Fix missing forge config UI translation keys (#10915 )

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

 dependencies {
-    implementation 'org.ow2.asm:asm:9.6'
-    implementation 'org.ow2.asm:asm-tree:9.6'
-    implementation 'net.minecraftforge:srgutils:0.5.+'
+    implementation 'org.ow2.asm:asm:9.9.1'
+    implementation 'org.ow2.asm:asm-tree:9.9.1'
+    implementation 'net.minecraftforge:srgutils:0.6.2'
    implementation 'commons-io:commons-io:2.13.0'
    implementation 'com.google.code.gson:gson:2.10.1'
    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
@@ -10,15 +10,19 @@ import java.util.zip.ZipFile

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

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

+        resolved = project.configurations.installerextra.resolvedConfiguration.resolvedArtifacts
+        for (def dep : resolved) {
+            def info = Util.getMavenInfoFromDep(dep)
+            //println("$dep.file.sha1\t$info.name\t$info.path")
+            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
+        }
+
        var packed = (AbstractArchiveTask) project.tasks.universalJar
        var info = Util.getMavenInfoFromTask(packed)
        def file = packed.archiveFile.get().asFile
@@ -27,6 +27,6 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
    @Internal
    @Override
    protected Object getData() {
-        return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
+        return matches.toSorted(Comparator.<String>naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
    }
 }
@@ -24,6 +24,7 @@ abstract class LauncherJson extends DefaultTask {
        dependsOn(project.tasks.universalJar)
        input.from(project.tasks.universalJar.archiveFile)
        input.from(project.configurations.installer)
+        input.from(project.configurations.installerextra)
        configure {
            def mc    = project.rootProject.ext.MC_VERSION
            def forge = project.rootProject.ext.FORGE_VERSION
@@ -88,6 +89,7 @@ abstract class LauncherJson extends DefaultTask {
            ]
        ])

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

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

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

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

 applyPatches {
    level 'WARNING'
+    failOnError = UPDATING != 'true'
 }

 sourceSets {
@@ -77,7 +78,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
 ]
@@ -88,16 +88,21 @@ ext {
 final String MAVEN_PATH = ext.MAVEN_PATH

 final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
-final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
+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'

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

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

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

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

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

        forge_server {
@@ -175,6 +188,7 @@ patcher {

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

        forge_server_gametest {
@@ -183,6 +197,7 @@ patcher {

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

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

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

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

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

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

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

 // Make sure we run bin compat checking during local testing.
-if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD)
+if ((!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) && CHECK_COMPATIBILITY == "true")
    tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }
@@ -74,3 +74,11 @@ eclipse {
    // Run when importing the project
    synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
 }
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
@@ -2,16 +2,15 @@

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

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

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

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

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

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

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

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

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

@@ -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
@@ -9,41 +9,35 @@ import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;

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

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

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

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

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

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

    /**
     * {@return if the logical side is the client}
     */
-    public boolean isClient()
-    {
+    public boolean isClient() {
        return this == CLIENT;
    }
 }
@@ -19,28 +19,45 @@ public class ModLoadingContext
 {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
+    private ModContainer activeContainer;
    private Object languageExtension;
    private ModLoadingStage stage;

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

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

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

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

+    public ModContainer getContainer() {
+        return getActiveContainer();
+    }
+
    /**
     * Register an {@link IExtensionPoint} with the mod container.
     * @param point The extension point to register
@@ -48,7 +65,7 @@ public class ModLoadingContext
     * @param <T> The type signature of the extension operator
     */
    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
-        getActiveContainer().registerExtensionPoint(point, extension);
+        getContainer().registerExtensionPoint(point, extension);
    }

    /**
@@ -57,7 +74,7 @@ public class ModLoadingContext
     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
     */
    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
-        getActiveContainer().registerDisplayTest(() -> displayTest);
+        getContainer().registerDisplayTest(() -> displayTest);
    }

    /**
@@ -66,7 +83,7 @@ public class ModLoadingContext
     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
     */
    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
-        getActiveContainer().registerDisplayTest(displayTest);
+        getContainer().registerDisplayTest(displayTest);
    }

    /**
@@ -76,7 +93,7 @@ public class ModLoadingContext
     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
     */
    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
    }

    /**
@@ -86,32 +103,31 @@ public class ModLoadingContext
     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
     */
    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
-        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
    }

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

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

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

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

-
    @SuppressWarnings("unchecked")
    public <T> T extension() {
        return (T)languageExtension;
@@ -48,8 +48,8 @@ public class VersionChecker {
        BETA(),
        BETA_OUTDATED(6, true, true);

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

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

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

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

    public static CheckResult getResult(IModInfo mod) {
-        return results.getOrDefault(mod, PENDING_CHECK);
+        return RESULTS.getOrDefault(mod, PENDING_CHECK);
    }
 }
@@ -67,7 +67,9 @@ public class ConfigFileTypeHandler {
    }

    private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
-        Files.createDirectories(file.getParent());
+        if (!Files.isDirectory(file.getParent())) {
+            Files.createDirectories(file.getParent());
+        }
        Path p = defaultConfigPath.resolve(modConfig.getFileName());
        if (Files.exists(p)) {
            LOGGER.info(CONFIG, "Loading default config file from path {}", p);
@@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;

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

    private final boolean showCPUUsage;
    private final OperatingSystemMXBean osBean;
-    private final MemoryMXBean memoryBean;

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

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

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

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

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

    String text() {
@@ -37,7 +37,7 @@ dependencies {
    implementation(libs.jimfs)

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

    testCompileOnly(libs.nulls)
    testRuntimeOnly(libs.bootstrap)
@@ -36,9 +36,9 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 */
 public class CapabilityTokenSubclass implements ILaunchPluginService {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -57,6 +57,9 @@ public class FMLLoader {
        LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
        LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());

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

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

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

@@ -5,12 +5,14 @@

 package net.minecraftforge.fml.loading;

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

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

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

    public void addForScanning(BackgroundScanHandler backgroundScanHandler)
@@ -77,7 +77,7 @@ public class MCPNamingService implements INameMappingService {
    }

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

@@ -10,6 +10,8 @@ import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
+
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;

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

+@ApiStatus.Internal
 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final Set<String> SERVICES = Set.of(
@@ -76,4 +79,15 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
            .filter(SERVICES::contains)
            .forEach(s -> found.add(new NamedPath(s, path)));
    }
+
+    public static boolean isServiceProvider(Path path) {
+        var jar = SecureJar.from(path);
+
+        for (var providers : jar.moduleDataProvider().descriptor().provides()) {
+            if (SERVICES.contains(providers.service()))
+                return true;
+        }
+
+        return false;
+    }
 }
@@ -34,8 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;

-public class RuntimeDistCleaner implements ILaunchPluginService
-{
+public final class RuntimeDistCleaner implements ILaunchPluginService {
    private static final Logger LOGGER = LogUtils.getLogger();
    private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
    private static String DIST;
@@ -57,11 +56,17 @@ public class RuntimeDistCleaner implements ILaunchPluginService
            throw new RuntimeException("Attempted to load class "+ classNode.name  + " for invalid dist "+ DIST);
        }

+        if (!FMLEnvironment.production && hasOnlyInWithModAnnotation(classNode.visibleAnnotations))
+        {
+            LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
+            throw new RuntimeException("Found @OnlyIn on @Mod class "+ classNode.name  + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
+        }
+
        if (classNode.interfaces != null )
        {
            unpack(classNode.visibleAnnotations).stream()
                .filter(ann->Objects.equals(ann.desc, ONLYIN))
-                .filter(ann->ann.values.indexOf("_interface") != -1)
+                .filter(ann-> ann.values.contains("_interface"))
                .filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST))
                .map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName())
                .forEach(intf -> {
@@ -137,22 +142,78 @@ public class RuntimeDistCleaner implements ILaunchPluginService
    }

    @SuppressWarnings("unchecked")
-    private static List<AnnotationNode> unpack(final List<AnnotationNode> anns) {
-        if (anns == null) return Collections.emptyList();
-        List<AnnotationNode> ret = anns.stream().filter(ann->Objects.equals(ann.desc, ONLYIN)).collect(Collectors.toList());
-        anns.stream().filter(ann->Objects.equals(ann.desc, ONLYINS) && ann.values != null)
-            .map( ann -> (List<AnnotationNode>)ann.values.get(ann.values.indexOf("value") + 1))
-            .filter(v -> v != null)
-            .forEach(v -> v.forEach(ret::add));
-        return ret;
+    private static List<AnnotationNode> unpack(final List<AnnotationNode> anns)
+    {
+        if (anns == null)
+        {
+            return Collections.emptyList();
+        }
+
+        List<AnnotationNode> unpacked = new ArrayList<>();
+
+        for (var annotationNode : anns)
+        {
+            if (Objects.equals(annotationNode.desc, ONLYINS))
+            {
+                unpacked.add(annotationNode);
+
+                if (annotationNode.values != null)
+                {
+                    List<AnnotationNode> subNodes = (List<AnnotationNode>) annotationNode.values.get(annotationNode.values.indexOf("value") + 1);
+
+                    if (subNodes != null)
+                    {
+                        unpacked.addAll(subNodes);
+                    }
+                }
+            }
+        }
+
+        return unpacked;
    }

-    private boolean remove(final List<AnnotationNode> anns, final String side)
+    private static boolean remove(final List<AnnotationNode> anns, final String side)
    {
-        return unpack(anns).stream().
-                filter(ann->Objects.equals(ann.desc, ONLYIN)).
-                filter(ann->ann.values.indexOf("_interface") == -1).
-                anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side));
+        var onlyIns = unpack(anns);
+
+        for (var onlyIn : onlyIns)
+        {
+            if (!Objects.equals(onlyIn.desc, ONLYINS) || onlyIn.values.contains("_interface"))
+            {
+                continue;
+            }
+
+            if (!Objects.equals(((String[])onlyIn.values.get(onlyIn.values.indexOf("value") + 1))[1], side))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean hasOnlyInWithModAnnotation(final List<AnnotationNode> anns)
+    {
+        if (anns == null)
+        {
+            return false;
+        }
+
+        var foundModAnnotation = false;
+        var foundOnlyIn = false;
+
+        for (var ann : anns)
+        {
+            if (ann.desc.equals("Lnet/minecraftforge/fml/common/Mod;"))
+            {
+                foundModAnnotation = true;
+            } else if (Objects.equals(ann.desc, ONLYIN) || Objects.equals(ann.desc, ONLYINS))
+            {
+                foundOnlyIn = true;
+            }
+        }
+
+        return foundModAnnotation && foundOnlyIn;
    }

    @SuppressWarnings("unchecked")
@@ -169,9 +230,19 @@ public class RuntimeDistCleaner implements ILaunchPluginService
    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);

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

    private static class LambdaGatherer extends MethodVisitor {
@@ -8,7 +8,6 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.JarMetadata;
 import cpw.mods.jarhandling.SecureJar;
-import net.minecraftforge.fml.loading.EarlyLoadingException;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;
@@ -19,6 +18,7 @@ import net.minecraftforge.forgespi.locating.IModProvider;
 import net.minecraftforge.forgespi.locating.ModFileLoadingException;

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

 import java.io.IOException;
@@ -37,6 +37,16 @@ public abstract class AbstractModProvider implements IModProvider {
    protected static final String MODS_TOML = "META-INF/mods.toml";

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

        if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
@@ -58,6 +68,8 @@ public abstract class AbstractModProvider implements IModProvider {
        } else if (type != null) {
            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
            mod = new ModFile(sj, this, this::manifestParser, type);
+        } else if (ignoreUnknown) {
+            return null;
        } else
            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));

@@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import com.mojang.logging.LogUtils;

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

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

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

@@ -83,7 +83,14 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
            final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
            final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
            final Path pathInFS = zipFS.getPath("/");
-            return Optional.of(createMod(pathInFS).file());
+            final IModFile.Type parentType = file.getType();
+            final String modType;
+            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
+                modType = IModFile.Type.LIBRARY.name();
+            } else {
+                modType = IModFile.Type.GAMELIBRARY.name();
+            }
+            return Optional.of(createMod(pathInFS, false, modType).file());
        } catch (Exception e) {
            LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
            final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
@@ -52,6 +52,7 @@ public class ModFile implements IModFile {
    private CompletableFuture<ModFileScanData> futureScanResult;
    private List<CoreModFile> coreMods;
    private Path accessTransformer;
+    private List<Path> accessTransformers = Collections.emptyList();

    static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
    private SecureJar.Status securityStatus;
@@ -94,9 +95,15 @@ public class ModFile implements IModFile {
    public List<IModInfo> getModInfos() {
        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() {
@@ -105,7 +112,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) {
@@ -16,6 +16,7 @@ import org.slf4j.Logger;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
@@ -42,11 +43,21 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
    public List<IModLocator.ModFileOrException> scanMods() {
        LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
        var excluded = ModDirTransformerDiscoverer.allExcluded();
-        try (var stream = Files.list(this.modFolder)) {
-            return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX))
-                .sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT)))
-                .map(this::createMod)
-                .toList();
+        try {
+            var ret = new ArrayList<IModLocator.ModFileOrException>();
+            var files = Files.list(this.modFolder).toList();
+            for (var file : files) {
+                var name = file.getFileName().toString().toLowerCase(Locale.ROOT);
+                if (excluded.contains(file) || !name.endsWith(SUFFIX))
+                    continue;
+                var mod = this.createMod(file, true);
+                if (mod == null) {
+                    LOGGER.debug(LogMarkers.SCAN, "Found unknown jar file {} ignoring", file);
+                } else {
+                    ret.add(mod);
+                }
+            }
+            return ret;
        } catch (IOException e) {
            return sneak(e);
        }
@@ -48,7 +48,7 @@ class Scanner {
        try (InputStream in = Files.newInputStream(path)){
            ModClassVisitor mcv = new ModClassVisitor();
            ClassReader cr = new ClassReader(in);
-            cr.accept(mcv, 0);
+            cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
            mcv.buildData(result.getClasses(), result.getAnnotations());
        } catch (IOException | IllegalArgumentException e) {
            // mark path bad
@@ -15,7 +15,7 @@ abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
        super(type, "forge_");
    }

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

    public static class Client extends ForgeProdLaunchHandler {
@@ -4,9 +4,14 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true

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

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

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

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

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

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

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

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

+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;

 /**
 * Automatic eventbus subscriber - reads {@link EventBusSubscriber}
- * annotations and passes the class instances to the {@link nBus}
+ * annotations and passes the class instances to the {@link Bus}
 * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS}
 */
 public class AutomaticEventSubscriber {
    private static final Logger LOGGER = LogManager.getLogger();
    private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
    private static final Type MOD_TYPE = Type.getType(Mod.class);
+    private static final Type ONLY_IN_TYPE = Type.getType(OnlyIn.class);

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

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

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

@@ -8,7 +8,7 @@ package net.minecraftforge.fml.javafmlmod;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;

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

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

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

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

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

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

        try {
            var moduleName = info.getOwningFile().moduleName();
@@ -63,7 +63,13 @@ public class FMLModContainer extends ModContainer {
    private void constructMod() {
        try {
            LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
-            this.modInstance = modClass.getDeclaredConstructor().newInstance();
+            Constructor<?> constructor;
+            try {
+                constructor = modClass.getDeclaredConstructor(context.getClass());
+            } catch (NoSuchMethodException | SecurityException exception) {
+                constructor = modClass.getDeclaredConstructor();
+            }
+            this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context);
            LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
        } catch (Throwable e) {
            // When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the
@@ -1,217 +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.16,6.2)'
+    id 'eclipse'
+    id 'net.minecraftforge.gradle' version '[7.0.3,8)'
 }

-version = mod_version
-group = mod_group_id
+version = '1.0.0'
+group = 'com.example.examplemod'

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

-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+// Include generated resources
+sourceSets.main.resources { srcDir 'src/generated/resources' }

-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 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
+    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 - using fg.deobf() ensures the dependency is remapped to your development mappings
-    // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
-    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
-
-    // Example mod dependency using a mod jar from ./libs with a flat dir repository
-    // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
-    // 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
-        ])
-    }
-
-    // This is the preferred method to reobfuscate your jar file
-    finalizedBy 'reobfJar'
-}
-
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
-// tasks.named('publish').configure {
-//     dependsOn 'reobfJar'
-// }
-
-// Example configuration to allow publishing using the maven-publish plugin
-publishing {
-    publications {
-        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
-}
-
-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'
@@ -18,7 +18,6 @@ import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -51,7 +50,7 @@ public class ExampleMod

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

    // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
    public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()
@@ -61,9 +60,9 @@ public class ExampleMod
                output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
            }).build());

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

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

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

    private void commonSetup(final FMLCommonSetupEvent event)
@@ -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,)"
@@ -1,56 +1,55 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -113,7 +_,10 @@
-             GlStateManager._texParameter(3553, 34892, 0);
-             GlStateManager._texParameter(3553, 10242, 33071);
-             GlStateManager._texParameter(3553, 10243, 33071);
-+         if (!stencilEnabled)
-             GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, (IntBuffer)null);
-+         else
-+            GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
-          }
+@@ -106,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);
+             }
 
-          this.setFilterMode(9728);
-@@ -124,7 +_,14 @@
-          GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
-          GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
-          if (this.useDepth) {
-+         if(!stencilEnabled)
-             GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
-+         else if(net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-+         } else {
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-+         }
-          }
+             this.setFilterMode(9728, true);
+@@ -116,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();
-@@ -292,4 +_,27 @@
-    public int getDepthTextureId() {
-       return this.depthBufferId;
-    }
+             this.checkStatus();
+@@ -280,5 +_,26 @@
+ 
+     public int getDepthTextureId() {
+         return this.depthBufferId;
+    }
 +
-+   /*================================ FORGE START ================================================*/
-+   private boolean stencilEnabled = false;
-+   /**
-+    * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
-+    * Modders must call this directly to set things up.
-+    * This is to prevent the default cause where graphics cards do not support stencil bits.
-+    * <b>Make sure to call this on the main render thread!</b>
-+    */
-+   public void enableStencil() {
-+      if(stencilEnabled) return;
-+      stencilEnabled = true;
-+      this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
-+   }
+    private boolean stencilEnabled = false;
+    /**
+     * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
+     * Modders must call this directly to set things up.
+     * This is to prevent the default cause where graphics cards do not support stencil bits.
+     * <b>Make sure to call this on the main render thread!</b>
+     */
+    public void enableStencil() {
+        if (stencilEnabled) return;
+        stencilEnabled = true;
+        this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
+    }
 +
-+   /**
-+    * Returns wither or not this FBO has been successfully initialized with stencil bits.
-+    * If not, and a modder wishes it to be, they must call enableStencil.
-+    */
-+   public boolean isStencilEnabled() {
-+      return this.stencilEnabled;
-+   }
-+   /*================================ FORGE END   ================================================*/
+    /**
+     * Returns wither or not this FBO has been successfully initialized with stencil bits.
+     * If not, and a modder wishes it to be, they must call enableStencil.
+     */
+    public boolean isStencilEnabled() {
+        return this.stencilEnabled;
+     }
 }
@@ -1,19 +1,20 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -501,9 +_,16 @@
+@@ -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_;
+        }
+     }
 
