Updated to 1.17.1 and Java 16 (#2)

* Updated to 1.17 Release Candidate 1 and Java 16

* Updated to 1.17.1

* Applied suggestion

Author: mschae23

.github/workflows/build.yml

@@ -12,9 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          1.8,  # Minimum supported by Minecraft
-          11,   # Current Java LTS
-          15    # Latest version
+          16 # Minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]
@@ -34,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew assemble
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '11' }} # Only upload artifacts built from LTS Java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '16' }} # Only upload artifacts built from latest Java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts

.github/workflows/checkstyle.yml

@@ -17,6 +17,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           checkstyle_config: 'checkstyle.xml'
           reporter: 'github-pr-check'
-          level: 'warning'
+          level: 'error'
           fail_on_error: 'true'
           tool_name: 'checkstyle'

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-    id 'fabric-loom' version '0.7-SNAPSHOT'
+    id 'fabric-loom' version '0.8-SNAPSHOT'
     id 'checkstyle'
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = "$project.mod_version+$project.minecraft_version"
@@ -38,10 +38,8 @@ processResources {
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = 'UTF-8'
 
-    def targetVersion = 8
-    if (JavaVersion.current().isJava9Compatible()) {
-        it.options.release = targetVersion
-    }
+    // Minecraft 1.17 (21w19a) upwards uses Java 16.
+    it.options.release = 16
 }
 
 java {
@@ -50,7 +48,7 @@ java {
 
 checkstyle {
     configFile = rootProject.file('checkstyle.xml')
-    toolVersion = '8.31'
+    toolVersion = '8.45'
 }
 
 jar {

gradle.properties

@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-# check these on https://modmuss50.me/fabric.html
-    minecraft_version=21w18a
-    yarn_mappings=21w18a+build.5
-    loader_version=0.11.3
+# check these on https://fabricmc.net/versions.html
+    minecraft_version=1.17.1
+    yarn_mappings=1.17.1+build.31
+    loader_version=0.11.6
 
 # Mod Properties
-    mod_version = 1.1.0
+    mod_version = 2.0.0
     maven_group = motherlode
     archives_base_name = motherlode-api
 
 # Dependencies
-    fabric_version=0.34.2+1.17
+    fabric_version=0.37.1+1.17
     artifice_version=1.17-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/motherlode/base/MotherlodeBase.java

@@ -1,34 +1,34 @@
-package motherlode.base;
-
-import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
-import motherlode.base.api.Motherlode;
-import motherlode.base.api.MotherlodeInitEvents;
-import org.apache.logging.log4j.Level;
-
-public class MotherlodeBase implements ModInitializer, DedicatedServerModInitializer {
-    public static final String MODID = "motherlode-api";
-
-    private static boolean moduleInitDone;
-
-    @Override
-    public void onInitialize() {
-        FabricLoader.getInstance().getEntrypointContainers("motherlode:init", ModInitializer.class)
-            .forEach(container -> container.getEntrypoint().onInitialize());
-        moduleInitDone = true;
-
-        MotherlodeInitEvents.MAIN.invoker().initialize();
-
-        Motherlode.getLogger().log(Level.INFO, "[Motherlode] Initialized.");
-    }
-
-    @Override
-    public void onInitializeServer() {
-        MotherlodeInitEvents.DEDICATED_SERVER.invoker().initialize();
-    }
-
-    public static boolean isModuleInitializationDone() {
-        return moduleInitDone;
-    }
-}
+package motherlode.base;
+
+import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import motherlode.base.api.Motherlode;
+import motherlode.base.api.MotherlodeInitEvents;
+import org.apache.logging.log4j.Level;
+
+public class MotherlodeBase implements ModInitializer, DedicatedServerModInitializer {
+    public static final String MODID = "motherlode-api";
+
+    private static boolean moduleInitDone;
+
+    @Override
+    public void onInitialize() {
+        FabricLoader.getInstance().getEntrypointContainers("motherlode:init", ModInitializer.class)
+            .forEach(container -> container.getEntrypoint().onInitialize());
+        moduleInitDone = true;
+
+        MotherlodeInitEvents.MAIN.invoker().initialize();
+
+        Motherlode.getLogger().log(Level.INFO, "[Motherlode] Initialized.");
+    }
+
+    @Override
+    public void onInitializeServer() {
+        MotherlodeInitEvents.DEDICATED_SERVER.invoker().initialize();
+    }
+
+    public static boolean isModuleInitializationDone() {
+        return moduleInitDone;
+    }
+}

src/main/java/motherlode/base/MotherlodeClient.java

@@ -1,11 +1,11 @@
-package motherlode.base;
-
-import net.fabricmc.api.ClientModInitializer;
-import motherlode.base.api.MotherlodeInitEvents;
-
-public class MotherlodeClient implements ClientModInitializer {
-    @Override
-    public void onInitializeClient() {
-        MotherlodeInitEvents.CLIENT.invoker().initialize();
-    }
-}
+package motherlode.base;
+
+import net.fabricmc.api.ClientModInitializer;
+import motherlode.base.api.MotherlodeInitEvents;
+
+public class MotherlodeClient implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        MotherlodeInitEvents.CLIENT.invoker().initialize();
+    }
+}