Backport to mc1.20.1

Author: NotRyken

.github/workflows/check-build.yml

@@ -18,7 +18,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [21]
+        java: [17]
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -39,7 +39,7 @@ jobs:
       - name: Build
         run: ./gradlew build --stacktrace
       - name: Capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
+        if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
         uses: actions/upload-artifact@v4
         with:
           name: artifacts

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
   release:
     strategy:
       matrix:
-        java: [21]
+        java: [17]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -34,15 +34,15 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: Build
-#        run: ./gradlew build neoforge:publishGithub fabric:publishGithub --stacktrace
-#        run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth fabric:publishGithub fabric:publishModrinth --stacktrace
-        run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth neoforge:publishCurseforge fabric:publishGithub fabric:publishModrinth fabric:publishCurseforge --stacktrace
+#        run: ./gradlew build forge:publishGithub fabric:publishGithub --stacktrace
+#        run: ./gradlew build forge:publishGithub forge:publishModrinth fabric:publishGithub fabric:publishModrinth --stacktrace
+        run: ./gradlew build forge:publishGithub forge:publishModrinth forge:publishCurseforge fabric:publishGithub fabric:publishModrinth fabric:publishCurseforge --stacktrace
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
       - name: Capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
+        if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
         uses: actions/upload-artifact@v4
         with:
           name: artifacts

build.gradle