-+   /* 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_) {
+     public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
@@ -1,28 +1,30 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -81,7 +_,8 @@
-       GLFW.glfwWindowHint(139267, 2);
-       GLFW.glfwWindowHint(139272, 204801);
-       GLFW.glfwWindowHint(139270, 1);
-      this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
-+      this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
-+      if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
-       if (monitor != null) {
-          VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
-          this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
-@@ -93,6 +_,7 @@
-          this.windowedX = this.x = aint1[0];
-          this.windowedY = this.y = aint[0];
-       }
-+      }
+@@ -82,7 +_,8 @@
+         GLFW.glfwWindowHint(139267, 2);
+         GLFW.glfwWindowHint(139272, 204801);
+         GLFW.glfwWindowHint(139270, 1);
+-        this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
+        this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
+        if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
+         if (monitor != null) {
+             VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
+             this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
+@@ -94,6 +_,7 @@
+             this.windowedX = this.x = aint1[0];
+             this.windowedY = this.y = aint[0];
+         }
+        }
 
-       GLFW.glfwMakeContextCurrent(this.window);
-       GL.createCapabilities();
-@@ -242,6 +_,7 @@
-       GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
-       this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
-       this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
-+      if (this.framebufferHeight == 0 || this.framebufferWidth==0) net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w->this.framebufferWidth=w, h->this.framebufferHeight=h);
-    }
+         GLFW.glfwMakeContextCurrent(this.window);
+         GL.createCapabilities();
+@@ -242,6 +_,9 @@
+         GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
+         this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
+         this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
+        if (this.framebufferHeight == 0 || this.framebufferWidth == 0) {
+            net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h);
+        }
+     }
 
-    private void onResize(long p_85428_, int p_85429_, int p_85430_) {
+     private void onResize(long p_85428_, int p_85429_, int p_85430_) {
@@ -1,17 +1,18 @@
 --- a/com/mojang/blaze3d/vertex/BufferBuilder.java
 +++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
-@@ -477,4 +_,14 @@
-          this.sorting = p_277855_;
-       }
-    }
+@@ -389,6 +_,15 @@
+         return MemoryUtil.memSlice(this.buffer, p_231170_, p_231171_ - p_231170_);
+     }
+ 
+    public void putBulkData(ByteBuffer buffer) {
+        ensureCapacity(buffer.limit() + this.format.getVertexSize());
+        this.buffer.position(this.nextElementByte);
+        this.buffer.put(buffer);
+        this.buffer.position(0);
+        this.vertices += buffer.limit() / this.format.getVertexSize();
+        this.nextElementByte += buffer.limit();
+    }
 +
-+   // Forge start
-+   public void putBulkData(ByteBuffer buffer) {
-+      ensureCapacity(buffer.limit() + this.format.getVertexSize());
-+      this.buffer.position(this.nextElementByte);
-+      this.buffer.put(buffer);
-+      this.buffer.position(0);
-+      this.vertices += buffer.limit() / this.format.getVertexSize();
-+      this.nextElementByte += buffer.limit();
-+   }
- }
+     @OnlyIn(Dist.CLIENT)
+     public static record DrawState(
+         VertexFormat format, int vertexCount, int indexCount, VertexFormat.Mode mode, VertexFormat.IndexType indexType, boolean indexOnly, boolean sequentialIndex
@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
-@@ -11,7 +_,7 @@
- import org.joml.Quaternionf;
+@@ -13,7 +_,7 @@
+ import org.joml.Vector3f;
 
 @OnlyIn(Dist.CLIENT)
 -public class PoseStack {
 +public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
-    private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), (p_85848_) -> {
-       Matrix4f matrix4f = new Matrix4f();
-       Matrix3f matrix3f = new Matrix3f();
+     private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), p_85848_ -> {
+         Matrix4f matrix4f = new Matrix4f();
+         Matrix3f matrix3f = new Matrix3f();
@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
 +++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
-@@ -46,7 +_,7 @@
- 
-    public void endVertex() {
-       Vector3f vector3f = this.normalInversePose.transform(new Vector3f(this.nx, this.ny, this.nz));
-      Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
-+      Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
-       Vector4f vector4f = this.cameraInversePose.transform(new Vector4f(this.x, this.y, this.z, 1.0F));
-       vector4f.rotateY((float)Math.PI);
-       vector4f.rotateX((-(float)Math.PI / 2F));
+@@ -47,7 +_,7 @@
+     @Override
+     public void endVertex() {
+         Vector3f vector3f = this.normalInversePose.transform(new Vector3f(this.nx, this.ny, this.nz));
+-        Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
+        Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
+         Vector4f vector4f = this.cameraInversePose.transform(new Vector4f(this.x, this.y, this.z, 1.0F));
+         vector4f.rotateY((float) Math.PI);
+         vector4f.rotateX((float) (-Math.PI / 2));
@@ -1,38 +1,24 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -14,7 +_,7 @@
+@@ -13,7 +_,7 @@
 import org.lwjgl.system.MemoryStack;
 
 @OnlyIn(Dist.CLIENT)
 -public interface VertexConsumer {
 +public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
-    VertexConsumer vertex(double p_85945_, double p_85946_, double p_85947_);
+     VertexConsumer vertex(double p_85945_, double p_85946_, double p_85947_);
 
-    VertexConsumer color(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
-@@ -64,6 +_,10 @@
-    }
+     VertexConsumer color(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
+@@ -142,10 +_,11 @@
+                     f5 = afloat[k] * p_85992_;
+                 }
 
-    default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, int[] p_86002_, int p_86003_, boolean p_86004_) {
-+      putBulkData(p_85996_, p_85997_, p_85998_, p_85999_, p_86000_, p_86001_, 1, p_86002_, p_86003_, p_86004_);
-+   }
-+
-+   default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, float alpha, int[] p_86002_, int p_86003_, boolean p_86004_) {
-       float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
-       int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
-       int[] aint1 = p_85997_.getVertices();
-@@ -99,11 +_,13 @@
-                f5 = afloat[k] * p_86001_;
+-                int l = aint[k];
+                int l = applyBakedLighting(aint[k], bytebuffer);
+                 float f9 = bytebuffer.getFloat(16);
+                 float f10 = bytebuffer.getFloat(20);
+                 Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
+                applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
+                 this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, p_335371_, f9, f10, p_85993_, l, vector3f.x(), vector3f.y(), vector3f.z());
             }
- 
-            int l = aint[k];
-+            int l = applyBakedLighting(p_86002_[k], bytebuffer);
-             float f9 = bytebuffer.getFloat(16);
-             float f10 = bytebuffer.getFloat(20);
-             Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
-            this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
-+            applyBakedNormals(vector3f, bytebuffer, p_85996_.normal());
-+            float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
-+            this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
-          }
-       }
- 
+         }
@@ -1,14 +1,21 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -176,4 +_,11 @@
-          return i;
-       }
-    }
+@@ -12,7 +_,7 @@
+ import net.minecraftforge.api.distmarker.OnlyIn;
+ 
+ @OnlyIn(Dist.CLIENT)
+-public class VertexFormat {
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
+     private final ImmutableList<VertexFormatElement> elements;
+     private final ImmutableMap<String, VertexFormatElement> elementMapping;
+     private final IntList offsets = new IntArrayList();
+@@ -113,6 +_,9 @@
+ 
+         return vertexbuffer;
+     }
 +
-+   public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
-+   public int getOffset(int index) { return offsets.getInt(index); }
-+   public boolean hasPosition() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.POSITION); }
-+   public boolean hasNormal() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.NORMAL); }
-+   public boolean hasColor() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.COLOR); }
-+   public boolean hasUV(int which) { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.UV && e.getIndex() == which); }
- }
+    public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
+    public int getOffset(int index) { return offsets.getInt(index); }
+ 
+     @OnlyIn(Dist.CLIENT)
+     public static enum IndexType {
@@ -1,13 +0,0 @@
--- a/com/mojang/blaze3d/vertex/VertexFormatElement.java
-+++ b/com/mojang/blaze3d/vertex/VertexFormatElement.java
-@@ -90,6 +_,10 @@
-       this.usage.clearBufferState(this.index, p_166964_);
-    }
- 
-+    public int getElementCount() {
-+       return count;
-+    }
-+
-    @OnlyIn(Dist.CLIENT)
-    public static enum Type {
-       FLOAT(4, "Float", 5126),
@@ -1,31 +1,31 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
@@ -13,7 +_,7 @@
+ import org.joml.Quaternionf;
 import org.joml.Vector3f;
- import org.joml.Vector3fc;
 
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
-    private final Matrix4f matrix;
-    public static final Codec<Transformation> CODEC = RecordCodecBuilder.create((p_269604_) -> {
-       return p_269604_.group(ExtraCodecs.VECTOR3F.fieldOf("translation").forGetter((p_269599_) -> {
-@@ -156,6 +_,19 @@
-    public int hashCode() {
-       return Objects.hash(this.matrix);
-    }
+     private final Matrix4f matrix;
+     public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
+         p_269604_ -> p_269604_.group(
+@@ -169,5 +_,19 @@
+         vector3f1.lerp(p_175938_.getScale(), p_175939_);
+         quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
+         return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
+    }
 +
 +    private Matrix3f normalTransform = null;
 +    public Matrix3f getNormalMatrix() {
 +        checkNormalTransform();
 +        return normalTransform;
 +    }
+
 +    private void checkNormalTransform() {
 +        if (normalTransform == null) {
 +            normalTransform = new Matrix3f(matrix);
 +            normalTransform.invert();
 +            normalTransform.transpose();
 +        }
-+    }
- 
-    public Transformation slerp(Transformation p_175938_, float p_175939_) {
-       Vector3f vector3f = this.getTranslation();
+     }
+ }
@@ -1,10 +1,9 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -61,6 +_,15 @@
-       return Component.empty().append(this.lines.title).append(": ").append(this.lines.detail);
-    }
+@@ -71,6 +_,15 @@
+     }
 
-+    @Override
+     @Override
 +    public boolean keyPressed(int key, int scanCode, int modifiers) {
 +       if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
 +          minecraft.setScreen(this.nextScreen);
@@ -13,6 +12,7 @@
 +       return super.keyPressed(key, scanCode, modifiers);
 +    }
 +
-    public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
-       super.render(p_283497_, p_88680_, p_88681_, p_88682_);
-       p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
+    @Override
+     public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
+         super.render(p_283497_, p_88680_, p_88681_, p_88682_);
+         p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
@@ -1,48 +1,48 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
@@ -59,14 +_,9 @@
-       if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
-          p_127520_.append("-- Head --\n");
-          p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
-         p_127520_.append("Stacktrace:\n");
+         if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
+             p_127520_.append("-- Head --\n");
+             p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
+-            p_127520_.append("Stacktrace:\n");
+-
+-            for (StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
+-                p_127520_.append("\t").append("at ").append(stacktraceelement);
+-                p_127520_.append("\n");
+-            }
 -
-         for(StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
-            p_127520_.append("\t").append("at ").append((Object)stacktraceelement);
 -            p_127520_.append("\n");
-         }
-
-         p_127520_.append("\n");
-+         p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
-+         p_127520_.append("Stacktrace:");
-+         p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
-       }
+            p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
+            p_127520_.append("Stacktrace:");
+            p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
+         }
 
-       for(CrashReportCategory crashreportcategory : this.details) {
+         for (CrashReportCategory crashreportcategory : this.details) {
@@ -74,6 +_,7 @@
-          p_127520_.append("\n\n");
-       }
+             p_127520_.append("\n\n");
+         }
 
-+      net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
-       this.systemReport.appendToCrashReportString(p_127520_);
-    }
+        net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
+         this.systemReport.appendToCrashReportString(p_127520_);
+     }
 
@@ -93,18 +_,7 @@
-          throwable.setStackTrace(this.exception.getStackTrace());
-       }
+             throwable.setStackTrace(this.exception.getStackTrace());
+         }
 
-      String s;
-      try {
-         stringwriter = new StringWriter();
-         printwriter = new PrintWriter(stringwriter);
-         throwable.printStackTrace(printwriter);
-         s = stringwriter.toString();
-      } finally {
-         IOUtils.closeQuietly((Writer)stringwriter);
-         IOUtils.closeQuietly((Writer)printwriter);
-      }
+-        String s;
+-        try {
+-            stringwriter = new StringWriter();
+-            printwriter = new PrintWriter(stringwriter);
+-            throwable.printStackTrace(printwriter);
+-            s = stringwriter.toString();
+-        } finally {
+-            IOUtils.closeQuietly((Writer)stringwriter);
+-            IOUtils.closeQuietly((Writer)printwriter);
+-        }
 -
-      return s;
-+      return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
-    }
+-        return s;
+        return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
+     }
 
-    public String getFriendlyReport() {
+     public String getFriendlyReport() {
@@ -1,38 +1,37 @@
 --- a/net/minecraft/CrashReportCategory.java
 +++ b/net/minecraft/CrashReportCategory.java
-@@ -102,8 +_,10 @@
-       if (astacktraceelement.length <= 0) {
-          return 0;
-       } else {
-         this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
-         System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
-+         int len = astacktraceelement.length - 3 - p_128149_;
-+         if (len <= 0) len = astacktraceelement.length;
-+         this.stackTrace = new StackTraceElement[len];
-+         System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
-          return this.stackTrace.length;
-       }
-    }
-@@ -147,17 +_,17 @@
+@@ -112,8 +_,10 @@
+         if (astacktraceelement.length <= 0) {
+             return 0;
+         } else {
+-            this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
+-            System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
+            int len = astacktraceelement.length - 3 - p_128149_;
+            if (len <= 0) len = astacktraceelement.length;
+            this.stackTrace = new StackTraceElement[len];
+            System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
+             return this.stackTrace.length;
+         }
+     }
+@@ -160,16 +_,16 @@
 
-       if (this.stackTrace != null && this.stackTrace.length > 0) {
-          p_128169_.append("\nStacktrace:");
+         if (this.stackTrace != null && this.stackTrace.length > 0) {
+             p_128169_.append("\nStacktrace:");
 -
-         for(StackTraceElement stacktraceelement : this.stackTrace) {
-            p_128169_.append("\n\tat ");
-            p_128169_.append((Object)stacktraceelement);
-         }
-+         p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
-       }
+-            for (StackTraceElement stacktraceelement : this.stackTrace) {
+-                p_128169_.append("\n\tat ");
+-                p_128169_.append(stacktraceelement);
+-            }
+            p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
+         }
+     }
 
-    }
- 
-    public StackTraceElement[] getStacktrace() {
-       return this.stackTrace;
-+   }
+     public StackTraceElement[] getStacktrace() {
+         return this.stackTrace;
+    }
 +
-+   public void applyStackTrace(Throwable t) {
-+      this.stackTrace = t.getStackTrace();
-    }
+    public void applyStackTrace(Throwable t) {
+        this.stackTrace = t.getStackTrace();
+     }
 
-    public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
+     public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
@@ -1,10 +1,10 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -215,6 +_,7 @@
-    }
+@@ -181,6 +_,7 @@
+     }
 
-    static {
-+      if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
-       ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
-       CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
-       CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
+     static {
+        if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
+         ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
+         CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
+         CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
@@ -1,23 +1,11 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -180,6 +_,11 @@
-       return 255;
-    }
- 
-+   // We add these inner classes to compensate for Mojang's missing inner classes and shift the anonymous class index.
-+   // This allows us to obfuscate subsequent anonymous inner classes correctly.
-+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT1 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
-+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT2 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
-+
-    public static ExecutorService backgroundExecutor() {
-       return BACKGROUND_EXECUTOR;
-    }
-@@ -254,7 +_,7 @@
-       try {
-          type = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())).getChoiceType(p_137552_, p_137553_);
-       } catch (IllegalArgumentException illegalargumentexception) {
-         LOGGER.error("No data fixer registered for {}", (Object)p_137553_);
-+         LOGGER.debug("No data fixer registered for {}", (Object)p_137553_);
-          if (SharedConstants.IS_RUNNING_IN_IDE) {
-             throw illegalargumentexception;
-          }
+@@ -267,7 +_,7 @@
+                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
+                 .getChoiceType(p_137552_, p_137553_);
+         } catch (IllegalArgumentException illegalargumentexception) {
+-            LOGGER.error("No data fixer registered for {}", p_137553_);
+            LOGGER.debug("No data fixer registered for {}", p_137553_);
+             if (SharedConstants.IS_RUNNING_IN_IDE) {
+                 throw illegalargumentexception;
+             }
@@ -1,15 +1,15 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -171,7 +_,11 @@
-       }
+@@ -214,7 +_,11 @@
+         }
 
-       public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
-         AdvancementHolder advancementholder = this.build(new ResourceLocation(p_138391_));
-+          return save(p_138390_, new ResourceLocation(p_138391_));
-+      }
+         public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
+-            AdvancementHolder advancementholder = this.build(new ResourceLocation(p_138391_));
+            return save(p_138390_, new ResourceLocation(p_138391_));
+        }
 +
-+      public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, ResourceLocation id) {
-+         AdvancementHolder advancementholder = this.build(id);
-          p_138390_.accept(advancementholder);
-          return advancementholder;
-       }
+        public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, ResourceLocation id) {
+            AdvancementHolder advancementholder = this.build(id);
+             p_138390_.accept(advancementholder);
+             return advancementholder;
+         }
@@ -1,11 +1,10 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -27,7 +_,7 @@
+@@ -40,6 +_,7 @@
+         LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
+             .withParameter(LootContextParams.THIS_ENTITY, p_9990_)
+             .withParameter(LootContextParams.ORIGIN, p_9990_.position())
+            .withLuck(p_9990_.getLuck())
+             .create(LootContextParamSets.ADVANCEMENT_REWARD);
+         boolean flag = false;
 
-    public void grant(ServerPlayer p_9990_) {
-       p_9990_.giveExperiencePoints(this.experience);
-      LootParams lootparams = (new LootParams.Builder(p_9990_.serverLevel())).withParameter(LootContextParams.THIS_ENTITY, p_9990_).withParameter(LootContextParams.ORIGIN, p_9990_.position()).create(LootContextParamSets.ADVANCEMENT_REWARD);
-+      LootParams lootparams = (new LootParams.Builder(p_9990_.serverLevel())).withParameter(LootContextParams.THIS_ENTITY, p_9990_).withParameter(LootContextParams.ORIGIN, p_9990_.position()).withLuck(p_9990_.getLuck()).create(LootContextParamSets.ADVANCEMENT_REWARD); // Forge: Add luck to LootContext
-       boolean flag = false;
- 
-       for(ResourceLocation resourcelocation : this.loot) {
@@ -1,11 +0,0 @@
--- a/net/minecraft/advancements/critereon/ItemPredicate.java
-+++ b/net/minecraft/advancements/critereon/ItemPredicate.java
-@@ -45,7 +_,7 @@
-          return false;
-       } else {
-          if (!this.enchantments.isEmpty()) {
-            Map<Enchantment, Integer> map = EnchantmentHelper.deserializeEnchantments(p_45050_.getEnchantmentTags());
-+            Map<Enchantment, Integer> map = p_45050_.getAllEnchantments();
- 
-             for(EnchantmentPredicate enchantmentpredicate : this.enchantments) {
-                if (!enchantmentpredicate.containedIn(map)) {
@@ -1,21 +1,21 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -212,6 +_,18 @@
-       return this.partialTickTime;
-    }
+@@ -227,6 +_,18 @@
+         return this.partialTickTime;
+     }
 
-+   public void setAnglesInternal(float yaw, float pitch) {
-+      this.yRot = yaw;
-+      this.xRot = pitch;
-+   }
+    public void setAnglesInternal(float yaw, float pitch) {
+        this.yRot = yaw;
+        this.xRot = pitch;
+    }
 +
-+   public net.minecraft.world.level.block.state.BlockState getBlockAtCamera() {
-+      if (!this.initialized)
-+         return net.minecraft.world.level.block.Blocks.AIR.defaultBlockState();
-+      else
-+         return this.level.getBlockState(this.blockPosition).getStateAtViewpoint(this.level, this.blockPosition, this.position);
-+   }
+    public net.minecraft.world.level.block.state.BlockState getBlockAtCamera() {
+        if (!this.initialized)
+            return net.minecraft.world.level.block.Blocks.AIR.defaultBlockState();
+        else
+            return this.level.getBlockState(this.blockPosition).getStateAtViewpoint(this.level, this.blockPosition, this.position);
+    }
 +
-    @OnlyIn(Dist.CLIENT)
-    public static class NearPlane {
-       final Vec3 forward;
+     @OnlyIn(Dist.CLIENT)
+     public static class NearPlane {
+         final Vec3 forward;
@@ -2,9 +2,9 @@
 +++ b/net/minecraft/client/ClientBrandRetriever.java
@@ -10,6 +_,6 @@
 
-    @DontObfuscate
-    public static String getClientModName() {
-      return "vanilla";
-+      return net.minecraftforge.internal.BrandingControl.getClientBranding();
-    }
+     @DontObfuscate
+     public static String getClientModName() {
+-        return "vanilla";
+        return net.minecraftforge.internal.BrandingControl.getClientBranding();
+     }
 }
@@ -1,20 +1,20 @@
 --- a/net/minecraft/client/ClientRecipeBook.java
 +++ b/net/minecraft/client/ClientRecipeBook.java
-@@ -56,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_) -> {
-                   return Lists.newArrayList();
-@@ -144,6 +_,8 @@
-          } else if (recipetype == RecipeType.SMITHING) {
-             return RecipeBookCategories.SMITHING;
-          } else {
-+            RecipeBookCategories categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType) recipetype, p_299041_);
-+            if (categories != null) return categories;
-             LOGGER.warn("Unknown recipe category: {}/{}", LogUtils.defer(() -> {
-                return BuiltInRegistries.RECIPE_TYPE.getKey(recipe.getType());
-             }), LogUtils.defer(p_299041_::id));
+@@ -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,182 +1,183 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -13,9 +_,9 @@
+@@ -14,9 +_,9 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
 -public class KeyMapping implements Comparable<KeyMapping> {
 +public class KeyMapping implements Comparable<KeyMapping>, net.minecraftforge.client.extensions.IForgeKeyMapping {
-    private static final Map<String, KeyMapping> ALL = Maps.newHashMap();
-   private static final Map<InputConstants.Key, KeyMapping> MAP = Maps.newHashMap();
-+   private static final net.minecraftforge.client.settings.KeyMappingLookup MAP = new net.minecraftforge.client.settings.KeyMappingLookup();
-    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";
-@@ -41,7 +_,7 @@
-    private int clickCount;
+     private static final Map<String, KeyMapping> ALL = Maps.newHashMap();
+-    private static final Map<InputConstants.Key, KeyMapping> MAP = Maps.newHashMap();
+    private static final net.minecraftforge.client.settings.KeyMappingLookup MAP = new net.minecraftforge.client.settings.KeyMappingLookup();
+     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 @@
+     private int clickCount;
 
-    public static void click(InputConstants.Key p_90836_) {
-      KeyMapping keymapping = MAP.get(p_90836_);
-+      for (KeyMapping keymapping : MAP.getAll(p_90836_))
-       if (keymapping != null) {
-          ++keymapping.clickCount;
-       }
-@@ -49,7 +_,7 @@
-    }
+     public static void click(InputConstants.Key p_90836_) {
+-        KeyMapping keymapping = MAP.get(p_90836_);
+        for (KeyMapping keymapping : MAP.getAll(p_90836_))
+         if (keymapping != null) {
+             keymapping.clickCount++;
+         }
+     }
 
-    public static void set(InputConstants.Key p_90838_, boolean p_90839_) {
-      KeyMapping keymapping = MAP.get(p_90838_);
-+      for (KeyMapping keymapping : MAP.getAll(p_90838_))
-       if (keymapping != null) {
-          keymapping.setDown(p_90839_);
-       }
-@@ -105,7 +_,7 @@
-    }
+     public static void set(InputConstants.Key p_90838_, boolean p_90839_) {
+-        KeyMapping keymapping = MAP.get(p_90838_);
+        for (KeyMapping keymapping : MAP.getAll(p_90838_))
+         if (keymapping != null) {
+             keymapping.setDown(p_90839_);
+         }
+@@ -100,7 +_,7 @@
+     }
 
-    public boolean isDown() {
-      return this.isDown;
-+      return this.isDown && isConflictContextAndModifierActive();
-    }
+     public boolean isDown() {
+-        return this.isDown;
+        return this.isDown && isConflictContextAndModifierActive();
+     }
 
-    public String getCategory() {
-@@ -139,7 +_,13 @@
-    }
+     public String getCategory() {
+@@ -136,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))
+-            : CATEGORY_SORT_ORDER.get(this.category).compareTo(CATEGORY_SORT_ORDER.get(p_90841_.category));
+            : compareSort(this.category, p_90841_.category);
+    }
+
+    private static int compareSort(String c1, String c2) {
+        Integer o1 = CATEGORY_SORT_ORDER.get(c1);
+        Integer o2 = CATEGORY_SORT_ORDER.get(c2);
+        if (o1 == null && o2 != null) return 1;
+        if (o1 != null && o2 == null) return -1;
+        if (o1 == null && o2 == null) return I18n.get(c1).compareTo(I18n.get(c2));
+        return  o1.compareTo(o2);
+     }
 
-    public int compareTo(KeyMapping p_90841_) {
-      return this.category.equals(p_90841_.category) ? I18n.get(this.name).compareTo(I18n.get(p_90841_.name)) : CATEGORY_SORT_ORDER.get(this.category).compareTo(CATEGORY_SORT_ORDER.get(p_90841_.category));
-+      if (this.category.equals(p_90841_.category)) return I18n.get(this.name).compareTo(I18n.get(p_90841_.name));
-+      Integer tCat = CATEGORY_SORT_ORDER.get(this.category);
-+      Integer oCat = CATEGORY_SORT_ORDER.get(p_90841_.category);
-+      if (tCat == null && oCat != null) return 1;
-+      if (tCat != null && oCat == null) return -1;
-+      if (tCat == null && oCat == null) return I18n.get(this.category).compareTo(I18n.get(p_90841_.category));
-+      return  tCat.compareTo(oCat);
-    }
+     public static Supplier<Component> createNameSupplier(String p_90843_) {
+@@ -145,6 +_,20 @@
+     }
 
-    public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -150,6 +_,20 @@
-    }
- 
-    public boolean same(KeyMapping p_90851_) {
-+      if (getKeyConflictContext().conflicts(p_90851_.getKeyConflictContext()) || p_90851_.getKeyConflictContext().conflicts(getKeyConflictContext())) {
-+         net.minecraftforge.client.settings.KeyModifier keyModifier = getKeyModifier();
-+         net.minecraftforge.client.settings.KeyModifier otherKeyModifier = p_90851_.getKeyModifier();
-+         if (keyModifier.matches(p_90851_.getKey()) || otherKeyModifier.matches(getKey())) {
-+            return true;
-+         } else if (getKey().equals(p_90851_.getKey())) {
-+            // IN_GAME key contexts have a conflict when at least one modifier is NONE.
-+            // For example: If you hold shift to crouch, you can still press E to open your inventory. This means that a Shift+E hotkey is in conflict with E.
-+            // GUI and other key contexts do not have this limitation.
-+            return keyModifier == otherKeyModifier ||
-+               (getKeyConflictContext().conflicts(net.minecraftforge.client.settings.KeyConflictContext.IN_GAME) &&
-+               (keyModifier == net.minecraftforge.client.settings.KeyModifier.NONE || otherKeyModifier == net.minecraftforge.client.settings.KeyModifier.NONE));
+     public boolean same(KeyMapping p_90851_) {
+        if (getKeyConflictContext().conflicts(p_90851_.getKeyConflictContext()) || p_90851_.getKeyConflictContext().conflicts(getKeyConflictContext())) {
+            var keyModifier = getKeyModifier();
+            var otherKeyModifier = p_90851_.getKeyModifier();
+            if (keyModifier.matches(p_90851_.getKey()) || otherKeyModifier.matches(getKey())) {
+               return true;
+            } else if (getKey().equals(p_90851_.getKey())) {
+               // IN_GAME key contexts have a conflict when at least one modifier is NONE.
+               // For example: If you hold shift to crouch, you can still press E to open your inventory. This means that a Shift+E hotkey is in conflict with E.
+               // GUI and other key contexts do not have this limitation.
+               return keyModifier == otherKeyModifier ||
+                  (getKeyConflictContext().conflicts(net.minecraftforge.client.settings.KeyConflictContext.IN_GAME) &&
+                  (keyModifier == net.minecraftforge.client.settings.KeyModifier.NONE || otherKeyModifier == net.minecraftforge.client.settings.KeyModifier.NONE));
+            }
 +         }
-+      }
-       return this.key.equals(p_90851_.key);
-    }
+         return this.key.equals(p_90851_.key);
+     }
 
-@@ -170,11 +_,13 @@
-    }
+@@ -163,11 +_,13 @@
+     }
 
-    public Component getTranslatedKeyMessage() {
-+      return getKeyModifier().getCombinedName(key, () -> {
-       return this.key.getDisplayName();
-+      });
-    }
+     public Component getTranslatedKeyMessage() {
+        return getKeyModifier().getCombinedName(key, () -> {
+         return this.key.getDisplayName();
+        });
+     }
 
-    public boolean isDefault() {
-      return this.key.equals(this.defaultKey);
-+      return this.key.equals(this.defaultKey) && getKeyModifier() == getDefaultKeyModifier();
-    }
+     public boolean isDefault() {
+-        return this.key.equals(this.defaultKey);
+        return this.key.equals(this.defaultKey) && getKeyModifier() == getDefaultKeyModifier();
+     }
 
-    public String saveString() {
-@@ -183,5 +_,89 @@
+     public String saveString() {
+@@ -176,5 +_,88 @@
 
-    public void setDown(boolean p_90846_) {
-       this.isDown = p_90846_;
-+   }
+     public void setDown(boolean p_90846_) {
+         this.isDown = p_90846_;
+    }
 +
-+   /****************** Forge Start *****************************/
-+   private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
-+   private net.minecraftforge.client.settings.KeyModifier keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
-+   private net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext = net.minecraftforge.client.settings.KeyConflictContext.UNIVERSAL;
+    private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
+    private net.minecraftforge.client.settings.KeyModifier keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
+    private net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext = net.minecraftforge.client.settings.KeyConflictContext.UNIVERSAL;
 +
