Backport to mc1.20.1

Author: NotRyken

.github/workflows/check-build.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          21
+          17
         ]
         os: [
           ubuntu-latest,
@@ -44,7 +44,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-platform-curseforge.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          21
+          17
         ]
         os: [
           ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
         env:
           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

.github/workflows/release-subproject-fabric.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          21
+          17
         ]
         os: [
           ubuntu-latest
@@ -40,7 +40,7 @@ jobs:
           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

…orkflows/release-subproject-neoforge.yml …b/workflows/release-subproject-forge.yml.github/workflows/release-subproject-neoforge.yml renamed to .github/workflows/release-subproject-forge.yml .github/workflows/release-subproject-neoforge.yml renamed to .github/workflows/release-subproject-forge.yml

@@ -1,5 +1,5 @@
-# A NeoForge-only version of the normal release workflow.
-name: Release-Subproject-NeoForge
+# A Forge-only version of the normal release workflow.
+name: Release-Subproject-Forge
 
 on:
   workflow_dispatch:
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          21
+          17
         ]
         os: [
           ubuntu-latest
@@ -34,13 +34,13 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: Build
-        run: ./gradlew build neoforge:publishMods --stacktrace
+        run: ./gradlew build forge:publishMods --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

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          21
+          17
         ]
         os: [
           ubuntu-latest
@@ -39,13 +39,13 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: Build
-        run: ./gradlew build neoforge:publishModrinth neoforge:publishCurseforge neoforge:publishGithub fabric:publishModrinth fabric:publishCurseforge fabric:publishGithub --stacktrace
+        run: ./gradlew build forge:publishModrinth forge:publishCurseforge forge:publishGithub fabric:publishModrinth fabric:publishCurseforge fabric:publishGithub --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

@@ -9,7 +9,9 @@ import java.time.LocalDate
 
 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}")