@@ -1,6 +1,8 @@
 plugins {
     id("fabric-loom") version("${loom_version}") apply(false)
-    id("net.neoforged.moddev") version("${moddev_version}") apply(false)
+    id("net.minecraftforge.gradle") version("${forgegradle_version}") apply(false)
+    id("org.spongepowered.gradle.vanilla") version("${vanillagradle_version}") apply(false)
+    id("org.spongepowered.mixin") version("${mixingradle_version}") apply(false)
     id("org.cadixdev.licenser") version("${licenser_version}") apply(false)
     id("me.modmuss50.mod-publish-plugin") version("${mpp_version}")
     id("org.ajoberstar.grgit.service") version("${grgitservice_version}")
@@ -31,7 +33,8 @@ subprojects {
 
         afterEvaluate {
             publishMods {
-                file = project.name == "fabric" ? remapJar.archiveFile : jar.archiveFile
+                file = project.name == "fabric" ? remapJar.archiveFile : name == "forge"
+                        ? project.file("build/libs/${mod_id}-${name}-${mod_version}.jar") : jar.archiveFile
                 version = mod_version
                 type = me.modmuss50.mpp.ReleaseType.of(release_type)
                 displayName = "v${mod_version}-${capsLoader(project.name)}"

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -25,18 +25,9 @@ repositories {
         }
         filter { includeGroupAndSubgroups("org.spongepowered") }
     }
-    exclusiveContent {
-        forRepositories(
-            maven {
-                name = "ParchmentMC"
-                url = "https://maven.parchmentmc.org"
-            },
-            maven {
-                name = "NeoForge"
-                url = "https://maven.neoforged.net/releases"
-            }
-        )
-        filter { includeGroup("org.parchmentmc.data") }
+    maven {
+        name = "ParchmentMC"
+        url = "https://maven.parchmentmc.org"
     }
     maven {
         name = "Modrinth"
@@ -107,16 +98,16 @@ processResources {
             // Java
             "java_version": java_version,
             "java_versions_fabric_list": asJsonList(java_versions_fabric),
-            "java_versions_neoforge": java_versions_neoforge,
+            "java_versions_forge": java_versions_forge,
             // Minecraft
             "minecraft_versions_fabric_list": asJsonList(minecraft_versions_fabric),
-            "minecraft_versions_neoforge": minecraft_versions_neoforge,
+            "minecraft_versions_forge": minecraft_versions_forge,
             // Fabric
             "fabric_loader_versions_list": asJsonList(fabric_loader_versions),
             "fabric_api_versions_list": asJsonList(fabric_api_versions),
-            // NeoForge
-            "neoforge_loader_versions": neoforge_loader_versions,
-            "neoforge_versions": neoforge_versions,
+            // Forge
+            "forge_loader_versions": forge_loader_versions,
+            "forge_versions": forge_versions,
             // Dependencies
             "modmenu_versions_fabric_list": asJsonList(modmenu_versions_fabric),
     ]

common/build.gradle

@@ -1,22 +1,21 @@
+buildscript {
+    dependencies.add("classpath", "org.spongepowered:vanillagradle:${vanillagradle_version}")
+}
+
 plugins {
     id("multiloader-common")
-    id("net.neoforged.moddev")
+    id("org.spongepowered.gradle.vanilla")
 }
 
 dependencies {
     compileOnly("org.spongepowered:mixin:${mixin_version}")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
 }
 
-neoForge {
-    version = neoforge_version // Shut up
-    neoFormVersion = neoform_version
-    // Automatically enable AccessTransformers if the file exists
-    def at = file("src/main/resources/META-INF/accesstransformer.cfg")
-    if (at.exists()) accessTransformers.from(at.absolutePath)
-    parchment {
-        minecraftVersion = parchment_minecraft_version
-        mappingsVersion = parchment_version
+minecraft {
+    version(minecraft_version)
+    if (file("src/main/resources/${mod_id}.accesswidener").exists()) {
+        accessWideners(file("src/main/resources/${mod_id}.accesswidener"))
     }
 }
 

common/src/main/java/dev/terminalmc/commandkeys/config/Config.java

@@ -41,7 +41,7 @@
  *
  * <p>When a profile is activated it is automatically moved to the start of the
  * list, so the list maintains most-recently-used order and the current active
- * profile can be obtained using {@code getFirst()}.</p>
+ * profile can be obtained using {@code get(0)}.</p>
  *
  * <p>The profile list is guaranteed to contain at least one instance at all
  * times, and at least two if the singleplayer default instance is not also the
@@ -147,19 +147,19 @@ public void setRatelimitTicks(int ticks) {
      * @return the most recently activated {@link Profile}.
      */
     public Profile activeProfile() {
-        return profiles.getFirst();
+        return profiles.get(0);
     }
 
     /**
      * Activates the {@link Profile} at {@code index}, if it is not already
      * active.
      */
     public void activateProfile(int index) {
-        profiles.getFirst().getMacros().forEach((macro) -> {
+        profiles.get(0).getMacros().forEach((macro) -> {
             if (!macro.resumeRepeatingStatus) macro.stopRepeating();
         });
         if (index != 0) {
-            profiles.addFirst(profiles.remove(index));
+            profiles.add(0, profiles.remove(index));
             if (index == spDefault) spDefault = 0;
             else if (index > spDefault) spDefault++;
             if (index == mpDefault) mpDefault = 0;
@@ -355,8 +355,8 @@ public Config deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
             int spDefault;
             int mpDefault;
             if (version == 1) {
-                profiles.addFirst(ctx.deserialize(obj.get("mpDefaultProfile"), Profile.class));
-                profiles.addFirst(ctx.deserialize(obj.get("spDefaultProfile"), Profile.class));
+                profiles.add(0, ctx.deserialize(obj.get("mpDefaultProfile"), Profile.class));
+                profiles.add(0, ctx.deserialize(obj.get("spDefaultProfile"), Profile.class));
                 if (profiles.size() < 2) throw new JsonParseException(
                         "Expected 2 or more profiles, got " + profiles.size());
                 spDefault = 0;

common/src/main/java/dev/terminalmc/commandkeys/config/Macro.java

@@ -224,7 +224,7 @@ public void trigger(@Nullable Keybind trigger) {
             }
             case TYPE -> {
                 if (!messages.isEmpty()) {
-                    CommandKeys.type(messages.getFirst().string);
+                    CommandKeys.type(messages.get(0).string);
                 }
             }
             case CYCLE -> {

common/src/main/java/dev/terminalmc/commandkeys/gui/screen/OptionsScreen.java

@@ -17,36 +17,37 @@
 package dev.terminalmc.commandkeys.gui.screen;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.platform.Window;
 import dev.terminalmc.commandkeys.CommandKeys;
 import dev.terminalmc.commandkeys.config.Config;
+import dev.terminalmc.commandkeys.gui.widget.list.MainOptionList;
 import dev.terminalmc.commandkeys.gui.widget.list.OptionList;
 import dev.terminalmc.commandkeys.gui.widget.list.ProfileOptionList;
-import dev.terminalmc.commandkeys.gui.widget.list.MainOptionList;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.StringWidget;
+import net.minecraft.client.gui.screens.OptionsSubScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.options.OptionsSubScreen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Supplier;
+
 import static dev.terminalmc.commandkeys.util.Localization.localized;
 
 /**
  * Contains one tightly-coupled {@link OptionList}, which is used to display
  * all option control widgets.
  */
 public class OptionsScreen extends OptionsSubScreen {
-    public static final int TOP_MARGIN = 32;
-    public static final int BOTTOM_MARGIN = 32;
-    public static final int LIST_ENTRY_SPACE = 25;
-    public static final int LIST_ENTRY_HEIGHT = 20;
-    public static final int BASE_ROW_WIDTH = Window.BASE_WIDTH;
-    public static final int BASE_LIST_ENTRY_WIDTH = BASE_ROW_WIDTH - 20;
+    public final int listTop = 32;
+    public final Supplier<Integer> listBottom = () -> height - 32;
+    public static final int listItemHeight = 25;
+    public static final int listEntryHeight = 20;
+    public static final int baseRowWidth = 320;
+    public static final int baseListEntryWidth = baseRowWidth - 20;
 
     protected OptionList optionList;
 
@@ -55,13 +56,13 @@ public OptionsScreen(Screen lastScreen, boolean inGame) {
                 inGame ? localized("option", "profile", CommandKeys.profile().getDisplayName())
                         : localized("option", "main"));
         if (inGame) {
-            optionList = new ProfileOptionList(Minecraft.getInstance(), 0, 0, TOP_MARGIN,
-                    LIST_ENTRY_SPACE, BASE_LIST_ENTRY_WIDTH, LIST_ENTRY_HEIGHT,
+            optionList = new ProfileOptionList(Minecraft.getInstance(), 0, 0, listTop, 
+                    listBottom.get(), listItemHeight, baseListEntryWidth, listEntryHeight,
                     CommandKeys.profile());
         }
         else {
-            optionList = new MainOptionList(Minecraft.getInstance(), 0, 0, TOP_MARGIN,
-                    LIST_ENTRY_SPACE, BASE_LIST_ENTRY_WIDTH, LIST_ENTRY_HEIGHT, null);
+            optionList = new MainOptionList(Minecraft.getInstance(), 0, 0, listTop, 
+                    listBottom.get(), listItemHeight, baseListEntryWidth, listEntryHeight, null);
         }
     }
 
@@ -75,11 +76,6 @@ protected void init() {
         reload();
     }
 
-    @Override
-    protected void addOptions() {
-        // Not currently used
-    }
-
     @Override
     public void resize(@NotNull Minecraft mc, int width, int height) {
         super.resize(mc, width, height);
@@ -113,6 +109,7 @@ public boolean mouseReleased(double mouseX, double mouseY, int delta) {
 
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+        renderDirtBackground(graphics);
         super.render(graphics, mouseX, mouseY, delta);
     }
 
@@ -136,21 +133,21 @@ public OptionList reload() {
 
     public OptionList reload(int width, int height) {
         clearWidgets();
-        optionList = optionList.reload(this, width, height - TOP_MARGIN - BOTTOM_MARGIN,
-                optionList.getScrollAmount());
+        optionList = optionList.reload(this, width, listBottom.get() - listTop, 
+                listTop, listBottom.get(), optionList.getScrollAmount());
         addRenderableWidget(optionList);
 
         // Title text
         Font font = Minecraft.getInstance().font;
         addRenderableWidget(new StringWidget(width / 2 - (font.width(title) / 2),
-                Math.max(0, TOP_MARGIN / 2 - font.lineHeight / 2),
+                Math.max(0, listTop / 2 - font.lineHeight / 2),
                 font.width(title), font.lineHeight, title, font).alignLeft());
 
         // Done button
         addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, (button) -> onClose())
-                .pos(width / 2 - BASE_LIST_ENTRY_WIDTH / 2, Math.min(height - LIST_ENTRY_HEIGHT,
-                        height - BOTTOM_MARGIN / 2 - LIST_ENTRY_HEIGHT / 2))
-                .size(BASE_LIST_ENTRY_WIDTH, LIST_ENTRY_HEIGHT)
+                .pos(width / 2 - baseListEntryWidth / 2, Math.min(height - listEntryHeight,
+                        height - 32 / 2 - listEntryHeight / 2))
+                .size(baseListEntryWidth, listEntryHeight)
                 .build());
 
         return optionList;

common/src/main/java/dev/terminalmc/commandkeys/gui/widget/list/MacroBindList.java

@@ -18,10 +18,12 @@
 
 import com.mojang.blaze3d.platform.InputConstants;
 import dev.terminalmc.commandkeys.CommandKeys;
-import dev.terminalmc.commandkeys.config.*;
+import dev.terminalmc.commandkeys.config.Keybind;
+import dev.terminalmc.commandkeys.config.Macro;
+import dev.terminalmc.commandkeys.config.Profile;
 import dev.terminalmc.commandkeys.mixin.accessor.KeyMappingAccessor;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.options.controls.KeyBindsScreen;
+import net.minecraft.client.gui.screens.controls.KeyBindsScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -38,10 +40,10 @@ public abstract class MacroBindList extends OptionList {
     private InputConstants.Key heldKey;
     private InputConstants.Key sendKey;
 
-    public MacroBindList(Minecraft mc, int width, int height, int y,
+    public MacroBindList(Minecraft mc, int width, int height, int top, int bottom,
                          int itemHeight, int entryWidth, int entryHeight, 
                          @NotNull Profile profile) {
-        super(mc, width, height, y, itemHeight, entryWidth, entryHeight);
+        super(mc, width, height, top, bottom, itemHeight, entryWidth, entryHeight);
         this.profile = profile;
     }