1.21.10

Also adds more validation to strict mode. See the GitHub PR for further details.

.github/workflows/publish.yml

@@ -1,28 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches: [ '1.21.8' ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
-    with:
-      java: 21
-      gradle_setup: './gradlew setup'
-      gradle_tasks: 'build publish'
-      artifact_name: 'forge'
-    secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
-      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
-      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
-      MAVEN_USER: ${{ secrets.MAVEN_USER }}
-      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
-      SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
-      SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
-      SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}

.github/workflows/pull_request_review.yml

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

.github/workflows/pull_request_review_comment.yml

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

.teamcity/pom.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <name>MinecraftForge_Forge Config DSL Script</name>
+  <groupId>MinecraftForge_Forge</groupId>
+  <artifactId>MinecraftForge_Forge_dsl</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <parent>
+    <groupId>org.jetbrains.teamcity</groupId>
+    <artifactId>configs-dsl-kotlin-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <repositories>
+    <repository>
+      <id>jetbrains-all</id>
+      <url>https://download.jetbrains.com/teamcity-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>teamcity-server</id>
+      <url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>JetBrains</id>
+      <url>https://download.jetbrains.com/teamcity-repository</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <sourceDirectory>${basedir}</sourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <version>${kotlin.version}</version>
+
+        <configuration/>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <phase>process-test-sources</phase>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.jetbrains.teamcity</groupId>
+        <artifactId>teamcity-configs-maven-plugin</artifactId>
+        <version>${teamcity.dsl.version}</version>
+        <configuration>
+          <format>kotlin</format>
+          <dstDir>target/generated-configs</dstDir>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.teamcity</groupId>
+      <artifactId>configs-dsl-kotlin</artifactId>
+      <version>${teamcity.dsl.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.teamcity</groupId>
+      <artifactId>configs-dsl-kotlin-plugins</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>pom</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-script-runtime</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

.teamcity/settings.kts

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

CREDITS.txt

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

build.gradle

@@ -7,8 +7,8 @@ plugins {
     id 'net.minecraftforge.gradleutils' version '[2.6.4,2.7)'
     id 'eclipse'
     id 'de.undercouch.download' version '5.4.0'
-    id 'net.minecraftforge.gradle.patcher' version '[6.0.54,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.45,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'
 }

buildSrc/build.gradle

@@ -4,9 +4,9 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:9.9.1'
-    implementation 'org.ow2.asm:asm-tree:9.9.1'
-    implementation 'net.minecraftforge:srgutils:0.6.8'
+    implementation 'org.ow2.asm:asm:9.8'
+    implementation 'org.ow2.asm:asm-tree:9.8'
+    implementation 'net.minecraftforge:srgutils:0.5.10'
     implementation 'commons-io:commons-io:2.13.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'

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

@@ -21,8 +21,6 @@ abstract class BundleList extends DefaultTask {
         configure {
             dependsOn(project.tasks.universalJar)
             inputs.file(project.tasks.universalJar.archiveFile)
-            dependsOn(project.tasks.applyServerBinPatches)
-            inputs.file(project.tasks.applyServerBinPatches.output)
         }
     }
     

build_forge.gradle

@@ -79,6 +79,7 @@ final String SPEC_VERSION = gitversion.info.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
 ]
@@ -414,7 +415,7 @@ tasks.register('extractInheritance', ExtractInheritance) {
 }
 tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
     jar = createClientOfficial.output
-    output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
+    output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json')
     predicate = {
         parent, node, insn ->
             return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
@@ -925,31 +926,23 @@ 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 mdkGradleWrapper.map(Wrapper.&getScriptFile)
-    from mdkGradleWrapper.map(Wrapper.&getBatchScript)
+    from rootProject.file('gradlew')
+    from rootProject.file('gradlew.bat')
     from(EXTRA_TXTS)
-    into('gradle/wrapper/') {
-        from mdkGradleWrapper.map(Wrapper.&getJarFile)
-        from mdkGradleWrapper.map(Wrapper.&getPropertiesFile)
+    from(rootProject.file('gradle/')){
+        into('gradle/')
     }
     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,
@@ -958,8 +951,7 @@ tasks.register('mdkZip', Zip) {
             MAPPING_CHANNEL: MAPPING_CHANNEL,
             MAPPING_VERSION: MAPPING_VERSION,
             FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0],
-            MC_NEXT_VERSION: MC_NEXT_VERSION,
-            EVENTBUS_VERSION: libs.versions.eventbus.get()
+            MC_NEXT_VERSION: MC_NEXT_VERSION
         ])
         rename 'gitignore\\.txt', '.gitignore'
         rename 'gitattributes\\.txt', '.gitattributes'

dump.sh

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

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

@@ -358,7 +358,7 @@ public class ModLoader {
         return completedStates.contains(state);
     }
 
-    public <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
+    public static <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
             return;
@@ -367,8 +367,7 @@ public class ModLoader {
             mod.acceptEvent(generator.apply(mod));
     }
 
-    public <T extends IModBusEvent> void postEvent(T e) {
-        var cls = e.getClass();
+    public static <T extends IModBusEvent> void postEvent(T e) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;
@@ -377,7 +376,7 @@ public class ModLoader {
             mod.acceptEvent(e);
     }
 
-    public <T extends IModBusEvent> T postEventWithReturn(T e) {
+    public static <T extends IModBusEvent> T postEventWithReturn(T e) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return e;
@@ -388,14 +387,14 @@ public class ModLoader {
     }
 
     @SuppressWarnings("removal")
-    public <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
+    public static <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
         postEventWithWrapInModOrder(event,
             (mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
             (mc, e) -> ModLoadingContext.get().setActiveContainer(null)
         );
     }
 
-    public <T extends IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
+    public static <T extends IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;

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

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

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

@@ -7,11 +7,9 @@ package net.minecraftforge.fml.common.asm;
 
 import java.util.EnumSet;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -60,10 +58,10 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
             return NAY;
 
         String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
-            return NAY;
+        if (internalName.startsWith("net/minecraft/client/model") || internalName.startsWith("net/minecraft/world"))
+            return YAY;
 
-        return YAY;
+        return NAY;
     }
 
     @Override
@@ -75,11 +73,6 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
         if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
             return ComputeFlags.NO_REWRITE;
 
-        if (!classNode.name.startsWith("net/minecraft/")) {
-            LOGGER.warn("IExtensibleEnum found on non-Minecraft class: {}", classType.getClassName());
-            LOGGER.warn("This behaviour is deprecated for removal and will have no effect in a future MC release. Please use a record with static final field instances instead.");
-        }
-
         Type array = Type.getType("[" + classType.getDescriptor());
         String arrayDesc = array.getDescriptor();
 

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

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

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

@@ -5,13 +5,11 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
-import org.slf4j.Logger;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -26,7 +24,6 @@ import java.util.stream.Collectors;
  * loading package</em>
  */
 public class LoadingModList {
-    private static final Logger LOGGER = LogUtils.getLogger();
     private static LoadingModList INSTANCE;
     private final List<ModFileInfo> modFiles;
     private final List<ModInfo> sortedList;
@@ -70,22 +67,13 @@ public class LoadingModList {
     }
 
     public void addAccessTransformers() {
-        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);
-                }
+            var at = mod.getAccessTransformer().orElse(null);
+            if (at != null) {
+                FMLLoader.addAccessTransformer(at, mod);
             }
         }
-        if (!errors.isEmpty()) {
-            preLoadErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
-        }
     }
 
     public void addForScanning(BackgroundScanHandler backgroundScanHandler) {

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

@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
-public final class RuntimeDistCleaner implements ILaunchPluginService {
+public class RuntimeDistCleaner implements ILaunchPluginService {
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
     private static String DIST;
@@ -52,10 +52,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         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;
     }
 

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

@@ -50,7 +50,6 @@ 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;
@@ -93,14 +92,8 @@ public class ModFile implements IModFile {
         return modFileInfo.getMods();
     }
 
-    /** @deprecated Use {@link #getAccessTransformers()} instead*/
-    @Deprecated(forRemoval=true, since="1.21.11")
     public Optional<Path> getAccessTransformer() {
-        return Optional.ofNullable(accessTransformer);
-    }
-
-    public List<Path> getAccessTransformers() {
-        return accessTransformers;
+        return Optional.ofNullable(Files.exists(accessTransformer) ? accessTransformer : null);
     }
 
     public boolean identifyMods() {
@@ -111,28 +104,7 @@ public class ModFile implements IModFile {
             LOGGER.warn("Mod file {} contains javascript coremods! JS CoreMods are deprecated and will be removed in a future release. Consider using Mixin or ModLauncher transformers.", this.getFileName());
         for (var mi : this.coreMods)
             LOGGER.debug(LogMarkers.LOADING, "Found coremod {}", mi.getPath());
-        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);
-        }
+        this.accessTransformer = findResource("META-INF", "accesstransformer.cfg");
         return true;
     }
 

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

@@ -6,7 +6,6 @@
 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;
@@ -14,7 +13,6 @@ 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;
 
@@ -33,7 +31,6 @@ 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());
@@ -44,15 +41,10 @@ public class ModFileParser {
         }
 
         final FileConfig fileConfig = FileConfig.builder(modsjson).build();
-        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.");
-        }
+        fileConfig.load();
+        fileConfig.close();
+        final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
+        return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
     }
 
     protected static List<CoreModFile> getCoreMods(final ModFile modFile) {

fmlloader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService

@@ -1,5 +1,4 @@
 net.minecraftforge.fml.loading.log4j.SLF4JFixerLaunchPluginService
 net.minecraftforge.fml.loading.RuntimeDistCleaner
 net.minecraftforge.fml.common.asm.RuntimeEnumExtender
-net.minecraftforge.fml.common.asm.ObjectHolderDefinalize
 net.minecraftforge.fml.common.asm.CapabilityTokenSubclass

forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json

@@ -107,7 +107,7 @@
     {
         "class": "net/minecraft/world/level/levelgen/PhantomSpawner",
         "methods": [
-            "tick(Lnet/minecraft/server/level/ServerLevel;ZZ)V"
+            "tick(Lnet/minecraft/server/level/ServerLevel;Z)V"
         ]
     },
     {

gradle.properties

@@ -5,11 +5,11 @@ org.gradle.daemon=false
 org.gradle.parallel=true
 
 JAVA_VERSION=21
-MC_VERSION=1.21.8
+MC_VERSION=1.21.10
 MC_NEXT_VERSION=1.22
-MCP_VERSION=20250717.105350
+MCP_VERSION=20251007.101210
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.21.8
+MAPPING_VERSION=1.21.10
 
 # Set to true before the first build of a new MC version, so we don't do compatibility checks
 CHECK_COMPATIBILITY=false

javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java

@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
  * annotations and passes the class instances to the {@link Bus}
  * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS}
  */
-public class AutomaticEventSubscriber {
+public final 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);

javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java

@@ -43,7 +43,7 @@ public class FMLModContainer extends ModContainer {
         LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
         this.scanResults = modFileScanResults;
         activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
-        this.eventBusGroup = BusGroup.create("modBusFor" + info.getModId());
+        this.eventBusGroup = BusGroup.create("modBusFor" + info.getModId(), IModBusEvent.class);
         this.contextExtension = () -> context;
         try {
             var moduleName = info.getOwningFile().moduleName();

mdk/README.txt

@@ -1,11 +1,13 @@
+
 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.
 
-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.
+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.
 
 Setup Process:
 ==============================
@@ -15,22 +17,30 @@ 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. Use the run tasks located under the "Slime Launcher" Gradle task group.
+3. Run the following command: `./gradlew genIntellijRuns`
+4. Refresh the Gradle Project in IDEA if required.
 
 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/

mdk/build.gradle

@@ -1,64 +1,235 @@
-// 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 'java'
-    id 'idea'
     id 'eclipse'
-    id 'net.minecraftforge.gradle' version '[7.0.3,8)'
+    id 'idea'
+    id 'maven-publish'
+    id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
 }
 
-version = '1.0.0'
-group = 'com.example.examplemod'
+version = mod_version
+group = mod_group_id
+
+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)
 
-// 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 {
-    mappings channel: 'official', version: '@MC_VERSION@'
+    // 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
+    //
+    // 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
+    //
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+    mappings channel: mapping_channel, version: mapping_version
 
+    // Forge 1.20.6 and newer use official mappings at runtime, so we shouldn't reobf from official to SRG
+    reobf = false
+
+    // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
+    // In most cases, it is not necessary to enable.
+    // 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, 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 {
-            workingDir = layout.projectDirectory.dir('run')
+            workingDirectory project.file('run')
 
-            systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
-            systemProperty 'forge.enabledGameTestNamespaces', 'examplemod'
+            // Optional additional logging. 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'
+
+            property 'forge.logging.console.level', 'debug'
+
+            // Recommended for development - enables more descriptive errors at the cost of slower startup and registration.
+            property 'eventbus.api.strictRuntimeChecks', 'true'
+
+//            arg "-mixin.config=${mod_id}.mixins.json"
         }
 
-        register('client')
+        client {
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', mod_id
+        }
 
-        register('server') {
+        server {
+            property 'forge.enabledGameTestNamespaces', mod_id
             args '--nogui'
         }
 
-        register('gameTestServer')
+        // 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('data') {
-            workingDir = layout.projectDirectory.dir('run-data')
+        data {
+            // example of overriding the workingDirectory set in configureEach above
+            workingDirectory project.file('run-data')
 
-            args '--mod', 'examplemod', '--all', '--output', layout.projectDirectory.dir('src/generated/resources'), '--existing', layout.projectDirectory.dir('src/main/resources')
+            // 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/')
         }
     }
 }
 
+// Include resources generated by data generators.
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 repositories {
-    minecraft.mavenizer(it) // In Kotlin, it = this
-    maven fg.forgeMaven
-    maven fg.minecraftLibsMaven
+    // Put repositories for dependencies here
     mavenCentral()
+    maven {
+        name = 'Forge'
+        url = 'https://maven.minecraftforge.net'
+    }
+    maven {
+        name = 'Minecraft libraries'
+        url = 'https://libraries.minecraft.net'
+    }
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = 'Sponge'
+                url = 'https://repo.spongepowered.org/repository/maven-public'
+            }
+        }
+        filter {
+            includeGroupAndSubgroups('org.spongepowered')
+        }
+    }
+
+    // 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'
+    // }
 }
 
 dependencies {
-    implementation minecraft.dependency('net.minecraftforge:forge:@MC_VERSION@-@FORGE_VERSION@')
-    annotationProcessor 'net.minecraftforge:eventbus-validator:@EVENTBUS_VERSION@'
+    // 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}"
+
+    // Forge 1.21.6+ uses EventBus 7, which shifts most of its runtime validation to compile-time via an annotation processor
+    // to improve performance in production environments. This line is required to enable said compile-time validation
+    // in your development environment, helping you catch issues early.
+    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.12'
+
+    // Example mod dependency with JEI
+    // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
+    // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
+    // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
+    // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
+
+    // Example mod dependency using a mod jar from ./libs with a flat dir repository
+    // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
+    // The group id is ignored when searching -- in this case, it is "blank"
+    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
+
+    // For more info:
+    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+}
+
+// This block of code expands all declared replace properties in the specified resource targets.
+// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
+// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
+// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
+tasks.named('processResources', ProcessResources) {
+    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) {
+    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
+        ])
+//        attributes['MixinConfigs'] = "${mod_id}.mixins.json"
+    }
+}
+
+// Example configuration to allow publishing using the maven-publish plugin
+publishing {
+    publications {
+        register('mavenJava', MavenPublication) {
+            artifact jar
+        }
+    }
+    repositories {
+        maven {
+            url "file://${project.projectDir}/mcmodsrepo"
+        }
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
-    // 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'
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}
+
+// IntelliJ no longer downloads javadocs and sources by default, this tells Gradle to force IntelliJ to do it.
+idea.module { downloadJavadoc = downloadSources = true }
+
+eclipse {
+    // Run everytime eclipse builds the code
+    //autoBuildTasks genEclipseRuns
+    // Run when importing the project
+    synchronizationTasks 'genEclipseRuns'
+}
+
+// Merge the resources and classes into the same directory, 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
 }

mdk/gitignore.txt

@@ -22,5 +22,4 @@ eclipse
 run
 
 # Files from Forge MDK
-forge_README.txt
 forge*changelog.txt

mdk/gradle.properties

@@ -1,9 +1,66 @@
-org.gradle.caching=true
-org.gradle.parallel=true
-org.gradle.configureondemand=true
+# 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=-Xmx5G
+org.gradle.daemon=false
 
-org.gradle.configuration-cache=true
-org.gradle.configuration-cache.parallel=true
-org.gradle.configuration-cache.problems=warn
+# In the case that Gradle needs to fork to recompile, this will set the memory for that process.
+systemProp.net.minecraftforge.gradle.repo.recompile.fork=true
+systemProp.net.minecraftforge.gradle.repo.recompile.fork.args=-Xmx5G
 
-net.minecraftforge.gradle.merge-source-sets=true
+# Opts-out of ForgeGradle automatically adding mavenCentral(), Forge's maven and MC libs maven to the repositories block
+systemProp.net.minecraftforge.gradle.repo.attach=false
+
+
+## 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.

mdk/settings.gradle

@@ -1,5 +1,13 @@
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
+    }
 }
 
-rootProject.name = 'examplemod'
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+}

mdk/src/main/resources/META-INF/mods.toml

@@ -1,43 +1,73 @@
-# 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
-
-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
+# 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
-authors="YourNameHere, OtherNameHere" #optional
-#displayTest="MATCH_VERSION" #optional, default=MATCH_VERSION when not clientSideOnly, else IGNORE_ALL_VERSION
+# 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)
 
-# 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@,)"
+# 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
     ordering="NONE"
+    # Side this dependency is applied on - BOTH, CLIENT, or SERVER
     side="BOTH"
-
-[[dependencies.examplemod]] #recommended
+# Here's another dependency
+[[dependencies.${mod_id}]]
     modId="minecraft"
     mandatory=true
-    versionRange="[@MC_VERSION@,@MC_NEXT_VERSION@,)"
+    # This version range declares a minimum of the current minecraft version up to but not including the next major version
+    versionRange="${minecraft_version_range}"
     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,)"

patches/minecraft/com/mojang/blaze3d/opengl/GlCommandEncoder.java.patch

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
 +++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
-@@ -132,6 +_,9 @@
+@@ -131,6 +_,9 @@
              GlStateManager._colorMask(true, true, true, true);
              GlStateManager._clear(16384);
              GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);

patches/minecraft/com/mojang/blaze3d/opengl/GlDevice.java.patch

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/opengl/GlDevice.java
 +++ b/com/mojang/blaze3d/opengl/GlDevice.java
