1.21.3 RB 1

https://forums.minecraftforge.net/topic/154393-forge-531-minecraft-1213/
Add missed license headers (#10475 )
2026-11-14 09:05:17 +00:00 · 2025-03-01 16:56:32 -05:00 · 2025-03-01 21:35:03 +00:00 · 2025-03-01 21:34:40 +00:00 · 2025-02-12 17:51:46 -08:00 · 2025-02-12 17:39:27 -08:00
354 changed files with 3829 additions and 5802 deletions
@@ -3,7 +3,6 @@
 *.patch text eol=lf
 *.java text eol=lf
 *.gradle text eol=crlf
-**/MANIFEST.MF text eol=crlf
 *.png binary
 *.gif binary
 *.exe binary
@@ -1,28 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches: [ '1.21.4' ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
-    with:
-      java: 21
-      gradle_setup: './gradlew setup'
-      gradle_tasks: 'build publish'
-      artifact_name: 'forge'
-    secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
-      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
-      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
-      MAVEN_USER: ${{ secrets.MAVEN_USER }}
-      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
-      SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
-      SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
-      SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}
@@ -7,7 +7,7 @@ jobs:
    name: Upload payload
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/upload-artifact@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 }}
@@ -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 }}
@@ -41,8 +41,3 @@ src/*/generated/**/.cache/

 /ForgeRoot.ipr
 /ForgeRoot.iws
