diff --git a/src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java b/src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java index 371c5d476..56c95ba1f 100644 --- a/src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java +++ b/src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java @@ -97,8 +97,8 @@ public enum ModsButtonStyle { REPLACE_REALMS(true), @SerializedName("shrink") SHRINK(false), - @SerializedName("fabric_icon") - FABRIC_ICON(false); + @SerializedName("icon") + ICON(false); private final boolean titleScreenOnly; diff --git a/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java b/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java index a71feaf50..b22614db9 100644 --- a/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java +++ b/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java @@ -61,7 +61,7 @@ private static void afterTitleScreenInit(Screen screen) { buttons.add(modsButtonIndex, new ModMenuButtonWidget(screen.width / 2 - 100, buttonsY + spacing * 3 - (spacing / 2), 200, 20, getModsButtonText(), screen)); } else if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.ModsButtonStyle.SHRINK) { buttons.add(modsButtonIndex, new ModMenuButtonWidget(screen.width / 2 + 2, buttonsY + spacing * 2, 98, 20, getModsButtonText(), screen)); - } else if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.ModsButtonStyle.FABRIC_ICON) { + } else if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.ModsButtonStyle.ICON) { buttons.add(modsButtonIndex, new ModMenuTexturedButtonWidget(screen.width / 2 + 104, buttonsY + spacing * 2, 20, 20, 0, 0, FABRIC_ICON_BUTTON_LOCATION, 32, 64, button -> MinecraftClient.getInstance().openScreen(new ModsScreen(screen)), getModsButtonText())); } } @@ -92,7 +92,7 @@ private static void afterGameMenuScreenInit(Screen screen) { if (modsButtonIndex != -1) { if (style == ModMenuConfig.ModsButtonStyle.CLASSIC) { buttons.add(modsButtonIndex, new ModMenuButtonWidget(screen.width / 2 - 102, buttonsY + spacing * 3 - (spacing / 2), 204, 20, getModsButtonText(), screen)); - } else if (style == ModMenuConfig.ModsButtonStyle.FABRIC_ICON) { + } else if (style == ModMenuConfig.ModsButtonStyle.ICON) { buttons.add(modsButtonIndex, new ModMenuTexturedButtonWidget(screen.width / 2 + 4 + 100 + 2, screen.height / 4 + 72 + -16, 20, 20, 0, 0, FABRIC_ICON_BUTTON_LOCATION, 32, 64, button -> MinecraftClient.getInstance().openScreen(new ModsScreen(screen)), getModsButtonText())); } } @@ -114,7 +114,7 @@ private static void shiftButtons(AbstractButtonWidget button, boolean shiftUp, i private static Text getModsButtonText() { TranslatableText modsText = new TranslatableText("modmenu.title"); - if (ModMenuConfig.MOD_COUNT_LOCATION.getValue().isOnModsButton() && ModMenuConfig.MODS_BUTTON_STYLE.getValue() != ModMenuConfig.ModsButtonStyle.FABRIC_ICON) { + if (ModMenuConfig.MOD_COUNT_LOCATION.getValue().isOnModsButton() && ModMenuConfig.MODS_BUTTON_STYLE.getValue() != ModMenuConfig.ModsButtonStyle.ICON) { if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.ModsButtonStyle.SHRINK) { modsText.append(new LiteralText(" ")).append(new TranslatableText("modmenu.loaded.short", ModMenu.getDisplayedModCount())); } else { diff --git a/src/main/resources/assets/modmenu/textures/gui/mods_button.png b/src/main/resources/assets/modmenu/textures/gui/mods_button.png index 89551ff23..fcda8de80 100644 Binary files a/src/main/resources/assets/modmenu/textures/gui/mods_button.png and b/src/main/resources/assets/modmenu/textures/gui/mods_button.png differ diff --git a/src/main/resources/assets/modmenu/textures/gui/mods_button_alt.png b/src/main/resources/assets/modmenu/textures/gui/mods_button_alt.png index 7dfe5085a..3ebfcc466 100644 Binary files a/src/main/resources/assets/modmenu/textures/gui/mods_button_alt.png and b/src/main/resources/assets/modmenu/textures/gui/mods_button_alt.png differ diff --git a/src/main/resources/assets/modmenu/textures/gui/mods_button_alt3.png b/src/main/resources/assets/modmenu/textures/gui/mods_button_alt3.png new file mode 100644 index 000000000..7dfe5085a Binary files /dev/null and b/src/main/resources/assets/modmenu/textures/gui/mods_button_alt3.png differ