made it work, using actual java stuff instead of weird hacks

Stereo528 · Dec 10, 2022 · b65177e · b65177e
1 parent dc3f413
commit b65177e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/main/java/io/github/stereo528/mainmenuchanger/client/MainMenuChangerClient.java b/src/main/java/io/github/stereo528/mainmenuchanger/client/MainMenuChangerClient.java
@@ -48,60 +48,60 @@ private static void mergeMultiplayerAndSingleplayer(Minecraft minecraft, Screen
                     if(MainMenuChangerClient.config.disableRealmsButtonAndNotifs) {
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.singleplayer"))) {
                             button.setWidth(98);
-                            button.y += space;
+                            button.setY(button.getY() + space);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.multiplayer"))) {
                             button.setWidth(98);
-                            button.x += 102;
+                            button.setX(button.getX() + 102);
                         }
                         //do a funny if modmenu is installed & realms button is off
                         // TODO Make this it's own config option
                         if (Objects.equals(button.getMessage(), Component.translatable("modmenu.title"))) {
                             button.setWidth(64);
-                            button.x += 68;
+                            button.setX(button.getX() + 68);
                         }
 
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.options"))) {
-                            button.y += -space-12;
+                            button.setY(button.getY() + (-space-12));
                             button.setWidth(64);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.quit"))) {
-                            button.y += -space-12;
+                            button.setY(button.getY() + (-space-12));
                             button.setWidth(64);
-                            button.x += 34;
+                            button.setX(button.getX() + 34);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("narrator.button.language"))) {
-                            button.y += -space-12;
+                            button.setY(button.getY() + (-space-12));
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("narrator.button.accessibility"))) {
-                            button.y += -space-12;
+                            button.setY(button.getY() + (-space-12));
                         }
                     } else { // bring everything up by 1 button so there isnt a gap from the title to sp/mp buttons
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.singleplayer"))) {
                             button.setWidth(98);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.multiplayer"))) {
                             button.setWidth(98);
-                            button.x += 102;
-                            button.y -= space;
+                            button.setX(button.getX() + 102);
+                            button.setY(button.getY() - space);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.online"))) {
-                            button.y -= space;
+                            button.setY(button.getY() - space);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.options"))) {
-                            button.y -= space/2;
+                            button.setY(button.getY() - space/2);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("menu.quit"))) {
-                            button.y -= space/2;
+                            button.setY(button.getY() - space/2);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("narrator.button.language"))) {
-                            button.y -= space;
+                            button.setY(button.getY() - space);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("narrator.button.accessibility"))) {
-                            button.y -= space;
+                            button.setY(button.getY() - space);
                         }
                         if (Objects.equals(button.getMessage(), Component.translatable("modmenu.title"))) {
-                            button.y -= space;
+                            button.setY(button.getY() - space);
                         }
                     }
                 }

diff --git a/src/main/java/io/github/stereo528/mainmenuchanger/mixin/TitleScreenMixin.java b/src/main/java/io/github/stereo528/mainmenuchanger/mixin/TitleScreenMixin.java
@@ -123,16 +123,16 @@ protected void removeButtons(CallbackInfo info) {
 
                 //bring buttons up so there isnt a weird gap, part 2
                 if (Objects.equals(button.getMessage(), Component.translatable("menu.options"))) {
-                    button.y -= space;
+                    button.setY(button.getY() - space);
                 }
                 if (Objects.equals(button.getMessage(), Component.translatable("menu.quit"))) {
-                    button.y -= space;
+                    button.setY(button.getY() - space);
                 }
                 if (Objects.equals(button.getMessage(), Component.translatable("narrator.button.language"))) {
-                    button.y -= space;
+                    button.setY(button.getY() - space);
                 }
                 if (Objects.equals(button.getMessage(), Component.translatable("narrator.button.accessibility"))) {
-                    button.y -= space;
+                    button.setY(button.getY() - space);
                 }
             }
             if (MainMenuChangerClient.config.disableSideButtons) {