-+   /**
-+    * Convenience constructor for creating KeyBindings with keyConflictContext set.
-+    */
-+   public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, final InputConstants.Type inputType, final int keyCode, String category) {
-+       this(description, keyConflictContext, inputType.getOrCreate(keyCode), category);
-+   }
+    /**
+     * Convenience constructor for creating KeyBindings with keyConflictContext set.
+     */
+    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, final InputConstants.Type inputType, final int keyCode, String category) {
+        this(description, keyConflictContext, inputType.getOrCreate(keyCode), category);
+    }
 +
-+   /**
-+    * Convenience constructor for creating KeyBindings with keyConflictContext set.
-+    */
-+   public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, InputConstants.Key keyCode, String category) {
-+       this(description, keyConflictContext, net.minecraftforge.client.settings.KeyModifier.NONE, keyCode, category);
-+   }
+    /**
+     * Convenience constructor for creating KeyBindings with keyConflictContext set.
+     */
+    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, InputConstants.Key keyCode, String category) {
+        this(description, keyConflictContext, net.minecraftforge.client.settings.KeyModifier.NONE, keyCode, category);
+    }
 +
-+   /**
-+    * Convenience constructor for creating KeyBindings with keyConflictContext and keyModifier set.
-+    */
-+   public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, final InputConstants.Type inputType, final int keyCode, String category) {
-+       this(description, keyConflictContext, keyModifier, inputType.getOrCreate(keyCode), category);
-+   }
-+
-+   /**
-+    * Convenience constructor for creating KeyBindings with keyConflictContext and keyModifier set.
-+    */
-+   public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, InputConstants.Key keyCode, String category) {
-+      this.name = description;
-+      this.key = keyCode;
-+      this.defaultKey = keyCode;
-+      this.category = category;
-+      this.keyConflictContext = keyConflictContext;
-+      this.keyModifier = keyModifier;
-+      this.keyModifierDefault = keyModifier;
-+      if (this.keyModifier.matches(keyCode))
-+         this.keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
-+      ALL.put(description, this);
-+      MAP.put(keyCode, this);
-+      CATEGORIES.add(category);
-+   }
-+
-+   @Override
-+   public InputConstants.Key getKey() {
-+       return this.key;
-+   }
-+
-+   @Override
-+   public void setKeyConflictContext(net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext) {
-+       this.keyConflictContext = keyConflictContext;
-+   }
-+
-+   @Override
-+   public net.minecraftforge.client.settings.IKeyConflictContext getKeyConflictContext() {
-+       return keyConflictContext;
-+   }
-+
-+   @Override
-+   public net.minecraftforge.client.settings.KeyModifier getDefaultKeyModifier() {
-+       return keyModifierDefault;
-+   }
-+
-+   @Override
-+   public net.minecraftforge.client.settings.KeyModifier getKeyModifier() {
-+       return keyModifier;
-+   }
-+
-+   @Override
-+   public void setKeyModifierAndCode(@org.jetbrains.annotations.Nullable net.minecraftforge.client.settings.KeyModifier keyModifier, InputConstants.Key keyCode) {
-+       MAP.remove(this);
-+
-+       if (keyModifier == null)
-+           keyModifier = net.minecraftforge.client.settings.KeyModifier.getModifier(this.key);
-+       if (keyModifier == null || keyCode == InputConstants.UNKNOWN || net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(keyCode))
-+           keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
+    /**
+     * Convenience constructor for creating KeyBindings with keyConflictContext and keyModifier set.
+     */
+    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, final InputConstants.Type inputType, final int keyCode, String category) {
+        this(description, keyConflictContext, keyModifier, inputType.getOrCreate(keyCode), category);
+    }
 +
+    /**
+     * Convenience constructor for creating KeyBindings with keyConflictContext and keyModifier set.
+     */
+    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, InputConstants.Key keyCode, String category) {
+       this.name = description;
 +       this.key = keyCode;
+       this.defaultKey = keyCode;
+       this.category = category;
+       this.keyConflictContext = keyConflictContext;
 +       this.keyModifier = keyModifier;
-+
+       this.keyModifierDefault = keyModifier;
+       if (this.keyModifier.matches(keyCode))
+          this.keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
+       ALL.put(description, this);
 +       MAP.put(keyCode, this);
-    }
+       CATEGORIES.add(category);
+    }
+
+    @Override
+    public InputConstants.Key getKey() {
+        return this.key;
+    }
+
+    @Override
+    public void setKeyConflictContext(net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext) {
+        this.keyConflictContext = keyConflictContext;
+    }
+
+    @Override
+    public net.minecraftforge.client.settings.IKeyConflictContext getKeyConflictContext() {
+        return keyConflictContext;
+    }
+
+    @Override
+    public net.minecraftforge.client.settings.KeyModifier getDefaultKeyModifier() {
+        return keyModifierDefault;
+    }
+
+    @Override
+    public net.minecraftforge.client.settings.KeyModifier getKeyModifier() {
+        return keyModifier;
+    }
+
+    @Override
+    public void setKeyModifierAndCode(@org.jetbrains.annotations.Nullable net.minecraftforge.client.settings.KeyModifier keyModifier, InputConstants.Key keyCode) {
+        MAP.remove(this);
+
+        if (keyModifier == null)
+            keyModifier = net.minecraftforge.client.settings.KeyModifier.getModifier(this.key);
+        if (keyModifier == null || keyCode == InputConstants.UNKNOWN || net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(keyCode))
+            keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
+
+        this.key = keyCode;
+        this.keyModifier = keyModifier;
+
+        MAP.put(keyCode, this);
+     }
 }
@@ -1,50 +1,39 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -397,11 +_,15 @@
-             Screen.wrapScreenError(() -> {
-                if (p_90897_ != 1 && p_90897_ != 2) {
-                   if (p_90897_ == 0) {
-                     aboolean[0] = screen.keyReleased(p_90895_, p_90896_, p_90898_);
-+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPre(screen, p_90895_, p_90896_, p_90898_);
-+                     if (!aboolean[0]) aboolean[0] = screen.keyReleased(p_90895_, p_90896_, p_90898_);
-+                     if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPost(screen, p_90895_, p_90896_, p_90898_);
-                   }
-                } else {
-                   screen.afterKeyboardAction();
-                  aboolean[0] = screen.keyPressed(p_90895_, p_90896_, p_90898_);
-+                  aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressedPre(screen, p_90895_, p_90896_, p_90898_);
-+                  if (!aboolean[0]) aboolean[0] = screen.keyPressed(p_90895_, p_90896_, p_90898_);
-+                  if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressedPost(screen, p_90895_, p_90896_, p_90898_);
-                }
- 
-             }, "keyPressed event handler", screen.getClass().getCanonicalName());
-@@ -478,21 +_,26 @@
+@@ -410,9 +_,9 @@
+                 Screen.wrapScreenError(() -> {
+                     if (p_90897_ == 1 || p_90897_ == 2) {
+                         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_);
+                     }
+                 }, "keyPressed event handler", screen.getClass().getCanonicalName());
+                 if (aboolean[0]) {
+@@ -481,20 +_,21 @@
+                     }
+                 }
             }
+            net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_90895_, p_90896_, p_90897_, p_90898_);
+         }
+     }
 
-          }
-+         net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_90895_, p_90896_, p_90897_, p_90898_);
-       }
-    }
- 
-    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_);
-+                  if (net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPre(guieventlistener, (char)p_90891_, p_90892_)) return;
-+                  if (guieventlistener.charTyped((char)p_90891_, p_90892_)) return;
-+                  net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPost(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_);
-+                     if (net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPre(guieventlistener, c0, p_90892_)) return;
-+                     if (guieventlistener.charTyped(c0, p_90892_)) return;
-+                     net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPost(guieventlistener, c0, p_90892_);
-                   }, "charTyped event handler", guieventlistener.getClass().getCanonicalName());
-                }
+     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());
+                     }
+                 }
             }
