Port to 1.21

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.7.2'
     id 'maven-publish'
 }
 
@@ -66,7 +66,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 17
+def targetJavaVersion = 21
 tasks.withType(JavaCompile).configureEach {
     // ensure that the encoding is set to UTF-8, no matter what the system default is
     // this fixes some edge cases with special characters not displaying correctly

gradle.properties

@@ -4,9 +4,9 @@ systemProp.https.protocols=TLSv1.1,TLSv1.2,TLSv1.3
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.20.2
-	yarn_mappings=1.20.2+build.4
-	loader_version=0.14.24
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.9
+	loader_version=0.15.11
 
 # Mod Properties
 	mod_version = 0.1.1
@@ -15,4 +15,4 @@ systemProp.https.protocols=TLSv1.1,TLSv1.2,TLSv1.3
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.90.7+1.20.2
+	fabric_version=0.100.7+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -5,6 +5,7 @@ pluginManagement {
             name = "forge"
             url = "https://lss233.littleservice.cn/repositories/minecraft"
         }
+        maven { url "https://maven.fabricmc.net" }
         gradlePluginPortal()
     }
 }

src/main/java/cn/cutemc/autologin/mixin/ConnectScreenMixin.java

@@ -3,27 +3,28 @@
 import cn.cutemc.autologin.AutoLogin;
 import cn.cutemc.autologin.records.ServerStatus;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.ConnectScreen;
+import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;
+import net.minecraft.client.network.CookieStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.regex.Pattern;
 
 @Mixin(ConnectScreen.class)
 public class ConnectScreenMixin {
-
-    @Inject(method = "connect(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;Lnet/minecraft/client/network/ServerInfo;Z)V", at = @At(value = "TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
-    private static void connectInject(Screen screen, MinecraftClient client, ServerAddress address, ServerInfo info, boolean quickPlay, CallbackInfo ci, ConnectScreen connectScreen) {
+    @Inject(method = "connect(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;Lnet/minecraft/client/network/ServerInfo;ZLnet/minecraft/client/network/CookieStorage;)V", at = @At(value = "TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
+    private static void connectInject(Screen screen, MinecraftClient client, ServerAddress address, ServerInfo info, boolean quickPlay, @Nullable CookieStorage cookieStorage, CallbackInfo ci) {
         if (address != null) {
             String addressStr = address.getAddress();
             Pattern pattern = Pattern.compile(":[0-9]{1,5}", Pattern.MULTILINE);
-            // address没有端口则加上默认端口
+            // If address has no port, add the default port
             addressStr = pattern.matcher(addressStr).find() ? addressStr : addressStr + ":25565";
 
             AutoLogin.server = new ServerStatus(addressStr, false, false);

src/main/resources/autologin.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "cn.cutemc.autologin.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [