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
2233 changed files with 41644 additions and 38943 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 }}
@@ -26,6 +26,7 @@
 /projects/mcp/
 /projects/clean/
 /projects/forge/
+#/patches/*

 #occupational hazards
 /projects/**/build/
@@ -34,10 +35,20 @@
 /projects/**/*.launch
 /repo/
 src/*/generated/**/.cache/
-
 # Generated by gradle every import
 **/src/main/resources/META-INF/MANIFEST.MF
 /fmlloader/src/main/resources/forge_version.json

+#Patch rejects
+#/patches-/
+#*.patch.rej
+#/projects/*/rejects/
+
+# FML changelog
+changelog.txt
+*.py
+*.7z
+/logs/
+
 /ForgeRoot.ipr
 /ForgeRoot.iws
@@ -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", "21", 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", "8.7", 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.21.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()
-    }
-})
@@ -7,8 +7,8 @@ plugins {
    id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
    id 'eclipse'
    id 'de.undercouch.download' version '5.4.0'
-    id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false
+    id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[6.0.16,6.2)' apply false
    id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
    id 'org.barfuin.gradle.taskinfo' version '2.1.0'
 }
@@ -4,10 +4,10 @@ repositories {
 }

 dependencies {
-    implementation 'org.ow2.asm:asm:9.7'
-    implementation 'org.ow2.asm:asm-tree:9.7'
-    implementation 'net.minecraftforge:srgutils:0.5.10'
+    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.7.0.202309050840-r'
+    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
 }
@@ -10,17 +10,17 @@ import java.util.zip.ZipFile

 abstract class BundleList extends DefaultTask {
    @InputFiles abstract ConfigurableFileCollection getConfig()
-    @InputFiles abstract ConfigurableFileCollection getConfigExtra()
    @InputFile abstract RegularFileProperty getServerBundle()
    @OutputFile abstract RegularFileProperty getOutput()

    BundleList() {
        config.setFrom(project.configurations.installer)
-        configExtra.setFrom(project.configurations.installerextra)
        output.convention(project.layout.buildDirectory.file("$name/output.list"))
        configure {
            dependsOn(project.tasks.universalJar)
            inputs.file(project.tasks.universalJar.archiveFile)
+            dependsOn(project.tasks.applyServerBinPatches)
+            inputs.file(project.tasks.applyServerBinPatches.output)
        }
    }
    
@@ -34,13 +34,6 @@ abstract class BundleList extends DefaultTask {
            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
        }

-        resolved = project.configurations.installerextra.resolvedConfiguration.resolvedArtifacts
-        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
@@ -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.')}()
    }
 }
@@ -24,7 +24,6 @@ abstract class LauncherJson extends DefaultTask {
        dependsOn(project.tasks.universalJar)
        input.from(project.tasks.universalJar.archiveFile)
        input.from(project.configurations.installer)
-        input.from(project.configurations.installerextra)
        configure {
            def mc    = project.rootProject.ext.MC_VERSION
            def forge = project.rootProject.ext.FORGE_VERSION
@@ -89,7 +88,6 @@ abstract class LauncherJson extends DefaultTask {
            ]
        ])

-        json.libraries.addAll(getArtifacts(project.configurations.installerextra).values())
        json.libraries.addAll(getArtifacts(project.configurations.installer).values())
        Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
    }
@@ -140,7 +140,7 @@ abstract class CheckPatches extends CheckTask {
                    final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')

                    if (!prevLineChange && !nextLineChange) {
-                        reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath \n$prevLine\n$line\n${lines[i+1]}", false)
+                        reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath", false)
                    }
                }

@@ -61,13 +61,4 @@ eclipse.classpath.file.whenMerged {
 	def src = entries.find { it.path == 'src/main/java' }
    if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
    src.entryAttributes['ignore_optional_problems'] = 'true'
-}
-
-tasks.named('genPatches').configure {
-    onlyIf { false }
-}
-
-tasks.named('extractRangeMap').configure {
-    onlyIf { false }
-    tool = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
 }
@@ -12,9 +12,9 @@ import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
 import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility
 import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
 import net.minecraftforge.gradle.common.tasks.ExtractInheritance
-import net.minecraftforge.gradle.patcher.tasks.FilterNewJar
 import net.minecraftforge.gradle.patcher.tasks.GeneratePatches
 import net.minecraftforge.gradle.userdev.tasks.RenameJar
+import net.minecraftforge.gradleutils.PomUtils
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.objectweb.asm.Opcodes