-@@ -89,8 +_,15 @@
+@@ -90,8 +_,15 @@
      public GpuTexture createTexture(
          @Nullable Supplier<String> p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_
      ) {
@@ -17,7 +17,7 @@
          );
      }
  
-@@ -98,6 +_,15 @@
+@@ -99,6 +_,15 @@
      public GpuTexture createTexture(
          @Nullable String p_394142_, int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_
      ) {
@@ -33,7 +33,7 @@
          if (p_406483_ < 1) {
              throw new IllegalArgumentException("mipLevels must be at least 1");
          } else if (p_408015_ < 1) {
-@@ -148,11 +_,14 @@
+@@ -149,11 +_,14 @@
                          GlStateManager._texImage2D(
                              k,
                              l,
@@ -48,7 +48,7 @@
                              GlConst.toGlType(p_394951_),
                              null
                          );
-@@ -163,11 +_,14 @@
+@@ -164,11 +_,14 @@
                      GlStateManager._texImage2D(
                          j,
                          i1,
@@ -63,7 +63,7 @@
                          GlConst.toGlType(p_394951_),
                          null
                      );
-@@ -180,7 +_,7 @@
+@@ -181,7 +_,7 @@
              } else if (j1 != 0) {
                  throw new IllegalStateException("OpenGL error " + j1);
              } else {

patches/minecraft/com/mojang/blaze3d/opengl/GlStateManager.java.patch

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/opengl/GlStateManager.java
 +++ b/com/mojang/blaze3d/opengl/GlStateManager.java
-@@ -89,6 +_,11 @@
+@@ -85,6 +_,11 @@
          }
      }
  
@@ -12,7 +12,7 @@
      public static void _disableBlend() {
          RenderSystem.assertOnRenderThread();
          BLEND.mode.disable();
-@@ -404,9 +_,17 @@
+@@ -371,9 +_,17 @@
          }
      }
  

patches/minecraft/com/mojang/blaze3d/pipeline/RenderTarget.java.patch

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -92,7 +_,7 @@
+@@ -86,7 +_,7 @@
              this.width = p_83951_;
              this.height = p_83952_;
              if (this.useDepth) {
@@ -9,7 +9,7 @@
                  this.depthTextureView = gpudevice.createTextureView(this.depthTexture);
                  this.depthTexture.setTextureFilter(FilterMode.NEAREST, false);
                  this.depthTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE);