@@ -1,447 +1,452 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -254,7 +_,7 @@
+@@ -259,7 +_,7 @@
 import org.slf4j.Logger;
 
 @OnlyIn(Dist.CLIENT)
 -public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler {
 +public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft {
-    static Minecraft instance;
-    private static final Logger LOGGER = LogUtils.getLogger();
-    public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
+     static Minecraft instance;
+     private static final Logger LOGGER = LogUtils.getLogger();
+     public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
@@ -438,7 +_,6 @@
-          }
-       }, Util.nonCriticalIoPool());
-       LOGGER.info("Setting user: {}", (Object)this.user.getName());
-      LOGGER.debug("(Session ID is {})", (Object)this.user.getSessionId());
-       this.demo = p_91084_.game.demo;
-       this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
-       this.allowsChat = !p_91084_.game.disableChat;
-@@ -474,15 +_,15 @@
-       }
- 
-       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);
-       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);
-@@ -538,10 +_,13 @@
-       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.createSearchTrees();
-+      // Forge: We delay this to allow registration of modded creative mode tabs
-+      // this.createSearchTrees();
-       this.resourceManager.registerReloadListener(this.searchRegistry);
-       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,7 +_,10 @@
-       this.gpuWarnlistManager = new GpuWarnlistManager();
-       this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
-       this.resourceManager.registerReloadListener(this.regionalCompliancies);
-      this.gui = new Gui(this, this.itemRenderer);
-+      this.gui = new net.minecraftforge.client.gui.overlay.ForgeGui(this);
-+      // FORGE: Moved keyboard and mouse handler setup below ingame gui creation to prevent NPEs in them.
-+      this.mouseHandler.setup(this.window.getWindow());
-+      this.keyboardHandler.setup(this.window.getWindow());
-       this.debugRenderer = new DebugRenderer(this);
-       RealmsClient realmsclient = RealmsClient.create(this);
-       this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
-@@ -572,6 +_,7 @@
-          TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
-       }
- 
-+      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();
-@@ -592,7 +_,7 @@
-       ReloadInstance reloadinstance = this.resourceManager.createReload(Util.backgroundExecutor(), this, RESOURCE_RELOAD_INITIAL_TASK, list);
-       GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
-       Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
-      this.setOverlay(new LoadingOverlay(this, reloadinstance, (p_296164_) -> {
-+      this.setOverlay(net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(() -> this, () -> reloadinstance, (p_296164_) -> {
-          Util.ifElse(p_296164_, (p_296162_) -> {
-             this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie);
-          }, () -> {
-@@ -602,8 +_,10 @@
- 
-             this.reloadStateTracker.finishReload();
-             this.onResourceLoadFinished(minecraft$gameloadcookie);
-+            if (net.minecraftforge.client.loading.ClientModLoader.completeModLoading())
-+                return; // Do not overwrite the error screen if there are errors
-          });
-      }, false));
-+      }, false).get());
-       this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
-    }
- 
-@@ -701,7 +_,7 @@
-    private String createTitle() {
-       StringBuilder stringbuilder = new StringBuilder("Minecraft");
-       if (checkModStatus().shouldReportAsModified()) {
-         stringbuilder.append("*");
-+         stringbuilder.append('*').append(" Forge");
-       }
- 
-       stringbuilder.append(" ");
-@@ -725,6 +_,8 @@
-    }
- 
-    private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
-+      if ("0".equals(p_193587_.user.user.getAccessToken())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
-+         return UserApiService.OFFLINE;
-       return p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
-    }
- 
-@@ -733,7 +_,7 @@
-    }
- 
-    private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
-      if (this.resourcePackRepository.getSelectedIds().size() > 1) {
-+      if (this.resourcePackRepository.getSelectedPacks().stream().anyMatch(e -> !e.isRequired())) { //Forge: This caused infinite loop if any resource packs are forced. Such as mod resources. So check if we can disable any.
-          this.clearResourcePacksOnError(p_91240_, (Component)null, p_299515_);
-       } else {
-          Util.throwAsRuntime(p_91240_);
-@@ -819,7 +_,10 @@
-    }
- 
-    public void createSearchTrees() {
-      this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, (p_231451_) -> {
-+      var nameSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getNameSearchKeys();
-+      var tagSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getTagSearchKeys();
-+      for (var nameSearchKey : nameSearchKeys.values())
-+      this.searchRegistry.register(nameSearchKey, (p_231451_) -> {
-          return new FullTextSearchTree<>((p_210797_) -> {
-             return p_210797_.getTooltipLines((Player)null, TooltipFlag.Default.NORMAL.asCreative()).stream().map((p_231455_) -> {
-                return ChatFormatting.stripFormatting(p_231455_.getString()).trim();
-@@ -830,7 +_,8 @@
-             return Stream.of(BuiltInRegistries.ITEM.getKey(p_91317_.getItem()));
-          }, p_231451_);
-       });
-      this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, (p_231430_) -> {
-+      for (var tagSearchKey : tagSearchKeys.values())
-+      this.searchRegistry.register(tagSearchKey, (p_231430_) -> {
-          return new IdSearchTree<>((p_231353_) -> {
-             return p_231353_.getTags().map(TagKey::location);
-          }, p_231430_);
-@@ -850,9 +_,12 @@
-             });
-          }, p_301514_);
-       });
-      CreativeModeTabs.searchTab().setSearchTreeBuilder((p_255439_) -> {
-         this.populateSearchTree(SearchRegistry.CREATIVE_NAMES, p_255439_);
-         this.populateSearchTree(SearchRegistry.CREATIVE_TAGS, p_255439_);
-+      nameSearchKeys.forEach((tab, nameSearchKey) -> {
-+         var tagSearchKey = tagSearchKeys.get(tab);
-+         tab.setSearchTreeBuilder(contents -> {
-+            this.populateSearchTree(nameSearchKey, contents);
-+            this.populateSearchTree(tagSearchKey, contents);
-+         });
-       });
-    }
- 
-@@ -1054,10 +_,6 @@
-          LOGGER.error("setScreen called from non-game thread");
-       }
- 
-      if (this.screen != null) {
-         this.screen.removed();
-      }
-
-       if (p_91153_ == null && this.clientLevelTeardownInProgress) {
-          throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
-       } else {
-@@ -1071,6 +_,19 @@
             }
-          }
+         }, Util.nonCriticalIoPool());
+         LOGGER.info("Setting user: {}", this.user.getName());
+-        LOGGER.debug("(Session ID is {})", this.user.getSessionId());
+         this.demo = p_91084_.game.demo;
+         this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
+         this.allowsChat = !p_91084_.game.disableChat;
+@@ -475,15 +_,15 @@
+         }
 
-+         net.minecraftforge.client.ForgeHooksClient.clearGuiLayers(this);
-+         Screen old = this.screen;
-+         if (p_91153_ != null) {
-+            var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenOpening(old, p_91153_);
-+            if (event == null) return;
-+            p_91153_ = event;
-+         }
-+
-+         if (old != null && p_91153_ != old) {
-+            net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenClose(old);
-+            old.removed();
-+         }
-+
-          this.screen = p_91153_;
-          if (this.screen != null) {
-             this.screen.added();
-@@ -1218,9 +_,12 @@
-       RenderSystem.enableCull();
-       this.profiler.pop();
-       if (!this.noRender) {
-+         this.realPartialTick = this.pause ? this.pausePartialTick : this.timer.partialTick; // Cache this since pause is volatile
-+         net.minecraftforge.event.ForgeEventFactory.onRenderTickStart(this.realPartialTick);
-          this.profiler.popPush("gameRenderer");
-          this.gameRenderer.render(this.pause ? this.pausePartialTick : this.timer.partialTick, i, p_91384_);
-          this.profiler.pop();
-+         net.minecraftforge.event.ForgeEventFactory.onRenderTickEnd(this.realPartialTick);
-       }
+         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);
+         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);
+@@ -542,6 +_,7 @@
+         this.entityRenderDispatcher = new EntityRenderDispatcher(this, this.textureManager, this.itemRenderer, this.blockRenderer, this.font, this.options, this.entityModels);
+         this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
+         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);
+@@ -554,13 +_,18 @@
+         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.createSearchTrees();
+        // Forge: We delay this to allow registration of modded creative mode tabs
+        //this.createSearchTrees();
+         this.resourceManager.registerReloadListener(this.searchRegistry);
+         this.gpuWarnlistManager = new GpuWarnlistManager();
+         this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
+         this.resourceManager.registerReloadListener(this.regionalCompliancies);
+         this.gui = new Gui(this);
+        // FORGE: Moved keyboard and mouse handler setup below ingame gui creation to prevent NPEs in them.
+        this.mouseHandler.setup(this.window.getWindow());
+        this.keyboardHandler.setup(this.window.getWindow());
+         this.debugRenderer = new DebugRenderer(this);
+         RealmsClient realmsclient = RealmsClient.create(this);
+         this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
+@@ -584,6 +_,7 @@
+             this.options.fullscreen().set(this.window.isFullscreen());
+         }
 
-       if (this.fpsPieResults != null) {
-@@ -1254,7 +_,8 @@
-       this.window.setErrorSection("Post render");
-       ++this.frames;
-       boolean flag1 = this.hasSingleplayerServer() && (this.screen != null && this.screen.isPauseScreen() || this.overlay != null && this.overlay.isPauseScreen()) && !this.singleplayerServer.isPublished();
-      if (this.pause != flag1) {
-+      if (this.pause != flag1 && !net.minecraftforge.client.ForgeHooksClient.onClientPauseChangePre(flag1)) {
-+
-          if (flag1) {
-             this.pausePartialTick = this.timer.partialTick;
-          } else {
-@@ -1262,6 +_,7 @@
-          }
- 
-          this.pause = flag1;
-+         net.minecraftforge.client.ForgeHooksClient.onClientPauseChangePost(flag1);
-       }
- 
-       long l = Util.getNanos();
-@@ -1341,10 +_,12 @@
-       this.window.setGuiScale((double)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);
-+      if (this.gameRenderer != null)
-       this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
-       this.mouseHandler.setIgnoreFirstMove();
-    }
-@@ -1618,6 +_,7 @@
-    }
- 
-    public void stop() {
-+      if (this.isRunning()) net.minecraftforge.event.ForgeEventFactory.onGameShuttingDown();
-       this.running = false;
-    }
- 
-@@ -1647,10 +_,18 @@
-          if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
-             BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
-             BlockPos blockpos = blockhitresult.getBlockPos();
-            if (!this.level.getBlockState(blockpos).isAir()) {
-+            if (!this.level.isEmptyBlock(blockpos)) {
-+               var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
-+               if (inputEvent.isCanceled()) {
-+                  if (inputEvent.shouldSwingHand()) {
-+                     this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
-+                     this.player.swing(InteractionHand.MAIN_HAND);
-+                  }
-+                  return;
-+               }
-                Direction direction = blockhitresult.getDirection();
-               if (this.gameMode.continueDestroyBlock(blockpos, direction)) {
-                  this.particleEngine.crack(blockpos, direction);
-+               if (this.gameMode.continueDestroyBlock(blockpos, direction) && inputEvent.shouldSwingHand()) {
-+                  this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
-                   this.player.swing(InteractionHand.MAIN_HAND);
-                }
-             }
-@@ -1679,6 +_,8 @@
-             return false;
-          } else {
-             boolean flag = false;
-+            var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
-+            if (!inputEvent.isCanceled())
-             switch (this.hitResult.getType()) {
-                case ENTITY:
-                   this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
-@@ -1686,7 +_,7 @@
-                case BLOCK:
-                   BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
-                   BlockPos blockpos = blockhitresult.getBlockPos();
-                  if (!this.level.getBlockState(blockpos).isAir()) {
-+                  if (!this.level.isEmptyBlock(blockpos)) {
-                      this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
-                      if (this.level.getBlockState(blockpos).isAir()) {
-                         flag = true;
-@@ -1699,8 +_,10 @@
-                   }
- 
-                   this.player.resetAttackStrengthTicker();
-+                  net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.player);
-             }
- 
-+            if (inputEvent.shouldSwingHand())
-             this.player.swing(InteractionHand.MAIN_HAND);
-             return flag;
-          }
-@@ -1716,6 +_,11 @@
-             }
- 
-             for(InteractionHand interactionhand : InteractionHand.values()) {
-+               var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(1, this.options.keyUse, interactionhand);
-+               if (inputEvent.isCanceled()) {
-+                  if (inputEvent.shouldSwingHand()) this.player.swing(interactionhand);
-+                  return;
-+               }
-                ItemStack itemstack = this.player.getItemInHand(interactionhand);
-                if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
-                   return;
-@@ -1736,7 +_,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();
+@@ -604,16 +_,17 @@
+         GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
+         Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
+         this.setOverlay(
+-            new LoadingOverlay(
+-                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 (interactionresult.consumesAction()) {
-                           if (interactionresult.shouldSwing()) {
-+                           if (interactionresult.shouldSwing() && inputEvent.shouldSwingHand()) {
-                               this.player.swing(interactionhand);
-                            }
+                         this.reloadStateTracker.finishReload();
+                         this.onResourceLoadFinished(minecraft$gameloadcookie);
+                        net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
+                     }), false
+-            )
+            ).get()
+         );
+         this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
+     }
+@@ -702,6 +_,7 @@
+         StringBuilder stringbuilder = new StringBuilder("Minecraft");
+         if (checkModStatus().shouldReportAsModified()) {
+             stringbuilder.append("*");
+            stringbuilder.append(" Forge");
+         }
 
-@@ -1748,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()) {
-                               this.player.swing(interactionhand);
-                               if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
-                                  this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
-@@ -1764,6 +_,9 @@
-                   }
-                }
+         stringbuilder.append(" ");
+@@ -725,6 +_,8 @@
+     }
 
