Merge branch 'development' into FS-37

.github/dependabot.yml

@@ -9,11 +9,15 @@ updates:
   # Maintain Maven Updates
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
+    target-branch: "development"
+    open-pull-requests-limit: 50
     schedule:
       interval: "daily"
       
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: "development"
+    open-pull-requests-limit: 50
     schedule:
       interval: "daily"

.github/workflows/codeql-analysis.yml

@@ -38,10 +38,11 @@ jobs:
       uses: actions/checkout@v2
       
     - name: Setup Java JDK
-      uses: actions/setup-java@v1.4.3
+      uses: actions/setup-java@v2.2.0
       with:
         # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
         java-version: 11
+        distribution: 'adopt'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/downstream.yml

@@ -30,7 +30,7 @@ jobs:
       with:
         upstream_repository: AtlasMediaGroup/TotalFreedomMod
         upstream_branch: main
-        target_branch: main
+        target_branch: development
         git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
 
     # Step 3: Display a message if 'sync' step had new commits (simple test)

.github/workflows/maven.yml

@@ -11,9 +11,20 @@ jobs:
     # Java 11 Builds
     - uses: actions/checkout@v1
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2.2.0
       with:
         java-version: 11
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    # Java 16 Builds
+    - uses: actions/checkout@v1
+    - name: Set up JDK 16
+      uses: actions/setup-java@v2.2.0
+      with:
+        java-version: 16
+        distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.05</version>
+    <version>2021.06</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -109,6 +109,11 @@
             <id>ess-repo</id>
             <url>https://ci.ender.zone/plugin/repository/everything/</url>
         </repository>
+        
+        <repository>
+            <id>total-freedom-libs-snapshot-local</id>
+            <url>https://atlasmedia.jfrog.io/artifactory/total-freedom-libs-snapshot-local/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -135,10 +140,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.speedxx</groupId>
-            <artifactId>Mojangson</artifactId>
-            <version>1957eef8d6</version>
-            <scope>compile</scope>
+            <groupId>ca.momoperes</groupId>
+            <artifactId>mojangson</artifactId>
+            <version>1.0-20210821.193420-1</version>
         </dependency>
 
         <dependency>
@@ -193,7 +197,7 @@
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.3</version>
+            <version>19.5</version>
             <scope>provided</scope>
         </dependency>
 
@@ -256,7 +260,7 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -462,7 +466,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <failOnViolation>true</failOnViolation>