-@@ -166,5 +_,26 @@
+@@ -155,5 +_,26 @@
      @Nullable
      public GpuTextureView getDepthTextureView() {
          return this.depthTextureView;
@@ -25,7 +25,7 @@
 +    public void enableStencil() {
 +        if (stencilEnabled) return;
 +        stencilEnabled = true;
-+        this.resize(viewWidth, viewHeight);
++        this.resize(width, height);
 +    }
 +
 +    /**

patches/minecraft/com/mojang/blaze3d/platform/Window.java.patch

@@ -1,16 +1,16 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -88,7 +_,8 @@
-         GLFW.glfwWindowHint(139267, 2);
+@@ -91,7 +_,8 @@
+         GLFW.glfwWindowHint(139267, 3);
          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);
+-        this.handle = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
++        this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
 +        if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
          if (monitor != null) {
              VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
              this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
-@@ -100,6 +_,7 @@
+@@ -103,6 +_,7 @@
              this.windowedX = this.x = aint1[0];
              this.windowedY = this.y = aint[0];
          }
@@ -18,8 +18,8 @@
  
          this.setMode();
          this.refreshFramebufferSize();
-@@ -266,6 +_,9 @@
-         GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
+@@ -269,6 +_,9 @@
+         GLFW.glfwGetFramebufferSize(this.handle, 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) {

patches/minecraft/com/mojang/blaze3d/vertex/VertexConsumer.java.patch

@@ -9,7 +9,7 @@
      VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
  
      VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
-@@ -135,9 +_,11 @@
+@@ -131,9 +_,11 @@
  
                  int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
                  int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);

patches/minecraft/com/mojang/blaze3d/vertex/VertexFormat.java.patch

@@ -1,15 +1,15 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -21,7 +_,7 @@
+@@ -20,7 +_,7 @@
  
  @OnlyIn(Dist.CLIENT)
  @DontObfuscate
 -public class VertexFormat {
 +public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
      public static final int UNKNOWN_ELEMENT = -1;
-     private static final boolean USE_STAGING_BUFFER_WORKAROUND = Util.getPlatform() == Util.OS.WINDOWS && Util.isAarch64();
-     @Nullable
-@@ -35,6 +_,7 @@
+     private final List<VertexFormatElement> elements;
+     private final List<String> names;
+@@ -31,6 +_,7 @@
      private GpuBuffer immediateDrawVertexBuffer;
      @Nullable
      private GpuBuffer immediateDrawIndexBuffer;
@@ -17,7 +17,7 @@
  
      VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
          this.elements = p_343616_;
-@@ -47,6 +_,11 @@
+@@ -43,6 +_,11 @@
              int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
              this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
          }
@@ -29,8 +29,8 @@
      }
  
      public static VertexFormat.Builder builder() {
-@@ -169,6 +_,9 @@
-         );
+@@ -141,6 +_,9 @@
+         this.immediateDrawIndexBuffer = uploadToBuffer(this.immediateDrawIndexBuffer, p_391835_, 72, () -> "Immediate index buffer for " + this);
          return this.immediateDrawIndexBuffer;
      }
 +

patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch

@@ -4,12 +4,12 @@
      }
  
      @Override
-+    public boolean keyPressed(int key, int scanCode, int modifiers) {
-+       if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
++    public boolean keyPressed(net.minecraft.client.input.KeyEvent event) {
++       if (event.key() == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
 +          minecraft.setScreen(this.nextScreen);
 +          return true;
 +       }
-+       return super.keyPressed(key, scanCode, modifiers);
++       return super.keyPressed(event);
 +    }
 +
 +    @Override

patches/minecraft/net/minecraft/CrashReportCategory.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReportCategory.java
 +++ b/net/minecraft/CrashReportCategory.java
-@@ -112,8 +_,10 @@
+@@ -116,8 +_,10 @@
          if (astacktraceelement.length <= 0) {
              return 0;
          } else {
@@ -13,7 +13,7 @@
              return this.stackTrace.length;
          }
      }
-@@ -160,16 +_,16 @@
+@@ -164,16 +_,16 @@
  
          if (this.stackTrace != null && this.stackTrace.length > 0) {
              p_128169_.append("\nStacktrace:");

patches/minecraft/net/minecraft/SharedConstants.java.patch

@@ -1,10 +1,10 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -175,6 +_,7 @@
+@@ -224,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.ENABLE_COMMAND_STACK_TRACES = COMMAND_STACK_TRACES;
          CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();

patches/minecraft/net/minecraft/Util.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -268,7 +_,7 @@
+@@ -266,7 +_,7 @@
                  .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().dataVersion().version()))
                  .getChoiceType(p_137552_, p_137553_);
          } catch (IllegalArgumentException illegalargumentexception) {

patches/minecraft/net/minecraft/advancements/Advancement.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -226,7 +_,11 @@
+@@ -233,7 +_,11 @@
          }
  
          public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {

patches/minecraft/net/minecraft/client/Camera.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -133,9 +_,13 @@
+@@ -132,9 +_,13 @@
      }
  
      protected void setRotation(float p_90573_, float p_90574_) {
@@ -15,7 +15,7 @@
          FORWARDS.rotate(this.rotation, this.forwards);
          UP.rotate(this.rotation, this.up);
          LEFT.rotate(this.rotation, this.left);
-@@ -251,6 +_,13 @@
+@@ -250,6 +_,13 @@
  
      public float getPartialTickTime() {
          return this.partialTickTime;

patches/minecraft/net/minecraft/client/KeyMapping.java.patch

@@ -1,35 +1,27 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -15,9 +_,9 @@
+@@ -19,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 Map<InputConstants.Key, List<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";
-@@ -43,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++;
-         }
+     private final String name;
+     private final InputConstants.Key defaultKey;
+     private final KeyMapping.Category category;
+@@ -38,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_);
-         }
-@@ -101,7 +_,7 @@
+     private static void forAllKeyMappings(InputConstants.Key p_424096_, Consumer<KeyMapping> p_427756_) {
+-        List<KeyMapping> list = MAP.get(p_424096_);
++        List<KeyMapping> list = MAP.getAll(p_424096_);
+         if (list != null && !list.isEmpty()) {
+             for (KeyMapping keymapping : list) {
+                 p_427756_.accept(keymapping);
+@@ -100,7 +_,7 @@
      }
  
      public boolean isDown() {
@@ -37,26 +29,26 @@
 +        return this.isDown && isConflictContextAndModifierActive();
      }
  
-     public String getCategory() {
-@@ -137,7 +_,16 @@
+     public KeyMapping.Category getCategory() {
+@@ -140,7 +_,16 @@
      public int compareTo(KeyMapping p_90841_) {
-         return this.category.equals(p_90841_.category)
+         return this.category == 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));
+-            : Integer.compare(KeyMapping.Category.SORT_ORDER.indexOf(this.category), KeyMapping.Category.SORT_ORDER.indexOf(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);
++    private static int compareSort(Category c1, Category c2) {
++        int o1 = KeyMapping.Category.SORT_ORDER.indexOf(c1);
++        int o2 = KeyMapping.Category.SORT_ORDER.indexOf(c2);
++        if (o1 == -1 && o2 != -1) return 1;
++        if (o1 != -1 && o2 == -1) return -1;
++        if (o1 == -1 && o2 == -1) return I18n.get(c1.id().toLanguageKey("key.category")).compareTo(I18n.get(c1.id().toLanguageKey("key.category")));
++        return  o1 - o2;
      }
  
      public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -146,6 +_,20 @@
+@@ -149,6 +_,20 @@
      }
  
      public boolean same(KeyMapping p_90851_) {
@@ -77,7 +69,7 @@
          return this.key.equals(p_90851_.key);
      }
  
-@@ -164,11 +_,13 @@
+@@ -167,11 +_,13 @@
      }
  
      public Component getTranslatedKeyMessage() {
@@ -92,7 +84,14 @@
      }
  
      public String saveString() {
-@@ -182,5 +_,88 @@
+@@ -183,12 +_,94 @@
+     }
+ 
+     private void registerMapping(InputConstants.Key p_423386_) {
+-        MAP.computeIfAbsent(p_423386_, p_420623_ -> new ArrayList<>()).add(this);
++        MAP.put(p_423386_, this);
+     }
+ 
      @Nullable
      public static KeyMapping get(String p_378660_) {
          return ALL.get(p_378660_);
@@ -105,28 +104,28 @@
 +    /**
 +     * 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) {
++    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, final InputConstants.Type inputType, final int keyCode, Category 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) {
++    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, InputConstants.Key keyCode, Category 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) {
++    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, final InputConstants.Type inputType, final int keyCode, Category 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) {
++    public KeyMapping(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, InputConstants.Key keyCode, Category category) {
 +       this.name = description;
 +       this.key = keyCode;
 +       this.defaultKey = keyCode;
@@ -138,7 +137,6 @@
 +          this.keyModifier = net.minecraftforge.client.settings.KeyModifier.NONE;
 +       ALL.put(description, this);
 +       MAP.put(keyCode, this);
-+       CATEGORIES.add(category);
 +    }
 +
 +    @Override
@@ -180,4 +178,5 @@
 +
 +        MAP.put(keyCode, this);
      }
- }
+ 
+     @OnlyIn(Dist.CLIENT)

patches/minecraft/net/minecraft/client/KeyboardHandler.java.patch

@@ -1,39 +1,34 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -440,12 +_,12 @@
+@@ -499,12 +_,12 @@
              if (screen != null) {
                  try {
-                     if (p_90897_ != 1 && p_90897_ != 2) {
--                        if (p_90897_ == 0 && screen.keyReleased(p_90895_, p_90896_, p_90898_)) {
-+                        if (p_90897_ == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, p_90895_, p_90896_, p_90898_)) {
+                     if (p_90895_ != 1 && p_90895_ != 2) {
+-                        if (p_90895_ == 0 && screen.keyReleased(p_423534_)) {
++                        if (p_90895_ == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, p_423534_)) {
                              return;
                          }
                      } else {
                          screen.afterKeyboardAction();
--                        if (screen.keyPressed(p_90895_, p_90896_, p_90898_)) {
-+                        if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, p_90895_, p_90896_, p_90898_)) {
-                             return;
-                         }
-                     }
-@@ -504,6 +_,7 @@
+-                        if (screen.keyPressed(p_423534_)) {
++                        if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, p_423534_)) {
+                             if (this.minecraft.screen == null) {
+                                 InputConstants.Key inputconstants$key = InputConstants.getKey(p_423534_);
+                                 KeyMapping.set(inputconstants$key, false);
+@@ -568,6 +_,7 @@
                      }
                  }
              }
-+            net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_90895_, p_90896_, p_90897_, p_90898_);
++            net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_423534_, p_90895_);
          }
      }
  
-@@ -513,10 +_,10 @@
+@@ -576,7 +_,7 @@
+             Screen screen = this.minecraft.screen;
              if (screen != null && this.minecraft.getOverlay() == null) {
                  try {
-                     if (Character.isBmpCodePoint(p_90891_)) {
--                        screen.charTyped((char)p_90891_, p_90892_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, (char)p_90891_, p_90892_);
-                     } else if (Character.isValidCodePoint(p_90891_)) {
--                        screen.charTyped(Character.highSurrogate(p_90891_), p_90892_);
--                        screen.charTyped(Character.lowSurrogate(p_90891_), p_90892_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.highSurrogate(p_90891_), p_90892_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.lowSurrogate(p_90891_), p_90892_);
-                     }
+-                    screen.charTyped(p_427531_);
++                    net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, p_427531_);
                  } catch (Throwable throwable) {
                      CrashReport crashreport = CrashReport.forThrowable(throwable, "charTyped event handler");
+                     screen.fillCrashDetails(crashreport);

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -256,7 +_,7 @@
+@@ -260,7 +_,7 @@
  import org.slf4j.Logger;
  
  @OnlyIn(Dist.CLIENT)
@@ -8,8 +8,8 @@
 +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;
-@@ -435,7 +_,6 @@
+     private static final int MAX_TICKS_PER_UPDATE = 10;
+@@ -439,7 +_,6 @@
              }
          }, Util.nonCriticalIoPool());
          LOGGER.info("Setting user: {}", this.user.getName());
@@ -17,19 +17,19 @@
          this.demo = p_91084_.game.demo;
          this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
          this.allowsChat = !p_91084_.game.disableChat;
-@@ -486,10 +_,9 @@
+@@ -491,10 +_,9 @@
              LOGGER.error("Couldn't set icon", (Throwable)ioexception);
          }
  
 +        // FORGE: Move mouse and keyboard handler setup further below
          this.mouseHandler = new MouseHandler(this);
--        this.mouseHandler.setup(this.window.getWindow());
+-        this.mouseHandler.setup(this.window);
          this.keyboardHandler = new KeyboardHandler(this);
--        this.keyboardHandler.setup(this.window.getWindow());
+-        this.keyboardHandler.setup(this.window);
          RenderSystem.initRenderer(
-             this.window.getWindow(),
+             this.window.handle(),
              this.options.glDebugVerbosity,
-@@ -500,6 +_,7 @@
+@@ -505,6 +_,7 @@
          LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
          this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
          this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
@@ -37,33 +37,33 @@
          this.resourcePackRepository.reload();
          this.options.loadSelectedResourcePacks(this.resourcePackRepository);
          this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
-@@ -578,6 +_,7 @@
-         this.blockEntityRenderDispatcher = new BlockEntityRenderDispatcher(this.font, this.modelManager.entityModels(), this.blockRenderer, this.itemModelResolver, this.itemRenderer, this.entityRenderDispatcher);
-         this.resourceManager.registerReloadListener(this.blockEntityRenderDispatcher);
-         this.particleEngine = new ParticleEngine(this.level, this.textureManager);
-+        net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
-         this.resourceManager.registerReloadListener(this.particleEngine);
-         this.paintingTextures = new PaintingTextureManager(this.textureManager);
-         this.resourceManager.registerReloadListener(this.paintingTextures);
-@@ -593,6 +_,9 @@
+@@ -593,6 +_,7 @@
+         this.particleResources = new ParticleResources();
+         this.resourceManager.registerReloadListener(this.particleResources);
+         this.particleEngine = new ParticleEngine(this.level, this.particleResources);
++        net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleResources);
+         this.particleResources.onReload(this.particleEngine::clearParticles);
+         this.waypointStyles = new WaypointStyleManager();
+         this.resourceManager.registerReloadListener(this.waypointStyles);
+@@ -604,6 +_,9 @@
          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);
++        this.mouseHandler.setup(this.window);
++        this.keyboardHandler.setup(this.window);
          RealmsClient realmsclient = RealmsClient.getOrCreate(this);
          this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
-@@ -626,6 +_,7 @@
+         RenderSystem.setErrorCallback(this::onFullscreenError);
+@@ -636,6 +_,7 @@
              }
          }
  
 +        net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
          this.window.updateVsync(this.options.enableVsync().get());
          this.window.updateRawMouseInput(this.options.rawMouseInput().get());
-         this.window.setDefaultErrorCallback();
-@@ -648,16 +_,17 @@
+         this.window.setAllowCursorChanges(this.options.allowCursorChanges().get());
+@@ -659,16 +_,17 @@
          GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
          Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
          this.setOverlay(
@@ -84,7 +84,7 @@
          );
          this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.logPath());
          this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
-@@ -759,6 +_,7 @@
+@@ -787,6 +_,7 @@
          StringBuilder stringbuilder = new StringBuilder("Minecraft");
          if (checkModStatus().shouldReportAsModified()) {
              stringbuilder.append("*");
@@ -92,16 +92,16 @@
          }
  
          stringbuilder.append(" ");
-@@ -782,6 +_,8 @@
+@@ -810,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_193587_.user.user.getType() != User.Type.MSA
-             ? UserApiService.OFFLINE
-             : p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
-@@ -792,7 +_,7 @@
+         return p_193587_.game.offlineDeveloperMode ? UserApiService.OFFLINE : p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
+     }
+ 
+@@ -822,7 +_,7 @@
      }
  
      private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
@@ -110,7 +110,7 @@
              this.clearResourcePacksOnError(p_91240_, null, p_299515_);
          } else {
              Util.throwAsRuntime(p_91240_);
-@@ -1078,12 +_,6 @@
+@@ -1108,12 +_,6 @@
              LOGGER.error("setScreen called from non-game thread");
          }
  
@@ -120,34 +120,34 @@
 -            this.setLastInputType(InputType.NONE);
 -        }
 -
-         if (p_91153_ == null && this.clientLevelTeardownInProgress) {
-             throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
-         } else {
-@@ -1097,6 +_,23 @@
-                 }
+         if (p_91153_ == null) {
+             if (this.clientLevelTeardownInProgress) {
+                 throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
+@@ -1132,6 +_,23 @@
              }
+         }
  
-+            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;
-+            }
++        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);
-+                }
++        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();
-@@ -1180,6 +_,7 @@
+         this.screen = p_91153_;
+         if (this.screen != null) {
+             this.screen.added();
+@@ -1214,6 +_,7 @@
              FreeTypeUtil.destroy();
              Util.shutdownExecutors();
              RenderSystem.getDevice().close();
@@ -155,19 +155,17 @@
          } catch (Throwable throwable) {
              LOGGER.error("Shutdown failure!", throwable);
              throw throwable;
-@@ -1248,9 +_,11 @@
-         this.mouseHandler.handleAccumulatedMovement();
-         profilerfiller.pop();
+@@ -1278,7 +_,9 @@
+         RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(rendertarget.getColorTexture(), 0, rendertarget.getDepthTexture(), 1.0);
+         profilerfiller.push("gameRenderer");
          if (!this.noRender) {
 +            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
-             profilerfiller.popPush("gameRenderer");
              this.gameRenderer.render(this.deltaTracker, p_91384_);
-             profilerfiller.pop();
 +            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
          }
  
-         profilerfiller.push("blit");
-@@ -1379,10 +_,12 @@
+         profilerfiller.popPush("blit");
+@@ -1388,10 +_,12 @@
          this.window.setGuiScale(i);
          if (this.screen != null) {
              this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
@@ -180,7 +178,7 @@
          this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
          this.mouseHandler.setIgnoreFirstMove();
      }
-@@ -1520,6 +_,7 @@
+@@ -1529,6 +_,7 @@
      }
  
      public void stop() {
@@ -188,7 +186,7 @@
          this.running = false;
      }
  
-@@ -1547,10 +_,18 @@
+@@ -1556,10 +_,18 @@
              if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
                  BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                  BlockPos blockpos = blockhitresult.getBlockPos();
@@ -197,20 +195,20 @@
 +                    var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
 +                    if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
 +                       if (inputEvent.shouldSwingHand()) {
-+                          this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
++                          this.level.addBreakingBlockEffect(blockpos, blockhitresult);
 +                          this.player.swing(InteractionHand.MAIN_HAND);
 +                       }
 +                       return;
 +                    }
                      Direction direction = blockhitresult.getDirection();
 -                    if (this.gameMode.continueDestroyBlock(blockpos, direction)) {
--                        this.particleEngine.crack(blockpos, direction);
+-                        this.level.addBreakingBlockEffect(blockpos, direction);
 +                    if (this.gameMode.continueDestroyBlock(blockpos, direction) && inputEvent.shouldSwingHand()) {
-+                        this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
++                        this.level.addBreakingBlockEffect(blockpos, blockhitresult);
                          this.player.swing(InteractionHand.MAIN_HAND);
                      }
                  }
-@@ -1578,6 +_,8 @@
+@@ -1587,6 +_,8 @@
                  return false;
              } else {
                  boolean flag = false;
@@ -219,7 +217,7 @@
                  switch (this.hitResult.getType()) {
                      case ENTITY:
                          this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
-@@ -1585,7 +_,7 @@
+@@ -1594,7 +_,7 @@
                      case BLOCK:
                          BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                          BlockPos blockpos = blockhitresult.getBlockPos();
@@ -228,7 +226,7 @@
                              this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
                              if (this.level.getBlockState(blockpos).isAir()) {
                                  flag = true;
-@@ -1598,8 +_,10 @@
+@@ -1607,8 +_,10 @@
                          }
  
                          this.player.resetAttackStrengthTicker();
@@ -239,7 +237,7 @@
                  this.player.swing(InteractionHand.MAIN_HAND);
                  return flag;
              }
-@@ -1615,6 +_,12 @@
+@@ -1624,6 +_,12 @@
                  }
  
                  for (InteractionHand interactionhand : InteractionHand.values()) {
@@ -252,7 +250,7 @@
                      ItemStack itemstack = this.player.getItemInHand(interactionhand);
                      if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
                          return;
-@@ -1635,7 +_,7 @@
+@@ -1644,7 +_,7 @@
                                  }
  
                                  if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
@@ -261,7 +259,7 @@
                                          this.player.swing(interactionhand);
                                      }
  
-@@ -1647,7 +_,7 @@
+@@ -1656,7 +_,7 @@
                                  int i = itemstack.getCount();
                                  InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
                                  if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
@@ -270,7 +268,7 @@
                                          this.player.swing(interactionhand);
                                          if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.player.hasInfiniteMaterials())) {
                                              this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
-@@ -1663,6 +_,9 @@
+@@ -1672,6 +_,9 @@
                          }
                      }
  
@@ -280,7 +278,7 @@
                      if (!itemstack.isEmpty()
                          && this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
                          if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
-@@ -1692,6 +_,8 @@
+@@ -1701,6 +_,8 @@
          }
  
          ProfilerFiller profilerfiller = Profiler.get();
@@ -289,7 +287,7 @@
          profilerfiller.push("gui");
          this.chatListener.tick();
          this.gui.tick(this.pause);
-@@ -1778,6 +_,7 @@
+@@ -1786,6 +_,7 @@
  
                  this.tutorial.tick();
  
@@ -297,7 +295,7 @@
                  try {
                      this.level.tick(() -> true);
                  } catch (Throwable throwable1) {
-@@ -1791,6 +_,7 @@
+@@ -1799,6 +_,7 @@
  
                      throw new ReportedException(crashreport1);
                  }
@@ -305,7 +303,7 @@
              }
  
              profilerfiller.popPush("animateTick");
-@@ -1815,6 +_,7 @@
+@@ -1823,6 +_,7 @@
          profilerfiller.popPush("keyboard");
          this.keyboardHandler.tick();
          profilerfiller.pop();
@@ -313,15 +311,15 @@
      }
  
      private boolean isLevelRunningNormally() {
-@@ -2031,6 +_,7 @@
+@@ -2041,6 +_,7 @@
      }
  
-     public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
+     public void setLevel(ClientLevel p_91157_) {
 +        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_);
-@@ -2068,6 +_,7 @@
+     }
+@@ -2094,6 +_,7 @@
          IntegratedServer integratedserver = this.singleplayerServer;
          this.singleplayerServer = null;
          this.gameRenderer.resetData();
@@ -329,27 +327,27 @@
          this.gameMode = null;
          this.narrator.clear();
          this.clientLevelTeardownInProgress = true;
-@@ -2075,6 +_,7 @@
+@@ -2101,6 +_,7 @@
          try {
-             this.updateScreenAndTick(p_335030_);
              if (this.level != null) {
-+                net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
-                 if (integratedserver != null) {
-                     ProfilerFiller profilerfiller = Profiler.get();
-                     profilerfiller.push("waitForServer");
-@@ -2088,6 +_,7 @@
- 
                  this.gui.onDisconnected();
-                 this.isLocalServer = false;
++                net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
+             }
+ 
+             if (integratedserver != null) {
+@@ -2113,6 +_,7 @@
+                 }
+ 
+                 profilerfiller.pop();
 +                net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(this.level);
              }
  
-             this.level = null;
-@@ -2236,6 +_,7 @@
+             this.setScreenAndShow(p_335030_);
+@@ -2254,6 +_,7 @@
  
      private void pickBlock() {
          if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
 +            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInputPickBlock(this.options.keyPickItem)) return;
-             boolean flag = Screen.hasControlDown();
+             boolean flag = this.hasControlDown();
              switch (this.hitResult) {
                  case BlockHitResult blockhitresult:

patches/minecraft/net/minecraft/client/MouseHandler.java.patch

@@ -1,40 +1,40 @@
 --- a/net/minecraft/client/MouseHandler.java
 +++ b/net/minecraft/client/MouseHandler.java
-@@ -90,6 +_,7 @@
-                 this.activeButton = -1;
+@@ -87,6 +_,7 @@
+                 this.activeButton = null;
              }
  
-+            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(p_91532_, p_91533_, p_91534_)) return;
++            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(mousebuttoninfo, p_423948_)) return;
              if (this.minecraft.getOverlay() == null) {
                  if (this.minecraft.screen == null) {
                      if (!this.mouseGrabbed && flag) {
 @@ -103,7 +_,7 @@
-                         screen.afterMouseAction();
- 
                          try {
--                            if (screen.mouseClicked(d0, d1, i)) {
-+                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, d0, d1, i)) {
+                             long i = Util.getMillis();
+                             boolean flag1 = i - this.lastClickTime < 250L && this.lastClickButton == mousebuttonevent.button();
+-                            if (screen.mouseClicked(mousebuttonevent, flag1)) {
++                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, d0, d1, mousebuttonevent, flag1)) {
+                                 this.lastClickTime = i;
+                                 this.lastClickButton = mousebuttoninfo.button();
                                  return;
-                             }
-                         } catch (Throwable throwable1) {
-@@ -116,7 +_,7 @@
+@@ -118,7 +_,7 @@
                          }
                      } else {
                          try {
--                            if (screen.mouseReleased(d0, d1, i)) {
-+                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, d0, d1, i)) {
+-                            if (screen.mouseReleased(mousebuttonevent)) {
++                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, d0, d1, mousebuttonevent)) {
                                  return;
                              }
                          } catch (Throwable throwable) {
-@@ -150,6 +_,7 @@
+@@ -148,6 +_,7 @@
+                     KeyMapping.click(inputconstants$key);
                  }
              }
++            net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(mousebuttoninfo, p_423948_);
          }
-+        net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
      }
  
-     public void fillMousePositionDetails(CrashReportCategory p_398230_, Window p_398216_) {
-@@ -189,7 +_,9 @@
+@@ -204,7 +_,9 @@
                  if (this.minecraft.screen != null) {
                      double d3 = this.getScaledXPos(this.minecraft.getWindow());
                      double d4 = this.getScaledYPos(this.minecraft.getWindow());
@@ -45,7 +45,7 @@
                      this.minecraft.screen.afterMouseAction();
                  } else if (this.minecraft.player != null) {
                      Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
-@@ -198,6 +_,7 @@
+@@ -213,6 +_,7 @@
                      }
  
                      int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
@@ -53,16 +53,16 @@
                      if (this.minecraft.player.isSpectator()) {
                          if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
                              this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
-@@ -303,7 +_,7 @@
+@@ -321,7 +_,7 @@
                      double d5 = getScaledYPos(window, this.accumulatedDY);
  
                      try {
--                        screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5);
+-                        screen.mouseDragged(new MouseButtonEvent(d2, d3, this.activeButton), d4, d5);
++                        net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, new MouseButtonEvent(d2, d3, this.activeButton), d4, d5);
                      } catch (Throwable throwable) {
                          CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
                          screen.fillCrashDetails(crashreport1);
-@@ -393,6 +_,14 @@
+@@ -408,6 +_,14 @@
  
      public double ypos() {
          return this.ypos;

patches/minecraft/net/minecraft/client/Options.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -671,7 +_,8 @@
+@@ -709,7 +_,8 @@
          },
          new OptionInstance.LazyEnum<>(
              () -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
@@ -10,7 +10,7 @@
                  ? Optional.empty()
                  : Optional.of(p_232011_),
              Codec.STRING
-@@ -705,6 +_,7 @@
+@@ -743,6 +_,7 @@
      );
      public boolean syncWrites;
      public boolean startedCleanly = true;
@@ -18,7 +18,7 @@
  
      public OptionInstance<Boolean> darkMojangStudiosBackground() {
          return this.darkMojangStudiosBackground;
-@@ -1088,6 +_,7 @@
+@@ -1150,6 +_,7 @@
      }
  
      public Options(Minecraft p_92138_, File p_92139_) {
@@ -26,7 +26,7 @@
          this.minecraft = p_92138_;
          this.optionsFile = new File(p_92139_, "options.txt");
          boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
-@@ -1222,15 +_,28 @@
+@@ -1290,15 +_,28 @@
          this.startedCleanly = p_168428_.process("startedCleanly", this.startedCleanly);
          p_168428_.process("showNowPlayingToast", this.showNowPlayingToast);
          p_168428_.process("musicFrequency", this.musicFrequency);
@@ -56,7 +56,7 @@
          for (SoundSource soundsource : SoundSource.values()) {
              p_168428_.process("soundCategory_" + soundsource.getName(), this.soundSourceVolumes.get(soundsource));
          }
-@@ -1245,6 +_,10 @@
+@@ -1313,6 +_,10 @@
      }
  
      public void load() {
@@ -67,7 +67,7 @@
          try {
              if (!this.optionsFile.exists()) {
                  return;
-@@ -1269,7 +_,8 @@
+@@ -1337,7 +_,8 @@
                  this.graphicsMode.set(isTrue(optional.get()) ? GraphicsStatus.FANCY : GraphicsStatus.FAST);
              }
  
@@ -77,7 +77,7 @@
                  new Options.FieldAccess() {
                      @Nullable
                      private String getValue(String p_394210_) {
-@@ -1350,6 +_,17 @@
+@@ -1418,6 +_,17 @@
              );
              compoundtag1.getString("fullscreenResolution").ifPresent(p_389133_ -> this.fullscreenVideoModeString = p_389133_);
              KeyMapping.resetMapping();
@@ -95,7 +95,7 @@
          } catch (Exception exception) {
              LOGGER.error("Failed to load options", (Throwable)exception);
          }
-@@ -1377,9 +_,11 @@
+@@ -1445,9 +_,11 @@
      public void save() {
          try (final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
              printwriter.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version());
@@ -107,7 +107,7 @@
                          printwriter.print(p_168491_);
                          printwriter.print(':');
                      }
-@@ -1435,6 +_,12 @@
+@@ -1503,6 +_,12 @@
              if (s != null) {
                  printwriter.println("fullscreenResolution:" + s);
              }
@@ -120,7 +120,7 @@
          } catch (Exception exception) {
              LOGGER.error("Failed to save options", (Throwable)exception);
          }
-@@ -1473,6 +_,7 @@
+@@ -1541,6 +_,7 @@
      }
  
      public void broadcastOptions() {
@@ -128,7 +128,7 @@
          if (this.minecraft.player != null) {
              this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
          }
-@@ -1586,6 +_,23 @@
+@@ -1654,6 +_,23 @@
  
      public static Component genericValueLabel(Component p_231901_, int p_231902_) {
          return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));

patches/minecraft/net/minecraft/client/ToggleKeyMapping.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/ToggleKeyMapping.java
 +++ b/net/minecraft/client/ToggleKeyMapping.java
-@@ -17,7 +_,7 @@
+@@ -31,7 +_,7 @@
      @Override
      public void setDown(boolean p_92534_) {
          if (this.needsToggle.getAsBoolean()) {
@@ -9,7 +9,7 @@
                  super.setDown(!this.isDown());
              }
          } else {
-@@ -27,5 +_,9 @@
+@@ -56,5 +_,9 @@
  
      protected void reset() {
          super.setDown(false);

patches/minecraft/net/minecraft/client/data/models/ItemModelGenerators.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/data/models/ItemModelGenerators.java
 +++ b/net/minecraft/client/data/models/ItemModelGenerators.java
-@@ -871,6 +_,9 @@
+@@ -882,6 +_,9 @@
          this.declareCustomModelItem(Items.COD);
          this.declareCustomModelItem(Items.FEATHER);
          this.declareCustomModelItem(Items.LEAD);

patches/minecraft/net/minecraft/client/gui/Font.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Font.java
 +++ b/net/minecraft/client/gui/Font.java
-@@ -32,7 +_,7 @@
+@@ -31,7 +_,7 @@
  import org.joml.Matrix4f;
  
  @OnlyIn(Dist.CLIENT)

patches/minecraft/net/minecraft/client/gui/Gui.java.patch

@@ -9,7 +9,7 @@
      private final SubtitleOverlay subtitleOverlay;
      private final SpectatorGui spectatorGui;
      private final PlayerTabOverlay tabList;
-@@ -194,6 +_,7 @@
+@@ -196,6 +_,7 @@
              () -> new JumpableVehicleBarRenderer(p_330021_)
          );
          this.resetTitleTimes();
@@ -17,10 +17,10 @@
      }
  
      public void resetTitleTimes() {
-@@ -204,6 +_,10 @@
+@@ -206,6 +_,10 @@
  
      public void render(GuiGraphics p_282884_, DeltaTracker p_342095_) {
-         if (this.minecraft.screen == null || !(this.minecraft.screen instanceof ReceivingLevelScreen)) {
+         if (!(this.minecraft.screen instanceof LevelLoadingScreen)) {
 +            if (Boolean.valueOf(true)) {
 +                net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.beginRender(p_282884_, p_342095_);
 +                return;
@@ -28,7 +28,7 @@
              if (!this.minecraft.options.hideGui) {
                  this.renderCameraOverlays(p_282884_, p_342095_);
                  this.renderCrosshair(p_282884_, p_342095_);
-@@ -377,7 +_,7 @@
+@@ -389,7 +_,7 @@
              int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
              int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
              p_329202_.nextStratum();
@@ -37,7 +37,7 @@
          }
      }
  
-@@ -472,6 +_,8 @@
+@@ -477,6 +_,8 @@
  
              for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
                  Holder<MobEffect> holder = mobeffectinstance.getEffect();
@@ -46,7 +46,7 @@
                  if (mobeffectinstance.showIcon()) {
                      int k = p_282812_.guiWidth();
                      int l = 1;
-@@ -502,6 +_,7 @@
+@@ -507,6 +_,7 @@
                          }
                      }
  
@@ -54,7 +54,7 @@
                      p_282812_.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(holder), k + 3, l + 3, 18, 18, ARGB.white(f));
                  }
              }
-@@ -598,6 +_,10 @@
+@@ -603,6 +_,10 @@
      }
  
      public void renderSelectedItemName(GuiGraphics p_283501_) {
@@ -65,7 +65,7 @@
          Profiler.get().push("selectedItemName");
          if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
              MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
-@@ -605,9 +_,13 @@
+@@ -610,9 +_,13 @@
                  mutablecomponent.withStyle(ChatFormatting.ITALIC);
              }
  
@@ -81,7 +81,7 @@
              if (!this.minecraft.gameMode.canHurtPlayer()) {
                  k += 14;
              }
-@@ -618,7 +_,7 @@
+@@ -623,7 +_,7 @@
              }
  
              if (l > 0) {
@@ -90,7 +90,7 @@
              }
          }
  
-@@ -1146,7 +_,7 @@
+@@ -1151,7 +_,7 @@
              ItemStack itemstack = this.minecraft.player.getInventory().getSelectedItem();
              if (itemstack.isEmpty()) {
                  this.toolHighlightTimer = 0;

patches/minecraft/net/minecraft/client/gui/GuiGraphics.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/GuiGraphics.java
 +++ b/net/minecraft/client/gui/GuiGraphics.java
-@@ -72,7 +_,7 @@
+@@ -83,7 +_,7 @@
  import org.joml.Vector3f;
  
  @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
      private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
      private final Minecraft minecraft;
      private final Matrix3x2fStack pose;
-@@ -875,6 +_,7 @@
+@@ -950,6 +_,7 @@
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
                  CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
                  crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_283653_.getItem()));
@@ -17,7 +17,7 @@
                  crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_283653_.getComponents()));
                  crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_283653_.hasFoil()));
                  throw new ReportedException(crashreport);
-@@ -893,6 +_,7 @@
+@@ -968,6 +_,7 @@
              this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
              this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
              this.pose.popMatrix();
@@ -25,7 +25,7 @@
          }
      }
  
-@@ -904,21 +_,30 @@
+@@ -979,21 +_,30 @@
          this.setTooltipForNextFrame(this.minecraft.font, p_407686_, DefaultTooltipPositioner.INSTANCE, p_410475_, p_407139_, false);
      }
  
@@ -58,7 +58,7 @@
          this.setTooltipForNextFrameInternal(p_407847_, list, p_409369_, p_407472_, DefaultTooltipPositioner.INSTANCE, p_410303_, false);
      }
  
-@@ -931,7 +_,22 @@
+@@ -1006,7 +_,22 @@
      }
  
      public void setComponentTooltipForNextFrame(Font p_406239_, List<Component> p_410275_, int p_410594_, int p_409343_) {
@@ -82,31 +82,11 @@
      }
  
      public void setComponentTooltipForNextFrame(Font p_408650_, List<Component> p_407512_, int p_406019_, int p_408123_, @Nullable ResourceLocation p_409993_) {
-@@ -981,9 +_,14 @@
-     ) {
-         if (!p_409928_.isEmpty()) {
-             if (this.deferredTooltip == null || p_410618_) {
--                this.deferredTooltip = () -> this.renderTooltip(p_406605_, p_409928_, p_407794_, p_408784_, p_408798_, p_407676_);
-+                final var stackContext = this.tooltipStack;
-+                this.deferredTooltip = () -> this.renderTooltip(p_406605_, p_409928_, p_407794_, p_408784_, p_408798_, p_407676_, stackContext);
-             }
-         }
-+    }
-+
-+    public void renderTooltip(Font p_283128_, List<ClientTooltipComponent> p_282716_, int p_283678_, int p_281696_, ClientTooltipPositioner p_409451_, @Nullable ResourceLocation p_409298_) {
-+        renderTooltip(p_283128_, p_282716_, p_283678_, p_281696_, p_409451_, p_409298_, ItemStack.EMPTY);
-     }
- 
-     public void renderTooltip(
-@@ -992,13 +_,16 @@
-         int p_283678_,
-         int p_281696_,
+@@ -1069,11 +_,13 @@
          ClientTooltipPositioner p_409451_,
--        @Nullable ResourceLocation p_409298_
-+        @Nullable ResourceLocation p_409298_,
-+        ItemStack itemStack
+         @Nullable ResourceLocation p_409298_
      ) {
-+        var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(itemStack, this, p_283678_, p_281696_, guiWidth(), guiHeight(), p_282716_, p_283128_, p_409451_, p_409298_);
++        var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, this, p_283678_, p_281696_, guiWidth(), guiHeight(), p_282716_, p_283128_, p_409451_);
 +        if (preEvent == null) return;
          int i = 0;
          int j = p_282716_.size() == 1 ? -2 : 0;
@@ -117,7 +97,7 @@
              if (k > i) {
                  i = k;
              }
-@@ -1008,16 +_,17 @@
+@@ -1083,16 +_,17 @@
  
          int l1 = i;
          int i2 = j;
@@ -127,8 +107,8 @@
          int i1 = vector2ic.y();
          this.pose.pushMatrix();
 -        TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, p_409298_);
-+        var background = net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTooltipBackground(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282716_, preEvent.getBackground());
-+        TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, background.getBackground());
++        var background_event = net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTooltipBackground(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282716_, p_409298_);
++        TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, background_event.getBackground());
          int j1 = i1;
  
          for (int k1 = 0; k1 < p_282716_.size(); k1++) {
@@ -138,7 +118,7 @@
              j1 += clienttooltipcomponent1.getHeight(p_283128_) + (k1 == 0 ? 2 : 0);
          }
  
-@@ -1025,7 +_,7 @@
+@@ -1100,7 +_,7 @@
  
          for (int j2 = 0; j2 < p_282716_.size(); j2++) {
              ClientTooltipComponent clienttooltipcomponent2 = p_282716_.get(j2);
@@ -147,7 +127,7 @@
              j1 += clienttooltipcomponent2.getHeight(p_283128_) + (j2 == 0 ? 2 : 0);
          }
  
-@@ -1222,6 +_,14 @@
+@@ -1315,6 +_,14 @@
  
      public void submitProfilerChartRenderState(List<ResultField> p_408565_, int p_410147_, int p_406156_, int p_407365_, int p_408180_) {
          this.guiRenderState.submitPicturesInPictureState(new GuiProfilerChartRenderState(p_408565_, p_410147_, p_406156_, p_407365_, p_408180_, this.scissorStack.peek()));
@@ -161,4 +141,4 @@
 +        return this.scissorStack;
      }
  
-     @OnlyIn(Dist.CLIENT)
+     public TextureAtlasSprite getSprite(Material p_430745_) {

patches/minecraft/net/minecraft/client/gui/components/AbstractButton.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/gui/components/AbstractButton.java
 +++ b/net/minecraft/client/gui/components/AbstractButton.java
-@@ -38,7 +_,7 @@
+@@ -41,7 +_,7 @@
              this.getHeight(),
              ARGB.white(this.alpha)
          );
 -        int i = ARGB.color(this.alpha, this.active ? -1 : -6250336);
 +        int i = getFGColor();
          this.renderString(p_281670_, minecraft.font, i);
-     }
- 
+         if (this.isHovered()) {
+             p_281670_.requestCursor(this.isActive() ? CursorTypes.POINTING_HAND : CursorTypes.NOT_ALLOWED);

patches/minecraft/net/minecraft/client/gui/components/AbstractWidget.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -236,6 +_,25 @@
+@@ -238,6 +_,25 @@
          this.focused = p_93693_;
      }
  

patches/minecraft/net/minecraft/client/gui/components/Button.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/Button.java
 +++ b/net/minecraft/client/gui/components/Button.java
-@@ -31,6 +_,12 @@
+@@ -32,6 +_,12 @@
          this.createNarration = p_259552_;
      }
  
@@ -11,9 +11,9 @@
 +    }
 +
      @Override
-     public void onPress() {
+     public void onPress(InputWithModifiers p_424878_) {
          this.onPress.onPress(this);
-@@ -95,9 +_,12 @@
+@@ -96,9 +_,12 @@
          }
  
          public Button build() {

patches/minecraft/net/minecraft/client/gui/components/DebugScreenOverlay.java.patch

@@ -1,101 +0,0 @@
---- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
-+++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
-@@ -139,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);
-@@ -183,15 +_,19 @@
-         this.clientChunk = null;
-     }
- 
--    public void render(GuiGraphics p_281427_) {
--        ProfilerFiller profilerfiller = Profiler.get();
--        profilerfiller.push("debug");
-+    protected void update() {
-         Entity entity = this.minecraft.getCameraEntity();
-         this.block = entity.pick(20.0, 0.0F, false);
-         this.liquid = entity.pick(20.0, 0.0F, true);
-+    }
-+
-+    protected void drawText(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
-         this.drawGameInformation(p_281427_);
-         this.drawSystemInformation(p_281427_);
-         p_281427_.nextStratum();
-+    }
-+
-+    protected void drawFPSCharts(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
-         this.profilerPieChart.setBottomOffset(10);
-         if (this.renderFpsCharts) {
-             int i = p_281427_.guiWidth();
-@@ -204,7 +_,9 @@
- 
-             this.profilerPieChart.setBottomOffset(this.tpsChart.getFullHeight());
-         }
-+    }
- 
-+    protected void drawNetworkCharts(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
-         if (this.renderNetworkCharts) {
-             int l = p_281427_.guiWidth();
-             int i1 = l / 2;
-@@ -220,12 +_,22 @@
-         try (Zone zone = profilerfiller.zone("profilerPie")) {
-             this.profilerPieChart.render(p_281427_);
-         }
-+    }
-+
-+    public void render(GuiGraphics p_281427_) {
-+        ProfilerFiller profilerfiller = Profiler.get();
-+        profilerfiller.push("debug");
-+        this.update();
-+
-+        this.drawText(profilerfiller, p_281427_);
-+        this.drawFPSCharts(profilerfiller, p_281427_);
-+        this.drawNetworkCharts(profilerfiller, p_281427_);
- 
-         profilerfiller.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(
-@@ -239,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());
-+      net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281525_, minecraft.getWindow(), minecraft.getDeltaTracker().getRealtimeDeltaTicks(), list, true);
-+      this.renderLines(p_281525_, list, true);
-     }
- 
-     protected void drawSystemInformation(GuiGraphics p_281261_) {
-         List<String> list = this.getSystemInformation();
-+        net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281261_, minecraft.getWindow(), minecraft.getDeltaTracker().getRealtimeDeltaTicks(), list, false);
-         this.renderLines(p_281261_, list, false);
-     }
- 
-@@ -597,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;

patches/minecraft/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java
++++ b/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java
+@@ -25,6 +_,7 @@
+         if (entity != null) {
+             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()));
+         }
+ 
+         p_426755_.addToGroup(GROUP, list);

patches/minecraft/net/minecraft/client/gui/render/GuiRenderer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/render/GuiRenderer.java
 +++ b/net/minecraft/client/gui/render/GuiRenderer.java
-@@ -134,6 +_,7 @@
+@@ -146,6 +_,7 @@
              builder.put((Class<? extends PictureInPictureRenderState>)pictureinpicturerenderer.getRenderStateClass(), pictureinpicturerenderer);
          }
  

patches/minecraft/net/minecraft/client/gui/screens/ChatScreen.java.patch

@@ -1,10 +1,10 @@
 --- a/net/minecraft/client/gui/screens/ChatScreen.java
 +++ b/net/minecraft/client/gui/screens/ChatScreen.java
-@@ -89,6 +_,7 @@
-             return true;
-         } else if (p_95591_ == 257 || p_95591_ == 335) {
+@@ -115,6 +_,7 @@
+         } else if (p_426273_.isConfirmation()) {
              this.handleChatInput(this.input.getValue(), true);
+             this.exitReason = ChatScreen.ExitReason.DONE;
 +            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) {
+         } else {

patches/minecraft/net/minecraft/client/gui/screens/ConnectScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/ConnectScreen.java
 +++ b/net/minecraft/client/gui/screens/ConnectScreen.java
-@@ -102,6 +_,8 @@
+@@ -103,6 +_,8 @@
                      }
  
                      if (optional.isEmpty()) {

patches/minecraft/net/minecraft/client/gui/screens/LoadingOverlay.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/LoadingOverlay.java
 +++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
-@@ -61,6 +_,8 @@
+@@ -62,6 +_,8 @@
          return p_169325_ & 16777215 | p_169326_ << 24;
      }
  
@@ -9,7 +9,7 @@
      @Override
      public void render(GuiGraphics p_281839_, int p_282704_, int p_283650_, float p_283394_) {
          int i = p_281839_.guiWidth();
-@@ -97,6 +_,7 @@
+@@ -102,6 +_,7 @@
              f2 = 1.0F;
          }
  
@@ -17,7 +17,7 @@
          int l2 = (int)(p_281839_.guiWidth() * 0.5);
          int i1 = (int)(p_281839_.guiHeight() * 0.5);
          double d0 = Math.min(p_281839_.guiWidth() * 0.75, (double)p_281839_.guiHeight()) * 0.25;
-@@ -112,12 +_,14 @@
+@@ -117,6 +_,7 @@
          if (f < 1.0F) {
              this.drawProgressBar(p_281839_, i / 2 - k1, i2 - 5, i / 2 + k1, i2 + 5, 1.0F - Mth.clamp(f, 0.0F, 1.0F));
          }
@@ -25,18 +25,19 @@
  
          if (f >= 2.0F) {
              this.minecraft.setOverlay(null);
-         }
- 
-         if (this.fadeOutStart == -1L && this.reload.isDone() && (!this.fadeIn || f1 >= 2.0F)) {
+@@ -126,6 +_,7 @@
+     @Override
+     public void tick() {
+         if (this.fadeOutStart == -1L && this.reload.isDone() && this.isReadyToFadeOut()) {
 +            this.fadeOutStart = Util.getMillis(); // Forge: Moved up to guard against inf loops caused by callback
              try {
                  this.reload.checkExceptions();
                  this.onFinish.accept(Optional.empty());
-@@ -125,7 +_,6 @@
+@@ -133,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());
-             }
+                 Window window = this.minecraft.getWindow();
+                 this.minecraft.screen.init(this.minecraft, window.getGuiScaledWidth(), window.getGuiScaledHeight());

patches/minecraft/net/minecraft/client/gui/screens/PauseScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/PauseScreen.java
 +++ b/net/minecraft/client/gui/screens/PauseScreen.java
-@@ -105,6 +_,7 @@
+@@ -103,6 +_,7 @@
          } else {
              gridlayout$rowhelper.addChild(this.openScreenButton(PLAYER_REPORTING, () -> new SocialInteractionsScreen(this)));
          }

patches/minecraft/net/minecraft/client/gui/screens/Screen.java.patch

@@ -9,7 +9,7 @@
      }
  
      protected <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(T p_169406_) {
-@@ -339,8 +_,10 @@
+@@ -343,8 +_,10 @@
          this.width = p_96608_;
          this.height = p_96609_;
          if (!this.initialized) {
@@ -20,7 +20,7 @@
          } else {
              this.repositionElements();
          }
-@@ -353,8 +_,10 @@
+@@ -361,8 +_,10 @@
      protected void rebuildWidgets() {
          this.clearWidgets();
          this.clearFocus();
@@ -31,15 +31,16 @@
      }
  
      protected void fadeWidgets(float p_409453_) {
-@@ -389,6 +_,7 @@
+@@ -402,6 +_,8 @@
+             this.renderMenuBackground(p_283688_);
+         }
  
-         this.renderBlurredBackground(p_283688_);
-         this.renderMenuBackground(p_283688_);
 +        net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderScreenBackground(this, p_283688_);
++
+         this.minecraft.gui.renderDeferredSubtitles();
      }
  
-     protected void renderBlurredBackground(GuiGraphics p_407253_) {
-@@ -492,6 +_,19 @@
+@@ -484,6 +_,19 @@
      }
  
      public void onFilesDrop(List<Path> p_96591_) {

patches/minecraft/net/minecraft/client/gui/screens/TitleScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/TitleScreen.java
 +++ b/net/minecraft/client/gui/screens/TitleScreen.java
-@@ -54,6 +_,7 @@
+@@ -55,6 +_,7 @@
      private boolean fading;
      private long fadeInStart;
      private final LogoRenderer logoRenderer;
@@ -8,7 +8,7 @@
  
      public TitleScreen() {
          this(false);
-@@ -106,11 +_,15 @@
+@@ -107,11 +_,15 @@
          int j = this.width - i - 2;
          int k = 24;
          int l = this.height / 4 + 48;
@@ -24,7 +24,7 @@
  
          l = this.createTestWorldButton(l, 24);
          SpriteIconButton spriteiconbutton = this.addRenderableWidget(
-@@ -175,7 +_,7 @@
+@@ -178,7 +_,7 @@
          }).bounds(this.width / 2 - 100, i = p_96764_ + p_96765_, 200, 20).tooltip(tooltip).build()).active = flag;
          this.addRenderableWidget(
                  Button.builder(Component.translatable("menu.online"), p_325369_ -> this.minecraft.setScreen(new RealmsMainScreen(this)))
@@ -33,7 +33,7 @@
                      .tooltip(tooltip)
                      .build()
              )
-@@ -295,9 +_,18 @@
+@@ -298,9 +_,18 @@
              s = s + I18n.get("menu.modded");
          }
  

patches/minecraft/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
 +++ b/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
-@@ -51,6 +_,7 @@
+@@ -53,6 +_,7 @@
      @Nullable
      private AdvancementTab selectedTab;
      private boolean isScrolling;
@@ -8,7 +8,7 @@
  
      public AdvancementsScreen(ClientAdvancements p_97340_) {
          this(p_97340_, null);
-@@ -64,6 +_,19 @@
+@@ -66,6 +_,19 @@
  
      @Override
      protected void init() {
@@ -28,16 +28,16 @@
          this.layout.addTitleHeader(TITLE, this.font);
          this.tabs.clear();
          this.selectedTab = null;
-@@ -108,7 +_,7 @@
+@@ -110,7 +_,7 @@
              int j = (this.height - 140) / 2;
  
              for (AdvancementTab advancementtab : this.tabs.values()) {
--                if (advancementtab.isMouseOver(i, j, p_97343_, p_97344_)) {
-+                if (advancementtab.getPage() == tabPage && advancementtab.isMouseOver(i, j, p_97343_, p_97344_)) {
+-                if (advancementtab.isMouseOver(i, j, p_431395_.x(), p_431395_.y())) {
++                if (advancementtab.getPage() == tabPage && advancementtab.isMouseOver(i, j, p_431395_.x(), p_431395_.y())) {
                      this.advancements.setSelectedTab(advancementtab.getRootNode().holder(), true);
                      break;
                  }
-@@ -183,10 +_,12 @@
+@@ -185,10 +_,12 @@
          p_283395_.blit(RenderPipelines.GUI_TEXTURED, WINDOW_LOCATION, p_281890_, p_282532_, 0.0F, 0.0F, 252, 140, 256, 256);
          if (this.tabs.size() > 1) {
              for (AdvancementTab advancementtab : this.tabs.values()) {
@@ -50,7 +50,7 @@
                  advancementtab1.drawIcon(p_283395_, p_281890_, p_282532_);
              }
          }
-@@ -205,6 +_,7 @@
+@@ -207,6 +_,7 @@
  
          if (this.tabs.size() > 1) {
              for (AdvancementTab advancementtab : this.tabs.values()) {

patches/minecraft/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
-@@ -107,6 +_,7 @@
+@@ -105,6 +_,7 @@
          int i = this.leftPos;
          int j = this.topPos;
          super.render(p_409971_, p_409213_, p_408205_, p_408282_);
@@ -8,7 +8,7 @@
          p_409971_.pose().pushMatrix();
          p_409971_.pose().translate(i, j);
          this.renderLabels(p_409971_, p_409213_, p_408205_);
-@@ -119,6 +_,8 @@
+@@ -117,6 +_,8 @@
              this.onStopHovering(slot);
          }
  
@@ -17,7 +17,7 @@
          p_409971_.pose().popMatrix();
      }
  
-@@ -202,7 +_,7 @@
+@@ -200,7 +_,7 @@
              ItemStack itemstack = this.hoveredSlot.getItem();
              if (this.menu.getCarried().isEmpty() || this.showTooltipWithItemInHand(itemstack)) {
                  p_283594_.setTooltipForNextFrame(
@@ -26,7 +26,7 @@
                  );
              }
          }
-@@ -218,7 +_,8 @@
+@@ -216,7 +_,8 @@
  
      private void renderFloatingItem(GuiGraphics p_282567_, ItemStack p_281330_, int p_281772_, int p_281689_, @Nullable String p_282568_) {
          p_282567_.renderItem(p_281330_, p_281772_, p_281689_);
@@ -36,87 +36,84 @@
      }
  
      protected void renderLabels(GuiGraphics p_281635_, int p_282681_, int p_283686_) {
-@@ -319,7 +_,8 @@
-         if (super.mouseClicked(p_97748_, p_97749_, p_97750_)) {
+@@ -317,7 +_,8 @@
+         if (super.mouseClicked(p_427253_, p_427622_)) {
              return true;
          } else {
--            boolean flag = this.minecraft.options.keyPickItem.matchesMouse(p_97750_) && this.minecraft.player.hasInfiniteMaterials();
-+            InputConstants.Key mouseKey = InputConstants.Type.MOUSE.getOrCreate(p_97750_);
-+            boolean flag = this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey);
-             Slot slot = this.getHoveredSlot(p_97748_, p_97749_);
-             long i = Util.getMillis();
-             this.doubleclick = this.lastClickSlot == slot && i - this.lastClickTime < 250L && this.lastClickButton == p_97750_;
-@@ -330,6 +_,7 @@
-                 int j = this.leftPos;
-                 int k = this.topPos;
-                 boolean flag1 = this.hasClickedOutside(p_97748_, p_97749_, j, k, p_97750_);
+-            boolean flag = this.minecraft.options.keyPickItem.matchesMouse(p_427253_) && this.minecraft.player.hasInfiniteMaterials();
++            var mouseKey = com.mojang.blaze3d.platform.InputConstants.Type.MOUSE.getOrCreate(p_427253_.button());
++            boolean flag = this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey) && this.minecraft.player.hasInfiniteMaterials();
+             Slot slot = this.getHoveredSlot(p_427253_.x(), p_427253_.y());
+             this.doubleclick = this.lastClickSlot == slot && p_427622_;
+             this.skipNextRelease = false;
+@@ -327,6 +_,7 @@
+                 int i = this.leftPos;
+                 int j = this.topPos;
+                 boolean flag1 = this.hasClickedOutside(p_427253_.x(), p_427253_.y(), i, j);
 +                if (slot != null) flag1 = false; // Forge, prevent dropping of items through slots outside of GUI boundaries
-                 int l = -1;
+                 int k = -1;
                  if (slot != null) {
-                     l = slot.index;
-@@ -355,7 +_,7 @@
+                     k = slot.index;
+@@ -352,7 +_,7 @@
                          }
                      } else if (!this.isQuickCrafting) {
                          if (this.menu.getCarried().isEmpty()) {
 -                            if (flag) {
 +                            if (this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey)) {
-                                 this.slotClicked(slot, l, p_97750_, ClickType.CLONE);
+                                 this.slotClicked(slot, k, p_427253_.button(), ClickType.CLONE);
                              } else {
-                                 boolean flag2 = l != -999
-@@ -383,7 +_,7 @@
+                                 boolean flag2 = k != -999 && p_427253_.hasShiftDown();
+@@ -376,7 +_,7 @@
                                  this.quickCraftingType = 0;
-                             } else if (p_97750_ == 1) {
+                             } else if (p_427253_.button() == 1) {
                                  this.quickCraftingType = 1;
 -                            } else if (flag) {
 +                            } else if (this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey)) {
                                  this.quickCraftingType = 2;
                              }
                          }
-@@ -459,10 +_,13 @@
+@@ -453,10 +_,13 @@
  
      @Override
-     public boolean mouseReleased(double p_97812_, double p_97813_, int p_97814_) {
-+        super.mouseReleased(p_97812_, p_97813_, p_97814_); //Forge, Call parent to release buttons
-         Slot slot = this.getHoveredSlot(p_97812_, p_97813_);
+     public boolean mouseReleased(MouseButtonEvent p_430939_) {
++        super.mouseReleased(p_430939_); //Forge, Call parent to release buttons
+         Slot slot = this.getHoveredSlot(p_430939_.x(), p_430939_.y());
          int i = this.leftPos;
          int j = this.topPos;
-         boolean flag = this.hasClickedOutside(p_97812_, p_97813_, i, j, p_97814_);
+         boolean flag = this.hasClickedOutside(p_430939_.x(), p_430939_.y(), i, j);
 +        if (slot != null) flag = false; // Forge, prevent dropping of items through slots outside of GUI boundaries
-+        InputConstants.Key mouseKey = InputConstants.Type.MOUSE.getOrCreate(p_97814_);
++        var mouseKey = com.mojang.blaze3d.platform.InputConstants.Type.MOUSE.getOrCreate(p_430939_.button());
          int k = -1;
          if (slot != null) {
              k = slot.index;
-@@ -479,7 +_,7 @@
+@@ -473,7 +_,7 @@
                          if (slot2 != null
                              && slot2.mayPickup(this.minecraft.player)
                              && slot2.hasItem()
 -                            && slot2.container == slot.container
 +                            && slot2.isSameInventory(slot)
                              && AbstractContainerMenu.canItemQuickReplace(slot2, this.lastQuickMoved, true)) {
-                             this.slotClicked(slot2, slot2.index, p_97814_, ClickType.QUICK_MOVE);
+                             this.slotClicked(slot2, slot2.index, p_430939_.button(), ClickType.QUICK_MOVE);
                          }
-@@ -545,7 +_,7 @@
+@@ -538,7 +_,7 @@
  
                  this.slotClicked(null, -999, AbstractContainerMenu.getQuickcraftMask(2, this.quickCraftingType), ClickType.QUICK_CRAFT);
              } else if (!this.menu.getCarried().isEmpty()) {
--                if (this.minecraft.options.keyPickItem.matchesMouse(p_97814_)) {
+-                if (this.minecraft.options.keyPickItem.matchesMouse(p_430939_)) {
 +                if (this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey)) {
-                     this.slotClicked(slot, k, p_97814_, ClickType.CLONE);
+                     this.slotClicked(slot, k, p_430939_.button(), ClickType.CLONE);
                  } else {
-                     boolean flag1 = k != -999
-@@ -622,9 +_,10 @@
- 
-     @Override
-     public boolean keyPressed(int p_97765_, int p_97766_, int p_97767_) {
-+        InputConstants.Key mouseKey = InputConstants.getKey(p_97765_, p_97766_);
-         if (super.keyPressed(p_97765_, p_97766_, p_97767_)) {
+                     boolean flag1 = k != -999 && p_430939_.hasShiftDown();
+@@ -609,7 +_,7 @@
+     public boolean keyPressed(KeyEvent p_424324_) {
+         if (super.keyPressed(p_424324_)) {
              return true;
--        } else if (this.minecraft.options.keyInventory.matches(p_97765_, p_97766_)) {
-+        } else if (this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey)) {
+-        } else if (this.minecraft.options.keyInventory.matches(p_424324_)) {
++        } else if (this.minecraft.options.keyInventory.isActiveAndMatches(com.mojang.blaze3d.platform.InputConstants.getKey(p_424324_))) {
              this.onClose();
              return true;
          } else {
-@@ -698,6 +_,13 @@
+@@ -688,6 +_,13 @@
  
          super.onClose();
      }

patches/minecraft/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
-@@ -113,6 +_,8 @@
+@@ -116,6 +_,8 @@
      private final Set<TagKey<Item>> visibleTags = new HashSet<>();
      private final boolean displayOperatorCreativeTab;
      private final EffectsInInventory effects;
@@ -9,7 +9,7 @@
  
      public CreativeModeInventoryScreen(LocalPlayer p_344408_, FeatureFlagSet p_260074_, boolean p_259569_) {
          super(new CreativeModeInventoryScreen.ItemPickerMenu(p_344408_), p_344408_.getInventory(), CommonComponents.EMPTY);
-@@ -161,7 +_,7 @@
+@@ -164,7 +_,7 @@
      private void refreshCurrentTabContents(Collection<ItemStack> p_261591_) {
          int i = this.menu.getRowIndexForScroll(this.scrollOffs);
          this.menu.items.clear();
@@ -18,7 +18,7 @@
              this.refreshSearchResults();
          } else {
              this.menu.items.addAll(p_261591_);
-@@ -329,6 +_,36 @@
+@@ -332,6 +_,36 @@
      protected void init() {
          if (this.minecraft.player.hasInfiniteMaterials()) {
              super.init();
@@ -55,8 +55,8 @@
              this.searchBox = new EditBox(this.font, this.leftPos + 82, this.topPos + 6, 80, 9, Component.translatable("itemGroup.search"));
              this.searchBox.setMaxLength(50);
              this.searchBox.setBordered(false);
-@@ -375,7 +_,7 @@
-     public boolean charTyped(char p_98521_, int p_98522_) {
+@@ -378,7 +_,7 @@
+     public boolean charTyped(CharacterEvent p_424087_) {
          if (this.ignoreTextInput) {
              return false;
 -        } else if (selectedTab.getType() != CreativeModeTab.Type.SEARCH) {
@@ -64,16 +64,16 @@
              return false;
          } else {
              String s = this.searchBox.getValue();
-@@ -394,7 +_,7 @@
+@@ -397,7 +_,7 @@
      @Override
-     public boolean keyPressed(int p_98547_, int p_98548_, int p_98549_) {
+     public boolean keyPressed(KeyEvent p_429237_) {
          this.ignoreTextInput = false;
 -        if (selectedTab.getType() != CreativeModeTab.Type.SEARCH) {
 +        if (!selectedTab.hasSearchBar()) {
-             if (this.minecraft.options.keyChat.matches(p_98547_, p_98548_)) {
+             if (this.minecraft.options.keyChat.matches(p_429237_)) {
                  this.ignoreTextInput = true;
                  this.selectTab(CreativeModeTabs.searchTab());
-@@ -430,6 +_,7 @@
+@@ -433,6 +_,7 @@
      }
  
      private void refreshSearchResults() {
@@ -81,7 +81,7 @@
          this.menu.items.clear();
          this.visibleTags.clear();
          String s = this.searchBox.getValue();
-@@ -442,10 +_,10 @@
+@@ -445,10 +_,10 @@
                  SearchTree<ItemStack> searchtree;
                  if (s.startsWith("#")) {
                      s = s.substring(1);
@@ -94,7 +94,7 @@
                  }
  
                  this.menu.items.addAll(searchtree.search(s.toLowerCase(Locale.ROOT)));
-@@ -477,7 +_,8 @@
+@@ -480,7 +_,8 @@
      @Override
      protected void renderLabels(GuiGraphics p_283168_, int p_281774_, int p_281466_) {
          if (selectedTab.showTitle()) {
@@ -104,17 +104,17 @@
          }
      }
  
-@@ -487,7 +_,7 @@
-             double d0 = p_98531_ - this.leftPos;
-             double d1 = p_98532_ - this.topPos;
+@@ -490,7 +_,7 @@
+             double d0 = p_430803_.x() - this.leftPos;
+             double d1 = p_430803_.y() - this.topPos;
  
 -            for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
 +            for (CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
                  if (this.checkTabClicked(creativemodetab, d0, d1)) {
                      return true;
                  }
-@@ -509,7 +_,7 @@
-             double d1 = p_98623_ - this.topPos;
+@@ -512,7 +_,7 @@
+             double d1 = p_423848_.y() - this.topPos;
              this.scrolling = false;
  
 -            for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
@@ -122,7 +122,7 @@
                  if (this.checkTabClicked(creativemodetab, d0, d1)) {
                      this.selectTab(creativemodetab);
                      return true;
-@@ -603,13 +_,15 @@
+@@ -606,13 +_,15 @@
              this.originalSlots = null;
          }
  
@@ -139,7 +139,7 @@
  
              this.refreshSearchResults();
          } else {
-@@ -673,7 +_,14 @@
+@@ -676,7 +_,14 @@
          super.render(p_283000_, p_281317_, p_282770_, p_281295_);
          this.effects.renderTooltip(p_283000_, p_281317_, p_282770_);
  
@@ -155,7 +155,7 @@
              if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
                  break;
              }
-@@ -697,7 +_,7 @@
+@@ -700,7 +_,7 @@
      public List<Component> getTooltipFromContainerItem(ItemStack p_281769_) {
          boolean flag = this.hoveredSlot != null && this.hoveredSlot instanceof CreativeModeInventoryScreen.CustomCreativeSlot;
          boolean flag1 = selectedTab.getType() == CreativeModeTab.Type.CATEGORY;
@@ -164,7 +164,7 @@
          TooltipFlag.Default tooltipflag$default = this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL;
          TooltipFlag tooltipflag = flag ? tooltipflag$default.asCreative() : tooltipflag$default;
          List<Component> list = p_281769_.getTooltipLines(Item.TooltipContext.of(this.minecraft.level), this.minecraft.player, tooltipflag);
-@@ -718,7 +_,7 @@
+@@ -721,7 +_,7 @@
              int i = 1;
  
              for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
@@ -173,7 +173,7 @@
                      list1.add(i++, creativemodetab.getDisplayName().copy().withStyle(ChatFormatting.BLUE));
                  }
              }
-@@ -729,7 +_,7 @@
+@@ -732,7 +_,7 @@
  
      @Override
      protected void renderBg(GuiGraphics p_282663_, float p_282504_, int p_282089_, int p_282249_) {
@@ -182,7 +182,7 @@
              if (creativemodetab != selectedTab) {
                  this.renderTabButton(p_282663_, creativemodetab);
              }
-@@ -745,6 +_,7 @@
+@@ -748,6 +_,7 @@
              p_282663_.blitSprite(RenderPipelines.GUI_TEXTURED, resourcelocation, j, k + (int)((i - k - 17) * this.scrollOffs), 12, 15);
          }
  
@@ -190,7 +190,7 @@
          this.renderTabButton(p_282663_, selectedTab);
          if (selectedTab.getType() == CreativeModeTab.Type.INVENTORY) {
              InventoryScreen.renderEntityInInventoryFollowsMouse(
-@@ -763,7 +_,7 @@
+@@ -766,7 +_,7 @@
      }
  
      private int getTabX(CreativeModeTab p_260136_) {
@@ -199,7 +199,7 @@
          int j = 27;
          int k = 27 * i;
          if (p_260136_.isAlignedRight()) {
-@@ -775,7 +_,7 @@
+@@ -778,7 +_,7 @@
  
      private int getTabY(CreativeModeTab p_260181_) {
          int i = 0;
@@ -208,7 +208,7 @@
              i -= 32;
          } else {
              i += this.imageHeight;
-@@ -803,8 +_,8 @@
+@@ -806,8 +_,8 @@
  
      protected void renderTabButton(GuiGraphics p_283590_, CreativeModeTab p_283489_) {
          boolean flag = p_283489_ == selectedTab;
@@ -219,7 +219,7 @@
          int j = this.leftPos + this.getTabX(p_283489_);
          int k = this.topPos - (flag1 ? 28 : -(this.imageHeight - 4));
          ResourceLocation[] aresourcelocation;
-@@ -814,6 +_,7 @@
+@@ -817,6 +_,7 @@
              aresourcelocation = flag ? SELECTED_BOTTOM_TABS : UNSELECTED_BOTTOM_TABS;
          }
  
@@ -227,7 +227,7 @@
          p_283590_.blitSprite(RenderPipelines.GUI_TEXTURED, aresourcelocation[Mth.clamp(i, 0, aresourcelocation.length)], j, k, 26, 32);
          int l = j + 13 - 8;
          int i1 = k + 16 - 8 + (flag1 ? 1 : -1);
-@@ -850,6 +_,14 @@
+@@ -853,6 +_,14 @@
          }
      }
  
@@ -242,7 +242,7 @@
      @OnlyIn(Dist.CLIENT)
      static class CustomCreativeSlot extends Slot {
          public CustomCreativeSlot(Container p_98633_, int p_98634_, int p_98635_, int p_98636_) {
-@@ -1031,6 +_,22 @@
+@@ -1034,6 +_,22 @@
          @Override
          public boolean mayPickup(Player p_98665_) {
              return this.target.mayPickup(p_98665_);

patches/minecraft/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
-@@ -106,7 +_,7 @@
+@@ -107,7 +_,7 @@
                  int l1 = 86 - this.font.width(s);
                  FormattedText formattedtext = EnchantmentNames.getInstance().getRandomName(this.font, l1);
                  int i2 = -9937334;
@@ -9,7 +9,7 @@
                      p_282430_.blitSprite(RenderPipelines.GUI_TEXTURED, ENCHANTMENT_SLOT_DISABLED_SPRITE, i1, j + 14 + 19 * l, 108, 19);
                      p_282430_.blitSprite(RenderPipelines.GUI_TEXTURED, DISABLED_LEVEL_SPRITES[l], i1 + 1, j + 15 + 19 * l, 16, 16);
                      p_282430_.drawWordWrap(this.font, formattedtext, j1, j + 16 + 19 * l, l1, ARGB.opaque((i2 & 16711422) >> 1), false);
-@@ -157,13 +_,16 @@
+@@ -158,13 +_,16 @@
                  .registryAccess()
                  .lookupOrThrow(Registries.ENCHANTMENT)
                  .get(this.menu.enchantClue[j]);

patches/minecraft/net/minecraft/client/gui/screens/inventory/MerchantScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
-@@ -229,6 +_,14 @@
+@@ -230,6 +_,14 @@
          } else {
              p_281357_.renderItemDecorations(this.font, p_282046_, p_282403_, p_283601_, p_282046_.getCount() == 1 ? "1" : null);
              p_281357_.renderItemDecorations(this.font, p_283466_, p_282403_ + 14, p_283601_, p_283466_.getCount() == 1 ? "1" : null);

patches/minecraft/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
-@@ -371,6 +_,8 @@
-                 p_281406_.setTooltipForNextFrame(Lists.transform(this.onlinePlayersTooltip, Component::getVisualOrderText), p_283567_, p_282864_);
+@@ -363,6 +_,8 @@
+                 p_425273_.setTooltipForNextFrame(Lists.transform(this.onlinePlayersTooltip, Component::getVisualOrderText), p_424268_, p_430737_);
              }
  
-+            net.minecraftforge.client.ForgeHooksClient.drawForgePingInfo(this.screen, serverData, p_281406_, p_281363_, p_282921_, p_283596_, p_283567_ - p_281363_, p_282864_ - p_282921_);
++            net.minecraftforge.client.ForgeHooksClient.drawForgePingInfo(this.screen, serverData, p_425273_, this.getContentX(), this.getContentY(), this.getContentWidth(), p_424268_ - this.getContentX(), p_430737_ - this.getContentY());
 +
-             if (this.minecraft.options.touchscreen().get() || p_282999_) {
-                 p_281406_.fill(p_281363_, p_282921_, p_281363_ + 32, p_282921_ + 32, -1601138544);
-                 int l = p_283567_ - p_281363_;
+             if (this.minecraft.options.touchscreen().get() || p_425246_) {
+                 p_425273_.fill(this.getContentX(), this.getContentY(), this.getContentX() + 32, this.getContentY() + 32, -1601138544);
+                 int i1 = p_424268_ - this.getContentX();

patches/minecraft/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java
 +++ b/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java
-@@ -148,9 +_,10 @@
+@@ -115,9 +_,10 @@
              this.name = p_343976_;
              this.changeButton = Button.builder(p_343976_, p_342196_ -> {
                      KeyBindsList.this.keyBindsScreen.selectedKey = p_343088_;
@@ -12,7 +12,7 @@
                  .createNarration(
                      p_342179_ -> p_343088_.isUnbound()
                          ? Component.translatable("narrator.controls.unbound", p_343976_)
-@@ -158,7 +_,7 @@
+@@ -125,7 +_,7 @@
                  )
                  .build();
              this.resetButton = Button.builder(RESET_BUTTON_TITLE, p_357685_ -> {
@@ -21,12 +21,13 @@
                  KeyBindsList.this.resetMappingAndUpdateButtons();
              }).bounds(0, 0, 50, 20).createNarration(p_344192_ -> Component.translatable("narrator.controls.reset", p_343976_)).build();
              this.refreshEntry();
-@@ -210,7 +_,7 @@
+@@ -166,7 +_,8 @@
              MutableComponent mutablecomponent = Component.empty();
              if (!this.key.isUnbound()) {
                  for (KeyMapping keymapping : KeyBindsList.this.minecraft.options.keyMappings) {
--                    if (keymapping != this.key && this.key.same(keymapping)) {
-+                    if ((keymapping != this.key && this.key.same(keymapping)) || keymapping.hasKeyModifierConflict(this.key)) { // FORGE: gracefully handle conflicts like SHIFT vs SHIFT+G
+-                    if (keymapping != this.key && this.key.same(keymapping) && (!keymapping.isDefault() || !this.key.isDefault())) {
++                    var vanillConflict = keymapping != this.key && this.key.same(keymapping) && (!keymapping.isDefault() || !this.key.isDefault());
++                    if (vanillConflict || keymapping.hasKeyModifierConflict(this.key)) { // FORGE: gracefully handle conflicts like SHIFT vs SHIFT+G
                          if (this.hasCollision) {
                              mutablecomponent.append(", ");
                          }

patches/minecraft/net/minecraft/client/gui/screens/options/controls/KeyBindsScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/options/controls/KeyBindsScreen.java
 +++ b/net/minecraft/client/gui/screens/options/controls/KeyBindsScreen.java
-@@ -41,7 +_,7 @@
+@@ -43,7 +_,7 @@
      protected void addFooter() {
          this.resetButton = Button.builder(Component.translatable("controls.resetAll"), p_343640_ -> {
              for (KeyMapping keymapping : this.options.keyMappings) {
@@ -9,37 +9,37 @@
              }
  
              this.keyBindsList.resetMappingAndUpdateButtons();
-@@ -73,11 +_,12 @@
-     public boolean keyPressed(int p_342715_, int p_342862_, int p_345515_) {
+@@ -75,11 +_,12 @@
+     public boolean keyPressed(KeyEvent p_424487_) {
          if (this.selectedKey != null) {
-             if (p_342715_ == 256) {
+             if (p_424487_.isEscape()) {
 -                this.selectedKey.setKey(InputConstants.UNKNOWN);
 +                this.selectedKey.setKeyModifierAndCode(null, InputConstants.UNKNOWN);
              } else {
--                this.selectedKey.setKey(InputConstants.getKey(p_342715_, p_342862_));
-+                this.selectedKey.setKeyModifierAndCode(null, InputConstants.getKey(p_342715_, p_342862_));
+-                this.selectedKey.setKey(InputConstants.getKey(p_424487_));
++                this.selectedKey.setKeyModifierAndCode(null, InputConstants.getKey(p_424487_));
              }
  
-+            if (p_342715_ == 256 || !net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.selectedKey.getKey()))
++            if (p_424487_.isEscape() || !net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.selectedKey.getKey()))
              this.selectedKey = null;
              this.lastKeySelection = Util.getMillis();
              this.keyBindsList.resetMappingAndUpdateButtons();
-@@ -100,5 +_,18 @@
+@@ -102,5 +_,18 @@
          }
  
          this.resetButton.active = flag;
 +    }
 +
 +    @Override
-+    public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
++    public boolean keyReleased(KeyEvent event) {
 +        // Forge: We wait for a second key above if the first press is a modifier
 +        // but if they release the modifier then set it explicitly.
-+        var key = InputConstants.getKey(keyCode, scanCode);
++        var key = InputConstants.getKey(event);
 +        if (this.selectedKey != null && this.selectedKey.getKey() == key) {
 +            this.selectedKey = null;
 +            this.lastKeySelection = Util.getMillis();
 +            this.keyBindsList.resetMappingAndUpdateButtons();
 +        }
-+        return super.keyReleased(keyCode, scanCode, modifiers);
++        return super.keyReleased(event);
      }
  }

patches/minecraft/net/minecraft/client/gui/screens/packs/PackSelectionModel.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/packs/PackSelectionModel.java
 +++ b/net/minecraft/client/gui/screens/packs/PackSelectionModel.java
-@@ -106,6 +_,10 @@
+@@ -108,6 +_,10 @@
          boolean canMoveUp();
  
          boolean canMoveDown();
@@ -11,7 +11,7 @@
      }
  
      @OnlyIn(Dist.CLIENT)
-@@ -205,6 +_,11 @@
+@@ -207,6 +_,11 @@
          @Override
          public void moveDown() {
              this.move(1);

patches/minecraft/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java.patch

@@ -1,11 +0,0 @@
---- a/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
-+++ b/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
-@@ -159,7 +_,7 @@
-         TransferableSelectionList.PackEntry transferableselectionlist$packentry = p_100014_.getSelected();
-         String s = transferableselectionlist$packentry == null ? "" : transferableselectionlist$packentry.getPackId();
-         p_100014_.setSelected(null);
--        p_100015_.forEach(
-+        p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach(
-             p_404866_ -> {
-                 TransferableSelectionList.PackEntry transferableselectionlist$packentry1 = new TransferableSelectionList.PackEntry(
-                     this.minecraft, p_100014_, p_404866_

patches/minecraft/net/minecraft/client/gui/screens/packs/TransferableSelectionList.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/gui/screens/packs/TransferableSelectionList.java
++++ b/net/minecraft/client/gui/screens/packs/TransferableSelectionList.java
+@@ -64,7 +_,7 @@
+         Component component = Component.empty().append(this.title).withStyle(ChatFormatting.UNDERLINE, ChatFormatting.BOLD);
+         this.addEntry(new TransferableSelectionList.HeaderEntry(this.minecraft.font, component), (int)(9.0F * 1.5F));
+         this.setSelected(null);
+-        p_429245_.forEach(p_430444_ -> {
++        p_429245_.filter(PackSelectionModel.Entry::notHidden).forEach(p_430444_ -> {
+             TransferableSelectionList.PackEntry transferableselectionlist$packentry = new TransferableSelectionList.PackEntry(this.minecraft, this, p_430444_);
+             this.addEntry(transferableselectionlist$packentry);
+             if (p_430177_ != null && p_430177_.getId().equals(p_430444_.getId())) {

patches/minecraft/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
 @@ -329,6 +_,8 @@
-         this.minecraft.forceSetScreen(new GenericMessageScreen(Component.translatable("selectWorld.resource_load")));
+         this.minecraft.setScreenAndShow(new GenericMessageScreen(Component.translatable("selectWorld.resource_load")));
          PackRepository packrepository = ServerPacksSource.createPackRepository(p_333651_);
  
 +        net.minecraftforge.common.ForgeHooks.readAdditionalLevelSaveData(p_333651_, p_333651_.getLevelDirectory());

patches/minecraft/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
-@@ -75,6 +_,7 @@
+@@ -79,6 +_,7 @@
      static final ResourceLocation JOIN_HIGHLIGHTED_SPRITE = ResourceLocation.withDefaultNamespace("world_list/join_highlighted");
      static final ResourceLocation JOIN_SPRITE = ResourceLocation.withDefaultNamespace("world_list/join");
      static final Logger LOGGER = LogUtils.getLogger();
@@ -8,31 +8,31 @@
      static final Component FROM_NEWER_TOOLTIP_1 = Component.translatable("selectWorld.tooltip.fromNewerVersion1").withStyle(ChatFormatting.RED);
      static final Component FROM_NEWER_TOOLTIP_2 = Component.translatable("selectWorld.tooltip.fromNewerVersion2").withStyle(ChatFormatting.RED);
      static final Component SNAPSHOT_TOOLTIP_1 = Component.translatable("selectWorld.tooltip.snapshot1").withStyle(ChatFormatting.GOLD);
-@@ -400,6 +_,7 @@
-             p_281612_.drawString(this.minecraft.font, s1, p_282820_ + 32 + 3, p_283181_ + 9 + 3, -8355712);
-             p_281612_.drawString(this.minecraft.font, component, p_282820_ + 32 + 3, p_283181_ + 9 + 9 + 3, -8355712);
-             p_281612_.blit(RenderPipelines.GUI_TEXTURED, this.icon.textureLocation(), p_282820_, p_283181_, 0.0F, 0.0F, 32, 32, 32, 32);
-+            renderExperimentalWarning(p_281612_, p_283204_, p_283025_, p_283181_, p_282820_);
-             if (this.minecraft.options.touchscreen().get() || p_283396_) {
-                 p_281612_.fill(p_282820_, p_283181_, p_282820_ + 32, p_283181_ + 32, -1601138544);
-                 int j = p_283204_ - p_282820_;
-@@ -450,6 +_,19 @@
-                     p_281612_.blitSprite(RenderPipelines.GUI_TEXTURED, resourcelocation, p_282820_, p_283181_, 32, 32);
-                 }
+@@ -494,6 +_,19 @@
              }
-+        }
-+
+         }
+ 
 +        // FORGE: Patch in experimental warning icon for worlds in the world selection screen
 +        private void renderExperimentalWarning(GuiGraphics guiGraphics, int mouseX, int mouseY, int top, int left) {
 +           if (this.summary.isLifecycleExperimental()) {
-+              int leftStart = left + WorldSelectionList.this.getRowWidth();
++              int leftStart = left + this.list.getRowWidth();
 +              guiGraphics.blit(RenderPipelines.GUI_TEXTURED, WorldSelectionList.FORGE_EXPERIMENTAL_WARNING_ICON, leftStart - 36, top, 0.0F, 0.0F, 32, 32, 32, 32);
-+              if (WorldSelectionList.this.getEntryAtPosition(mouseX, mouseY) == this && mouseX > leftStart - 36 && mouseX < leftStart) {
++              if (this.list.getEntryAtPosition(mouseX, mouseY) == this && mouseX > leftStart - 36 && mouseX < leftStart) {
 +                 var font = Minecraft.getInstance().font;
 +                 List<net.minecraft.util.FormattedCharSequence> tooltip = font.split(Component.translatable("forge.experimentalsettings.tooltip"), 200);
 +                 guiGraphics.setTooltipForNextFrame(font, tooltip, mouseX, mouseY);
 +              }
 +           }
-         }
- 
++        }
++
          @Override
+         public Component getNarration() {
+             Component component = Component.translatable(
+@@ -520,6 +_,7 @@
+             this.infoText.setPosition(i, this.getContentY() + 9 + 9 + 3);
+             this.infoText.render(p_424437_, p_425443_, p_425024_, p_424775_);
+             p_424437_.blit(RenderPipelines.GUI_TEXTURED, this.icon.textureLocation(), this.getContentX(), this.getContentY(), 0.0F, 0.0F, 32, 32, 32, 32);
++            renderExperimentalWarning(p_424437_, p_425443_, p_425024_, this.getContentY(), this.getContentX());
+             if (this.list.entryType == WorldSelectionList.EntryType.SINGLEPLAYER && (this.minecraft.options.touchscreen().get() || p_430261_)) {
+                 p_424437_.fill(this.getContentX(), this.getContentY(), this.getContentX() + 32, this.getContentY() + 32, -1601138544);
+                 int j = p_425443_ - this.getContentX();

patches/minecraft/net/minecraft/client/main/Main.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/main/Main.java
 +++ b/net/minecraft/client/main/Main.java
-@@ -123,8 +_,8 @@
+@@ -116,8 +_,8 @@
              CrashReport.preload();
              logger = LogUtils.getLogger();
              s1 = "Bootstrap";

patches/minecraft/net/minecraft/client/model/HumanoidModel.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/model/HumanoidModel.java
 +++ b/net/minecraft/client/model/HumanoidModel.java
-@@ -255,6 +_,8 @@
+@@ -290,6 +_,8 @@
              case BRUSH:
                  this.rightArm.xRot = this.rightArm.xRot * 0.5F - (float) (Math.PI / 5);
                  this.rightArm.yRot = 0.0F;
@@ -9,7 +9,7 @@
          }
      }
  
-@@ -299,6 +_,8 @@
+@@ -334,6 +_,8 @@
              case BRUSH:
                  this.leftArm.xRot = this.leftArm.xRot * 0.5F - (float) (Math.PI / 5);
                  this.leftArm.yRot = 0.0F;
@@ -18,7 +18,7 @@
          }
      }
  
-@@ -377,7 +_,7 @@
+@@ -402,7 +_,7 @@
      }
  
      @OnlyIn(Dist.CLIENT)
@@ -27,7 +27,7 @@
          EMPTY(false),
          ITEM(false),
          BLOCK(false),
-@@ -393,10 +_,28 @@
+@@ -418,10 +_,28 @@
  
          private ArmPose(final boolean p_102896_) {
              this.twoHanded = p_102896_;

patches/minecraft/net/minecraft/client/model/geom/LayerDefinitions.java.patch

@@ -1,10 +1,10 @@
 --- a/net/minecraft/client/model/geom/LayerDefinitions.java
 +++ b/net/minecraft/client/model/geom/LayerDefinitions.java
-@@ -505,6 +_,7 @@
-                 builder.put(ModelLayers.createHangingSignModelName(p_374591_, hangingsignrenderer$attachmenttype), layerdefinition60);
+@@ -506,6 +_,7 @@
+                 builder.put(ModelLayers.createHangingSignModelName(p_374591_, hangingsignrenderer$attachmenttype), layerdefinition57);
              }
          });
 +        net.minecraftforge.client.ForgeHooksClient.loadLayerDefinitions(builder);
          ImmutableMap<ModelLayerLocation, LayerDefinition> immutablemap = builder.build();
-         List<ModelLayerLocation> list = ModelLayers.getKnownLocations().filter(p_171117_ -> !immutablemap.containsKey(p_171117_)).collect(Collectors.toList());
+         List<ModelLayerLocation> list = ModelLayers.getKnownLocations().filter(p_171117_ -> !immutablemap.containsKey(p_171117_)).toList();
          if (!list.isEmpty()) {

patches/minecraft/net/minecraft/client/model/geom/ModelLayers.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/model/geom/ModelLayers.java
 +++ b/net/minecraft/client/model/geom/ModelLayers.java
-@@ -336,15 +_,18 @@
+@@ -328,15 +_,18 @@
      }
  
      public static ModelLayerLocation createStandingSignModelName(WoodType p_171292_) {

patches/minecraft/net/minecraft/client/multiplayer/ClientCommonPacketListenerImpl.java.patch

@@ -1,10 +1,10 @@
 --- a/net/minecraft/client/multiplayer/ClientCommonPacketListenerImpl.java
 +++ b/net/minecraft/client/multiplayer/ClientCommonPacketListenerImpl.java
-@@ -153,6 +_,7 @@
+@@ -160,6 +_,7 @@
  
      @Override
      public void handleCustomPayload(ClientboundCustomPayloadPacket p_298103_) {
 +        if (net.minecraftforge.common.ForgeHooks.onCustomPayload(p_298103_.payload(), this.connection)) return;
          CustomPacketPayload custompacketpayload = p_298103_.payload();
          if (!(custompacketpayload instanceof DiscardedPayload)) {
-             PacketUtils.ensureRunningOnSameThread(p_298103_, this, this.minecraft);
+             PacketUtils.ensureRunningOnSameThread(p_298103_, this, this.minecraft.packetProcessor());

patches/minecraft/net/minecraft/client/multiplayer/ClientConfigurationPacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientConfigurationPacketListenerImpl.java
 +++ b/net/minecraft/client/multiplayer/ClientConfigurationPacketListenerImpl.java
-@@ -157,6 +_,7 @@
+@@ -184,6 +_,7 @@
                  return true;
              }
          }));

patches/minecraft/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
 +++ b/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
-@@ -208,6 +_,7 @@
+@@ -214,6 +_,7 @@
          Component component = this.wasTransferredTo ? CommonComponents.TRANSFER_CONNECT_FAILED : CommonComponents.CONNECT_FAILED;
          if (this.serverData != null && this.serverData.isRealm()) {
              this.minecraft.setScreen(new DisconnectedScreen(this.parent, component, p_342266_.reason(), CommonComponents.GUI_BACK));
@@ -8,7 +8,7 @@
          } else {
              this.minecraft.setScreen(new DisconnectedScreen(this.parent, component, p_342266_));
          }
-@@ -232,6 +_,7 @@
+@@ -238,6 +_,7 @@
  
      @Override
      public void handleCustomQuery(ClientboundCustomQueryPacket p_104545_) {

patches/minecraft/net/minecraft/client/multiplayer/ClientLevel.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientLevel.java
 +++ b/net/minecraft/client/multiplayer/ClientLevel.java
-@@ -130,6 +_,7 @@
+@@ -145,6 +_,7 @@
          p_389331_.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache(p_194177_ -> this.calculateBlockTint(p_194177_, BiomeColors.FOLIAGE_COLOR_RESOLVER)));
          p_389331_.put(BiomeColors.DRY_FOLIAGE_COLOR_RESOLVER, new BlockTintCache(p_389335_ -> this.calculateBlockTint(p_389335_, BiomeColors.DRY_FOLIAGE_COLOR_RESOLVER)));
          p_389331_.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache(p_194168_ -> this.calculateBlockTint(p_194168_, BiomeColors.WATER_COLOR_RESOLVER)));
@@ -8,7 +8,7 @@
      });
      private final ClientChunkCache chunkSource;
      private final Deque<Runnable> lightUpdateQueue = Queues.newArrayDeque();
-@@ -139,6 +_,8 @@
+@@ -156,6 +_,8 @@
      private final int seaLevel;
      private boolean tickDayTime;
      private static final Set<Item> MARKER_PARTICLE_ITEMS = Set.of(Items.BARRIER, Items.LIGHT);
@@ -16,8 +16,8 @@
 +    private final net.minecraftforge.client.model.data.ModelDataManager modelDataManager = new net.minecraftforge.client.model.data.ModelDataManager(this);
  
      public void handleBlockChangedAck(int p_233652_) {
-         this.blockStatePredictionHandler.endPredictionsUpTo(p_233652_, this);
-@@ -217,6 +_,8 @@
+         if (SharedConstants.DEBUG_BLOCK_BREAK) {
+@@ -239,6 +_,8 @@
          this.serverSimulationDistance = p_364305_;
          this.updateSkyBrightness();
          this.prepareWeather();
@@ -26,7 +26,7 @@
      }
  
      public void queueLightUpdate(Runnable p_194172_) {
-@@ -299,6 +_,7 @@
+@@ -343,6 +_,7 @@
          p_104640_.setOldPosAndRot();
          p_104640_.tickCount++;
          Profiler.get().push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(p_104640_.getType()).toString());
@@ -34,7 +34,7 @@
          p_104640_.tick();
          Profiler.get().pop();
  
-@@ -350,8 +_,10 @@
+@@ -394,8 +_,10 @@
      }
  
      public void addEntity(Entity p_104741_) {
@@ -45,7 +45,7 @@
      }
  
      public void removeEntity(int p_171643_, Entity.RemovalReason p_171644_) {
-@@ -532,6 +_,12 @@
+@@ -576,6 +_,12 @@
          float p_263349_,
          long p_263408_
      ) {
@@ -58,7 +58,7 @@
          if (p_394722_ == this.minecraft.player) {
              this.playSound(p_263372_, p_263404_, p_263365_, p_263335_.value(), p_263417_, p_263416_, p_263349_, false, p_263408_);
          }
-@@ -541,6 +_,12 @@
+@@ -585,6 +_,12 @@
      public void playSeededSound(
          @Nullable Entity p_263536_, Entity p_396496_, Holder<SoundEvent> p_263518_, SoundSource p_263487_, float p_263538_, float p_263524_, long p_263509_
      ) {
@@ -71,8 +71,48 @@
          if (p_263536_ == this.minecraft.player) {
              this.minecraft.getSoundManager().play(new EntityBoundSoundInstance(p_263518_.value(), p_263487_, p_263538_, p_263524_, p_396496_, p_263509_));
          }
-@@ -991,6 +_,16 @@
-         this.connection.registerForCleaning(p_396040_);
+@@ -1032,7 +_,7 @@
+ 
+     @Override
+     public void addDestroyBlockEffect(BlockPos p_171667_, BlockState p_171668_) {
+-        if (!p_171668_.isAir() && p_171668_.shouldSpawnTerrainParticles()) {
++        if (!p_171668_.isAir() && !net.minecraftforge.client.extensions.common.IClientBlockExtensions.of(p_171668_).addDestroyEffects(p_171668_, this, p_171667_, this.minecraft.particleEngine)) {
+             VoxelShape voxelshape = p_171668_.getShape(this, p_171667_);
+             double d0 = 0.25;
+             voxelshape.forAllBoxes(
+@@ -1067,6 +_,7 @@
+                                             p_171668_,
+                                             p_171667_
+                                         )
++                                        .updateSprite(p_171668_, p_171667_)
+                                     );
+                             }
+                         }
+@@ -1076,6 +_,13 @@
+         }
+     }
+ 
++    public void addBreakingBlockEffect(BlockPos pos, net.minecraft.world.phys.BlockHitResult target) {
++        var state = this.getBlockState(pos);
++        if (!net.minecraftforge.client.extensions.common.IClientBlockExtensions.of(state).addHitEffects(state, this, target, this.minecraft.particleEngine))
++            addBreakingBlockEffect(pos, target.getDirection());
++    }
++
++    /** @deprecated Forge - Use crack(BlockPos, BlockHitResult) as it has more context and gives more control to modders */
+     public void addBreakingBlockEffect(BlockPos p_425440_, Direction p_431745_) {
+         BlockState blockstate = this.getBlockState(p_425440_);
+         if (blockstate.getRenderShape() != RenderShape.INVISIBLE && blockstate.shouldSpawnTerrainParticles()) {
+@@ -1111,7 +_,7 @@
+                 d0 = i + aabb.maxX + 0.1F;
+             }
+ 
+-            this.minecraft.particleEngine.add(new TerrainParticle(this, d0, d1, d2, 0.0, 0.0, 0.0, blockstate, p_425440_).setPower(0.2F).scale(0.6F));
++            this.minecraft.particleEngine.add(new TerrainParticle(this, d0, d1, d2, 0.0, 0.0, 0.0, blockstate, p_425440_).updateSprite(blockstate, p_425440_).setPower(0.2F).scale(0.6F));
+         }
+     }
+ 
+@@ -1175,6 +_,16 @@
+         this.explosionTracker.track(p_429129_, p_428744_, p_431051_, p_431683_);
      }
  
 +    @Override
