Add protection against large network channel lists

Fix legacy object holders not being fired in the registry specific codepath
Better optimize the scanning for object holders by unrolling streams.
2026-11-14 09:05:17 +00:00 · 2026-10-14 19:45:46 -07:00 · 2026-10-13 10:24:28 -07:00 · 2026-10-12 16:41:51 -07:00 · 2026-10-12 16:41:02 -07:00 · 2026-09-23 15:14:38 -07:00
1415 changed files with 18775 additions and 21253 deletions
@@ -3,6 +3,7 @@
 *.patch text eol=lf
 *.java text eol=lf
 *.gradle text eol=crlf
+**/MANIFEST.MF text eol=crlf
 *.png binary
 *.gif binary
 *.exe binary
@@ -0,0 +1,28 @@
+name: Publish
+
+on:
+  push:
+    branches: [ '1.21.5' ]
+
+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 }}
@@ -7,7 +7,7 @@ jobs:
    name: Upload payload
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
+      - uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
        with:
          name: payload
          path: ${{ github.event_path }}
@@ -7,7 +7,7 @@ jobs:
    name: Upload payload
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
+      - uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
        with:
          name: payload
          path: ${{ github.event_path }}
@@ -26,7 +26,6 @@
 /projects/mcp/
 /projects/clean/
 /projects/forge/
-#/patches/*

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

-#Patch rejects
-#/patches-/
-#*.patch.rej
-#/projects/*/rejects/
-
-# FML changelog
-changelog.txt
-*.py
-*.7z
-/logs/
-
 /ForgeRoot.ipr
 /ForgeRoot.iws
