Add protection against large network channel lists

(cherry picked from commit 162908338bbda96431ffec48249fe5101dd67d2c)
Fix legacy object holders not being fired in the registry specific codepath
2026-11-14 09:05:17 +00:00 · 2026-10-14 20:31:00 -07:00 · 2026-10-13 09:43:51 -07:00 · 2026-10-12 18:13:48 -07:00 · 2026-10-12 18:10:41 -07:00 · 2026-08-04 19:10:47 +01:00
657 changed files with 7466 additions and 4814 deletions
@@ -0,0 +1,28 @@
+name: Publish
+
+on:
+  push:
+    branches: [ '1.20.4' ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
+    with:
+      java: 17
+      gradle_setup: './gradlew setup'
+      gradle_tasks: 'build publish'
+      artifact_name: 'forge'
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
+      SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
+      SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
+      SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>MinecraftForge_Forge Config DSL Script</name>
-  <groupId>MinecraftForge_Forge</groupId>
-  <artifactId>MinecraftForge_Forge_dsl</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.jetbrains.teamcity</groupId>
-    <artifactId>configs-dsl-kotlin-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>teamcity-server</id>
-      <url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>JetBrains</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>${basedir}</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-
-        <configuration/>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.teamcity</groupId>
-        <artifactId>teamcity-configs-maven-plugin</artifactId>
-        <version>${teamcity.dsl.version}</version>
-        <configuration>
-          <format>kotlin</format>
-          <dstDir>target/generated-configs</dstDir>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
-      <version>${teamcity.dsl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-script-runtime</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,193 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
-import jetbrains.buildServer.configs.kotlin.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-
-/*
-The settings script is an entry point for defining a TeamCity
-project hierarchy. The script should contain a single call to the
-project() function with a Project instance or an init function as
-an argument.
-
-VcsRoots, BuildTypes, Templates, and subprojects can be
-registered inside the project using the vcsRoot(), buildType(),
-template(), and subProject() methods respectively.
-
-To debug settings scripts in command-line, run the
-
-    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
-
-command and attach your debugger to the port 8000.
-
-To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
-> Tool Windows -> Maven Projects), find the generate task node
-(Plugins -> teamcity-configs -> teamcity-configs:generate), the
-'Debug' option is available in the context menu for the task.
-*/
-
-version = "2021.2"
-
-project {
-
-    buildType(Build)
-    buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-    buildType(PullRequestChecks)
-    buildType(PullRequestCompatibility)
-
-    params {
-        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_branch_spec", """
-                +:refs/heads/(main*)
-                +:refs/heads/(master*)
-                +:refs/heads/(develop|release|staging|main|master)
-                +:refs/heads/(1.*)
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-        text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
-        //These are references and not actually keys
-        password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN)
-        text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-
-        checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        checkbox("should_execute_test", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-    }
-
-    features {
-        githubIssues {
-            id = "MinecraftForge_MinecraftForge__IssueTracker"
-            displayName = "MinecraftForge/MinecraftForge"
-            repositoryURL = "https://github.com/MinecraftForge/MinecraftForge"
-        }
-    }
-}
-
-object Build : BuildType({
-    templates(AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"), AbsoluteId("MinecraftForge_PublishProjectUsingGradle"), AbsoluteId("MinecraftForge_TriggersStaticFilesWebpageGenerator"))
-    id("MinecraftForge_MinecraftForge__Build")
-    name = "Build"
-    description = "Builds and Publishes the main branches of the project."
-})
-
-object BuildSecondaryBranches : BuildType({
-    templates(AbsoluteId("MinecraftForge_ExcludesBuildingDefaultBranch"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__BuildSecondaryBranches")
-    name = "Build - Secondary Branches"
-    description = "Builds and Publishes the secondary branches of the project."
-    params {
-        text("git_branch_spec", """
-                +:refs/heads/(*)
-                -:refs/heads/noci*
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-    }
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequests : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequests")
-    name = "Pull Requests"
-    description = "Builds pull requests for the project"
-
-    params {
-        checkbox("should_execute_build", "true", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        text(
-            "gradle_build_task",
-            "assemble",
-            label = "Gradle build task to execute during build",
-            description = "Determines the build task that is executed to build the project.",
-            display = ParameterDisplay.HIDDEN,
-            allowEmpty = false
-        )
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestChecks : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestChecks")
-    name = "Pull Requests (Checks)"
-    description = "Checks pull requests for the project"
-
-    steps {
-        gradle {
-            name = "Check"
-            id = "RUNNER_10_Check"
-
-            tasks = "checkAll"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestCompatibility : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
-    name = "Pull Requests (Compatibility)"
-    description = "Validates binary compatibility for pull requests made to the project"
-
-    steps {
-        gradle {
-            name = "Validate"
-            id = "RUNNER_10_Compatibility"
-
-            tasks = "checkJarCompatibility"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
@@ -3,7 +3,7 @@ Minecraft Forge: Credits/Thank You
 Forge is a set of tools and modifications to the Minecraft base game code to assist 
 mod developers in creating new and exciting content. It has been in development for 
 several years now, but I would like to take this time thank a few people who have 
-helped it along it's way.
+helped it along its way.

 First, the people who originally created the Forge projects way back in Minecraft 
 alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
@@ -11,7 +11,7 @@ of me taking over the project, who knows what Minecraft modding would be today.

 Secondly, someone who has worked with me, and developed some of the core features
 that allow modding to be as functional, and as simple as it is, cpw. For developing
-FML, which stabelized the client and server modding ecosystem. As well as the base
+FML, which stabilized the client and server modding ecosystem. As well as the base
 loading system that allows us to modify Minecraft's code as elegently as possible.

 Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
@@ -45,11 +45,11 @@ and minecraft clients.
 The code is authored by cpw.

 It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
-http://www.minecraftforum.net/topic/75440-
+https://www.minecraftforum.net/topic/75440-
 This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.

 It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
-http://www.minecraftforge.net/
+https://minecraftforge.net/

 Additionally, it contains an implementation of topological sort based on that 
 published at http://keithschwarz.com/interesting/code/?dir=topological-sort
@@ -2,7 +2,7 @@ import net.minecraftforge.forge.tasks.*
 import net.minecraftforge.gradleutils.PomUtils

 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1'
+    id 'net.minecraftforge.licenser' version '1.0.1'
    id 'com.github.ben-manes.versions' version '0.46.0'
    id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
    id 'eclipse'
@@ -19,10 +19,6 @@ ext {
    GIT_INFO = gradleutils.gitInfo
    VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
    FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
-
-    BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
-    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
-    FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
 }

 changelog {
@@ -50,10 +46,10 @@ project(':mcp') {

 if (System.env.TEAMCITY_VERSION) {
    //Only setup the CI environment if and only if the environment variables are set.
-    tasks.configureTeamCity {
+    tasks.named('configureTeamCity').configure {
        doLast {
            println "##teamcity[buildNumber '${project(':forge').version}']"
            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
        }
    }
-}
+}
@@ -4,10 +4,10 @@ repositories {
 }

 dependencies {
-    implementation 'org.ow2.asm:asm:9.5'
-    implementation 'org.ow2.asm:asm-tree:9.5'
-    implementation 'net.minecraftforge:srgutils:0.5.+'
-    implementation 'commons-io:commons-io:2.12.0'
+    implementation 'org.ow2.asm:asm:9.9.1'
+    implementation 'org.ow2.asm:asm-tree:9.9.1'
+    implementation 'net.minecraftforge:srgutils:0.6.2'
+    implementation 'commons-io:commons-io:2.13.0'
    implementation 'com.google.code.gson:gson:2.10.1'
    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
-}
+}
@@ -4,6 +4,9 @@ import org.gradle.api.tasks.*
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+import java.util.zip.ZipFile

 abstract class BundleList extends DefaultTask {
    @InputFiles abstract ConfigurableFileCollection getConfig()
@@ -16,6 +19,8 @@ abstract class BundleList extends DefaultTask {
        configure {
            dependsOn(project.tasks.universalJar)
            inputs.file(project.tasks.universalJar.archiveFile)
+            dependsOn(project.tasks.applyServerBinPatches)
+            inputs.file(project.tasks.applyServerBinPatches.output)
        }
    }
    
@@ -23,21 +28,24 @@ abstract class BundleList extends DefaultTask {
    void run() {
        def entries = [:] as TreeMap
        def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
-        for (var dep : resolved) {
+        for (def dep : resolved) {
            def info = Util.getMavenInfoFromDep(dep)
            //println("$dep.file.sha1\t$info.name\t$info.path")
            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
        }
+
+        var packed = (AbstractArchiveTask) project.tasks.universalJar
+        var info = Util.getMavenInfoFromTask(packed)
+        def file = packed.archiveFile.get().asFile
+        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
+
+        var classifier = 'server'
+        var genned = project.tasks.applyServerBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        file = genned.output.get().asFile
+        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
        
-        [
-            project.tasks.universalJar
-        ].forEach{ packed -> 
-            def info = Util.getMavenInfoFromTask(packed)
-            def file = packed.archiveFile.get().asFile
-            entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
-        }
-        
-        try (def zip = new java.util.zip.ZipFile(serverBundle.get().asFile)) {
+        try (def zip = new ZipFile(serverBundle.get().asFile)) {
            def entry = zip.getEntry('META-INF/libraries.list')
            def data = zip.getInputStream(entry).text.split('\n')
            for (def line : data) {
@@ -1,6 +1,7 @@
 package net.minecraftforge.forge.tasks

 import groovy.json.JsonBuilder
+import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
@@ -10,6 +11,7 @@ import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode

+@CompileStatic
 abstract class BytecodeFinder extends DefaultTask {
    @InputFile abstract RegularFileProperty getJar()
    // It should be fine to mark the output as internal as we want to control when we run it anyways.
@@ -24,13 +26,13 @@ abstract class BytecodeFinder extends DefaultTask {
    protected void exec() {
        Util.init()

-        def outputFile = output.get().asFile
+        var outputFile = output.get().asFile
        if (outputFile.exists())
            outputFile.delete()

        pre()

-        Util.processClassNodes(jar.get().asFile, this::process)
+        Util.processClassNodes(jar.get().asFile, this.&process)

        post()
        outputFile.text = new JsonBuilder(getData()).toPrettyString()
@@ -38,8 +40,8 @@ abstract class BytecodeFinder extends DefaultTask {


    protected process(ClassNode node) {
-        if (node.fields != null) node.fields.each { process(node, it) }
-        if (node.methods != null) node.methods.each { process(node, it) }
+        if (node.fields !== null) node.fields.each { process(node, it) }
+        if (node.methods !== null) node.methods.each { process(node, it) }
    }

    protected pre() {}
@@ -12,7 +12,7 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
    @Internal
    abstract Property<Closure<Boolean>> getPredicate()

-    private final Set<String> matches = new HashSet()
+    private final Set<String> matches = new HashSet<>()

    @Override
    protected process(ClassNode parent, MethodNode node) {
@@ -27,6 +27,6 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
    @Internal
    @Override
    protected Object getData() {
-        return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
+        return matches.toSorted(Comparator.<String>naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
    }
 }
@@ -1,5 +1,8 @@
 package net.minecraftforge.forge.tasks;

+import groovy.transform.CompileDynamic;
+import groovy.transform.CompileStatic;
+
 import java.util.Properties;
 import java.util.Enumeration;
 import java.util.Map;
@@ -26,6 +29,7 @@ import java.util.Set;
 * This does the same thing, as well as sorting alphabetically.
 * It also ignores all comments. We can add them latter if someone cares.
 */
+@CompileStatic
 public class CleanProperties extends Properties {
    private static final long serialVersionUID = 1L;
    private static final String LINE_SEP = System.getProperty("line.separator");
@@ -58,6 +62,7 @@ public class CleanProperties extends Properties {
        return Collections.enumeration(ret);
    }

+    @CompileDynamic
    @Override
    public Set<Map.Entry<Object, Object>> entrySet() {
        Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
@@ -1,5 +1,7 @@
 package net.minecraftforge.forge.tasks

+import groovy.transform.stc.FirstParam
+
 import java.util.function.BiConsumer

 public class ClosureHelper {
@@ -22,7 +24,7 @@ public class ClosureHelper {
        }
    }
    
-    static <T> T apply(T obj, Closure cl) {
+    static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
        cl.delegate = obj
        cl.resolveStrategy = Closure.DELEGATE_FIRST
        cl()
@@ -27,7 +27,7 @@ abstract class DownloadLibraries extends DefaultTask {
    def run() {
 		Util.init()
 		File outputDir = output.get().asFile
-        def libraries = new ArrayList()
+        var libraries = new ArrayList<String>()

 		def json = input.get().asFile.json().libraries.each { lib ->
 		    //TODO: Thread?
@@ -35,7 +35,7 @@ abstract class DownloadLibraries extends DefaultTask {
 			artifacts.each{ art -> 
 				def target = new File(outputDir, art.path)
 				libraries.add(target.absolutePath)
-				if (!target.exists() || !art.sha1.equals(target.sha1())) {
+				if (!target.exists() || art.sha1 != target.sha1()) {
 					project.logger.lifecycle("Downloading ${art.url}")
 					if (!target.parentFile.exists()) {
 						target.parentFile.mkdirs()
@@ -43,7 +43,7 @@ abstract class DownloadLibraries extends DefaultTask {
 					new URL(art.url).withInputStream { i ->
 						target.withOutputStream { it << i }
 					}
-					if (!art.sha1.equals(target.sha1())) {
+					if (art.sha1 != target.sha1()) {
 						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
 					}
 				}
@@ -1,10 +1,14 @@
 package net.minecraftforge.forge.tasks

+import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*

+import java.util.zip.ZipFile
+
+@CompileStatic
 abstract class ExtractFile extends DefaultTask {
    @InputFile abstract RegularFileProperty getInput()
    @Input abstract Property<String> getTarget()
@@ -12,11 +16,11 @@ abstract class ExtractFile extends DefaultTask {

    @TaskAction
    protected void exec() {
-        def zip = new java.util.zip.ZipFile(input.get().asFile);
-        def entry = zip.getEntry(target.get())
+        var zip = new ZipFile(input.get().asFile);
+        var entry = zip.getEntry(target.get())
        if (entry == null)
            throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
-        def stream = zip.getInputStream(entry)
+        var stream = zip.getInputStream(entry)
        output.get().asFile.withOutputStream { out ->
            stream.transferTo(out)
        }
@@ -1,20 +1,11 @@
 package net.minecraftforge.forge.tasks

+import groovy.transform.CompileStatic
 import groovy.transform.EqualsAndHashCode

-import java.util.ArrayList
-import java.util.HashMap
-import java.util.TreeMap
-import java.util.TreeSet
-import java.util.function.BiConsumer
-
-import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.*
-
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.Type
+import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode

 import static org.objectweb.asm.Opcodes.*
@@ -34,17 +25,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
    
    @Override
    protected process(ClassNode parent, MethodNode node) {
-        def last = null
+        AbstractInsnNode last = null
        def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
        for (int x = 0; x < node.instructions.size(); x++) {
            def current = node.instructions.get(x)
-            if (current.opcode == IF_ACMPEQ || current.opcode == IF_ACMPNE) {
-                if (last != null && (last.opcode == GETSTATIC || last.opcode == GETFIELD)) {
+            if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
+                if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
                    def target = new Search(cls: last.owner, name: last.name)
                    def wanted = fieldsReverse.get(target)
                    def original = fields.get(wanted)
                    def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
-                    if (wanted != null && (original.blacklist == null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
+                    if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
                        targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
                    }
                }
@@ -68,9 +59,10 @@ abstract class FieldCompareFinder extends BytecodeFinder {
 		}
        return ret
    }
-    
+
+    @CompileStatic
    @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
-    public static class Search {
+    static class Search {
        @Input
        String cls
        
@@ -89,17 +81,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
            return cls + '.' + name
        }
        
-        def blacklist(def owner, def name, def desc) {
-            if (blacklist == null)
-                blacklist = new HashSet()
+        def blacklist(String owner, String name, String desc) {
+            if (blacklist === null)
+                blacklist = new HashSet<>()
            blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
        }
-        def blacklist(def owner) {
+        def blacklist(String owner) {
            blacklist(owner, '', '')
        }
    }
    
-    def fields(Closure cl) {
+    void fields(Closure cl) {
        new ClosureHelper(cl, {name, ccl ->
            def search = ClosureHelper.apply(new Search(), ccl)
            this.fields.put(name, search)
@@ -1,5 +1,7 @@
 package net.minecraftforge.forge.tasks

+import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.*
 import org.gradle.api.DefaultTask
@@ -27,7 +29,7 @@ abstract class InstallerJar extends Zip {
        from(project.rootProject.file('/src/main/resources/url.png'))
        project.afterEvaluate {
            from(project.zipTree(downloadInstaller.output)) {
-                duplicatesStrategy = 'exclude'
+                duplicatesStrategy = DuplicatesStrategy.EXCLUDE
            }
            
            if (fat.get() || offline.get()) {
@@ -42,7 +44,7 @@ abstract class InstallerJar extends Zip {
                // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
                [
                    project.tasks.serverShimJar // Server bootstrap executable jar
-                ].forEach { packed ->
+                ].forEach { AbstractArchiveTask packed ->
                    def path = Util.getMavenInfoFromTask(packed).path
                    from(packed) {
                        rename { "maven/$path" }
@@ -67,8 +69,8 @@ abstract class InstallerJar extends Zip {
            ].each { task ->
                def json = task.output.get().asFile.json
                json.libraries.each { lib -> 
-                    deps.put(lib.name, lib.downloads.artifact)
-                    //println(lib.name)
+                    if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
+                        deps.put(lib.name, lib.downloads.artifact)
                }
            }
            
@@ -76,10 +78,10 @@ abstract class InstallerJar extends Zip {
            [
                project.tasks.universalJar, // Forge runtime code
                project.tasks.serverShimJar // Shim jar for dedicated server
-            ].forEach { packed ->
+            ].forEach { AbstractArchiveTask packed ->
                def name = Util.getMavenInfoFromTask(packed).name
                def info = deps.remove(name)
-                if (info != null) {
+                if (info !== null) {
                    println("Adding: $packed.path $name")
                    parent.from(packed) {
                        rename { "maven/$info.path" }
@@ -96,7 +98,7 @@ abstract class InstallerJar extends Zip {
                //println('')
                def resolved = cfg.resolvedConfiguration.resolvedArtifacts
                int found = 0
-                for (var dep : resolved) {
+                for (def dep : resolved) {
                    def name = Util.getMavenInfoFromDep(dep).name
                    def info = deps.remove(name)
                    if (info == null) {
@@ -132,13 +134,13 @@ abstract class InstallerJar extends Zip {
        }
        
        void addFile(file, info) {
-            def pack = parent.offline.get() || info.url.isEmpty()
+            boolean pack = parent.offline.get() || info.url.isEmpty()
            
            // If it's a offline jar just always pack
            if (!pack) {
                try {
-                    def remote = new URL("${info.url}.sha1").getText('UTF-8')
-                    pack = !info.sha1.equals(remote)
+                    var remote = new URL("${info.url}.sha1").getText('UTF-8')
+                    pack = info.sha1 != remote
                } catch (FileNotFoundException e) {
                    pack = !info.url.startsWith('https://libraries.minecraft.net/')
                    // Oh noes its not there!
@@ -7,6 +7,7 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask

 import java.nio.file.Files

@@ -45,7 +46,7 @@ abstract class InstallerJson extends DefaultTask {
        [
            project.tasks.universalJar,
            project.tasks.serverShimJar
-        ].forEach { packed ->
+        ].forEach { AbstractArchiveTask packed ->
            def info = Util.getMavenInfoFromTask(packed)
            libs.put(info.name, [
                name: info.name,
@@ -6,6 +6,7 @@ import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask

 import java.nio.file.Files

@@ -33,7 +34,7 @@ abstract class LauncherJson extends DefaultTask {
                    "Our efforts are supported by ads from the download page.",
                    "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
                ],
-                id: "$mc-$project.name$forge",
+                id: "$mc-$project.name-$forge",
                time: timestamp,
                releaseTime: timestamp,
                inheritsFrom: mc,
@@ -49,30 +50,45 @@ abstract class LauncherJson extends DefaultTask {
                dependsOn(packed)
                input.from packed.archiveFile
            }
+            
+            def patched = project.tasks.applyClientBinPatches
+            dependsOn(patched)
+            input.from patched.output
        }
    }

    @TaskAction
    protected void exec() {
-        [
-            project.tasks.universalJar
-        ].forEach { packed ->
-            def info = Util.getMavenInfoFromTask(packed)
-            json.libraries.add([
-                name: info.name,
-                downloads: [
-                    artifact: [
-                        path: info.path,
-                        url: "https://maven.minecraftforge.net/$info.path",
-                        sha1: packed.archiveFile.get().asFile.sha1(),
-                        size: packed.archiveFile.get().asFile.length()
-                    ]
+        var packed = (AbstractArchiveTask) project.tasks.universalJar
+        def info = Util.getMavenInfoFromTask(packed)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "https://maven.minecraftforge.net/$info.path",
+                    sha1: packed.archiveFile.get().asFile.sha1(),
+                    size: packed.archiveFile.get().asFile.length()
                ]
-            ])
-        }
-        getArtifacts(project, project.configurations.installer).each { key, lib -> 
-            json.libraries.add(lib)
-        }
+            ]
+        ])
+
+        var classifier = 'client'
+        var genned = project.tasks.applyClientBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "",
+                    sha1: genned.output.get().asFile.sha1(),
+                    size: genned.output.get().asFile.length()
+                ]
+            ]
+        ])
+
+        json.libraries.addAll(getArtifacts(project.configurations.installer).values())
        Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
    }
 }
@@ -1,5 +1,6 @@
 package net.minecraftforge.forge.tasks

+import groovy.transform.CompileStatic
 import org.apache.commons.io.IOUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
@@ -12,6 +13,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream

+@CompileStatic
 abstract class MergeJars extends DefaultTask {
    MergeJars() {
        output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
@@ -24,8 +26,8 @@ abstract class MergeJars extends DefaultTask {
        try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
            for (def jar : jars) {
                try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
-                    def entry
-                    while ((entry = zin.getNextEntry()) != null) {
+                    ZipEntry entry
+                    while ((entry = zin.getNextEntry()) !== null) {
                        ZipEntry _new = new ZipEntry(entry.getName())
                        _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
                        zout.putNextEntry(_new)
@@ -27,6 +27,6 @@ public class ObjectTarget implements Comparable<ObjectTarget> {
    
    @Override
    int compareTo(ObjectTarget o) {
-        return toString().compareTo(o.toString())
+        return toString() <=> o.toString()
    }
 }
@@ -16,7 +16,7 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
    SetupCheckJarCompatibility() {
        group = 'jar compatibility'
        onlyIf {
-            inputVersion.getOrNull() != null
+            inputVersion.getOrNull() !== null
        }
        outputs.upToDateWhen { false } // Never up to date, because this setup task should always run

@@ -2,35 +2,47 @@ package net.minecraftforge.forge.tasks

 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
+import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.SimpleType
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ResolvedArtifact
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode

-import java.io.File
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Semaphore
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream

-public class Util {
-    static final ASM_LEVEL = Opcodes.ASM9
+final class Util {
+    public static final int ASM_LEVEL = Opcodes.ASM9
+    private static final HttpClient HTTP = HttpClient.newBuilder().build()

    static void init() {
        File.metaClass.sha1 = { ->
            MessageDigest md = MessageDigest.getInstance('SHA-1')
-            delegate.eachByte 4096, {bytes, size ->
+            delegate.eachByte(4096) { byte[] bytes, int size ->
                md.update(bytes, 0, size)
            }
-            return md.digest().collect {String.format "%02x", it}.join()
+            return md.digest().collect(this.&toHex).join('')
        }
        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
        File.metaClass.sha256 = { ->
            MessageDigest md = MessageDigest.getInstance('SHA-256')
-            delegate.eachByte 4096, {bytes, size ->
+            delegate.eachByte(4096) { byte[] bytes, int size ->
                md.update(bytes, 0, size)
            }
-            return md.digest().collect {String.format "%02x", it}.join()
+            return md.digest().collect(this.&toHex).join('')
        }
        File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }

@@ -39,16 +51,17 @@ public class Util {
        File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }

        Date.metaClass.iso8601 = { ->
-            def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-            def result = format.format(delegate)
+            var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+            var result = format.format(delegate)
            return result[0..21] + ':' + result[22..-1]
        }

        String.metaClass.rsplit = { String del, int limit = -1 ->
-            def lst = new ArrayList()
-            def x = 0, idx
-            def tmp = delegate
-            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit == -1 || x++ < limit)) {
+            var lst = new ArrayList<String>()
+            int x = 0
+            int idx
+            String tmp = delegate
+            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
                lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
                tmp = tmp.substring(0, idx)
            }
@@ -57,7 +70,7 @@ public class Util {
        }
    }

-    public static String[] getClasspath(project, libs, artifact) {
+    static String[] getClasspath(Project project, Map libs, String artifact) {
        def ret = []
        artifactTree(project, artifact).each { key, lib ->
            libs[lib.name] = lib
@@ -67,30 +80,38 @@ public class Util {
        return ret
    }

-    public static def getArtifacts(project, config) {
-        def ret = [:]
-        config.resolvedConfiguration.resolvedArtifacts.each { dep ->
-            def info = getMavenInfoFromDep(dep)
-            def url = "https://libraries.minecraft.net/$info.path"
+    @CompileStatic
+    static Map getArtifacts(Configuration config) {
+        var ret = [:]
+        var semaphore = new Semaphore(1, true)
+        config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
+            var info = getMavenInfoFromDep(dep)
+            var domain = 'libraries.minecraft.net'
+            var url = "https://$domain/$info.path"
            if (!checkExists(url))
-                url = "https://maven.minecraftforge.net/$info.path"
-                
+                url.values[0] = 'maven.minecraftforge.net'
+
+            var sha1 = sha1(dep.file)
+
+            semaphore.acquire()
            ret[info.key] = [
                name: info.name,
                downloads: [
                    artifact: [
                        path: info.path,
-                        url: url,
-                        sha1: dep.file.sha1(),
+                        url: url.toString(),
+                        sha1: sha1,
                        size: dep.file.length()
                    ]
                ]
            ]
-        }
+            semaphore.release()
+        })
        return ret
    }
-    
-    public static Map getMavenInfoFromDep(dep) {
+
+    @CompileStatic
+    static Map getMavenInfoFromDep(ResolvedArtifact dep) {
        return getMavenInfoFromMap([
            group: dep.moduleVersion.id.group,
            name: dep.moduleVersion.id.name,
@@ -99,49 +120,69 @@ public class Util {
            extension: dep.extension
        ])
    }
-    public static Map getMavenInfoFromTask(task) {
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(AbstractArchiveTask task) {
        return getMavenInfoFromMap([
-            group: task.project.group,
+            group: task.project.group.toString(),
            name: task.project.name,
-            version: task.project.version,
+            version: task.project.version.toString(),
            classifier: task.archiveClassifier.get(),
            extension: task.archiveExtension.get()
        ])
    }
-    
-    private static Map getMavenInfoFromMap(art) {
-        def key = "$art.group:$art.name"
-        def name = "$art.group:$art.name:$art.version"
-        def path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
-        if (art.classifier != null) {
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(Task task, String classifier) {
+        return getMavenInfoFromMap([
+            group: task.project.group.toString(),
+            name: task.project.name,
+            version: task.project.version.toString(),
+            classifier: classifier,
+            extension: 'jar'
+        ])
+    }
+
+    @CompileStatic
+    private static Map getMavenInfoFromMap(Map<String, String> art) {
+        var key = "$art.group:$art.name"
+        var name = "$art.group:$art.name:$art.version"
+        var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
+        if (art.classifier !== null) {
            name += ":$art.classifier"
            path += "-$art.classifier"
        }
-        if (!'jar'.equals(art.extension)) {
+        if ('jar' != art.extension) {
            name += "@$art.extension"
            path += ".$art.extension"
        } else {
            path += ".jar"
        }
        return [
-            key: key,
-            name: name,
-            path: path,
+            key: key.toString(),
+            name: name.toString(),
+            path: path.toString(),
            art: art
        ]
    }

-    public static def iso8601Now() { new Date().iso8601() }
+    static String iso8601Now() { new Date().iso8601() }

-    public static def sha1(file) {
+    @CompileStatic
+    static String sha1(File file) {
        MessageDigest md = MessageDigest.getInstance('SHA-1')
-        file.eachByte 4096, {bytes, size ->
+        file.eachByte(4096) { byte[] bytes, int size ->
            md.update(bytes, 0, size)
        }
-        return md.digest().collect {String.format "%02x", it}.join()
+        return md.digest().collect(this.&toHex).join('')
    }

-    private static def artifactTree(project, artifact, transitive = true) {
+    @CompileStatic
+    private static String toHex(byte bite) {
+        return String.format('%02x', bite)
+    }
+
+    private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
        if (!project.ext.has('tree_resolver'))
            project.ext.tree_resolver = 1
        def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
@@ -149,37 +190,36 @@ public class Util {
        def dep = project.dependencies.create(artifact)
        cfg.dependencies.add(dep)
        def files = cfg.resolve()
-        return getArtifacts(project, cfg)
+        return getArtifacts(cfg)
    }

-    static boolean checkExists(url) {
+    @CompileStatic
+    static boolean checkExists(String url) {
        try {
-            def code = new URL(url).openConnection().with {
-                requestMethod = 'HEAD'
-                connect()
-                responseCode
-            }
-            return code == 200
+            return HTTP.send(HttpRequest.newBuilder(new URI(url))
+                    .method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
+            ).statusCode() === 200
        } catch (Exception e) {
            if (e.toString().contains('unable to find valid certification path to requested target'))
-                throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
+                throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
            throw e
        }
    }

-    static String getLatestForgeVersion(mcVersion) {
+    static String getLatestForgeVersion(String mcVersion) {
        final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
        final ver = json.promos["$mcVersion-latest"]
        ver === null ? null : (mcVersion + '-' + ver)
    }

-    static void processClassNodes(File file, Closure process) {
+    @CompileStatic
+    static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
        file.withInputStream { i ->
            new ZipInputStream(i).withCloseable { zin ->
                ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
+                while ((zein = zin.nextEntry) !== null) {
                    if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(ASM_LEVEL)
+                        var node = new ClassNode(ASM_LEVEL)
                        new ClassReader(zin).accept(node, 0)
                        process(node)
                    }
@@ -187,4 +227,4 @@ public class Util {
            }
        }
    }
-}
+}
@@ -5,6 +5,7 @@

 package net.minecraftforge.forge.tasks

+import groovy.transform.CompileStatic
 import net.minecraftforge.srgutils.MinecraftVersion
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
@@ -28,8 +29,8 @@ abstract class ValidateDeprecations extends DefaultTask {

    @TaskAction
    protected void exec() {
-        def mcVer = MinecraftVersion.from(mcVersion.get())
-        def errors = []
+        var mcVer = MinecraftVersion.from(mcVersion.get())
+        List<String> errors = []

        Util.processClassNodes(input.get().asFile) {
            processNode(mcVer, errors, it)
@@ -65,7 +66,7 @@ abstract class ValidateDeprecations extends DefaultTask {
        }
    }

-    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure context) {
+    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
        def values = annotation.values
        if (values === null)
            return
@@ -73,7 +74,7 @@ abstract class ValidateDeprecations extends DefaultTask {
        int since = values.indexOf('since')
        if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
            def oldVersion = MinecraftVersion.from(values[since + 1])
-            def split = ValidateDeprecations.splitDots(oldVersion.toString())
+            int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
            if (split.length < 2)
                return
            def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
@@ -82,6 +83,7 @@ abstract class ValidateDeprecations extends DefaultTask {
        }
    }

+    @CompileStatic
    private static int[] splitDots(String version) {
        String[] pts = version.split('\\.')
        int[] values = new int[pts.length]
@@ -26,12 +26,12 @@ abstract class CheckExcs extends CheckTask {
        excs.each { f ->
            final lines = []
            f.eachLine { line ->
-                def idx = line.indexOf('#')
-                if (idx == 0 || line.isEmpty()) {
+                int idx = line.indexOf('#')
+                if (idx === 0 || line.isEmpty()) {
                    return
                }

-                if (idx != -1) line = line.substring(0, idx - 1)
+                if (idx !== -1) line = line.substring(0, idx - 1)

                if (!line.contains('=')) {
                    reporter.report("Invalid: $line")
@@ -58,6 +58,8 @@ abstract class CheckExcs extends CheckTask {
                    return
                }
                lines.add(line)
+
+                return
            }

            if (fix) f.text = lines.sort().join('\n')
@@ -6,4 +6,6 @@ import groovy.transform.CompileStatic
 enum CheckMode {
    CHECK,
    FIX
+
+    CheckMode() {}
 }
@@ -36,13 +36,13 @@ abstract class CheckPatches extends CheckTask {
        }
    }
    
-    def accessChange(previous, current) {
+    static boolean accessChange(String previous, String current) {
        //return ACCESS_MAP[previous] < ACCESS_MAP[current]
        return previous != current
    }

    void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
-        final oldFixedErrors = reporter.fixed.size()
+        int oldFixedErrors = reporter.fixed.size()

        final lines = Files.readAllLines(patch)

@@ -94,7 +94,7 @@ abstract class CheckSAS extends CheckTask {
        }
    }

-    protected static isSided(Annotatable annotatable) {
+    protected static boolean isSided(Annotatable annotatable) {
        if (annotatable === null) return false
        for (ann in annotatable.annotations) {
            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
@@ -104,7 +104,7 @@ abstract class CheckSAS extends CheckTask {
    }
    
    protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
-        return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
+        return json.values().findAll{ it.methods !== null && it.methods[desc] !== null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
                .collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
    }
 }
@@ -1,6 +1,8 @@
 package net.minecraftforge.forge.tasks.checks

 import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.ThirdParam
 import net.minecraftforge.forge.tasks.Util
 import org.gradle.api.Action
 import org.gradle.api.DefaultTask
@@ -33,7 +35,7 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
    void run() {
        Util.init()

-        final doFix = getMode().get() === CheckMode.FIX
+        boolean doFix = getMode().get() === CheckMode.FIX
        final Reporter reporter = new Reporter(doFix)
        check(reporter, doFix)

@@ -88,7 +90,8 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
    }

    static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
-                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type') Closure configuration) {
+                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type')
+                                                   @ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
        taskName = taskName.capitalize()
        tasks.register("check$taskName", clazz) { CheckTask task ->
            def castedTask = task as T
@@ -1,6 +1,5 @@
 plugins {
    id 'java-library'
-    id 'org.cadixdev.licenser'
    id 'net.minecraftforge.gradle.patcher'
 }

@@ -1,11 +1,11 @@
+import de.undercouch.gradle.tasks.download.Download
 import net.minecraftforge.forge.tasks.checks.CheckATs
 import net.minecraftforge.forge.tasks.checks.CheckExcs
 import net.minecraftforge.forge.tasks.checks.CheckPatches
 import net.minecraftforge.forge.tasks.checks.CheckSAS
 import net.minecraftforge.forge.tasks.checks.CheckTask

-import java.util.Date
-import java.util.LinkedHashMap
+import java.nio.file.Files
 import net.minecraftforge.forge.tasks.*
 import static net.minecraftforge.forge.tasks.Util.*
 import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
@@ -23,7 +23,7 @@ plugins {
    id 'eclipse'
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'de.undercouch.download'
    id 'net.minecraftforge.gradleutils'
    id 'net.minecraftforge.gradle.patcher'
@@ -69,19 +69,27 @@ sourceSets {
    }
 }

-ext {
-    SPEC_VERSION = gradleutils.gitInfo.tag
-    // The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
-    // ForgeMC is a unique identifier for every MC version we have supported.
-    // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
-    MCP_ARTIFACT = project(':mcp').mcp.config.get()
+final String SPEC_VERSION = gradleutils.gitInfo.tag

-    EXTRA_TXTS = [
+// The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
+// ForgeMC is a unique identifier for every MC version we have supported.
+// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
+final def MCP_ARTIFACT = project(':mcp').mcp.config.get()
+
+final List<File> EXTRA_TXTS = [
        rootProject.file('CREDITS.txt'),
        rootProject.file('LICENSE.txt'),
        rootProject.tasks.createChangelog.outputFile
-    ]
+]
+
+ext {
+    MAVEN_PATH = "${group.toString().replace('.', '/')}/${project.name}/${VERSION}".toString()
 }
+final String MAVEN_PATH = ext.MAVEN_PATH
+
+final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
+final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
+final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'

 configurations {
    // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
@@ -128,6 +136,7 @@ dependencies {
    installer(project(':mclanguage'))

    runtimeOnly(libs.bootstrap)
+    runtimeOnly(libs.bootstrap.dev)
 }

 patcher {
@@ -277,7 +286,7 @@ tasks.userdevConfig.configure {
    }
 }

-for (def run : patcher.runs + tasks.userdevConfig.runs) {
+for (def run in patcher.runs + tasks.userdevConfig.runs) {
    if (run.parents) continue // We already added this to the parent run config
    //run.property 'bsl.debug', 'true'
    run.args '--gameDir', '.'
@@ -309,7 +318,7 @@ tasks.register('downloadVersionManifest', Download) {
 tasks.register('downloadJson', Download) {
    dependsOn downloadVersionManifest
    inputs.file downloadVersionManifest.dest
-    src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url }
+    src { downloadVersionManifest.dest.json.versions.find { it.id == MC_VERSION }.url }
    dest file("build/versions/$MC_VERSION/version.json")
    useETag 'all'
    onlyIfModified true
@@ -349,8 +358,8 @@ tasks.register('extractInheritance', ExtractInheritance) {
    tool = INSTALLER_TOOLS + ':fatjar'
    args.add '--annotations'
    input = genJoinedBinPatches.cleanJar
-    libraries.addAll downloadLibraries.librariesOutput.map { rf -> 
-        java.nio.file.Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) 
+    libraries.addAll downloadLibraries.librariesOutput.map { rf ->
+        Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).toList()
    }
 }
 tasks.register("findFieldInstanceChecks", FieldCompareFinder) {
@@ -377,16 +386,18 @@ tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
    predicate = {
        parent, node, insn ->
            'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
-            && insn.getOpcode() == Opcodes.INVOKEVIRTUAL
-            && insn.name.equals('m_6518_')
-            && insn.desc.equals('(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;')
+            && insn.getOpcode() === Opcodes.INVOKEVIRTUAL
+            && insn.name == 'm_6518_'
+            && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;'
    }
 }
 tasks.register('validateDeprecations', ValidateDeprecations) {
    input = tasks.jar.archiveFile
    mcVersion = MC_VERSION
 }
-tasks.jar.finalizedBy 'validateDeprecations'
+tasks.named('jar', Jar).configure {
+    finalizedBy 'validateDeprecations'
+}
 tasks.register("downloadInstaller", DownloadMavenArtifact) {
    artifact = "net.minecraftforge:installer:2.2.+:fatjar"
    changing = true
@@ -536,7 +547,7 @@ CheckTask.registerTask(tasks, 'Excs', CheckExcs) {
 }

 CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
-    dependsOn genPatches
+    dependsOn 'genPatches'
    patchDir = file("$rootDir/patches")
    patchesWithS2SArtifact = [
            'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
@@ -544,7 +555,7 @@ CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
    ]
 }

-genPatches {
+tasks.named('genPatches', GeneratePatches).configure {
    finalizedBy checkAndFixPatches
    autoHeader true
    lineEnding = '\n'
@@ -553,10 +564,10 @@ genPatches {
 def baseForgeVersionProperty = project.objects.property(String)
 baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) })
 baseForgeVersionProperty.finalizeValueOnRead()
-def jarCompatibilityTaskSetup = { task ->
+final jarCompatibilityTaskSetup = { Task task ->
    task.group = 'jar compatibility'
    task.onlyIf {
-        baseForgeVersionProperty.getOrNull() != null
+        baseForgeVersionProperty.getOrNull() !== null
    }
 }

@@ -640,8 +651,8 @@ tasks.register('installerJson', InstallerJson) {
    input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)

    doFirst {
-        def libs = libraries
-        def INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS)
+        var libs = libraries
+        String[] INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS)
        json.putAll([
            _comment: launcherJson.json._comment,
            hideExtract: true,
@@ -707,6 +718,34 @@ tasks.register('installerJson', InstallerJson) {
            ],
            processors: [
                [
+                    sides: ['server'],
+                    jar: INSTALLER_TOOLS,
+                    classpath: INSTALLER_TOOLS_CLASSPATH,
+                    args: [
+                        '--task', 'EXTRACT_FILES',
+                        '--archive', '{INSTALLER}',
+
+                        '--from', 'data/README.txt',
+                        '--to', '{ROOT}/README.txt',
+
+                        '--from', 'data/run.sh',
+                        '--to', '{ROOT}/run.sh',
+                        '--exec', '{ROOT}/run.sh',
+
+                        '--from', 'data/run.bat',
+                        '--to', '{ROOT}/run.bat',
+
+                        '--from', 'data/user_jvm_args.txt',
+                        '--to', '{ROOT}/user_jvm_args.txt',
+                        '--optional', '{ROOT}/user_jvm_args.txt',
+
+                        '--from', 'data/unix_args.txt',
+                        '--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt",
+
+                        '--from', 'data/win_args.txt',
+                        '--to', "{ROOT}/libraries/${MAVEN_PATH}/win_args.txt"
+                    ]
+                ], [
                    sides: ['server'],
                    jar: INSTALLER_TOOLS,
                    classpath: INSTALLER_TOOLS_CLASSPATH,
@@ -814,12 +853,12 @@ tasks.register('installerJson', InstallerJson) {

 tasks.named('universalJar').configure {
    dependsOn downloadCrowdin
-        from zipTree(downloadCrowdin.dest).matching {
+    from zipTree(downloadCrowdin.dest).matching {
        include 'assets/forge/lang/*.json'
    }

    from(EXTRA_TXTS)
-    duplicatesStrategy = 'exclude'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
    exclude '.cache'

    manifest {
@@ -856,6 +895,29 @@ tasks.register('installerJar', InstallerJar) {
    from(genServerBinPatches.output) {
        rename { 'data/server.lzma' }
    }
+
+    final var argsFile = rootProject.file('server_files/args.txt')
+    final Map<String, Map<String, String>> tokens = [tokens: [
+            SHIM_JAR_FILE: serverShimJar.archiveFileName.get(),
+            MAVEN_PATH: MAVEN_PATH
+    ]]
+    from(argsFile) {
+        filter(tokens, ReplaceTokens)
+        into 'data'
+        rename { 'unix_args.txt' }
+    }
+    from(argsFile) {
+        filter(tokens, ReplaceTokens)
+        into 'data'
+        rename { 'win_args.txt' }
+    }
+
+    from(rootProject.file('server_files')) {
+        filter(tokens, ReplaceTokens)
+        into 'data'
+        exclude 'args.txt'
+    }
+
    jarSigner.sign(it)
 }

@@ -1029,6 +1091,4 @@ publishing {

 // Make sure we run bin compat checking during local testing.
 if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD)
-    publish.dependsOn(':forge:checkJarCompatibility')
-
-apply from: rootProject.file('build_forge_eclipse.gradle')
+    tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }
@@ -1,44 +0,0 @@
-apply plugin: 'eclipse'
-
-eclipse {
-    classpath.file.whenMerged {
-        def minecraft = entries.find { it.path == 'src/main/java' }
-        if (minecraft == null) throw new IllegalStateException("You must run `setup` task before importing")
-        // Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
-        minecraft.entryAttributes['ignore_optional_problems'] = 'true'
-        
-        def mods = [
-            'src/main/java':      'minecraft',
-            'src/main/resources': 'minecraft',
-            'src/test/java':      'minecraft-test',
-            'src/test/resources': 'minecraft-test',
-            
-            'main-java':      'forge',
-            'main-resources': 'forge',
-            'generated':      'forge',
-            
-            'test-java':      'forge-test',
-            'test-resources': 'forge-test',
-            'test-generated': 'forge-test',
-        ]
-        
-        entries.forEach { e -> 
-            if ('src'.equals(e.kind) && e.hasProperty('output')) {
-                if (mods.containsKey(e.path))
-                    e.output = 'bin/' + mods[e.path]
-                //else
-                //    throw new IllegalStateException('Unknown path: ' + e.toString())
-            }
-        }
-    }
-    
-    // Filter out the run directory
-    project.resourceFilter {
-        appliesTo = 'FOLDERS'
-        type = 'EXCLUDE_ALL'
-        matcher {
-            id = 'org.eclipse.ui.ide.multiFilter'
-            arguments = '1.0-name-matches-false-true-run'
-        }
-    }
-}
@@ -40,8 +40,8 @@ tasks.register('generateResources') {

 // Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
 tasks.withType(JavaCompile).configureEach {
-    dependsOn(generateResources)
-    dependsOn(processResources) // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
+    dependsOn 'generateResources'
+    dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
    options.warnings = false // Shutup deprecated for removal warnings
 }
@@ -61,7 +61,7 @@ tasks.register('copyEclipseSettings') {
            def temp = new CleanProperties().load(file)
            def exst = new CleanProperties().load(target)
            exst.put('eclipse.preferences.version', '1')
-            temp.forEach(exst::put)
+            exst.putAll(temp)
            exst.store(target)
        }
    }
@@ -73,4 +73,12 @@ eclipse {
    //autoBuildTasks writeManifest
    // Run when importing the project
    synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
-}
+}
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
@@ -2,16 +2,15 @@

 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.2&query=$.promos["1.20.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.2-&query=$.promos["1.20.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.4-&query=$.promos["1.20.4-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.4-&query=$.promos["1.20.4-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
 )][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon]

 Forge is a free, open-source modding API all of your favourite mods use!

-| Version |    Support    |
-|---------| ------------- |
-| 1.20.x  |    Active     |
-| 1.19.x  |    Legacy     |
+| Version      | Support                     |
+|--------------|-----------------------------|
+| All versions | [Supported][Support-Policy] |

 * [Download]
 * [Forum]
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
 
 For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].

+## Required Java Versions
+
+We require the version of Java that Minecraft requires, which is currently:
+
+| Minecraft     | Java              |
+|---------------|-------------------|
+| 1.20.6+       | [21][Adoptium-21] |
+| 1.18 - 1.20.4 | [17][Adoptium-17] |
+| 1.17.1        | [16][Adoptium-16] |
+| 1.16.5-       | [8][Adoptium-8]   |
+
+**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
+
 # Creating Mods

 [See the "Getting Started" section in the Forge Documentation][Getting-Started].
@@ -63,8 +75,15 @@ Please ensure you have a valid email address associated with your GitHub account

 [Download]: https://files.minecraftforge.net/

+[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
+[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
+[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
+[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
+[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
+
 [Forum]: https://forums.minecraftforge.net/
 [Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
+[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy

 [Discord]: https://discord.minecraftforge.net/

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
 }

@@ -40,7 +40,7 @@ tasks.named('jar', Jar).configure {
    }
 }

-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
    options.compilerArgs << '-Xlint:-unchecked'
 }

@@ -64,4 +64,4 @@ publishing {
    repositories {
        maven gradleutils.publishingForgeMaven
    }
-}
+}
@@ -9,41 +9,35 @@ import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;

-import java.util.ArrayList;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;

+/**
+ * Used to allow access to certain things from the game layer
+ */
 public class Bindings {
-    private static final Bindings INSTANCE = new Bindings();
+    private Bindings() {}

-    private final IBindingsProvider provider;
-
-    private Bindings() {
-        var providers = new ArrayList<IBindingsProvider>(1);
-        for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) {
-            try {
-                providers.add(itr.next());
-            } catch (ServiceConfigurationError sce) {
-                sce.printStackTrace();
-            }
-        }
-
-        if (providers.size() != 1)
-            throw new IllegalStateException("Could not find bindings provider: " + providers);
-
-        this.provider = providers.get(0);
-    }
+    /**
+     * The provider of the bindings
+     * @implNote May also throw a {@link ServiceConfigurationError}
+     */
+    private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
+            .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));

+    /**
+     * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
+     */
    public static Supplier<IEventBus> getForgeBus() {
-        return INSTANCE.provider.getForgeBusSupplier();
+        return PROVIDER.getForgeBusSupplier();
    }

    public static Supplier<I18NParser> getMessageParser() {
-        return INSTANCE.provider.getMessageParser();
+        return PROVIDER.getMessageParser();
    }

    public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return INSTANCE.provider.getConfigConfiguration();
+        return PROVIDER.getConfigConfiguration();
    }
 }
@@ -96,5 +96,26 @@ public interface IExtensionPoint<T extends Record>
    @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
    record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
        public static final String IGNORESERVERONLY = "SERVER_ONLY";
+
+        /**
+         * Ignores any version information coming from the server - use for server only mods
+         */
+        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
+
+        /**
+         * Ignores all information and provides no information
+         * <p>Note: If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or
+         * Open to LAN), consider setting {@code clientSideOnly=true} in the root of your mods.toml.</p>
+         */
+        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
+
+        /**
+         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
+         * instead of a {@link Supplier}.
+         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
+         */
+        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+            this(() -> version, remoteVersionTest);
+        }
    }
 }
@@ -21,6 +21,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

@@ -58,15 +59,16 @@ public abstract class ModContainer
        this.modInfo = info;
        this.modLoadingStage = ModLoadingStage.CONSTRUCT;

-        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
+        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
+                .orElseGet(() -> info.getOwningFile().isClientSideOnly() ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
        Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
            case "MATCH_VERSION" -> // default displaytest checks for version string match
                    () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
                        (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
            case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
            case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    () -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
            case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
            default -> // any other value throws an exception
                    throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
@@ -145,6 +147,22 @@ public abstract class ModContainer
        extensionPoints.put(point, extension);
    }

+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
+    }
+
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
+    }
+
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
    public void addConfig(final ModConfig modConfig) {
       configs.put(modConfig.getType(), modConfig);
    }
@@ -47,7 +47,7 @@ import java.util.stream.Stream;
 */
 public class ModList
 {
-    private static Logger LOGGER = LogManager.getLogger();
+    //private static final Logger LOGGER = LogManager.getLogger();
    private static ModList INSTANCE;
    private final List<IModFileInfo> modFiles;
    private final List<IModInfo> sortedList;
@@ -120,14 +120,14 @@ public class ModList
        return executor -> gather(
                this.mods.stream()
                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
-                .collect(Collectors.toList()))
-            .thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
+                .toList()
+        ).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
    }
    static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
        if (t.stream().noneMatch(e->e.getValue()!=null)) {
            return CompletableFuture.completedFuture(null);
        } else {
-            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
+            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
            CompletableFuture<Void> cf = new CompletableFuture<>();
            final RuntimeException accumulator = new RuntimeException();
            cf.completeExceptionally(accumulator);
@@ -6,6 +6,7 @@
 package net.minecraftforge.fml;

 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Streams;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.FMLEnvironment;
@@ -32,6 +33,7 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import static net.minecraftforge.fml.Logging.CORE;
 import static net.minecraftforge.fml.Logging.LOADING;
@@ -91,13 +93,13 @@ public class ModLoader
    {
        INSTANCE = this;
        this.loadingModList = FMLLoader.getLoadingModList();
-        this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream()
+        this.loadingExceptions = this.loadingModList.getErrors().stream()
                .flatMap(ModLoadingException::fromEarlyException)
                .collect(Collectors.toList());
-        this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
+        this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
                .collect(Collectors.toList());
-        FMLLoader.getLoadingModList().getModFiles().stream()
+        this.loadingModList.getModFiles().stream()
                .filter(ModFileInfo::missingLicense)
                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
@@ -228,10 +230,9 @@ public class ModLoader
        } catch (CompletionException e) {
            loadingStateValid = false;
            Throwable t = e.getCause();
-            final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed())
-                    .filter(obj -> !(obj instanceof ModLoadingException))
-                    .collect(Collectors.toList());
-            if (!notModLoading.isEmpty()) {
+            boolean hasNotModLoadingEx = Arrays.stream(t.getSuppressed())
+                    .anyMatch(obj -> !(obj instanceof ModLoadingException));
+            if (hasNotModLoadingEx) {
                LOGGER.fatal("Encountered non-modloading exceptions!", e);
                statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
                throw e;
@@ -257,10 +258,10 @@ public class ModLoader
                .stream()
                .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .toList();
        if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
+            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
+            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();

            LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                    modFile.getFilePath(),
@@ -278,7 +279,7 @@ public class ModLoader
            loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
        }
        // remove errored mod containers
-        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
+        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
    }

    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
@@ -8,38 +8,54 @@ package net.minecraftforge.fml;
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.config.IConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.loading.FMLLoader;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

+import java.util.function.BiPredicate;
 import java.util.function.Supplier;

 public class ModLoadingContext
 {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
+    private ModContainer activeContainer;
    private Object languageExtension;
    private ModLoadingStage stage;

+    /**
+     * @deprecated Use the context provided by your language loader in your mod's constructor.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public static ModLoadingContext get() {
        return context.get();
    }

-    private ModContainer activeContainer;
-
+    /**
+     * @deprecated Going to be moved to ForgeHooks for internal use.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public void setActiveContainer(final ModContainer container) {
        this.activeContainer = container;
        this.languageExtension = container == null ? null : container.contextExtension.get();
    }

+    /**
+     * Going to be moved to ForgeHooks for internal use.
+     * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public ModContainer getActiveContainer() {
        return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
    }

+    @Deprecated(forRemoval = true, since = "1.21.1")
    public String getActiveNamespace() {
        return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
    }

+    public ModContainer getContainer() {
+        return getActiveContainer();
+    }
+
    /**
     * Register an {@link IExtensionPoint} with the mod container.
     * @param point The extension point to register
@@ -47,29 +63,67 @@ public class ModLoadingContext
     * @param <T> The type signature of the extension operator
     */
    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
-        getActiveContainer().registerExtensionPoint(point, extension);
+        getContainer().registerExtensionPoint(point, extension);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
+     */
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        getContainer().registerDisplayTest(() -> displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
+     */
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        getContainer().registerDisplayTest(displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
+     */
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
+     */
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
    }

    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
        if (spec.isEmpty())
        {
            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
+            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
            return;
        }

-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
+        getContainer().addConfig(new ModConfig(type, spec, getContainer()));
    }

    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
        if (spec.isEmpty())
        {
            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
+            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
            return;
        }

-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
+        getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
    }


@@ -12,8 +12,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;

-public class ModLoadingWarning
-{
+public class ModLoadingWarning {
    /**
     * Mod Info for mod with warning
     */
@@ -48,8 +48,8 @@ public class VersionChecker {
        BETA(),
        BETA_OUTDATED(6, true, true);

-        final int sheetOffset;
-        final boolean draw, animated;
+        private final int sheetOffset;
+        private final boolean draw, animated;

        Status() {
            this(0, false, false);
@@ -72,6 +72,10 @@ public class VersionChecker {
        public boolean isAnimated() {
            return animated;
        }
+
+        public boolean isOutdated() {
+            return this == OUTDATED || this == BETA_OUTDATED;
+        }
    }

    public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
@@ -211,7 +215,7 @@ public class VersionChecker {
                    LOGGER.warn("Failed to process update information", e);
                    status = FAILED;
                }
-                results.put(mod, new CheckResult(status, target, changes, display_url));
+                RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
            }
        }.start();
    }
@@ -226,10 +230,10 @@ public class VersionChecker {
        return ret;
    }

-    private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
+    private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
    private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);

    public static CheckResult getResult(IModInfo mod) {
-        return results.getOrDefault(mod, PENDING_CHECK);
+        return RESULTS.getOrDefault(mod, PENDING_CHECK);
    }
 }
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
 }

@@ -44,11 +44,11 @@ dependencies {
    testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
 }

-test {
+tasks.named('test', Test).configure {
    useJUnitPlatform()
 }

-jar {
+tasks.named('jar', Jar).configure {
    manifest {
        attributes([
            'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
@@ -65,7 +65,7 @@ jar {
    }
 }

-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
    options.compilerArgs << '-Xlint:unchecked'
 }

@@ -89,4 +89,4 @@ publishing {
    repositories {
        maven gradleutils.publishingForgeMaven
    }
-}
+}
@@ -14,9 +14,7 @@ import net.minecraftforge.fml.loading.ImmediateWindowProvider;
 import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.PointerBuffer;
-import org.lwjgl.glfw.GLFWImage;
 import org.lwjgl.glfw.GLFWVidMode;
-import org.lwjgl.stb.STBImage;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.util.tinyfd.TinyFileDialogs;
@@ -30,9 +28,8 @@ import java.io.InputStreamReader;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.URI;
-import java.nio.ByteBuffer;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -50,7 +47,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.IntConsumer;
 import java.util.function.IntSupplier;
 import java.util.function.LongSupplier;
@@ -80,7 +76,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
    private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
    private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);

-    private ColourScheme colourScheme;
+    private ColourScheme colourScheme = ColourScheme.RED;
    private ElementShader elementShader;

    private RenderElement.DisplayContext context;
@@ -139,13 +135,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
            this.colourScheme = ColourScheme.BLACK;
        } else {
            try {
-                var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Paths.get("options.txt")));
-                var options = optionLines.stream().map(l -> l.split(":")).filter(a -> a.length == 2).collect(Collectors.toMap(a -> a[0], a -> a[1]));
-                var colourScheme = Boolean.parseBoolean(options.getOrDefault("darkMojangStudiosBackground", "false"));
-                this.colourScheme = colourScheme ? ColourScheme.BLACK : ColourScheme.RED;
-            } catch (IOException ioe) {
-                // No options
-                this.colourScheme = ColourScheme.RED; // default to red colourscheme
+                // check the options file for the colour scheme
+                var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
+                var keyName = "darkMojangStudiosBackground:";
+                for (String line : optionLines) {
+                    if (line.startsWith(keyName)) {
+                        this.colourScheme = line.startsWith("true", keyName.length()) ? ColourScheme.BLACK : ColourScheme.RED;
+                        break;
+                    }
+                }
+            } catch (IOException e) {
+                this.colourScheme = ColourScheme.RED; // fallback to red colourScheme
            }
        }
        this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
@@ -229,7 +229,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
            LOGGER.error("Crash during font initialization", t);
            crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
        }
-        this.elements = new ArrayList<>(Arrays.asList(
+        this.elements = new ArrayList<>(List.of(
            RenderElement.anvil(font),
            RenderElement.logMessageOverlay(font),
            RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion),
@@ -364,14 +364,15 @@ public class DisplayWindow implements ImmediateWindowProvider {
        glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
        glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
        glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
-        if (mcVersion != null) {
-            // this emulates what we would get without early progress window
-            // as vanilla never sets these, so GLFW uses the first window title
-            // set them explicitly to avoid it using "FML early loading progress" as the class
-            String vanillaWindowTitle = "Minecraft* " + mcVersion;
-            glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
-            glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
-        }
+
+        String vanillaWindowTitle = "Minecraft* ";
+        if (mcVersion != null) vanillaWindowTitle += mcVersion;
+
+        // this emulates what we would get without early progress window
+        // as vanilla never sets these, so GLFW uses the first window title
+        // set them explicitly to avoid it using "FML early loading progress" as the class
+        glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
+        glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);

        long primaryMonitor = glfwGetPrimaryMonitor();
        if (primaryMonitor == 0) {
@@ -393,7 +394,8 @@ public class DisplayWindow implements ImmediateWindowProvider {
        }, 10, TimeUnit.SECONDS);
        int versidx = 0;
        var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
-        final String[] lastGLError=new String[GL_VERSIONS.length];
+        boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
+        final String[] lastGLError = new String[GL_VERSIONS.length];
        do {
            final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
            if (skipVersions.contains(glVersionToTry)) {
@@ -402,11 +404,23 @@ public class DisplayWindow implements ImmediateWindowProvider {
                continue;
            }
            LOGGER.info("Trying GL version " + glVersionToTry);
+            if (showHelpLog && versidx == 0) {
+                LOGGER.info("""
+                If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
+                
+                Possible solutions:
+                A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
+                B) Check for driver updates on the graphics brand's website
+                C) Try reinstalling your graphics drivers
+                D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
+                
+                You can safely ignore this message if the game starts up successfully.""");
+            }
            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
            glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
            glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-            window = glfwCreateWindow(winWidth, winHeight, "Minecraft: Forge Loading...", 0L, 0L);
+            window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
            var erridx = versidx;
            handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
            if (lastGLError[versidx] != null) {
@@ -434,6 +448,9 @@ public class DisplayWindow implements ImmediateWindowProvider {
        this.glVersion = gotVersion;
        this.window = window;

+        if (showHelpLog)
+            FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
+
        int[] x = new int[1];
        int[] y = new int[1];
        glfwGetMonitorPos(primaryMonitor, x, y);
@@ -451,19 +468,19 @@ public class DisplayWindow implements ImmediateWindowProvider {
        glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);

        // Attempt setting the icon
-        int[] channels = new int[1];
-        try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
-            final ByteBuffer imgBuffer;
-            try (GLFWImage glfwImages = GLFWImage.malloc()) {
-                imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
-                glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
-                glfwSetWindowIcon(window, glfwImgBuffer);
-                STBImage.stbi_image_free(imgBuffer);
-            }
-        } catch (NullPointerException e) {
-            System.err.println("Failed to load forge logo");
-        }
-        handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
+//        int[] channels = new int[1];
+//        try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
+//            final ByteBuffer imgBuffer;
+//            try (GLFWImage glfwImages = GLFWImage.malloc()) {
+//                imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
+//                glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
+//                glfwSetWindowIcon(window, glfwImgBuffer);
+//                STBImage.stbi_image_free(imgBuffer);
+//            }
+//        } catch (NullPointerException e) {
+//            System.err.println("Failed to load forge logo");
+//        }
+//        handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));

        glfwSetFramebufferSizeCallback(window, this::fbResize);
        glfwSetWindowPosCallback(window, this::winMove);
@@ -598,8 +615,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
        var fm = layer.findModule("forge").orElseThrow();
        getClass().getModule().addReads(fm);
        var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
-        var methods = Arrays.stream(clz.getMethods()).filter(m-> Modifier.isStatic(m.getModifiers())).collect(Collectors.toMap(Method::getName, Function.identity()));
-        loadingOverlay = methods.get("newInstance");
+        loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
    }

    public int getFramebufferTextureId() {
@@ -6,35 +6,44 @@
 package net.minecraftforge.fml.earlydisplay;

 import com.sun.management.OperatingSystemMXBean;
+import net.minecraftforge.fml.loading.FMLConfig;

 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;

 public class PerformanceInfo {
+    private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();

+    private final boolean showCPUUsage;
    private final OperatingSystemMXBean osBean;
-    private final MemoryMXBean memoryBean;
-    float memory;
+
+    private float memory;
    private String text;

    PerformanceInfo() {
-        osBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class);
-        memoryBean = ManagementFactory.getMemoryMXBean();
+        showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
+        osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
    }

    void update() {
-        final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
+        final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
        memory = (float) heapusage.getUsed() / heapusage.getMax();
+
+        if (!showCPUUsage) {
+            text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
+            return;
+        }
+
        var cpuLoad = osBean.getProcessCpuLoad();
        String cpuText;
        if (cpuLoad == -1) {
-            cpuText = String.format("*CPU: %.1f%%", osBean.getCpuLoad() * 100f);
+            cpuText = "*CPU: %.1f%%".formatted(osBean.getCpuLoad() * 100f);
        } else {
-            cpuText = String.format("CPU: %.1f%%", cpuLoad * 100f);
+            cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
        }

-        text = String.format("Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s", heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
+        text = "Memory: %d/%dMB (%.1f%%)  %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
    }

    String text() {
@@ -34,11 +34,14 @@ public class RenderElement {
            };
        }
    }
+    @FunctionalInterface
    interface TextureRenderer {
        void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
    }
+    @FunctionalInterface
    interface Initializer extends Supplier<Renderer> {}

+    @FunctionalInterface
    interface TextGenerator {
        void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx);
    }
@@ -201,14 +204,17 @@ public class RenderElement {
        bar.then(label).accept(buffer, context, frameNumber);
    }

+    @FunctionalInterface
    interface ColourFunction {
        int colour(int frame);
    }

+    @FunctionalInterface
    interface ProgressDisplay {
        float[] progress(int frame);
    }

+    @FunctionalInterface
    interface BarPosition {
        int[] location(DisplayContext context);
    }
@@ -280,7 +286,7 @@ public class RenderElement {
        if (num < min) {
            return min;
        } else {
-            return num > max ? max : num;
+            return Math.min(num, max);
        }
    }

@@ -288,7 +294,7 @@ public class RenderElement {
        if (num < min) {
            return min;
        } else {
-            return num > max ? max : num;
+            return Math.min(num, max);
        }
    }

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
 }

@@ -65,7 +65,7 @@ tasks.named('jar', Jar).configure {
    }
 }

-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
    options.compilerArgs << '-Xlint:unchecked'
 }

@@ -94,10 +94,10 @@ publishing {
 tasks.register('writeForgeVersionJson') {
    doLast {
        file('src/main/resources/forge_version.json').json = [
-            'forge': FORGE_VERSION,
-            'mc': MC_VERSION,
-            'mcp': MCP_VERSION
-        ] as LinkedHashMap
+            forge: FORGE_VERSION,
+            mc: MC_VERSION,
+            mcp: MCP_VERSION
+        ]
    }
 }

@@ -36,9 +36,9 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 */
 public class CapabilityTokenSubclass implements ILaunchPluginService {

-    private final String FUNC_NAME = "getType";
-    private final String FUNC_DESC = "()Ljava/lang/String;";
-    private final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
+    private static final String FUNC_NAME = "getType";
+    private static final String FUNC_DESC = "()Ljava/lang/String;";
+    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.

    @Override
    public String name() {
@@ -51,7 +51,14 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
    @Override
    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
    {
-        return isEmpty ? NAY : YAY;
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
+            return NAY;
+        
+        return YAY;
    }

    @Override
@@ -75,7 +82,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
            SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
            reader.accept(new SignatureVisitor(Opcodes.ASM9)
            {
-                Deque<String> stack = new ArrayDeque<>();
+                final Deque<String> stack = new ArrayDeque<>();

                @Override
                public void visitClassType(final String name)
@@ -113,7 +120,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
        }
    }

-    private static class Holder {
+    private static final class Holder {
        String value;
    }

@@ -8,6 +8,7 @@ package net.minecraftforge.fml.common.asm;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -35,7 +36,11 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
            new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
            new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
    ).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
-    private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
+    private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
+            .map(it -> it.replace('.', '/'))
+            .collect(Collectors.toUnmodifiableSet());
+    private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
+    private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;

    @Override
    public String name() {
@@ -46,13 +51,29 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);

    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        // Let's skip processing classes that definitely don't have object holders
+        String internalName = classType.getInternalName();
+
+        // Forge classes that aren't in the debug package (that package is used for tests)
+        if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
+            return NAY;
+
+        // Vanilla classes that don't have object holders
+        if (internalName.startsWith("com/mojang/"))
+            return NAY;
+
+        // ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
+        if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
+            return NAY;
+
+        return YAY;
    }

-    private boolean hasHolder(List<AnnotationNode> lst)
-    {
+    private boolean hasHolder(List<AnnotationNode> lst) {
        return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
    }

@@ -76,10 +97,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
    {
        final AtomicBoolean changes = new AtomicBoolean();
        //Must be public static finals, and non-array objects
-        final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;

        //Fix Annotated Fields before injecting from class level
-        classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
+        classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
        {
            int prev = f.access;
            f.access &= ~Opcodes.ACC_FINAL; //Strip final
@@ -89,7 +109,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {

        if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
        {
-            classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f ->
+            classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
            {
                int prev = f.access;
                f.access &= ~Opcodes.ACC_FINAL;
@@ -28,15 +28,16 @@ import org.slf4j.Logger;
 public class RuntimeEnumExtender implements ILaunchPluginService {

    private static final Logger LOGGER = LogUtils.getLogger();
-    private final Type STRING = Type.getType(String.class);
-    private final Type ENUM = Type.getType(Enum.class);
-    private final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
-    private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
-    private final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
-    private final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
-    private final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
-    private final String NAME_DESC = Type.getMethodDescriptor(STRING);
-    private final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
+    private static final Type STRING = Type.getType(String.class);
+    private static final Type ENUM = Type.getType(Enum.class);
+    private static final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
+    private static final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
+    private static final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
+    private static final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
+    private static final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
+    private static final String NAME_DESC = Type.getMethodDescriptor(STRING);
+    private static final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
+    private static final int FLAGS = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;

    @Override
    public String name() {
@@ -47,9 +48,15 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);

    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
+            return NAY;
+
+        return YAY;
    }

    @Override
@@ -58,25 +65,24 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
        if ((classNode.access & Opcodes.ACC_ENUM) == 0)
            return ComputeFlags.NO_REWRITE;

-        Type array = Type.getType("[" + classType.getDescriptor());
-        final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
-
-        FieldNode values = classNode.fields.stream().filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)).findFirst().orElse(null);
-
-        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
+        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
            return ComputeFlags.NO_REWRITE;
-        }
+
+        Type array = Type.getType("[" + classType.getDescriptor());
+        String arrayDesc = array.getDescriptor();
+
+        FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);

        //Static methods named "create" with first argument as a string
        List<MethodNode> candidates = classNode.methods.stream()
                .filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
-                .collect(Collectors.toList());
+                .toList();

        if (candidates.isEmpty()) {
            throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
        }

-        candidates.forEach(mtd ->
+        for (var mtd : candidates)
        {
            Type[] args = Type.getArgumentTypes(mtd.desc);
            if (args.length == 0 || !args[0].equals(STRING)) {
@@ -108,8 +114,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
            Type[] ctrArgs = new Type[args.length + 1];
            ctrArgs[0] = STRING;
            ctrArgs[1] = Type.INT_TYPE;
-            for (int x = 1; x < args.length; x++)
-                ctrArgs[1 + x] = args[x];
+            System.arraycopy(args, 1, ctrArgs, 2, args.length - 1);

            String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);

@@ -231,7 +236,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
                ins.load(vars, classType);
                ins.areturn(classType);
            }
-        });
+        }
        return ComputeFlags.COMPUTE_FRAMES;
    }

@@ -11,7 +11,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;

 public class BackgroundWaiter {
-    private static ExecutorService runner = Executors.newSingleThreadExecutor();
+    private static final ExecutorService runner = Executors.newSingleThreadExecutor();

    public static void runAndTick(Runnable r, Runnable tick) {
        ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
@@ -36,7 +36,10 @@ public class FMLConfig
        EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"),
        EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized"),
        EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
-        EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?")
+        EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
+        EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
+        EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
+        DETECT_NON_FORGE_MODS_TOML("detectNonForgeModsToml", Boolean.TRUE, "Attempt to detect non-Forge mods from their mods.toml to show a friendlier error message. This is a best-effort feature - disable if it causes issues."),
        ;

        private final String entry;
@@ -44,7 +44,7 @@ public class FMLLoader {
    private static LoadingModList loadingModList;
    private static RuntimeDistCleaner runtimeDistCleaner;
    private static Path gamePath;
-    private static VersionInfo versionInfo = VersionInfo.detect();
+    private static final VersionInfo versionInfo = VersionInfo.detect();
    private static String launchHandlerName;
    private static CommonLaunchHandler commonLaunchHandler;
    public static Runnable progressWindowTick;
@@ -57,6 +57,9 @@ public class FMLLoader {
        LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
        LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());

+        // Allows us to communicate properties with other services through ModLauncher
+        setupBlackboardKeys();
+
        checkPackage(ITransformationService.class, "4.0", "ModLauncher");
        accessTransformer  = getPlugin(env, "accesstransformer",  "1.0", "AccessTransformer");
        /*eventBus       =*/ getPlugin(env, "eventbus",           "1.0", "EventBus");
@@ -120,6 +123,12 @@ public class FMLLoader {
          return providers.get(0);
    }

+    private static void setupBlackboardKeys() {
+        LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
+        var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
+        Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
+    }
+
    static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments) {
        final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
        arguments.put("launchTarget", launchTarget);
@@ -181,7 +190,7 @@ public class FMLLoader {
    }

    public static void addAccessTransformer(Path atPath, ModFile modName) {
-        LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath());
+        LOGGER.debug(SCAN, "Adding Access Transformer in {} in {}", atPath, modName.getFilePath());
        accessTransformer.offerResource(atPath, modName.getFileName());
    }

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class LibraryFinder {
-    private static Path libsPath;
-    static Path findLibsPath() {
-        if (libsPath == null) {
-            libsPath = Path.of(System.getProperty("libraryDirectory", "libraries"));
-            if (!Files.isDirectory(libsPath))
-                throw new IllegalStateException("Library directory: `" + libsPath + "` does not exist. Set it via the `libraryDirectory` system property.");
-        }
-        return libsPath;
-    }
-
-    public static Path findPathForMaven(final String group, final String artifact, final String extension, final String classifier, final String version) {
-        return findLibsPath().resolve(MavenCoordinateResolver.get(group, artifact, extension, classifier, version));
-    }
-    public static Path findPathForMaven(final String maven) {
-        return findLibsPath().resolve(MavenCoordinateResolver.get(maven));
-    }
-}
@@ -5,12 +5,14 @@

 package net.minecraftforge.fml.loading;

+import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
+import org.slf4j.Logger;

 import java.net.URL;
 import java.nio.file.Files;
@@ -30,6 +32,7 @@ import java.util.stream.Collectors;
 */
 public class LoadingModList
 {
+    private static final Logger LOGGER = LogUtils.getLogger();
    private static LoadingModList INSTANCE;
    private final List<ModFileInfo> modFiles;
    private final List<ModInfo> sortedList;
@@ -78,9 +81,22 @@ public class LoadingModList

    public void addAccessTransformers()
    {
-        modFiles.stream()
-                .map(ModFileInfo::getFile)
-                .forEach(mod -> mod.getAccessTransformer().ifPresent(path -> FMLLoader.addAccessTransformer(path, mod)));
+        var errors = new ArrayList<EarlyLoadingException.ExceptionData>();
+        for (ModFileInfo modFile : modFiles) {
+            ModFile mod = modFile.getFile();
+            for (Path at : mod.getAccessTransformers()) {
+                if (!Files.exists(at)) {
+                    var message = "Invalid mod file: " + modFile.getFile().getFileName() + ". Missing Access Transformer: " + at;
+                    errors.add(new EarlyLoadingException.ExceptionData(message));
+                    LOGGER.error(message);
+                } else {
+                    FMLLoader.addAccessTransformer(at, mod);
+                }
+            }
+        }
+        if (!errors.isEmpty()) {
+            preLoadErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
+        }
    }

    public void addForScanning(BackgroundScanHandler backgroundScanHandler)
@@ -10,6 +10,8 @@ import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
+
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;

 import java.io.IOException;
@@ -20,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

+@ApiStatus.Internal
 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final Set<String> SERVICES = Set.of(
@@ -76,4 +79,15 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
            .filter(SERVICES::contains)
            .forEach(s -> found.add(new NamedPath(s, path)));
    }
+
+    public static boolean isServiceProvider(Path path) {
+        var jar = SecureJar.from(path);
+
+        for (var providers : jar.moduleDataProvider().descriptor().provides()) {
+            if (SERVICES.contains(providers.service()))
+                return true;
+        }
+
+        return false;
+    }
 }
@@ -54,6 +54,9 @@ public class ModSorter
            ms.buildUniqueList();
        } catch (EarlyLoadingException e) {
            // We cannot build any list with duped mods. We have to abort immediately and report it
+            // Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
+            // So all this is really doing is wasting time.
+            // But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
        }
        // try and validate dependencies
@@ -34,8 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;

-public class RuntimeDistCleaner implements ILaunchPluginService
-{
+public final class RuntimeDistCleaner implements ILaunchPluginService {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
    private static String DIST;
@@ -147,7 +146,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService
        return ret;
    }

-    private boolean remove(final List<AnnotationNode> anns, final String side)
+    private static boolean remove(final List<AnnotationNode> anns, final String side)
    {
        return unpack(anns).stream().
                filter(ann->Objects.equals(ann.desc, ONLYIN)).
@@ -169,9 +168,19 @@ public class RuntimeDistCleaner implements ILaunchPluginService
    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);

    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        // No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client
+        if (FMLEnvironment.dist.isClient() && (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/")))
+            return NAY;
+
+        return YAY;
    }

    private static class LambdaGatherer extends MethodVisitor {
@@ -25,7 +25,7 @@ public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersi
    /*==========================================================================*
     *                        INTERNAL SHIT                                     *
     *==========================================================================*/
-    private static Gson GSON = new GsonBuilder().create();
+    private static final Gson GSON = new GsonBuilder().create();
    private static <T> T readJson(String path, Class<T> type) {
        try (var is = VersionInfo.class.getResourceAsStream(path)) {
            if (is == null)
@@ -36,6 +36,10 @@ public abstract class AbstractModProvider implements IModProvider {
    protected static final String MODS_TOML = "META-INF/mods.toml";

    protected IModLocator.ModFileOrException createMod(Path path) {
+        return this.createMod(path, getDefaultJarModType());
+    }
+
+    protected IModLocator.ModFileOrException createMod(Path path, String defaultType) {
        var mjm = new ModJarMetadata();
        var sj = SecureJar.from(
            jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
@@ -45,11 +49,15 @@ public abstract class AbstractModProvider implements IModProvider {
        IModFile mod;
        var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
        if (type == null)
-            type = getDefaultJarModType();
+            type = defaultType;

        if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
            mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
+            if (ModFileInfo.DETECT_NON_FORGE_MODS_TOML && mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
+                LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
+                return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
+            }
        } else if (type != null) {
            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
            mod = new ModFile(sj, this, this::manifestParser, type);
@@ -109,20 +117,20 @@ public abstract class AbstractModProvider implements IModProvider {
            };
        }

-        try {
-            Files.walk(root)
+        try (var files = Files.walk(root)) {
+            files
                .filter(p -> p.toString().endsWith(".class"))
                .forEach(consumer);

            file.setSecurityStatus(holder.value);
-        } catch(IOException e) {
+        } catch (IOException e) {
            e.printStackTrace();
        }

        LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", file);
    }

-    private static class Holder<T> {
+    private static final class Holder<T> {
        T value;
    }

@@ -132,6 +140,7 @@ public abstract class AbstractModProvider implements IModProvider {
        @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
        @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
        @Override public boolean showAsResourcePack() { return false; }
+        @Override public boolean showAsDataPack() { return false; }
        @Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); }
        @Override public String getLicense() { return license; }
        @Override public IModFile getFile() { return mod; }
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import com.mojang.logging.LogUtils;

 import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
 import net.minecraftforge.forgespi.locating.IModLocator;

 import org.jetbrains.annotations.ApiStatus;
@@ -71,8 +72,11 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
        }

        var ret = new ArrayList<ModFileOrException>();
-        for (var path : claimed)
-            ret.add(createMod(path));
+        for (var path : claimed) {
+            // Filter out anything found by the ServiceLoader
+            if (!ModDirTransformerDiscoverer.isServiceProvider(path))
+                ret.add(createMod(path));
+        }
        return ret;
    }

@@ -12,10 +12,12 @@ import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.BiPredicate;
+import java.util.stream.Stream;
 import java.util.zip.ZipFile;

 import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.*;

+// TODO: [FML][Loader] By the time this is reached, most stuff this checks for is already filtered out - needs fixing.
 public enum InvalidModIdentifier {

    OLDFORGE(filePresent("mcmod.info")),
@@ -23,9 +25,9 @@ public enum InvalidModIdentifier {
    LITELOADER(filePresent("litemod.json")),
    OPTIFINE(filePresent("optifine/Installer.class")),
    BUKKIT(filePresent("plugin.yml")),
-    INVALIDZIP((f,zf) -> !zf.isPresent());
+    INVALIDZIP((f,zf) -> zf.isEmpty()); // note: only this one INVALIDZIP check is ran until the todo on this class is fixed

-    private BiPredicate<Path, Optional<ZipFile>> ident;
+    private final BiPredicate<Path, Optional<ZipFile>> ident;

    InvalidModIdentifier(BiPredicate<Path, Optional<ZipFile>> identifier)
    {
@@ -40,7 +42,7 @@ public enum InvalidModIdentifier {
    public static Optional<String> identifyJarProblem(Path path)
    {
        Optional<ZipFile> zfo = optionalFromException(() -> new ZipFile(path.toFile()));
-        Optional<String> result = Arrays.stream(values()).
+        Optional<String> result = Stream.of(INVALIDZIP).
                                         filter(i -> i.ident.test(path, zfo)).
                                         map(InvalidModIdentifier::getReason).
                                         findAny();
@@ -83,7 +83,14 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
            final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
            final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
            final Path pathInFS = zipFS.getPath("/");
-            return Optional.of(createMod(pathInFS).file());
+            final IModFile.Type parentType = file.getType();
+            final String modType;
+            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
+                modType = IModFile.Type.LIBRARY.name();
+            } else {
+                modType = IModFile.Type.GAMELIBRARY.name();
+            }
+            return Optional.of(createMod(pathInFS, modType).file());
        } catch (Exception e) {
            LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
            final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
@@ -12,6 +12,7 @@ import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.UniqueModListBuilder;
@@ -22,6 +23,7 @@ import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;

+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;

@@ -70,6 +72,8 @@ public class ModDiscoverer {
        List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>();
        boolean successfullyLoadedMods = true;
        List<IModFileInfo> brokenFiles = new ArrayList<>();
+        List<ModFileLoadingException> modFileLoadingExceptions = new ArrayList<>();
+        boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
        ImmediateWindowHandler.updateProgress("Discovering mod files");
        //Loop all mod locators to get the prime mods to load from.
        for (IModLocator locator : modLocatorList) {
@@ -80,7 +84,17 @@ public class ModDiscoverer {
                var exceptions = candidates.stream().map(IModLocator.ModFileOrException::ex).filter(Objects::nonNull).toList();
                if (!exceptions.isEmpty()) {
                    LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} invalid mod files", locator, exceptions.size());
-                    brokenFiles.addAll(exceptions.stream().map(e->e instanceof InvalidModFileException ime ? ime.getBrokenFile() : null).filter(Objects::nonNull).toList());
+                    for (ModFileLoadingException ex : exceptions) {
+                        // pipe exception messages through the discoveryErrorData to avoid swallowing some exceptions and improve error messages
+                        // (no longer a generic "Invalid mod file" for all InvalidModExceptions - it actually shows the exception message now)
+                        if (ex instanceof InvalidModFileException invalidModFileEx) {
+                            var modInfo = invalidModFileEx.getBrokenFile();
+                            brokenFiles.add(modInfo);
+                            discoveryErrorData.add(new EarlyLoadingException.ExceptionData(ex.getMessage(), modInfo));
+                        } else {
+                            discoveryErrorData.add(new EarlyLoadingException.ExceptionData(ex.getMessage()));
+                        }
+                    }
                }
                var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).collect(Collectors.toList());

@@ -88,8 +102,17 @@ public class ModDiscoverer {
                if (!badModFiles.isEmpty()) {
                    LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
                    brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
+                    locatedFiles.removeAll(badModFiles);
                }
-                locatedFiles.removeAll(badModFiles);
+
+                if (distIsDedicatedServer) {
+                    var clientOnlyModFiles = locatedFiles.stream().filter(file -> file.getModFileInfo().isClientSideOnly()).toList();
+                    if (!clientOnlyModFiles.isEmpty()) {
+                        LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
+                        locatedFiles.removeAll(clientOnlyModFiles);
+                    }
+                }
+
                LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
                handleLocatedFiles(loadedFiles, locatedFiles);
            } catch (InvalidModFileException imfe) {
@@ -162,7 +185,7 @@ public class ModDiscoverer {

        //Validate the loading. With a deduplicated list, we can now successfully process the artifacts and load
        //transformer plugins.
-        var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData);
+        var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData, modFileLoadingExceptions);
        validator.stage1Validation();
        return validator;
    }
@@ -52,6 +52,7 @@ public class ModFile implements IModFile {
    private CompletableFuture<ModFileScanData> futureScanResult;
    private List<CoreModFile> coreMods;
    private Path accessTransformer;
+    private List<Path> accessTransformers = Collections.emptyList();

    static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
    private SecureJar.Status securityStatus;
@@ -96,7 +97,11 @@ public class ModFile implements IModFile {
    }

    public Optional<Path> getAccessTransformer() {
-        return Optional.ofNullable(Files.exists(accessTransformer) ? accessTransformer : null);
+        return Optional.ofNullable(accessTransformer);
+    }
+
+    public List<Path> getAccessTransformers() {
+        return accessTransformers;
    }

    public boolean identifyMods() {
@@ -105,7 +110,28 @@ public class ModFile implements IModFile {
        LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
        this.coreMods = ModFileParser.getCoreMods(this);
        this.coreMods.forEach(mi-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {}", mi.getPath()));
-        this.accessTransformer = findResource("META-INF", "accesstransformer.cfg");
+        List<String> cfg;
+        // Note: Some mods may have invalid tomls copied from other projects.
+        // Unfortunately we must protect against those landmines.
+        try {
+            cfg = this.modFileInfo.getConfig().<List<String>>getConfigElement("accessTransformers").orElse(null);
+        } catch (Exception e) {
+            cfg = null;
+            LOGGER.warn("{} contains an invalid 'accessTransformers' TOML entry. Should be e.g. accessTransformers = [\"META-INF/accesstransformer.cfg\", \"META-INF/extra_at.cfg\"] or accessTransformers = [] for no ATs. Falling back to default.", this.getFileName());
+        }
+        if (cfg == null) {
+            var path = findResource("META-INF", "accesstransformer.cfg");
+            if (Files.exists(path)) {
+                this.accessTransformer = path;
+                this.accessTransformers = List.of(path);
+            }
+        } else if (!cfg.isEmpty()) {
+            var paths = new ArrayList<Path>(cfg.size());
+            for (var path : cfg) {
+                paths.add(getSecureJar().getPath(path.replace("\\","/")));
+            }
+            this.accessTransformers = List.copyOf(paths);
+        }
        return true;
    }

@@ -8,12 +8,14 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import com.google.common.base.Strings;
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
+import net.minecraftforge.fml.loading.FMLConfig;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.StringUtils;
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.MavenVersionAdapter;
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import javax.security.auth.x500.X500Principal;
 import java.net.URL;
@@ -29,6 +31,7 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -40,11 +43,22 @@ import java.util.stream.Stream;
 public class ModFileInfo implements IModFileInfo, IConfigurable
 {
    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final String MAYBE_NOT_JAVAFML_VER = "[2,)";
+    private static final String JAVAFML = "javafml";
+
+    @ApiStatus.Internal
+    public static final String NOT_A_FORGE_MOD_PROP = "__FORGE__not_a_forge_mod";
+
+    @ApiStatus.Internal
+    public static final boolean DETECT_NON_FORGE_MODS_TOML = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.DETECT_NON_FORGE_MODS_TOML);
+
    private final IConfigurable config;
    private final ModFile modFile;
    private final URL issueURL;
    private final List<LanguageSpec> languageSpecs;
    private final boolean showAsResourcePack;
+    private final boolean clientSideOnly;
+    private final boolean showAsDataPack;
    private final List<IModInfo> mods;
    private final Map<String,Object> properties;
    private final String license;
@@ -59,23 +73,47 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
        var modLoader = config.<String>getConfigElement("modLoader")
                .orElseThrow(()->new InvalidModFileException("Missing ModLoader in file", this));
        // as is modloader version
-        var modLoaderVersion = config.<String>getConfigElement("loaderVersion")
-                .map(MavenVersionAdapter::createFromVersionSpec)
+        var modLoaderVerStr = config.<String>getConfigElement("loaderVersion")
                .orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this));
+        var modLoaderVersion = MavenVersionAdapter.createFromVersionSpec(modLoaderVerStr);
        this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
+
+        // if true, this might not be a Forge mod
+        boolean maybeNotAForgeMod = DETECT_NON_FORGE_MODS_TOML
+                && modLoader.equals(JAVAFML)
+                && modLoaderVersion.hasRestrictions() // if loaderVersion is not "*"
+                && modLoaderVerStr.equals(MAYBE_NOT_JAVAFML_VER); // if loaderVersion is exactly "[2,)"
+
        // the remaining properties are optional with sensible defaults
        this.license = config.<String>getConfigElement("license")
                .orElse("");
        this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack")
                .orElse(false);
+        this.clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly")
+                .orElse(false);
+        if (this.clientSideOnly) {
+            // if clientSideOnly, then this is definitely a Forge mod
+            maybeNotAForgeMod = false;
+        }
+        this.showAsDataPack = config.<Boolean>getConfigElement("showAsDataPack")
+                .orElse(false);
        this.usesServices = config.<List<String>>getConfigElement("services")
                .orElse(List.of());
-        this.properties = config.<Map<String, Object>>getConfigElement("properties")
-                .orElse(Collections.emptyMap());
-        this.modFile.setFileProperties(this.properties);
        this.issueURL = config.<String>getConfigElement("issueTrackerURL")
                .map(StringUtils::toURL)
                .orElse(null);
+
+        if (maybeNotAForgeMod) {
+            // mark this file as not a Forge mod. Note: this marker may be removed later based on the mod dependencies
+            this.properties = config.<Map<String, Object>>getConfigElement("properties")
+                    .orElse(new LinkedHashMap<>());
+            this.properties.put(NOT_A_FORGE_MOD_PROP, true);
+        } else {
+            this.properties = config.<Map<String, Object>>getConfigElement("properties")
+                    .orElse(Collections.emptyMap());
+        }
+        this.modFile.setFileProperties(this.properties);
+
        final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
        if (modConfigs.isEmpty())
        {
@@ -126,6 +164,18 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
        return this.showAsResourcePack;
    }

+    @Override
+    public boolean isClientSideOnly()
+    {
+        return this.clientSideOnly;
+    }
+
+    @Override
+    public boolean showAsDataPack()
+    {
+        return this.showAsDataPack;
+    }
+
    @Override
    public <T> Optional<T> getConfigElement(final String... key)
    {
@@ -6,6 +6,7 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.electronwill.nightconfig.core.file.FileConfig;
+import com.electronwill.nightconfig.core.io.ParsingException;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.mojang.logging.LogUtils;
@@ -13,6 +14,8 @@ import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

 import java.io.IOException;
@@ -30,7 +33,8 @@ public class ModFileParser {
        return parser.build(modFile);
    }

-    public static IModFileInfo modsTomlParser(final IModFile imodFile) {
+    // Note: Although @Nullable, several other places in FML assume ModFileInfo is not null. Keep this in mind
+    public static @Nullable IModFileInfo modsTomlParser(final IModFile imodFile) {
        ModFile modFile = (ModFile) imodFile;
        LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
        final Path modsjson = modFile.findResource("META-INF", "mods.toml");
@@ -40,10 +44,15 @@ public class ModFileParser {
        }

        final FileConfig fileConfig = FileConfig.builder(modsjson).build();
-        fileConfig.load();
-        fileConfig.close();
-        final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
-        return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
+        try {
+            fileConfig.load();
+            fileConfig.close();
+            final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
+            return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
+        } catch (ParsingException e) {
+            LOGGER.error("Mod candidate {} contains a corrupt or misconfigured toml.", modFile.getFileName());
+            throw new ModFileLoadingException("Mod candidate " + modFile.getFileName() + " contains a corrupt or misconfigured toml.");
+        }
    }

    protected static List<CoreModFile> getCoreMods(final ModFile modFile) {
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;

@ApiStatus.Internal
@@ -213,8 +214,23 @@ public class ModInfo implements IModInfo, IConfigurable {
            this.owner = owner;
            this.modId = config.<String>getConfigElement("modId")
                    .orElseThrow(()->new InvalidModFileException("Missing required field modid in dependency", getOwningFile()));
-            this.mandatory = config.<Boolean>getConfigElement("mandatory")
-                    .orElseThrow(()->new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile()));
+            if (ModFileInfo.DETECT_NON_FORGE_MODS_TOML && this.modId.equals("forge")) {
+                var fileProps = owner.getOwningFile().getFileProperties();
+                // Checking containsKey to avoid a possible exception if the property is not present (due to Collections.emptyMap())
+                if (!fileProps.isEmpty() && fileProps.containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
+                    // if the mod has a dependency on Forge, but we thought it wasn't a Forge mod earlier, we were wrong
+                    // so remove the flag.
+                    fileProps.remove(ModFileInfo.NOT_A_FORGE_MOD_PROP);
+                }
+            }
+            var mandatory = config.<Boolean>getConfigElement("mandatory");
+            if (mandatory.isPresent()) {
+                this.mandatory = mandatory.get();
+            } else if (ModFileInfo.DETECT_NON_FORGE_MODS_TOML && owner.getOwningFile().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
+                this.mandatory = true;
+            } else {
+                throw new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile());
+            }
            this.versionRange = config.<String>getConfigElement("versionRange")
                    .map(MavenVersionAdapter::createFromVersionSpec)
                    .orElse(UNBOUNDED);
@@ -6,11 +6,18 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.mojang.logging.LogUtils;
+
+import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.api.ITransformationService;
-import net.minecraftforge.fml.loading.*;
+import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.ImmediateWindowHandler;
+import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.ModSorter;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

@@ -18,25 +25,30 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;

 public class ModValidator {
    private static final Logger LOGGER = LogUtils.getLogger();
-    //private final Map<IModFile.Type, List<ModFile>> modFiles;
    private final List<ModFile> candidatePlugins;
    private final List<ModFile> candidateMods;
+    private final List<ModFile> gameLibraries;
    private LoadingModList loadingModList;
-    private List<IModFile> brokenFiles;
+    private final List<IModFile> brokenFiles = new ArrayList<>();
    private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;
+    private final List<ModFileLoadingException> modFileLoadingExceptions;

-    public ModValidator(final Map<IModFile.Type, List<ModFile>> modFiles, final List<IModFileInfo> brokenFiles, final List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
-        //this.modFiles = modFiles;
+    public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData, List<ModFileLoadingException> modFileLoadingExceptions) {
        this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
-        this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY)));
+        this.gameLibraries = lst(modFiles.get(IModFile.Type.GAMELIBRARY));
+        this.candidateMods.addAll(this.gameLibraries);
        this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));
        this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
        this.discoveryErrorData = discoveryErrorData;
-        this.brokenFiles = brokenFiles.stream().map(IModFileInfo::getFile).collect(Collectors.toList()); // mutable list
+        this.brokenFiles.addAll(brokenFiles.stream().map(IModFileInfo::getFile).toList());
+        this.modFileLoadingExceptions = modFileLoadingExceptions;
+    }
+
+    public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
+        this(modFiles, brokenFiles, discoveryErrorData, List.of());
    }

    private static List<ModFile> lst(List<ModFile> files) {
@@ -54,8 +66,7 @@ public class ModValidator {
    @NotNull
    private List<ModFile> validateFiles(final List<ModFile> mods) {
        final List<ModFile> brokenFiles = new ArrayList<>();
-        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext(); )
-        {
+        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
            ModFile modFile = iterator.next();
            if (!modFile.getProvider().isValid(modFile) || !modFile.identifyMods()) {
                LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", modFile.getFilePath());
@@ -71,7 +82,26 @@ public class ModValidator {
    }

    public ITransformationService.Resource getModResources() {
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, this.candidateMods.stream().map(IModFile::getSecureJar).toList());
+        var mods = new ArrayList<SecureJar>();
+        // Add only the valid mods that we will be attempting to load.
+        // If any detectable error happens during the sorting process {missing deps, duplicates,
+        // This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display.
+        // This won't fix them all as they are still loaded and will still apply but it might help
+        for (var info : this.loadingModList.getModFiles())
+            mods.add(info.getFile().getSecureJar());
+
+        // Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing
+        // that clusterfuck of a system, have this simple de-duplication. Order of resource is important, but i'm unsure if duplication is
+        // so might as well waste a few cycles on checking. Still faster then converting from a set to a list.
+        // Ideally we would explicitly list out which mods to load {forge and MC being the only ones} but some coremods could require extra things.
+        // So try game libraries as well
+        for (var lib : this.gameLibraries) {
+            var jar = lib.getSecureJar();
+            if (!mods.contains(jar))
+                mods.add(jar);
+        }
+
+        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, mods);
    }

    private List<EarlyLoadingException.ExceptionData> validateLanguages() {
@@ -48,7 +48,7 @@ class Scanner {
        try (InputStream in = Files.newInputStream(path)){
            ModClassVisitor mcv = new ModClassVisitor();
            ClassReader cr = new ClassReader(in);
-            cr.accept(mcv, 0);
+            cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
            mcv.buildData(result.getClasses(), result.getAnnotations());
        } catch (IOException | IllegalArgumentException e) {
            // mark path bad
@@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public final class ProgressMeter {
    private final String name;
    private final int steps;
-    private AtomicInteger current;
+    private final AtomicInteger current;
    private Message label;

    public ProgressMeter(String name, int steps, int current, Message label) {
@@ -19,6 +19,7 @@ import org.slf4j.Logger;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;

 /**
@@ -89,4 +90,24 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
        if (mtd == null) throw new IllegalStateException("Class " + target + " in module " + module + " does not have a main(String[]) method");
        mtd.invoke(null, (Object)arguments);
    }
+
+    protected static Path getPathFromResource(String resource) {
+        return getPathFromResource(resource, ForgeDevLaunchHandler.class.getClassLoader());
+    }
+
+    protected static Path getPathFromResource(String resource, ClassLoader cl) {
+        var url = cl.getResource(resource);
+        if (url == null)
+            throw new IllegalStateException("Could not find " + resource + " in classloader " + cl);
+
+        var str = url.toString();
+        int len = resource.length();
+        if ("jar".equalsIgnoreCase(url.getProtocol())) {
+            str = url.getFile();
+            len += 2;
+        }
+        str = str.substring(0, str.length() - len);
+        var path = Paths.get(URI.create(str));
+        return path;
+    }
 }
@@ -4,9 +4,7 @@
 */

 package net.minecraftforge.fml.loading.targets;
-import java.net.URI;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;

@@ -35,23 +33,6 @@ abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
        return List.of(filtered);
    }

-    static Path getPathFromResource(String resource) {
-        var cl = ForgeDevLaunchHandler.class.getClassLoader();
-        var url = cl.getResource(resource);
-        if (url == null)
-            throw new IllegalStateException("Could not find " + resource + " in classloader " + cl);
-
-        var str = url.toString();
-        int len = resource.length();
-        if ("jar".equalsIgnoreCase(url.getProtocol())) {
-            str = url.getFile();
-            len += 2;
-        }
-        str = str.substring(0, str.length() - len);
-        var path = Paths.get(URI.create(str));
-        return path;
-    }
-
    public static class Client extends ForgeDevLaunchHandler {
        public Client() {
            super(CLIENT);
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;

 import java.io.IOException;
@@ -71,7 +76,7 @@ public class ForgeDevLocator extends AbstractModProvider implements IModLocator
        if (!isTest)
            return ret;

-        var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class");
+        var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class", ClassLoader.getSystemClassLoader());
        // Explode our test mods into a framework that treats them all as separate jars.
        var tests = explodeTestMods(test);
        ret.addAll(tests);
@@ -9,9 +9,6 @@ import java.nio.file.Path;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;

-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LibraryFinder;
-
@ApiStatus.Internal
 abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
    protected ForgeProdLaunchHandler(LaunchType type) {
@@ -21,22 +18,25 @@ abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
    @Override public String getNaming() { return "srg"; }
    @Override public boolean isProduction() { return true; }

-    @Override
-    public List<Path> getMinecraftPaths() {
-        var vers = FMLLoader.versionInfo();
-        var mc = LibraryFinder.findPathForMaven(vers.forgeGroup(), "forge", "", this.type.name(), vers.mcAndForgeVersion());
-        return List.of(mc);
-    }
-
    public static class Client extends ForgeProdLaunchHandler {
        public Client() {
            super(CLIENT);
        }
+
+        @Override
+        public List<Path> getMinecraftPaths() {
+            return List.of(getPathFromResource("net/minecraft/client/Minecraft.class"));
+        }
    }

    public static class Server extends ForgeProdLaunchHandler {
        public Server() {
            super(SERVER);
        }
+
+        @Override
+        public List<Path> getMinecraftPaths() {
+            return List.of(getPathFromResource("net/minecraft/server/MinecraftServer.class"));
+        }
    }
 }
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;

 import java.util.List;
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;

 import java.io.IOException;
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Forge Development LLC and contributors
+    SPDX-License-Identifier: LGPL-2.1-only
+-->
+
 <Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
    <filters>
        <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
@@ -2,10 +2,11 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+org.gradle.parallel=true

 JAVA_VERSION=17
-MC_VERSION=1.20.2
+MC_VERSION=1.20.4
 MC_NEXT_VERSION=1.21
-MCP_VERSION=20230921.100330
+MCP_VERSION=20231207.112700
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.20.2
+MAPPING_VERSION=1.20.4
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
 }

@@ -37,7 +37,7 @@ tasks.named('jar', Jar).configure {
    }
 }

-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
    options.compilerArgs << '-Xlint:unchecked'
 }

@@ -61,4 +61,4 @@ publishing {
    repositories {
        maven gradleutils.publishingForgeMaven
    }
-}
+}
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;

 /**
 * Automatic eventbus subscriber - reads {@link EventBusSubscriber}
- * annotations and passes the class instances to the {@link nBus}
+ * annotations and passes the class instances to the {@link Bus}
 * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS}
 */
 public class AutomaticEventSubscriber {
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.javafmlmod;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;

-public class FMLJavaModLoadingContext
+public class FMLJavaModLoadingContext extends ModLoadingContext
 {
    private final FMLModContainer container;

@@ -24,11 +24,18 @@ public class FMLJavaModLoadingContext
        return container.getEventBus();
    }

+    @Override
+    public FMLModContainer getContainer() {
+        return container;
+    }

    /**
     * Helper to get the right instance from the {@link ModLoadingContext} correctly.
     * @return The FMLJavaMod language specific extension from the ModLoadingContext
+     *
+     * @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public static FMLJavaModLoadingContext get() {
        return ModLoadingContext.get().extension();
    }
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;

+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,6 +33,7 @@ public class FMLModContainer extends ModContainer {
    private final IEventBus eventBus;
    private Object modInstance;
    private final Class<?> modClass;
+    private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);

    public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer) {
        super(info);
@@ -40,9 +42,7 @@ public class FMLModContainer extends ModContainer {
        activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
        this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
        this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
-        final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this);
-        this.contextExtension = () -> contextExtension;
-
+        this.contextExtension = () -> context;

        try {
            var moduleName = info.getOwningFile().moduleName();
@@ -63,7 +63,13 @@ public class FMLModContainer extends ModContainer {
    private void constructMod() {
        try {
            LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
-            this.modInstance = modClass.getDeclaredConstructor().newInstance();
+            Constructor<?> constructor;
+            try {
+                constructor = modClass.getDeclaredConstructor(context.getClass());
+            } catch (NoSuchMethodException | SecurityException exception) {
+                constructor = modClass.getDeclaredConstructor();
+            }
+            this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context);
            LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
        } catch (Throwable e) {
            // When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
 }

@@ -38,7 +38,7 @@ tasks.named('jar', Jar).configure {
    }
 }

-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
    options.compilerArgs << '-Xlint:unchecked'
 }

@@ -62,4 +62,4 @@ publishing {
    repositories {
        maven gradleutils.publishingForgeMaven
    }
-}
+}
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
    id 'java-library'
    id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
 }

@@ -37,7 +37,7 @@ tasks.named('jar', Jar).configure {
    }
 }

-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
    options.compilerArgs << '-Xlint:unchecked'
 }

@@ -61,4 +61,4 @@ publishing {
    repositories {
        maven gradleutils.publishingForgeMaven
    }
-}
+}
@@ -199,6 +199,10 @@ tasks.withType(JavaCompile).configureEach {
    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }

+// IntelliJ no longer downloads javadocs and sources by default.
+// This tells Gradle to force IDEA to do it.
+idea.module { downloadJavadoc = downloadSources = true }
+
 eclipse {
    // Run everytime eclipse builds the code
    //autoBuildTasks genEclipseRuns
@@ -18,7 +18,6 @@ import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -61,9 +60,9 @@ public class ExampleMod
                output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
            }).build());

-    public ExampleMod()
+    public ExampleMod(FMLJavaModLoadingContext context)
    {
-        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        IEventBus modEventBus = context.getModEventBus();

        // Register the commonSetup method for modloading
        modEventBus.addListener(this::commonSetup);
@@ -82,7 +81,7 @@ public class ExampleMod
        modEventBus.addListener(this::addCreative);

        // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
-        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC);
+        context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
    }

    private void commonSetup(final FMLCommonSetupEvent event)
@@ -12,6 +12,9 @@ loaderVersion="${loader_version_range}" #mandatory This is typically bumped ever
 license="${mod_license}"
 # A URL to refer people to when problems occur with this mod
 #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
+# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
+# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
+#clientSideOnly=true #optional - defaults to false if absent
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
@@ -36,7 +39,14 @@ authors="${mod_authors}" #optional
 # IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
 # NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
 # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
+#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)
+
+
+# Access Transformers
+# Optional, if not specified Forge will attempt to find the default META-INF/accesstransformer.cfg and silently continue if not found. May default to an empty list in a future MC.
+# If you specify AT path strings in this list, Forge will attempt to load each of them and throw errors for any that aren't found.
+# Specifying an empty list when your mod has no ATs is recommended to opt-out of the default for slightly better loading performance.
+#accessTransformers = []

 # The description text for the mod (multi line!) (#mandatory)
 description='''${mod_description}'''
@@ -67,4 +77,4 @@ description='''${mod_description}'''
 # that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
 # stop your mod loading on the server for example.
 #[features.${mod_id}]
-#openGLVersion="[3.2,)"
+#openGLVersion="[3.2,)"
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/BufferBuilder.java
 +++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
-@@ -459,4 +_,14 @@
+@@ -477,4 +_,14 @@
          this.sorting = p_277855_;
       }
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -57,14 +_,9 @@
+@@ -59,14 +_,9 @@
       if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
          p_127520_.append("-- Head --\n");
          p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
@@ -18,7 +18,7 @@
       }
 
       for(CrashReportCategory crashreportcategory : this.details) {
-@@ -72,6 +_,7 @@
+@@ -74,6 +_,7 @@
          p_127520_.append("\n\n");
       }
 
@@ -26,7 +26,7 @@
       this.systemReport.appendToCrashReportString(p_127520_);
    }
 
-@@ -91,18 +_,7 @@
+@@ -93,18 +_,7 @@
          throwable.setStackTrace(this.exception.getStackTrace());
       }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -212,6 +_,7 @@
+@@ -215,6 +_,7 @@
    }
 
    static {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -172,6 +_,11 @@
+@@ -180,6 +_,11 @@
       return 255;
    }
 
@@ -12,7 +12,7 @@
    public static ExecutorService backgroundExecutor() {
       return BACKGROUND_EXECUTOR;
    }
-@@ -240,7 +_,7 @@
+@@ -254,7 +_,7 @@
       try {
          type = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())).getChoiceType(p_137552_, p_137553_);
       } catch (IllegalArgumentException illegalargumentexception) {
@@ -1,21 +1,6 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -62,7 +_,14 @@
-       return jsonobject;
-    }
- 
-+   /** @deprecated Forge: use {@linkplain #fromJson(JsonObject, DeserializationContext, net.minecraftforge.common.crafting.conditions.ICondition.IContext) overload with context}. */
-+   @Deprecated
-    public static Advancement fromJson(JsonObject p_300691_, DeserializationContext p_300053_) {
-+       return fromJson(p_300691_, p_300053_, net.minecraftforge.common.crafting.conditions.ICondition.IContext.EMPTY);
-+   }
-+
-+   public static Advancement fromJson(JsonObject p_300691_, DeserializationContext p_300053_, net.minecraftforge.common.crafting.conditions.ICondition.IContext context) {
-+      if ((p_300691_ = net.minecraftforge.common.ForgeHooks.readConditionalAdvancement(context, p_300691_)) == null) return null;
-       Optional<ResourceLocation> optional = p_300691_.has("parent") ? Optional.of(new ResourceLocation(GsonHelper.getAsString(p_300691_, "parent"))) : Optional.empty();
-       Optional<DisplayInfo> optional1 = p_300691_.has("display") ? Optional.of(DisplayInfo.fromJson(GsonHelper.getAsJsonObject(p_300691_, "display"))) : Optional.empty();
-       AdvancementRewards advancementrewards = p_300691_.has("rewards") ? AdvancementRewards.deserialize(GsonHelper.getAsJsonObject(p_300691_, "rewards")) : AdvancementRewards.EMPTY;
-@@ -182,7 +_,11 @@
+@@ -171,7 +_,11 @@
       }
 
       public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -43,7 +_,7 @@
+@@ -27,7 +_,7 @@
 
    public void grant(ServerPlayer p_9990_) {
       p_9990_.giveExperiencePoints(this.experience);
@@ -1,11 +0,0 @@
--- a/net/minecraft/advancements/CriteriaTriggers.java
-+++ b/net/minecraft/advancements/CriteriaTriggers.java
-@@ -46,7 +_,7 @@
- import net.minecraft.resources.ResourceLocation;
- 
- public class CriteriaTriggers {
-   private static final BiMap<ResourceLocation, CriterionTrigger<?>> CRITERIA = HashBiMap.create();
-+   private static final BiMap<ResourceLocation, CriterionTrigger<?>> CRITERIA = com.google.common.collect.Maps.synchronizedBiMap(HashBiMap.create());
-    public static final ImpossibleTrigger IMPOSSIBLE = register("impossible", new ImpossibleTrigger());
-    public static final KilledTrigger PLAYER_KILLED_ENTITY = register("player_killed_entity", new KilledTrigger());
-    public static final KilledTrigger ENTITY_KILLED_PLAYER = register("entity_killed_player", new KilledTrigger());
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/critereon/ItemPredicate.java
 +++ b/net/minecraft/advancements/critereon/ItemPredicate.java
-@@ -50,7 +_,7 @@
+@@ -45,7 +_,7 @@
          return false;
       } else {
          if (!this.enchantments.isEmpty()) {
@@ -1,7 +1,7 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -206,6 +_,18 @@
-       this.initialized = false;
+@@ -212,6 +_,18 @@
+       return this.partialTickTime;
    }
 
 +   public void setAnglesInternal(float yaw, float pitch) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -380,11 +_,15 @@
+@@ -397,11 +_,15 @@
             Screen.wrapScreenError(() -> {
                if (p_90897_ != 1 && p_90897_ != 2) {
                   if (p_90897_ == 0) {
@@ -18,11 +18,10 @@
                }
 
             }, "keyPressed event handler", screen.getClass().getCanonicalName());
-@@ -443,22 +_,26 @@
-                this.minecraft.debugFpsMeterKeyPress(p_90895_ - 48);
+@@ -478,21 +_,26 @@
             }
+ 
          }
-
 +         net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_90895_, p_90896_, p_90897_, p_90898_);
       }
    }
Author	SHA1	Message	Date
LexManos	e00bddd6d8	Add protection against large network channel lists (cherry picked from commit 162908338bbda96431ffec48249fe5101dd67d2c)	2026-10-14 20:31:00 -07:00
LexManos	f0ef4fe307	Fix legacy object holders not being fired in the registry specific codepath Better optimize the scanning for object holders by unrolling streams.	2026-10-13 09:43:51 -07:00
BonsUnleashedandLexManos	71f626be39	Store object holder handlers per registry name (#10899 ) Co-authored-by: LexManos <[email protected]>	2026-10-12 18:13:48 -07:00
LexManos	1554afd613	Fix generic errors in new Eclipse compiler	2026-10-12 18:10:41 -07:00
Meme Man	631b756d5b	Update equality check for RegistryObject to include RegistryObject#key. (#10863 )	2026-08-04 19:10:47 +01:00
Matt	bc6408ee24	Toml parsing errors are now visible in the latest log (#10845 )	2026-07-09 13:35:42 -07:00
Matt	998999412f	Add support for multiple access transformer configs. Backport (#10760 ) (#10788 )	2026-03-22 17:29:51 -07:00
Paint_Ninja	02bbab1f90	Skip processing vanilla classes in RuntimeDistCleaner when running on a client Backport of #10682 to 1.20.4	2026-03-17 21:11:04 +00:00
Paint_Ninja	1cde9f70a9	Bump ASM and EventBus - ASM 9.9.1 for Java 26 support - EventBus 6.2.33 for Event#cancel() convenience method and further performance improvements	2026-03-17 21:10:07 +00:00
LexManos	2dd93eea1d	Mark applyServerBinpatches as a dependency of BundleList. Fixes: #10729	2025-12-04 09:25:30 -08:00
LexManos	592ca2897c	Migrate to Github Actions	2025-12-02 15:13:33 -08:00
Paint_Ninja	27fb189b0d	Bump ASM to 9.8 for Java 25 runtime support	2025-09-22 11:55:53 +01:00
Jonathing	3cd49ed58d	Ignore item equality when checking shouldCauseBlockBreakReset, fixes #10645 (#10648 )	2025-09-01 19:36:31 -07:00
Jonathing	f31519b6bb	1.20.4 RB 2 https://forums.minecraftforge.net/topic/154388-forge-492-minecraft-1204/	2025-03-04 15:51:32 -08:00
Jonathing	f715248a1e	Bump SecureModules to 2.2.21, fixes crash caused by previous jline version bump. (#10488 )	2025-03-04 14:26:48 -08:00
Jonathing	e1bc30a04b	Add missed license headers (#10478 )	2025-03-04 12:56:27 -08:00
JonathingandLexManos	85ab903cd1	Speed up mod annotation scanning by ~30% (#10469 ) Co-authored-by: LexManos <[email protected]>	2025-03-04 12:56:19 -08:00
Jonathing	530c7c4eb5	Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10462 )	2025-03-04 12:56:06 -08:00
Jonathing	3c740e488d	Bump dependencies, most notably EventBus (#10388 ) - CoreMods 5.2.4 -> 5.2.6 - EventBus 6.2.8 -> 6.2.27 - Reduced memory usage - Further performance improvements - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC - Apache MavenArtifact 3.8.5 -> 3.8.8 - BootStrap 2.1.0 -> 2.1.8 - JLine 3.12.1 -> 3.25.1 - Better OSX Support	2025-02-21 12:05:39 -08:00
Jonathing	03d07a9621	Fix damageItem's game test not using onBreak callback correctly (#10452 )	2025-02-18 13:38:04 -08:00
Jonathing	90dc29b1ef	Cache this.useItem before running item break logic, Fixes #10344 (#10375 )	2025-02-18 12:42:17 -08:00
Jonathing	eae9d72dd8	Add fast graphics render type to block model jsons (#10398 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-18 12:28:13 -08:00
Jonathing	7ac8903a3b	Fix corrupted and invalidly symlinked worlds crashing on level select (#10438 )	2025-02-18 12:24:23 -08:00
Jonathing	bd96ff8777	Backport even more future ResourceLocation methods (#10427 )	2025-02-18 12:02:06 -08:00
Jonathing	ebfd92e0e1	Fix incorrect method reference in TntBlock.explode() (#10330 )	2025-02-18 12:01:42 -08:00
Jonathing	43288f79e3	Fix VillagerTypeTestMod not working (#10426 )	2025-02-18 12:01:28 -08:00
Jonathing	dbd7da6885	Fix issue with shields not disabling correctly (#10320 )	2025-01-27 19:12:47 -08:00
Jonathing	bb98165ee8	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10358 ) Add VillagerType#registerBiomeType Co-authored-by: Joseph T. McQuigg <[email protected]>	2025-01-27 19:11:52 -08:00
Jonathing	6a1f1acc42	Update Gradle to 8.12.1 (#10356 ) Make IntelliJ download sources automatically in MDK	2025-01-27 14:38:53 -08:00
JonathingandLexManos	a982445295	GameTestHelper additions (#10343 ) Co-authored-by: LexManos <[email protected]>	2025-01-27 14:38:18 -08:00
Jonathing	89919519ac	Fix non-passengers being tickable without checking canUpdate() (#10303 )	2025-01-22 13:22:52 -08:00
Jonathing	4d592ba5ac	Fix finalizeSpawn's return value not being used correctly (#10302 )	2025-01-22 13:22:44 -08:00
Jonathing	5657e6542b	Fix boat travel distance being incorrect (#10292 )	2025-01-04 19:54:20 -08:00
JonathingandJames Mitchell	c1c327ce11	Add a way to render tooltips from Formatted text and TooltipComponents elements (#10056 ) Co-authored-by: James Mitchell <[email protected]>	2025-01-04 13:03:32 -08:00
Jonathing	142f07cbad	Bump CoreMods to 5.2.4 (#10264 )	2024-12-23 17:25:49 -08:00
Jonathing	c4f18dfa4b	Allow mipmap lowering to be disabled (#10253 )	2024-12-23 17:25:38 -08:00
Jonathing	9f5a6d716e	Add optional fix of use item duration, disabled by default (#10247 )	2024-12-23 17:15:38 -08:00
JonathingandPaint_Ninja	984cedda5c	Simplify memory usage display on loading screen (#10234 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 17:15:27 -08:00
JonathingandPaint_Ninja	cc4a431711	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10229 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 17:03:01 -08:00
JonathingandPaint_Ninja	ee07bcac57	Skip Vanilla classes for the `CapabilityTokenSubclass` transformer (#10222 ) Cherry-pick a few optimizations from HEAD Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 16:53:23 -08:00
JonathingandPaint_Ninja	b1cc694453	Skip Forge classes in the RuntimeEnumExtender transformer (#10217 ) Mod classes are still transformed as usual Cherry-pick a few optimizations from HEAD Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 16:38:24 -08:00
JonathingandPaint_Ninja	838ab9e1a5	Skip processing Forge classes in `RuntimeDistCleaner` (#10209 ) Cherry-pick a few optimizations from HEAD Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 16:23:54 -08:00
Jonathing	99a7fcd8bd	Bump CoreMods to 5.2 (#10129 ) Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 The key features are: - ES6 language support - Thoroughly updated ASMAPI, with full documentation - Bug fixes (some optional for backwards-compatibility) - Partial internal code cleanup - Updated Nashorn to 15.4 - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default	2024-11-08 17:40:18 -08:00
Paint_Ninja	3535dcdbb3	Use the new fire() and Result#isAllowed/isDenied/isDefault methods from EventBus (backport of #10028 to 1.20.4) (#10097 )	2024-10-06 18:39:59 -07:00
Paint_Ninjaandandan42	d7ccecefe0	Remove unneeded boat patch (backport of #10061 to 1.20.4) (#10087 ) Co-authored-by: andan42 <[email protected]>	2024-10-06 18:39:52 -07:00
Paint_NinjaandDaniel Norris	d3e9cfaaba	Change tick event to have pre/post classes (backport of #9890 to 1.20.4) (#10090 ) Co-authored-by: Daniel Norris <[email protected]>	2024-09-12 14:36:27 +01:00
Paint_Ninja	7134b93427	Backport some Vanilla `ResourceLocation` methods (backport of #10084 to 1.20.4) (#10098 )	2024-09-12 14:35:54 +01:00
Paint_Ninja	61694447b2	Minor cleanup to ModListScreen and VersionChecker (backport of #9988 to 1.20.4) (#10089 )	2024-09-12 14:03:49 +01:00
Paint_Ninja	561f3ee534	Cleanup FML Bindings (backport of #10004 to 1.20.4) (#10088 )	2024-09-12 14:03:35 +01:00
Paint_NinjaandRealMangoRage	d0fea9cf76	Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.20.4) (#10099 ) Co-authored-by: RealMangoRage <[email protected]>	2024-09-12 14:03:01 +01:00
Paint_Ninja	dd866ed53e	Add missed @user_jvm_args.txt to run.bat (backport of `40a0a16` to 1.20.4) (#10093 )	2024-09-10 13:56:55 +01:00
LexManos	54f5e1213a	Make HangingSignBlockEntity useable with custom BlockEntityTypes. #10038	2024-07-05 13:42:41 -07:00
Edouard127andLexManos	9d4f283e6b	Unlock wrapped registries when firing register events. (#10036 ) Co-authored-by: LexManos <[email protected]>	2024-07-02 10:56:10 -07:00
Jonathingandthedarkcolour	28d4205a97	Choose default JarJar mod file type based on parent JAR Closes #9939 (#10022 ) Co-authored-by: thedarkcolour <[email protected]>	2024-06-28 22:21:47 -07:00
JonathingandVen	d0d1f1d782	Fixed falling block entities not rendering as moving blocks (#10006 ) (#10017 ) Co-authored-by: Ven <[email protected]>	2024-06-28 22:04:56 -07:00
LexManos	397ceac0b6	1.20.4 RB 1 https://forums.minecraftforge.net/topic/149456-forge-491-minecraft-1204/	2024-06-03 13:23:22 -07:00
LexManos	1b7665cdaa	Fix LevelSettings ignoring data configuration. Close #9938	2024-06-03 12:46:09 -07:00
LexManos	70f96ef64e	Fix erroneous patch in FireBlock. Closes #9996	2024-06-03 12:38:03 -07:00
Paint_Ninja	0cf4446352	[1.20.4] Add config option for optionally disabling non-Forge mods.toml detection (#9943 )	2024-05-30 23:50:19 +01:00
LexManos	b8270cd9ff	Filter paths discovered by ServiceProvider in ClasspathLocator. Closes #9899	2024-05-09 09:53:36 -07:00
Paint_Ninja	e1fa61080a	Make non-Forge mods.toml detection more robust (#9935 )	2024-04-25 22:36:56 +01:00
Paint_Ninja	381998c35c	Fix early window crash when parsing some forms of options.txt (#9933 )	2024-04-19 21:39:23 +01:00
Paint_Ninja	11ed2500a6	Fix edge-case regression with single-jar multiloader mods (#9931 )	2024-04-19 21:38:57 +01:00
J-RAP	a647237db4	Add ClientPauseChangeEvent (#9905 )	2024-04-18 21:36:00 +01:00
Paint_Ninja	e0dccae041	Improve mod loading errors (#9870 )	2024-04-18 20:02:41 +01:00
Paint_Ninja	e7a5c58907	Early display fixes/workarounds for buggy drivers (#9921 )	2024-04-18 20:02:18 +01:00
oldkingOK	e094eee54d	Prevent registering null tiers (#9895 ) Makes it easier to identify broken mods, as it moves the crash to when the broken mod in question registers the tier, rather than when any mod tries getting the tier.	2024-04-15 14:49:03 +01:00
Paint_NinjaandblockingHD	a6adc58655	Add helper method to `OnDatapackSyncEvent` (#9901 ) Co-authored-by: blockingHD <[email protected]>	2024-04-15 14:47:45 +01:00
J-RAP	d31ea640f9	Fix NPE when acceptableValues in defineInList() does not allow nulls, fixes #9300 (#9903 )	2024-04-13 12:47:35 +01:00
J-RAP	8e16765438	[1.20.x] Add ByteValue, ShortValue and FloatValue to ForgeConfigSpec, cleanup code (#9902 )	2024-04-13 12:42:31 +01:00
Joseph T. McQuigg	73b0088cb4	Add Leaves method to ModelProvider.java (#9887 )	2024-04-04 13:53:55 +01:00
LexManos	203fbbb742	Bump bootstrap	2024-03-18 18:31:29 -07:00
LexManos	46d78c8210	Fix level data not loading from existing worlds. Whole system needs a re-write.	2024-03-18 18:15:39 -07:00
LexManos	cfba4381b6	Fix modlist size	2024-03-18 18:09:37 -07:00
LexManos	7113701322	Bump Bootstrap	2024-03-18 17:45:58 -07:00
Paint_Ninja	73e02c6add	Optimize Entity capabilities a bit by reordering conditions (#9886 )	2024-03-16 17:16:11 -07:00
Paint_Ninja	7f2b85d2ff	[1.20.x] Make common config screen registration tasks easier (#9884 )	2024-03-10 21:27:57 +00:00
Paint_Ninja	099d121c2c	[1.20.4] Add CPU usage config option to early window, hide it by default (#9866 )	2024-03-10 21:10:06 +00:00
Luis	a6978eed68	Fix DatapackBuiltinEntriesProvider issues with forge registries, Fixes #9874	2024-03-01 13:26:00 -08:00
Luis	309116520b	Readded DatapackBuiltinEntriesProvider (#9848 )	2024-02-15 14:04:51 -08:00
Paint_NinjaandDennis C	3e358acbe1	Fix slightly offset mods screen link positioning (#9860 ) Co-authored-by: Dennis C <[email protected]>	2024-02-15 14:04:05 -08:00
LexManos	c243adf6aa	Fix DNS SRV record lookup not working by hacking the module system. Closes #9846	2024-02-12 13:46:29 -08:00
LexManos	5d0047753d	Add null check to DimensionDataStorage. Fixes #9859	2024-02-02 12:50:09 -08:00
LexManos	aa6f268c74	Fix cases where LivingConversionEvents were not fired for vanilla conversions. Closes #9850	2024-01-29 13:13:28 -08:00
LexManos	d21556a4da	Update licenser plugin, and re-run it. Closes #9855	2024-01-29 12:27:45 -08:00
LexManos	d4c998e311	Fix background music looping when it shouldn't	2024-01-29 12:16:46 -08:00
LexManos	25727a0e93	Fix Criterion Test Mod	2024-01-29 12:16:21 -08:00
Paint_Ninja	80286594c5	Improve help text on server Java check failure	2024-01-20 00:28:02 +00:00
Paint_Ninja	870e3ebcab	[1.20.4] Restore the option of server run scripts (#9849 ) Executable server jar is still a thing, but the run scripts are restored as an option for those that prefer it.	2024-01-19 20:55:00 +00:00
Paint_Ninja	a4c26c9b2b	[1.20.x] More buildscript clean-up (#9845 )	2024-01-19 20:54:15 +00:00
Mostafa Mabrok	45b00b0004	Fixed Spelling error in credits.txt (#9694 )	2024-01-09 11:42:01 -08:00
LexManos	4b1c5ddb2c	Bump JarJar to fix more issues with UnionFileSystem assumptions.	2024-01-09 11:41:20 -08:00
DBotThePony	0966109602	Criterion test mod + unit test (#9744 )	2024-01-09 11:40:02 -08:00
LexManos	b31006534a	Fix launcher version name missing - between `forge` and the version. Closes #9843	2024-01-08 13:43:46 -08:00
LexManos	740a5d5039	Bump JarJar and SecureModule to fix issue with jars containing [] in their name. Closes #9842	2024-01-08 13:42:36 -08:00
LexManos	817e20821d	Only add sorted/deduplicated mods to the classpath. Fixes some mods causing the Forge error displays to break. Closes #9833	2024-01-02 12:51:57 -08:00
Paint_Ninja	fdb22d02cc	Improve server panel compatibility (#9836 )	2023-12-30 20:56:18 +00:00
Paint_Ninja	f09fd1f05b	Make common DisplayTest registration tasks easier (#9822 )	2023-12-27 08:57:02 -08:00
LexManos	ed2ba0f52c	Cleanup Explosion patch but keep bin compatibility by using asm hacks. Closes #9817	2023-12-21 11:22:31 -08:00
LexManos	b04118982f	Bump SecureModules, Closes #9820	2023-12-18 14:24:59 -08:00
LexManos	d44d0b8edc	Support pack overlay system. Closes #9818	2023-12-13 14:42:49 -08:00
LexManos	6d7fda6a9b	Fix Server bundle	2023-12-11 21:27:32 -08:00
Paint_Ninja	0303ca651e	Optimise ForgeConfigSpec and make Range public (#9810 )	2023-12-11 13:10:53 -08:00
Paint_Ninja	8445f73b2d	Add `clientSideOnly` feature to mods.toml (#9804 )	2023-12-11 13:10:33 -08:00
Paint_Ninja	c7446a5180	Add impl. of `IModFileInfo#showAsDataPack` (#9802 )	2023-12-11 13:08:50 -08:00
LexManos	5c15aa3322	Get rid of LibraryFinder	2023-12-11 12:27:23 -08:00
LexManos	588466f5e4	1.20.4 - Minor bug fix from Mojang	2023-12-07 11:35:53 -08:00
LexManos	470f03b2f9	Fix java version check in bootstrap shim	2023-12-06 16:29:53 -08:00
LexManos	d2367d81fc	1.20.3 Initial Update https://forums.minecraftforge.net/topic/139822-forge-490-minecraft-1203/	2023-12-06 10:38:20 -08:00