1.21.4 RB 1

https://forums.minecraftforge.net/topic/154394-forge-541-minecraft-1214/
Fix corrupted and invalidly symlinked worlds crashing on level select (#10406 )
2026-11-14 09:05:17 +00:00 · 2025-02-12 12:29:03 -08:00 · 2025-02-12 11:52:53 -08:00 · 2025-02-12 11:47:09 -08:00 · 2025-02-12 11:02:22 -08:00 · 2025-02-05 09:15:37 -08:00
296 changed files with 3652 additions and 2857 deletions
@@ -3,6 +3,7 @@
 *.patch text eol=lf
 *.java text eol=lf
 *.gradle text eol=crlf
+**/MANIFEST.MF text eol=crlf
 *.png binary
 *.gif binary
 *.exe binary
@@ -41,3 +41,8 @@ src/*/generated/**/.cache/

 /ForgeRoot.ipr
 /ForgeRoot.iws
+
+# APT stuff
+/*/.gitignore
+/*/.factorypath
+/*/.apt_generated/
@@ -97,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)
 }
@@ -117,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)
@@ -227,6 +227,31 @@ 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}"
+        }
    }
 }

@@ -268,11 +293,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 {
@@ -284,6 +309,13 @@ tasks.userdevConfig.configure {
            args '--assetsDir', '{assets_root}'
        }

+        clientData {
+            environment 'MCP_MAPPINGS', '{mcp_mappings}'
+            args '--launchTarget', "forge_userdev_client_data"
+            args '--assetIndex', '{asset_index}'
+            args '--assetsDir', '{assets_root}'
+        }
+
        server {
            environment 'MCP_MAPPINGS', '{mcp_mappings}'
            property 'forge.enableGameTest', 'true'
@@ -493,7 +525,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'
@@ -586,7 +618,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)
 }
@@ -607,11 +639,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)
@@ -1059,7 +1091,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.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=
+[![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=
 )][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!
@@ -84,16 +84,6 @@ 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,6 +5,7 @@ plugins {
    id 'maven-publish'
    id 'net.minecraftforge.licenser'
    id 'net.minecraftforge.gradleutils'
+    alias(libs.plugins.apt)
 }

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

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

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

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

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

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

    public static void runAndTick(Runnable r, Runnable tick) {
+        var runner = Executors.newSingleThreadExecutor();
        ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
        final Future<?> work = runner.submit(r);
        do {
@@ -40,6 +40,21 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
        return "runtimedistcleaner";
    }

+    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
+    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
+
+    @Override
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        return YAY;
+    }
+
    @Override
    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
        var changed = false;
@@ -198,21 +213,6 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
        };
    }

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

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

 /**
 * A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
@@ -81,6 +81,10 @@ class ArgumentList {
            .toArray(String[]::new);
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 // Set to true before the first build of a new MC version, so we don't do compatibility checks
 CHECK_COMPATIBILITY=false
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -88,7 +_,8 @@
+@@ -89,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;
-@@ -100,6 +_,7 @@
+@@ -101,6 +_,7 @@
             this.windowedX = this.x = aint1[0];
             this.windowedY = this.y = aint[0];
         }
@@ -18,7 +18,7 @@
 
         GLFW.glfwMakeContextCurrent(this.window);
         GL.createCapabilities();
-@@ -267,6 +_,9 @@
+@@ -271,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
-@@ -264,7 +_,7 @@
+@@ -268,7 +_,7 @@
                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
                 .getChoiceType(p_137552_, p_137553_);
         } catch (IllegalArgumentException illegalargumentexception) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -14,9 +_,9 @@
+@@ -15,9 +_,9 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
@@ -12,7 +12,7 @@
     private static final Set<String> CATEGORIES = Sets.newHashSet();
     public static final String CATEGORY_MOVEMENT = "key.categories.movement";
     public static final String CATEGORY_MISC = "key.categories.misc";
-@@ -42,14 +_,14 @@
+@@ -43,14 +_,14 @@
     private int clickCount;
 
     public static void click(InputConstants.Key p_90836_) {
@@ -29,7 +29,7 @@
         if (keymapping != null) {
             keymapping.setDown(p_90839_);
         }
-@@ -100,7 +_,7 @@
+@@ -101,7 +_,7 @@
     }
 
     public boolean isDown() {
@@ -38,7 +38,7 @@
     }
 
     public String getCategory() {
-@@ -136,7 +_,16 @@
+@@ -137,7 +_,16 @@
     public int compareTo(KeyMapping p_90841_) {
         return this.category.equals(p_90841_.category)
             ? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
@@ -56,7 +56,7 @@
     }
 
     public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -145,6 +_,20 @@
+@@ -146,6 +_,20 @@
     }
 
     public boolean same(KeyMapping p_90851_) {
@@ -77,7 +77,7 @@
         return this.key.equals(p_90851_.key);
     }
 
-@@ -163,11 +_,13 @@
+@@ -164,11 +_,13 @@
     }
 
     public Component getTranslatedKeyMessage() {
@@ -92,10 +92,10 @@
     }
 
     public String saveString() {
-@@ -176,5 +_,88 @@
- 
-     public void setDown(boolean p_90846_) {
-         this.isDown = p_90846_;
+@@ -182,5 +_,88 @@
+     @Nullable
+     public static KeyMapping get(String p_378660_) {
+         return ALL.get(p_378660_);
 +    }
 +
 +    private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -253,7 +_,7 @@
+@@ -250,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;
-@@ -433,7 +_,6 @@
+@@ -428,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;
-@@ -480,15 +_,15 @@
+@@ -475,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_ -> {
-@@ -562,6 +_,7 @@
-         );
-         this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
+@@ -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);
         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);
-@@ -577,6 +_,9 @@
+@@ -576,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);
-@@ -600,6 +_,7 @@
+@@ -599,6 +_,7 @@
             this.options.fullscreen().set(this.window.isFullscreen());
         }
 
@@ -165,7 +165,7 @@
         }
 
         profilerfiller.push("blit");
-@@ -1339,10 +_,12 @@
+@@ -1342,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();
     }
-@@ -1483,6 +_,7 @@
+@@ -1486,6 +_,7 @@
     }
 
     public void stop() {
@@ -186,7 +186,7 @@
         this.running = false;
     }
 
-@@ -1511,10 +_,18 @@
+@@ -1514,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);
                     }
                 }
-@@ -1542,6 +_,8 @@
+@@ -1545,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());
-@@ -1549,7 +_,7 @@
+@@ -1552,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;
-@@ -1562,8 +_,10 @@
+@@ -1565,8 +_,10 @@
                         }
 
                         this.player.resetAttackStrengthTicker();
@@ -237,7 +237,7 @@
                 this.player.swing(InteractionHand.MAIN_HAND);
                 return flag;
             }
-@@ -1579,6 +_,12 @@
+@@ -1582,6 +_,12 @@
                 }
 
                 for (InteractionHand interactionhand : InteractionHand.values()) {
@@ -250,7 +250,7 @@
                     ItemStack itemstack = this.player.getItemInHand(interactionhand);
                     if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
                         return;
-@@ -1599,7 +_,7 @@
+@@ -1602,7 +_,7 @@
                                 }
 
                                 if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
@@ -259,7 +259,7 @@
                                         this.player.swing(interactionhand);
                                     }
 
-@@ -1611,7 +_,7 @@
+@@ -1614,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);
-@@ -1627,6 +_,9 @@
+@@ -1630,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) {
-@@ -1656,6 +_,8 @@
+@@ -1659,6 +_,8 @@
         }
 
         ProfilerFiller profilerfiller = Profiler.get();
@@ -287,7 +287,7 @@
         profilerfiller.push("gui");
         this.chatListener.tick();
         this.gui.tick(this.pause);
-@@ -1745,6 +_,7 @@
+@@ -1748,6 +_,7 @@
 
                 this.tutorial.tick();
 
@@ -295,7 +295,7 @@
                 try {
                     this.level.tick(() -> true);
                 } catch (Throwable throwable1) {
-@@ -1758,6 +_,7 @@
+@@ -1761,6 +_,7 @@
 
                     throw new ReportedException(crashreport1);
                 }
@@ -303,7 +303,7 @@
             }
 
             profilerfiller.popPush("animateTick");
-@@ -1782,6 +_,7 @@
+@@ -1785,6 +_,7 @@
         profilerfiller.popPush("keyboard");
         this.keyboardHandler.tick();
         profilerfiller.pop();
@@ -311,7 +311,7 @@
     }
 
     private boolean isLevelRunningNormally() {
-@@ -1983,6 +_,7 @@
+@@ -1986,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_);
-@@ -2020,6 +_,7 @@
+@@ -2023,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;
-@@ -2027,6 +_,7 @@
+@@ -2030,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");
-@@ -2040,6 +_,7 @@
+@@ -2043,6 +_,7 @@
 
                 this.gui.onDisconnected();
                 this.isLocalServer = false;
@@ -343,40 +343,11 @@
             }
 
             this.level = null;
-@@ -2187,6 +_,7 @@
+@@ -2190,6 +_,7 @@
 
     private void pickBlock() {
         if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
 +            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
-             boolean flag = this.player.getAbilities().instabuild;
-             BlockEntity blockentity = null;
-             HitResult.Type hitresult$type = this.hitResult.getType();
-@@ -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)
+             boolean flag = Screen.hasControlDown();
+             HitResult hitresult = this.hitResult;
+             Objects.requireNonNull(this.hitResult);
@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/color/block/BlockColors.java
 +++ b/net/minecraft/client/color/block/BlockColors.java
-@@ -29,7 +_,8 @@
- @OnlyIn(Dist.CLIENT)
- public class BlockColors {
+@@ -30,7 +_,8 @@
     private static final int DEFAULT = -1;
+     public static final int LILY_PAD_IN_WORLD = -14647248;
+     public static final int LILY_PAD_DEFAULT = -9321636;
 -    private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
 +    // Forge: Use registry delegate as non-Vanilla block ids are not constant
 +    private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
     private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
 
     public static BlockColors createDefault() {
-@@ -91,11 +_,12 @@
+@@ -90,11 +_,12 @@
         }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
         blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
         blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
@@ -24,7 +24,7 @@
         if (blockcolor != null) {
             return blockcolor.getColor(p_92583_, null, null, 0);
         } else {
-@@ -105,13 +_,15 @@
+@@ -104,13 +_,15 @@
     }
 
     public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
@@ -1,35 +0,0 @@
--- a/net/minecraft/client/color/item/ItemColors.java
-+++ b/net/minecraft/client/color/item/ItemColors.java
-@@ -26,7 +_,8 @@
- @OnlyIn(Dist.CLIENT)
- public class ItemColors {
-     private static final int DEFAULT = -1;
-    private final IdMapper<ItemColor> itemColors = new IdMapper<>(32);
-+    // Forge: Use registry delegate as non-Vanilla item ids are not constant
-+    private final java.util.Map<net.minecraft.core.Holder.Reference<Item>, ItemColor> itemColors = new java.util.HashMap<>(32);
- 
-     public static ItemColors createDefault(BlockColors p_92684_) {
-         ItemColors itemcolors = new ItemColors();
-@@ -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_);
-         }
-     }
- }
@@ -0,0 +1,22 @@
+--- a/net/minecraft/client/data/Main.java
+++ b/net/minecraft/client/data/Main.java
+@@ -30,13 +_,18 @@
+         OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
+         OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
+         OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
+        OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg();
+        var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true);
+         OptionSet optionset = optionparser.parse(p_375526_);
+-        if (!optionset.has(optionspec) && optionset.hasOptions()) {
+        if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
+            var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList();
+             Path path = Paths.get(optionspec3.value(optionset));
+             boolean flag = optionset.has(optionspec2);
+             boolean flag1 = flag || optionset.has(optionspec1);
+             Bootstrap.bootStrap();
+             ClientBootstrap.bootstrap();
+            if (!loader.run(optionset, path, input, flag, flag1, flag, flag, false))
+                return;
+             DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
+             addClientProviders(datagenerator, flag1);
+             datagenerator.run();
@@ -0,0 +1,12 @@
+--- a/net/minecraft/client/data/models/ItemModelGenerators.java
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
+@@ -852,6 +_,9 @@
+         this.declareCustomModelItem(Items.COD);
+         this.declareCustomModelItem(Items.FEATHER);
+         this.declareCustomModelItem(Items.LEAD);
+        // moved from validate to here, because it's just vanilla default blocks
+        if (this.itemModelOutput instanceof ModelProvider.ItemInfoCollector collector)
+            collector.generateDefaultBlockModels();
+     }
+ 
+     @OnlyIn(Dist.CLIENT)
@@ -0,0 +1,111 @@
+--- a/net/minecraft/client/data/models/ModelProvider.java
+++ b/net/minecraft/client/data/models/ModelProvider.java
+@@ -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
-@@ -33,7 +_,7 @@
- import org.joml.Vector3f;
+@@ -32,7 +_,7 @@
+ import org.joml.Matrix4f;
 
 @OnlyIn(Dist.CLIENT)
 -public class Font {
 +public class Font implements net.minecraftforge.client.extensions.IForgeFont {
     private static final float EFFECT_DEPTH = 0.01F;
-     private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
-     public static final int ALPHA_CUTOFF = 8;
+     public static final float SHADOW_DEPTH = 0.03F;
+     public static final int NO_SHADOW = 0;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/GuiGraphics.java
 +++ b/net/minecraft/client/gui/GuiGraphics.java
-@@ -53,7 +_,7 @@
+@@ -52,7 +_,7 @@
 import org.joml.Vector2ic;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     public static final float MAX_GUI_Z = 10000.0F;
     public static final float MIN_GUI_Z = -10000.0F;
     private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
-@@ -227,6 +_,11 @@
+@@ -229,6 +_,11 @@
     }
 
     public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
@@ -21,7 +21,7 @@
         return p_281896_ == null
             ? 0
             : p_283343_.drawInBatch(
-@@ -248,6 +_,11 @@
+@@ -250,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_,
-@@ -872,6 +_,7 @@
+@@ -859,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);
-@@ -892,13 +_,24 @@
+@@ -879,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_) {
-@@ -908,8 +_,7 @@
+@@ -895,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_);
     }
 
-@@ -922,7 +_,22 @@
+@@ -909,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_) {
-@@ -964,11 +_,13 @@
+@@ -951,11 +_,13 @@
         @Nullable ResourceLocation p_368234_
     ) {
         if (!p_282615_.isEmpty()) {
@@ -115,7 +115,7 @@
                 if (k > i) {
                     i = k;
                 }
-@@ -978,18 +_,19 @@
+@@ -965,18 +_,19 @@
 
             int i2 = i;
             int j2 = j;
@@ -138,7 +138,7 @@
                 k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
             }
 
-@@ -997,7 +_,7 @@
+@@ -984,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);
             }
 
-@@ -1054,6 +_,10 @@
+@@ -1041,6 +_,10 @@
                 }
             }
         }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -259,6 +_,25 @@
+@@ -250,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
-@@ -62,6 +_,8 @@
+@@ -61,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();
-@@ -100,6 +_,7 @@
+@@ -99,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;
-@@ -115,12 +_,14 @@
+@@ -114,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());
-@@ -128,7 +_,6 @@
+@@ -127,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
-@@ -60,6 +_,7 @@
+@@ -58,6 +_,7 @@
     private boolean fading;
     private long fadeInStart;
     private final LogoRenderer logoRenderer;
@@ -8,7 +8,7 @@
 
     public TitleScreen() {
         this(false);
-@@ -115,11 +_,15 @@
+@@ -111,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(
-@@ -184,7 +_,7 @@
+@@ -180,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()
             )
-@@ -293,6 +_,7 @@
+@@ -289,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);
             }
-@@ -308,10 +_,18 @@
+@@ -304,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
-@@ -108,6 +_,7 @@
+@@ -106,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;
-@@ -119,6 +_,8 @@
+@@ -117,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()) {
-@@ -199,7 +_,7 @@
+@@ -197,7 +_,7 @@
             ItemStack itemstack = this.hoveredSlot.getItem();
             if (this.menu.getCarried().isEmpty() || this.showTooltipWithItemInHand(itemstack)) {
                 p_283594_.renderTooltip(
@@ -26,7 +26,7 @@
                 );
             }
         }
-@@ -217,7 +_,8 @@
+@@ -215,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();
     }
 
-@@ -324,7 +_,8 @@
+@@ -321,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_;
-@@ -335,6 +_,7 @@
+@@ -332,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;
-@@ -360,7 +_,7 @@
+@@ -357,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
-@@ -388,7 +_,7 @@
+@@ -385,7 +_,7 @@
                                 this.quickCraftingType = 0;
                             } else if (p_97750_ == 1) {
                                 this.quickCraftingType = 1;
@@ -72,7 +72,7 @@
                                 this.quickCraftingType = 2;
                             }
                         }
-@@ -467,10 +_,13 @@
+@@ -464,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;
-@@ -487,7 +_,7 @@
+@@ -484,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);
                         }
-@@ -551,7 +_,7 @@
+@@ -548,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
-@@ -631,9 +_,10 @@
+@@ -628,9 +_,10 @@
 
     @Override
     public boolean keyPressed(int p_97765_, int p_97766_, int p_97767_) {
@@ -116,7 +116,7 @@
             this.onClose();
             return true;
         } else {
-@@ -707,4 +_,11 @@
+@@ -704,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
-@@ -115,6 +_,8 @@
+@@ -114,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);
-@@ -163,7 +_,7 @@
+@@ -162,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_);
-@@ -331,6 +_,35 @@
+@@ -330,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);
-@@ -377,7 +_,7 @@
+@@ -376,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();
-@@ -396,7 +_,7 @@
+@@ -395,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());
-@@ -432,6 +_,7 @@
+@@ -431,6 +_,7 @@
     }
 
     private void refreshSearchResults() {
@@ -80,7 +80,7 @@
         this.menu.items.clear();
         this.visibleTags.clear();
         String s = this.searchBox.getValue();
-@@ -444,10 +_,10 @@
+@@ -443,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)));
-@@ -479,7 +_,8 @@
+@@ -478,7 +_,8 @@
     @Override
     protected void renderLabels(GuiGraphics p_283168_, int p_281774_, int p_281466_) {
         if (selectedTab.showTitle()) {
@@ -103,7 +103,7 @@
         }
     }
 
-@@ -489,7 +_,7 @@
+@@ -488,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;
                 }
-@@ -511,7 +_,7 @@
+@@ -510,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;
-@@ -605,13 +_,15 @@
+@@ -604,13 +_,15 @@
             this.originalSlots = null;
         }
 
@@ -138,7 +138,7 @@
 
             this.refreshSearchResults();
         } else {
-@@ -677,7 +_,15 @@
+@@ -676,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;
             }
-@@ -689,6 +_,7 @@
+@@ -688,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_);
     }
 
-@@ -701,7 +_,7 @@
+@@ -700,7 +_,7 @@
     public List<Component> getTooltipFromContainerItem(ItemStack p_281769_) {
         boolean flag = this.hoveredSlot != null && this.hoveredSlot instanceof CreativeModeInventoryScreen.CustomCreativeSlot;
         boolean flag1 = selectedTab.getType() == CreativeModeTab.Type.CATEGORY;
@@ -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);
-@@ -720,7 +_,7 @@
+@@ -719,7 +_,7 @@
             int i = 1;
 
             for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
@@ -181,7 +181,7 @@
                     list1.add(i++, creativemodetab.getDisplayName().copy().withStyle(ChatFormatting.BLUE));
                 }
             }
-@@ -731,7 +_,7 @@
+@@ -730,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);
             }
-@@ -747,6 +_,7 @@
+@@ -746,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(
-@@ -765,7 +_,7 @@
+@@ -764,7 +_,7 @@
     }
 
     private int getTabX(CreativeModeTab p_260136_) {
@@ -207,7 +207,7 @@
         int j = 27;
         int k = 27 * i;
         if (p_260136_.isAlignedRight()) {
-@@ -777,7 +_,7 @@
+@@ -776,7 +_,7 @@
 
     private int getTabY(CreativeModeTab p_260181_) {
         int i = 0;
@@ -216,7 +216,7 @@
             i -= 32;
         } else {
             i += this.imageHeight;
-@@ -805,8 +_,8 @@
+@@ -804,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;
-@@ -816,6 +_,7 @@
+@@ -815,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);
-@@ -857,6 +_,14 @@
+@@ -856,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_) {
-@@ -1038,6 +_,22 @@
+@@ -1037,6 +_,22 @@
         @Override
         public boolean mayPickup(Player p_98665_) {
             return this.target.mayPickup(p_98665_);
@@ -267,8 +267,8 @@
 +        }
 +
 +        @Override
-+        public Slot setBackground(ResourceLocation atlas, ResourceLocation sprite) {
-+            this.target.setBackground(atlas, sprite);
+        public Slot setBackground(ResourceLocation sprite) {
+            this.target.setBackground(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);
+                     p_282430_.drawWordWrap(this.font, formattedtext, j1, j + 16 + 19 * l, l1, (i2 & 16711422) >> 1, false);
@@ -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
-@@ -372,6 +_,8 @@
+@@ -371,6 +_,8 @@
                 this.screen.setTooltipForNextRenderPass(Lists.transform(this.onlinePlayersTooltip, Component::getVisualOrderText));
             }
 
@@ -1,18 +1,6 @@
 --- a/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java
 +++ b/net/minecraft/client/gui/screens/options/controls/KeyBindsList.java
-@@ -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 @@
+@@ -148,9 +_,10 @@
             this.name = p_343976_;
             this.changeButton = Button.builder(p_343976_, p_342196_ -> {
                     KeyBindsList.this.keyBindsScreen.selectedKey = p_343088_;
@@ -24,7 +12,7 @@
                 .createNarration(
                     p_342179_ -> p_343088_.isUnbound()
                             ? Component.translatable("narrator.controls.unbound", p_343976_)
-@@ -163,7 +_,7 @@
+@@ -158,7 +_,7 @@
                 )
                 .build();
             this.resetButton = Button.builder(RESET_BUTTON_TITLE, p_357685_ -> {
@@ -33,7 +21,7 @@
                 KeyBindsList.this.resetMappingAndUpdateButtons();
             }).bounds(0, 0, 50, 20).createNarration(p_344192_ -> Component.translatable("narrator.controls.reset", p_343976_)).build();
             this.refreshEntry();
-@@ -215,7 +_,7 @@
+@@ -210,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_357689_ -> {
+             p_374582_ -> {
                 TransferableSelectionList.PackEntry transferableselectionlist$packentry1 = new TransferableSelectionList.PackEntry(
-                     this.minecraft, p_100014_, p_357689_
+                     this.minecraft, p_100014_, p_374582_
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
 +++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
-@@ -169,6 +_,7 @@
+@@ -168,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,
-@@ -479,7 +_,7 @@
+@@ -468,7 +_,7 @@
                                         if (p_269627_) {
                                             p_270552_.accept(this.uiState.getSettings().dataConfiguration());
                                         } else {
@@ -17,7 +17,7 @@
                                         }
                                     },
                                     Component.translatable("dataPack.validation.failed"),
-@@ -593,6 +_,7 @@
+@@ -582,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, false);
-             p_281612_.drawString(this.minecraft.font, component, p_282820_ + 32 + 3, p_283181_ + 9 + 9 + 3, -8355712, false);
+             p_281612_.drawString(this.minecraft.font, s1, p_282820_ + 32 + 3, p_283181_ + 9 + 3, -8355712);
+             p_281612_.drawString(this.minecraft.font, component, p_282820_ + 32 + 3, p_283181_ + 9 + 9 + 3, -8355712);
             p_281612_.blit(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,12 +1,13 @@
 --- a/net/minecraft/client/main/Main.java
 +++ b/net/minecraft/client/main/Main.java
-@@ -120,8 +_,8 @@
+@@ -121,8 +_,8 @@
             CrashReport.preload();
             logger = LogUtils.getLogger();
             s1 = "Bootstrap";
 -            Bootstrap.bootStrap();
-             GameLoadTimesEvent.INSTANCE.setBootstrapTime(Bootstrap.bootstrapDuration.get());
+-            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());
             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
-@@ -259,6 +_,8 @@
+@@ -255,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 @@
         }
     }
 
-@@ -303,6 +_,8 @@
+@@ -299,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 @@
         }
     }
 
-@@ -381,7 +_,7 @@
+@@ -377,7 +_,7 @@
     }
 
     @OnlyIn(Dist.CLIENT)
@@ -27,7 +27,7 @@
         EMPTY(false),
         ITEM(false),
         BLOCK(false),
-@@ -397,10 +_,28 @@
+@@ -393,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
-@@ -449,6 +_,7 @@
-             builder.put(ModelLayers.createWallSignModelName(p_357774_), layerdefinition54);
-             builder.put(ModelLayers.createHangingSignModelName(p_357774_), layerdefinition55);
+@@ -464,6 +_,7 @@
+                 builder.put(ModelLayers.createHangingSignModelName(p_374591_, hangingsignrenderer$attachmenttype), 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
-@@ -301,15 +_,18 @@
+@@ -308,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_) {
-        return createLocation("hanging_sign/" + p_252225_.name(), "main");
+     public static ModelLayerLocation createHangingSignModelName(WoodType p_252225_, HangingSignRenderer.AttachmentType p_378070_) {
+-        return createLocation("hanging_sign/" + p_252225_.name() + "/" + p_378070_.getSerializedName(), "main");
 +        ResourceLocation location = ResourceLocation.parse(p_252225_.name());
-+        return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "hanging_sign/" + location.getPath()), "main");
+        return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "hanging_sign/" + location.getPath() + "/" + p_378070_.getSerializedName()), "main");
     }
 
     public static Stream<ModelLayerLocation> getKnownLocations() {
@@ -8,7 +8,7 @@
                 this.storage.drop(i, levelchunk);
             }
         }
-@@ -123,6 +_,7 @@
+@@ -124,6 +_,7 @@
             }
 
             this.level.onChunkLoaded(chunkpos);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientLevel.java
 +++ b/net/minecraft/client/multiplayer/ClientLevel.java
-@@ -118,6 +_,7 @@
+@@ -123,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();
-@@ -126,6 +_,8 @@
+@@ -131,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);
-@@ -192,6 +_,8 @@
+@@ -197,6 +_,8 @@
         this.serverSimulationDistance = p_364305_;
         this.updateSkyBrightness();
         this.prepareWeather();
@@ -26,7 +26,7 @@
     }
 
     public void queueLightUpdate(Runnable p_194172_) {
-@@ -274,6 +_,7 @@
+@@ -279,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();
 
-@@ -326,8 +_,10 @@
+@@ -330,8 +_,10 @@
     }
 
     public void addEntity(Entity p_104741_) {
@@ -45,7 +45,7 @@
     }
 
     public void removeEntity(int p_171643_, Entity.RemovalReason p_171644_) {
-@@ -498,6 +_,12 @@
+@@ -502,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_);
         }
-@@ -507,6 +_,12 @@
+@@ -511,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_));
         }
-@@ -943,6 +_,24 @@
+@@ -953,6 +_,24 @@
         return this.seaLevel;
     }
 
@@ -96,7 +96,7 @@
     @OnlyIn(Dist.CLIENT)
     public static class ClientLevelData implements WritableLevelData {
         private final boolean hardcore;
-@@ -1031,6 +_,7 @@
+@@ -1041,6 +_,7 @@
         }
 
         public void setDifficulty(Difficulty p_104852_) {
@@ -104,9 +104,9 @@
             this.difficulty = p_104852_;
         }
 
-@@ -1067,11 +_,26 @@
-             if (p_171712_ instanceof AbstractClientPlayer) {
-                 ClientLevel.this.players.add((AbstractClientPlayer)p_171712_);
+@@ -1084,6 +_,12 @@
+                     break;
+                 default:
             }
 +
 +            if (p_171712_.isMultipartEntity()) {
@@ -117,8 +117,11 @@
         }
 
         public void onTrackingEnd(Entity p_171716_) {
-             p_171716_.unRide();
-             ClientLevel.this.players.remove(p_171716_);
+@@ -1097,6 +_,15 @@
+                     ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities()));
+                     break;
+                 default:
+            }
 +
 +            p_171716_.onRemovedFromWorld();
 +            net.minecraftforge.event.ForgeEventFactory.onEntityLeaveLevel(p_171716_, ClientLevel.this);
@@ -127,7 +130,6 @@
 +               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
-@@ -451,6 +_,7 @@
+@@ -452,6 +_,7 @@
 
         this.minecraft.debugRenderer.clear();
         this.minecraft.player.resetPos();
@@ -57,7 +57,7 @@
     }
 
     @Override
-@@ -2516,6 +_,8 @@
+@@ -2530,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();
-@@ -2524,6 +_,7 @@
+@@ -2538,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
-@@ -106,6 +_,7 @@
+@@ -107,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 {
-@@ -120,9 +_,8 @@
+@@ -121,9 +_,8 @@
                 } else if (blockstate.isAir()) {
                     return false;
                 } else {
@@ -19,7 +19,7 @@
                     if (flag) {
                         block.destroy(level, p_105268_, blockstate);
                     }
-@@ -143,6 +_,7 @@
+@@ -144,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_);
                 });
-@@ -152,15 +_,18 @@
+@@ -153,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 {
-@@ -171,6 +_,7 @@
+@@ -172,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_);
                 });
-@@ -203,6 +_,7 @@
+@@ -204,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_);
             });
-@@ -215,7 +_,7 @@
+@@ -216,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(
-@@ -232,6 +_,7 @@
+@@ -233,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_ -> {
-@@ -270,7 +_,7 @@
+@@ -271,7 +_,7 @@
 
     private boolean sameDestroyTarget(BlockPos p_105282_) {
         ItemStack itemstack = this.minecraft.player.getMainHandItem();
@@ -88,7 +88,7 @@
     }
 
     private void ensureHasSentCarriedItem() {
-@@ -298,12 +_,23 @@
+@@ -299,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;
-@@ -324,8 +_,10 @@
+@@ -325,8 +_,10 @@
                 }
             }
 
@@ -127,7 +127,7 @@
                 InteractionResult interactionresult2;
                 if (this.localPlayerMode.isCreative()) {
                     int i = itemstack.getCount();
-@@ -359,6 +_,11 @@
+@@ -360,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) {
-@@ -369,6 +_,9 @@
+@@ -370,6 +_,9 @@
 
                         if (itemstack1 != itemstack) {
                             p_233722_.setItemInHand(p_233723_, itemstack1);
@@ -149,7 +149,7 @@
                         }
 
                         mutableobject.setValue(interactionresult);
-@@ -400,6 +_,10 @@
+@@ -401,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_));
     }
 
-@@ -407,6 +_,10 @@
+@@ -408,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
-@@ -86,6 +_,7 @@
+@@ -88,6 +_,7 @@
     }
 
     protected void setGameMode(GameType p_105318_) {
@@ -1,11 +0,0 @@
--- 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
-@@ -243,6 +_,18 @@
+@@ -248,6 +_,18 @@
         return Optional.empty();
     }
 
@@ -1,8 +1,8 @@
 --- a/net/minecraft/client/particle/ParticleEngine.java
 +++ b/net/minecraft/client/particle/ParticleEngine.java
-@@ -77,11 +_,11 @@
-         ParticleRenderType.TERRAIN_SHEET, ParticleRenderType.PARTICLE_SHEET_OPAQUE, ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT, ParticleRenderType.CUSTOM
-     );
+@@ -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);
     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;
-@@ -214,10 +_,14 @@
+@@ -205,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_,
-@@ -234,10 +_,12 @@
+@@ -225,10 +_,12 @@
         );
     }
 
@@ -44,7 +44,7 @@
     }
 
     @Override
-@@ -357,7 +_,7 @@
+@@ -348,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,35 +53,61 @@
         return particleprovider == null
             ? null
             : particleprovider.createParticle(p_107396_, this.level, p_107397_, p_107398_, p_107399_, p_107400_, p_107401_, p_107402_);
-@@ -433,17 +_,26 @@
+@@ -424,28 +_,36 @@
         }
     }
 
-+
-+    /**@deprecated Forge: use {@link #render(LightTexture, Camera, float, net.minecraft.client.renderer.culling.Frustum)} with Frustum as additional parameter*/
+    /**@deprecated Forge: use {@link #render(Camera, float, net.minecraft.client.renderer.culling.Frustum)} with Frustum as additional parameter*/
 +    @Deprecated
-     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_) {
+-        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_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
-         p_107339_.turnOnLightLayer();
-         RenderSystem.enableDepthTest();
- 
-        for (ParticleRenderType particlerendertype : RENDER_ORDER) {
+    public void render(Camera p_107340_, float p_107341_, MultiBufferSource.BufferSource p_377798_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
 +        for (ParticleRenderType particlerendertype : this.particles.keySet()) { // Forge: allow custom IParticleRenderType's
-+            if (particlerendertype == ParticleRenderType.NO_RENDER) continue;
+            if (particlerendertype.renderType() == null) continue;
             Queue<Particle> queue = this.particles.get(particlerendertype);
             if (queue != null && !queue.isEmpty()) {
-                 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 @@
+-                renderParticleType(p_107340_, p_107341_, p_377798_, particlerendertype, queue);
+                renderParticleType(p_107340_, p_107341_, p_377798_, particlerendertype, queue, frustum);
+             }
+         }
+ 
+         Queue<Particle> queue1 = this.particles.get(ParticleRenderType.CUSTOM);
+         if (queue1 != null && !queue1.isEmpty()) {
+-            renderCustomParticles(p_107340_, p_107341_, p_377798_, queue1);
+            renderCustomParticles(p_107340_, p_107341_, p_377798_, queue1, frustum);
+         }
+ 
+         p_377798_.endBatch();
+     }
+ 
+     private static void renderParticleType(
+-        Camera p_376120_, float p_375470_, MultiBufferSource.BufferSource p_377543_, ParticleRenderType p_378369_, Queue<Particle> p_376283_
+        Camera p_376120_, float p_375470_, MultiBufferSource.BufferSource p_377543_, ParticleRenderType p_378369_, Queue<Particle> p_376283_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum
+     ) {
+         VertexConsumer vertexconsumer = p_377543_.getBuffer(Objects.requireNonNull(p_378369_.renderType()));
+ 
+         for (Particle particle : p_376283_) {
+            if (frustum != null && particle.shouldCull() && !frustum.isVisible(particle.getBoundingBox())) continue;
+             try {
+                 particle.render(vertexconsumer, p_376120_, p_375470_);
+             } catch (Throwable throwable) {
+@@ -458,10 +_,11 @@
+         }
+     }
+ 
+-    private static void renderCustomParticles(Camera p_377913_, float p_376893_, MultiBufferSource.BufferSource p_376978_, Queue<Particle> p_375784_) {
+    private static void renderCustomParticles(Camera p_377913_, float p_376893_, MultiBufferSource.BufferSource p_376978_, Queue<Particle> p_375784_, @Nullable net.minecraft.client.renderer.culling.Frustum frustum) {
+         PoseStack posestack = new PoseStack();
+ 
+         for (Particle particle : p_375784_) {
+            if (frustum != null && particle.shouldCull() && !frustum.isVisible(particle.getBoundingBox())) continue;
+             try {
+                 particle.renderCustom(posestack, p_376978_, p_377913_, p_376893_);
+             } catch (Throwable throwable) {
+@@ -481,7 +_,7 @@
     }
 
     public void destroy(BlockPos p_107356_, BlockState p_107357_) {
@@ -90,7 +116,7 @@
             VoxelShape voxelshape = p_107357_.getShape(this.level, p_107356_);
             double d0 = 0.25;
             voxelshape.forAllBoxes(
-@@ -508,6 +_,7 @@
+@@ -514,6 +_,7 @@
                                         p_107357_,
                                         p_107356_
                                     )
@@ -98,7 +124,7 @@
                                 );
                             }
                         }
-@@ -517,6 +_,13 @@
+@@ -523,6 +_,13 @@
         }
     }
 
@@ -112,7 +138,7 @@
     public void crack(BlockPos p_107368_, Direction p_107369_) {
         BlockState blockstate = this.level.getBlockState(p_107368_);
         if (blockstate.getRenderShape() != RenderShape.INVISIBLE && blockstate.shouldSpawnTerrainParticles()) {
-@@ -552,7 +_,7 @@
+@@ -558,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
-@@ -303,6 +_,7 @@
+@@ -308,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();
-@@ -488,7 +_,11 @@
+@@ -493,7 +_,11 @@
 
     @Override
     public void playSound(SoundEvent p_108651_, float p_108652_, float p_108653_) {
@@ -21,43 +21,43 @@
     }
 
     @Override
-@@ -682,6 +_,7 @@
+@@ -686,6 +_,7 @@
+             && this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.CROUCHING)
             && (this.isShiftKeyDown() || !this.isSleeping() && !this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.STANDING));
-         float f = (float)this.getAttributeValue(Attributes.SNEAKING_SPEED);
-         this.input.tick(this.isMovingSlowly(), f);
+         this.input.tick();
 +        net.minecraftforge.client.ForgeHooksClient.onMovementInputUpdate(this, this.input);
         this.minecraft.getTutorial().onInput(this.input);
-         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.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.sprintTriggerTime <= 0 && !this.minecraft.options.keySprint.isDown()) {
                 this.sprintTriggerTime = 7;
             } else {
-@@ -718,15 +_,15 @@
+@@ -732,15 +_,16 @@
             }
         }
 
