1.21.3 RB 1

https://forums.minecraftforge.net/topic/154393-forge-531-minecraft-1213/

.gitattributes

@@ -3,7 +3,6 @@
 *.patch text eol=lf
 *.java text eol=lf
 *.gradle text eol=crlf
-**/MANIFEST.MF text eol=crlf
 *.png binary
 *.gif binary
 *.exe binary

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,4 +10,4 @@ assignees: ''
 <!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
 <!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
 <!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
-<!-- Discord: https://discord..minecraftforge.net/ -->
+<!-- Discord: https://discord.gg/UvedJ9m -->

.github/ISSUE_TEMPLATE/issue_report.md

@@ -11,7 +11,6 @@ assignees: ''
 
 <!-- For support with crashes and issues, please create a post on the forum instead: -->
 <!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
-<!-- You can also use the discord for support, https://discord.minecraftforge.net/ -->
 
 **Minecraft Version:** {Minecraft version}
 

.github/workflows/publish.yml

@@ -1,28 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches: [ '26.2' ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
-    with:
-      java: 21
-      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 }}

.github/workflows/pull_request_review.yml

@@ -7,7 +7,7 @@ jobs:
     name: Upload payload
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
+      - uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
         with:
           name: payload
           path: ${{ github.event_path }}

.github/workflows/pull_request_review_comment.yml

@@ -7,7 +7,7 @@ jobs:
     name: Upload payload
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
+      - uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
         with:
           name: payload
           path: ${{ github.event_path }}

.gitignore

@@ -1,6 +1,3 @@
-#forgedev dev if the folder exists in here
-forgedev
-
 #eclipse
 **/bin
 **/.settings
@@ -25,12 +22,10 @@ forgedev
 /*/build
 /*/.gradle
 
-# Minecraft
-/run
-/*.launch
-
 # Projects repo, either ignore it, or ignore patches.
-src/minecraft
+/projects/mcp/
+/projects/clean/
+/projects/forge/
 
 #occupational hazards
 /projects/**/build/
@@ -38,7 +33,6 @@ src/minecraft
 /projects/**/run/
 /projects/**/*.launch
 /repo/
-/rejects-*/
 src/*/generated/**/.cache/
 
 # Generated by gradle every import
@@ -47,14 +41,3 @@ src/*/generated/**/.cache/
 
 /ForgeRoot.ipr
 /ForgeRoot.iws
