Port to 1.21.9

Author: Riflusso

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 	id "io.github.p03w.machete" version "2.0.1"
 }

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
-loader_version=0.16.14
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
+loader_version=0.17.2
 
 # Mod Properties
 mod_version=3.1.1
-target_version=1.21.6
+target_version=1.21.9
 maven_group=me.contaria
 archives_base_name=fastquit
 
 # Dependencies
-fabric_api_version=0.127.1+1.21.6
-modmenu_version=15.0.0-beta.2
-cloth_config_version=19.0.147
+fabric_api_version=0.134.0+1.21.9
+modmenu_version=16.0.0-rc.1
+cloth_config_version=20.0.148

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

@@ -36,13 +36,13 @@ private boolean fastquit(IntegratedServer server) {
     }
 
     @WrapWithCondition(
-            method = "reset",
+            method = { "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V", "enterReconfiguration" },
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/MinecraftClient;render(Z)V"
+                    target = "Lnet/minecraft/client/MinecraftClient;setScreenAndRender(Lnet/minecraft/client/gui/screen/Screen;)V"
             )
     )
-    private boolean fastquit$doNotOpenSaveScreen(MinecraftClient client, boolean tick, Screen screen) {
+    private boolean fastquit$skipSavingScreen(MinecraftClient client, Screen screen) {
         return FastQuit.CONFIG.renderSavingScreen || !(screen instanceof MessageScreen && screen.getTitle().equals(TextHelper.translatable("menu.savingLevel")));
     }
 

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

@@ -7,7 +7,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.world.SelectWorldScreen;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.world.WorldListWidget;
 import net.minecraft.world.level.storage.LevelStorage;
 import net.minecraft.world.level.storage.LevelSummary;
@@ -19,18 +19,21 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(WorldListWidget.WorldEntry.class)
-public abstract class WorldListWidgetWorldEntryMixin {
+public abstract class WorldListWidgetWorldEntryMixin extends WorldListWidget.Entry {
 
     @Shadow
     @Final
-    private SelectWorldScreen screen;
+    private Screen screen;
     @Shadow
     @Final
     private MinecraftClient client;
     @Shadow
     @Final
     LevelSummary level;
 
+    @Shadow
+    protected abstract int getTextX();
+
     @WrapOperation(
             method = {
                     "edit",
@@ -69,24 +72,18 @@ public abstract class WorldListWidgetWorldEntryMixin {
         this.client.setScreen(this.screen);
     }
 
-    @Inject(
-            method = "render",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V",
-                    ordinal = 0,
-                    shift = At.Shift.AFTER
-            )
-    )
-    private void fastquit$renderSavingTimeOnWorldList(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo ci) {
+    @Inject(method = "render", at = @At("TAIL"))
+    private void fastquit$renderSavingTimeOnWorldList(DrawContext context, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo ci) {
         if (FastQuit.CONFIG.showSavingTime == FastQuitConfig.ShowSavingTime.TRUE) {
             FastQuit.getSavingWorld(this.client.getLevelStorage().getSavesDirectory().resolve(this.level.getName())).ifPresent(server -> {
-                WorldInfo info = FastQuit.savingWorlds.get(server);
-                if (info != null) {
-                    String time = info.getTimeSaving() + " ⌛";
-                    context.drawText(this.client.textRenderer, time, x + entryWidth - this.client.textRenderer.getWidth(time) - 4, y + 1, -6939106, false);
-                }
-            });
+                        WorldInfo info = FastQuit.savingWorlds.get(server);
+                        if (info != null) {
+                            String time = info.getTimeSaving() + " ⌛";
+                            int x = this.getTextX();
+                            int y = this.getContentY() + 1;
+                            context.drawText(this.client.textRenderer, time, x + 200 - this.client.textRenderer.getWidth(time) - 4, y, -6939106, false);
+                        }
+                    });
         }
     }
 }