Merge pull request #7 from tildejustin/1.21.6

port to 1.21.6

Author: tildejustin

gradle.properties

@@ -3,6 +3,6 @@ org.gradle.parallel = true
 org.gradle.caching = true
 
 mod_version = 1.4.3
-target_version = 1.19.4-1.20.6
+target_version = 1.21.6
 archives_name = fast-reset
 maven_group = fast_reset.client

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-minecraft = "1.19.4"
-yarn_mappings = "1.19.4+build.2"
+minecraft = "1.21.6-rc1"
+yarn_mappings = "1.21.6-rc1+build.1"
 fabric_loader = "0.15.6"
 loom = "1.5-SNAPSHOT"
 vineflower = "1.10.0-SNAPSHOT"

src/main/java/fast_reset/client/client/SaveWorldScreen.java

@@ -1,5 +1,6 @@
 package fast_reset.client.client;
 
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
@@ -11,11 +12,11 @@ public SaveWorldScreen(){
         super(Text.translatable("menu.savingLevel"));
     }
 
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta){
-        renderBackground(matrices);
+    public void render(DrawContext ctx, int mouseX, int mouseY, float delta){
+        renderBackground(ctx, mouseX, mouseY, delta);
 
-        super.render(matrices, mouseX, mouseY, delta);
+        super.render(ctx, mouseX, mouseY, delta);
 
-        drawCenteredTextWithShadow(matrices, this.textRenderer, "still saving the last world", this.width / 2, 70, Color.white.getRGB());
+        ctx.drawCenteredTextWithShadow(this.textRenderer, "still saving the last world", this.width / 2, 70, Color.white.getRGB());
     }
 }

src/main/java/fast_reset/client/mixin/GameMenuMixin.java

@@ -3,9 +3,11 @@
 import com.llamalad7.mixinextras.sugar.Share;
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import fast_reset.client.Client;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.*;
 import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.widget.*;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.*;
@@ -18,20 +20,21 @@ protected GameMenuMixin(Text title) {
         super(title);
     }
 
-    @Shadow
-    protected abstract void disconnect();
-
     @Unique
     private static final int bottomRightWidth = 102;
 
     @Shadow
     private @Nullable ButtonWidget exitButton;
 
+    @Shadow
+    public static void disconnect(MinecraftClient client, Text disconnectReason) {
+    }
+
     @Redirect(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;I)Lnet/minecraft/client/gui/widget/Widget;"))
     private <T extends Widget> T addButtons(GridWidget.Adder instance, T widget, int occupiedColumns, @Share("saveButton") LocalRef<ButtonWidget.Builder> saveButtonStore, @Share("quitButton") LocalRef<T> quitButton) {
         final ButtonWidget.Builder saveButton = ButtonWidget.builder(Text.translatable("menu.quitWorld"), (buttonWidgetX) -> {
             Client.saveOnQuit = false;
-            this.disconnect();
+            disconnect(this.client, ClientWorld.QUITTING_MULTIPLAYER_TEXT);
             Client.saveOnQuit = true;
         });
         if (Client.buttonLocation == 2) {