-
-# APT stuff
-/*/.gitignore
-/*/.factorypath
-/*/.apt_generated/
@@ -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>
@@ -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()
+    }
+})
@@ -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.
+
@@ -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.2'
+    implementation 'org.ow2.asm:asm:9.7'
+    implementation 'org.ow2.asm:asm-tree:9.7'
+    implementation 'net.minecraftforge:srgutils:0.5.10'
    implementation 'commons-io:commons-io:2.13.0'
    implementation 'com.google.code.gson:gson:2.10.1'
    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
@@ -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)
        }
    }
    
@@ -79,6 +79,7 @@ final String SPEC_VERSION = gradleutils.gitInfo.tag
 final def MCP_ARTIFACT = project(':mcp').mcp.config.get()

 final List<File> EXTRA_TXTS = [
+        rootProject.file('CREDITS.txt'),
        rootProject.file('LICENSE.txt'),
        rootProject.tasks.createChangelog.outputFile
 ]
@@ -96,13 +97,13 @@ final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
 configurations {
    // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
    bootstrap  { transitive = false }
-    installer {
+    installer { 
        extendsFrom(bootstrap)
-        transitive = false
+        transitive = false 
    }
-    installerextra {
+    installerextra { 
        extendsFrom(bootstrap)
-        transitive = false
+        transitive = false 
    }
    api.extendsFrom(installer)
 }
@@ -116,9 +117,9 @@ dependencies {
    bootstrap(libs.securemodules) // Has Union file system in it
    bootstrap(libs.unsafe)        // Needed by securemodules
    bootstrap(libs.bundles.asm)   // Needed by securemodules
-
+    
    implementation(libs.jopt.simple)
-
+    
    installer(libs.bootstrap)
    installer(libs.bootstrap.api) // Needed by securemodules
    installer(libs.accesstransformers)
@@ -226,31 +227,6 @@ patcher {
                 '--assetsDir', downloadAssets.output,
                 '--assetIndex', "{asset_index}"
        }
-
-        forge_client_data {
-            args '--launchTarget', 'forge_dev_client_data',
-                 '--mod', 'forge',
-                 '--all',
-                 '--validate',
-                 '--output', rootProject.file('src/main/generated/'),
-                 '--existing', sourceSets.main.resources.srcDirs[0],
-                 '--assetsDir', downloadAssets.output,
-                 '--assetIndex', "{asset_index}"
-        }
-
-        forge_client_data_test {
-            source sourceSets.test
-            args '--launchTarget', 'forge_dev',
-                 '--launchEntry', 'minecraft/net.minecraft.client.data.Main',
-                 '--launchData',
-                 '--mod', '.+',
-                 '--all',
-                 '--output', rootProject.file('src/test/generated/'),
-                 '--existing', sourceSets.main.resources.srcDirs[0],
-                 '--existing', sourceSets.test.resources.srcDirs[0],
-                 '--assetsDir', downloadAssets.output,
-                 '--assetIndex', "{asset_index}"
-        }
    }
 }

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

-        clientData {
-            environment 'MCP_MAPPINGS', '{mcp_mappings}'
-            args '--launchTarget', "forge_userdev_client_data"
-            args '--assetIndex', '{asset_index}'
-            args '--assetsDir', '{assets_root}'
-        }
-
        server {
            environment 'MCP_MAPPINGS', '{mcp_mappings}'
            property 'forge.enableGameTest', 'true'
@@ -524,7 +493,7 @@ tasks.register('serverShimJar', Jar) {
        from {
            zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
        }
-
+        
        attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
    }
    archiveClassifier = 'shim'
@@ -617,7 +586,7 @@ tasks.register('checkJarCompatibility', CheckJarCompatibility) {
    baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })

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

 tasks.register('installerJson', InstallerJson) {
    icon = rootProject.file('icon.ico')
-
+    
    // Json to install into the client's launcher
    dependsOn(launcherJson)
    input.from(launcherJson.output)
-
+    
    // Download Official Mappings
    dependsOn(downloadClientMappings, downloadServerMappings)
    input.from(downloadClientMappings.output, downloadServerMappings.output)
@@ -924,31 +893,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,
@@ -1098,7 +1059,7 @@ publishing {
            license gradleutils.pom.Licenses.LGPLv2_1
        }
    }
-
+    
    repositories {
        maven gradleutils.publishingForgeMaven
    }
@@ -2,8 +2,8 @@

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

 Forge is a free, open-source modding API all of your favourite mods use!
@@ -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
@@ -84,6 +84,16 @@ public class RenderElement {

        font.generateVerticesForTexts(10, context.scaledHeight() -  texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
    }
+    public static RenderElement monag() {
+        return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
+            var size = 256;
+            var x0 = (ctx.width() - 2 * size) / 2;
+            var y0 = 64;
+            QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
+            QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
+        }));
+
+    }

    public static RenderElement mojang(final int textureId, final int frameStart) {
        return new RenderElement(()->(bb, ctx, frame) -> {
@@ -5,7 +5,6 @@ plugins {
    id 'maven-publish'
    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
-    alias(libs.plugins.apt)
 }

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

-    // Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
    implementation(libs.log4j.core)
    annotationProcessor(libs.bundles.log4j)

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

 tasks.named('generateResources').configure {
-    dependsOn('eclipseJdt')
-    dependsOn('eclipseJdtApt')
-    dependsOn('eclipseFactorypath')
    dependsOn('writeForgeVersionJson')
 }
-
-eclipse {
-    classpath {
-       // We need to set the default output directory for the log4j annotation processor
-       // Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
-       // So we have to do a hacky whenMerged
-       //defaultOutputDir = file('bin/main')
-       file.whenMerged {
-           entries.each { entry ->
-               if (entry.kind == 'output' && entry.hasProperty('path'))
-                   entry.path = 'bin/main'
-           }
-       }
-    }
-}
@@ -6,13 +6,14 @@
 package net.minecraftforge.fml.loading;

 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;

 public class BackgroundWaiter {
+    private static final ExecutorService runner = Executors.newSingleThreadExecutor();

    public static void runAndTick(Runnable r, Runnable tick) {
-        var runner = Executors.newSingleThreadExecutor();
        ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
        final Future<?> work = runner.submit(r);
        do {
@@ -175,7 +175,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());
    }

@@ -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) {
@@ -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;
@@ -40,25 +40,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
        return "runtimedistcleaner";
    }

-    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
-    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
-
-    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty)
-            return NAY;
-
-        String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraftforge/"))
-            return NAY;
-
-        // No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client
-        if (FMLEnvironment.dist.isClient() && (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/")))
-            return NAY;
-
-        return YAY;
-    }
-
    @Override
    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
        var changed = false;
@@ -217,6 +198,21 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
        };
    }

+    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
+    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
+
+    @Override
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        return YAY;
+    }
+
    private static class LambdaGatherer extends MethodVisitor {
        private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
                "java/lang/invoke/LambdaMetafactory", "metafactory",
@@ -18,7 +18,9 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.jetbrains.annotations.Nullable;

 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;

 /**
 * A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
@@ -51,7 +51,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;
@@ -95,14 +94,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.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
        this.coreMods = ModFileParser.getCoreMods(this);
        this.coreMods.forEach(mi-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {}", mi.getPath()));
-        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;
    }

@@ -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) {
@@ -81,10 +81,6 @@ class ArgumentList {
            .toArray(String[]::new);
    }

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

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

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

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

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

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

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

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

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

@@ -76,12 +66,11 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
    }

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

    protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
    protected static final LaunchType CLIENT          = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
-    protected static final LaunchType CLIENT_DATA     = new LaunchType("client_data", "minecraft", "net.minecraft.client.data.Main", Dist.CLIENT, true);
    protected static final LaunchType DATA            = new LaunchType("data",   "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
    protected static final LaunchType SERVER          = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
    protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
@@ -14,14 +14,12 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
        super(type, "forge_dev_");
    }

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

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

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

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

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

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

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

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

-<Configuration status="warn" shutdownHook="disable">
+<Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
    <filters>
        <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>
@@ -5,11 +5,11 @@ org.gradle.daemon=false
 org.gradle.parallel=true

 JAVA_VERSION=21
-MC_VERSION=1.21.4
+MC_VERSION=1.21.3
 MC_NEXT_VERSION=1.22
-MCP_VERSION=20241203.143248
+MCP_VERSION=20241025.112443
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.21.4
+MAPPING_VERSION=1.21.3

 // Set to true before the first build of a new MC version, so we don't do compatibility checks
 CHECK_COMPATIBILITY=false
@@ -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/
@@ -1,62 +1,216 @@
-// 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.24,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
+    //
+    // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+    //
+    // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
+    // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
+    //
+    // Use non-default mappings at your own risk. They may not always work.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+    mappings channel: mapping_channel, version: mapping_version
+    
+    // Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
+    reobf = false

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

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

-        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
-    mavenCentral()
+    // Put repositories for dependencies here
+    // ForgeGradle automatically adds the Forge maven and Maven Central for you
+
+    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
+    // flatDir {
+    //     dir 'libs'
+    // }
 }

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

 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 IDEA to do it.
+idea.module { downloadJavadoc = downloadSources = true }
+
+eclipse {
+    // Run everytime eclipse builds the code
+    //autoBuildTasks genEclipseRuns
+    // Run when importing the project
+    synchronizationTasks 'genEclipseRuns'
+}
+
+// Merge the resources and classes into the same directory. 
+// This is done because java expects modules to be in a single directory.
+// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
+// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
 }
@@ -22,5 +22,4 @@ eclipse
 run

 # Files from Forge MDK
-forge_README.txt
 forge*changelog.txt
@@ -1,9 +1,59 @@
-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=-Xmx3G
+org.gradle.daemon=false

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

-net.minecraftforge.gradle.merge-source-sets=true
+## 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.
@@ -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.7.0'
+}
@@ -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,)"
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -89,7 +_,8 @@
+@@ -88,7 +_,8 @@
         GLFW.glfwWindowHint(139267, 2);
         GLFW.glfwWindowHint(139272, 204801);
         GLFW.glfwWindowHint(139270, 1);
@@ -10,7 +10,7 @@
         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;
-@@ -101,6 +_,7 @@
+@@ -100,6 +_,7 @@
             this.windowedX = this.x = aint1[0];
             this.windowedY = this.y = aint[0];
         }
@@ -18,7 +18,7 @@
 
         GLFW.glfwMakeContextCurrent(this.window);
         GL.createCapabilities();
-@@ -271,6 +_,9 @@
+@@ -267,6 +_,9 @@
         GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
         this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
         this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -268,7 +_,7 @@
+@@ -264,7 +_,7 @@
                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
                 .getChoiceType(p_137552_, p_137553_);
         } catch (IllegalArgumentException illegalargumentexception) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -15,9 +_,9 @@
+@@ -14,9 +_,9 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
@@ -12,7 +12,7 @@
     private static final Set<String> CATEGORIES = Sets.newHashSet();
     public static final String CATEGORY_MOVEMENT = "key.categories.movement";
     public static final String CATEGORY_MISC = "key.categories.misc";
-@@ -43,14 +_,14 @@
+@@ -42,14 +_,14 @@
     private int clickCount;
 
     public static void click(InputConstants.Key p_90836_) {
@@ -29,7 +29,7 @@
         if (keymapping != null) {
             keymapping.setDown(p_90839_);
         }
-@@ -101,7 +_,7 @@
+@@ -100,7 +_,7 @@
     }
 
     public boolean isDown() {
@@ -38,7 +38,7 @@
     }
 
     public String getCategory() {
-@@ -137,7 +_,16 @@
+@@ -136,7 +_,16 @@
     public int compareTo(KeyMapping p_90841_) {
         return this.category.equals(p_90841_.category)
             ? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
@@ -56,7 +56,7 @@
     }
 
     public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -146,6 +_,20 @@
+@@ -145,6 +_,20 @@
     }
 
     public boolean same(KeyMapping p_90851_) {
@@ -77,7 +77,7 @@
         return this.key.equals(p_90851_.key);
     }
 
-@@ -164,11 +_,13 @@
+@@ -163,11 +_,13 @@
     }
 
     public Component getTranslatedKeyMessage() {
@@ -92,10 +92,10 @@
     }
 
     public String saveString() {
-@@ -182,5 +_,88 @@
-     @Nullable
-     public static KeyMapping get(String p_378660_) {
-         return ALL.get(p_378660_);
+@@ -176,5 +_,88 @@
+ 
+     public void setDown(boolean p_90846_) {
+         this.isDown = p_90846_;
 +    }
 +
 +    private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -250,7 +_,7 @@
+@@ -253,7 +_,7 @@
 import org.slf4j.Logger;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     static Minecraft instance;
     private static final Logger LOGGER = LogUtils.getLogger();
     public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
-@@ -428,7 +_,6 @@
+@@ -433,7 +_,6 @@
             }
         }, Util.nonCriticalIoPool());
         LOGGER.info("Setting user: {}", this.user.getName());
@@ -17,7 +17,7 @@
         this.demo = p_91084_.game.demo;
         this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
         this.allowsChat = !p_91084_.game.disableChat;
-@@ -475,15 +_,15 @@
+@@ -480,15 +_,15 @@
             LOGGER.error("Couldn't set icon", (Throwable)ioexception);
         }
 
@@ -35,15 +35,15 @@
         this.resourcePackRepository.reload();
         this.options.loadSelectedResourcePacks(this.resourcePackRepository);
         this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
-@@ -561,6 +_,7 @@
-         this.blockEntityRenderDispatcher = new BlockEntityRenderDispatcher(this.font, this.modelManager.entityModels(), this.blockRenderer, this.itemModelResolver, this.itemRenderer, this.entityRenderDispatcher);
-         this.resourceManager.registerReloadListener(this.blockEntityRenderDispatcher);
+@@ -562,6 +_,7 @@
+         );
+         this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
         this.particleEngine = new ParticleEngine(this.level, this.textureManager);
 +        net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
         this.resourceManager.registerReloadListener(this.particleEngine);
         this.paintingTextures = new PaintingTextureManager(this.textureManager);
         this.resourceManager.registerReloadListener(this.paintingTextures);
-@@ -576,6 +_,9 @@
+@@ -577,6 +_,9 @@
         this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
         this.resourceManager.registerReloadListener(this.regionalCompliancies);
         this.gui = new Gui(this);
@@ -53,7 +53,7 @@
         this.debugRenderer = new DebugRenderer(this);
         RealmsClient realmsclient = RealmsClient.create(this);
         this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
-@@ -599,6 +_,7 @@
+@@ -600,6 +_,7 @@
             this.options.fullscreen().set(this.window.isFullscreen());
         }
 
@@ -165,7 +165,7 @@
         }
 
         profilerfiller.push("blit");
-@@ -1342,10 +_,12 @@
+@@ -1339,10 +_,12 @@
         this.window.setGuiScale((double)i);
         if (this.screen != null) {
             this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
@@ -178,7 +178,7 @@
         this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
         this.mouseHandler.setIgnoreFirstMove();
     }
-@@ -1486,6 +_,7 @@
+@@ -1483,6 +_,7 @@
     }
 
     public void stop() {
@@ -186,7 +186,7 @@
         this.running = false;
     }
 
-@@ -1514,10 +_,18 @@
+@@ -1511,10 +_,18 @@
             if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
                 BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                 BlockPos blockpos = blockhitresult.getBlockPos();
@@ -208,7 +208,7 @@
                         this.player.swing(InteractionHand.MAIN_HAND);
                     }
                 }
-@@ -1545,6 +_,8 @@
+@@ -1542,6 +_,8 @@
                 return false;
             } else {
                 boolean flag = false;
@@ -217,7 +217,7 @@
                 switch (this.hitResult.getType()) {
                     case ENTITY:
                         this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
-@@ -1552,7 +_,7 @@
+@@ -1549,7 +_,7 @@
                     case BLOCK:
                         BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                         BlockPos blockpos = blockhitresult.getBlockPos();
@@ -226,7 +226,7 @@
                             this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
                             if (this.level.getBlockState(blockpos).isAir()) {
                                 flag = true;
-@@ -1565,8 +_,10 @@
+@@ -1562,8 +_,10 @@
                         }
 
                         this.player.resetAttackStrengthTicker();
@@ -237,7 +237,7 @@
                 this.player.swing(InteractionHand.MAIN_HAND);
                 return flag;
             }
-@@ -1582,6 +_,12 @@
+@@ -1579,6 +_,12 @@
                 }
 
                 for (InteractionHand interactionhand : InteractionHand.values()) {
@@ -250,7 +250,7 @@
                     ItemStack itemstack = this.player.getItemInHand(interactionhand);
                     if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
                         return;
-@@ -1602,7 +_,7 @@
+@@ -1599,7 +_,7 @@
                                 }
 
                                 if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
@@ -259,7 +259,7 @@
                                         this.player.swing(interactionhand);
                                     }
 
-@@ -1614,7 +_,7 @@
+@@ -1611,7 +_,7 @@
                                 int i = itemstack.getCount();
                                 InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
                                 if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
@@ -268,7 +268,7 @@
                                         this.player.swing(interactionhand);
                                         if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
                                             this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
-@@ -1630,6 +_,9 @@
+@@ -1627,6 +_,9 @@
                         }
                     }
 
@@ -278,7 +278,7 @@
                     if (!itemstack.isEmpty()
                         && this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
                         if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
-@@ -1659,6 +_,8 @@
+@@ -1656,6 +_,8 @@
         }
 
         ProfilerFiller profilerfiller = Profiler.get();
@@ -287,7 +287,7 @@
         profilerfiller.push("gui");
         this.chatListener.tick();
         this.gui.tick(this.pause);
-@@ -1748,6 +_,7 @@
+@@ -1745,6 +_,7 @@
 
                 this.tutorial.tick();
 
@@ -295,7 +295,7 @@
                 try {
                     this.level.tick(() -> true);
                 } catch (Throwable throwable1) {
-@@ -1761,6 +_,7 @@
+@@ -1758,6 +_,7 @@
 
                     throw new ReportedException(crashreport1);
                 }
@@ -303,7 +303,7 @@
             }
 
             profilerfiller.popPush("animateTick");
-@@ -1785,6 +_,7 @@
+@@ -1782,6 +_,7 @@
         profilerfiller.popPush("keyboard");
         this.keyboardHandler.tick();
         profilerfiller.pop();
@@ -311,7 +311,7 @@
     }
 
     private boolean isLevelRunningNormally() {
-@@ -1986,6 +_,7 @@
+@@ -1983,6 +_,7 @@
     }
 
     public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
@@ -319,7 +319,7 @@
         this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
         this.level = p_91157_;
         this.updateLevelInEngines(p_91157_);
-@@ -2023,6 +_,7 @@
+@@ -2020,6 +_,7 @@
         IntegratedServer integratedserver = this.singleplayerServer;
         this.singleplayerServer = null;
         this.gameRenderer.resetData();
@@ -327,7 +327,7 @@
         this.gameMode = null;
         this.narrator.clear();
         this.clientLevelTeardownInProgress = true;
-@@ -2030,6 +_,7 @@
+@@ -2027,6 +_,7 @@
         try {
             this.updateScreenAndTick(p_335030_);
             if (this.level != null) {
@@ -335,7 +335,7 @@
                 if (integratedserver != null) {
                     ProfilerFiller profilerfiller = Profiler.get();
                     profilerfiller.push("waitForServer");
-@@ -2043,6 +_,7 @@
+@@ -2040,6 +_,7 @@
 
                 this.gui.onDisconnected();
                 this.isLocalServer = false;
@@ -343,11 +343,40 @@
             }
 
             this.level = null;
-@@ -2190,6 +_,7 @@
+@@ -2187,6 +_,7 @@
 
     private void pickBlock() {
         if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
 +            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
-             boolean flag = Screen.hasControlDown();
-             HitResult hitresult = this.hitResult;
-             Objects.requireNonNull(this.hitResult);
+             boolean flag = this.player.getAbilities().instabuild;
+             BlockEntity blockentity = null;
+             HitResult.Type hitresult$type = this.hitResult.getType();
+@@ -2199,7 +_,7 @@
+                 }
+ 
+                 Block block = blockstate.getBlock();
+-                itemstack = block.getCloneItemStack(this.level, blockpos, blockstate);
+                itemstack = blockstate.getCloneItemStack(this.hitResult, this.level, blockpos, this.player);
+                 if (itemstack.isEmpty()) {
+                     return;
+                 }
+@@ -2213,7 +_,7 @@
+                 }
+ 
+                 Entity entity = ((EntityHitResult)this.hitResult).getEntity();
+-                itemstack = entity.getPickResult();
+                itemstack = entity.getPickedResult(this.hitResult);
+                 if (itemstack == null) {
+                     return;
+                 }
+@@ -2818,6 +_,10 @@
+     @Nullable
+     public static String getLauncherBrand() {
+         return System.getProperty("minecraft.launcher.brand");
+    }
+
+    public ItemColors getItemColors() {
+       return this.itemColors;
+     }
+ 
+     @OnlyIn(Dist.CLIENT)
@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/color/block/BlockColors.java
 +++ b/net/minecraft/client/color/block/BlockColors.java
-@@ -30,7 +_,8 @@
+@@ -29,7 +_,8 @@
+ @OnlyIn(Dist.CLIENT)
+ public class BlockColors {
     private static final int DEFAULT = -1;
-     public static final int LILY_PAD_IN_WORLD = -14647248;
-     public static final int LILY_PAD_DEFAULT = -9321636;
 -    private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
 +    // Forge: Use registry delegate as non-Vanilla block ids are not constant
 +    private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
     private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
 
     public static BlockColors createDefault() {
-@@ -90,11 +_,12 @@
+@@ -91,11 +_,12 @@
         }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
         blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
         blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
@@ -24,7 +24,7 @@
         if (blockcolor != null) {
             return blockcolor.getColor(p_92583_, null, null, 0);
         } else {
-@@ -104,13 +_,15 @@
+@@ -105,13 +_,15 @@
     }
 
     public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
@@ -0,0 +1,35 @@
+--- a/net/minecraft/client/color/item/ItemColors.java
+++ b/net/minecraft/client/color/item/ItemColors.java
+@@ -26,7 +_,8 @@
+ @OnlyIn(Dist.CLIENT)
+ public class ItemColors {
+     private static final int DEFAULT = -1;
+-    private final IdMapper<ItemColor> itemColors = new IdMapper<>(32);
+    // Forge: Use registry delegate as non-Vanilla item ids are not constant
+    private final java.util.Map<net.minecraft.core.Holder.Reference<Item>, ItemColor> itemColors = new java.util.HashMap<>(32);
+ 
+     public static ItemColors createDefault(BlockColors p_92684_) {
+         ItemColors itemcolors = new ItemColors();
+@@ -101,17 +_,20 @@
+             (p_357654_, p_357655_) -> p_357655_ == 0 ? -1 : ARGB.opaque(p_357654_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
+             Items.FILLED_MAP
+         );
+        net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
+         return itemcolors;
+     }
+ 
+     public int getColor(ItemStack p_92677_, int p_92678_) {
+-        ItemColor itemcolor = this.itemColors.byId(BuiltInRegistries.ITEM.getId(p_92677_.getItem()));
+        ItemColor itemcolor = this.itemColors.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.getItem()));
+         return itemcolor == null ? -1 : itemcolor.getColor(p_92677_, p_92678_);
+     }
+ 
+    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Item} */
+    @Deprecated
+     public void register(ItemColor p_92690_, ItemLike... p_92691_) {
+         for (ItemLike itemlike : p_92691_) {
+-            this.itemColors.addMapping(p_92690_, Item.getId(itemlike.asItem()));
+            this.itemColors.put(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(itemlike.asItem()), p_92690_);
+         }
+     }
+ }
@@ -1,22 +0,0 @@
--- a/net/minecraft/client/data/Main.java
-+++ b/net/minecraft/client/data/Main.java
-@@ -30,13 +_,18 @@
-         OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
-         OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
-         OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
-+        OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg();
-+        var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true);
-         OptionSet optionset = optionparser.parse(p_375526_);
-        if (!optionset.has(optionspec) && optionset.hasOptions()) {
-+        if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
-+            var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList();
-             Path path = Paths.get(optionspec3.value(optionset));
-             boolean flag = optionset.has(optionspec2);
-             boolean flag1 = flag || optionset.has(optionspec1);
-             Bootstrap.bootStrap();
-             ClientBootstrap.bootstrap();
-+            if (!loader.run(optionset, path, input, flag, flag1, flag, flag, false))
-+                return;
-             DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
-             addClientProviders(datagenerator, flag1);
-             datagenerator.run();
@@ -1,12 +0,0 @@
--- a/net/minecraft/client/data/models/ItemModelGenerators.java
-+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
-@@ -852,6 +_,9 @@
-         this.declareCustomModelItem(Items.COD);
-         this.declareCustomModelItem(Items.FEATHER);
-         this.declareCustomModelItem(Items.LEAD);
-+        // moved from validate to here, because it's just vanilla default blocks
-+        if (this.itemModelOutput instanceof ModelProvider.ItemInfoCollector collector)
-+            collector.generateDefaultBlockModels();
-     }
- 
-     @OnlyIn(Dist.CLIENT)
@@ -1,111 +0,0 @@
--- a/net/minecraft/client/data/models/ModelProvider.java
-+++ b/net/minecraft/client/data/models/ModelProvider.java
-@@ -43,11 +_,11 @@
- 
-     @Override
-     public CompletableFuture<?> run(CachedOutput p_376268_) {
-        ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector();
-        ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector();
-+        ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(this::getKnownItems);
-+        ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
-         ModelProvider.SimpleModelCollector modelprovider$simplemodelcollector = new ModelProvider.SimpleModelCollector();
-        new BlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-        new ItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-+         getBlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-+         getItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-         modelprovider$blockstategeneratorcollector.validate();
-         modelprovider$iteminfocollector.finalizeAndValidate();
-         return CompletableFuture.allOf(
-@@ -57,6 +_,22 @@
-         );
-     }
- 
-+    protected Stream<Block> getKnownBlocks() {
-+         return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace()));
-+    }
-+
-+    protected Stream<Item> getKnownItems() {
-+        return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace()));
-+    }
-+
-+    protected BlockModelGenerators getBlockModelGenerators(BlockStateGeneratorCollector blocks, ItemInfoCollector items, SimpleModelCollector models) {
-+        return new BlockModelGenerators(blocks, items, models);
-+    }
-+
-+    protected ItemModelGenerators getItemModelGenerators(ItemInfoCollector items, SimpleModelCollector models) {
-+        return new ItemModelGenerators(items, models);
-+    }
-+
-     static <T> CompletableFuture<?> saveAll(CachedOutput p_378816_, Function<T, Path> p_377914_, Map<T, ? extends Supplier<JsonElement>> p_377836_) {
-         return DataProvider.saveAll(p_378816_, Supplier::get, p_377914_, p_377836_);
-     }
-@@ -69,6 +_,15 @@
-     @OnlyIn(Dist.CLIENT)
-     public static class BlockStateGeneratorCollector implements Consumer<BlockStateGenerator> {
-         private final Map<Block, BlockStateGenerator> generators = new HashMap<>();
-+        private final Supplier<Stream<Block>> known;
-+
-+        public BlockStateGeneratorCollector() {
-+            this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace())));
-+        }
-+
-+        public BlockStateGeneratorCollector(Supplier<Stream<Block>> known) {
-+            this.known = known;
-+        }
- 
-         public void accept(BlockStateGenerator p_378147_) {
-             Block block = p_378147_.getBlock();
-@@ -79,7 +_,7 @@
-         }
- 
-         public void validate() {
-            Stream<Holder.Reference<Block>> stream = BuiltInRegistries.BLOCK.listElements().filter(p_376480_ -> true);
-+            Stream<Holder.Reference<Block>> stream = known.get().map(Block::builtInRegistryHolder);
-             List<ResourceLocation> list = stream.filter(p_378423_ -> !this.generators.containsKey(p_378423_.value()))
-                 .map(p_378200_ -> p_378200_.key().location())
-                 .toList();
-@@ -97,6 +_,15 @@
-     public static class ItemInfoCollector implements ItemModelOutput {
-         private final Map<Item, ClientItem> itemInfos = new HashMap<>();
-         private final Map<Item, Item> copies = new HashMap<>();
-+        private final Supplier<Stream<Item>> known;
-+
-+        public ItemInfoCollector() {
-+            this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace())));
-+        }
-+
-+        public ItemInfoCollector(Supplier<Stream<Item>> known) {
-+            this.known = known;
-+        }
- 
-         @Override
-         public void accept(Item p_376450_, ItemModel.Unbaked p_378513_) {
-@@ -115,7 +_,7 @@
-             this.copies.put(p_376965_, p_377438_);
-         }
- 
-        public void finalizeAndValidate() {
-+        public void generateDefaultBlockModels() {
-             BuiltInRegistries.ITEM.forEach(p_378629_ -> {
-                 if (!this.copies.containsKey(p_378629_)) {
-                     if (p_378629_ instanceof BlockItem blockitem && !this.itemInfos.containsKey(blockitem)) {
-@@ -124,6 +_,8 @@
-                     }
-                 }
-             });
-+        }
-+        public void finalizeAndValidate() {
-             this.copies.forEach((p_376289_, p_375718_) -> {
-                 ClientItem clientitem = this.itemInfos.get(p_375718_);
-                 if (clientitem == null) {
-@@ -132,8 +_,8 @@
-                     this.register(p_376289_, clientitem);
-                 }
-             });
-            List<ResourceLocation> list = BuiltInRegistries.ITEM
-                .listElements()
-+            List<ResourceLocation> list = known.get()
-+                .map(item -> item.builtInRegistryHolder())
-                 .filter(p_377225_ -> !this.itemInfos.containsKey(p_377225_.value()))
-                 .map(p_378591_ -> p_378591_.key().location())
-                 .toList();
@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/gui/Font.java
 +++ b/net/minecraft/client/gui/Font.java
-@@ -32,7 +_,7 @@
- import org.joml.Matrix4f;
+@@ -33,7 +_,7 @@
+ import org.joml.Vector3f;
 
 @OnlyIn(Dist.CLIENT)
 -public class Font {
 +public class Font implements net.minecraftforge.client.extensions.IForgeFont {
     private static final float EFFECT_DEPTH = 0.01F;
-     public static final float SHADOW_DEPTH = 0.03F;
-     public static final int NO_SHADOW = 0;
+     private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
+     public static final int ALPHA_CUTOFF = 8;
@@ -9,40 +9,6 @@
     private final SubtitleOverlay subtitleOverlay;
     private final SpectatorGui spectatorGui;
     private final PlayerTabOverlay tabList;
-@@ -167,7 +_,7 @@
-     private int lastBubblePopSoundPlayed;
-     private float autosaveIndicatorValue;
-     private float lastAutosaveIndicatorValue;
-    private final LayeredDraw layers = new LayeredDraw();
-+    private final LayeredDraw layers = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.VANILLA_ROOT, net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.COMBINE_LIST);
-     private float scopeScale;
- 
-     public Gui(Minecraft p_330021_) {
-@@ -179,14 +_,14 @@
-         this.bossOverlay = new BossHealthOverlay(p_330021_);
-         this.subtitleOverlay = new SubtitleOverlay(p_330021_);
-         this.resetTitleTimes();
-        LayeredDraw layereddraw = new LayeredDraw()
-+        LayeredDraw layereddraw = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.PRE_SLEEP_STACK, net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.PRE_LIST)
-             .add(this::renderCameraOverlays)
-             .add(this::renderCrosshair)
-             .add(this::renderHotbarAndDecorations)
-             .add(this::renderExperienceLevel)
-             .add(this::renderEffects)
-             .add((p_325313_, p_342678_) -> this.bossOverlay.render(p_325313_));
-        LayeredDraw layereddraw1 = new LayeredDraw()
-+        LayeredDraw layereddraw1 = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.POST_SLEEP_STACK,net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.POST_LIST)
-             .add(this::renderDemoOverlay)
-             .add((p_325315_, p_344521_) -> {
-                 if (this.debugOverlay.showDebugScreen()) {
-@@ -203,6 +_,7 @@
-             .add(layereddraw, () -> !p_330021_.options.hideGui)
-             .add(this::renderSleepOverlay)
-             .add(layereddraw1, () -> !p_330021_.options.hideGui);
-+        ((net.minecraftforge.client.gui.overlay.ForgeLayeredDraw) layers).resolveLayers();
-     }
- 
-     public void resetTitleTimes() {
@@ -345,7 +_,7 @@
             Window window = this.minecraft.getWindow();
             int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/GuiGraphics.java
 +++ b/net/minecraft/client/gui/GuiGraphics.java
-@@ -52,7 +_,7 @@
+@@ -53,7 +_,7 @@
 import org.joml.Vector2ic;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     public static final float MAX_GUI_Z = 10000.0F;
     public static final float MIN_GUI_Z = -10000.0F;
     private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
-@@ -229,6 +_,11 @@
+@@ -227,6 +_,11 @@
     }
 
     public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
@@ -21,7 +21,7 @@
         return p_281896_ == null
             ? 0
             : p_283343_.drawInBatch(
-@@ -250,6 +_,11 @@
+@@ -248,6 +_,11 @@
     }
 
     public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
@@ -33,7 +33,7 @@
         return p_282636_.drawInBatch(
             p_281596_,
             (float)p_281586_,
-@@ -859,6 +_,7 @@
+@@ -872,6 +_,7 @@
                 CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
                 CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
                 crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
@@ -41,7 +41,7 @@
                 crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
                 crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
                 throw new ReportedException(crashreport);
-@@ -879,13 +_,24 @@
+@@ -892,13 +_,24 @@
             this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
             this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
             this.pose.popPose();
@@ -66,7 +66,7 @@
     }
 
     public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
-@@ -895,8 +_,7 @@
+@@ -908,8 +_,7 @@
     public void renderTooltip(
         Font p_362491_, List<Component> p_368544_, Optional<TooltipComponent> p_362815_, int p_366300_, int p_368952_, @Nullable ResourceLocation p_368469_
     ) {
@@ -76,7 +76,7 @@
         this.renderTooltipInternal(p_362491_, list, p_366300_, p_368952_, DefaultTooltipPositioner.INSTANCE, p_368469_);
     }
 
-@@ -909,7 +_,22 @@
+@@ -922,7 +_,22 @@
     }
 
     public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
@@ -100,7 +100,7 @@
     }
 
     public void renderComponentTooltip(Font p_369090_, List<Component> p_365405_, int p_368143_, int p_366244_, @Nullable ResourceLocation p_364763_) {
-@@ -951,11 +_,13 @@
+@@ -964,11 +_,13 @@
         @Nullable ResourceLocation p_368234_
     ) {
         if (!p_282615_.isEmpty()) {
@@ -115,7 +115,7 @@
                 if (k > i) {
                     i = k;
                 }
-@@ -965,18 +_,19 @@
+@@ -978,18 +_,19 @@
 
             int i2 = i;
             int j2 = j;
@@ -138,7 +138,7 @@
                 k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
             }
 
-@@ -984,7 +_,7 @@
+@@ -997,7 +_,7 @@
 
             for (int k2 = 0; k2 < p_282615_.size(); k2++) {
                 ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
@@ -147,7 +147,7 @@
                 k1 += clienttooltipcomponent2.getHeight(p_282675_) + (k2 == 0 ? 2 : 0);
             }
 
-@@ -1041,6 +_,10 @@
+@@ -1054,6 +_,10 @@
                 }
             }
         }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -250,6 +_,25 @@
+@@ -259,6 +_,25 @@
         this.focused = p_93693_;
     }
 
@@ -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();
-@@ -99,6 +_,7 @@
+@@ -100,6 +_,7 @@
             f2 = 1.0F;
         }
 
@@ -17,7 +17,7 @@
         int k2 = (int)((double)p_281839_.guiWidth() * 0.5);
         int l2 = (int)((double)p_281839_.guiHeight() * 0.5);
         double d1 = Math.min((double)p_281839_.guiWidth() * 0.75, (double)p_281839_.guiHeight()) * 0.25;
-@@ -114,12 +_,14 @@
+@@ -115,12 +_,14 @@
         if (f < 1.0F) {
             this.drawProgressBar(p_281839_, i / 2 - j1, l1 - 5, i / 2 + j1, l1 + 5, 1.0F - Mth.clamp(f, 0.0F, 1.0F));
         }
