Adapt Mod Menu button for 26.2 Pre-Release 2

gradle.properties

@@ -4,9 +4,9 @@ org.gradle.parallel=true
 maven_group=com.terraformersmc
 archive_name=modmenu
 
-minecraft_version=26.2-snapshot-7
+minecraft_version=26.2-pre-2
 loader_version=0.19.2
-fabric_version=0.148.3+26.2
+fabric_version=0.150.1+26.2
 text_placeholder_api_version=3.0.0+26.1
 quilt_loader_version=0.30.0-beta.7
 
@@ -21,7 +21,7 @@ default_release_type=alpha
 # Modrinth Metadata
 modrinth_slug=modmenu
 modrinth_id=mOgUt4GM
-modrinth_game_versions=26.2-snapshot-6
+modrinth_game_versions=26.2-pre-2
 modrinth_mod_loaders=fabric, quilt
 modrinth_required_dependencies=fabric-api, placeholder-api
 

src/main/java/com/terraformersmc/modmenu/ModMenu.java

@@ -250,7 +250,7 @@ public static Component createModsButtonText(boolean title) {
                 gameMenuStyle == ModMenuConfig.GameMenuButtonStyle.ICON;
         var isShort = title ?
                 titleStyle == ModMenuConfig.TitleMenuButtonStyle.SHRINK :
-                gameMenuStyle == ModMenuConfig.GameMenuButtonStyle.REPLACE;
+                gameMenuStyle == ModMenuConfig.GameMenuButtonStyle.ICON;
         MutableComponent modsText = ModMenuScreenTexts.TITLE.copy();
         if (ModMenuConfig.MOD_COUNT_LOCATION.getValue().isOnModsButton() && !isIcon) {
             String count = ModMenu.getDisplayedModCount();

src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java

@@ -22,8 +22,8 @@ public class ModMenuConfig {
     public static final BooleanConfigOption COUNT_LIBRARIES = new BooleanConfigOption("count_libraries", true);
     public static final BooleanConfigOption COMPACT_LIST = new BooleanConfigOption("compact_list", false);
     public static final BooleanConfigOption COUNT_CHILDREN = new BooleanConfigOption("count_children", true);
-    public static final EnumConfigOption<TitleMenuButtonStyle> MODS_BUTTON_STYLE = new EnumConfigOption<>("mods_button_style", TitleMenuButtonStyle.CLASSIC);
-    public static final EnumConfigOption<GameMenuButtonStyle> GAME_MENU_BUTTON_STYLE = new EnumConfigOption<>("game_menu_button_style", GameMenuButtonStyle.REPLACE);
+    public static final EnumConfigOption<TitleMenuButtonStyle> MODS_BUTTON_STYLE = new EnumConfigOption<>("mods_button_style", TitleMenuButtonStyle.ICON);
+    public static final EnumConfigOption<GameMenuButtonStyle> GAME_MENU_BUTTON_STYLE = new EnumConfigOption<>("game_menu_button_style", GameMenuButtonStyle.ICON);
     public static final BooleanConfigOption COUNT_HIDDEN_MODS = new BooleanConfigOption("count_hidden_mods", true);
     public static final EnumConfigOption<ModCountLocation> MOD_COUNT_LOCATION = new EnumConfigOption<>("mod_count_location", ModCountLocation.TITLE_SCREEN);
     public static final BooleanConfigOption HIDE_MOD_LINKS = new BooleanConfigOption("hide_mod_links", false);
@@ -120,6 +120,6 @@ public enum TitleMenuButtonStyle {
     }
 
     public enum GameMenuButtonStyle {
-        @SerializedName(value = "replace", alternate = {"replace_bugs"}) REPLACE, @SerializedName(value = "insert", alternate = {"below_bugs"}) INSERT, ICON
+        @SerializedName(value = "insert", alternate = {"below_bugs"}) INSERT, @SerializedName(value = "icon", alternate = {"replace", "replace_bugs" /*old REPLACE ids*/}) ICON
     }
 }

src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java

@@ -6,8 +6,6 @@
 import com.terraformersmc.modmenu.config.ModMenuConfig;
 import com.terraformersmc.modmenu.gui.ModsScreen;
 import com.terraformersmc.modmenu.gui.widget.ModMenuButtonWidget;
-import com.terraformersmc.modmenu.gui.widget.UpdateCheckerTexturedButtonWidget;
-import com.terraformersmc.modmenu.mixin.AccessorAbstractWidget;
 import com.terraformersmc.modmenu.util.UpdateCheckerUtil;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
@@ -17,7 +15,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.layouts.LayoutElement;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
@@ -113,21 +110,6 @@ private static void afterTitleScreenInit(Screen screen) {
                                     screen
                             )
                     );
-                } else if (ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.ICON) {
-                    buttons.add(modsButtonIndex, new UpdateCheckerTexturedButtonWidget(
-                            screen.width / 2 + 104,
-                            buttonsY,
-                            20,
-                            20,
-                            0,
-                            0,
-                            20,
-                            MODS_BUTTON_TEXTURE,
-                            32,
-                            64,
-                            button -> Minecraft.getInstance().gui.setScreen(new ModsScreen(screen)),
-                            ModMenuApi.createModsButtonText()
-                    ));
                 }
             }
         }
