Migrate mod to Minecraft 26.2

gradle.properties

@@ -7,17 +7,17 @@ org.gradle.configuration-cache=false
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=26.1.2
-loader_version=0.19.2
-loom_version=1.16-SNAPSHOT
+minecraft_version=26.2
+loader_version=0.19.3
+loom_version=1.17-SNAPSHOT
 
 # Mod Properties
 mod_version=3.1.4
-target_version=26.1.x
+target_version=26.2
 maven_group=me.contaria
 archives_base_name=fastquit
 
 # Dependencies
-fabric_api_version=0.149.1+26.1.2
-modmenu_version=18.0.0-beta.1
-cloth_config_version=26.1.154
+fabric_api_version=0.154.0+26.2
+modmenu_version=20.0.0-beta.4
+cloth_config_version=26.2.155

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/me/contaria/fastquit/FastQuit.java

@@ -1,6 +1,7 @@
 package me.contaria.fastquit;
 
 import me.contaria.fastquit.mixin.MinecraftAccessor;
+import me.contaria.fastquit.mixin.GuiAccessor;
 import me.contaria.fastquit.mixin.MinecraftServerAccessor;
 import me.contaria.fastquit.mixin.LevelStorageSessionAccessor;
 import com.mojang.logging.LogUtils;
@@ -130,15 +131,15 @@ public static void wait(Collection<IntegratedServer> servers, @Nullable Callback
             return;
         }
 
-        Screen oldScreen = client.screen;
+        Screen oldScreen = client.gui.screen();
 
         Component stillSaving = TextHelper.translatable("fastquit.screen.waiting", String.join("\" & \"", servers.stream().map(server -> server.getWorldData().getLevelName()).toList()));
         log(stillSaving.getString());
 
         servers.forEach(server -> server.getRunningThread().setPriority(Thread.NORM_PRIORITY));
 
         try {
-            client.setScreen(new WaitingScreen(stillSaving, cancellable));
+            client.gui.setScreen(new WaitingScreen(stillSaving, cancellable));
 
             while (servers.stream().anyMatch(server -> !server.isShutdown())) {
                 if (cancellable != null && cancellable.isCancelled()) {
@@ -153,9 +154,9 @@ public static void wait(Collection<IntegratedServer> servers, @Nullable Callback
         } finally {
             // compatibility with "WorldGen" mod
             if (oldScreen != null && oldScreen.getClass().getName().equals("caeruleusTait.WorldGen.gui.screens.WGConfigScreen")) {
-                client.screen = oldScreen;
+                ((GuiAccessor) client.gui).fastquit$setScreen(oldScreen);
             } else {
-                client.setScreenAndShow(oldScreen);
+                client.gui.setScreen(oldScreen);
             }
         }
     }

src/main/java/me/contaria/fastquit/mixin/GuiAccessor.java

@@ -0,0 +1,14 @@
+package me.contaria.fastquit.mixin;
+
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.screens.Screen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Gui.class)
+public interface GuiAccessor {
+    @Mutable
+    @Accessor("screen")
+    void fastquit$setScreen(Screen screen);
+}

src/main/java/me/contaria/fastquit/mixin/MinecraftMixin.java

@@ -48,12 +48,12 @@ private boolean fastquit(IntegratedServer server) {
         if (FastQuit.CONFIG.renderSavingScreen && this.isLocalServer) {
             original.call(client, screen);
         } else {
-            client.setScreen(screen);
+            client.gui.setScreen(screen);
         }
     }
 
     @Inject(
-            method = "destroy",
+            method = "exitWorldAndClose",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/Minecraft;disconnectWithProgressScreen()V",
@@ -65,7 +65,7 @@ private boolean fastquit(IntegratedServer server) {
     }
 
     @Inject(
-            method = "crash(Lnet/minecraft/client/Minecraft;Ljava/io/File;Lnet/minecraft/CrashReport;)V",
+            method = "crash(Lnet/minecraft/client/Minecraft;Ljava/io/File;Lnet/minecraft/CrashReport;I)V",
             at = @At("HEAD")
     )
     private static void fastquit$waitForSaveOnCrash(CallbackInfo ci) {

src/main/java/me/contaria/fastquit/mixin/MinecraftServerMixin.java

@@ -47,7 +47,7 @@ public abstract class MinecraftServerMixin {
                 description.append(" (" + info.getTimeSaving() + ")");
             }
             if (FastQuit.CONFIG.showToasts) {
-                Minecraft.getInstance().submit(() -> Minecraft.getInstance().getToastManager().addToast(new SystemToast(SystemToast.SystemToastId.WORLD_BACKUP, TextHelper.translatable("fastquit.toast.title"), description)));
+                Minecraft.getInstance().submit(() -> Minecraft.getInstance().gui.toastManager().addToast(new SystemToast(SystemToast.SystemToastId.WORLD_BACKUP, TextHelper.translatable("fastquit.toast.title"), description)));
             }
             FastQuit.log(description.getString());
         }

src/main/java/me/contaria/fastquit/mixin/WorldListWidgetWorldEntryMixin.java

@@ -65,7 +65,7 @@ public abstract class WorldListWidgetWorldEntryMixin extends WorldSelectionList.
             )
     )
     private void fastquit$openWorldListWhenFailed(CallbackInfo ci) {
-        this.minecraft.setScreen(this.screen);
+        this.minecraft.gui.setScreen(this.screen);
     }
 
     @Inject(

src/main/resources/fastquit.mixins.json

@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_17",
   "client": [
     "EditWorldScreenMixin",
+    "GuiAccessor",
     "LevelSettingsAccessor",
     "LevelStorageAccessMixin",
     "LevelStorageSessionAccessor",