@@ -88,7 +128,7 @@
      @OnlyIn(Dist.CLIENT)
      public static class ClientLevelData implements WritableLevelData {
          private final boolean hardcore;
-@@ -1079,6 +_,7 @@
+@@ -1256,6 +_,7 @@
          }
  
          public void setDifficulty(Difficulty p_104852_) {
@@ -96,7 +136,7 @@
              this.difficulty = p_104852_;
          }
  
-@@ -1121,6 +_,12 @@
+@@ -1298,6 +_,12 @@
                      break;
                  default:
              }
@@ -109,7 +149,7 @@
          }
  
          public void onTrackingEnd(Entity p_171716_) {
-@@ -1133,6 +_,15 @@
+@@ -1310,6 +_,15 @@
                      ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities()));
                      break;
                  default:

patches/minecraft/net/minecraft/client/multiplayer/ClientPacketListener.java.patch

@@ -1,14 +1,14 @@
 --- a/net/minecraft/client/multiplayer/ClientPacketListener.java
 +++ b/net/minecraft/client/multiplayer/ClientPacketListener.java
-@@ -528,6 +_,7 @@
- 
-         this.minecraft.debugRenderer.clear();
+@@ -514,6 +_,7 @@
+         this.debugSubscriber.clear();
+         this.minecraft.levelRenderer.debugRenderer.refreshRendererList();
          this.minecraft.player.resetPos();
 +        net.minecraftforge.client.event.ForgeEventFactoryClient.firePlayerLogin(this.minecraft.gameMode, this.minecraft.player, this.minecraft.getConnection().connection);
          this.minecraft.player.setId(p_105030_.playerId());
          this.level.addEntity(this.minecraft.player);
          this.minecraft.player.input = new KeyboardInput(this.minecraft.options);
