Update to 1.20.6

Aeltumn · May 11, 2024 · 505921f · 505921f
1 parent 81a46a5
commit 505921f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,20 +4,20 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.3
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.11
 
-#Fabric api
-fabric_version=0.92.1+1.20.4
+# Fabric API
+fabric_version=0.98.0+1.20.6
 
 # Mod Properties
 mod_id=autoreconnect
 mod_name=AutoReconnect
-mod_version=1.20.4-2.3.0
+mod_version=1.20.6-2.3.0
 maven_group=autoreconnect
 archives_base_name=autoreconnect
 
 # Dependencies
-modmenu_version=9.0.0
-clothconfig_version=13.0.121
+modmenu_version=10.0.0-beta.1
+clothconfig_version=14.0.126
diff --git a/src/main/java/autoreconnect/config/AutoReconnectConfig.java b/src/main/java/autoreconnect/config/AutoReconnectConfig.java
@@ -34,9 +34,17 @@ public static AutoReconnectConfig getInstance() {
     }
 
     public static void load() {
+        var targetFile = FabricLoader.getInstance().getConfigDir().resolve(FILE_NAME);
+        if (!targetFile.toFile().exists()) {
+            LogUtils.getLogger().info("AutoReconnect config does not yet exist, generating new file");
+            instance = new AutoReconnectConfig();
+            instance.save();
+            return;
+        }
+
         try {
             instance = GSON.fromJson(
-                Files.readString(FabricLoader.getInstance().getConfigDir().resolve(FILE_NAME)),
+                Files.readString(targetFile),
                 AutoReconnectConfig.class);
             instance.validate();
         } catch (IOException | JsonSyntaxException ex) {

diff --git a/src/main/java/autoreconnect/mixin/ConnectScreenMixin.java b/src/main/java/autoreconnect/mixin/ConnectScreenMixin.java
@@ -5,6 +5,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.ConnectScreen;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.TransferState;
 import net.minecraft.client.multiplayer.resolver.ServerAddress;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,8 +15,8 @@
 @Mixin(ConnectScreen.class)
 public class ConnectScreenMixin {
     @Inject(at = @At("HEAD"), method = "connect")
-    private void connect(Minecraft minecraft, ServerAddress serverAddress, ServerData serverData, CallbackInfo ci) {
+    private void connect(Minecraft minecraft, ServerAddress serverAddress, ServerData serverData, TransferState transferState, CallbackInfo ci) {
         if (serverData == null) return;
-        AutoReconnect.getInstance().setReconnectHandler(new MultiplayerReconnectStrategy(serverData));
+        AutoReconnect.getInstance().setReconnectHandler(new MultiplayerReconnectStrategy(serverData, transferState));
     }
 }
diff --git a/src/main/java/autoreconnect/reconnect/MultiplayerReconnectStrategy.java b/src/main/java/autoreconnect/reconnect/MultiplayerReconnectStrategy.java
@@ -5,13 +5,16 @@
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.TransferState;
 import net.minecraft.client.multiplayer.resolver.ServerAddress;
 
 public class MultiplayerReconnectStrategy extends ReconnectStrategy {
     private final ServerData serverData;
+    private final TransferState transferState;
 
-    public MultiplayerReconnectStrategy(ServerData serverData) {
+    public MultiplayerReconnectStrategy(ServerData serverData, TransferState transferState) {
         this.serverData = serverData;
+        this.transferState = transferState;
     }
 
     @Override
@@ -29,7 +32,8 @@ public void reconnect() {
                 Minecraft.getInstance(),
                 ServerAddress.parseString(serverData.ip),
                 serverData,
-                false
+                false,
+                transferState
         );
     }
 }
diff --git a/src/main/java/autoreconnect/reconnect/SingleplayerReconnectStrategy.java b/src/main/java/autoreconnect/reconnect/SingleplayerReconnectStrategy.java
@@ -22,7 +22,7 @@ public String getName() {
     public void reconnect() {
         var minecraft = Minecraft.getInstance();
         if (!minecraft.getLevelSource().levelExists(worldName)) return;
-        minecraft.createWorldOpenFlows().checkForBackupAndLoad(worldName, () -> {
+        minecraft.createWorldOpenFlows().openWorld(worldName, () -> {
             minecraft.setScreen(new TitleScreen());
         });
     }