@@ -32,7 +32,7 @@
             try {
                 this.reload.checkExceptions();
                 this.onFinish.accept(Optional.empty());
-@@ -127,7 +_,6 @@
+@@ -128,7 +_,6 @@
                 this.onFinish.accept(Optional.of(throwable));
             }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/TitleScreen.java
 +++ b/net/minecraft/client/gui/screens/TitleScreen.java
-@@ -58,6 +_,7 @@
+@@ -60,6 +_,7 @@
     private boolean fading;
     private long fadeInStart;
     private final LogoRenderer logoRenderer;
@@ -8,7 +8,7 @@
 
     public TitleScreen() {
         this(false);
-@@ -111,11 +_,15 @@
+@@ -115,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(
-@@ -180,7 +_,7 @@
+@@ -184,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()
             )
-@@ -289,6 +_,7 @@
+@@ -293,6 +_,7 @@
         if ((i & -67108864) != 0) {
             super.render(p_282860_, p_281753_, p_283539_, p_282628_);
             this.logoRenderer.renderLogo(p_282860_, this.width, f);
@@ -41,7 +41,7 @@
             if (this.splash != null && !this.minecraft.options.hideSplashTexts().get()) {
                 this.splash.render(p_282860_, this.width, this.font, i);
             }
-@@ -304,10 +_,18 @@
+@@ -308,10 +_,18 @@
                 s = s + I18n.get("menu.modded");
             }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
-@@ -106,6 +_,7 @@
+@@ -108,6 +_,7 @@
         int i = this.leftPos;
         int j = this.topPos;
         super.render(p_283479_, p_283661_, p_281248_, p_281886_);
@@ -8,7 +8,7 @@
         p_283479_.pose().pushPose();
         p_283479_.pose().translate((float)i, (float)j, 0.0F);
         Slot slot = this.hoveredSlot;
-@@ -117,6 +_,8 @@
+@@ -119,6 +_,8 @@
             this.onStopHovering(slot);
         }
 
@@ -17,7 +17,7 @@
         this.renderLabels(p_283479_, p_283661_, p_281248_);
         ItemStack itemstack = this.draggingItem.isEmpty() ? this.menu.getCarried() : this.draggingItem;
         if (!itemstack.isEmpty()) {
-@@ -197,7 +_,7 @@
+@@ -199,7 +_,7 @@
             ItemStack itemstack = this.hoveredSlot.getItem();
             if (this.menu.getCarried().isEmpty() || this.showTooltipWithItemInHand(itemstack)) {
                 p_283594_.renderTooltip(
@@ -26,7 +26,7 @@
                 );
             }
         }
-@@ -215,7 +_,8 @@
+@@ -217,7 +_,8 @@
         p_282567_.pose().pushPose();
         p_282567_.pose().translate(0.0F, 0.0F, 232.0F);
         p_282567_.renderItem(p_281330_, p_281772_, p_281689_);
@@ -36,7 +36,7 @@
         p_282567_.pose().popPose();
     }
 
-@@ -321,7 +_,8 @@
+@@ -324,7 +_,8 @@
         if (super.mouseClicked(p_97748_, p_97749_, p_97750_)) {
             return true;
         } else {
@@ -46,7 +46,7 @@
             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_;
-@@ -332,6 +_,7 @@
+@@ -335,6 +_,7 @@
                 int j = this.leftPos;
                 int k = this.topPos;
                 boolean flag1 = this.hasClickedOutside(p_97748_, p_97749_, j, k, p_97750_);
@@ -54,7 +54,7 @@
                 int l = -1;
                 if (slot != null) {
                     l = slot.index;
-@@ -357,7 +_,7 @@
+@@ -360,7 +_,7 @@
                         }
                     } else if (!this.isQuickCrafting) {
                         if (this.menu.getCarried().isEmpty()) {
@@ -63,7 +63,7 @@
                                 this.slotClicked(slot, l, p_97750_, ClickType.CLONE);
                             } else {
                                 boolean flag2 = l != -999
-@@ -385,7 +_,7 @@
+@@ -388,7 +_,7 @@
                                 this.quickCraftingType = 0;
                             } else if (p_97750_ == 1) {
                                 this.quickCraftingType = 1;
@@ -72,7 +72,7 @@
                                 this.quickCraftingType = 2;
                             }
                         }
-@@ -464,10 +_,13 @@
+@@ -467,10 +_,13 @@
 
     @Override
     public boolean mouseReleased(double p_97812_, double p_97813_, int p_97814_) {
@@ -86,7 +86,7 @@
         int k = -1;
         if (slot != null) {
             k = slot.index;
-@@ -484,7 +_,7 @@
+@@ -487,7 +_,7 @@
                         if (slot2 != null
                             && slot2.mayPickup(this.minecraft.player)
                             && slot2.hasItem()
@@ -95,7 +95,7 @@
                             && AbstractContainerMenu.canItemQuickReplace(slot2, this.lastQuickMoved, true)) {
                             this.slotClicked(slot2, slot2.index, p_97814_, ClickType.QUICK_MOVE);
                         }
-@@ -548,7 +_,7 @@
+@@ -551,7 +_,7 @@
 
                 this.slotClicked(null, -999, AbstractContainerMenu.getQuickcraftMask(2, this.quickCraftingType), ClickType.QUICK_CRAFT);
             } else if (!this.menu.getCarried().isEmpty()) {
@@ -104,7 +104,7 @@
                     this.slotClicked(slot, k, p_97814_, ClickType.CLONE);
                 } else {
                     boolean flag1 = k != -999
-@@ -628,9 +_,10 @@
+@@ -631,9 +_,10 @@
 
     @Override
     public boolean keyPressed(int p_97765_, int p_97766_, int p_97767_) {
@@ -116,7 +116,7 @@
             this.onClose();
             return true;
         } else {
-@@ -704,4 +_,11 @@
+@@ -707,4 +_,11 @@
 
         super.onClose();
     }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
-@@ -114,6 +_,8 @@
+@@ -115,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);
-@@ -162,7 +_,7 @@
+@@ -163,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_);
-@@ -330,6 +_,35 @@
+@@ -331,6 +_,35 @@
     protected void init() {
         if (this.minecraft.gameMode.hasInfiniteItems()) {
             super.init();
@@ -54,7 +54,7 @@
             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);
-@@ -376,7 +_,7 @@
+@@ -377,7 +_,7 @@
     public boolean charTyped(char p_98521_, int p_98522_) {
         if (this.ignoreTextInput) {
             return false;
@@ -63,7 +63,7 @@
             return false;
         } else {
             String s = this.searchBox.getValue();
-@@ -395,7 +_,7 @@
+@@ -396,7 +_,7 @@
     @Override
     public boolean keyPressed(int p_98547_, int p_98548_, int p_98549_) {
         this.ignoreTextInput = false;
@@ -72,7 +72,7 @@
             if (this.minecraft.options.keyChat.matches(p_98547_, p_98548_)) {
                 this.ignoreTextInput = true;
                 this.selectTab(CreativeModeTabs.searchTab());
-@@ -431,6 +_,7 @@
+@@ -432,6 +_,7 @@
     }
 
     private void refreshSearchResults() {
@@ -80,7 +80,7 @@
         this.menu.items.clear();
         this.visibleTags.clear();
         String s = this.searchBox.getValue();
-@@ -443,10 +_,10 @@
+@@ -444,10 +_,10 @@
                 SearchTree<ItemStack> searchtree;
                 if (s.startsWith("#")) {
                     s = s.substring(1);
@@ -93,7 +93,7 @@
                 }
 
                 this.menu.items.addAll(searchtree.search(s.toLowerCase(Locale.ROOT)));
-@@ -478,7 +_,8 @@
+@@ -479,7 +_,8 @@
     @Override
     protected void renderLabels(GuiGraphics p_283168_, int p_281774_, int p_281466_) {
         if (selectedTab.showTitle()) {
@@ -103,7 +103,7 @@
         }
     }
 
-@@ -488,7 +_,7 @@
+@@ -489,7 +_,7 @@
             double d0 = p_98531_ - (double)this.leftPos;
             double d1 = p_98532_ - (double)this.topPos;
 
@@ -112,7 +112,7 @@
                 if (this.checkTabClicked(creativemodetab, d0, d1)) {
                     return true;
                 }
-@@ -510,7 +_,7 @@
+@@ -511,7 +_,7 @@
             double d1 = p_98623_ - (double)this.topPos;
             this.scrolling = false;
 
@@ -121,7 +121,7 @@
                 if (this.checkTabClicked(creativemodetab, d0, d1)) {
                     this.selectTab(creativemodetab);
                     return true;
-@@ -604,13 +_,15 @@
+@@ -605,13 +_,15 @@
             this.originalSlots = null;
         }
 
@@ -138,7 +138,7 @@
 
             this.refreshSearchResults();
         } else {
-@@ -676,7 +_,15 @@
+@@ -677,7 +_,15 @@
         super.render(p_283000_, p_281317_, p_282770_, p_281295_);
         this.effects.render(p_283000_, p_281317_, p_282770_, p_281295_);
 
@@ -155,7 +155,7 @@
             if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
                 break;
             }
-@@ -688,6 +_,7 @@
+@@ -689,6 +_,7 @@
             p_283000_.renderTooltip(this.font, TRASH_SLOT_TOOLTIP, p_281317_, p_282770_);
         }
 
@@ -163,7 +163,7 @@
         this.renderTooltip(p_283000_, p_281317_, p_282770_);
     }
 
-@@ -700,7 +_,7 @@
+@@ -701,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;
@@ -172,7 +172,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);
-@@ -719,7 +_,7 @@
+@@ -720,7 +_,7 @@
             int i = 1;
 
             for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
@@ -181,7 +181,7 @@
                     list1.add(i++, creativemodetab.getDisplayName().copy().withStyle(ChatFormatting.BLUE));
                 }
             }
-@@ -730,7 +_,7 @@
+@@ -731,7 +_,7 @@
 
     @Override
     protected void renderBg(GuiGraphics p_282663_, float p_282504_, int p_282089_, int p_282249_) {
@@ -190,7 +190,7 @@
             if (creativemodetab != selectedTab) {
                 this.renderTabButton(p_282663_, creativemodetab);
             }
-@@ -746,6 +_,7 @@
+@@ -747,6 +_,7 @@
             p_282663_.blitSprite(RenderType::guiTextured, resourcelocation, j, k + (int)((float)(i - k - 17) * this.scrollOffs), 12, 15);
         }
 
@@ -198,7 +198,7 @@
         this.renderTabButton(p_282663_, selectedTab);
         if (selectedTab.getType() == CreativeModeTab.Type.INVENTORY) {
             InventoryScreen.renderEntityInInventoryFollowsMouse(
-@@ -764,7 +_,7 @@
+@@ -765,7 +_,7 @@
     }
 
     private int getTabX(CreativeModeTab p_260136_) {
@@ -207,7 +207,7 @@
         int j = 27;
         int k = 27 * i;
         if (p_260136_.isAlignedRight()) {
-@@ -776,7 +_,7 @@
+@@ -777,7 +_,7 @@
 
     private int getTabY(CreativeModeTab p_260181_) {
         int i = 0;
@@ -216,7 +216,7 @@
             i -= 32;
         } else {
             i += this.imageHeight;
-@@ -804,8 +_,8 @@
+@@ -805,8 +_,8 @@
 
     protected void renderTabButton(GuiGraphics p_283590_, CreativeModeTab p_283489_) {
         boolean flag = p_283489_ == selectedTab;
@@ -227,7 +227,7 @@
         int j = this.leftPos + this.getTabX(p_283489_);
         int k = this.topPos - (flag1 ? 28 : -(this.imageHeight - 4));
         ResourceLocation[] aresourcelocation;
-@@ -815,6 +_,7 @@
+@@ -816,6 +_,7 @@
             aresourcelocation = flag ? SELECTED_BOTTOM_TABS : UNSELECTED_BOTTOM_TABS;
         }
 
@@ -235,7 +235,7 @@
         p_283590_.blitSprite(RenderType::guiTextured, aresourcelocation[Mth.clamp(i, 0, aresourcelocation.length)], j, k, 26, 32);
         p_283590_.pose().pushPose();
         p_283590_.pose().translate(0.0F, 0.0F, 100.0F);
-@@ -856,6 +_,14 @@
+@@ -857,6 +_,14 @@
         }
     }
 
@@ -250,7 +250,7 @@
     @OnlyIn(Dist.CLIENT)
     static class CustomCreativeSlot extends Slot {
         public CustomCreativeSlot(Container p_98633_, int p_98634_, int p_98635_, int p_98636_) {
-@@ -1037,6 +_,22 @@
+@@ -1038,6 +_,22 @@
         @Override
         public boolean mayPickup(Player p_98665_) {
             return this.target.mayPickup(p_98665_);
@@ -267,8 +267,8 @@
 +        }
 +
 +        @Override
-+        public Slot setBackground(ResourceLocation sprite) {
-+            this.target.setBackground(sprite);
+        public Slot setBackground(ResourceLocation atlas, ResourceLocation sprite) {
+            this.target.setBackground(atlas, sprite);
 +            return this;
         }
     }
@@ -8,7 +8,7 @@
 +                if (((k < l + 1 || this.minecraft.player.experienceLevel < k1) && !this.minecraft.player.getAbilities().instabuild)  || this.menu.enchantClue[l] == -1) { // Forge: render buttons as disabled when enchantable but enchantability not met on lower levels{
                     p_282430_.blitSprite(RenderType::guiTextured, ENCHANTMENT_SLOT_DISABLED_SPRITE, i1, j + 14 + 19 * l, 108, 19);
                     p_282430_.blitSprite(RenderType::guiTextured, DISABLED_LEVEL_SPRITES[l], i1 + 1, j + 15 + 19 * l, 16, 16);
-                     p_282430_.drawWordWrap(this.font, formattedtext, j1, j + 16 + 19 * l, l1, (i2 & 16711422) >> 1, false);
+                     p_282430_.drawWordWrap(this.font, formattedtext, j1, j + 16 + 19 * l, l1, (i2 & 16711422) >> 1);
@@ -175,13 +_,16 @@
                 .registryAccess()
                 .lookupOrThrow(Registries.ENCHANTMENT)
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
-@@ -371,6 +_,8 @@
+@@ -372,6 +_,8 @@
                 this.screen.setTooltipForNextRenderPass(Lists.transform(this.onlinePlayersTooltip, Component::getVisualOrderText));
             }
 
@@ -1,6 +1,18 @@
 --- a/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java
 +++ b/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java
-@@ -148,9 +_,10 @@
+@@ -69,6 +_,11 @@
+         return 340;
+     }
+ 
+    @Override
+    protected int getScrollbarPosition() {
+      return super.getScrollbarPosition() + 20;
+    }
+
+     @OnlyIn(Dist.CLIENT)
+     public class CategoryEntry extends KeyBindsList.Entry {
+         final Component name;
+@@ -153,9 +_,10 @@
             this.name = p_343976_;
             this.changeButton = Button.builder(p_343976_, p_342196_ -> {
                     KeyBindsList.this.keyBindsScreen.selectedKey = p_343088_;
@@ -12,7 +24,7 @@
                 .createNarration(
                     p_342179_ -> p_343088_.isUnbound()
                             ? Component.translatable("narrator.controls.unbound", p_343976_)
-@@ -158,7 +_,7 @@
+@@ -163,7 +_,7 @@
                 )
                 .build();
             this.resetButton = Button.builder(RESET_BUTTON_TITLE, p_357685_ -> {
@@ -21,7 +33,7 @@
                 KeyBindsList.this.resetMappingAndUpdateButtons();
             }).bounds(0, 0, 50, 20).createNarration(p_344192_ -> Component.translatable("narrator.controls.reset", p_343976_)).build();
             this.refreshEntry();
-@@ -210,7 +_,7 @@
+@@ -215,7 +_,7 @@
             MutableComponent mutablecomponent = Component.empty();
             if (!this.key.isUnbound()) {
                 for (KeyMapping keymapping : KeyBindsList.this.minecraft.options.keyMappings) {
@@ -6,6 +6,6 @@
         p_100014_.setSelected(null);
 -        p_100015_.forEach(
 +        p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach(
-             p_374582_ -> {
+             p_357689_ -> {
                 TransferableSelectionList.PackEntry transferableselectionlist$packentry1 = new TransferableSelectionList.PackEntry(
-                     this.minecraft, p_100014_, p_374582_
+                     this.minecraft, p_100014_, p_357689_
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
 +++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
-@@ -168,6 +_,7 @@
+@@ -169,6 +_,7 @@
     ) {
         queueLoadScreen(p_369292_, PREPARING_WORLD_DATA);
         PackRepository packrepository = new PackRepository(new ServerPacksSource(p_369292_.directoryValidator()));
@@ -8,7 +8,7 @@
         WorldLoader.InitConfig worldloader$initconfig = createDefaultLoadConfig(packrepository, WorldDataConfiguration.DEFAULT);
         CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.load(
             worldloader$initconfig,
-@@ -468,7 +_,7 @@
+@@ -479,7 +_,7 @@
                                         if (p_269627_) {
                                             p_270552_.accept(this.uiState.getSettings().dataConfiguration());
                                         } else {
@@ -17,7 +17,7 @@
                                         }
                                     },
                                     Component.translatable("dataPack.validation.failed"),
-@@ -582,6 +_,7 @@
+@@ -593,6 +_,7 @@
         if (path != null) {
             if (this.tempDataPackRepository == null) {
                 this.tempDataPackRepository = ServerPacksSource.createPackRepository(path, this.packValidator);
@@ -9,8 +9,8 @@
     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_.drawString(this.minecraft.font, s1, p_282820_ + 32 + 3, p_283181_ + 9 + 3, -8355712, false);
+             p_281612_.drawString(this.minecraft.font, component, p_282820_ + 32 + 3, p_283181_ + 9 + 9 + 3, -8355712, false);
             p_281612_.blit(RenderType::guiTextured, 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_) {
@@ -1,13 +1,12 @@
 --- a/net/minecraft/client/main/Main.java
 +++ b/net/minecraft/client/main/Main.java
-@@ -121,8 +_,8 @@
+@@ -120,8 +_,8 @@
             CrashReport.preload();
             logger = LogUtils.getLogger();
             s1 = "Bootstrap";
 -            Bootstrap.bootStrap();
-            ClientBootstrap.bootstrap();
-+            net.minecraftforge.fml.loading.BackgroundWaiter.runAndTick(Bootstrap::bootStrap, net.minecraftforge.fml.loading.FMLLoader.progressWindowTick);
-+            net.minecraftforge.fml.loading.BackgroundWaiter.runAndTick(ClientBootstrap::bootstrap, net.minecraftforge.fml.loading.FMLLoader.progressWindowTick);
             GameLoadTimesEvent.INSTANCE.setBootstrapTime(Bootstrap.bootstrapDuration.get());
+            net.minecraftforge.fml.loading.BackgroundWaiter.runAndTick(Bootstrap::bootStrap, net.minecraftforge.fml.loading.FMLLoader.progressWindowTick);
             Bootstrap.validate();
             s1 = "Argument parsing";
+             List<String> list = optionset.valuesOf(optionspec29);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/model/HumanoidModel.java
 +++ b/net/minecraft/client/model/HumanoidModel.java
-@@ -255,6 +_,8 @@
+@@ -259,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 @@
+@@ -303,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 @@
+@@ -381,7 +_,7 @@
     }
 
     @OnlyIn(Dist.CLIENT)
@@ -27,7 +27,7 @@
         EMPTY(false),
         ITEM(false),
         BLOCK(false),
-@@ -393,10 +_,28 @@
+@@ -397,10 +_,28 @@
 
         private ArmPose(final boolean p_102896_) {
             this.twoHanded = p_102896_;
@@ -1,8 +1,8 @@
 --- a/net/minecraft/client/model/geom/LayerDefinitions.java
 +++ b/net/minecraft/client/model/geom/LayerDefinitions.java
-@@ -464,6 +_,7 @@
-                 builder.put(ModelLayers.createHangingSignModelName(p_374591_, hangingsignrenderer$attachmenttype), layerdefinition55);
-             }
+@@ -449,6 +_,7 @@
+             builder.put(ModelLayers.createWallSignModelName(p_357774_), layerdefinition54);
+             builder.put(ModelLayers.createHangingSignModelName(p_357774_), layerdefinition55);
         });
 +        net.minecraftforge.client.ForgeHooksClient.loadLayerDefinitions(builder);
         ImmutableMap<ModelLayerLocation, LayerDefinition> immutablemap = builder.build();
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/model/geom/ModelLayers.java
 +++ b/net/minecraft/client/model/geom/ModelLayers.java
-@@ -308,15 +_,18 @@
+@@ -301,15 +_,18 @@
     }
 
     public static ModelLayerLocation createStandingSignModelName(WoodType p_171292_) {
@@ -15,10 +15,10 @@
 +        return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "sign/wall/" + location.getPath()), "main");
     }
 
-     public static ModelLayerLocation createHangingSignModelName(WoodType p_252225_, HangingSignRenderer.AttachmentType p_378070_) {
-        return createLocation("hanging_sign/" + p_252225_.name() + "/" + p_378070_.getSerializedName(), "main");
+     public static ModelLayerLocation createHangingSignModelName(WoodType p_252225_) {
+-        return createLocation("hanging_sign/" + p_252225_.name(), "main");
 +        ResourceLocation location = ResourceLocation.parse(p_252225_.name());
-+        return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "hanging_sign/" + location.getPath() + "/" + p_378070_.getSerializedName()), "main");
+        return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "hanging_sign/" + location.getPath()), "main");
     }
 
     public static Stream<ModelLayerLocation> getKnownLocations() {
@@ -8,7 +8,7 @@
                 this.storage.drop(i, levelchunk);
             }
         }
-@@ -124,6 +_,7 @@
+@@ -123,6 +_,7 @@
             }
 
             this.level.onChunkLoaded(chunkpos);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientLevel.java
 +++ b/net/minecraft/client/multiplayer/ClientLevel.java
-@@ -123,6 +_,7 @@
+@@ -118,6 +_,7 @@
         p_194170_.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache(p_194181_ -> this.calculateBlockTint(p_194181_, BiomeColors.GRASS_COLOR_RESOLVER)));
         p_194170_.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache(p_194177_ -> this.calculateBlockTint(p_194177_, BiomeColors.FOLIAGE_COLOR_RESOLVER)));
         p_194170_.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();
-@@ -131,6 +_,8 @@
+@@ -126,6 +_,8 @@
     private final int seaLevel;
     private boolean tickDayTime;
     private static final Set<Item> MARKER_PARTICLE_ITEMS = Set.of(Items.BARRIER, Items.LIGHT);
@@ -17,7 +17,7 @@
 
     public void handleBlockChangedAck(int p_233652_) {
         this.blockStatePredictionHandler.endPredictionsUpTo(p_233652_, this);
-@@ -197,6 +_,8 @@
+@@ -192,6 +_,8 @@
         this.serverSimulationDistance = p_364305_;
         this.updateSkyBrightness();
         this.prepareWeather();
@@ -26,7 +26,7 @@
     }
 
     public void queueLightUpdate(Runnable p_194172_) {
-@@ -279,6 +_,7 @@
+@@ -274,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();
 
-@@ -330,8 +_,10 @@
+@@ -326,8 +_,10 @@
     }
 
     public void addEntity(Entity p_104741_) {
@@ -45,7 +45,7 @@
     }
 
     public void removeEntity(int p_171643_, Entity.RemovalReason p_171644_) {
-@@ -502,6 +_,12 @@
+@@ -498,6 +_,12 @@
         float p_263349_,
         long p_263408_
     ) {
@@ -58,7 +58,7 @@
         if (p_263381_ == this.minecraft.player) {
             this.playSound(p_263372_, p_263404_, p_263365_, p_263335_.value(), p_263417_, p_263416_, p_263349_, false, p_263408_);
         }
-@@ -511,6 +_,12 @@
+@@ -507,6 +_,12 @@
     public void playSeededSound(
         @Nullable Player p_263514_, Entity p_263536_, Holder<SoundEvent> p_263518_, SoundSource p_263487_, float p_263538_, float p_263524_, long p_263509_
     ) {
@@ -71,7 +71,7 @@
         if (p_263514_ == this.minecraft.player) {
             this.minecraft.getSoundManager().play(new EntityBoundSoundInstance(p_263518_.value(), p_263487_, p_263538_, p_263524_, p_263536_, p_263509_));
         }
-@@ -953,6 +_,24 @@
+@@ -943,6 +_,24 @@
         return this.seaLevel;
     }
 
@@ -96,7 +96,7 @@
     @OnlyIn(Dist.CLIENT)
     public static class ClientLevelData implements WritableLevelData {
         private final boolean hardcore;
-@@ -1041,6 +_,7 @@
+@@ -1031,6 +_,7 @@
         }
 
         public void setDifficulty(Difficulty p_104852_) {
@@ -104,9 +104,9 @@
             this.difficulty = p_104852_;
         }
 
-@@ -1084,6 +_,12 @@
-                     break;
-                 default:
+@@ -1067,11 +_,26 @@
+             if (p_171712_ instanceof AbstractClientPlayer) {
+                 ClientLevel.this.players.add((AbstractClientPlayer)p_171712_);
             }
 +
 +            if (p_171712_.isMultipartEntity()) {
@@ -117,11 +117,8 @@
         }
 
         public void onTrackingEnd(Entity p_171716_) {
-@@ -1097,6 +_,15 @@
-                     ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities()));
-                     break;
-                 default:
-+            }
+             p_171716_.unRide();
+             ClientLevel.this.players.remove(p_171716_);
 +
 +            p_171716_.onRemovedFromWorld();
 +            net.minecraftforge.event.ForgeEventFactory.onEntityLeaveLevel(p_171716_, ClientLevel.this);
@@ -130,6 +127,7 @@
 +               for (var part : p_171716_.getParts()) {
 +                  ClientLevel.this.partEntities.remove(part.getId());
 +               }
-             }
+            }
         }
 