-
-# APT stuff
-/*/.gitignore
-/*/.factorypath
-/*/.apt_generated/
-/fmlcore/logs/
-/lib/
-/_actual/
-/runs/
-/forge.ipr
-/forge.iws

.teamcity/pom.xml

@@ -0,0 +1,104 @@
+<?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>

.teamcity/settings.kts

@@ -0,0 +1,193 @@
+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()
+    }
+})

CREDITS.txt

@@ -0,0 +1,65 @@
+Minecraft Forge: Credits/Thank You
+
+Forge is a set of tools and modifications to the Minecraft base game code to assist 
+mod developers in creating new and exciting content. It has been in development for 
+several years now, but I would like to take this time thank a few people who have 
+helped it along its way.
+
+First, the people who originally created the Forge projects way back in Minecraft 
+alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
+of me taking over the project, who knows what Minecraft modding would be today.
+
+Secondly, someone who has worked with me, and developed some of the core features
+that allow modding to be as functional, and as simple as it is, cpw. For developing
+FML, which stabilized the client and server modding ecosystem. As well as the base
+loading system that allows us to modify Minecraft's code as elegently as possible.
+
+Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
+sane as well as guiding the community into creating better additions to Forge.
+
+Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which 
+I am a part}. For creating some of the core tools needed to make Minecraft modding 
+both possible, and as stable as can be.
+  On that note, here is some specific information of the MCP data we use:
+    * Minecraft Coder Pack (MCP) *
+      Forge Mod Loader and Minecraft Forge have permission to distribute and automatically 
+      download components of MCP and distribute MCP data files. This permission is not 
+      transitive and others wishing to redistribute the Minecraft Forge source independently
+      should seek permission of MCP or remove the MCP data files and request their users 
+      to download MCP separately.
+      
+And lastly, the countless community members who have spent time submitting bug reports, 
+pull requests, and just helping out the community in general. Thank you.
+
+--LexManos
+
+=========================================================================
+
+This is Forge Mod Loader.
+
+You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml
+
+This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
+and minecraft clients.
+
+The code is authored by cpw.
+
+It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
+https://www.minecraftforum.net/topic/75440-
+This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
+
+It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
+https://minecraftforge.net/
+
+Additionally, it contains an implementation of topological sort based on that 
+published at http://keithschwarz.com/interesting/code/?dir=topological-sort
+
+It also contains code from the Maven project for performing versioned dependency
+resolution. http://maven.apache.org/
+
+It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
+with credit to it's authors.
+
+Forge Mod Loader downloads components from the Minecraft Coder Pack
+(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
+

LICENSE.txt

@@ -3,7 +3,7 @@ parts herein are licensed under the terms of the LGPL 2.1 found
 here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and 
 copied below.
 
-Homepage: https://minecraftforge.net/
+Homepage: http://minecraftforge.net/
           https://github.com/MinecraftForge/MinecraftForge
           
 

build.gradle

@@ -1,795 +1,55 @@
-import org.apache.tools.ant.filters.ReplaceTokens
+import net.minecraftforge.forge.tasks.*
+import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
-    id 'java-library'
-    id 'idea'
+    id 'net.minecraftforge.licenser' version '1.0.1'
+    id 'com.github.ben-manes.versions' version '0.46.0'
+    id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
     id 'eclipse'
-    id 'maven-publish'
-    alias libs.plugins.licenser
-    alias libs.plugins.versions
-    alias libs.plugins.gradleutils
-    alias libs.plugins.gitversion
-    alias libs.plugins.changelog
-    alias libs.plugins.jarsigner
-    id 'net.minecraftforge.forgedev'
-    id 'net.minecraftforge.forge.build.convention'
+    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.gradlejarsigner' version '1.0.4'
+    id 'org.barfuin.gradle.taskinfo' version '2.1.0'
 }
 
-gradleutils.displayName = 'Forge'
-group = 'net.minecraftforge'
-description = 'Modifications to Minecraft to enable mod developers.'
+Util.init() //Init all our extension methods!
 
-// NOTE: See settings.gradle for all the referenceable version variables.
-// All subprojects (that apply 'net.minecraftforge.forge.build.convention') will have these available.
-println "Version: $version"
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
-
-jarSigner.autoDetect('forge')
-
-// We have to tell ForgeDev to use the exact versions of tools we ship in the installer
-fdtools {
-    configure('binpatcher') {
-        version = buildLibs.binarypatcher.get().version
-    }
-    configure('installertools') {
-        version = buildLibs.installertools.get().version
-    }
-    configure('jarcompatibilitychecker') {
-        javaLauncher = javaToolchains.launcherFor(java.toolchain)
-    }
-}
-
-/* This is used for debugging, comparing all published artifacts against actual production
-forgedev.validatePublish {
-    task {
-        baseBranch = 'upstream/26.1.2'
-        versionPrefix = minecraftVersion
-    }
-}
-*/
-
-final minecraftFiles = forgedev.minecraftFiles(minecraftVersion)
-
-final mcpBase = forgedev.mcpBase {
-    mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}"
-    accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg')
-    sideAnnotationStrippers.from file('src/main/resources/forge.sas')
-}
-
-forgedev.patches {
-    base = mcpBase
-    patches = file('patches/minecraft')
-    patched = file('src/minecraft/java')
-    sourceSets.main.java.srcDir patched
-}
-
-tasks.register('setup') {
-    dependsOn forgedev.patches.apply
-}
-
-sourceSets {
-    named('main') {
-        resources.srcDir 'src/main/generated'
-    }
-    named('test') {
-        resources.srcDir 'src/test/generated'
-    }
-}
-
-license {
-    header = file('LICENSE-header.txt')
-
-    include 'net/minecraftforge/'
-    exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
-
-    tasks.tap {
-        register('main') {
-            files.from files('src/main/java')
-        }
-
-        register('test') {
-            files.from files('src/test/java')
-        }
-    }
+ext {
+    GIT_INFO = gradleutils.gitInfo
+    VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
+    FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
 }
 
 changelog {
-    from changelogBase
-    publishAll = false
+    from '47.999'
 }
 
-// TODO [ForgeDev] Support compileOnlyApi, runtimeOnly, and a consumable annotation processor configuration
-configurations {
-    // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
-    register('bootstrap') {
-        transitive = false
-        canBeDeclared = true
-        canBeResolved = true
-    }
+tasks.register('setup') {
+    dependsOn ':forge:extractMapped'
+    if (findProject(':clean'))
+        dependsOn ':clean:extractMapped'
+}
 
-    register('installer') {
-        transitive = false
-        canBeDeclared = true
-        canBeResolved = true
-        extendsFrom(bootstrap)
-    }
+tasks.register('doChecks') {
+    dependsOn ':forge:checkJarCompatibility'
+    dependsOn ':forge:publish'
+}
 
-    named('api') {
-        extendsFrom(installer)
-    }
-
-    named('implementation') {
-        // Inherit vanilla Minecraft's dependencies
-        extendsFrom(mcpBase.dependencyConfiguration)
+project(':mcp') {
+    apply plugin: 'net.minecraftforge.gradle.mcp'
+    mcp {
+        config MC_VERSION + '-' + MCP_VERSION
+        pipeline = 'joined'
     }
 }
 
-dependencies {
-    // These need to actually be on the classpath at the start. This is only used for the server shim jar.
-    // And this is only needed because custom file systems are REQUIRED to be on the boot classloader.
-    // This has ASM/BootStrap/Unsafe all because I haven't gotten around to moving UnionFileSystem out to its own project.
-    bootstrap libs.jarjar.fs     // JarInJar file system
-    bootstrap libs.roimfs        // JarInJar File System - FileSystems need to be on boot loader.
-    bootstrap libs.bundles.jimfs // In memory file system used for ForgeDev launches
-    bootstrap libs.securemodules // Has Union file system in it
-    bootstrap libs.unsafe        // Needed by securemodules
-    bootstrap libs.bundles.asm   // Needed by securemodules
-
-    implementation libs.jopt.simple
-
-    installer libs.bootstrap
-    installer libs.bootstrap.api // Needed by securemodules
-    installer libs.accesstransformers
-    installer libs.eventbus
-    installer libs.jspecify // Dep of EventBus
-    installer libs.forgespi
-    installer libs.coremods.api
-    installer libs.modlauncher
-    installer libs.mergetool.api
-    installer libs.bundles.night.config
-    installer libs.maven.artifact
-    installer libs.bundles.terminalconsoleappender
-    installer libs.mixin
-    installer libs.mixinextras.forge
-    installer libs.bundles.jarjar
-    installer libs.roimfs
-
-    installer projects.fmlcore
-    installer projects.fmlloader
-    installer projects.fmlearlydisplay
-    installer projects.javafmllanguage
-    installer projects.lowcodelanguage
-    installer projects.mclanguage
-    installer projects.forgeTransformers
-
-    runtimeOnly files(mcpBase.extra)
-
-    runtimeOnly libs.bootstrap
-    runtimeOnly libs.bootstrap.dev
-
-    annotationProcessor libs.eventbus.validator
-}
-
-final EXTRA_TXTS = [
-        file('LICENSE.txt'),
-        changelog.task.flatMap(task -> task.outputFile)
-]
-forgedev.runs {
-    configureEach {
-        options {
-            workingDir = layout.projectDirectory.dir("runs/$name")
-
-            mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-            args '--gameDir', '.'
-            jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
-
-            systemProperty 'bsl.debug', 'true'
-            systemProperty 'terminal.jline', 'true'
-            with(sourceSets.test) {
-                systemProperty 'forge.enableGameTest', 'true'
-                systemProperty 'forgedev.enableTestMods', 'true'
-            }
-        }
-    }
-
-    create('client') {
-        options {
-            systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
-            systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
-
-            args '--launchTarget', 'forge_dev_client',
-                 '--username', 'Dev',
-                 '--version', project.name,
-                 '--accessToken', '0',
-                 '--userType', 'mojang',
-                 '--versionType', 'release',
-                 '--assetsDir', '{assets_root}',
-                 '--assetIndex', '{asset_index}'
-        }
-    }
-
-    create('server') {
-        options {
-            args '--launchTarget', 'forge_dev_server'
-        }
-    }
-
-    create('gameTestServer') {
-        options {
-            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
-        }
-    }
-
-    create('data') {
-        options {
-            args '--launchTarget', 'forge_dev_data',
-                 '--all',
-                 '--existing', sourceSets.main.resources.srcDirs[0],
-                 '--assetsDir', '{assets_root}',
-                 '--assetIndex', '{asset_index}'
-
-            with(sourceSets.main) {
-                args '--mod', 'forge',
-                     '--output', rootProject.file('src/main/generated/')
-            }
-
-            with(sourceSets.test) {
-                args '--mod', '.+',
-                     '--existing', sourceSets.test.resources.srcDirs[0],
-                     '--output', rootProject.file('src/test/generated/')
-            }
-        }
-    }
-
-    create('clientData') {
-        options {
-            args '--all',
-                    '--existing', sourceSets.main.resources.srcDirs[0],
-                    '--assetsDir', '{assets_root}',
-                    '--assetIndex', '{asset_index}'
-
-            with(sourceSets.main) {
-                args '--launchTarget', 'forge_dev_client_data',
-                     '--mod', 'forge',
-                     '--output', rootProject.file('src/main/generated/'),
-                     '--mod', 'forge'
-            }
-
-            with(sourceSets.test) {
-                args '--launchTarget', 'forge_dev',
-                     '--launchEntry', 'minecraft/net.minecraft.client.data.Main',
-                     '--launchData',
-                     '--mod', '.+',
-                     '--existing', sourceSets.test.resources.srcDirs[0],
-                     '--output', rootProject.file('src/test/generated/')
-            }
+if (System.env.TEAMCITY_VERSION) {
+    //Only setup the CI environment if and only if the environment variables are set.
+    tasks.named('configureTeamCity').configure {
+        doLast {
+            println "##teamcity[buildNumber '${project(':forge').version}']"
+            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
         }
     }
 }
-tasks.register('genAllData') {
-    dependsOn forgedev.runs.data.run, forgedev.runs.data.runTest, forgedev.runs.clientData.run, forgedev.runs.clientData.runTest
-}
-
-final serverShim = forgedev.shim {
-    config {
-        mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-        args = ['--launchTarget', 'forge_server']
-    }
-    classpath {
-        libraries configurations.installer
-        library tasks.named('universalJar', Jar)
-        library forgedev.binaryPatches('server').apply, 'server'
-        serverBundle.fileProvider(minecraftFiles.server)
-    }
-    bootstrapClasspath(configurations.bootstrap)
-    jar {
-        jarSigner.sign(it)
-    }
-}
-
-final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') {
-    jar.fileProvider(mcpBase.classes)
-    output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json')
-    blacklist 'net/minecraft/world/level/BaseSpawner' // Ignore this class as we special case it.
-    invokeVirtual('finalizeSpawn', '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;')
-}
-
-forgedev.validateDeprecations(tasks.named('jar', Jar)) {
-    mcVersion = minecraftVersion
-}
-
-forgedev.checks() {
-    base = mcpBase
-    ats {}
-    sas {}
-    execs {}
-
-    patches {
-        dependsOn forgedev.patches.make
-        patchDir = forgedev.patches.patches
-        patchesWithS2SArtifact = [
-                'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
-                'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch',
-        ]
-    }
-
-    fix {
-        dependsOn finalizeSpawn
-    }
-
-    forgedev.patches.make.configure {
-        finalizedBy forgedev.checks.patches.fix
-    }
-}
-
-final crowdin = forgedev.crowdin // Create the crowdin tasks
-tasks.named('jar', Jar) {
-    from(EXTRA_TXTS)
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    exclude '.cache'
-
-    from(zipTree(crowdin.flatMap { it.output } )) {
-        include 'assets/forge/lang/*.json'
-    }
-
-    manifest {
-        attributes([
-                'Automatic-Module-Name': 'net.minecraftforge.forge'
-        ])
-        attributes([
-                'Specification-Title'   : gradleutils.displayName.get(),
-                'Specification-Vendor'  : gradleutils.vendor.get(),
-                'Specification-Version' : gitversion.info.tag,
-                'Implementation-Title'  : project.group,
-                'Implementation-Vendor' : gradleutils.vendor.get(),
-                'Implementation-Version': forgeVersion
-        ], 'net/minecraftforge/versions/forge/')
-        attributes([
-                'Specification-Title'   : 'Minecraft',
-                'Specification-Vendor'  : gradleutils.vendor.get(),
-                'Specification-Version' : minecraftVersion,
-                'Implementation-Title'  : 'MCP',
-                'Implementation-Vendor' : gradleutils.vendor.get(),
-                'Implementation-Version': mcpVersion
-        ], 'net/minecraftforge/versions/mcp/')
-    }
-    jarSigner.sign(it)
-}
-
-final universalJar = tasks.register('universalJar', Jar) {
-    from (zipTree(tasks.named('jar', Jar).flatMap { it.archiveFile } )) {
-        exclude(forgedev.filterVanilla(mcpBase.classes))
-    }
-    manifest = tasks.named('jar', Jar).get().manifest
-    archiveClassifier = 'universal'
-    jarSigner.sign(it)
-}
-
-final sourcesJarAll = tasks.register('sourcesJarAll', Jar) {
-    archiveClassifier = 'sources-all'
-    from(sourceSets.main.allJava.srcDirs)
-}
-
-// Our sources, plus the patches we do to Vanilla Minecraft
-final sourcesJar = tasks.register('sourcesJar', Jar) {
-    archiveClassifier = 'sources'
-    from(sourceSets.main.allJava.srcDirs - forgedev.patches.patched.asFile.get())
-    mustRunAfter(forgedev.patches.make)
-    from(forgedev.patches.patches) {
-        into 'patches/'
-    }
-}
-
-forgedev.userDev {
-    base(mcpBase)
-
-    config {
-        universal universalJar
-        sources sourcesJar
-        addLibraries(configurations.installer)
-        // TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config
-        //      so we don't gotta keep making exceptions for MixinExtras
-        addCompileDependency(libs.mixinextras.common)
-        addAnnotationProcessorDependency(libs.mixinextras.common)
-
-        // TODO [ForgeDev] Consolidate Patcher + UserDev Config runs in a sane way
-        runs {
-            configureEach {
-                parents = []
-                main = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-                args '--gameDir', '.'
-                jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
-                client = it.name.containsIgnoreCase('client')
-                environment 'MCP_MAPPINGS', '{mcp_mappings}'
-            }
-
-            register('clientData') {
-                args '--launchTarget', "forge_userdev_client_data"
-                args '--assetIndex', '{asset_index}'
-                args '--assetsDir', '{assets_root}'
-            }
-
-            register('client') {
-                property 'forge.enableGameTest', 'true'
-                args '--launchTarget', "forge_userdev_client"
-                args '--version', 'MOD_DEV'
-                args '--assetIndex', '{asset_index}'
-                args '--assetsDir', '{assets_root}'
-            }
-
-            register('server') {
-                property 'forge.enableGameTest', 'true'
-                args '--launchTarget', "forge_userdev_server"
-            }
-
-            register('gameTestServer') {
-                args '--launchTarget', "forge_userdev_server_gametest"
-            }
-
-            register('data') {
-                args '--launchTarget', "forge_userdev_data"
-                args '--assetIndex', '{asset_index}'
-                args '--assetsDir', '{assets_root}'
-            }
-        }
-    }
-    patches {
-        modified.setFrom(sourcesJarAll.flatMap { it.archiveFile })
-    }
-    binaryPatches {
-        mustRunAfter(forgedev.patches.make)
-        patches.setFrom(forgedev.patches.patches)
-        dirty.setFrom(tasks.named('jar', Jar).flatMap { it.archiveFile })
-    }
-}
-
-forgedev.userdevCompatibility(minecraftVersion) {
-    clean = mcpBase.classes
-    dirty = tasks.named('jar', Jar)
-}
-
-// region Installer tasks, Not needed when we simplify the installer/remove obf
-final clientBinPatches = forgedev.binaryPatches('client') {
-    clean = minecraftFiles.client
-    // Workaround for 3rd party launcher issues, marker needed to locate MC, store needed to fix zlib-ng issues
-    apply { 
-        store = true 
-        marker = '.forge_patched_minecraft'
-    }
-}
-final serverBinPatches = forgedev.binaryPatches('server') {
-    clean = minecraftFiles.serverExtracted
-    apply { store = true }
-}
-// endregion
-
-forgedev.installer {
-    dev = !forgedev.ci
-    offline = false
-    baseVersion = buildLibs.installer.get().version.toString()
-
-    // Add extra libraries
-    pack serverShim.jar // The Server executable jar IS needed to be packed, as the installer would need a spec bump in order to download it
-    pack universalJar // I don't think this is strictly needed to be packed anymore, will need to double check later
-
-    launcherLibrary universalJar
-    // We configure the launcher here to keep the order for easier diff, after publishing, move this to the LauncherJson configuration below
-    launcherJson {
-        // We create this during install, so it's not downloadable
-        generated(clientBinPatches.apply, 'client')
-    }
-
-    launcherLibraries configurations.installer
-
-    final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}"
-    final installertools = tool(buildLibs.installertools)
-    final binarypatcher = tool(buildLibs.binarypatcher)
-
-    jar {
-        from(EXTRA_TXTS)
-        from(rootProject.file('/forge_installer_logo.png')) {
-            rename { 'big_logo.png' }
-        }
-        from(clientBinPatches.create.flatMap { t -> t.output }) {
-            rename { 'data/client.lzma' }
-        }
-        from(serverBinPatches.create.flatMap { t -> t.output }) {
-            rename { 'data/server.lzma' }
-        }
-
-        final argsFile = rootProject.file('server_files/args.txt')
-        final tokens = [tokens: [
-                SHIM_JAR_FILE: serverShim.jar.get().archiveFileName.get(),
-                MAVEN_PATH: forgedev.mavenArtifact.directory
-        ]]
-        from(argsFile) {
-            filter(tokens, ReplaceTokens)
-            into 'data'
-            rename { 'unix_args.txt' }
-        }
-        from(argsFile) {
-            filter(tokens, ReplaceTokens)
-            into 'data'
-            rename { 'win_args.txt' }
-        }
-
-        from(rootProject.file('server_files')) {
-            filter(tokens, ReplaceTokens)
-            into 'data'
-            exclude 'args.txt'
-        }
-
-        jarSigner.sign(it)
-    }
-    json {
-        icon = rootProject.file('icon.ico')
-        executable serverShim.jar
-        minecraft = minecraftVersion
-        profileVersion = launcherId
-
-        final projectArtifact = "${project.group}:${project.name}:${project.version}"
-
-        data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]"
-        data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted
-
-        data 'BINPATCH', '/data/client.lzma', '/data/server.lzma'
-        data 'PATCHED', "[$projectArtifact:client]", "[$projectArtifact:server]"
-        data 'PATCHED_SHA', clientBinPatches.apply.flatMap { it.output }, serverBinPatches.apply.flatMap { it.output }
-
-        steps = [
-                extract(installertools) {
-                    side = 'server'
-                    archive '{INSTALLER}'
-                    extract 'data/README.txt', '{ROOT}/README.txt'
-                    extract 'data/run.sh', '{ROOT}/run.sh'
-                    executable '{ROOT}/run.sh'
-                    extract 'data/run.bat', '{ROOT}/run.bat'
-                    optional 'data/user_jvm_args.txt', '{ROOT}/user_jvm_args.txt'
-                    extract 'data/unix_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/unix_args.txt"
-                    extract 'data/win_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/win_args.txt"
-                },
-                extractBundle(installertools) {
-                    side = 'server'
-                    libraries()
-                },
-                extractBundle(installertools) {
-                    side = 'server'
-                    jar '{MINECRAFT_JAR}', '{MC_UNPACKED}'
-                    cache '{MC_UNPACKED}', '{MC_UNPACKED_SHA}'
-                },
-                step(binarypatcher) {
-                    side = 'server'
-                    args = [
-                            '--clean', '{MC_UNPACKED}',
-                            '--output', '{PATCHED}',
-                            '--apply', '{BINPATCH}',
-                            '--data', '--unpatched',
-                            '--store'
-                    ]
-                    cache '{PATCHED}', '{PATCHED_SHA}'
-                },
-                step(binarypatcher) {
-                    side = 'client'
-                    args = [
-                            '--clean', '{MINECRAFT_JAR}',
-                            '--output', '{PATCHED}',
-                            '--apply', '{BINPATCH}',
-                            '--data', '--unpatched',
-                            '--store',
-                            '--marker', '.forge_patched_minecraft'
-                    ]
-                    cache '{PATCHED}', '{PATCHED_SHA}'
-                }
-        ]
-    }
-
-    launcherJson {
-        // These are flags to preserve glitchy old behavior to make diffing easier, removing when migrating to production is recommended
-        sortLibraries = false // Don't sort, makes things non-deterministic, but easier to diff old versions
-        duplicateLibraries = true // Our 'bootstrap' layer go added twice
-        librariesLast = false // Makes libraries be added before args
-
-        id = launcherId
-        inheritsFrom = minecraftVersion
-        mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-        gameArgs = [ '--launchTarget', 'forge_client' ]
-        jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders' ]
-    }
-}
-
-final mdkGradleWrapper = tasks.register('mdkGradleWrapper', Wrapper) {
-    gradleVersion = '9.5.0'
-    scriptFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradlew")
-    jarFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradle/wrapper/gradle-wrapper.jar")
-}
-
-final mdkZip = tasks.register('mdkZip', Zip) {
-    dependsOn mdkGradleWrapper
-
-    archiveBaseName = project.name
-    archiveClassifier = 'mdk'
-    archiveVersion = project.version
-    destinationDirectory = file('build/libs')
-    from(EXTRA_TXTS)
-
-    from mdkGradleWrapper.map(Wrapper.&getScriptFile)
-    from mdkGradleWrapper.map(Wrapper.&getBatchScript)
-    into('gradle/wrapper/') {
-        from mdkGradleWrapper.map(Wrapper.&getJarFile)
-        from mdkGradleWrapper.map(Wrapper.&getPropertiesFile)
-    }
-    from(rootProject.file('mdk/')){
-        rootProject.file('mdk/gitignore.txt').eachLine {
-            if (!it.trim().isEmpty() && !it.trim().startsWith('#'))
-                exclude it
-        }
-        filter(ReplaceTokens, tokens: [
-                FORGE_VERSION: forgeVersion,
-                FORGE_GROUP: project.group,
-                FORGE_NAME: project.name,
-                MC_VERSION: minecraftVersion,
-                FORGE_SPEC_VERSION: gitversion.info.tag.split("\\.")[0],
-                MC_NEXT_VERSION: minecraftNextVersion,
-                EVENTBUS_VERSION: libs.versions.eventbus.get()
-        ])
-        rename 'gitignore\\.txt', '.gitignore'
-        rename 'gitattributes\\.txt', '.gitattributes'
-    }
-    from(rootProject.file('src/test/java/com/example/examplemod/')) {
-        into('src/main/java/com/example/examplemod/')
-    }
-    from(rootProject.file('src/test/generated/mdk_datagen/')) {
-        into('src/main/resources/')
-        exclude '**/.cache/'
-    }
-}
-
-/*
-tasks.named('javadoc', Javadoc) {
-    description = 'Generates the combined javadocs for the FML projects and the main Forge project'
-    var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage', ':forge-transformers' ]
-    source includedProjects.collect { project(it).sourceSets.main.allJava }
-    classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath })
-
-    var docsDir = rootProject.file('src/docs/')
-    inputs.dir(docsDir)
-        .withPropertyName('docs resources directory')
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-        .optional()
-
-    failOnError = false
-
-    // Exclude the Minecraft classes if not enabled
-    if (!project.hasProperty('generateAllDocumentation')) {
-        exclude 'net/minecraft/**'
-        exclude 'com/mojang/**'
-    }
-    exclude 'mcp/**'
-
-    options {
-        stylesheetFile = new File(docsDir, 'stylesheet.css')
-
-        tags = [
-            'apiNote:a:<em>API Note:</em>',
-            'implSpec:a:<em>Implementation Requirements:</em>',
-            'implNote:a:<em>Implementation Note:</em>'
-        ]
-
-        groups = [
-            'Forge Mod Loader': [
-                'net.minecraftforge.fml.common.asm*',
-                'net.minecraftforge.fml.loading*',
-                'net.minecraftforge.fml.server*'
-            ],
-            'FML Core':  [
-                'net.minecraftforge.fml',
-                'net.minecraftforge.fml.config*',
-                'net.minecraftforge.fml.event*',
-                'net.minecraftforge.fml.util*'
-            ],
-            'FML Common': [
-                'net.minecraftforge.fml.core',
-                'net.minecraftforge.fml.event.config',
-                'net.minecraftforge.fml.event.lifecycle'
-            ],
-            'FML Java/MC Language Providers': [
-                'net.minecraftforge.fml.common',
-                'net.minecraftforge.fml.javafmlmod',
-                'net.minecraftforge.fml.mclanguageprovider'
-            ],
-            'Minecraft Forge API': [
-                'net.minecraftforge*'
-            ]
-        ]
-
-        author = false
-        noSince = true
-        noHelp = true
-
-        bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1."
-        windowTitle = "Minecraft Forge API ${version}"
-        docTitle = "Minecraft Forge API - ${forgeVersion} for Minecraft ${minecraftVersion}"
-        header = "<div style=\"margin-top: 9px;padding: 5px 6px;\"><strong>${forgeVersion} for Minecraft ${minecraftVersion}</strong></div>"
-    }
-
-    doLast {
-        project.copy {
-            from docsDir
-            exclude '/stylesheet.css'
-            into destinationDir
-        }
-    }
-}
-*/
-
-publishing {
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
-
-    publications.register('mavenJava', MavenPublication) {
-        changelog.publish(it)
-        gradleutils.promote(it)
-
-        artifact universalJar
-        artifact forgedev.installer.jar
-        artifact mdkZip
-        artifact forgedev.userDev.jar
-        artifact sourcesJar
-        artifact serverShim.jar
-
-        pom {
-            description = project.description
-
-            gradleutils.pom.addRemoteDetails(pom)
-
-            licenses {
-                license gradleutils.pom.licenses.LGPLv2_1
-            }
-        }
-    }
-}
-
-
-/*
-// These are debugging tasks that are only used when developing ForgeDevPlugin, to bulk test task's config/caching
-// region ForgeDev Tests
-def all = tasks.register('all') {}
-afterEvaluate {
-    if (gradle.startParameter.taskNames.contains('all')) {
-	    tasks.forEach { task -> // This forces everything to be realized, which is why we have the startParameter check
-	        if (!gradle.startParameter.isTaskGraph() && task.name.startsWith('run')) return
-            if (task.name in [all.name, 'dependencyInsight', 'dependencies', 'dependencyUpdates', 'init', 'buildEnvironment', 'idea',
-                'eclipse', 'javaToolchains', 'outgoingVariants', 'projects', 'properties', 'resolvableConfigurations', 'tasks', 'updateDaemonJvm',
-                'generateActionsWorkflow'
-            ]) return
-            if (task.name.startsWith('clean')) return
-            if (task.name == 'checkJarCompatibility') return // This doesn't work in FG6 dev, I think it's cuz we check vs srg names. Will need to look at later
-        	all.configure { dependsOn(task) }
-	    }
-    }
-}
-*/
-// endregion
-// We dont have any unit tests, so disable this error
-tasks.withType(AbstractTestTask).configureEach {
-    failOnNoDiscoveredTests = false
-}
-// This shouldn't be needed according to the Gradle devs, as we never run these commands together.
-// But in another case of Gradle being gradle, here we are
-[ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ]
-        .each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }}
-forgedev.runs.configureEach {
-    run.configure { dependsOn finalizeSpawn}
-    runTest.configure { dependsOn finalizeSpawn}
-}
-// run gradlew dependencyUpdates --no-parallel
-//noinspection UnnecessaryQualifiedReference
-tasks.named('dependencyUpdates', com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask) {
-    resolutionStrategy {
-        mcpBase.dependencies.get().forEach {dep -> force(dep) } // Force all vanilla dependencies to their correct versions
-        force(earlyDisplayLibs.slf4j.jdk14) // Force slf4j implementation, its tied to the api from the manifest
-    }
-}

buildSrc/.gitignore

@@ -0,0 +1,3 @@
+/.gradle/
+/build/
+/out/

buildSrc/build.gradle

@@ -0,0 +1,13 @@
+repositories {
+    maven { url = 'https://maven.minecraftforge.net/' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.ow2.asm:asm:9.7'
+    implementation 'org.ow2.asm:asm-tree:9.7'
+    implementation 'net.minecraftforge:srgutils:0.5.10'
+    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'
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BundleList.groovy

@@ -0,0 +1,70 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.tasks.*
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+import java.util.zip.ZipFile
+
+abstract class BundleList extends DefaultTask {
+    @InputFiles abstract ConfigurableFileCollection getConfig()
+    @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)
+        }
+    }
+    
+    @TaskAction
+    void run() {
+        def entries = [:] as TreeMap
+        def resolved = project.configurations.installer.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")
+        }
+
+        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
+        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
+
+        var classifier = 'server'
+        var genned = project.tasks.applyServerBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        file = genned.output.get().asFile
+        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
+        
+        try (def zip = new ZipFile(serverBundle.get().asFile)) {
+            def entry = zip.getEntry('META-INF/libraries.list')
+            def data = zip.getInputStream(entry).text.split('\n')
+            for (def line : data) {
+                def (sha, artifact, path) = line.split('\t')
+                def (group, name, other) = artifact.split(':', 3)
+                //println("Group: $group Name: $name")
+                def key = "$group:$name"
+                if (!entries.containsKey(key))
+                    entries.put(key, line)
+            }
+        }
+        
+        output.get().asFile.text = entries.values().join('\n')
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BytecodeFinder.groovy

@@ -0,0 +1,52 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.json.JsonBuilder
+import groovy.transform.CompileStatic
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.FieldNode
+import org.objectweb.asm.tree.MethodNode
+
+@CompileStatic
+abstract class BytecodeFinder extends DefaultTask {
+    @InputFile abstract RegularFileProperty getJar()
+    // It should be fine to mark the output as internal as we want to control when we run it anyways.
+    // This also shuts Gradle 8 up about implicit task dependencies.
+    @Internal abstract RegularFileProperty getOutput()
+
+    BytecodeFinder() {
+        output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
+    }
+
+    @TaskAction
+    protected void exec() {
+        Util.init()
+
+        var outputFile = output.get().asFile
+        if (outputFile.exists())
+            outputFile.delete()
+
+        pre()
+
+        Util.processClassNodes(jar.get().asFile, this.&process)
+
+        post()
+        outputFile.text = new JsonBuilder(getData()).toPrettyString()
+    }
+
+
+    protected process(ClassNode node) {
+        if (node.fields !== null) node.fields.each { process(node, it) }
+        if (node.methods !== null) node.methods.each { process(node, it) }
+    }
+
+    protected pre() {}
+    protected process(ClassNode parent, FieldNode node) {}
+    protected process(ClassNode parent, MethodNode node) {}
+    protected post() {}
+    protected abstract Object getData()
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BytecodePredicateFinder.groovy

@@ -0,0 +1,48 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.CompileStatic
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Internal
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.MethodNode
+
+@CompileStatic
+abstract class BytecodePredicateFinder extends BytecodeFinder {
+
+    @Internal
+    abstract Property<Closure<Boolean>> getPredicate()
+
+    private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
+
+    @Override
+    protected process(ClassNode parent, MethodNode node) {
+        for (final current : node.instructions) {
+            if (predicate.get().call(parent, node, current)) {
+                var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
+
+                // only add non-synthetic methods
+                if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
+                    methods.add(node.name + node.desc)
+                }
+
+                return
+            }
+        }
+    }
+
+    @Internal
+    @Override
+    protected Object getData() {
+        var array = new ArrayList<Object>()
+        matches.forEach { c, m ->
+            {
+                array.add(
+                        'class': c,
+                        'methods': m
+                )
+            }
+        }
+        return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CleanProperties.groovy

@@ -0,0 +1,97 @@
+package net.minecraftforge.forge.tasks;
+
+import groovy.transform.CompileDynamic;
+import groovy.transform.CompileStatic;
+
+import java.util.Properties;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.TreeSet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.Reader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Eclipse config files are literally just java properties, with the header cleaned up.
+ * https://github.com/eclipse/buildship/blob/5b2c7fca7fa86cd74d71b3c099c7b1559eba038e/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/internal/configuration/PreferenceStore.java#L238
+ *
+ * This does the same thing, as well as sorting alphabetically.
+ * It also ignores all comments. We can add them latter if someone cares.
+ */
+@CompileStatic
+public class CleanProperties extends Properties {
+    private static final long serialVersionUID = 1L;
+    private static final String LINE_SEP = System.getProperty("line.separator");
+    private static final String UNIX_LINE_SEP = "\n";
+    private static final Charset ENCODING = StandardCharsets.UTF_8;
+
+    public CleanProperties load(File input) throws IOException {
+        if (input.exists()) {
+            try (Reader is = new InputStreamReader(new FileInputStream(input), ENCODING)) {
+                super.load(is);
+            }
+        }
+        return this;
+    }
+
+    public void store(File out) throws IOException {
+        if (!out.getParentFile().exists())
+            out.getParentFile().mkdirs();
+
+        try (OutputStream os = new FileOutputStream(out)) {
+            store(os, null);
+        }
+    }
+
+    @Override
+    public synchronized Enumeration<Object> keys() {
+        Set<Object> ret = new TreeSet<>();
+        for (Enumeration<?> e = super.keys(); e.hasMoreElements();)
+            ret.add(e.nextElement());
+        return Collections.enumeration(ret);
+    }
+
+    @CompileDynamic
+    @Override
+    public Set<Map.Entry<Object, Object>> entrySet() {
+        Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
+        ret.addAll(super.entrySet());
+        return ret;
+    }
+
+    @Override
+    public void store(OutputStream out, String comments) throws IOException {
+        out.write(clean().getBytes(ENCODING));
+        out.flush();
+    }
+
+    @Override
+    public void store(Writer out, String comments) throws IOException {
+        out.write(clean());
+        out.flush();
+    }
+
+    private String clean() throws IOException {
+        ByteArrayOutputStream tmp = new ByteArrayOutputStream();
+        try {
+            super.store(tmp, null);
+        } finally {
+            tmp.close();
+        }
+
+        String ret = tmp.toString(ENCODING).replace(LINE_SEP, UNIX_LINE_SEP);
+        ret = ret.substring(ret.indexOf(UNIX_LINE_SEP) + 1);
+        return ret;
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ClosureHelper.groovy

@@ -0,0 +1,33 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.stc.FirstParam
+
+import java.util.function.BiConsumer
+
+public class ClosureHelper {
+    BiConsumer<String, Closure> callback
+    
+    public ClosureHelper(Closure cl, BiConsumer<String, Closure> callback) {
+        this.callback = callback
+        apply(this, cl)
+    }
+    
+    
+    def methodMissing(String name, Object args) {
+        if (!args.class.isArray()) return
+        Object[] aargs = (Object[])args
+        
+        if (aargs.length == 1 && aargs[0] instanceof Closure) {
+            this.callback.accept(name, (Closure)aargs[0])
+        } else {
+            throw new IllegalArgumentException('Unknown method: "' + name + '" with arguments ' + args + ' for ' + this)
+        }
+    }
+    
+    static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
+        cl.delegate = obj
+        cl.resolveStrategy = Closure.DELEGATE_FIRST
+        cl()
+        return obj
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/DownloadLibraries.groovy

@@ -0,0 +1,54 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.OutputFiles
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.OutputDirectory
+
+import java.nio.file.Files
+
+abstract class DownloadLibraries extends DefaultTask {
+	@InputFile abstract RegularFileProperty getInput()
+	@OutputDirectory abstract DirectoryProperty getOutput()
+	@OutputFile abstract RegularFileProperty getLibrariesOutput()
+
+    DownloadLibraries() {
+		output.convention(project.layout.buildDirectory.dir(name))
+        librariesOutput.convention(project.layout.buildDirectory.dir(name).map(d -> d.file('libraries.txt')))
+	}
+
+    @TaskAction
+    def run() {
+		Util.init()
+		File outputDir = output.get().asFile
+        var libraries = new ArrayList<String>()
+
+		def json = input.get().asFile.json().libraries.each { lib ->
+		    //TODO: Thread?
+			def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
+			artifacts.each{ art -> 
+				def target = new File(outputDir, art.path)
+				libraries.add(target.absolutePath)
+				if (!target.exists() || art.sha1 != target.sha1()) {
+					project.logger.lifecycle("Downloading ${art.url}")
+					if (!target.parentFile.exists()) {
+						target.parentFile.mkdirs()
+					}
+					new URL(art.url).withInputStream { i ->
+						target.withOutputStream { it << i }
+					}
+					if (art.sha1 != target.sha1()) {
+						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
+					}
+				}
+			}
+		}
+        Files.write(librariesOutput.get().asFile.toPath(), libraries)
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ExtractFile.groovy

@@ -0,0 +1,28 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.CompileStatic
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.*
+
+import java.util.zip.ZipFile
+
+@CompileStatic
+abstract class ExtractFile extends DefaultTask {
+    @InputFile abstract RegularFileProperty getInput()
+    @Input abstract Property<String> getTarget()
+    @OutputFile abstract RegularFileProperty getOutput()
+
+    @TaskAction
+    protected void exec() {
+        var zip = new ZipFile(input.get().asFile);
+        var entry = zip.getEntry(target.get())
+        if (entry == null)
+            throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
+        var stream = zip.getInputStream(entry)
+        output.get().asFile.withOutputStream { out ->
+            stream.transferTo(out)
+        }
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/FieldCompareFinder.groovy

@@ -0,0 +1,101 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.CompileStatic
+import groovy.transform.EqualsAndHashCode
+
+import org.gradle.api.tasks.*
+import org.objectweb.asm.tree.AbstractInsnNode
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.MethodNode
+
+import static org.objectweb.asm.Opcodes.*
+
+abstract class FieldCompareFinder extends BytecodeFinder {
+    @Nested
+    Map<String, Search> fields = [:] as HashMap
+    @Internal
+    Map<Search, String> fieldsReverse = [:] as HashMap
+    @Internal
+    Map<String, Set<ObjectTarget>> targets = [:] as TreeMap
+    
+    @Override
+    protected pre() {
+        //fields.each{ k,v -> logger.lifecycle("Fields: " + k + ' ' + v) }
+    }
+    
+    @Override
+    protected process(ClassNode parent, MethodNode node) {
+        AbstractInsnNode last = null
+        def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
+        for (int x = 0; x < node.instructions.size(); x++) {
+            def current = node.instructions.get(x)
+            if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
+                if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
+                    def target = new Search(cls: last.owner, name: last.name)
+                    def wanted = fieldsReverse.get(target)
+                    def original = fields.get(wanted)
+                    def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
+                    if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
+                        targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
+                    }
+                }
+            }
+            last = current
+        }
+    }
+    
+    @Internal
+    @Override
+    protected Object getData() {
+		def ret = [:] as HashMap
+		targets.forEach{ k, v -> 
+			def e = fields.get(k)
+			ret[k] = [
+				cls: e.cls, 
+				name: e.name, 
+				replacement: e.replacement, 
+				targets: v
+			]
+		}
+        return ret
+    }
+
+    @CompileStatic
+    @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
+    static class Search {
+        @Input
+        String cls
+        
+        @Input
+        String name
+		
+		@Input
+		String replacement
+    
+        @Nested
+        @Optional
+        Set<ObjectTarget> blacklist
+        
+        @Override
+        String toString() {
+            return cls + '.' + name
+        }
+        
+        def blacklist(String owner, String name, String desc) {
+            if (blacklist === null)
+                blacklist = new HashSet<>()
+            blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
+        }
+        def blacklist(String owner) {
+            blacklist(owner, '', '')
+        }
+    }
+    
+    void fields(Closure cl) {
+        new ClosureHelper(cl, {name, ccl ->
+            def search = ClosureHelper.apply(new Search(), ccl)
+            this.fields.put(name, search)
+            this.fieldsReverse.put(search, name)
+        })
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InheritanceData.groovy

@@ -0,0 +1,49 @@
+package net.minecraftforge.forge.tasks
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import groovy.transform.CompileStatic
+import groovy.transform.TupleConstructor
+
+@CompileStatic
+@TupleConstructor
+final class InheritanceData implements Annotatable {
+    String name
+    int access
+    String superName
+    List<String> interfaces = []
+    Map<String, Method> methods = [:]
+    Map<String, Field> fields = [:]
+    List<Annotation> annotations = []
+
+    @TupleConstructor
+    static final class Method implements Annotatable {
+        int access
+        String override
+        List<Annotation> annotations = []
+    }
+
+    @TupleConstructor
+    static final class Field implements Annotatable {
+        int access
+        String desc
+        List<Annotation> annotations = []
+    }
+
+    @TupleConstructor
+    static final class Annotation {
+        String desc
+    }
+
+    private static final Gson GSON = new Gson()
+    static Map<String, InheritanceData> parse(File file) {
+        try (final reader = file.newReader()) {
+            return GSON.fromJson(reader, new TypeToken<Map<String, InheritanceData>>() {})
+        }
+    }
+}
+
+@CompileStatic
+interface Annotatable {
+    List<InheritanceData.Annotation> getAnnotations()
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy

@@ -0,0 +1,158 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+import org.gradle.api.tasks.bundling.Zip
+import org.gradle.api.tasks.*
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import groovy.json.JsonSlurper
+
+abstract class InstallerJar extends Zip {
+    @Input @Optional abstract Property<Boolean> getFat()
+    @Input @Optional abstract Property<Boolean> getOffline()
+
+    InstallerJar() {
+        archiveClassifier.set('installer')
+        archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
+        destinationDirectory.set(project.layout.buildDirectory.dir('libs'))
+        fat.convention(false)
+        offline.convention(false)
+
+        def installerJson = project.tasks.installerJson
+        def launcherJson = project.tasks.launcherJson
+        def downloadInstaller = project.tasks.downloadInstaller
+
+        dependsOn(installerJson, launcherJson, downloadInstaller, project.configurations.installer)
+        from(installerJson, launcherJson)
+
+        from(project.rootProject.file('/src/main/resources/url.png'))
+        project.afterEvaluate {
+            from(project.zipTree(downloadInstaller.output)) {
+                duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            }
+            
+            if (fat.get() || offline.get()) {
+                def cfg = project.tasks.register(name + "Config", Configure)
+                cfg.get().configure {
+                    parent = this
+                    dependsOn(project.tasks.installerJson, project.tasks.launcherJson)
+                }
+                dependsOn(cfg)
+            } else {
+                // Things we ALWAYS bundle, this just the server shim jar, because the installer spec only says to extract the file. 
+                // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
+                [
+                    project.tasks.serverShimJar // Server bootstrap executable jar
+                ].forEach { AbstractArchiveTask packed ->
+                    def path = Util.getMavenInfoFromTask(packed).path
+                    from(packed) {
+                        rename { "maven/$path" }
+                    }
+                }
+            }
+        }
+    }
+    
+    static abstract class Configure extends DefaultTask {
+        public Zip parent
+        private int count = 0;
+        
+        @TaskAction
+        protected void exec() {
+            def deps = [:] as java.util.TreeMap
+            
+            // Gather all things that need downloading
+            [
+                project.tasks.installerJson, 
+                project.tasks.launcherJson
+            ].each { task ->
+                def json = task.output.get().asFile.json
+                json.libraries.each { lib -> 
+                    if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
+                        deps.put(lib.name, lib.downloads.artifact)
+                }
+            }
+            
+            // First find things we build in this project.
+            [
+                project.tasks.universalJar, // Forge runtime code
+                project.tasks.serverShimJar // Shim jar for dedicated server
+            ].forEach { AbstractArchiveTask packed ->
+                def name = Util.getMavenInfoFromTask(packed).name
+                def info = deps.remove(name)
+                if (info !== null) {
+                    println("Adding: $packed.path $name")
+                    parent.from(packed) {
+                        rename { "maven/$info.path" }
+                    }
+                }
+            }
+            
+            // Find any artifacts from the 'installer' config
+            // This config specifies the runtime files we intend for the interaller to have.
+            // And are typically what we would be developing and testing alongside Forge. 
+            // So we may have local modified versions
+            def cfg = project.configurations.installer
+            while (cfg != null) {
+                //println('')
+                def resolved = cfg.resolvedConfiguration.resolvedArtifacts
+                int found = 0
+                for (def dep : resolved) {
+                    def name = Util.getMavenInfoFromDep(dep).name
+                    def info = deps.remove(name)
+                    if (info == null) {
+                        //println("Skipping: $name")
+                        continue
+                    }
+                    //println("-$name")
+                    found++
+                    addFile(dep.file, info)
+                }
+                
+                if (deps.isEmpty()) {
+                    cfg = null
+                    continue
+                }
+                
+                // Prevent infinite loops if something fucky happens
+                if (found == 0)
+                    throw new IllegalStateException("Failed to find any installer dependencies") 
+                
+                def seen = [] as Set
+                cfg = project.configurations.detachedConfiguration()
+                cfg.transitive = false
+                for (def key : deps.keySet()) {
+                    def (group, artifact, other) = key.split(':', 3)
+                    // Only resolve unique group:artifact so we don't get version overrides
+                    if (seen.add(group + ':' + artifact)) {
+                        //println("+$key")
+                        cfg.dependencies.add(project.dependencies.create(key))
+                    }
+                }
+            }
+        }
+        
+        void addFile(file, info) {
+            boolean pack = parent.offline.get() || info.url.isEmpty()
+            
+            // If it's a offline jar just always pack
+            if (!pack) {
+                try {
+                    var remote = new URL("${info.url}.sha1").getText('UTF-8')
+                    pack = info.sha1 != remote
+                } catch (FileNotFoundException e) {
+                    pack = !info.url.startsWith('https://libraries.minecraft.net/')
+                    // Oh noes its not there!
+                }
+            }
+            
+            if (pack) {
+                println("Adding: $file.absolutePath")
+                parent.from(file) {
+                    rename { "maven/$info.path" }
+                }
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy

@@ -0,0 +1,73 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.json.JsonBuilder
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.SetProperty
+import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+import java.nio.file.Files
+
+abstract class InstallerJson extends DefaultTask {
+    @OutputFile abstract RegularFileProperty getOutput()
+    @InputFiles abstract ConfigurableFileCollection getInput()
+    @Input @Optional final Map<String, Object> libraries = new LinkedHashMap<>()
+    @Input Map<String, Object> json = new LinkedHashMap<>()
+    @InputFile abstract RegularFileProperty getIcon()
+    @Input abstract Property<String> getLauncherJsonName()
+    @Input abstract Property<String> getLogo()
+    @Input abstract Property<String> getMirrors()
+    @Input abstract Property<String> getWelcome()
+
+    InstallerJson() {
+        launcherJsonName.convention('/version.json')
+        logo.convention('/big_logo.png')
+        mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json')
+        welcome.convention("Welcome to the ${project.name.capitalize()} installer.")
+        output.convention(project.layout.buildDirectory.file('libs/install_profile.json'))
+        
+        project.afterEvaluate {
+            [
+                project.tasks.universalJar,
+                project.tasks.serverShimJar
+            ].forEach { packed ->
+                dependsOn(packed)
+                input.from packed.archiveFile
+            }
+        }
+    }
+
+    @TaskAction
+    protected void exec() {
+        def libs = libraries
+        [
+            project.tasks.universalJar,
+            project.tasks.serverShimJar
+        ].forEach { AbstractArchiveTask packed ->
+            def info = Util.getMavenInfoFromTask(packed)
+            libs.put(info.name, [
+                name: info.name,
+                downloads: [
+                    artifact: [
+                        path: info.path,
+                        url: "https://maven.minecraftforge.net/$info.path",
+                        sha1: packed.archiveFile.get().asFile.sha1(),
+                        size: packed.archiveFile.get().asFile.length()
+                    ]
+                ]
+            ])
+        }
+        json.libraries = libs.values().sort{a,b -> a.name.compareTo(b.name)}
+        json.icon = "data:image/png;base64," + new String(Base64.getEncoder().encode(Files.readAllBytes(icon.get().asFile.toPath())))
+        json.json = launcherJsonName.get()
+        json.logo = logo.get()
+        if (!mirrors.get().isEmpty())
+            json.mirrorList = mirrors.get()
+        json.welcome = welcome.get()
+
+        Files.writeString(output.get().getAsFile().toPath(), new JsonBuilder(json).toPrettyString())
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy

@@ -0,0 +1,96 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.json.JsonBuilder
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.SetProperty
+import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+import java.nio.file.Files
+
+import static net.minecraftforge.forge.tasks.Util.getArtifacts
+import static net.minecraftforge.forge.tasks.Util.iso8601Now
+
+abstract class LauncherJson extends DefaultTask {
+    @OutputFile abstract RegularFileProperty getOutput()
+    @InputFiles abstract ConfigurableFileCollection getInput()
+    @Input Map<String, Object> json = new LinkedHashMap<>()
+
+    LauncherJson() {
+        output.convention(project.layout.buildDirectory.file('libs/version.json'))
+
+        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
+            def timestamp = iso8601Now()
+            json.putAll([
+                _comment: [
+                    "Please do not automate the download and installation of Forge.",
+                    "Our efforts are supported by ads from the download page.",
+                    "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
+                ],
+                id: "$mc-$project.name-$forge",
+                time: timestamp,
+                releaseTime: timestamp,
+                inheritsFrom: mc,
+                type: 'release',
+                logging: [:],
+                mainClass: '',
+                libraries: []
+            ] as LinkedHashMap)
+            
+            [
+                project.tasks.universalJar
+            ].forEach { packed ->
+                dependsOn(packed)
+                input.from packed.archiveFile
+            }
+            
+            def patched = project.tasks.applyClientBinPatches
+            dependsOn(patched)
+            input.from patched.output
+        }
+    }
+
+    @TaskAction
+    protected void exec() {
+        var packed = (AbstractArchiveTask) project.tasks.universalJar
+        def info = Util.getMavenInfoFromTask(packed)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "https://maven.minecraftforge.net/$info.path",
+                    sha1: packed.archiveFile.get().asFile.sha1(),
+                    size: packed.archiveFile.get().asFile.length()
+                ]
+            ]
+        ])
+
+        var classifier = 'client'
+        var genned = project.tasks.applyClientBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "",
+                    sha1: genned.output.get().asFile.sha1(),
+                    size: genned.output.get().asFile.length()
+                ]
+            ]
+        ])
+
+        json.libraries.addAll(getArtifacts(project.configurations.installerextra).values())
+        json.libraries.addAll(getArtifacts(project.configurations.installer).values())
+        Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/MergeJars.groovy

@@ -0,0 +1,46 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.CompileStatic
+import org.apache.commons.io.IOUtils
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+@CompileStatic
+abstract class MergeJars extends DefaultTask {
+    MergeJars() {
+        output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
+    }
+
+    @TaskAction
+    void run() {
+        def jars = inputJars.files
+
+        try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
+            for (def jar : jars) {
+                try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
+                    ZipEntry entry
+                    while ((entry = zin.getNextEntry()) !== null) {
+                        ZipEntry _new = new ZipEntry(entry.getName())
+                        _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
+                        zout.putNextEntry(_new)
+                        IOUtils.copy(zin, zout)
+                    }
+                }
+            }
+        }
+    }
+
+    @InputFiles
+    abstract ConfigurableFileCollection getInputJars()
+
+    @OutputFile
+    abstract RegularFileProperty getOutput()
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ObjectTarget.groovy

@@ -0,0 +1,32 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.EqualsAndHashCode
+
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
+import org.gradle.api.tasks.Optional
+
+@EqualsAndHashCode
+public class ObjectTarget implements Comparable<ObjectTarget> {
+    @Input
+    String owner
+    
+    @Input
+    String name
+    
+    @Input
+    @Optional
+    String desc
+    
+    @Override
+    String toString() {
+        if (desc == null)
+            return owner + '.' + name
+        return owner + '.' + name + desc
+    }
+    
+    @Override
+    int compareTo(ObjectTarget o) {
+        return toString() <=> o.toString()
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy

@@ -0,0 +1,47 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+
+abstract class SetupCheckJarCompatibility extends DefaultTask {
+    SetupCheckJarCompatibility() {
+        group = 'jar compatibility'
+        onlyIf {
+            inputVersion.getOrNull() !== null
+        }
+        outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
+
+        baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
+    }
+
+    @TaskAction
+    void run() {
+        def inputVersion = inputVersion.get()
+
+        def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
+        project.rootProject.extensions.download.run {
+            src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-userdev.jar"
+            dest baseForgeUserdev
+        }
+
+        def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
+
+        Files.copy(joinedLzma.toPath(), baseBinPatchesOutput.get().asFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+    }
+
+    @Input
+    @Optional
+    abstract Property<String> getInputVersion()
+
+    @OutputFile
+    abstract RegularFileProperty getBaseBinPatchesOutput()
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/TeamcityRequests.groovy

@@ -0,0 +1,74 @@
+package net.minecraftforge.forge.tasks
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import groovy.transform.CompileStatic
+import org.eclipse.jgit.api.Git
+
+import javax.annotation.Nullable
+import java.util.stream.Collectors
+
+@CompileStatic
+class TeamcityRequests {
+    public static final Gson GSON = new Gson()
+
+    @Nullable
+    static <T> T jsonRequest(TypeToken<T> clazz, String url) throws Exception {
+        final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection()
+        conn.setRequestProperty('Accept', 'application/json')
+        conn.setReadTimeout(5 * 1000)
+        conn.setConnectTimeout(5 * 1000)
+        conn.connect()
+
+        if (conn.responseCode !== 200) {
+            return null
+        }
+
+        try (final InputStream is = conn.getInputStream()) {
+            GSON.fromJson(new InputStreamReader(is), clazz.getType())
+        }
+    }
+
+    @Nullable
+    static Map<String, Build> buildsByCommit() throws IOException {
+        final Map<String, Build> builds = [:]
+        jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
+                ?.build?.forEach {
+            it.revisions.revision.each { rev -> builds[rev.version] = it }
+        }
+        return builds
+    }
+
+    @Nullable
+    static String attemptFindBase(File gitPath) {
+        try (final git = Git.open(gitPath)) {
+            final Map<String, Build> buildByCommit = buildsByCommit()
+            for (final commit in git.log().setMaxCount(100).call()) {
+                // Find the first commit which was built on CI
+                final build = buildByCommit[commit.id.name]
+                if (build) {
+                    return build.number
+                }
+            }
+        } catch (Exception ignored) {}
+        return null
+    }
+
+    static final class Builds {
+        public List<Build> build
+    }
+
+    static final class Build {
+        public String number
+        public Revisions revisions
+    }
+
+    static final class Revisions {
+        public int count
+        public List<Revision> revision
+    }
+
+    static final class Revision {
+        public String version
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy

@@ -0,0 +1,230 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.json.JsonBuilder
+import groovy.json.JsonSlurper
+import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.SimpleType
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ResolvedArtifact
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.tree.ClassNode
+
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
+import java.security.MessageDigest
+import java.text.SimpleDateFormat
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Semaphore
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
+final class Util {
+    public static final int ASM_LEVEL = Opcodes.ASM9
+    private static final HttpClient HTTP = HttpClient.newBuilder().build()
+
+    static void init() {
+        File.metaClass.sha1 = { ->
+            MessageDigest md = MessageDigest.getInstance('SHA-1')
+            delegate.eachByte(4096) { byte[] bytes, int size ->
+                md.update(bytes, 0, size)
+            }
+            return md.digest().collect(this.&toHex).join('')
+        }
+        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
+        File.metaClass.sha256 = { ->
+            MessageDigest md = MessageDigest.getInstance('SHA-256')
+            delegate.eachByte(4096) { byte[] bytes, int size ->
+                md.update(bytes, 0, size)
+            }
+            return md.digest().collect(this.&toHex).join('')
+        }
+        File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
+
+        File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
+        File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
+        File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
+
+        Date.metaClass.iso8601 = { ->
+            var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+            var result = format.format(delegate)
+            return result[0..21] + ':' + result[22..-1]
+        }
+
+        String.metaClass.rsplit = { String del, int limit = -1 ->
+            var lst = new ArrayList<String>()
+            int x = 0
+            int idx
+            String tmp = delegate
+            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
+                lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
+                tmp = tmp.substring(0, idx)
+            }
+            lst.add(0, tmp)
+            return lst
+        }
+    }
+
+    static String[] getClasspath(Project project, Map libs, String artifact) {
+        def ret = []
+        artifactTree(project, artifact).each { key, lib ->
+            libs[lib.name] = lib
+            if (lib.name != artifact)
+                ret.add(lib.name)
+        }
+        return ret
+    }
+
+    @CompileStatic
+    static Map getArtifacts(Configuration config) {
+        var ret = [:]
+        var semaphore = new Semaphore(1, true)
+        config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
+            var info = getMavenInfoFromDep(dep)
+            var domain = 'libraries.minecraft.net'
+            var url = "https://$domain/$info.path"
+            if (!checkExists(url))
+                url.values[0] = 'maven.minecraftforge.net'
+
+            var sha1 = sha1(dep.file)
+
+            semaphore.acquire()
+            ret[info.key] = [
+                name: info.name,
+                downloads: [
+                    artifact: [
+                        path: info.path,
+                        url: url.toString(),
+                        sha1: sha1,
+                        size: dep.file.length()
+                    ]
+                ]
+            ]
+            semaphore.release()
+        })
+        return ret
+    }
+
+    @CompileStatic
+    static Map getMavenInfoFromDep(ResolvedArtifact dep) {
+        return getMavenInfoFromMap([
+            group: dep.moduleVersion.id.group,
+            name: dep.moduleVersion.id.name,
+            version: dep.moduleVersion.id.version,
+            classifier: dep.classifier,
+            extension: dep.extension
+        ])
+    }
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(AbstractArchiveTask task) {
+        return getMavenInfoFromMap([
+            group: task.project.group.toString(),
+            name: task.project.name,
+            version: task.project.version.toString(),
+            classifier: task.archiveClassifier.get(),
+            extension: task.archiveExtension.get()
+        ])
+    }
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(Task task, String classifier) {
+        return getMavenInfoFromMap([
+            group: task.project.group.toString(),
+            name: task.project.name,
+            version: task.project.version.toString(),
+            classifier: classifier,
+            extension: 'jar'
+        ])
+    }
+
+    @CompileStatic
+    private static Map getMavenInfoFromMap(Map<String, String> art) {
+        var key = "$art.group:$art.name"
+        var name = "$art.group:$art.name:$art.version"
+        var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
+        if (art.classifier !== null) {
+            name += ":$art.classifier"
+            path += "-$art.classifier"
+        }
+        if ('jar' != art.extension) {
+            name += "@$art.extension"
+            path += ".$art.extension"
+        } else {
+            path += ".jar"
+        }
+        return [
+            key: key.toString(),
+            name: name.toString(),
+            path: path.toString(),
+            art: art
+        ]
+    }
+
+    static String iso8601Now() { new Date().iso8601() }
+
+    @CompileStatic
+    static String sha1(File file) {
+        MessageDigest md = MessageDigest.getInstance('SHA-1')
+        file.eachByte(4096) { byte[] bytes, int size ->
+            md.update(bytes, 0, size)
+        }
+        return md.digest().collect(this.&toHex).join('')
+    }
+
+    @CompileStatic
+    private static String toHex(byte bite) {
+        return String.format('%02x', bite)
+    }
+
+    private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
+        if (!project.ext.has('tree_resolver'))
+            project.ext.tree_resolver = 1
+        def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
+        cfg.transitive = transitive
+        def dep = project.dependencies.create(artifact)
+        cfg.dependencies.add(dep)
+        def files = cfg.resolve()
+        return getArtifacts(cfg)
+    }
+
+    @CompileStatic
+    static boolean checkExists(String url) {
+        try {
+            return HTTP.send(HttpRequest.newBuilder(new URI(url))
+                    .method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
+            ).statusCode() === 200
+        } catch (Exception e) {
+            if (e.toString().contains('unable to find valid certification path to requested target'))
+                throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
+            throw e
+        }
+    }
+
+    static String getLatestForgeVersion(String mcVersion) {
+        final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
+        final ver = json.promos["$mcVersion-latest"]
+        ver === null ? null : (mcVersion + '-' + ver)
+    }
+
+    @CompileStatic
+    static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
+        file.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                ZipEntry zein
+                while ((zein = zin.nextEntry) !== null) {
+                    if (zein.name.endsWith('.class')) {
+                        var node = new ClassNode(ASM_LEVEL)
+                        new ClassReader(zin).accept(node, 0)
+                        process(node)
+                    }
+                }
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ValidateDeprecations.groovy

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.CompileStatic
+import net.minecraftforge.srgutils.MinecraftVersion
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import org.objectweb.asm.tree.AnnotationNode
+import org.objectweb.asm.tree.ClassNode
+
+abstract class ValidateDeprecations extends DefaultTask {
+    @InputFile
+    abstract RegularFileProperty getInput()
+
+    @Input
+    abstract Property<String> getMcVersion()
+
+    ValidateDeprecations() {
+        this.onlyIf { !System.env.TEAMCITY_VERSION }
+    }
+
+    @TaskAction
+    protected void exec() {
+        var mcVer = MinecraftVersion.from(mcVersion.get())
+        List<String> errors = []
+
+        Util.processClassNodes(input.get().asFile) {
+            processNode(mcVer, errors, it)
+        }
+
+        if (!errors.isEmpty()) {
+            errors.forEach {
+                this.logger.error("Deprecated ${it[0]} is marked for removal in ${it[1]} but is not yet removed")
+            }
+            throw new IllegalStateException("Found deprecated members marked for removal but not yet removed in ${mcVer}; see log for details")
+        }
+    }
+
+    protected processNode(MinecraftVersion mcVer, List<String> errors, ClassNode node) {
+        node.visibleAnnotations?.each { annotation ->
+            ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
+                "class ${node.name}"
+            }
+        }
+        node.fields?.each { field ->
+            field.visibleAnnotations?.each { annotation ->
+                ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
+                    "field ${node.name}#${field.name}"
+                }
+            }
+        }
+        node.methods?.each { method ->
+            method.visibleAnnotations?.each { annotation ->
+                ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
+                    "method ${node.name}#${method.name}${method.desc}"
+                }
+            }
+        }
+    }
+
+    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
+        def values = annotation.values
+        if (values === null)
+            return
+        int forRemoval = values.indexOf('forRemoval')
+        int since = values.indexOf('since')
+        if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
+            def oldVersion = MinecraftVersion.from(values[since + 1])
+            int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
+            if (split.length < 2)
+                return
+            def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
+            if (removeVersion <= mcVer)
+                errors.add([context(), removeVersion])
+        }
+    }
+
+    @CompileStatic
+    private static int[] splitDots(String version) {
+        String[] pts = version.split('\\.')
+        int[] values = new int[pts.length]
+        for (int x = 0; x < pts.length; x++)
+            values[x] = Integer.parseInt(pts[x])
+        return values
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckATs.groovy

@@ -0,0 +1,310 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import groovy.transform.TupleConstructor
+import net.minecraftforge.forge.tasks.InheritanceData
+import net.minecraftforge.srgutils.IMappingFile
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFile
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Optional
+import org.objectweb.asm.Opcodes
+
+@CompileStatic
+abstract class CheckATs extends CheckTask {
+
+    @InputFile abstract RegularFileProperty getInheritance()
+    @InputFiles abstract ConfigurableFileCollection getAts()
+    @InputFile @Optional abstract RegularFileProperty getMappings()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final IMappingFile mappings = mappings.map { RegularFile it -> IMappingFile.load(it.asFile) }.getOrNull()
+        final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
+
+        ats.each {
+            final lines = process(it, reporter, inheritance)
+            if (fix) {
+                it.text = joinBack(lines, inheritance, mappings).join('\n')
+            }
+        }
+    }
+
+    private static TreeMap<String, ATParser.Entry> process(File file, Reporter reporter, Map<String, InheritanceData> inheritance) {
+        final TreeMap<String, ATParser.Entry> lines = ATParser.parse(file.readLines(), reporter)
+        final Map<String, ATParser.Entry> constructorGroups = [:]
+
+        final itr = lines.entrySet().iterator()
+        final toRemove = []
+        while (itr.hasNext()) {
+            final next = itr.next()
+            String key = next.key
+            final entry = next.value
+            if (entry === null) continue
+
+            final binaryName = entry.cls.replaceAll('\\.', '/')
+
+            // Process Groups, this will remove any entries outside the group that is covered by the group
+            if (entry.group) {
+                final jcls = inheritance[binaryName]
+                if (jcls === null) {
+                    itr.remove()
+                    reporter.report("Invalid group: $key")
+                } else if ('*' == entry.desc) {
+                    if (!jcls.fields) {
+                        itr.remove()
+                        reporter.report("Invalid group, class has no fields: $key")
+                    } else {
+                        jcls.fields.each { field, value ->
+                            final fkey = entry.cls + ' ' + field
+                            if (accessLevel(value.access) < accessStr(entry.modifier)) {
+                                if (lines.containsKey(fkey)) {
+                                    toRemove.add(fkey)
+                                } else if (!entry.existing.contains(fkey)) {
+                                    reporter.report("Missing group entry: $fkey")
+                                }
+                                entry.children.add(fkey)
+                            } else if (lines.containsKey(fkey)) {
+                                toRemove.add(fkey)
+                                reporter.report("Found invalid group entry: $fkey")
+                            }
+                        }
+                        entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
+                    }
+                } else if ('*()' == entry.desc) {
+                    if (!jcls.methods) {
+                        itr.remove()
+                        reporter.report("Invalid group, class has no methods: $key")
+                    } else {
+                        jcls.methods.each { mtd, value ->
+                            if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$')) return
+                            key = entry.cls + ' ' + mtd.replace(' ', '')
+                            if (accessLevel(value.access) < accessStr(entry.modifier)) {
+                                if (lines.containsKey(key)) {
+                                    toRemove.add(key)
+                                } else if (!entry.existing.contains(key)) {
+                                    reporter.report("Missing group entry: $key")
+                                }
+                                entry.children.add(key)
+                            } else if (lines.containsKey(key)) {
+                                toRemove.add(key)
+                                reporter.report("Found invalid group entry: $key")
+                            }
+                        }
+                        entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
+                    }
+                } else if ('<init>' == entry.desc) { //Make all public non-abstract subclasses
+                    constructorGroups.put(binaryName, entry)
+                }
+            }
+
+            // Process normal lines, remove invalid and remove narrowing
+            else {
+                def jcls = inheritance.get(binaryName)
+                if (jcls === null) {
+                    itr.remove()
+                    reporter.report("Invalid: $key")
+                } else if (entry.desc == '') {
+                    if (accessLevel(jcls.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
+                        itr.remove()
+                        reporter.report("Invalid Narrowing: $key")
+                    }
+                } else if (!entry.desc.contains('(')) {
+                    if (!jcls.fields || !jcls.fields.containsKey(entry.desc)) {
+                        itr.remove()
+                        reporter.report("Invalid: $key")
+                    } else {
+                        final value = jcls.fields[entry.desc]
+                        if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
+                            itr.remove()
+                            reporter.report("Invalid Narrowing: $key - ${entry.comment}")
+                        }
+                    }
+                } else {
+                    final jdesc = entry.desc.replace('(', ' (')
+                    if (!jcls.methods || !jcls.methods.containsKey(jdesc)) {
+                        itr.remove()
+                        reporter.report("Invalid: $key")
+                    } else {
+                        final value = jcls.methods[jdesc]
+                        if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
+                            itr.remove()
+                            reporter.report("Invalid Narrowing: $key")
+                        }
+                    }
+                }
+            }
+        }
+
+        inheritance.each { tcls, value ->
+            if (!value.methods || ((value.access & Opcodes.ACC_ABSTRACT) !== 0)) return
+            String parent = tcls
+            while (parent !== null) {
+                constructorGroups[parent]?.tap { entry ->
+                    value.methods.each { mtd, v ->
+                        if (mtd.startsWith('<init>')) {
+                            final child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
+                            if (accessLevel(v.access) < 3) {
+                                if (lines.containsKey(child)) {
+                                    toRemove.add(child)
+                                } else if (child !in entry.existing) {
+                                    reporter.report("Missing group entry: $child")
+                                }
+                                entry.children.add(child)
+                            } else if (lines.containsKey(child)) {
+                                toRemove.add(child)
+                                reporter.report("Found invalid group entry: $child")
+                            }
+                        }
+                    }
+                }
+                parent = inheritance[parent]?.superName
+            }
+        }
+        constructorGroups.values().each { entry -> entry.existing.findAll { it !in entry.children }.each{  reporter.report("Found invalid group entry: $it") } }
+
+        toRemove.each(lines.&remove)
+
+        return lines
+    }
+
+    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance, IMappingFile mappings) {
+        final data = [] as List<String>
+        final remapComment = { ATParser.Entry entry ->
+            if (!mappings || !entry || !entry.desc) return null
+            final comment = entry.comment?.substring(1)?.trim()
+            final jsonCls = inheritance.get(entry.cls.replaceAll('\\.', '/'))
+            final mappingsClass = mappings?.getClass(jsonCls.name)
+            if (mappingsClass === null) return entry.comment
+            final idx = entry.desc.indexOf('(')
+
+            String mappedName = idx == -1
+                    ? mappingsClass.remapField(entry.desc)
+                    : mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
+            if (!mappedName) return entry.comment
+            if (mappedName == '<init>')
+                mappedName = 'constructor'
+
+            if (comment?.startsWith(mappedName))
+                return '# ' + comment
+            if (comment && comment.indexOf(' ') !== -1) {
+                def split = comment.split(' - ').toList()
+                if (split[0].indexOf(' ') !== -1)
+                // The first string is more than one word, so append before it
+                    return "# ${mappedName} - ${comment}"
+                split.remove(0)
+                return "# ${mappedName} - ${String.join(' - ', split)}"
+            }
+            return '# ' + mappedName
+        }
+        lines.each { key, value ->
+            if (!value.group) {
+                def comment = remapComment.call(value)
+                data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
+            } else {
+                data.add(('#group ' + value.modifier + ' ' + key + ' ' + (value.comment ?: '')).trim())
+                value.children.each {
+                    final line = value.modifier + ' ' + it
+                    final entry = ATParser.parseEntry(line)
+                    final comment = remapComment(entry)
+                    data.add(line + (comment ? ' ' + comment : ''))
+                }
+                data.add('#endgroup')
+            }
+        }
+        return data
+    }
+
+    static int accessStr(String access) {
+        if (access.endsWith('-f') || access.endsWith('+f')) return 4
+        switch (access.toLowerCase()) {
+            case 'public':    return 3
+            case 'protected': return 2
+            case 'default':   return 1
+            case 'private':   return 0
+            default:          return -1
+        }
+    }
+
+    static int accessLevel(int access) {
+        if ((access & Opcodes.ACC_PUBLIC)    !== 0) return 3
+        if ((access & Opcodes.ACC_PROTECTED) !== 0) return 2
+        if ((access & Opcodes.ACC_PRIVATE)   !== 0) return 0
+        return 1
+    }
+}
+
+@CompileStatic
+class ATParser {
+    static TreeMap<String, Entry> parse(List<String> lines, CheckTask.Reporter reporter) {
+        TreeMap<String, Entry> outLines = new TreeMap<>()
+        Entry group = null
+        for (final line : lines) {
+            if (line.isEmpty()) continue
+            if (line.startsWith('#group ')) {
+                final entry = parseEntry(line.substring(7))
+
+                if (entry.desc != '*' && entry.desc != '*()' && entry.desc != '<init>') {
+                    reporter.report("Invalid group: $line", false)
+                }
+
+                entry.group = true
+                entry.children = []
+                entry.existing = []
+
+                group = entry
+
+                if (outLines.containsKey(entry.key)) {
+                    reporter.report("Duplicate group: $line", false)
+                }
+
+                outLines[entry.key] = group
+            } else if (group !== null) {
+                if (line.startsWith('#endgroup')) {
+                    group = null
+                } else {
+                    final key = parseEntry(line).key
+                    group.existing.add(key)
+                }
+            } else if (line.startsWith('#endgroup')) {
+                reporter.report("Invalid group ending: $line", false)
+            } else if (line.startsWith('#')) {
+                //Nom
+            } else {
+                final entry = parseEntry(line)
+                if (outLines.containsKey(entry.key)) {
+                    reporter.report("Found duplicate: $line")
+                    continue
+                }
+                outLines[entry.key] = entry
+            }
+        }
+        return outLines
+    }
+
+    static Entry parseEntry(String line) {
+        final idx = line.indexOf('#')
+        final String comment = idx === -1 ? null : line.substring(idx)
+        if (idx !== -1) line = line.substring(0, idx - 1)
+        final data = (line.trim() + '     ').split(' ', -1)
+        new Entry(data[0], data[1], data[2], comment)
+    }
+
+    @TupleConstructor
+    static final class Entry {
+        String modifier, cls, desc, comment
+
+        Set<String> existing
+        TreeSet<String> children
+        boolean group = false
+
+        @Lazy
+        String key = {cls + (desc.isEmpty() ? '' : ' ' + desc)}()
+
+        Object getAt(String key) {
+            return getProperty(key)
+        }
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckExcs.groovy

@@ -0,0 +1,95 @@
+package net.minecraftforge.forge.tasks.checks
+
+import net.minecraftforge.forge.tasks.Util
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.ClassVisitor
+import org.objectweb.asm.MethodVisitor
+import org.objectweb.asm.Type
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
+abstract class CheckExcs extends CheckTask {
+
+    @InputFile abstract RegularFileProperty getBinary()
+    @InputFiles abstract ConfigurableFileCollection getExcs()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final Set<String> known = []
+        collectKnown(known)
+
+        excs.each { f ->
+            final lines = []
+            f.eachLine { line ->
+                int idx = line.indexOf('#')
+                if (idx === 0 || line.isEmpty()) {
+                    return
+                }
+
+                if (idx !== -1) line = line.substring(0, idx - 1)
+
+                if (!line.contains('=')) {
+                    reporter.report("Invalid: $line")
+                    return
+                }
+
+                def (String key, String value) = line.split('=', 2)
+                if (!known.contains(key)) {
+                    reporter.report("Unknown: $line")
+                    return
+                }
+
+                String desc = key.split('\\.', 2)[1]
+                if (!desc.contains('(')) {
+                    reporter.report("Invalid: $line")
+                    return
+                }
+                desc = '(' + desc.split('\\(', 2)[1]
+
+                def (exceptions, String args) = value.contains('|') ? value.split('|', 2) : [value, '']
+
+                if (args.split(',').length !== Type.getArgumentTypes(desc).length) {
+                    reporter.report("Invalid: $line")
+                    return
+                }
+                lines.add(line)
+
+                return
+            }
+
+            if (fix) f.text = lines.sort().join('\n')
+        }
+    }
+
+    private void collectKnown(Collection<String> known) {
+        binary.get().asFile.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                final visitor = new ClassVisitor(Util.ASM_LEVEL) {
+                    private String cls
+                    @Override
+                    void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+                        this.cls = name
+                    }
+
+                    @Override
+                    MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+                        known.add(this.cls + '.' + name + descriptor)
+                        super.visitMethod(access, name, descriptor, signature, exceptions)
+                    }
+                }
+                ZipEntry zein
+                while ((zein = zin.nextEntry) !== null) {
+                    if (zein.name.endsWith('.class')) {
+                        ClassReader reader = new ClassReader(zin)
+                        reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
+                    }
+                }
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckMode.groovy

@@ -0,0 +1,11 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+enum CheckMode {
+    CHECK,
+    FIX
+
+    CheckMode() {}
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckPatches.groovy

@@ -0,0 +1,182 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Optional
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.regex.Pattern
+
+@CompileStatic
+abstract class CheckPatches extends CheckTask {
+
+    private static final Pattern HUNK_START_PATTERN = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
+    private static final Pattern WHITESPACE_PATTERN = Pattern.compile('^[+\\-]\\s*$')
+    private static final Pattern IMPORT_PATTERN = Pattern.compile('^[+\\-]\\s*import.*')
+    private static final Pattern FIELD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
+    private static final Pattern METHOD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
+    private static final Pattern CLASS_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
+    private static final Map<String, Integer> ACCESS_MAP = [private: 0, protected: 2, public: 3].tap { it.put(null, 1) }
+
+    @InputDirectory abstract DirectoryProperty getPatchDir()
+    @Input @Optional abstract ListProperty<String> getPatchesWithS2SArtifact()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final patchDir = getPatchDir().get().asFile.toPath()
+        Files.walk(patchDir).withCloseable {
+            it.filter(Files.&isRegularFile).forEach { path ->
+                final String relativeName = patchDir.relativize(path).toString()
+                verifyPatch(path, reporter, fix, relativeName, patchesWithS2SArtifact.get().contains(relativeName.replace('\\', '/')))
+            }
+        }
+    }
+    
+    static boolean accessChange(String previous, String current) {
+        //return ACCESS_MAP[previous] < ACCESS_MAP[current]
+        return previous != current
+    }
+
+    void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
+        int oldFixedErrors = reporter.fixed.size()
+
+        final lines = Files.readAllLines(patch)
+
+        int hunksStart = 0
+        boolean onlyWhiteSpace = false
+
+        final List<String> newLines = []
+
+        // First two lines are file name ++/-- and we do not care
+        newLines.add(lines[0] + '\n')
+        newLines.add(lines[1] + '\n')
+
+        int i
+        for (i = 2; i < lines.size(); ++i) {
+            def line = lines[i]
+            newLines.add(line + '\n')
+
+            if (HUNK_START_PATTERN.matcher(line).find()) {
+                if (onlyWhiteSpace) {
+                    if (!hasS2SArtifact)
+                        reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
+                    int toRemove = i - hunksStart
+                    while (toRemove-- > 0)
+                        newLines.remove(newLines.size() - 1)
+                }
+                hunksStart = i
+                onlyWhiteSpace = true
+                continue
+            }
+
+            if (line.startsWithAny('+','-')) {
+                def prefixChange = false
+                def prevLine = lines[i - 1]
+
+                if (line.charAt(0) == (char)'+' && prevLine.charAt(0) == (char)'-') {
+                    def prevTrim = prevLine.substring(1).replaceAll("\\s", "")
+                    def currTrim = line.substring(1).replaceAll("\\s", "")
+
+                    if (prevTrim == currTrim) {
+                        prefixChange = true
+                    }
+
+                    def pMatcher = FIELD_PATTERN.matcher(prevLine)
+                    def cMatcher = FIELD_PATTERN.matcher(line)
+
+                    if (pMatcher.find() && cMatcher.find() &&
+                            pMatcher.group(6) == cMatcher.group(6) && // = ...
+                            pMatcher.group(5) == cMatcher.group(5) && // field name
+                            pMatcher.group(3) == cMatcher.group(3) && // static
+                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
+                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
+                    }
+
+                    pMatcher = METHOD_PATTERN.matcher(prevLine)
+                    cMatcher = METHOD_PATTERN.matcher(line)
+
+                    if (pMatcher.find() && cMatcher.find() &&
+                            pMatcher.group(6) == cMatcher.group(6) && // params
+                            pMatcher.group(5) == cMatcher.group(5) && // <T> void name
+                            pMatcher.group(3) == cMatcher.group(3) && // static
+                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
+                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
+                    }
+
+                    pMatcher = CLASS_PATTERN.matcher(prevLine)
+                    cMatcher = CLASS_PATTERN.matcher(line)
+
+                    if (pMatcher.find() && cMatcher.find() &&
+                            pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
+                            pMatcher.group(5) == cMatcher.group(5) && // class | interface
+                            pMatcher.group(3) == cMatcher.group(3) && // static
+                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
+                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
+                    }
+                }
+
+                if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
+                    final nextLine = lines[i + 1]
+                    if (nextLine.charAt(0) == (char)'+') {
+                        final nextTrim = nextLine.substring(1).replaceAll("\\s", "")
+                        final currTrim = line.substring(1).replaceAll("\\s", "")
+
+                        if (nextTrim == currTrim) {
+                            prefixChange = true
+                        }
+                    }
+                }
+
+                final isWhiteSpaceChange = WHITESPACE_PATTERN.matcher(line).find()
+
+                if (!prefixChange && !isWhiteSpaceChange) {
+                    onlyWhiteSpace = hasS2SArtifact && IMPORT_PATTERN.matcher(line).find()
+                } else if (isWhiteSpaceChange) {
+                    final prevLineChange = prevLine.startsWithAny('+','-')
+                    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)
+                    }
+                }
+
+                if (line.contains('\t')) {
+                    reporter.report("Patch contains tabs on line ${i + 1}, file: $patchPath")
+                    line = line.replaceAll('\t', '    ')
+                    newLines.remove(newLines.size() - 1)
+                    newLines.add(line + '\n')
+                }
+
+                if (IMPORT_PATTERN.matcher(line).find() && !hasS2SArtifact) {
+                    reporter.report("Patch contains import change on line ${i + 1}, file: $patchPath", false)
+                }
+            }
+        }
+
+        if (onlyWhiteSpace) {
+            if (!hasS2SArtifact)
+                reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
+            def toRemove = i - hunksStart;
+            while (toRemove-- > 0)
+                newLines.remove(newLines.size() - 1)
+        }
+
+        if ((reporter.fixed.size() > oldFixedErrors && fix) || hasS2SArtifact) {
+            if (newLines.size() <= 2) {
+                logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
+                Files.delete(patch)
+            }
+            else {
+                if (!hasS2SArtifact)
+                    logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
+                Files.newBufferedWriter(patch).withCloseable {
+                    newLines.each { l -> it.write(l) }
+                }
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckSAS.groovy

@@ -0,0 +1,110 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import net.minecraftforge.forge.tasks.Annotatable
+import net.minecraftforge.forge.tasks.InheritanceData
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+
+@CompileStatic
+abstract class CheckSAS extends CheckTask {
+
+    @InputFile abstract RegularFileProperty getInheritance()
+    @InputFiles abstract ConfigurableFileCollection getSass()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
+
+        sass.each { f ->
+            final lines = []
+            f.eachLine { line ->
+                if (line[0] == '\t') return // Skip any tabbed lines, those are ones we add
+                final idx = line.indexOf('#')
+                if (idx == 0 || line.isEmpty()) {
+                    lines.add(line)
+                    return
+                }
+                def comment = idx == -1 ? null : line.substring(idx)
+                if (idx != -1) line = line.substring(0, idx - 1)
+                final spl = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
+                def (String cls, String name, String desc) = [spl[0], spl[1], spl[2]]
+                cls = cls.replaceAll('\\.', '/')
+
+                if (inheritance[cls] === null) {
+                    reporter.report("Invalid: $line")
+                } else if (name.isEmpty()) { //Class SAS
+                    final toAdd = []
+                    final clsSided = isSided(inheritance[cls])
+                    boolean sided = clsSided
+
+                    /* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null) {
+                        for (entry in json[cls]['fields']) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key)
+                            }
+						}
+                    } */
+
+                    final clsInh = inheritance[cls]
+                    if (clsInh.methods) {
+                        for (entry in clsInh.methods) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
+                                findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
+                                findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
+                            } else if (clsSided) {
+                                findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
+                                findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
+                            }
+                        }
+                    }
+
+                    if (sided) {
+                        lines.add(cls + (comment == null ? '' : ' ' + comment))
+                        lines.addAll(toAdd.sort())
+                    } else {
+                        reporter.report("Invalid: $line")
+                    }
+
+                } else if (desc.isEmpty()) { // Fields
+                    /* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
+                        lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
+                    else */
+                    reporter.report("Invalid: $line")
+                } else { // Methods
+                    final clsInh = inheritance[cls]
+                    if (clsInh.methods === null || !isSided(clsInh.methods[name + ' ' + desc]))
+                        reporter.report("Invalid: $line")
+                    else {
+                        lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
+                        findChildMethods(inheritance, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
+                        findChildMethods(inheritance, cls, name + ' ' + desc).each { lines.add('\t' + it) }
+                    }
+                }
+            }
+
+            if (fix) f.text = lines.join('\n')
+        }
+    }
+
+    protected static boolean isSided(Annotatable annotatable) {
+        if (annotatable === null) return false
+        for (ann in annotatable.annotations) {
+            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
+                return true
+        }
+        return false
+    }
+    
+    protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
+        return json.values().findAll{ it.methods !== null && it.methods[desc] !== null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
+                .collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
+    }
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckTask.groovy

@@ -0,0 +1,114 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.ThirdParam
+import net.minecraftforge.forge.tasks.Util
+import org.gradle.api.Action
+import org.gradle.api.DefaultTask
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskContainer
+import org.gradle.api.tasks.VerificationTask
+
+@CompileStatic
+abstract class CheckTask extends DefaultTask implements VerificationTask {
+    @Input
+    abstract Property<CheckMode> getMode()
+
+    private boolean ignoreFailures = false
+
+    @Input
+    @Override
+    boolean getIgnoreFailures() {
+        return ignoreFailures
+    }
+
+    @Override
+    void setIgnoreFailures(boolean ignoreFailures) {
+        this.ignoreFailures = ignoreFailures
+    }
+
+    @TaskAction
+    void run() {
+        Util.init()
+
+        boolean doFix = getMode().get() === CheckMode.FIX
+        final Reporter reporter = new Reporter(doFix)
+        check(reporter, doFix)
+
+        if (reporter.messages) {
+            if (getMode().get() === CheckMode.CHECK) {
+                logger.error("Check task '{}' found errors:\n{}", name, reporter.messages.join('\n'))
+                if (!ignoreFailures) {
+                    throw new IllegalArgumentException("${reporter.messages.size()} errors were found!")
+                }
+            } else {
+                if (logger.isEnabled(LogLevel.DEBUG)) {
+                    logger.warn("Check task '{}' found {} errors and fixed {}:\n{}", name, reporter.messages.size(), reporter.fixed.size(), reporter.fixed.join('\n'))
+                } else {
+                    logger.warn("Check task '{}' found {} errors and fixed {}.", name, reporter.messages.size(), reporter.fixed.size())
+                }
+
+                if (reporter.notFixed) {
+                    logger.error('{} errors could not be fixed:\n{}', reporter.notFixed.size(), reporter.notFixed.join('\n'))
+                    if (!ignoreFailures) {
+                        throw new IllegalArgumentException("${reporter.notFixed.size()} errors which cannot be fixed were found!")
+                    }
+                }
+            }
+        }
+    }
+
+    abstract void check(Reporter reporter, boolean fix)
+
+    @CompileStatic
+    static final class Reporter {
+        final boolean trackFixed
+        Reporter(boolean trackFixed) {
+            this.trackFixed = trackFixed
+        }
+
+        public final List<String> messages = []
+
+        public final List<String> fixed = []
+        public final List<String> notFixed = []
+
+        void report(String message, boolean canBeFixed = true) {
+            messages.add(message)
+
+            if (trackFixed) {
+                if (canBeFixed) {
+                    fixed.add(message)
+                } else {
+                    notFixed.add(message)
+                }
+            }
+        }
+    }
+
+    static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
+                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type')
+                                                   @ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
+        taskName = taskName.capitalize()
+        tasks.register("check$taskName", clazz) { CheckTask task ->
+            def castedTask = task as T
+            configuration.setDelegate(castedTask)
+            configuration.call(castedTask)
+            castedTask.mode.set(CheckMode.CHECK)
+            castedTask.group = 'checks'
+        }
+        tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
+
+        tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
+            def castedTask = task as T
+            configuration.setDelegate(castedTask)
+            configuration.call(castedTask)
+            castedTask.mode.set(CheckMode.FIX)
+            castedTask.group = 'checks'
+        }
+        tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
+    }
+}

build_clean.gradle

@@ -0,0 +1,73 @@
+plugins {
+    id 'java-library'
+    id 'net.minecraftforge.gradle.patcher'
+}
+
+evaluationDependsOn(':mcp')
+
+repositories {
+    mavenCentral()
+    maven gradleutils.forgeMaven
+    maven gradleutils.minecraftLibsMaven
+}
+    
+java.toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
+
+dependencies {
+	implementation(libs.forgespi)
+}
+
+patcher {
+	parent = project(':mcp')
+	mcVersion = MC_VERSION
+	patchedSrc = file('src/main/java')
+
+	mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
+
+	runs {
+		clean_client {
+			client true
+			taskName 'clean_client'
+			ideaModule "${rootProject.name}.${project.name}.main"
+
+			main 'net.minecraft.client.main.Main'
+			workingDirectory project.file('run/client')
+
+			args '--gameDir', '.'
+			args '--version', MC_VERSION
+			args '--assetsDir', downloadAssets.output
+			args '--assetIndex', '{asset_index}'
+			args '--accessToken', '0'
+		}
+
+		clean_server {
+			client false
+			taskName 'clean_server'
+			ideaModule "${rootProject.name}.${project.name}.main"
+
+			main 'net.minecraft.server.Main'
+			workingDirectory project.file('run/server')
+		}
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+    options.warnings = false // Shutup deprecated for removal warnings
+}
+
+eclipse.classpath.file.whenMerged {
+	// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
+	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'
+}

build_shared.gradle

@@ -0,0 +1,85 @@
+import net.minecraftforge.forge.tasks.CleanProperties
+
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'net.minecraftforge.gradleutils'
+
+group = 'net.minecraftforge'
+version = VERSION
+println("Version: $version")
+
+repositories {
+    mavenCentral()
+    maven gradleutils.forgeMaven
+    maven gradleutils.minecraftLibsMaven
+    //mavenLocal()
+}
+
+tasks.withType(Javadoc).configureEach {
+    options.tags = [
+        'apiNote:a:<em>API Note:</em>',
+        'implSpec:a:<em>Implementation Requirements:</em>',
+        'implNote:a:<em>Implementation Note:</em>'
+    ]
+    options.addStringOption('Xdoclint:all,-missing', '-public')
+}
+
+// We need to write the manifest to the binary file so we have properly versioned packaged at dev time.
+tasks.register('writeManifest') {
+    doLast {
+        if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project
+            universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF'))
+        else
+            jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF'))
+    }
+}
+
+tasks.register('generateResources') {
+    dependsOn('writeManifest')
+}
+
+// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
+tasks.withType(JavaCompile).configureEach {
+    dependsOn 'generateResources'
+    dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
+    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
+// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now..
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("classes/java/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
+tasks.register('copyEclipseSettings') {
+    doLast {
+        rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file ->
+            def target = project.file('.settings/' + file.name)
+            def temp = new CleanProperties().load(file)
+            def exst = new CleanProperties().load(target)
+            exst.put('eclipse.preferences.version', '1')
+            exst.putAll(temp)
+            exst.store(target)
+        }
+    }
+}
+
+// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import.
+eclipse {
+    // Run everytime eclipse builds the code
+    //autoBuildTasks writeManifest
+    // Run when importing the project
+    synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
+}
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}

docs/README.md

@@ -2,8 +2,8 @@
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=26.2-&query=$.promos["26.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=26.2-&query=$.promos["26.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.21.3-&query=$.promos["1.21.3-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.21.3-&query=$.promos["1.21.3-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!
@@ -34,13 +34,12 @@ For support and questions, visit [the Support Forum][Support-Forum] or [the Forg
 
 We require the version of Java that Minecraft requires, which is currently:
 
-| Minecraft        | Java              |
-|------------------|-------------------|
-| 26.1+            | [25][Adoptium-25] |
-| 1.20.6 - 1.21.11 | [21][Adoptium-21] |
-| 1.18 - 1.20.4    | [17][Adoptium-17] |
-| 1.17.1           | [16][Adoptium-16] |
-| 1.16.5-          | [8][Adoptium-8]   |
+| 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].**
 
@@ -71,17 +70,11 @@ Please ensure you have a valid email address associated with your GitHub account
  to use and modify. However, it costs money to run such a large project as this, so please consider 
  [becoming a patron][Patreon].*
 
-### Thanks
-[![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)
-
-YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
-
 [Contributing]: ./CONTRIBUTING.md
 [CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
 
 [Download]: https://files.minecraftforge.net/
 
-[Adoptium-25]: https://adoptium.net/temurin/releases/?version=25
 [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
@@ -100,4 +93,3 @@ YourKit for providing us accesss to their [YourKit Java Profiler] which helps id
 [Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
 
 [Patreon]: https://www.patreon.com/LexManos
-[YourKit Java Profiler]: https://www.yourkit.com/java/profiler/

dump.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-for file in $(find repo | grep --invert-match -e md5 -e sha | grep -e .jar -e .zip); do
-    file_path=$(realpath $file)
-    file_name=$(basename $file)
-    
-    echo "$file_name"
-    files=$(unzip -l $file | awk '{print $4}')
-    for f in $files; do
-        out="_actual/$file_name/$f"
-        parent=$(dirname "$out")
-        echo $out
-        
-        if [ ! -d "$parent" ]; then
-            mkdir -p "$parent"
-        fi
-            
-        if [[ $f == *.class ]]; then
-            javap -v -p jar:file://$file_path!/$f | tail -n +4 >$out.txt
-        elif [[ $f != */ && $f != "Name" && $f != "----" ]]; then
-            unzip -o -q $file $f -d _actual/$file_name
-        fi
-    done
-done

fmlcore/build.gradle

@@ -1,78 +1,67 @@
+import net.minecraftforge.gradleutils.PomUtils
+
 plugins {
     id 'java-library'
     id 'maven-publish'
-    alias libs.plugins.licenser
-    alias libs.plugins.gradleutils
-    alias libs.plugins.gitversion
-    alias libs.plugins.changelog
-    id 'net.minecraftforge.forge.build.convention'
+    id 'net.minecraftforge.licenser'
+    id 'net.minecraftforge.gradleutils'
 }
 
-gradleutils.displayName = 'FML'
-final vendor = 'Forge Development LLC'
-description = 'Modifications to Minecraft to enable mod developers.'
+apply from: rootProject.file('build_shared.gradle')
 
 dependencies {
-    compileOnly libs.jetbrains.annotations
+    compileOnly(libs.nulls)
 
-    api libs.eventbus
+    api(libs.eventbus)
 
-    implementation projects.fmlloader
-    implementation libs.commons.io
+    implementation(project(':fmlloader'))
+    implementation(libs.commons.io)
 }
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
+    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
     withSourcesJar()
 }
 
-license {
-    header = rootProject.file('LICENSE-header.txt')
-}
-changelog {
-    from changelogBase
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+            'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
+            'FMLModType': 'LIBRARY'
+        ] as LinkedHashMap)
+        attributes([
+            'Specification-Title':      'FML',
+            'Specification-Vendor':     'Forge Development LLC',
+            'Specification-Version':    '1',
+            'Implementation-Title':     'FML',
+            'Implementation-Version':   '1.0',
+            'Implementation-Vendor':    'Forge Development LLC'
+        ] as LinkedHashMap, 'net/minecraftforge/fml/')
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:-unchecked'
 }
 
-tasks.named('jar', Jar) {
-    manifest {
-        attributes([
-                'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
-                'FMLModType'           : 'LIBRARY'
-        ])
-        attributes([
-                'Specification-Title'   : gradleutils.displayName.get(),
-                'Specification-Vendor'  : vendor,
-                'Specification-Version' : '1',
-                'Implementation-Title'  : gradleutils.displayName.get(),
-                'Implementation-Version': '1.0',
-                'Implementation-Vendor' : vendor
-        ], 'net/minecraftforge/fml/')
-    }
+license {
+    header = rootProject.file('LICENSE-header.txt')
 }
 
 publishing {
+    publications.register('mavenJava', MavenPublication).configure {
+        from components.java
+        artifactId = 'fmlcore'
+        pom {
+            name = project.name
+            description = 'Modifactions to Minecraft to enable mod developers.'
+            url = 'https://github.com/MinecraftForge/MinecraftForge'
+            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
+            license PomUtils.Licenses.LGPLv2_1
+        }
+    }
+    
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-
-    publications.register('mavenJava', MavenPublication) {
-        changelog.publish(it)
-        gradleutils.promote(it)
-
-        from components.java
-
-        pom {
-            description = project.description
-
-            gradleutils.pom.addRemoteDetails(pom)
-
-            licenses {
-                license gradleutils.pom.licenses.LGPLv2_1
-            }
-        }
-    }
 }

fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java

@@ -5,7 +5,7 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
 
@@ -29,7 +29,7 @@ public class Bindings {
     /**
      * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
      */
-    public static Supplier<BusGroup> getForgeBus() {
+    public static Supplier<IEventBus> getForgeBus() {
         return PROVIDER.getForgeBusSupplier();
     }
 

fmlcore/src/main/java/net/minecraftforge/fml/CrashReportCallables.java

@@ -14,14 +14,16 @@ import java.util.List;
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 
-public class CrashReportCallables {
+public class CrashReportCallables
+{
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final List<ISystemReportExtender> crashCallables = Collections.synchronizedList(new ArrayList<>());
 
     /**
      * Register a custom {@link ISystemReportExtender}
      */
-    public static void registerCrashCallable(ISystemReportExtender callable) {
+    public static void registerCrashCallable(ISystemReportExtender callable)
+    {
         crashCallables.add(callable);
     }
 
@@ -31,15 +33,19 @@ public class CrashReportCallables {
      * @param headerName The name of the system report entry
      * @param reportGenerator The report generator to be called when a crash report is built
      */
-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator) {
-        registerCrashCallable(new ISystemReportExtender() {
+    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator)
+    {
+        registerCrashCallable(new ISystemReportExtender()
+        {
             @Override
-            public String getLabel() {
+            public String getLabel()
+            {
                 return headerName;
             }
 
             @Override
-            public String get() {
+            public String get()
+            {
                 return reportGenerator.get();
             }
         });
@@ -52,23 +58,31 @@ public class CrashReportCallables {
      * @param reportGenerator The report generator to be called when a crash report is built
      * @param active The supplier of the flag to be checked when a crash report is built
      */
-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator, BooleanSupplier active) {
-        registerCrashCallable(new ISystemReportExtender() {
+    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator, BooleanSupplier active)
+    {
+        registerCrashCallable(new ISystemReportExtender()
+        {
             @Override
-            public String getLabel() {
+            public String getLabel()
+            {
                 return headerName;
             }
 
             @Override
-            public String get() {
+            public String get()
+            {
                 return reportGenerator.get();
             }
 
             @Override
-            public boolean isActive() {
-                try {
+            public boolean isActive()
+            {
+                try
+                {
                     return active.getAsBoolean();
-                } catch (Throwable t) {
+                }
+                catch (Throwable t)
+                {
                     LOGGER.warn("CrashCallable '{}' threw an exception while checking the active flag, disabling", headerName, t);
                     return false;
                 }
@@ -76,7 +90,8 @@ public class CrashReportCallables {
         });
     }
 
-    public static List<ISystemReportExtender> allCrashCallables() {
+    public static List<ISystemReportExtender> allCrashCallables()
+    {
         return List.copyOf(crashCallables);
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/DistExecutor.java

@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml;
+
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.Serializable;
+import java.lang.invoke.SerializedLambda;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.function.Supplier;
+
+/**
+ * Use to execute code conditionally based on sidedness.
+ * <ul>
+ * <li>When you want to call something on one side and return a result {@link #safeCallWhenOn(Dist, Supplier)}</li>
+ * <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
+ * <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
+ * </ul>
+ */
+public final class DistExecutor
+{
+    private static final Logger LOGGER = LogManager.getLogger();
+    private DistExecutor() {}
+
+    /**
+     * Run the callable in the supplier only on the specified {@link Dist}.
+     * This method is NOT sided-safe and special care needs to be taken in code using this method that implicit class
+     * loading is not triggered by the Callable.
+     *
+     * This method can cause unexpected ClassNotFound exceptions.
+     *
+     * Use {@link #safeCallWhenOn(Dist, Supplier)} where possible.
+     *
+     * @param dist The dist to run on
+     * @param toRun A supplier of the callable to run (Supplier wrapper to ensure classloading only on the appropriate dist)
+     * @param <T> The return type from the callable
+     * @return The callable's result
+     * @deprecated use {@link #safeCallWhenOn(Dist, Supplier)} instead. This remains for advanced use cases.
+     */
+    @Deprecated
+    public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
+        return unsafeCallWhenOn(dist, toRun);
+    }
+
+    public static <T> T unsafeCallWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
+        if (dist == FMLEnvironment.dist) {
+            try
+            {
+                return toRun.get().call();
+            }
+            catch (Exception e)
+            {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Call the SafeCallable when on the correct {@link Dist}.
+     *
+     * <strong>The lambda supplied here is required to be a method reference to a method defined in
+     * another class, otherwise an invalid SafeReferent error will be thrown</strong>
+     * @param dist the dist which this will run on
+     * @param toRun the SafeCallable to run and return the result from
+     * @param <T> The type of the SafeCallable
+     * @return the result of the SafeCallable or null if on the wrong side
+     */
+    public static <T> T safeCallWhenOn(Dist dist, Supplier<SafeCallable<T>> toRun) {
+        validateSafeReferent(toRun);
+        return callWhenOn(dist, toRun::get);
+    }
+
+    /**
+     * Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #callWhenOn(Dist, Supplier)}.
+     *
+     * This method can cause unexpected ClassNotFound exceptions.
+     *
+     * @see #callWhenOn(Dist, Supplier)
+     * @param dist Dist to run this code on
+     * @param toRun The code to run
+     * @deprecated use {@link #safeRunWhenOn(Dist, Supplier)} where possible. Advanced uses only.
+     */
+    @Deprecated
+    public static void runWhenOn(Dist dist, Supplier<Runnable> toRun) {
+        unsafeRunWhenOn(dist, toRun);
+    }
+    /**
+     * Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #unsafeCallWhenOn(Dist, Supplier)}.
+     *
+     * This method can cause unexpected ClassNotFoundException problems in common scenarios. Understand the pitfalls of
+     * the way the class verifier works to load classes before using this.
+     *
+     * Use {@link #safeRunWhenOn(Dist, Supplier)} if you can.
+     *
+     * @see #unsafeCallWhenOn(Dist, Supplier)
+     * @param dist Dist to run this code on
+     * @param toRun The code to run
+     */
+    public static void unsafeRunWhenOn(Dist dist, Supplier<Runnable> toRun) {
+        if (dist == FMLEnvironment.dist) {
+            toRun.get().run();
+        }
+    }
+
+    /**
+     * Call the supplied SafeRunnable when on the correct Dist.
+     * @param dist The dist to run on
+     * @param toRun The code to run
+     */
+    public static void safeRunWhenOn(Dist dist, Supplier<SafeRunnable> toRun) {
+        validateSafeReferent(toRun);
+        if (dist == FMLEnvironment.dist)  {
+            toRun.get().run();
+        }
+    }
+    /**
+     * Executes one of the two suppliers, based on which side is active.
+     *
+     * <p>
+     *     Example (replacement for old SidedProxy):<br/>
+     * {@code Proxy p = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new);}
+     *
+     * NOTE: the double supplier is required to avoid classloading the secondary target.
+     *
+     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
+     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
+     * @param <T> The common type to return
+     * @return The returned instance
+     * @deprecated Use {@link #safeRunForDist(Supplier, Supplier)}
+     */
+    @Deprecated
+    public static <T> T runForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
+        return unsafeRunForDist(clientTarget, serverTarget);
+    }
+
+    /**
+     * Unsafe version of {@link #safeRunForDist(Supplier, Supplier)}. Use only when you know what you're doing
+     * and understand why the verifier can cause unexpected ClassNotFoundException crashes even when code is apparently
+     * not sided. Ensure you test both sides fully to be confident in using this.
+     *
+     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
+     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
+     * @param <T> The common type to return
+     * @return The returned instance
+     */
+    public static <T> T unsafeRunForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
+        switch (FMLEnvironment.dist)
+        {
+            case CLIENT:
+                return clientTarget.get().get();
+            case DEDICATED_SERVER:
+                return serverTarget.get().get();
+            default:
+                throw new IllegalArgumentException("UNSIDED?");
+        }
+    }
+    /**
+     * Executes one of the two suppliers, based on which side is active.
+     *
+     * <p>
+     *     Example (replacement for old SidedProxy):<br/>
+     * {@code Proxy p = DistExecutor.safeRunForDist(()->ClientProxy::new, ()->ServerProxy::new);}
+     *
+     * NOTE: the double supplier is required to avoid classloading the secondary target.
+     *
+     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
+     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
+     * @param <T> The common type to return
+     * @return The returned instance
+     */
+    public static <T> T safeRunForDist(Supplier<SafeSupplier<T>> clientTarget, Supplier<SafeSupplier<T>> serverTarget) {
+        validateSafeReferent(clientTarget);
+        validateSafeReferent(serverTarget);
+        switch (FMLEnvironment.dist)
+        {
+            case CLIENT:
+                return clientTarget.get().get();
+            case DEDICATED_SERVER:
+                return serverTarget.get().get();
+            default:
+                throw new IllegalArgumentException("UNSIDED?");
+        }
+    }
+
+    /**
+     * A safe referent. This will assert that it is being called via a separated class method reference. This will
+     * avoid the common pitfalls of {@link #callWhenOn(Dist, Supplier)} above.
+     *
+     * SafeReferents assert that they are defined as a separate method outside the scope of the calling class.
+     *
+     * <strong>Implementations need to be defined in a separate class to the referring site, with appropriate
+     * visibility to be accessible at the callsite (generally, avoid private methods).</strong>
+     *
+     * <p>
+     * Valid:<br/>
+     *
+     * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->AnotherClass::clientOnlyMethod);}
+     *
+     * <p>
+     * Invalid:<br/>
+     *
+     * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->()->Minecraft.getInstance().world);}
+     */
+    public interface SafeReferent {}
+
+    /**
+     * SafeCallable version of {@link SafeReferent}.
+     * @see SafeReferent
+     * @param <T> The return type of the Callable
+     */
+    public interface SafeCallable<T> extends SafeReferent, Callable<T>, Serializable {}
+
+    /**
+     * SafeSupplier version of {@link SafeReferent}
+     * @param <T> The return type of the Supplier
+     */
+    public interface SafeSupplier<T> extends SafeReferent, Supplier<T>, Serializable {}
+
+    /**
+     * SafeRunnable version of {@link SafeReferent}
+     */
+    public interface SafeRunnable extends SafeReferent, Runnable, Serializable {}
+
+    private static final void validateSafeReferent(Supplier<? extends SafeReferent> safeReferentSupplier) {
+        if (FMLEnvironment.production) return;
+        final SafeReferent setter;
+        try {
+            setter = safeReferentSupplier.get();
+        } catch (Exception e) {
+            // Typically a class cast exception, just return out, expected.
+            return;
+        }
+
+        for (Class<?> cl = setter.getClass(); cl != null; cl = cl.getSuperclass()) {
+            try {
+                Method m = cl.getDeclaredMethod("writeReplace");
+                m.setAccessible(true);
+                Object replacement = m.invoke(setter);
+                if (!(replacement instanceof SerializedLambda))
+                    break;// custom interface implementation
+                SerializedLambda l = (SerializedLambda) replacement;
+                if (Objects.equals(l.getCapturingClass(), l.getImplClass())) {
+                    LOGGER.fatal("Detected unsafe referent usage, please view the code at {}",Thread.currentThread().getStackTrace()[3]);
+                    throw new RuntimeException("Unsafe Referent usage found in safe referent method");
+                }
+            } catch (NoSuchMethodException e) {
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                break;
+            }
+        }
+    }
+}

fmlcore/src/main/java/net/minecraftforge/fml/IBindingsProvider.java

@@ -5,13 +5,13 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 
 import java.util.function.Supplier;
 
 public interface IBindingsProvider {
-    Supplier<BusGroup> getForgeBusSupplier();
+    Supplier<IEventBus> getForgeBusSupplier();
     Supplier<I18NParser> getMessageParser();
     Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
 }

fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java

@@ -5,15 +5,16 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.IntSupplier;
-import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
 
 /**
  * A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
@@ -21,7 +22,6 @@ import java.util.function.Supplier;
  *
  * @see IModStateProvider
  */
-@NullMarked
 public interface IModLoadingState {
     /**
      * {@return the name of this state}
@@ -44,39 +44,38 @@ public interface IModLoadingState {
     /**
      * {@return a function returning a human-friendly message for this state}
      */
-    Supplier<String> message();
+    Function<ModList, String> message();
 
     /**
      * @return a function that computes the size of this transition based on the size of the modlist.
      * Used to compute progress.
      */
-    default IntSupplier size() {
-        return ModList::size;
-    }
+    ToIntFunction<ModList> size();
 
     /**
      * {@return an optional runnable, which runs before starting the transition from this state to the next}
      * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
      */
-    @Nullable Runnable inlineRunnable();
+    Optional<Consumer<ModList>> inlineRunnable();
 
     /**
      * Builds the transition task for this state with a blank pre-sync and post-sync task.
      *
+     * @param <T>              a type of event fired on the mod-specific event bus
      * @param syncExecutor     a synchronous executor
      * @param parallelExecutor a parallel executor
      * @param progressBar      a progress meter for tracking progress
      * @return a transition task for this state
      * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
      */
-    default @Nullable CompletableFuture<Void> buildTransition(
+    default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
         final Executor syncExecutor,
         final Executor parallelExecutor,
         final ProgressMeter progressBar
     ) {
         return buildTransition(syncExecutor, parallelExecutor, progressBar,
-            _ -> CompletableFuture.completedFuture(null),
-            _ -> CompletableFuture.completedFuture(null)
+            e -> CompletableFuture.completedFuture(null),
+            e -> CompletableFuture.completedFuture(null)
         );
     }
 
@@ -84,6 +83,7 @@ public interface IModLoadingState {
      * Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
      * to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
      *
+     * @param <T>              a type of event fired on the mod-specific event bus
      * @param syncExecutor     a synchronous executor
      * @param parallelExecutor a parallel executor
      * @param progressBar      a progress meter for tracking progress
@@ -91,7 +91,8 @@ public interface IModLoadingState {
      * @param postSyncTask     a function which returns a task to run after event post-dispatch hook
      * @return a transition task for this state
      */
-    @Nullable CompletableFuture<Void> buildTransition(final Executor syncExecutor,
+    <T extends Event & IModBusEvent>
+    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
                                                       final Executor parallelExecutor,
                                                       final ProgressMeter progressBar,
                                                       final Function<Executor, CompletableFuture<Void>> preSyncTask,

fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java

@@ -5,17 +5,23 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
 
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import org.jetbrains.annotations.Nullable;
 
 public interface IModStateTransition {
+    /** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
+    public static final BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
+
     static IModStateTransition buildNoopTransition() {
         return ModStateTransitionHelper.NOOP;
     }
@@ -35,17 +41,42 @@ public interface IModStateTransition {
         return ModLoadingStage::nextState;
     }
 
+    /**
+     * This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
+     * ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
+     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
+    default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
+        return () -> Stream.ofNullable(eventFunction());
+    }
+
     @Nullable
-    default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
+    default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
         return null;
     }
 
     ThreadSelector threadSelector();
     BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
 
-    interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
-        static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
+    /**
+     * I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
+     * However, the Future returned by this was never linked to the main transition future in any way.  Which means that it was run
+     * in parallel and couldn't guarantee the state of the ModContainer.
+     * <p>
+     * Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
+     * <p>
+     * If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
+     * <p>
+     * Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
+     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
+    default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() { return NULL_HOOK; }
+    @Deprecated(since = "1.21.3", forRemoval = true)
+    default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
+
+    interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
+        static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
             return fn::apply;
         }
     }
-}
+}

fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java

@@ -7,10 +7,12 @@ package net.minecraftforge.fml;
 
 import java.util.function.Supplier;
 
-public interface ISystemReportExtender extends Supplier<String> {
+public interface ISystemReportExtender extends Supplier<String>
+{
     String getLabel();
 
-    default boolean isActive() {
+    default boolean isActive()
+    {
         return true;
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/InterModComms.java

@@ -5,20 +5,63 @@
 
 package net.minecraftforge.fml;
 
+
 import java.util.Iterator;
 import java.util.Spliterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-public final class InterModComms {
-    public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {}
+public class InterModComms
+{
+    public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {
 
-    private static final ConcurrentHashMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
+        /**
+         * Deprecated: use {@link #senderModId()}
+         * @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
+         * Consider it unreliable.
+         */
+        @Deprecated
+        public final String getSenderModId() {
+            return this.senderModId;
+        }
+
+        /**
+         * Deprecated: use {@link #modId()}
+         * @return The modid being sent to.
+         */
+        @Deprecated
+        public final String getModId() {
+            return this.modId;
+        }
+
+        /**
+         * Deprecated: use {@link #method()}
+         * @return The method being sent to.
+         */
+        @Deprecated
+        public final String getMethod() {
+            return this.method;
+        }
+
+        /**
+         * @param <T> The type of the message.
+         * @return A {@link Supplier} of the message.
+         * Use {@link #messageSupplier()}
+         */
+        @SuppressWarnings("unchecked")
+        @Deprecated
+        public final <T> Supplier<T> getMessageSupplier() {
+            return (Supplier<T>) this.messageSupplier;
+        }
+    }
+
+    private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
 
     /**
      * Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
@@ -29,9 +72,8 @@ public final class InterModComms {
      * @return true if the message was enqueued for sending (the target modid is loaded)
      */
     public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) {
-        if (!ModList.isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
-                .add(new IMCMessage(ModLoadingContext.get().getContainer().getModId(), modId, method, thing));
+        if (!ModList.get().isLoaded(modId)) return false;
+        containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing));
         return true;
     }
 
@@ -45,9 +87,8 @@ public final class InterModComms {
      * @return true if the message was enqueued for sending (the target modid is loaded)
      */
     public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) {
-        if (!ModList.isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
-                .add(new IMCMessage(senderModId, modId, method, thing));
+        if (!ModList.get().isLoaded(modId)) return false;
+        containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing));
         return true;
     }
 
@@ -71,7 +112,7 @@ public final class InterModComms {
      * @return All messages
      */
     public static Stream<IMCMessage> getMessages(final String modId) {
-        return getMessages(modId, _ -> true);
+        return getMessages(modId, s->Boolean.TRUE);
     }
 
     private record QueueFilteringSpliterator(
@@ -95,10 +136,13 @@ public final class InterModComms {
         }
 
         @Override
-        public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
+        public boolean tryAdvance(final Consumer<? super IMCMessage> action)
+        {
             IMCMessage next;
-            do {
-                if (!iterator.hasNext()) {
+            do
+            {
+                if (!iterator.hasNext())
+                {
                     return false;
                 }
                 next = this.iterator.next();
@@ -113,5 +157,6 @@ public final class InterModComms {
         public Spliterator<IMCMessage> trySplit() {
             return null;
         }
+
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java

@@ -5,7 +5,7 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
@@ -19,6 +19,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiPredicate;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -40,6 +41,11 @@ public abstract class ModContainer {
     protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
     protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
     final Set<ModContainer> dependencies = new HashSet<>();
+    /**
+     * If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
+     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
+    protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
 
     public ModContainer(IModInfo info) {
         this.modId = info.getModId();
@@ -53,7 +59,7 @@ public abstract class ModContainer {
         Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
             case "MATCH_VERSION" -> // default displaytest checks for version string match
                     () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
-                        (incoming, _) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
+                        (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
             case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
                     IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
             case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
@@ -132,7 +138,12 @@ public abstract class ModContainer {
        configs.put(modConfig.getType(), modConfig);
     }
 
-    public void dispatchConfigEvent(IConfigEvent event) {}
+    public void dispatchConfigEvent(IConfigEvent event) {
+        var handler = configHandler.orElse(null);
+        if (handler != null) {
+            handler.accept(event);
+        }
+    }
 
     /**
      * Does this mod match the supplied mod?
@@ -147,17 +158,9 @@ public abstract class ModContainer {
      */
     public abstract Object getMod();
 
-    /**
-     * @return the mod bus group for this specific mod, or null if there is none.
-     *         Leave null if you use {@link BusGroup#DEFAULT} for your mod lifecycle events.
-     */
-    public BusGroup getModBusGroup() {
-        return null;
-    }
-
     /**
      * Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
      * @param e Event to accept
      */
-    protected <T extends IModBusEvent> void acceptEvent(T e) {}
+    protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModList.java

@@ -5,14 +5,14 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 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 java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -30,36 +30,33 @@ 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 final class ModList {
-    private ModList() {}
+public class ModList {
+    private static ModList INSTANCE;
+    private final List<IModFileInfo> modFiles;
+    private final List<IModInfo> sortedList;
+    private final Map<String, IModFileInfo> fileById;
+    private List<ModContainer> mods;
+    private Map<String, ModContainer> indexedMods;
+    private List<ModFileScanData> modFileScanData;
+    private List<ModContainer> sortedContainers;
 
-    private static final List<IModFileInfo> MOD_FILES;
-    private static final List<IModInfo> SORTED_LIST;
-    private static final Map<String, IModFileInfo> FILE_BY_ID;
-    private static List<ModContainer> mods;
-    private static Map<String, ModContainer> indexedMods;
-    private static List<ModContainer> sortedContainers;
-
-    static {
-        var loadingModFiles = LoadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList();
-        var loadingSortedList = LoadingModList.getMods();
-
-        var modFileInfos = MOD_FILES = loadingModFiles.stream().map(ModFile::getModFileInfo).toList();
-        SORTED_LIST = loadingSortedList.stream().map(IModInfo.class::cast).toList();
+    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
+        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
+        this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
         var byId = new HashMap<String, IModFileInfo>();
-        for (var file : modFileInfos) {
+        for (var file : this.modFiles) {
             for (var mod : file.getMods())
                 byId.put(mod.getModId(), mod.getOwningFile());
         }
-        FILE_BY_ID = Map.copyOf(byId);
-        CrashReportCallables.registerCrashCallable("Mod List", ModList::crashReport);
+        this.fileById = Collections.unmodifiableMap(byId);
+        CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
     }
 
-    private static String getModContainerState(String modId) {
+    private String getModContainerState(String modId) {
         return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
     }
 
-    private static String fileToLine(IModFile mf) {
+    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(),
@@ -69,92 +66,93 @@ public final class ModList {
                 ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
     }
 
-    private static String crashReport() {
-        return "\n" + applyForEachModFile(ModList::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
+    private String crashReport() {
+        return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
     }
 
-    public static void init() {}
-
-    public static List<IModFileInfo> getModFiles() {
-        return MOD_FILES;
+    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
+        INSTANCE = new ModList(modFiles, sortedList);
+        return INSTANCE;
     }
 
-    public static IModFileInfo getModFileById(String modid) {
-        return FILE_BY_ID.get(modid);
+    public static ModList get() {
+        return INSTANCE;
     }
 
-    static void setLoadedMods(final List<ModContainer> modContainers) {
-        mods = modContainers;
-        sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> SORTED_LIST.indexOf(c.getModInfo()))).toList();
-        indexedMods = modContainers.stream().collect(Collectors.toUnmodifiableMap(ModContainer::getModId, Function.identity()));
+    public List<IModFileInfo> getModFiles() {
+        return modFiles;
     }
 
-    static void clearLoadedMods() {
-        mods = List.of();
-        indexedMods = Map.of();
-        sortedContainers = List.of();
+    public IModFileInfo getModFileById(String modid) {
+        return this.fileById.get(modid);
+    }
+
+    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 static <T> Optional<T> getModObjectById(String modId) {
+    public <T> Optional<T> getModObjectById(String modId) {
         return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
     }
 
-    public static Optional<? extends ModContainer> getModContainerById(String modId) {
-        return Optional.ofNullable(indexedMods.get(modId));
+    public Optional<? extends ModContainer> getModContainerById(String modId) {
+        return Optional.ofNullable(this.indexedMods.get(modId));
     }
 
-    public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
+    public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
         return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
     }
 
-    public static List<IModInfo> getMods() {
-        return SORTED_LIST;
+    public List<IModInfo> getMods() {
+        return this.sortedList;
     }
 
-    public static boolean isLoaded(String modTarget) {
-        return indexedMods.containsKey(modTarget);
+    public boolean isLoaded(String modTarget) {
+        return this.indexedMods.containsKey(modTarget);
     }
 
-    public static int size() {
+    public int size() {
         return mods.size();
     }
 
-    public static List<ModFileScanData> getAllScanData() {
-        final class LazyInit {
-            private LazyInit() {}
-            private static final List<ModFileScanData> MOD_FILE_SCAN_DATA = SORTED_LIST.stream()
-                    .map(IModInfo::getOwningFile)
-                    .filter(Objects::nonNull)
-                    .map(IModFileInfo::getFile)
-                    .distinct()
-                    .map(IModFile::getScanResult)
-                    .toList();
+    public List<ModFileScanData> getAllScanData() {
+        if (modFileScanData == null) {
+            modFileScanData = this.sortedList.stream().
+                    map(IModInfo::getOwningFile).
+                    filter(Objects::nonNull).
+                    map(IModFileInfo::getFile).
+                    distinct().
+                    map(IModFile::getScanResult).
+                    collect(Collectors.toList());
         }
-        return LazyInit.MOD_FILE_SCAN_DATA;
+        return modFileScanData;
+
     }
 
-    public static void forEachModFile(Consumer<IModFile> fileConsumer) {
-        MOD_FILES.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
+    public void forEachModFile(Consumer<IModFile> fileConsumer) {
+        modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
     }
 
-    public static <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
-        return MOD_FILES.stream().map(IModFileInfo::getFile).map(function);
+    public <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
+        return modFiles.stream().map(IModFileInfo::getFile).map(function);
     }
 
-    public static void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
+    public void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
         indexedMods.forEach(modContainerConsumer);
     }
 
-    public static void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
-        sortedContainers.forEach(containerConsumer);
+    public void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
+        this.sortedContainers.forEach(containerConsumer);
     }
 
-    public static List<ModContainer> getLoadedMods() {
-        return sortedContainers;
+    public List<ModContainer> getLoadedMods() {
+        return this.sortedContainers;
     }
 
-    public static <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
+    public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
         return indexedMods.values().stream().map(function);
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java

@@ -5,11 +5,16 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import com.google.common.collect.ImmutableList;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.*;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.ImmediateWindowHandler;
+import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
+import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.IModInfo;
@@ -66,86 +71,100 @@ import static net.minecraftforge.fml.Logging.LOADING;
  *     and completes the mod loading sequence.</dd>
  * </dl>
  */
-public final class ModLoader {
-    private ModLoader() {}
-
+public class ModLoader {
     private static final Logger LOGGER = LogManager.getLogger();
-    private static final ArrayList<ModLoadingException> LOADING_EXCEPTIONS = new ArrayList<>();
-    private static final ArrayList<ModLoadingWarning> LOADING_WARNINGS = new ArrayList<>();
-    private static final Consumer<String> STATUS_CONSUMER = StartupNotificationManager.modLoaderConsumer().orElse(_ -> {});
-    private static final HashSet<IModLoadingState> COMPLETED_STATES = new HashSet<>();
+    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 final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
+    private final Set<IModLoadingState> completedStates = new HashSet<>();
+    private ModList modList;
+
+    private ModLoader() {
+        this.loadingModList = FMLLoader.getLoadingModList();
+        this.loadingExceptions = this.loadingModList.getErrors().stream()
+                .flatMap(ModLoadingException::fromEarlyException)
+                .toList();
+        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
+                .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);
+    }
 
     private static String computeLanguageList() {
-        return "\n" + LanguageLoadingProvider
-                .applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
+        return "\n" + FMLLoader.getLanguageLoadingProvider()
+                .applyForEach(lp -> lp.name() + "@" + lp.getClass().getPackage().getImplementationVersion())
                 .collect(Collectors.joining("\n\t\t", "\t\t", ""));
     }
 
     private static String computeModLauncherServiceList() {
         final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
-        return "\n" + mods.stream().map(mod -> mod.getOrDefault("file","nofile") +
-                ' ' + mod.getOrDefault("name", "missing") +
-                ' ' + mod.getOrDefault("type","NOTYPE") +
-                ' ' + mod.getOrDefault("description", "")).
+        return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
+                " "+mod.getOrDefault("name", "missing")+
+                " "+mod.getOrDefault("type","NOTYPE")+
+                " "+mod.getOrDefault("description", "")).
                 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() {}
+    }
+
     /**
      * Run on the primary starting thread by ClientModLoader and ServerModLoader
      * @param syncExecutor An executor to run tasks on the main thread
      * @param parallelExecutor An executor to run tasks on a parallel loading thread pool
      * @param periodicTask Optional periodic task to perform on the main thread while other activities run
      */
-    public static void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var loadingExceptions = LoadingModList.getErrors().stream()
-                .flatMap(ModLoadingException::fromEarlyException)
-                .toList();
-        ModLoader.LOADING_EXCEPTIONS.addAll(loadingExceptions);
-        LOADING_WARNINGS.addAll(LoadingModList.getBrokenFiles().stream()
-                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
-                .toList());
-        Set<IModInfo> erroredModInfos;
-        if (loadingExceptions.isEmpty()) {
-            erroredModInfos = Collections.emptySet();
-        } else {
-            erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
-            erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
-        }
-        LoadingModList.getModFiles().stream()
-                .filter(ModFileInfo::missingLicense)
-                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
-                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
-                .forEach(LOADING_EXCEPTIONS::add);
-        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);
-
+    public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
         ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
         ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
         loadingStateValid = true;
         FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
-        if (!LOADING_EXCEPTIONS.isEmpty()) {
-            LOGGER.fatal(CORE, "Error during pre-loading phase", LOADING_EXCEPTIONS.getFirst());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
+        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());
+            statusConsumer.accept("ERROR DURING MOD LOADING");
+            modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
-            throw new LoadingFailedException(LOADING_EXCEPTIONS);
-        }
-        var failedBounds = new ArrayList<ForgeFeature.Bound>();
-        for (var mod : LoadingModList.getMods()) {
-            for (var feature : mod.getForgeFeatures()) {
-                if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
-                    failedBounds.add(feature);
-            }
+            throw new LoadingFailedException(loadingExceptions);
         }
+        List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
+                .map(ModInfo::getForgeFeatures)
+                .flatMap(List::stream)
+                .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
+                .toList();
 
         if (!failedBounds.isEmpty()) {
             LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
+            statusConsumer.accept("ERROR DURING MOD LOADING");
+            modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(failedBounds.stream()
                     .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
@@ -153,18 +172,18 @@ public final class ModLoader {
         }
 
         final var modContainers = new HashMap<String, ModContainer>();
-        for (var file : LoadingModList.getModFiles()) {
-            var containers = buildMods(file.getFile());
+        for (var file : loadingModList.getModFiles()) {
+            var containers = this.buildMods(file.getFile());
             for (var container : containers)
                 modContainers.put(container.getModId(), container);
         }
 
-        if (!LOADING_EXCEPTIONS.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to initialize mod containers", LOADING_EXCEPTIONS.getFirst());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
+        if (!loadingExceptions.isEmpty()) {
+            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
+            statusConsumer.accept("ERROR DURING MOD LOADING");
+            modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
-            throw new LoadingFailedException(LOADING_EXCEPTIONS);
+            throw new LoadingFailedException(loadingExceptions);
         }
 
         // Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
@@ -187,47 +206,36 @@ public final class ModLoader {
             }
         }
 
-        ModList.setLoadedMods(modContainers.values().stream().toList());
-        var stateList = ModStateManager.getStates(ModLoadingPhase.GATHER);
-        var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
+        modList.setLoadedMods(modContainers.values().stream().toList());
+        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);
         }
         progress.complete();
     }
 
-    public static void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var stateList = ModStateManager.getStates(ModLoadingPhase.LOAD);
-        var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
+    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);
         }
         progress.complete();
     }
 
-    public static void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var stateList = ModStateManager.getStates(ModLoadingPhase.COMPLETE);
-        var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
+    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);
         }
-
-        var modBusGroups = Set.of(
-                ModList.getLoadedMods().stream()
-                        .map(ModContainer::getModBusGroup)
-                        .filter(Objects::nonNull)
-                        .toArray(BusGroup[]::new)
-        );
-        for (var modBusGroup : modBusGroups) {
-            parallelExecutor.execute(modBusGroup::trim);
-        }
-        parallelExecutor.execute(BusGroup.DEFAULT::trim);
-
-        STATUS_CONSUMER.accept("Mod loading complete - %d mods loaded".formatted(ModList.size()));
+        statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
         progress.complete();
     }
 
-    private static void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
+    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
         if (!isLoadingStateValid()) {
             LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
             return;
@@ -235,25 +243,25 @@ public final class ModLoader {
         progressBar.label(progressBar.name() + " working");
         syncExecutor.drive(ticker);
 
-        var inlineRunnable = state.inlineRunnable();
+        var inlineRunnable = state.inlineRunnable().orElse(null);
         if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
 
-        var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar);
+        var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
         if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
 
-        COMPLETED_STATES.add(state);
+        completedStates.add(state);
     }
 
-    private static void handleInlineTransition(final Runnable transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
-        var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0);
+    private void handleInlineTransition(final Consumer<ModList> transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
+        var pb = StartupMessageManager.addProgressBar("State transition " +state.name()+" running", 0);
         syncExecutor.drive(ticker);
-        transition.run();
+        transition.accept(this.modList);
         syncExecutor.drive(ticker);
         pb.complete();
         syncExecutor.drive(ticker);
     }
 
-    private static void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
+    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
         while (!transition.isDone()) {
             syncExecutor.drive(ticker);
         }
@@ -267,7 +275,7 @@ public final class ModLoader {
                     .anyMatch(obj -> !(obj instanceof ModLoadingException));
             if (hasNotModLoadingEx) {
                 LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+                statusConsumer.accept("ERROR DURING MOD LOADING");
                 throw e;
             }
 
@@ -276,12 +284,12 @@ public final class ModLoader {
                     .map(ModLoadingException.class::cast)
                     .toList();
             LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+            statusConsumer.accept("ERROR DURING MOD LOADING");
             throw new LoadingFailedException(modLoadingExceptions);
         }
     }
 
-    private static List<ModContainer> buildMods(final IModFile modFile) {
+    private List<ModContainer> buildMods(final IModFile modFile) {
         final Map<String, IModInfo> modInfoMap = new HashMap<>();
         for (var mod : modFile.getModFileInfo().getMods())
             modInfoMap.put(mod.getModId(), mod);
@@ -311,14 +319,14 @@ public final class ModLoader {
             missingMods.removeAll(modIds);
             LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
 
-            LOADING_EXCEPTIONS.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
+            loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
         }
 
         // remove errored mod containers
         return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
     }
 
-    private static ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
+    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
         final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
     ) {
         try {
@@ -330,7 +338,7 @@ public final class ModLoader {
             return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
         } catch (ModLoadingException mle) {
             // exceptions are caught and added to the error list for later handling
-            LOADING_EXCEPTIONS.add(mle);
+            loadingExceptions.add(mle);
             // return an errored container instance here, because we tried and failed building a container.
             return new ErroredModContainer();
         }
@@ -344,64 +352,62 @@ public final class ModLoader {
         return loadingStateValid;
     }
 
-    public static boolean hasCompletedState(IModLoadingState state) {
-        return COMPLETED_STATES.contains(state);
+    public boolean hasCompletedState(final String stateName) {
+        IModLoadingState state = stateManager.findState(stateName);
+        return completedStates.contains(state);
     }
 
-    public static <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
+    public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
             return;
         }
-        for (var mod : ModList.getLoadedMods())
-            mod.acceptEvent(generator.apply(mod));
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
     }
 
-    public static <T extends IModBusEvent> void postEvent(T e) {
+    public <T extends Event & IModBusEvent> void postEvent(T e) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;
         }
-        for (var mod : ModList.getLoadedMods())
-            mod.acceptEvent(e);
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
     }
 
-    public static <T extends IModBusEvent> T postEventWithReturn(T e) {
+    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return e;
         }
-        for (var mod : ModList.getLoadedMods())
-            mod.acceptEvent(e);
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
         return e;
     }
 
     @SuppressWarnings("removal")
-    public static <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
+    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
         postEventWithWrapInModOrder(event,
-            (mc, _) -> ModLoadingContext.get().setActiveContainer(mc),
-            (_, _) -> ModLoadingContext.get().setActiveContainer(null)
+            (mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
+            (mc, e) -> ModLoadingContext.get().setActiveContainer(null)
         );
     }
 
-    public static <T extends IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
+    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;
         }
-        for (var mod : ModList.getLoadedMods()) {
-            pre.accept(mod, e);
-            mod.acceptEvent(e);
-            post.accept(mod, e);
-        }
+        ModList.get().forEachModInOrder(mc -> {
+            pre.accept(mc, e);
+            mc.acceptEvent(e);
+            post.accept(mc, e);
+        });
     }
 
-    public static List<ModLoadingWarning> getWarnings() {
-        return List.copyOf(LOADING_WARNINGS);
+    public List<ModLoadingWarning> getWarnings() {
+        return ImmutableList.copyOf(this.loadingWarnings);
     }
 
-    public static void addWarning(ModLoadingWarning warning) {
-        LOADING_WARNINGS.add(warning);
+    public void addWarning(ModLoadingWarning warning) {
+        this.loadingWarnings.add(warning);
     }
 
     private static boolean runningDataGen = false;
@@ -410,7 +416,7 @@ public final class ModLoader {
         return runningDataGen;
     }
 
-    private static final class ErroredModContainer extends ModContainer {
+    private static class ErroredModContainer extends ModContainer {
         public ErroredModContainer() {
             super();
         }

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java

@@ -19,24 +19,31 @@ public class ModLoadingContext {
     private Object languageExtension;
 
     /**
-     * @deprecated Use the context provided by your language loader in your mod's constructor. Example for Java mods: {@snippet :
-     * @Mod("examplemod")
-     * public final class ExampleMod {
-     *      public ExampleMod(FMLJavaModLoadingContext context) {
-     *           // Use context from the param instead of FMLJavaModLoadingContext.get() or ModLoadingContext.get()
-     *      }
-     * }}
+     * @deprecated Use the context provided by your language loader in your mod's constructor
      */
     @Deprecated(forRemoval = true, since="1.21.1")
     public static ModLoadingContext get() {
         return context.get();
     }
 
-    void setActiveContainer(final ModContainer container) {
+    /**
+     * @deprecated Going to be moved to ForgeHooks for Internal use.
+     */
+    @Deprecated(forRemoval = true, since="1.21.1")
+    public void setActiveContainer(final ModContainer container) {
         this.activeContainer = container;
         this.languageExtension = container == null ? null : container.contextExtension.get();
     }
 
+    /**
+     * Going to be moved to ForgeHooks for Internal use.
+     * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
+     */
+    @Deprecated(forRemoval = true, since="1.21.1")
+    public ModContainer getActiveContainer() {
+        return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
+    }
+
     /**
      * @deprecated Going to be moved to ForgeHooks for Internal use.
      */
@@ -45,10 +52,11 @@ public class ModLoadingContext {
         return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
     }
 
+    /**
+     * @return {@link ModLoadingContext#getActiveContainer()} by default.
+     */
     public ModContainer getContainer() {
-        return activeContainer == null
-                ? ModList.getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!"))
-                : activeContainer;
+        return getActiveContainer();
     }
 
     /**
@@ -100,7 +108,8 @@ public class ModLoadingContext {
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        if (spec.isEmpty()) {
+        if (spec.isEmpty())
+        {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
             LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
             return;
@@ -110,7 +119,8 @@ public class ModLoadingContext {
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        if (spec.isEmpty()) {
+        if (spec.isEmpty())
+        {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
             LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
             return;
@@ -119,6 +129,7 @@ public class ModLoadingContext {
         getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
     }
 
+
     @SuppressWarnings("unchecked")
     public <T> T extension() {
         return (T)languageExtension;

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingState.java

@@ -5,15 +5,16 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.IntSupplier;
-import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
 
 /**
  * Implementation of the {@link IModLoadingState} interface.
@@ -25,26 +26,27 @@ import java.util.function.Supplier;
  * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
  * @param transition     optional state transition information
  */
-@NullMarked
 public record ModLoadingState(
     String name,
     String previous,
-    Supplier<String> message,
-    IntSupplier size,
+    Function<ModList, String> message,
+    ToIntFunction<ModList> size,
     ModLoadingPhase phase,
-    @Nullable Runnable inlineRunnable,
-    @Nullable IModStateTransition transition
+    Optional<Consumer<ModList>> inlineRunnable,
+    Optional<IModStateTransition> transition
 ) implements IModLoadingState {
     @Override
-    public @Nullable CompletableFuture<Void> buildTransition(
+    public <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
         final Executor syncExecutor,
         final Executor parallelExecutor,
         final ProgressMeter progressBar,
         final Function<Executor, CompletableFuture<Void>> preSyncTask,
         final Function<Executor, CompletableFuture<Void>> postSyncTask
     ) {
-        if (transition == null) return null;
-        return transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
+        var transition = this.transition.orElse(null);
+        return transition == null
+                ? Optional.empty()
+                : Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
     }
 
     /**
@@ -59,7 +61,7 @@ public record ModLoadingState(
      */
     @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, () -> "", () -> 0, phase, null, null);
+        return of(name, phase).after(previous).empty();
     }
 
     /**
@@ -93,7 +95,7 @@ public record ModLoadingState(
      */
     @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withTransition(final String name, final String previous,
-                                                 final Supplier<String> message, final ModLoadingPhase phase,
+                                                 final Function<ModList, String> message, final ModLoadingPhase phase,
                                                  final IModStateTransition transition) {
         return of(name, phase).after(previous).message(message).withTransition(transition);
     }
@@ -112,7 +114,7 @@ public record ModLoadingState(
      */
     @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
-                                             final Runnable inline) {
+                                             final Consumer<ModList> inline) {
         return of(name, phase).after(previous).withInline(inline);
     }
 
@@ -120,28 +122,12 @@ public record ModLoadingState(
         return new Builder(name, phase);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof ModLoadingState that
-                && this.phase == that.phase
-                && this.name.equals(that.name)
-                && this.previous.equals(that.previous);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = phase.hashCode();
-        result = 31 * result + name.hashCode();
-        result = 31 * result + previous.hashCode();
-        return result;
-    }
-
-    public static final class Builder {
+    public static class Builder {
         private final String name;
         private final ModLoadingPhase phase;
-        private String after = "";
-        private @Nullable Supplier<String> message = null;
-        private @Nullable IntSupplier size = null;
+        private String after;
+        private Function<ModList, String> message = null;
+        private ToIntFunction<ModList> size = null;
 
         private Builder(final String name, final ModLoadingPhase phase) {
             this.name = name;
@@ -154,28 +140,28 @@ public record ModLoadingState(
             return this;
         }
 
-        public Builder message(final String value) { return message(() -> value); }
-        public Builder message(final Supplier<String> value) {
+        public Builder message(final String value) { return message(ml -> value); }
+        public Builder message(final Function<ModList, String> value) {
             this.message = value;
             return this;
         }
 
-        public Builder size(final int value) { return size(() -> value); }
-        public Builder size(final IntSupplier value) {
+        public Builder size(final int value) { return size(ml -> value); }
+        public Builder size(final ToIntFunction<ModList> value) {
             this.size = value;
             return this;
         }
 
         public ModLoadingState empty() {
-            return new ModLoadingState(name, after, message != null ? message : () -> "", size != null ? size : () -> 0, phase, null, null);
+            return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty());
         }
 
         public ModLoadingState withTransition(final IModStateTransition transition) {
-            return new ModLoadingState(name, after, message != null ? message : () -> "Processing transition " + name, size != null ? size : ModList::size, phase, null, transition);
+            return new ModLoadingState(name, after, message != null ? message : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
         }
 
-        public ModLoadingState withInline(final Runnable inline) {
-            return new ModLoadingState(name, after, message != null ? message : () -> "Processing work " + name, size != null ? size : () -> 0, phase, inline, null);
+        public ModLoadingState withInline(final Consumer<ModList> inline) {
+            return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty());
         }
     }
-}
+}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingWarning.java

@@ -5,27 +5,41 @@
 
 package net.minecraftforge.fml;
 
+import com.google.common.collect.Streams;
 import net.minecraftforge.forgespi.language.IModInfo;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-/**
- * @param modInfo Mod info for mod with warning
- * @param warningStage The stage where this warning was encountered
- * @param i18nMessage I18N message to use for display
- * @param context Context for message display
- */
-public record ModLoadingWarning(IModInfo modInfo, ModLoadingStage warningStage, String i18nMessage, List<Object> context) {
-    public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
-        this(modInfo, warningStage, i18nMessage, List.of(context));
-    }
+public class ModLoadingWarning {
+    /**
+     * Mod Info for mod with warning
+     */
+    private final IModInfo modInfo;
+    /**
+     * The stage where this warning was encountered
+     */
+    private final ModLoadingStage warningStage;
 
-    public ModLoadingWarning {
-        context = List.copyOf(context);
+    /**
+     * I18N message to use for display
+     */
+    private final String i18nMessage;
+
+    /**
+     * Context for message display
+     */
+    private final List<Object> context;
+
+    public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
+        this.modInfo = modInfo;
+        this.warningStage = warningStage;
+        this.i18nMessage = i18nMessage;
+        this.context = Arrays.asList(context);
     }
 
     public String formatToString() {
-        return Bindings.getMessageParser().get().parseMessage(i18nMessage, Stream.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
+        return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModStateManager.java

@@ -15,19 +15,18 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @SuppressWarnings("UnstableApiUsage")
-public final class ModStateManager {
-    private ModStateManager() {}
-    private static final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
+public class ModStateManager {
+    private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
 
-    static {
+    public ModStateManager() {
         final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
-        stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, _ -> {})
+        this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
                 .map(IModStateProvider::getAllStates)
                 .flatMap(List::stream)
-                .collect(Collectors.groupingBy(IModLoadingState::phase, () -> new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
+                .collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
     }
 
-    public static List<IModLoadingState> getStates(final ModLoadingPhase phase) {
+    public List<IModLoadingState> getStates(final ModLoadingPhase phase) {
         var nodes = stateMap.get(phase);
         var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
 
@@ -41,14 +40,12 @@ public final class ModStateManager {
         return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
     }
 
-    public static IModLoadingState findState(final String stateName) {
-        var result = stateMap.values()
+    public IModLoadingState findState(final String stateName) {
+        return stateMap.values()
                 .stream()
                 .flatMap(List::stream)
                 .filter(mls -> mls.name().equals(stateName))
                 .findFirst()
-                .orElse(null);
-        if (result != null) return result;
-        else throw new IllegalArgumentException("Unknown IModLoadingState: " + stateName);
+                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModStateTransitionHelper.java

@@ -9,22 +9,21 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import org.jetbrains.annotations.ApiStatus;
 
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.IModStateTransition.EventGenerator;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 @ApiStatus.Internal
-final class ModStateTransitionHelper {
+class ModStateTransitionHelper {
     static final IModStateTransition NOOP = new NoopTransition();
     record NoopTransition() implements IModStateTransition {
         @Override
@@ -42,7 +41,7 @@ final class ModStateTransitionHelper {
         if (t.stream().noneMatch(e -> e.exception() != null)) {
             return CompletableFuture.completedFuture(null);
         } else {
-            final var throwables = t.stream().map(FutureResult::exception).filter(Objects::nonNull).toList();
+            final var throwables = t.stream().map(FutureResult::exception).filter(e -> e != null).toList();
             CompletableFuture<Void> cf = new CompletableFuture<>();
             final RuntimeException accumulator = new RuntimeException();
             cf.completeExceptionally(accumulator);
@@ -62,30 +61,7 @@ final class ModStateTransitionHelper {
         }
     }
 
-    /// Same as [#completableFutureFromExceptionList(List)] but specialised for a single future
-    static <V> CompletionStage<Void> completableFutureFromException(FutureResult<V> t) {
-        if (t.exception() == null) {
-            return CompletableFuture.completedFuture(null);
-        } else {
-            var exception = t.exception();
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            RuntimeException accumulator = new RuntimeException();
-            cf.completeExceptionally(accumulator);
-            if (exception instanceof CompletionException) {
-                exception = exception.getCause();
-            }
-            if (exception.getSuppressed().length != 0) {
-                for (Throwable throwable : exception.getSuppressed()) {
-                    accumulator.addSuppressed(throwable);
-                }
-            } else {
-                accumulator.addSuppressed(exception);
-            }
-            return cf;
-        }
-    }
-
-    record FutureResult<V>(V value, Throwable exception) {}
+    record FutureResult<V>(V value, Throwable exception){}
 
     static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
         var list = new ArrayList<FutureResult<V>>(futures.size());
@@ -94,22 +70,28 @@ final class ModStateTransitionHelper {
         for (var future : futures) {
             int i = list.size();
             list.add(null);
-            @SuppressWarnings("unchecked") // Bypass a weird javac error with generic by forcing it to be the exact type we want.
-            var raw = ((CompletableFuture<V>)future);
-            results[i] = raw.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
+            results[i] = future.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
         }
 
-        return CompletableFuture.allOf(results).handle((_, _)->null).thenApply(_ -> list);
+        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
     }
 
-    private static <T extends IModBusEvent> CompletableFuture<Void> addCompletableFutureTaskForModDispatch(
+    private static <T extends Event & IModBusEvent> void addCompletableFutureTaskForModDispatch(
+        final IModStateTransition transition,
         final Executor executor,
+        final List<CompletableFuture<Void>> completableFutures,
         final ProgressMeter progressBar,
         final EventGenerator<T> eventGenerator,
         final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
      ) {
+
+        @SuppressWarnings("removal")
+        var preDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
+        if (preDispatchHook != null)
+            completableFutures.add(preDispatchHook);
+
         var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
-        for (var mod : ModList.getLoadedMods()) {
+        for (var mod : ModList.get().getLoadedMods()) {
 
             CompletableFuture<Void> parent = null;
             if (mod.dependencies.isEmpty()) {
@@ -135,7 +117,7 @@ final class ModStateTransitionHelper {
                         handler.run();
                     mod.acceptEvent(eventGenerator.apply(mod));
                 }, executor)
-                .whenComplete((_, exception) -> {
+                .whenComplete((mc, exception) -> {
                     mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
                     progressBar.increment();
                     ModLoadingContext.get().setActiveContainer(null);
@@ -144,10 +126,23 @@ final class ModStateTransitionHelper {
             modFutures.put(mod.getModId(), dispatch);
         }
 
-        return gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
+        var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
+        completableFutures.add(dispatch);
+
+        @SuppressWarnings("removal")
+        var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
+        if (postDispatchHook != null)
+            completableFutures.add(postDispatchHook);
     }
 
-    static <T extends IModBusEvent> CompletableFuture<Void> build(
+    private static <T extends Event & IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
+        if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
+        @SuppressWarnings("unchecked")
+        var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
+        return hookTyped.apply(executor, eventGenerator);
+    }
+
+    static <T extends Event & IModBusEvent> CompletableFuture<Void> build(
         final IModStateTransition transition,
         final String name,
         final Executor syncExecutor,
@@ -156,25 +151,31 @@ final class ModStateTransitionHelper {
         final Function<Executor, CompletableFuture<Void>> preSyncTask,
         final Function<Executor, CompletableFuture<Void>> postSyncTask
     ) {
-        CompletableFuture<Void> future;
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
         final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
 
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
-            .thenRunAsync(() -> progressBar.label(progressBar.name() + ": dispatching " + name), parallelExecutor);
-
-        var eventGenerator = transition.eventFunction();
-        if (eventGenerator != null) {
-            BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = transition.nextModLoadingStage();
-            future = addCompletableFutureTaskForModDispatch(executor, progressBar, eventGenerator, state);
-
-            final CompletableFuture<Void> eventDispatchCF = future.handle(FutureResult::new)
-                    .thenCompose(ModStateTransitionHelper::completableFutureFromException);
-            postEventDispatchCF = postEventDispatchCF.thenComposeAsync(_ -> eventDispatchCF, parallelExecutor);
+        @SuppressWarnings({ "removal", "unchecked" })
+        var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList();
+        for (int x = 0; x < events.size(); x++) {
+            var gen = events.get(x);
+            BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1
+                ? transition.nextModLoadingStage()
+                : ModLoadingStage::currentState;
+            addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state);
         }
 
-        postEventDispatchCF = postEventDispatchCF.thenRun(() -> postSyncTask.apply(syncExecutor));
-
+        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
+        final CompletableFuture<Void> eventDispatchCF = gather(futures).thenCompose(ModStateTransitionHelper::completableFutureFromExceptionList);
+        final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
+            .thenApplyAsync(n -> {
+                progressBar.label(progressBar.name() + ": dispatching " + name);
+                return null;
+            }, parallelExecutor)
+            .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
+            .thenApply(r -> {
+                postSyncTask.apply(syncExecutor);
+                return null;
+            });
         return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java

@@ -14,12 +14,25 @@ import java.util.concurrent.locks.LockSupport;
 
 import static net.minecraftforge.fml.Logging.LOADING;
 
-public final class ModWorkManager {
+public class ModWorkManager {
     private static final Logger LOGGER = LogManager.getLogger();
     private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
 
-    public sealed interface DrivenExecutor extends Executor {
-        void drive(Runnable ticker);
+    public interface DrivenExecutor extends Executor {
+        boolean selfDriven();
+        boolean driveOne();
+
+        default void drive(Runnable ticker) {
+            if (!selfDriven()) {
+                ticker.run();
+                while (true) {
+                    if (!driveOne()) break;
+                }
+            } else {
+                // park for a bit so other threads can schedule
+                LockSupport.parkNanos(PARK_TIME);
+            }
+        }
     }
 
     private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
@@ -27,7 +40,8 @@ public final class ModWorkManager {
             this(new ConcurrentLinkedDeque<>());
         }
 
-        private boolean driveOne() {
+        @Override
+        public boolean driveOne() {
             final Runnable task = tasks.pollFirst();
             if (task != null) {
                 task.run();
@@ -36,29 +50,30 @@ public final class ModWorkManager {
         }
 
         @Override
-        public void execute(final Runnable command) {
-            tasks.addLast(command);
+        public boolean selfDriven() {
+            return false;
         }
 
         @Override
-        public void drive(Runnable ticker) {
-            ticker.run();
-            while (true) {
-                if (!driveOne()) break;
-            }
+        public void execute(final Runnable command) {
+            tasks.addLast(command);
         }
     }
 
     private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
         @Override
-        public void execute(final Runnable command) {
-            wrapped.execute(command);
+        public boolean selfDriven() {
+            return true;
         }
 
         @Override
-        public void drive(Runnable ticker) {
-            // Park for a bit so other threads can schedule
-            LockSupport.parkNanos(PARK_TIME);
+        public boolean driveOne() {
+            return false;
+        }
+
+        @Override
+        public void execute(final Runnable command) {
+            wrapped.execute(command);
         }
     }
 

fmlcore/src/main/java/net/minecraftforge/fml/OptionalMod.java

@@ -43,7 +43,7 @@ public final class OptionalMod<T>
     private T getValue()
     {
         if (!searched) {
-            this.value = ModList.<T>getModObjectById(this.modId).orElse(null);
+            this.value = ModList.get().<T>getModObjectById(this.modId).orElse(null);
             searched = true;
         }
         return this.value;

fmlcore/src/main/java/net/minecraftforge/fml/ThreadSelector.java

@@ -9,8 +9,8 @@ import java.util.concurrent.Executor;
 import java.util.function.BinaryOperator;
 
 public enum ThreadSelector implements BinaryOperator<Executor> {
-    SYNC((sync, _) -> sync),
-    PARALLEL((_, parallel) -> parallel);
+    SYNC((sync, parallel) -> sync),
+    PARALLEL((sync, parallel) -> parallel);
 
     private final BinaryOperator<Executor> selector;
 

fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java

@@ -93,8 +93,8 @@ public class VersionChecker {
                     return;
                 }
 
-                var mc = ModList.getModContainerById("minecraft");
-                var forge = ModList.getModContainerById("forge");
+                var mc = ModList.get().getModContainerById("minecraft");
+                var forge = ModList.get().getModContainerById("forge");
                 this.mcVersion = mc.get().getModInfo().getVersion().toString();
 
                 this.agent = "Java-http-client/" + System.getProperty("java.version")
@@ -223,7 +223,7 @@ public class VersionChecker {
     // Gather a list of mods that have opted in to this update system by providing a URL.
     private static List<IModInfo> gatherMods() {
         List<IModInfo> ret = new LinkedList<>();
-        for (IModInfo info : ModList.getMods()) {
+        for (IModInfo info : ModList.get().getMods()) {
             if (info.getUpdateURL().isPresent())
                 ret.add(info);
         }

fmlcore/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java

@@ -8,7 +8,8 @@ package net.minecraftforge.fml.config;
 import com.electronwill.nightconfig.core.CommentedConfig;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.loading.FMLPaths;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
@@ -18,54 +19,57 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-public final class ConfigTracker {
-    private ConfigTracker() {}
-
+public class ConfigTracker {
     private static final Logger LOGGER = LogUtils.getLogger();
     static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
-    private static final ConcurrentHashMap<String, ModConfig> FILE_MAP = new ConcurrentHashMap<>();
-    private static final Map<ModConfig.Type, Set<ModConfig>> CONFIG_SETS = Map.of(
-            ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()),
-            ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()),
-            ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>())
-    );
-    private static final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> CONFIGS_BY_MOD = new ConcurrentHashMap<>();
+    public static final ConfigTracker INSTANCE = new ConfigTracker();
+    private final ConcurrentHashMap<String, ModConfig> fileMap;
+    private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets;
+    private final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> configsByMod;
 
-    static void trackConfig(final ModConfig config) {
-        if (FILE_MAP.containsKey(config.getFileName())) {
-            LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), FILE_MAP.get(config.getFileName()).getModId(), config.getModId());
+    private ConfigTracker() {
+        this.fileMap = new ConcurrentHashMap<>();
+        this.configSets = new EnumMap<>(ModConfig.Type.class);
+        this.configsByMod = new ConcurrentHashMap<>();
+        this.configSets.put(ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()));
+        this.configSets.put(ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()));
+//        this.configSets.put(ModConfig.Type.PLAYER, new ConcurrentSkipListSet<>());
+        this.configSets.put(ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>()));
+    }
+
+    void trackConfig(final ModConfig config) {
+        if (this.fileMap.containsKey(config.getFileName())) {
+            LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), this.fileMap.get(config.getFileName()).getModId(), config.getModId());
             throw new RuntimeException("Config conflict detected!");
         }
-        FILE_MAP.put(config.getFileName(), config);
-        CONFIG_SETS.get(config.getType()).add(config);
-        CONFIGS_BY_MOD.computeIfAbsent(config.getModId(), _ -> new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
+        this.fileMap.put(config.getFileName(), config);
+        this.configSets.get(config.getType()).add(config);
+        this.configsByMod.computeIfAbsent(config.getModId(), (k)->new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
         LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
     }
 
-    public static void loadConfigs(ModConfig.Type type, Path configBasePath) {
+    public void loadConfigs(ModConfig.Type type, Path configBasePath) {
         LOGGER.debug(CONFIG, "Loading configs type {}", type);
-        for (ModConfig config : CONFIG_SETS.get(type)) {
+        for (ModConfig config : this.configSets.get(type)) {
             openConfig(config, configBasePath);
         }
     }
 
     // TODO: [FML] This is only called for the server (outside of forceUnload)
     // rethink config implementation for eventual FML rewrite
-    public static void unloadConfigs(ModConfig.Type type, Path configBasePath) {
+    public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
         LOGGER.debug(CONFIG, "Unloading configs type {}", type);
-        for (ModConfig config : CONFIG_SETS.get(type)) {
+        for (ModConfig config : this.configSets.get(type)) {
             closeConfig(config, configBasePath);
         }
         ConfigFileTypeHandler.get(type).stopWatcher();
     }
 
     // If there is a better way to do this, please tell me. Because this is FUCKED
-    public static void forceUnload() {
+    public void forceUnload() {
         // This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
-        if (FMLEnvironment.dist.isClient())
-            unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get());
-
-        unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
+        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
+        this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
 
         // just in case server watcher is still alive somehow...
         ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
@@ -92,8 +96,8 @@ public final class ConfigTracker {
         }
     }
 
-    public static void loadDefaultServerConfigs() {
-        CONFIG_SETS.get(ModConfig.Type.SERVER).forEach(modConfig -> {
+    public void loadDefaultServerConfigs() {
+        configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> {
             final CommentedConfig commentedConfig = CommentedConfig.inMemory();
             modConfig.getSpec().correct(commentedConfig);
             modConfig.setConfigData(commentedConfig);
@@ -101,16 +105,16 @@ public final class ConfigTracker {
         });
     }
 
-    public static String getConfigFileName(String modId, ModConfig.Type type) {
-        return Optional.ofNullable(CONFIGS_BY_MOD.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
+    public String getConfigFileName(String modId, ModConfig.Type type) {
+        return Optional.ofNullable(configsByMod.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
                 map(ModConfig::getFullPath).map(Object::toString).orElse(null);
     }
 
-    public static Map<ModConfig.Type, Set<ModConfig>> configSets() {
-        return CONFIG_SETS;
+    public Map<ModConfig.Type, Set<ModConfig>> configSets() {
+        return configSets;
     }
 
-    public static ConcurrentHashMap<String, ModConfig> fileMap() {
-        return FILE_MAP;
+    public ConcurrentHashMap<String, ModConfig> fileMap() {
+        return fileMap;
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/config/IConfigEvent.java

@@ -5,7 +5,7 @@
 
 package net.minecraftforge.fml.config;
 
-import net.minecraftforge.eventbus.api.event.InheritableEvent;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.Bindings;
 
 import java.util.function.Function;
@@ -13,7 +13,6 @@ import java.util.function.Function;
 import org.jetbrains.annotations.Nullable;
 
 public interface IConfigEvent {
-    // TODO: [FML] Get rid of this indirection somehow
     record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
 
     ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
@@ -30,7 +29,7 @@ public interface IConfigEvent {
     ModConfig getConfig();
 
     @SuppressWarnings("unchecked")
-    default <T extends InheritableEvent & IConfigEvent> T self() {
+    default <T extends Event & IConfigEvent> T self() {
         return (T) this;
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/config/ModConfig.java

@@ -13,6 +13,8 @@ import net.minecraftforge.fml.loading.StringUtils;
 
 import java.io.ByteArrayInputStream;
 import java.nio.file.Path;
+import java.util.Locale;
+import java.util.concurrent.Callable;
 
 public class ModConfig
 {
@@ -29,7 +31,7 @@ public class ModConfig
         this.fileName = fileName;
         this.container = container;
         this.configHandler = ConfigFileTypeHandler.get(type);
-        ConfigTracker.trackConfig(this);
+        ConfigTracker.INSTANCE.trackConfig(this);
     }
 
     public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) {
@@ -38,9 +40,8 @@ public class ModConfig
 
     private static String defaultConfigName(Type type, String modId) {
         // config file name would be "forge-client.toml" and "forge-server.toml"
-        return modId + '-' + type.extension() + ".toml";
+        return String.format(Locale.ROOT, "%s-%s.toml", modId, type.extension());
     }
-
     public Type getType() {
         return type;
     }

fmlcore/src/main/java/net/minecraftforge/fml/event/IModBusEvent.java

@@ -5,33 +5,8 @@
 
 package net.minecraftforge.fml.event;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
-import net.minecraftforge.eventbus.api.bus.EventBus;
-import net.minecraftforge.eventbus.api.event.InheritableEvent;
-import org.jspecify.annotations.NonNull;
-
 /**
- * Marker interface for mod lifecycle events dispatched on the
- * {@linkplain net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup() mod BusGroup} instead
- * of the {@linkplain BusGroup#DEFAULT default BusGroup}.
- *
- * @apiNote Each mod gets its own unique mod BusGroup instance, obtained from the mod loading context. Most events
- *          should go on the default BusGroup.
+ * Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
  */
-public interface IModBusEvent extends InheritableEvent {
-    /**
-     * @param modEventBusGroup Obtained from {@link net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup()} or your language provider's equivalent.
-     * @param eventClass The event type you want to get the associated bus for.
-     */
-    static <T extends IModBusEvent> @NonNull EventBus<@NonNull T> getBus(@NonNull BusGroup modEventBusGroup, @NonNull Class<T> eventClass) {
-        // Do not copy! Temporary solution until the FML rewrite is complete. May throw in future
-        // without prior notice.
-        //
-        // Mods creating their own events should directly assign the result of the create method to a
-        // static final field in their event class, without wrapping or calling multiple times.
-        //
-        // Mods using existing events should instead use the existing static final BUS field in the
-        // event class (for most events) or getBus(BusGroup) method (for mod bus events).
-        return EventBus.create(modEventBusGroup, eventClass);
-    }
+public interface IModBusEvent {
 }

fmlcore/src/main/java/net/minecraftforge/fml/util/thread/EffectiveSide.java

@@ -7,11 +7,8 @@ package net.minecraftforge.fml.util.thread;
 
 import net.minecraftforge.fml.LogicalSide;
 
-/**
- * Attempts to determine the effect side of the current thread, based on know threads in networking.
- * This is not guaranteed to be correct, and modders should use other methods to determine the logical side when possible.
- */
-public class EffectiveSide {
+public class EffectiveSide
+{
     public static LogicalSide get() {
         final ThreadGroup group = Thread.currentThread().getThreadGroup();
         return group instanceof SidedThreadGroup ? ((SidedThreadGroup) group).getSide() : LogicalSide.CLIENT;

fmlcore/src/main/java/net/minecraftforge/fml/util/thread/SidedThreadGroups.java

@@ -7,13 +7,11 @@ package net.minecraftforge.fml.util.thread;
 
 import net.minecraftforge.fml.LogicalSide;
 
-public final class SidedThreadGroups {
+public final class SidedThreadGroups
+{
     public static final SidedThreadGroup CLIENT = new SidedThreadGroup(LogicalSide.CLIENT);
     public static final SidedThreadGroup SERVER = new SidedThreadGroup(LogicalSide.SERVER);
 
-    public static SidedThreadGroup get(boolean client) {
-        return client ? CLIENT : SERVER;
+    private SidedThreadGroups() {
     }
-
-    private SidedThreadGroups() { }
 }

fmlearlydisplay/build.gradle

@@ -1,74 +1,67 @@
-import org.gradle.api.plugins.jvm.JvmTestSuite
-import org.gradle.internal.os.OperatingSystem
+import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
     id 'java-library'
-    id 'jvm-test-suite'
     id 'maven-publish'
-    alias libs.plugins.licenser
-    alias libs.plugins.gradleutils
-    alias libs.plugins.gitversion
-    alias libs.plugins.changelog
-    id 'net.minecraftforge.forge.build.convention'
+    id 'net.minecraftforge.licenser'
+    id 'net.minecraftforge.gradleutils'
 }
 
+apply from: rootProject.file('build_shared.gradle')
+
+import org.gradle.internal.os.OperatingSystem
 switch (OperatingSystem.current()) {
-    case OperatingSystem.LINUX:
-        project.ext.lwjglNatives = "natives-linux"
-        break
-    case OperatingSystem.MAC_OS:
-        project.ext.lwjglNatives = "natives-macos"
-        break
-    case OperatingSystem.WINDOWS:
-        project.ext.lwjglNatives = "natives-windows"
-        break
+	case OperatingSystem.LINUX:
+		project.ext.lwjglNatives = "natives-linux"
+		break
+	case OperatingSystem.MAC_OS:
+		project.ext.lwjglNatives = "natives-macos"
+		break
+	case OperatingSystem.WINDOWS:
+		project.ext.lwjglNatives = "natives-windows"
+		break
 }
 
-gradleutils.displayName = 'FML Early Display'
-final vendor = 'Forge Development LLC'
-description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
-
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
+    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
     withSourcesJar()
 }
 
-license {
-    header = rootProject.file('LICENSE-header.txt')
-}
-
-changelog {
-    from changelogBase
-}
-
 dependencies {
-    compileOnly libs.jetbrains.annotations
-
-    implementation projects.fmlloader
-    implementation projects.fmlcore
-    implementation libs.bundles.lwjgl
-    implementation earlyDisplayLibs.slf4j.api
-    implementation libs.jopt.simple
+    compileOnly(libs.nulls)
+    implementation(project(':fmlloader'))
+    implementation(project(':fmlcore'))
+    implementation(libs.bundles.lwjgl)
+    implementation('org.slf4j:slf4j-api:1.8.0-beta4')
+    implementation(libs.jopt.simple)
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
+    testImplementation('org.powermock:powermock-core:2.0.9')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.8.2')
+    testRuntimeOnly('org.slf4j:slf4j-jdk14:1.8.0-beta4')
+    testRuntimeOnly("org.lwjgl:lwjgl::$lwjglNatives")
+    testRuntimeOnly("org.lwjgl:lwjgl-glfw::$lwjglNatives")
+    testRuntimeOnly("org.lwjgl:lwjgl-opengl::$lwjglNatives")
+    testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
 }
 
-// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
-// We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration.
-var lwjglTestLibs = [
-        dependencies.variantOf(earlyDisplayTestLibs.lwjgl) { classifier lwjglNatives },
-        dependencies.variantOf(earlyDisplayTestLibs.lwjgl.glfw) { classifier lwjglNatives },
-        dependencies.variantOf(earlyDisplayTestLibs.lwjgl.opengl) { classifier lwjglNatives },
-        dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives }
-].with { list ->
-    provider { list.collect { it.get() } }
+tasks.named('test', Test).configure {
+    useJUnitPlatform()
 }
 
-testing.suites.named('test', JvmTestSuite) {
-    useJUnitJupiter('5.8.2')
-
-    dependencies {
-        implementation earlyDisplayTestLibs.powermock.core
-        runtimeOnly earlyDisplayLibs.slf4j.jdk14
-        runtimeOnly.bundle lwjglTestLibs
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+            'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
+            'Forge-Module-Layer':    'boot'
+        ] as LinkedHashMap)
+        attributes([
+            'Specification-Title':      'FML Early Display',
+            'Specification-Vendor':     'Forge Development LLC',
+            'Specification-Version':    '1',
+            'Implementation-Title':     'FML Early Display',
+            'Implementation-Vendor':    'Forge Development LLC',
+            'Implementation-Version':   '1.0'
+        ] as LinkedHashMap, 'net/minecraftforge/fml/earlydisplay/')
     }
 }
 
@@ -76,42 +69,24 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
-tasks.named('jar', Jar) {
-    manifest {
-        attributes([
-                'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
-                'Forge-Module-Layer'   : 'boot'
-        ])
-        attributes([
-                'Specification-Title'   : gradleutils.displayName.get(),
-                'Specification-Vendor'  : vendor,
-                'Specification-Version' : '1',
-                'Implementation-Title'  : gradleutils.displayName.get(),
-                'Implementation-Vendor' : vendor,
-                'Implementation-Version': '1.0'
-        ], 'net/minecraftforge/fml/earlydisplay/')
-    }
+license {
+    header = rootProject.file('LICENSE-header.txt')
 }
 
 publishing {
+    publications.register('mavenJava', MavenPublication).configure {
+        from components.java
+        artifactId = 'fmlearlydisplay'
+        pom {
+            name = project.name
+            description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
+            url = 'https://github.com/MinecraftForge/MinecraftForge'
+            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
+            license PomUtils.Licenses.LGPLv2_1
+        }
+    }
+    
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-
-    publications.register('mavenJava', MavenPublication) {
-        changelog.publish(it)
-        gradleutils.promote(it)
-
-        from components.java
-
-        pom {
-            description = project.description
-
-            gradleutils.pom.addRemoteDetails(pom)
-
-            licenses {
-                license gradleutils.pom.licenses.LGPLv2_1
-            }
-        }
-    }
-}
+}

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java

@@ -46,6 +46,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -68,7 +70,7 @@ import static org.lwjgl.opengl.GL32C.*;
  * Based on the prior ClientVisualization, with some personal touches.
  */
 public class DisplayWindow implements ImmediateWindowProvider {
-    private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}};
+    private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}, {3,2}};
     private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
     private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
 
@@ -88,12 +90,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
     // The GL ID of the window. Used for all operations
     private long window;
     // The thread that contains and ticks the window while Forge is loading mods
-    private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
-        final var thread = Executors.defaultThreadFactory().newThread(r);
-        thread.setName("EarlyDisplay");
-        thread.setDaemon(true);
-        return thread;
-    });
+    private ScheduledExecutorService renderScheduler;
     private int fbWidth;
     private int fbHeight;
     private int fbScale;
@@ -113,14 +110,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
         return "fmlearlywindow";
     }
 
-    @Override
-    public ImmediateWindowProvider selectBackend(String backend) {
-        // We only support opengl
-        if ("default".equals(backend) || "opengl".equals(backend))
-            return this;
-        return ImmediateWindowProvider.getFallbackHandler();
-    }
-
     @Override
     public Runnable initialize(String[] arguments) {
         String mcVersion = FMLLoader.versionInfo().mcVersion();
@@ -145,7 +134,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
             this.colourScheme = ColourScheme.BLACK;
         } else {
             try {
-                // check the options file for the color scheme
+                // check the options file for the colour scheme
                 var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
                 var keyName = "darkMojangStudiosBackground:";
                 for (String line : optionLines) {
@@ -160,7 +149,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         }
         this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
 
-        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion()));
+        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion));
         performanceInfo = new PerformanceInfo();
         return start(mcVersion, forgeVersion);
     }
@@ -249,7 +238,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
 
         var date = Calendar.getInstance();
         if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
-            this.elements.addFirst(RenderElement.squir());
+            this.elements.add(0, RenderElement.squir());
 
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -298,6 +287,12 @@ public class DisplayWindow implements ImmediateWindowProvider {
      * Start the window and Render Thread; we're ready to go.
      */
     public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
+        renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+            final var thread = Executors.defaultThreadFactory().newThread(r);
+            thread.setName("EarlyDisplay");
+            thread.setDaemon(true);
+            return thread;
+        });
         initWindow(mcVersion);
         this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
         return this::periodicTick;
@@ -309,7 +304,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         return this.glVersion;
     }
 
-    private static void crashElegantly(String errorDetails) {
+    private void crashElegantly(String errorDetails) {
         StringBuilder msgBuilder = new StringBuilder(2000);
         msgBuilder.append("Failed to initialize graphics window with current settings.\n");
         msgBuilder.append("\n\n");
@@ -320,18 +315,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
         LOGGER.error("ERROR DISPLAY\n"+msgBuilder);
         // we show the display on a new dedicated thread
         Executors.newSingleThreadExecutor().submit(()-> {
-            var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", 0);
-            if (res != 0) {
+            var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", false);
+            if (res) {
                 try {
                     Desktop.getDesktop().browse(URI.create(ERROR_URL));
                 } catch (IOException ioe) {
-                    TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", 0);
+                    TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", false);
                 }
             }
             System.exit(1);
         });
     }
-
     /**
      * Called to initialize the window when preparing for the Render Thread.
      *
@@ -467,9 +461,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         this.winWidth = x[0];
         this.winHeight = y[0];
 
-        // Setting the window position isn't supported on wayland, so check the error here
         glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
-        handleLastGLFWError();
 
         // Attempt setting the icon
 //        int[] channels = new int[1];
@@ -492,10 +484,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
 
         // Show the window
         glfwShowWindow(window);
-        // Getting the window position isn't supported on wayland, so check the error here
         glfwGetWindowPos(window, x, y);
-        handleLastGLFWError();
-        
         this.winX = x[0];
         this.winY = y[0];
         glfwGetFramebufferSize(window, x, y);
@@ -504,18 +493,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
         glfwPollEvents();
     }
 
-    private static void handleLastGLFWError() {
-        handleLastGLFWError((error, description) -> {
-            if (error == GLFW_FEATURE_UNAVAILABLE) {
-                // suppress window pos errors for unsupported platforms (wayland)
-                LOGGER.debug(String.format("Suppressing GLFW error: [0x%X]%s", error, description));
-                return;
-            }
-
-            throw new IllegalStateException(String.format("GLFW error: [0x%X]%s", error, description));
-        });
-    }
-
     private void winResize(long window, int width, int height) {
         if (window == this.window && width != 0 && height != 0) {
             this.winWidth = width;
@@ -535,7 +512,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
             this.winY = y;
         }
     }
-    private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
+    private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
         try (MemoryStack memorystack = MemoryStack.stackPush()) {
             PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
             int error = glfwGetError(pointerbuffer);
@@ -553,7 +530,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
      *
      * @return the Window we own.
      */
-    public long setupMinecraftWindow(final int width, final int height, final String title, final long monitorSupplier, final Supplier<Object> backend) {
+    public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
         // wait for the window to actually be initialized
         try {
             this.initializationFuture.get(30, TimeUnit.SECONDS);
@@ -573,11 +550,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
         var renderlockticket = false;
         do {
             try {
-                renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
-                if (++tries > 9) {
-                    Thread.dumpStack();
-                    crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
-                }
+                    renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
+                    if (++tries > 9) {
+                        Thread.dumpStack();
+                        crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
+                    }
             } catch (InterruptedException e) {
                 Thread.interrupted();
             }
@@ -587,7 +564,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
 
         glfwMakeContextCurrent(window);
         // Set the title to what the game wants
-        glfwSetWindowTitle(window, title);
+        glfwSetWindowTitle(window, title.get());
         glfwSwapInterval(0);
         // Clean up our hooks
         glfwSetFramebufferSizeCallback(window, null).free();
@@ -663,7 +640,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
     }
 
     public void addMojangTexture(final int textureId) {
-        this.elements.addFirst(RenderElement.mojang(textureId, framecount));
+        this.elements.add(0, RenderElement.mojang(textureId, framecount));
     }
 
     public void close() {
@@ -673,4 +650,4 @@ public class DisplayWindow implements ImmediateWindowProvider {
         this.context.elementShader().close();
         SimpleBufferBuilder.destroy();
     }
-}
+}

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java

@@ -22,8 +22,8 @@ public class RenderElement {
     static int globalAlpha = 255;
     private int retireCount;
 
-    @FunctionalInterface
     interface Renderer {
+
         void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
 
         default Renderer then(Renderer r) {
@@ -38,9 +38,6 @@ public class RenderElement {
     interface TextureRenderer {
         void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
     }
-
-    /** @deprecated Use {@link Renderer} directly. This was always eagerly resolved, making it an unnecessary wrapper. */
-    @Deprecated(since = "1.21.5", forRemoval = true)
     @FunctionalInterface
     interface Initializer extends Supplier<Renderer> {}
 
@@ -59,18 +56,11 @@ public class RenderElement {
         }
     }
 
-    /** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */
-    @Deprecated(since = "1.21.5", forRemoval = true)
     public RenderElement(final Initializer rendererInitializer) {
         this.bb = new SimpleBufferBuilder(1);
         this.renderer = rendererInitializer.get();
     }
 
-    public RenderElement(Renderer renderer) {
-        this.bb = new SimpleBufferBuilder(1);
-        this.renderer = renderer;
-    }
-
     public boolean render(DisplayContext ctx, int count) {
         this.renderer.accept(bb, ctx, count);
         return this.retireCount == 0 || this.retireCount < count;
@@ -85,7 +75,7 @@ public class RenderElement {
         List<SimpleFont.DisplayText> texts = new ArrayList<>();
         for (int i = messages.size() - 1; i >= 0; i--) {
             final StartupNotificationManager.AgeMessage pair = messages.get(i);
-            final float fade = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
+            final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
             if (fade <0.01f) continue;
             Message msg = pair.message();
             int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
@@ -94,9 +84,19 @@ public class RenderElement {
 
         font.generateVerticesForTexts(10, context.scaledHeight() -  texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
     }
+    public static RenderElement monag() {
+        return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
+            var size = 256;
+            var x0 = (ctx.width() - 2 * size) / 2;
+            var y0 = 64;
+            QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
+            QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
+        }));
+
+    }
 
     public static RenderElement mojang(final int textureId, final int frameStart) {
-        return new RenderElement((bb, ctx, frame) -> {
+        return new RenderElement(()->(bb, ctx, frame) -> {
             var size = 256 * ctx.scale();
             var x0 = (ctx.scaledWidth() - 2 * size) / 2;
             var y0 = 64 * ctx.scale() + 32;
@@ -116,7 +116,7 @@ public class RenderElement {
     }
 
     public static RenderElement forgeVersionOverlay(SimpleFont font, String version) {
-        return new RenderElement(RenderElement.initializeText(font, (bb, _, ctx)->
+        return new RenderElement(RenderElement.initializeText(font, (bb, fnt, ctx)->
                 font.generateVerticesForTexts(ctx.scaledWidth() - font.stringWidth(version) - 10,
                         ctx.scaledHeight() - font.lineSpacing() + font.descent() - 10, bb,
                         new SimpleFont.DisplayText(version, ctx.colourScheme.foreground().packedint(RenderElement.globalAlpha)))));
@@ -148,11 +148,11 @@ public class RenderElement {
         }));
     }
     public static RenderElement progressBars(SimpleFont font) {
-        return new RenderElement((bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
+        return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
     }
 
     public static RenderElement performanceBar(SimpleFont font) {
-        return new RenderElement((bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
+        return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
     }
 
     public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
@@ -178,19 +178,19 @@ public class RenderElement {
         var colour = (alpha << 24) | 0xFFFFFF;
         Renderer bar;
         if (pm.steps() == 0) {
-            bar = progressBar(ctx->new int[] {(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, _->colour, frame -> indeterminateBar(frame, cnt == 0));
+            bar = progressBar(ctx->new int[] {(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, f->colour, frame -> indeterminateBar(frame, cnt == 0));
         } else {
-            bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, _ -> colour, _ -> new float[]{0f, pm.progress()});
+            bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, f -> colour, f -> new float[]{0f, pm.progress()});
         }
-        Renderer label = (bb, ctx, _) -> renderText(font, text((ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, pm.label().getText(), colour), bb, ctx);
+        Renderer label = (bb, ctx, frame) -> renderText(font, text((ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, pm.label().getText(), colour), bb, ctx);
         return bar.then(label);
     }
     private static float[] indeterminateBar(int frame, boolean isActive) {
         if (RenderElement.globalAlpha != 0xFF || !isActive) {
-            return new float[] { 0f, 1f };
+            return new float[] {0f,1f};
         } else {
-            int progress = frame % 100;
-            return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
+            var progress = frame % 100;
+            return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
         }
     }
 
@@ -198,9 +198,9 @@ public class RenderElement {
         var y = 10 * context.scale();
         PerformanceInfo pi = context.performance();
         final int colour = hsvToRGB((1.0f - (float)Math.pow(pi.memory(), 1.5f)) / 3f, 1.0f, 0.5f);
-        var bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, BAR_WIDTH * ctx.scale()}, _ -> colour, _ -> new float[]{0f, pi.memory()});
+        var bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, BAR_WIDTH * ctx.scale()}, f -> colour, f -> new float[]{0f, pi.memory()});
         var width = font.stringWidth(pi.text());
-        Renderer label = (bb, ctx, _) -> renderText(font, text(ctx.scaledWidth() / 2 - width / 2, y + 18, pi.text(), context.colourScheme.foreground().packedint(globalAlpha)), bb, ctx);
+        Renderer label = (bb, ctx, frame) -> renderText(font, text(ctx.scaledWidth() / 2 - width / 2, y + 18, pi.text(), context.colourScheme.foreground().packedint(globalAlpha)), bb, ctx);
         bar.then(label).accept(buffer, context, frameNumber);
     }
 
@@ -249,8 +249,8 @@ public class RenderElement {
         };
     }
 
-    private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) {
-        return (bb, context, _) -> renderText(font, textGenerator, bb, context);
+    private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
+        return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
     }
 
     private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
@@ -262,15 +262,16 @@ public class RenderElement {
     }
 
     private static TextGenerator text(int x, int y, String text, int colour) {
-        return (bb, font, _) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
+        return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
     }
-
-    private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
-        int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
-        return (bb, ctx, frame) -> {
-            ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
-            ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
-            renderTexture(bb, ctx, frame, imgSize, positionAndColour);
+    private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
+        return ()->{
+            int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
+            return (bb, ctx, frame) -> {
+                ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
+                ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
+                renderTexture(bb, ctx, frame, imgSize, positionAndColour);
+            };
         };
     }
 
@@ -280,13 +281,21 @@ public class RenderElement {
         bb.draw();
     }
 
-    @Deprecated(since = "1.21.5", forRemoval = true)
+
     public static float clamp(float num, float min, float max) {
-        return Math.clamp(num, min, max);
+        if (num < min) {
+            return min;
+        } else {
+            return Math.min(num, max);
+        }
     }
 
     public static int clamp(int num, int min, int max) {
-        return Math.min(max, Math.max(num, min));
+        if (num < min) {
+            return min;
+        } else {
+            return Math.min(num, max);
+        }
     }
 
     public static int hsvToRGB(float hue, float saturation, float value) {

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/SimpleFont.java

@@ -22,7 +22,7 @@ public class SimpleFont {
     private final int textureNumber;
     private final int lineSpacing;
     private final int descent;
-    private static final int GLYPH_COUNT = 127 - 32;
+    private final int GLYPH_COUNT = 127-32;
     private final Glyph[] glyphs;
 
     private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
@@ -120,7 +120,7 @@ public class SimpleFont {
                 case '\n', '\t' -> 0;
                 case ' ' -> glyphs[0].charwidth();
                 default -> {
-                    if (c - 32 < GLYPH_COUNT && c > 32) {
+                    if (c - 32 < this.GLYPH_COUNT && c > 32) {
                         yield this.glyphs[c - 32].charwidth();
                     } else {
                         yield 0;
@@ -151,7 +151,7 @@ public class SimpleFont {
                     case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
                     case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
                     default -> {
-                        if (c-32 < GLYPH_COUNT && c > 32) {
+                        if (c-32 < font.GLYPH_COUNT && c > 32) {
                             pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
                         }
                         yield pos;

fmlloader/build.gradle

@@ -1,75 +1,67 @@
-import groovy.transform.CompileDynamic
-import groovy.transform.CompileStatic
-import groovy.transform.PackageScope
-import net.minecraftforge.forgedev.legacy.tasks.JarJarMetadataOptions
-import org.gradle.api.plugins.jvm.JvmTestSuite
-
-import javax.inject.Inject
+import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
     id 'java-library'
-    id 'jvm-test-suite'
     id 'maven-publish'
-    alias libs.plugins.licenser
-    alias libs.plugins.gradleutils
-    alias libs.plugins.gitversion
-    alias libs.plugins.changelog
-    alias libs.plugins.apt
-    id 'net.minecraftforge.forge.build.convention'
+    id 'net.minecraftforge.licenser'
+    id 'net.minecraftforge.gradleutils'
 }
 
-gradleutils.displayName = 'FMLLoader'
-final vendor = 'Forge Development LLC'
-description = 'Modifications to Minecraft to enable mod developers.'
+apply from: rootProject.file('build_shared.gradle')
+
+configurations.forEach{ it.transitive = false }
+
+dependencies {
+    compileOnly(libs.nulls)
+
+    api(libs.bundles.asm) // Needed by all the black magic
+    api(libs.forgespi)
+    api(libs.mergetool.api)
+    api(libs.log4j.api)
+    api(libs.slf4j.api)
+    api(libs.guava)
+    api(libs.gson)
+    api(libs.maven.artifact)
+    api(libs.apache.commons)
+    api(libs.bundles.night.config)
+    api(libs.modlauncher)
+    api(libs.coremods)
+    api(libs.mojang.logging)
+    api(libs.jarjar.selector)
+    api(libs.jarjar.meta)
+
+    implementation(libs.jopt.simple)
+    implementation(libs.securemodules)
+    implementation(libs.accesstransformers)
+    implementation(libs.terminalconsoleappender)
+    implementation(libs.jimfs)
+
+    implementation(libs.log4j.core)
+    annotationProcessor(libs.bundles.log4j)
+
+    testCompileOnly(libs.nulls)
+    testRuntimeOnly(libs.bootstrap)
+}
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
+    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
     withSourcesJar()
 }
 
-license {
-    header = rootProject.file('LICENSE-header.txt')
-}
-
-changelog {
-    from changelogBase
-}
-
-dependencies {
-    compileOnly libs.jetbrains.annotations
-
-    // TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the isntaller
-    api(libs.bundles.asm         ){ transitive = false } // Needed by all the black magic
-    api(libs.forgespi            ){ transitive = false }
-    api(libs.mergetool.api       ){ transitive = false }
-    api(libs.log4j.api           ){ transitive = false }
-    api(libs.slf4j.api           ){ transitive = false }
-    api(libs.guava               ){ transitive = false }
-    api(libs.gson                ){ transitive = false }
-    api(libs.maven.artifact      ){ transitive = false }
-    api(libs.apache.commons      ){ transitive = false }
-    api(libs.bundles.night.config){ transitive = false }
-    api(libs.modlauncher         ){ transitive = false }
-    api(libs.mojang.logging      ){ transitive = false }
-    api(libs.jarjar.selector     ){ transitive = false }
-    api(libs.jarjar.meta         ){ transitive = false }
-
-    implementation(libs.jopt.simple            ){ transitive = false }
-    implementation(libs.securemodules          ){ transitive = false }
-    implementation(libs.accesstransformers     ){ transitive = false }
-    implementation(libs.terminalconsoleappender){ transitive = false }
-    implementation(libs.jimfs                  ){ transitive = false }
-    implementation(libs.roimfs                 ){ transitive = false }
-
-    // Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
-    implementation(libs.log4j.core        ){ transitive = false }
-    annotationProcessor(libs.bundles.log4j){ transitive = false }
-}
-
-testing.suites.named('test', JvmTestSuite) {
-    dependencies {
-        compileOnly libs.jetbrains.annotations
-        runtimeOnly libs.bootstrap
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+            'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
+            'Forge-Module-Layer':    'boot'
+        ] as LinkedHashMap)
+        attributes([
+            'Specification-Title':   'FMLLoader',
+            'Specification-Vendor':  'Forge Development LLC',
+            'Specification-Version': '1',
+            'Implementation-Title':  'FMLLoader',
+            'Implementation-Vendor': 'Forge Development LLC',
+            'Implementation-Version': FORGE_VERSION
+        ] as LinkedHashMap, 'net/minecraftforge/fml/loading/')
     }
 }
 
@@ -77,114 +69,38 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
-tasks.named('jar', Jar) {
-    manifest {
-        attributes([
-                'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
-                'Forge-Module-Layer'   : 'boot'
-        ])
-        attributes([
-                'Specification-Title'   : gradleutils.displayName.get(),
-                'Specification-Vendor'  : vendor,
-                'Specification-Version' : '1',
-                'Implementation-Title'  : gradleutils.displayName.get(),
-                'Implementation-Vendor' : vendor,
-                'Implementation-Version': forgeVersion
-        ], 'net/minecraftforge/fml/loading/')
-    }
+license {
+    header = rootProject.file('LICENSE-header.txt')
 }
 
 publishing {
+    publications.register('mavenJava', MavenPublication).configure {
+        from components.java
+        artifactId = 'fmlloader'
+        pom {
+            name = project.name
+            description = 'Modifactions to Minecraft to enable mod developers.'
+            url = 'https://github.com/MinecraftForge/MinecraftForge'
+            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
+            license PomUtils.Licenses.LGPLv2_1
+        }
+    }
+    
     repositories {
         maven gradleutils.publishingForgeMaven
     }
+}
 
-    publications.register('mavenJava', MavenPublication) {
-        changelog.publish(it)
-        gradleutils.promote(it)
-
-        from components.java
-
-        pom {
-            description = project.description
-
-            gradleutils.pom.addRemoteDetails(pom)
-
-            licenses {
-                license gradleutils.pom.licenses.LGPLv2_1
-            }
-        }
+tasks.register('writeForgeVersionJson') {
+    doLast {
+        file('src/main/resources/forge_version.json').json = [
+            forge: FORGE_VERSION,
+            mc: MC_VERSION,
+            mcp: MCP_VERSION
+        ]
     }
 }
 
-// A simple task to write JSON to a file. Using Task#doLast to output files is no longer supported.
-// This code may seem verbose, but it's better this way.  If more projects need this, we can move it to buildSrc.
-@CompileStatic
-@PackageScope abstract class WriteForgeVersionJson extends DefaultTask {
-    abstract @Input Property<String> getForgeVersion()
-    abstract @Input Property<String> getMinecraftVersion()
-    abstract @Input Property<String> getMcpVersion()
-
-    abstract @OutputFile RegularFileProperty getOutputFile()
-
-    @Inject
-    WriteForgeVersionJson() {}
-
-    @TaskAction
-    @CompileDynamic
-    void exec() {
-        var json = new groovy.json.JsonBuilder()
-        json {
-            forge this.forgeVersion.get()
-            mc    this.minecraftVersion.get()
-            mcp   this.mcpVersion.get()
-        }
-        this.outputFile.asFile.get().text = json.toPrettyString()
-    }
-}
-
-tasks.register('writeForgeVersionJson', WriteForgeVersionJson) {
-    forgeVersion = project.forgeVersion
-    minecraftVersion = project.minecraftVersion
-    mcpVersion = project.mcpVersion
-
-    outputFile = file('src/main/resources/forge_version.json')
-}
-
-tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
-    metadataFile = project.file('src/main/resources/jarjar_options.json')
-    // This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually...
-    //add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class')
-    add(libs.mixinextras.forge) {
-        containedJarMetadata {
-            path = ''
-        }
-        resource = 'com/llamalad7/mixinextras/platform/forge/MixinExtrasConfigPlugin.class'
-        layer = 'GAMELIBRARY'
-        id = 'mixinextras'
-        nested = true
-    }
-}
-
-tasks.named('generateResources') {
-    dependsOn(
-            tasks.named('eclipseJdt'),
-            tasks.named('eclipseJdtApt'),
-            tasks.named('eclipseFactorypath'),
-            tasks.named('writeForgeVersionJson', WriteForgeVersionJson),
-            tasks.named('jarJarOptionsJson')
-    )
-}
-
-eclipse.classpath {
-    // We need to set the default output directory for the log4j annotation processor
-    // Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
-    // So we have to do a hacky whenMerged
-    //defaultOutputDir = file('bin/main')
-    file.whenMerged {
-        entries.each { entry ->
-            if (entry.kind == 'output' && entry.hasProperty('path'))
-                entry.path = 'bin/main'
-        }
-    }
+tasks.named('generateResources').configure {
+    dependsOn('writeForgeVersionJson')
 }

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/CapabilityTokenSubclass.java

@@ -34,10 +34,11 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
  *  }</code>
  * </pre>
  */
-public final class CapabilityTokenSubclass implements ILaunchPluginService {
+public class CapabilityTokenSubclass implements ILaunchPluginService {
+
     private static final String FUNC_NAME = "getType";
     private static final String FUNC_DESC = "()Ljava/lang/String;";
-    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; // Don't directly reference this to prevent class loading.
+    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
 
     @Override
     public String name() {
@@ -55,11 +56,8 @@ public final class CapabilityTokenSubclass implements ILaunchPluginService {
         String internalName = classType.getInternalName();
         if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
             return NAY;
-
-        if (internalName.startsWith("net/minecraftforge/common/capabilities/"))
-            return YAY;
         
-        return internalName.contains("$") ? YAY : NAY; // Anonymous subclasses only
+        return YAY;
     }
 
     @Override
@@ -72,7 +70,7 @@ public final class CapabilityTokenSubclass implements ILaunchPluginService {
             }
             return ComputeFlags.SIMPLE_REWRITE;
         } else if (CAP_INJECT.equals(classNode.superName)) {
-            var cls = new Object() { String value = null; };
+            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) {
@@ -108,4 +106,8 @@ public final class CapabilityTokenSubclass implements ILaunchPluginService {
             return ComputeFlags.NO_REWRITE;
         }
     }
+
+    private static final class Holder {
+        String value;
+    }
 }

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/ObjectHolderDefinalize.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+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;
+import java.util.stream.Stream;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AnnotationNode;
+import org.objectweb.asm.tree.ClassNode;
+import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
+
+/**
+ * Removes the final modifier from fields with the @ObjectHolder annotation, prevents the JITer from in lining them so our runtime replacements can work.
+ * Will also de-finalize all fields in on class level annotations.
+ */
+public class ObjectHolderDefinalize implements ILaunchPluginService {
+    // Hardcoded map of vanilla classes that should have object holders for each field of the given registry type.
+    // IMPORTANT: Updates to this collection must be reflected in ObjectHolderRegistry. Duplicated cuz classloaders, yay!
+    // Classnames are validated in ObjectHolderRegistry.
+    private static final Map<String, VanillaObjectHolderData> VANILLA_OBJECT_HOLDERS = Stream.of(
+            new VanillaObjectHolderData("net.minecraft.world.level.block.Blocks", "block", "net.minecraft.world.level.block.Block"),
+            new VanillaObjectHolderData("net.minecraft.world.item.Items", "item", "net.minecraft.world.item.Item"),
+            new VanillaObjectHolderData("net.minecraft.world.item.enchantment.Enchantments", "enchantment", "net.minecraft.world.item.enchantment.Enchantment"),
+            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()));
+    private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
+            .map(it -> it.replace('.', '/'))
+            .collect(Collectors.toUnmodifiableSet());
+    private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
+    private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
+
+    @Override
+    public String name() {
+        return "object_holder_definalize";
+    }
+
+    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
+    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
+
+    @Override
+    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) {
+        return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
+    }
+
+    @SuppressWarnings("unused")
+    private String getValue(List<AnnotationNode> lst)
+    {
+        AnnotationNode ann = lst.stream().filter(n -> n.desc.equals(OBJECT_HOLDER)).findFirst().get();
+        if (ann.values != null)
+        {
+            for (int x = 0; x < ann.values.size() - 1; x += 2) {
+                if (ann.values.get(x).equals("value")) {
+                    return (String)ann.values.get(x + 1);
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
+    {
+        final AtomicBoolean changes = new AtomicBoolean();
+        //Must be public static finals, and non-array objects
+
+        //Fix Annotated Fields before injecting from class level
+        classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
+        {
+            int prev = f.access;
+            f.access &= ~Opcodes.ACC_FINAL; //Strip final
+            f.access |= Opcodes.ACC_SYNTHETIC; //Add Synthetic so we can check in runtime. ? Good idea?
+            changes.compareAndSet(false, prev != f.access);
+        });
+
+        if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
+        {
+            classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
+            {
+                int prev = f.access;
+                f.access &= ~Opcodes.ACC_FINAL;
+                f.access |= Opcodes.ACC_SYNTHETIC;
+                /*if (!hasHolder(f.visibleAnnotations)) //Add field level annotation, doesn't do anything until after we figure out how ASMDataTable is gatherered
+                {
+                   if (value == null)
+                       f.visitAnnotation(OBJECT_HOLDER, true);
+                   else
+                       f.visitAnnotation(OBJECT_HOLDER, true).visit("value", value + ":" + f.name.toLowerCase());
+                }*/
+                changes.compareAndSet(false, prev != f.access);
+            });
+        }
+        return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
+    }
+
+    private record VanillaObjectHolderData(String holderClass, String registryName, String registryType) {}
+}

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/RuntimeEnumExtender.java

@@ -7,9 +7,9 @@ package net.minecraftforge.fml.common.asm;
 
 import java.util.EnumSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.LoadingModList;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -47,21 +47,16 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
     private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
-    private static final class LazyInit {
-        private LazyInit() {}
-        private static final boolean ANY_MODS = LoadingModList.getMods().size() > 2; // 2: forge, minecraft
-    }
-
     @Override
     public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty || !LazyInit.ANY_MODS)
+        if (isEmpty)
             return NAY;
 
         String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraft/client/model") || internalName.startsWith("net/minecraft/world"))
-            return YAY;
+        if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
+            return NAY;
 
-        return NAY;
+        return YAY;
     }
 
     @Override

fmlloader/src/main/java/net/minecraftforge/fml/loading/BackgroundWaiter.java

@@ -6,13 +6,14 @@
 package net.minecraftforge.fml.loading;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 public class BackgroundWaiter {
+    private static final ExecutorService runner = Executors.newSingleThreadExecutor();
 
     public static void runAndTick(Runnable r, Runnable tick) {
-        var runner = Executors.newSingleThreadExecutor();
         ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
         final Future<?> work = runner.submit(r);
         do {

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java

@@ -109,7 +109,7 @@ public class FMLConfig
         }
         if (!configSpec.isCorrect(configData)) {
             LOGGER.warn(CORE, "Configuration file {} is not correct. Correcting", configFile);
-            configSpec.correct(configData, (_, path, incorrectValue, correctedValue) ->
+            configSpec.correct(configData, (action, path, incorrectValue, correctedValue) ->
                     LOGGER.info(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue));
         }
         configData.putAllComments(configComments);

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLEnvironment.java

@@ -20,8 +20,8 @@ public class FMLEnvironment
     public static final boolean secureJarsEnabled = FMLLoader.isSecureJarEnabled();
 
     static void setupInteropEnvironment(IEnvironment environment) {
-        environment.computePropertyIfAbsent(IEnvironment.Keys.NAMING.get(), _->naming);
-        environment.computePropertyIfAbsent(Environment.Keys.DIST.get(), _->dist);
+        environment.computePropertyIfAbsent(IEnvironment.Keys.NAMING.get(), v->naming);
+        environment.computePropertyIfAbsent(Environment.Keys.DIST.get(), v->dist);
     }
 
     public static class Keys {

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java

@@ -16,6 +16,7 @@ import net.minecraftforge.accesstransformer.service.AccessTransformerService;
 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.slf4j.Logger;
 
 import java.nio.file.Path;
@@ -30,11 +31,14 @@ import java.util.function.BiFunction;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
 
-public final class FMLLoader {
+public class FMLLoader {
     private static final Logger LOGGER = LogUtils.getLogger();
     private static AccessTransformerService accessTransformer;
+    private static ICoreModProvider coreModProvider;
+    private static LanguageLoadingProvider languageLoadingProvider;
     private static Dist dist;
     private static String naming;
+    private static LoadingModList loadingModList;
     private static RuntimeDistCleaner runtimeDistCleaner;
     private static Path gamePath;
     private static final VersionInfo versionInfo = VersionInfo.detect();
@@ -52,7 +56,10 @@ public final class FMLLoader {
 
         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"));
         checkPackage(Environment.class, "2.0", "ForgeSPI");
 
         try {
@@ -90,7 +97,6 @@ public final class FMLLoader {
         }
     }
 
-    @SuppressWarnings("unused")
     private static <T> T getSingleService(Class<T> clazz, String name) throws IncompatibleEnvironmentException {
           var providers = new ArrayList<T>();
           for (var itr = ServiceLoader.load(FMLLoader.class.getModule().getLayer(), clazz).iterator(); itr.hasNext(); ) {
@@ -141,25 +147,35 @@ public final class FMLLoader {
     }
 
     public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
-        LOGGER.debug(SCAN, "Scanning for Mod Locators");
-        modValidator = ModDiscoverer.discoverMods(arguments);
+        LOGGER.debug(SCAN,"Scanning for Mod Locators");
+        var modDiscoverer = new ModDiscoverer(arguments);
+        modValidator = modDiscoverer.discoverMods();
         var pluginResources = modValidator.getPluginResources();
         return List.of(pluginResources);
     }
 
     public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) {
         moduleLayerManager = layerManager;
-        LanguageLoadingProvider.reload();
+        languageLoadingProvider = new LanguageLoadingProvider();
         backgroundScanHandler = modValidator.stage2Validation();
+        loadingModList = backgroundScanHandler.getLoadingModList();
         return List.of(modValidator.getModResources());
     }
 
+    public static ICoreModProvider getCoreModProvider() {
+        return coreModProvider;
+    }
+
+    public static LanguageLoadingProvider getLanguageLoadingProvider() {
+        return languageLoadingProvider;
+    }
+
     public static CommonLaunchHandler getLaunchHandler() {
         return commonLaunchHandler;
     }
 
     public static void addAccessTransformer(Path atPath, ModFile modName) {
-        LOGGER.debug(SCAN, "Adding Access Transformer {} in {}", atPath, modName.getFilePath());
+        LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath());
         accessTransformer.offerResource(atPath, modName.getFileName());
     }
 
@@ -173,6 +189,10 @@ public final class FMLLoader {
         progressWindowTick.run();
     }
 
+    public static LoadingModList getLoadingModList() {
+        return loadingModList;
+    }
+
     public static Path getGamePath() {
         return gamePath;
     }

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java

@@ -7,16 +7,19 @@ package net.minecraftforge.fml.loading;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.*;
+import joptsimple.OptionSpecBuilder;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.Environment;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BiFunction;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 public class FMLServiceProvider implements ITransformationService {
@@ -41,7 +44,7 @@ public class FMLServiceProvider implements ITransformationService {
         LOGGER.debug(CORE, "Loading configuration");
         FMLConfig.load();
         LOGGER.debug(CORE, "Preparing ModFile");
-        environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), _->ModFile::new);
+        environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
         LOGGER.debug(CORE, "Preparing launch handler");
         FMLLoader.setupLaunchHandler(environment, arguments);
         FMLEnvironment.setupInteropEnvironment(environment);
@@ -67,6 +70,7 @@ public class FMLServiceProvider implements ITransformationService {
     @SuppressWarnings("rawtypes")
     @Override
     public @NotNull List<ITransformer> transformers() {
-        return List.of();
+        LOGGER.debug(CORE, "Loading coremod transformers");
+        return new ArrayList<>(FMLLoader.getCoreModProvider().getCoreModTransformers());
     }
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java

@@ -10,13 +10,8 @@ import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import joptsimple.OptionParser;
-
-import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.Collectors;
@@ -46,64 +41,18 @@ public class ImmediateWindowHandler {
             if (provider == null) {
                 LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
                 provider = new DummyProvider();
-            } else {
-                var backend = findBackend(arguments);
-                var newProvider = provider.selectBackend(backend);
-                if (provider != newProvider) {
-                    if (newProvider == null)
-                        newProvider = new DummyProvider();
-
-                    LOGGER.info("ImmediateWindowProvider {} does not support {}, switching to {}", provider.name(), backend, newProvider.name());
-                    provider = newProvider;
-                }
             }
         }
-
         // Only update config if the provider isn't the dummy provider
         if (!Objects.equals(provider.name(), "dummyprovider"))
             FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER, provider.name());
-
         FMLLoader.progressWindowTick = provider.initialize(arguments);
         earlyProgress = StartupNotificationManager.addProgressBar("EARLY", 0);
         earlyProgress.label("Bootstrapping Minecraft");
     }
 
-    private static String findBackend(String[] arguments) {
-        // Try and parse from the command line arguments
-        var parser = new OptionParser();
-        var backendOption = parser.accepts("graphicsBackend").withRequiredArg();
-        parser.allowsUnrecognizedOptions();
-        var parsed = parser.parse(arguments);
-
-        if (parsed.has(backendOption))
-            return parsed.valueOf(backendOption).toLowerCase(Locale.ENGLISH);
-
-
-        // Read the options.txt if it exists.
-        var optionsFile = FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt"));
-        if (!Files.exists(optionsFile)) // Default is OpenGL first
-            return "default";
-
-        List<String> lines = null;
-        try {
-            lines = Files.readAllLines(optionsFile);
-        } catch (IOException e) {
-            return "default"; // We failed to read for some reason, assume we're using the default.
-        }
-
-        final String key = "preferredGraphicsBackend:";
-        for (var line : lines) {
-            if (line.startsWith(key)) {
-                var backend = line.substring(key.length() + 1, line.length() - 1);
-                return backend.toLowerCase(Locale.ENGLISH);
-            }
-        }
-
-        return "default";
-    }
-
-    public static long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
-        return provider.setupMinecraftWindow(width, height, title, monitor, backend);
+    public static long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
+        return provider.setupMinecraftWindow(width, height, title, monitor);
     }
 
     public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
@@ -134,7 +83,7 @@ public class ImmediateWindowHandler {
         earlyProgress.label(message);
     }
 
-    record DummyProvider() implements ImmediateWindowProvider {
+    private record DummyProvider() implements ImmediateWindowProvider {
         private static Method NV_HANDOFF;
         private static Method NV_POSITION;
         private static Method NV_OVERLAY;
@@ -155,9 +104,9 @@ public class ImmediateWindowHandler {
         }
 
         @Override
-        public long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
+        public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
             try {
-                var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor, backend);
+                var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor);
                 return longsupplier.getAsLong();
             } catch (Throwable e) {
                 throw new IllegalStateException("How did you get here?", e);

fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowProvider.java

@@ -8,6 +8,8 @@ package net.minecraftforge.fml.loading;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
 import java.util.function.Supplier;
 
 /**
@@ -24,36 +26,11 @@ import java.util.function.Supplier;
  * No doubt many more things can be said here.
  */
 public interface ImmediateWindowProvider {
-    /**
-     * Returns a new instance of ImmediateWindowProvider which just bounces to the vanilla code.
-     * This can be useful when you want to disable your provider and defer to vanilla behavior for some reason.
-     */
-    public static ImmediateWindowProvider getFallbackHandler() {
-        return new ImmediateWindowHandler.DummyProvider();
-    }
-
     /**
      * @return The name of this window provider. Do NOT use fmlearlywindow.
      */
     String name();
 
-    /**
-     * This is called before initialize, but after reading the preferred graphics backend config value from the user's
-     * options.txt or command line.
-     *
-     * If you do not support the requested backend, you can return a new ImmediateWindowProvider that does.
-     * {@link #getFallbackHandler()} can be used to get an instance that falls back to Vanilla's code effectively
-     * disabling the early loading screen.
-     *
-     * @param backend - The backend the user has selected, known values: "default", "opengl", and "vulkan". However this
-     * 	                is read from the config file, or command line arguments so could be anything.
-     *                  Default and OpenGL are treated the same, attempting to load OpenGL first, then Vulkan.
-     *                  Vulkan attempts to load Vulkan first then OpenGL
-     */
-    default ImmediateWindowProvider selectBackend(String backend) {
-        return this;
-    }
-
     /**
      * This is called very early on to initialize ourselves. Use this to initialize the window and other GL core resources.
      *
@@ -89,7 +66,7 @@ public interface ImmediateWindowProvider {
      * @param monitor This is the monitor it should appear on.
      * @return The window id
      */
-    long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend);
+    long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor);
 
     /**
      * This is called after window handoff to allow us to tell Mojang about our window's position. This might give a

fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java

@@ -18,6 +18,7 @@ import org.slf4j.Logger;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Consumer;
@@ -27,36 +28,43 @@ import java.util.stream.Stream;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-public final class LanguageLoadingProvider {
-    public static void forEach(Consumer<IModLanguageProvider> consumer) {
+public class LanguageLoadingProvider {
+    public void forEach(Consumer<IModLanguageProvider> consumer) {
         providers.forEach(consumer);
     }
 
-    public static <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
+    public <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
         return providers.stream().map(function);
     }
 
-    public static void reload() {
+    public void reload() {
         loadLanguageProviders();
     }
 
+    /** This doesn't actually do anything with the argument, so just call reload(). Not sure when cpw broke that. */
+    @Deprecated(forRemoval = true, since = "1.20.2")
+    public void addAdditionalLanguages(List<ModFile> modFiles) {
+        reload();
+    }
+
     /*==========================================================================*
-     *                        INTERNAL                                          *
+     *                        INTERNAL SHIT                                     *
      *==========================================================================*/
     private static final Logger LOGGER = LogUtils.getLogger();
-    private static final ServiceLoader<IModLanguageProvider> serviceLoader;
-    private static final ArrayList<IModLanguageProvider> providers = new ArrayList<>();
-    private static final HashMap<String, Wrapper> providersByName = new HashMap<>();
+    private final ServiceLoader<IModLanguageProvider> serviceLoader;
+    private final List<IModLanguageProvider> providers = new ArrayList<>();
+    private final Map<String, Wrapper> providersByName = new HashMap<>();
     private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev");
 
     private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
 
-    static {
+    LanguageLoadingProvider() {
         var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
         serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
+        loadLanguageProviders();
     }
 
-    private static void loadLanguageProviders() {
+    private void loadLanguageProviders() {
         providers.clear();
         providersByName.clear();
 
@@ -89,7 +97,7 @@ public final class LanguageLoadingProvider {
         }
     }
 
-    public static IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
+    public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
         var consumer = mod.getFileName();
         var wrapper = providersByName.get(language);
 

fmlloader/src/main/java/net/minecraftforge/fml/loading/LoadingModList.java

@@ -5,46 +5,113 @@
 
 package net.minecraftforge.fml.loading;
 
+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.jetbrains.annotations.Nullable;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
-/// Master list of all mods in the loading context
-public sealed interface LoadingModList permits LoadingModListImpl {
-    static ModFileInfo getModFileById(String modId) {
-        return get().fileById().get(modId);
+/**
+ * Master list of all mods <em>in the loading context. This class cannot refer outside the
+ * loading package</em>
+ */
+public class LoadingModList {
+    private static LoadingModList INSTANCE;
+    private final List<ModFileInfo> modFiles;
+    private final List<ModInfo> sortedList;
+    private final Map<String, ModFileInfo> fileById;
+    private final List<EarlyLoadingException> preLoadErrors;
+    private List<IModFile> brokenFiles;
+
+    private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
+        this.modFiles = modFiles.stream()
+                .map(ModFile::getModFileInfo)
+                .map(ModFileInfo.class::cast)
+                .toList();
+        this.sortedList = sortedList.stream()
+                .map(ModInfo.class::cast)
+                .toList();
+        this.fileById = this.modFiles.stream()
+                .map(ModFileInfo::getMods)
+                .flatMap(Collection::stream)
+                .map(ModInfo.class::cast)
+                .collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
+        this.preLoadErrors = new ArrayList<>();
     }
 
-    static List<ModFileInfo> getModFiles() {
-        return get().getModFiles();
+    public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) {
+        INSTANCE = new LoadingModList(modFiles, sortedList);
+        if (earlyLoadingException != null)
+            INSTANCE.preLoadErrors.add(earlyLoadingException);
+        return INSTANCE;
     }
 
-    static List<ModInfo> getMods() {
-        return get().getMods();
+    public static LoadingModList get() {
+        return INSTANCE;
     }
 
-    static @Nullable Path findResource(String className) {
-        for (ModFileInfo modFileInfo : get().getModFiles()) {
-            Path resource = modFileInfo.getFile().findResource(className);
+    public void addCoreMods() {
+        modFiles.stream()
+                .map(ModFileInfo::getFile)
+                .map(ModFile::getCoreMods)
+                .flatMap(List::stream)
+                .forEach(FMLLoader.getCoreModProvider()::addCoreMod);
+    }
+
+    public void addAccessTransformers() {
+        for (ModFileInfo modFile : modFiles) {
+            ModFile mod = modFile.getFile();
+            var at = mod.getAccessTransformer().orElse(null);
+            if (at != null) {
+                FMLLoader.addAccessTransformer(at, mod);
+            }
+        }
+    }
+
+    public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
+        backgroundScanHandler.setLoadingModList(this);
+        modFiles.stream()
+                .map(ModFileInfo::getFile)
+                .forEach(backgroundScanHandler::submitForScanning);
+    }
+
+    public List<ModFileInfo> getModFiles() {
+        return modFiles;
+    }
+
+    public Path findResource(final String className) {
+        for (ModFileInfo mf : modFiles) {
+            final Path resource = mf.getFile().findResource(className);
             if (Files.exists(resource)) return resource;
         }
         return null;
     }
 
-    static List<EarlyLoadingException> getErrors() {
-        return get().getErrors();
+    public ModFileInfo getModFileById(String modid) {
+        return this.fileById.get(modid);
     }
 
-    static List<IModFile> getBrokenFiles() {
-        return get().getBrokenFiles();
+    public List<ModInfo> getMods() {
+        return this.sortedList;
     }
 
-    private static LoadingModListImpl get() {
-        return LoadingModListImpl.get();
+    public List<EarlyLoadingException> getErrors() {
+        return preLoadErrors;
+    }
+
+    public void setBrokenFiles(final List<IModFile> brokenFiles) {
+        this.brokenFiles = brokenFiles;
+    }
+
+    public List<IModFile> getBrokenFiles() {
+        return this.brokenFiles;
     }
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/LoadingModListImpl.java

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
-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 java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-
-import com.mojang.logging.LogUtils;
-
-/**
- * Master list of all mods <em>in the loading context. This class cannot refer outside the
- * loading package</em>
- */
-record LoadingModListImpl(
-        List<ModFileInfo> getModFiles,
-        List<ModInfo> getMods,
-        Map<String, ModFileInfo> fileById,
-        ArrayList<EarlyLoadingException> getErrors,
-        ArrayList<IModFile> getBrokenFiles
-) implements LoadingModList {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static ModSorter.State temp;
-
-    LoadingModListImpl(List<ModFile> modFiles, List<ModInfo> sortedList) {
-        var modFileInfos = modFiles.stream()
-                .map(ModFile::getModFileInfo)
-                .map(ModFileInfo.class::cast)
-                .toList();
-        sortedList = sortedList.stream().toList();
-        var fileById = modFileInfos.stream()
-                .map(ModFileInfo::getMods)
-                .flatMap(Collection::stream)
-                .map(ModInfo.class::cast)
-                .collect(Collectors.toUnmodifiableMap(ModInfo::getModId, ModInfo::getOwningFile));
-        this(modFileInfos, sortedList, fileById, new ArrayList<>(), new ArrayList<>());
-    }
-
-    static LoadingModListImpl init(ModSorter.State modSorterState, EarlyLoadingException earlyLoadingException) {
-        temp = modSorterState;
-        var instance = get();
-        if (earlyLoadingException != null)
-            instance.getErrors.add(earlyLoadingException);
-        temp = null;
-        instance.addAccessTransformers();
-        return instance;
-    }
-
-    static LoadingModListImpl get() {
-        final class LazyInit {
-            private LazyInit() {}
-            private static final LoadingModListImpl INSTANCE
-                    = new LoadingModListImpl(LoadingModListImpl.temp.files(), LoadingModListImpl.temp.mods());
-        }
-        return LazyInit.INSTANCE;
-    }
-
-    private void addAccessTransformers() {
-        var errors = new ArrayList<ExceptionData>();
-
-        for (ModFileInfo modFile : getModFiles) {
-            ModFile mod = modFile.getFile();
-            for (var at : mod.getAccessTransformers()) {
-                if (!Files.exists(at)) {
-                    var message = "Invalid mod file: " + modFile.getFile().getFileName() + ". Missing Access Transformer: " + at;
-                    errors.add(new ExceptionData(message));
-                    LOGGER.error(message);
-                } else
-                    FMLLoader.addAccessTransformer(at, mod);
-            }
-        }
-
-        if (!errors.isEmpty())
-            getErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
-    }
-}

fmlloader/src/main/java/net/minecraftforge/fml/loading/MCPNamingService.java

@@ -7,6 +7,7 @@ package net.minecraftforge.fml.loading;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.INameMappingService;
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 
 import java.io.BufferedReader;

fmlloader/src/main/java/net/minecraftforge/fml/loading/MavenCoordinateResolver.java

@@ -6,6 +6,7 @@
 package net.minecraftforge.fml.loading;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 /**
  * Convert a maven coordinate into a Path.

fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java

@@ -7,10 +7,8 @@ package net.minecraftforge.fml.loading;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
-import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
-import cpw.mods.modlauncher.api.TypesafeMap;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
 
 import org.jetbrains.annotations.ApiStatus;
@@ -42,17 +40,6 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
 
     @Override
     public void earlyInitialization(final String launchTarget, final String[] arguments) {
-        boolean isMixinEnabledInDev = false;
-        for (String arg : arguments) {
-            if (arg.startsWith("-mixin") || arg.startsWith("--mixin")) {
-                isMixinEnabledInDev = true;
-                break;
-            }
-        }
-        Launcher.INSTANCE.blackboard().putIfAbsent(
-            TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "isMixinEnabledInDev", Boolean.class),
-            isMixinEnabledInDev
-        );
         ImmediateWindowHandler.load(launchTarget, arguments);
     }
 

fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java

@@ -33,10 +33,10 @@ import java.util.stream.Stream;
 
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-public final class ModSorter {
+public class ModSorter {
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    record State(List<ModFile> files, List<ModInfo> mods) {}
+    private record State(List<ModFile> files, List<ModInfo> mods) {}
 
     private ModSorter() {}
 
@@ -46,13 +46,13 @@ public final class ModSorter {
         List<ModFile> modFiles;
 
         try {
-            modFiles = UniqueModListBuilder.buildUniqueList(mods).modFiles();
+            modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
         } catch (EarlyLoadingException e) {
             // We cannot build any list with duped mods. We have to abort immediately and report it
             // Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
             // So all this is really doing is wasting time.
             // But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
-            return LoadingModListImpl.init(systemMods, e);
+            return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
         }
 
         var named = new HashMap<String, ModInfo>();
@@ -66,15 +66,15 @@ public final class ModSorter {
 
         // if we miss one or the other, we abort now
         if (!failedList.isEmpty()) {
-            return LoadingModListImpl.init(systemMods, new EarlyLoadingException("failure to validate mod list", null, failedList));
+            return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
         } else {
             // Otherwise, lets try and sort the modlist and proceed
             try {
                 var sorted = sort(modFiles, named);
-                return LoadingModListImpl.init(sorted, null);
+                return LoadingModList.of(sorted.files(), sorted.mods(), null);
             } catch (EarlyLoadingException e) {
                 // The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
-                return LoadingModListImpl.init(systemMods, e);
+                return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
             }
         }
     }

fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java

@@ -27,58 +27,34 @@ import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
-public final class RuntimeDistCleaner implements ILaunchPluginService {
+public 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() {
         return "runtimedistcleaner";
     }
 
-    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
-    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
-
-    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty)
-            return NAY;
-
-        String internalName = classType.getInternalName();
-
-        // Only apply to MC classes when on a dedicated server in a production environment
-        if (FMLEnvironment.production)
-            return FMLEnvironment.dist.isDedicatedServer() && isMinecraftClass(internalName) ? YAY : NAY;
-
-        // For dev time it's a bit trickier so that we can throw exceptions when someone uses @OnlyIn in their mod code,
-        // so that it's more obvious that the behaviour they're expecting won't work in production anymore
-        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() && isMinecraftClass(internalName))
-            return NAY;
-
-        return YAY; // mod classes might have @OnlyIn, so parse them in dev to find out and throw if they do
-    }
-
     @Override
     public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
         var changed = false;
 
         var annotations = unpack(classNode.visibleAnnotations);
-        var isNonMinecraftClass = !isMinecraftClass(classNode.name);
 
         if (remove(annotations, 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);
+            throw new RuntimeException("Attempted to load class "+ classNode.name  + " for invalid dist "+ DIST);
         }
 
-        if (isNonMinecraftClass && !annotations.isEmpty())
-            throw new UnsupportedOperationException("Mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
+        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) {
@@ -86,7 +62,7 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
                     continue;
 
                 if (classNode.interfaces.remove(ann.intf)) {
-                    LOGGER.debug(DISTXFORM, "Removing Interface: {} implements {}", classNode.name, ann.intf);
+                    LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, ann.intf);
                     changed = true;
                 }
             }
@@ -110,9 +86,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
                 LOGGER.debug(DISTXFORM, "Removing field: {}.{}", classNode.name, field.name);
                 itr.remove();
                 changed = true;
-
-                if (isNonMinecraftClass)
-                    throw new UnsupportedOperationException("Field " + field.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
             }
         }
 
@@ -124,9 +97,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
                 itr.remove();
                 lambdaGatherer.accept(method);
                 changed = true;
-
-                if (isNonMinecraftClass)
-                    throw new UnsupportedOperationException("Method " + method.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
             }
         }
 
@@ -153,7 +123,7 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         return changed ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
     }
 
-    private record Target(String side, String intf) {
+    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]
@@ -207,8 +177,16 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         return false;
     }
 
-    private static boolean isMinecraftClass(final String internalName) {
-        return internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/");
+    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;
     }
 
     @SuppressWarnings("unchecked")
@@ -220,7 +198,22 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         };
     }
 
-    private static final class LambdaGatherer extends MethodVisitor {
+    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
+    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
+
+    @Override
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        return YAY;
+    }
+
+    private static class LambdaGatherer extends MethodVisitor {
         private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
                 "java/lang/invoke/LambdaMetafactory", "metafactory",
                 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",

fmlloader/src/main/java/net/minecraftforge/fml/loading/StringSubstitutor.java

@@ -12,7 +12,6 @@ import java.util.Map;
 import org.apache.commons.lang3.text.StrLookup;
 import org.apache.commons.lang3.text.StrSubstitutor;
 
-// TODO: [FML] Remove this
 @SuppressWarnings("deprecation")
 public class StringSubstitutor {
     private static final Map<String, String> GLOBALS = Map.of(

fmlloader/src/main/java/net/minecraftforge/fml/loading/StringUtils.java

@@ -26,7 +26,6 @@ public class StringUtils {
         return java.util.stream.Stream.of(endings).anyMatch(lowerSearch::endsWith);
     }
 
-    @SuppressWarnings("deprecation")
     public static URL toURL(final String string) {
         if (string == null || string.trim().isEmpty() || string.contains("myurl.me") || string.contains("example.invalid"))
             return null;

fmlloader/src/main/java/net/minecraftforge/fml/loading/UniqueModListBuilder.java

@@ -17,6 +17,8 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
@@ -24,12 +26,19 @@ import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
 @ApiStatus.Internal
 @Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
-public final class UniqueModListBuilder {
-    private UniqueModListBuilder() {}
+public class UniqueModListBuilder {
+    private final static Logger LOGGER = LogUtils.getLogger();
 
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private final List<ModFile> modFiles;
+
+    public UniqueModListBuilder(final List<ModFile> modFiles) {
+        this.modFiles = modFiles;
+    }
+
+    public UniqueModListData buildUniqueList() {
+        List<ModFile> uniqueModList;
+        List<ModFile> uniqueLibListWithVersion;
 
-    public static UniqueModListData buildUniqueList(List<ModFile> modFiles) {
         // Collect mod files by module name. This will be used for deduping purposes
         final Map<String, List<ModFile>> modFilesByFirstId = modFiles.stream()
                 .filter(mf -> mf.getModFileInfo() != null)
@@ -40,12 +49,12 @@ public final class UniqueModListBuilder {
                 .collect(groupingBy(UniqueModListBuilder::getModId));
 
         // Select the newest by artifact version sorting of non-unique files thus identified
-        final List<ModFile> uniqueModList = modFilesByFirstId.entrySet().stream()
+        uniqueModList = modFilesByFirstId.entrySet().stream()
                 .map(UniqueModListBuilder::selectNewestModInfo)
                 .toList();
 
         // Select the newest by artifact version sorting of non-unique files thus identified
-        final List<ModFile> uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
+        uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
                 .map(UniqueModListBuilder::selectNewestModInfo)
                 .toList();
 
@@ -57,10 +66,12 @@ public final class UniqueModListBuilder {
                 .collect(groupingBy(IModInfo::getModId));
 
         // Transform to the full lib id list
-        final List<List<ModFile>> versionedLibs = uniqueLibListWithVersion.stream()
+        final Map<String, List<ModFile>> versionedLibIds = uniqueLibListWithVersion.stream()
                 .map(UniqueModListBuilder::getModId)
-                .map(libFilesWithVersionByModuleName::get)
-                .toList();
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    libFilesWithVersionByModuleName::get
+                ));
 
         // Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
         // We can't handle this
@@ -73,24 +84,24 @@ public final class UniqueModListBuilder {
                 )).toList();
 
         if (!dupedModErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate mods:\n{}", String.join("\n", dupedModErrors));
+            LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
             throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
-                    .map(EarlyLoadingException.ExceptionData::new)
+                    .map(s -> new EarlyLoadingException.ExceptionData(s))
                     .toList());
         }
 
 
-        final List<String> dupedLibErrors = versionedLibs.stream()
-                .filter(libModFiles -> libModFiles.size() > 1)
+        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(", "))
                 )).toList();
 
         if (!dupedLibErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", String.join("\n", dupedLibErrors));
+            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
             throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
-                    .map(EarlyLoadingException.ExceptionData::new)
+                    .map(s -> new EarlyLoadingException.ExceptionData(s))
                     .toList());
         }
 
@@ -111,26 +122,23 @@ public final class UniqueModListBuilder {
             modInfoList.sort(Comparator.comparing(UniqueModListBuilder::getVersion).reversed());
             LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
         }
-        return modInfoList.getFirst();
+        return modInfoList.get(0);
     }
 
     private static ArtifactVersion getVersion(final ModFile mf) {
-        List<IModInfo> modInfos;
-        if (mf.getModFileInfo() == null || (modInfos = mf.getModInfos()) == null || modInfos.isEmpty()) {
+        if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
             return mf.getJarVersion();
         }
 
-        return modInfos.getFirst().getVersion();
+        return mf.getModInfos().get(0).getVersion();
     }
 
     private static String getModId(ModFile modFile) {
-        var modFileInfo = modFile.getModFileInfo();
-        List<IModInfo> mods;
-        if (modFileInfo == null || (mods = modFileInfo.getMods()).isEmpty()) {
+        if (modFile.getModFileInfo() == null || modFile.getModFileInfo().getMods().isEmpty()) {
             return modFile.getSecureJar().name();
         }
 
-        return mods.getFirst().getModId();
+        return modFile.getModFileInfo().getMods().get(0).getModId();
     }
 
     public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}

fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java

@@ -13,6 +13,7 @@ import org.jetbrains.annotations.ApiStatus;
 import java.util.Collections;
 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 {
@@ -31,6 +32,15 @@ public class VersionSupportMatrix {
         }
     }
 
+    /**
+     * @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) {
+        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);

fmlloader/src/main/java/net/minecraftforge/fml/loading/log4j/ForgeHighlight.java

@@ -18,7 +18,9 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java

@@ -54,16 +54,12 @@ public abstract class AbstractModProvider implements IModProvider {
 
     @Nullable
     protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
-        var debug = path.toString();
-        if (debug.equals("/"))
-            debug = path.toUri().toString();
-
         var mjm = new ModJarMetadata();
         SecureJar sj = null;
         try {
             sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
         } catch (Throwable t) {
-            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + debug + "\" - " + t.getMessage()));
+            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + path + "\" - " + t.getMessage()));
         }
 
         IModFile mod;
@@ -72,7 +68,7 @@ public abstract class AbstractModProvider implements IModProvider {
             type = defaultType;
 
         if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
-            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, debug);
+            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
             mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
             // ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata
             mjm.setModFile(mod);
@@ -81,17 +77,17 @@ public abstract class AbstractModProvider implements IModProvider {
                 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, debug);
+            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 " + debug));
+            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
 
         return new IModLocator.ModFileOrException(mod, null);
     }
 
-    protected static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
+    private static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
         var info = jar.moduleDataProvider().open(MODULE_INFO).orElse(null);
         if (info != null) {
             try {
@@ -149,12 +145,6 @@ public abstract class AbstractModProvider implements IModProvider {
             public <T> Optional<T> getConfigElement(String... key) {
                 return Optional.empty();
             }
-
-            @Override
-            public List<? extends IConfigurable> getConfigList(String key) {
-                return Collections.emptyList();
-            }
-
             @Override
             public List<? extends IConfigurable> getConfigList(String... key) {
                 return Collections.emptyList();

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java

@@ -7,6 +7,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
 
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.ImmediateWindowHandler;
+import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.slf4j.Logger;
@@ -16,7 +17,8 @@ import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.*;
 
-public final class BackgroundScanHandler {
+public class BackgroundScanHandler
+{
     private enum ScanStatus {
         NOT_STARTED,
         RUNNING,
@@ -31,6 +33,7 @@ public final class BackgroundScanHandler {
     private final ExecutorService modContentScanner;
     private final List<ModFile> modFiles;
     private ScanStatus status;
+    private LoadingModList loadingModList;
 
     public BackgroundScanHandler(final List<ModFile> modFiles) {
         this.modFiles = modFiles;
@@ -55,7 +58,7 @@ public final class BackgroundScanHandler {
         ImmediateWindowHandler.updateProgress("Scanning mod candidates");
         CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
                 .whenComplete(file::setScanResult);
-        if (DEBUG) future = future.whenComplete((_, t) -> addCompletedFile(file, t));
+        if (DEBUG) future = future.whenComplete((r, t) -> addCompletedFile(file, t));
         file.setFutureScanResult(future);
     }
 
@@ -66,6 +69,16 @@ public final class BackgroundScanHandler {
         }
     }
 
+    public void setLoadingModList(LoadingModList loadingModList)
+    {
+        this.loadingModList = loadingModList;
+    }
+
+    public LoadingModList getLoadingModList()
+    {
+        return loadingModList;
+    }
+
     public void waitForScanToComplete(final Runnable ticker) {
         boolean timeoutActive = System.getProperty("fml.disableScanTimeout") == null;
         Instant deadline = Instant.now().plus(Duration.ofMinutes(10));