Handle the new GridWidget in the pause menu properly

Author: magicus

src/main/java/se/icus/mag/modsettings/gui/MenuScreensChanger.java

@@ -1,17 +1,19 @@
 package se.icus.mag.modsettings.gui;
 
+import java.util.Optional;
 import net.fabricmc.fabric.api.client.screen.v1.Screens;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.GridWidget;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
 
 import java.util.List;
+import se.icus.mag.modsettings.mixin.GridWidgetAccessor;
 
 public abstract class MenuScreensChanger {
     private static final int TITLE_FULL_BUTTON_WIDTH = 200;
@@ -21,16 +23,20 @@ public abstract class MenuScreensChanger {
     private static final int BUTTON_VERICAL_SPACING = 24;
 
     public static void postTitleScreenInit(TitleScreen screen) {
-        injectModSettingsButton(screen, TITLE_FULL_BUTTON_WIDTH, 2,  BUTTON_VERICAL_SPACING / 2);
+        List<ClickableWidget> buttons = Screens.getButtons(screen);
+        injectModSettingsButton(screen, buttons, TITLE_FULL_BUTTON_WIDTH, 2,  BUTTON_VERICAL_SPACING / 2);
     }
 
     public static void postGameMenuScreenInit(GameMenuScreen screen) {
-        injectModSettingsButton(screen, INGAME_FULL_BUTTON_WIDTH, 4,  0);
+        Optional<ClickableWidget> gridWidgetOpt = Screens.getButtons(screen).stream().filter(w -> w instanceof GridWidget).findFirst();
+        if (gridWidgetOpt.isEmpty()) return;
+
+        List<ClickableWidget> buttons = ((GridWidgetAccessor) gridWidgetOpt.get()).getChildren();
+        injectModSettingsButton(screen, buttons, INGAME_FULL_BUTTON_WIDTH, 4,  0);
     }
 
-    private static void injectModSettingsButton(Screen screen, int fullButtonWidth,
+    private static void injectModSettingsButton(Screen screen, List<ClickableWidget> buttons, int fullButtonWidth,
         int halfButtonSpacer, int verticalOffset) {
-        List<ClickableWidget> buttons = Screens.getButtons(screen);
         boolean shortenModMenu = false;
         ClickableWidget savedButton = null;
 

src/main/java/se/icus/mag/modsettings/mixin/GridWidgetAccessor.java

@@ -0,0 +1,13 @@
+package se.icus.mag.modsettings.mixin;
+
+import java.util.List;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.GridWidget;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(GridWidget.class)
+public interface GridWidgetAccessor {
+	@Accessor
+	List<ClickableWidget> getChildren();
+}

src/main/resources/modsettings.mixins.json

@@ -4,6 +4,7 @@
   "package": "se.icus.mag.modsettings.mixin",
   "compatibilityLevel": "JAVA_16",
   "client": [
+    "GridWidgetAccessor",
     "ScreenMixin"
   ],
   "injectors": {