-+               if (itemstack.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS))
-+                  net.minecraftforge.common.ForgeHooks.onEmptyClick(this.player, interactionhand);
-+
-                if (!itemstack.isEmpty()) {
-                   InteractionResult interactionresult2 = this.gameMode.useItem(this.player, interactionhand);
-                   if (interactionresult2.consumesAction()) {
-@@ -1795,6 +_,8 @@
-          --this.rightClickDelay;
-       }
+     private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
+        if ("0".equals(p_193587_.user.user.getAccessToken())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
+            return UserApiService.OFFLINE;
+         return p_193587_.user.user.getType() != User.Type.MSA
+             ? UserApiService.OFFLINE
+             : p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
+@@ -735,7 +_,7 @@
+     }
 
-+      net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
-+
-       this.profiler.push("gui");
-       this.chatListener.tick();
-       this.gui.tick(this.pause);
-@@ -1887,6 +_,7 @@
+     private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
+-        if (this.resourcePackRepository.getSelectedIds().size() > 1) {
+        if (this.resourcePackRepository.getSelectedPacks().stream().anyMatch(e -> !e.isRequired())) { //Forge: This caused infinite loop if any resource packs are forced. Such as mod resources. So check if we can disable any.
+             this.clearResourcePacksOnError(p_91240_, null, p_299515_);
+         } else {
+             Util.throwAsRuntime(p_91240_);
+@@ -817,9 +_,12 @@
+     }
 
-             this.tutorial.tick();
+     public void createSearchTrees() {
+        var nameSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getNameSearchKeys();
+        var tagSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getTagSearchKeys();
+        for (var nameSearchKey : nameSearchKeys.values())
+         this.searchRegistry
+             .register(
+-                SearchRegistry.CREATIVE_NAMES,
+                nameSearchKey,
+                 p_231451_ -> new FullTextSearchTree<>(
+                         p_325272_ -> p_325272_.getTooltipLines(Item.TooltipContext.EMPTY, null, TooltipFlag.Default.NORMAL.asCreative())
+                                 .stream()
+@@ -829,8 +_,9 @@
+                         p_231451_
+                     )
+             );
+        for (var tagSearchKey : tagSearchKeys.values())
+         this.searchRegistry
+-            .register(SearchRegistry.CREATIVE_TAGS, p_231430_ -> new IdSearchTree<>(p_231353_ -> p_231353_.getTags().map(TagKey::location), p_231430_));
+            .register(tagSearchKey, p_231430_ -> new IdSearchTree<>(p_231353_ -> p_231353_.getTags().map(TagKey::location), p_231430_));
+         this.searchRegistry
+             .register(
+                 SearchRegistry.RECIPE_COLLECTIONS,
+@@ -854,9 +_,12 @@
+                         p_301514_
+                     )
+             );
+-        CreativeModeTabs.searchTab().setSearchTreeBuilder(p_255439_ -> {
+-            this.populateSearchTree(SearchRegistry.CREATIVE_NAMES, p_255439_);
+-            this.populateSearchTree(SearchRegistry.CREATIVE_TAGS, p_255439_);
+        nameSearchKeys.forEach((tab, nameSearchKey) -> {
+            var tagSearchKey = tagSearchKeys.get(tab);
+            tab.setSearchTreeBuilder(contents -> {
+                this.populateSearchTree(nameSearchKey, contents);
+                this.populateSearchTree(tagSearchKey, contents);
+            });
+         });
+     }
 
-+            net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
-             try {
-                this.level.tick(() -> {
-                   return true;
-@@ -1902,6 +_,7 @@
+@@ -1039,12 +_,6 @@
+             LOGGER.error("setScreen called from non-game thread");
+         }
 
-                throw new ReportedException(crashreport);
-             }
-+            net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
-          }
- 
-          this.profiler.popPush("animateTick");
-@@ -1921,6 +_,8 @@
-       this.profiler.popPush("keyboard");
-       this.keyboardHandler.tick();
-       this.profiler.pop();
-+
-+      net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
-    }
- 
-    private boolean isMultiplayerServer() {
-@@ -2112,6 +_,7 @@
-    }
- 
-    public void setLevel(ClientLevel p_91157_) {
-+      if (this.level != null) net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
-       ProgressScreen progressscreen = new ProgressScreen(true);
-       progressscreen.progressStartNoAbort(Component.translatable("connect.joining"));
-       this.updateScreenAndTick(progressscreen);
-@@ -2146,6 +_,7 @@
-       IntegratedServer integratedserver = this.singleplayerServer;
-       this.singleplayerServer = null;
-       this.gameRenderer.resetData();
-+      net.minecraftforge.client.ForgeHooksClient.firePlayerLogout(this.gameMode, this.player);
-       this.gameMode = null;
-       this.narrator.clear();
-       this.clientLevelTeardownInProgress = true;
-@@ -2153,6 +_,7 @@
-       try {
-          this.updateScreenAndTick(p_91321_);
-          if (this.level != null) {
-+            net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
-             if (integratedserver != null) {
-                this.profiler.push("waitForServer");
- 
-@@ -2165,6 +_,7 @@
- 
-             this.gui.onDisconnected();
-             this.isLocalServer = false;
-+            net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(this.level);
-          }
- 
-          this.level = null;
-@@ -2313,6 +_,7 @@
- 
-    private void pickBlock() {
-       if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
-+         if (net.minecraftforge.client.ForgeHooksClient.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();
-@@ -2325,10 +_,7 @@
+-        if (this.screen != null) {
+-            this.screen.removed();
+-        } else {
+-            this.setLastInputType(InputType.NONE);
+-        }
+-
+         if (p_91153_ == null && this.clientLevelTeardownInProgress) {
+             throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
+         } else {
+@@ -1058,6 +_,23 @@
+                 }
             }
 
-             Block block = blockstate.getBlock();
-            itemstack = block.getCloneItemStack(this.level, blockpos, blockstate);
-            if (itemstack.isEmpty()) {
-               return;
-            }
-+            itemstack = blockstate.getCloneItemStack(this.hitResult, this.level, blockpos, this.player);
+            net.minecraftforge.client.ForgeHooksClient.clearGuiLayers(this);
+            Screen old = this.screen;
+            if (p_91153_ != null) {
+               var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenOpening(old, p_91153_);
+               if (event == null) return;
+               p_91153_ = event;
+            }
+
+            if (p_91153_ != old) {
+                if (old != null) {
+                    net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenClose(old);
+                    old.removed();
+                } else {
+                    this.setLastInputType(InputType.NONE);
+                }
+            }
+
+             this.screen = p_91153_;
+             if (this.screen != null) {
+                 this.screen.added();
+@@ -1204,9 +_,12 @@
+         this.mouseHandler.handleAccumulatedMovement();
+         this.profiler.pop();
+         if (!this.noRender) {
+            this.realPartialTick = this.pause ? this.pausePartialTick : this.timer.partialTick; // Cache this since pause is volatile
+            net.minecraftforge.event.ForgeEventFactory.onRenderTickStart(this.realPartialTick);
+             this.profiler.popPush("gameRenderer");
+             this.gameRenderer.render(this.pause ? this.pausePartialTick : this.timer.partialTick, i, p_91384_);
+             this.profiler.pop();
+            net.minecraftforge.event.ForgeEventFactory.onRenderTickEnd(this.realPartialTick);
+         }
 
-             if (flag && Screen.hasControlDown() && blockstate.hasBlockEntity()) {
-                blockentity = this.level.getBlockEntity(blockpos);
-@@ -2339,7 +_,7 @@
+         if (this.fpsPieResults != null) {
+@@ -1240,7 +_,7 @@
+         boolean flag1 = this.hasSingleplayerServer()
+             && (this.screen != null && this.screen.isPauseScreen() || this.overlay != null && this.overlay.isPauseScreen())
+             && !this.singleplayerServer.isPublished();
+-        if (this.pause != flag1) {
+        if (this.pause != flag1 && !net.minecraftforge.client.ForgeHooksClient.onClientPauseChangePre(flag1)) {
+             if (flag1) {
+                 this.pausePartialTick = this.timer.partialTick;
+             } else {
+@@ -1248,6 +_,7 @@
             }
 
-             Entity entity = ((EntityHitResult)this.hitResult).getEntity();
-            itemstack = entity.getPickResult();
-+            itemstack = entity.getPickedResult(this.hitResult);
-             if (itemstack == null) {
-                return;
+             this.pause = flag1;
+            net.minecraftforge.client.ForgeHooksClient.onClientPauseChangePost(flag1);
+         }
+ 
+         long l = Util.getNanos();
+@@ -1340,10 +_,12 @@
+         this.window.setGuiScale((double)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);
+        if (this.gameRenderer != null)
+         this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
+         this.mouseHandler.setIgnoreFirstMove();
+     }
+@@ -1619,6 +_,7 @@
+     }
+ 
+     public void stop() {
+        if (this.isRunning()) net.minecraftforge.event.ForgeEventFactory.onGameShuttingDown();
+         this.running = false;
+     }
+ 
+@@ -1647,10 +_,18 @@
+             if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
+                 BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
+                 BlockPos blockpos = blockhitresult.getBlockPos();
+-                if (!this.level.getBlockState(blockpos).isAir()) {
+                if (!this.level.isEmptyBlock(blockpos)) {
+                    var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
+                    if (inputEvent.isCanceled()) {
+                       if (inputEvent.shouldSwingHand()) {
+                          this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
+                          this.player.swing(InteractionHand.MAIN_HAND);
+                       }
+                       return;
+                    }
+                     Direction direction = blockhitresult.getDirection();
+-                    if (this.gameMode.continueDestroyBlock(blockpos, direction)) {
+-                        this.particleEngine.crack(blockpos, direction);
+                    if (this.gameMode.continueDestroyBlock(blockpos, direction) && inputEvent.shouldSwingHand()) {
+                        this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
+                         this.player.swing(InteractionHand.MAIN_HAND);
+                     }
+                 }
+@@ -1678,6 +_,8 @@
+                 return false;
+             } else {
+                 boolean flag = false;
+                var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
+                if (!inputEvent.isCanceled())
+                 switch (this.hitResult.getType()) {
+                     case ENTITY:
+                         this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
+@@ -1685,7 +_,7 @@
+                     case BLOCK:
+                         BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
+                         BlockPos blockpos = blockhitresult.getBlockPos();
+-                        if (!this.level.getBlockState(blockpos).isAir()) {
+                        if (!this.level.isEmptyBlock(blockpos)) {
+                             this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
+                             if (this.level.getBlockState(blockpos).isAir()) {
+                                 flag = true;
+@@ -1698,8 +_,10 @@
+                         }
+ 
+                         this.player.resetAttackStrengthTicker();
+                        net.minecraftforge.event.ForgeEventFactory.onLeftClickEmpty(this.player);
+                 }
+ 
+                if (inputEvent.shouldSwingHand())
+                 this.player.swing(InteractionHand.MAIN_HAND);
+                 return flag;
             }
-@@ -2904,6 +_,19 @@
+@@ -1715,6 +_,12 @@
+                 }
 
-    public void updateMaxMipLevel(int p_91313_) {
-       this.modelManager.updateMaxMipLevel(p_91313_);
-+   }
+                 for (InteractionHand interactionhand : InteractionHand.values()) {
+                    var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(1, this.options.keyUse, interactionhand);
+                    if (inputEvent.isCanceled()) {
+                       if (inputEvent.shouldSwingHand()) this.player.swing(interactionhand);
+                       return;
+                    }
 +
-+   public ItemColors getItemColors() {
-+      return this.itemColors;
-+   }
-+
-+   public SearchRegistry getSearchTreeManager() {
-+      return this.searchRegistry;
-+   }
-+
-+   private float realPartialTick;
-+   public float getPartialTick() {
-+      return this.realPartialTick;
-    }
+                     ItemStack itemstack = this.player.getItemInHand(interactionhand);
+                     if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
+                         return;
+@@ -1735,7 +_,7 @@
+                                 }
 
-    public EntityModelSet getEntityModels() {
+                                 if (interactionresult.consumesAction()) {
+-                                    if (interactionresult.shouldSwing()) {
+                                    if (interactionresult.shouldSwing() && inputEvent.shouldSwingHand()) {
+                                         this.player.swing(interactionhand);
+                                     }
+ 
+@@ -1747,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()) {
+                                         this.player.swing(interactionhand);
+                                         if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
+                                             this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
+@@ -1763,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()) {
+@@ -1793,6 +_,8 @@
+             this.rightClickDelay--;
+         }
+ 
+        net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
+
+         this.profiler.push("gui");
+         this.chatListener.tick();
+         this.gui.tick(this.pause);
+@@ -1877,6 +_,7 @@
+ 
+                 this.tutorial.tick();
+ 
+                net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
+                 try {
+                     this.level.tick(() -> true);
+                 } catch (Throwable throwable) {
+@@ -1890,6 +_,7 @@
+ 
+                     throw new ReportedException(crashreport);
+                 }
+                net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
+             }
+ 
+             this.profiler.popPush("animateTick");
+@@ -1909,6 +_,7 @@
+         this.profiler.popPush("keyboard");
+         this.keyboardHandler.tick();
+         this.profiler.pop();
+        net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
+     }
+ 
+     private boolean isMultiplayerServer() {
+@@ -2105,6 +_,7 @@
+     }
+ 
+     public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
+        if (this.level != null) net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
+         this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
+         this.level = p_91157_;
+         this.updateLevelInEngines(p_91157_);
+@@ -2142,6 +_,7 @@
+         IntegratedServer integratedserver = this.singleplayerServer;
+         this.singleplayerServer = null;
+         this.gameRenderer.resetData();
+        net.minecraftforge.client.event.ForgeEventFactoryClient.firePlayerLogout(this.gameMode, this.player);
+         this.gameMode = null;
+         this.narrator.clear();
+         this.clientLevelTeardownInProgress = true;
+@@ -2149,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");
+ 
+@@ -2161,6 +_,7 @@
+ 
+                 this.gui.onDisconnected();
+                 this.isLocalServer = false;
+                net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(this.level);
+             }
+ 
+             this.level = null;
+@@ -2307,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();
+@@ -2319,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;
+                 }
+@@ -2333,7 +_,7 @@
+                 }
+ 
+                 Entity entity = ((EntityHitResult)this.hitResult).getEntity();
+-                itemstack = entity.getPickResult();
+                itemstack = entity.getPickedResult(this.hitResult);
+                 if (itemstack == null) {
+                     return;
+                 }
+@@ -2931,6 +_,19 @@
+     @Nullable
+     public static String getLauncherBrand() {
+         return System.getProperty("minecraft.launcher.brand");
+    }
+
+    public ItemColors getItemColors() {
+       return this.itemColors;
+    }
+
+    public SearchRegistry getSearchTreeManager() {
+       return this.searchRegistry;
+    }
+
+    private float realPartialTick;
+    public float getPartialTick() {
+       return this.realPartialTick;
+     }
+ 
+     @OnlyIn(Dist.CLIENT)
@@ -1,86 +1,73 @@
 --- a/net/minecraft/client/MouseHandler.java
 +++ b/net/minecraft/client/MouseHandler.java
@@ -74,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) {
-@@ -87,11 +_,19 @@
-                if (flag) {
-                   screen.afterMouseAction();
-                   Screen.wrapScreenError(() -> {
-                     aboolean[0] = screen.mouseClicked(d0, d1, i);
-+                     aboolean[0] = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClickedPre(screen, d0, d1, i);
-+                     if (!aboolean[0]) {
-+                        aboolean[0] = this.minecraft.screen.mouseClicked(d0, d1, i);
-+                        aboolean[0] = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClickedPost(screen, d0, d1, i, aboolean[0]);
-+                     }
-                   }, "mouseClicked event handler", screen.getClass().getCanonicalName());
-                } else {
-                   Screen.wrapScreenError(() -> {
-                     aboolean[0] = screen.mouseReleased(d0, d1, i);
-+                     aboolean[0] = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleasedPre(screen, d0, d1, i);
-+                     if (!aboolean[0]) {
-+                        aboolean[0] = this.minecraft.screen.mouseReleased(d0, d1, i);
-+                        aboolean[0] = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleasedPost(screen, d0, d1, i, aboolean[0]);
-+                     }
-                   }, "mouseReleased event handler", screen.getClass().getCanonicalName());
-                }
-             }
-@@ -116,6 +_,7 @@
-             }
-          }
- 
-+         net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
-       }
-    }
- 
-@@ -129,8 +_,10 @@
-             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();
-               this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
-                this.minecraft.screen.afterMouseAction();
-+               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);
-             } else if (this.minecraft.player != null) {
-                if (this.accumulatedScrollX != 0.0D && Math.signum(d1) != Math.signum(this.accumulatedScrollX)) {
-                   this.accumulatedScrollX = 0.0D;
-@@ -151,6 +_,7 @@
-                this.accumulatedScrollX -= (double)j;
-                this.accumulatedScrollY -= (double)i;
-                int k = i == 0 ? -j : i;
-+               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);
-@@ -219,7 +_,9 @@
-                double d2 = (p_91563_ - this.xpos) * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
-                double d3 = (p_91564_ - this.ypos) * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
-                Screen.wrapScreenError(() -> {
-                  screen.mouseDragged(d0, d1, this.activeButton, d2, d3);
-+                  if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseDragPre(screen, d0, d1, this.activeButton, d2, d3)) return;
-+                  if (screen.mouseDragged(d0, d1, this.activeButton, d2, d3)) return;
-+                  net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseDragPost(screen, d0, d1, this.activeButton, d2, d3);
-                }, "mouseDragged event handler", screen.getClass().getCanonicalName());
+                 this.activeButton = -1;
             }
 
-@@ -302,6 +_,14 @@
+            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) {
+@@ -86,9 +_,9 @@
+                     Screen screen = this.minecraft.screen;
+                     if (flag) {
+                         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());
+                     } 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());
+                     }
+                 }
+             }
+@@ -111,6 +_,7 @@
+                     }
+                 }
+             }
+            net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
+         }
+     }
 
-    public double ypos() {
-       return this.ypos;
-+   }
+@@ -124,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();
+-                    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)) {
+@@ -146,6 +_,7 @@
+                     this.accumulatedScrollX -= (double)j;
+                     this.accumulatedScrollY -= (double)i;
+                     int k = i == 0 ? -j : i;
+                    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);
+@@ -216,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());
+                 }
+ 
+                 screen.afterMouseMove();
+@@ -283,6 +_,14 @@
+ 
+     public double ypos() {
+         return this.ypos;
+    }
 +
-+   public double getXVelocity() {
-+      return this.accumulatedDX;
-+   }
+    public double getXVelocity() {
+        return this.accumulatedDX;
+    }
 +
-+   public double getYVelocity() {
-+      return this.accumulatedDY;
-    }
+    public double getYVelocity() {
+        return this.accumulatedDY;
+     }
 
-    public void setIgnoreFirstMove() {
+     public void setIgnoreFirstMove() {
@@ -1,95 +1,97 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -509,7 +_,8 @@
-    }, new OptionInstance.LazyEnum<>(() -> {
-       return Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList();
-    }, (p_232011_) -> {
-      return Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_) ? Optional.empty() : Optional.of(p_232011_);
-+      // FORGE: fix incorrect string comparison - PR #8767
-+      return Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_) ? Optional.empty() : Optional.of(p_232011_);
-    }, Codec.STRING), "", (p_299350_) -> {
-       SoundManager soundmanager = Minecraft.getInstance().getSoundManager();
-       soundmanager.reload();
-@@ -841,6 +_,7 @@
-    }
+@@ -680,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_),
+             Codec.STRING
+@@ -1044,6 +_,7 @@
+     }
 
-    public Options(Minecraft p_92138_, File p_92139_) {
-+      setForgeKeybindProperties();
-       this.minecraft = p_92138_;
-       this.optionsFile = new File(p_92139_, "options.txt");
-       boolean flag = p_92138_.is64Bit();
-@@ -964,11 +_,20 @@
-       p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
-       this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
+     public Options(Minecraft p_92138_, File p_92139_) {
+        setForgeKeybindProperties();
+         this.minecraft = p_92138_;
+         this.optionsFile = new File(p_92139_, "options.txt");
+         boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
+@@ -1178,12 +_,22 @@
+         p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
+         this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
+         p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
+        processOptionsForge(p_168428_);
+    }
 
-+      processOptionsForge(p_168428_);
-+   }
-+   // FORGE: split off to allow reloading options after mod loading is done
-+   private void processOptionsForge(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() : "");
-          String s1 = p_168428_.process("key_" + keymapping.getName(), s);
-          if (!s.equals(s1)) {
-            keymapping.setKey(InputConstants.getKey(s1));
-+            if (s1.indexOf(':') != -1) {
-+               String[] pts = s1.split(":");
-+               keymapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(pts[1]), InputConstants.getKey(pts[0]));
-+            } else
-+               keymapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, InputConstants.getKey(s1));
-          }
-       }
- 
-@@ -987,6 +_,9 @@
-    }
- 
-    public void load() {
-+      this.load(false);
-+   }
-+   public void load(boolean limited) {
-       try {
-          if (!this.optionsFile.exists()) {
-             return;
-@@ -1015,7 +_,8 @@
+    // FORGE: split off to allow reloading options after mod loading is done
+    private void processOptionsForge(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() : "");
+             String s1 = p_168428_.process("key_" + keymapping.getName(), s);
+             if (!s.equals(s1)) {
+                 keymapping.setKey(InputConstants.getKey(s1));
+                if (s1.indexOf(':') != -1) {
+                    String[] pts = s1.split(":");
+                    keymapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(pts[1]), InputConstants.getKey(pts[0]));
+                } else {
+                    keymapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, InputConstants.getKey(s1));
+                }
             }
-          }
+         }
 
-         this.processOptions(new Options.FieldAccess() {
-+         java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsForge : this::processOptions;
-+         processor.accept(new Options.FieldAccess() {
-             @Nullable
-             private String getValueOrNull(String p_168459_) {
-                return compoundtag1.contains(p_168459_) ? compoundtag1.getString(p_168459_) : null;
-@@ -1188,6 +_,7 @@
-    }
+@@ -1201,6 +_,10 @@
+     }
 
-    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()));
-       }
-@@ -1246,6 +_,23 @@
-       }
- 
-       p_92146_.setSelected(set);
-+   }
+     public void load() {
+        load(false);
+    }
 +
-+   private void setForgeKeybindProperties() {
-+      net.minecraftforge.client.settings.KeyConflictContext inGame = net.minecraftforge.client.settings.KeyConflictContext.IN_GAME;
-+      keyUp.setKeyConflictContext(inGame);
-+      keyLeft.setKeyConflictContext(inGame);
-+      keyDown.setKeyConflictContext(inGame);
-+      keyRight.setKeyConflictContext(inGame);
-+      keyJump.setKeyConflictContext(inGame);
-+      keyShift.setKeyConflictContext(inGame);
-+      keySprint.setKeyConflictContext(inGame);
-+      keyAttack.setKeyConflictContext(inGame);
-+      keyChat.setKeyConflictContext(inGame);
-+      keyPlayerList.setKeyConflictContext(inGame);
-+      keyCommand.setKeyConflictContext(inGame);
-+      keyTogglePerspective.setKeyConflictContext(inGame);
-+      keySmoothCamera.setKeyConflictContext(inGame);
-    }
+    public void load(boolean limited) {
+         try {
+             if (!this.optionsFile.exists()) {
+                 return;
+@@ -1228,7 +_,8 @@
+                 }
+             }
 
-    public CameraType getCameraType() {
+-            this.processOptions(
+            java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsForge : this::processOptions;
+            processor.accept(
+                 new Options.FieldAccess() {
+                     @Nullable
+                     private String getValueOrNull(String p_168459_) {
+@@ -1422,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()));
+         }
+@@ -1544,6 +_,23 @@
+ 
+     public static Component genericValueLabel(Component p_231901_, int p_231902_) {
+         return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
+    }
+
+    private void setForgeKeybindProperties() {
+        var inGame = net.minecraftforge.client.settings.KeyConflictContext.IN_GAME;
+        keyUp.setKeyConflictContext(inGame);
+        keyLeft.setKeyConflictContext(inGame);
+        keyDown.setKeyConflictContext(inGame);
+        keyRight.setKeyConflictContext(inGame);
+        keyJump.setKeyConflictContext(inGame);
+        keyShift.setKeyConflictContext(inGame);
+        keySprint.setKeyConflictContext(inGame);
+        keyAttack.setKeyConflictContext(inGame);
+        keyChat.setKeyConflictContext(inGame);
+        keyPlayerList.setKeyConflictContext(inGame);
+        keyCommand.setKeyConflictContext(inGame);
+        keyTogglePerspective.setKeyConflictContext(inGame);
+        keySmoothCamera.setKeyConflictContext(inGame);
+     }
+ 
+     @OnlyIn(Dist.CLIENT)
@@ -6,34 +6,40 @@
 @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)),
-@@ -36,7 +_,7 @@
-    public static final List<RecipeBookCategories> BLAST_FURNACE_CATEGORIES = ImmutableList.of(BLAST_FURNACE_SEARCH, BLAST_FURNACE_BLOCKS, BLAST_FURNACE_MISC);
-    public static final List<RecipeBookCategories> FURNACE_CATEGORIES = ImmutableList.of(FURNACE_SEARCH, FURNACE_FOOD, FURNACE_BLOCKS, FURNACE_MISC);
-    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(CRAFTING_SEARCH, ImmutableList.of(CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE), FURNACE_SEARCH, ImmutableList.of(FURNACE_FOOD, FURNACE_BLOCKS, FURNACE_MISC), BLAST_FURNACE_SEARCH, ImmutableList.of(BLAST_FURNACE_BLOCKS, BLAST_FURNACE_MISC), SMOKER_SEARCH, ImmutableList.of(SMOKER_FOOD));
-+   public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = net.minecraftforge.client.RecipeBookManager.getAggregateCategories();
-    private final List<ItemStack> itemIcons;
+     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(ItemStack... p_92267_) {
-@@ -59,7 +_,7 @@
-             list = SMOKER_CATEGORIES;
-             break;
-          default:
-            throw new IncompatibleClassChangeError();
-+            return net.minecraftforge.client.RecipeBookManager.getCustomCategoriesOrEmpty(p_92270_);
-       }
+     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_);
+         };
+     }
 
