Support 1.19

Author: magicus

README.md

@@ -17,7 +17,7 @@ can directly go to the configuration screen with just a single button, and
 unless you have an extreme amount of mods installed, they are all likely to fit
 on a single page.
 
-This mod requires Minecraft 1.17.1, 1.18.1 or 1.18.2 and the Fabric loader.
+This mod requires Minecraft 1.17.1 - 1.19 and the Fabric loader.
 
 ## Screenshot
 
@@ -48,13 +48,13 @@ https://modrinth.com/mod/fabric-api).
 
 The latest version is 1.1.0.
 
-Direct download links for Minecraft 1.18.1-1.18.2:
+Direct download links for Minecraft 1.19:
 
-* Download from GitHub: [modsettings-1.1.0+1.18.1.jar](
-https://github.com/magicus/ModSettings/releases/download/v1.1.0%2B1.18.1/modsettings-1.1.0+1.18.1.jar)
-* Download from Modrinth: [modsettings-1.1.0+1.18.1.jar](
-https://cdn.modrinth.com/data/mfDfQvcJ/versions/1.1.0+1.18.1/modsettings-1.1.0%2B1.18.1.jar)
-* Download from CurseForge: [modsettings-1.1.0+1.18.1.jar](
+* Download from GitHub: [modsettings-1.1.0+1.19.jar](
+https://github.com/magicus/ModSettings/releases/download/v1.1.0%2B1.19/modsettings-1.1.0+1.19.jar)
+* Download from Modrinth: [modsettings-1.1.0+1.19.jar](
+https://cdn.modrinth.com/data/mfDfQvcJ/versions/1.1.0+1.19/modsettings-1.1.0%2B1.19.jar)
+* Download from CurseForge: [modsettings-1.1.0+1.19.jar](
 https://www.curseforge.com/minecraft/mc-mods/mod-settings/download/3757415)
 
 For all other Minecraft releases, check these download sites:
@@ -72,10 +72,6 @@ mod.](https://lmgtfy.app/?q=how+to+install+minecraft+fabric+mods)
 
 Do you have any problems with the mod? Please open an issue here on Github.
 
-Currently only Minecraft versions 1.17.1 to 1.18.2 are supported, but it would
-probably be trivial to add support for other versions. If you want support for
-another version, please open an issue and state the requested version.
-
 ## Known Incompatibilities
 
 The mod [Content Creator Integration](
@@ -86,4 +82,4 @@ if you do not click the CCI button. The mod hardcodes references to
 implementation details of Mod Menu itself so the bug does not manifest using Mod
 Menu. This [will be fixed](
 https://github.com/iChun/ContentCreatorIntegration-IssuesAndDocumentation/issues/82)
-in future versions.
+in future versions of CCI.

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.10-SNAPSHOT'
+	id 'fabric-loom' version '0.12-SNAPSHOT'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17

gradle.properties

@@ -2,16 +2,16 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-# check these on https://fabricmc.net/versions.html
-minecraft_version=1.18.1
-yarn_mappings=1.18.1+build.22
-loader_version=0.12.12
+# check these on https://fabricmc.net/develop
+minecraft_version=1.19
+yarn_mappings=1.19+build.4
+loader_version=0.14.8
 
 # Mod Properties
 project_name=Mod Settings
-mod_version=1.1.0+1.18.1
+mod_version=1.1.0+1.19
 maven_group=se.icus.mag
 archives_base_name=modsettings
 
 # Fabric api
-fabric_version=0.46.1+1.18
+fabric_version=0.57.0+1.19

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

@@ -7,8 +7,9 @@
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.text.TranslatableTextContent;
 
 import java.util.List;
 
@@ -78,12 +79,13 @@ private static void injectModSettingsButton(Screen screen, int fullButtonWidth,
 
     private static boolean buttonHasText(ClickableWidget button, String translationKey) {
         Text text = button.getMessage();
-        return text instanceof TranslatableText && ((TranslatableText) text).getKey().equals(translationKey);
+        return text instanceof MutableText mutableText &&
+            mutableText.getContent().equals(new TranslatableTextContent(translationKey));
     }
 
     public static class ModSettingsButton extends ButtonWidget {
         public ModSettingsButton(int x, int y, int width, int height, Screen screen) {
-            super(x, y, width, height, new TranslatableText("modsettings.button.title"),
+            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

@@ -0,0 +1,74 @@
+package se.icus.mag.modsettings.gui;
+
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+
+import java.util.List;
+
+public class ModListWidget extends ElementListWidget<ModListWidget.Entry> {
+    private static final int BUTTON_HEIGHT = 20;
+
+    public ModListWidget(MinecraftClient client, int width, int height, int top, int bottom, int itemHeight) {
+        super(client, width, height, top, bottom, itemHeight);
+        this.centerListVertically = false;
+    }
+
+    @Override
+    public int getRowWidth() {
+        return 400;
+    }
+
+    @Override
+    protected int getScrollbarPositionX() {
+        return super.getScrollbarPositionX() + 32;
+    }
+
+    public void addAll(ModSettingsScreen.ModSettingsOption[] options) {
+        for (int i = 0; i < options.length; i += 2) {
+            addEntry(new ModEntry(options[i], i < options.length - 1 ? options[i + 1] : null));
+        }
+    }
+
+    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()),
+                    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()),
+                        button -> client.setScreen(mod2.configScreen()));
+                buttons = ImmutableList.of(leftButton, rightButton);
+            } else {
+                buttons = ImmutableList.of(leftButton);
+            }
+        }
+
+        @Override
+        public List<? extends Selectable> selectableChildren() {
+            return buttons;
+        }
+
+        @Override
+        public List<? extends Element> children() {
+            return buttons;
+        }
+
+        @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.render(matrices, mouseX, mouseY, tickDelta);
+            });
+        }
+    }
+
+    public static abstract class Entry extends ElementListWidget.Entry<Entry> {
+    }
+}

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

@@ -1,15 +1,10 @@
 package se.icus.mag.modsettings.gui;
 
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
-import net.minecraft.client.gui.widget.ButtonListWidget;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.option.GameOptions;
-import net.minecraft.client.option.Option;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import se.icus.mag.modsettings.Main;
 import se.icus.mag.modsettings.ModRegistry;
 
@@ -22,11 +17,11 @@ public class ModSettingsScreen extends Screen {
 	private static final int TITLE_COLOR = 0xffffff;
 
 	private final Screen previous;
-	private ButtonListWidget list;
+	private ModListWidget list;
 	private boolean initIsProcessing;
 
 	public ModSettingsScreen(Screen previous) {
-		super(new TranslatableText("modsettings.screen.title"));
+		super(Text.translatable("modsettings.screen.title"));
 		this.previous = previous;
 	}
 
@@ -38,7 +33,7 @@ protected void init() {
 		initIsProcessing = true;
 
 		// Put list between 32 pixels from top and bottom
-		this.list = new ButtonListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+		this.list = new ModListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
 		this.list.addAll(getAllModConfigOptions());
 
 		this.addSelectableChild(this.list);
@@ -48,8 +43,8 @@ protected void init() {
 		initIsProcessing = false;
 	}
 
-	private Option[] getAllModConfigOptions() {
-		List<Option> options = new LinkedList<>();
+	private ModSettingsOption[] getAllModConfigOptions() {
+		List<ModSettingsOption> options = new LinkedList<>();
 		for (String modId : ModRegistry.getInstance().getAllModIds()) {
 			try {
 				Screen configScreen = ModRegistry.getInstance().getConfigScreen(modId, this);
@@ -60,7 +55,7 @@ private Option[] getAllModConfigOptions() {
 				Main.LOGGER.error("Error creating Settings screen from mod " + modId, e);
 			}
 		}
-		return options.toArray(new Option[0]);
+		return options.toArray(new ModSettingsOption[0]);
 	}
 
 	@Override
@@ -72,24 +67,10 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
 	}
 
 	@Override
-	public void onClose() {
+	public void close() {
 		this.client.setScreen(this.previous);
 	}
 
-	public class ModSettingsOption extends Option {
-		private final String modName;
-		private final Screen configScreen;
-
-		public ModSettingsOption(String modId, String modName, Screen configScreen) {
-			super(modId);
-			this.modName = modName;
-			this.configScreen = configScreen;
-		}
-
-		@Override
-		public ClickableWidget createButton(GameOptions options, int x, int y, int width) {
-			return new ButtonWidget(x, y, width, BUTTON_HEIGHT, Text.of(this.modName),
-					button -> client.setScreen(this.configScreen));
-		}
+	public record ModSettingsOption(String modId, String modName, Screen configScreen)  {
 	}
 }

src/main/resources/fabric.mod.json

@@ -33,6 +33,6 @@
     "fabricloader": ">=0.7.4",
     "fabric-screen-api-v1": ">=1.0.4",
     "fabric-key-binding-api-v1": ">=1.0.1",
-    "minecraft": "1.18.x"
+    "minecraft": "~1.19"
   }
 }