+         public void onSectionChange(Entity p_233660_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientPacketListener.java
 +++ b/net/minecraft/client/multiplayer/ClientPacketListener.java
-@@ -452,6 +_,7 @@
+@@ -451,6 +_,7 @@
 
         this.minecraft.debugRenderer.clear();
         this.minecraft.player.resetPos();
@@ -57,7 +57,7 @@
     }
 
     @Override
-@@ -2530,6 +_,8 @@
+@@ -2516,6 +_,8 @@
     }
 
     public void sendChat(String p_249888_) {
@@ -66,7 +66,7 @@
         Instant instant = Instant.now();
         long i = Crypt.SaltSupplier.getLong();
         LastSeenMessagesTracker.Update lastseenmessagestracker$update = this.lastSeenMessages.generateAndApplyUpdate();
-@@ -2538,6 +_,7 @@
+@@ -2524,6 +_,7 @@
     }
 
     public void sendCommand(String p_250092_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
 +++ b/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
-@@ -107,6 +_,7 @@
+@@ -106,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 {
-@@ -121,9 +_,8 @@
+@@ -120,9 +_,8 @@
                 } else if (blockstate.isAir()) {
                     return false;
                 } else {
@@ -19,7 +19,7 @@
                     if (flag) {
                         block.destroy(level, p_105268_, blockstate);
                     }
-@@ -144,6 +_,7 @@
+@@ -143,6 +_,7 @@
                 BlockState blockstate = this.minecraft.level.getBlockState(p_105270_);
                 this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105270_, blockstate, 1.0F);
                 this.startPrediction(this.minecraft.level, p_233757_ -> {
@@ -27,7 +27,7 @@
                     this.destroyBlock(p_105270_);
                     return new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, p_105270_, p_105271_, p_233757_);
                 });
-@@ -153,15 +_,18 @@
+@@ -152,15 +_,18 @@
                     this.connection
                         .send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, this.destroyBlockPos, p_105271_));
                 }
@@ -46,7 +46,7 @@
                     if (flag && blockstate1.getDestroyProgress(this.minecraft.player, this.minecraft.player.level(), p_105270_) >= 1.0F) {
                         this.destroyBlock(p_105270_);
                     } else {
-@@ -172,6 +_,7 @@
+@@ -171,6 +_,7 @@
                         this.destroyTicks = 0.0F;
                         this.minecraft.level.destroyBlockProgress(this.minecraft.player.getId(), this.destroyBlockPos, this.getDestroyStage());
                     }
@@ -54,7 +54,7 @@
 
                     return new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, p_105270_, p_105271_, p_233728_);
                 });
-@@ -204,6 +_,7 @@
+@@ -203,6 +_,7 @@
             BlockState blockstate1 = this.minecraft.level.getBlockState(p_105284_);
             this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105284_, blockstate1, 1.0F);
             this.startPrediction(this.minecraft.level, p_233753_ -> {
@@ -62,7 +62,7 @@
                 this.destroyBlock(p_105284_);
                 return new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, p_105284_, p_105285_, p_233753_);
             });
-@@ -216,7 +_,7 @@
+@@ -215,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,7 +71,7 @@
                     this.minecraft
                         .getSoundManager()
                         .play(
-@@ -233,6 +_,7 @@
+@@ -232,6 +_,7 @@
 
                 this.destroyTicks++;
                 this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, p_105284_, blockstate, Mth.clamp(this.destroyProgress, 0.0F, 1.0F));
@@ -79,7 +79,7 @@
                 if (this.destroyProgress >= 1.0F) {
                     this.isDestroying = false;
                     this.startPrediction(this.minecraft.level, p_233739_ -> {
-@@ -271,7 +_,7 @@
+@@ -270,7 +_,7 @@
 
     private boolean sameDestroyTarget(BlockPos p_105282_) {
         ItemStack itemstack = this.minecraft.player.getMainHandItem();
@@ -88,7 +88,7 @@
     }
 
     private void ensureHasSentCarriedItem() {
-@@ -299,12 +_,23 @@
+@@ -298,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 +114,7 @@
                 BlockState blockstate = this.minecraft.level.getBlockState(blockpos);
                 if (!this.connection.isFeatureEnabled(blockstate.getBlock().requiredFeatures())) {
                     return InteractionResult.FAIL;
-@@ -325,8 +_,10 @@
+@@ -324,8 +_,10 @@
                 }
             }
 
@@ -127,7 +127,7 @@
                 InteractionResult interactionresult2;
                 if (this.localPlayerMode.isCreative()) {
                     int i = itemstack.getCount();
-@@ -360,6 +_,11 @@
+@@ -359,6 +_,11 @@
                         mutableobject.setValue(InteractionResult.PASS);
                         return serverbounduseitempacket;
                     } else {
@@ -139,7 +139,7 @@
                         InteractionResult interactionresult = itemstack.use(this.minecraft.level, p_233722_, p_233723_);
                         ItemStack itemstack1;
                         if (interactionresult instanceof InteractionResult.Success interactionresult$success) {
-@@ -370,6 +_,9 @@
+@@ -369,6 +_,9 @@
 
                         if (itemstack1 != itemstack) {
                             p_233722_.setItemInHand(p_233723_, itemstack1);
@@ -149,7 +149,7 @@
                         }
 
                         mutableobject.setValue(interactionresult);
-@@ -401,6 +_,10 @@
+@@ -400,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 +160,7 @@
         return (InteractionResult)(this.localPlayerMode == GameType.SPECTATOR ? InteractionResult.PASS : p_105227_.interactOn(p_105228_, p_105229_));
     }
 
-@@ -408,6 +_,10 @@
+@@ -407,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));
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/PlayerInfo.java
 +++ b/net/minecraft/client/multiplayer/PlayerInfo.java
-@@ -88,6 +_,7 @@
+@@ -86,6 +_,7 @@
     }
 
     protected void setGameMode(GameType p_105318_) {
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/particle/BreakingItemParticle.java
+++ b/net/minecraft/client/particle/BreakingItemParticle.java
+@@ -33,7 +_,7 @@
+ 
+     protected BreakingItemParticle(ClientLevel p_105665_, double p_105666_, double p_105667_, double p_105668_, ItemStack p_105669_) {
+         super(p_105665_, p_105666_, p_105667_, p_105668_, 0.0, 0.0, 0.0);
+-        this.setSprite(Minecraft.getInstance().getItemRenderer().getModel(p_105669_, p_105665_, null, 0).getParticleIcon());
+        this.setSprite(Minecraft.getInstance().getItemRenderer().getModel(p_105669_, p_105665_, null, 0).getParticleIcon(net.minecraftforge.client.model.data.ModelData.EMPTY));
+         this.gravity = 1.0F;
+         this.quadSize /= 2.0F;
+         this.uo = this.random.nextFloat() * 3.0F;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/particle/Particle.java
 +++ b/net/minecraft/client/particle/Particle.java
-@@ -248,6 +_,18 @@
+@@ -243,6 +_,18 @@
         return Optional.empty();
     }
 
@@ -1,8 +1,8 @@
 --- a/net/minecraft/client/particle/ParticleEngine.java
 +++ b/net/minecraft/client/particle/ParticleEngine.java
-@@ -72,11 +_,11 @@
-     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);
+@@ -77,11 +_,11 @@
+         ParticleRenderType.TERRAIN_SHEET, ParticleRenderType.PARTICLE_SHEET_OPAQUE, ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT, ParticleRenderType.CUSTOM
+     );
     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));
@@ -14,7 +14,7 @@
     private final Queue<Particle> particlesToAdd = Queues.newArrayDeque();
     private final Map<ResourceLocation, ParticleEngine.MutableSpriteSet> spriteSets = Maps.newHashMap();
     private final TextureAtlas textureAtlas;
-@@ -205,10 +_,14 @@
+@@ -214,10 +_,14 @@
         this.register(ParticleTypes.BLOCK_CRUMBLE, new TerrainParticle.CrumblingProvider());
     }
 
@@ -30,7 +30,7 @@
     public <T extends ParticleOptions> void register(ParticleType<T> p_273423_, ParticleProvider.Sprite<T> p_273134_) {
         this.register(
             p_273423_,
-@@ -225,10 +_,12 @@
+@@ -234,10 +_,12 @@
         );
     }
 
@@ -44,7 +44,7 @@
     }
 
     @Override
-@@ -348,7 +_,7 @@
+@@ -357,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_
     ) {
@@ -53,61 +53,35 @@
         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 @@
+@@ -433,17 +_,26 @@
         }
     }
 