-       return list;
-@@ -67,5 +_,9 @@
- 
-    public List<ItemStack> getIconItems() {
-       return this.itemIcons;
-+   }
+     public List<ItemStack> getIconItems() {
+         return this.itemIcons;
+    }
 +
-+   public static RecipeBookCategories create(String name, ItemStack... icons) {
-+      throw new IllegalStateException("Enum not extended");
-    }
+    public static RecipeBookCategories create(String name, ItemStack... icons) {
+        throw new IllegalStateException("Enum not extended");
+     }
 }
@@ -1,29 +1,30 @@
 --- a/net/minecraft/client/Screenshot.java
 +++ b/net/minecraft/client/Screenshot.java
-@@ -56,13 +_,23 @@
-          file2 = new File(file1, p_92307_);
-       }
+@@ -54,14 +_,24 @@
+             file2 = new File(file1, p_92307_);
+         }
 
-+      net.minecraftforge.client.event.ScreenshotEvent event = net.minecraftforge.client.ForgeHooksClient.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(nativeimage, file2);
+        if (event.isCanceled()) {
+           p_92311_.accept(event.getCancelMessage());
+           return;
+        }
+        final File target = event.getScreenshotFile();
 +
-       Util.ioPool().execute(() -> {
-          try {
-            nativeimage.writeToFile(file2);
-+            nativeimage.writeToFile(target);
-             Component component = Component.literal(file2.getName()).withStyle(ChatFormatting.UNDERLINE).withStyle((p_168608_) -> {
-               return p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file2.getAbsolutePath()));
-+               return p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, target.getAbsolutePath()));
-             });
-            p_92311_.accept(Component.translatable("screenshot.success", component));
-+            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);
-             p_92311_.accept(Component.translatable("screenshot.failure", exception.getMessage()));
+         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);
@@ -1,19 +1,21 @@
 --- a/net/minecraft/client/ToggleKeyMapping.java
 +++ b/net/minecraft/client/ToggleKeyMapping.java
-@@ -16,7 +_,7 @@
+@@ -17,7 +_,7 @@
+     @Override
+     public void setDown(boolean p_92534_) {
+         if (this.needsToggle.getAsBoolean()) {
+-            if (p_92534_) {
+            if (p_92534_ && isConflictContextAndModifierActive()) {
+                 super.setDown(!this.isDown());
+             }
+         } else {
+@@ -27,5 +_,9 @@
 
-    public void setDown(boolean p_92534_) {
-       if (this.needsToggle.getAsBoolean()) {
-         if (p_92534_) {
-+         if (p_92534_ && isConflictContextAndModifierActive()) {
-             super.setDown(!this.isDown());
-          }
-       } else {
-@@ -24,6 +_,7 @@
-       }
- 
-    }
-+   @Override public boolean isDown() { return this.isDown && (isConflictContextAndModifierActive() || needsToggle.getAsBoolean()); }
- 
-    protected void reset() {
-       super.setDown(false);
+     protected void reset() {
+         super.setDown(false);
+    }
+
+    @Override public boolean isDown() {
+        return this.isDown && (isConflictContextAndModifierActive() || needsToggle.getAsBoolean());
+     }
+ }
@@ -1,44 +1,44 @@
 --- a/net/minecraft/client/color/block/BlockColors.java
 +++ b/net/minecraft/client/color/block/BlockColors.java
-@@ -28,7 +_,8 @@
+@@ -29,7 +_,8 @@
 @OnlyIn(Dist.CLIENT)
 public class BlockColors {
-    private static final int DEFAULT = -1;
-   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<>();
-    private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
+     private static final int DEFAULT = -1;
+-    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() {
-@@ -80,11 +_,12 @@
-       blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> {
-          return p_92597_ != null && p_92598_ != null ? 2129968 : 7455580;
-       }, Blocks.LILY_PAD);
-+      net.minecraftforge.client.ForgeHooksClient.onBlockColorsInit(blockcolors);
-       return blockcolors;
-    }
+     public static BlockColors createDefault() {
+@@ -91,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);
+        net.minecraftforge.client.ForgeHooksClient.onBlockColorsInit(blockcolors);
+         return blockcolors;
+     }
 
-    public int getColor(BlockState p_92583_, Level p_92584_, BlockPos p_92585_) {
-      BlockColor blockcolor = this.blockColors.byId(BuiltInRegistries.BLOCK.getId(p_92583_.getBlock()));
-+      BlockColor blockcolor = this.blockColors.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92583_.getBlock()));
-       if (blockcolor != null) {
-          return blockcolor.getColor(p_92583_, (BlockAndTintGetter)null, (BlockPos)null, 0);
-       } else {
-@@ -94,13 +_,15 @@
-    }
+     public int getColor(BlockState p_92583_, Level p_92584_, BlockPos p_92585_) {
+-        BlockColor blockcolor = this.blockColors.byId(BuiltInRegistries.BLOCK.getId(p_92583_.getBlock()));
+        BlockColor blockcolor = this.blockColors.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92583_.getBlock()));
+         if (blockcolor != null) {
+             return blockcolor.getColor(p_92583_, null, null, 0);
+         } else {
+@@ -105,13 +_,15 @@
+     }
 
-    public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
-      BlockColor blockcolor = this.blockColors.byId(BuiltInRegistries.BLOCK.getId(p_92578_.getBlock()));
-+      BlockColor blockcolor = this.blockColors.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92578_.getBlock()));
-       return blockcolor == null ? -1 : blockcolor.getColor(p_92578_, p_92579_, p_92580_, p_92581_);
-    }
+     public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
+-        BlockColor blockcolor = this.blockColors.byId(BuiltInRegistries.BLOCK.getId(p_92578_.getBlock()));
+        BlockColor blockcolor = this.blockColors.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92578_.getBlock()));
+         return blockcolor == null ? -1 : blockcolor.getColor(p_92578_, p_92579_, p_92580_, p_92581_);
+     }
 
-+   /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Block} */
-+   @Deprecated
-    public void register(BlockColor p_92590_, Block... p_92591_) {
-       for(Block block : p_92591_) {
-         this.blockColors.addMapping(p_92590_, BuiltInRegistries.BLOCK.getId(block));
-+         this.blockColors.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), p_92590_);
-       }
+    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Block} */
+    @Deprecated
+     public void register(BlockColor p_92590_, Block... p_92591_) {
+         for (Block block : p_92591_) {
+-            this.blockColors.addMapping(p_92590_, BuiltInRegistries.BLOCK.getId(block));
+            this.blockColors.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), p_92590_);
+         }
+     }
 
-    }
@@ -1,35 +1,35 @@
 --- a/net/minecraft/client/color/item/ItemColors.java
 +++ b/net/minecraft/client/color/item/ItemColors.java
