feat: update to 1.21.9

build.gradle

@@ -1,12 +1,12 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version '1.11-SNAPSHOT'
 }
 
 version = "${project.mod_version}+mc${project.minecraft_version}"
 group = project.maven_group
 
 repositories {
-    maven { url "https://maven.terraformersmc.com" }
+    maven { url = "https://maven.terraformersmc.com" }
 }
 
 dependencies {
@@ -23,7 +23,7 @@ dependencies {
 
 processResources {
     inputs.property "version", project.version
-    filteringCharset "UTF-8"
+    filteringCharset = "UTF-8"
 
     filesMatching("fabric.mod.json") {
         expand "version": project.version

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.13
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
+loader_version=0.17.2
 
 # Fabric API
-fabric_version=0.119.9+1.21.5
+fabric_version=0.134.0+1.21.9
 
 # Mod Properties
 mod_version=0.1.7
@@ -18,4 +18,4 @@ maven_group=com.github.getchoo
 
 # Dependencies
 ## https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
-mod_menu_version=14.0.0-rc.2
+mod_menu_version=16.0.0-rc.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/com/github/getchoo/smoothboot/config/ConfigHandler.java

@@ -16,7 +16,7 @@ public class ConfigHandler {
 
     public static SmoothBootConfig readConfig() throws IOException {
         String configPath = System.getProperty("user.dir") + "/config/" + SmoothBoot.MOD_ID + ".json";
-        SmoothBoot.LOGGER.debug("Config path: " + configPath);
+        SmoothBoot.LOGGER.debug("Config path: {}", configPath);
 
         // Read config
         SmoothBootConfig config;
@@ -30,7 +30,7 @@ public static SmoothBootConfig readConfig() throws IOException {
                 GSON.toJson(config, writer);
             }
 
-            SmoothBoot.LOGGER.debug("Config: " + config);
+            SmoothBoot.LOGGER.debug("Config: {}", config);
         } catch (NullPointerException | JsonParseException | IOException e) {
             // Create new config
             config = new SmoothBootConfig();

src/main/java/com/github/getchoo/smoothboot/mixin/UtilMixin.java

@@ -74,7 +74,7 @@ private static NameableExecutor replWorker(String name) {
 		ExecutorService service = new ForkJoinPool(MathHelper.clamp(select(name, SmoothBoot.config.threadCount.bootstrap,
 			SmoothBoot.config.threadCount.main), 1, 0x7fff), forkJoinPool -> {
 				String workerName = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
-				SmoothBoot.LOGGER.debug("Initialized " + workerName);
+                SmoothBoot.LOGGER.debug("Initialized {}", workerName);
 
 				ForkJoinWorkerThread forkJoinWorkerThread = new LoggingForkJoinWorkerThread(forkJoinPool, SmoothBoot.LOGGER);
 				forkJoinWorkerThread.setPriority(select(name, SmoothBoot.config.threadPriority.bootstrap,
@@ -95,7 +95,7 @@ private static NameableExecutor replIoWorker() {
 
 		ExecutorService service = Executors.newCachedThreadPool(runnable -> {
 			String workerName = "IO-Worker-" + atomicInteger.getAndIncrement();
-			SmoothBoot.LOGGER.debug("Initialized " + workerName);
+            SmoothBoot.LOGGER.debug("Initialized {}", workerName);
 
 			Thread thread = new Thread(runnable);
 			thread.setName(workerName);

src/main/java/com/github/getchoo/smoothboot/mixin/client/IntegratedServerMixin.java

@@ -4,9 +4,9 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.resource.ResourcePackManager;
 import net.minecraft.server.SaveLoader;
-import net.minecraft.server.WorldGenerationProgressListenerFactory;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.util.ApiServices;
+import net.minecraft.world.chunk.ChunkLoadProgress;
 import net.minecraft.world.level.storage.LevelStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,7 +16,7 @@
 @Mixin(IntegratedServer.class)
 public class IntegratedServerMixin {
     @Inject(method = "<init>", at = @At("RETURN"))
-    public void onInit(Thread serverThread, MinecraftClient client, LevelStorage.Session session, ResourcePackManager dataPackManager, SaveLoader saveLoader, ApiServices apiServices, WorldGenerationProgressListenerFactory worldGenerationProgressListenerFactory, CallbackInfo ci) {
+    public void onInit(Thread serverThread, MinecraftClient client, LevelStorage.Session session, ResourcePackManager dataPackManager, SaveLoader saveLoader, ApiServices apiServices, ChunkLoadProgress chunkLoadProgress, CallbackInfo ci) {
         serverThread.setPriority(SmoothBoot.config.threadPriority.integratedServer);
         SmoothBoot.LOGGER.debug("Initialized integrated server thread");
     }

src/main/resources/fabric.mod.json

@@ -21,9 +21,9 @@
   },
   "mixins": ["smoothboot.mixins.json"],
   "depends": {
-    "fabricloader": ">=0.15",
+    "fabricloader": ">=0.17",
     "fabric-api": "*",
-    "minecraft": ">=1.21.3",
+    "minecraft": ">=1.21.9",
     "java": ">=21"
   }
 }

src/main/resources/smoothboot.mixins.json

@@ -1,8 +1,8 @@
 {
   "required": true,
-  "minVerscomn": "0.8",
+  "minVersion": "0.8",
   "package": "com.github.getchoo.smoothboot.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_21",
   "mixins": ["UtilMixin"],
   "client": ["client.MainMixin", "client.IntegratedServerMixin"],
   "server": ["server.MainMixin"],