-+    /**@deprecated Forge: use {@link #render(Camera, float, net.minecraft.client.renderer.culling.Frustum)} with Frustum as additional parameter*/
+
+    /**@deprecated Forge: use {@link #render(LightTexture, 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_) {
-        for (ParticleRenderType particlerendertype : RENDER_ORDER) {
-+        render(p_107340_, p_107341_, p_377798_, null);
+     public void render(LightTexture p_107339_, Camera p_107340_, float p_107341_) {
+        render(p_107339_, p_107340_, p_107341_, null);
 +    }
 +
-+    public void render(Camera p_107340_, float p_107341_, MultiBufferSource.BufferSource p_377798_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
+    public void render(LightTexture p_107339_, Camera p_107340_, float p_107341_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
+         p_107339_.turnOnLightLayer();
+         RenderSystem.enableDepthTest();
+ 
+-        for (ParticleRenderType particlerendertype : RENDER_ORDER) {
 +        for (ParticleRenderType particlerendertype : this.particles.keySet()) { // Forge: allow custom IParticleRenderType's
-+            if (particlerendertype.renderType() == null) continue;
+            if (particlerendertype == ParticleRenderType.NO_RENDER) 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 @@
+                 Tesselator tesselator = Tesselator.getInstance();
+                 BufferBuilder bufferbuilder = particlerendertype.begin(tesselator, this.textureManager);
+                 if (bufferbuilder != null) {
+                     for (Particle particle : queue) {
+                        if (frustum != null && particle.shouldCull() && !frustum.isVisible(particle.getBoundingBox())) continue;
+                         try {
+                             particle.render(bufferbuilder, p_107340_, p_107341_);
+                         } catch (Throwable throwable) {
+@@ -475,7 +_,7 @@
     }
 
     public void destroy(BlockPos p_107356_, BlockState p_107357_) {
@@ -116,7 +90,7 @@
             VoxelShape voxelshape = p_107357_.getShape(this.level, p_107356_);
             double d0 = 0.25;
             voxelshape.forAllBoxes(
-@@ -514,6 +_,7 @@
+@@ -508,6 +_,7 @@
                                         p_107357_,
                                         p_107356_
                                     )
@@ -124,7 +98,7 @@
                                 );
                             }
                         }
-@@ -523,6 +_,13 @@
+@@ -517,6 +_,13 @@
         }
     }
 
@@ -138,7 +112,7 @@
     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 @@
+@@ -552,7 +_,7 @@
                 d0 = (double)i + aabb.maxX + 0.1F;
             }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/player/LocalPlayer.java
 +++ b/net/minecraft/client/player/LocalPlayer.java
-@@ -308,6 +_,7 @@
+@@ -303,6 +_,7 @@
         ServerboundPlayerActionPacket.Action serverboundplayeractionpacket$action = p_108701_
             ? ServerboundPlayerActionPacket.Action.DROP_ALL_ITEMS
             : ServerboundPlayerActionPacket.Action.DROP_ITEM;
@@ -8,7 +8,7 @@
         ItemStack itemstack = this.getInventory().removeFromSelected(p_108701_);
         this.connection.send(new ServerboundPlayerActionPacket(serverboundplayeractionpacket$action, BlockPos.ZERO, Direction.DOWN));
         return !itemstack.isEmpty();
-@@ -493,7 +_,11 @@
+@@ -488,7 +_,11 @@
 
     @Override
     public void playSound(SoundEvent p_108651_, float p_108652_, float p_108653_) {
@@ -21,43 +21,43 @@
     }
 
     @Override
-@@ -686,6 +_,7 @@
-             && this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.CROUCHING)
+@@ -682,6 +_,7 @@
             && (this.isShiftKeyDown() || !this.isSleeping() && !this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.STANDING));
-         this.input.tick();
+         float f = (float)this.getAttributeValue(Attributes.SNEAKING_SPEED);
+         this.input.tick(this.isMovingSlowly(), f);
 +        net.minecraftforge.client.ForgeHooksClient.onMovementInputUpdate(this, this.input);
         this.minecraft.getTutorial().onInput(this.input);
-         if (this.shouldStopSprinting()) {
-             this.setSprinting(false);
-@@ -724,7 +_,7 @@
-         boolean flag3 = this.canStartSprinting();
-         boolean flag4 = this.isPassenger() ? this.getVehicle().onGround() : this.onGround();
-         boolean flag5 = !flag1 && !flag2;
-        if ((flag4 || this.isUnderWater()) && flag5 && flag3) {
-+        if ((flag4 || this.isUnderWater() || this.canStartSwimming()) && flag5 && flag3) {
+         if (this.isUsingItem() && !this.isPassenger()) {
+             this.input.leftImpulse *= 0.2F;
+@@ -710,7 +_,7 @@
+         boolean flag4 = this.canStartSprinting();
+         boolean flag5 = this.isPassenger() ? this.getVehicle().onGround() : this.onGround();
+         boolean flag6 = !flag1 && !flag2;
+-        if ((flag5 || this.isUnderWater()) && flag6 && flag4) {
+        if ((flag5 || this.isUnderWater() || this.canStartSwimming()) && flag6 && flag4) {
             if (this.sprintTriggerTime <= 0 && !this.minecraft.options.keySprint.isDown()) {
                 this.sprintTriggerTime = 7;
             } else {
-@@ -732,15 +_,16 @@
+@@ -718,15 +_,15 @@
             }
         }
 
-        if ((!this.isInWater() || this.isUnderWater()) && flag3 && this.minecraft.options.keySprint.isDown()) {
-+        if ((!this.isInWaterOrSwimmable() || this.isUnderWater() || this.canStartSwimming()) && flag3 && this.minecraft.options.keySprint.isDown()) {
+-        if ((!this.isInWater() || this.isUnderWater()) && flag4 && this.minecraft.options.keySprint.isDown()) {
+        if (!this.isSprinting() && (!(this.isInWater() || this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType))) || (this.isUnderWater() || this.canStartSwimming())) && this.hasEnoughImpulseToStartSprinting() && flag4 && !this.isUsingItem() && !this.hasEffect(MobEffects.BLINDNESS) && this.minecraft.options.keySprint.isDown()) {
             this.setSprinting(true);
         }
 
         if (this.isSprinting()) {
-             boolean flag6 = !this.input.hasForwardImpulse() || !this.hasEnoughFoodToStartSprinting();
-             boolean flag7 = flag6 || this.horizontalCollision && !this.minorHorizontalCollision || this.isInWater() && !this.isUnderWater();
-+            flag7 = flag7 || (this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType)) && !this.canStartSwimming());
+             boolean flag7 = !this.input.hasForwardImpulse() || !this.hasEnoughFoodToStartSprinting();
+-            boolean flag8 = flag7 || this.horizontalCollision && !this.minorHorizontalCollision || this.isInWater() && !this.isUnderWater();
+            boolean flag8 = flag7 || this.horizontalCollision && !this.minorHorizontalCollision || this.isInWater() && !this.isUnderWater() || (this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType)) && !this.canStartSwimming());
             if (this.isSwimming()) {
-                if (!this.onGround() && !this.input.keyPresses.shift() && flag6 || !this.isInWater()) {
-+                if (!this.onGround() && !this.input.keyPresses.shift() && flag7 || !this.isInWaterOrSwimmable()) {
+-                if (!this.onGround() && !this.input.keyPresses.shift() && flag7 || !this.isInWater()) {
+                if (!this.onGround() && !this.input.keyPresses.shift() && flag7 || !(this.isInWater() || this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType)))) {
                     this.setSprinting(false);
                 }
-             } else if (flag7) {
-@@ -777,8 +_,9 @@
+             } else if (flag8) {
+@@ -763,8 +_,9 @@
         }
 
         this.wasFallFlying = this.isFallFlying();
@@ -69,7 +69,7 @@
         }
 
         if (this.isEyeInFluid(FluidTags.WATER)) {
-@@ -900,6 +_,8 @@
+@@ -870,6 +_,8 @@
     @Override
     public void rideTick() {
         super.rideTick();
@@ -78,7 +78,7 @@
         this.handsBusy = false;
         if (this.getControlledVehicle() instanceof AbstractBoat abstractboat) {
             abstractboat.setInput(
-@@ -1177,6 +_,18 @@
+@@ -1146,6 +_,18 @@
     @Override
     public float getVisualRotationYInDegrees() {
         return this.getYRot();
@@ -34,7 +34,7 @@
         }
     }
 
-@@ -470,12 +_,12 @@
+@@ -468,12 +_,12 @@
                     (float)((double)window.getHeight() / window.getGuiScale()),
                     0.0F,
                     1000.0F,
@@ -49,7 +49,7 @@
             Lighting.setupFor3DItems();
             GuiGraphics guigraphics = new GuiGraphics(this.minecraft, this.renderBuffers.bufferSource());
             if (flag && p_109096_ && this.minecraft.level != null) {
-@@ -501,7 +_,7 @@
+@@ -499,7 +_,7 @@
                 }
             } else if (flag && this.minecraft.screen != null) {
                 try {
@@ -58,7 +58,7 @@
                 } catch (Throwable throwable1) {
                     CrashReport crashreport1 = CrashReport.forThrowable(throwable1, "Rendering screen");
                     CrashReportCategory crashreportcategory1 = crashreport1.addCategory("Screen render details");
-@@ -657,6 +_,9 @@
+@@ -655,6 +_,9 @@
         if (this.minecraft.options.bobView().get()) {
             this.bobView(posestack, camera.getPartialTickTime());
         }
@@ -5,18 +5,18 @@
 @OnlyIn(Dist.CLIENT)
 public class ItemBlockRenderTypes {
 +    @Deprecated
-     private static final Map<Block, RenderType> TYPE_BY_BLOCK = Util.make(Maps.newHashMap(), p_374604_ -> {
+     private static final Map<Block, RenderType> TYPE_BY_BLOCK = Util.make(Maps.newHashMap(), p_357825_ -> {
         RenderType rendertype = RenderType.tripwire();
-         p_374604_.put(Blocks.TRIPWIRE, rendertype);
-@@ -345,6 +_,7 @@
-         p_374604_.put(Blocks.BUBBLE_COLUMN, rendertype3);
-         p_374604_.put(Blocks.TINTED_GLASS, rendertype3);
+         p_357825_.put(Blocks.TRIPWIRE, rendertype);
+@@ -340,6 +_,7 @@
+         p_357825_.put(Blocks.BUBBLE_COLUMN, rendertype3);
+         p_357825_.put(Blocks.TINTED_GLASS, rendertype3);
     });
 +    @Deprecated
     private static final Map<Fluid, RenderType> TYPE_BY_FLUID = Util.make(Maps.newHashMap(), p_109290_ -> {
         RenderType rendertype = RenderType.translucent();
         p_109290_.put(Fluids.FLOWING_WATER, rendertype);
-@@ -352,6 +_,8 @@
+@@ -347,6 +_,8 @@
     });
     private static boolean renderCutout;
 
@@ -25,7 +25,7 @@
     public static RenderType getChunkRenderType(BlockState p_109283_) {
         Block block = p_109283_.getBlock();
         if (block instanceof LeavesBlock) {
-@@ -362,6 +_,8 @@
+@@ -357,6 +_,8 @@
         }
     }
 
@@ -34,7 +34,7 @@
     public static RenderType getMovingBlockRenderType(BlockState p_109294_) {
         Block block = p_109294_.getBlock();
         if (block instanceof LeavesBlock) {
-@@ -376,11 +_,14 @@
+@@ -371,6 +_,8 @@
         }
     }
 
@@ -43,17 +43,12 @@
     public static RenderType getRenderType(BlockState p_364446_) {
         RenderType rendertype = getChunkRenderType(p_364446_);
         return rendertype == RenderType.translucent() ? Sheets.translucentItemSheet() : Sheets.cutoutBlockSheet();
-     }
- 
-+    /* Forge: Use {@link net.minecraft.client.resources.model.BakedModel#getRenderPasses(ItemStack, boolean)} and {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(ItemStack, boolean)}. */
-     public static RenderType getRenderType(ItemStack p_363859_) {
-         if (p_363859_.getItem() instanceof BlockItem blockitem) {
-             Block block = blockitem.getBlock();
-@@ -390,12 +_,81 @@
+@@ -385,12 +_,82 @@
         }
     }
 
-+    // Note: this method does NOT support model-based render types
+    /** @deprecated Forge: Use {@link net.minecraft.client.resources.model.BakedModel#getRenderPasses(ItemStack, boolean)} and {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(ItemStack, boolean)}. */
+    @Deprecated // Note: this method does NOT support model-based render types
     public static RenderType getRenderLayer(FluidState p_109288_) {
 -        RenderType rendertype = TYPE_BY_FLUID.get(p_109288_.getType());
 +        RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.getType()));
@@ -85,7 +80,7 @@
 +    });
 +
 +    /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
-+    @Deprecated(forRemoval = true, since = "1.21.4")
+    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
 +       Block block = state.getBlock();
 +       if (block instanceof LeavesBlock) {
@@ -96,20 +91,20 @@
 +    }
 +
 +    /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+    @Deprecated(forRemoval = true, since = "1.21.4")
+    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static void setRenderLayer(Block block, RenderType type) {
 +       com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
 +       setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
 +    }
 +
 +    /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+    @Deprecated(forRemoval = true, since = "1.21.4")
+    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
 +       setRenderLayer(block, createSetFromPredicate(predicate));
 +    }
 +
 +    /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+    @Deprecated(forRemoval = true, since = "1.21.4")
+    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
 +       checkClientLoading();
 +       BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/ItemInHandRenderer.java
 +++ b/net/minecraft/client/renderer/ItemInHandRenderer.java
-@@ -343,12 +_,14 @@
+@@ -339,12 +_,14 @@
         if (iteminhandrenderer$handrenderselection.renderMainHand) {
             float f4 = interactionhand == InteractionHand.MAIN_HAND ? f : 0.0F;
             float f5 = 1.0F - Mth.lerp(p_109315_, this.oMainHandHeight, this.mainHandHeight);
@@ -15,7 +15,7 @@
             this.renderArmWithItem(p_109318_, p_109315_, f1, InteractionHand.OFF_HAND, f6, this.offHandItem, f7, p_109316_, p_109317_, p_109319_);
         }
 
-@@ -414,7 +_,7 @@
+@@ -410,7 +_,7 @@
                 } else {
                     this.renderOneHandedMap(p_109379_, p_109380_, p_109381_, p_109378_, humanoidarm, p_109376_, p_109377_);
                 }
@@ -25,20 +25,19 @@
                 boolean flag2 = humanoidarm == HumanoidArm.RIGHT;
                 int i = flag2 ? 1 : -1;
@@ -460,6 +_,7 @@
+                 );
             } else {
                 boolean flag3 = humanoidarm == HumanoidArm.RIGHT;
-                 int j = flag3 ? 1 : -1;
 +                if (!net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_109377_).applyForgeHandTransform(p_109379_, minecraft.player, humanoidarm, p_109377_, p_109373_, p_109378_, p_109376_)) // FORGE: Allow items to define custom arm animation
                 if (p_109372_.isUsingItem() && p_109372_.getUseItemRemainingTicks() > 0 && p_109372_.getUsedItemHand() == p_109375_) {
+                     int k = flag3 ? 1 : -1;
                     switch (p_109377_.getUseAnimation()) {
-                         case NONE:
-@@ -588,8 +_,18 @@
+@@ -574,8 +_,16 @@
             this.offHandHeight = Mth.clamp(this.offHandHeight - 0.4F, 0.0F, 1.0F);
         } else {
             float f = localplayer.getAttackStrengthScale(1.0F);
-            float f1 = this.mainHandItem != itemstack ? 0.0F : f * f * f;
-            float f2 = this.offHandItem != itemstack1 ? 0.0F : 1.0F;
-+
+-            this.mainHandHeight = this.mainHandHeight + Mth.clamp((this.mainHandItem == itemstack ? f * f * f : 0.0F) - this.mainHandHeight, -0.4F, 0.4F);
+-            this.offHandHeight = this.offHandHeight + Mth.clamp((float)(this.offHandItem == itemstack1 ? 1 : 0) - this.offHandHeight, -0.4F, 0.4F);
 +            boolean requipM = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.mainHandItem, itemstack, localplayer.getInventory().selected);
 +            boolean requipO = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.offHandItem, itemstack1, -1);
 +
@@ -47,9 +46,8 @@
 +            if (!requipO && this.offHandItem != itemstack1)
 +               this.offHandItem = itemstack1;
 +
-+            float f1 = requipM ? 0.0F : f * f * f;
-+            float f2 = requipO ? 0.0F : 1.0F;
-+
-             this.mainHandHeight = this.mainHandHeight + Mth.clamp(f1 - this.mainHandHeight, -0.4F, 0.4F);
-             this.offHandHeight = this.offHandHeight + Mth.clamp(f2 - this.offHandHeight, -0.4F, 0.4F);
+            this.mainHandHeight += Mth.clamp((!requipM ? f * f * f : 0.0F) - this.mainHandHeight, -0.4F, 0.4F);
+            this.offHandHeight += Mth.clamp((float)(!requipO ? 1 : 0) - this.offHandHeight, -0.4F, 0.4F);
         }
+ 
+         if (this.mainHandHeight < 0.1F) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/LevelRenderer.java
 +++ b/net/minecraft/client/renderer/LevelRenderer.java
-@@ -109,7 +_,7 @@
+@@ -111,7 +_,7 @@
     private final SkyRenderer skyRenderer = new SkyRenderer();
     private final CloudRenderer cloudRenderer = new CloudRenderer();
     private final WorldBorderRenderer worldBorderRenderer = new WorldBorderRenderer();
@@ -9,24 +9,16 @@
     @Nullable
     private ClientLevel level;
     private final SectionOcclusionGraph sectionOcclusionGraph = new SectionOcclusionGraph();
-@@ -482,7 +_,7 @@
+@@ -487,7 +_,7 @@
             postchain1.addToFrame(framegraphbuilder, i, j, this.targets);
         }
 
-        this.addParticlesPass(framegraphbuilder, p_109604_, f, fogparameters);
-+        this.addParticlesPass(framegraphbuilder, p_109604_, f, fogparameters, frustum);
+-        this.addParticlesPass(framegraphbuilder, p_109604_, p_109606_, f, fogparameters);
+        this.addParticlesPass(framegraphbuilder, p_109604_, p_109606_, f, fogparameters, frustum);
         CloudStatus cloudstatus = this.minecraft.options.getCloudsType();
         if (cloudstatus != CloudStatus.OFF) {
             float f2 = this.level.effects().getCloudHeight();
-@@ -499,6 +_,7 @@
-         }
- 
-         this.addLateDebugPass(framegraphbuilder, vec3, fogparameters);
-+        net.minecraftforge.client.event.ForgeEventFactoryClient.onLastFramePassAddition(framegraphbuilder, targets);
-         profilerfiller.popPush("framegraph");
-         framegraphbuilder.execute(p_367325_, new FrameGraphBuilder.Inspector() {
-             @Override
-@@ -564,7 +_,11 @@
+@@ -569,7 +_,11 @@
             double d2 = vec3.z();
             p_369478_.push("terrain");
             this.renderSectionLayer(RenderType.solid(), d0, d1, d2, p_361439_, p_369924_);
@@ -38,7 +30,7 @@
             this.renderSectionLayer(RenderType.cutout(), d0, d1, d2, p_361439_, p_369924_);
             if (this.level.effects().constantAmbientLight()) {
                 Lighting.setupNetherLevel();
-@@ -598,7 +_,7 @@
+@@ -603,7 +_,7 @@
             multibuffersource$buffersource.endLastBatch();
             this.checkPoseStack(posestack);
             p_369478_.popPush("blockentities");
@@ -47,7 +39,7 @@
             multibuffersource$buffersource.endLastBatch();
             this.checkPoseStack(posestack);
             multibuffersource$buffersource.endBatch(RenderType.solid());
-@@ -612,8 +_,8 @@
+@@ -617,8 +_,8 @@
             multibuffersource$buffersource.endBatch(Sheets.hangingSignSheet());
             multibuffersource$buffersource.endBatch(Sheets.chestSheet());
             this.renderBuffers.outlineBufferSource().endOutlineBatch();
@@ -58,7 +50,7 @@
             }
 
             p_369478_.popPush("debug");
-@@ -643,8 +_,8 @@
+@@ -648,8 +_,8 @@
             this.renderSectionLayer(RenderType.translucent(), d0, d1, d2, p_361439_, p_369924_);
             p_369478_.popPush("string");
             this.renderSectionLayer(RenderType.tripwire(), d0, d1, d2, p_361439_, p_369924_);
@@ -69,25 +61,25 @@
             }
 
             multibuffersource$buffersource.endBatch();
-@@ -652,7 +_,7 @@
+@@ -657,7 +_,7 @@
         });
     }
 
-    private void addParticlesPass(FrameGraphBuilder p_366471_, Camera p_363128_, float p_365755_, FogParameters p_363695_) {
-+    private void addParticlesPass(FrameGraphBuilder p_366471_, Camera p_363128_, float p_365755_, FogParameters p_363695_, Frustum frustum) {
+-    private void addParticlesPass(FrameGraphBuilder p_366471_, Camera p_363128_, LightTexture p_366434_, float p_365755_, FogParameters p_363695_) {
+    private void addParticlesPass(FrameGraphBuilder p_366471_, Camera p_363128_, LightTexture p_366434_, float p_365755_, FogParameters p_363695_, Frustum frustum) {
         FramePass framepass = p_366471_.addPass("particles");
         if (this.targets.particles != null) {
             this.targets.particles = framepass.readsAndWrites(this.targets.particles);
-@@ -671,7 +_,7 @@
-                 resourcehandle1.get().copyDepthFrom(resourcehandle.get());
+@@ -677,7 +_,7 @@
             }
 
-            this.minecraft.particleEngine.render(p_363128_, p_365755_, this.renderBuffers.bufferSource());
-+            this.minecraft.particleEngine.render(p_363128_, p_365755_, this.renderBuffers.bufferSource(), frustum);
+             RenderStateShard.PARTICLES_TARGET.setupRenderState();
+-            this.minecraft.particleEngine.render(p_366434_, p_363128_, p_365755_);
+            this.minecraft.particleEngine.render(p_366434_, p_363128_, p_365755_, frustum);
+             RenderStateShard.PARTICLES_TARGET.clearRenderState();
         });
     }
- 
-@@ -759,9 +_,9 @@
+@@ -766,9 +_,9 @@
                             || p_365712_.isDetached()
                             || p_365712_.getEntity() instanceof LivingEntity && ((LivingEntity)p_365712_.getEntity()).isSleeping()
                     )
