From f3acf8cde7022498293e55e73ee1a5d4840f44f1 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 25 May 2019 20:07:27 +0200 Subject: [PATCH] Fix realms icon offsets in main menu on 1.14+ --- .../com/replaymod/core/handler/MainMenuHandler.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/replaymod/core/handler/MainMenuHandler.java b/src/main/java/com/replaymod/core/handler/MainMenuHandler.java index c70f5d90..5f8b325b 100644 --- a/src/main/java/com/replaymod/core/handler/MainMenuHandler.java +++ b/src/main/java/com/replaymod/core/handler/MainMenuHandler.java @@ -15,6 +15,7 @@ import static com.replaymod.core.versions.MCVer.*; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.resource.language.I18n; //#else //$$ import net.minecraft.client.gui.GuiButton; //$$ import net.minecraftforge.client.event.GuiScreenEvent; @@ -39,6 +40,7 @@ public class MainMenuHandler extends EventRegistrations { TitleScreen gui = (TitleScreen) guiScreen; int realmsOffset = 0; //#if MC>=11400 + final String BUTTON_REALMS = I18n.translate("menu.online"); for (AbstractButtonWidget button : buttonList) { //#else //$$ for (GuiButton button : buttonList) { @@ -52,14 +54,14 @@ public class MainMenuHandler extends EventRegistrations { int offset = -1 * 24 + 10; button.y += offset; - //#if MC>=11400 - // FIXME looks like the button has moved into the realms lib? - //#else //#if MC>=11300 + //#if MC>=11400 + if (BUTTON_REALMS.equals(button.getMessage())) { + //#else //$$ if (button.id == 14) { - //$$ realmsOffset = offset; - //$$ } //#endif + realmsOffset = offset; + } //#endif } //#if MC>=11300