@@ -150,14 +132,6 @@ public static boolean buttonHasText(LayoutElement widget, String... translationK
         }
     }
 
-    public static boolean buttonHasTooltip(LayoutElement widget, Tooltip tooltip) {
-        if (widget instanceof Button && widget instanceof AccessorAbstractWidget accessor) {
-            return tooltip == accessor.getTooltip().get();
-        } else {
-            return false;
-        }
-    }
-
     public static void shiftButtons(LayoutElement widget, boolean shiftUp, int spacing) {
         if (shiftUp) {
             widget.setY(widget.getY() - spacing / 2);

src/main/java/com/terraformersmc/modmenu/gui/widget/LegacyTexturedButtonWidget.java

@@ -5,6 +5,7 @@
 import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
+import net.minecraft.util.ARGB;
 
 public class LegacyTexturedButtonWidget extends ImageButton {
     private final int u;
@@ -61,7 +62,8 @@ public void extractContents(GuiGraphicsExtractor context, int mouseX, int mouseY
                 this.width,
                 this.height,
                 this.textureWidth,
-                this.textureHeight
+                this.textureHeight,
+                ARGB.color(getAlpha(), 0xffffff)
         );
     }
 

src/main/java/com/terraformersmc/modmenu/gui/widget/ModMenuButtonWidget.java

@@ -24,7 +24,7 @@ public ModMenuButtonWidget(int x, int y, int width, int height, net.minecraft.ne
     @Override
     public void extractContents(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
         super.extractContents(drawContext, mouseX, mouseY, delta);
-        if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable()) {
+        if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable() && getAlpha() >= 1.0f) {
             UpdateAvailableBadge.renderBadge(
                     drawContext,
                     this.width + this.getX() - 13,

src/main/java/com/terraformersmc/modmenu/gui/widget/UpdateCheckerTexturedButtonWidget.java

@@ -4,6 +4,7 @@
 import com.terraformersmc.modmenu.config.ModMenuConfig;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.resources.Identifier;
 
 public class UpdateCheckerTexturedButtonWidget extends LegacyTexturedButtonWidget {
@@ -22,12 +23,13 @@ public UpdateCheckerTexturedButtonWidget(
             net.minecraft.network.chat.Component message
     ) {
         super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message);
+        setTooltip(Tooltip.create(message));
     }
 
     @Override
     public void extractContents(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
         super.extractContents(drawContext, mouseX, mouseY, delta);
-        if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable()) {
+        if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable() && getAlpha() >= 1.0f) {
             UpdateAvailableBadge.renderBadge(drawContext, this.getX() + this.width - 5, this.getY() - 3);
         }
     }

src/main/java/com/terraformersmc/modmenu/mixin/MixinPauseScreen.java

@@ -1,119 +1,71 @@
 package com.terraformersmc.modmenu.mixin;
 
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import com.terraformersmc.modmenu.config.ModMenuConfig;
 import com.terraformersmc.modmenu.event.ModMenuEventHandler;
 import com.terraformersmc.modmenu.gui.ModsScreen;
 import com.terraformersmc.modmenu.gui.widget.ModMenuButtonWidget;
 import com.terraformersmc.modmenu.gui.widget.UpdateCheckerTexturedButtonWidget;
-import net.fabricmc.fabric.api.client.screen.v1.Screens;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Tooltip;
-import net.minecraft.client.gui.layouts.LayoutElement;
+import net.minecraft.client.gui.layouts.GridLayout;
+import net.minecraft.client.gui.layouts.LinearLayout;
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PauseScreen.class)
 public abstract class MixinPauseScreen extends Screen {
     protected MixinPauseScreen(Component title) {
         super(title);
     }
 
-    @Accessor
-    private static Tooltip getCUSTOM_OPTIONS_TOOLTIP() {
-        throw new AssertionError();
-    }
-
-    @Inject(method = "createPauseMenu", at = @At("TAIL"))
-    private void onCreatePauseMenu(CallbackInfo ci) {
-        List<AbstractWidget> buttons = Screens.getWidgets(this);
-
-        if (ModMenuConfig.MODIFY_GAME_MENU.getValue()) {
-            int modsButtonIndex = -1;
-            final int spacing = 24;
-            int buttonsY = this.height / 4 + 8;
-            ModMenuConfig.GameMenuButtonStyle style = ModMenuConfig.GAME_MENU_BUTTON_STYLE.getValue();
-            int vanillaButtonsY = this.height / 4 + 72 - 16 + 1;
-            final int fullWidthButton = 204;
-            for (int i = 0; i < buttons.size(); i++) {
-                LayoutElement widget = buttons.get(i);
-                if (style == ModMenuConfig.GameMenuButtonStyle.INSERT) {
-                    if (!(widget instanceof AbstractWidget button) || button.visible) {
-                        ModMenuEventHandler.shiftButtons(widget, modsButtonIndex == -1 || ModMenuEventHandler.buttonHasText(widget, "menu.reportBugs", "menu.server_links") || ModMenuEventHandler.buttonHasTooltip(widget, getCUSTOM_OPTIONS_TOOLTIP()), spacing);
-                        if (modsButtonIndex == -1) {
-                            buttonsY = widget.getY();
-                        }
-                    }
-                }
+    @Definition(id = "integratedServer", local = @Local(type = IntegratedServer.class, name = "integratedServer"))
+    @Expression("integratedServer = ?")
+    @Inject(method = "createPauseMenu", at = @At("MIXINEXTRAS:EXPRESSION"))
+    private void insertModMenuIconButton(CallbackInfo ci, @Local(name = "iconButtonRow") LinearLayout iconButtonRow) {
+        if (!ModMenuConfig.MODIFY_GAME_MENU.getValue()) return;
+        ModMenuConfig.GameMenuButtonStyle style = ModMenuConfig.GAME_MENU_BUTTON_STYLE.getValue();
+        if (style == ModMenuConfig.GameMenuButtonStyle.ICON) {
+            iconButtonRow.addChild(new UpdateCheckerTexturedButtonWidget(
+                    0,
+                    0,
+                    20,
+                    20,
+                    0,
+                    0,
+                    20,
+                    ModMenuEventHandler.MODS_BUTTON_TEXTURE,
+                    32,
+                    64,
+                    _ -> Minecraft.getInstance().gui.setScreen(new ModsScreen(this)),
+                    ModMenuApi.createModsButtonText()
+            ));
+        }
 
-                boolean isShortFeedback = ModMenuEventHandler.buttonHasText(widget, "menu.feedback");
-                boolean isLongFeedback = ModMenuEventHandler.buttonHasText(widget, "menu.sendFeedback");
-                if (isShortFeedback || isLongFeedback) {
-                    modsButtonIndex = i + 1;
-                    vanillaButtonsY = widget.getY();
-                    if (style == ModMenuConfig.GameMenuButtonStyle.REPLACE) {
-                        buttons.set(i, new ModMenuButtonWidget(
-                                widget.getX(),
-                                widget.getY(),
-                                isShortFeedback ? widget.getWidth() : fullWidthButton,
-                                widget.getHeight(),
-                                ModMenuApi.createModsButtonText(),
-                                this
-                        ));
-                        buttons.stream()
-                                .filter(w -> ModMenuEventHandler.buttonHasText(w, "menu.reportBugs"))
-                                .forEach(w -> {
-                                    if (w instanceof AbstractWidget cw) {
-                                        cw.visible = false;
-                                        cw.active = false;
-                                    }
-                                });
-                    } else {
-                        modsButtonIndex = i + 1;
-                        if (!(widget instanceof AbstractWidget button) || button.visible) {
-                            buttonsY = widget.getY();
-                        }
-                    }
-                }
-            }
+    }
 
-            if (modsButtonIndex != -1) {
-                if (style == ModMenuConfig.GameMenuButtonStyle.INSERT) {
-                    buttons.add(modsButtonIndex, new ModMenuButtonWidget(
-                            this.width / 2 - 102,
-                            buttonsY + spacing,
-                            fullWidthButton,
-                            20,
-                            ModMenuApi.createModsButtonText(),
-                            this
-                    ));
-                } else if (style == ModMenuConfig.GameMenuButtonStyle.ICON) {
-                    buttons.add(modsButtonIndex, new UpdateCheckerTexturedButtonWidget(
-                            this.width / 2 + 4 + 100 + 2,
-                            vanillaButtonsY,
-                            20,
-                            20,
-                            0,
-                            0,
-                            20,
-                            ModMenuEventHandler.MODS_BUTTON_TEXTURE,
-                            32,
-                            64,
-                            button -> Minecraft.getInstance().gui.setScreen(new ModsScreen(this)),
-                            ModMenuApi.createModsButtonText()
-                    ));
-                }
-            }
+    @Inject(method = "createPauseMenu", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/layouts/GridLayout$RowHelper;addChild(Lnet/minecraft/client/gui/layouts/LayoutElement;ILnet/minecraft/client/gui/layouts/LayoutSettings;)Lnet/minecraft/client/gui/layouts/LayoutElement;", ordinal = 1, shift = At.Shift.AFTER))
+    private void insertModMenuFullButton(CallbackInfo ci, @Local(name = "helper") GridLayout.RowHelper helper) {
+        if (!ModMenuConfig.MODIFY_GAME_MENU.getValue()) return;
+        ModMenuConfig.GameMenuButtonStyle style = ModMenuConfig.GAME_MENU_BUTTON_STYLE.getValue();
+        if (style == ModMenuConfig.GameMenuButtonStyle.INSERT) {
+            final int fullWidthButton = 204; // PauseScreen.BUTTON_WIDTH_FULL
+            helper.addChild(new ModMenuButtonWidget(
+                    0,
+                    0,
+                    fullWidthButton,
+                    20,
+                    ModMenuApi.createModsButtonText(),
+                    this
+            ), 2);
         }
     }
 }