Merge pull request #5 from tildejustin/1.19.4-1.20.6

1.20.5-1.20.6 support and fix button order

Author: tildejustin

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 1.4.2
-target_version = 1.19.4-1.20.4
+mod_version = 1.4.3
+target_version = 1.19.4-1.20.6
 archives_name = fast-reset
 maven_group = fast_reset.client

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

@@ -1,12 +1,16 @@
 package fast_reset.client.mixin;
 
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import fast_reset.client.Client;
 import net.minecraft.client.gui.*;
 import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameMenuScreen.class)
 public abstract class GameMenuMixin extends Screen {
@@ -20,8 +24,11 @@ protected GameMenuMixin(Text title) {
     @Unique
     private static final int bottomRightWidth = 102;
 
+    @Shadow
+    private @Nullable ButtonWidget exitButton;
+
     @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) {
+    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();
@@ -30,7 +37,19 @@ private <T extends Widget> T addButtons(GridWidget.Adder instance, T widget, int
         if (Client.buttonLocation == 2) {
             // add menu.quitWorld button instead of save button
             instance.add(saveButton.width(204).build(), occupiedColumns);
-            return (T) this.addDrawableChild((ButtonWidget) widget);
+            quitButton.set(widget);
+            return null; // warning: GameMenu#exitButton is null here, needs to be set later
+        }
+
+        saveButtonStore.set(saveButton);
+        return instance.add(widget, occupiedColumns);
+    }
+
+    @Inject(method = "initWidgets", at = @At("TAIL"))
+    private <T extends Element & Drawable & Selectable> void addFastResetWidget(CallbackInfo ci, @Share("saveButton") LocalRef<ButtonWidget.Builder> saveButtonStore, @Share("quitButton") LocalRef<T> quitButton) {
+        if (Client.buttonLocation == 2) {
+            this.exitButton = (ButtonWidget) this.addDrawableChild(quitButton.get());
+            return;
         }
 
         int height = 20;
@@ -52,9 +71,7 @@ private <T extends Widget> T addButtons(GridWidget.Adder instance, T widget, int
             }
         }
 
-
-        this.addDrawableChild(saveButton.dimensions(x, y, width, height).build());
-        return instance.add(widget, occupiedColumns);
+        this.addDrawableChild(saveButtonStore.get().dimensions(x, y, width, height).build());
     }
 
     @Redirect(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget$Builder;width(I)Lnet/minecraft/client/gui/widget/ButtonWidget$Builder;", ordinal = 1))

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

@@ -1,14 +1,14 @@
 package fast_reset.client.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import fast_reset.client.Client;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.text.Text;
 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.*;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(OptionsScreen.class)
 public class OptionsScreenMixin extends Screen {
@@ -29,8 +29,8 @@ private static Text getButtonText(){
         }
     }
 
-    @Inject(method = "init", at= @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;ILnet/minecraft/client/gui/widget/Positioner;)Lnet/minecraft/client/gui/widget/Widget;"), locals = LocalCapture.CAPTURE_FAILHARD)
-    public void initInject(CallbackInfo ci, GridWidget gridWidget, GridWidget.Adder adder){
+    @Inject(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;)Lnet/minecraft/client/gui/widget/Widget;", shift = At.Shift.AFTER), slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/option/OptionsScreen;CREDITS_AND_ATTRIBUTION_TEXT:Lnet/minecraft/text/Text;")))
+    public void initInject(CallbackInfo ci, @Local GridWidget.Adder adder){
         adder.add(ButtonWidget.builder(getButtonText(), (buttonWidget) -> {
             Client.updateButtonLocation();
             buttonWidget.setMessage(getButtonText());