-        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()) {
+-        if ((!this.isInWater() || this.isUnderWater()) && flag3 && this.minecraft.options.keySprint.isDown()) {
+        if ((!this.isInWaterOrSwimmable() || this.isUnderWater() || this.canStartSwimming()) && flag3 && this.minecraft.options.keySprint.isDown()) {
             this.setSprinting(true);
         }
 
         if (this.isSprinting()) {
-             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());
+             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());
             if (this.isSwimming()) {
-                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)))) {
+-                if (!this.onGround() && !this.input.keyPresses.shift() && flag6 || !this.isInWater()) {
+                if (!this.onGround() && !this.input.keyPresses.shift() && flag7 || !this.isInWaterOrSwimmable()) {
                     this.setSprinting(false);
                 }
-             } else if (flag8) {
-@@ -763,8 +_,9 @@
+             } else if (flag7) {
+@@ -777,8 +_,9 @@
         }
 
         this.wasFallFlying = this.isFallFlying();
@@ -69,7 +69,7 @@
         }
 
         if (this.isEyeInFluid(FluidTags.WATER)) {
-@@ -870,6 +_,8 @@
+@@ -900,6 +_,8 @@
     @Override
     public void rideTick() {
         super.rideTick();
@@ -78,7 +78,7 @@
         this.handsBusy = false;
         if (this.getControlledVehicle() instanceof AbstractBoat abstractboat) {
             abstractboat.setInput(
-@@ -1146,6 +_,18 @@
+@@ -1177,6 +_,18 @@
     @Override
     public float getVisualRotationYInDegrees() {
         return this.getYRot();
@@ -34,7 +34,7 @@
         }
     }
 
-@@ -468,12 +_,12 @@
+@@ -470,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) {
-@@ -499,7 +_,7 @@
+@@ -501,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");
-@@ -655,6 +_,9 @@
+@@ -657,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_357825_ -> {
+     private static final Map<Block, RenderType> TYPE_BY_BLOCK = Util.make(Maps.newHashMap(), p_374604_ -> {
         RenderType rendertype = RenderType.tripwire();
-         p_357825_.put(Blocks.TRIPWIRE, rendertype);
-@@ -340,6 +_,7 @@
-         p_357825_.put(Blocks.BUBBLE_COLUMN, rendertype3);
-         p_357825_.put(Blocks.TINTED_GLASS, rendertype3);
+         p_374604_.put(Blocks.TRIPWIRE, rendertype);
+@@ -345,6 +_,7 @@
+         p_374604_.put(Blocks.BUBBLE_COLUMN, rendertype3);
+         p_374604_.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);
-@@ -347,6 +_,8 @@
+@@ -352,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) {
-@@ -357,6 +_,8 @@
+@@ -362,6 +_,8 @@
         }
     }
 
@@ -34,7 +34,7 @@
     public static RenderType getMovingBlockRenderType(BlockState p_109294_) {
         Block block = p_109294_.getBlock();
         if (block instanceof LeavesBlock) {
-@@ -371,6 +_,8 @@
+@@ -376,11 +_,14 @@
         }
     }
 
@@ -43,12 +43,17 @@
     public static RenderType getRenderType(BlockState p_364446_) {
         RenderType rendertype = getChunkRenderType(p_364446_);
         return rendertype == RenderType.translucent() ? Sheets.translucentItemSheet() : Sheets.cutoutBlockSheet();
-@@ -385,12 +_,82 @@
+     }
+ 
+    /* 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 @@
         }
     }
 
-+    /** @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
+    // 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()));
@@ -80,7 +85,7 @@
 +    });
 +
 +    /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
-+    @Deprecated(since = "1.21.4", forRemoval = true)
+    @Deprecated(forRemoval = true, since = "1.21.4")
 +    public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
 +       Block block = state.getBlock();
 +       if (block instanceof LeavesBlock) {
@@ -91,20 +96,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(since = "1.21.4", forRemoval = true)
+    @Deprecated(forRemoval = true, since = "1.21.4")
 +    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(since = "1.21.4", forRemoval = true)
+    @Deprecated(forRemoval = true, since = "1.21.4")
 +    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(since = "1.21.4", forRemoval = true)
+    @Deprecated(forRemoval = true, since = "1.21.4")
 +    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
-@@ -339,12 +_,14 @@
+@@ -343,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_);
         }
 
-@@ -410,7 +_,7 @@
+@@ -414,7 +_,7 @@
                 } else {
                     this.renderOneHandedMap(p_109379_, p_109380_, p_109381_, p_109378_, humanoidarm, p_109376_, p_109377_);
                 }
@@ -25,19 +25,20 @@
                 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()) {
-@@ -574,8 +_,16 @@
+                         case NONE:
+@@ -588,8 +_,18 @@
             this.offHandHeight = Mth.clamp(this.offHandHeight - 0.4F, 0.0F, 1.0F);
         } else {
             float f = localplayer.getAttackStrengthScale(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);
+-            float f1 = this.mainHandItem != itemstack ? 0.0F : f * f * f;
+-            float f2 = this.offHandItem != itemstack1 ? 0.0F : 1.0F;
+
 +            boolean requipM = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.mainHandItem, itemstack, localplayer.getInventory().selected);
 +            boolean requipO = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.offHandItem, itemstack1, -1);
 +
@@ -46,8 +47,9 @@
 +            if (!requipO && this.offHandItem != itemstack1)
 +               this.offHandItem = itemstack1;
 +
-+            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);
+            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);
         }
- 
-         if (this.mainHandHeight < 0.1F) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/LevelRenderer.java
 +++ b/net/minecraft/client/renderer/LevelRenderer.java
-@@ -111,7 +_,7 @@
+@@ -109,7 +_,7 @@
     private final SkyRenderer skyRenderer = new SkyRenderer();
     private final CloudRenderer cloudRenderer = new CloudRenderer();
     private final WorldBorderRenderer worldBorderRenderer = new WorldBorderRenderer();
@@ -9,16 +9,16 @@
     @Nullable
     private ClientLevel level;
     private final SectionOcclusionGraph sectionOcclusionGraph = new SectionOcclusionGraph();
-@@ -487,7 +_,7 @@
+@@ -482,7 +_,7 @@
             postchain1.addToFrame(framegraphbuilder, i, j, this.targets);
         }
 
-        this.addParticlesPass(framegraphbuilder, p_109604_, p_109606_, f, fogparameters);
-+        this.addParticlesPass(framegraphbuilder, p_109604_, p_109606_, f, fogparameters, frustum);
+-        this.addParticlesPass(framegraphbuilder, p_109604_, f, fogparameters);
+        this.addParticlesPass(framegraphbuilder, p_109604_, f, fogparameters, frustum);
         CloudStatus cloudstatus = this.minecraft.options.getCloudsType();
         if (cloudstatus != CloudStatus.OFF) {
             float f2 = this.level.effects().getCloudHeight();
-@@ -569,7 +_,11 @@
+@@ -564,7 +_,11 @@
             double d2 = vec3.z();
             p_369478_.push("terrain");
             this.renderSectionLayer(RenderType.solid(), d0, d1, d2, p_361439_, p_369924_);
@@ -30,7 +30,7 @@
             this.renderSectionLayer(RenderType.cutout(), d0, d1, d2, p_361439_, p_369924_);
             if (this.level.effects().constantAmbientLight()) {
                 Lighting.setupNetherLevel();
-@@ -603,7 +_,7 @@
+@@ -598,7 +_,7 @@
             multibuffersource$buffersource.endLastBatch();
             this.checkPoseStack(posestack);
             p_369478_.popPush("blockentities");
@@ -39,7 +39,7 @@
             multibuffersource$buffersource.endLastBatch();
             this.checkPoseStack(posestack);
             multibuffersource$buffersource.endBatch(RenderType.solid());
-@@ -617,8 +_,8 @@
+@@ -612,8 +_,8 @@
             multibuffersource$buffersource.endBatch(Sheets.hangingSignSheet());
             multibuffersource$buffersource.endBatch(Sheets.chestSheet());
             this.renderBuffers.outlineBufferSource().endOutlineBatch();
@@ -50,7 +50,7 @@
             }
 
             p_369478_.popPush("debug");
-@@ -648,8 +_,8 @@
+@@ -643,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_);
@@ -61,25 +61,25 @@
             }
 
             multibuffersource$buffersource.endBatch();
-@@ -657,7 +_,7 @@
+@@ -652,7 +_,7 @@
         });
     }
 
-    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) {
+-    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) {
         FramePass framepass = p_366471_.addPass("particles");
         if (this.targets.particles != null) {
             this.targets.particles = framepass.readsAndWrites(this.targets.particles);
-@@ -677,7 +_,7 @@
+@@ -671,7 +_,7 @@
+                 resourcehandle1.get().copyDepthFrom(resourcehandle.get());
             }
 
-             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();
+-            this.minecraft.particleEngine.render(p_363128_, p_365755_, this.renderBuffers.bufferSource());
+            this.minecraft.particleEngine.render(p_363128_, p_365755_, this.renderBuffers.bufferSource(), frustum);
         });
     }
-@@ -766,9 +_,9 @@
+ 
+@@ -759,9 +_,9 @@
                             || p_365712_.isDetached()
                             || p_365712_.getEntity() instanceof LivingEntity && ((LivingEntity)p_365712_.getEntity()).isSleeping()
                     )
@@ -91,7 +91,7 @@
                         flag = true;
                     }
                 }
-@@ -808,9 +_,10 @@
+@@ -801,9 +_,10 @@
         }
     }
 
@@ -104,7 +104,7 @@
         Vec3 vec3 = p_369847_.getPosition();
         double d0 = vec3.x();
         double d1 = vec3.y();
-@@ -820,6 +_,7 @@
+@@ -813,6 +_,7 @@
             List<BlockEntity> list = sectionrenderdispatcher$rendersection.getCompiled().getRenderableBlockEntities();
             if (!list.isEmpty()) {
                 for (BlockEntity blockentity : list) {
@@ -112,7 +112,7 @@
                     BlockPos blockpos = blockentity.getBlockPos();
                     MultiBufferSource multibuffersource = p_362022_;
                     p_366168_.pushPose();
-@@ -839,6 +_,9 @@
+@@ -832,6 +_,9 @@
                         }
                     }
 
@@ -122,7 +122,7 @@
                     this.blockEntityRenderDispatcher.render(blockentity, p_367074_, p_366168_, multibuffersource);
                     p_366168_.popPose();
                 }
-@@ -847,13 +_,18 @@
+@@ -840,13 +_,18 @@
 
         synchronized (this.globalBlockEntities) {
             for (BlockEntity blockentity1 : this.globalBlockEntities) {
@@ -141,7 +141,7 @@
     }
 
     private void renderBlockDestroyAnimation(PoseStack p_366956_, Camera p_369324_, MultiBufferSource.BufferSource p_365998_) {
-@@ -872,14 +_,14 @@
+@@ -865,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);
@@ -158,7 +158,7 @@
         if (this.minecraft.hitResult instanceof BlockHitResult blockhitresult) {
             if (blockhitresult.getType() != HitResult.Type.MISS) {
                 BlockPos blockpos = blockhitresult.getBlockPos();
-@@ -890,6 +_,9 @@
+@@ -883,6 +_,9 @@
                         return;
                     }
 
@@ -168,7 +168,7 @@
                     Vec3 vec3 = p_367935_.getPosition();
                     Boolean obool = this.minecraft.options.highContrastBlockOutline().get();
                     if (obool) {
-@@ -905,6 +_,8 @@
+@@ -898,6 +_,8 @@
                     p_367206_.endLastBatch();
                 }
             }
@@ -177,7 +177,7 @@
         }
     }
 
-@@ -1391,7 +_,7 @@
+@@ -1367,7 +_,7 @@
         } else {
             int i = p_109538_.getBrightness(LightLayer.SKY, p_109540_);
             int j = p_109538_.getBrightness(LightLayer.BLOCK, p_109540_);
@@ -186,7 +186,7 @@
             if (j < k) {
                 j = k;
             }
-@@ -1453,5 +_,21 @@
+@@ -1429,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
-@@ -800,11 +_,22 @@
+@@ -929,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;
-@@ -1025,7 +_,7 @@
+@@ -1154,7 +_,7 @@
     }
 
     public static RenderType text(ResourceLocation p_110498_) {
@@ -32,7 +32,7 @@
     }
 
     public static RenderType textBackground() {
-@@ -1033,19 +_,19 @@
+@@ -1162,19 +_,19 @@
     }
 
     public static RenderType textIntensity(ResourceLocation p_173238_) {
@@ -56,7 +56,7 @@
     }
 
     public static RenderType textBackgroundSeeThrough() {
-@@ -1053,7 +_,7 @@
+@@ -1182,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
-@@ -31,17 +_,24 @@
+@@ -27,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_);
+-                renderTex(p_110719_.getBlockRenderer().getBlockModelShaper().getParticleIcon(blockstate), p_110720_, p_378238_);
 +            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_);
+                    renderTex(p_110719_.getBlockRenderer().getBlockModelShaper().getTexture(overlay.getLeft(), p_110719_.level, overlay.getRight()), p_110720_, p_378238_);
 +                }
             }
         }
@@ -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_);
+                 renderWater(p_110719_, p_110720_, p_378238_);
 +            } else if (!player.getEyeInFluidType().isAir()) {
-+                net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(player.getEyeInFluidType()).renderOverlay(p_110719_, p_110720_);
+                net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(player.getEyeInFluidType()).renderOverlay(p_110719_, p_110720_, p_378238_);
             }
 
             if (p_110719_.player.isOnFire()) {
 +                if (!net.minecraftforge.client.ForgeHooksClient.renderFireOverlay(player, p_110720_))
-                 renderFire(p_110719_, p_110720_);
+                 renderFire(p_110720_, p_378238_);
             }
         }
-@@ -49,6 +_,12 @@
+@@ -45,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++) {
-@@ -58,7 +_,7 @@
+@@ -54,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,17 +49,23 @@
             }
         }
 
-@@ -88,8 +_,12 @@
+@@ -82,6 +_,10 @@
     }
 
-     private static void renderWater(Minecraft p_110726_, PoseStack p_110727_) {
-+        renderFluid(p_110726_, p_110727_, UNDERWATER_LOCATION);
+     private static void renderWater(Minecraft p_110726_, PoseStack p_110727_, MultiBufferSource p_376402_) {
+        renderFluid(p_110726_, p_110727_, p_376402_, UNDERWATER_LOCATION);
 +    }
 +
-+    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);
+    public static void renderFluid(Minecraft p_110726_, PoseStack p_110727_, MultiBufferSource p_376402_, ResourceLocation 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));
-         RenderSystem.enableBlend();
+         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);
@@ -1,20 +1,24 @@
 --- a/net/minecraft/client/renderer/Sheets.java
 +++ b/net/minecraft/client/renderer/Sheets.java
-@@ -140,11 +_,11 @@
+@@ -155,7 +_,7 @@
     }
 
     private static Material createSignMaterial(WoodType p_173386_) {
-        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/"));
+-        return createSignMaterial(ResourceLocation.withDefaultNamespace(p_173386_.name()));
+        return createSignMaterial(ResourceLocation.parse(p_173386_.name()));
+     }
+ 
+     public static Material createSignMaterial(ResourceLocation p_378064_) {
+@@ -163,7 +_,7 @@
     }
 
     private static Material createHangingSignMaterial(WoodType p_251735_) {
-        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/"));
+-        return createHangingSignMaterial(ResourceLocation.withDefaultNamespace(p_251735_.name()));
+        return createHangingSignMaterial(ResourceLocation.parse(p_251735_.name()));
     }
 
-     public static Material getSignMaterial(WoodType p_173382_) {
-@@ -203,6 +_,23 @@
+     public static Material createHangingSignMaterial(ResourceLocation p_377324_) {
+@@ -230,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.blockEntityRenderer = p_173400_;
+         this.specialBlockModelRenderer = p_378785_;
         this.blockColors = p_173401_;
 -        this.modelRenderer = new ModelBlockRenderer(this.blockColors);
 +        this.modelRenderer = new net.minecraftforge.client.model.lighting.ForgeModelBlockRenderer(this.blockColors);
@@ -67,34 +67,16 @@
 +    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) {
-             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_);
-             }
+             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_);
         }
-     }
@@ -1,82 +1,52 @@
 --- a/net/minecraft/client/renderer/block/model/BlockModel.java
 +++ b/net/minecraft/client/renderer/block/model/BlockModel.java
-@@ -72,9 +_,10 @@
-     public BlockModel parent;
+@@ -49,6 +_,7 @@
+     public UnbakedModel parent;
     @Nullable
-     protected ResourceLocation parentLocation;
+     private final 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);
-+        return GsonHelper.fromJson(net.minecraftforge.client.model.ExtendedBlockModelDeserializer.INSTANCE, p_111462_, BlockModel.class);
+         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);
+         }
     }
- 
-     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.isEmpty() && this.parent != null ? this.parent.getElements() : this.elements;
-     }
- 
-+    @Nullable
-+    public ResourceLocation getParentLocation() {
-+        return 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_);
 +
-     public boolean hasAmbientOcclusion() {
-         if (this.hasAmbientOcclusion != null) {
-             return this.hasAmbientOcclusion;
-@@ -130,12 +_,18 @@
-                 throw new IllegalStateException("BlockModel parent has to be a block model.");
+        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());
+     }
+ 
+     @Nullable
+     @VisibleForTesting
+     List<BlockElement> getElements() {
+        if (customData.hasCustomGeometry()) return java.util.Collections.emptyList();
+         return this.elements;
+     }
+ 
+@@ -147,7 +_,8 @@
             }
 
-+            if (customData.hasCustomGeometry()) {
-+                customData.getCustomGeometry().resolveDependencies(p_365651_, customData);
-+            }
-+
-             this.parent = blockmodel;
+             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_);
         }
-     }
 
-     @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;
-         }
-     }
- }
+         private TextureSlots.Data getTextureMap(JsonObject p_111510_) {
@@ -1,12 +1,11 @@
 --- a/net/minecraft/client/renderer/block/model/FaceBakery.java
 +++ b/net/minecraft/client/renderer/block/model/FaceBakery.java
-@@ -58,7 +_,14 @@
-             this.recalculateWinding(aint, direction);
+@@ -58,7 +_,13 @@
+             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);
@@ -1,11 +0,0 @@
--- 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,53 +1,23 @@
 --- a/net/minecraft/client/renderer/block/model/ItemTransforms.java
 +++ b/net/minecraft/client/renderer/block/model/ItemTransforms.java
-@@ -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(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;
-+    }
+@@ -19,8 +_,15 @@
+     ItemTransform head,
+     ItemTransform gui,
+     ItemTransform ground,
+-    ItemTransform fixed
+    ItemTransform fixed,
+    com.google.common.collect.ImmutableMap<ItemDisplayContext, ItemTransform> moddedTransforms
+ ) {
 +
 +    @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 @@
+    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 static final ItemTransforms NO_TRANSFORMS = new ItemTransforms(
+         ItemTransform.NO_TRANSFORM,
+         ItemTransform.NO_TRANSFORM,
+@@ -42,7 +_,7 @@
             case GUI -> this.gui;
             case GROUND -> this.ground;
             case FIXED -> this.fixed;
@@ -56,7 +26,7 @@
         };
     }
 
-@@ -104,8 +_,23 @@
+@@ -66,8 +_,22 @@
             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);
@@ -69,9 +39,8 @@
 +                     fallbackType = fallbackType.fallback();
 +                     transform = this.getTransform(p_111822_, jsonobject, fallbackType);
 +                  }
-+                  if (transform != ItemTransform.NO_TRANSFORM){
+                  if (transform != ItemTransform.NO_TRANSFORM)
 +                     builder.put(type, transform);
-+                  }
 +               }
 +            }
 +
@@ -1,11 +0,0 @@
--- 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,10 +1,21 @@
 --- a/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
 +++ b/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
-@@ -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();
+@@ -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_);
+         }
     }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
 +++ b/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
-@@ -243,12 +_,12 @@
+@@ -246,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());
-@@ -481,6 +_,10 @@
+@@ -484,6 +_,10 @@
         return this.itemInHandRenderer;
     }
 
@@ -26,7 +26,7 @@
     @Override
     public void onResourceManagerReload(ResourceManager p_174004_) {
         EntityRendererProvider.Context entityrendererprovider$context = new EntityRendererProvider.Context(
-@@ -488,5 +_,6 @@
+@@ -491,5 +_,6 @@
         );
         this.renderers = EntityRenderers.createEntityRenderers(entityrendererprovider$context);
         this.playerRenderers = EntityRenderers.createPlayerRenderers(entityrendererprovider$context);
@@ -12,7 +12,7 @@
         }
     }
 
-@@ -268,7 +_,7 @@
+@@ -272,7 +_,7 @@
         }
 
         p_367427_.distanceToCameraSq = this.entityRenderDispatcher.distanceToSqr(p_367571_);
@@ -1,11 +0,0 @@
--- 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
-@@ -40,7 +_,7 @@
+@@ -51,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
-@@ -98,6 +_,7 @@
- 
-             int j = mapid != null ? p_361692_.rotation % 4 * 2 : p_361692_.rotation;
+@@ -96,6 +_,7 @@
+         if (p_361692_.mapId != null) {
+             int j = p_361692_.rotation % 4 * 2;
             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_)) {
-             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);
+             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);
 +            }
-             }
-         }
- 
+         } 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,54 +1,11 @@
 --- a/net/minecraft/client/renderer/entity/ItemRenderer.java
 +++ b/net/minecraft/client/renderer/entity/ItemRenderer.java
-@@ -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 @@
+@@ -130,7 +_,7 @@
+                 f3 = 1.0F;
             }
 
-             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
-@@ -69,6 +_,7 @@
+@@ -73,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;
-@@ -104,6 +_,7 @@
+@@ -108,6 +_,7 @@
 
         p_115311_.popPose();
         super.render(p_364280_, p_115311_, p_115312_, p_115313_);
@@ -16,12 +16,11 @@
     }
 
     protected boolean shouldRenderLayers(S p_360804_) {
-@@ -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);
+@@ -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);
@@ -1,17 +1,17 @@
 --- a/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
 +++ b/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
-@@ -45,22 +_,23 @@
+@@ -44,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_.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_);
+-        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_);
     }
 
 -    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_);
-             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_);
+             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_);
         }
     }
 
-@@ -97,5 +_,12 @@
+@@ -96,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
-@@ -49,7 +_,7 @@
+@@ -57,7 +_,7 @@
     }
 
     @Nullable
@@ -1,26 +1,22 @@
 --- a/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
 +++ b/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
-@@ -128,6 +_,9 @@
+@@ -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_)) {
                 return HumanoidModel.ArmPose.CROSSBOW_HOLD;
             }
 
-+            if (p_362189_.pose != null)
-+                return p_362189_.pose;
+            var pose = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_376446_).getArmPose(p_376602_, p_361073_, p_376446_);
+            if (pose != null)
+                return pose;
 +
             return HumanoidModel.ArmPose.ITEM;
         }
     }
-@@ -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 @@
+@@ -255,10 +_,12 @@
     }
 
     public void renderRightHand(PoseStack p_117771_, MultiBufferSource p_117772_, int p_117773_, ResourceLocation p_364347_, boolean p_367689_) {
@@ -33,7 +29,7 @@
         this.renderHand(p_117814_, p_117815_, p_117816_, p_368419_, this.model.leftArm, p_362915_);
     }
 
-@@ -293,5 +_,12 @@
+@@ -297,5 +_,12 @@
         } else {
             super.setupRotations(p_369667_, p_117803_, p_117804_, p_117805_);
         }
@@ -1,11 +0,0 @@
--- 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;
@@ -0,0 +1,15 @@
+--- 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);
+     }
@@ -1,24 +0,0 @@
--- 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_);
-     }
- 
@@ -0,0 +1,21 @@
+--- 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) {
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/special/SpecialModelRenderers.java
+++ b/net/minecraft/client/renderer/special/SpecialModelRenderers.java
+@@ -180,6 +_,8 @@
+             map.put(Blocks.TRAPPED_CHEST, GIFT_CHEST);
+         }
+ 
+        net.minecraftforge.client.event.ForgeEventFactoryClient.onCreateSpecialBlockRenderers(map);
+
+         Builder<Block, SpecialModelRenderer<?>> builder = ImmutableMap.builder();
+         map.forEach((p_377014_, p_376072_) -> {
+             SpecialModelRenderer<?> specialmodelrenderer = p_376072_.bake(p_378538_);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/texture/AbstractTexture.java
 +++ b/net/minecraft/client/renderer/texture/AbstractTexture.java
-@@ -20,6 +_,8 @@
+@@ -53,6 +_,8 @@
         RenderSystem.assertOnRenderThreadOrInit();
         int i;
         int j;
@@ -9,7 +9,7 @@
         if (p_117961_) {
             i = p_117962_ ? 9987 : 9729;
             j = 9729;
-@@ -76,5 +_,18 @@
+@@ -110,5 +_,18 @@
 
     @Override
     public void close() {
@@ -19,25 +19,25 @@
         this.name = p_249787_;
         this.width = p_251031_.width();
         this.height = p_251031_.height();
-@@ -44,6 +_,7 @@
-         this.animatedTexture = this.createAnimatedTexture(p_251031_, p_252131_.getWidth(), p_252131_.getHeight(), animationmetadatasection);
+@@ -45,6 +_,7 @@
+             .orElse(null);
         this.originalImage = p_252131_;
         this.byMipLevel = new NativeImage[]{this.originalImage};
 +        this.forgeMeta = forgeMeta;
     }
 
     public void increaseMipLevel(int p_248864_) {
-@@ -120,6 +_,9 @@
+@@ -130,6 +_,9 @@
 
     void upload(int p_248895_, int p_250245_, int p_250458_, int p_251337_, NativeImage[] p_248825_) {
         for (int i = 0; i < this.byMipLevel.length; i++) {
 +            // Forge: Skip uploading if the texture would be made invalid by mip level
 +            if ((this.width >> i) <= 0 || (this.height >> i) <= 0)
 +               break;
-             p_248825_[i]
-                 .upload(
-                     i,
-@@ -150,6 +_,10 @@
+             p_248825_[i].upload(i, p_248895_ >> i, p_250245_ >> i, p_250458_ >> i, p_251337_ >> i, this.width >> i, this.height >> i, false);
+         }
+     }
+@@ -149,6 +_,10 @@
         return this.name;
     }
 
@@ -48,7 +48,7 @@
     public IntStream getUniqueFrames() {
         return this.animatedTexture != null ? this.animatedTexture.getUniqueFrames() : IntStream.of(1);
     }
-@@ -252,7 +_,8 @@
+@@ -244,7 +_,8 @@
             for (int i = 0; i < this.activeFrame.length; i++) {
                 int j = SpriteContents.this.width >> i;
                 int k = SpriteContents.this.height >> i;
@@ -58,7 +58,7 @@
             }
         }
 
-@@ -267,6 +_,9 @@
+@@ -259,6 +_,9 @@
                 for (int k = 0; k < this.activeFrame.length; k++) {
                     int l = SpriteContents.this.width >> k;
                     int i1 = SpriteContents.this.height >> k;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/texture/TextureAtlas.java
 +++ b/net/minecraft/client/renderer/texture/TextureAtlas.java
-@@ -87,6 +_,7 @@
+@@ -82,6 +_,7 @@
             this.sprites = List.copyOf(list);
             this.animatedTextures = List.copyOf(list1);
         }
@@ -8,10 +8,10 @@
     }
 
     @Override
-@@ -168,5 +_,10 @@
+@@ -159,5 +_,10 @@
 
-     public void updateFilter(SpriteLoader.Preparations p_251993_) {
-         this.setFilter(false, p_251993_.mipLevel() > 0);
+     int getHeight() {
+         return this.height;
 +    }
 +
 +    /** {@return the set of sprites in this atlas} */
@@ -1,11 +1,12 @@
 --- a/net/minecraft/client/renderer/texture/atlas/SpriteResourceLoader.java
 +++ b/net/minecraft/client/renderer/texture/atlas/SpriteResourceLoader.java
-@@ -45,6 +_,8 @@
-                 .orElse(AnimationMetadataSection.EMPTY);
-             FrameSize framesize = animationmetadatasection.calculateFrameSize(nativeimage.getWidth(), nativeimage.getHeight());
-             if (Mth.isMultipleOf(nativeimage.getWidth(), framesize.width()) && Mth.isMultipleOf(nativeimage.getHeight(), framesize.height())) {
-+                SpriteContents contents = net.minecraftforge.client.ForgeHooksClient.loadSpriteContents(p_296303_, p_296304_, framesize, nativeimage, resourcemetadata);
-+                if (contents != null) return contents;
-                 return new SpriteContents(p_296303_, framesize, nativeimage, resourcemetadata);
-             } else {
-                 LOGGER.error(
+@@ -62,6 +_,9 @@
+                 framesize = new FrameSize(nativeimage.getWidth(), nativeimage.getHeight());
+             }
+ 
+            SpriteContents contents = net.minecraftforge.client.ForgeHooksClient.loadSpriteContents(p_374679_, p_374680_, framesize, nativeimage, resourcemetadata);
+            if (contents != null) return contents;
+
+             return new SpriteContents(p_374679_, framesize, nativeimage, resourcemetadata);
+         };
+     }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/resources/model/BakedModel.java
 +++ b/net/minecraft/client/resources/model/BakedModel.java
-@@ -13,7 +_,9 @@
+@@ -12,7 +_,9 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
@@ -11,9 +11,9 @@
     List<BakedQuad> getQuads(@Nullable BlockState p_235039_, @Nullable Direction p_235040_, RandomSource p_235041_);
 
     boolean useAmbientOcclusion();
-@@ -24,9 +_,13 @@
+@@ -21,7 +_,11 @@
 
-     boolean isCustomRenderer();
+     boolean usesBlockLight();
 
 +    /**@deprecated Forge: Use {@link net.minecraftforge.client.extensions.IForgeBakedModel#getParticleIcon(net.minecraftforge.client.model.data.ModelData)}*/
 +    @Deprecated
@@ -23,6 +23,4 @@
 +    /**@deprecated Forge: Use {@link net.minecraftforge.client.extensions.IForgeBakedModel#applyTransform(ItemTransforms.TransformType, com.mojang.blaze3d.vertex.PoseStack, boolean)} instead */
 +    @Deprecated
 +    default ItemTransforms getTransforms() { return ItemTransforms.NO_TRANSFORMS; }
- 
-     default BakedOverrides overrides() {
-         return BakedOverrides.EMPTY;
+ }
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/resources/model/BlockStateModelLoader.java
+++ b/net/minecraft/client/resources/model/BlockStateModelLoader.java
+@@ -52,6 +_,8 @@
+ 
+     private static Function<ResourceLocation, StateDefinition<Block, BlockState>> definitionLocationToBlockMapper() {
+         Map<ResourceLocation, StateDefinition<Block, BlockState>> map = new HashMap<>(STATIC_DEFINITIONS);
+        var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onRegisterModeStateDefinitions();
+        map.putAll(event.getStates());
+ 
+         for (Block block : BuiltInRegistries.BLOCK) {
+             map.put(block.builtInRegistryHolder().key().location(), block.getStateDefinition());
@@ -1,14 +1,19 @@
 --- a/net/minecraft/client/resources/model/ModelBaker.java
 +++ b/net/minecraft/client/resources/model/ModelBaker.java
-@@ -5,6 +_,10 @@
- import net.minecraftforge.api.distmarker.OnlyIn;
+@@ -13,4 +_,16 @@
 
- @OnlyIn(Dist.CLIENT)
-public interface ModelBaker {
-+public interface ModelBaker extends net.minecraftforge.client.extensions.IForgeModelBaker {
-+    /**
-+     * @deprecated Forge: Use {@link #bake(ResourceLocation, ModelState, java.util.function.Function)} instead.
-+     */
-+    @Deprecated
-     BakedModel bake(ResourceLocation p_250776_, ModelState p_251280_);
+     @VisibleForDebug
+     ModelDebugName rootName();
+
+    /** Forge: Return the render type to use when baking this model, its a dirty hack to pass down this value to parents */
+    @org.jetbrains.annotations.Nullable
+    default net.minecraftforge.client.RenderTypeGroup renderType() {
+        return null;
+    }
+
+    /** Forge: Return the fast graphics render type to use when baking this model, its a dirty hack to pass down this value to parents */
+    @org.jetbrains.annotations.Nullable
+    default net.minecraftforge.client.RenderTypeGroup renderTypeFast() {
+        return null;
+    }
 }
@@ -1,45 +0,0 @@
--- a/net/minecraft/client/resources/model/ModelBakery.java
-+++ b/net/minecraft/client/resources/model/ModelBakery.java
-@@ -94,25 +_,39 @@
-         }
- 
-         @Override
-+        public Function<Material, TextureAtlasSprite> getModelTextureGetter() {
-+            return this.modelTextureGetter;
-+        }
-+
-+        @Override
-         public BakedModel bake(ResourceLocation p_252176_, ModelState p_249765_) {
-+            return bake(p_252176_, p_249765_, this.modelTextureGetter);
-+        }
-+
-+        @Override
-+        public BakedModel bake(ResourceLocation p_252176_, ModelState p_249765_, Function<Material, TextureAtlasSprite> sprites) {
-             ModelBakery.BakedCacheKey modelbakery$bakedcachekey = new ModelBakery.BakedCacheKey(p_252176_, p_249765_.getRotation(), p_249765_.isUvLocked());
-             BakedModel bakedmodel = ModelBakery.this.bakedCache.get(modelbakery$bakedcachekey);
-             if (bakedmodel != null) {
-                 return bakedmodel;
-             } else {
-                 UnbakedModel unbakedmodel = this.getModel(p_252176_);
-                BakedModel bakedmodel1 = this.bakeUncached(unbakedmodel, p_249765_);
-+                BakedModel bakedmodel1 = this.bakeUncached(unbakedmodel, p_249765_, sprites);
-                 ModelBakery.this.bakedCache.put(modelbakery$bakedcachekey, bakedmodel1);
-                 return bakedmodel1;
-             }
-         }
- 
-         BakedModel bakeUncached(UnbakedModel p_343761_, ModelState p_342939_) {
-+            return bakeUncached(p_343761_, p_342939_, this.modelTextureGetter);
-+        }
-+
-+        BakedModel bakeUncached(UnbakedModel p_343761_, ModelState p_342939_, Function<Material, TextureAtlasSprite> sprites) {
-             if (p_343761_ instanceof BlockModel blockmodel && blockmodel.getRootModel() == SpecialModels.GENERATED_MARKER) {
-                return ModelBakery.ITEM_MODEL_GENERATOR.generateBlockModel(this.modelTextureGetter, blockmodel).bake(this.modelTextureGetter, p_342939_, false);
-+                return ModelBakery.ITEM_MODEL_GENERATOR.generateBlockModel(sprites, blockmodel).bake(sprites, p_342939_, false);
-             }
- 
-            return p_343761_.bake(this, this.modelTextureGetter, p_342939_);
-+            return p_343761_.bake(this, sprites, p_342939_);
-         }
-     }
- 
@@ -1,12 +0,0 @@
--- a/net/minecraft/client/resources/model/ModelDiscovery.java
-+++ b/net/minecraft/client/resources/model/ModelDiscovery.java
-@@ -37,7 +_,8 @@
-     private static Set<ModelResourceLocation> listMandatoryModels() {
-         Set<ModelResourceLocation> set = new HashSet<>();
-         BuiltInRegistries.ITEM.listElements().forEach(p_368638_ -> {
-            ResourceLocation resourcelocation = p_368638_.value().components().get(DataComponents.ITEM_MODEL);
-+            // Forge: Force use vanilla components without gathering mod components in the event
-+            ResourceLocation resourcelocation = p_368638_.value().vanillaComponents().get(DataComponents.ITEM_MODEL);
-             if (resourcelocation != null) {
-                 set.add(ModelResourceLocation.inventory(resourcelocation));
-             }
@@ -1,48 +1,87 @@
 --- a/net/minecraft/client/resources/model/ModelManager.java
 +++ b/net/minecraft/client/resources/model/ModelManager.java
-@@ -71,13 +_,14 @@
-         TextureAtlas.LOCATION_BLOCKS,
+@@ -72,7 +_,9 @@
         ResourceLocation.withDefaultNamespace("blocks")
     );
-    private Map<ModelResourceLocation, BakedModel> bakedRegistry;
-+    private Map<ModelResourceLocation, BakedModel> bakedRegistry = new java.util.HashMap<>();
+     private Map<ModelResourceLocation, BakedModel> bakedBlockStateModels = Map.of();
+    private Map<ModelResourceLocation, BakedModel> bakedBlockStateModelsView = Map.of();
+     private Map<ResourceLocation, ItemModel> bakedItemStackModels = Map.of();
+    private Map<ResourceLocation, ItemModel> bakedItemStackModelsView = Map.of();
+     private Map<ResourceLocation, ClientItem.Properties> itemProperties = Map.of();
     private final AtlasSet atlases;
     private final BlockModelShaper blockModelShaper;
-     private final BlockColors blockColors;
-     private int maxMipmapLevels;
+@@ -83,6 +_,7 @@
     private BakedModel missingModel;
-     private Object2IntMap<BlockState> modelGroups;
+     private ItemModel missingItemModel;
+     private Object2IntMap<BlockState> modelGroups = Object2IntMaps.emptyMap();
 +    private ModelBakery modelBakery;
 
     public ModelManager(TextureManager p_119406_, BlockColors p_119407_, int p_119408_) {
         this.blockColors = p_119407_;
-@@ -102,6 +_,7 @@
+@@ -95,6 +_,10 @@
+         return this.bakedBlockStateModels.getOrDefault(p_119423_, this.missingModel);
+     }
+ 
+    public Map<ModelResourceLocation, BakedModel> getModels() {
+        return this.bakedBlockStateModelsView;
+    }
+
+     public BakedModel getMissingModel() {
+         return this.missingModel;
+     }
+@@ -103,6 +_,10 @@
+         return this.bakedItemStackModels.getOrDefault(p_376816_, this.missingItemModel);
+     }
+ 
+    public Map<ResourceLocation, ItemModel> getItemModels() {
+        return this.bakedItemStackModelsView;
+    }
+
+     public ClientItem.Properties getItemProperties(ResourceLocation p_378319_) {
+         return this.itemProperties.getOrDefault(p_378319_, ClientItem.Properties.DEFAULT);
+     }
+@@ -115,6 +_,7 @@
     public final CompletableFuture<Void> reload(
         PreparableReloadListener.PreparationBarrier p_249079_, ResourceManager p_251134_, Executor p_250550_, Executor p_249221_
     ) {
 +        net.minecraftforge.client.model.geometry.GeometryLoaderManager.init();
         UnbakedModel unbakedmodel = MissingBlockModel.missingModel();
-         BlockStateModelLoader blockstatemodelloader = new BlockStateModelLoader(unbakedmodel);
-         CompletableFuture<Map<ResourceLocation, UnbakedModel>> completablefuture = loadBlockModels(p_251134_, p_250550_);
-@@ -253,6 +_,8 @@
-                             .collect(Collectors.joining("\n"))
+         CompletableFuture<EntityModelSet> completablefuture = CompletableFuture.supplyAsync(EntityModelSet::vanilla, p_250550_);
+         CompletableFuture<SpecialBlockModelRenderer> completablefuture1 = completablefuture.thenApplyAsync(SpecialBlockModelRenderer::vanilla, p_250550_);
+@@ -260,13 +_,15 @@
+                         p_374740_.stream().sorted().map(p_374742_ -> "    " + p_374742_).collect(Collectors.joining("\n"))
                     )
             );
 +        p_252136_.popPush("forge_modify_baking_result");
-+        net.minecraftforge.client.ForgeHooksClient.onModifyBakingResult(p_248945_.getBakedTopLevelModels(), p_248945_);
+        net.minecraftforge.client.ForgeHooksClient.onModifyBakingResult(p_248945_, modelbakery$bakingresult);
         p_252136_.popPush("dispatch");
-         Map<ModelResourceLocation, BakedModel> map = p_248945_.getBakedTopLevelModels();
-         BakedModel bakedmodel = map.get(MissingBlockModel.VARIANT);
-@@ -284,6 +_,8 @@
-         this.bakedRegistry = modelbakery.getBakedTopLevelModels();
+         Map<BlockState, BakedModel> map = createBlockStateToModelDispatch(modelbakery$bakingresult.blockStateModels(), modelbakery$bakingresult.missingModel());
+         CompletableFuture<Void> completablefuture = CompletableFuture.allOf(
+             p_250646_.values().stream().map(AtlasSet.StitchResult::readyForUpload).toArray(CompletableFuture[]::new)
+         );
+         p_252136_.pop();
+-        return new ModelManager.ReloadState(modelbakery$bakingresult, p_361513_, map, p_250646_, p_378097_, p_377275_, completablefuture);
+        return new ModelManager.ReloadState(modelbakery$bakingresult, p_361513_, map, p_250646_, p_378097_, p_377275_, completablefuture, p_248945_);
+     }
+ 
+     private static Map<BlockState, BakedModel> createBlockStateToModelDispatch(Map<ModelResourceLocation, BakedModel> p_377857_, BakedModel p_378390_) {
+@@ -298,11 +_,15 @@
+         p_248996_.atlasPreparations.values().forEach(AtlasSet.StitchResult::upload);
+         ModelBakery.BakingResult modelbakery$bakingresult = p_248996_.bakedModels;
+         this.bakedBlockStateModels = modelbakery$bakingresult.blockStateModels();
+        this.bakedBlockStateModelsView = java.util.Collections.unmodifiableMap(this.bakedBlockStateModels);
+         this.bakedItemStackModels = modelbakery$bakingresult.itemStackModels();
+        this.bakedItemStackModelsView = java.util.Collections.unmodifiableMap(this.bakedItemStackModels);
+         this.itemProperties = modelbakery$bakingresult.itemProperties();
         this.modelGroups = p_248996_.modelGroups;
-         this.missingModel = p_248996_.missingModel;
-+        this.modelBakery = modelbakery;
-+        net.minecraftforge.client.ForgeHooksClient.onModelBake(this, this.bakedRegistry, modelbakery);
+         this.missingModel = modelbakery$bakingresult.missingModel();
+         this.missingItemModel = modelbakery$bakingresult.missingItemModel();
+        this.modelBakery = p_248996_.modelBakery();
+        net.minecraftforge.client.ForgeHooksClient.onModelBake(this, this.modelBakery);
         p_251960_.popPush("cache");
         this.blockModelShaper.replaceCache(p_248996_.modelCache);
-         p_251960_.pop();
-@@ -308,6 +_,7 @@
+         this.specialBlockModelRenderer = p_248996_.specialBlockModelRenderer;
+@@ -329,6 +_,7 @@
     }
 
     public TextureAtlas getAtlas(ResourceLocation p_119429_) {
@@ -50,14 +89,24 @@
         return this.atlases.getAtlas(p_119429_);
     }
 
-@@ -318,6 +_,10 @@
- 
-     public void updateMaxMipLevel(int p_119411_) {
+@@ -341,6 +_,10 @@
         this.maxMipmapLevels = p_119411_;
-+    }
-+
-+    public ModelBakery getModelBakery() {
-+        return com.google.common.base.Preconditions.checkNotNull(modelBakery, "Attempted to query model bakery before it has been initialized.");
     }
 
-     @OnlyIn(Dist.CLIENT)
+    public ModelBakery getModelBakery() {
+        return com.google.common.base.Preconditions.checkNotNull(modelBakery, "Attempted to query model bakery before it has been initialized.");
+    }
+
+     public Supplier<SpecialBlockModelRenderer> specialBlockModelRenderer() {
+         return () -> this.specialBlockModelRenderer;
+     }
+@@ -357,7 +_,8 @@
+         Map<ResourceLocation, AtlasSet.StitchResult> atlasPreparations,
+         EntityModelSet entityModelSet,
+         SpecialBlockModelRenderer specialBlockModelRenderer,
+-        CompletableFuture<Void> readyForUpload
+        CompletableFuture<Void> readyForUpload,
+        ModelBakery modelBakery
+     ) {
+     }
+ }
@@ -1,20 +1,14 @@
 --- a/net/minecraft/client/resources/model/SimpleBakedModel.java
 +++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