+
+# APT stuff
+/*/.gitignore
+/*/.factorypath
+/*/.apt_generated/
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>MinecraftForge_Forge Config DSL Script</name>
-  <groupId>MinecraftForge_Forge</groupId>
-  <artifactId>MinecraftForge_Forge_dsl</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.jetbrains.teamcity</groupId>
-    <artifactId>configs-dsl-kotlin-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>teamcity-server</id>
-      <url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>JetBrains</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>${basedir}</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-
-        <configuration/>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.teamcity</groupId>
-        <artifactId>teamcity-configs-maven-plugin</artifactId>
-        <version>${teamcity.dsl.version}</version>
-        <configuration>
-          <format>kotlin</format>
-          <dstDir>target/generated-configs</dstDir>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
-      <version>${teamcity.dsl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-script-runtime</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,193 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
-import jetbrains.buildServer.configs.kotlin.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-
-/*
-The settings script is an entry point for defining a TeamCity
-project hierarchy. The script should contain a single call to the
-project() function with a Project instance or an init function as
-an argument.
-
-VcsRoots, BuildTypes, Templates, and subprojects can be
-registered inside the project using the vcsRoot(), buildType(),
-template(), and subProject() methods respectively.
-
-To debug settings scripts in command-line, run the
-
-    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
-
-command and attach your debugger to the port 8000.
-
-To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
-> Tool Windows -> Maven Projects), find the generate task node
-(Plugins -> teamcity-configs -> teamcity-configs:generate), the
-'Debug' option is available in the context menu for the task.
-*/
-
-version = "2021.2"
-
-project {
-
-    buildType(Build)
-    buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-    buildType(PullRequestChecks)
-    buildType(PullRequestCompatibility)
-
-    params {
-        text("docker_jdk_version", "21", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "8.7", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_main_branch", "1.21.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_branch_spec", """
-                +:refs/heads/(main*)
-                +:refs/heads/(master*)
-                +:refs/heads/(develop|release|staging|main|master)
-                +:refs/heads/(1.*)
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-        text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
-        //These are references and not actually keys
-        password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN)
-        text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-
-        checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        checkbox("should_execute_test", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-    }
-
-    features {
-        githubIssues {
-            id = "MinecraftForge_MinecraftForge__IssueTracker"
-            displayName = "MinecraftForge/MinecraftForge"
-            repositoryURL = "https://github.com/MinecraftForge/MinecraftForge"
-        }
-    }
-}
-
-object Build : BuildType({
-    templates(AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"), AbsoluteId("MinecraftForge_PublishProjectUsingGradle"), AbsoluteId("MinecraftForge_TriggersStaticFilesWebpageGenerator"))
-    id("MinecraftForge_MinecraftForge__Build")
-    name = "Build"
-    description = "Builds and Publishes the main branches of the project."
-})
-
-object BuildSecondaryBranches : BuildType({
-    templates(AbsoluteId("MinecraftForge_ExcludesBuildingDefaultBranch"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__BuildSecondaryBranches")
-    name = "Build - Secondary Branches"
-    description = "Builds and Publishes the secondary branches of the project."
-    params {
-        text("git_branch_spec", """
-                +:refs/heads/(*)
-                -:refs/heads/noci*
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-    }
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequests : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequests")
-    name = "Pull Requests"
-    description = "Builds pull requests for the project"
-
-    params {
-        checkbox("should_execute_build", "true", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        text(
-            "gradle_build_task",
-            "assemble",
-            label = "Gradle build task to execute during build",
-            description = "Determines the build task that is executed to build the project.",
-            display = ParameterDisplay.HIDDEN,
-            allowEmpty = false
-        )
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestChecks : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestChecks")
-    name = "Pull Requests (Checks)"
-    description = "Checks pull requests for the project"
-
-    steps {
-        gradle {
-            name = "Check"
-            id = "RUNNER_10_Check"
-
-            tasks = "checkAll"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestCompatibility : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
-    name = "Pull Requests (Compatibility)"
-    description = "Validates binary compatibility for pull requests made to the project"
-
-    steps {
-        gradle {
-            name = "Validate"
-            id = "RUNNER_10_Compatibility"
-
-            tasks = "checkJarCompatibility"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
@@ -1,65 +0,0 @@
-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.
-
@@ -4,9 +4,9 @@ repositories {
 }

 dependencies {
-    implementation 'org.ow2.asm:asm:9.7'
-    implementation 'org.ow2.asm:asm-tree:9.7'
-    implementation 'net.minecraftforge:srgutils:0.5.10'
+    implementation 'org.ow2.asm:asm:9.9.1'
+    implementation 'org.ow2.asm:asm-tree:9.9.1'
+    implementation 'net.minecraftforge:srgutils:0.6.2'
    implementation 'commons-io:commons-io:2.13.0'
    implementation 'com.google.code.gson:gson:2.10.1'
    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
@@ -21,6 +21,8 @@ abstract class BundleList extends DefaultTask {
        configure {
            dependsOn(project.tasks.universalJar)
            inputs.file(project.tasks.universalJar.archiveFile)
+            dependsOn(project.tasks.applyServerBinPatches)
+            inputs.file(project.tasks.applyServerBinPatches.output)
        }
    }
    
@@ -3,6 +3,7 @@ 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

@@ -12,13 +13,19 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
    @Internal
    abstract Property<Closure<Boolean>> getPredicate()

-    private final Set<String> matches = new HashSet<>()
+    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)) {
-                matches.add(parent.name)
+                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
            }
        }
@@ -27,6 +34,15 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
    @Internal
    @Override
    protected Object getData() {
-        return matches.toSorted(Comparator.<String>naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
+        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.') }()
    }
 }
@@ -47,6 +47,7 @@ jarSigner.autoDetect('forge')
 applyPatches {
    level 'WARNING'
    failOnError = UPDATING != 'true'
+    rejects = rootProject.layout.projectDirectory.dir('rejects').asFile
 }

 sourceSets {
@@ -78,7 +79,6 @@ final String SPEC_VERSION = gradleutils.gitInfo.tag
 final def MCP_ARTIFACT = project(':mcp').mcp.config.get()

 final List<File> EXTRA_TXTS = [
-        rootProject.file('CREDITS.txt'),
        rootProject.file('LICENSE.txt'),
        rootProject.tasks.createChangelog.outputFile
 ]
@@ -91,18 +91,18 @@ final String MAVEN_PATH = ext.MAVEN_PATH
 final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
 final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.3'
 final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
-final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
+final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.1:fatjar'

 configurations {
    // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
    bootstrap  { transitive = false }
-    installer { 
+    installer {
        extendsFrom(bootstrap)
-        transitive = false 
+        transitive = false
    }
-    installerextra { 
+    installerextra {
        extendsFrom(bootstrap)
-        transitive = false 
+        transitive = false
    }
    api.extendsFrom(installer)
 }
@@ -116,9 +116,9 @@ dependencies {
    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)
@@ -208,7 +208,6 @@ patcher {
                 '--all',
                 '--validate',
                 '--output', rootProject.file('src/main/generated/'),
-                 '--validate',
                 '--existing', sourceSets.main.resources.srcDirs[0],
                 '--assetsDir', downloadAssets.output,
                 '--assetIndex', "{asset_index}"
@@ -226,6 +225,30 @@ patcher {
                 '--assetsDir', downloadAssets.output,
                 '--assetIndex', "{asset_index}"
        }
+
+        forge_client_data {
+            args '--launchTarget', 'forge_dev_client_data',
+                 '--mod', 'forge',
+                 '--all',
+                 '--output', rootProject.file('src/main/generated/'),
+                 '--existing', sourceSets.main.resources.srcDirs[0],
+                 '--assetsDir', downloadAssets.output,
+                 '--assetIndex', "{asset_index}"
+        }
+
+        forge_client_data_test {
+            source sourceSets.test
+            args '--launchTarget', 'forge_dev',
+                 '--launchEntry', 'minecraft/net.minecraft.client.data.Main',
+                 '--launchData',
+                 '--mod', '.+',
+                 '--all',
+                 '--output', rootProject.file('src/test/generated/'),
+                 '--existing', sourceSets.main.resources.srcDirs[0],
+                 '--existing', sourceSets.test.resources.srcDirs[0],
+                 '--assetsDir', downloadAssets.output,
+                 '--assetIndex', "{asset_index}"
+        }
    }
 }

@@ -267,11 +290,11 @@ tasks.register('downloadCrowdin', Download) {
 tasks.userdevConfig.configure {
    configurations.installer.allDependencies.forEach {
        def dep = it.toString()
-        if (it instanceof ProjectDependency) 
+        if (it instanceof ProjectDependency)
            dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version"
        libraries.add(dep)
    }
-    
+
    inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
    runs {
        client {
@@ -283,6 +306,13 @@ tasks.userdevConfig.configure {
            args '--assetsDir', '{assets_root}'
        }

+        clientData {
+            environment 'MCP_MAPPINGS', '{mcp_mappings}'
+            args '--launchTarget', "forge_userdev_client_data"
+            args '--assetIndex', '{asset_index}'
+            args '--assetsDir', '{assets_root}'
+        }
+
        server {
            environment 'MCP_MAPPINGS', '{mcp_mappings}'
            property 'forge.enableGameTest', 'true'
@@ -380,14 +410,14 @@ tasks.register('extractInheritance', ExtractInheritance) {
    }
 }
 tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
-    jar = createJoinedSRG.output
+    jar = createClientOfficial.output
    output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
    predicate = {
        parent, node, insn ->
            return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
            && insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
-            && insn.name == 'm_6518_'
-            && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
+            && insn.name == 'finalizeSpawn'
+            && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
    }
 }
 tasks.register('validateDeprecations', ValidateDeprecations) {
@@ -492,7 +522,7 @@ tasks.register('serverShimJar', Jar) {
        from {
            zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
        }
-        
+
        attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
    }
    archiveClassifier = 'shim'
@@ -585,7 +615,7 @@ tasks.register('checkJarCompatibility', CheckJarCompatibility) {
    baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })

    inputJar = project.tasks.named('reobfJar').flatMap { it.output }
-    
+
    commonLibraries.from(project.configurations.minecraftImplementation)
    commonLibraries.from(project.configurations.installer)
 }
@@ -606,11 +636,11 @@ tasks.register('launcherJson', LauncherJson).configure {

 tasks.register('installerJson', InstallerJson) {
    icon = rootProject.file('icon.ico')
-    
+
    // Json to install into the client's launcher
    dependsOn(launcherJson)
    input.from(launcherJson.output)
-    
+
    // Download Official Mappings
    dependsOn(downloadClientMappings, downloadServerMappings)
    input.from(downloadClientMappings.output, downloadServerMappings.output)
@@ -892,23 +922,31 @@ tasks.register('installerJar', InstallerJar) {
    jarSigner.sign(it)
 }

+final mdkGradleWrapper = tasks.register('mdkGradleWrapper', Wrapper) {
+    gradleVersion = '9.3.1'
+}
+
 tasks.register('mdkZip', Zip) {
+    dependsOn mdkGradleWrapper
+
    archiveBaseName = project.name
    archiveClassifier = 'mdk'
    archiveVersion = project.version
    destinationDirectory = file('build/libs')

-    from rootProject.file('gradlew')
-    from rootProject.file('gradlew.bat')
+    from mdkGradleWrapper.map(Wrapper.&getScriptFile)
+    from mdkGradleWrapper.map(Wrapper.&getBatchScript)
    from(EXTRA_TXTS)
-    from(rootProject.file('gradle/')){
-        into('gradle/')
+    into('gradle/wrapper/') {
+        from mdkGradleWrapper.map(Wrapper.&getJarFile)
+        from mdkGradleWrapper.map(Wrapper.&getPropertiesFile)
    }
    from(rootProject.file('mdk/')){
-        rootProject.file('mdk/gitignore.txt').eachLine{
+        rootProject.file('mdk/gitignore.txt').eachLine {
            if (!it.trim().isEmpty() && !it.trim().startsWith('#'))
                exclude it
        }
+
        filter(ReplaceTokens, tokens: [
            FORGE_VERSION: FORGE_VERSION,
            FORGE_GROUP: project.group,
@@ -922,6 +960,9 @@ tasks.register('mdkZip', Zip) {
        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/'
@@ -1055,7 +1096,7 @@ publishing {
            license gradleutils.pom.Licenses.LGPLv2_1
        }
    }
-    
+
    repositories {
        maven gradleutils.publishingForgeMaven
    }
@@ -44,7 +44,7 @@ tasks.withType(JavaCompile).configureEach {
    dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
    options.warnings = false // Shutup deprecated for removal warnings
-    options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
+    options.forkOptions.jvmArgs += '-Xmx6G' // 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
@@ -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=1.21.1-&query=$.promos["1.21.1-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.1-&query=$.promos["1.21.1-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.5-&query=$.promos["1.21.5-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.5-&query=$.promos["1.21.5-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!
@@ -70,6 +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

@@ -93,3 +98,4 @@ Please ensure you have a valid email address associated with your GitHub account
 [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/
@@ -0,0 +1,24 @@
+#!/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
@@ -25,7 +25,18 @@ import java.util.function.Supplier;
 * <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>
+ *
+ * @deprecated Historically, this allowed for safe execution of code on the correct side by exploiting a low-level
+ * detail in Java 8, but in newer versions a simple if check is enough.
+ * <br>
+ * For example:
+ * <pre>{@code
+ * if (FMLEnvironment.dist.isClient()) {
+ *     // client code here
+ * }
+ * }</pre>
 */
+@Deprecated(since = "1.21.5", forRemoval = true)
 public final class DistExecutor
 {
    private static final Logger LOGGER = LogManager.getLogger();
@@ -68,13 +68,15 @@ public interface IModLoadingState {
     * @return a transition task for this state
     * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
     */
-    default <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final ProgressMeter progressBar) {
+    default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
+        final Executor syncExecutor,
+        final Executor parallelExecutor,
+        final ProgressMeter progressBar
+    ) {
        return buildTransition(syncExecutor, parallelExecutor, progressBar,
-                e -> CompletableFuture.runAsync(() -> {}, e),
-                e -> CompletableFuture.runAsync(() -> {}, e));
+            e -> CompletableFuture.completedFuture(null),
+            e -> CompletableFuture.completedFuture(null)
+        );
    }

    /**
@@ -9,8 +9,6 @@ import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;

-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
@@ -18,103 +16,67 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Stream;

-@SuppressWarnings("unchecked")
+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 new NoopTransition();
+        return ModStateTransitionHelper.NOOP;
    }

-    default <T extends Event & IModBusEvent>
-    CompletableFuture<Void> build(final String name,
-                                  final Executor syncExecutor,
-                                  final Executor parallelExecutor,
-                                  final ProgressMeter progressBar,
-                                  final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                  final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-
-        this.eventFunctionStream().get()
-                .map(f -> (EventGenerator<T>) f)
-                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
-
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::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 this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
+    default CompletableFuture<Void> build(
+        final String name,
+        final Executor syncExecutor,
+        final Executor parallelExecutor,
+        final ProgressMeter progressBar,
+        final Function<Executor, CompletableFuture<Void>> preSyncTask,
+        final Function<Executor, CompletableFuture<Void>> postSyncTask
+    ) {
+        return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
    }

    default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
        return ModLoadingStage::nextState;
    }

-    private <T extends Event & IModBusEvent>
-    EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
-                                                             final Executor parallelExecutor,
-                                                             final List<CompletableFuture<Void>> completableFutures,
-                                                             final ProgressMeter progressBar,
-                                                             final EventGenerator<T> eventGenerator,
-                                                             final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
-                                                             final EventGenerator<T> nextGenerator) {
-        final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
-
-        var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
-        completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
-
-        var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
-        completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        return nextGenerator;
+    /**
+     * 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 Event & IModBusEvent> EventGenerator<T> eventFunction() {
+        return null;
    }

-    Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
    ThreadSelector threadSelector();
    BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
+
+    /**
+     * 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;
        }
    }
-}
-
-record NoopTransition() implements IModStateTransition {
-
-    @Override
-    public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
-        return Stream::of;
-    }
-
-    @Override
-    public ThreadSelector threadSelector() {
-        return ThreadSelector.SYNC;
-    }
-
-    @Override
-    public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
-        return (e, t) -> t.thenApplyAsync(Function.identity(), e);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
-    }
 }
@@ -9,18 +9,15 @@ import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModInfo;

 import java.util.EnumMap;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
+import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -33,13 +30,8 @@ import java.util.function.Supplier;
 * a mechanism by which we can wrap actual mod code so that the loader and other
 * facilities can treat mods at arms length.
 * </p>
- *
- * @author cpw
- *
 */
-
-public abstract class ModContainer
-{
+public abstract class ModContainer {
    protected final String modId;
    protected final String namespace;
    protected final IModInfo modInfo;
@@ -48,11 +40,14 @@ public abstract class ModContainer
    protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
    protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
    protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    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)
-    {
+    public ModContainer(IModInfo info) {
        this.modId = info.getModId();
        // TODO: Currently not reading namespace from configuration..
        this.namespace = this.modId;
@@ -82,58 +77,35 @@ public abstract class ModContainer
    /**
     * Errored container state, used for filtering. Does nothing.
     */
-    ModContainer()
-    {
+    ModContainer() {
        this.modLoadingStage = ModLoadingStage.ERROR;
        modId = "BROKEN";
        namespace = "BROKEN";
        modInfo = null;
    }
+
    /**
     * @return the modid for this mod
     */
-    public final String getModId()
-    {
+    public final String getModId() {
        return modId;
    }

    /**
     * @return the resource prefix for the mod
     */
-    public final String getNamespace()
-    {
+    public final String getNamespace() {
        return namespace;
    }

    /**
     * @return The current loading stage for this mod
     */
-    public ModLoadingStage getCurrentState()
-    {
+    public ModLoadingStage getCurrentState() {
        return modLoadingStage;
    }

-    public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
-            final ModContainer target,
-            final IModStateTransition.EventGenerator<T> eventGenerator,
-            final ProgressMeter progressBar,
-            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
-            final Executor executor) {
-        return CompletableFuture
-                .runAsync(() -> {
-                    ModLoadingContext.get().setActiveContainer(target);
-                    target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
-                    target.acceptEvent(eventGenerator.apply(target));
-                }, executor)
-                .whenComplete((mc, exception) -> {
-                    target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
-                    progressBar.increment();
-                    ModLoadingContext.get().setActiveContainer(null);
-                });
-    }
-
-    public IModInfo getModInfo()
-    {
+    public IModInfo getModInfo() {
        return modInfo;
    }

@@ -142,8 +114,7 @@ public abstract class ModContainer
        return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
    }

-    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
-    {
+    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
        extensionPoints.put(point, extension);
    }

@@ -5,9 +5,6 @@

 package net.minecraftforge.fml;

-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
@@ -15,27 +12,15 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -45,27 +30,25 @@ import java.util.stream.Stream;
 * Master list of all mods - game-side version. This is classloaded in the game scope and
 * can dispatch game level events as a result.
 */
-public class ModList
-{
-    //private static final Logger LOGGER = LogManager.getLogger();
+public class ModList {
    private static ModList INSTANCE;
    private final List<IModFileInfo> modFiles;
    private final List<IModInfo> sortedList;
-    private final Map<String, ModFileInfo> fileById;
+    private final Map<String, IModFileInfo> fileById;
    private List<ModContainer> mods;
    private Map<String, ModContainer> indexedMods;
    private List<ModFileScanData> modFileScanData;
    private List<ModContainer> sortedContainers;

-    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
-    {
-        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
-        this.sortedList = sortedList.stream().
-                map(ModInfo.class::cast).
-                collect(Collectors.toList());
-        this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
-                map(ModInfo.class::cast).
-                collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
+    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 : this.modFiles) {
+            for (var mod : file.getMods())
+                byId.put(mod.getModId(), mod.getOwningFile());
+        }
+        this.fileById = Collections.unmodifiableMap(byId);
        CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
    }

@@ -82,12 +65,12 @@ public class ModList
                getModContainerState(mainMod.getModId()),
                ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
    }
+
    private String crashReport() {
        return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
    }

-    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
-    {
+    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
        INSTANCE = new ModList(modFiles, sortedList);
        return INSTANCE;
    }
@@ -96,103 +79,47 @@ public class ModList
        return INSTANCE;
    }

-    public List<IModFileInfo> getModFiles()
-    {
+    public List<IModFileInfo> getModFiles() {
        return modFiles;
    }

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

-    <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
-            final IModStateTransition.EventGenerator<T> eventGenerator,
-            final ProgressMeter progressBar,
-            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
-        return executor -> gather(
-                this.mods.stream()
-                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
-                .toList()
-        ).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
-    }
-    static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
-        if (t.stream().noneMatch(e->e.getValue()!=null)) {
-            return CompletableFuture.completedFuture(null);
-        } else {
-            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            final RuntimeException accumulator = new RuntimeException();
-            cf.completeExceptionally(accumulator);
-            for (Throwable exception : throwables) {
-                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;
-        }
-    }
-
-    static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
-        List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
-        CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
-        for (var future : futures) {
-            int i = list.size();
-            list.add(null);
-            results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
-        }
-        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
-    }
-
-    void setLoadedMods(final List<ModContainer> modContainers)
-    {
+    void setLoadedMods(final List<ModContainer> modContainers) {
        this.mods = modContainers;
-        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
+        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
        this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
    }

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

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

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

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

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

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

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

    }

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

@@ -222,13 +148,11 @@ public class ModList
        this.sortedContainers.forEach(containerConsumer);
    }

+    public List<ModContainer> getLoadedMods() {
+        return this.sortedContainers;
+    }
+
    public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
        return indexedMods.values().stream().map(function);
    }
-
-    private static class UncaughtModLoadingException extends ModLoadingException {
-        public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
-            super(null, stage, "fml.modloading.uncaughterror", originalException);
-        }
-    }
 }
@@ -6,7 +6,6 @@
 package net.minecraftforge.fml;

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

@@ -74,8 +71,7 @@ import static net.minecraftforge.fml.Logging.LOADING;
 *     and completes the mod loading sequence.</dd>
 * </dl>
 */
-public class ModLoader
-{
+public class ModLoader {
    private static final Logger LOGGER = LogManager.getLogger();
    private final LoadingModList loadingModList;

@@ -84,17 +80,15 @@ public class ModLoader
    private final List<ModLoadingWarning> loadingWarnings;
    private final ModStateManager stateManager;
    private static boolean loadingStateValid;
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
+    private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
    private final Set<IModLoadingState> completedStates = new HashSet<>();
    private ModList modList;

-    private ModLoader()
-    {
+    private ModLoader() {
        this.loadingModList = FMLLoader.getLoadingModList();
        this.loadingExceptions = this.loadingModList.getErrors().stream()
                .flatMap(ModLoadingException::fromEarlyException)
-                .collect(Collectors.toList());
+                .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());
@@ -156,7 +150,7 @@ public class ModLoader
                loadingModList.getMods());
        if (!this.loadingExceptions.isEmpty()) {
            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
+            statusConsumer.accept("ERROR DURING MOD LOADING");
            modList.setLoadedMods(Collections.emptyList());
            loadingStateValid = false;
            throw new LoadingFailedException(loadingExceptions);
@@ -169,7 +163,7 @@ public class ModLoader

        if (!failedBounds.isEmpty()) {
            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
+            statusConsumer.accept("ERROR DURING MOD LOADING");
            modList.setLoadedMods(Collections.emptyList());
            loadingStateValid = false;
            throw new LoadingFailedException(failedBounds.stream()
@@ -177,19 +171,42 @@ public class ModLoader
                    .toList());
        }

-        final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
-                .map(ModFileInfo::getFile)
-                .map(this::buildMods)
-                .flatMap(List::stream)
-                .toList();
+        final var modContainers = new HashMap<String, ModContainer>();
+        for (var file : loadingModList.getModFiles()) {
+            var containers = this.buildMods(file.getFile());
+            for (var container : containers)
+                modContainers.put(container.getModId(), container);
+        }
+
        if (!loadingExceptions.isEmpty()) {
            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
+            statusConsumer.accept("ERROR DURING MOD LOADING");
            modList.setLoadedMods(Collections.emptyList());
            loadingStateValid = false;
            throw new LoadingFailedException(loadingExceptions);
        }
-        modList.setLoadedMods(modContainers);
+
+        // Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
+        for (var mod : modContainers.values()) {
+            for (var dep : mod.getModInfo().getDependencies()) {
+                var target = modContainers.get(dep.getModId());
+                if (target == null)
+                    continue;
+
+                switch (dep.getOrdering()) {
+                    case AFTER:
+                        mod.dependencies.add(target);
+                        break;
+                    case BEFORE:
+                        target.dependencies.add(mod);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        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());
@@ -214,7 +231,7 @@ public class ModLoader
        for (IModLoadingState mls : stateList) {
            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
        }
-        statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
+        statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
        progress.complete();
    }

@@ -243,10 +260,12 @@ public class ModLoader
        pb.complete();
        syncExecutor.drive(ticker);
    }
+
    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
        while (!transition.isDone()) {
            syncExecutor.drive(ticker);
        }
+
        try {
            transition.join();
        } catch (CompletionException e) {
@@ -256,36 +275,38 @@ public class ModLoader
                    .anyMatch(obj -> !(obj instanceof ModLoadingException));
            if (hasNotModLoadingEx) {
                LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
+                statusConsumer.accept("ERROR DURING MOD LOADING");
                throw e;
            }

            final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
                    .filter(ModLoadingException.class::isInstance)
                    .map(ModLoadingException.class::cast)
-                    .collect(Collectors.toList());
+                    .toList();
            LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
+            statusConsumer.accept("ERROR DURING MOD LOADING");
            throw new LoadingFailedException(modLoadingExceptions);
        }
    }

-    private List<ModContainer> buildMods(final IModFile modFile)
-    {
-        final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
+    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);

        LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
-        final List<ModContainer> containers = modFile.getScanResult().getTargets()
-                .entrySet()
-                .stream()
-                .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
-                .filter(Objects::nonNull)
-                .toList();
+        final List<ModContainer> containers = new ArrayList<>();
+        for (var entry : modFile.getScanResult().getTargets().entrySet()) {
+            var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
+            if (container != null)
+                containers.add(container);
+        }
+
        if (containers.size() != modInfoMap.size()) {
            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();

-            LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
+            LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
                    modFile.getFilePath(),
                    containers.size(), containerIds,
                    modInfoMap.size(), modIds);
@@ -300,15 +321,15 @@ public class ModLoader

            loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
        }
+
        // remove errored mod containers
        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
    }

-    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
+    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
+        final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
+    ) {
        try {
-            final String modId = idToProviderEntry.getKey();
-            final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
-
            IModInfo info = modInfoMap.get(modId);
            // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
            if (info == null)
@@ -351,6 +372,7 @@ public class ModLoader
        }
        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(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());
@@ -359,9 +381,15 @@ public class ModLoader
        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
        return e;
    }
+
+    @SuppressWarnings("removal")
    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
-        postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
+        postEventWithWrapInModOrder(event,
+            (mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
+            (mc, e) -> ModLoadingContext.get().setActiveContainer(null)
+        );
    }
+
    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());
@@ -374,13 +402,11 @@ public class ModLoader
        });
    }

-    public List<ModLoadingWarning> getWarnings()
-    {
+    public List<ModLoadingWarning> getWarnings() {
        return ImmutableList.copyOf(this.loadingWarnings);
    }

-    public void addWarning(ModLoadingWarning warning)
-    {
+    public void addWarning(ModLoadingWarning warning) {
        this.loadingWarnings.add(warning);
    }

@@ -8,20 +8,15 @@ package net.minecraftforge.fml;
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.config.IConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.loading.FMLLoader;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;

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

    /**
     * @deprecated Use the context provided by your language loader in your mod's constructor
@@ -26,19 +26,23 @@ import java.util.function.ToIntFunction;
 * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
 * @param transition     optional state transition information
 */
-public record ModLoadingState(String name, String previous,
-                              Function<ModList, String> message,
-                              ToIntFunction<ModList> size,
-                              ModLoadingPhase phase,
-                              Optional<Consumer<ModList>> inlineRunnable,
-                              Optional<IModStateTransition> transition) implements IModLoadingState {
+public record ModLoadingState(
+    String name,
+    String previous,
+    Function<ModList, String> message,
+    ToIntFunction<ModList> size,
+    ModLoadingPhase phase,
+    Optional<Consumer<ModList>> inlineRunnable,
+    Optional<IModStateTransition> transition
+) implements IModLoadingState {
    @Override
-    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) {
+    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
+    ) {
        var transition = this.transition.orElse(null);
        return transition == null
                ? Optional.empty()
@@ -52,9 +56,12 @@ public record ModLoadingState(String name, String previous,
     * @param name     the name of the state
     * @param previous the name of the immediately previous state to this state
     * @param phase    the mod loading phase the state belongs to
+     *
+     * @deprecated Use the builder
     */
+    @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, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
+        return of(name, phase).after(previous).empty();
    }

    /**
@@ -65,11 +72,13 @@ public record ModLoadingState(String name, String previous,
     * @param previous   the name of the immediately previous state to this state
     * @param phase      the mod loading phase the state belongs to
     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a default message
+     *
+     * @deprecated Use the builder
     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
    public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
+        return of(name, phase).after(previous).withTransition(transition);
    }

    /**
@@ -81,11 +90,14 @@ public record ModLoadingState(String name, String previous,
     * @param phase      the mod loading phase the state belongs to
     * @param transition the state transition information
     * @return a mod loading state with state transition information and a custom message
+     *
+     * @deprecated Use the builder
     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
    public static ModLoadingState withTransition(final String name, final String previous,
                                                 final Function<ModList, String> message, final ModLoadingPhase phase,
                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
+        return of(name, phase).after(previous).message(message).withTransition(transition);
    }

    /**
@@ -97,9 +109,59 @@ public record ModLoadingState(String name, String previous,
     * @param phase    the mod loading phase the state belongs to
     * @param inline   an optional runnable, which runs before starting the transition from this state to the next
     * @return a mod loading state with an inline runnable and default message
+     *
+     * @deprecated Use the builder
     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
    public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
                                             final Consumer<ModList> inline) {
-        return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
+        return of(name, phase).after(previous).withInline(inline);
+    }
+
+    public static Builder of(final String name, final ModLoadingPhase phase) {
+        return new Builder(name, phase);
+    }
+
+    public static class Builder {
+        private final String name;
+        private final ModLoadingPhase phase;
+        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;
+            this.phase = phase;
+        }
+
+        public Builder after(final ModLoadingState value) { return after(value.name()); }
+        public Builder after(final String value) {
+            this.after = value;
+            return this;
+        }
+
+        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(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 : 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 : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
+        }
+
+        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());
+        }
    }
 }
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+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
+class ModStateTransitionHelper {
+    static final IModStateTransition NOOP = new NoopTransition();
+    record NoopTransition() implements IModStateTransition {
+        @Override
+        public ThreadSelector threadSelector() {
+            return ThreadSelector.SYNC;
+        }
+
+        @Override
+        public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
+            return (e, t) -> t.thenApplyAsync(Function.identity(), e);
+        }
+    }
+
+    static <V> CompletionStage<Void> completableFutureFromExceptionList(List<FutureResult<V>> t) {
+        if (t.stream().noneMatch(e -> e.exception() != null)) {
+            return CompletableFuture.completedFuture(null);
+        } else {
+            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);
+            for (Throwable exception : throwables) {
+                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){}
+
+    static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
+        var list = new ArrayList<FutureResult<V>>(futures.size());
+        var results = new CompletableFuture[futures.size()];
+
+        for (var future : futures) {
+            int i = list.size();
+            list.add(null);
+            results[i] = future.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
+        }
+
+        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
+    }
+
+    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.get().getLoadedMods()) {
+
+            CompletableFuture<Void> parent = null;
+            if (mod.dependencies.isEmpty()) {
+                parent = CompletableFuture.allOf();
+            } else {
+                var deps = new CompletableFuture[mod.dependencies.size()];
+                int idx = 0;
+                for (var depContainer : mod.dependencies) {
+                    var future = modFutures.get(depContainer.getModId());
+                    if (future == null)
+                        throw new IllegalStateException("Could not find dependency future " + depContainer.getModId() + " for " + mod.getModId());
+                    deps[idx++] = future;
+                }
+                parent = CompletableFuture.allOf(deps);
+            }
+
+            @SuppressWarnings("removal")
+            var dispatch = parent
+                .thenRunAsync(() -> {
+                    ModLoadingContext.get().setActiveContainer(mod);
+                    var handler = mod.activityMap.get(mod.modLoadingStage);
+                    if (handler != null)
+                        handler.run();
+                    mod.acceptEvent(eventGenerator.apply(mod));
+                }, executor)
+                .whenComplete((mc, exception) -> {
+                    mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
+                    progressBar.increment();
+                    ModLoadingContext.get().setActiveContainer(null);
+                });
+
+            modFutures.put(mod.getModId(), dispatch);
+        }
+
+        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);
+    }
+
+    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,
+        final Executor parallelExecutor,
+        final ProgressMeter progressBar,
+        final Function<Executor, CompletableFuture<Void>> preSyncTask,
+        final Function<Executor, CompletableFuture<Void>> postSyncTask
+    ) {
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+        final var executor = transition.threadSelector().apply(syncExecutor, 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);
+        }
+
+        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);
+    }
+}
@@ -85,11 +85,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
    private ScheduledFuture<?> initializationFuture;

    private PerformanceInfo performanceInfo;
+    @SuppressWarnings("unused")
    private ScheduledFuture<?> performanceTick;
    // The GL ID of the window. Used for all operations
    private long window;
    // The thread that contains and ticks the window while Forge is loading mods
-    private ScheduledExecutorService renderScheduler;
+    private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+        final var thread = Executors.defaultThreadFactory().newThread(r);
+        thread.setName("EarlyDisplay");
+        thread.setDaemon(true);
+        return thread;
+    });
    private int fbWidth;
    private int fbHeight;
    private int fbScale;
@@ -148,7 +154,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 " + forgeVersion));
+        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion()));
        performanceInfo = new PerformanceInfo();
        return start(mcVersion, forgeVersion);
    }
@@ -237,7 +243,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.add(0, RenderElement.squir());
+            this.elements.addFirst(RenderElement.squir());

        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -257,7 +263,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-        this.elements.removeIf(element -> !element.render(context, framecount));
+        for (var itr = this.elements.iterator(); itr.hasNext(); ) {
+            var element = itr.next();
+            if (!element.render(context, framecount))
+                itr.remove();
+        }
        if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
            framecount++;
    }
@@ -282,12 +292,6 @@ 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;
@@ -299,7 +303,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
        return this.glVersion;
    }

-    private void crashElegantly(String errorDetails) {
+    private static void crashElegantly(String errorDetails) {
        StringBuilder msgBuilder = new StringBuilder(2000);
        msgBuilder.append("Failed to initialize graphics window with current settings.\n");
        msgBuilder.append("\n\n");
@@ -488,10 +492,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
        glfwPollEvents();
    }

-    private void badWindowHandler(final int code, final long desc) {
-        LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
-    }
-
    private void winResize(long window, int width, int height) {
        if (window == this.window && width != 0 && height != 0) {
            this.winWidth = width;
@@ -511,7 +511,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
            this.winY = y;
        }
    }
-    private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
+    private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
        try (MemoryStack memorystack = MemoryStack.stackPush()) {
            PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
            int error = glfwGetError(pointerbuffer);
@@ -639,8 +639,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
    }

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

    public void close() {
@@ -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,6 +38,9 @@ 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> {}

@@ -56,11 +59,18 @@ 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;
@@ -75,7 +85,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 = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
+            final float fade = Math.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;
@@ -84,19 +94,9 @@ 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;
@@ -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) {
@@ -187,10 +187,10 @@ public class RenderElement {
    }
    private static float[] indeterminateBar(int frame, boolean isActive) {
        if (RenderElement.globalAlpha != 0xFF || !isActive) {
-            return new float[] {0f,1f};
+            return new float[] { 0f, 1f };
        } else {
-            var progress = frame % 100;
-            return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
+            int progress = frame % 100;
+            return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
        }
    }

@@ -249,8 +249,8 @@ public class RenderElement {
        };
    }

-    private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
-        return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
+    private static Renderer 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) {
@@ -264,14 +264,13 @@ public class RenderElement {
    private static TextGenerator text(int x, int y, String text, int colour) {
        return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
    }
-    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);
-            };
+
+    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);
        };
    }

@@ -281,21 +280,13 @@ public class RenderElement {
        bb.draw();
    }

-
+    @Deprecated(since = "1.21.5", forRemoval = true)
    public static float clamp(float num, float min, float max) {
-        if (num < min) {
-            return min;
-        } else {
-            return Math.min(num, max);
-        }
+        return Math.clamp(num, min, max);
    }

    public static int clamp(int num, int min, int max) {
-        if (num < min) {
-            return min;
-        } else {
-            return Math.min(num, max);
-        }
+        return Math.min(max, Math.max(num, min));
    }

    public static int hsvToRGB(float hue, float saturation, float value) {
@@ -11,8 +11,6 @@ import org.lwjgl.stb.STBTTFontinfo;
 import org.lwjgl.stb.STBTTPackContext;
 import org.lwjgl.stb.STBTTPackRange;
 import org.lwjgl.stb.STBTTPackedchar;
-import org.lwjgl.system.MemoryStack;
-
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

@@ -24,7 +22,7 @@ public class SimpleFont {
    private final int textureNumber;
    private final int lineSpacing;
    private final int descent;
-    private final int GLYPH_COUNT = 127-32;
+    private static final int GLYPH_COUNT = 127 - 32;
    private final Glyph[] glyphs;

    private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
@@ -122,7 +120,7 @@ public class SimpleFont {
                case '\n', '\t' -> 0;
                case ' ' -> glyphs[0].charwidth();
                default -> {
-                    if (c - 32 < this.GLYPH_COUNT && c > 32) {
+                    if (c - 32 < GLYPH_COUNT && c > 32) {
                        yield this.glyphs[c - 32].charwidth();
                    } else {
                        yield 0;
@@ -153,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 < font.GLYPH_COUNT && c > 32) {
+                        if (c-32 < GLYPH_COUNT && c > 32) {
                            pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
                        }
                        yield pos;
@@ -5,6 +5,7 @@ plugins {
    id 'maven-publish'
    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
+    alias(libs.plugins.apt)
 }

 apply from: rootProject.file('build_shared.gradle')
@@ -36,6 +37,7 @@ dependencies {
    implementation(libs.terminalconsoleappender)
    implementation(libs.jimfs)

+    // 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)
    annotationProcessor(libs.bundles.log4j)

@@ -85,7 +87,7 @@ publishing {
            license PomUtils.Licenses.LGPLv2_1
        }
    }
-    
+
    repositories {
        maven gradleutils.publishingForgeMaven
    }
@@ -102,5 +104,23 @@ tasks.register('writeForgeVersionJson') {
 }

 tasks.named('generateResources').configure {
+    dependsOn('eclipseJdt')
+    dependsOn('eclipseJdtApt')
+    dependsOn('eclipseFactorypath')
    dependsOn('writeForgeVersionJson')
 }
+
+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'
+           }
+       }
+    }
+}
@@ -6,14 +6,13 @@
 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 {
@@ -54,9 +54,6 @@ public class FMLLoader {
        LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
        LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());

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

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

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

@@ -7,7 +7,6 @@ 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;
@@ -19,7 +18,6 @@ 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 {
@@ -5,31 +5,28 @@

 package net.minecraftforge.fml.loading;

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

-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.stream.Collectors;

 /**
 * Master list of all mods <em>in the loading context. This class cannot refer outside the
 * loading package</em>
 */
-public class LoadingModList
-{
+public class LoadingModList {
+    private static final Logger LOGGER = LogUtils.getLogger();
    private static LoadingModList INSTANCE;
    private final List<ModFileInfo> modFiles;
    private final List<ModInfo> sortedList;
@@ -37,15 +34,14 @@ public class LoadingModList
    private final List<EarlyLoadingException> preLoadErrors;
    private List<IModFile> brokenFiles;

-    private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
-    {
+    private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
        this.modFiles = modFiles.stream()
                .map(ModFile::getModFileInfo)
                .map(ModFileInfo.class::cast)
-                .collect(Collectors.toList());
+                .toList();
        this.sortedList = sortedList.stream()
                .map(ModInfo.class::cast)
-                .collect(Collectors.toList());
+                .toList();
        this.fileById = this.modFiles.stream()
                .map(ModFileInfo::getMods)
                .flatMap(Collection::stream)
@@ -54,21 +50,18 @@ public class LoadingModList
        this.preLoadErrors = new ArrayList<>();
    }

-    public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException)
-    {
+    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;
    }

    public static LoadingModList get() {
        return INSTANCE;
    }
-    public void addCoreMods()
-    {
+
+    public void addCoreMods() {
        modFiles.stream()
                .map(ModFileInfo::getFile)
                .map(ModFile::getCoreMods)
@@ -76,32 +69,37 @@ public class LoadingModList
                .forEach(FMLLoader.getCoreModProvider()::addCoreMod);
    }

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

-    public void addForScanning(BackgroundScanHandler backgroundScanHandler)
-    {
+    public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
        backgroundScanHandler.setLoadingModList(this);
        modFiles.stream()
                .map(ModFileInfo::getFile)
                .forEach(backgroundScanHandler::submitForScanning);
    }

-    public List<ModFileInfo> getModFiles()
-    {
+    public List<ModFileInfo> getModFiles() {
        return modFiles;
    }

-    public Path findResource(final String className)
-    {
+    public Path findResource(final String className) {
        for (ModFileInfo mf : modFiles) {
            final Path resource = mf.getFile().findResource(className);
            if (Files.exists(resource)) return resource;
@@ -109,55 +107,11 @@ public class LoadingModList
        return null;
    }

-    public Enumeration<URL> findAllURLsForResource(final String resName) {
-        final String resourceName;
-        // strip a leading slash
-        if (resName.startsWith("/")) {
-            resourceName = resName.substring(1);
-        } else {
-            resourceName = resName;
-        }
-        return new Enumeration<URL>() {
-            private final Iterator<ModFileInfo> modFileIterator = modFiles.iterator();
-            private URL next;
-            @Override
-            public boolean hasMoreElements() {
-                if (next!=null) return true;
-                next = findNextURL();
-                return next != null;
-            }
-
-            @Override
-            public URL nextElement() {
-                if (next == null) {
-                    next = findNextURL();
-                    if (next == null) throw new NoSuchElementException();
-                }
-                URL result = next;
-                next = null;
-                return result;
-            }
-
-            private URL findNextURL() {
-                while (modFileIterator.hasNext()) {
-                    final ModFileInfo next = modFileIterator.next();
-                    final Path resource = next.getFile().findResource(resourceName);
-                    if (Files.exists(resource)) {
-                        return LamdbaExceptionUtils.uncheck(()->new URL("modjar://" + next.getMods().get(0).getModId() + "/" + resourceName));
-                    }
-                }
-                return null;
-            }
-        };
-    }
-
-    public ModFileInfo getModFileById(String modid)
-    {
+    public ModFileInfo getModFileById(String modid) {
        return this.fileById.get(modid);
    }

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

@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
 import com.google.common.graph.GraphBuilder;
 import com.google.common.graph.MutableGraph;
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.forgespi.language.IModInfo;
+import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
 import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
@@ -20,235 +20,250 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.slf4j.Logger;

 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static java.util.stream.Collectors.*;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;

-public class ModSorter
-{
+public class ModSorter {
    private static final Logger LOGGER = LogUtils.getLogger();
-    private final UniqueModListBuilder uniqueModListBuilder;
-    private List<ModFile> modFiles;
-    private List<ModInfo> sortedList;
-    private Map<String, IModInfo> modIdNameLookup;
-    private List<ModFile> systemMods;

-    private ModSorter(final List<ModFile> modFiles)
-    {
-        this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
-    }
+    private record State(List<ModFile> files, List<ModInfo> mods) {}
+
+    private ModSorter() {}
+
+    @SuppressWarnings("removal")
+    public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
+        State systemMods = detectSystemMods(mods);
+        List<ModFile> modFiles;

-    public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
-    {
-        final ModSorter ms = new ModSorter(mods);
        try {
-            ms.buildUniqueList();
+            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 LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), e);
+            return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
        }
+
+        var named = new HashMap<String, ModInfo>();
+        for (var file : modFiles) {
+            for (var info : file.getModInfos())
+                named.put(info.getModId(), (ModInfo)info);
+        }
+
        // try and validate dependencies
-        final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
+        final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
+
        // if we miss one or the other, we abort now
        if (!failedList.isEmpty()) {
-            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), new EarlyLoadingException("failure to validate mod list", null, failedList));
+            return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
        } else {
            // Otherwise, lets try and sort the modlist and proceed
-            EarlyLoadingException earlyLoadingException = null;
            try {
-                ms.sort();
+                var sorted = sort(modFiles, named);
+                return LoadingModList.of(sorted.files(), sorted.mods(), null);
            } catch (EarlyLoadingException e) {
-                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 LoadingModList.of(systemMods.files(), systemMods.mods(), e);
            }
-            return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
        }
    }

-    private void sort()
-    {
-        // lambdas are identity based, so sorting them is impossible unless you hold reference to them
-        final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
-        AtomicInteger counter = new AtomicInteger();
-        Map<ModFileInfo, Integer> infos = modFiles.stream()
-                .map(ModFile::getModFileInfo)
-                .filter(ModFileInfo.class::isInstance)
-                .map(ModFileInfo.class::cast)
-                .collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
-        infos.keySet().forEach(graph::addNode);
-        modFiles.stream()
-                .map(ModFile::getModInfos)
-                .flatMap(List::stream)
-                .map(IModInfo::getDependencies)
-                .<IModInfo.ModVersion>flatMap(List::stream)
-                .forEach(dep -> addDependency(graph, dep));
+    private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
+        final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();

-        final List<ModFileInfo> sorted;
-        try
-        {
-            sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
-        }
-        catch (CyclePresentException e)
-        {
-            Set<Set<ModFileInfo>> cycles = e.getCycles();
-            if (LOGGER.isErrorEnabled(LOADING))
-            {
-                LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
+        int counter = 0;
+        var infos = new HashMap<ModInfo, Integer>();
+        for (var file : modFiles) {
+            if (file.getModFileInfo() instanceof ModFileInfo info) {
+                for (var imod : info.getMods()) {
+                    var mod = (ModInfo)imod;
+                    infos.put(mod, counter++);
+                    graph.addNode(mod);
+                }
            }
-            var dataList = cycles.stream()
-                    .flatMap(Set::stream)
-                    .<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
-                    .map(IModInfo::getModId)
-                    .map(list -> new ExceptionData("fml.modloading.cycle", list))
-                    .toList();
+        }
+
+        for (var file : modFiles) {
+            for (var info : file.getModInfos()) {
+                for (var dep : info.getDependencies()) {
+                    // Ordering isn't effected by sides, should it be?
+                    //if (!dep.getSide().isCorrectSide())
+                    //    continue;
+
+                    var target = named.get(dep.getModId());
+
+                    // soft dep that doesn't exist. No edge required.
+                    if (target == null)
+                        continue;
+
+                    var self = (ModInfo)dep.getOwner();
+
+                    switch (dep.getOrdering()) {
+                        case BEFORE -> graph.putEdge(self, target);
+                        case AFTER -> graph.putEdge(target, self);
+                        default -> {}
+                    }
+                }
+            }
+        }
+
+        final List<ModInfo> sorted;
+        try {
+            sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
+        } catch (CyclePresentException e) {
+            Set<Set<ModInfo>> cycles = e.getCycles();
+            var buf = new StringBuilder();
+            buf.append("Mod Sorting failed - Detected Cycles: \n");
+
+            var dataList = new ArrayList<ExceptionData>();
+            for (var cycle : cycles) {
+                buf.append("\tCycle:\n");
+                for (var mod : cycle) {
+                    var modDeps = new StringBuilder()
+                        .append(mod.getModId())
+                        .append(' ')
+                        .append(mod.getDependencies().stream()
+                            .filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
+                            .map(dep -> dep.getOrdering().name() + " " + dep.getModId())
+                            .collect(Collectors.joining(", "))
+                        );
+                    dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
+                    buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
+                }
+            }
+
+            LOGGER.error(LOADING, buf.toString());
+
            throw new EarlyLoadingException("Sorting error", e, dataList);
        }
-        this.sortedList = sorted.stream()
-                .map(ModFileInfo::getMods)
-                .flatMap(List::stream)
-                .map(ModInfo.class::cast)
-                .collect(toList());
-        this.modFiles = sorted.stream()
-                .map(ModFileInfo::getFile)
-                .collect(toList());
-    }

-    private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
-    {
-        final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
-        // soft dep that doesn't exist. Just return. No edge required.
-        if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
+        var files = new LinkedHashSet<ModFile>();
+        var list = new ArrayList<ModInfo>();

-        final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
-        if (self == target)
-            return; // in case a jar has two mods that have dependencies between
-
-        switch (dep.getOrdering()) {
-            case BEFORE -> topoGraph.putEdge(self, target);
-            case AFTER -> topoGraph.putEdge(target, self);
-            default -> {}
+        for (var mod : sorted) {
+            files.add(mod.getOwningFile().getFile());
+            list.add(mod);
        }
+
+        return new State(files.stream().toList(), list);
    }

-    private void buildUniqueList()
-    {
-        final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
-
-        this.modFiles = uniqueModListData.modFiles();
-
-        detectSystemMods(uniqueModListData.modFilesByFirstId());
-
-        modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
-                .filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
-                .collect(Collectors.toMap(
-                    Map.Entry::getKey,
-                    e -> e.getValue().get(0).getModInfos().get(0)
-                  ));
-    }
-
-    private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
+    private static State detectSystemMods(final List<ModFile> modFiles) {
        // Capture system mods (ex. MC, Forge) here, so we can keep them for later
        var systemMods = List.of("minecraft", "forge");
        LOGGER.debug("Configured system mods: {}", systemMods);

-        this.systemMods = new ArrayList<>();
+        var mods = new ArrayList<ModInfo>();
+        var files = new ArrayList<ModFile>();
        for (var systemMod : systemMods) {
-            var container = modFilesByFirstId.get(systemMod);
-            if (container != null && !container.isEmpty()) {
-                LOGGER.debug("Found system mod: {}", systemMod);
-                this.systemMods.add(container.getFirst());
-            } else {
+            var mod = findMod(modFiles, systemMod);
+            if (mod == null)
                throw new IllegalStateException("Failed to find system mod: " + systemMod);
-            }
+
+            LOGGER.debug("Found system mod: {}", systemMod);
+            mods.add(mod.info());
+            files.add(mod.file());
        }
+
+        return new State(files, mods);
    }

-    private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
-    {
-        final var modVersions = modFiles.stream()
-                .map(ModFile::getModInfos)
-                .flatMap(List::stream)
-                .collect(toMap(IModInfo::getModId, IModInfo::getVersion));
+    private record ModPair(ModFile file, ModInfo info) {}
+    private static ModPair findMod(final List<ModFile> modFiles, String name) {
+        for (var file : modFiles) {
+            for (var mod : file.getModFileInfo().getMods()) {
+                if (name.equals(mod.getModId()))
+                    return new ModPair(file, (ModInfo)mod);
+            }
+        }
+        return null;
+    }

-        final var modVersionDependencies = modFiles.stream()
-                .map(ModFile::getModInfos)
-                .flatMap(List::stream)
-                .collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
+    private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
+        final var modVersions = new HashMap<String, ArtifactVersion>();
+        final var modRequirements = new HashSet<ModVersion>();
+        int mandatoryRequired = 0;

-        final var modRequirements = modVersionDependencies.values().stream()
-                .<IModInfo.ModVersion>flatMap(List::stream)
-                .filter(mv -> mv.getSide().isCorrectSide())
-                .collect(toSet());
+        for (var file : files) {
+            for (var info : file.getModInfos()) {
+                modVersions.put(info.getModId(), info.getVersion());
+                for (var dep : info.getDependencies()) {
+                    if (dep.getSide().isCorrectSide()) {
+                        if (modRequirements.add(dep) && dep.isMandatory())
+                            mandatoryRequired++;
+                    }
+                }
+            }
+        }

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

-        if (!missingVersions.isEmpty()) {
-            if (mandatoryMissing > 0) {
-                LOGGER.error(
-                        LOADING,
-                        "Missing or unsupported mandatory dependencies:\n{}",
-                        missingVersions.stream()
-                                .filter(IModInfo.ModVersion::isMandatory)
-                                .map(ver -> formatDependencyError(ver, modVersions))
-                                .collect(Collectors.joining("\n"))
-                );
-            }
-            if (missingVersions.size() - mandatoryMissing > 0) {
-                LOGGER.error(
-                        LOADING,
-                        "Unsupported installed optional dependencies:\n{}",
-                        missingVersions.stream()
-                                .filter(ver -> !ver.isMandatory())
-                                .map(ver -> formatDependencyError(ver, modVersions))
-                                .collect(Collectors.joining("\n"))
-                );
-            }
+        final var missingMandatory = new HashSet<ModVersion>();
+        final var missingOptional = new HashSet<ModVersion>();

-            return missingVersions.stream()
-                    .map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
-                            mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
-                            modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
-                    .toList();
+        for (var dep : modRequirements) {
+            var modId = dep.getModId();
+            var existing = modVersions.get(modId);
+
+            if (!dep.isMandatory() && existing == null)
+                continue;
+
+            var range = dep.getVersionRange();
+            if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
+                continue;
+
+            if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
+                (dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
        }
-        return Collections.emptyList();
+
+
+        LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
+
+        var ret = new ArrayList<ExceptionData>();
+
+        if (!missingMandatory.isEmpty()) {
+            LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
+            for (var mv : missingMandatory)
+                ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
+        }
+
+        if (!missingOptional.isEmpty()) {
+            LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
+            for (var mv : missingMandatory)
+                ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
+        }
+
+        return ret;
    }

-    private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
-    {
-        ArtifactVersion installed = modVersions.get(dependency.getModId());
-        return String.format(
+    private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
+        var ret = new ArrayList<String>();
+        for (var dep : missing) {
+            var installed = modVersions.get(dep.getModId());
+            ret.add(String.format(
                "\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
-                dependency.getModId(),
-                dependency.getOwner().getModId(),
-                dependency.getVersionRange(),
+                dep.getModId(),
+                dep.getOwner().getModId(),
+                dep.getVersionRange(),
                installed != null ? installed.toString() : "[MISSING]"
-        );
+            ));
+        }
+        return String.join("\n", ret);
    }

-    private static boolean modVersionContained(IModInfo.ModVersion mv, Map<String, ArtifactVersion> modVersions) {
-        var modId = mv.getModId();
-        var range = mv.getVersionRange();
-        if (modVersions.containsKey(modId)
-                && (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE")))
-            return true;
-
-        return VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod");
+    private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
+    private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
+        return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
    }
 }
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;

-public class RuntimeDistCleaner implements ILaunchPluginService {
+public final class RuntimeDistCleaner implements ILaunchPluginService {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
    private static String DIST;
@@ -40,6 +40,25 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
        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();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        // No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client
+        if (FMLEnvironment.dist.isClient() && (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/")))
+            return NAY;
+
+        return YAY;
+    }
+
    @Override
    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
        var changed = false;
@@ -198,21 +217,6 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
        };
    }

-    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",
@@ -9,6 +9,7 @@ import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.language.IModInfo;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;

 import java.util.ArrayList;
@@ -23,16 +24,18 @@ import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;

-public class UniqueModListBuilder
-{
+@ApiStatus.Internal
+@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
+public class UniqueModListBuilder {
    private final static Logger LOGGER = LogUtils.getLogger();

    private final List<ModFile> modFiles;

-    public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
+    public UniqueModListBuilder(final List<ModFile> modFiles) {
+        this.modFiles = modFiles;
+    }

-    public UniqueModListData buildUniqueList()
-    {
+    public UniqueModListData buildUniqueList() {
        List<ModFile> uniqueModList;
        List<ModFile> uniqueLibListWithVersion;

@@ -139,5 +142,4 @@ public class UniqueModListBuilder
    }

    public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
-
 }
@@ -18,9 +18,7 @@ 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.
@@ -9,7 +9,6 @@ import cpw.mods.modlauncher.api.LamdbaExceptionUtils.Supplier_WithExceptions;
 import net.minecraftforge.fml.loading.StringUtils;

 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.stream.Stream;
@@ -68,6 +68,7 @@ public class ModDiscoverer {
        }
    }

+    @SuppressWarnings("removal")
    public ModValidator discoverMods() {
        LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
        List<ModFile> loadedFiles = new ArrayList<>();
@@ -51,6 +51,7 @@ public class ModFile implements IModFile {
    private CompletableFuture<ModFileScanData> futureScanResult;
    private List<CoreModFile> coreMods;
    private Path accessTransformer;
+    private List<Path> accessTransformers = Collections.emptyList();

    static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
    private SecureJar.Status securityStatus;
@@ -94,8 +95,14 @@ public class ModFile implements IModFile {
        return modFileInfo.getMods();
    }

+    /** @deprecated Use {@link #getAccessTransformers()} instead*/
+    @Deprecated(forRemoval=true, since="1.21.11")
    public Optional<Path> getAccessTransformer() {
-        return Optional.ofNullable(Files.exists(accessTransformer) ? accessTransformer : null);
+        return Optional.ofNullable(accessTransformer);
+    }
+
+    public List<Path> getAccessTransformers() {
+        return accessTransformers;
    }

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

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

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

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

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

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

    protected static List<CoreModFile> getCoreMods(final ModFile modFile) {
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;

@@ -81,6 +81,10 @@ class ArgumentList {
            .toArray(String[]::new);
    }

+    public boolean has(String key) {
+        return this.values.containsKey(key);
+    }
+
    public boolean hasValue(String key) {
        return getOrDefault(key, null) != null;
    }
@@ -22,6 +22,10 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
        super(type, prefix);
    }

+    protected CommonDevLaunchHandler(String name) {
+        super(name);
+    }
+
    @Override public String getNaming() { return "mcp"; }
    @Override public boolean isProduction() { return false; }

@@ -29,13 +33,35 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
    protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
        super.preLaunch(arguments, layer);

+        var args = ArgumentList.from(arguments);
+
+        if (this.module == null) {
+            var entry = args.get("launchEntry");
+            if (entry == null)
+                throw new IllegalArgumentException("When using " + this.name() + " launch target you must specify a --launchEntry argument");
+
+            args.remove("launchEntry");
+
+            int idx = entry.indexOf('/');
+            if (idx == -1) {
+                this.module = "minecraft";
+                this.main = entry;
+            } else {
+                this.module = entry.substring(0, idx);
+                this.main = entry.substring(idx + 1);
+            }
+
+            if (args.has("launchData")) {
+                args.remove("launchData");
+                this.isData = true;
+            }
+        }
+
        if (getDist().isDedicatedServer())
-            return arguments;
+            return args.getArguments();

        if (isData())
-            return arguments;
-
-        var args = ArgumentList.from(arguments);
+            return args.getArguments();

        String username = args.get("username");
        if (username != null) { // Replace '#' placeholders with random numbers
@@ -29,17 +29,27 @@ import java.util.List;
 public abstract class CommonLaunchHandler implements ILaunchHandlerService {
    protected static final Logger LOGGER = LogUtils.getLogger();

-    protected final LaunchType type;
-    private final String prefix;
+    private final String name;
+    protected Dist dist = Dist.CLIENT;
+    protected boolean isData = false;
+    protected String module;
+    protected String main;

    protected CommonLaunchHandler(LaunchType type, String prefix) {
-        this.type = type;
-        this.prefix = prefix;
+        this(prefix + type.name());
+        this.dist = type.dist();
+        this.isData = type.data();
+        this.module = type.module();
+        this.main = type.main();
    }

-    @Override public String name() { return this.prefix + this.type.name(); }
-    public Dist getDist() { return this.type.dist(); }
-    public boolean isData() { return this.type.data(); }
+    protected CommonLaunchHandler(String name) {
+        this.name = name;
+    }
+
+    @Override public String name() { return this.name; }
+    public Dist getDist() { return this.dist; }
+    public boolean isData() { return this.isData; }
    public boolean isProduction() { return false; }
    public abstract String getNaming();

@@ -66,14 +76,15 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
    }

    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
-        return () -> runTarget(this.type.module(), this.type.main(), arguments, gameLayer);
+        return () -> runTarget(this.module, this.main, arguments, gameLayer);
    }

    protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
    protected static final LaunchType CLIENT          = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
+    protected static final LaunchType CLIENT_DATA     = new LaunchType("client_data", "minecraft", "net.minecraft.client.data.Main", Dist.CLIENT, true);
    protected static final LaunchType DATA            = new LaunchType("data",   "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
    protected static final LaunchType SERVER          = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
-    protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
+    protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "minecraft", "net.minecraft.gametest.Main", Dist.DEDICATED_SERVER, false);

    protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
        var mod = layer.findModule(module).orElse(null);
@@ -14,12 +14,14 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
        super(type, "forge_dev_");
    }

+    private ForgeDevLaunchHandler(String name) {
+        super(name);
+    }
+
    @Override
    public List<Path> getMinecraftPaths() {
-
-        // The extra jar is on the classpath, so try and pull it out of the legacy classpath
-        var legacyCP = findClassPath();
-        var extra = findJarOnClasspath(legacyCP, "client-extra");
+        // The client extra jar is on the classpath we can try locating it using the .mcassetsroot which vanilla uses for loading data
+        var extra = getPathFromResource("assets/.mcassetsroot");
        // Minecraft is an exploded directory, so find it.
        var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class");
        var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
@@ -39,6 +41,12 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
        }
    }

+    public static final class ClientData extends ForgeDevLaunchHandler {
+        public ClientData() {
+            super(CLIENT_DATA);
+        }
+    }
+
    public static final class Data extends ForgeDevLaunchHandler {
        public Data() {
            super(DATA);
@@ -56,4 +64,10 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
            super(SERVER_GAMETEST);
        }
    }
+
+    public static final class Custom extends ForgeDevLaunchHandler {
+        public Custom() {
+            super("forge_dev");
+        }
+    }
 }
@@ -8,17 +8,18 @@ package net.minecraftforge.fml.loading.targets;
 import net.minecraftforge.fml.loading.FMLLoader;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.function.BiPredicate;
 import org.jetbrains.annotations.ApiStatus;

-import cpw.mods.jarhandling.SecureJar;
-
@ApiStatus.Internal
 sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
    private ForgeUserdevLaunchHandler(LaunchType type) {
        super(type, "forge_userdev_");
    }

+    private ForgeUserdevLaunchHandler(String name) {
+        super(name);
+    }
+
    @Override
    public List<Path> getMinecraftPaths() {
        var legacyCP = findClassPath();
@@ -26,7 +27,7 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {

        // Minecraft is extra jar {resources} + forge jar {patches}
        // The MC extra and forge jars are on the classpath, so try and pull them out
-        var extra = findJarOnClasspath(legacyCP, "client-extra");
+        var extra = findJarOnClasspath(legacyCP, "client-extra"); // This should be "client-" + vers.mcAndMCPVersion() + "-extra" but FG6 qwerks
        var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion());
        // We need to filter the forge jar to just MC code
        var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge);
@@ -39,6 +40,12 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
        }
    }

+    public static final class ClientData extends ForgeUserdevLaunchHandler {
+        public ClientData() {
+            super(CLIENT_DATA);
+        }
+    }
+
    public static final class Data extends ForgeUserdevLaunchHandler {
        public Data() {
            super(DATA);
@@ -56,4 +63,10 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
            super(SERVER_GAMETEST);
        }
    }
+
+    public static final class Custom extends ForgeUserdevLaunchHandler {
+        public Custom() {
+            super("forge_userdev");
+        }
+    }
 }
@@ -4,12 +4,16 @@ net.minecraftforge.fml.loading.targets.ForgeProdLaunchHandler$Server

 # Mod Developers
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Client
+net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ClientData
+net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Custom
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Data
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Server
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ServerGameTest

 #Working on Forge itself
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Client
+net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ClientData
+net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Custom
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Data
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Server
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ServerGameTest
@@ -4,7 +4,7 @@
    SPDX-License-Identifier: LGPL-2.1-only
 -->

-<Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
+<Configuration status="warn" shutdownHook="disable">
    <filters>
        <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>
@@ -1,17 +1,17 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx6G
 org.gradle.daemon=false
 org.gradle.parallel=true

 JAVA_VERSION=21
-MC_VERSION=1.21.1
+MC_VERSION=1.21.5
 MC_NEXT_VERSION=1.22
-MCP_VERSION=20240808.132146
+MCP_VERSION=20250325.155543
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.21.1
+MAPPING_VERSION=1.21.5

-// Set to true before the first build of a new MC version, so we don't do compatibility checks
+# Set to true before the first build of a new MC version, so we don't do compatibility checks
 CHECK_COMPATIBILITY=false
-// Set to true to allow for fuzzy patching. Useful during updateing
-UPDATING=false
+# Set to true to allow for fuzzy patching. Useful during updateing
+UPDATING=false
@@ -13,6 +13,7 @@ import net.minecraftforge.eventbus.api.IEventListener;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModLoadingException;
 import net.minecraftforge.fml.ModLoadingStage;
+import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
@@ -29,7 +30,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.jar.Attributes;

 public class FMLModContainer extends ModContainer {
@@ -47,7 +47,6 @@ public class FMLModContainer extends ModContainer {
        this.scanResults = modFileScanResults;
        activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
        this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
-        this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
        this.contextExtension = () -> context;
        try {
            var moduleName = info.getOwningFile().moduleName();
@@ -189,4 +188,14 @@ public class FMLModContainer extends ModContainer {
            throw new ModLoadingException(modInfo, modLoadingStage, "fml.modloading.errorduringevent", t);
        }
    }
+
+    @Override
+    public void dispatchConfigEvent(IConfigEvent event) {
+        this.eventBus.post(event.self());
+    }
+
+    @Override
+    public String toString() {
+        return "FMLModContainer[" + this.getModInfo().getModId() + ", " + this.getClass().getName() + "]";
+    }
 }
@@ -1,216 +1,62 @@
+// This is a minimal setup of a Forge mod workspace.
+// For complex examples (including AccessTransformers, Jar-in-Jar, and Mixin), see our examples repository.
+// https://github.com/MinecraftForge/MDKExamples
+
 plugins {
-    id 'eclipse'
+    id 'java'
    id 'idea'
-    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'eclipse'
+    id 'net.minecraftforge.gradle' version '[7.0.3,8)'
 }

-version = mod_version
-group = mod_group_id
-
-base {
-    archivesName = mod_id
-}
+version = '1.0.0'
+group = 'com.example.examplemod'

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

-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
+// Include generated resources
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 minecraft {
-    // The mappings can be changed at any time and must be in the following format.
-    // Channel:   Version:
-    // official   MCVersion             Official field/method names from Mojang mapping files
-    // parchment  YYYY.MM.DD-MCVersion  Open community-sourced parameter names and javadocs layered on top of official
-    //
-    // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
-    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-    //
-    // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
-    // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
-    //
-    // Use non-default mappings at your own risk. They may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: mapping_channel, version: mapping_version
-    
-    // Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
-    reobf = false
+    mappings channel: 'official', version: '@MC_VERSION@'

-    // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
-    // In most cases, it is not necessary to enable.
-    // enableEclipsePrepareRuns = true
-    // enableIdeaPrepareRuns = true
-
-    // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
-    // It is REQUIRED to be set to true for this template to function.
-    // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-    copyIdeResources = true
-
-    // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
-    // The folder name can be set on a run configuration using the "folderName" property.
-    // By default, the folder name of a run configuration is the name of the Gradle project containing it.
-    // generateRunFolders = true
-
-    // This property enables access transformers for use in development.
-    // They will be applied to the Minecraft artifact.
-    // The access transformer file can be anywhere in the project.
-    // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
-    // This default location is a best practice to automatically put the file in the right place in the final jar.
-    // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
    runs {
-        // applies to all the run configs below
        configureEach {
-            workingDirectory project.file('run')
+            workingDir = layout.projectDirectory.dir('run')

-            // Recommended logging data for a userdev environment
-            // The markers can be added/remove as needed separated by commas.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-            property 'forge.logging.console.level', 'debug'
+            systemProperty 'forge.enabledGameTestNamespaces', 'examplemod'
        }

-        client {
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', mod_id
-        }
+        register('client')

-        server {
-            property 'forge.enabledGameTestNamespaces', mod_id
+        register('server') {
            args '--nogui'
        }

-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
-        gameTestServer {
-            property 'forge.enabledGameTestNamespaces', mod_id
-        }
+        register('gameTestServer')

-        data {
-            // example of overriding the workingDirectory set in configureEach above
-            workingDirectory project.file('run-data')
+        register('data') {
+            workingDir = layout.projectDirectory.dir('run-data')

-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--mod', 'examplemod', '--all', '--output', layout.projectDirectory.dir('src/generated/resources'), '--existing', layout.projectDirectory.dir('src/main/resources')
        }
    }
 }

-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 repositories {
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
-    // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
-    // flatDir {
-    //     dir 'libs'
-    // }
+    minecraft.mavenizer(it) // In Kotlin, it = this
+    maven fg.forgeMaven
+    maven fg.minecraftLibsMaven
+    mavenCentral()
 }

 dependencies {
-    // Specify the version of Minecraft to use.
-    // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact.
-    // The "userdev" classifier will be requested and setup by ForgeGradle.
-    // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
-    // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-
-    // Example mod dependency with JEI
-    // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
-    // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
-    // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
-    // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
-
-    // Example mod dependency using a mod jar from ./libs with a flat dir repository
-    // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
-    // The group id is ignored when searching -- in this case, it is "blank"
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
-
-    // For more info:
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-}
-
-// This block of code expands all declared replace properties in the specified resource targets.
-// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
-// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
-// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-tasks.named('processResources', ProcessResources).configure {
-    var replaceProperties = [
-            minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
-            forge_version: forge_version, forge_version_range: forge_version_range,
-            loader_version_range: loader_version_range,
-            mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-            mod_authors: mod_authors, mod_description: mod_description,
-    ]
-    inputs.properties replaceProperties
-
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
-        expand replaceProperties + [project: project]
-    }
-}
-
-// Example for how to get properties into the manifest for reading at runtime.
-tasks.named('jar', Jar).configure {
-    manifest {
-        attributes([
-            'Specification-Title'     : mod_id,
-            'Specification-Vendor'    : mod_authors,
-            'Specification-Version'   : '1', // We are version 1 of ourselves
-            'Implementation-Title'    : project.name,
-            'Implementation-Version'  : project.jar.archiveVersion,
-            'Implementation-Vendor'   : mod_authors
-        ])
-    }
-}
-
-// Example configuration to allow publishing using the maven-publish plugin
-publishing {
-    publications {
-        register('mavenJava', MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
-            url "file://${project.projectDir}/mcmodsrepo"
-        }
-    }
+    implementation minecraft.dependency('net.minecraftforge:forge:@MC_VERSION@-@FORGE_VERSION@')
 }

 tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}
-
-// IntelliJ no longer downloads javadocs and sources by default.
-// This tells Gradle to force IDEA to do it.
-idea.module { downloadJavadoc = downloadSources = true }
-
-eclipse {
-    // Run everytime eclipse builds the code
-    //autoBuildTasks genEclipseRuns
-    // Run when importing the project
-    synchronizationTasks 'genEclipseRuns'
-}
-
-// Merge the resources and classes into the same directory. 
-// This is done because java expects modules to be in a single directory.
-// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
-// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
-sourceSets.each {
-    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
-    it.output.resourcesDir = dir
-    it.java.destinationDirectory = dir
+    // Use the UTF-8 charset for Java compilation
+    // This is done by default in Java 18+, but this ensures it no matter the Java or Gradle version
+    options.encoding = 'UTF-8'
 }
@@ -1,13 +1,11 @@
-
 Source installation information for modders
 -------------------------------------------
 This code follows the Minecraft Forge installation methodology. It will apply
-some small patches to the vanilla MCP source code, giving you and it access 
+some small patches to the vanilla MCP source code, giving you and it access
 to some of the data and functions you need to build a successful mod.

-Note also that the patches are built against "un-renamed" MCP source code (aka
-SRG Names) - this means that you will not be able to read them directly against
-normal code.
+Please note that this example MDK is a simple showcase for the most basic of mods.
+To see more examples see our dedicated examples repository under the "Additional Resources" section.

 Setup Process:
 ==============================
@@ -17,30 +15,22 @@ Step 1: Open your command-line and browse to the folder where you extracted the
 Step 2: You're left with a choice.
 If you prefer to use Eclipse:
 1. Run the following command: `./gradlew genEclipseRuns`
-2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
+2. Open Eclipse, Import > Existing Gradle Project > Select Folder
   or run `gradlew eclipse` to generate the project.

 If you prefer to use IntelliJ:
 1. Open IDEA, and import project.
 2. Select your build.gradle file and have it import.
-3. Run the following command: `./gradlew genIntellijRuns`
-4. Refresh the Gradle Project in IDEA if required.
+3. Use the run tasks located under the "Slime Launcher" Gradle task group.

 If at any point you are missing libraries in your IDE, or you've run into problems you can 
 run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything 
 (this does not affect your code) and then start the process again.

-Mapping Names:
-=============================
-By default, the MDK is configured to use the official mapping names from Mojang for methods and fields 
-in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this
-license, if you do not agree with it you can change your mapping names to other crowdsourced names in your 
-build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here:
-https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-
 Additional Resources: 
 =========================
 Community Documentation: https://docs.minecraftforge.net/en/latest/gettingstarted/
+Additional Examples: https://github.com/MinecraftForge/MDKExamples
 LexManos' Install Video: https://youtu.be/8VEdtQLuLO0
 Forge Forums: https://forums.minecraftforge.net/
 Forge Discord: https://discord.minecraftforge.net/
@@ -22,4 +22,5 @@ eclipse
 run

 # Files from Forge MDK
+forge_README.txt
 forge*changelog.txt
@@ -1,59 +1,9 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true

+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.problems=warn

-## Environment Properties
-
-# The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=@MC_VERSION@
-# The Minecraft version range can use any release version of Minecraft as bounds.
-# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
-# as they do not follow standard versioning conventions.
-minecraft_version_range=[@MC_VERSION@,@MC_NEXT_VERSION@)
-# The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=@FORGE_VERSION@
-# The Forge version range can use any version of Forge as bounds or match the loader version range
-forge_version_range=[@FORGE_SPEC_VERSION@,)
-# The loader version range can only use the major version of Forge/FML as bounds
-loader_version_range=[@FORGE_SPEC_VERSION@,)
-# The mapping channel to use for mappings.
-# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
-# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
-#
-# | Channel   | Version              |                                                                                |
-# |-----------|----------------------|--------------------------------------------------------------------------------|
-# | official  | MCVersion            | Official field/method names from Mojang mapping files                          |
-# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
-#
-# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
-# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-#
-# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
-# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
-mapping_channel=@MAPPING_CHANNEL@
-# The mapping version to query from the mapping channel.
-# This must match the format required by the mapping channel.
-mapping_version=@MAPPING_VERSION@
-
-
-## Mod Properties
-
-# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
-# Must match the String constant located in the main mod class annotated with @Mod.
-mod_id=examplemod
-# The human-readable display name for the mod.
-mod_name=Example Mod
-# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
-mod_license=All Rights Reserved
-# The mod version. See https://semver.org/
-mod_version=1.0.0
-# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
-# This should match the base package used for the mod sources.
-# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
-mod_group_id=com.example.examplemod
-# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
-mod_authors=YourNameHere, OtherNameHere
-# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
-mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.
+net.minecraftforge.gradle.merge-source-sets=true
@@ -1,13 +1,5 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
-    }
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }

-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
-}
+rootProject.name = 'examplemod'
@@ -1,73 +1,43 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="${mod_license}"
-# A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
-# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
-# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
-#clientSideOnly=true #optional - defaults to false if absent
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="${mod_id}" #mandatory
-# The version number of the mod
-version="${mod_version}" #mandatory
-# A display name for the mod
-displayName="${mod_name}" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
-#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-#credits="" #optional
-# A text field displayed in the mod UI
-authors="${mod_authors}" #optional
-# Display Test controls the display for your mod in the server connection screen
-# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
-# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
-# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
-# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
-# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)
+# See https://docs.minecraftforge.net/en/1.21.x/gettingstarted/modfiles/#modstoml
+# There are lots of things you can do with the mods.toml, and not all fields are included with this MDK
+# References: https://github.com/MinecraftForge/MDKExamples

-# The description text for the mod (multi line!) (#mandatory)
-description='''${mod_description}'''
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.${mod_id}]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="${forge_version_range}" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
-    # BEFORE - This mod is loaded BEFORE the dependency
-    # AFTER - This mod is loaded AFTER the dependency
+modLoader="javafml"
+loaderVersion="[@FORGE_SPEC_VERSION@,)"
+license="All Rights Reserved"
+#issueTrackerURL="https://github.com/MyOrganization/MyMod/" #optional
+#clientSideOnly=true #optional, default=false
+
+[[mods]]
+modId="examplemod"
+version="1.0.0"
+displayName="Example Mod"
+#updateJSONURL="https://example.com/updates.json" #optional
+#displayURL="https://example.com/" #optional
+#logoFile="examplemod.png" #optional
+#credits="" #optional
+authors="YourNameHere, OtherNameHere" #optional
+#displayTest="MATCH_VERSION" #optional, default=MATCH_VERSION when not clientSideOnly, else IGNORE_ALL_VERSION
+
+# Access Transformers
+# Optional, if not specified Forge will attempt to find the default META-INF/accesstransformer.cfg and silently continue if not found. May default to an empty list in a future MC.
+# If you specify AT path strings in this list, Forge will attempt to load each of them and throw errors for any that aren't found.
+# Specifying an empty list when your mod has no ATs is recommended to opt-out of the default for slightly better loading performance.
+#accessTransformers = []
+
+description='''Example mod description.
+Newline characters can be used like this, and rendered on the mods screen properly.'''
+
+[[dependencies.examplemod]] #recommended
+    modId="forge"
+    mandatory=true
+    versionRange="[@FORGE_SPEC_VERSION@,)"
    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT, or SERVER
    side="BOTH"
-# Here's another dependency
-[[dependencies.${mod_id}]]
+
+[[dependencies.examplemod]] #recommended
    modId="minecraft"
    mandatory=true
-    # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="${minecraft_version_range}"
+    versionRange="[@MC_VERSION@,@MC_NEXT_VERSION@,)"
    ordering="NONE"
    side="BOTH"
-
-# Features are specific properties of the game environment, that you may want to declare you require. This example declares
-# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
-# stop your mod loading on the server for example.
-#[features.${mod_id}]
-#openGLVersion="[3.2,)"
@@ -0,0 +1,12 @@
+--- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
+@@ -109,6 +_,9 @@
+             GlStateManager._colorMask(true, true, true, true);
+             GlStateManager._clear(16384);
+             GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
+            // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
+            if (p_394273_.isStencilEnabled())
+                GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, GlConst.GL_TEXTURE_2D, 0, 0);
+             GlStateManager._glBindFramebuffer(36160, 0);
+         }
+     }
@@ -0,0 +1,34 @@
+--- a/com/mojang/blaze3d/opengl/GlDebug.java
+++ b/com/mojang/blaze3d/opengl/GlDebug.java
+@@ -23,6 +_,14 @@
+ 
+ @OnlyIn(Dist.CLIENT)
+ public class GlDebug {
+    /**
+     * TODO: [Forge][Rendering][VEN] Expose this in the configs
+     * <p>
+     * Will enable synchronous OpenGL debug logging, which means the message will be sent from the call that
+     * would have caused the error. Additionally, enables printing a stacktrace when and where this occurs.
+     */
+    private static final boolean PRINT_STACKTRACE_ON_ERROR = Boolean.getBoolean("forge.printGLStackOnError");
+
+     private static final Logger LOGGER = LogUtils.getLogger();
+     private static final int CIRCULAR_LOG_SIZE = 10;
+     private final Queue<GlDebug.LogEntry> MESSAGE_BUFFER = EvictingQueue.create(10);
+@@ -105,6 +_,8 @@
+         }
+ 
+         LOGGER.info("OpenGL debug message: {}", gldebug$logentry);
+        // TODO: [VEN] Trim the stack trace
+        if (PRINT_STACKTRACE_ON_ERROR) LOGGER.info("Trace: ", new Throwable("GlDebug"));
+     }
+ 
+     public List<String> getLastOpenGlDebugMessages() {
+@@ -121,6 +_,7 @@
+ 
+     @Nullable
+     public static GlDebug enableDebugCallback(int p_394351_, boolean p_393026_, Set<String> p_393339_) {
+        p_393026_ |= PRINT_STACKTRACE_ON_ERROR;
+         if (p_394351_ <= 0) {
+             return null;
+         } else {
@@ -0,0 +1,53 @@
+--- a/com/mojang/blaze3d/opengl/GlDevice.java
+++ b/com/mojang/blaze3d/opengl/GlDevice.java
+@@ -80,11 +_,25 @@
+ 
+     @Override
+     public GpuTexture createTexture(@Nullable Supplier<String> p_397830_, TextureFormat p_394839_, int p_394481_, int p_391831_, int p_395609_) {
+-        return this.createTexture(this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394839_, p_394481_, p_391831_, p_395609_);
+        return this.createTexture(p_397830_, p_394839_, p_394481_, p_391831_, p_395609_, false);
+    }
+
+    /** @see GpuDevice#createTexture(Supplier, TextureFormat, int, int, int, boolean) */
+    @Override
+    public GpuTexture createTexture(@Nullable Supplier<String> p_397830_, TextureFormat p_394839_, int p_394481_, int p_391831_, int p_395609_, boolean stencil) {
+        return this.createTexture(this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394839_, p_394481_, p_391831_, p_395609_, stencil);
+     }
+ 
+     @Override
+     public GpuTexture createTexture(@Nullable String p_394142_, TextureFormat p_394951_, int p_395535_, int p_393944_, int p_392329_) {
+        return this.createTexture(p_394142_, p_394951_, p_395535_, p_393944_, p_392329_, false);
+    }
+
+    /** @see GpuDevice#createTexture(String, TextureFormat, int, int, int, boolean) */
+    @Override
+    public GpuTexture createTexture(@Nullable String p_394142_, TextureFormat p_394951_, int p_395535_, int p_393944_, int p_392329_, boolean stencil) {
+        // Forge: stencil rendering is only for depth
+        stencil &= p_394951_.hasDepthAspect();
+         if (p_392329_ < 1) {
+             throw new IllegalArgumentException("mipLevels must be at least 1");
+         } else {
+@@ -106,11 +_,14 @@
+                 GlStateManager._texImage2D(
+                     3553,
+                     j,
+                    stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
+                     GlConst.toGlInternalId(p_394951_),
+                     p_395535_ >> j,
+                     p_393944_ >> j,
+                     0,
+                    stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL :
+                     GlConst.toGlExternalId(p_394951_),
+                    stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV :
+                     GlConst.toGlType(p_394951_),
+                     null
+                 );
+@@ -122,7 +_,7 @@
+             } else if (k != 0) {
+                 throw new IllegalStateException("OpenGL error " + k);
+             } else {
+-                GlTexture gltexture = new GlTexture(p_394142_, p_394951_, p_395535_, p_393944_, p_392329_, i);
+                GlTexture gltexture = new GlTexture(p_394142_, p_394951_, p_395535_, p_393944_, p_392329_, i, stencil);
+                 this.debugLabels.applyLabel(gltexture);
+                 return gltexture;
+             }
@@ -0,0 +1,32 @@
+--- a/com/mojang/blaze3d/opengl/GlStateManager.java
+++ b/com/mojang/blaze3d/opengl/GlStateManager.java
+@@ -90,6 +_,11 @@
+         }
+     }
+ 
+    public static boolean _isBlendEnabled() {
+        RenderSystem.assertOnRenderThread();
+        return BLEND.mode.enabled;
+    }
+
+     public static void _disableBlend() {
+         RenderSystem.assertOnRenderThread();
+         BLEND.mode.disable();
+@@ -411,9 +_,17 @@
+         }
+     }
+ 
+    /* Stores the last values sent into glMultiTexCoord2f */
+    public static float lastBrightnessX = 0.0f;
+    public static float lastBrightnessY = 0.0f;
+
+     public static void _texParameter(int p_393876_, int p_397998_, int p_396741_) {
+         RenderSystem.assertOnRenderThread();
+         GL11.glTexParameteri(p_393876_, p_397998_, p_396741_);
+        if (p_393876_ == GL13.GL_TEXTURE1) {
+            lastBrightnessX = p_397998_;
+            lastBrightnessY = p_396741_;
+        }
+     }
+ 
+     public static int _getTexLevelParameter(int p_393352_, int p_397204_, int p_396319_) {
@@ -0,0 +1,32 @@
+--- a/com/mojang/blaze3d/opengl/GlTexture.java
+++ b/com/mojang/blaze3d/opengl/GlTexture.java
+@@ -18,8 +_,13 @@
+     protected boolean modesDirty = true;
+ 
+     protected GlTexture(String p_393950_, TextureFormat p_392837_, int p_394590_, int p_391379_, int p_391947_, int p_396659_) {
+        this(p_393950_, p_392837_, p_394590_, p_391379_, p_391947_, p_396659_, false);
+    }
+
+    protected GlTexture(String p_393950_, TextureFormat p_392837_, int p_394590_, int p_391379_, int p_391947_, int p_396659_, boolean stencil) {
+         super(p_393950_, p_392837_, p_394590_, p_391379_, p_391947_);
+         this.id = p_396659_;
+        this.stencilEnabled = stencil;
+     }
+ 
+     @Override
+@@ -86,5 +_,15 @@
+     public void setTextureFilter(FilterMode p_394977_, FilterMode p_397175_, boolean p_393558_) {
+         super.setTextureFilter(p_394977_, p_397175_, p_393558_);
+         this.modesDirty = true;
+    }
+
+
+    /* FORGE START */
+
+    private final boolean stencilEnabled;
+
+    @Override
+    public boolean isStencilEnabled() {
+        return this.stencilEnabled;
+     }
+ }
@@ -1,35 +1,18 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -104,7 +_,10 @@
-                 GlStateManager._texParameter(3553, 34892, 0);
-                 GlStateManager._texParameter(3553, 10242, 33071);
-                 GlStateManager._texParameter(3553, 10243, 33071);
-+                if (!stencilEnabled)
-                 GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
-+                else
-+                    GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
+@@ -75,7 +_,7 @@
+             this.width = p_83951_;
+             this.height = p_83952_;
+             if (this.useDepth) {
+-                this.depthTexture = RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", TextureFormat.DEPTH32, p_83951_, p_83952_, 1);
+                this.depthTexture = RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", TextureFormat.DEPTH32, p_83951_, p_83952_, 1, this.stencilEnabled);
+                 this.depthTexture.setTextureFilter(FilterMode.NEAREST, false);
+                 this.depthTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE);
             }
- 
-             this.setFilterMode(9728, true);
-@@ -114,8 +_,13 @@
-             GlStateManager._texImage2D(3553, 0, 32856, this.width, this.height, 0, 6408, 5121, null);
-             GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
-             GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
-            if (this.useDepth) {
-+            if (this.useDepth && !stencilEnabled) {
-                 GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
-+            } else if(this.useDepth && net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
-+                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-+            } else if (this.useDepth) {
-+                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
-+                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-             }
- 
-             this.checkStatus();
-@@ -257,5 +_,26 @@
- 
-     public int getDepthTextureId() {
-         return this.depthBufferId;
+@@ -134,5 +_,26 @@
+     @Nullable
+     public GpuTexture getDepthTexture() {
+         return this.depthTexture;
 +    }
 +
 +    private boolean stencilEnabled = false;
@@ -42,7 +25,7 @@
 +    public void enableStencil() {
 +        if (stencilEnabled) return;
 +        stencilEnabled = true;
-+        this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
+        this.resize(viewWidth, viewHeight);
 +    }
 +
 +    /**
@@ -1,20 +0,0 @@
--- a/com/mojang/blaze3d/platform/GlStateManager.java
-+++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -493,9 +_,17 @@
-         }
-     }
- 
-+    /* Stores the last values sent into glMultiTexCoord2f */
-+    public static float lastBrightnessX = 0.0f;
-+    public static float lastBrightnessY = 0.0f;
-+
-     public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
-         RenderSystem.assertOnRenderThreadOrInit();
-         GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
-+        if (p_84161_ == GL13.GL_TEXTURE1) {
-+            lastBrightnessX = p_84162_;
-+            lastBrightnessY = p_84163_;
-+        }
-     }
- 
-     public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -84,7 +_,8 @@
+@@ -88,7 +_,8 @@
         GLFW.glfwWindowHint(139267, 2);
         GLFW.glfwWindowHint(139272, 204801);
         GLFW.glfwWindowHint(139270, 1);
@@ -10,15 +10,15 @@
         if (monitor != null) {
             VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
             this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
-@@ -96,6 +_,7 @@
+@@ -100,6 +_,7 @@
             this.windowedX = this.x = aint1[0];
             this.windowedY = this.y = aint[0];
         }
 +        }
 
-         GLFW.glfwMakeContextCurrent(this.window);
-         GL.createCapabilities();
-@@ -254,6 +_,9 @@
+         this.setMode();
+         this.refreshFramebufferSize();
+@@ -266,6 +_,9 @@
         GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
         this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
         this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
@@ -0,0 +1,20 @@
+--- a/com/mojang/blaze3d/systems/GpuDevice.java
+++ b/com/mojang/blaze3d/systems/GpuDevice.java
+@@ -25,7 +_,17 @@
+ 
+     GpuTexture createTexture(@Nullable Supplier<String> p_394357_, TextureFormat p_395807_, int p_395623_, int p_395802_, int p_396157_);
+ 
+    /** Forge: same as {@link #createTexture(Supplier, TextureFormat, int, int, int)} but with stencil support */
+    default GpuTexture createTexture(@Nullable Supplier<String> p_394357_, TextureFormat p_395807_, int p_395623_, int p_395802_, int p_396157_, boolean stencil) {
+        return this.createTexture(p_394357_, p_395807_, p_395623_, p_395802_, p_396157_);
+    }
+
+     GpuTexture createTexture(@Nullable String p_391798_, TextureFormat p_393333_, int p_391800_, int p_395600_, int p_394065_);
+
+    /** Forge: same as {@link #createTexture(String, TextureFormat, int, int, int)} but with stencil support */
+    default GpuTexture createTexture(@Nullable String p_391798_, TextureFormat p_393333_, int p_391800_, int p_395600_, int p_394065_, boolean stencil) {
+        return this.createTexture(p_391798_, p_393333_, p_391800_, p_395600_, p_394065_);
+    }
+ 
+     GpuBuffer createBuffer(@Nullable Supplier<String> p_395215_, BufferType p_392847_, BufferUsage p_391478_, int p_397054_);
+ 
@@ -0,0 +1,11 @@
+--- a/com/mojang/blaze3d/textures/GpuTexture.java
+++ b/com/mojang/blaze3d/textures/GpuTexture.java
+@@ -6,7 +_,7 @@
+ 
+ @OnlyIn(Dist.CLIENT)
+ @DontObfuscate
+-public abstract class GpuTexture implements AutoCloseable {
+public abstract class GpuTexture implements AutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture {
+     private final TextureFormat format;
+     private final int width;
+     private final int height;
@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
-@@ -13,7 +_,7 @@
- import org.joml.Vector3f;
+@@ -15,7 +_,7 @@
+ import org.joml.Vector3fc;
 
 @OnlyIn(Dist.CLIENT)
 -public class PoseStack {
 +public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
-     private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), p_85848_ -> {
-         Matrix4f matrix4f = new Matrix4f();
-         Matrix3f matrix3f = new Matrix3f();
+     private final List<PoseStack.Pose> poses = new ArrayList<>(16);
+     private int lastIndex;
+ 
@@ -1,11 +0,0 @@
--- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
-+++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
-@@ -62,7 +_,7 @@
-     public VertexConsumer setNormal(float p_344306_, float p_342091_, float p_344579_) {
-         this.delegate.setNormal(p_344306_, p_342091_, p_344579_);
-         Vector3f vector3f = this.normalInversePose.transform(p_344306_, p_342091_, p_344579_, this.normal);
-        Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
-+        Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
-         Vector3f vector3f1 = this.cameraInversePose.transformPosition(this.x, this.y, this.z, this.worldPos);
-         vector3f1.rotateY((float) Math.PI);
-         vector3f1.rotateX((float) (-Math.PI / 2));
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -12,7 +_,7 @@
+@@ -13,7 +_,7 @@
 import org.lwjgl.system.MemoryStack;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,16 +9,15 @@
     VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
 
     VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
-@@ -135,10 +_,11 @@
-                 }
+@@ -133,9 +_,11 @@
 
-                 int i1 = FastColor.ARGB32.color(k, (int)f3, (int)f4, (int)f5);
-                int j1 = p_331444_[l];
-+                int j1 = applyBakedLighting(p_331444_[l], bytebuffer);
+                 int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
+                 int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
+                k1 = applyBakedLighting(k1, bytebuffer);
                 float f10 = bytebuffer.getFloat(16);
                 float f9 = bytebuffer.getFloat(20);
                 Vector3f vector3f1 = matrix4f.transformPosition(f, f1, f2, new Vector3f());
 +                applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
-                 this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), i1, f10, f9, p_85993_, j1, vector3f.x(), vector3f.y(), vector3f.z());
+                 this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), j1, f10, f9, p_85993_, k1, vector3f.x(), vector3f.y(), vector3f.z());
             }
         }
@@ -1,23 +1,23 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -13,7 +_,7 @@
- import net.minecraftforge.api.distmarker.OnlyIn;
+@@ -20,7 +_,7 @@
 
 @OnlyIn(Dist.CLIENT)
+ @DontObfuscate
 -public class VertexFormat {
 +public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
     public static final int UNKNOWN_ELEMENT = -1;
     private final List<VertexFormatElement> elements;
     private final List<String> names;
-@@ -22,6 +_,7 @@
-     private final int[] offsetsByElement = new int[32];
+@@ -31,6 +_,7 @@
+     private GpuBuffer immediateDrawVertexBuffer;
     @Nullable
-     private VertexBuffer immediateDrawVertexBuffer;
+     private GpuBuffer immediateDrawIndexBuffer;
 +    private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
 
     VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
         this.elements = p_343616_;
-@@ -34,6 +_,11 @@
+@@ -43,6 +_,11 @@
             int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
             this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
         }
@@ -29,13 +29,13 @@
     }
 
     public static VertexFormat.Builder builder() {
-@@ -158,6 +_,9 @@
+@@ -146,6 +_,9 @@
 
-         return vertexbuffer;
+         return this.immediateDrawIndexBuffer;
     }
 +
 +    public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
 +    public int getOffset(int index) { return offsetsByElement[index]; }
 
     @OnlyIn(Dist.CLIENT)
-     public static class Builder {
+     @DontObfuscate
@@ -1,15 +1,15 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
-@@ -13,7 +_,7 @@
+@@ -14,7 +_,7 @@
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
-     private final Matrix4f matrix;
+     private final Matrix4fc matrix;
     public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
         p_269604_ -> p_269604_.group(
-@@ -169,5 +_,19 @@
+@@ -174,5 +_,19 @@
         vector3f1.lerp(p_175938_.getScale(), p_175939_);
         quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
         return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
@@ -34,4 +34,4 @@
 +        this.stackTrace = t.getStackTrace();
     }
 
-     public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
+     public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, BlockState p_178954_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -267,7 +_,7 @@
+@@ -268,7 +_,7 @@
                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
                 .getChoiceType(p_137552_, p_137553_);
         } catch (IllegalArgumentException illegalargumentexception) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -214,7 +_,11 @@
+@@ -226,7 +_,11 @@
         }
 
         public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -105,9 +_,13 @@
+@@ -118,9 +_,13 @@
     }
 
     protected void setRotation(float p_90573_, float p_90574_) {
@@ -15,7 +15,7 @@
         FORWARDS.rotate(this.rotation, this.forwards);
         UP.rotate(this.rotation, this.up);
         LEFT.rotate(this.rotation, this.left);
-@@ -223,6 +_,13 @@
+@@ -236,6 +_,13 @@
 
     public float getPartialTickTime() {
         return this.partialTickTime;
@@ -1,20 +0,0 @@
--- a/net/minecraft/client/ClientRecipeBook.java
-+++ b/net/minecraft/client/ClientRecipeBook.java
-@@ -65,7 +_,7 @@
-             Recipe<?> recipe = recipeholder.value();
-             if (!recipe.isSpecial() && !recipe.isIncomplete()) {
-                 RecipeBookCategories recipebookcategories = getCategory(recipeholder);
-                String s = recipe.getGroup();
-+                String s = recipe.getGroup().isEmpty() ? recipeholder.id().toString() : recipe.getGroup(); // FORGE: Group value defaults to the recipe's ID if the recipe's explicit group is empty.
-                 if (s.isEmpty()) {
-                     map.computeIfAbsent(recipebookcategories, p_90645_ -> Lists.newArrayList()).add(ImmutableList.of(recipeholder));
-                 } else {
-@@ -125,6 +_,8 @@
-             } else if (recipetype == RecipeType.SMITHING) {
-                 return RecipeBookCategories.SMITHING;
-             } else {
-+                var categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType)recipetype, p_299041_);
-+                if (categories != null) return categories;
-                 LOGGER.warn(
-                     "Unknown recipe category: {}/{}",
-                     LogUtils.defer(() -> BuiltInRegistries.RECIPE_TYPE.getKey(recipe.getType())),
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -14,9 +_,9 @@
+@@ -15,9 +_,9 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
@@ -12,7 +12,7 @@
     private static final Set<String> CATEGORIES = Sets.newHashSet();
     public static final String CATEGORY_MOVEMENT = "key.categories.movement";
     public static final String CATEGORY_MISC = "key.categories.misc";
-@@ -42,14 +_,14 @@
+@@ -43,14 +_,14 @@
     private int clickCount;
 
     public static void click(InputConstants.Key p_90836_) {
@@ -29,7 +29,7 @@
         if (keymapping != null) {
             keymapping.setDown(p_90839_);
         }
-@@ -100,7 +_,7 @@
+@@ -101,7 +_,7 @@
     }
 
     public boolean isDown() {
@@ -38,7 +38,7 @@
     }
 
     public String getCategory() {
-@@ -136,7 +_,16 @@
+@@ -137,7 +_,16 @@
     public int compareTo(KeyMapping p_90841_) {
         return this.category.equals(p_90841_.category)
             ? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
@@ -56,7 +56,7 @@
     }
 
     public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -145,6 +_,20 @@
+@@ -146,6 +_,20 @@
     }
 
     public boolean same(KeyMapping p_90851_) {
@@ -77,7 +77,7 @@
         return this.key.equals(p_90851_.key);
     }
 
-@@ -163,11 +_,13 @@
+@@ -164,11 +_,13 @@
     }
 
     public Component getTranslatedKeyMessage() {
@@ -92,10 +92,10 @@
     }
 
     public String saveString() {
-@@ -176,5 +_,88 @@
- 
-     public void setDown(boolean p_90846_) {
-         this.isDown = p_90846_;
+@@ -182,5 +_,88 @@
+     @Nullable
+     public static KeyMapping get(String p_378660_) {
+         return ALL.get(p_378660_);
 +    }
 +
 +    private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
@@ -1,18 +1,21 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -405,9 +_,9 @@
-                 Screen.wrapScreenError(() -> {
-                     if (p_90897_ == 1 || p_90897_ == 2) {
+@@ -431,12 +_,12 @@
+             if (screen != null) {
+                 try {
+                     if (p_90897_ != 1 && p_90897_ != 2) {
+-                        if (p_90897_ == 0 && screen.keyReleased(p_90895_, p_90896_, p_90898_)) {
+                        if (p_90897_ == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, p_90895_, p_90896_, p_90898_)) {
+                             return;
+                         }
+                     } else {
                         screen.afterKeyboardAction();
-                        aboolean[0] = screen.keyPressed(p_90895_, p_90896_, p_90898_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(aboolean, screen, p_90895_, p_90896_, p_90898_);
-                     } else if (p_90897_ == 0) {
-                        aboolean[0] = screen.keyReleased(p_90895_, p_90896_, p_90898_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(aboolean, screen, p_90895_, p_90896_, p_90898_);
+-                        if (screen.keyPressed(p_90895_, p_90896_, p_90898_)) {
+                        if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, p_90895_, p_90896_, p_90898_)) {
+                             return;
+                         }
                     }
-                 }, "keyPressed event handler", screen.getClass().getCanonicalName());
-                 if (aboolean[0]) {
-@@ -476,20 +_,21 @@
+@@ -495,6 +_,7 @@
                     }
                 }
             }
@@ -20,20 +23,17 @@
         }
     }
 
-     private void charTyped(long p_90890_, int p_90891_, int p_90892_) {
-         if (p_90890_ == this.minecraft.getWindow().getWindow()) {
-            GuiEventListener guieventlistener = this.minecraft.screen;
-+            Screen guieventlistener = this.minecraft.screen;
-             if (guieventlistener != null && this.minecraft.getOverlay() == null) {
-                 if (Character.charCount(p_90891_) == 1) {
-                     Screen.wrapScreenError(
-                        () -> guieventlistener.charTyped((char)p_90891_, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName()
-+                        () -> net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(guieventlistener, (char)p_90891_, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName()
-                     );
-                 } else {
-                     for (char c0 : Character.toChars(p_90891_)) {
-                        Screen.wrapScreenError(() -> guieventlistener.charTyped(c0, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName());
-+                        Screen.wrapScreenError(() -> net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(guieventlistener, c0, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName());
+@@ -504,10 +_,10 @@
+             if (screen != null && this.minecraft.getOverlay() == null) {
+                 try {
+                     if (Character.isBmpCodePoint(p_90891_)) {
+-                        screen.charTyped((char)p_90891_, p_90892_);
+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, (char)p_90891_, p_90892_);
+                     } else if (Character.isValidCodePoint(p_90891_)) {
+-                        screen.charTyped(Character.highSurrogate(p_90891_), p_90892_);
+-                        screen.charTyped(Character.lowSurrogate(p_90891_), p_90892_);
+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.highSurrogate(p_90891_), p_90892_);
+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.lowSurrogate(p_90891_), p_90892_);
                     }
-                 }
-             }
+                 } catch (Throwable throwable) {
+                     CrashReport crashreport = CrashReport.forThrowable(throwable, "charTyped event handler");
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -254,7 +_,7 @@
+@@ -248,7 +_,7 @@
 import org.slf4j.Logger;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     static Minecraft instance;
     private static final Logger LOGGER = LogUtils.getLogger();
     public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
-@@ -431,7 +_,6 @@
+@@ -426,7 +_,6 @@
             }
         }, Util.nonCriticalIoPool());
         LOGGER.info("Setting user: {}", this.user.getName());
@@ -17,39 +17,35 @@
         this.demo = p_91084_.game.demo;
         this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
         this.allowsChat = !p_91084_.game.disableChat;
-@@ -468,15 +_,15 @@
+@@ -478,10 +_,9 @@
+             LOGGER.error("Couldn't set icon", (Throwable)ioexception);
         }
 
-         this.window.setFramerateLimit(this.options.framerateLimit().get());
 +        // FORGE: Move mouse and keyboard handler setup further below
         this.mouseHandler = new MouseHandler(this);
 -        this.mouseHandler.setup(this.window.getWindow());
         this.keyboardHandler = new KeyboardHandler(this);
 -        this.keyboardHandler.setup(this.window.getWindow());
-         RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
+         RenderSystem.initRenderer(
+             this.window.getWindow(),
+             this.options.glDebugVerbosity,
+@@ -492,6 +_,7 @@
+         LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
         this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
-         this.mainRenderTarget.setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
-         this.mainRenderTarget.clear(ON_OSX);
         this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
 +        net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
         this.resourcePackRepository.reload();
         this.options.loadSelectedResourcePacks(this.resourcePackRepository);
         this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
-@@ -540,6 +_,7 @@
-         this.entityRenderDispatcher = new EntityRenderDispatcher(this, this.textureManager, this.itemRenderer, this.blockRenderer, this.font, this.options, this.entityModels);
-         this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
+@@ -570,6 +_,7 @@
+         this.blockEntityRenderDispatcher = new BlockEntityRenderDispatcher(this.font, this.modelManager.entityModels(), this.blockRenderer, this.itemModelResolver, this.itemRenderer, this.entityRenderDispatcher);
+         this.resourceManager.registerReloadListener(this.blockEntityRenderDispatcher);
         this.particleEngine = new ParticleEngine(this.level, this.textureManager);
 +        net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
         this.resourceManager.registerReloadListener(this.particleEngine);
         this.paintingTextures = new PaintingTextureManager(this.textureManager);
         this.resourceManager.registerReloadListener(this.paintingTextures);
-@@ -552,11 +_,15 @@
-         this.gameRenderer = new GameRenderer(this, this.entityRenderDispatcher.getItemInHandRenderer(), this.resourceManager, this.renderBuffers);
-         this.resourceManager.registerReloadListener(this.gameRenderer.createReloadListener());
-         this.levelRenderer = new LevelRenderer(this, this.entityRenderDispatcher, this.blockEntityRenderDispatcher, this.renderBuffers);
-+        net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RenderLevelStageEvent.RegisterStageEvent());
-         this.resourceManager.registerReloadListener(this.levelRenderer);
-         this.gpuWarnlistManager = new GpuWarnlistManager();
+@@ -585,6 +_,9 @@
         this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
         this.resourceManager.registerReloadListener(this.regionalCompliancies);
         this.gui = new Gui(this);
@@ -57,17 +53,17 @@
 +        this.mouseHandler.setup(this.window.getWindow());
 +        this.keyboardHandler.setup(this.window.getWindow());
         this.debugRenderer = new DebugRenderer(this);
-         RealmsClient realmsclient = RealmsClient.create(this);
+         RealmsClient realmsclient = RealmsClient.getOrCreate(this);
         this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
-@@ -580,6 +_,7 @@
-             this.options.fullscreen().set(this.window.isFullscreen());
+@@ -618,6 +_,7 @@
+             }
         }
 
 +        net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
         this.window.updateVsync(this.options.enableVsync().get());
         this.window.updateRawMouseInput(this.options.rawMouseInput().get());
         this.window.setDefaultErrorCallback();
-@@ -600,16 +_,17 @@
+@@ -639,16 +_,17 @@
         GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
         Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
         this.setOverlay(
@@ -75,20 +71,20 @@
 -                this, reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
 +            net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(
 +                () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
-                         if (SharedConstants.IS_RUNNING_IN_IDE) {
-                             this.selfTest();
-                         }
+                     if (SharedConstants.IS_RUNNING_IN_IDE) {
+                         this.selfTest();
+                     }
 
-                         this.reloadStateTracker.finishReload();
-                         this.onResourceLoadFinished(minecraft$gameloadcookie);
-+                        net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
-                     }), false
+                     this.reloadStateTracker.finishReload();
+                     this.onResourceLoadFinished(minecraft$gameloadcookie);
+                    net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
+                 }), false
 -            )
 +            ).get()
         );
         this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
-     }
-@@ -698,6 +_,7 @@
+         this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
+@@ -746,6 +_,7 @@
         StringBuilder stringbuilder = new StringBuilder("Minecraft");
         if (checkModStatus().shouldReportAsModified()) {
             stringbuilder.append("*");
@@ -96,7 +92,7 @@
         }
 
         stringbuilder.append(" ");
-@@ -721,6 +_,8 @@
+@@ -769,6 +_,8 @@
     }
 
     private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
@@ -105,7 +101,7 @@
         return p_193587_.user.user.getType() != User.Type.MSA
             ? UserApiService.OFFLINE
             : p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
-@@ -731,7 +_,7 @@
+@@ -779,7 +_,7 @@
     }
 
     private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
@@ -114,7 +110,7 @@
             this.clearResourcePacksOnError(p_91240_, null, p_299515_);
         } else {
             Util.throwAsRuntime(p_91240_);
-@@ -991,12 +_,6 @@
+@@ -1065,12 +_,6 @@
             LOGGER.error("setScreen called from non-game thread");
         }
 
@@ -127,7 +123,7 @@
         if (p_91153_ == null && this.clientLevelTeardownInProgress) {
             throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
         } else {
-@@ -1010,6 +_,23 @@
+@@ -1084,6 +_,23 @@
                 }
             }
 
@@ -151,40 +147,40 @@
             this.screen = p_91153_;
             if (this.screen != null) {
                 this.screen.added();
-@@ -1088,6 +_,7 @@
-             this.resourceManager.close();
+@@ -1168,6 +_,7 @@
             FreeTypeUtil.destroy();
             Util.shutdownExecutors();
+             RenderSystem.getDevice().close();
 +            net.minecraftforge.fml.config.ConfigTracker.INSTANCE.forceUnload();
         } catch (Throwable throwable) {
             LOGGER.error("Shutdown failure!", throwable);
             throw throwable;
-@@ -1155,9 +_,11 @@
+@@ -1237,9 +_,11 @@
         this.mouseHandler.handleAccumulatedMovement();
-         this.profiler.pop();
+         profilerfiller.pop();
         if (!this.noRender) {
-+            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.timer);
-             this.profiler.popPush("gameRenderer");
-             this.gameRenderer.render(this.timer, p_91384_);
-             this.profiler.pop();
-+            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.timer);
+            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
+             profilerfiller.popPush("gameRenderer");
+             this.gameRenderer.render(this.deltaTracker, p_91384_);
+             profilerfiller.pop();
+            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
         }
 
-         if (this.fpsPieResults != null) {
-@@ -1283,10 +_,12 @@
-         this.window.setGuiScale((double)i);
+         profilerfiller.push("blit");
+@@ -1363,10 +_,12 @@
+         this.window.setGuiScale(i);
         if (this.screen != null) {
             this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
 +            net.minecraftforge.client.ForgeHooksClient.resizeGuiLayers(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
         }
 
         RenderTarget rendertarget = this.getMainRenderTarget();
-         rendertarget.resize(this.window.getWidth(), this.window.getHeight(), ON_OSX);
+         rendertarget.resize(this.window.getWidth(), this.window.getHeight());
 +        if (this.gameRenderer != null)
         this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
         this.mouseHandler.setIgnoreFirstMove();
     }
-@@ -1554,6 +_,7 @@
+@@ -1504,6 +_,7 @@
     }
 
     public void stop() {
@@ -192,7 +188,7 @@
         this.running = false;
     }
 
-@@ -1582,10 +_,18 @@
+@@ -1532,10 +_,18 @@
             if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
                 BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                 BlockPos blockpos = blockhitresult.getBlockPos();
@@ -214,7 +210,7 @@
                         this.player.swing(InteractionHand.MAIN_HAND);
                     }
                 }
-@@ -1613,6 +_,8 @@
+@@ -1563,6 +_,8 @@
                 return false;
             } else {
                 boolean flag = false;
@@ -223,7 +219,7 @@
                 switch (this.hitResult.getType()) {
                     case ENTITY:
                         this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
-@@ -1620,7 +_,7 @@
+@@ -1570,7 +_,7 @@
                     case BLOCK:
                         BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                         BlockPos blockpos = blockhitresult.getBlockPos();
@@ -232,7 +228,7 @@
                             this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
                             if (this.level.getBlockState(blockpos).isAir()) {
                                 flag = true;
-@@ -1633,8 +_,10 @@
+@@ -1583,8 +_,10 @@
                         }
 
                         this.player.resetAttackStrengthTicker();
@@ -243,7 +239,7 @@
                 this.player.swing(InteractionHand.MAIN_HAND);
                 return flag;
             }
-@@ -1650,6 +_,12 @@
+@@ -1600,6 +_,12 @@
                 }
 
                 for (InteractionHand interactionhand : InteractionHand.values()) {
@@ -256,68 +252,68 @@
                     ItemStack itemstack = this.player.getItemInHand(interactionhand);
                     if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
                         return;
-@@ -1670,7 +_,7 @@
+@@ -1620,7 +_,7 @@
                                 }
 
-                                 if (interactionresult.consumesAction()) {
-                                    if (interactionresult.shouldSwing()) {
-+                                    if (interactionresult.shouldSwing() && inputEvent.shouldSwingHand()) {
+                                 if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
+-                                    if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT) {
+                                    if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
                                         this.player.swing(interactionhand);
                                     }
 
-@@ -1682,7 +_,7 @@
+@@ -1632,7 +_,7 @@
                                 int i = itemstack.getCount();
                                 InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
-                                 if (interactionresult1.consumesAction()) {
-                                    if (interactionresult1.shouldSwing()) {
-+                                    if (interactionresult1.shouldSwing() && inputEvent.shouldSwingHand()) {
+                                 if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
+-                                    if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
+                                    if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
                                         this.player.swing(interactionhand);
-                                         if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
+                                         if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.player.hasInfiniteMaterials())) {
                                             this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
-@@ -1698,6 +_,9 @@
+@@ -1648,6 +_,9 @@
                         }
                     }
 
 +                    if (itemstack.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS))
 +                       net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, interactionhand);
 +
-                     if (!itemstack.isEmpty()) {
-                         InteractionResult interactionresult2 = this.gameMode.useItem(this.player, interactionhand);
-                         if (interactionresult2.consumesAction()) {
-@@ -1728,6 +_,8 @@
-             this.rightClickDelay--;
+                     if (!itemstack.isEmpty()
+                         && this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
+                         if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
+@@ -1677,6 +_,8 @@
         }
 
+         ProfilerFiller profilerfiller = Profiler.get();
 +        net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
 +
-         this.profiler.push("gui");
+         profilerfiller.push("gui");
         this.chatListener.tick();
         this.gui.tick(this.pause);
-@@ -1811,6 +_,7 @@
+@@ -1766,6 +_,7 @@
 
                 this.tutorial.tick();
 
 +                net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
                 try {
                     this.level.tick(() -> true);
-                 } catch (Throwable throwable) {
-@@ -1824,6 +_,7 @@
+                 } catch (Throwable throwable1) {
+@@ -1779,6 +_,7 @@
 
-                     throw new ReportedException(crashreport);
+                     throw new ReportedException(crashreport1);
                 }
 +                net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
             }
 
-             this.profiler.popPush("animateTick");
-@@ -1843,6 +_,7 @@
-         this.profiler.popPush("keyboard");
+             profilerfiller.popPush("animateTick");
+@@ -1803,6 +_,7 @@
+         profilerfiller.popPush("keyboard");
         this.keyboardHandler.tick();
-         this.profiler.pop();
+         profilerfiller.pop();
 +        net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
     }
 
     private boolean isLevelRunningNormally() {
-@@ -2043,6 +_,7 @@
+@@ -2003,6 +_,7 @@
     }
 
     public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
@@ -325,7 +321,7 @@
         this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
         this.level = p_91157_;
         this.updateLevelInEngines(p_91157_);
-@@ -2080,6 +_,7 @@
+@@ -2040,6 +_,7 @@
         IntegratedServer integratedserver = this.singleplayerServer;
         this.singleplayerServer = null;
         this.gameRenderer.resetData();
@@ -333,15 +329,15 @@
         this.gameMode = null;
         this.narrator.clear();
         this.clientLevelTeardownInProgress = true;
-@@ -2087,6 +_,7 @@
+@@ -2047,6 +_,7 @@
         try {
             this.updateScreenAndTick(p_335030_);
             if (this.level != null) {
 +                net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
                 if (integratedserver != null) {
-                     this.profiler.push("waitForServer");
- 
-@@ -2099,6 +_,7 @@
+                     ProfilerFiller profilerfiller = Profiler.get();
+                     profilerfiller.push("waitForServer");
+@@ -2060,6 +_,7 @@
 
                 this.gui.onDisconnected();
                 this.isLocalServer = false;
@@ -349,40 +345,11 @@
             }
 
             this.level = null;
-@@ -2245,6 +_,7 @@
+@@ -2207,6 +_,7 @@
 
     private void pickBlock() {
         if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
 +            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
-             boolean flag = this.player.getAbilities().instabuild;
-             BlockEntity blockentity = null;
-             HitResult.Type hitresult$type = this.hitResult.getType();
-@@ -2257,7 +_,7 @@
-                 }
- 
-                 Block block = blockstate.getBlock();
-                itemstack = block.getCloneItemStack(this.level, blockpos, blockstate);
-+                itemstack = blockstate.getCloneItemStack(this.hitResult, this.level, blockpos, this.player);
-                 if (itemstack.isEmpty()) {
-                     return;
-                 }
-@@ -2271,7 +_,7 @@
-                 }
- 
-                 Entity entity = ((EntityHitResult)this.hitResult).getEntity();
-                itemstack = entity.getPickResult();
-+                itemstack = entity.getPickedResult(this.hitResult);
-                 if (itemstack == null) {
-                     return;
-                 }
-@@ -2855,6 +_,10 @@
-     @Nullable
-     public static String getLauncherBrand() {
-         return System.getProperty("minecraft.launcher.brand");
-+    }
-+
-+    public ItemColors getItemColors() {
-+       return this.itemColors;
-     }
- 
-     @OnlyIn(Dist.CLIENT)
+             boolean flag = Screen.hasControlDown();
+             switch (this.hitResult) {
+                 case BlockHitResult blockhitresult:
@@ -1,62 +1,68 @@
 --- a/net/minecraft/client/MouseHandler.java
 +++ b/net/minecraft/client/MouseHandler.java
-@@ -79,6 +_,7 @@
+@@ -90,6 +_,7 @@
                 this.activeButton = -1;
             }
 
 +            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(p_91532_, p_91533_, p_91534_)) return;
-             boolean[] aboolean = new boolean[]{false};
             if (this.minecraft.getOverlay() == null) {
                 if (this.minecraft.screen == null) {
-@@ -91,9 +_,9 @@
-                     Screen screen = this.minecraft.screen;
-                     if (flag) {
+                     if (!this.mouseGrabbed && flag) {
+@@ -103,7 +_,7 @@
                         screen.afterMouseAction();
-                        Screen.wrapScreenError(() -> aboolean[0] = screen.mouseClicked(d0, d1, i), "mouseClicked event handler", screen.getClass().getCanonicalName());
-+                        Screen.wrapScreenError(() -> net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(aboolean, screen, d0, d1, i), "mouseClicked event handler", screen.getClass().getCanonicalName());
+ 
+                         try {
+-                            if (screen.mouseClicked(d0, d1, i)) {
+                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, d0, d1, i)) {
+                                 return;
+                             }
+                         } catch (Throwable throwable1) {
+@@ -116,7 +_,7 @@
+                         }
                     } else {
-                        Screen.wrapScreenError(() -> aboolean[0] = screen.mouseReleased(d0, d1, i), "mouseReleased event handler", screen.getClass().getCanonicalName());
-+                        Screen.wrapScreenError(() -> net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(aboolean, screen, d0, d1, i), "mouseReleased event handler", screen.getClass().getCanonicalName());
-                     }
+                         try {
+-                            if (screen.mouseReleased(d0, d1, i)) {
+                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, d0, d1, i)) {
+                                 return;
+                             }
+                         } catch (Throwable throwable) {
+@@ -150,6 +_,7 @@
                 }
             }
-@@ -116,6 +_,7 @@
-                     }
-                 }
-             }
-+            net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
         }
+        net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
     }
 
-@@ -129,7 +_,9 @@
+     public void fillMousePositionDetails(CrashReportCategory p_398230_, Window p_398216_) {
+@@ -189,7 +_,9 @@
                 if (this.minecraft.screen != null) {
-                     double d3 = this.xpos * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
-                     double d4 = this.ypos * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
+                     double d3 = this.getScaledXPos(this.minecraft.getWindow());
+                     double d4 = this.getScaledYPos(this.minecraft.getWindow());
 -                    this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
 +                    if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPre(this.minecraft.screen, d3, d4, d1, d2)) return;
 +                    if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return;
 +                    net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPost(this.minecraft.screen, d3, d4, d1, d2);
                     this.minecraft.screen.afterMouseAction();
                 } else if (this.minecraft.player != null) {
-                     if (this.accumulatedScrollX != 0.0 && Math.signum(d1) != Math.signum(this.accumulatedScrollX)) {
-@@ -151,6 +_,7 @@
-                     this.accumulatedScrollX -= (double)j;
-                     this.accumulatedScrollY -= (double)i;
-                     int k = i == 0 ? -j : i;
+                     Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
+@@ -198,6 +_,7 @@
+                     }
+ 
+                     int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
 +                    if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseScroll(this, d1, d2)) return;
                     if (this.minecraft.player.isSpectator()) {
                         if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
-                             this.minecraft.gui.getSpectatorGui().onMouseScrolled(-k);
-@@ -236,7 +_,7 @@
-                 if (this.activeButton != -1 && this.mousePressedTime > 0.0) {
-                     double d4 = this.accumulatedDX * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
-                     double d5 = this.accumulatedDY * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
-                    Screen.wrapScreenError(() -> screen.mouseDragged(d2, d3, this.activeButton, d4, d5), "mouseDragged event handler", screen.getClass().getCanonicalName());
-+                    Screen.wrapScreenError(() -> net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5), "mouseDragged event handler", screen.getClass().getCanonicalName());
-                 }
+                             this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
+@@ -303,7 +_,7 @@
+                     double d5 = getScaledYPos(window, this.accumulatedDY);
 
-                 screen.afterMouseMove();
-@@ -303,6 +_,14 @@
+                     try {
+-                        screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
+                        net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5);
+                     } catch (Throwable throwable) {
+                         CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
+                         screen.fillCrashDetails(crashreport1);
+@@ -393,6 +_,14 @@
 
     public double ypos() {
         return this.ypos;
@@ -1,15 +1,23 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -681,7 +_,8 @@
+@@ -668,7 +_,8 @@
         },
         new OptionInstance.LazyEnum<>(
             () -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
 -            p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
 +            // FORGE: fix incorrect string comparison - PR #8767
 +            p_232011_ -> Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
-                     ? Optional.empty()
-                     : Optional.of(p_232011_),
+                 ? Optional.empty()
+                 : Optional.of(p_232011_),
             Codec.STRING
+@@ -683,6 +_,7 @@
+     public boolean onboardAccessibility = true;
+     public boolean syncWrites;
+     public boolean startedCleanly = true;
+    private final Map<String, String> unknownKeys = new java.util.HashMap<>();
+ 
+     public OptionInstance<Boolean> darkMojangStudiosBackground() {
+         return this.darkMojangStudiosBackground;
@@ -1050,6 +_,7 @@
     }
 
@@ -18,15 +26,16 @@
         this.minecraft = p_92138_;
         this.optionsFile = new File(p_92139_, "options.txt");
         boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
-@@ -1184,12 +_,22 @@
-         p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
+@@ -1181,15 +_,28 @@
         this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
         p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
-+        processOptionsForge(p_168428_);
+         this.startedCleanly = p_168428_.process("startedCleanly", this.startedCleanly);
+        processOptionsKeysOnly(p_168428_);
+        processOptionsEnd(p_168428_);
 +    }
 
-+    // FORGE: split off to allow reloading options after mod loading is done
-+    private void processOptionsForge(Options.FieldAccess p_168428_) {
+    // FORGE: split off to allow reloading keys after mod loading is done
+    private void processOptionsKeysOnly(Options.FieldAccess p_168428_) {
         for (KeyMapping keymapping : this.keyMappings) {
 -            String s = keymapping.saveString();
 +            String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : "");
@@ -41,8 +50,13 @@
 +                }
             }
         }
+    }
 
-@@ -1207,6 +_,10 @@
+    private void processOptionsEnd(Options.FieldAccess p_168428_) {
+         for (SoundSource soundsource : SoundSource.values()) {
+             p_168428_.process("soundCategory_" + soundsource.getName(), this.soundSourceVolumes.get(soundsource));
+         }
+@@ -1204,6 +_,10 @@
     }
 
     public void load() {
@@ -53,23 +67,66 @@
         try {
             if (!this.optionsFile.exists()) {
                 return;
-@@ -1234,7 +_,8 @@
-                 }
+@@ -1228,7 +_,8 @@
+                 this.graphicsMode.set(isTrue(optional.get()) ? GraphicsStatus.FANCY : GraphicsStatus.FAST);
             }
 
 -            this.processOptions(
-+            java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsForge : this::processOptions;
+            java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsKeysOnly : this::processOptions;
 +            processor.accept(
                 new Options.FieldAccess() {
                     @Nullable
-                     private String getValueOrNull(String p_168459_) {
-@@ -1428,6 +_,7 @@
+                     private String getValue(String p_394210_) {
+@@ -1310,6 +_,17 @@
+             );
+             compoundtag1.getString("fullscreenResolution").ifPresent(p_389133_ -> this.fullscreenVideoModeString = p_389133_);
+             KeyMapping.resetMapping();
+
+            if (limited) {
+                this.unknownKeys.clear();
+            } else {
+                var knownKeys = Arrays.stream(this.keyMappings).map(k -> "key_" + k.getName()).collect(Collectors.toSet());
+                for (var entry : compoundtag1.entrySet()) {
+                    if (entry.getKey().startsWith("key_") && entry.getValue().asString().isPresent() && !knownKeys.contains(entry.getKey()))
+                        this.unknownKeys.put(entry.getKey(), entry.getValue().asString().get());
+                }
+            }
+
+         } catch (Exception exception) {
+             LOGGER.error("Failed to load options", (Throwable)exception);
+         }
+@@ -1337,9 +_,11 @@
+     public void save() {
+         try (final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
+             printwriter.println("version:" + SharedConstants.getCurrentVersion().getDataVersion().getVersion());
+            var seen = new java.util.HashSet<String>();
+             this.processOptions(
+                 new Options.FieldAccess() {
+                     public void writePrefix(String p_168491_) {
+                        seen.add(p_168491_);
+                         printwriter.print(p_168491_);
+                         printwriter.print(':');
+                     }
+@@ -1395,6 +_,12 @@
+             if (s != null) {
+                 printwriter.println("fullscreenResolution:" + s);
+             }
+            // Forge add any unknown keys so that Mods can add keybindings between vanilla loading/saving its config.
+            for (var entry : this.unknownKeys.entrySet()) {
+                if (!seen.contains(entry.getKey()))
+                    printwriter.println(entry.getKey() + ":" + entry.getValue());
+            }
+
+         } catch (Exception exception) {
+             LOGGER.error("Failed to save options", (Throwable)exception);
+         }
+@@ -1433,6 +_,7 @@
     }
 
     public void broadcastOptions() {
 +        if (net.minecraftforge.client.loading.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
         if (this.minecraft.player != null) {
-             this.minecraft.player.connection.send(new ServerboundClientInformationPacket(this.buildPlayerInformation()));
+             this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
         }
@@ -1546,6 +_,23 @@
 
@@ -1,45 +0,0 @@
--- a/net/minecraft/client/RecipeBookCategories.java
-+++ b/net/minecraft/client/RecipeBookCategories.java
-@@ -12,7 +_,7 @@
- import net.minecraftforge.api.distmarker.OnlyIn;
- 
- @OnlyIn(Dist.CLIENT)
-public enum RecipeBookCategories {
-+public enum RecipeBookCategories implements net.minecraftforge.common.IExtensibleEnum {
-     CRAFTING_SEARCH(new ItemStack(Items.COMPASS)),
-     CRAFTING_BUILDING_BLOCKS(new ItemStack(Blocks.BRICKS)),
-     CRAFTING_REDSTONE(new ItemStack(Items.REDSTONE)),
-@@ -38,7 +_,7 @@
-     public static final List<RecipeBookCategories> CRAFTING_CATEGORIES = ImmutableList.of(
-         CRAFTING_SEARCH, CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE
-     );
-    public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = ImmutableMap.of(
-+    public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = net.minecraftforge.client.RecipeBookManager.getAggregateCategories(ImmutableMap.of(
-         CRAFTING_SEARCH,
-         ImmutableList.of(CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE),
-         FURNACE_SEARCH,
-@@ -47,7 +_,7 @@
-         ImmutableList.of(BLAST_FURNACE_BLOCKS, BLAST_FURNACE_MISC),
-         SMOKER_SEARCH,
-         ImmutableList.of(SMOKER_FOOD)
-    );
-+    ));
-     private final List<ItemStack> itemIcons;
- 
-     private RecipeBookCategories(final ItemStack... p_92267_) {
-@@ -60,10 +_,15 @@
-             case FURNACE -> FURNACE_CATEGORIES;
-             case BLAST_FURNACE -> BLAST_FURNACE_CATEGORIES;
-             case SMOKER -> SMOKER_CATEGORIES;
-+            default -> net.minecraftforge.client.RecipeBookManager.getCustomCategoriesOrEmpty(p_92270_);
-         };
-     }
- 
-     public List<ItemStack> getIconItems() {
-         return this.itemIcons;
-+    }
-+
-+    public static RecipeBookCategories create(String name, ItemStack... icons) {
-+        throw new IllegalStateException("Enum not extended");
-     }
- }
@@ -1,30 +1,32 @@
 --- a/net/minecraft/client/Screenshot.java
 +++ b/net/minecraft/client/Screenshot.java
-@@ -54,14 +_,24 @@
-             file2 = new File(file1, p_92307_);
-         }
+@@ -43,6 +_,13 @@
+                     file2 = new File(file1, p_92297_);
+                 }
 
-+        var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenshot(nativeimage, file2);
-+        if (event.isCanceled()) {
-+           p_92311_.accept(event.getCancelMessage());
-+           return;
-+        }
-+        final File target = event.getScreenshotFile();
+                var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenshot(p_389141_, file2);
+                if (event.isCanceled()) {
+                    p_92301_.accept(event.getCancelMessage());
+                    return;
+                }
+                final File target = event.getScreenshotFile();
 +
-         Util.ioPool()
-             .execute(
-                 () -> {
-                     try {
-                        nativeimage.writeToFile(file2);
-                        Component component = Component.literal(file2.getName())
-+                        nativeimage.writeToFile(target);
-+                        Component component = Component.literal(target.getName())
-                             .withStyle(ChatFormatting.UNDERLINE)
-                            .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file2.getAbsolutePath())));
-+                            .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, target.getAbsolutePath())));
-+                        if (event.getResultMessage() != null)
-+                            p_92311_.accept(event.getResultMessage());
-+                        else
-                         p_92311_.accept(Component.translatable("screenshot.success", component));
-                     } catch (Exception exception) {
-                         LOGGER.warn("Couldn't save screenshot", (Throwable)exception);
+                 Util.ioPool()
+                     .execute(
+                         () -> {
+@@ -50,10 +_,13 @@
+                                 NativeImage $$4x = p_389141_;
+ 
+                                 try {
+-                                    p_389141_.writeToFile(file2);
+-                                    Component component = Component.literal(file2.getName())
+                                    p_389141_.writeToFile(target);
+                                    Component component = Component.literal(target.getName())
+                                         .withStyle(ChatFormatting.UNDERLINE)
+                                         .withStyle(p_389149_ -> p_389149_.withClickEvent(new ClickEvent.OpenFile(file2.getAbsoluteFile())));
+                                    if (event.getResultMessage() != null)
+                                        p_92301_.accept(event.getResultMessage());
+                                    else
+                                     p_92301_.accept(Component.translatable("screenshot.success", component));
+                                 } catch (Throwable throwable1) {
+                                     if (p_389141_ != null) {
@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/color/block/BlockColors.java
 +++ b/net/minecraft/client/color/block/BlockColors.java
-@@ -29,7 +_,8 @@
- @OnlyIn(Dist.CLIENT)
- public class BlockColors {
+@@ -30,7 +_,8 @@
     private static final int DEFAULT = -1;
+     public static final int LILY_PAD_IN_WORLD = -14647248;
+     public static final int LILY_PAD_DEFAULT = -9321636;
 -    private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
 +    // Forge: Use registry delegate as non-Vanilla block ids are not constant
 +    private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
     private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
 
     public static BlockColors createDefault() {
-@@ -91,11 +_,12 @@
+@@ -95,11 +_,12 @@
         }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
         blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
         blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
@@ -24,7 +24,7 @@
         if (blockcolor != null) {
             return blockcolor.getColor(p_92583_, null, null, 0);
         } else {
-@@ -105,13 +_,15 @@
+@@ -109,13 +_,15 @@
     }
 
     public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
@@ -1,35 +0,0 @@
--- a/net/minecraft/client/color/item/ItemColors.java
-+++ b/net/minecraft/client/color/item/ItemColors.java
-@@ -26,7 +_,8 @@
- @OnlyIn(Dist.CLIENT)
- public class ItemColors {
-     private static final int DEFAULT = -1;
-    private final IdMapper<ItemColor> itemColors = new IdMapper<>(32);
-+    // Forge: Use registry delegate as non-Vanilla item ids are not constant
-+    private final java.util.Map<net.minecraft.core.Holder.Reference<Item>, ItemColor> itemColors = new java.util.HashMap<>(32);
- 
-     public static ItemColors createDefault(BlockColors p_92684_) {
-         ItemColors itemcolors = new ItemColors();
-@@ -105,17 +_,20 @@
-                     : FastColor.ARGB32.opaque(p_325310_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
-             Items.FILLED_MAP
-         );
-+        net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
-         return itemcolors;
-     }
- 
-     public int getColor(ItemStack p_92677_, int p_92678_) {
-        ItemColor itemcolor = this.itemColors.byId(BuiltInRegistries.ITEM.getId(p_92677_.getItem()));
-+        ItemColor itemcolor = this.itemColors.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.getItem()));
-         return itemcolor == null ? -1 : itemcolor.getColor(p_92677_, p_92678_);
-     }
- 
-+    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Item} */
-+    @Deprecated
-     public void register(ItemColor p_92690_, ItemLike... p_92691_) {
-         for (ItemLike itemlike : p_92691_) {
-            this.itemColors.addMapping(p_92690_, Item.getId(itemlike.asItem()));
-+            this.itemColors.put(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(itemlike.asItem()), p_92690_);
-         }
-     }
- }
@@ -0,0 +1,22 @@
+--- a/net/minecraft/client/data/Main.java
+++ b/net/minecraft/client/data/Main.java
+@@ -30,13 +_,18 @@
+         OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
+         OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
+         OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
+        OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg();
+        var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true);
+         OptionSet optionset = optionparser.parse(p_375526_);
+-        if (!optionset.has(optionspec) && optionset.hasOptions()) {
+        if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
+            var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList();
+             Path path = Paths.get(optionspec3.value(optionset));
+             boolean flag = optionset.has(optionspec2);
+             boolean flag1 = flag || optionset.has(optionspec1);
+             Bootstrap.bootStrap();
+             ClientBootstrap.bootstrap();
+            if (!loader.run(optionset, path, input, flag, flag1, flag, flag, true))
+                return;
+             DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
+             addClientProviders(datagenerator, flag1);
+             datagenerator.run();
@@ -0,0 +1,12 @@
+--- a/net/minecraft/client/data/models/ItemModelGenerators.java
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
+@@ -852,6 +_,9 @@
+         this.declareCustomModelItem(Items.COD);
+         this.declareCustomModelItem(Items.FEATHER);
+         this.declareCustomModelItem(Items.LEAD);
+        // moved from validate to here, because it's just vanilla default blocks
+        if (this.itemModelOutput instanceof ModelProvider.ItemInfoCollector collector)
+            collector.generateDefaultBlockModels();
+     }
+ 
+     @OnlyIn(Dist.CLIENT)
@@ -0,0 +1,111 @@
+--- a/net/minecraft/client/data/models/ModelProvider.java
+++ b/net/minecraft/client/data/models/ModelProvider.java
+@@ -45,11 +_,11 @@
+ 
+     @Override
+     public CompletableFuture<?> run(CachedOutput p_376268_) {
+-        ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector();
+-        ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector();
+        ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(this::getKnownItems);
+        ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
+         ModelProvider.SimpleModelCollector modelprovider$simplemodelcollector = new ModelProvider.SimpleModelCollector();
+-        new BlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
+-        new ItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
+         getBlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
+         getItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
+         modelprovider$blockstategeneratorcollector.validate();
+         modelprovider$iteminfocollector.finalizeAndValidate();
+         return CompletableFuture.allOf(
+@@ -59,6 +_,22 @@
+         );
+     }
+ 
+    protected Stream<Block> getKnownBlocks() {
+         return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace()));
+    }
+
+    protected Stream<Item> getKnownItems() {
+        return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace()));
+    }
+
+    protected BlockModelGenerators getBlockModelGenerators(BlockStateGeneratorCollector blocks, ItemInfoCollector items, SimpleModelCollector models) {
+        return new BlockModelGenerators(blocks, items, models);
+    }
+
+    protected ItemModelGenerators getItemModelGenerators(ItemInfoCollector items, SimpleModelCollector models) {
+        return new ItemModelGenerators(items, models);
+    }
+
+     @Override
+     public final String getName() {
+         return "Model Definitions";
+@@ -67,6 +_,15 @@
+     @OnlyIn(Dist.CLIENT)
+     public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> {
+         private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>();
+        private final Supplier<Stream<Block>> known;
+
+        public BlockStateGeneratorCollector() {
+            this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace())));
+        }
+
+        public BlockStateGeneratorCollector(Supplier<Stream<Block>> known) {
+            this.known = known;
+        }
+ 
+         public void accept(BlockModelDefinitionGenerator p_393399_) {
+             Block block = p_393399_.block();
+@@ -77,7 +_,7 @@
+         }
+ 
+         public void validate() {
+-            Stream<Holder.Reference<Block>> stream = BuiltInRegistries.BLOCK.listElements().filter(p_376480_ -> true);
+            Stream<Holder.Reference<Block>> stream = known.get().map(Block::builtInRegistryHolder);
+             List<ResourceLocation> list = stream.filter(p_378423_ -> !this.generators.containsKey(p_378423_.value()))
+                 .map(p_378200_ -> p_378200_.key().location())
+                 .toList();
+@@ -97,6 +_,15 @@
+     public static class ItemInfoCollector implements ItemModelOutput {
+         private final Map<Item, ClientItem> itemInfos = new HashMap<>();
+         private final Map<Item, Item> copies = new HashMap<>();
+        private final Supplier<Stream<Item>> known;
+
+        public ItemInfoCollector() {
+            this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace())));
+        }
+
+        public ItemInfoCollector(Supplier<Stream<Item>> known) {
+            this.known = known;
+        }
+ 
+         @Override
+         public void accept(Item p_376450_, ItemModel.Unbaked p_378513_) {
+@@ -115,7 +_,7 @@
+             this.copies.put(p_376965_, p_377438_);
+         }
+ 
+-        public void finalizeAndValidate() {
+        public void generateDefaultBlockModels() {
+             BuiltInRegistries.ITEM.forEach(p_378629_ -> {
+                 if (!this.copies.containsKey(p_378629_)) {
+                     if (p_378629_ instanceof BlockItem blockitem && !this.itemInfos.containsKey(blockitem)) {
+@@ -124,6 +_,8 @@
+                     }
+                 }
+             });
+        }
+        public void finalizeAndValidate() {
+             this.copies.forEach((p_376289_, p_375718_) -> {
+                 ClientItem clientitem = this.itemInfos.get(p_375718_);
+                 if (clientitem == null) {
+@@ -132,8 +_,8 @@
+                     this.register(p_376289_, clientitem);
+                 }
+             });
+-            List<ResourceLocation> list = BuiltInRegistries.ITEM
+-                .listElements()
+            List<ResourceLocation> list = known.get()
+                .map(item -> item.builtInRegistryHolder())
+                 .filter(p_377225_ -> !this.itemInfos.containsKey(p_377225_.value()))
+                 .map(p_378591_ -> p_378591_.key().location())
+                 .toList();
@@ -1,20 +1,11 @@
 --- a/net/minecraft/client/gui/Font.java
 +++ b/net/minecraft/client/gui/Font.java
-@@ -31,7 +_,7 @@
- import org.joml.Vector3f;
+@@ -32,7 +_,7 @@
+ import org.joml.Matrix4f;
 
 @OnlyIn(Dist.CLIENT)
 -public class Font {
 +public class Font implements net.minecraftforge.client.extensions.IForgeFont {
     private static final float EFFECT_DEPTH = 0.01F;
-     private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
-     public static final int ALPHA_CUTOFF = 8;
-@@ -322,6 +_,8 @@
-     public StringSplitter getSplitter() {
-         return this.splitter;
-     }
-+
-+    @Override public Font self() { return this; }
- 
-     @OnlyIn(Dist.CLIENT)
-     public static enum DisplayMode {
+     public static final float SHADOW_DEPTH = 0.03F;
+     public static final int NO_SHADOW = 0;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -131,7 +_,7 @@
+@@ -148,7 +_,7 @@
     public float vignetteBrightness = 1.0F;
     private int toolHighlightTimer;
     private ItemStack lastToolHighlight = ItemStack.EMPTY;
@@ -9,32 +9,66 @@
     private final SubtitleOverlay subtitleOverlay;
     private final SpectatorGui spectatorGui;
     private final PlayerTabOverlay tabList;
-@@ -318,7 +_,7 @@
+@@ -168,7 +_,7 @@
+     private int lastBubblePopSoundPlayed;
+     private float autosaveIndicatorValue;
+     private float lastAutosaveIndicatorValue;
+-    private final LayeredDraw layers = new LayeredDraw();
+    private final LayeredDraw layers = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.VANILLA_ROOT, net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.COMBINE_LIST);
+     private float scopeScale;
+ 
+     public Gui(Minecraft p_330021_) {
+@@ -180,14 +_,14 @@
+         this.bossOverlay = new BossHealthOverlay(p_330021_);
+         this.subtitleOverlay = new SubtitleOverlay(p_330021_);
+         this.resetTitleTimes();
+-        LayeredDraw layereddraw = new LayeredDraw()
+        LayeredDraw layereddraw = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.PRE_SLEEP_STACK, net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.PRE_LIST)
+             .add(this::renderCameraOverlays)
+             .add(this::renderCrosshair)
+             .add(this::renderHotbarAndDecorations)
+             .add(this::renderExperienceLevel)
+             .add(this::renderEffects)
+             .add((p_325313_, p_342678_) -> this.bossOverlay.render(p_325313_));
+-        LayeredDraw layereddraw1 = new LayeredDraw()
+        LayeredDraw layereddraw1 = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.POST_SLEEP_STACK,net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.POST_LIST)
+             .add(this::renderDemoOverlay)
+             .add((p_325315_, p_344521_) -> {
+                 if (this.debugOverlay.showDebugScreen()) {
+@@ -204,6 +_,7 @@
+             .add(layereddraw, () -> !p_330021_.options.hideGui)
+             .add(this::renderSleepOverlay)
+             .add(layereddraw1, () -> !p_330021_.options.hideGui);
+        ((net.minecraftforge.client.gui.overlay.ForgeLayeredDraw) layers).resolveLayers();
+     }
+ 
+     public void resetTitleTimes() {
+@@ -347,7 +_,7 @@
             Window window = this.minecraft.getWindow();
-             int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
-             int j = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
+             int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
+             int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
 -            this.chat.render(p_329202_, this.tickCount, i, j, false);
 +            net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
         }
     }
 
-@@ -434,6 +_,8 @@
+@@ -445,6 +_,8 @@
 
             for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
                 Holder<MobEffect> holder = mobeffectinstance.getEffect();
 +                var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
 +                if (!renderer.isVisibleInGui(mobeffectinstance)) continue;
                 if (mobeffectinstance.showIcon()) {
-                     int i = p_282812_.guiWidth();
-                     int j = 1;
-@@ -463,6 +_,7 @@
+                     int k = p_282812_.guiWidth();
+                     int l = 1;
+@@ -475,6 +_,7 @@
                         }
                     }
 
-+                    if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, i, j, 0, f)) continue;
+                    if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, k, l, 0, f)) continue;
                     TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
-                     int l1 = i;
-                     int i1 = j;
+                     int l1 = k;
+                     int k1 = l;
@@ -625,6 +_,10 @@
     }
 
@@ -43,7 +77,7 @@
 +    }
 +
 +    public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
-         this.minecraft.getProfiler().push("selectedItemName");
+         Profiler.get().push("selectedItemName");
         if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
             MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
@@ -632,9 +_,13 @@
@@ -66,13 +100,13 @@
             }
 
             if (l > 0) {
-                p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, FastColor.ARGB32.color(l, -1));
-+                p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, FastColor.ARGB32.color(l, -1));
+-                p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, ARGB.color(l, -1));
+                p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, ARGB.color(l, -1));
             }
         }
 
-@@ -1146,7 +_,7 @@
-             ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
+@@ -1154,7 +_,7 @@
+             ItemStack itemstack = this.minecraft.player.getInventory().getSelectedItem();
             if (itemstack.isEmpty()) {
                 this.toolHighlightTimer = 0;
 -            } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/GuiGraphics.java
 +++ b/net/minecraft/client/gui/GuiGraphics.java
-@@ -56,7 +_,7 @@
+@@ -52,7 +_,7 @@
 import org.joml.Vector2ic;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     public static final float MAX_GUI_Z = 10000.0F;
     public static final float MIN_GUI_Z = -10000.0F;
     private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
-@@ -268,6 +_,11 @@
+@@ -229,6 +_,11 @@
     }
 
     public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
@@ -18,10 +18,10 @@
 +
 +    // Forge: Add float variant for x,y coordinates
 +    public int drawString(Font p_283343_, @Nullable String p_281896_, float p_283569_, float p_283418_, int p_281560_, boolean p_282130_) {
-         if (p_281896_ == null) {
-             return 0;
-         } else {
-@@ -294,6 +_,11 @@
+         return p_281896_ == null
+             ? 0
+             : p_283343_.drawInBatch(
+@@ -250,6 +_,11 @@
     }
 
     public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
@@ -30,10 +30,10 @@
 +
 +    // Forge: Add float variant for x,y coordinates
 +    public int drawString(Font p_282636_, FormattedCharSequence p_281596_, float p_281586_, float p_282816_, int p_281743_, boolean p_282394_) {
-         int i = p_282636_.drawInBatch(
-             p_281596_,
-             (float)p_281586_,
-@@ -864,6 +_,7 @@
+         return p_282636_.drawInBatch(
+             p_281596_, p_281586_, p_282816_, p_281743_, p_282394_, this.pose.last().pose(), this.bufferSource, Font.DisplayMode.NORMAL, 0, 15728880
+         );
+@@ -850,6 +_,7 @@
                 CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
                 CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
                 crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
@@ -41,9 +41,9 @@
                 crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
                 crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
                 throw new ReportedException(crashreport);
-@@ -904,16 +_,26 @@
-             }
- 
+@@ -870,13 +_,24 @@
+             this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
+             this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
             this.pose.popPose();
 +            net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
         }
@@ -53,50 +53,56 @@
 
     public void renderTooltip(Font p_282308_, ItemStack p_282781_, int p_282687_, int p_282292_) {
 +        this.tooltipStack = p_282781_;
-         this.renderTooltip(p_282308_, Screen.getTooltipFromItem(this.minecraft, p_282781_), p_282781_.getTooltipImage(), p_282687_, p_282292_);
+         this.renderTooltip(
+             p_282308_, Screen.getTooltipFromItem(this.minecraft, p_282781_), p_282781_.getTooltipImage(), p_282687_, p_282292_, p_282781_.get(DataComponents.TOOLTIP_STYLE)
+         );
 +        this.tooltipStack = ItemStack.EMPTY;
 +    }
 +
 +    public void renderTooltip(Font font, List<Component> textComponents, Optional<TooltipComponent> tooltipComponent, ItemStack stack, int mouseX, int mouseY) {
 +       this.tooltipStack = stack;
-+       this.renderTooltip(font, textComponents, tooltipComponent, mouseX, mouseY);
+       this.renderTooltip(font, textComponents, tooltipComponent, mouseX, mouseY, stack.get(DataComponents.TOOLTIP_STYLE));
 +       this.tooltipStack = ItemStack.EMPTY;
     }
 
     public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
-        List<ClientTooltipComponent> list = p_282716_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
-        p_281682_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
-+        List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_282716_, p_281682_, p_283678_, guiWidth(), guiHeight(), p_283128_);
-         this.renderTooltipInternal(p_283128_, list, p_283678_, p_281696_, DefaultTooltipPositioner.INSTANCE);
+@@ -886,8 +_,7 @@
+     public void renderTooltip(
+         Font p_362491_, List<Component> p_368544_, Optional<TooltipComponent> p_362815_, int p_366300_, int p_368952_, @Nullable ResourceLocation p_368469_
+     ) {
+-        List<ClientTooltipComponent> list = p_368544_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
+-        p_362815_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
+        List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_368544_, p_362815_, p_366300_, guiWidth(), guiHeight(), p_362491_);
+         this.renderTooltipInternal(p_362491_, list, p_366300_, p_368952_, DefaultTooltipPositioner.INSTANCE, p_368469_);
     }
 
-@@ -922,7 +_,22 @@
+@@ -900,7 +_,22 @@
     }
 
     public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
-        this.renderTooltip(p_282739_, Lists.transform(p_281832_, Component::getVisualOrderText), p_282191_, p_282446_);
+-        this.renderComponentTooltip(p_282739_, p_281832_, p_282191_, p_282446_, null);
 +        List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_281832_, p_282191_, guiWidth(), guiHeight(), p_282739_);
-+        this.renderTooltipInternal(p_282739_, components, p_282191_, p_282446_, DefaultTooltipPositioner.INSTANCE);
+        this.renderTooltipInternal(p_282739_, components, p_282191_, p_282446_, DefaultTooltipPositioner.INSTANCE, null);
 +    }
 +
 +    public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
 +        this.tooltipStack = stack;
 +        List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
-+        this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
+        this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
 +        this.tooltipStack = ItemStack.EMPTY;
 +    }
 +
 +    public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
 +        this.tooltipStack = stack;
 +        List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
-+        this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
+        this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
 +        this.tooltipStack = ItemStack.EMPTY;
     }
 
-     public void renderTooltip(Font p_282192_, List<? extends FormattedCharSequence> p_282297_, int p_281680_, int p_283325_) {
-@@ -941,11 +_,13 @@
- 
-     private void renderTooltipInternal(Font p_282675_, List<ClientTooltipComponent> p_282615_, int p_283230_, int p_283417_, ClientTooltipPositioner p_282442_) {
+     public void renderComponentTooltip(Font p_369090_, List<Component> p_365405_, int p_368143_, int p_366244_, @Nullable ResourceLocation p_364763_) {
+@@ -942,11 +_,13 @@
+         @Nullable ResourceLocation p_368234_
+     ) {
         if (!p_282615_.isEmpty()) {
 +            var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, this, p_283230_, p_283417_, guiWidth(), guiHeight(), p_282615_, p_282675_, p_282442_);
 +            if (preEvent.isCanceled()) return;
@@ -109,21 +115,19 @@
                 if (k > i) {
                     i = k;
                 }
-@@ -955,18 +_,21 @@
+@@ -956,18 +_,19 @@
 
             int i2 = i;
             int j2 = j;
-            Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283230_, p_283417_, i2, j2);
+-            Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283230_, p_283417_, i, j);
 +            Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), i2, j2);
             int l = vector2ic.x();
             int i1 = vector2ic.y();
             this.pose.pushPose();
             int j1 = 400;
-            this.drawManaged(() -> TooltipRenderUtil.renderTooltipBackground(this, l, i1, i2, j2, 400));
-+            this.drawManaged(() -> {
-+                var colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282615_);
-+                TooltipRenderUtil.renderTooltipBackground(this, l, i1, i2, j2, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd(), colorEvent.getBorderStart(), colorEvent.getBorderEnd());
-+            });
+-            TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, 400, p_368234_);
+            var background_event = net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTooltipBackground(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282615_, p_368234_);
+            TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, 400, background_event.getBackground());
             this.pose.translate(0.0F, 0.0F, 400.0F);
             int k1 = i1;
 
@@ -131,15 +135,26 @@
                 ClientTooltipComponent clienttooltipcomponent1 = p_282615_.get(l1);
 -                clienttooltipcomponent1.renderText(p_282675_, l, k1, this.pose.last().pose(), this.bufferSource);
 +                clienttooltipcomponent1.renderText(preEvent.getFont(), l, k1, this.pose.last().pose(), this.bufferSource);
-                 k1 += clienttooltipcomponent1.getHeight() + (l1 == 0 ? 2 : 0);
+                 k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
             }
 
-@@ -974,7 +_,7 @@
+@@ -975,7 +_,7 @@
 
             for (int k2 = 0; k2 < p_282615_.size(); k2++) {
                 ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
-                clienttooltipcomponent2.renderImage(p_282675_, l, k1, this);
-+                clienttooltipcomponent2.renderImage(preEvent.getFont(), l, k1, this);
-                 k1 += clienttooltipcomponent2.getHeight() + (k2 == 0 ? 2 : 0);
+-                clienttooltipcomponent2.renderImage(p_282675_, l, k1, i2, j2, this);
+                clienttooltipcomponent2.renderImage(preEvent.getFont(), l, k1, i2, j2, this);
+                 k1 += clienttooltipcomponent2.getHeight(p_282675_) + (k2 == 0 ? 2 : 0);
             }
 
+@@ -1030,6 +_,10 @@
+                 default:
+             }
+         }
+    }
+
+    public MultiBufferSource.BufferSource getBufferSource() {
+        return this.bufferSource;
+     }
+ 
+     public void drawSpecial(Consumer<MultiBufferSource> p_367429_) {
@@ -1,9 +1,9 @@
 --- a/net/minecraft/client/gui/components/AbstractButton.java
 +++ b/net/minecraft/client/gui/components/AbstractButton.java
-@@ -34,7 +_,7 @@
-         RenderSystem.enableDepthTest();
-         p_281670_.blitSprite(SPRITES.get(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
-         p_281670_.setColor(1.0F, 1.0F, 1.0F, 1.0F);
+@@ -39,7 +_,7 @@
+             this.getHeight(),
+             ARGB.white(this.alpha)
+         );
 -        int i = this.active ? 16777215 : 10526880;
 +        int i = getFGColor();
         this.renderString(p_281670_, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -255,6 +_,25 @@
+@@ -250,6 +_,25 @@
         this.focused = p_93693_;
     }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/BossHealthOverlay.java
 +++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
-@@ -63,13 +_,16 @@
+@@ -66,13 +_,16 @@
 
             for (LerpingBossEvent lerpingbossevent : this.events.values()) {
                 int k = i / 2 - 91;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
 +++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
-@@ -101,9 +_,9 @@
+@@ -134,9 +_,9 @@
     @Nullable
     private CompletableFuture<LevelChunk> serverChunk;
     private boolean renderDebug;
@@ -13,53 +13,54 @@
     private final LocalSampleLogger frameTimeLogger = new LocalSampleLogger(1);
     private final LocalSampleLogger tickTimeLogger = new LocalSampleLogger(TpsDebugDimensions.values().length);
     private final LocalSampleLogger pingLogger = new LocalSampleLogger(1);
-@@ -129,14 +_,18 @@
+@@ -179,14 +_,18 @@
         this.clientChunk = null;
     }
 
 -    public void render(GuiGraphics p_281427_) {
-        this.minecraft.getProfiler().push("debug");
+-        ProfilerFiller profilerfiller = Profiler.get();
+-        profilerfiller.push("debug");
 +    protected void update() {
         Entity entity = this.minecraft.getCameraEntity();
         this.block = entity.pick(20.0, 0.0F, false);
         this.liquid = entity.pick(20.0, 0.0F, true);
-        p_281427_.drawManaged(() -> {
 +    }
 +
-+    protected void drawText(GuiGraphics p_281427_) {
-             this.drawGameInformation(p_281427_);
-             this.drawSystemInformation(p_281427_);
+    protected void drawText(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
+         this.drawGameInformation(p_281427_);
+         this.drawSystemInformation(p_281427_);
 +    }
 +
-+    protected void drawFPSCharts(GuiGraphics p_281427_) {
-             if (this.renderFpsCharts) {
-                 int i = p_281427_.guiWidth();
-                 int j = i / 2;
-@@ -146,7 +_,9 @@
-                     this.tpsChart.drawChart(p_281427_, i - k, k);
-                 }
-             }
+    protected void drawFPSCharts(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
+         this.profilerPieChart.setBottomOffset(10);
+         if (this.renderFpsCharts) {
+             int i = p_281427_.guiWidth();
+@@ -199,7 +_,9 @@
+ 
+             this.profilerPieChart.setBottomOffset(this.tpsChart.getFullHeight());
+         }
 +    }
 
-+    protected void drawNetworkCharts(GuiGraphics p_281427_) {
-             if (this.renderNetworkCharts) {
-                 int l = p_281427_.guiWidth();
-                 int i1 = l / 2;
-@@ -157,12 +_,21 @@
-                 int j1 = this.pingChart.getWidth(i1);
-                 this.pingChart.drawChart(p_281427_, l - j1, j1);
-             }
+    protected void drawNetworkCharts(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
+         if (this.renderNetworkCharts) {
+             int l = p_281427_.guiWidth();
+             int i1 = l / 2;
+@@ -215,12 +_,22 @@
+         try (Zone zone = profilerfiller.zone("profilerPie")) {
+             this.profilerPieChart.render(p_281427_);
+         }
 +    }
 +
 +    public void render(GuiGraphics p_281427_) {
-+        this.minecraft.getProfiler().push("debug");
+        ProfilerFiller profilerfiller = Profiler.get();
+        profilerfiller.push("debug");
 +        this.update();
-+        p_281427_.drawManaged(() -> {
-+           this.drawText(p_281427_);
-+           this.drawFPSCharts(p_281427_);
-+           this.drawNetworkCharts(p_281427_);
-         });
-         this.minecraft.getProfiler().pop();
+
+        this.drawText(profilerfiller, p_281427_);
+        this.drawFPSCharts(profilerfiller, p_281427_);
+        this.drawNetworkCharts(profilerfiller, p_281427_);
+ 
+         profilerfiller.pop();
     }
 
 -    protected void drawGameInformation(GuiGraphics p_281525_) {
@@ -69,7 +70,7 @@
         list.add("");
         boolean flag = this.minecraft.getSingleplayerServer() != null;
         list.add(
-@@ -176,11 +_,18 @@
+@@ -234,11 +_,18 @@
                 + (this.renderNetworkCharts ? " visible" : " hidden")
         );
         list.add("For help: press F3 + Q");
@@ -79,17 +80,17 @@
 +   protected void drawGameInformation(GuiGraphics p_281525_) {
 +      List<String> list = this.getGameInformation();
 +      list.addAll(this.getOverlayHelp());
-+      net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281525_, minecraft.getWindow(), minecraft.getTimer().getRealtimeDeltaTicks(), list, true);
+      net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281525_, minecraft.getWindow(), minecraft.getDeltaTracker().getRealtimeDeltaTicks(), list, true);
 +      this.renderLines(p_281525_, list, true);
     }
 
     protected void drawSystemInformation(GuiGraphics p_281261_) {
         List<String> list = this.getSystemInformation();
-+        net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281261_, minecraft.getWindow(), minecraft.getTimer().getRealtimeDeltaTicks(), list, false);
+        net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281261_, minecraft.getWindow(), minecraft.getDeltaTracker().getRealtimeDeltaTicks(), list, false);
         this.renderLines(p_281261_, list, false);
     }
 
-@@ -529,6 +_,7 @@
+@@ -592,6 +_,7 @@
                 list.add("");
                 list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
                 list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
@@ -1,10 +0,0 @@
--- a/net/minecraft/client/gui/components/toasts/ToastComponent.java
-+++ b/net/minecraft/client/gui/components/toasts/ToastComponent.java
-@@ -97,6 +_,7 @@
-     }
- 
-     public void addToast(Toast p_94923_) {
-+        if (net.minecraftforge.client.ForgeHooksClient.onToastAdd(p_94923_)) return;
-         this.queued.add(p_94923_);
-     }
- 
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/components/toasts/ToastManager.java
+++ b/net/minecraft/client/gui/components/toasts/ToastManager.java
+@@ -127,6 +_,7 @@
+     }
+ 
+     public void addToast(Toast p_360768_) {
+        if (net.minecraftforge.client.event.ForgeEventFactoryClient.onToastAdd(p_360768_)) return;
+         this.queued.add(p_360768_);
+     }
+ 
@@ -1,6 +1,30 @@
 --- a/net/minecraft/client/gui/screens/LoadingOverlay.java
 +++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
-@@ -131,6 +_,7 @@
+@@ -61,6 +_,8 @@
+         return p_169325_ & 16777215 | p_169326_ << 24;
+     }
+ 
+    protected boolean renderContents(GuiGraphics gui, float alpha) { return true; }
+
+     @Override
+     public void render(GuiGraphics p_281839_, int p_282704_, int p_283650_, float p_283394_) {
+         int i = p_281839_.guiWidth();
+@@ -95,6 +_,7 @@
+             f2 = 1.0F;
+         }
+ 
+        if (renderContents(p_281839_, f2)) {
+         int l2 = (int)(p_281839_.guiWidth() * 0.5);
+         int i1 = (int)(p_281839_.guiHeight() * 0.5);
+         double d0 = Math.min(p_281839_.guiWidth() * 0.75, (double)p_281839_.guiHeight()) * 0.25;
+@@ -110,12 +_,14 @@
+         if (f < 1.0F) {
+             this.drawProgressBar(p_281839_, i / 2 - k1, i2 - 5, i / 2 + k1, i2 + 5, 1.0F - Mth.clamp(f, 0.0F, 1.0F));
+         }
+        }
+ 
+         if (f >= 2.0F) {
+             this.minecraft.setOverlay(null);
         }
 
         if (this.fadeOutStart == -1L && this.reload.isDone() && (!this.fadeIn || f1 >= 2.0F)) {
@@ -8,7 +32,7 @@
             try {
                 this.reload.checkExceptions();
                 this.onFinish.accept(Optional.empty());
-@@ -138,7 +_,6 @@
+@@ -123,7 +_,6 @@
                 this.onFinish.accept(Optional.of(throwable));
             }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/PauseScreen.java
 +++ b/net/minecraft/client/gui/screens/PauseScreen.java
-@@ -94,6 +_,7 @@
+@@ -95,6 +_,7 @@
         } else {
             gridlayout$rowhelper.addChild(this.openScreenButton(PLAYER_REPORTING, () -> new SocialInteractionsScreen(this)));
         }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/Screen.java
 +++ b/net/minecraft/client/gui/screens/Screen.java
-@@ -201,7 +_,7 @@
+@@ -197,7 +_,7 @@
     }
 
     public void onClose() {
@@ -9,7 +9,7 @@
     }
 
     protected <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(T p_169406_) {
-@@ -312,8 +_,10 @@
+@@ -311,8 +_,10 @@
         this.width = p_96608_;
         this.height = p_96609_;
         if (!this.initialized) {
@@ -20,7 +20,7 @@
         } else {
             this.repositionElements();
         }
-@@ -326,8 +_,10 @@
+@@ -325,8 +_,10 @@
     protected void rebuildWidgets() {
         this.clearWidgets();
         this.clearFocus();
@@ -31,15 +31,15 @@
     }
 
     @Override
-@@ -354,6 +_,7 @@
+@@ -353,6 +_,7 @@
 
-         this.renderBlurredBackground(p_297268_);
+         this.renderBlurredBackground();
         this.renderMenuBackground(p_283688_);
 +        net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderScreenBackground(this, p_283688_);
     }
 
-     protected void renderBlurredBackground(float p_336041_) {
-@@ -463,6 +_,19 @@
+     protected void renderBlurredBackground() {
+@@ -453,6 +_,19 @@
     }
 
     public void onFilesDrop(List<Path> p_96591_) {
Author	SHA1	Message	Date
LexManos	694167779c	Add protection against large network channel lists	2026-10-14 19:45:46 -07:00
LexManos	3ea91e77ac	Fix legacy object holders not being fired in the registry specific codepath Better optimize the scanning for object holders by unrolling streams.	2026-10-13 10:24:28 -07:00
BonsUnleashedandLexManos	fc27a35722	Store object holder handlers per registry name (#10899 ) Co-authored-by: LexManos <[email protected]>	2026-10-12 16:41:51 -07:00
LexManos	12939f4cd3	Fix generic errors in new Eclipse compiler	2026-10-12 16:41:02 -07:00
Odin Okland	7a37f17c89	Use vanilla's entrypoint for GameTest servers (#10884 )	2026-09-23 15:14:38 -07:00
Paint_NinjaandMartijn van den Brand	22168f6a69	Fix IForgeBlockStateModel.getModelData not being called correct for `#getParticleIcon` (#10818 ) (#10875 ) Co-authored-by: Martijn van den Brand <[email protected]>	2026-08-15 13:34:02 -07:00
Meme Man	d32d853c0b	Update equality check for RegistryObject to include RegistryObject#key. (#10866 )	2026-08-04 19:09:58 +01:00
Matt	dd24e1385e	Toml parsing errors are now visible in the latest log (#10840 )	2026-07-09 12:45:19 -07:00
Matt	1ae17d5a04	Add support for multiple access transformer configs.	2026-03-23 12:03:29 -07:00
Jonathing	deaf69e1c9	Migrate the MDK to ForgeGradle 7 Backport of `d29524b` to 1.21.5	2026-03-18 22:54:38 +00:00
Paint_Ninja	ea7dff02a3	Skip processing vanilla classes in RuntimeDistCleaner when running on a client Backport of #10682 to 1.21.5. Also bumped ASM to 9.9.1	2026-03-17 20:19:28 +00:00
LexManos	054c23a59a	Update SecureModules to address ZipPath bug with brackets. Closes #10755	2026-01-20 18:28:21 -08:00
LexManos	220dcbe92c	Fix Entity patch lines	2026-01-15 11:06:05 -08:00
MattandLexManos	6865f4e77d	Optimize memory allocation for checking entity fluid collisions. Backport of #10745 (#10750 ) Co-authored-by: LexManos <[email protected]>	2026-01-15 10:45:48 -08:00
LexManos	3ea77c75b4	Mark applyServerBinpatches as a dependency of BundleList. Fixes: #10729	2025-12-04 08:56:28 -08:00
LexManos	d97e796c56	Migrate to Github Actions	2025-12-02 14:27:55 -08:00
Matt	6585db991d	Fix crafter not inserting into iitemhandler (#10667 ) (#10672 )	2025-09-25 13:10:57 -07:00
Paint_Ninja	fe64775f09	Bump ASM to 9.8 for Java 25 runtime support Note: Forge for 1.21.8 already has ASM 9.8	2025-09-22 11:53:38 +01:00
LexManos	9ccfaf4812	1.21.5 RB 1	2025-08-27 12:02:50 -07:00
Paint_Ninja	3ed3d2b9cf	Update to EventBus 6.2.32 (#10644 ) - Performance improvements, especially for posting to zero or one listeners on an event - New Event#cancel() convenience method - Only the monitor priority is tracked on the Forge bus now	2025-08-27 17:36:13 +01:00
Matt	3d374fe732	[1.21.5] Add ForgeLayeredDraw & ModifyOverlayLayersEvent as API to making gui layers. (#10556 )	2025-07-25 10:44:49 -07:00
Paint_Ninja	a02f3f9841	Update MDK to fix OOM error and aid getting Mixin setup (#10559 )	2025-06-09 22:19:37 +01:00
LexManos	c5e462f7d2	Remove legacy patch that caused tripwires to create a loop. Fixes #10558	2025-06-01 00:43:08 -07:00
Matt	d1f79d6655	Fix warped and crimson fungi not being able to be placed on nylium. (#10544 ) Fix other PlantType parity issues, add test for all vanilla PlantType blocks. Co-authored-by: LexManos <[email protected]>	2025-05-23 02:22:26 -07:00
LexManos	9d5e81b1a9	Fix modded keybidings being reset to default when reloading. Fixes: #10531	2025-05-22 00:40:04 -07:00
LexManos	a1c275df46	Deprecate GatherDataEvent.validate() as validation always happens. And made ExistingFileHelper always function. Closes #10516	2025-05-21 23:42:44 -07:00
LexManos	4ef7fe8bd8	Call getToolModifiedState for AXE_STRIP and AXE_WAX_OFF.	2025-05-21 23:41:54 -07:00
LexManos	ce8838e721	Fix Wood Stripping sound not playing. Fixes #10525	2025-05-20 23:12:19 -07:00
LexManos	b7e2593d48	Fix dedicated server not loading default language files. Fixes #10555	2025-05-16 13:01:02 -07:00
Joseph T. McQuigg	33d177f02e	Make Loot Function without builders Constructors public (#10521 )	2025-05-14 21:17:58 -07:00
Olivier Sechet	5d2186df63	Ensure changes from keyboard in ForgeSlider behave as changes from mouse (#10554 )	2025-05-09 15:14:16 -07:00
LexManos	77af36b807	Add YourKit mention	2025-05-08 13:40:26 -07:00
Matt	54eeca0aed	Fix creative inventory not displaying item categories correctly. Fixes #10524	2025-05-05 14:54:16 -07:00
LexManos	3de0566425	Make unbound tags non-fatal due to Mojang's registry loading order issues. Closes #10524	2025-05-05 14:52:43 -07:00
LexManos	a5ebf3b645	Fix PlayerEquipmentInvWrapper offset. Closes #10532	2025-05-05 12:13:58 -07:00
Paint_Ninja	63d0496cc4	Deprecate `DistExecutor` for removal (#10198 )	2025-04-23 20:54:22 +01:00
Paint_Ninja	31f623e794	Cleanup early display's internals a bit more (#10538 )	2025-04-23 20:53:29 +01:00
Erizamanu	eb001a6382	Add ChunkEvent.LightingCalculated, fixes #8354 (#10533 )	2025-04-22 21:11:26 +01:00
Paint_Ninja	504dcad849	Seal most event hierarchies (#10515 ) Most events in Forge are not designed to be extended by mod devs but technically allowed it before this PR, leading to a risk of unintentional breaking changes for those that do. If you need to extend a Forge event, please let us know so that we can explicitly support that and design it with extending in mind. Note that this change does not affect making your own events that directly extend from EventBus' `Event` class.	2025-04-19 13:18:48 +01:00
Matt	81f7f029c3	Fix NPE when breeze deflects a projectile (#10535 )	2025-04-19 13:08:10 +01:00
Jonathing	207c1997c9	Fix Swords and Pickaxes not using ToolActions (#10520 )	2025-04-06 12:08:21 -05:00
LexManos	e348ae5b84	Fix bundles causing crash upon inserting item. Closes #10509	2025-03-27 22:09:50 -07:00
LexManos	0f3b8ee830	Add DeferredRegistryData to help with generating data driven registry entries. Revive GameTest system and make all but one Forge Test mod pass.	2025-03-27 20:52:35 -07:00
LexManos	b4b6e48a7a	Fix Mod List Screen's render layout and scroll bars.	2025-03-26 18:54:11 -07:00
LexManos Ven Jonathing	d50a3b5ab7	Minecraft 1.21.5 Co-authored-by: Ven <[email protected]> Co-authored-by: Jonathing <[email protected]>	2025-03-26 16:34:26 -07:00
Joseph T. McQuigg	88904a1d09	Add Pumpkin Block and Item Tags (#10482 )	2025-03-17 00:04:24 +00:00
Jonathing	b864faf0ef	Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10459 )	2025-03-04 12:47:17 -08:00
cech12	c97eabc0c4	Fix Hanging Pale Moss not dropping with modded shears (#10414 )	2025-02-17 18:06:56 -08:00
Jonathing	6ae39c8597	1.21.4 RB 1 https://forums.minecraftforge.net/topic/154394-forge-541-minecraft-1214/	2025-02-12 12:29:03 -08:00
Jonathing	dcafb4f633	Fix corrupted and invalidly symlinked worlds crashing on level select (#10406 )	2025-02-12 11:52:53 -08:00
Jonathing	1ea7ce9831	Add fast graphics render type to block model jsons (#10394 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-12 11:47:09 -08:00
Jonathing	674f2efd54	Add updated tag context to AddReloadListenerEvent (#10412 ) Fixes using custom tags in GlobalLootModifiers.	2025-02-12 11:02:22 -08:00
Jonathing	02e82c672d	Give ItemStack context to IForgeItem.getCapabilityProvider (#10404 )	2025-02-05 09:15:37 -08:00
RealMangoRage	b25f6e3a7c	Re-introduce ItemStack Capabilities (#10324 )	2025-02-03 18:44:44 -08:00
LexManos	e69b07a54a	Fix redstone updates for comparators going up/down incorrectly. Related: #9973	2025-02-03 18:32:53 -08:00
Jonathing	79efe2ac36	Fix forced chunks never being ticked by the server (#10325 )	2025-02-03 13:47:36 -08:00
LexManos	464483db5b	Fix redstone update order not matching vanilla. (#10392 )	2025-02-03 13:36:45 -08:00
LexManos	f49adb285f	Fix game test structure rotations being inconsistant (#10391 )	2025-02-03 13:31:20 -08:00
Jonathing	55862dfd1d	Re-introduce IForgeItem.damageItem when an item takes damage, Fixes #10344 (#10371 )	2025-02-03 13:17:38 -08:00
Jonathing	124b9bd8d3	Gate client test mods behind clientSideOnly (#10390 )	2025-02-03 13:17:01 -08:00
Jonathing	bae3915728	Fix issue with superclass event listeners by updating EventBus (#10384 )	2025-02-03 11:13:33 -08:00
Jonathing	b3c2c62c7e	Bump dependencies, most notably EventBus (#10370 ) - CoreMods 5.2.4 -> 5.2.6 - EventBus 6.2.15 -> 6.2.26 - Reduced memory usage - Further performance improvements - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC - Apache MavenArtifact 3.8.5 -> 3.8.8 - NightConfig 3.7.3 -> 3.7.4	2025-01-28 21:00:16 +00:00
Jonathing	68698d70c1	Fix shield disabling being completely ignored (#10316 )	2025-01-27 15:24:30 -08:00
Jonathing	d55dee9394	Update Gradle to 8.12.1	2025-01-27 09:17:02 -08:00
Jonathing	2d114f2719	Fix JOpt Simple by updating ModLauncher (#10347 )	2025-01-27 09:16:24 -08:00
JonathingandLexManos	3e6583af01	GameTestHelper additions (#10338 ) Co-authored-by: LexManos <[email protected]>	2025-01-27 09:15:57 -08:00
Paint_NinjaandTelepathicGrunt	762f6a7d78	Add `c:flowers`, `c:flowers/tall`, and `c:flowers/small` block and item tags (#10335 ) Co-authored-by: TelepathicGrunt <[email protected]>	2025-01-25 20:55:58 +00:00
Jonathing	3c5a534b7a	Fix JOpt Simple needing a strict version requirement declaration (#10311 )	2025-01-25 17:49:11 +00:00
Jonathing	bc62d1693a	Fix incorrect method reference in TntBlock.explode() (#10326 )	2025-01-25 17:48:54 +00:00
Joseph T. McQuigg	554ead8d4a	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10298 ) Add VillagerType#registerBiomeType	2025-01-21 16:07:56 -08:00
LexManos	ec5ac91389	Fix render_type in block models not being used. Fixes #10294	2025-01-13 13:27:47 -08:00
Jonathing	f63813d929	Bump dependencies (#10274 ) - EventBus 6.2.8 -> 6.2.15 - Bootstrap 2.1.7 -> 2.1.8 - SecureModules 2.2.20 -> 2.2.21 - AccessTransformers 8.2.0 -> 8.2.1 - ModLauncher 10.2.2 -> 10.2.3 These bumps include further clean-up and optimisations.	2025-01-04 16:04:31 +00:00
Jonathing	5d4825ac4b	Simplify Title Screen Brandings (#10287 )	2025-01-02 14:31:05 -08:00
Jonathing	3024ef7707	Clean and fix Forge's internal coremods, fixes finalizeSpawn hook. (#10271 )	2024-12-30 11:18:20 -08:00
Gabriel Harris-Rouquette	0d3b488728	Update jline for better darwin/arm64 support Fixes #10107 (#10279 )	2024-12-29 09:25:21 -08:00
Jonathing	a01012f20c	Bump CoreMods to 5.2.4 (#10262 )	2024-12-23 15:25:21 -08:00
Jonathing	d4e3ef4a22	Allow mipmap lowering to be disabled (#10242 )	2024-12-23 11:46:59 -08:00
Jonathing	d7293a78dc	Manage FileWatcher instance per ConfigFileTypeHandler (#10213 )	2024-12-22 11:59:00 -08:00
Paint_Ninja	8e4e02e258	Skip processing Forge classes in `RuntimeDistCleaner` (#10199 ) Mod classes are still transformed as usual	2024-12-21 22:20:21 +00:00
Paint_Ninja	2f5a6fee48	Skip Forge classes in the RuntimeEnumExtender transformer (#10197 ) Mod classes are still transformed as usual	2024-12-21 22:19:07 +00:00
LexManos	0e74886f8d	Add hooks for using Vanilla's new Client data generator (#10206 ) Add new hook for custom block models that do not have real blocks backing them Some workspace cleanup fixing log4j annotation processor	2024-12-19 10:41:21 -08:00
Paint_Ninja	07977ba242	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10195 )	2024-12-06 18:18:53 +00:00
LexManos	a894c244fe	Bump Bootstrap which has a slight performance boost during dev time.	2024-12-06 10:13:49 -08:00
LexManos	cf32a799a4	Speed up mod annotation scanning by ~30%	2024-12-06 10:11:04 -08:00
Paint_Ninja	0fda1d9393	Skip Vanilla classes for the CapabilityTokenSubclass transformer (#10196 )	2024-12-06 17:35:09 +00:00
Paint_NinjaandTelepathicGrunt	c7f0acbe38	Simplify memory usage display on loading screen (#10193 ) Co-authored-by: TelepathicGrunt <[email protected]>	2024-12-06 17:34:33 +00:00
LexManos	9c06c20023	Fix custom particles causing crash	2024-12-05 16:40:29 -08:00
LexManos	041084d1da	Minecraft 1.21.4	2024-12-05 10:22:55 -08:00
LexManos	e643d0a11f	Remove debug code. Closes #10182	2024-11-21 11:57:00 -08:00
LexManos	5efb8d3f12	Pass the Holder<Enchantment> to Item.canApplyAtEnchantingTable. Closes #10181	2024-11-21 09:52:32 -08:00
LexManos	70537542d1	Fix incorrect patch	2024-11-20 21:04:24 -08:00
LexManos	bd4b059c2b	Change vanilla registry order to last-seen. Closes #10179	2024-11-20 19:32:28 -08:00
LexManos	e0d2c68c5b	Call IUnbakedGeometry.bake from BlockModel Closes #10178	2024-11-18 12:30:22 -08:00
LexManos	86d4bda32e	Cleanup some warnings	2024-11-18 12:27:16 -08:00
LexManos	98b90f26bc	Fix not being able to swim in lava	2024-11-14 23:12:26 -08:00
LexManos	4e7c471fa3	Move mdk back to com/example/examplemod to align with what people expect.	2024-11-14 23:12:11 -08:00
LexManos	ec6f9fc6e7	Move MDK example to test sourceset and fix Item/Block registration example. Closes #10139	2024-11-14 14:24:21 -08:00
LexManos	427fef1d4b	Added support for using optional tags on Forge registries Add DeferredRegister.key(name) helper function to make ResourceKey creation easier Fix TagManager not binding tags Fix Unbound Tag Exception when modders register tags during Register events Closes #10154	2024-11-14 14:23:00 -08:00
LexManos	83594b0b0a	Fix empty tag conditional recipe test	2024-11-14 14:08:00 -08:00
LexManos	b76064e57a	Fixed missed call to getFriction hook in AbstractBoat	2024-11-12 09:33:05 -08:00
Martijn van den Brand	b2bf70c7f1	Pass player argument when firing `OnDatapackSyncEvent` (#10170 )	2024-11-11 20:39:55 -08:00
LexManos	384286a453	Cleanup lifecycle transitions Fix mod ordering for multi-mod jars Make dependency resolution issues easier to debug/diagnose	2024-11-11 03:04:23 -08:00
Jonathing	d93b7db69a	Bump CoreMods to 5.2 (#10156 ) Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 The key features are: - ES6 language support - Thoroughly updated ASMAPI, with full documentation - Bug fixes (some optional for backwards-compatibility) - Partial internal code cleanup	2024-11-08 12:28:39 -08:00
StavWasPlayZ	bdbde4bb0f	Fix PlayerRenderer#render invoking RenderLivingEvent and not RenderPlayerEvent (#10167 )	2024-11-07 20:03:37 -08:00
LexManos	e2a68ad903	Fix Powered Rails acting like Activator Rails due to misaligned patch	2024-11-06 23:38:09 -08:00
LexManos	46cfe50108	Properly allow normal mods.toml mods to specify the module names and use a full module-info. Make FMLModContainer read and apply Add-Opens and Add-Exports manifest entries from mod files. Forge is now the `net.minecraftforge.forge` module instead of `forge` https://forums.minecraftforge.net/topic/153333-proper-java-module-support-in-forge-mods/	2024-11-04 16:55:10 -08:00
LexManos	4b423a3087	Fix LootTableLoadEvent not being fired. Closes #10144	2024-10-28 16:08:03 -07:00
LexManos	7d0b07e858	Fix items with use durations of 0 being repeatedly used when use button is held down. Fixed #10150	2024-10-28 14:54:39 -07:00
yurisuika	40220600b0	Add AT for BlockEntityType constructor. (#10149 )	2024-10-27 18:05:19 -07:00
Jonathing	0c7a0e927c	Add `c:stripped_logs` and `c:stripped_woods` tags (#10146 )	2024-10-27 02:36:36 +00:00
Jonathing	60e8157b9a	Bump CoreMods and ASM (#10145 ) CoreMods 5.1.13 changelog: https://gist.github.com/Jonathing/905d142447ecef670526ae27243adbba	2024-10-27 02:34:06 +00:00
Paint_Ninja	b8f5e4553b	Remove redundant rendering options (#10140 )	2024-10-26 20:24:18 +01:00
Ven	de587eb50a	Fix pause menu having a black background, reverts PR #10115	2024-10-26 12:22:19 -07:00
LexManos	086bcb7148	1.21.3 update	2024-10-25 18:04:34 -07:00