add back adjacent title screen mods button

OrnitheMC · Jan 29, 2024 · 98ab02f · 98ab02f
1 parent 1537d9b
commit 98ab02f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/com/terraformersmc/modmenu/ModMenu.java b/src/main/java/com/terraformersmc/modmenu/ModMenu.java
@@ -11,7 +11,6 @@
 import com.terraformersmc.modmenu.config.ModMenuConfig.TitleMenuButtonStyle;
 import com.terraformersmc.modmenu.config.ModMenuConfigManager;
 import com.terraformersmc.modmenu.event.ModMenuEventHandler;
-import com.terraformersmc.modmenu.util.GlUtil;
 import com.terraformersmc.modmenu.util.ModrinthUtil;
 import com.terraformersmc.modmenu.util.TranslationUtil;
 import com.terraformersmc.modmenu.util.mod.Mod;
@@ -159,7 +158,7 @@ public static String createModsButtonText(boolean title) {
 		TitleMenuButtonStyle titleStyle = ModMenuConfig.MODS_BUTTON_STYLE.getValue();
 		GameMenuButtonStyle gameMenuStyle = ModMenuConfig.GAME_MENU_BUTTON_STYLE.getValue();
 		boolean isIcon = title ? titleStyle == ModMenuConfig.TitleMenuButtonStyle.ICON : gameMenuStyle == ModMenuConfig.GameMenuButtonStyle.ICON;
-		boolean isShort = /*title ? titleStyle == ModMenuConfig.TitleMenuButtonStyle.SHRINK :*/ false;
+		boolean isShort = title ? titleStyle == ModMenuConfig.TitleMenuButtonStyle.SHRINK : false;
 		String modsText = I18n.translate("modmenu.title");
 		if (ModMenuConfig.MOD_COUNT_LOCATION.getValue().isOnModsButton() && !isIcon) {
 			String count = ModMenu.getDisplayedModCount();

diff --git a/src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java b/src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java
@@ -111,6 +111,8 @@ public boolean isOnModsButton() {
 	public enum TitleMenuButtonStyle {
 		@SerializedName("classic")
 		CLASSIC(),
+		@SerializedName("shrink")
+		SHRINK(),
 		@SerializedName("icon")
 		ICON();
 	}

diff --git a/src/main/java/com/terraformersmc/modmenu/mixin/MixinTitleScreen.java b/src/main/java/com/terraformersmc/modmenu/mixin/MixinTitleScreen.java
@@ -48,6 +48,9 @@ private void onInit(CallbackInfo ci) {
 					}
 				}
 				if (button.id == TEXTURE_PACKS) {
+					if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.SHRINK) {
+						((AccessorButtonWidget) button).setWidth(98);
+					}
 					modsButtonIndex = i + 1;
 					if (button.visible) {
 						buttonsY = button.y;
@@ -57,6 +60,8 @@ private void onInit(CallbackInfo ci) {
 			if (modsButtonIndex != -1) {
 				if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.CLASSIC) {
 					this.buttons.add(new ModMenuButtonWidget(MODS, this.width / 2 - 100, buttonsY + spacing, 200, 20, ModMenuApi.createModsButtonText()));
+				} else if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.SHRINK) {
+					this.buttons.add(new ModMenuButtonWidget(MODS, this.width / 2 + 2, buttonsY, 98, 20, ModMenuApi.createModsButtonText()));
 				} else if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.ICON) {
 					this.buttons.add(new UpdateCheckerTexturedButtonWidget(MODS, this.width / 2 + 104, buttonsY, 20, 20, 0, 0, 20, FABRIC_ICON_BUTTON_LOCATION, 32, 64));
 				}

diff --git a/src/main/resources/assets/modmenu/lang/en_US.lang b/src/main/resources/assets/modmenu/lang/en_US.lang
@@ -129,6 +129,7 @@ option.modmenu.easter_eggs.true=Enabled
 option.modmenu.easter_eggs.false=Disabled
 option.modmenu.mods_button_style=Title Screen
 option.modmenu.mods_button_style.classic=Below Texture Packs
+option.modmenu.mods_button_style.shrink=Adjacent
 option.modmenu.mods_button_style.icon=Icon
 option.modmenu.game_menu_button_style=Game Menu
 option.modmenu.game_menu_button_style.below_achievements=Below Achievements