@@ -99,7 +91,7 @@
                         flag = true;
                     }
                 }
-@@ -801,9 +_,10 @@
+@@ -808,9 +_,10 @@
         }
     }
 
@@ -112,7 +104,7 @@
         Vec3 vec3 = p_369847_.getPosition();
         double d0 = vec3.x();
         double d1 = vec3.y();
-@@ -813,6 +_,7 @@
+@@ -820,6 +_,7 @@
             List<BlockEntity> list = sectionrenderdispatcher$rendersection.getCompiled().getRenderableBlockEntities();
             if (!list.isEmpty()) {
                 for (BlockEntity blockentity : list) {
@@ -120,7 +112,7 @@
                     BlockPos blockpos = blockentity.getBlockPos();
                     MultiBufferSource multibuffersource = p_362022_;
                     p_366168_.pushPose();
-@@ -832,6 +_,9 @@
+@@ -839,6 +_,9 @@
                         }
                     }
 
@@ -130,7 +122,7 @@
                     this.blockEntityRenderDispatcher.render(blockentity, p_367074_, p_366168_, multibuffersource);
                     p_366168_.popPose();
                 }
-@@ -840,13 +_,18 @@
+@@ -847,13 +_,18 @@
 
         synchronized (this.globalBlockEntities) {
             for (BlockEntity blockentity1 : this.globalBlockEntities) {
@@ -149,7 +141,7 @@
     }
 
     private void renderBlockDestroyAnimation(PoseStack p_366956_, Camera p_369324_, MultiBufferSource.BufferSource p_365998_) {
-@@ -865,14 +_,14 @@
+@@ -872,14 +_,14 @@
                     p_366956_.translate((double)blockpos.getX() - d0, (double)blockpos.getY() - d1, (double)blockpos.getZ() - d2);
                     PoseStack.Pose posestack$pose = p_366956_.last();
                     VertexConsumer vertexconsumer = new SheetedDecalTextureGenerator(p_365998_.getBuffer(ModelBakery.DESTROY_TYPES.get(i)), posestack$pose, 1.0F);
@@ -166,7 +158,7 @@
         if (this.minecraft.hitResult instanceof BlockHitResult blockhitresult) {
             if (blockhitresult.getType() != HitResult.Type.MISS) {
                 BlockPos blockpos = blockhitresult.getBlockPos();
-@@ -883,6 +_,9 @@
+@@ -890,6 +_,9 @@
                         return;
                     }
 
@@ -176,7 +168,7 @@
                     Vec3 vec3 = p_367935_.getPosition();
                     Boolean obool = this.minecraft.options.highContrastBlockOutline().get();
                     if (obool) {
-@@ -898,6 +_,8 @@
+@@ -905,6 +_,8 @@
                     p_367206_.endLastBatch();
                 }
             }
@@ -185,7 +177,7 @@
         }
     }
 
-@@ -1367,7 +_,7 @@
+@@ -1391,7 +_,7 @@
         } else {
             int i = p_109538_.getBrightness(LightLayer.SKY, p_109540_);
             int j = p_109538_.getBrightness(LightLayer.BLOCK, p_109540_);
@@ -194,7 +186,7 @@
             if (j < k) {
                 j = k;
             }
-@@ -1429,5 +_,21 @@
+@@ -1453,5 +_,21 @@
 
     public CloudRenderer getCloudRenderer() {
         return this.cloudRenderer;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/RenderType.java
 +++ b/net/minecraft/client/renderer/RenderType.java
-@@ -929,11 +_,22 @@
+@@ -800,11 +_,22 @@
             .createCompositeState(false)
     );
     private static final ImmutableList<RenderType> CHUNK_BUFFER_LAYERS = ImmutableList.of(solid(), cutoutMipped(), cutout(), translucent(), tripwire());
@@ -23,7 +23,7 @@
 
     public static RenderType solid() {
         return SOLID;
-@@ -1154,7 +_,7 @@
+@@ -1025,7 +_,7 @@
     }
 
     public static RenderType text(ResourceLocation p_110498_) {
@@ -32,7 +32,7 @@
     }
 
     public static RenderType textBackground() {
-@@ -1162,19 +_,19 @@
+@@ -1033,19 +_,19 @@
     }
 
     public static RenderType textIntensity(ResourceLocation p_173238_) {
@@ -56,7 +56,7 @@
     }
 
     public static RenderType textBackgroundSeeThrough() {
-@@ -1182,7 +_,7 @@
+@@ -1053,7 +_,7 @@
     }
 
     public static RenderType textIntensitySeeThrough(ResourceLocation p_173241_) {
@@ -1,15 +1,15 @@
 --- a/net/minecraft/client/renderer/ScreenEffectRenderer.java
 +++ b/net/minecraft/client/renderer/ScreenEffectRenderer.java
-@@ -27,17 +_,24 @@
+@@ -31,17 +_,24 @@
         Player player = p_110719_.player;
         if (!player.noPhysics) {
             BlockState blockstate = getViewBlockingState(player);
 -            if (blockstate != null) {
-                renderTex(p_110719_.getBlockRenderer().getBlockModelShaper().getParticleIcon(blockstate), p_110720_, p_378238_);
+-                renderTex(p_110719_.getBlockRenderer().getBlockModelShaper().getParticleIcon(blockstate), p_110720_);
 +            var overlay = getOverlayBlock(player);
 +            if (overlay != null) {
 +                if (!net.minecraftforge.client.ForgeHooksClient.renderBlockOverlay(player, p_110720_, net.minecraftforge.client.event.RenderBlockScreenEffectEvent.OverlayType.BLOCK, overlay.getLeft(), overlay.getRight())) {
-+                    renderTex(p_110719_.getBlockRenderer().getBlockModelShaper().getTexture(overlay.getLeft(), p_110719_.level, overlay.getRight()), p_110720_, p_378238_);
+                    renderTex(p_110719_.getBlockRenderer().getBlockModelShaper().getTexture(overlay.getLeft(), p_110719_.level, overlay.getRight()), p_110720_);
 +                }
             }
         }
@@ -17,17 +17,17 @@
         if (!p_110719_.player.isSpectator()) {
             if (p_110719_.player.isEyeInFluid(FluidTags.WATER)) {
 +                if (!net.minecraftforge.client.ForgeHooksClient.renderWaterOverlay(player, p_110720_))
-                 renderWater(p_110719_, p_110720_, p_378238_);
+                 renderWater(p_110719_, p_110720_);
 +            } else if (!player.getEyeInFluidType().isAir()) {
-+                net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(player.getEyeInFluidType()).renderOverlay(p_110719_, p_110720_, p_378238_);
+                net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(player.getEyeInFluidType()).renderOverlay(p_110719_, p_110720_);
             }
 
             if (p_110719_.player.isOnFire()) {
 +                if (!net.minecraftforge.client.ForgeHooksClient.renderFireOverlay(player, p_110720_))
-                 renderFire(p_110720_, p_378238_);
+                 renderFire(p_110719_, p_110720_);
             }
         }
-@@ -45,6 +_,12 @@
+@@ -49,6 +_,12 @@
 
     @Nullable
     private static BlockState getViewBlockingState(Player p_110717_) {
@@ -40,7 +40,7 @@
         BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
 
         for (int i = 0; i < 8; i++) {
-@@ -54,7 +_,7 @@
+@@ -58,7 +_,7 @@
             blockpos$mutableblockpos.set(d0, d1, d2);
             BlockState blockstate = p_110717_.level().getBlockState(blockpos$mutableblockpos);
             if (blockstate.getRenderShape() != RenderShape.INVISIBLE && blockstate.isViewBlocking(p_110717_.level(), blockpos$mutableblockpos)) {
@@ -49,23 +49,17 @@
             }
         }
 
-@@ -82,6 +_,10 @@
+@@ -88,8 +_,12 @@
     }
 
-     private static void renderWater(Minecraft p_110726_, PoseStack p_110727_, MultiBufferSource p_376402_) {
-+        renderFluid(p_110726_, p_110727_, p_376402_, UNDERWATER_LOCATION);
+     private static void renderWater(Minecraft p_110726_, PoseStack p_110727_) {
+        renderFluid(p_110726_, p_110727_, UNDERWATER_LOCATION);
 +    }
 +
-+    public static void renderFluid(Minecraft p_110726_, PoseStack p_110727_, MultiBufferSource p_376402_, ResourceLocation texture) {
+    public static void renderFluid(Minecraft p_110726_, PoseStack p_110727_, ResourceLocation texture) {
+         RenderSystem.setShader(CoreShaders.POSITION_TEX);
+-        RenderSystem.setShaderTexture(0, UNDERWATER_LOCATION);
+        RenderSystem.setShaderTexture(0, texture);
         BlockPos blockpos = BlockPos.containing(p_110726_.player.getX(), p_110726_.player.getEyeY(), p_110726_.player.getZ());
         float f = LightTexture.getBrightness(p_110726_.player.level().dimensionType(), p_110726_.player.level().getMaxLocalRawBrightness(blockpos));
-         int i = ARGB.colorFromFloat(0.1F, f, f, f);
-@@ -94,7 +_,7 @@
-         float f7 = -p_110726_.player.getYRot() / 64.0F;
-         float f8 = p_110726_.player.getXRot() / 64.0F;
-         Matrix4f matrix4f = p_110727_.last().pose();
-        VertexConsumer vertexconsumer = p_376402_.getBuffer(RenderType.blockScreenEffect(UNDERWATER_LOCATION));
-+        VertexConsumer vertexconsumer = p_376402_.getBuffer(RenderType.blockScreenEffect(texture));
-         vertexconsumer.addVertex(matrix4f, -1.0F, -1.0F, -0.5F).setUv(4.0F + f7, 4.0F + f8).setColor(i);
-         vertexconsumer.addVertex(matrix4f, 1.0F, -1.0F, -0.5F).setUv(0.0F + f7, 4.0F + f8).setColor(i);
-         vertexconsumer.addVertex(matrix4f, 1.0F, 1.0F, -0.5F).setUv(0.0F + f7, 0.0F + f8).setColor(i);
+         RenderSystem.enableBlend();
@@ -1,24 +1,20 @@
 --- a/net/minecraft/client/renderer/Sheets.java
 +++ b/net/minecraft/client/renderer/Sheets.java
-@@ -155,7 +_,7 @@
+@@ -140,11 +_,11 @@
     }
 
     private static Material createSignMaterial(WoodType p_173386_) {
-        return createSignMaterial(ResourceLocation.withDefaultNamespace(p_173386_.name()));
-+        return createSignMaterial(ResourceLocation.parse(p_173386_.name()));
-     }
- 
-     public static Material createSignMaterial(ResourceLocation p_378064_) {
-@@ -163,7 +_,7 @@
+-        return new Material(SIGN_SHEET, ResourceLocation.withDefaultNamespace("entity/signs/" + p_173386_.name()));
+        return new Material(SIGN_SHEET, ResourceLocation.parse(p_173386_.name()).withPrefix("entity/signs/"));
     }
 
     private static Material createHangingSignMaterial(WoodType p_251735_) {
-        return createHangingSignMaterial(ResourceLocation.withDefaultNamespace(p_251735_.name()));
-+        return createHangingSignMaterial(ResourceLocation.parse(p_251735_.name()));
+-        return new Material(SIGN_SHEET, ResourceLocation.withDefaultNamespace("entity/signs/hanging/" + p_251735_.name()));
+        return new Material(SIGN_SHEET, ResourceLocation.parse(p_251735_.name()).withPrefix("entity/signs/hanging/"));
     }
 
-     public static Material createHangingSignMaterial(ResourceLocation p_377324_) {
-@@ -230,6 +_,23 @@
+     public static Material getSignMaterial(WoodType p_173382_) {
+@@ -203,6 +_,23 @@
             case SINGLE:
             default:
                 return p_110773_;
@@ -2,7 +2,7 @@
 +++ b/net/minecraft/client/renderer/block/BlockRenderDispatcher.java
@@ -37,7 +_,7 @@
         this.blockModelShaper = p_173399_;
-         this.specialBlockModelRenderer = p_378785_;
+         this.blockEntityRenderer = p_173400_;
         this.blockColors = p_173401_;
 -        this.modelRenderer = new ModelBlockRenderer(this.blockColors);
 +        this.modelRenderer = new net.minecraftforge.client.model.lighting.ForgeModelBlockRenderer(this.blockColors);
@@ -67,16 +67,34 @@
 +    public void renderSingleBlock(BlockState p_110913_, PoseStack p_110914_, MultiBufferSource p_110915_, int p_110916_, int p_110917_, net.minecraftforge.client.model.data.ModelData modelData, net.minecraft.client.renderer.RenderType renderType) {
         RenderShape rendershape = p_110913_.getRenderShape();
         if (rendershape != RenderShape.INVISIBLE) {
-             BakedModel bakedmodel = this.getBlockModel(p_110913_);
-@@ -111,9 +_,10 @@
-             float f = (float)(i >> 16 & 0xFF) / 255.0F;
-             float f1 = (float)(i >> 8 & 0xFF) / 255.0F;
-             float f2 = (float)(i & 0xFF) / 255.0F;
-+            for (var rt : bakedmodel.getRenderTypes(p_110913_, RandomSource.create(42), modelData))
-             this.modelRenderer
-                 .renderModel(
-                    p_110914_.last(), p_110915_.getBuffer(ItemBlockRenderTypes.getRenderType(p_110913_)), p_110913_, bakedmodel, f, f1, f2, p_110916_, p_110917_
-+                    p_110914_.last(), p_110915_.getBuffer(renderType != null ? renderType : net.minecraftforge.client.RenderTypeHelper.getEntityRenderType(rt)), p_110913_, bakedmodel, f, f1, f2, p_110916_, p_110917_, modelData, rt
-                 );
-             this.specialBlockModelRenderer.get().renderByBlock(p_110913_.getBlock(), ItemDisplayContext.NONE, p_110914_, p_110915_, p_110916_, p_110917_);
+             switch (rendershape) {
+@@ -113,21 +_,26 @@
+                     float f = (float)(i >> 16 & 0xFF) / 255.0F;
+                     float f1 = (float)(i >> 8 & 0xFF) / 255.0F;
+                     float f2 = (float)(i & 0xFF) / 255.0F;
+                    for (var rt : bakedmodel.getRenderTypes(p_110913_, RandomSource.create(42), modelData))
+                     this.modelRenderer
+                         .renderModel(
+                             p_110914_.last(),
+-                            p_110915_.getBuffer(ItemBlockRenderTypes.getRenderType(p_110913_)),
+                            p_110915_.getBuffer(renderType != null ? renderType : net.minecraftforge.client.RenderTypeHelper.getEntityRenderType(rt)),
+                             p_110913_,
+                             bakedmodel,
+                             f,
+                             f1,
+                             f2,
+                             p_110916_,
+-                            p_110917_
+                            p_110917_,
+                            modelData,
+                            rt
+                         );
+                     break;
+                 case ENTITYBLOCK_ANIMATED:
+-                    this.blockEntityRenderer.renderByItem(new ItemStack(p_110913_.getBlock()), ItemDisplayContext.NONE, p_110914_, p_110915_, p_110916_, p_110917_);
+                    ItemStack stack = new ItemStack(p_110913_.getBlock());
+                    var renderer = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(stack).getCustomRenderer();
+                    renderer.renderByItem(stack, ItemDisplayContext.NONE, p_110914_, p_110915_, p_110916_, p_110917_);
+             }
         }
+     }
@@ -1,52 +1,82 @@
 --- a/net/minecraft/client/renderer/block/model/BlockModel.java
 +++ b/net/minecraft/client/renderer/block/model/BlockModel.java
-@@ -49,6 +_,7 @@
-     public UnbakedModel parent;
+@@ -72,9 +_,10 @@
+     public BlockModel parent;
     @Nullable
-     private final ResourceLocation parentLocation;
+     protected ResourceLocation parentLocation;
 +    public final net.minecraftforge.client.model.geometry.BlockGeometryBakingContext customData = new net.minecraftforge.client.model.geometry.BlockGeometryBakingContext(this);
 
     public static BlockModel fromStream(Reader p_111462_) {
-         return GsonHelper.fromJson(GSON, p_111462_, BlockModel.class);
-@@ -85,6 +_,8 @@
-     @Override
-     public void resolveDependencies(ResolvableModel.Resolver p_377823_) {
-         if (this.parentLocation != null) {
-+            if (customData.hasCustomGeometry())
-+                customData.getCustomGeometry().resolveDependencies(p_377823_, customData);
-             this.parent = p_377823_.resolve(this.parentLocation);
-         }
-     }
-@@ -110,14 +_,20 @@
-     public BakedModel bake(
-         TextureSlots p_378598_, ModelBaker p_378458_, ModelState p_111453_, boolean p_111455_, boolean p_377435_, ItemTransforms p_378085_
-     ) {
-+        if (this.customData.getCustomGeometry() != null)
-+            return this.customData.getCustomGeometry().bake(customData, p_378458_, p_378598_, p_111453_);
-+
-+        var wrapped = net.minecraftforge.client.ForgeHooksClient.wrapRenderType(p_378458_, this.customData.getRenderType(), this.customData.getRenderTypeFast());
-+
-         return this.elements.isEmpty() && this.parent != null
-            ? this.parent.bake(p_378598_, p_378458_, p_111453_, p_111455_, p_377435_, p_378085_)
-            : SimpleBakedModel.bakeElements(this.elements, p_378598_, p_378458_.sprites(), p_111453_, p_111455_, p_377435_, true, p_378085_);
-+            ? this.parent.bake(p_378598_, wrapped, p_111453_, p_111455_, p_377435_, p_378085_)
-+            : SimpleBakedModel.bakeElements(this.elements, p_378598_, p_378458_.sprites(), p_111453_, p_111455_, p_377435_, true, p_378085_, wrapped.renderType(), wrapped.renderTypeFast());
+-        return GsonHelper.fromJson(GSON, p_111462_, BlockModel.class);
+        return GsonHelper.fromJson(net.minecraftforge.client.model.ExtendedBlockModelDeserializer.INSTANCE, p_111462_, BlockModel.class);
     }
 
-     @Nullable
-     @VisibleForTesting
-     List<BlockElement> getElements() {
+     public BlockModel(
+@@ -95,10 +_,17 @@
+         this.overrides = p_273099_;
+     }
+ 
+    @Deprecated
+     public List<BlockElement> getElements() {
 +        if (customData.hasCustomGeometry()) return java.util.Collections.emptyList();
-         return this.elements;
+         return this.elements.isEmpty() && this.parent != null ? this.parent.getElements() : this.elements;
     }
 
-@@ -147,7 +_,8 @@
+    @Nullable
+    public ResourceLocation getParentLocation() {
+        return parentLocation;
+    }
+
+     public boolean hasAmbientOcclusion() {
+         if (this.hasAmbientOcclusion != null) {
+             return this.hasAmbientOcclusion;
+@@ -130,12 +_,18 @@
+                 throw new IllegalStateException("BlockModel parent has to be a block model.");
             }
 
-             ResourceLocation resourcelocation = s.isEmpty() ? null : ResourceLocation.parse(s);
-            return new BlockModel(resourcelocation, list, textureslots$data, obool, unbakedmodel$guilight, itemtransforms);
-+            var ret = new BlockModel(resourcelocation, list, textureslots$data, obool, unbakedmodel$guilight, itemtransforms);
-+            return net.minecraftforge.client.ForgeHooksClient.deserializeBlockModel(ret, ret.getElements(), jsonobject, p_111500_);
+            if (customData.hasCustomGeometry()) {
+                customData.getCustomGeometry().resolveDependencies(p_365651_, customData);
+            }
+
+             this.parent = blockmodel;
         }
+     }
 
-         private TextureSlots.Data getTextureMap(JsonObject p_111510_) {
+     @Override
+     public BakedModel bake(ModelBaker p_252120_, Function<Material, TextureAtlasSprite> p_250023_, ModelState p_251130_) {
+        if (this.customData.getCustomGeometry() != null)
+            return this.customData.getCustomGeometry().bake(customData, p_252120_, p_250023_, p_251130_);
+         return this.bake(p_250023_, p_251130_, true);
+     }
+ 
+@@ -229,7 +_,18 @@
+         ItemTransform itemtransform5 = this.getTransform(ItemDisplayContext.GUI);
+         ItemTransform itemtransform6 = this.getTransform(ItemDisplayContext.GROUND);
+         ItemTransform itemtransform7 = this.getTransform(ItemDisplayContext.FIXED);
+-        return new ItemTransforms(itemtransform, itemtransform1, itemtransform2, itemtransform3, itemtransform4, itemtransform5, itemtransform6, itemtransform7);
+
+        var builder = com.google.common.collect.ImmutableMap.<ItemDisplayContext, ItemTransform>builder();
+        for (ItemDisplayContext type : ItemDisplayContext.values()) {
+           if (type.isModded()) {
+              var transform = this.getTransform(type);
+              if (transform != ItemTransform.NO_TRANSFORM) {
+                 builder.put(type, transform);
+              }
+           }
+        }
+
+        return new ItemTransforms(itemtransform, itemtransform1, itemtransform2, itemtransform3, itemtransform4, itemtransform5, itemtransform6, itemtransform7, builder.build());
+     }
+ 
+     private ItemTransform getTransform(ItemDisplayContext p_270662_) {
+@@ -347,6 +_,10 @@
+ 
+         public boolean lightLikeBlock() {
+             return this == SIDE;
+        }
+
+        public String getSerializedName() {
+            return name;
+         }
+     }
+ }
@@ -1,11 +1,12 @@
 --- a/net/minecraft/client/renderer/block/model/FaceBakery.java
 +++ b/net/minecraft/client/renderer/block/model/FaceBakery.java
-@@ -58,7 +_,13 @@
-             recalculateWinding(aint, direction);
+@@ -58,7 +_,14 @@
+             this.recalculateWinding(aint, direction);
         }
 
 -        return new BakedQuad(aint, p_111603_.tintIndex(), direction, p_111604_, p_111608_, p_364904_);
 +        var data = p_111603_.data();
+        //net.minecraftforge.client.ForgeHooksClient.fillNormal(aint, direction, data.calculateNormals());
 +        var quad = new BakedQuad(aint, p_111603_.tintIndex(), direction, p_111604_, p_111608_, p_364904_, data.ambientOcclusion());
 +        if (!net.minecraftforge.client.model.ForgeFaceData.DEFAULT.equals(data)) {
 +           net.minecraftforge.client.model.QuadTransformers.applyingLightmap(data.blockLight(), data.skyLight()).processInPlace(quad);
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
+++ b/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
+@@ -39,6 +_,8 @@
+         map.put("particle", p_111672_.hasTexture("particle") ? Either.left(p_111672_.getMaterial("particle")) : map.get("layer0"));
+         BlockModel blockmodel = new BlockModel(null, list, map, false, p_111672_.getGuiLight(), p_111672_.getTransforms(), p_111672_.getOverrides());
+         blockmodel.name = p_111672_.name;
+        blockmodel.customData.copyFrom(p_111672_.customData);
+        blockmodel.customData.setGui3d(false);
+         return blockmodel;
+     }
+ 
@@ -1,23 +1,53 @@
 --- a/net/minecraft/client/renderer/block/model/ItemTransforms.java
 +++ b/net/minecraft/client/renderer/block/model/ItemTransforms.java
-@@ -19,8 +_,15 @@
-     ItemTransform head,
-     ItemTransform gui,
-     ItemTransform ground,
-    ItemTransform fixed
-+    ItemTransform fixed,
-+    com.google.common.collect.ImmutableMap<ItemDisplayContext, ItemTransform> moddedTransforms
- ) {
-+
+@@ -21,6 +_,7 @@
+     public final ItemTransform gui;
+     public final ItemTransform ground;
+     public final ItemTransform fixed;
+    public final com.google.common.collect.ImmutableMap<ItemDisplayContext, ItemTransform> moddedTransforms;
+ 
+     private ItemTransforms() {
+         this(
+@@ -35,6 +_,7 @@
+         );
+     }
+ 
 +    @Deprecated
-+    public ItemTransforms(ItemTransform thirdPersonLeftHand, ItemTransform thirdPersonRightHand, ItemTransform firstPersonLeftHand, ItemTransform firstPersonRightHand, ItemTransform head, ItemTransform gui, ItemTransform ground, ItemTransform fixed) {
-+        this(thirdPersonLeftHand, thirdPersonRightHand, firstPersonLeftHand, firstPersonRightHand, head, gui, ground, fixed, com.google.common.collect.ImmutableMap.of());
+     public ItemTransforms(ItemTransforms p_111807_) {
+         this.thirdPersonLeftHand = p_111807_.thirdPersonLeftHand;
+         this.thirdPersonRightHand = p_111807_.thirdPersonRightHand;
+@@ -44,6 +_,12 @@
+         this.gui = p_111807_.gui;
+         this.ground = p_111807_.ground;
+         this.fixed = p_111807_.fixed;
+        this.moddedTransforms = p_111807_.moddedTransforms;
 +    }
 +
-     public static final ItemTransforms NO_TRANSFORMS = new ItemTransforms(
-         ItemTransform.NO_TRANSFORM,
-         ItemTransform.NO_TRANSFORM,
-@@ -42,7 +_,7 @@
+    @Deprecated
+    public ItemTransforms(ItemTransform p_111798_, ItemTransform p_111799_, ItemTransform p_111800_, ItemTransform p_111801_, ItemTransform p_111802_, ItemTransform p_111803_, ItemTransform p_111804_, ItemTransform p_111805_) {
+        this(p_111798_, p_111799_, p_111800_, p_111801_, p_111802_, p_111803_, p_111804_, p_111805_, com.google.common.collect.ImmutableMap.of());
+     }
+ 
+     public ItemTransforms(
+@@ -54,7 +_,8 @@
+         ItemTransform p_111802_,
+         ItemTransform p_111803_,
+         ItemTransform p_111804_,
+-        ItemTransform p_111805_
+        ItemTransform p_111805_,
+        com.google.common.collect.ImmutableMap<ItemDisplayContext, ItemTransform> moddedTransforms
+     ) {
+         this.thirdPersonLeftHand = p_111798_;
+         this.thirdPersonRightHand = p_111799_;
+@@ -64,6 +_,7 @@
+         this.gui = p_111803_;
+         this.ground = p_111804_;
+         this.fixed = p_111805_;
+        this.moddedTransforms = moddedTransforms;
+     }
+ 
+     public ItemTransform getTransform(ItemDisplayContext p_270619_) {
+@@ -76,7 +_,7 @@
             case GUI -> this.gui;
             case GROUND -> this.ground;
             case FIXED -> this.fixed;
@@ -26,7 +56,7 @@
         };
     }
 
-@@ -66,8 +_,22 @@
+@@ -104,8 +_,23 @@
             ItemTransform itemtransform5 = this.getTransform(p_111822_, jsonobject, ItemDisplayContext.GUI);
             ItemTransform itemtransform6 = this.getTransform(p_111822_, jsonobject, ItemDisplayContext.GROUND);
             ItemTransform itemtransform7 = this.getTransform(p_111822_, jsonobject, ItemDisplayContext.FIXED);
@@ -39,8 +69,9 @@
 +                     fallbackType = fallbackType.fallback();
 +                     transform = this.getTransform(p_111822_, jsonobject, fallbackType);
 +                  }
-+                  if (transform != ItemTransform.NO_TRANSFORM)
+                  if (transform != ItemTransform.NO_TRANSFORM){
 +                     builder.put(type, transform);
+                  }
 +               }
 +            }
 +
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/block/model/MultiVariant.java
+++ b/net/minecraft/client/renderer/block/model/MultiVariant.java
+@@ -50,7 +_,7 @@
+             SimpleWeightedRandomList.Builder<BakedModel> builder = SimpleWeightedRandomList.builder();
+ 
+             for (Variant variant : this.variants) {
+-                BakedModel bakedmodel = p_249016_.bake(variant.getModelLocation(), variant);
+                BakedModel bakedmodel = p_249016_.bake(variant.getModelLocation(), variant, p_111851_);
+                 builder.add(bakedmodel, variant.getWeight());
+             }
+ 
@@ -1,21 +1,10 @@
 --- a/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
 +++ b/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
-@@ -33,6 +_,7 @@
- 
- @OnlyIn(Dist.CLIENT)
- public class SkullBlockRenderer implements BlockEntityRenderer<SkullBlockEntity> {
-+    private static Map<SkullBlock.Type, Function<EntityModelSet, SkullModelBase>> customModels;
-     private final Function<SkullBlock.Type, SkullModelBase> modelByType;
-     public static final Map<SkullBlock.Type, ResourceLocation> SKIN_BY_TYPE = Util.make(Maps.newHashMap(), p_340906_ -> {
-         p_340906_.put(SkullBlock.Types.SKELETON, ResourceLocation.withDefaultNamespace("textures/entity/skeleton/skeleton.png"));
-@@ -57,7 +_,9 @@
-                 case PIGLIN -> new PiglinHeadModel(p_376421_.bakeLayer(ModelLayers.PIGLIN_HEAD));
-             });
-         } else {
-            return null;
-+            if (customModels == null)
-+                customModels = net.minecraftforge.client.event.ForgeEventFactoryClient.onCreateSkullModels();
-+            return customModels.getOrDefault(p_377655_, k -> null).apply(p_376421_);
-         }
+@@ -55,6 +_,7 @@
+         builder.put(SkullBlock.Types.CREEPER, new SkullModel(p_173662_.bakeLayer(ModelLayers.CREEPER_HEAD)));
+         builder.put(SkullBlock.Types.DRAGON, new DragonHeadModel(p_173662_.bakeLayer(ModelLayers.DRAGON_SKULL)));
+         builder.put(SkullBlock.Types.PIGLIN, new PiglinHeadModel(p_173662_.bakeLayer(ModelLayers.PIGLIN_HEAD)));
+        net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.CreateSkullModels(builder, p_173662_));
+         return builder.build();
     }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
 +++ b/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
-@@ -246,12 +_,12 @@
+@@ -243,12 +_,12 @@
     ) {
         AABB aabb = p_114444_.getBoundingBox().move(-p_114444_.getX(), -p_114444_.getY(), -p_114444_.getZ());
         ShapeRenderer.renderLineBox(p_114442_, p_114443_, aabb, p_343193_, p_342304_, p_342638_, 1.0F);
@@ -15,7 +15,7 @@
                 p_114442_.pushPose();
                 double d3 = d0 + Mth.lerp((double)p_114445_, enderdragonpart.xOld, enderdragonpart.getX());
                 double d4 = d1 + Mth.lerp((double)p_114445_, enderdragonpart.yOld, enderdragonpart.getY());
-@@ -484,6 +_,10 @@
+@@ -481,6 +_,10 @@
         return this.itemInHandRenderer;
     }
 
@@ -26,7 +26,7 @@
     @Override
     public void onResourceManagerReload(ResourceManager p_174004_) {
         EntityRendererProvider.Context entityrendererprovider$context = new EntityRendererProvider.Context(
-@@ -491,5 +_,6 @@
+@@ -488,5 +_,6 @@
         );
         this.renderers = EntityRenderers.createEntityRenderers(entityrendererprovider$context);
         this.playerRenderers = EntityRenderers.createPlayerRenderers(entityrendererprovider$context);
@@ -12,7 +12,7 @@
         }
     }
 