-@@ -25,7 +_,8 @@
+@@ -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<>();
+     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();
-@@ -88,17 +_,20 @@
-       itemcolors.register((p_232352_, p_232353_) -> {
-          return p_232353_ == 0 ? -1 : MapItem.getColor(p_232352_);
-       }, Items.FILLED_MAP);
-+      net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
-       return itemcolors;
-    }
+     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_);
-    }
+     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_);
-       }
- 
-    }
+    /** @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_);
+         }
+     }
+ }
@@ -6,15 +6,15 @@
 @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;
-@@ -202,6 +_,8 @@
-    public StringSplitter getSplitter() {
-       return this.splitter;
-    }
+     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; }
+    @Override public Font self() { return this; }
 
-    @OnlyIn(Dist.CLIENT)
-    public static enum DisplayMode {
+     @OnlyIn(Dist.CLIENT)
+     public static enum DisplayMode {
@@ -1,77 +1,126 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
@@ -131,7 +_,7 @@
-    public float vignetteBrightness = 1.0F;
-    protected int toolHighlightTimer;
-    protected ItemStack lastToolHighlight = ItemStack.EMPTY;
-   protected final DebugScreenOverlay debugOverlay;
-+   protected DebugScreenOverlay debugOverlay;
-    protected final SubtitleOverlay subtitleOverlay;
-    protected final SpectatorGui spectatorGui;
-    protected final PlayerTabOverlay tabList;
-@@ -454,6 +_,8 @@
+     public float vignetteBrightness = 1.0F;
+     private int toolHighlightTimer;
+     private ItemStack lastToolHighlight = ItemStack.EMPTY;
+-    private final DebugScreenOverlay debugOverlay;
+    protected DebugScreenOverlay debugOverlay;
+     private final SubtitleOverlay subtitleOverlay;
+     private final SpectatorGui spectatorGui;
+     private final PlayerTabOverlay tabList;
+@@ -150,7 +_,7 @@
+     private long healthBlinkTime;
+     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;
 
-          for(MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
-             MobEffect mobeffect = mobeffectinstance.getEffect();
-+            var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
-+            if (!renderer.isVisibleInGui(mobeffectinstance)) continue;
-             if (mobeffectinstance.showIcon()) {
-                int i = this.screenWidth;
-                int j = 1;
-@@ -482,6 +_,7 @@
-                   }
-                }
+     public Gui(Minecraft p_330021_) {
+@@ -162,16 +_,16 @@
+         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_325314_) -> this.bossOverlay.render(p_325313_));
+-        LayeredDraw layereddraw1 = new LayeredDraw()
+            .add((p_325313_, p_342678_) -> this.bossOverlay.render(p_325313_));
+        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_325316_) -> {
+            .add((p_325315_, p_344521_) -> {
+                 if (this.debugOverlay.showDebugScreen()) {
+                     this.debugOverlay.render(p_325315_);
+                 }
+@@ -181,11 +_,12 @@
+             .add(this::renderTitle)
+             .add(this::renderChat)
+             .add(this::renderTabList)
+-            .add((p_325317_, p_325318_) -> this.subtitleOverlay.render(p_325317_));
+            .add((p_325317_, p_342874_) -> this.subtitleOverlay.render(p_325317_));
+         this.layers
+             .add(layereddraw, () -> !p_330021_.options.hideGui)
+             .add(this::renderSleepOverlay)
+             .add(layereddraw1, () -> !p_330021_.options.hideGui);
+        ((net.minecraftforge.client.gui.overlay.ForgeLayeredDraw) layers).resolveLayers();
+     }
 
-+               if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, i, j, 0, f)) continue;
-                TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(mobeffect);
-                int i1 = j;
-                float f1 = f;
-@@ -602,16 +_,21 @@
-    }
+     public void resetTitleTimes() {
+@@ -320,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());
+-            this.chat.render(p_329202_, this.tickCount, i, j, false);
+            net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
+         }
+     }
 
-    public void renderSelectedItemName(GuiGraphics p_283501_) {
-+      renderSelectedItemName(p_283501_, 0);
-+   }
+@@ -444,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;
+@@ -473,6 +_,7 @@
+                         }
+                     }
+ 
+                    if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, i, j, 0, f)) continue;
+                     TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
+                     int l1 = i;
+                     int i1 = j;
+@@ -635,6 +_,10 @@
+     }
+ 
+     private void renderSelectedItemName(GuiGraphics p_283501_) {
+        renderSelectedItemName(p_283501_, 0);
+    }
 +
-+   public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
-       this.minecraft.getProfiler().push("selectedItemName");
-       if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
-         MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color);
-+         MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().getStyleModifier());
-          if (this.lastToolHighlight.hasCustomHoverName()) {
-             mutablecomponent.withStyle(ChatFormatting.ITALIC);
-          }
- 
-         int i = this.getFont().width(mutablecomponent);
-+         Component highlightTip = this.lastToolHighlight.getHighlightTip(mutablecomponent);
-+         int i = this.getFont().width(highlightTip);
-          int j = (this.screenWidth - i) / 2;
-         int k = this.screenHeight - 59;
-+         int k = this.screenHeight - Math.max(yShift, 59);
-          if (!this.minecraft.gameMode.canHurtPlayer()) {
-             k += 14;
-          }
-@@ -623,7 +_,13 @@
- 
-          if (l > 0) {
-             p_283501_.fill(j - 2, k - 2, j + i + 2, k + 9 + 2, this.minecraft.options.getBackgroundColor(0));
-            p_283501_.drawString(this.getFont(), mutablecomponent, j, k, 16777215 + (l << 24));
-+            Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(lastToolHighlight).getFont(lastToolHighlight, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME);
-+            if (font == null) {
-+               p_283501_.drawString(this.getFont(), highlightTip, j, k, 16777215 + (l << 24));
-+            } else {
-+               j = (this.screenWidth - font.width(highlightTip)) / 2;
-+               p_283501_.drawString(font, highlightTip, j, k, 16777215 + (l << 24));
-+            }
-          }
-       }
- 
-@@ -1080,7 +_,7 @@
-          ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
-          if (itemstack.isEmpty()) {
-             this.toolHighlightTimer = 0;
-         } else if (!this.lastToolHighlight.isEmpty() && itemstack.is(this.lastToolHighlight.getItem()) && itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
-+         } else if (!this.lastToolHighlight.isEmpty() && itemstack.getItem() == this.lastToolHighlight.getItem() && (itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName()) && itemstack.getHighlightTip(itemstack.getHoverName()).equals(lastToolHighlight.getHighlightTip(lastToolHighlight.getHoverName())))) {
-             if (this.toolHighlightTimer > 0) {
-                --this.toolHighlightTimer;
+    public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
+         this.minecraft.getProfiler().push("selectedItemName");
+         if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
+             MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
+@@ -642,9 +_,13 @@
+                 mutablecomponent.withStyle(ChatFormatting.ITALIC);
             }
+ 
+-            int i = this.getFont().width(mutablecomponent);
+            Component highlightTip = this.lastToolHighlight.getHighlightTip(mutablecomponent);
+            Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(lastToolHighlight).getFont(lastToolHighlight, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME);
+            if (font == null)
+                font = this.getFont();
+            int i = font.width(highlightTip);
+             int j = (p_283501_.guiWidth() - i) / 2;
+-            int k = p_283501_.guiHeight() - 59;
+            int k = p_283501_.guiHeight() - Math.max(yShift, 59);
+             if (!this.minecraft.gameMode.canHurtPlayer()) {
+                 k += 14;
+             }
+@@ -656,7 +_,7 @@
+ 
+             if (l > 0) {
+                 p_283501_.fill(j - 2, k - 2, j + i + 2, k + 9 + 2, this.minecraft.options.getBackgroundColor(0));
+-                p_283501_.drawString(this.getFont(), mutablecomponent, j, k, 16777215 + (l << 24));
+                p_283501_.drawString(font, highlightTip, j, k, 16777215 + (l << 24));
+             }
+         }
+ 
+@@ -1155,7 +_,7 @@
+             ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
+             if (itemstack.isEmpty()) {
+                 this.toolHighlightTimer = 0;
+-            } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
+            } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName()) || !itemstack.getHighlightTip(itemstack.getHoverName()).equals(lastToolHighlight.getHighlightTip(lastToolHighlight.getHoverName()))) {
+                 this.toolHighlightTimer = (int)(40.0 * this.minecraft.options.notificationDisplayTime().get());
+             } else if (this.toolHighlightTimer > 0) {
+                 this.toolHighlightTimer--;
@@ -1,140 +1,145 @@
 --- a/net/minecraft/client/gui/GuiGraphics.java
 +++ b/net/minecraft/client/gui/GuiGraphics.java
-@@ -55,7 +_,7 @@
+@@ -56,7 +_,7 @@
 import org.joml.Vector2ic;
 
 @OnlyIn(Dist.CLIENT)
 -public class GuiGraphics {
 +public class GuiGraphics implements net.minecraftforge.client.extensions.IForgeGuiGraphics {
-    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;
-@@ -271,6 +_,11 @@
-    }
+     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;
+@@ -280,6 +_,11 @@
+     }
 
-    public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
-+      return this.drawString(p_283343_, p_281896_, (float)p_283569_, (float)p_283418_, p_281560_, p_282130_);
-+   }
+     public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
+        return this.drawString(p_283343_, p_281896_, (float)p_283569_, (float)p_283418_, p_281560_, p_282130_);
+    }
 +
-+   // 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 {
-@@ -285,6 +_,11 @@
-    }
+    // 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 {
+@@ -306,6 +_,11 @@
+     }
 
-    public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
-+      return this.drawString(p_282636_, p_281596_, (float)p_281586_, (float)p_282816_, p_281743_, p_282394_);
-+   }
+     public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
+        return this.drawString(p_282636_, p_281596_, (float)p_281586_, (float)p_282816_, p_281743_, p_282394_);
+    }
 +
-+   // 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_, (float)p_282816_, p_281743_, p_282394_, this.pose.last().pose(), this.bufferSource, Font.DisplayMode.NORMAL, 0, 15728880);
-       this.flushIfUnmanaged();
-       return i;
-@@ -515,6 +_,7 @@
-             crashreportcategory.setDetail("Item Type", () -> {
-                return String.valueOf((Object)p_281675_.getItem());
-             });
-+            crashreportcategory.setDetail("Registry Name", () -> String.valueOf(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(p_281675_.getItem())));
-             crashreportcategory.setDetail("Item Damage", () -> {
-                return String.valueOf(p_281675_.getDamageValue());
-             });
-@@ -562,18 +_,26 @@
-          }
- 
-          this.pose.popPose();
-+         net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
-       }
-    }
-+
-+   private ItemStack tooltipStack = ItemStack.EMPTY;
- 
-    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.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.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(Collectors.toList());
-      p_281682_.ifPresent((p_282969_) -> {
-         list.add(1, ClientTooltipComponent.create(p_282969_));
-      });
-+      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);
-    }
- 
-@@ -582,7 +_,15 @@
-    }
- 
-    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_);
-+      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);
-+   }
-+
-+   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.tooltipStack = ItemStack.EMPTY;
-    }
- 
-    public void renderTooltip(Font p_282192_, List<? extends FormattedCharSequence> p_282297_, int p_281680_, int p_283325_) {
-@@ -595,11 +_,13 @@
- 
-    private void renderTooltipInternal(Font p_282675_, List<ClientTooltipComponent> p_282615_, int p_283230_, int p_283417_, ClientTooltipPositioner p_282442_) {
-       if (!p_282615_.isEmpty()) {
-+         net.minecraftforge.client.event.RenderTooltipEvent.Pre 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;
-          int i = 0;
-          int j = p_282615_.size() == 1 ? -2 : 0;
- 
-          for(ClientTooltipComponent clienttooltipcomponent : p_282615_) {
-            int k = clienttooltipcomponent.getWidth(p_282675_);
-+            int k = clienttooltipcomponent.getWidth(preEvent.getFont());
-             if (k > i) {
-                i = k;
+    // 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_,
+@@ -872,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()));
+                crashreportcategory.setDetail("Registry Name", () -> String.valueOf(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(p_281675_.getItem())));
+                 crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
+                 crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
+                 throw new ReportedException(crashreport);
+@@ -912,16 +_,26 @@
             }
-@@ -609,20 +_,21 @@
 
-          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(), 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);
-+            net.minecraftforge.client.event.RenderTooltipEvent.Color 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());
-          });
-          this.pose.translate(0.0F, 0.0F, 400.0F);
-          int k1 = i1;
+             this.pose.popPose();
+            net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
+         }
+     }
+
+    private ItemStack tooltipStack = ItemStack.EMPTY;
 
-          for(int l1 = 0; l1 < p_282615_.size(); ++l1) {
-             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);
-          }
+     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.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.tooltipStack = ItemStack.EMPTY;
+     }
 
-@@ -630,7 +_,7 @@
+     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);
+     }
 
-          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);
-          }
+@@ -930,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_);
+        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);
+    }
+
+    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.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.tooltipStack = ItemStack.EMPTY;
+     }
+ 
+     public void renderTooltip(Font p_282192_, List<? extends FormattedCharSequence> p_282297_, int p_281680_, int p_283325_) {
+@@ -949,11 +_,13 @@
+ 
+     private void renderTooltipInternal(Font p_282675_, List<ClientTooltipComponent> p_282615_, int p_283230_, int p_283417_, ClientTooltipPositioner p_282442_) {
+         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;
+             int i = 0;
+             int j = p_282615_.size() == 1 ? -2 : 0;
+ 
+             for (ClientTooltipComponent clienttooltipcomponent : p_282615_) {
+-                int k = clienttooltipcomponent.getWidth(p_282675_);
+                int k = clienttooltipcomponent.getWidth(preEvent.getFont());
+                 if (k > i) {
+                     i = k;
+                 }
+@@ -963,18 +_,21 @@
+ 
+             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(), 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());
+            });
+             this.pose.translate(0.0F, 0.0F, 400.0F);
+             int k1 = i1;
+ 
+             for (int l1 = 0; l1 < p_282615_.size(); l1++) {
+                 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);
+             }
+ 
+@@ -982,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);
+             }
 
@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/gui/components/AbstractButton.java
 +++ b/net/minecraft/client/gui/components/AbstractButton.java
-@@ -29,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);
-      int i = this.active ? 16777215 : 10526880;
-+      int i = getFGColor();
-       this.renderString(p_281670_, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24);
-    }
+@@ -32,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);
+-        int i = this.active ? 16777215 : 10526880;
+        int i = getFGColor();
+         this.renderString(p_281670_, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24);
+     }
 
@@ -1,22 +1,28 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -233,6 +_,19 @@
-       this.focused = p_93693_;
-    }
+@@ -255,6 +_,25 @@
+         this.focused = p_93693_;
+     }
 
-+   public static final int UNSET_FG_COLOR = -1;
-+   protected int packedFGColor = UNSET_FG_COLOR;
-+   public int getFGColor() {
-+      if (packedFGColor != UNSET_FG_COLOR) return packedFGColor;
-+      return this.active ? 16777215 : 10526880; // White : Light Grey
-+   }
-+   public void setFGColor(int color) {
-+      this.packedFGColor = color;
-+   }
-+   public void clearFGColor() {
-+      this.packedFGColor = UNSET_FG_COLOR;
-+   }
+    // Forge start
+    public static final int UNSET_FG_COLOR = -1;
 +
-    public NarratableEntry.NarrationPriority narrationPriority() {
-       if (this.isFocused()) {
-          return NarratableEntry.NarrationPriority.FOCUSED;
+    protected int packedFGColor = UNSET_FG_COLOR;
+
+    public int getFGColor() {
+        if (packedFGColor != UNSET_FG_COLOR) return packedFGColor;
+        return this.active ? 16777215 : 10526880; // White : Light Grey
+    }
+
+    public void setFGColor(int color) {
+        this.packedFGColor = color;
+    }
+
+    public void clearFGColor() {
+        this.packedFGColor = UNSET_FG_COLOR;
+    }
+    // Forge end
+
+     @Override
+     public NarratableEntry.NarrationPriority narrationPriority() {
+         if (this.isFocused()) {
@@ -1,20 +1,20 @@
 --- a/net/minecraft/client/gui/components/BossHealthOverlay.java
 +++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
-@@ -36,13 +_,16 @@
+@@ -63,13 +_,16 @@
 
-          for(LerpingBossEvent lerpingbossevent : this.events.values()) {
-             int k = i / 2 - 91;
-+            var event = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(p_283175_, this.minecraft.getWindow(), lerpingbossevent, k, j, 10 + this.minecraft.font.lineHeight);
-+            if (!event.isCanceled()) {
-             this.drawBar(p_283175_, k, j, lerpingbossevent);
-             Component component = lerpingbossevent.getName();
-             int l = this.minecraft.font.width(component);
-             int i1 = i / 2 - l / 2;
-             int j1 = j - 9;
-             p_283175_.drawString(this.minecraft.font, component, i1, j1, 16777215);
-            j += 10 + 9;
-+            }
-+            j += event.getIncrement();
-             if (j >= p_283175_.guiHeight() / 3) {
-                break;
-             }
+             for (LerpingBossEvent lerpingbossevent : this.events.values()) {
+                 int k = i / 2 - 91;
+                var event = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(p_283175_, this.minecraft.getWindow(), lerpingbossevent, k, j, 10 + this.minecraft.font.lineHeight);
+                if (!event.isCanceled()) {
+                 this.drawBar(p_283175_, k, j, lerpingbossevent);
+                 Component component = lerpingbossevent.getName();
+                 int l = this.minecraft.font.width(component);
+                 int i1 = i / 2 - l / 2;
+                 int j1 = j - 9;
+                 p_283175_.drawString(this.minecraft.font, component, i1, j1, 16777215);
+-                j += 10 + 9;
+                }
+                j += event.getIncrement();
+                 if (j >= p_283175_.guiHeight() / 3) {
+                     break;
+                 }
@@ -1,29 +1,31 @@
 --- a/net/minecraft/client/gui/components/Button.java
 +++ b/net/minecraft/client/gui/components/Button.java
-@@ -30,6 +_,11 @@
-       this.createNarration = p_259552_;
-    }
+@@ -31,6 +_,12 @@
+         this.createNarration = p_259552_;
+     }
 
-+   protected Button(Builder builder) {
-+      this(builder.x, builder.y, builder.width, builder.height, builder.message, builder.onPress, builder.createNarration);
-+      setTooltip(builder.tooltip); // Forge: Make use of the Builder tooltip
-+   }
+    // Forge (GH-9238)
+    protected Button(Builder builder) {
+        this(builder.x, builder.y, builder.width, builder.height, builder.message, builder.onPress, builder.createNarration);
+        this.setTooltip(builder.tooltip);
+    }
 +
-    public void onPress() {
-       this.onPress.onPress(this);
-    }
-@@ -93,9 +_,11 @@
-       }
+     @Override
+     public void onPress() {
+         this.onPress.onPress(this);
+@@ -95,9 +_,12 @@
+         }
 
-       public Button build() {
-         Button button = new Button(this.x, this.y, this.width, this.height, this.message, this.onPress, this.createNarration);
-         button.setTooltip(this.tooltip);
-         return button;
-+         return build(Button::new);
-+      }
+         public Button build() {
+-            Button button = new Button(this.x, this.y, this.width, this.height, this.message, this.onPress, this.createNarration);
+-            button.setTooltip(this.tooltip);
+-            return button;
+            return build(Button::new);
+        }
 +
-+      public Button build(java.util.function.Function<Builder, Button> builder) {
-+         return builder.apply(this);
-       }
-    }
+        // Forge (GH-9238)
+        public Button build(java.util.function.Function<Builder, Button> builder) {
+            return builder.apply(this);
+         }
+     }
 
@@ -1,92 +1,99 @@
 --- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
 +++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
-@@ -95,9 +_,9 @@
-    @Nullable
-    private CompletableFuture<LevelChunk> serverChunk;
-    private boolean renderDebug;
-   private boolean renderProfilerChart;
-   private boolean renderFpsCharts;
-   private boolean renderNetworkCharts;
-+   protected boolean renderProfilerChart;
-+   protected boolean renderFpsCharts;
-+   protected boolean renderNetworkCharts;
-    private final SampleLogger frameTimeLogger = new SampleLogger();
-    private final SampleLogger tickTimeLogger = new SampleLogger();
-    private final SampleLogger pingLogger = new SampleLogger();
-@@ -124,14 +_,18 @@
-       this.clientChunk = null;
-    }
+@@ -101,9 +_,9 @@
+     @Nullable
+     private CompletableFuture<LevelChunk> serverChunk;
+     private boolean renderDebug;
+-    private boolean renderProfilerChart;
+-    private boolean renderFpsCharts;
+-    private boolean renderNetworkCharts;
+    protected boolean renderProfilerChart;
+    protected boolean renderFpsCharts;
+    protected boolean renderNetworkCharts;
+     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 @@
+         this.clientChunk = null;
+     }
 
-   public void render(GuiGraphics p_281427_) {
-      this.minecraft.getProfiler().push("debug");
-+   protected void update() {
-       Entity entity = this.minecraft.getCameraEntity();
-       this.block = entity.pick(20.0D, 0.0F, false);
-       this.liquid = entity.pick(20.0D, 0.0F, true);
-      p_281427_.drawManaged(() -> {
-         this.drawGameInformation(p_281427_);
-         this.drawSystemInformation(p_281427_);
-+   }
+-    public void render(GuiGraphics p_281427_) {
+-        this.minecraft.getProfiler().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(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;
-@@ -141,7 +_,9 @@
-                this.tpsChart.drawChart(p_281427_, i - k, k);
+    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 drawNetworkCharts(GuiGraphics p_281427_) {
-          if (this.renderNetworkCharts) {
-             int l = p_281427_.guiWidth();
-             int i1 = l / 2;
-@@ -152,17 +_,32 @@
-             int j1 = this.pingChart.getWidth(i1);
-             this.pingChart.drawChart(p_281427_, l - j1, j1);
-          }
-+   }
+    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);
+             }
+    }
 +
-+   public void render(GuiGraphics p_281427_) {
-+      this.minecraft.getProfiler().push("debug");
-+      this.update();
-+      p_281427_.drawManaged(() -> {
-+         this.drawText(p_281427_);
-+         this.drawFPSCharts(p_281427_);
-+         this.drawNetworkCharts(p_281427_);
+    public void render(GuiGraphics p_281427_) {
+        this.minecraft.getProfiler().push("debug");
+        this.update();
+        p_281427_.drawManaged(() -> {
+           this.drawText(p_281427_);
+           this.drawFPSCharts(p_281427_);
+           this.drawNetworkCharts(p_281427_);
+         });
+         this.minecraft.getProfiler().pop();
+     }
 
-       });
-       this.minecraft.getProfiler().pop();
-    }
- 
-   protected void drawGameInformation(GuiGraphics p_281525_) {
-      List<String> list = this.getGameInformation();
-+   protected List<String> getOverlayHelp() {
-+      List<String> list = Lists.newArrayList();
-       list.add("");
-       boolean flag = this.minecraft.getSingleplayerServer() != null;
-       list.add("Debug charts: [F3+1] Profiler " + (this.renderProfilerChart ? "visible" : "hidden") + "; [F3+2] " + (flag ? "FPS + TPS " : "FPS ") + (this.renderFpsCharts ? "visible" : "hidden") + "; [F3+3] " + (!this.minecraft.isLocalServer() ? "Bandwidth + Ping" : "Ping") + (this.renderNetworkCharts ? " visible" : " hidden"));
-       list.add("For help: press F3 + Q");
-+      return list;
-+   }
-+
+-    protected void drawGameInformation(GuiGraphics p_281525_) {
+-        List<String> list = this.getGameInformation();
+    protected List<String> getOverlayHelp() {
+        List<String> list = Lists.newArrayList();
+         list.add("");
+         boolean flag = this.minecraft.getSingleplayerServer() != null;
+         list.add(
+@@ -176,11 +_,18 @@
+                 + (this.renderNetworkCharts ? " visible" : " hidden")
+         );
+         list.add("For help: press F3 + Q");
+-        this.renderLines(p_281525_, list, true);
+        return list;
+    }
 +   protected void drawGameInformation(GuiGraphics p_281525_) {
 +      List<String> list = this.getGameInformation();
 +      list.addAll(this.getOverlayHelp());
-       this.renderLines(p_281525_, list, true);
-    }
+      net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281525_, minecraft.getWindow(), minecraft.getFrameTime(), list, true);
+      this.renderLines(p_281525_, list, true);
+     }
 
-@@ -451,6 +_,7 @@
-             list.add("");
-             list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
-             list.add(String.valueOf((Object)BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
-+            entity.getType().builtInRegistryHolder().tags().forEach(t -> list.add("#" + t.location()));
-          }
+     protected void drawSystemInformation(GuiGraphics p_281261_) {
+         List<String> list = this.getSystemInformation();
+        net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281261_, minecraft.getWindow(), minecraft.getFrameTime(), list, false);
+         this.renderLines(p_281261_, list, false);
+     }
 
-          return list;
+@@ -529,6 +_,7 @@
+                 list.add("");
+                 list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
+                 list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
+                entity.getType().builtInRegistryHolder().tags().forEach(t -> list.add("#" + t.location()));
+             }
+ 
+             return list;
@@ -1,10 +1,10 @@
 --- a/net/minecraft/client/gui/components/toasts/ToastComponent.java
 +++ b/net/minecraft/client/gui/components/toasts/ToastComponent.java
-@@ -101,6 +_,7 @@
-    }
+@@ -97,6 +_,7 @@
+     }
 
-    public void addToast(Toast p_94923_) {
-+      if (net.minecraftforge.client.ForgeHooksClient.onToastAdd(p_94923_)) return;
-       this.queued.add(p_94923_);
-    }
+     public void addToast(Toast p_94923_) {
+        if (net.minecraftforge.client.ForgeHooksClient.onToastAdd(p_94923_)) return;
+         this.queued.add(p_94923_);
+     }
 
@@ -1,11 +1,10 @@
 --- a/net/minecraft/client/gui/screens/ChatScreen.java
 +++ b/net/minecraft/client/gui/screens/ChatScreen.java
-@@ -225,7 +_,7 @@
-             this.minecraft.player.connection.sendChat(p_242400_);
-          }
- 
-         return true;
-+         return minecraft.screen == this; // FORGE: Prevent closing the screen if another screen has been opened.
-       }
-    }
- 
+@@ -89,6 +_,7 @@
+             return true;
+         } else if (p_95591_ == 257 || p_95591_ == 335) {
+             this.handleChatInput(this.input.getValue(), true);
+            if (this.minecraft.screen == this) // FORGE: Prevent closing the screen if another screen has been opened.
+             this.minecraft.setScreen(null);
+             return true;
+         } else if (p_95591_ == 265) {
@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/gui/screens/ConnectScreen.java
 +++ b/net/minecraft/client/gui/screens/ConnectScreen.java
-@@ -85,6 +_,8 @@
-                }
+@@ -102,6 +_,8 @@
+                     }
 
-                if (optional.isEmpty()) {
-+                  ConnectScreen.LOGGER.error("Couldn't connect to server: Unknown host \"{}\"", p_249536_.getHost());
-+                  net.minecraftforge.network.DualStackUtils.logInitialPreferences();
-                   p_251955_.execute(() -> {
-                      p_251955_.setScreen(new DisconnectedScreen(ConnectScreen.this.parent, ConnectScreen.this.connectFailedTitle, ConnectScreen.UNKNOWN_HOST_MESSAGE));
-                   });
+                     if (optional.isEmpty()) {
+                        ConnectScreen.LOGGER.error("Couldn't connect to server: Unknown host \"{}\"", p_249536_.getHost());
+                        net.minecraftforge.network.DualStackUtils.logInitialPreferences();
+                         p_251955_.execute(
+                             () -> p_251955_.setScreen(new DisconnectedScreen(ConnectScreen.this.parent, ConnectScreen.this.connectFailedTitle, ConnectScreen.UNKNOWN_HOST_MESSAGE))
+                         );
@@ -1,18 +1,18 @@
 --- a/net/minecraft/client/gui/screens/LoadingOverlay.java
 +++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
-@@ -132,6 +_,7 @@
-       }
+@@ -131,6 +_,7 @@
+         }
 
-       if (this.fadeOutStart == -1L && this.reload.isDone() && (!this.fadeIn || f1 >= 2.0F)) {
-+         this.fadeOutStart = Util.getMillis(); // Moved up to guard against inf loops caused by callback
-          try {
-             this.reload.checkExceptions();
-             this.onFinish.accept(Optional.empty());
-@@ -139,7 +_,6 @@
-             this.onFinish.accept(Optional.of(throwable));
-          }
+         if (this.fadeOutStart == -1L && this.reload.isDone() && (!this.fadeIn || f1 >= 2.0F)) {
+            this.fadeOutStart = Util.getMillis(); // Forge: Moved up to guard against inf loops caused by callback
+             try {
+                 this.reload.checkExceptions();
+                 this.onFinish.accept(Optional.empty());
+@@ -138,7 +_,6 @@
+                 this.onFinish.accept(Optional.of(throwable));
+             }
 
-         this.fadeOutStart = Util.getMillis();
-          if (this.minecraft.screen != null) {
-             this.minecraft.screen.init(this.minecraft, p_281839_.guiWidth(), p_281839_.guiHeight());
-          }
+-            this.fadeOutStart = Util.getMillis();
+             if (this.minecraft.screen != null) {
+                 this.minecraft.screen.init(this.minecraft, p_281839_.guiWidth(), p_281839_.guiHeight());
+             }
@@ -1,25 +1,20 @@
 --- a/net/minecraft/client/gui/screens/MenuScreens.java
 +++ b/net/minecraft/client/gui/screens/MenuScreens.java
-@@ -41,6 +_,10 @@
-    private static final Map<MenuType<?>, MenuScreens.ScreenConstructor<?, ?>> SCREENS = Maps.newHashMap();
+@@ -41,11 +_,16 @@
+     private static final Map<MenuType<?>, MenuScreens.ScreenConstructor<?, ?>> SCREENS = Maps.newHashMap();
 
-    public static <T extends AbstractContainerMenu> void create(@Nullable MenuType<T> p_96202_, Minecraft p_96203_, int p_96204_, Component p_96205_) {
-+      getScreenFactory(p_96202_, p_96203_, p_96204_, p_96205_).ifPresent(f -> f.fromPacket(p_96205_, p_96202_, p_96203_, p_96204_));
-+   }
+     public static <T extends AbstractContainerMenu> void create(MenuType<T> p_96202_, Minecraft p_96203_, int p_96204_, Component p_96205_) {
+        getScreenFactory(p_96202_, p_96203_, p_96204_, p_96205_).ifPresent(f -> f.fromPacket(p_96205_, p_96202_, p_96203_, p_96204_));
+    }
 +
-+   public static <T extends AbstractContainerMenu> java.util.Optional<ScreenConstructor<T, ?>> getScreenFactory(@Nullable MenuType<T> p_96202_, Minecraft p_96203_, int p_96204_, Component p_96205_) {
-       if (p_96202_ == null) {
-          LOGGER.warn("Trying to open invalid screen with name: {}", (Object)p_96205_.getString());
-       } else {
-@@ -48,9 +_,10 @@
-          if (screenconstructor == null) {
-             LOGGER.warn("Failed to create screen for menu type: {}", (Object)BuiltInRegistries.MENU.getKey(p_96202_));
-          } else {
+    public static <T extends AbstractContainerMenu> java.util.Optional<ScreenConstructor<T, ?>> getScreenFactory(@Nullable MenuType<T> p_96202_, Minecraft p_96203_, int p_96204_, Component p_96205_) {
+         MenuScreens.ScreenConstructor<T, ?> screenconstructor = getConstructor(p_96202_);
+         if (screenconstructor == null) {
+             LOGGER.warn("Failed to create screen for menu type: {}", BuiltInRegistries.MENU.getKey(p_96202_));
+            return java.util.Optional.empty();
+         } else {
 -            screenconstructor.fromPacket(p_96205_, p_96202_, p_96203_, p_96204_);
 +            return java.util.Optional.of(screenconstructor);
-          }
-       }
-+      return java.util.Optional.empty();
-    }
+         }
+     }
 
-    @Nullable
@@ -1,17 +0,0 @@
--- a/net/minecraft/client/gui/screens/OptionsScreen.java
-+++ b/net/minecraft/client/gui/screens/OptionsScreen.java
-@@ -150,6 +_,14 @@
-       p_283520_.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
-    }
- 
-+    @Override
-+    public void onClose() {
-+        // We need to consider 2 potential parent screens here:
-+        // 1. From the main menu, in which case display the main menu
-+        // 2. From the pause menu, in which case exit back to game
-+        this.minecraft.setScreen(this.lastScreen instanceof PauseScreen ? null : this.lastScreen);
-+    }
-+
-    private Button openScreenButton(Component p_261565_, Supplier<Screen> p_262119_) {
-       return Button.builder(p_261565_, (p_280808_) -> {
-          this.minecraft.setScreen(p_262119_.get());
Author	SHA1	Message	Date
berkay8987	8bdaec882b	Fix missing forge config UI translation keys (#10915 )	2026-11-02 18:07:47 -08:00
LexManos	243490d780	Add protection against large network channel lists	2026-10-14 20:22:01 -07:00
LexManos	ddf327d367	Fix legacy object holders not being fired in the registry specific codepath Better optimize the scanning for object holders by unrolling streams.	2026-10-13 09:55:15 -07:00
BonsUnleashedandLexManos	82696a8a76	Store object holder handlers per registry name (#10899 ) Co-authored-by: LexManos <[email protected]>	2026-10-12 17:51:51 -07:00
LexManos	56abf84881	Fix generic errors in new Eclipse compiler	2026-10-12 17:48:05 -07:00
Meme Man	71d814ffa6	Update equality check for RegistryObject to include RegistryObject#key. (#10856 )	2026-07-21 11:16:17 -07:00
Matt	b7efb8287b	Toml parsing errors are now visible in the latest log (#10844 )	2026-07-09 13:26:59 -07:00
Matt	e85be8a621	Add support for multiple access transformer configs.	2026-03-23 11:18:49 -07:00
Jonathing	94a540437d	Migrate the MDK to ForgeGradle 7 Backport of `d29524b` to 1.20.6	2026-03-18 23:17:25 +00:00
Paint_Ninja	fac1237023	Skip processing vanilla classes in RuntimeDistCleaner when running on a client Backport of #10682 to 1.20.6	2026-03-17 21:05:41 +00:00
Paint_Ninja	0081a4dee8	Bump ASM and EventBus - ASM 9.9.1 for Java 26 support - EventBus 6.2.33 for Event#cancel() convenience method and further performance improvements	2026-03-17 21:03:33 +00:00
LexManos	be1a061bd2	Mark applyServerBinpatches as a dependency of BundleList. Fixes: #10729	2025-12-04 09:23:51 -08:00
LexManos	e64aaa5e9d	Migrate to Github Actions	2025-12-02 15:06:48 -08:00
Paint_Ninja	4a5b7af2dc	Bump ASM to 9.8 for Java 25 runtime support	2025-09-22 11:55:32 +01:00
Matt	cc4a4a62b4	Add ForgeLayeredDraw & AddGuiOverlayLayersEvent as API for gui overlay management. (#10584 )	2025-07-27 10:27:13 -07:00
Jonathing	2ce54f1855	1.20.6 RB 2 https://forums.minecraftforge.net/topic/154389-forge-502-minecraft-1206/	2025-03-04 16:02:43 -05:00
JonathingandLexManos	8897351a80	Speed up mod annotation scanning by ~30% (#10468 ) Co-authored-by: LexManos <[email protected]>	2025-03-04 12:49:08 -08:00
Jonathing	b0b34c638e	Add missed license headers (#10477 )	2025-03-04 12:48:54 -08:00
Jonathing	212da42d6e	Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10455 )	2025-03-04 12:48:41 -08:00
Jonathing	fe616ffe20	Fix damageItem's game test not using onBreak callback correctly (#10451 )	2025-02-18 13:18:58 -08:00
Jonathing	dba4691cd3	Bump dependencies, most notably EventBus (#10387 ) - SecureModules 2.2.19 -> 2.2.21 - Dev time performance improvements - CoreMods 5.2.4 -> 5.2.6 - EventBus 6.2.15 -> 6.2.27 - Reduced memory usage - Further performance improvements - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC - Apache MavenArtifact 3.8.5 -> 3.8.8 - Bootstrap 2.1.3 -> 2.1.8 - Dev time performance improvements	2025-02-17 19:50:56 -08:00
Jonathing RealMangoRage LexManos	00fc008f7f	Re-introduce ItemStack Capabilities (#10364 ) Co-authored-by: RealMangoRage <[email protected]> Co-authored-by: LexManos <[email protected]>	2025-02-17 19:45:45 -08:00
LexManos	e23fc25a6c	Fix compile error in test helper.	2025-02-17 19:37:45 -08:00
Jonathing	b8bbf950a9	Re-introduce IForgeItem.damageItem when an item takes damage, Fixes #10344 (#10374 )	2025-02-17 19:09:58 -08:00
JonathingandLexManos	208adc1109	Add updated tag context to AddReloadListenerEvent (#10440 ) Fixes using custom tags in GlobalLootModifiers. Fix Global Loot Modifier deserialization not having registry access --------- Co-authored-by: LexManos <[email protected]>	2025-02-17 19:08:18 -08:00
Jonathing	60904744b9	Add fast graphics render type to block model jsons (#10397 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-17 18:59:16 -08:00
Jonathing	ac5141c97c	Fix corrupted and invalidly symlinked worlds crashing on level select (#10437 )	2025-02-17 18:58:32 -08:00
Jonathing	0b1eefc6d5	Backport even more future ResourceLocation methods (#10405 )	2025-02-17 18:58:17 -08:00
Jonathing	3de4e38d10	Fix issue with shields not disabling correctly (#10319 )	2025-01-27 17:18:06 -08:00
Joseph T. McQuigg	384fe451fc	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10310 ) Add VillagerType#registerBiomeType	2025-01-27 17:17:23 -08:00
JonathingandLexManos	6a78310a52	GameTestHelper additions (#10341 ) Co-authored-by: LexManos <[email protected]>	2025-01-27 14:36:37 -08:00
Jonathing	4305f6de49	Update Gradle to 8.12.1 (#10355 ) Set IntelliJ to download sources automatically in MDK	2025-01-27 14:36:21 -08:00
Jonathing	9d64011438	Fix JOpt Simple by bumping ModLauncher (#10350 )	2025-01-27 14:35:41 -08:00
Jonathing	a0a71c6c53	Fix JOpt Simple needing a strict version requirement declaration (#10314 )	2025-01-25 18:52:12 +00:00
Jonathing	7060036589	Fix incorrect method reference in TntBlock.explode() (#10329 )	2025-01-25 18:51:46 +00:00
JonathingandJames Mitchell	97e6b96cbb	Add a way to render tooltips from Formatted text and TooltipComponents elements (#10056 ) (#10291 ) Co-authored-by: James Mitchell <[email protected]>	2025-01-04 14:35:14 -08:00
Jonathing	915d8a8f7d	Bump CoreMods to 5.2.4 (#10265 )	2024-12-23 16:12:20 -08:00
JonathingandPaint_Ninja	69037051ab	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10230 ) Cherry-pick a few optimizations from HEAD Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 15:15:05 -08:00
Jonathing	1fe85f5396	Add optional fix of use item duration, disabled by default (#10248 )	2024-12-23 15:04:45 -08:00
JonathingandPaint_Ninja	5693e5d11a	Simplify memory usage display on loading screen (#10235 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 15:04:31 -08:00
Jonathing	da2f435810	Allow mipmap lowering to be disabled (#10254 )	2024-12-23 14:53:51 -08:00
JonathingandPaint_Ninja	c24aff8a53	Skip Vanilla classes for the `CapabilityTokenSubclass` transformer (#10223 ) Skip Vanilla classes for the CapabilityTokenSubclass transformer Cherry-pick a few optimizations from HEAD Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 14:44:43 -08:00
JonathingandPaint_Ninja	d38ce3d794	Skip Forge classes in the RuntimeEnumExtender transformer (#10218 ) Mod classes are still transformed as usual Cherry-pick a few optimizations from HEAD Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 14:32:40 -08:00
JonathingandPaint_Ninja	87b4f6367a	[1.20.6] Skip processing Forge classes in `RuntimeDistCleaner` (#10210 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 14:16:31 -08:00
Martijn van den Brand	b81e7dfe73	Pass player argument when firing `OnDatapackSyncEvent` (#10172 )	2024-11-17 01:01:43 -08:00
Jonathing	9d02da81cf	Bump CoreMods to 5.2 (#10161 ) 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 - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default	2024-11-08 12:52:47 -08:00
Jonathing	5b1ab8b40b	Bump CoreMods 5.1.13 and ASM 9.7.1 (#10128 )	2024-10-27 18:17:53 -07:00
Paint_Ninjaandandan42	542db422ad	Remove unneeded boat patch (backport of #10061 to 1.20.6) (#10086 ) Co-authored-by: andan42 <[email protected]>	2024-10-06 18:27:38 -07:00
Paint_Ninja	ac10315810	Use the new methods in EventBus (backport of #10028 to 1.20.6) (#10091 ) Adds `fire()` and Result#isAllowed/isDenied/isDefault from EventBus	2024-09-12 14:34:23 +01:00
Paint_Ninja	8006e4ff48	Backport some Vanilla 1.21 `ResourceLocation` methods (#10084 )	2024-09-12 14:32:28 +01:00
Paint_Ninja	dd8e7ffd16	Optionally supply `FMLJavaModLoadingContext` as a param to mod constructors (backport of #10074 to 1.20.6) (#10083 )	2024-09-12 14:01:15 +01:00
LexManos	976d710c10	Fix highlighted item tooltip rendering twice. Closes #10112	2024-09-11 10:27:53 -07:00
Paint_Ninja	1b44cda8ed	Add missed @user_jvm_args.txt to run.bat (backport of `40a0a16` to 1.20.6) (#10092 )	2024-09-10 13:56:48 +01:00
Martijn van den Brand	10bc7b8e2e	Fire `OnDatapackSyncEvent` when a player joins a server (#10077 )	2024-08-22 14:37:58 -07:00
LexManos	333a8e16ad	Fix network channels not initializing during server transfers. Closes #10067	2024-08-17 13:06:27 -07:00
Martijn van den Brand	0554de0251	Fix `onPlaceItemIntoWorld` always resetting item stack when in creative mode (#10048 )	2024-07-18 13:03:23 -07:00
Martijn van den Brand	845f315c47	Fix matrix stack translations for `RenderHighlightEvent` (#10051 )	2024-07-18 13:03:09 -07:00
LexManos	c6f3726b6d	Make HangingSignBlockEntity useable with custom BlockEntityTypes. #10038	2024-07-05 11:05:21 -07:00
Jonathingandthedarkcolour	46ea9fca8e	Choose default JarJar mod file type based on parent JAR Closes #9939 (#10021 ) Co-authored-by: thedarkcolour <[email protected]>	2024-06-28 16:43:01 -07:00
JonathingandVen	0f2dac73ea	Fixed falling block entities not rendering as moving blocks (#10006 ) Co-authored-by: Ven <[email protected]>	2024-06-28 16:29:35 -07:00
Daniel Norris	576c61cf7d	Fix conditional checking swallowing decoding errors when loading registry entries from datapacks. Fixes #9995	2024-06-19 15:15:48 -07:00
LexManos	5eb5c34636	Fix ClientTickEvent not firing properly.	2024-06-13 17:11:04 -07:00
Daniel Norris	8f17370cb7	Change tick event to have pre/post classes (#9890 )	2024-06-13 15:07:48 -07:00
LexManos	bc0c89ff69	Fix Bogged and Wolf armor not being shearable by custom shears. Closes #10005	2024-06-13 14:40:46 -07:00
Paint_Ninja	3d9e12a71d	Cleanup FML Bindings (#10004 )	2024-06-05 09:57:42 -07:00
LexManos	cdeb786877	Fix NPE when calling ForgeHooks.getDefaultCreatorModId(ItemStack) on Spawn Eggs. Closes #10002	2024-06-04 15:48:07 -07:00
LexManos	ff7085b95b	Fix boat travel distance being incorrect. Closes #9997	2024-06-03 17:31:51 -07:00
LexManos	16dde4d551	1.20.6 RB 1 https://forums.minecraftforge.net/topic/149458-forge-501-minecraft-1206/	2024-06-03 13:15:55 -07:00
Paint_Ninja	60661350c6	Fix minor typo in MDK build.gradle	2024-06-03 20:53:10 +01:00
LexManos	7ee4a44c75	Fire EntityInteractSpecific on server side. Closes #9984	2024-06-03 12:33:53 -07:00
LexManos	f22894cf70	Unlock wrapped registries when firing register events.	2024-06-03 12:31:59 -07:00
Paint_Ninja	a3fce36942	Update Bootstrap to improve the Java version check error message (#9990 )	2024-05-30 23:51:44 +01:00
Paint_Ninja	549dbe7df4	Minor cleanup to ModListScreen and VersionChecker (#9988 )	2024-05-30 23:51:25 +01:00
Daniel Norris	5505e472aa	Prevent the `@OnlyIn` being misused on `@EventBusSubscriber` and `@Mod` annotated classes (#9891 )	2024-05-30 23:51:09 +01:00
Mysticdrew	c2c7f9b656	Fix CustomizeGuiOverlayEvent.DebugText and CustomizeGuiOverlayEvent.Chat not being fired. (#9982 )	2024-05-24 08:33:52 -07:00
LexManos	fd8a0f9c8b	Actually fix creative tab count, IDE didn't save the file before regenning patches.	2024-05-23 09:08:51 -07:00
LexManos	0ac873e296	Move Creative Inventory page count to fix issue with partially transparent tooltips. Closes #9983	2024-05-22 12:14:38 -07:00
LexManos	38b5b678cb	Make OpenContainer and SpawnEntity packets process on main game thread.	2024-05-21 11:02:44 -07:00
LexManos	9a2bc1e7c2	Add File.exists check to ConfigFileTypeHandler. Closes #9976	2024-05-21 11:02:43 -07:00
RealMangoRage	95b49bedbc	Fix crash when reloading a world that uses custom placed features. Closes #9979	2024-05-20 23:23:45 -07:00
LexManos	7c36115e3d	Fix NPE in HurtByTargetGoal when mods set targets to null. Closes #7853	2024-05-20 16:21:17 -07:00
R0b0Li0n	c037e6aca1	Fix RenderHandEvent firing with incorrect hand and item for offhand items. (#9977 )	2024-05-20 11:50:09 -07:00
Mysticdrew	e8f1b7ed6d	Fix screen layering and re-add the test. (#9978 )	2024-05-20 11:49:41 -07:00
RealMangoRage	5da16e6719	Add GatherComponentsEvent (#9944 )	2024-05-14 23:02:58 -07:00
LexManos	f0a82d79a6	Fix powered rails not propogating correctly.	2024-05-14 22:43:27 -07:00
LexManos	2b3a4137e1	Remove ICustomPacket and add PayloadChannel. (#9972 ) New PayloadChannel that uses the vanilla payload Type for packet distinction Implement the minecraft:register/unregister channels using the new PayloadChannel New generic channel builder function allowing people to implement channels however they want.	2024-05-14 08:36:42 -07:00
LexManos	640c206117	Implement entity aware armor model and texture hooks. Closes #9960	2024-05-12 17:07:45 -07:00
LexManos	59a7bbdb57	Fix finalizeSpawn's return value not being used correctly. Closes #9964	2024-05-12 13:48:20 -07:00
LexManos	be7ad14b4b	Fix Biome patch change that caused our field redirect coremod to not function correctly.	2024-05-12 11:21:49 -07:00
LexManos	c700b4ea9d	Make RegistryObject.getHolder lazy, Should help cases where vanilla registries use holders from other vanilla registries. Closes #9961	2024-05-12 10:53:10 -07:00
LexManos	dffa3dd4c9	Ignore jar files in the mods folder that are not Forge mods. Closes #9968	2024-05-12 03:36:22 -07:00
LexManos	4b934809c4	Fix canceling MobSpawnEvent.FinalizeSpawn causing a NPE closes #9971	2024-05-11 23:05:19 -07:00
LexManos	ddf76db9b3	Fix potion brewing having arguments reversed. Closes #9970	2024-05-10 14:55:38 -07:00
LexManos	64d6b4f76a	Fix Melons/Pumpkins not growing correctly.	2024-05-10 10:39:13 -07:00
Paint_Ninja	58012bfb17	Some patch cleanup (#9951 )	2024-05-09 18:07:41 +01:00
LexManos	0cad6b14d9	Filter paths discovered by ServiceProvider in ClasspathLocator. Closes #9899	2024-05-09 09:39:25 -07:00
LexManos MrCrayfish Paint_Ninja	8848294210	Update SimpleChannel to make StreamCodecs easier (#9959 ) Rework networking so that RegistryFriendlyByteBuf is useable for modders Simple support for StreamCodec in SimpleChannel Codecify all Forge packets Make simpler builder pattern for SimpleChannel. Will eventually deprecate the old MessageBuilder as it's verbose and poorly written. Co-authored-by: MrCrayfish <[email protected]> Co-authored-by: Paint_Ninja <[email protected]>	2024-05-07 22:53:14 -07:00
LexManos	0e28336fc0	Fix shields not working correctly. Fixes #9966	2024-05-06 18:56:20 -07:00
LexManos	968fa9eeb5	Fix RenderTarget stencil patch location. Fixes #9965	2024-05-06 09:33:27 -07:00
EnZaXD	43768ea328	Add ModelLayers patch back (#9962 )	2024-05-05 09:15:05 -07:00
LexManos	0e829630da	Fix canApplyAtEnchantingTable null pointer, Closes #9956 Bump SecureModules for package info and multi-release jar fixes.	2024-05-03 14:10:17 -07:00
Paint_Ninja	0467d71466	Remove zombie chance config options (#9950 )	2024-05-01 22:27:28 +01:00
Paint_Ninja	115eb5e4c8	Remove deprecated compressLanIPv6Addresses config option (#9949 ) LAN IPv6 addresses are always compressed these days, so this config option is redundant	2024-05-01 22:27:16 +01:00
LexManos	a7345372fd	Fix custom payloads not being handled on the server in the game state. Closes #9948 Fix villagers not opening trade guis. Closes #9946	2024-05-01 13:16:41 -07:00
LexManos	bd714b2f76	Fix MDK by bumping FG and disabling reobf tasks Fix LAN server IPs being duplicated Fix connecting to vanilla servers due to misapplied patch.	2024-05-01 11:28:43 -07:00
LexManos RealMangoRage Paint_Ninja	7b782e5b05	1.20.6 Initial Update New Decompiler Runtime Official mappings ItemStacks arnt Capability providers anymore, use Vanilla's system. Co-authored-by: RealMangoRage <[email protected]> Co-authored-by: Paint_Ninja <[email protected]>	2024-04-30 11:42:52 -07:00