-@@ -25,7 +_,32 @@
-     protected final boolean usesBlockLight;
-     protected final TextureAtlasSprite particleIcon;
-     protected final ItemTransforms transforms;
+@@ -29,7 +_,26 @@
+     private final boolean usesBlockLight;
+     private final TextureAtlasSprite particleIcon;
+     private final ItemTransforms transforms;
 -
 +    /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +    protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
 +    /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
 +    protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypesFast;
-+    /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
-+    protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
-+    /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
-+    protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypesFast;
-+    /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FABULOUS fabulous graphics} */
-+    protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
 +    /** Forge: If this model's {@linkplain #blockRenderTypes block render types} are rendering cutout, to account for older leaves model JSONs */
 +    protected final boolean isRenderingCutout;
 +
@@ -34,7 +28,7 @@
     public SimpleBakedModel(
         List<BakedQuad> p_119489_,
         Map<Direction, List<BakedQuad>> p_119490_,
-@@ -33,7 +_,9 @@
+@@ -37,7 +_,9 @@
         boolean p_119492_,
         boolean p_119493_,
         TextureAtlasSprite p_119494_,
@@ -45,7 +39,7 @@
     ) {
         this.unculledFaces = p_119489_;
         this.culledFaces = p_119490_;
-@@ -42,6 +_,15 @@
+@@ -46,6 +_,20 @@
         this.usesBlockLight = p_119492_;
         this.particleIcon = p_119494_;
         this.transforms = p_119495_;
@@ -54,19 +48,48 @@
 +        boolean hasRenderTypesFast = renderTypesFast != null && !renderTypesFast.isEmpty();
 +        this.blockRenderTypes = hasRenderTypes ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
 +        this.blockRenderTypesFast = hasRenderTypesFast ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypesFast.block()) : null;