-@@ -1315,6 +_,8 @@
+@@ -1321,6 +_,8 @@
              localplayer1.getAttributes().assignBaseValues(localplayer.getAttributes());
          }
  
@@ -17,7 +17,7 @@
          this.level.addEntity(localplayer1);
          localplayer1.input = new KeyboardInput(this.minecraft.options);
          this.minecraft.gameMode.adjustPlayer(localplayer1);
-@@ -1462,7 +_,7 @@
+@@ -1469,7 +_,7 @@
              ProblemReporter.ScopedCollector problemreporter$scopedcollector = new ProblemReporter.ScopedCollector(p_404890_.problemPath(), LOGGER);
  
              try {
@@ -26,10 +26,10 @@
              } catch (Throwable throwable1) {
                  try {
                      problemreporter$scopedcollector.close();
-@@ -1630,7 +_,9 @@
+@@ -1646,7 +_,9 @@
      @Override
      public void handleCommands(ClientboundCommandsPacket p_104990_) {
-         PacketUtils.ensureRunningOnSameThread(p_104990_, this, this.minecraft);
+         PacketUtils.ensureRunningOnSameThread(p_104990_, this, this.minecraft.packetProcessor());
 -        this.commands = new CommandDispatcher<>(p_104990_.getRoot(CommandBuildContext.simple(this.registryAccess, this.enabledFeatures), COMMAND_NODE_BUILDER));
 +        var context = CommandBuildContext.simple(this.registryAccess, this.enabledFeatures);
 +        this.commands = new CommandDispatcher<>(p_104990_.getRoot(context, COMMAND_NODE_BUILDER));
@@ -37,7 +37,7 @@
      }
  
      @Override
-@@ -1731,6 +_,7 @@
+@@ -1747,6 +_,7 @@
          if (this.minecraft.screen instanceof RecipeUpdateListener recipeupdatelistener) {
              recipeupdatelistener.recipesUpdated();
          }
@@ -45,7 +45,7 @@
      }
  
      @Override
-@@ -1769,6 +_,8 @@
+@@ -1785,6 +_,8 @@
          this.fuelValues = FuelValues.vanillaBurnTimes(this.registryAccess, this.enabledFeatures);
          List<ItemStack> list1 = List.copyOf(CreativeModeTabs.searchTab().getDisplayItems());
          this.searchTrees.updateCreativeTags(list1);
@@ -54,7 +54,7 @@
      }
  
      @Override
