Support 1.19.3, for real this time

Author: magicus

src/main/java/se/icus/mag/modsettings/LegacyApiWrapper.java

@@ -15,21 +15,21 @@ public LegacyApiWrapper(io.github.prospector.modmenu.api.ModMenuApi legacyApi) {
 
   @Override
   public ConfigScreenFactory<?> getModConfigScreenFactory() {
-    return new LegacyScreenFactory(legacyApi.getModConfigScreenFactory());
+    return new LegacyScreenFactory<>(legacyApi.getModConfigScreenFactory());
   }
 
   @Override
   public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
     Map<String, io.github.prospector.modmenu.api.ConfigScreenFactory<?>> legacyMap = legacyApi.getProvidedConfigScreenFactories();
 
     return legacyMap.keySet().stream().collect(Collectors.toMap(id -> id,
-        id -> new LegacyScreenFactory(legacyMap.get(id))));
+        id -> new LegacyScreenFactory<>(legacyMap.get(id))));
   }
 
   public static class LegacyScreenFactory<S extends Screen> implements ConfigScreenFactory<S> {
     private io.github.prospector.modmenu.api.ConfigScreenFactory<S> legcayFactory;
 
-    public LegacyScreenFactory(io.github.prospector.modmenu.api.ConfigScreenFactory legcayFactory) {
+    public LegacyScreenFactory(io.github.prospector.modmenu.api.ConfigScreenFactory<S> legcayFactory) {
       this.legcayFactory = legcayFactory;
     }
 

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

@@ -0,0 +1,10 @@
+package se.icus.mag.modsettings.gui;
+
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.text.Text;
+
+public class Button extends ButtonWidget {
+    public Button(int x, int y, int width, int height, Text message, PressAction onPress) {
+        super(x, y, width, height, message, onPress, DEFAULT_NARRATION_SUPPLIER);
+    }
+}

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

@@ -52,21 +52,21 @@ private static void injectModSettingsButton(Screen screen, int fullButtonWidth,
         if (shortenModMenu) {
             // If we find a wide ModMenu button, shorten it and fit in our button on the same row
             savedButton.setWidth(HALF_BUTTON_WIDTH);
-            savedButton.x = screen.width / 2 + halfButtonSpacer;
+            savedButton.setX(screen.width / 2 + halfButtonSpacer);
 
             ClickableWidget msbutton = new ModSettingsButton(screen.width / 2 - fullButtonWidth / 2,
-                savedButton.y, HALF_BUTTON_WIDTH, BUTTON_HEIGHT, screen);
+                savedButton.getY(), HALF_BUTTON_WIDTH, BUTTON_HEIGHT, screen);
             buttons.add(msbutton);
         } else {
             if (savedButton == null) {
                 // There is no "Options..." button. Just grab an arbitrary button
                 savedButton = buttons.get(0);
             }
             // Shift all buttons starting at "Options..." down
-            int optionsY = savedButton.y;
+            int optionsY = savedButton.getY();
             for (ClickableWidget button : buttons) {
-                if (button.y >= optionsY) {
-                    button.y += BUTTON_VERICAL_SPACING;
+                if (button.getY() >= optionsY) {
+                    button.setY(button.getY() + BUTTON_VERICAL_SPACING);
                 }
             }
 
@@ -83,7 +83,7 @@ private static boolean buttonHasText(ClickableWidget button, String translationK
             mutableText.getContent().equals(new TranslatableTextContent(translationKey));
     }
 
-    public static class ModSettingsButton extends ButtonWidget {
+    public static class ModSettingsButton extends Button {
         public ModSettingsButton(int x, int y, int width, int height, Screen screen) {
             super(x, y, width, height, Text.translatable("modsettings.button.title"),
                     button -> MinecraftClient.getInstance().setScreen(new ModSettingsScreen(screen)));

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

@@ -39,10 +39,10 @@ public class ModEntry extends Entry {
         final List<ButtonWidget> buttons;
 
         public ModEntry(ModSettingsScreen.ModSettingsOption mod1, ModSettingsScreen.ModSettingsOption mod2) {
-            ButtonWidget leftButton = new ButtonWidget(ModListWidget.this.width / 2 - 155, 0, 150, BUTTON_HEIGHT, Text.of(mod1.modName()),
+            ButtonWidget leftButton = new Button(ModListWidget.this.width / 2 - 155, 0, 150, BUTTON_HEIGHT, Text.of(mod1.modName()),
                     button -> client.setScreen(mod1.configScreen()));
             if (mod2 != null) {
-                ButtonWidget rightButton = new ButtonWidget(ModListWidget.this.width / 2 - 155 + 160, 0, 150, BUTTON_HEIGHT, Text.of(mod2.modName()),
+                ButtonWidget rightButton = new Button(ModListWidget.this.width / 2 - 155 + 160, 0, 150, BUTTON_HEIGHT, Text.of(mod2.modName()),
                         button -> client.setScreen(mod2.configScreen()));
                 buttons = ImmutableList.of(leftButton, rightButton);
             } else {
@@ -63,7 +63,7 @@ public List<? extends Element> children() {
         @Override
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             buttons.forEach(button -> {
-                button.y = y;
+                button.setY(y);
                 button.render(matrices, mouseX, mouseY, tickDelta);
             });
         }

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

@@ -37,7 +37,7 @@ protected void init() {
 		this.list.addAll(getAllModConfigOptions());
 
 		this.addSelectableChild(this.list);
-		this.addDrawableChild(new ButtonWidget(this.width / 2 - FULL_BUTTON_WIDTH / 2, this.height - 27,
+		this.addDrawableChild(new Button(this.width / 2 - FULL_BUTTON_WIDTH / 2, this.height - 27,
 				FULL_BUTTON_WIDTH, BUTTON_HEIGHT, ScreenTexts.DONE,
 				button -> this.client.setScreen(this.previous)));
 		initIsProcessing = false;