-+        this.itemRenderTypes = hasRenderTypes ? List.of(renderTypes.entity()) : null;
-+        this.itemRenderTypesFast = hasRenderTypesFast ? List.of(renderTypesFast.entity()) : null;
-+        this.fabulousItemRenderTypes = hasRenderTypes ? List.of(renderTypes.entityFabulous()) : null;
 +        this.isRenderingCutout = hasRenderTypes && (renderTypes.block() == net.minecraft.client.renderer.RenderType.cutout() || renderTypes.block() == net.minecraft.client.renderer.RenderType.cutoutMipped());
+    }
+
+    public static BakedModel bakeElements(List<BlockElement> p_377425_, TextureSlots p_378525_, SpriteGetter p_375793_, ModelState p_376680_, boolean p_375745_, boolean p_376866_, boolean p_376846_, ItemTransforms p_376883_) {
+        return bakeElements(p_377425_, p_378525_, p_375793_, p_376680_, p_375745_, p_376866_, p_376846_, p_376883_, null);
+    }
+
+    public static BakedModel bakeElements(List<BlockElement> p_377425_, TextureSlots p_378525_, SpriteGetter p_375793_, ModelState p_376680_, boolean p_375745_, boolean p_376866_, boolean p_376846_, ItemTransforms p_376883_, @Nullable net.minecraftforge.client.RenderTypeGroup renderType) {
+        return bakeElements(p_377425_, p_378525_, p_375793_, p_376680_, p_375745_, p_376866_, p_376846_, p_376883_, renderType, null);
     }
 