-@@ -2617,6 +_,8 @@
+@@ -2614,6 +_,8 @@
      }
  
      public void sendChat(String p_249888_) {
@@ -63,7 +63,7 @@
          Instant instant = Instant.now();
          long i = Crypt.SaltSupplier.getLong();
          LastSeenMessagesTracker.Update lastseenmessagestracker$update = this.lastSeenMessages.generateAndApplyUpdate();
-@@ -2625,6 +_,7 @@
+@@ -2622,6 +_,7 @@
      }
  
      public void sendCommand(String p_250092_) {
@@ -71,7 +71,7 @@
          SignableCommand<ClientSuggestionProvider> signablecommand = SignableCommand.of(this.commands.parse(p_250092_, this.suggestionsProvider));
          if (signablecommand.arguments().isEmpty()) {
              this.send(new ServerboundChatCommandPacket(p_250092_));
-@@ -2641,6 +_,7 @@
+@@ -2638,6 +_,7 @@
      }
  
      public void sendUnattendedCommand(String p_407213_, @Nullable Screen p_406262_) {

patches/minecraft/net/minecraft/client/multiplayer/MultiPlayerGameMode.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
 +++ b/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
-@@ -111,6 +_,7 @@
+@@ -112,6 +_,7 @@
      }
  
      public boolean destroyBlock(BlockPos p_105268_) {
@@ -8,7 +8,7 @@
          if (this.minecraft.player.blockActionRestricted(this.minecraft.level, p_105268_, this.localPlayerMode)) {
              return false;
          } else {
-@@ -125,9 +_,8 @@
+@@ -126,9 +_,8 @@
                  } else if (blockstate.isAir()) {
                      return false;
                  } else {
@@ -19,15 +19,15 @@
                      if (flag) {
                          block.destroy(level, p_105268_, blockstate);
                      }
-@@ -148,6 +_,7 @@
-                 BlockState blockstate = this.minecraft.level.getBlockState(p_105270_);
-                 this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105270_, blockstate, 1.0F);
+@@ -157,6 +_,7 @@
+                 }
+ 
                  this.startPrediction(this.minecraft.level, p_233757_ -> {
 +                    if (!net.minecraftforge.event.ForgeEventFactory.isLeftClickBlockCancelled(this.minecraft.player, p_105270_, p_105271_, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK))
                      this.destroyBlock(p_105270_);
                      return new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, p_105270_, p_105271_, p_233757_);
                  });