-@@ -272,7 +_,7 @@
+@@ -268,7 +_,7 @@
         }
 
         p_367427_.distanceToCameraSq = this.entityRenderDispatcher.distanceToSqr(p_367571_);
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/entity/FishingHookRenderer.java
+++ b/net/minecraft/client/renderer/entity/FishingHookRenderer.java
+@@ -63,7 +_,7 @@
+     private Vec3 getPlayerHandPos(Player p_328037_, float p_328369_, float p_332926_) {
+         int i = p_328037_.getMainArm() == HumanoidArm.RIGHT ? 1 : -1;
+         ItemStack itemstack = p_328037_.getMainHandItem();
+-        if (!itemstack.is(Items.FISHING_ROD)) {
+        if (!itemstack.canPerformAction(net.minecraftforge.common.ToolActions.FISHING_ROD_CAST)) {
+             i = -i;
+         }
+ 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/entity/HumanoidMobRenderer.java
 +++ b/net/minecraft/client/renderer/entity/HumanoidMobRenderer.java
-@@ -51,7 +_,7 @@
+@@ -40,7 +_,7 @@
         p_369040_.isCrouching = p_362179_.isCrouching();
         p_369040_.isFallFlying = p_362179_.isFallFlying();
         p_369040_.isVisuallySwimming = p_362179_.isVisuallySwimming();
@@ -1,18 +1,18 @@
 --- a/net/minecraft/client/renderer/entity/ItemFrameRenderer.java
 +++ b/net/minecraft/client/renderer/entity/ItemFrameRenderer.java
-@@ -96,6 +_,7 @@
-         if (p_361692_.mapId != null) {
-             int j = p_361692_.rotation % 4 * 2;
+@@ -98,6 +_,7 @@
+ 
+             int j = mapid != null ? p_361692_.rotation % 4 * 2 : p_361692_.rotation;
             p_115061_.mulPose(Axis.ZP.rotationDegrees((float)j * 360.0F / 8.0F));
 +            if (!net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderItemInFrame(p_361692_, this, p_115061_, p_115062_, p_115063_)) {
-             p_115061_.mulPose(Axis.ZP.rotationDegrees(180.0F));
-             float f2 = 0.0078125F;
-             p_115061_.scale(0.0078125F, 0.0078125F, 0.0078125F);
-@@ -103,6 +_,7 @@
-             p_115061_.translate(0.0F, 0.0F, -1.0F);
-             int i = this.getLightCoords(p_361692_.isGlowFrame, 15728850, p_115063_);
-             this.mapRenderer.render(p_361692_.mapRenderState, p_115061_, p_115062_, true, i);
+             if (mapid != null) {
+                 p_115061_.mulPose(Axis.ZP.rotationDegrees(180.0F));
+                 float f2 = 0.0078125F;
+@@ -110,6 +_,7 @@
+                 int k = this.getLightVal(p_361692_.isGlowFrame, 15728880, p_115063_);
+                 p_115061_.scale(0.5F, 0.5F, 0.5F);
+                 this.itemRenderer.render(itemstack, ItemDisplayContext.FIXED, false, p_115061_, p_115062_, k, OverlayTexture.NO_OVERLAY, p_361692_.itemModel);
 +            }
-         } else if (!p_361692_.item.isEmpty()) {
-             p_115061_.mulPose(Axis.ZP.rotationDegrees((float)p_361692_.rotation * 360.0F / 8.0F));
-             int k = this.getLightCoords(p_361692_.isGlowFrame, 15728880, p_115063_);
+             }
+         }
+ 
@@ -1,11 +1,54 @@
 --- a/net/minecraft/client/renderer/entity/ItemRenderer.java
 +++ b/net/minecraft/client/renderer/entity/ItemRenderer.java
-@@ -130,7 +_,7 @@
-                 f3 = 1.0F;
+@@ -152,7 +_,7 @@
+         float p_368655_
+     ) {
+         p_366810_.pushPose();
+-        p_369691_.getTransforms().getTransform(p_369628_).apply(p_365876_, p_366810_);
+        p_369691_ = p_369691_.applyTransform(p_369628_, p_366810_, p_365876_);
+         p_366810_.translate(-0.5F, -0.5F, p_368655_);
+         this.renderItem(p_368265_, p_369628_, p_366810_, p_363829_, p_363235_, p_368132_, p_369691_, p_366607_);
+         p_366810_.popPose();
+@@ -169,7 +_,8 @@
+         boolean p_366488_
+     ) {
+         if (!p_367824_.isCustomRenderer() && (!p_364096_.is(Items.TRIDENT) || p_366488_)) {
+-            RenderType rendertype = ItemBlockRenderTypes.getRenderType(p_364096_);
+            for (var model : p_367824_.getRenderPasses(p_364096_, true)) {
+            for (var rendertype : model.getRenderTypes(p_364096_, true)) {
+             VertexConsumer vertexconsumer;
+             if (hasAnimatedTexture(p_364096_) && p_364096_.hasFoil()) {
+                 PoseStack.Pose posestack$pose = p_370127_.last().copy();
+@@ -185,8 +_,11 @@
             }
 
+             this.renderModelLists(p_367824_, p_364096_, p_363416_, p_367651_, p_370127_, vertexconsumer);
+            }
+            }
+         } else {
+-            this.blockEntityRenderer.renderByItem(p_364096_, p_362035_, p_370127_, p_365365_, p_363416_, p_367651_);
+            var blockEntityRenderer = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_364096_).getCustomRenderer();
+            blockEntityRenderer.renderByItem(p_364096_, p_362035_, p_370127_, p_365365_, p_363416_, p_367651_);
+         }
+     }
+ 
+@@ -232,7 +_,7 @@
+             float f1 = (float)ARGB.red(i) / 255.0F;
+             float f2 = (float)ARGB.green(i) / 255.0F;
+             float f3 = (float)ARGB.blue(i) / 255.0F;
 -            p_115164_.putBulkData(posestack$pose, bakedquad, f1, f2, f3, f, p_115167_, p_115168_);
 +            p_115164_.putBulkData(posestack$pose, bakedquad, f1, f2, f3, f, p_115167_, p_115168_, true);
         }
     }
 