-     @Override
-@@ -79,6 +_,38 @@
+     public static BakedModel bakeElements(
+@@ -56,7 +_,9 @@
+         boolean p_375745_,
+         boolean p_376866_,
+         boolean p_376846_,
+-        ItemTransforms p_376883_
+        ItemTransforms p_376883_,
+        @Nullable net.minecraftforge.client.RenderTypeGroup renderType,
+        @Nullable net.minecraftforge.client.RenderTypeGroup renderTypeFast
+     ) {
+         TextureAtlasSprite textureatlassprite = findSprite(p_375793_, p_378525_, "particle");
+         SimpleBakedModel.Builder simplebakedmodel$builder = new SimpleBakedModel.Builder(p_375745_, p_376866_, p_376846_, p_376883_)
+@@ -77,6 +_,13 @@
+             }
+         }
+ 
+        if (renderType != null && !renderType.isEmpty()) {
+            if (renderTypeFast != null && !renderTypeFast.isEmpty())
+                simplebakedmodel$builder.renderTypes(renderType, renderTypeFast);
+            else
+                simplebakedmodel$builder.renderTypes(renderType);
+        }
+
+         return simplebakedmodel$builder.build();
+     }
+ 
+@@ -123,6 +_,19 @@
         return this.transforms;
     }
 
 +    private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID_BLOCK = net.minecraftforge.client.ChunkRenderTypeSet.of(net.minecraft.client.renderer.RenderType.solid());