-@@ -157,15 +_,18 @@
+@@ -170,6 +_,7 @@
                      this.connection
                          .send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, this.destroyBlockPos, p_105271_));
                  }
@@ -35,6 +35,7 @@
  
                  BlockState blockstate1 = this.minecraft.level.getBlockState(p_105270_);
                  this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105270_, blockstate1, 0.0F);
+@@ -180,9 +_,11 @@
                  this.startPrediction(this.minecraft.level, p_233728_ -> {
                      boolean flag = !blockstate1.isAir();
                      if (flag && this.destroyProgress == 0.0F) {
@@ -46,7 +47,7 @@
                      if (flag && blockstate1.getDestroyProgress(this.minecraft.player, this.minecraft.player.level(), p_105270_) >= 1.0F) {
                          this.destroyBlock(p_105270_);
                      } else {
-@@ -176,6 +_,7 @@
+@@ -193,6 +_,7 @@
                          this.destroyTicks = 0.0F;
                          this.minecraft.level.destroyBlockProgress(this.minecraft.player.getId(), this.destroyBlockPos, this.getDestroyStage());
                      }
@@ -54,15 +55,15 @@
  
                      return new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, p_105270_, p_105271_, p_233728_);
                  });
-@@ -208,6 +_,7 @@
-             BlockState blockstate1 = this.minecraft.level.getBlockState(p_105284_);
-             this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105284_, blockstate1, 1.0F);
+@@ -233,6 +_,7 @@
+             }
+ 
              this.startPrediction(this.minecraft.level, p_233753_ -> {
 +                if (!net.minecraftforge.event.ForgeEventFactory.isLeftClickBlockCancelled(this.minecraft.player, p_105284_, p_105285_, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK))
                  this.destroyBlock(p_105284_);
                  return new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, p_105284_, p_105285_, p_233753_);
              });