@@ -46,8 +46,6 @@ jarSigner.autoDetect('forge')

 applyPatches {
    level 'WARNING'
-    failOnError = UPDATING != 'true'
-    rejects = rootProject.layout.projectDirectory.dir('rejects').asFile
 }

 sourceSets {
@@ -90,21 +88,16 @@ ext {
 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.3'
+final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
 final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
-final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'

 configurations {
    // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
-    bootstrap  { transitive = false }
+    bootstrap  { transitive = false }        
    installer { 
        extendsFrom(bootstrap)
        transitive = false 
    }
-    installerextra { 
-        extendsFrom(bootstrap)
-        transitive = false 
-    }
    api.extendsFrom(installer)
 }

@@ -118,11 +111,10 @@ dependencies {
    bootstrap(libs.unsafe)        // Needed by securemodules
    bootstrap(libs.bundles.asm)   // Needed by securemodules
    
-    implementation(libs.jopt.simple) { version { strictly '5.0.4' } }
-    
    installer(libs.bootstrap)
    installer(libs.bootstrap.api) // Needed by securemodules
    installer(libs.accesstransformers)
+    installer(libs.antlr.runtime) // Dep of AccessTransformer
    installer(libs.eventbus)
    installer(libs.typetools) // Dep of EventBus
    installer(libs.forgespi)
@@ -143,16 +135,10 @@ dependencies {
    installer(project(':lowcodelanguage'))
    installer(project(':mclanguage'))

-    installerextra("${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:srg2off")
-
    runtimeOnly(libs.bootstrap)
    runtimeOnly(libs.bootstrap.dev)
 }

-tasks.named('extractRangeMap').configure {
-    tool = S2S_TOOL
-}
-
 patcher {
    excs.from file("$rootDir/src/main/resources/forge.exc")
    parent = project(':mcp')
@@ -181,7 +167,6 @@ patcher {

        forge_client_test {
            parent runs.forge_client
-            source sourceSets.test
        }

        forge_server {
@@ -190,17 +175,14 @@ patcher {

        forge_server_test {
            parent runs.forge_server
-            source sourceSets.test
        }

        forge_server_gametest {
            args '--launchTarget', 'forge_dev_server_gametest'
-            args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs
        }

        forge_server_gametest_test {
            parent runs.forge_server_gametest
-            source sourceSets.test
        }

        forge_data {
@@ -216,7 +198,6 @@ patcher {
        }

        forge_data_test {
-            source sourceSets.test
            args '--launchTarget', 'forge_dev_data',
                 '--mod', '.+',
                 '--all',
@@ -227,6 +208,7 @@ patcher {
                 '--assetsDir', downloadAssets.output,
                 '--assetIndex', "{asset_index}"
        }
+
    }
 }

@@ -380,15 +362,33 @@ tasks.register('extractInheritance', ExtractInheritance) {
        Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).toList()
    }
 }
+tasks.register("findFieldInstanceChecks", FieldCompareFinder) {
+    jar = createJoinedSRG.output
+    output = rootProject.file('src/main/resources/coremods/field_to_instanceof.json')
+    fields {
+        /* 1.17 changed most things to use Tags. So this isn't nessasary anymore so just make an empty list
+        bows {
+            cls = 'net/minecraft/world/item/Items'
+            name = 'f_42411_'
+            replacement = 'net/minecraft/world/item/BowItem'
+        }
+        crossbows {
+            cls = 'net/minecraft/world/item/Items'
+            name = 'f_42717_'
+            replacement = 'net/minecraft/world/item/CrossbowItem'
+        }
+        */
+    }
+}
 tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
    jar = createJoinedSRG.output
    output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
    predicate = {
        parent, node, insn ->
-            return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
-            && insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
+            'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
+            && insn.getOpcode() === Opcodes.INVOKEVIRTUAL
            && insn.name == 'm_6518_'
-            && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
+            && 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) {
@@ -406,6 +406,16 @@ tasks.register("downloadServerShim", DownloadMavenArtifact) {
    artifact = libs.bootstrap.shim.get().toString()
    changing = true
 }
+tasks.register("downloadMCPConfig", DownloadMavenArtifact) {
+    artifact = MCP_ARTIFACT
+}
+tasks.register('extractMCPConfigMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
+    ext.output = file('build/mcp_mappings.tsrg')
+    tool = INSTALLER_TOOLS + ':fatjar'
+    args = ['--task', 'MCP_DATA', '--key', 'mappings', '--input', downloadMCPConfig.output.get().asFile.absolutePath, '--output', output.absolutePath]
+    outputs.file(output)
+    inputs.file(downloadMCPConfig.output)
+}
 tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
    ext.output = file('build/client_mappings.tsrg')
    tool = INSTALLER_TOOLS + ':fatjar'
@@ -418,34 +428,43 @@ tasks.register('downloadServerMappings', net.minecraftforge.gradle.common.tasks.
    args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath]
    outputs.file(output)
 }
+tasks.register('mergeClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
+    ext.output = file('build/client_mappings_merged.tsrg')
+    tool = INSTALLER_TOOLS + ':fatjar'
+    args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadClientMappings.output.absolutePath, '--output', output.absolutePath]
+    outputs.file(output)
+}
+tasks.register('mergeServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
+    ext.output = file('build/server_mappings_merged.tsrg')
+    tool = INSTALLER_TOOLS + ':fatjar'
+    args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadServerMappings.output.absolutePath, '--output', output.absolutePath]
+    outputs.file(output)
+}
 tasks.register("createJoinedSRG", DownloadMavenArtifact) {
    artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg"
 }
-tasks.register("createClientOfficial", RenameJar) {
+tasks.register("createClientSRG", RenameJar) {
    tool = FART + ':all'
-    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
-    mappings = downloadClientMappings.output
-    dependsOn(downloadClientRaw, downloadClientMappings)
+    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs']
+    mappings = createMcp2Srg.srg
+    dependsOn(downloadClientRaw)
    input = downloadClientRaw.dest
-    output = file("build/createClientOfficial/output.jar")
+    output = file("build/createClientSRG/output.jar")
 }
-tasks.register("createServerOfficial", RenameJar) {
+tasks.register("createServerSRG", RenameJar) {
    tool = FART + ':all'
-    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
-    mappings = downloadServerMappings.output
-    dependsOn(downloadServerMappings)
+    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs']
+    mappings = createMcp2Srg.srg
    input = extractServer.output
-    output = file("build/createServerOfficial/output.jar")
+    output = file("build/createServerSRG/output.jar")
 }
 tasks.named('genClientBinPatches').configure {
    tool = BINPATCH_TOOL
-    cleanJar = createClientOfficial.output
-    dirtyJar = jar.archiveFile
+    cleanJar = createClientSRG.output
 }
 tasks.named('genServerBinPatches').configure {
    tool = BINPATCH_TOOL
-    cleanJar = createServerOfficial.output
-    dirtyJar = jar.archiveFile
+    cleanJar = createServerSRG.output
 }
 tasks.named('genJoinedBinPatches').configure {
    tool = BINPATCH_TOOL
@@ -453,13 +472,13 @@ tasks.named('genJoinedBinPatches').configure {
 }
 tasks.register('applyClientBinPatches', ApplyBinPatches) {
    tool = BINPATCH_TOOL
-    clean = createClientOfficial.output
+    clean = createClientSRG.output
    patch = genClientBinPatches.output
    args.addAll(['--data', '--unpatched'])
 }
 tasks.register('applyServerBinPatches', ApplyBinPatches) {
    tool = BINPATCH_TOOL
-    clean = createServerOfficial.output
+    clean = createServerSRG.output
    patch = genServerBinPatches.output
    args.addAll(['--data', '--unpatched'])
 }
@@ -475,10 +494,10 @@ tasks.register('createServerShimClasspath', BundleList) {
 tasks.register('createServerShimConfig') {
    ext.output = file('build/libs/bootstrap-shim.properties')
    doLast {
-        var cfg = new CleanProperties()
-        cfg['Main-Class'] = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-        cfg['Java-Version'] = '21'
-        cfg['Arguments'] = '--launchTarget forge_server'
+        def cfg = new CleanProperties()
+        cfg."Main-Class" = 'net.minecraftforge.bootstrap.ForgeBootstrap'
+        cfg."Java-Version" = '17'
+        cfg."Arguments" = "--launchTarget forge_server"
        cfg.store(output)
    }
 }
@@ -504,7 +523,7 @@ tasks.register('checkAll') {
    group = 'checks'
 }
 tasks.register('checkAllAndFix') {
-    dependsOn 'findFinalizeSpawnTargets', 'checkLicenses'
+    dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses'
    group = 'checks'
 }

@@ -612,15 +631,21 @@ tasks.register('installerJson', InstallerJson) {
    dependsOn(launcherJson)
    input.from(launcherJson.output)
    
+    // Extract MCP Mappings
+    dependsOn(extractMCPConfigMappings)
+    input.from(extractMCPConfigMappings.output)
    // Download Official Mappings
    dependsOn(downloadClientMappings, downloadServerMappings)
    input.from(downloadClientMappings.output, downloadServerMappings.output)
+    // Merge MCP and Official Mappings
+    dependsOn(mergeClientMappings, mergeServerMappings)
+    input.from(mergeClientMappings.output, mergeServerMappings.output)
    // Get 'base' MC jar, Client is straight download, server is extracted from the bundle
    dependsOn(downloadClientRaw, extractServer)
    input.from(downloadClientRaw.dest, extractServer.output)
    // Rename MC Jar
-    dependsOn(createClientOfficial, createServerOfficial)
-    input.from(createClientOfficial.output, createServerOfficial.output)
+    dependsOn(createClientSRG, createServerSRG)
+    input.from(createClientSRG.output, createServerSRG.output)
    // Apply Binary patches to vanilla jar
    dependsOn(applyClientBinPatches, applyServerBinPatches)
    input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)
@@ -638,14 +663,30 @@ tasks.register('installerJson', InstallerJson) {
            minecraft: MC_VERSION,
            serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar',
            data: [
+                MAPPINGS: [
+                    client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]",
+                    server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]"
+                ],
+                MAPPINGS_SHA: [
+                    client: "'${extractMCPConfigMappings.output.sha1}'",
+                    server: "'${extractMCPConfigMappings.output.sha1}'"
+                ],
                MOJMAPS: [
-                    client: "[net.minecraft:client:${MC_VERSION}:mappings@tsrg]",
-                    server: "[net.minecraft:server:${MC_VERSION}:mappings@tsrg]"
+                    client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]",
+                    server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]"
                ],
                MOJMAPS_SHA: [
                    client: "'${downloadClientMappings.output.sha1}'",
                    server: "'${downloadServerMappings.output.sha1}'"
                ],
+                MERGED_MAPPINGS: [
+                    client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]",
+                    server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]"
+                ],
+                MERGED_MAPPINGS_SHA: [
+                    client: "'${mergeClientMappings.output.sha1}'",
+                    server: "'${mergeServerMappings.output.sha1}'"
+                ],
                MC_UNPACKED: [
                    client: "[net.minecraft:client:${MC_VERSION}]",
                    server: "[net.minecraft:server:${MC_VERSION}:unpacked]"
@@ -654,13 +695,13 @@ tasks.register('installerJson', InstallerJson) {
                    client: "'${downloadClientRaw.dest.sha1}'",
                    server: "'${extractServer.output.get().asFile.sha1}'"
                ],
-                MC_OFF: [
-                    client: "[net.minecraft:client:${MC_VERSION}:official]",
-                    server: "[net.minecraft:server:${MC_VERSION}:official]"
+                MC_SRG: [
+                    client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]",
+                    server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]"
                ],
-                MC_OFF_SHA: [
-                    client: "'${createClientOfficial.output.get().asFile.sha1}'",
-                    server: "'${createServerOfficial.output.get().asFile.sha1}'"
+                MC_SRG_SHA: [
+                    client: "'${createClientSRG.output.get().asFile.sha1}'",
+                    server: "'${createServerSRG.output.get().asFile.sha1}'"
                ],
                BINPATCH: [
                    client: '/data/client.lzma',
@@ -727,6 +768,18 @@ tasks.register('installerJson', InstallerJson) {
                    outputs: [
                        '{MC_UNPACKED}': '{MC_UNPACKED_SHA}'
                    ]
+                ], [
+                    jar: INSTALLER_TOOLS,
+                    classpath: INSTALLER_TOOLS_CLASSPATH,
+                    args: [
+                        '--task', 'MCP_DATA',
+                        '--input', "[${MCP_ARTIFACT.descriptor}]",
+                        '--output', '{MAPPINGS}',
+                        '--key', 'mappings'
+                    ],
+                    outputs: [
+                        '{MAPPINGS}': '{MAPPINGS_SHA}'
+                    ]
                ], [
                    jar: INSTALLER_TOOLS,
                    classpath: INSTALLER_TOOLS_CLASSPATH,
@@ -740,18 +793,31 @@ tasks.register('installerJson', InstallerJson) {
                    outputs: [
                        '{MOJMAPS}': '{MOJMAPS_SHA}'
                    ]
+                ], [
+                    jar: INSTALLER_TOOLS,
+                    classpath: INSTALLER_TOOLS_CLASSPATH,
+                    args: [
+                        '--task', 'MERGE_MAPPING',
+                        '--left', '{MAPPINGS}',
+                        '--right', '{MOJMAPS}',
+                        '--output', '{MERGED_MAPPINGS}',
+                        '--classes', '--reverse-right'
+                    ],
+                    outputs: [
+                        '{MERGED_MAPPINGS}': '{MERGED_MAPPINGS_SHA}'
+                    ]
                ], [
                    sides: ['server'],
                    jar: FART,
                    classpath: getClasspath(project, libs, FART),
                    args: [
                        '--input', '{MC_UNPACKED}',
-                        '--output', '{MC_OFF}',
-                        '--names', '{MOJMAPS}',
-                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
+                        '--output', '{MC_SRG}',
+                        '--names', '{MERGED_MAPPINGS}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'
                    ],
                    outputs: [
-                        '{MC_OFF}': '{MC_OFF_SHA}'
+                        '{MC_SRG}': '{MC_SRG_SHA}'
                    ]
                ], [
                    sides: ['client'],
@@ -759,18 +825,18 @@ tasks.register('installerJson', InstallerJson) {
                    classpath: getClasspath(project, libs, FART),
                    args: [
                        '--input', '{MINECRAFT_JAR}',
-                        '--output', '{MC_OFF}',
-                        '--names', '{MOJMAPS}',
-                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
+                        '--output', '{MC_SRG}',
+                        '--names', '{MERGED_MAPPINGS}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'
                    ],
                    outputs: [
-                        '{MC_OFF}': '{MC_OFF_SHA}'
+                        '{MC_SRG}': '{MC_SRG_SHA}'
                    ]
                ], [
                    jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
                    classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
                    args: [
-                        '--clean', '{MC_OFF}',
+                        '--clean', '{MC_SRG}',
                        '--output', '{PATCHED}',
                        '--apply', '{BINPATCH}',
                        '--data', '--unpatched'
@@ -785,27 +851,6 @@ tasks.register('installerJson', InstallerJson) {
    }
 }

-tasks.register('officialClassesOnly', Zip).configure {
-    dependsOn(jar)
-    destinationDirectory = file('build/libs')
-    archiveClassifier = 'official-classes'
-    from zipTree(jar.archiveFile).matching {
-        include '**/*.class'
-        exclude 'mcp/**'
-    }
-}
-
-tasks.named('filterJarNew').configure {
-    dependsOn('officialClassesOnly')
-    input = officialClassesOnly.archiveFile
-}
-
-tasks.register('filterJarNewSRG', FilterNewJar).configure {
-    input = reobfJar.output
-    srg = filterJarNew.srg
-    blacklist = filterJarNew.blacklist
-}
-
 tasks.named('universalJar').configure {
    dependsOn downloadCrowdin
    from zipTree(downloadCrowdin.dest).matching {
@@ -817,9 +862,6 @@ tasks.named('universalJar').configure {
    exclude '.cache'

    manifest {
-        attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.forge'
-        ] as LinkedHashMap)
        attributes([
            'Specification-Title':   'Forge',
            'Specification-Vendor':  'Forge Development LLC',
@@ -840,20 +882,6 @@ tasks.named('universalJar').configure {
    jarSigner.sign(it)
 }

-tasks.register('universalJarSrg', Jar).configure {
-    from zipTree(filterJarNewSRG.output)
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    from zipTree(universalJar.archiveFile)
-    destinationDirectory = file('build/libs')
-    archiveClassifier = 'universal-srg'
-    manifest.from(universalJar.manifest)
-    jarSigner.sign(it)
-}
-
-tasks.named('userdevConfig').configure {
-    universal = "$project.group:$project.name:$project.version:universal-srg@jar"
-}
-
 tasks.register('installerJar', InstallerJar) {
    fat = !System.env.TEAMCITY_VERSION
    //offline = true
@@ -1040,7 +1068,6 @@ tasks.named('javadoc', Javadoc).configure {
 publishing {
    publications.register('mavenJava', MavenPublication).configure {
        artifact universalJar
-        artifact universalJarSrg
        artifact installerJar
        artifact mdkZip
        artifact userdevJar
@@ -1052,8 +1079,8 @@ publishing {
            name = project.name
            description = 'Modifactions to Minecraft to enable mod developers.'
            url = 'https://github.com/MinecraftForge/MinecraftForge'
-            gradleutils.pom.setGitHubDetails(pom, 'MinecraftForge')
-            license gradleutils.pom.Licenses.LGPLv2_1
+            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
+            license PomUtils.Licenses.LGPLv2_1
        }
    }
    
@@ -1063,5 +1090,5 @@ publishing {
 }

 // Make sure we run bin compat checking during local testing.
-if ((!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) && CHECK_COMPATIBILITY == "true")
+if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD)
    tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }
@@ -44,7 +44,6 @@ tasks.withType(JavaCompile).configureEach {
    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
-    options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
 }

 // Merge the resources and classes into the same directory. We'll need to split them at runtime because
@@ -75,3 +74,11 @@ eclipse {
    // 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.6-&query=$.promos["1.20.6-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.6-&query=$.promos["1.20.6-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/

@@ -57,9 +57,7 @@ public class DeferredWorkQueue
        LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
        RuntimeException aggregate = new RuntimeException();
        Stopwatch timer = Stopwatch.createStarted();
-        for (TaskInfo t : tasks) {
-            makeRunnable(t, Runnable::run, aggregate);
-        }
+        tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
        timer.stop();
        if (aggregate.getSuppressed().length > 0) {
            LOGGER.fatal(
@@ -116,7 +114,7 @@ public class DeferredWorkQueue
        return future;
    }

-    private static final class TaskInfo {
+    private static class TaskInfo {
        private final ModContainer owner;
        private Runnable task;
        private CompletableFuture<?> future;
@@ -61,7 +61,7 @@ public class InterModComms
        }
    }

-    private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
+    private static ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();

    /**
     * Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
@@ -115,14 +115,16 @@ public class InterModComms
        return getMessages(modId, s->Boolean.TRUE);
    }

-    private record QueueFilteringSpliterator(
-            ConcurrentLinkedQueue<IMCMessage> queue,
-            Predicate<String> methodFilter,
-            Iterator<IMCMessage> iterator
-    ) implements Spliterator<IMCMessage> {
+    private static class QueueFilteringSpliterator implements Spliterator<IMCMessage>
+    {
+        private final ConcurrentLinkedQueue<IMCMessage> queue;
+        private final Predicate<String> methodFilter;
+        private final Iterator<IMCMessage> iterator;

        public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
-            this(queue, methodFilter, queue.iterator());
+            this.queue = queue;
+            this.iterator = queue.iterator();
+            this.methodFilter = methodFilter;
        }

        @Override
@@ -16,7 +16,8 @@ import net.minecraftforge.api.distmarker.Dist;
 *
 * @see Dist
 */
-public enum LogicalSide {
+public enum LogicalSide
+{
    /**
     * The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
     * viewpoint.
@@ -26,7 +27,6 @@ public enum LogicalSide {
     * @see Dist#CLIENT
     */
    CLIENT,
-
    /**
     * The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
     * on the level.
@@ -41,14 +41,16 @@ public enum LogicalSide {
    /**
     * {@return if this logical side is the server}
     */
-    public boolean isServer() {
+    public boolean isServer()
+    {
        return !isClient();
    }

    /**
     * {@return if the logical side is the client}
     */
-    public boolean isClient() {
+    public boolean isClient()
+    {
        return this == CLIENT;
    }
 }
@@ -45,7 +45,7 @@ public abstract class ModContainer
    protected final IModInfo modInfo;
    protected ModLoadingStage modLoadingStage;
    protected Supplier<?> contextExtension;
-    protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
+    protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>();
    protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
    protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
@@ -168,10 +168,7 @@ public abstract class ModContainer
    }

    public void dispatchConfigEvent(IConfigEvent event) {
-        var handler = configHandler.orElse(null);
-        if (handler != null) {
-            handler.accept(event);
-        }
+        configHandler.ifPresent(configHandler->configHandler.accept(event));
    }

    /**
@@ -15,8 +15,12 @@ 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.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -28,6 +32,8 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -39,7 +45,9 @@ import java.util.stream.Stream;
 * Master list of all mods - game-side version. This is classloaded in the game scope and
 * can dispatch game level events as a result.
 */
-public class ModList {
+public class ModList
+{
+    //private static final Logger LOGGER = LogManager.getLogger();
    private static ModList INSTANCE;
    private final List<IModFileInfo> modFiles;
    private final List<IModInfo> sortedList;
@@ -49,7 +57,8 @@ public class ModList {
    private List<ModFileScanData> modFileScanData;
    private List<ModContainer> sortedContainers;

-    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
+    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
+    {
        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
        this.sortedList = sortedList.stream().
                map(ModInfo.class::cast).
@@ -65,20 +74,19 @@ public class ModList {
    }

    private String fileToLine(IModFile mf) {
-        var mainMod = mf.getModInfos().getFirst();
        return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
-                mainMod.getDisplayName(),
-                mainMod.getModId(),
-                mainMod.getVersion(),
-                getModContainerState(mainMod.getModId()),
+                mf.getModInfos().get(0).getDisplayName(),
+                mf.getModInfos().get(0).getModId(),
+                mf.getModInfos().get(0).getVersion(),
+                getModContainerState(mf.getModInfos().get(0).getModId()),
                ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
    }
-
    private String crashReport() {
        return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
    }

-    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
+    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
+    {
        INSTANCE = new ModList(modFiles, sortedList);
        return INSTANCE;
    }
@@ -87,11 +95,21 @@ public class ModList {
        return INSTANCE;
    }

-    public List<IModFileInfo> getModFiles() {
+    private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
+        ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
+        thread.setName("modloading-worker-" + thread.getPoolIndex());
+        // The default sets it to the SystemClassloader, so copy the current one.
+        thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
+        return thread;
+    }
+
+    public List<IModFileInfo> getModFiles()
+    {
        return modFiles;
    }

-    public IModFileInfo getModFileById(String modid) {
+    public IModFileInfo getModFileById(String modid)
+    {
        return this.fileById.get(modid);
    }

@@ -113,18 +131,16 @@ public class ModList {
            CompletableFuture<Void> cf = new CompletableFuture<>();
            final RuntimeException accumulator = new RuntimeException();
            cf.completeExceptionally(accumulator);
-            for (Throwable exception : throwables) {
+            throwables.forEach(exception -> {
                if (exception instanceof CompletionException) {
                    exception = exception.getCause();
                }
-                if (exception.getSuppressed().length != 0) {
-                    for (Throwable throwable : exception.getSuppressed()) {
-                        accumulator.addSuppressed(throwable);
-                    }
+                if (exception.getSuppressed().length!=0) {
+                    Arrays.stream(exception.getSuppressed()).forEach(accumulator::addSuppressed);
                } else {
                    accumulator.addSuppressed(exception);
                }
-            }
+            });
            return cf;
        }
    }
@@ -132,47 +148,56 @@ public class ModList {
    static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
        List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
        CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
-        for (var future : futures) {
+        futures.forEach(future -> {
            int i = list.size();
            list.add(null);
            results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
-        }
+        });
        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
    }

-    void setLoadedMods(final List<ModContainer> modContainers) {
+    void setLoadedMods(final List<ModContainer> modContainers)
+    {
        this.mods = modContainers;
        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
        this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
    }

    @SuppressWarnings("unchecked")
-    public <T> Optional<T> getModObjectById(String modId) {
+    public <T> Optional<T> getModObjectById(String modId)
+    {
        return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
    }

-    public Optional<? extends ModContainer> getModContainerById(String modId) {
+    public Optional<? extends ModContainer> getModContainerById(String modId)
+    {
        return Optional.ofNullable(this.indexedMods.get(modId));
    }

-    public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
+    public Optional<? extends ModContainer> getModContainerByObject(Object obj)
+    {
        return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
    }

-    public List<IModInfo> getMods() {
+    public List<IModInfo> getMods()
+    {
        return this.sortedList;
    }

-    public boolean isLoaded(String modTarget) {
+    public boolean isLoaded(String modTarget)
+    {
        return this.indexedMods.containsKey(modTarget);
    }

-    public int size() {
+    public int size()
+    {
        return mods.size();
    }

-    public List<ModFileScanData> getAllScanData() {
-        if (modFileScanData == null) {
+    public List<ModFileScanData> getAllScanData()
+    {
+        if (modFileScanData == null)
+        {
            modFileScanData = this.sortedList.stream().
                    map(IModInfo::getOwningFile).
                    filter(Objects::nonNull).
@@ -185,7 +210,8 @@ public class ModList {

    }

-    public void forEachModFile(Consumer<IModFile> fileConsumer) {
+    public void forEachModFile(Consumer<IModFile> fileConsumer)
+    {
        modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
    }

@@ -204,4 +230,10 @@ public class ModList {
    public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
        return indexedMods.values().stream().map(function);
    }
+
+    private static class UncaughtModLoadingException extends ModLoadingException {
+        public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
+            super(null, stage, "fml.modloading.uncaughterror", originalException);
+        }
+    }
 }
@@ -77,13 +77,13 @@ import static net.minecraftforge.fml.Logging.LOADING;
 public class ModLoader
 {
    private static final Logger LOGGER = LogManager.getLogger();
+    private static ModLoader INSTANCE;
    private final LoadingModList loadingModList;

    private final List<ModLoadingException> loadingExceptions;
-    private final Set<IModInfo> erroredModInfos;
    private final List<ModLoadingWarning> loadingWarnings;
    private final ModStateManager stateManager;
-    private static boolean loadingStateValid;
+    private boolean loadingStateValid;
    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
    private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
    private final Set<IModLoadingState> completedStates = new HashSet<>();
@@ -91,6 +91,7 @@ public class ModLoader

    private ModLoader()
    {
+        INSTANCE = this;
        this.loadingModList = FMLLoader.getLoadingModList();
        this.loadingExceptions = this.loadingModList.getErrors().stream()
                .flatMap(ModLoadingException::fromEarlyException)
@@ -98,32 +99,24 @@ public class ModLoader
        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());
-        if (this.loadingExceptions.isEmpty()) {
-            this.erroredModInfos = Collections.emptySet();
-        } else {
-            this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
-            this.erroredModInfos.addAll(this.loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
-        }
        this.loadingModList.getModFiles().stream()
                .filter(ModFileInfo::missingLicense)
-                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
+                .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()))
                .forEach(this.loadingExceptions::add);
        this.stateManager = new ModStateManager();
        CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
        CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
-        CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
-        CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
+        CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
+        CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
    }

-    private static String computeLanguageList() {
-        return "\n" + FMLLoader.getLanguageLoadingProvider()
-                .applyForEach(lp -> lp.name() + "@" + lp.getClass().getPackage().getImplementationVersion())
-                .collect(Collectors.joining("\n\t\t", "\t\t", ""));
+    private String computeLanguageList() {
+        return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", ""));
    }

-    private static String computeModLauncherServiceList() {
+    private String computeModLauncherServiceList() {
        final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
        return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
                " "+mod.getOrDefault("name", "missing")+
@@ -132,13 +125,9 @@ public class ModLoader
                collect(Collectors.joining("\n\t\t","\t\t",""));
    }

-    public static ModLoader get() {
-        return LazyInit.INSTANCE;
-    }
-
-    private static final class LazyInit {
-        private static final ModLoader INSTANCE = new ModLoader();
-        private LazyInit() {}
+    public static ModLoader get()
+    {
+        return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE;
    }

    /**
@@ -155,7 +144,7 @@ public class ModLoader
        final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
                loadingModList.getMods());
        if (!this.loadingExceptions.isEmpty()) {
-            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
+            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
            modList.setLoadedMods(Collections.emptyList());
            loadingStateValid = false;
@@ -163,7 +152,7 @@ public class ModLoader
        }
        List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
                .map(ModInfo::getForgeFeatures)
-                .flatMap(List::stream)
+                .flatMap(Collection::stream)
                .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
                .toList();

@@ -180,10 +169,10 @@ public class ModLoader
        final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
                .map(ModFileInfo::getFile)
                .map(this::buildMods)
-                .flatMap(List::stream)
+                .<ModContainer>mapMulti(Iterable::forEach)
                .toList();
        if (!loadingExceptions.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
+            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
            modList.setLoadedMods(Collections.emptyList());
            loadingStateValid = false;
@@ -192,28 +181,22 @@ public class ModLoader
        modList.setLoadedMods(modContainers);
        this.modList = modList;
        var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
-        var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
-        for (IModLoadingState mls : stateList) {
-            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
-        }
+        var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
+        stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
        progress.complete();
    }

    public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
        var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
        var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
-        for (IModLoadingState mls : stateList) {
-            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
-        }
+        stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
        progress.complete();
    }

    public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
        var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
        var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
-        for (IModLoadingState mls : stateList) {
-            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
-        }
+        stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
        statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
        progress.complete();
    }
@@ -223,15 +206,10 @@ public class ModLoader
            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
            return;
        }
-        progressBar.label(progressBar.name() + " working");
+        progressBar.label(progressBar.name()+ " working");
        syncExecutor.drive(ticker);
-
-        var inlineRunnable = state.inlineRunnable().orElse(null);
-        if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
-
-        var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
-        if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
-
+        state.inlineRunnable().ifPresent(a->this.handleInlineTransition(a, state, syncExecutor, ticker));
+        state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
        completedStates.add(state);
    }

@@ -308,12 +286,9 @@ public class ModLoader
        try {
            final String modId = idToProviderEntry.getKey();
            final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
-
-            IModInfo info = modInfoMap.get(modId);
-            // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
-            if (info == null)
-                throw new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId);
-
+            IModInfo info = Optional.ofNullable(modInfoMap.get(modId)).
+                    // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
+                    orElseThrow(()->new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId));
            return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
        } catch (ModLoadingException mle) {
            // exceptions are caught and added to the error list for later handling
@@ -328,7 +303,7 @@ public class ModLoader
     * and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
     */
    public static boolean isLoadingStateValid() {
-        return loadingStateValid;
+        return get().loadingStateValid;
    }

    public boolean hasCompletedState(final String stateName) {
@@ -9,52 +9,49 @@ import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.config.IConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
 import org.slf4j.Logger;
+
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;

-public class ModLoadingContext {
+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 Use the context provided by your language loader in your mod's constructor.
     */
-    @Deprecated(forRemoval = true, since="1.21.1")
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public static ModLoadingContext get() {
        return context.get();
    }

    /**
-     * @deprecated Going to be moved to ForgeHooks for Internal use.
+     * @deprecated Going to be moved to ForgeHooks for internal use.
     */
-    @Deprecated(forRemoval = true, since="1.21.1")
+    @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.
+     * Going to be moved to ForgeHooks for internal use.
     * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
     */
-    @Deprecated(forRemoval = true, since="1.21.1")
+    @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 Going to be moved to ForgeHooks for Internal use.
-     */
-    @Deprecated(forRemoval = true, since="1.21.1")
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public String getActiveNamespace() {
        return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
    }

-    /**
-     * @return {@link ModLoadingContext#getActiveContainer()} by default.
-     */
    public ModContainer getContainer() {
        return getActiveContainer();
    }
@@ -39,10 +39,7 @@ public record ModLoadingState(String name, String previous,
                                                      final ProgressMeter progressBar,
                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        var transition = this.transition.orElse(null);
-        return transition == null
-                ? Optional.empty()
-                : Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
+        return transition.map(t -> t.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
    }

    /**
@@ -16,13 +16,15 @@ import java.util.stream.Collectors;

@SuppressWarnings("UnstableApiUsage")
 public class ModStateManager {
+    static ModStateManager INSTANCE;
    private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;

    public ModStateManager() {
+        INSTANCE = this;
        final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
        this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
                .map(IModStateProvider::getAllStates)
-                .flatMap(List::stream)
+                .<IModLoadingState>mapMulti(Iterable::forEach)
                .collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
    }

@@ -34,16 +36,14 @@ public class ModStateManager {
        var dummy = ModLoadingState.empty("", "", phase);
        nodes.forEach(graph::addNode);
        graph.addNode(dummy);
-        for (IModLoadingState node : nodes) {
-            graph.putEdge(lookup.getOrDefault(node.previous(), dummy), node);
-        }
+        nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
        return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
    }

    public IModLoadingState findState(final String stateName) {
        return stateMap.values()
                .stream()
-                .flatMap(List::stream)
+                .flatMap(Collection::stream)
                .filter(mls -> mls.name().equals(stateName))
                .findFirst()
                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
@@ -17,7 +17,6 @@ import static net.minecraftforge.fml.Logging.LOADING;
 public class ModWorkManager {
    private static final Logger LOGGER = LogManager.getLogger();
    private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
-
    public interface DrivenExecutor extends Executor {
        boolean selfDriven();
        boolean driveOne();
@@ -34,11 +33,8 @@ public class ModWorkManager {
            }
        }
    }
-
-    private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
-        public SyncExecutor() {
-            this(new ConcurrentLinkedDeque<>());
-        }
+    private static class SyncExecutor implements DrivenExecutor {
+        private ConcurrentLinkedDeque<Runnable> tasks = new ConcurrentLinkedDeque<>();

        @Override
        public boolean driveOne() {
@@ -60,7 +56,13 @@ public class ModWorkManager {
        }
    }

-    private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
+    private static class WrappingExecutor implements DrivenExecutor {
+        private final Executor wrapped;
+
+        public WrappingExecutor(final Executor executor) {
+            this.wrapped = executor;
+        }
+
        @Override
        public boolean selfDriven() {
            return true;
@@ -77,9 +79,11 @@ public class ModWorkManager {
        }
    }

-    private static final SyncExecutor syncExecutor = new SyncExecutor();
+    private static SyncExecutor syncExecutor;

    public static DrivenExecutor syncExecutor() {
+        if (syncExecutor == null)
+            syncExecutor = new SyncExecutor();
        return syncExecutor;
    }

@@ -87,8 +91,14 @@ public class ModWorkManager {
        return new WrappingExecutor(executor);
    }

+    private static ForkJoinPool parallelThreadPool;
    public static Executor parallelExecutor() {
-        return LazyInit.PARALLEL_EXECUTOR;
+        if (parallelThreadPool == null) {
+            final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
+            LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
+            parallelThreadPool = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
+        }
+        return parallelThreadPool;
    }

    private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
@@ -99,14 +109,4 @@ public class ModWorkManager {
        return thread;
    }

-    private static final class LazyInit {
-        private LazyInit() {}
-        private static final ForkJoinPool PARALLEL_EXECUTOR;
-
-        static {
-            final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
-            LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
-            PARALLEL_EXECUTOR = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
-        }
-    }
 }
@@ -23,7 +23,7 @@ public final class OptionalMod<T>
        return new OptionalMod<>(modId);
    }

-    private static final OptionalMod<?> EMPTY = new OptionalMod<>(true);
+    private static OptionalMod<?> EMPTY = new OptionalMod<>(true);
    private static <T> OptionalMod<T> empty() {
        @SuppressWarnings("unchecked")
        OptionalMod<T> t = (OptionalMod<T>) EMPTY;
@@ -213,8 +213,8 @@ public final class OptionalMod<T>
    public boolean equals(Object obj)
    {
        if (this == obj) return true;
-        if (obj instanceof OptionalMod<?> optionalMod) {
-            return Objects.equals(optionalMod.modId, modId);
+        if (obj instanceof OptionalMod) {
+            return Objects.equals(((OptionalMod)obj).modId, modId);
        }
        return false;
    }
@@ -25,7 +25,7 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;

 public class ConfigFileTypeHandler {
    private static final Logger LOGGER = LogUtils.getLogger();
-    static final ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
+    static ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
    private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));

    public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
@@ -47,8 +47,12 @@ public class ConfigFileTypeHandler {
                throw new ConfigLoadingException(c, ex);
            }
            LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
-            FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
-            LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
+            try {
+                FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
+                LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
+            } catch (IOException e) {
+                throw new RuntimeException("Couldn't watch config file", e);
+            }
            return configData;
        };
    }
@@ -62,10 +66,8 @@ public class ConfigFileTypeHandler {
        }
    }

-    private static boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
-        if (!Files.isDirectory(file.getParent())) {
-            Files.createDirectories(file.getParent());
-        }
+    private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
+        Files.createDirectories(file.getParent());
        Path p = defaultConfigPath.resolve(modConfig.getFileName());
        if (Files.exists(p)) {
            LOGGER.info(CONFIG, "Loading default config file from path {}", p);
@@ -109,11 +111,17 @@ public class ConfigFileTypeHandler {
        }
    }

-    private record ConfigWatcher(
-            ModConfig modConfig,
-            CommentedFileConfig commentedFileConfig,
-            ClassLoader realClassLoader
-    ) implements Runnable {
+    private static class ConfigWatcher implements Runnable {
+        private final ModConfig modConfig;
+        private final CommentedFileConfig commentedFileConfig;
+        private final ClassLoader realClassLoader;
+
+        ConfigWatcher(final ModConfig modConfig, final CommentedFileConfig commentedFileConfig, final ClassLoader classLoader) {
+            this.modConfig = modConfig;
+            this.commentedFileConfig = commentedFileConfig;
+            this.realClassLoader = classLoader;
+        }
+
        @Override
        public void run() {
            // Force the regular classloader onto the special thread
@@ -47,19 +47,15 @@ public class ConfigTracker {

    public void loadConfigs(ModConfig.Type type, Path configBasePath) {
        LOGGER.debug(CONFIG, "Loading configs type {}", type);
-        for (ModConfig config : this.configSets.get(type)) {
-            openConfig(config, configBasePath);
-        }
+        this.configSets.get(type).forEach(config -> openConfig(config, configBasePath));
    }

    public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
        LOGGER.debug(CONFIG, "Unloading configs type {}", type);
-        for (ModConfig config : this.configSets.get(type)) {
-            closeConfig(config, configBasePath);
-        }
+        this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath));
    }

-    private static void openConfig(final ModConfig config, final Path configBasePath) {
+    private void openConfig(final ModConfig config, final Path configBasePath) {
        LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
        final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
        config.setConfigData(configData);
@@ -67,7 +63,7 @@ public class ConfigTracker {
        config.save();
    }

-    private static void closeConfig(final ModConfig config, final Path configBasePath) {
+    private void closeConfig(final ModConfig config, final Path configBasePath) {
        if (config.getConfigData() != null) {
            LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
            // stop the filewatcher before we save the file and close it, so reload doesn't fire
@@ -24,6 +24,7 @@ public class ModConfig
    private final ModContainer container;
    private final ConfigFileTypeHandler configHandler;
    private CommentedConfig configData;
+    private Callable<Void> saveHandler;

    public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
        this.type = type;
@@ -22,7 +22,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.awt.Desktop;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.URI;
@@ -85,7 +87,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
    private ScheduledFuture<?> initializationFuture;

    private PerformanceInfo performanceInfo;
-    @SuppressWarnings("unused")
    private ScheduledFuture<?> performanceTick;
    // The GL ID of the window. Used for all operations
    private long window;
@@ -258,11 +259,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-        for (var itr = this.elements.iterator(); itr.hasNext(); ) {
-            var element = itr.next();
-            if (!element.render(context, framecount))
-                itr.remove();
-        }
+        this.elements.removeIf(element -> !element.render(context, framecount));
        if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
            framecount++;
    }
@@ -305,6 +302,13 @@ public class DisplayWindow implements ImmediateWindowProvider {
    }

    private void crashElegantly(String errorDetails) {
+        String qrText;
+        try (var is = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/glfailure.txt")))) {
+            qrText = is.lines().collect(Collectors.joining("\n"));
+        } catch (IOException ioe) {
+            qrText = "";
+        }
+
        StringBuilder msgBuilder = new StringBuilder(2000);
        msgBuilder.append("Failed to initialize graphics window with current settings.\n");
        msgBuilder.append("\n\n");
@@ -403,13 +407,13 @@ public class DisplayWindow implements ImmediateWindowProvider {
            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
@@ -493,6 +497,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
        glfwPollEvents();
    }

+    private void badWindowHandler(final int code, final long desc) {
+        LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
+    }
+
    private void winResize(long window, int width, int height) {
        if (window == this.window && width != 0 && height != 0) {
            this.winWidth = width;
@@ -626,6 +634,7 @@ public class DisplayWindow implements ImmediateWindowProvider {

    public void addMojangTexture(final int textureId) {
        this.elements.add(0, RenderElement.mojang(textureId, framecount));
+//        this.elements.get(0).retire(framecount + 1);
    }

    public void close() {
@@ -13,10 +13,10 @@ 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;

    private float memory;
    private String text;
@@ -24,15 +24,14 @@ public class PerformanceInfo {
    PerformanceInfo() {
        showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
        osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
-        memoryBean = ManagementFactory.getMemoryMXBean();
    }

    void update() {
-        final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
+        final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
        memory = (float) heapusage.getUsed() / heapusage.getMax();

        if (!showCPUUsage) {
-            text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
+            text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
            return;
        }

@@ -44,7 +43,7 @@ public class PerformanceInfo {
            cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
        }

-        text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s".formatted(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() {
@@ -11,6 +11,8 @@ import org.lwjgl.stb.STBTTFontinfo;
 import org.lwjgl.stb.STBTTPackContext;
 import org.lwjgl.stb.STBTTPackRange;
 import org.lwjgl.stb.STBTTPackedchar;
+import org.lwjgl.system.MemoryStack;
+
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

@@ -23,7 +25,7 @@ public class SimpleFont {
    private final int lineSpacing;
    private final int descent;
    private final int GLYPH_COUNT = 127-32;
-    private final Glyph[] glyphs;
+    private Glyph[] glyphs;

    private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
        Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
@@ -37,7 +37,7 @@ dependencies {
    implementation(libs.jimfs)

    implementation(libs.log4j.core)
-    annotationProcessor(libs.bundles.log4j)
+    annotationProcessor(libs.log4j.core)

    testCompileOnly(libs.nulls)
    testRuntimeOnly(libs.bootstrap)
@@ -49,38 +49,56 @@ public class CapabilityTokenSubclass 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/minecraft/") || internalName.startsWith("com/mojang/"))
+            return NAY;
+        
+        return YAY;
    }

    @Override
-    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
-        if (CAP_INJECT.equals(classNode.name)) {
-            for (MethodNode mtd : classNode.methods) {
-                if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc)) {
+    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
+    {
+        if (CAP_INJECT.equals(classNode.name))
+        {
+            for (MethodNode mtd : classNode.methods)
+            {
+                if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc))
+                {
                    mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
                }
            }
            return ComputeFlags.SIMPLE_REWRITE;
-        } else if (CAP_INJECT.equals(classNode.superName)) {
+        }
+        else if (CAP_INJECT.equals(classNode.superName))
+        {
            Holder cls = new Holder();

            SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
-            reader.accept(new SignatureVisitor(Opcodes.ASM9) {
+            reader.accept(new SignatureVisitor(Opcodes.ASM9)
+            {
                final Deque<String> stack = new ArrayDeque<>();

                @Override
-                public void visitClassType(final String name) {
+                public void visitClassType(final String name)
+                {
                    stack.push(name);
                }

                @Override
-                public void visitInnerClassType(final String name) {
+                public void visitInnerClassType(final String name)
+                {
                    stack.push(stack.pop() + '$' + name);
                }

                @Override
-                public void visitEnd() {
+                public void visitEnd()
+                {
                    var val = stack.pop();
                    if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
                        cls.value = val;
@@ -95,7 +113,9 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
            mtd.visitInsn(Opcodes.ARETURN);
            mtd.visitEnd();
            return ComputeFlags.COMPUTE_MAXS;
-        } else {
+        }
+        else
+        {
            return ComputeFlags.NO_REWRITE;
        }
    }
@@ -103,4 +123,5 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
    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;
@@ -34,7 +35,10 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
            new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
            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.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
+    ).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
+    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;

@@ -47,12 +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 static boolean hasHolder(List<AnnotationNode> lst) {
+    private boolean hasHolder(List<AnnotationNode> lst) {
        return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
    }

@@ -48,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
@@ -59,15 +65,14 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
        if ((classNode.access & Opcodes.ACC_ENUM) == 0)
            return ComputeFlags.NO_REWRITE;

+        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);

-        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
-            return ComputeFlags.NO_REWRITE;
-        }
-
        //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"))
@@ -39,6 +39,7 @@ public class FMLConfig
        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;
@@ -17,9 +17,11 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
 import net.minecraftforge.forgespi.Environment;
 import net.minecraftforge.forgespi.coremod.ICoreModProvider;
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;

 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +36,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
 public class FMLLoader {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static AccessTransformerService accessTransformer;
+    private static ModDiscoverer modDiscoverer;
    private static ICoreModProvider coreModProvider;
    private static LanguageLoadingProvider languageLoadingProvider;
    private static Dist dist;
@@ -54,12 +57,15 @@ 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");
        runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
        coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
-        LOGGER.debug(CORE, "FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
+        LOGGER.debug(CORE,"FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
        checkPackage(Environment.class, "2.0", "ForgeSPI");

        try {
@@ -71,15 +77,14 @@ public class FMLLoader {
        }
    }

-    @SuppressWarnings("unchecked")
    private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
-        var plugin = env.findLaunchPlugin(id).orElse(null);
-        if (plugin == null) {
+        @SuppressWarnings("unchecked")
+        var plugin = (T)env.findLaunchPlugin(id).orElseThrow(() -> {
            LOGGER.error(CORE, "{} library is missing, we need this to run", name);
-            throw new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
-        }
+            return new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
+        });
        checkPackage(plugin.getClass(), version, name);
-        return (T) plugin;
+        return plugin;
    }

    private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
@@ -118,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);
@@ -135,20 +146,20 @@ public class FMLLoader {
        }
        commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
        launchHandlerName = launchHandler.get().name();
-        gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Path.of(".").toAbsolutePath());
+        gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath());

        naming = commonLaunchHandler.getNaming();
        dist = commonLaunchHandler.getDist();
        production = commonLaunchHandler.isProduction();

-        accessTransformer.getExtension().accept(Map.entry(naming, "srg"));
+        accessTransformer.getExtension().accept(Pair.of(naming, "srg"));

        runtimeDistCleaner.getExtension().accept(dist);
    }

    public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
        LOGGER.debug(SCAN,"Scanning for Mod Locators");
-        var modDiscoverer = new ModDiscoverer(arguments);
+        modDiscoverer = new ModDiscoverer(arguments);
        modValidator = modDiscoverer.discoverMods();
        var pluginResources = modValidator.getPluginResources();
        return List.of(pluginResources);
@@ -170,12 +181,16 @@ public class FMLLoader {
        return languageLoadingProvider;
    }

+    static ModDiscoverer getModDiscoverer() {
+        return modDiscoverer;
+    }
+
    public static CommonLaunchHandler getLaunchHandler() {
        return commonLaunchHandler;
    }

    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());
    }

@@ -24,7 +24,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.CORE;

 public class FMLServiceProvider implements ITransformationService {
    private static final Logger LOGGER = LogUtils.getLogger();
-    private final Map<String, Object> arguments = new HashMap<>();
+    private Map<String, Object> arguments;

    public FMLServiceProvider() {
        var markers = System.getProperty("forge.logging.markers", "").split(",");
@@ -45,6 +45,7 @@ public class FMLServiceProvider implements ITransformationService {
        FMLConfig.load();
        LOGGER.debug(CORE, "Preparing ModFile");
        environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
+        arguments = new HashMap<>();
        LOGGER.debug(CORE, "Preparing launch handler");
        FMLLoader.setupLaunchHandler(environment, arguments);
        FMLEnvironment.setupInteropEnvironment(environment);
@@ -67,6 +68,14 @@ public class FMLServiceProvider implements ITransformationService {
        FMLLoader.onInitialLoad(environment, otherServices);
    }

+    @Override
+    public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder) {
+    }
+
+    @Override
+    public void argumentValues(OptionResult option) {
+    }
+
    @SuppressWarnings("rawtypes")
    @Override
    public @NotNull List<ITransformer> transformers() {
@@ -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,13 +81,22 @@ public class LoadingModList

    public void addAccessTransformers()
    {
+        var errors = new ArrayList<EarlyLoadingException.ExceptionData>();
        for (ModFileInfo modFile : modFiles) {
            ModFile mod = modFile.getFile();
-            var at = mod.getAccessTransformer().orElse(null);
-            if (at != null) {
-                FMLLoader.addAccessTransformer(at, mod);
+            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)
@@ -36,7 +36,7 @@ public class MCPNamingService implements INameMappingService {

    @Override
    public Map.Entry<String, String> understanding() {
-        return Map.entry("srg", "mcp");
+        return Pair.of("srg", "mcp");
    }

    @Override
@@ -77,7 +77,7 @@ public class MCPNamingService implements INameMappingService {
    }

    private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
-        URL path = MCPNamingService.class.getClassLoader().getResource(mappingFileName);
+        URL path = ClassLoader.getSystemResource(mappingFileName); //We EXPLICITLY go through the SystemClassLoader here because this is dev-time only. And will be on the root classpath.
        if (path == null)
            return;

@@ -34,7 +34,7 @@ public class MavenCoordinateResolver {
                (!extension.isEmpty() ? "." + extension : ".jar");

        String[] groups = groupId.split("\\.");
-        Path result = Path.of(groups[0]);
+        Path result = Paths.get(groups[0]);
        for (int i = 1; i < groups.length; i++) {
            result = result.resolve(groups[i]);
        }
@@ -57,13 +57,13 @@ public class ModSorter
            // 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)).toList(), e);
+            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
        }
        // try and validate dependencies
        final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
        // if we miss one or the other, we abort now
        if (!failedList.isEmpty()) {
-            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), new EarlyLoadingException("failure to validate mod list", null, failedList));
+            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), new EarlyLoadingException("failure to validate mod list", null, failedList));
        } else {
            // Otherwise, lets try and sort the modlist and proceed
            EarlyLoadingException earlyLoadingException = null;
@@ -89,9 +89,9 @@ public class ModSorter
        infos.keySet().forEach(graph::addNode);
        modFiles.stream()
                .map(ModFile::getModInfos)
-                .flatMap(List::stream)
+                .<IModInfo>mapMulti(Iterable::forEach)
                .map(IModInfo::getDependencies)
-                .<IModInfo.ModVersion>flatMap(List::stream)
+                .<IModInfo.ModVersion>mapMulti(Iterable::forEach)
                .forEach(dep -> addDependency(graph, dep));

        final List<ModFileInfo> sorted;
@@ -107,7 +107,7 @@ public class ModSorter
                LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
            }
            var dataList = cycles.stream()
-                    .flatMap(Set::stream)
+                    .<ModFileInfo>mapMulti(Iterable::forEach)
                    .<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
                    .map(IModInfo::getModId)
                    .map(list -> new ExceptionData("fml.modloading.cycle", list))
@@ -116,7 +116,7 @@ public class ModSorter
        }
        this.sortedList = sorted.stream()
                .map(ModFileInfo::getMods)
-                .flatMap(List::stream)
+                .<IModInfo>mapMulti(Iterable::forEach)
                .map(ModInfo.class::cast)
                .collect(toList());
        this.modFiles = sorted.stream()
@@ -126,14 +126,12 @@ public class ModSorter

    private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
    {
+        final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
        final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
        // soft dep that doesn't exist. Just return. No edge required.
        if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
-
-        final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
        if (self == target)
            return; // in case a jar has two mods that have dependencies between
-
        switch (dep.getOrdering()) {
            case BEFORE -> topoGraph.putEdge(self, target);
            case AFTER -> topoGraph.putEdge(target, self);
@@ -167,7 +165,7 @@ public class ModSorter
            var container = modFilesByFirstId.get(systemMod);
            if (container != null && !container.isEmpty()) {
                LOGGER.debug("Found system mod: {}", systemMod);
-                this.systemMods.add(container.getFirst());
+                this.systemMods.add((ModFile) container.get(0));
            } else {
                throw new IllegalStateException("Failed to find system mod: " + systemMod);
            }
@@ -178,23 +176,23 @@ public class ModSorter
    {
        final var modVersions = modFiles.stream()
                .map(ModFile::getModInfos)
-                .flatMap(List::stream)
+                .<IModInfo>mapMulti(Iterable::forEach)
                .collect(toMap(IModInfo::getModId, IModInfo::getVersion));

        final var modVersionDependencies = modFiles.stream()
                .map(ModFile::getModInfos)
-                .flatMap(List::stream)
+                .<IModInfo>mapMulti(Iterable::forEach)
                .collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));

        final var modRequirements = modVersionDependencies.values().stream()
-                .<IModInfo.ModVersion>flatMap(List::stream)
+                .<IModInfo.ModVersion>mapMulti(Iterable::forEach)
                .filter(mv -> mv.getSide().isCorrectSide())
                .collect(toSet());

        final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
        LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
        final var missingVersions = modRequirements.stream()
-                .filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && !modVersionContained(mv, modVersions))
+                .filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && this.modVersionNotContained(mv, modVersions))
                .collect(toSet());
        final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
        LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
@@ -242,13 +240,9 @@ public class ModSorter
        );
    }

-    private static boolean modVersionContained(IModInfo.ModVersion mv, Map<String, ArtifactVersion> modVersions) {
-        var modId = mv.getModId();
-        var range = mv.getVersionRange();
-        if (modVersions.containsKey(modId)
-                && (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE")))
-            return true;
-
-        return VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod");
+    private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
+    {
+        return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
+                (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE"))));
    }
 }
@@ -8,8 +8,14 @@ package net.minecraftforge.fml.loading;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Streams;
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 import net.minecraftforge.api.distmarker.Dist;
@@ -22,177 +28,137 @@ import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;
 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;
    private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
    private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
-    private static final String MOD = "Lnet/minecraftforge/fml/common/Mod;";
-
    @Override
-    public String name() {
+    public String name()
+    {
        return "runtimedistcleaner";
    }

    @Override
-    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
-        var changed = false;
-
-        var annotations = unpack(classNode.visibleAnnotations);
-
-        if (remove(annotations, DIST)) {
+    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
+    {
+        AtomicBoolean changes = new AtomicBoolean();
+        if (remove(classNode.visibleAnnotations, DIST))
+        {
            LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
            throw new RuntimeException("Attempted to load class "+ classNode.name  + " for invalid dist "+ DIST);
        }

-        if (!FMLEnvironment.production && !annotations.isEmpty() && hasModAnnotation(classNode.visibleAnnotations)) {
-            LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
-            throw new RuntimeException("Found @OnlyIn on @Mod class "+ classNode.name  + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
-        }
-
-        if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
-            for (var ann : annotations) {
-                if (ann.intf == null || DIST.equals(ann.side))
-                    continue;
-
-                if (classNode.interfaces.remove(ann.intf)) {
-                    LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, ann.intf);
-                    changed = true;
-                }
-            }
+        if (classNode.interfaces != null )
+        {
+            unpack(classNode.visibleAnnotations).stream()
+                .filter(ann->Objects.equals(ann.desc, ONLYIN))
+                .filter(ann->ann.values.indexOf("_interface") != -1)
+                .filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST))
+                .map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName())
+                .forEach(intf -> {
+                    if (classNode.interfaces.remove(intf)) {
+                        LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, intf);
+                        changes.compareAndSet(false, true);
+                    }
+                });

            //Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set.
            if (classNode.visibleAnnotations != null) {
-                for (var itr = classNode.visibleAnnotations.iterator(); itr.hasNext(); ) {
-                    var ann = itr.next();
-                    if (ONLYIN.equals(ann.desc) || ONLYINS.equals(ann.desc)) {
-                        LOGGER.debug(DISTXFORM, "Removing Class Annotation: {} @{}", classNode.name, ann.desc);
+                Iterator<AnnotationNode> itr = classNode.visibleAnnotations.iterator();
+                while (itr.hasNext()) {
+                    AnnotationNode ann = itr.next();
+                    if (Objects.equals(ann.desc, ONLYIN) || Objects.equals(ann.desc, ONLYINS)) {
+                        LOGGER.debug(DISTXFORM,"Removing Class Annotation: {} @{}", classNode.name, ann.desc);
                        itr.remove();
-                        changed = true;
+                        changes.compareAndSet(false, true);
                    }
                }
            }
        }

-        for (var itr = classNode.fields.iterator(); itr.hasNext(); ) {
-            var field = itr.next();
-            if (remove(unpack(field.visibleAnnotations), DIST)) {
-                LOGGER.debug(DISTXFORM, "Removing field: {}.{}", classNode.name, field.name);
-                itr.remove();
-                changed = true;
+        Iterator<FieldNode> fields = classNode.fields.iterator();
+        while(fields.hasNext())
+        {
+            FieldNode field = fields.next();
+            if (remove(field.visibleAnnotations, DIST))
+            {
+                LOGGER.debug(DISTXFORM,"Removing field: {}.{}", classNode.name, field.name);
+                fields.remove();
+                changes.compareAndSet(false, true);
            }
        }

-        var lambdaGatherer = new LambdaGatherer();
-        for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
-            var method = itr.next();
-            if (remove(unpack(method.visibleAnnotations), DIST)) {
-                LOGGER.debug(DISTXFORM, "Removing method: {}.{}{}", classNode.name, method.name, method.desc);
-                itr.remove();
+        LambdaGatherer lambdaGatherer = new LambdaGatherer();
+        Iterator<MethodNode> methods = classNode.methods.iterator();
+        while(methods.hasNext())
+        {
+            MethodNode method = methods.next();
+            if (remove(method.visibleAnnotations, DIST))
+            {
+                LOGGER.debug(DISTXFORM,"Removing method: {}.{}{}", classNode.name, method.name, method.desc);
+                methods.remove();
                lambdaGatherer.accept(method);
-                changed = true;
+                changes.compareAndSet(false, true);
            }
        }

        // remove dynamic synthetic lambda methods that are inside of removed methods
-        for (List<Handle> handles = lambdaGatherer.getDynamicLambdaHandles();
-            !handles.isEmpty(); handles = lambdaGatherer.getDynamicLambdaHandles()) {
+        for (List<Handle> dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles();
+            !dynamicLambdaHandles.isEmpty(); dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles())
+        {
            lambdaGatherer = new LambdaGatherer();
-            for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
-                MethodNode method = itr.next();
-                if ((method.access & Opcodes.ACC_SYNTHETIC) == 0)
-                    continue;
-
-                for (var handle : handles) {
-                    if (method.name.equals(handle.getName()) && method.desc.equals(handle.getDesc())) {
-                        LOGGER.debug(DISTXFORM, "Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
-                        itr.remove();
+            methods = classNode.methods.iterator();
+            while (methods.hasNext())
+            {
+                MethodNode method = methods.next();
+                if ((method.access & Opcodes.ACC_SYNTHETIC) == 0) continue;
+                for (Handle dynamicLambdaHandle : dynamicLambdaHandles)
+                {
+                    if (method.name.equals(dynamicLambdaHandle.getName()) && method.desc.equals(dynamicLambdaHandle.getDesc()))
+                    {
+                        LOGGER.debug(DISTXFORM,"Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
+                        methods.remove();
                        lambdaGatherer.accept(method);
-                        changed = true;
+                        changes.compareAndSet(false, true);
                    }
                }
            }
        }
-
-        return changed ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
+        return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
    }

-    private static record Target(String side, String intf) {
-        static Target from(final AnnotationNode node) {
-            var idx = node.values.indexOf("value");
-            var value = (String[])node.values.get(idx + 1); // Enums are stored as [Type, Value]
-
-            idx = node.values.indexOf("_interface");
-            if (idx == -1)
-                return new Target(value[1], null);
-
-            var intf = (Type)node.values.get(idx + 1);
-            return new Target(value[1], intf.getInternalName());
-        }
-    }
-
-    /**
-     * Unpack any OnlyIn or OnlyIns annotations to Target objects.
-     */
    @SuppressWarnings("unchecked")
-    private static List<Target> unpack(final List<AnnotationNode> anns) {
-        if (anns == null || anns.isEmpty())
-            return Collections.emptyList();
-
-        var ret = new ArrayList<Target>();
-        for (var node : anns) {
-            if (ONLYIN.equals(node.desc))
-                ret.add(Target.from(node));
-            else if (ONLYINS.equals(node.desc)) {
-                if (node.values == null || node.values.isEmpty())
-                    continue;
-
-                int idx = node.values.indexOf("value");
-                if (idx == -1)
-                    continue;
-
-                var subNodes = (List<AnnotationNode>)node.values.get(idx + 1);
-                if (subNodes != null) {
-                    for (var sub : subNodes)
-                        ret.add(Target.from(sub));
-                }
-            }
-        }
-
+    private static List<AnnotationNode> unpack(final List<AnnotationNode> anns) {
+        if (anns == null) return Collections.emptyList();
+        List<AnnotationNode> ret = anns.stream().filter(ann->Objects.equals(ann.desc, ONLYIN)).collect(Collectors.toList());
+        anns.stream().filter(ann->Objects.equals(ann.desc, ONLYINS) && ann.values != null)
+            .map( ann -> (List<AnnotationNode>)ann.values.get(ann.values.indexOf("value") + 1))
+            .filter(v -> v != null)
+            .forEach(v -> v.forEach(ret::add));
        return ret;
    }

-    private static boolean remove(final List<Target> targets, final String side) {
-        for (var target : targets) {
-            if (target.intf == null && !side.equals(target.side))
-                return true;
-        }
-
-        return false;
-    }
-
-    private static boolean hasModAnnotation(final List<AnnotationNode> anns) {
-        if (anns == null || anns.isEmpty())
-            return false;
-
-        for (var ann : anns) {
-            if (ann.desc.equals(MOD))
-                return true;
-        }
-
-        return false;
+    private static boolean remove(final List<AnnotationNode> anns, final String side)
+    {
+        return unpack(anns).stream().
+                filter(ann->Objects.equals(ann.desc, ONLYIN)).
+                filter(ann->ann.values.indexOf("_interface") == -1).
+                anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side));
    }

    @SuppressWarnings("unchecked")
    @Override
-    public Consumer<Dist> getExtension() {
-        return s -> {
+    public Consumer<Dist> getExtension()
+    {
+        return (s)-> {
            DIST = s.name();
            LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST);
        };
@@ -203,7 +169,18 @@ public class RuntimeDistCleaner 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/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 {
@@ -218,21 +195,23 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
        }

        public void accept(MethodNode method) {
-            for (var insn : method.instructions) {
-                if (insn.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN)
-                    insn.accept(this);
-            }
+            Streams.stream(method.instructions.iterator()).
+                    filter(insnNode->insnNode.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN).
+                    forEach(insnNode->insnNode.accept(this));
        }

        @Override
-        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
-            if (META_FACTORY.equals(bsm)) {
-                var handle = (Handle)bsmArgs[1];
-                dynamicLambdaHandles.add(handle);
+        public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs)
+        {
+            if (META_FACTORY.equals(bsm))
+            {
+                Handle dynamicLambdaHandle = (Handle) bsmArgs[1];
+                dynamicLambdaHandles.add(dynamicLambdaHandle);
            }
        }

-        public List<Handle> getDynamicLambdaHandles() {
+        public List<Handle> getDynamicLambdaHandles()
+        {
            return dynamicLambdaHandles;
        }
    }
@@ -14,17 +14,16 @@ import org.apache.commons.lang3.text.StrSubstitutor;

@SuppressWarnings("deprecation")
 public class StringSubstitutor {
-    private static final Map<String, String> GLOBALS = Map.of(
-        "mcVersion", FMLLoader.versionInfo().mcVersion(),
-        "forgeVersion", FMLLoader.versionInfo().forgeVersion()
-    );
-
    public static String replace(final String in, final ModFile file) {
        return new StrSubstitutor(getStringLookup(file)).replace(in);
    }

    private static StrLookup<String> getStringLookup(final ModFile file) {
-        return new StrLookup<>() {
+        var globals = Map.of(
+            "mcVersion", FMLLoader.versionInfo().mcVersion(),
+            "forgeVersion", FMLLoader.versionInfo().forgeVersion()
+        );
+        return new StrLookup<String>() {
            @Override
            public String lookup(String key) {
                var parts = key.split("\\.");
@@ -33,7 +32,7 @@ public class StringSubstitutor {
                var pfx = parts[0];

                if ("global".equals(pfx))
-                    return GLOBALS.get(parts[1]);
+                    return globals.get(parts[1]);
                else if ("file".equals(pfx) && file != null)
                    return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));

@@ -47,12 +47,12 @@ public class UniqueModListBuilder

        // Select the newest by artifact version sorting of non-unique files thus identified
        uniqueModList = modFilesByFirstId.entrySet().stream()
-                .map(UniqueModListBuilder::selectNewestModInfo)
+                .map(this::selectNewestModInfo)
                .toList();

        // Select the newest by artifact version sorting of non-unique files thus identified
        uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
-                .map(UniqueModListBuilder::selectNewestModInfo)
+                .map(this::selectNewestModInfo)
                .toList();

        // Transform to the full mod id list
@@ -75,7 +75,7 @@ public class UniqueModListBuilder
        final List<String> dupedModErrors = modIds.values().stream()
                .filter(modInfos -> modInfos.size() > 1)
                .map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
-                        mods.getFirst().getModId(),
+                        mods.get(0).getModId(),
                        mods.stream()
                                .map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
                )).toList();
@@ -91,8 +91,9 @@ public class UniqueModListBuilder
        final List<String> dupedLibErrors = versionedLibIds.values().stream()
                .filter(modFiles -> modFiles.size() > 1)
                .map(mods -> String.format("\tLibrary: '%s' from files: %s",
-                        getModId(mods.getFirst()),
-                        mods.stream().map(ModFile::getFileName).collect(joining(", "))
+                        getModId(mods.get(0)),
+                        mods.stream()
+                                .map(modFile -> modFile.getFileName()).collect(joining(", "))
                )).toList();

        if (!dupedLibErrors.isEmpty()) {
@@ -106,23 +107,25 @@ public class UniqueModListBuilder
        final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
                .collect(groupingBy(UniqueModListBuilder::getModId));

-        final List<ModFile> loadedList = new ArrayList<>(uniqueModList);
+        final List<ModFile> loadedList = new ArrayList<>();
+        loadedList.addAll(uniqueModList);
        loadedList.addAll(uniqueLibListWithVersion);

        return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
    }

-    private static ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
+    private ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
        List<ModFile> modInfoList = fullList.getValue();
        if (modInfoList.size() > 1) {
            LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
-            modInfoList.sort(Comparator.comparing(UniqueModListBuilder::getVersion).reversed());
-            LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
+            modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
+            LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
        }
        return modInfoList.get(0);
    }

-    private static ArtifactVersion getVersion(final ModFile mf) {
+    private ArtifactVersion getVersion(final ModFile mf)
+    {
        if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
            return mf.getJarVersion();
        }
@@ -5,53 +5,33 @@

 package net.minecraftforge.fml.loading;

+import net.minecraftforge.forgespi.language.MavenVersionAdapter;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.jetbrains.annotations.ApiStatus;

-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiPredicate;

-@ApiStatus.Internal // since 1.21.1, will be made non-public in a later MC version
 public class VersionSupportMatrix {
-    private static final Map<String, List<ArtifactVersion>> OVERRIDE_VERSIONS;
-
+    private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
    static {
-        if ("1.21.1".equals(FMLLoader.versionInfo().mcVersion())) {
-            OVERRIDE_VERSIONS = Map.ofEntries(
-                    // 1.21.1 is compatible with 1.21
-                    entry("languageloader.javafml", "51"),
-                    entry("mod.minecraft",          "1.21"),
-                    entry("mod.forge",              "51.0.33")
-            );
-        } else {
-            OVERRIDE_VERSIONS = Collections.emptyMap();
+         final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
+         if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
+             // 1.19.2 is Compatible with 1.19.1
+             add("languageloader.javafml", "42");
+             add("mod.minecraft",          "1.19.1");
+             add("mod.forge",              "42.0.9");
        }
    }
-
-    /**
-     * @deprecated Use {@link #testVersionSupportMatrix(VersionRange, String, String)} instead, unwrapping your BiPredicate.
-     */
-    @Deprecated(forRemoval = true, since = "1.21.1")
-    public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
+    private static void add(String key, String value) {
+        overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));
+    }
+    public static <T> boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
        if (standardLookup.test(lookupId, declaredRange)) return true;
-        return testVersionSupportMatrix(declaredRange, lookupId, type);
-    }
-
-    public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) {
-        if (OVERRIDE_VERSIONS.isEmpty()) return false;
-        List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId);
-        return custom != null && custom.stream().anyMatch(declaredRange::containsVersion);
-    }
-
-    private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, String declaredRange) {
-        return Map.entry(typeAndLookupId, List.of(new DefaultArtifactVersion(declaredRange)));
-    }
-
-    private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, List<String> declaredRanges) {
-        return Map.entry(typeAndLookupId, declaredRanges.stream().map(DefaultArtifactVersion::new).map(it -> (ArtifactVersion) it).toList());
+        List<ArtifactVersion> custom = overrideVersions.get(type + "." + lookupId);
+        return custom == null ? false  : custom.stream().anyMatch(declaredRange::containsVersion);
    }
 }
@@ -49,7 +49,10 @@ public class ForgeHighlight {
            LOGGER.warn("Failed to invoke initializeTerminal on TCA", e);
        }
        if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) {
-            options = new String[] { options[0], "disableAnsi=true" };
+            List<String> optionList = new ArrayList<>();
+            optionList.add(options[0]);
+            optionList.add("disableAnsi=true");
+            options = optionList.toArray(new String[0]);
        }
        return HighlightConverter.newInstance(config, options);
    }
@@ -18,7 +18,6 @@ import net.minecraftforge.forgespi.locating.IModProvider;
 import net.minecraftforge.forgespi.locating.ModFileLoadingException;

 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

 import java.io.IOException;
@@ -37,16 +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 createMod(path, false);
+        return this.createMod(path, getDefaultJarModType());
    }

-    @Nullable
-    protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown) {
-        return createMod(path, ignoreUnknown, getDefaultJarModType());
-    }
-
-    @Nullable
-    protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
+    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),
@@ -61,15 +54,13 @@ public abstract class AbstractModProvider implements IModProvider {
        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 (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
+            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);
-        } else if (ignoreUnknown) {
-            return null;
        } else
            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));

@@ -81,11 +72,6 @@ public abstract class AbstractModProvider implements IModProvider {
        var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
        var license = mf.getValue("LICENSE");
        var dummy = new IConfigurable() {
-            @Override
-            public <T> Optional<T> getConfigElement(String key) {
-                return Optional.empty();
-            }
-
            @Override
            public <T> Optional<T> getConfigElement(String... key) {
                return Optional.empty();
@@ -145,11 +131,10 @@ public abstract class AbstractModProvider implements IModProvider {
    }

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

    private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
-        @Override public <T> Optional<T> getConfigElement(final String string) { return Optional.empty(); }
        @Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
        @Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
        @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
@@ -29,7 +29,6 @@ public class BackgroundScanHandler
    }

    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final boolean DEBUG = LOGGER.isErrorEnabled(LogMarkers.SCAN);
    private final ExecutorService modContentScanner;
    private final List<ModFile> modFiles;
    private ScanStatus status;
@@ -56,16 +55,16 @@ public class BackgroundScanHandler
        }
        status = ScanStatus.RUNNING;
        ImmediateWindowHandler.updateProgress("Scanning mod candidates");
-        CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
-                .whenComplete(file::setScanResult);
-        if (DEBUG) future = future.whenComplete((r, t) -> addCompletedFile(file, t));
+        final CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
+                .whenComplete(file::setScanResult)
+                .whenComplete((r,t)-> this.addCompletedFile(file,r,t));
        file.setFutureScanResult(future);
    }

-    private void addCompletedFile(final ModFile file, final Throwable throwable) {
+    private void addCompletedFile(final ModFile file, final ModFileScanData modFileScanData, final Throwable throwable) {
        if (throwable != null) {
            status = ScanStatus.ERRORED;
-            LOGGER.error(LogMarkers.SCAN, "An error occurred scanning file {}", file, throwable);
+            LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable);
        }
    }

@@ -18,9 +18,9 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.jar.Attributes;
@@ -28,7 +28,7 @@ import java.util.jar.JarFile;
 import java.util.jar.Manifest;

@ApiStatus.Internal
-public final class ClasspathLocator extends AbstractModProvider implements IModLocator {
+public class ClasspathLocator extends AbstractModProvider implements IModLocator {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");

@@ -80,11 +80,11 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
        return ret;
    }

-    private static List<URL> getUrls(ClassLoader cl, String resource) {
+    private List<URL> getUrls(ClassLoader cl, String resource) {
        try {
            var lst = Collections.list(cl.getResources(resource));
            if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
-                lst.sort(Comparator.comparing(URL::toString));
+                Collections.sort(lst, (a, b) -> a.toString().compareTo(b.toString()));
                LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
                for (var url : lst)
                    LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
@@ -104,7 +104,8 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
            len += 2;
        }
        str = str.substring(0, str.length() - len);
-        return Path.of(URI.create(str));
+        var path = Paths.get(URI.create(str));
+        return path;
    }

    private static Path getPathFromResource(ClassLoader cl, String resource) {
@@ -15,7 +15,7 @@ import java.nio.file.Path;
 import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
-public final class CoreModFile implements ICoreModFile {
+public class CoreModFile implements ICoreModFile {
    private final Path internalPath;
    private final ModFile file;
    private final String name;
@@ -6,6 +6,7 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
 import net.minecraftforge.forgespi.language.IModInfo;
@@ -25,7 +26,6 @@ import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -51,7 +51,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID

    @Override
    public List<IModFile> scanMods(Iterable<IModFile> loadedMods) {
-        final List<IModFile> sources = new ArrayList<>();
+        final List<IModFile> sources = Lists.newArrayList();
        loadedMods.forEach(sources::add);

        var dependenciesToLoad = JarSelector.detectAndSelect(
@@ -90,7 +90,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
            } else {
                modType = IModFile.Type.GAMELIBRARY.name();
            }
-            return Optional.of(createMod(pathInFS, false, modType).file());
+            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());
@@ -102,34 +102,34 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
    protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies) {
        final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
               .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
-               .map(JarInJarDependencyLocator::buildExceptionData)
+               .map(this::buildExceptionData)
               .toList();

        return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
    }

    @NotNull
-    private static EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
+    private EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
        return new EarlyLoadingException.ExceptionData(
                getErrorTranslationKey(entry),
                entry.identifier().group() + ":" + entry.identifier().artifact(),
                entry.sources()
                     .stream()
-                     .flatMap(JarInJarDependencyLocator::getModWithVersionRangeStream)
-                     .map(JarInJarDependencyLocator::formatError)
+                     .flatMap(this::getModWithVersionRangeStream)
+                     .map(this::formatError)
                     .collect(Collectors.joining(", "))
        );
    }

    @NotNull
-    private static String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
+    private String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
        return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
                       "fml.dependencyloading.conflictingdependencies" :
                       "fml.dependencyloading.mismatchedcontaineddependencies";
    }

    @NotNull
-    private static Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
+    private Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
        return file.sources()
                   .stream()
                   .map(IModFile::getModFileInfo)
@@ -152,7 +152,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
    }

    @NotNull
-    private static String formatError(ModWithVersionRange modWithVersionRange){
+    private String formatError(ModWithVersionRange modWithVersionRange){
        return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " +
               RED + modWithVersionRange.versionRange().toString() + RESET + " - " +
               GREEN + modWithVersionRange.artifactVersion().toString() + RESET;
@@ -18,7 +18,7 @@ import java.util.List;
 import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
-public final class MinecraftLocator extends AbstractModProvider implements IModLocator {
+public class MinecraftLocator extends AbstractModProvider implements IModLocator {
    @Override
    public List<IModLocator.ModFileOrException> scanMods() {
        var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
@@ -29,13 +29,13 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
            jar -> meta,
            minecraft.toArray(Path[]::new)
        );
-        var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
+        var mc = ModFileFactory.FACTORY.build(mcjar, this, this::buildMinecraftTOML);
        meta.setModFile(mc);

        return List.of(new ModFileOrException(mc, null));
    }

-    private static IModFileInfo buildMinecraftTOML(final IModFile iModFile) {
+    private IModFileInfo buildMinecraftTOML(final IModFile iModFile) {
        // We haven't changed this in years, and I can't be asked right now to special case this one file in the path.
        final var conf = Config.inMemory();
        conf.set("modLoader", "minecraft");
@@ -52,7 +52,7 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
        conf.set("mods", List.of(mods));

        var configWrapper = new NightConfigWrapper(conf);
-        return new ModFileInfo((ModFile) iModFile, configWrapper, configWrapper::setFile);
+        return new ModFileInfo((ModFile)iModFile, configWrapper, configWrapper::setFile, List.of());
    }

    @Override
@@ -6,6 +6,7 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
@@ -27,7 +28,6 @@ import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;

 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -49,19 +49,17 @@ public class ModDiscoverer {
        modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
        dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
        modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList());
-        for (IModLocator iModLocator : modLocatorList) {
-            iModLocator.initArguments(arguments);
-        }
+        modLocatorList.forEach(l->l.initArguments(arguments));
        dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList());
-        for (IDependencyLocator l : dependencyLocatorList) {
-            l.initArguments(arguments);
-        }
+        dependencyLocatorList.forEach(l->l.initArguments(arguments));
        if (LOGGER.isDebugEnabled(LogMarkers.CORE))
        {
            LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream()
                                                                       .map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
                                                                         modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
-
+        }
+        if (LOGGER.isDebugEnabled(LogMarkers.CORE))
+        {
            LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream()
                                                                       .map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
                                                                         dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
@@ -128,7 +126,7 @@ public class ModDiscoverer {
        }

        //First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped.
-        Map<IModFile.Type, List<ModFile>> modFilesMap = new EnumMap<>(IModFile.Type.class);
+        Map<IModFile.Type, List<ModFile>> modFilesMap = Maps.newHashMap();
        try {
            final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
            final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList();
@@ -136,7 +134,7 @@ public class ModDiscoverer {
            //Grab the temporary results.
            //This allows loading to continue to a base state, in case dependency loading fails.
            modFilesMap = uniqueModsData.modFiles().stream()
-                            .collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
+                            .collect(Collectors.groupingBy(IModFile::getType));
            loadedFiles = uniqueModsData.modFiles();
        }
        catch (EarlyLoadingException exception) {
@@ -173,11 +171,11 @@ public class ModDiscoverer {

                //We now only need the mod files map, not the list.
                modFilesMap = uniqueModsAndDependenciesData.modFiles().stream()
-                                .collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
+                                .collect(Collectors.groupingBy(IModFile::getType));
            } catch (EarlyLoadingException exception) {
                LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after dependency discovery.", exception);
                discoveryErrorData.addAll(exception.getAllData());
-                modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
+                modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType));
            }
        }
        else {
@@ -192,7 +190,8 @@ public class ModDiscoverer {
        return validator;
    }

-    private static void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles) {
+    private void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles)
+    {
        var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
        for (IModFile mf : locatedModFiles) {
            LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
@@ -45,12 +45,14 @@ public class ModFile implements IModFile {
    private Throwable scanError;
    private final SecureJar jar;
    private final Type modFileType;
+    private final Manifest     manifest;
    private final IModProvider provider;
    private       IModFileInfo modFileInfo;
    private ModFileScanData fileModFileScanData;
    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;
@@ -64,7 +66,7 @@ public class ModFile implements IModFile {
        this.jar = jar;
        this.parser = parser;

-        var manifest = this.jar.moduleDataProvider().getManifest();
+        manifest = this.jar.moduleDataProvider().getManifest();
        modFileType = Type.valueOf(type);
        jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE");
        this.modFileInfo = ModFileParser.readModList(this, this.parser);
@@ -95,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() {
@@ -104,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;
    }

@@ -7,6 +7,8 @@ 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;
@@ -17,15 +19,17 @@ import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import javax.security.auth.x500.X500Principal;
 import java.net.URL;
+import java.security.CodeSigner;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.SignatureException;
-import java.security.cert.CertificateEncodingException;
+import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 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;
@@ -34,8 +38,10 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;

-public class ModFileInfo implements IModFileInfo, IConfigurable {
+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";
@@ -43,6 +49,9 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
    @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;
@@ -55,7 +64,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
    private final String license;
    private final List<String> usesServices;

-    ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer) {
+    ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer)
+    {
        this.modFile = modFile;
        this.config = config;
        configFileConsumer.accept(this);
@@ -69,7 +79,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
        this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));

        // if true, this might not be a Forge mod
-        boolean maybeNotAForgeMod = modLoader.equals(JAVAFML)
+        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,)"

@@ -80,6 +91,10 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
                .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")
@@ -88,10 +103,6 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
                .map(StringUtils::toURL)
                .orElse(null);

-        // if clientSideOnly, then this is definitely a Forge mod
-        if (this.clientSideOnly)
-            maybeNotAForgeMod = false;
-
        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")
@@ -104,14 +115,15 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
        this.modFile.setFileProperties(this.properties);

        final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
-        if (modConfigs == null || modConfigs.isEmpty())
+        if (modConfigs.isEmpty())
+        {
            throw new InvalidModFileException("Missing mods list", this);
-
+        }
        this.mods = modConfigs.stream()
-                .map(mi -> (IModInfo) ModInfo.of(this, mi))
+                .map(mi-> (IModInfo)new ModInfo(this, mi))
                .toList();
-
-        if (LOGGER.isDebugEnabled(LogMarkers.LOADING)) {
+        if (LOGGER.isDebugEnabled(LogMarkers.LOADING))
+        {
            LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
                    this.modFile.getFileName(),
                    this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
@@ -125,11 +137,13 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
    }

    @Override
-    public List<IModInfo> getMods() {
+    public List<IModInfo> getMods()
+    {
        return mods;
    }

-    public ModFile getFile() {
+    public ModFile getFile()
+    {
        return this.modFile;
    }

@@ -139,42 +153,44 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
    }

    @Override
-    public Map<String, Object> getFileProperties() {
+    public Map<String, Object> getFileProperties()
+    {
        return this.properties;
    }

    @Override
-    public boolean showAsResourcePack() {
+    public boolean showAsResourcePack()
+    {
        return this.showAsResourcePack;
    }

    @Override
-    public boolean isClientSideOnly() {
+    public boolean isClientSideOnly()
+    {
        return this.clientSideOnly;
    }

    @Override
-    public boolean showAsDataPack() {
+    public boolean showAsDataPack()
+    {
        return this.showAsDataPack;
    }

    @Override
-    public <T> Optional<T> getConfigElement(final String key) {
+    public <T> Optional<T> getConfigElement(final String... key)
+    {
        return this.config.getConfigElement(key);
    }

    @Override
-    public <T> Optional<T> getConfigElement(final String... key) {
-        return this.config.getConfigElement(key);
-    }
-
-    @Override
-    public List<? extends IConfigurable> getConfigList(final String... key) {
+    public List<? extends IConfigurable> getConfigList(final String... key)
+    {
        return this.config.getConfigList(key);
    }

    @Override
-    public String getLicense() {
+    public String getLicense()
+    {
        return license;
    }

@@ -183,78 +199,49 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
        return this;
    }

-    public URL getIssueURL() {
+    public URL getIssueURL()
+    {
        return issueURL;
    }

-    public boolean missingLicense() {
+    public boolean missingLicense()
+    {
        return Strings.isNullOrEmpty(license);
    }

-    private static final char[] HEX = "0123456789ABCDEF".toCharArray();
    public Optional<String> getCodeSigningFingerprint() {
        var signers = this.modFile.getSecureJar().getManifestSigners();
-        if (signers == null)
-            return Optional.empty();
-
-        for (var signer : signers) {
-            for (var cert : signer.getSignerCertPath().getCertificates()) {
-                try {
-                    var encoded = cert.getEncoded();
-                    var sha256 = MessageDigest.getInstance("SHA-256");
-                    var digest = sha256.digest(encoded);
-                    var buf = new StringBuilder(digest.length * 3);
-                    for (int x = 0; x < digest.length - 1; x++) {
-                        buf.append(HEX[(digest[x] & 0xF0) >> 4]);
-                        buf.append(HEX[(digest[x] & 0x0F)     ]);
-                        buf.append(':');
-                    }
-                    buf.append(HEX[(digest[digest.length - 1] & 0xF0) >> 4]);
-                    buf.append(HEX[(digest[digest.length - 1] & 0x0F)     ]);
-
-                    // We only care about the first. Should we list them all?
-                    return Optional.of(buf.toString());
-                } catch (CertificateEncodingException | NoSuchAlgorithmException e) {
-                    sneak(e);
-                }
-            }
-        }
-
-        return Optional.empty();
-
+        return (signers == null ? Stream.<CodeSigner>of() : Arrays.stream(signers))
+                .flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
+                .findFirst()
+                .map(LamdbaExceptionUtils.rethrowFunction(Certificate::getEncoded))
+                .map(bytes->LamdbaExceptionUtils.uncheck(()->MessageDigest.getInstance("SHA-256")).digest(bytes))
+                .map(StringUtils::binToHex)
+                .map(str-> String.join(":", str.split("(?<=\\G.{2})")));
    }

    public Optional<String> getTrustData() {
-        var signers = this.modFile.getSecureJar().getManifestSigners();
-        if (signers == null)
-            return Optional.empty();
-
-        for (var signer : signers) {
-            for (var cert : signer.getSignerCertPath().getCertificates()) {
-                if (!(cert instanceof X509Certificate x509))
-                    continue;
-
-                var sb = new StringBuilder();
-                sb.append(x509.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
-
-                var selfSigned = false;
-                try {
-                    x509.verify(x509.getPublicKey());
-                    selfSigned = true;
-                } catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
-                    // not self signed
-                }
-
-                if (selfSigned)
+        return Arrays.stream(this.modFile.getSecureJar().getManifestSigners())
+                .flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
+                .findFirst()
+                .map(X509Certificate.class::cast)
+                .map(c->{
+                    StringBuffer sb = new StringBuffer();
+                    sb.append(c.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
+                    boolean selfSigned = false;
+                   try {
+                       c.verify(c.getPublicKey());
+                       selfSigned = true;
+                   } catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
+                       // not self signed
+                   }
+                   if (selfSigned) {
                    sb.append(" self-signed");
-                else
-                    sb.append(" signed by ").append(x509.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
-
-               return Optional.of(sb.toString());
-            }
-        }
-
-        return Optional.empty();
+                   } else {
+                       sb.append(" signed by ").append(c.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
+                   };
+                   return sb.toString();
+                });
    }

    @Override
@@ -271,9 +258,4 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
    public List<String> usesServices() {
        return usesServices;
    }
-
-    @SuppressWarnings("unchecked")
-    private static <E extends Throwable, R> R sneak(Throwable e) throws E {
-        throw (E)e;
-    }
 }
@@ -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,7 @@ 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;

@@ -31,6 +33,7 @@ public class ModFileParser {
        return parser.build(modFile);
    }

+    // 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());
@@ -41,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) {
@@ -19,189 +19,202 @@ import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;

 import java.net.URL;
-import java.util.ArrayList;
 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
-public record ModInfo(
-        ModFileInfo getOwningFile,
-        IConfigurable getConfig,
-
-        String getModId,
-        String getNamespace,
-        ArtifactVersion getVersion,
-
-        String getDisplayName,
-        String getDescription,
-        Optional<String> getLogoFile,
-        boolean getLogoBlur,
-        Optional<URL> getUpdateURL,
-        Optional<URL> getModURL,
-
-        Holder<List<? extends ModVersion>> dependencies,
-        Holder<List<ForgeFeature.Bound>> forgeFeatures,
-        Map<String, Object> getModProperties
-) implements IModInfo, IConfigurable {
+public class ModInfo implements IModInfo, IConfigurable {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1");
    private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$");
    private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$");
    private static final Pattern VALID_VERSION = Pattern.compile("^\\d+.*");

-    public static ModInfo of(ModFileInfo owningFile, IConfigurable config) {
+    private final ModFileInfo owningFile;
+    private final String modId;
+    private final String namespace;
+    private final ArtifactVersion version;
+    private final String displayName;
+    private final String description;
+    private final Optional<String> logoFile;
+    private final boolean logoBlur;
+    private final Optional<URL> updateJSONURL;
+    private final List<? extends IModInfo.ModVersion> dependencies;
+
+    private final List<ForgeFeature.Bound> features;
+    private final Map<String,Object> properties;
+    private final IConfigurable config;
+    private final Optional<URL> modUrl;
+
+    public ModInfo(final ModFileInfo owningFile, final IConfigurable config)
+    {
+        Optional<ModFileInfo> ownFile = Optional.ofNullable(owningFile);
+        this.owningFile = owningFile;
+        this.config = config;
        // These are sourced from the mod specific [[mod]] entry
-        String modId = config.<String>getConfigElement("modId").orElse(null);
-        if (modId == null)
-            throw new InvalidModFileException("Missing modId", owningFile);
-
+        this.modId = config.<String>getConfigElement("modId")
+                .orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile));
        // verify we have a valid modid
-        if (!VALID_MODID.matcher(modId).matches()) {
-            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", owningFile.getFile().getFilePath(), modId, VALID_MODID.pattern());
-            throw new InvalidModFileException("Invalid modId found : " + modId, owningFile);
+        if (!VALID_MODID.matcher(this.modId).matches()) {
+            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern());
+            throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile);
        }
-
-        String namespace = config.<String>getConfigElement("namespace")
-                .orElse(modId);
-
+        this.namespace = config.<String>getConfigElement("namespace")
+                .orElse(this.modId);
        // verify our namespace is valid
-        if (!VALID_NAMESPACE.matcher(namespace).matches()) {
-            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", owningFile.getFile().getFilePath(), namespace, VALID_NAMESPACE.pattern());
-            throw new InvalidModFileException("Invalid override namespace found : " + namespace, owningFile);
+        if (!VALID_NAMESPACE.matcher(this.namespace).matches()) {
+            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern());
+            throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile);
        }
-
-        ArtifactVersion version = config.<String>getConfigElement("version")
-                .map(s -> StringSubstitutor.replace(s, owningFile.getFile()))
+        this.version = config.<String>getConfigElement("version")
+                .map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
                .map(DefaultArtifactVersion::new)
                .orElse(DEFAULT_VERSION);
-
        // verify we have a valid mod version
-        if (!VALID_VERSION.matcher(version.toString()).matches())
-            throw new InvalidModFileException("Illegal version number specified " + version, owningFile);
-
+        if (!VALID_VERSION.matcher(this.version.toString()).matches()) {
+            throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile());
+        }
        // The remaining properties all default to sensible values and are not essential
-        String displayName = config.<String>getConfigElement("displayName")
-                .orElse(modId);
-
-        String description = config.<String>getConfigElement("description")
+        this.displayName = config.<String>getConfigElement("displayName")
+                .orElse(this.modId);
+        this.description = config.<String>getConfigElement("description")
                .orElse("MISSING DESCRIPTION")
                .replace("\r\n", "\n").stripIndent();
-
-        Optional<String> logoFile = Optional.ofNullable(
-                config.<String>getConfigElement("logoFile")
-                        .orElseGet(() -> owningFile.<String>getConfigElement("logoFile").orElse(null))
-        );
-
-        Boolean logoBlur = config.<Boolean>getConfigElement("logoBlur").orElse(null);
-        if (logoBlur == null)
-            logoBlur = owningFile.<Boolean>getConfigElement("logoBlur").orElse(true);
-
-        Optional<URL> updateJSONURL = config.<String>getConfigElement("updateJSONURL")
+        this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
+                .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile"))
+                        .orElse(null)));
+        this.logoBlur = config.<Boolean>getConfigElement("logoBlur")
+                .orElseGet(() -> ownFile.flatMap(f -> f.<Boolean>getConfigElement("logoBlur"))
+                        .orElse(true));
+        this.updateJSONURL = config.<String>getConfigElement("updateJSONURL")
                .map(StringUtils::toURL);
-
-        Optional<URL> modUrl = config.<String>getConfigElement("modUrl")
+        this.modUrl = config.<String>getConfigElement("modUrl")
                .map(StringUtils::toURL);
-
-        // dependencies and features are done after the constructor as they need to reference the ModInfo we are creating
-        List<? extends ModVersion> dependencies = Collections.emptyList();
-        List<ForgeFeature.Bound> forgeFeatures = Collections.emptyList();
-
-        Map<String, Object> modProperties = owningFile.<Map<String, Object>>getConfigElement("modproperties", modId)
-                .map(Collections::unmodifiableMap)
+        // These are sourced from the file rather than the mod-specific block, but with a modid tag
+        this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId))
+                .orElse(Collections.emptyList())
+                .stream()
+                .map(dep -> new ModVersion(this, dep))
+                .toList();
+        this.features = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("features", this.modId))
+                .stream()
+                .flatMap(m->m.entrySet().stream())
+                .map(this::makeBound)
+                .toList();
+        this.properties = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId))
                .orElse(Collections.emptyMap());
-
-        return new ModInfo(
-                owningFile, config,
-                modId, namespace, version,
-                displayName, description, logoFile, logoBlur, updateJSONURL, modUrl,
-                new Holder<>(dependencies), new Holder<>(forgeFeatures), modProperties
-        ).setupDependencies().setupForgeFeatures();
-    }
-
-    private ModInfo setupDependencies() {
-        var deps = getOwningFile.getConfigList("dependencies", getModId);
-        if (deps == null || deps.isEmpty()) {
-            dependencies.value = Collections.emptyList();
-            return this;
-        }
-
-        var tmp = new ModVersion[deps.size()];
-        for (int i = 0; i < deps.size(); i++) {
-            tmp[i] = ModVersion.of(this, deps.get(i));
-        }
-        dependencies.value = List.of(tmp);
-        return this;
-    }
-
-    private ModInfo setupForgeFeatures() {
-        var feats = getOwningFile.<Map<String, Object>>getConfigElement("features", getModId).orElse(null);
-        if (feats == null) {
-            forgeFeatures.value = Collections.emptyList();
-            return this;
-        }
-
-        var tmp = new ArrayList<ForgeFeature.Bound>();
-        for (var entry : feats.entrySet()) {
-            if (!(entry.getValue() instanceof String val))
-                throw new InvalidModFileException("Invalid feature bound {" + entry.getValue() + "} for key {" + entry.getKey() + "} only strings are accepted", getOwningFile);
-            tmp.add(new ForgeFeature.Bound(entry.getKey(), val, this));
-        }
-        forgeFeatures.value = List.copyOf(tmp);
-        return this;
    }

    @Override
-    public <T> Optional<T> getConfigElement(String key) {
-        return getConfig.getConfigElement(key);
+    public ModFileInfo getOwningFile() {
+        return owningFile;
    }

    @Override
-    public <T> Optional<T> getConfigElement(String... key) {
-        return getConfig.getConfigElement(key);
+    public String getModId() {
+        return modId;
    }

    @Override
-    public List<? extends IConfigurable> getConfigList(String... key) {
-        return null;
+    public String getDisplayName()
+    {
+        return this.displayName;
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    @Override
+    public ArtifactVersion getVersion() {
+        return version;
    }

    @Override
    public List<? extends IModInfo.ModVersion> getDependencies() {
-        return dependencies.value;
+        return this.dependencies;
+    }
+
+    @Override
+    public String getNamespace() {
+        return this.namespace;
+    }
+
+    @Override
+    public Map<String, Object> getModProperties() {
+        return this.properties;
+    }
+
+    @Override
+    public Optional<URL> getUpdateURL() {
+        return this.updateJSONURL;
+    }
+
+    @Override
+    public Optional<String> getLogoFile()
+    {
+        return this.logoFile;
+    }
+
+    @Override
+    public boolean getLogoBlur()
+    {
+        return this.logoBlur;
+    }
+
+    @Override
+    public IConfigurable getConfig() {
+        return this;
    }

    @Override
    public List<? extends ForgeFeature.Bound> getForgeFeatures() {
-        return forgeFeatures.value;
+        return this.features;
    }

-    private static final class Holder<T> {
-        private T value;
+    @Override
+    public <T> Optional<T> getConfigElement(final String... key) {
+        return this.config.getConfigElement(key);
+    }

-        public Holder(T value) {
-            this.value = value;
+    @Override
+    public List<? extends IConfigurable> getConfigList(final String... key) {
+        return null;
+    }
+
+    @Override
+    public Optional<URL> getModURL() {
+        return modUrl;
+    }
+
+    private ForgeFeature.Bound makeBound(Map.Entry<String, Object> e) {
+        if (e.getValue() instanceof String val) {
+            return new ForgeFeature.Bound(e.getKey(), val, this);
+        } else {
+            throw new InvalidModFileException("Invalid feature bound {" + e.getValue() + "} for key {" + e.getKey() + "} only strings are accepted", this.owningFile);
        }
    }

-    private record ModVersion(
-            Holder<IModInfo> owner,
+    class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion {
+        private IModInfo owner;
+        private final String modId;
+        private final VersionRange versionRange;
+        private final boolean mandatory;
+        private final Ordering ordering;
+        private final DependencySide side;
+        private final Optional<URL> referralUrl;

-            String getModId,
-            VersionRange getVersionRange,
-            boolean isMandatory,
-            Ordering getOrdering,
-            DependencySide getSide,
-            Optional<URL> getReferralURL
-    ) implements IModInfo.ModVersion {
-        public static ModVersion of(IModInfo owner, IConfigurable config) {
-            var modId = config.<String>getConfigElement("modId").orElse(null);
-            if (modId == null)
-                throw new InvalidModFileException("Missing required field modid in dependency", owner.getOwningFile());
-
-            if (modId.equals("forge")) {
+        public ModVersion(final IModInfo owner, final IConfigurable config) {
+            this.owner = owner;
+            this.modId = config.<String>getConfigElement("modId")
+                    .orElseThrow(()->new InvalidModFileException("Missing required field modid 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)) {
@@ -210,42 +223,74 @@ public record ModInfo(
                    fileProps.remove(ModFileInfo.NOT_A_FORGE_MOD_PROP);
                }
            }
-
-            boolean mandatory;
-            var mandatoryValue = config.<Boolean>getConfigElement("mandatory");
-            if (mandatoryValue.isPresent())
-                mandatory = mandatoryValue.get();
-            else if (owner.getOwningFile().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP))
-                mandatory = true;
-            else
-                throw new InvalidModFileException("Missing required field mandatory in dependency", owner.getOwningFile());
-
-            var versionRange = config.<String>getConfigElement("versionRange")
+            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);
-            var ordering = config.<String>getConfigElement("ordering")
+            this.ordering = config.<String>getConfigElement("ordering")
                    .map(Ordering::valueOf)
                    .orElse(Ordering.NONE);
-            var side = config.<String>getConfigElement("side")
+            this.side = config.<String>getConfigElement("side")
                    .map(DependencySide::valueOf)
                    .orElse(DependencySide.BOTH);
-            var referralUrl = config.<String>getConfigElement("referralUrl")
+            this.referralUrl = config.<String>getConfigElement("referralUrl")
                    .map(StringUtils::toURL);
+        }

-            return new ModVersion(
-                    new Holder<>(owner),
-                    modId, versionRange, mandatory, ordering, side, referralUrl
-            );
+
+        @Override
+        public String getModId()
+        {
+            return modId;
        }

        @Override
-        public IModInfo getOwner() {
-            return owner.value;
+        public VersionRange getVersionRange()
+        {
+            return versionRange;
        }

        @Override
-        public void setOwner(IModInfo newOwner) {
-            owner.value = newOwner;
+        public boolean isMandatory()
+        {
+            return mandatory;
+        }
+
+        @Override
+        public Ordering getOrdering()
+        {
+            return ordering;
+        }
+
+        @Override
+        public DependencySide getSide()
+        {
+            return side;
+        }
+
+        @Override
+        public void setOwner(final IModInfo owner)
+        {
+            this.owner = owner;
+        }
+
+        @Override
+        public IModInfo getOwner()
+        {
+            return owner;
+        }
+
+        @Override
+        public Optional<URL> getReferralURL() {
+            return referralUrl;
        }
    }
+
 }
@@ -64,7 +64,7 @@ public class ModValidator {
    }

    @NotNull
-    private static List<ModFile> validateFiles(final List<ModFile> mods) {
+    private List<ModFile> validateFiles(final List<ModFile> mods) {
        final List<ModFile> brokenFiles = new ArrayList<>();
        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
            ModFile modFile = iterator.next();
@@ -106,8 +106,8 @@ public class ModValidator {

    private List<EarlyLoadingException.ExceptionData> validateLanguages() {
        List<EarlyLoadingException.ExceptionData> errorData = new ArrayList<>();
-        for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext();) {
-            var modFile = iterator.next();
+        for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext(); ) {
+            final ModFile modFile = iterator.next();
            try {
                modFile.identifyLanguage();
            } catch (EarlyLoadingException e) {
@@ -16,7 +16,6 @@ import org.slf4j.Logger;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
@@ -43,21 +42,11 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
    public List<IModLocator.ModFileOrException> scanMods() {
        LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
        var excluded = ModDirTransformerDiscoverer.allExcluded();
-        try {
-            var ret = new ArrayList<IModLocator.ModFileOrException>();
-            var files = Files.list(this.modFolder).toList();
-            for (var file : files) {
-                var name = file.getFileName().toString().toLowerCase(Locale.ROOT);
-                if (excluded.contains(file) || !name.endsWith(SUFFIX))
-                    continue;
-                var mod = this.createMod(file, true);
-                if (mod == null) {
-                    LOGGER.debug(LogMarkers.SCAN, "Found unknown jar file {} ignoring", file);
-                } else {
-                    ret.add(mod);
-                }
-            }
-            return ret;
+        try (var stream = Files.list(this.modFolder)) {
+            return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX))
+                .sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT)))
+                .map(this::createMod)
+                .toList();
        } catch (IOException e) {
            return sneak(e);
        }
@@ -6,8 +6,6 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.electronwill.nightconfig.core.UnmodifiableConfig;
-import com.google.common.collect.ImmutableMap;
-
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;

@@ -18,12 +16,11 @@ import java.util.Optional;
 import java.util.stream.Collectors;

 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;

 import static java.util.Arrays.asList;

@ApiStatus.Internal
-final class NightConfigWrapper implements IConfigurable {
+class NightConfigWrapper implements IConfigurable {
    private final UnmodifiableConfig config;
    private IModFileInfo file;

@@ -31,51 +28,35 @@ final class NightConfigWrapper implements IConfigurable {
        this.config = config;
    }

-    private NightConfigWrapper(UnmodifiableConfig config, IModFileInfo file) {
-        this.config = config;
-        this.file = file;
-    }
-
-    void setFile(IModFileInfo file) {
+    NightConfigWrapper setFile(IModFileInfo file) {
        this.file = file;
+        return this;
    }

    @Override
-    public <T> Optional<T> getConfigElement(String key) {
-        var path = List.of(key);
-        return Optional.ofNullable(validate(this.config.get(path), path));
-    }
-
-    @Override
+    @SuppressWarnings("unchecked")
    public <T> Optional<T> getConfigElement(final String... key) {
        var path = asList(key);
-        return Optional.ofNullable(validate(this.config.get(path), path));
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T validate(@Nullable T value, List<String> path) {
-        if (value instanceof UnmodifiableConfig cfg) {
-            // New Night config doesn't implement valueMap(), so do a copy.
-            var entries = cfg.entrySet();
-            var builder = ImmutableMap.builderWithExpectedSize(entries.size());
-            for (var e : entries)
-                builder.put(e.getKey(), e.getValue());
-            return (T) builder.build();
-        } else if (value instanceof ArrayList<?> al && !al.isEmpty() && al.getFirst() instanceof UnmodifiableConfig) {
-            throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
-        }
-        return value;
+        return this.config.getOptional(path).map(value -> {
+            if (value instanceof UnmodifiableConfig) {
+                return (T) ((UnmodifiableConfig) value).valueMap();
+            } else if (value instanceof ArrayList<?> al && al.size() > 0 && al.get(0) instanceof UnmodifiableConfig) {
+                throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
+            }
+            return (T) value;
+        });
    }

    @Override
    public List<? extends IConfigurable> getConfigList(final String... key) {
        final List<String> path = asList(key);
        if (this.config.contains(path) && !(this.config.get(path) instanceof Collection)) {
-            throw new InvalidModFileException("The configuration path " + path + " is invalid. Expecting a collection!", file);
+            throw new InvalidModFileException("The configuration path "+path+" is invalid. Expecting a collection!", file);
        }
        final Collection<UnmodifiableConfig> nestedConfigs = this.config.getOrElse(path, ArrayList::new);
        return nestedConfigs.stream()
-                .map(conf -> new NightConfigWrapper(conf, file))
+                .map(NightConfigWrapper::new)
+                .map(cw->cw.setFile(file))
                .collect(Collectors.toList());
    }
 }
@@ -21,36 +21,37 @@ import java.nio.file.Path;
 import java.util.List;

@ApiStatus.Internal
-record Scanner(ModFile fileToScan, ModFileScanData result) {
+class Scanner {
    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final boolean DEBUG = LOGGER.isDebugEnabled(LogMarkers.SCAN);
+    private final ModFile fileToScan;

-    public Scanner(ModFile fileToScan) {
-        this(fileToScan, new ModFileScanData());
+    public Scanner(final ModFile fileToScan) {
+        this.fileToScan = fileToScan;
    }

    public ModFileScanData scan() {
+        ModFileScanData result = new ModFileScanData();
        result.addModFileInfo(fileToScan.getModFileInfo());
-        fileToScan.scanFile(this::fileVisitor);
+        fileToScan.scanFile(p -> fileVisitor(p, result));
        final List<IModLanguageProvider> loaders = fileToScan.getLoaders();
        if (loaders != null) {
-            for (IModLanguageProvider loader : loaders) {
-                if (DEBUG) LOGGER.debug("Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
+            loaders.forEach(loader -> {
+                LOGGER.debug(LogMarkers.SCAN, "Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
                loader.getFileVisitor().accept(result);
-            }
+            });
        }
        return result;
    }

-    private void fileVisitor(final Path path) {
-        try (InputStream in = Files.newInputStream(path)) {
+    private void fileVisitor(final Path path, final ModFileScanData result) {
+        LOGGER.debug(LogMarkers.SCAN,"Scanning {} path {}", fileToScan, path);
+        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
-            if (DEBUG) LOGGER.warn("Failed scanning {} path {}", fileToScan, path);
        }
    }
 }
@@ -24,8 +24,8 @@ import java.util.function.Supplier;
@ApiStatus.Internal
 class ArgumentList {
    private static final Logger LOGGER = LogUtils.getLogger();
-    private final List<Supplier<String[]>> entries = new ArrayList<>();
-    private final Map<String, EntryValue> values = new HashMap<>();
+    private List<Supplier<String[]>> entries = new ArrayList<>();
+    private Map<String, EntryValue> values = new HashMap<>();

    public static ArgumentList from(String... args) {
        ArgumentList ret = new ArgumentList();
@@ -77,8 +77,8 @@ class ArgumentList {

    public String[] getArguments() {
        return entries.stream()
-            .flatMap(e -> Arrays.stream(e.get()))
-            .toArray(String[]::new);
+            .flatMap(e -> Arrays.asList(e.get()).stream())
+            .toArray(size -> new String[size]);
    }

    public boolean hasValue(String key) {
@@ -122,7 +122,7 @@ class ArgumentList {
        return ent.getValue();
    }

-    private static final class EntryValue implements Supplier<String[]> {
+    private class EntryValue implements Supplier<String[]> {
        private final String prefix;
        private final String key;
        private final boolean split;
@@ -40,7 +40,7 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
        String username = args.get("username");
        if (username != null) { // Replace '#' placeholders with random numbers
            Matcher m = Pattern.compile("#+").matcher(username);
-            StringBuilder replaced = new StringBuilder();
+            StringBuffer replaced = new StringBuffer();
            while (m.find()) {
                m.appendReplacement(replaced, getRandomNumbers(m.group().length()));
            }
@@ -7,6 +7,7 @@ package net.minecraftforge.fml.loading.targets;

 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.ILaunchHandlerService;
+import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
 import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.api.distmarker.Dist;
@@ -18,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;

 /**
@@ -45,6 +47,10 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {

    public abstract List<Path> getMinecraftPaths();

+    @Override
+    public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) {
+    }
+
    protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
        URI uri;
        try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) {
@@ -101,7 +107,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
            len += 2;
        }
        str = str.substring(0, str.length() - len);
-        var path = Path.of(URI.create(str));
+        var path = Paths.get(URI.create(str));
        return path;
    }
 }
@@ -9,7 +9,7 @@ import java.util.List;
 import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
-sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
+abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
    private ForgeDevLaunchHandler(LaunchType type) {
        super(type, "forge_dev_");
    }
@@ -33,25 +33,25 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
        return List.of(filtered);
    }

-    public static final class Client extends ForgeDevLaunchHandler {
+    public static class Client extends ForgeDevLaunchHandler {
        public Client() {
            super(CLIENT);
        }
    }

-    public static final class Data extends ForgeDevLaunchHandler {
+    public static class Data extends ForgeDevLaunchHandler {
        public Data() {
            super(DATA);
        }
    }

-    public static final class Server extends ForgeDevLaunchHandler {
+    public static class Server extends ForgeDevLaunchHandler {
        public Server() {
            super(SERVER);
        }
    }

-    public static final class ServerGameTest extends ForgeDevLaunchHandler {
+    public static class ServerGameTest extends ForgeDevLaunchHandler {
        public ServerGameTest() {
            super(SERVER_GAMETEST);
        }
@@ -35,7 +35,7 @@ import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
 import net.minecraftforge.forgespi.locating.IModLocator;

@ApiStatus.Internal
-public final class ForgeDevLocator extends AbstractModProvider implements IModLocator {
+public class ForgeDevLocator extends AbstractModProvider implements IModLocator {
    private static final String PACK_META = "pack.mcmeta";

    @Override
@@ -60,7 +60,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
        return ret;
    }

-    private static List<Path> getMods() {
+    private List<Path> getMods() {
        // Forge is an exploded directory as well
        var minecraft = ForgeDevLaunchHandler.getPathFromResource("net/minecraft/client/Minecraft.class");
        var forge = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
@@ -84,7 +84,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
        return ret;
    }

-    private static List<Path> explodeTestMods(Path path) {
+    private List<Path> explodeTestMods(Path path) {
        var mod = new ArrayList<Path>();
        var memory = Jimfs.newFileSystem();

@@ -137,7 +137,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo

    // Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories,
    // I could make it merge all the way up, but I think this would be fine.
-    private static Map<String, Set<String>> findTestModPackages(Path path) {
+    private Map<String, Set<String>> findTestModPackages(Path path) {
        var mods = new HashMap<String, Set<String>>();
        try (var files = Files.walk(path)) {
            var classes = files
@@ -190,7 +190,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
    }

    // Builds or update the mods.toml file for all @Mods in this package
-    private static void buildModsToml(Set<Path> resources, Set<String> modids, Path root) {
+    private void buildModsToml(Set<Path> resources, Set<String> modids, Path root) {
        var toml = resources.stream()
            .map(p -> p.resolve(MODS_TOML))
            .filter(Files::exists)
@@ -226,7 +226,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
        }

        for (var modid : modids) {
-            if (modlist.stream().noneMatch(c -> modid.equals(c.get("modId")))) {
+            if (!modlist.stream().anyMatch(c -> modid.equals(c.get("modId")))) {
                modified = true;
                var tmp = Config.inMemory();
                tmp.set("modId", modid);
@@ -248,7 +248,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
    }

    // This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there.
-    private static void buildPackMeta(Set<Path> paths, Path root) {
+    private void buildPackMeta(Set<Path> paths, Path root) {
        var existing = paths.stream()
                .map(p -> p.resolve(PACK_META))
                .filter(Files::exists)
@@ -10,15 +10,15 @@ import java.util.List;
 import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
-sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
+abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
    protected ForgeProdLaunchHandler(LaunchType type) {
        super(type, "forge_");
    }

-    @Override public String getNaming() { return "mcp"; }
+    @Override public String getNaming() { return "srg"; }
    @Override public boolean isProduction() { return true; }

-    public static final class Client extends ForgeProdLaunchHandler {
+    public static class Client extends ForgeProdLaunchHandler {
        public Client() {
            super(CLIENT);
        }
@@ -29,7 +29,7 @@ sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
        }
    }

-    public static final class Server extends ForgeProdLaunchHandler {
+    public static class Server extends ForgeProdLaunchHandler {
        public Server() {
            super(SERVER);
        }
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.ApiStatus;
 import cpw.mods.jarhandling.SecureJar;

@ApiStatus.Internal
-sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
+abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
    private ForgeUserdevLaunchHandler(LaunchType type) {
        super(type, "forge_userdev_");
    }
@@ -33,25 +33,25 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
        return List.of(minecraft);
    }

-    public static final class Client extends ForgeUserdevLaunchHandler {
+    public static class Client extends ForgeUserdevLaunchHandler {
        public Client() {
            super(CLIENT);
        }
    }

-    public static final class Data extends ForgeUserdevLaunchHandler {
+    public static class Data extends ForgeUserdevLaunchHandler {
        public Data() {
            super(DATA);
        }
    }

-    public static final class Server extends ForgeUserdevLaunchHandler {
+    public static class Server extends ForgeUserdevLaunchHandler {
        public Server() {
            super(SERVER);
        }
    }

-    public static final class ServerGameTest extends ForgeUserdevLaunchHandler {
+    public static class ServerGameTest extends ForgeUserdevLaunchHandler {
        public ServerGameTest() {
            super(SERVER_GAMETEST);
        }
@@ -12,7 +12,7 @@ import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
 import net.minecraftforge.forgespi.locating.IModLocator;

@ApiStatus.Internal
-public final class ForgeUserdevLocator extends AbstractModProvider implements IModLocator {
+public class ForgeUserdevLocator extends AbstractModProvider implements IModLocator {
    @Override
    public String name() {
        return "forge_userdev_locator";
@@ -25,7 +25,7 @@ import java.util.Set;
 */
 public class StronglyConnectedComponentDetector<T> {
    private final Graph<T> graph;
-    private final Map<T, Integer> ids = new HashMap<>();
+    private Map<T, Integer> ids;
    private T[] elements;
    private int[] dfn;
    private int[] low;
@@ -49,6 +49,7 @@ public class StronglyConnectedComponentDetector<T> {
    private void calculate() {
        components = new HashSet<>();
        int t = 0;
+        ids = new HashMap<>();
        Set<T> nodes = graph.nodes();
        elements = (T[]) new Object[nodes.size()];
        for (T node : nodes) {
@@ -4,14 +4,9 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true

-JAVA_VERSION=21
-MC_VERSION=1.21.3
-MC_NEXT_VERSION=1.22
-MCP_VERSION=20241025.112443
+JAVA_VERSION=17
+MC_VERSION=1.20.4
+MC_NEXT_VERSION=1.21
+MCP_VERSION=20231207.112700
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.21.3
-
-// Set to true before the first build of a new MC version, so we don't do compatibility checks
-CHECK_COMPATIBILITY=false
-// Set to true to allow for fuzzy patching. Useful during updateing
-UPDATING=false
+MAPPING_VERSION=1.20.4
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-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" \
@@ -6,7 +6,6 @@
 package net.minecraftforge.fml.javafmlmod;

 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.Logging;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.common.Mod;
@@ -20,7 +19,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.Type;

-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -34,7 +32,6 @@ public class AutomaticEventSubscriber {
    private static final Logger LOGGER = LogManager.getLogger();
    private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
    private static final Type MOD_TYPE = Type.getType(Mod.class);
-    private static final Type ONLY_IN_TYPE = Type.getType(OnlyIn.class);

    public static void inject(ModContainer mod, ModFileScanData scanData, ClassLoader loader) {
        if (scanData == null) return;
@@ -44,11 +41,6 @@ public class AutomaticEventSubscriber {
            .filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType()))
            .toList();

-        var onlyIns = FMLEnvironment.production ? Collections.emptySet() : scanData.getAnnotations().stream()
-                .filter(data -> ONLY_IN_TYPE.equals(data.annotationType()))
-                .map(data -> data.clazz().getClassName())
-                .collect(Collectors.toSet());
-
        var modids = scanData.getAnnotations().stream()
            .filter(data -> MOD_TYPE.equals(data.annotationType()))
            .collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value")));
@@ -57,10 +49,6 @@ public class AutomaticEventSubscriber {
        var defaultBus = new EnumData(null, "FORGE");

        for (var data : targets) {
-            if (!FMLEnvironment.production && onlyIns.contains(data.clazz().getClassName())) {
-                throw new RuntimeException("Found @OnlyIn on @EventBusSubscriber class " + data.clazz().getClassName() + " - this is not allowed as it causes crashes. Remove the OnlyIn and set value=Dist.CLIENT in the EventBusSubscriber annotation instead");
-            }
-
            var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId());
            modId = value(data, "modid", modId);

@@ -31,8 +31,21 @@ public class FMLJavaModLanguageProvider implements IModLanguageProvider
 {
    private static final Logger LOGGER = LogManager.getLogger();

-    private record FMLModTarget(String className, String modId) implements IModLanguageProvider.IModLanguageLoader {
+    private static class FMLModTarget implements IModLanguageProvider.IModLanguageLoader {
        private static final Logger LOGGER = FMLJavaModLanguageProvider.LOGGER;
+        private final String className;
+        private final String modId;
+
+        private FMLModTarget(String className, String modId)
+        {
+            this.className = className;
+            this.modId = modId;
+        }
+
+        public String getModId()
+        {
+            return modId;
+        }

        @SuppressWarnings("unchecked")
        @Override
@@ -81,7 +94,7 @@ public class FMLJavaModLanguageProvider implements IModLanguageProvider
                    .filter(ad -> ad.annotationType().equals(MODANNOTATION))
                    .peek(ad -> LOGGER.debug(SCAN, "Found @Mod class {} with id {}", ad.clazz().getClassName(), ad.annotationData().get("value")))
                    .map(ad -> new FMLModTarget(ad.clazz().getClassName(), (String)ad.annotationData().get("value")))
-                    .collect(Collectors.toMap(FMLModTarget::modId, Function.identity(), (a,b)->a));
+                    .collect(Collectors.toMap(FMLModTarget::getModId, Function.identity(), (a,b)->a));
            scanResult.addLanguageLoader(modTargetMap);
        };
    }
@@ -8,9 +8,6 @@ package net.minecraftforge.fml.javafmlmod;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;

-/**
- * Use the context provided by your language loader in your mod's constructor
- */
 public class FMLJavaModLoadingContext extends ModLoadingContext
 {
    private final FMLModContainer container;
@@ -27,9 +24,6 @@ public class FMLJavaModLoadingContext extends ModLoadingContext
        return container.getEventBus();
    }

-    /**
-     * @return {@link FMLModContainer} by default.
-     */
    @Override
    public FMLModContainer getContainer() {
        return container;
@@ -41,7 +35,7 @@ public class FMLJavaModLoadingContext extends ModLoadingContext
     *
     * @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
     */
-    @Deprecated(forRemoval = true, since="1.21.1")
+    @Deprecated(forRemoval = true, since = "1.21.1")
    public static FMLJavaModLoadingContext get() {
        return ModLoadingContext.get().extension();
    }
@@ -40,9 +40,10 @@ public class FMLModContainer extends ModContainer {
        LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
        this.scanResults = modFileScanResults;
        activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
-        this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
+        this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
        this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
        this.contextExtension = () -> context;
+
        try {
            var moduleName = info.getOwningFile().moduleName();
            var module = gameLayer.findModule(moduleName)
@@ -55,7 +56,7 @@ public class FMLModContainer extends ModContainer {
        }
    }

-    private static void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
+    private void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
        LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
    }

@@ -21,12 +21,14 @@ import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 public class LowCodeModContainer extends ModContainer
 {
    private static final Logger LOGGER = LogUtils.getLogger();
-    private final Object modInstance;
+    private final ModFileScanData scanResults;
+    private Object modInstance;

    public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
    {
        super(info);
        LOGGER.debug(LOADING, "Creating LowCodeModContainer for {}", info.getModId());
+        this.scanResults = modFileScanResults;
        this.modInstance = new Object();
        this.contextExtension = () -> null;
        this.extensionPoints.remove(IExtensionPoint.DisplayTest.class);
@@ -43,4 +45,9 @@ public class LowCodeModContainer extends ModContainer
    {
        return modInstance;
    }
+
+    @Override
+    protected <T extends Event & IModBusEvent> void acceptEvent(final T e)
+    {
+    }
 }
@@ -5,6 +5,7 @@

 package net.minecraftforge.fml.mclanguageprovider;

+import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.forgespi.language.ILifecycleEvent;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
@@ -14,11 +15,14 @@ import org.apache.logging.log4j.Logger;

 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

 import static net.minecraftforge.fml.Logging.LOADING;

+import net.minecraftforge.forgespi.language.IModLanguageProvider.IModLanguageLoader;
+
 public class MinecraftModLanguageProvider implements IModLanguageProvider {
    private static final Logger LOGGER = LogManager.getLogger();
    @Override
@@ -2,7 +2,7 @@ plugins {
    id 'eclipse'
    id 'idea'
    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
 }

 version = mod_version
@@ -12,8 +12,8 @@ base {
    archivesName = mod_id
 }

-// Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21.
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)

 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -31,9 +31,6 @@ minecraft {
    // Use non-default mappings at your own risk. They may not always work.
    // Simply re-run your setup task after changing the mappings to update your workspace.
    mappings channel: mapping_channel, version: mapping_version
-    
-    // Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
-    reobf = false

    // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
    // In most cases, it is not necessary to enable.
@@ -127,11 +124,11 @@ dependencies {
    // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

-    // Example mod dependency with JEI
+    // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
    // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
-    // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
-    // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
-    // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
+    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")

    // Example mod dependency using a mod jar from ./libs with a flat dir repository
    // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
@@ -141,9 +138,6 @@ dependencies {
    // For more info:
    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    
-    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+ 
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }

 // This block of code expands all declared replace properties in the specified resource targets.
@@ -177,8 +171,16 @@ tasks.named('jar', Jar).configure {
            'Implementation-Vendor'   : mod_authors
        ])
    }
+
+    // This is the preferred method to reobfuscate your jar file
+    finalizedBy 'reobfJar'
 }

+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
+// tasks.named('publish').configure {
+//     dependsOn 'reobfJar'
+// }
+
 // Example configuration to allow publishing using the maven-publish plugin
 publishing {
    publications {
@@ -197,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
@@ -46,7 +46,7 @@ public class Config

    private static boolean validateItemName(final Object obj)
    {
-        return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(ResourceLocation.tryParse(itemName));
+        return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
    }

    @SubscribeEvent
@@ -58,7 +58,7 @@ public class Config

        // convert the list of strings into a set of items
        items = ITEM_STRINGS.get().stream()
-                .map(itemName -> ForgeRegistries.ITEMS.getValue(ResourceLocation.tryParse(itemName)))
+                .map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName)))
                .collect(Collectors.toSet());
    }
 }
@@ -50,7 +50,7 @@ public class ExampleMod

    // Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
    public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
-            .alwaysEdible().nutrition(1).saturationModifier(2f).build())));
+            .alwaysEat().nutrition(1).saturationMod(2f).build())));

    // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
    public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()
@@ -41,6 +41,13 @@ authors="${mod_authors}" #optional
 # 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" # 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}'''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
@@ -1,55 +1,56 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -96,7 +_,10 @@
-                 GlStateManager._texParameter(3553, 34892, 0);
-                 GlStateManager._texParameter(3553, 10242, 33071);
-                 GlStateManager._texParameter(3553, 10243, 33071);
-+                if (!stencilEnabled)
-                 GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
-+                else
-+                    GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
-             }
+@@ -113,7 +_,10 @@
+             GlStateManager._texParameter(3553, 34892, 0);
+             GlStateManager._texParameter(3553, 10242, 33071);
+             GlStateManager._texParameter(3553, 10243, 33071);
+         if (!stencilEnabled)
+             GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, (IntBuffer)null);
+         else
+            GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
+          }
 
-             this.setFilterMode(9728, true);
-@@ -106,8 +_,13 @@
-             GlStateManager._texImage2D(3553, 0, 32856, this.width, this.height, 0, 6408, 5121, null);
-             GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
-             GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
-            if (this.useDepth) {
-+            if (this.useDepth && !stencilEnabled) {
-                 GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
-+            } else if(this.useDepth && net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
-+                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-+            } else if (this.useDepth) {
-+                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
-+                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-             }
+          this.setFilterMode(9728);
+@@ -124,7 +_,14 @@
+          GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
+          GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
+          if (this.useDepth) {
+         if(!stencilEnabled)
+             GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
+         else if(net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
+         } else {
+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
+         }
+          }
 
-             this.checkStatus();
-@@ -229,5 +_,26 @@
- 
-     public int getDepthTextureId() {
-         return this.depthBufferId;
-+    }
+          this.checkStatus();
+@@ -292,4 +_,27 @@
+    public int getDepthTextureId() {
+       return this.depthBufferId;
+    }
 +
-+    private boolean stencilEnabled = false;
-+    /**
-+     * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
-+     * Modders must call this directly to set things up.
-+     * This is to prevent the default cause where graphics cards do not support stencil bits.
-+     * <b>Make sure to call this on the main render thread!</b>
-+     */
-+    public void enableStencil() {
-+        if (stencilEnabled) return;
-+        stencilEnabled = true;
-+        this.resize(viewWidth, viewHeight);
-+    }
+   /*================================ FORGE START ================================================*/
+   private boolean stencilEnabled = false;
+   /**
+    * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
+    * Modders must call this directly to set things up.
+    * This is to prevent the default cause where graphics cards do not support stencil bits.
+    * <b>Make sure to call this on the main render thread!</b>
+    */
+   public void enableStencil() {
+      if(stencilEnabled) return;
+      stencilEnabled = true;
+      this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
+   }
 +
-+    /**
-+     * Returns wither or not this FBO has been successfully initialized with stencil bits.
-+     * If not, and a modder wishes it to be, they must call enableStencil.
-+     */
-+    public boolean isStencilEnabled() {
-+        return this.stencilEnabled;
-     }
+   /**
+    * Returns wither or not this FBO has been successfully initialized with stencil bits.
+    * If not, and a modder wishes it to be, they must call enableStencil.
+    */
+   public boolean isStencilEnabled() {
+      return this.stencilEnabled;
+   }
+   /*================================ FORGE END   ================================================*/
 }
@@ -1,20 +1,19 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -519,9 +_,17 @@
-         }
-     }
+@@ -501,9 +_,16 @@
 
-+    /* Stores the last values sent into glMultiTexCoord2f */
-+    public static float lastBrightnessX = 0.0f;
-+    public static float lastBrightnessY = 0.0f;
-+
-     public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
-         RenderSystem.assertOnRenderThreadOrInit();
-         GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
-+        if (p_84161_ == GL13.GL_TEXTURE1) {
-+            lastBrightnessX = p_84162_;
-+            lastBrightnessY = p_84163_;
-+        }
-     }
+    }
 
-     public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
+   /* Stores the last values sent into glMultiTexCoord2f */
+   public static float lastBrightnessX = 0.0f;
+   public static float lastBrightnessY = 0.0f;
+    public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
+       RenderSystem.assertOnRenderThreadOrInit();
+       GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
+      if (p_84161_ == GL13.GL_TEXTURE1) {
+          lastBrightnessX = p_84162_;
+          lastBrightnessY = p_84163_;
+       }
+    }
+ 
+    public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
@@ -1,30 +1,28 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -88,7 +_,8 @@
-         GLFW.glfwWindowHint(139267, 2);
-         GLFW.glfwWindowHint(139272, 204801);
-         GLFW.glfwWindowHint(139270, 1);
-        this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
-+        this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
-+        if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
-         if (monitor != null) {
-             VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
-             this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
-@@ -100,6 +_,7 @@
-             this.windowedX = this.x = aint1[0];
-             this.windowedY = this.y = aint[0];
-         }
-+        }
+@@ -81,7 +_,8 @@
+       GLFW.glfwWindowHint(139267, 2);
+       GLFW.glfwWindowHint(139272, 204801);
+       GLFW.glfwWindowHint(139270, 1);
+-      this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
+      this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
+      if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
+       if (monitor != null) {
+          VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
+          this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
+@@ -93,6 +_,7 @@
+          this.windowedX = this.x = aint1[0];
+          this.windowedY = this.y = aint[0];
+       }
+      }
 
-         GLFW.glfwMakeContextCurrent(this.window);
-         GL.createCapabilities();
-@@ -267,6 +_,9 @@
-         GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
-         this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
-         this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
-+        if (this.framebufferHeight == 0 || this.framebufferWidth == 0) {
-+            net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h);
-+        }
-     }
+       GLFW.glfwMakeContextCurrent(this.window);
+       GL.createCapabilities();
+@@ -242,6 +_,7 @@
+       GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
+       this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
+       this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
+      if (this.framebufferHeight == 0 || this.framebufferWidth==0) net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w->this.framebufferWidth=w, h->this.framebufferHeight=h);
+    }
 
-     private void onResize(long p_85428_, int p_85429_, int p_85430_) {
+    private void onResize(long p_85428_, int p_85429_, int p_85430_) {
@@ -0,0 +1,17 @@
+--- a/com/mojang/blaze3d/vertex/BufferBuilder.java
+++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
+@@ -477,4 +_,14 @@
+          this.sorting = p_277855_;
+       }
+    }
+
+   // Forge start
+   public void putBulkData(ByteBuffer buffer) {
+      ensureCapacity(buffer.limit() + this.format.getVertexSize());
+      this.buffer.position(this.nextElementByte);
+      this.buffer.put(buffer);
+      this.buffer.position(0);
+      this.vertices += buffer.limit() / this.format.getVertexSize();
+      this.nextElementByte += buffer.limit();
+   }
+ }
@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
-@@ -14,7 +_,7 @@
- import org.joml.Vector3f;
+@@ -11,7 +_,7 @@
+ import org.joml.Quaternionf;
 
 @OnlyIn(Dist.CLIENT)
 -public class PoseStack {
 +public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
-     private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), p_85848_ -> {
-         Matrix4f matrix4f = new Matrix4f();
-         Matrix3f matrix3f = new Matrix3f();
+    private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), (p_85848_) -> {
+       Matrix4f matrix4f = new Matrix4f();
+       Matrix3f matrix3f = new Matrix3f();
@@ -0,0 +1,11 @@
+--- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
+++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
+@@ -46,7 +_,7 @@
+ 
+    public void endVertex() {
+       Vector3f vector3f = this.normalInversePose.transform(new Vector3f(this.nx, this.ny, this.nz));
+-      Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
+      Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
+       Vector4f vector4f = this.cameraInversePose.transform(new Vector4f(this.x, this.y, this.z, 1.0F));
+       vector4f.rotateY((float)Math.PI);
+       vector4f.rotateX((-(float)Math.PI / 2F));
@@ -1,23 +1,38 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -13,7 +_,7 @@
+@@ -14,7 +_,7 @@
 import org.lwjgl.system.MemoryStack;
 
 @OnlyIn(Dist.CLIENT)
 -public interface VertexConsumer {
 +public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
-     VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
+    VertexConsumer vertex(double p_85945_, double p_85946_, double p_85947_);
 
-     VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
-@@ -133,9 +_,11 @@
+    VertexConsumer color(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
+@@ -64,6 +_,10 @@
+    }
 
-                 int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
-                 int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
-+                k1 = applyBakedLighting(k1, bytebuffer);
-                 float f10 = bytebuffer.getFloat(16);
-                 float f9 = bytebuffer.getFloat(20);
-                 Vector3f vector3f1 = matrix4f.transformPosition(f, f1, f2, new Vector3f());
-+                applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
-                 this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), j1, f10, f9, p_85993_, k1, vector3f.x(), vector3f.y(), vector3f.z());
+    default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, int[] p_86002_, int p_86003_, boolean p_86004_) {
+      putBulkData(p_85996_, p_85997_, p_85998_, p_85999_, p_86000_, p_86001_, 1, p_86002_, p_86003_, p_86004_);
+   }
+
+   default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, float alpha, int[] p_86002_, int p_86003_, boolean p_86004_) {
+       float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
+       int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
+       int[] aint1 = p_85997_.getVertices();
+@@ -99,11 +_,13 @@
+                f5 = afloat[k] * p_86001_;
             }
-         }
+ 
+-            int l = aint[k];
+            int l = applyBakedLighting(p_86002_[k], bytebuffer);
+             float f9 = bytebuffer.getFloat(16);
+             float f10 = bytebuffer.getFloat(20);
+             Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
+-            this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
+            applyBakedNormals(vector3f, bytebuffer, p_85996_.normal());
+            float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
+            this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
+          }
+       }
+ 
@@ -1,41 +1,14 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -14,7 +_,7 @@
- import net.minecraftforge.api.distmarker.OnlyIn;
- 
- @OnlyIn(Dist.CLIENT)
-public class VertexFormat {
-+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
-     public static final int UNKNOWN_ELEMENT = -1;
-     private final List<VertexFormatElement> elements;
-     private final List<String> names;
-@@ -23,6 +_,7 @@
-     private final int[] offsetsByElement = new int[32];
-     @Nullable
-     private VertexBuffer immediateDrawVertexBuffer;
-+    private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
- 
-     VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
-         this.elements = p_343616_;
-@@ -35,6 +_,11 @@
-             int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
-             this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
-         }
+@@ -176,4 +_,11 @@
+          return i;
+       }
+    }
 +
-+        ImmutableMap.Builder<String, VertexFormatElement> elements = ImmutableMap.builder();
-+        for (int i = 0; i < p_343616_.size(); i++)
-+            elements.put(p_345241_.get(i), p_343616_.get(i));
-+        this.elementMapping = elements.buildOrThrow();
-     }
- 
-     public static VertexFormat.Builder builder() {
-@@ -141,6 +_,9 @@
- 
-         return vertexbuffer;
-     }
-+
-+    public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
-+    public int getOffset(int index) { return offsetsByElement[index]; }
- 
-     @OnlyIn(Dist.CLIENT)
-     public static class Builder {
+   public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
+   public int getOffset(int index) { return offsets.getInt(index); }
+   public boolean hasPosition() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.POSITION); }
+   public boolean hasNormal() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.NORMAL); }
+   public boolean hasColor() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.COLOR); }
+   public boolean hasUV(int which) { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.UV && e.getIndex() == which); }
+ }
@@ -0,0 +1,13 @@
+--- a/com/mojang/blaze3d/vertex/VertexFormatElement.java
+++ b/com/mojang/blaze3d/vertex/VertexFormatElement.java
+@@ -90,6 +_,10 @@
+       this.usage.clearBufferState(this.index, p_166964_);
+    }
+ 
+    public int getElementCount() {
+       return count;
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static enum Type {
+       FLOAT(4, "Float", 5126),
@@ -1,31 +1,31 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
@@ -13,7 +_,7 @@
- import org.joml.Quaternionf;
 import org.joml.Vector3f;
+ import org.joml.Vector3fc;
 
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
-     private final Matrix4f matrix;
-     public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
-         p_269604_ -> p_269604_.group(
-@@ -169,5 +_,19 @@
-         vector3f1.lerp(p_175938_.getScale(), p_175939_);
-         quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
-         return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
-+    }
+    private final Matrix4f matrix;
+    public static final Codec<Transformation> CODEC = RecordCodecBuilder.create((p_269604_) -> {
+       return p_269604_.group(ExtraCodecs.VECTOR3F.fieldOf("translation").forGetter((p_269599_) -> {
+@@ -156,6 +_,19 @@
+    public int hashCode() {
+       return Objects.hash(this.matrix);
+    }
 +
 +    private Matrix3f normalTransform = null;
 +    public Matrix3f getNormalMatrix() {
 +        checkNormalTransform();
 +        return normalTransform;
 +    }
-+
 +    private void checkNormalTransform() {
 +        if (normalTransform == null) {
 +            normalTransform = new Matrix3f(matrix);
 +            normalTransform.invert();
 +            normalTransform.transpose();
 +        }
-     }
- }
+    }
+ 
+    public Transformation slerp(Transformation p_175938_, float p_175939_) {
+       Vector3f vector3f = this.getTranslation();
@@ -1,9 +1,10 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -71,6 +_,15 @@
-     }
+@@ -61,6 +_,15 @@
+       return Component.empty().append(this.lines.title).append(": ").append(this.lines.detail);
+    }
 
-     @Override
+    @Override
 +    public boolean keyPressed(int key, int scanCode, int modifiers) {
 +       if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
 +          minecraft.setScreen(this.nextScreen);
@@ -12,7 +13,6 @@
 +       return super.keyPressed(key, scanCode, modifiers);
 +    }
 +
-+    @Override
-     public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
-         super.render(p_283497_, p_88680_, p_88681_, p_88682_);
-         p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
+    public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
+       super.render(p_283497_, p_88680_, p_88681_, p_88682_);
+       p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
@@ -1,48 +1,48 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -58,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");
-            p_127520_.append("Stacktrace:\n");
-
-            for (StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
-                p_127520_.append("\t").append("at ").append(stacktraceelement);
-                p_127520_.append("\n");
-            }
+@@ -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");
+-         p_127520_.append("Stacktrace:\n");
 -
+-         for(StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
+-            p_127520_.append("\t").append("at ").append((Object)stacktraceelement);
 -            p_127520_.append("\n");
-+            p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
-+            p_127520_.append("Stacktrace:");
-+            p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
-         }
- 
-         for (CrashReportCategory crashreportcategory : this.details) {
-@@ -73,6 +_,7 @@
-             p_127520_.append("\n\n");
-         }
- 
-+        net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
-         this.systemReport.appendToCrashReportString(p_127520_);
-     }
- 
-@@ -92,18 +_,7 @@
-             throwable.setStackTrace(this.exception.getStackTrace());
-         }
- 
-        String s;
-        try {
-            stringwriter = new StringWriter();
-            printwriter = new PrintWriter(stringwriter);
-            throwable.printStackTrace(printwriter);
-            s = stringwriter.toString();
-        } finally {
-            IOUtils.closeQuietly((Writer)stringwriter);
-            IOUtils.closeQuietly((Writer)printwriter);
-        }
+-         }
 -
-        return s;
-+        return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
-     }
+-         p_127520_.append("\n");
+         p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
+         p_127520_.append("Stacktrace:");
+         p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
+       }
 
-     public String getFriendlyReport(ReportType p_343869_, List<String> p_342487_) {
+       for(CrashReportCategory crashreportcategory : this.details) {
+@@ -74,6 +_,7 @@
+          p_127520_.append("\n\n");
+       }
+ 
+      net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
+       this.systemReport.appendToCrashReportString(p_127520_);
+    }
+ 
+@@ -93,18 +_,7 @@
+          throwable.setStackTrace(this.exception.getStackTrace());
+       }
+ 
+-      String s;
+-      try {
+-         stringwriter = new StringWriter();
+-         printwriter = new PrintWriter(stringwriter);
+-         throwable.printStackTrace(printwriter);
+-         s = stringwriter.toString();
+-      } finally {
+-         IOUtils.closeQuietly((Writer)stringwriter);
+-         IOUtils.closeQuietly((Writer)printwriter);
+-      }
+-
+-      return s;
+      return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
+    }
+ 
+    public String getFriendlyReport() {
@@ -1,37 +1,38 @@
 --- a/net/minecraft/CrashReportCategory.java
 +++ b/net/minecraft/CrashReportCategory.java
-@@ -112,8 +_,10 @@
-         if (astacktraceelement.length <= 0) {
-             return 0;
-         } else {
-            this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
-            System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
-+            int len = astacktraceelement.length - 3 - p_128149_;
-+            if (len <= 0) len = astacktraceelement.length;
-+            this.stackTrace = new StackTraceElement[len];
-+            System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
-             return this.stackTrace.length;
-         }
-     }
-@@ -160,16 +_,16 @@
+@@ -102,8 +_,10 @@
+       if (astacktraceelement.length <= 0) {
+          return 0;
+       } else {
+-         this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
+-         System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
+         int len = astacktraceelement.length - 3 - p_128149_;
+         if (len <= 0) len = astacktraceelement.length;
+         this.stackTrace = new StackTraceElement[len];
+         System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
+          return this.stackTrace.length;
+       }
+    }
+@@ -147,17 +_,17 @@
 
-         if (this.stackTrace != null && this.stackTrace.length > 0) {
-             p_128169_.append("\nStacktrace:");
+       if (this.stackTrace != null && this.stackTrace.length > 0) {
+          p_128169_.append("\nStacktrace:");
 -
-            for (StackTraceElement stacktraceelement : this.stackTrace) {
-                p_128169_.append("\n\tat ");
-                p_128169_.append(stacktraceelement);
-            }
-+            p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
-         }
-     }
+-         for(StackTraceElement stacktraceelement : this.stackTrace) {
+-            p_128169_.append("\n\tat ");
+-            p_128169_.append((Object)stacktraceelement);
+-         }
+         p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
+       }
 
-     public StackTraceElement[] getStacktrace() {
-         return this.stackTrace;
-+    }
+    }
+ 
+    public StackTraceElement[] getStacktrace() {
+       return this.stackTrace;
+   }
 +
-+    public void applyStackTrace(Throwable t) {
-+        this.stackTrace = t.getStackTrace();
-     }
+   public void applyStackTrace(Throwable t) {
+      this.stackTrace = t.getStackTrace();
+    }
 
-     public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
+    public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
@@ -1,10 +1,10 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -170,6 +_,7 @@
-     }
+@@ -215,6 +_,7 @@
+    }
 
-     static {
-+        if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
-         ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
-         CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
-         CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
+    static {
+      if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
+       ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
+       CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
+       CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
@@ -1,11 +1,23 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -264,7 +_,7 @@
-                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
-                 .getChoiceType(p_137552_, p_137553_);
-         } catch (IllegalArgumentException illegalargumentexception) {
-            LOGGER.error("No data fixer registered for {}", p_137553_);
-+            LOGGER.debug("No data fixer registered for {}", p_137553_);
-             if (SharedConstants.IS_RUNNING_IN_IDE) {
-                 throw illegalargumentexception;
-             }
+@@ -180,6 +_,11 @@
+       return 255;
+    }
+ 
+   // We add these inner classes to compensate for Mojang's missing inner classes and shift the anonymous class index.
+   // This allows us to obfuscate subsequent anonymous inner classes correctly.
+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT1 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT2 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
+
+    public static ExecutorService backgroundExecutor() {
+       return BACKGROUND_EXECUTOR;
+    }
+@@ -254,7 +_,7 @@
+       try {
+          type = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())).getChoiceType(p_137552_, p_137553_);
+       } catch (IllegalArgumentException illegalargumentexception) {
+-         LOGGER.error("No data fixer registered for {}", (Object)p_137553_);
+         LOGGER.debug("No data fixer registered for {}", (Object)p_137553_);
+          if (SharedConstants.IS_RUNNING_IN_IDE) {
+             throw illegalargumentexception;
+          }
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