-+    private static final List<net.minecraft.client.renderer.RenderType> SOLID_BLOCK_ITEM = List.of(net.minecraft.client.renderer.RenderType.solid());
 +
 +    @Override
 +    public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(BlockState state, RandomSource rand, net.minecraftforge.client.model.data.ModelData data) {
@@ -78,29 +101,11 @@
 +        }
 +        return blockRenderTypes != null ? blockRenderTypes : BakedModel.super.getRenderTypes(state, rand, data);
 +    }
-+
-+    @Override
-+    public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
-+        if (!fabulous) {
-+            if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
-+                if (itemRenderTypesFast != null)
-+                    return itemRenderTypesFast;
-+                if (isRenderingCutout && itemStack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem && blockItem.getBlock() instanceof net.minecraft.world.level.block.LeavesBlock)
-+                    return SOLID_BLOCK_ITEM;
-+            }
-+            if (itemRenderTypes != null)
-+                return itemRenderTypes;
-+        } else {
-+            if (fabulousItemRenderTypes != null)
-+                return fabulousItemRenderTypes;
-+        }
-+        return BakedModel.super.getRenderTypes(itemStack, fabulous);
-+    }
 +
     @OnlyIn(Dist.CLIENT)
     public static class Builder {
         private final ImmutableList.Builder<BakedQuad> unculledFaces = ImmutableList.builder();
-@@ -124,13 +_,50 @@
+@@ -164,13 +_,50 @@
             return this;
         }
 