+@@ -275,6 +_,10 @@
+     @Override
+     public void onResourceManagerReload(ResourceManager p_115105_) {
+         this.itemModelShaper.invalidateCache();
+    }
+
+    public BlockEntityWithoutLevelRenderer getBlockEntityRenderer() {
+        return blockEntityRenderer;
+     }
+ 
+     @Nullable
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/entity/LivingEntityRenderer.java
 +++ b/net/minecraft/client/renderer/entity/LivingEntityRenderer.java
-@@ -73,6 +_,7 @@
+@@ -69,6 +_,7 @@
     }
 
     public void render(S p_364280_, PoseStack p_115311_, MultiBufferSource p_115312_, int p_115313_) {
@@ -8,7 +8,7 @@
         p_115311_.pushPose();
         if (p_364280_.hasPose(Pose.SLEEPING)) {
             Direction direction = p_364280_.bedOrientation;
-@@ -108,6 +_,7 @@
+@@ -104,6 +_,7 @@
 
         p_115311_.popPose();
         super.render(p_364280_, p_115311_, p_115312_, p_115313_);
@@ -16,11 +16,12 @@
     }
 
     protected boolean shouldRenderLayers(S p_360804_) {
-@@ -290,6 +_,7 @@
-             p_363057_.isFullyFrozen = p_368665_.isFullyFrozen();
-             p_363057_.isBaby = p_368665_.isBaby();
-             p_363057_.isInWater = p_368665_.isInWater();
-+            p_363057_.isInWater = p_368665_.isInWaterOrSwimmable();
-             p_363057_.isAutoSpinAttack = p_368665_.isAutoSpinAttack();
-             p_363057_.hasRedOverlay = p_368665_.hurtTime > 0 || p_368665_.deathTime > 0;
-             ItemStack itemstack = p_368665_.getItemBySlot(EquipmentSlot.HEAD);
+@@ -284,7 +_,7 @@
+ 
+         p_363057_.isFullyFrozen = p_368665_.isFullyFrozen();
+         p_363057_.isBaby = p_368665_.isBaby();
+-        p_363057_.isInWater = p_368665_.isInWater();
+        p_363057_.isInWater = p_368665_.isInWater() || p_368665_.isInFluidType((fluidType, height) -> p_368665_.canSwimInFluidType(fluidType));
+         p_363057_.isAutoSpinAttack = p_368665_.isAutoSpinAttack();
+         p_363057_.hasRedOverlay = p_368665_.hurtTime > 0 || p_368665_.deathTime > 0;
+         ItemStack itemstack1 = p_368665_.getItemBySlot(EquipmentSlot.HEAD);
@@ -1,17 +1,17 @@
 --- a/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
 +++ b/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
-@@ -44,22 +_,23 @@
+@@ -45,22 +_,23 @@
     }
 
     public void render(PoseStack p_117085_, MultiBufferSource p_117086_, int p_117087_, S p_364101_, float p_117089_, float p_117090_) {
-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.chestEquipment, EquipmentSlot.CHEST, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.CHEST));
-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.legsEquipment, EquipmentSlot.LEGS, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.LEGS));
-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.feetEquipment, EquipmentSlot.FEET, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.FEET));
-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.headEquipment, EquipmentSlot.HEAD, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.HEAD));
-+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.chestEquipment, EquipmentSlot.CHEST, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.CHEST), p_364101_);
-+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.legsEquipment, EquipmentSlot.LEGS, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.LEGS), p_364101_);
-+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.feetEquipment, EquipmentSlot.FEET, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.FEET), p_364101_);
-+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.headEquipment, EquipmentSlot.HEAD, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.HEAD), p_364101_);
+-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.chestItem, EquipmentSlot.CHEST, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.CHEST));
+-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.legsItem, EquipmentSlot.LEGS, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.LEGS));
+-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.feetItem, EquipmentSlot.FEET, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.FEET));
+-        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.headItem, EquipmentSlot.HEAD, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.HEAD));
+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.chestItem, EquipmentSlot.CHEST, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.CHEST), p_364101_);
+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.legsItem, EquipmentSlot.LEGS, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.LEGS), p_364101_);
+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.feetItem, EquipmentSlot.FEET, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.FEET), p_364101_);
+        this.renderArmorPiece(p_117085_, p_117086_, p_364101_.headItem, EquipmentSlot.HEAD, p_117087_, this.getArmorModel(p_364101_, EquipmentSlot.HEAD), p_364101_);
     }
 
 -    private void renderArmorPiece(PoseStack p_117119_, MultiBufferSource p_117120_, ItemStack p_366444_, EquipmentSlot p_117122_, int p_117123_, A p_117124_) {
@@ -21,16 +21,16 @@
             this.getParentModel().copyPropertiesTo(p_117124_);
             this.setPartVisibility(p_117124_, p_117122_);
 +            var model = this.getArmorModel(state, p_117122_, p_366444_, p_117124_);
-             EquipmentClientInfo.LayerType equipmentclientinfo$layertype = this.usesInnerModel(p_117122_)
-                 ? EquipmentClientInfo.LayerType.HUMANOID_LEGGINGS
-                 : EquipmentClientInfo.LayerType.HUMANOID;
-             this.equipmentRenderer
-                .renderLayers(equipmentclientinfo$layertype, equippable.assetId().orElseThrow(), p_117124_, p_366444_, p_117119_, p_117120_, p_117123_);
-+                .renderLayers(equipmentclientinfo$layertype, equippable.assetId().orElseThrow(), model, p_366444_, p_117119_, p_117120_, p_117123_);
+             ResourceLocation resourcelocation = equippable.model().orElseThrow();
+             EquipmentModel.LayerType equipmentmodel$layertype = this.usesInnerModel(p_117122_)
+                 ? EquipmentModel.LayerType.HUMANOID_LEGGINGS
+                 : EquipmentModel.LayerType.HUMANOID;
+-            this.equipmentRenderer.renderLayers(equipmentmodel$layertype, resourcelocation, p_117124_, p_366444_, p_117119_, p_117120_, p_117123_);
+            this.equipmentRenderer.renderLayers(equipmentmodel$layertype, resourcelocation, model, p_366444_, p_117119_, p_117120_, p_117123_);
         }
     }
 
-@@ -96,5 +_,12 @@
+@@ -97,5 +_,12 @@
 
     private boolean usesInnerModel(EquipmentSlot p_117129_) {
         return p_117129_ == EquipmentSlot.LEGS;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/entity/layers/WingsLayer.java
 +++ b/net/minecraft/client/renderer/entity/layers/WingsLayer.java
-@@ -57,7 +_,7 @@
+@@ -49,7 +_,7 @@
     }
 
     @Nullable
@@ -1,22 +1,26 @@
 --- a/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
 +++ b/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
-@@ -128,10 +_,14 @@
-                 if (itemuseanimation == ItemUseAnimation.BRUSH) {
-                     return HumanoidModel.ArmPose.BRUSH;
-                 }
-            } else if (!p_376602_.swinging && p_376446_.is(Items.CROSSBOW) && CrossbowItem.isCharged(p_376446_)) {
-+            } else if (!p_376602_.swinging && p_376446_.getItem() instanceof CrossbowItem && CrossbowItem.isCharged(p_376446_)) {
+@@ -128,6 +_,9 @@
                 return HumanoidModel.ArmPose.CROSSBOW_HOLD;
             }
 
-+            var pose = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_376446_).getArmPose(p_376602_, p_361073_, p_376446_);
-+            if (pose != null)
-+                return pose;
+            if (p_362189_.pose != null)
+                return p_362189_.pose;
 +
             return HumanoidModel.ArmPose.ITEM;
         }
     }
-@@ -255,10 +_,12 @@
+@@ -217,7 +_,8 @@
+         ItemStack itemstack = p_361341_.getItemInHand(p_364300_);
+         p_365410_.isEmpty = itemstack.isEmpty();
+         p_365410_.useAnimation = !itemstack.isEmpty() ? itemstack.getUseAnimation() : null;
+-        p_365410_.holdsChargedCrossbow = itemstack.is(Items.CROSSBOW) && CrossbowItem.isCharged(itemstack);
+        p_365410_.holdsChargedCrossbow = itemstack.getItem() instanceof CrossbowItem && CrossbowItem.isCharged(itemstack);
+        p_365410_.pose = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(itemstack).getArmPose(p_361341_, p_364300_, itemstack);
+     }
+ 
+     private static void extractCapeState(AbstractClientPlayer p_366404_, PlayerRenderState p_365208_, float p_366613_) {
+@@ -251,10 +_,12 @@
     }
 
     public void renderRightHand(PoseStack p_117771_, MultiBufferSource p_117772_, int p_117773_, ResourceLocation p_364347_, boolean p_367689_) {
@@ -29,7 +33,7 @@
         this.renderHand(p_117814_, p_117815_, p_117816_, p_368419_, this.model.leftArm, p_362915_);
     }
 
-@@ -297,5 +_,12 @@
+@@ -293,5 +_,12 @@
         } else {
             super.setupRotations(p_369667_, p_117803_, p_117804_, p_117805_);
         }
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/entity/state/PlayerRenderState.java
+++ b/net/minecraft/client/renderer/entity/state/PlayerRenderState.java
+@@ -48,6 +_,8 @@
+ 
+     @OnlyIn(Dist.CLIENT)
+     public static class HandState {
+        @Nullable
+        public net.minecraft.client.model.HumanoidModel.ArmPose pose;
+         public boolean isEmpty = true;
+         @Nullable
+         public ItemUseAnimation useAnimation;
@@ -1,15 +0,0 @@
--- a/net/minecraft/client/renderer/item/BlockModelWrapper.java
-+++ b/net/minecraft/client/renderer/item/BlockModelWrapper.java
-@@ -55,6 +_,12 @@
-             aint[j] = this.tints.get(j).calculate(p_378482_, p_376532_, p_376906_);
-         }
- 
-+        // TODO: [Rendering] Figure out how to add multiple passes
-+        /*
-+            - RenderType rendertype = ItemBlockRenderTypes.getRenderType(p_378482_);
-+            + for (var model : p_367824_.getRenderPasses(p_378482_, true)) {
-+            + for (var rendertype : model.getRenderTypes(p_378482_, true)) {
-+         */
-         RenderType rendertype = ItemBlockRenderTypes.getRenderType(p_378482_);
-         itemstackrenderstate$layerrenderstate.setupBlockModel(this.model, rendertype);
-     }
@@ -0,0 +1,24 @@
+--- a/net/minecraft/client/renderer/item/ItemProperties.java
+++ b/net/minecraft/client/renderer/item/ItemProperties.java
+@@ -42,6 +_,10 @@
+     private static final Map<Item, Map<ResourceLocation, ItemPropertyFunction>> PROPERTIES = Maps.newHashMap();
+ 
+     private static ClampedItemPropertyFunction registerGeneric(ResourceLocation p_174582_, ClampedItemPropertyFunction p_174583_) {
+        return (ClampedItemPropertyFunction) registerGeneric(p_174582_, (ItemPropertyFunction) p_174583_);
+    }
+
+    public static ItemPropertyFunction registerGeneric(ResourceLocation p_174582_, ItemPropertyFunction p_174583_) {
+         GENERIC_PROPERTIES.put(p_174582_, p_174583_);
+         return p_174583_;
+     }
+@@ -51,6 +_,10 @@
+     }
+ 
+     private static void register(Item p_174571_, ResourceLocation p_174572_, ClampedItemPropertyFunction p_174573_) {
+        register(p_174571_, p_174572_, (ItemPropertyFunction) p_174573_);
+    }
+
+    public static void register(Item p_174571_, ResourceLocation p_174572_, ItemPropertyFunction p_174573_) {
+         PROPERTIES.computeIfAbsent(p_174571_, p_117828_ -> Maps.newHashMap()).put(p_174572_, p_174573_);
+     }
+ 
@@ -1,21 +0,0 @@
--- a/net/minecraft/client/renderer/item/ItemStackRenderState.java
-+++ b/net/minecraft/client/renderer/item/ItemStackRenderState.java
-@@ -72,7 +_,7 @@
-             return null;
-         } else {
-             BakedModel bakedmodel = this.layers[p_376964_.nextInt(this.activeLayerCount)].model;
-            return bakedmodel == null ? null : bakedmodel.getParticleIcon();
-+            return bakedmodel == null ? null : bakedmodel.getParticleIcon(net.minecraftforge.client.model.data.ModelData.EMPTY);
-         }
-     }
- 
-@@ -149,6 +_,9 @@
- 
-         void render(PoseStack p_377989_, MultiBufferSource p_377594_, int p_375616_, int p_376132_) {
-             p_377989_.pushPose();
-+            if (this.model != null)
-+                this.model.applyTransform(ItemStackRenderState.this.displayContext, p_377989_, ItemStackRenderState.this.isLeftHand);
-+            else
-             this.transform().apply(ItemStackRenderState.this.isLeftHand, p_377989_);
-             p_377989_.translate(-0.5F, -0.5F, -0.5F);
-             if (this.specialRenderer != null) {
Author	SHA1	Message	Date
Jonathing	c047cf136c	1.21.3 RB 1 https://forums.minecraftforge.net/topic/154393-forge-531-minecraft-1213/	2025-03-01 16:56:32 -05:00
Jonathing	f4287ecc81	Add missed license headers (#10475 )	2025-03-01 21:35:03 +00:00
JonathingandLexManos	364a1e737f	Speed up mod annotation scanning by ~30% (#10466 ) Co-authored-by: LexManos <[email protected]>	2025-03-01 21:34:40 +00:00
Jonathing	45a977bb33	[1.21.3] Bump dependencies, most notably EventBus (#10385 ) - CoreMods 5.2.4 -> 5.2.6 - EventBus 6.2.15 -> 6.2.27 - Reduced memory usage - Further performance improvements - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC - Apache MavenArtifact 3.8.5 -> 3.8.8 - NightConfig 3.7.3 -> 3.7.4	2025-02-12 17:51:46 -08:00
Jonathing	ab00c907e7	Add fast graphics render type to block model jsons (#10395 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-12 17:39:27 -08:00
Jonathing RealMangoRage LexManos	979abb2b93	Re-introduce ItemStack Capabilities (#10362 ) Co-authored-by: RealMangoRage <[email protected]> Co-authored-by: LexManos <[email protected]>	2025-02-12 17:30:29 -08:00
Jonathing	056360b050	Re-introduce IForgeItem.damageItem when an item takes damage, Fixes #10344 (#10372 )	2025-02-12 17:29:44 -08:00
Jonathing	960fce505c	Add updated tag context to AddReloadListenerEvent (#10416 ) Fixes using custom tags in GlobalLootModifiers.	2025-02-12 17:21:30 -08:00
JonathingandLexManos	ea597ff45a	Fix redstone update order not matching vanilla. (#10392 ) Fix redstone updates for comparators going up/down incorrectly. Related: #9973 Fix game test structure rotations being inconsistant (#10391) Co-authored-by: LexManos <[email protected]>	2025-02-12 17:11:56 -08:00
Jonathing	f35dce7eb3	Fix corrupted and invalidly symlinked worlds crashing on level select (#10415 )	2025-02-12 17:03:06 -08:00
Jonathing	ef224bd2b8	Fix ModelDiscovery using Item components early (#10418 )	2025-02-12 17:02:52 -08:00
Jonathing	0749f49b6c	Fix forced chunks never being ticked by the server (#10365 )	2025-02-12 13:37:21 -08:00
Jonathing	5c508efaa9	Fix shield disabling being completely ignored (#10317 )	2025-01-27 15:28:07 -08:00
JonathingandJoseph T. McQuigg	dbafe039d8	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10357 ) Co-authored-by: Joseph T. McQuigg <[email protected]>	2025-01-27 15:27:42 -08:00
JonathingandLexManos	b36ee22925	GameTestHelper additions (#10339 ) Co-authored-by: LexManos <[email protected]>	2025-01-27 09:44:26 -08:00
Jonathing	287ee7b0b5	Update Gradle to 8.12.1 (#10353 ) IntelliJ download sources in MDK	2025-01-27 09:44:11 -08:00
Jonathing	5f67621477	Fix JOpt Simple by bumping ModLaucnher (#10348 )	2025-01-27 09:43:49 -08:00
Jonathing	f237e7a8c3	Fix incorrect method reference in TntBlock.explode() (#10327 )	2025-01-25 18:15:54 +00:00
Jonathing	a54420de36	Fix JOpt Simple needing a strict version requirement declaration (#10312 )	2025-01-25 18:15:36 +00:00
Jonathing	65dbdc8eb0	Bump dependencies (#10275 ) - EventBus 6.2.8 -> 6.2.15 - Bootstrap 2.1.3 -> 2.1.8 - SecureModules 2.2.20 -> 2.2.21 - AccessTransformers 8.2.0 -> 8.2.1 - ModLauncher 10.2.2 -> 10.2.3 These bumps include further cleanup and optimisations.	2025-01-04 16:17:38 +00:00
Jonathing	d42979f620	Simplify Title Screen Brandings (#10288 )	2025-01-02 21:34:03 -08:00
Jonathing	ac56afc99c	Clean and fix Forge's internal coremods, fixes finalizeSpawn hook.	2024-12-30 14:36:16 -08:00
Gabriel Harris-Rouquette	81b7bfe4ea	Update jline for better darwin/arm64 support (#10281 )	2024-12-30 09:46:25 -08:00
Jonathing	4cbcf64ce1	Bump CoreMods to 5.2.4 (#10267 )	2024-12-23 15:36:20 -08:00
JonathingandPaint_Ninja	29b763a0c3	Simplify memory usage display on loading screen (#10237 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 12:52:39 -08:00
JonathingandPaint_Ninja	52f41a4448	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10232 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 12:51:51 -08:00
JonathingandPaint_Ninja	597409e2f2	Skip Vanilla classes for the CapabilityTokenSubclass transformer (#10225 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 12:42:07 -08:00
JonathingandPaint_Ninja	21fbd72585	Skip Forge classes in the RuntimeEnumExtender transformer (#10220 ) Mod classes are still transformed as usual Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 12:30:09 -08:00
JonathingandPaint_Ninja	83a09f7584	Skip processing Forge classes in `RuntimeDistCleaner` (#10212 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 12:19:40 -08:00
Jonathing	0e864fbe6e	Fix NightConfig FileWatcher causing dedicated server to hang when exiting (#10214 )	2024-12-23 12:09:22 -08:00
Jonathing	2fd8900c01	Allow mipmap lowering to be disabled (#10256 )	2024-12-23 11:57:00 -08:00