3.2.0: remove replace save & quit option

Author: tildejustin

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 3.1.0
+mod_version = 3.2.0
 
 target_version = 1.8.x
 archives_name = anchiale

src/main/java/me/voidxwalker/anchiale/Anchiale.java

@@ -18,7 +18,9 @@ public class Anchiale {
                 Files.createFile(config);
                 saveConfig();
             }
-            buttonLocation = ButtonLocation.values()[Integer.parseInt(new String(Files.readAllBytes(config)))];
+            int ordinal = Integer.parseInt(new String(Files.readAllBytes(config)));
+            ordinal = Math.max(0, Math.min(ButtonLocation.values().length - 1, ordinal));
+            buttonLocation = ButtonLocation.values()[ordinal];
         } catch (Exception e) {
             LOGGER.error("Failed to create/read Anchiale config");
             e.printStackTrace();
@@ -36,8 +38,7 @@ public static void saveConfig() {
 
     public enum ButtonLocation {
         BOTTOM_RIGHT("Bottom Right"),
-        CENTER("Center"),
-        REPLACE_SQ("Replace Save and Quit");
+        CENTER("Center");
 
         private final String name;
 

src/main/java/me/voidxwalker/anchiale/mixin/GameMenuScreenMixin.java

@@ -15,39 +15,28 @@ public abstract class GameMenuScreenMixin extends Screen {
     @ModifyArg(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIILjava/lang/String;)V", ordinal = 0), index = 1)
     private int titleScreenX(int x, @Share("originalX") LocalIntRef originalX) {
         originalX.set(x);
-        return Anchiale.buttonLocation == Anchiale.ButtonLocation.REPLACE_SQ ? this.width - 153 - 4 : x;
+        return x;
     }
 
     @ModifyArg(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIILjava/lang/String;)V", ordinal = 0), index = 2)
     private int titleScreenY(int y, @Share("originalY") LocalIntRef originalY) {
         originalY.set(y);
-        return Anchiale.buttonLocation == Anchiale.ButtonLocation.REPLACE_SQ ? this.height - 24 : y;
-    }
-
-    @ModifyExpressionValue(method = "init", at = @At(value = "NEW", target = "(IIILjava/lang/String;)Lnet/minecraft/client/gui/widget/ButtonWidget;", ordinal = 0))
-    private ButtonWidget titleScreenWidth(ButtonWidget button) {
-        if (Anchiale.buttonLocation == Anchiale.ButtonLocation.REPLACE_SQ) {
-            button.setWidth(150); // from fast reset
-        }
-        return button;
+        return y;
     }
 
     @Inject(method = "init", at = @At("TAIL"))
     private void addAnchialeButton(CallbackInfo ci, @Share("originalX") LocalIntRef originalX, @Share("originalY") LocalIntRef originalY) {
         int x, y;
         switch (Anchiale.buttonLocation) {
-            case BOTTOM_RIGHT:
-                x = this.width - 104;
-                y = this.height - 24;
-                break;
             case CENTER:
                 x = originalX.get();
                 y = originalY.get() + 24;
                 break;
-            case REPLACE_SQ:
+            case BOTTOM_RIGHT:
             default:
-                x = originalX.get();
-                y = originalY.get();
+                x = this.width - 104;
+                y = this.height - 24;
+                break;
         }
         if (this.client.isInSingleplayer()) {
             this.buttons.add(new ButtonWidget(1507, x, y, Anchiale.buttonLocation == Anchiale.ButtonLocation.BOTTOM_RIGHT ? 100 : 200, 20, "Quit to Title"));