@@ -0,0 +1,12 @@
+--- a/net/minecraft/client/resources/model/SpriteGetter.java
+++ b/net/minecraft/client/resources/model/SpriteGetter.java
+@@ -9,4 +_,9 @@
+     TextureAtlasSprite get(Material p_376066_);
+ 
+     TextureAtlasSprite reportMissingReference(String p_377389_);
+
+    default TextureAtlasSprite maybeMissing(net.minecraft.client.renderer.block.model.TextureSlots textures, String name) {
+        var material = textures.getMaterial(name);
+        return material != null ? get(material) : reportMissingReference(name);
+    }
+ }
@@ -0,0 +1,24 @@
+--- a/net/minecraft/client/resources/model/UnbakedModel.java
+++ b/net/minecraft/client/resources/model/UnbakedModel.java
+@@ -13,6 +_,10 @@
+     boolean DEFAULT_AMBIENT_OCCLUSION = true;
+     UnbakedModel.GuiLight DEFAULT_GUI_LIGHT = UnbakedModel.GuiLight.SIDE;
+ 
+    default BakedModel bake(TextureSlots textures, ModelBaker baker, ModelState state) {
+        return bake(textures, baker, state, this.getAmbientOcclusion(), this.getGuiLight().lightLikeBlock(), this.getTransforms());
+    }
+
+     BakedModel bake(TextureSlots p_376037_, ModelBaker p_250133_, ModelState p_119536_, boolean p_378145_, boolean p_377763_, ItemTransforms p_375499_);
+ 
+     @Nullable
+@@ -135,6 +_,10 @@
+ 
+         public boolean lightLikeBlock() {
+             return this == SIDE;
+        }
+
+        public String getSerializedName() {
+            return name;
+         }
+     }
+ }
@@ -16,7 +16,7 @@
     }
 
     private synchronized void loadLibrary() {
-@@ -325,7 +_,8 @@
+@@ -334,7 +_,8 @@
 
     public void play(SoundInstance p_120313_) {
         if (this.loaded) {
@@ -26,7 +26,7 @@
                 WeighedSoundEvents weighedsoundevents = p_120313_.resolve(this.soundManager);
                 ResourceLocation resourcelocation = p_120313_.getLocation();
                 if (weighedsoundevents == null) {
-@@ -389,19 +_,22 @@
+@@ -398,19 +_,22 @@
                                             p_194488_.setSelfPosition(vec3);
                                             p_194488_.setRelative(flag);
                                         });
@@ -34,8 +34,8 @@
                                         if (!flag2) {
                                             this.soundBuffers
                                                 .getCompleteBuffer(sound.getPath())
-                                                 .thenAccept(p_194501_ -> channelaccess$channelhandle.execute(p_194495_ -> {
-                                                         p_194495_.attachStaticBuffer(p_194501_);
+                                                 .thenAccept(p_377326_ -> channelaccess$channelhandle.execute(p_194495_ -> {
+                                                         p_194495_.attachStaticBuffer(p_377326_);
                                                         p_194495_.play();
 +                                                    net.minecraftforge.client.event.ForgeEventFactoryClient.onPlaySoundSource(this, soundinstance, p_194495_);
                                                     }));
@@ -44,8 +44,8 @@
 -                                                .getStream(sound.getPath(), flag1)
 +                                            soundinstance
 +                                                .getStream(this.soundBuffers, sound, flag1)
-                                                 .thenAccept(p_194504_ -> channelaccess$channelhandle.execute(p_194498_ -> {
-                                                         p_194498_.attachBufferStream(p_194504_);
+                                                 .thenAccept(p_376862_ -> channelaccess$channelhandle.execute(p_194498_ -> {
+                                                         p_194498_.attachBufferStream(p_376862_);
                                                         p_194498_.play();
 +                                                        net.minecraftforge.client.event.ForgeEventFactoryClient.onPlayStreamingSource(this, soundinstance, p_194498_);
                                                     }));
@@ -1,41 +1,21 @@
 --- a/net/minecraft/data/Main.java
 +++ b/net/minecraft/data/Main.java
-@@ -86,8 +_,15 @@
-         OptionSpec<Void> optionspec6 = optionparser.accepts("all", "Include all generators");
-         OptionSpec<String> optionspec7 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
-         OptionSpec<String> optionspec8 = optionparser.accepts("input", "Input folder").withRequiredArg();
-+        OptionSpec<String> existing = optionparser.accepts("existing", "Existing resource packs that generated resources can reference").withRequiredArg();
-+        OptionSpec<String> existingMod = optionparser.accepts("existing-mod", "Existing mods that generated resources can reference the resource packs of").withRequiredArg();
-+        OptionSpec<java.io.File> gameDir = optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
-+        OptionSpec<String> mod = optionparser.accepts("mod", "A modid to dump").withRequiredArg().withValuesSeparatedBy(",");
-+        OptionSpec<Void> flat = optionparser.accepts("flat", "Do not append modid prefix to output directory when generating for multiple mods");
-+        OptionSpec<String> assetIndex = optionparser.accepts("assetIndex").withRequiredArg();
-+        OptionSpec<java.io.File> assetsDir = optionparser.accepts("assetsDir").withRequiredArg().ofType(java.io.File.class);
+@@ -77,14 +_,17 @@
+         OptionSpec<Void> optionspec4 = optionparser.accepts("all", "Include all generators");
+         OptionSpec<String> optionspec5 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
+         OptionSpec<String> optionspec6 = optionparser.accepts("input", "Input folder").withRequiredArg();
+        var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, false);
         OptionSet optionset = optionparser.parse(p_129669_);
 -        if (!optionset.has(optionspec) && optionset.hasOptions()) {
-+        if (!optionset.has(optionspec) && optionset.hasOptions() && !(optionset.specs().size() == 1 && optionset.has(gameDir))) {
-             Path path = Paths.get(optionspec7.value(optionset));
-             boolean flag = optionset.has(optionspec6);
-             boolean flag1 = flag || optionset.has(optionspec2);
-@@ -95,6 +_,13 @@
+        if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
+             Path path = Paths.get(optionspec5.value(optionset));
+             boolean flag = optionset.has(optionspec4);
+             boolean flag1 = flag || optionset.has(optionspec1);
+             boolean flag2 = flag || optionset.has(optionspec2);
             boolean flag3 = flag || optionset.has(optionspec3);
-             boolean flag4 = flag || optionset.has(optionspec4);
-             boolean flag5 = flag || optionset.has(optionspec5);
-+            Collection<Path> inputs = optionset.valuesOf(optionspec8).stream().map(Paths::get).collect(Collectors.toList());
-+            Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).collect(Collectors.toList());
-+            java.util.Set<String> existingMods = new java.util.HashSet<>(optionset.valuesOf(existingMod));
-+            java.util.Set<String> mods = new java.util.HashSet<>(optionset.valuesOf(mod));
-+            boolean isFlat = mods.isEmpty() || optionset.has(flat);
-+            net.minecraftforge.data.loading.DatagenModLoader.begin(mods, path, inputs, existingPacks, existingMods, flag2, flag1, flag3, flag4, flag5, isFlat, optionset.valueOf(assetIndex), optionset.valueOf(assetsDir));
-+            if (mods.contains("minecraft") || mods.isEmpty()) {
-             DataGenerator datagenerator = createStandardGenerator(
-                 path,
-                 optionset.valuesOf(optionspec8).stream().map(p_129659_ -> Paths.get(p_129659_)).collect(Collectors.toList()),
-@@ -107,6 +_,7 @@
-                 true
-             );
+             Collection<Path> collection = optionset.valuesOf(optionspec6).stream().map(p_129659_ -> Paths.get(p_129659_)).toList();
+            if (!loader.run(optionset, path, collection, flag1, flag, flag2, flag3, false))
+                return;
+             DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
+             addServerProviders(datagenerator, collection, flag1, flag2, flag3);
             datagenerator.run();
-+            }
-         } else {
-             optionparser.printHelpOn(System.out);
-         }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/data/loot/BlockLootSubProvider.java
 +++ b/net/minecraft/data/loot/BlockLootSubProvider.java
-@@ -668,12 +_,16 @@
+@@ -690,12 +_,16 @@
 
     protected abstract void generate();
 
@@ -9,7 +9,7 @@
 
     private static <E> Codec<List<Holder<E>>> homogenousList(Codec<Holder<E>> p_206668_, boolean p_206669_) {
         Codec<List<Holder<E>>> codec = p_206668_.listOf().validate(ExtraCodecs.ensureHomogenous(Holder::kind));
-@@ -42,6 +_,10 @@
+@@ -36,6 +_,10 @@
         this.elementCodec = p_206661_;
         this.homogenousListCodec = homogenousList(p_206661_, p_206662_);
         this.registryAwareCodec = Codec.either(TagKey.hashedCodec(p_206660_), this.homogenousListCodec);
@@ -20,7 +20,7 @@
     }
 
     @Override
-@@ -50,14 +_,17 @@
+@@ -44,14 +_,17 @@
             Optional<HolderGetter<E>> optional = registryops.getter(this.registryKey);
             if (optional.isPresent()) {
                 HolderGetter<E> holdergetter = optional.get();
@@ -39,7 +39,7 @@
                                 );
                             return dataresult.map(p_326149_ -> Pair.of((HolderSet<E>)p_326149_, (T)p_326147_.getSecond()));
                         }
-@@ -90,7 +_,7 @@
+@@ -84,7 +_,7 @@
     }
 
     private <T> DataResult<Pair<HolderSet<E>, T>> decodeWithoutRegistry(DynamicOps<T> p_206671_, T p_206672_) {
@@ -48,7 +48,7 @@
             List<Holder.Direct<E>> list = new ArrayList<>();
 
             for (Holder<E> holder : p_206666_.getFirst()) {
-@@ -106,6 +_,9 @@
+@@ -100,6 +_,9 @@
     }
 
     private <T> DataResult<T> encodeWithoutRegistry(HolderSet<E> p_206690_, DynamicOps<T> p_206691_, T p_206692_) {
@@ -63,15 +63,15 @@
             E e = dataresult.getOrThrow();
             p_330991_.register(p_332850_, e, p_332222_);
         }
-@@ -267,6 +_,7 @@
-         String s = Registries.elementsDirPath(p_331358_.key());
-         FileToIdConverter filetoidconverter = FileToIdConverter.json(s);
+@@ -266,6 +_,7 @@
+     ) {
+         FileToIdConverter filetoidconverter = FileToIdConverter.registry(p_331358_.key());
         RegistryOps<JsonElement> registryops = RegistryOps.create(JsonOps.INSTANCE, p_333035_);
 +        Decoder<Optional<E>> conditional = net.minecraftforge.common.crafting.conditions.ConditionCodec.wrap(p_329404_);
 
         for (Entry<ResourceLocation, Resource> entry : filetoidconverter.listMatchingResources(p_335634_).entrySet()) {
             ResourceLocation resourcelocation = entry.getKey();
-@@ -275,7 +_,7 @@
+@@ -274,7 +_,7 @@
             RegistrationInfo registrationinfo = REGISTRATION_INFO_CACHE.apply(resource.knownPackInfo());
 
             try {
@@ -80,18 +80,17 @@
             } catch (Exception exception) {
                 p_335074_.put(
                     resourcekey,
-@@ -298,7 +_,9 @@
+@@ -297,7 +_,8 @@
         RegistryDataLoader.NetworkedRegistryData registrydataloader$networkedregistrydata = p_331925_.get(p_332518_.key());
         if (registrydataloader$networkedregistrydata != null) {
             RegistryOps<Tag> registryops = RegistryOps.create(NbtOps.INSTANCE, p_329253_);
 -            RegistryOps<JsonElement> registryops1 = RegistryOps.create(JsonOps.INSTANCE, p_329253_);
-+            RegistryOps<JsonElement> registryops1 = RegistryOps.create(JsonOps.INSTANCE, p_329253_)
-+                .withContext(net.minecraftforge.common.crafting.conditions.ICondition.IContext.KEY, net.minecraftforge.common.crafting.conditions.ICondition.IContext.TAGS_INVALID);
+            RegistryOps<JsonElement> registryops1 = net.minecraftforge.common.crafting.conditions.ICondition.IContext.TAGS_INVALID.wrap(RegistryOps.create(JsonOps.INSTANCE, p_329253_));
 +            Decoder<Optional<E>> conditional = net.minecraftforge.common.crafting.conditions.ConditionCodec.wrap(p_328898_);
-             String s = Registries.elementsDirPath(p_332518_.key());
-             FileToIdConverter filetoidconverter = FileToIdConverter.json(s);
+             FileToIdConverter filetoidconverter = FileToIdConverter.registry(p_332518_.key());
 
-@@ -321,7 +_,7 @@
+             for (RegistrySynchronization.PackedRegistryEntry registrysynchronization$packedregistryentry : registrydataloader$networkedregistrydata.elements) {
+@@ -319,7 +_,7 @@
 
                     try {
                         Resource resource = p_332010_.getResourceOrThrow(resourcelocation);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/Bootstrap.java
 +++ b/net/minecraft/server/Bootstrap.java
-@@ -53,6 +_,8 @@
+@@ -57,6 +_,8 @@
                     CauldronInteraction.bootStrap();
                     BuiltInRegistries.bootStrap();
                     CreativeModeTabs.validate();
@@ -9,7 +9,7 @@
                     wrapStreams();
                     bootstrapDuration.set(Duration.between(instant, Instant.now()).toMillis());
                 }
-@@ -119,7 +_,6 @@
+@@ -123,7 +_,6 @@
             Commands.validate();
         }
Author	SHA1	Message	Date
Jonathing	6ae39c8597	1.21.4 RB 1 https://forums.minecraftforge.net/topic/154394-forge-541-minecraft-1214/	2025-02-12 12:29:03 -08:00
Jonathing	dcafb4f633	Fix corrupted and invalidly symlinked worlds crashing on level select (#10406 )	2025-02-12 11:52:53 -08:00
Jonathing	1ea7ce9831	Add fast graphics render type to block model jsons (#10394 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-12 11:47:09 -08:00
Jonathing	674f2efd54	Add updated tag context to AddReloadListenerEvent (#10412 ) Fixes using custom tags in GlobalLootModifiers.	2025-02-12 11:02:22 -08:00
Jonathing	02e82c672d	Give ItemStack context to IForgeItem.getCapabilityProvider (#10404 )	2025-02-05 09:15:37 -08:00
RealMangoRage	b25f6e3a7c	Re-introduce ItemStack Capabilities (#10324 )	2025-02-03 18:44:44 -08:00
LexManos	e69b07a54a	Fix redstone updates for comparators going up/down incorrectly. Related: #9973	2025-02-03 18:32:53 -08:00
Jonathing	79efe2ac36	Fix forced chunks never being ticked by the server (#10325 )	2025-02-03 13:47:36 -08:00
LexManos	464483db5b	Fix redstone update order not matching vanilla. (#10392 )	2025-02-03 13:36:45 -08:00
LexManos	f49adb285f	Fix game test structure rotations being inconsistant (#10391 )	2025-02-03 13:31:20 -08:00
Jonathing	55862dfd1d	Re-introduce IForgeItem.damageItem when an item takes damage, Fixes #10344 (#10371 )	2025-02-03 13:17:38 -08:00
Jonathing	124b9bd8d3	Gate client test mods behind clientSideOnly (#10390 )	2025-02-03 13:17:01 -08:00
Jonathing	bae3915728	Fix issue with superclass event listeners by updating EventBus (#10384 )	2025-02-03 11:13:33 -08:00
Jonathing	b3c2c62c7e	Bump dependencies, most notably EventBus (#10370 ) - CoreMods 5.2.4 -> 5.2.6 - EventBus 6.2.15 -> 6.2.26 - Reduced memory usage - Further performance improvements - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC - Apache MavenArtifact 3.8.5 -> 3.8.8 - NightConfig 3.7.3 -> 3.7.4	2025-01-28 21:00:16 +00:00
Jonathing	68698d70c1	Fix shield disabling being completely ignored (#10316 )	2025-01-27 15:24:30 -08:00
Jonathing	d55dee9394	Update Gradle to 8.12.1	2025-01-27 09:17:02 -08:00
Jonathing	2d114f2719	Fix JOpt Simple by updating ModLauncher (#10347 )	2025-01-27 09:16:24 -08:00
JonathingandLexManos	3e6583af01	GameTestHelper additions (#10338 ) Co-authored-by: LexManos <[email protected]>	2025-01-27 09:15:57 -08:00
Paint_NinjaandTelepathicGrunt	762f6a7d78	Add `c:flowers`, `c:flowers/tall`, and `c:flowers/small` block and item tags (#10335 ) Co-authored-by: TelepathicGrunt <[email protected]>	2025-01-25 20:55:58 +00:00
Jonathing	3c5a534b7a	Fix JOpt Simple needing a strict version requirement declaration (#10311 )	2025-01-25 17:49:11 +00:00
Jonathing	bc62d1693a	Fix incorrect method reference in TntBlock.explode() (#10326 )	2025-01-25 17:48:54 +00:00
Joseph T. McQuigg	554ead8d4a	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10298 ) Add VillagerType#registerBiomeType	2025-01-21 16:07:56 -08:00
LexManos	ec5ac91389	Fix render_type in block models not being used. Fixes #10294	2025-01-13 13:27:47 -08:00
Jonathing	f63813d929	Bump dependencies (#10274 ) - EventBus 6.2.8 -> 6.2.15 - Bootstrap 2.1.7 -> 2.1.8 - SecureModules 2.2.20 -> 2.2.21 - AccessTransformers 8.2.0 -> 8.2.1 - ModLauncher 10.2.2 -> 10.2.3 These bumps include further clean-up and optimisations.	2025-01-04 16:04:31 +00:00
Jonathing	5d4825ac4b	Simplify Title Screen Brandings (#10287 )	2025-01-02 14:31:05 -08:00
Jonathing	3024ef7707	Clean and fix Forge's internal coremods, fixes finalizeSpawn hook. (#10271 )	2024-12-30 11:18:20 -08:00
Gabriel Harris-Rouquette	0d3b488728	Update jline for better darwin/arm64 support Fixes #10107 (#10279 )	2024-12-29 09:25:21 -08:00
Jonathing	a01012f20c	Bump CoreMods to 5.2.4 (#10262 )	2024-12-23 15:25:21 -08:00
Jonathing	d4e3ef4a22	Allow mipmap lowering to be disabled (#10242 )	2024-12-23 11:46:59 -08:00
Jonathing	d7293a78dc	Manage FileWatcher instance per ConfigFileTypeHandler (#10213 )	2024-12-22 11:59:00 -08:00
Paint_Ninja	8e4e02e258	Skip processing Forge classes in `RuntimeDistCleaner` (#10199 ) Mod classes are still transformed as usual	2024-12-21 22:20:21 +00:00
Paint_Ninja	2f5a6fee48	Skip Forge classes in the RuntimeEnumExtender transformer (#10197 ) Mod classes are still transformed as usual	2024-12-21 22:19:07 +00:00
LexManos	0e74886f8d	Add hooks for using Vanilla's new Client data generator (#10206 ) Add new hook for custom block models that do not have real blocks backing them Some workspace cleanup fixing log4j annotation processor	2024-12-19 10:41:21 -08:00
Paint_Ninja	07977ba242	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10195 )	2024-12-06 18:18:53 +00:00
LexManos	a894c244fe	Bump Bootstrap which has a slight performance boost during dev time.	2024-12-06 10:13:49 -08:00
LexManos	cf32a799a4	Speed up mod annotation scanning by ~30%	2024-12-06 10:11:04 -08:00
Paint_Ninja	0fda1d9393	Skip Vanilla classes for the CapabilityTokenSubclass transformer (#10196 )	2024-12-06 17:35:09 +00:00
Paint_NinjaandTelepathicGrunt	c7f0acbe38	Simplify memory usage display on loading screen (#10193 ) Co-authored-by: TelepathicGrunt <[email protected]>	2024-12-06 17:34:33 +00:00
LexManos	9c06c20023	Fix custom particles causing crash	2024-12-05 16:40:29 -08:00
LexManos	041084d1da	Minecraft 1.21.4	2024-12-05 10:22:55 -08:00