@@ -64,7 +66,8 @@ subprojects {
         afterEvaluate { sp ->
             publishMods {
                 // Common configuration
-                file = sp.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 = ReleaseType.of(mod_version_type)
                 displayName = "v${mod_version}-${StaticUtil.capsLoader(sp.name)}"

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

@@ -121,47 +121,47 @@ if (build_sources_jar == "true") {
 processResources {
     final expandProps = [
             // Mod
-            "mod_version"            : mod_version,
-            "mod_group"              : mod_group,
-            "mod_id"                 : mod_id,
-            "mod_name"               : mod_name,
-            "mod_description_fabric" : mod_description.replace("\n", "\\n"),
-            "mod_description_neoforge": mod_description,
-            "mod_icon"               : "assets/${mod_id}/icon.png",
-            "mod_owner"              : mod_owner,
-            "mod_authors_list"       : asJsonList(mod_authors),
-            "mod_authors_string"     : mod_authors.split(",").join(", "),
-            "mod_contributors_list"  : asJsonList("${mod_contributors},${mod_translators},${mod_credits}"),
-            "mod_contributors_string": asTomlList("${mod_contributors},${mod_translators},${mod_credits}"),
-            "mod_license"            : mod_license,
+            "mod_version"             : mod_version,
+            "mod_group"               : mod_group,
+            "mod_id"                  : mod_id,
+            "mod_name"                : mod_name,
+            "mod_description_fabric"  : mod_description.replace("\n", "\\n"),
+            "mod_description_forge"   : mod_description,
+            "mod_icon"                : "assets/${mod_id}/icon.png",
+            "mod_owner"               : mod_owner,
+            "mod_authors_list"        : asJsonList(mod_authors),
+            "mod_authors_string"      : mod_authors.split(",").join(", "),
+            "mod_contributors_list"   : asJsonList("${mod_contributors},${mod_translators},${mod_credits}"),
+            "mod_contributors_string" : asTomlList("${mod_contributors},${mod_translators},${mod_credits}"),
+            "mod_license"             : mod_license,
             // Links
-            "homepage_url"           : homepage_url,
-            "sources_url"            : sources_url,
-            "issues_url"             : issues_url,
-            "contact_url"            : contact_url,
+            "homepage_url"            : homepage_url,
+            "sources_url"             : sources_url,
+            "issues_url"              : issues_url,
+            "contact_url"             : contact_url,
             // Java
-            "java_version"           : java_version,
+            "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),
             "fabric_entrypoints_main"   : asJsonListPrefixed(fabric_entrypoints_main, "${mod_group}.${mod_id}."),
             "fabric_entrypoints_client" : asJsonListPrefixed(fabric_entrypoints_client, "${mod_group}.${mod_id}."),
             "fabric_entrypoints_server" : asJsonListPrefixed(fabric_entrypoints_server, "${mod_group}.${mod_id}."),
             "fabric_entrypoints_modmenu": asJsonListPrefixed(fabric_entrypoints_modmenu, "${mod_group}.${mod_id}."),
-            // NeoForge
-            "neoforge_versions"      : neoforge_versions,
+            // Forge
+            "forge_versions"          : forge_versions,
             // Dependencies:
-            "fabric_depends"         : "",
-            "fabric_recommends"      : "",
-            "fabric_suggests"        : "",
-            "fabric_conflicts"       : "",
-            "fabric_breaks"          : "",
-            "neoforge_all_deps"      : ""
+            "fabric_depends"          : "",
+            "fabric_recommends"       : "",
+            "fabric_suggests"         : "",
+            "fabric_conflicts"        : "",
+            "fabric_breaks"           : "",
+            "forge_all_deps"          : ""
     ]
 
     // Apply property-defined dependencies
@@ -186,25 +186,25 @@ processResources {
     if (!expandProps["fabric_depends"].isBlank()) {
         expandProps["fabric_depends"] = "${expandProps["fabric_depends"]},".toString()
     }
-    safePropList("neoforge_deps").each { dep ->
+    safePropList("forge_deps").each { dep ->
         try {
-            final depData = propList("d_neoforge_${dep}")
+            final depData = propList("d_forge_${dep}")
             if (depData.length > 1 && depData[1] != "-") {
                 final loaderData = depData[1].split(":")
-                expandProps["neoforge_all_deps"] = expandProps["neoforge_all_deps"] +
+                expandProps["forge_all_deps"] = expandProps["forge_all_deps"] +
                         "[[dependencies.${mod_id}]]\n" +
                         "modId=\"${loaderData[1]}\"\n" +
-                        "type=\"${loaderData[0]}\"\n" +
-                        "versionRange=\"${project.property("vr_neoforge_${dep}")}\"\n" +
+                        "mandatory=${loaderData[0] == "required"}\n" +
+                        "versionRange=\"${project.property("vr_forge_${dep}")}\"\n" +
                         "side=\"CLIENT\"\n\n"
             }
         } catch (Exception ex) {
-            logger.error("Error processing NeoForge dependency metadata for '${dep}'. "
+            logger.error("Error processing Forge dependency metadata for '${dep}'. "
                     + "Check dependency property format.")
             throw ex
         }
     }
-//    logger.info("NeoForge metadata 'neoforge_all_deps': ${expandProps["neoforge_all_deps"]}")
+//    logger.info("Forge metadata 'forge_all_deps': ${expandProps["forge_all_deps"]}")
 
     filesMatching(["pack.mcmeta", "*.mod.json", "*.mixins.json", "META-INF/*.toml"]) {
         expand(expandProps)

common/build.gradle

@@ -2,7 +2,7 @@ import util.PropUtil
 
 plugins {
     id("multiloader-common")
-    id("net.neoforged.moddev")
+    id("org.spongepowered.gradle.vanilla")
 }
 
 // Configure new ASM version
@@ -55,18 +55,12 @@ dependencies {
     new PropUtil(project).applyDependencies(project.name, selector)
 }
 
-// Configure ModDevGradle
-neoForge {
-    neoFormVersion = neoform_version
-    // Apply common AccessTransformer if it exists
-    def at = file("src/main/resources/META-INF/accesstransformer.cfg")
-    if (at.exists()) accessTransformers.from(at.absolutePath)
-    validateAccessTransformers = true
-    // Apply Parchment mappings
-    parchment {
-        minecraftVersion = parchment_minecraft_version
-        mappingsVersion = parchment_version
-    }
+// Configure VanillaGradle
+minecraft {
+    version(minecraft_version)
+    // Apply common AccessWidener if it exists
+    def aw = file("src/main/resources/${mod_id}.accesswidener")
+    if (aw.exists()) accessWideners(aw)
 }
 
 // Set up access to common files

common/src/main/java/dev/terminalmc/clientsort/client/config/Config.java

@@ -24,6 +24,7 @@
 import dev.terminalmc.clientsort.config.ClassPolicy;
 import dev.terminalmc.clientsort.platform.Services;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.*;
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
@@ -220,27 +221,27 @@ public enum ControlButtonType {
      */
     private void validate() {
         // Clamp numbered values
-        options.interactionInterval = Math.clamp(
+        options.interactionInterval = Mth.clamp(
                 options.interactionInterval,
                 Options.INTERACTION_INTERVAL_MIN,
                 Options.INTERACTION_INTERVAL_MAX
         );
-        options.soundInterval = Math.clamp(
+        options.soundInterval = Mth.clamp(
                 options.soundInterval,
                 Options.SOUND_INTERVAL_MIN,
                 Options.SOUND_INTERVAL_MAX
         );
-        options.soundPitchMin = Math.clamp(
+        options.soundPitchMin = Mth.clamp(
                 options.soundPitchMin,
                 Options.SOUND_PITCH_MIN,
                 Options.SOUND_PITCH_MAX
         );
-        options.soundPitchMax = Math.clamp(
+        options.soundPitchMax = Mth.clamp(
                 options.soundPitchMax,
                 options.soundPitchMin, // Not less than configured min
                 Options.SOUND_PITCH_MAX
         );
-        options.soundVolume = Math.clamp(
+        options.soundVolume = Mth.clamp(
                 options.soundVolume,
                 Options.SOUND_VOLUME_MIN,
                 Options.SOUND_VOLUME_MAX

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/GroupSelectorScreen.java

@@ -107,15 +107,6 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
         }
     }
 
-    @Override
-    protected void renderBlurredBackground(float partialTick) {
-        // Heavy blur, we want the widgets to really stand out
-        int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
-        Minecraft.getInstance().options.menuBackgroundBlurriness().set(6);
-        super.renderBlurredBackground(partialTick);
-        Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
-    }
-
     @Override
     public void onClose() {
         super.onClose();