-@@ -220,7 +_,7 @@
+@@ -245,7 +_,7 @@
              } else {
                  this.destroyProgress = this.destroyProgress + blockstate.getDestroyProgress(this.minecraft.player, this.minecraft.player.level(), p_105284_);
                  if (this.destroyTicks % 4.0F == 0.0F) {
@@ -71,15 +72,15 @@
                      this.minecraft
                          .getSoundManager()
                          .play(
-@@ -237,6 +_,7 @@
+@@ -262,6 +_,7 @@
  
                  this.destroyTicks++;
                  this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105284_, blockstate, Mth.clamp(this.destroyProgress, 0.0F, 1.0F));
 +                if (net.minecraftforge.event.ForgeEventFactory.onLeftClickBlockHold(this.minecraft.player, p_105284_, p_105285_).getUseItem().isDenied()) return true;
                  if (this.destroyProgress >= 1.0F) {
                      this.isDestroying = false;
-                     this.startPrediction(this.minecraft.level, p_233739_ -> {
-@@ -275,7 +_,7 @@
+                     if (SharedConstants.DEBUG_BLOCK_BREAK) {
+@@ -304,7 +_,7 @@
  
      private boolean sameDestroyTarget(BlockPos p_105282_) {
          ItemStack itemstack = this.minecraft.player.getMainHandItem();
@@ -88,7 +89,7 @@
      }
  
      private void ensureHasSentCarriedItem() {
-@@ -303,12 +_,23 @@
+@@ -332,12 +_,23 @@
      private InteractionResult performUseItemOn(LocalPlayer p_233747_, InteractionHand p_233748_, BlockHitResult p_233749_) {
          BlockPos blockpos = p_233749_.getBlockPos();
          ItemStack itemstack = p_233747_.getItemInHand(p_233748_);
@@ -114,7 +115,7 @@
                  BlockState blockstate = this.minecraft.level.getBlockState(blockpos);
                  if (!this.connection.isFeatureEnabled(blockstate.getBlock().requiredFeatures())) {
                      return InteractionResult.FAIL;
-@@ -329,8 +_,10 @@
+@@ -358,8 +_,10 @@
                  }
              }
  
@@ -127,7 +128,7 @@
                  InteractionResult interactionresult2;
                  if (p_233747_.hasInfiniteMaterials()) {
                      int i = itemstack.getCount();
-@@ -364,6 +_,11 @@
+@@ -393,6 +_,11 @@
                          mutableobject.setValue(InteractionResult.PASS);
                          return serverbounduseitempacket;
                      } else {
@@ -139,7 +140,7 @@
                          InteractionResult interactionresult = itemstack.use(this.minecraft.level, p_233722_, p_233723_);
                          ItemStack itemstack1;
                          if (interactionresult instanceof InteractionResult.Success interactionresult$success) {
-@@ -374,6 +_,9 @@
+@@ -403,6 +_,9 @@
  
                          if (itemstack1 != itemstack) {
                              p_233722_.setItemInHand(p_233723_, itemstack1);
@@ -149,7 +150,7 @@
                          }
  
                          mutableobject.setValue(interactionresult);
-@@ -405,6 +_,10 @@
+@@ -434,6 +_,10 @@
      public InteractionResult interact(Player p_105227_, Entity p_105228_, InteractionHand p_105229_) {
          this.ensureHasSentCarriedItem();
          this.connection.send(ServerboundInteractPacket.createInteractionPacket(p_105228_, p_105227_.isShiftKeyDown(), p_105229_));
@@ -160,7 +161,7 @@
          return (InteractionResult)(this.localPlayerMode == GameType.SPECTATOR ? InteractionResult.PASS : p_105227_.interactOn(p_105228_, p_105229_));
      }
  
-@@ -412,6 +_,10 @@
+@@ -441,6 +_,10 @@
          this.ensureHasSentCarriedItem();
          Vec3 vec3 = p_105233_.getLocation().subtract(p_105232_.getX(), p_105232_.getY(), p_105232_.getZ());
          this.connection.send(ServerboundInteractPacket.createInteractionPacket(p_105232_, p_105231_.isShiftKeyDown(), p_105234_, vec3));

patches/minecraft/net/minecraft/client/multiplayer/PlayerInfo.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/PlayerInfo.java
 +++ b/net/minecraft/client/multiplayer/PlayerInfo.java
-@@ -88,6 +_,7 @@
+@@ -76,6 +_,7 @@
      }
  
      protected void setGameMode(GameType p_105318_) {

patches/minecraft/net/minecraft/client/multiplayer/ServerData.java.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/client/multiplayer/ServerData.java
 +++ b/net/minecraft/client/multiplayer/ServerData.java
-@@ -37,6 +_,7 @@
-     private byte[] iconBytes;
+@@ -38,6 +_,7 @@
      private ServerData.Type type;
+     private int acceptedCodeOfConduct;
      private ServerData.State state = ServerData.State.INITIAL;
 +    public net.minecraftforge.client.ExtendedServerListData forgeData = null;
  

patches/minecraft/net/minecraft/client/multiplayer/ServerStatusPinger.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ServerStatusPinger.java
 +++ b/net/minecraft/client/multiplayer/ServerStatusPinger.java
-@@ -99,6 +_,7 @@
+@@ -107,6 +_,7 @@
                                  p_105461_.run();
                              }
                          });

patches/minecraft/net/minecraft/client/multiplayer/chat/ChatListener.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/chat/ChatListener.java
 +++ b/net/minecraft/client/multiplayer/chat/ChatListener.java
-@@ -124,7 +_,9 @@
+@@ -133,7 +_,9 @@
          Instant instant = Instant.now();
          this.handleMessage(null, () -> {
              Component component = p_251256_.decorate(p_250375_);
@@ -11,7 +11,7 @@
              this.narrateChatMessage(p_251256_, p_250375_);
              this.logSystemMessage(component, instant);
              this.previousMessageTime = Util.getMillis();
-@@ -143,12 +_,16 @@
+@@ -152,12 +_,16 @@
              MessageSignature messagesignature = p_249430_.signature();
              FilterMask filtermask = p_249430_.filterMask();
              if (filtermask.isEmpty()) {
@@ -30,7 +30,7 @@
                      this.narrateChatMessage(p_251766_, component);
                  }
              }
-@@ -181,6 +_,8 @@
+@@ -190,6 +_,8 @@
  
      public void handleSystemMessage(Component p_240522_, boolean p_240642_) {
          if (!this.minecraft.options.hideMatchedNames().get() || !this.minecraft.isBlocked(this.guessChatUUID(p_240522_))) {

patches/minecraft/net/minecraft/client/particle/FireworkParticles.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/particle/FireworkParticles.java
 +++ b/net/minecraft/client/particle/FireworkParticles.java
-@@ -263,6 +_,10 @@
+@@ -268,6 +_,10 @@
                      intlist = IntList.of(DyeColor.BLACK.getFireworkColor());
                  }
  

patches/minecraft/net/minecraft/client/particle/FlyTowardsPositionParticle.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/particle/FlyTowardsPositionParticle.java
 +++ b/net/minecraft/client/particle/FlyTowardsPositionParticle.java
-@@ -104,6 +_,7 @@
+@@ -114,6 +_,7 @@
              this.x = this.xStart + this.xd * f;
              this.y = this.yStart + this.yd * f - f1 * 1.2F;
              this.z = this.zStart + this.zd * f;

patches/minecraft/net/minecraft/client/particle/Particle.java.patch

@@ -1,17 +1,9 @@
 --- a/net/minecraft/client/particle/Particle.java
 +++ b/net/minecraft/client/particle/Particle.java
-@@ -248,6 +_,18 @@
+@@ -207,6 +_,10 @@
          return Optional.empty();
      }
  
-+    /**
-+     * Forge added method that controls if a particle should be culled to it's bounding box.
-+     * Default behaviour is culling enabled
-+     */
-+    public boolean shouldCull() {
-+        return true;
-+    }
-+
 +    public net.minecraft.world.phys.Vec3 getPos() {
 +       return new net.minecraft.world.phys.Vec3(this.x, this.y, this.z);
 +    }

patches/minecraft/net/minecraft/client/particle/ParticleEngine.java.patch

@@ -1,148 +1,29 @@
 --- a/net/minecraft/client/particle/ParticleEngine.java
 +++ b/net/minecraft/client/particle/ParticleEngine.java
-@@ -72,10 +_,10 @@
-     private static final int MAX_PARTICLES_PER_LAYER = 16384;
-     private static final List<ParticleRenderType> RENDER_ORDER = List.of(ParticleRenderType.TERRAIN_SHEET, ParticleRenderType.PARTICLE_SHEET_OPAQUE, ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT);
+@@ -26,7 +_,7 @@
+ public class ParticleEngine {
+     private static final List<ParticleRenderType> RENDER_ORDER = List.of(ParticleRenderType.SINGLE_QUADS, ParticleRenderType.ITEM_PICKUP, ParticleRenderType.ELDER_GUARDIANS);
      protected ClientLevel level;
--    private final Map<ParticleRenderType, Queue<Particle>> particles = Maps.newIdentityHashMap();
-+    private final Map<ParticleRenderType, Queue<Particle>> particles = Maps.newTreeMap(net.minecraftforge.client.ForgeHooksClient.makeParticleRenderTypeComparator(RENDER_ORDER));
+-    private final Map<ParticleRenderType, ParticleGroup<?>> particles = Maps.newIdentityHashMap();
++    private final Map<ParticleRenderType, ParticleGroup<?>> particles = Maps.newTreeMap(net.minecraftforge.client.ForgeHooksClient.makeParticleRenderTypeComparator(RENDER_ORDER));
      private final Queue<TrackingEmitter> trackingEmitters = Queues.newArrayDeque();
-     private final RandomSource random = RandomSource.create();
--    private final Int2ObjectMap<ParticleProvider<?>> providers = new Int2ObjectOpenHashMap<>();
-+    private final Map<ResourceLocation, ParticleProvider<?>> providers = new java.util.HashMap<>();
      private final Queue<Particle> particlesToAdd = Queues.newArrayDeque();
-     private final Map<ResourceLocation, ParticleEngine.MutableSpriteSet> spriteSets = Maps.newHashMap();
-     private final TextureAtlas textureAtlas;
-@@ -205,10 +_,14 @@
-         this.register(ParticleTypes.FIREFLY, FireflyParticle.FireflyProvider::new);
-     }
- 
-+    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterParticleProvidersEvent} */
-+    @Deprecated
-     public <T extends ParticleOptions> void register(ParticleType<T> p_107382_, ParticleProvider<T> p_107383_) {
--        this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getId(p_107382_), p_107383_);
-+        this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getKey(p_107382_), p_107383_);
-     }
- 
-+    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterParticleProvidersEvent} */
-+    @Deprecated
-     public <T extends ParticleOptions> void register(ParticleType<T> p_273423_, ParticleProvider.Sprite<T> p_273134_) {
-         this.register(
-             p_273423_,
-@@ -225,10 +_,12 @@
-         );
-     }
- 
-+    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterParticleProvidersEvent} */
-+    @Deprecated
-     public <T extends ParticleOptions> void register(ParticleType<T> p_107379_, ParticleEngine.SpriteParticleRegistration<T> p_107380_) {
-         ParticleEngine.MutableSpriteSet particleengine$mutablespriteset = new ParticleEngine.MutableSpriteSet();
-         this.spriteSets.put(BuiltInRegistries.PARTICLE_TYPE.getKey(p_107379_), particleengine$mutablespriteset);
--        this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getId(p_107379_), p_107380_.create(particleengine$mutablespriteset));
-+        this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getKey(p_107379_), p_107380_.create(particleengine$mutablespriteset));
-     }
- 
-     @Override
-@@ -348,7 +_,7 @@
+     private final Object2IntOpenHashMap<ParticleLimit> trackedParticleCounts = new Object2IntOpenHashMap<>();
+@@ -63,7 +_,7 @@
      private <T extends ParticleOptions> Particle makeParticle(
          T p_107396_, double p_107397_, double p_107398_, double p_107399_, double p_107400_, double p_107401_, double p_107402_
      ) {
--        ParticleProvider<T> particleprovider = (ParticleProvider<T>)this.providers.get(BuiltInRegistries.PARTICLE_TYPE.getId(p_107396_.getType()));
-+        ParticleProvider<T> particleprovider = (ParticleProvider<T>)this.providers.get(BuiltInRegistries.PARTICLE_TYPE.getKey(p_107396_.getType()));
+-        ParticleProvider<T> particleprovider = (ParticleProvider<T>)this.resourceManager.getProviders().get(BuiltInRegistries.PARTICLE_TYPE.getId(p_107396_.getType()));
++        ParticleProvider<T> particleprovider = (ParticleProvider<T>)this.resourceManager.getProvider(p_107396_.getType());
          return particleprovider == null
              ? null
-             : particleprovider.createParticle(p_107396_, this.level, p_107397_, p_107398_, p_107399_, p_107400_, p_107401_, p_107402_);
-@@ -424,28 +_,36 @@
-         }
+             : particleprovider.createParticle(p_107396_, this.level, p_107397_, p_107398_, p_107399_, p_107400_, p_107401_, p_107402_, this.random);
+@@ -123,7 +_,7 @@
      }
  
-+    /**@deprecated Forge: use {@link #render(Camera, float, net.minecraft.client.renderer.culling.Frustum)} with Frustum as additional parameter*/
-+    @Deprecated
-     public void render(Camera p_107340_, float p_107341_, MultiBufferSource.BufferSource p_377798_) {
+     public void extract(ParticlesRenderState p_423938_, Frustum p_424803_, Camera p_430521_, float p_426823_) {
 -        for (ParticleRenderType particlerendertype : RENDER_ORDER) {
-+        render(p_107340_, p_107341_, p_377798_, null);
-+    }
-+
-+    public void render(Camera p_107340_, float p_107341_, MultiBufferSource.BufferSource p_377798_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
-+        for (ParticleRenderType particlerendertype : this.particles.keySet()) { // Forge: allow custom IParticleRenderType's
-+            if (particlerendertype.renderType() == null) continue;
-             Queue<Particle> queue = this.particles.get(particlerendertype);
-             if (queue != null && !queue.isEmpty()) {
--                renderParticleType(p_107340_, p_107341_, p_377798_, particlerendertype, queue);
-+                renderParticleType(p_107340_, p_107341_, p_377798_, particlerendertype, queue, frustum);
-             }
-         }
- 
-         Queue<Particle> queue1 = this.particles.get(ParticleRenderType.CUSTOM);
-         if (queue1 != null && !queue1.isEmpty()) {
--            renderCustomParticles(p_107340_, p_107341_, p_377798_, queue1);
-+            renderCustomParticles(p_107340_, p_107341_, p_377798_, queue1, frustum);
-         }
- 
-         p_377798_.endBatch();
-     }
- 
-     private static void renderParticleType(
--        Camera p_376120_, float p_375470_, MultiBufferSource.BufferSource p_377543_, ParticleRenderType p_378369_, Queue<Particle> p_376283_
-+        Camera p_376120_, float p_375470_, MultiBufferSource.BufferSource p_377543_, ParticleRenderType p_378369_, Queue<Particle> p_376283_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum
-     ) {
-         VertexConsumer vertexconsumer = p_377543_.getBuffer(Objects.requireNonNull(p_378369_.renderType()));
- 
-         for (Particle particle : p_376283_) {
-+            if (frustum != null && particle.shouldCull() && !frustum.isVisible(particle.getBoundingBox())) continue;
-             try {
-                 particle.render(vertexconsumer, p_376120_, p_375470_);
-             } catch (Throwable throwable) {
-@@ -458,10 +_,11 @@
-         }
-     }
- 
--    private static void renderCustomParticles(Camera p_377913_, float p_376893_, MultiBufferSource.BufferSource p_376978_, Queue<Particle> p_375784_) {
-+    private static void renderCustomParticles(Camera p_377913_, float p_376893_, MultiBufferSource.BufferSource p_376978_, Queue<Particle> p_375784_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
-         PoseStack posestack = new PoseStack();
- 
-         for (Particle particle : p_375784_) {
-+            if (frustum != null && particle.shouldCull() && !frustum.isVisible(particle.getBoundingBox())) continue;
-             try {
-                 particle.renderCustom(posestack, p_376978_, p_377913_, p_376893_);
-             } catch (Throwable throwable) {
-@@ -481,7 +_,7 @@
-     }
- 
-     public void destroy(BlockPos p_107356_, BlockState p_107357_) {
--        if (!p_107357_.isAir() && p_107357_.shouldSpawnTerrainParticles()) {
-+        if (!p_107357_.isAir() && !net.minecraftforge.client.extensions.common.IClientBlockExtensions.of(p_107357_).addDestroyEffects(p_107357_, this.level, p_107356_, this)) {
-             VoxelShape voxelshape = p_107357_.getShape(this.level, p_107356_);
-             double d0 = 0.25;
-             voxelshape.forAllBoxes(
-@@ -514,6 +_,7 @@
-                                         p_107357_,
-                                         p_107356_
-                                     )
-+                                    .updateSprite(p_107357_, p_107356_)
-                                 );
-                             }
-                         }
-@@ -523,6 +_,13 @@
-         }
-     }
- 
-+    public void addBlockHitEffects(BlockPos pos, net.minecraft.world.phys.BlockHitResult target) {
-+        var state = level.getBlockState(pos);
-+        if (!net.minecraftforge.client.extensions.common.IClientBlockExtensions.of(state).addHitEffects(state, level, target, this))
-+            crack(pos, target.getDirection());
-+    }
-+
-+    @Deprecated // Forge - Use addBlockHitEffects as it has more context and gives more control to modders
-     public void crack(BlockPos p_107368_, Direction p_107369_) {
-         BlockState blockstate = this.level.getBlockState(p_107368_);
-         if (blockstate.getRenderShape() != RenderShape.INVISIBLE && blockstate.shouldSpawnTerrainParticles()) {
-@@ -558,7 +_,7 @@
-                 d0 = i + aabb.maxX + 0.1F;
-             }
- 
--            this.add(new TerrainParticle(this.level, d0, d1, d2, 0.0, 0.0, 0.0, blockstate, p_107368_).setPower(0.2F).scale(0.6F));
-+            this.add(new TerrainParticle(this.level, d0, d1, d2, 0.0, 0.0, 0.0, blockstate, p_107368_).updateSprite(blockstate, p_107368_).setPower(0.2F).scale(0.6F));
-         }
-     }
- 
++        for (ParticleRenderType particlerendertype : this.particles.keySet()) { // Forge: allow custom ParticleRenderType's
+             ParticleGroup<?> particlegroup = this.particles.get(particlerendertype);
+             if (particlegroup != null && !particlegroup.isEmpty()) {
+                 p_423938_.add(particlegroup.extractRenderState(p_424803_, p_430521_, p_426823_));

patches/minecraft/net/minecraft/client/particle/ParticleResources.java.patch

@@ -0,0 +1,43 @@
+--- a/net/minecraft/client/particle/ParticleResources.java
++++ b/net/minecraft/client/particle/ParticleResources.java
+@@ -45,6 +_,7 @@
+     private static final FileToIdConverter PARTICLE_LISTER = FileToIdConverter.json("particles");
+     private final Map<ResourceLocation, ParticleResources.MutableSpriteSet> spriteSets = Maps.newHashMap();
+     private final Int2ObjectMap<ParticleProvider<?>> providers = new Int2ObjectOpenHashMap<>();
++    private final Map<ResourceLocation, ParticleProvider<?>> providersByName = new java.util.HashMap<>();
+     @Nullable
+     private Runnable onReload;
+ 
+@@ -174,14 +_,17 @@
+         this.register(ParticleTypes.FIREFLY, FireflyParticle.FireflyProvider::new);
+     }
+ 
++    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterParticleProvidersEvent} */
+     public <T extends ParticleOptions> void register(ParticleType<T> p_427222_, ParticleProvider<T> p_423729_) {
+         this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getId(p_427222_), p_423729_);
++        this.providersByName.put(BuiltInRegistries.PARTICLE_TYPE.getKey(p_427222_), p_423729_);
+     }
+ 
++    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterParticleProvidersEvent} */
+     public <T extends ParticleOptions> void register(ParticleType<T> p_427223_, ParticleResources.SpriteParticleRegistration<T> p_423156_) {
+         ParticleResources.MutableSpriteSet particleresources$mutablespriteset = new ParticleResources.MutableSpriteSet();
+         this.spriteSets.put(BuiltInRegistries.PARTICLE_TYPE.getKey(p_427223_), particleresources$mutablespriteset);
+-        this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getId(p_427223_), p_423156_.create(particleresources$mutablespriteset));
++        register(p_427223_, p_423156_.create(particleresources$mutablespriteset));
+     }
+ 
+     @Override
+@@ -274,8 +_,13 @@
+         }
+     }
+ 
++    /** @deprecated Use getProvider(ProviderType) as these ids may not be in sync with servers */
+     public Int2ObjectMap<ParticleProvider<?>> getProviders() {
+         return this.providers;
++    }
++
++    public <T extends ParticleOptions> ParticleProvider<T> getProvider(ParticleType<T> type) {
++        return (ParticleProvider<T>)this.providersByName.get(BuiltInRegistries.PARTICLE_TYPE.getKey(type));
+     }
+ 
+     @OnlyIn(Dist.CLIENT)

patches/minecraft/net/minecraft/client/particle/PortalParticle.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/particle/PortalParticle.java
 +++ b/net/minecraft/client/particle/PortalParticle.java
-@@ -80,6 +_,7 @@
+@@ -91,6 +_,7 @@
              this.x = this.xStart + this.xd * f2;
              this.y = this.yStart + this.yd * f2 + (1.0F - f);
              this.z = this.zStart + this.zd * f2;

patches/minecraft/net/minecraft/client/particle/ReversePortalParticle.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/particle/ReversePortalParticle.java
 +++ b/net/minecraft/client/particle/ReversePortalParticle.java
-@@ -31,6 +_,7 @@
+@@ -42,6 +_,7 @@
              this.x = this.x + this.xd * f;
              this.y = this.y + this.yd * f;
              this.z = this.z + this.zd * f;

patches/minecraft/net/minecraft/client/particle/VibrationSignalParticle.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/particle/VibrationSignalParticle.java
 +++ b/net/minecraft/client/particle/VibrationSignalParticle.java
-@@ -76,6 +_,7 @@
+@@ -80,6 +_,7 @@
                  this.x = Mth.lerp(d0, this.x, vec3.x());
                  this.y = Mth.lerp(d0, this.y, vec3.y());
                  this.z = Mth.lerp(d0, this.z, vec3.z());