43.2 Recommended Build.

Allow discovering services from the mods folder that use java's modular definition. (#9143 )
Make Datapack Registries support ICondition(s) (#9113 )
2026-11-14 01:04:24 +00:00 · 2022-12-07 23:20:28 -08:00 · 2022-11-30 14:50:30 -08:00 · 2022-11-30 14:45:00 -08:00 · 2022-11-30 14:08:05 -08:00 · 2022-11-30 14:07:18 -08:00
367 changed files with 8243 additions and 1466 deletions
@@ -0,0 +1,42 @@
+name: 'Spam label'
+
+on:
+  issues:
+    types: [labeled]
+  pull_request:
+    types: [labeled]
+  discussion:
+    types: [labeled]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+  discussions: write
+
+jobs:
+  lock:
+    if: ${{ (github.event.label.name == 'spam') && (github.event.action == 'labeled') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/close-issue@v2
+        name: Close Issue
+        with: 
+          close-reason: 'not_planned'
+        if: ${{ github.event_name != 'pull_request' }}
+      - run: gh pr close ${{ github.event.pull_request.html_url }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Close PR
+        if: ${{ github.event_name == 'pull_request' }}
+      - uses: maxkomarychev/[email protected]
+        name: Lock PR
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          issue_number: ${{ github.event.number }}
+      - uses: OSDKDev/[email protected]
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        name: Lock issue
+        if: ${{ github.event_name != 'pull_request' }}
@@ -1,5 +1,7 @@
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
+import jetbrains.buildServer.configs.kotlin.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle

 /*
 The settings script is an entry point for defining a TeamCity
@@ -30,11 +32,13 @@ project {
    buildType(Build)
    buildType(BuildSecondaryBranches)
    buildType(PullRequests)
+    buildType(PullRequestChecks)
+    buildType(PullRequestCompatibility)

    params {
        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
        text("docker_gradle_version", "7.4", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_main_branch", "1.18.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("git_main_branch", "1.19.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
        text("git_branch_spec", """
                +:refs/heads/(main*)
                +:refs/heads/(master*)
@@ -134,3 +138,71 @@ object PullRequests : BuildType({
        """.trimIndent()
    }
 })
+
+object PullRequestChecks : BuildType({
+    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
+    id("MinecraftForge_MinecraftForge__PullRequestChecks")
+    name = "Pull Requests (Checks)"
+    description = "Checks pull requests for the project"
+
+    steps {
+        gradle {
+            name = "Check"
+            id = "RUNNER_10_Check"
+
+            tasks = "checkAll"
+            gradleParams = "--continue %gradle_custom_args%"
+            enableStacktrace = true
+            dockerImage = "%docker_gradle_image%"
+            dockerRunParameters = """
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
+                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
+                --network=host
+                -u 1000:1000
+                %docker_additional_args%
+            """.trimIndent()
+        }
+    }
+
+    vcs {
+        branchFilter = """
+            +:*
+            -:1.*
+            -:<default>
+        """.trimIndent()
+    }
+})
+
+object PullRequestCompatibility : BuildType({
+    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
+    id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
+    name = "Pull Requests (Compatibility)"
+    description = "Validates binary compatibility for pull requests made to the project"
+
+    steps {
+        gradle {
+            name = "Validate"
+            id = "RUNNER_10_Compatibility"
+
+            tasks = "checkJarCompatibility"
+            gradleParams = "--continue %gradle_custom_args%"
+            enableStacktrace = true
+            dockerImage = "%docker_gradle_image%"
+            dockerRunParameters = """
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
+                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
+                --network=host
+                -u 1000:1000
+                %docker_additional_args%
+            """.trimIndent()
+        }
+    }
+
+    vcs {
+        branchFilter = """
+            +:*
+            -:1.*
+            -:<default>
+        """.trimIndent()
+    }
+})
@@ -19,9 +19,9 @@ plugins {
    id 'com.github.ben-manes.versions' version '0.36.0'
    id 'net.minecraftforge.gradleutils' version '2.+'
    id 'eclipse'
-    id 'de.undercouch.download' version '4.1.2'
-    id 'net.minecraftforge.gradle.patcher' version '[5.1.43,)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[5.1.43,)' apply false
+    id 'de.undercouch.download' version '5.1.3'
+    id 'net.minecraftforge.gradle.patcher' version '[5.1.50,5.2.0)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[5.1.50,5.2.0)' apply false
 }

 Util.init() //Init all our extension methods!
@@ -36,13 +36,14 @@ ext {
        ]
    }
    MAPPING_CHANNEL = 'official'
-    MAPPING_VERSION = '1.19'
-    MC_VERSION = '1.19'
-    MCP_VERSION = '20220607.102129'
+    MAPPING_VERSION = '1.19.2'
+    MC_VERSION = '1.19.2'
+    MC_NEXT_VERSION = '1.20'
+    MCP_VERSION = '20220805.130853'
    SPI_VERSION = '6.0.0'
    ACCESSTRANSFORMERS_VERSION = '8.0.4'
    COREMODS_VERSION = '5.0.1'
-    EVENTBUS_VERSION = '6.0.0'
+    EVENTBUS_VERSION = '6.0.3'
    MODLAUNCHER_VERSION = '10.0.8'
    SECUREJARHANDLER_VERSION = '2.1.4'
    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
@@ -65,7 +66,7 @@ ext {
    APACHE_COMMONS_LANG3_VERSION = '3.12.0'
    JOPT_SIMPLE_VERSION = '5.0.4'
    COMMONS_IO_VERSION = '2.11.0'
-    JARJAR_VERSION = '0.3.9'
+    JARJAR_VERSION = '0.3.16'

    GIT_INFO = gradleutils.gitInfo
    VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
@@ -76,7 +77,7 @@ ext {
    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
    JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
-    MIN_TAG_FOR_CHANGELOG = "41.0"
+    MIN_TAG_FOR_CHANGELOG = '41.0'
 }

 println('Version: ' + VERSION +
@@ -95,7 +96,7 @@ def extraTxts = [
 ]

 task downloadVersionManifest(type: Download) {
-    src 'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json'
+    src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'
    dest file('build/versions/version_manifest.json')
    useETag 'all'
    onlyIfModified true
@@ -261,6 +262,7 @@ def sharedDeps = {
    moduleonly "org.ow2.asm:asm-util:${ASM_VERSION}"
    moduleonly "org.ow2.asm:asm-analysis:${ASM_VERSION}"
    moduleonly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
+    moduleonly "net.minecraftforge:JarJarFileSystems:${JARJAR_VERSION}"

    installer "cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}"
    installer "org.ow2.asm:asm:${ASM_VERSION}"
@@ -284,7 +286,8 @@ def sharedDeps = {
    installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
    installer "org.spongepowered:mixin:${MIXIN_VERSION}"
    installer 'org.openjdk.nashorn:nashorn-core:15.3'
-    installer "net.minecraftforge:JarJar:${JARJAR_VERSION}"
+    installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
+    installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"

    /*
    installer 'org.lwjgl:lwjgl:3.2.2'
@@ -377,7 +380,8 @@ def sharedFmlonlyForge = { Project prj ->
                environment 'MOD_CLASSES', '{source_roots}'
                environment 'MCP_MAPPINGS', '{mcp_mappings}'

-                property 'nativesDirectory', '{natives}'
+                // Natives are loaded from the classpath now in all cases
+                // property 'nativesDirectory', '{natives}'
                if (prj.name == 'forge') {
                    property 'forge.enableGameTest', 'true'
                }
@@ -442,7 +446,7 @@ def sharedFmlonlyForge = { Project prj ->
        // SecureJarHandler bootstrap values.
        run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
        // FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
-        run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar'
+        run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar'
        if (userdevRuns.contains(run)) {
            run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
            run.jvmArgs '-p', '{modules}'
@@ -462,7 +466,8 @@ def sharedFmlonlyForge = { Project prj ->
        run.workingDirectory prj.file('run')

        if (run.name.contains('client') || run.name.contains('data')) {
-            run.property 'nativesDirectory', prj.extractNatives.output.get().asFile
+            // Natives are loaded from the classpath now in all cases
+            // run.property 'nativesDirectory', prj.extractNatives.output.get().asFile
            run.args '--assetsDir', prj.downloadAssets.output
            run.args '--assetIndex', "{asset_index}"
        }
@@ -637,8 +642,7 @@ project(':fmlonly') {
                           '--fml.mcVersion', MC_VERSION,
                           '--fml.forgeGroup', project.group,
                           '--fml.mcpVersion', MCP_VERSION],
-                    jvm: ['-Djava.net.preferIPv6Addresses=system',
-                          "-DignoreList=${fmlonly_client.properties.ignoreList},\${version_name}.jar",
+                    jvm: ["-DignoreList=${fmlonly_client.properties.ignoreList},\${version_name}.jar",
                          "-DmergeModules=${fmlonly_client.properties.mergeModules}",
                          '-DlibraryDirectory=${library_directory}',
                          '-p', Util.getArtifacts(project, configurations.moduleonly, false).values().collect{"\${library_directory}/${it.downloads.artifact.path}"}.join('${classpath_separator}'),
@@ -1180,8 +1184,6 @@ project(':forge') {
        excs.from patcher.excs
    }

-    task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks]){}
-
    task checkPatchesAndFix(type: CheckPatches, dependsOn: genPatches) {
        patchDir = file("$rootDir/patches")
        autoFix = true
@@ -1198,58 +1200,51 @@ project(':forge') {
        lineEnding = '\n'
    }

-    def baseForgeVersion = System.getProperty("forge.compatibility_check_version")
-    if (baseForgeVersion == null)
-        // FIXME: Restore commented out portion when next tagged (41.1 or 42.0), assuming that a .0 build is published
-        baseForgeVersion = "1.19-41.0.1" // "${MC_VERSION}-${GIT_INFO.tag}.0"
-    if (baseForgeVersion == "null")
-        baseForgeVersion = null // Allow disabling from system property if not wanted
-    def baseForgeUniversal = null
-    if (baseForgeVersion != null)
-        baseForgeUniversal = project.dependencies.create("net.minecraftforge:forge:${baseForgeVersion}:universal")
+    def baseForgeVersionProperty = project.objects.property(String)
+    baseForgeVersionProperty.set(project.provider { getLatestForgeVersion(MC_VERSION) }.map { MC_VERSION + '-' + it })
+    baseForgeVersionProperty.finalizeValueOnRead()
    def jarCompatibilityTaskSetup = { task ->
        task.group = 'jar compatibility'
        task.onlyIf {
-            baseForgeVersion != null
+            baseForgeVersionProperty.getOrNull() != null
        }
-        task.inputs.property 'baseForgeVersion', baseForgeVersion
    }

-    task downloadBaseCompatibilityBinPatches(type: DownloadBaseCompatibilityBinPatches) {
-        inputVersion = baseForgeVersion
+    tasks.register('setupCheckJarCompatibility', SetupCheckJarCompatibility) {
+        inputVersion = baseForgeVersionProperty
    }

-    task applyBaseCompatibilityJarBinPatches(type: ApplyBinPatches) {
+    tasks.register('applyBaseCompatibilityJarBinPatches', ApplyBinPatches) {
        jarCompatibilityTaskSetup(it)

-        clean = createJoinedSRG.output
-        patch = downloadBaseCompatibilityBinPatches.output
+        clean = project.tasks.createJoinedSRG.output
+        patch = project.tasks.named('setupCheckJarCompatibility').flatMap { it.baseBinPatchesOutput }
        output = project.layout.buildDirectory.dir(name).map { it.file('output.jar') }
    }

-    task checkJarCompatibility(type: CheckJarCompatibility) {
+    tasks.register('mergeBaseForgeJar', MergeJars) {
        jarCompatibilityTaskSetup(it)

-        if (baseForgeVersion != null) {
-            def fmlLibs = project.configurations.detachedConfiguration(PACKED_DEPS.collect {
-                def artifactId = it.split(':')[1]
-                return project.dependencies.create("net.minecraftforge:${artifactId}:${baseForgeVersion}")
-            }.toArray(Dependency[]::new))
-
-            baseJar = project.tasks.applyBaseCompatibilityJarBinPatches.output
-            baseLibraries.from(project.configurations.detachedConfiguration(baseForgeUniversal))
-            baseLibraries.from(project.tasks.createJoinedSRG.output)
-            baseLibraries.from(fmlLibs)
-
-            inputJar = project.tasks.reobfJar.output
-            concreteLibraries.from(PACKED_DEPS.collect { rootProject.tasks.getByPath(it).archiveFile })
-
-            commonLibraries.from(project.configurations.minecraftImplementation)
-            commonLibraries.from(project.configurations.installer)
-            commonLibraries.from(project.configurations.moduleonly)
-        }
+        inputJars.from(project.tasks.named('applyBaseCompatibilityJarBinPatches').flatMap { it.output })
+        inputJars.from(baseForgeVersionProperty.map { inputVersion ->
+            def output = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-universal.jar") }.get().asFile
+            project.rootProject.extensions.download.run {
+                src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-universal.jar"
+                dest output
+            }
+            return output
+        })
    }

+    tasks.register('checkJarCompatibility', CheckJarCompatibility) {
+        jarCompatibilityTaskSetup(it)
+        dependsOn 'setupCheckJarCompatibility'
+
+        baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output }
+    }
+
+    task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks, checkPatches, checkLicenses]){}
+
    task launcherJson(type: LauncherJson) {
        packedDependencies = [':fmlloader:jar']
        doFirst {
@@ -1561,7 +1556,7 @@ project(':forge') {
                MAPPING_CHANNEL: MAPPING_CHANNEL,
                MAPPING_VERSION: MAPPING_VERSION,
                FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0],
-                MC_NEXT_VERSION: "1."+((MC_VERSION.split("[\\.-]")[1] as int)+1)
+                MC_NEXT_VERSION: MC_NEXT_VERSION
            ])
            rename 'gitignore\\.txt', '.gitignore'
            rename 'gitattributes\\.txt', '.gitattributes'
@@ -7,4 +7,5 @@ dependencies {
 	implementation 'org.ow2.asm:asm:9.3'
 	implementation 'org.ow2.asm:asm-tree:9.3'
    implementation 'net.minecraftforge:srgutils:0.4.+'
+    implementation 'commons-io:commons-io:2.8.0'
 }
@@ -1,39 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
-
-import java.nio.file.Files
-
-abstract class DownloadBaseCompatibilityBinPatches extends DefaultTask {
-    DownloadBaseCompatibilityBinPatches() {
-        group = 'jar compatibility'
-        onlyIf {
-            inputVersion.getOrNull() != null
-        }
-
-        output.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
-    }
-
-    @TaskAction
-    void run() {
-        def dep = project.dependencies.create("net.minecraftforge:forge:${inputVersion.get()}:userdev")
-        def baseForgeUserdev = project.configurations.detachedConfiguration(dep).resolve().iterator().next()
-
-        def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
-
-        Files.copy(joinedLzma.toPath(), output.get().asFile.toPath())
-    }
-
-    @Input
-    @Optional
-    abstract Property<String> getInputVersion()
-
-    @OutputFile
-    abstract RegularFileProperty getOutput()
-}
@@ -0,0 +1,44 @@
+package net.minecraftforge.forge.tasks
+
+import org.apache.commons.io.IOUtils
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+abstract class MergeJars extends DefaultTask {
+    MergeJars() {
+        output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
+    }
+
+    @TaskAction
+    void run() {
+        def jars = inputJars.files
+
+        try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
+            for (def jar : jars) {
+                try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
+                    def entry
+                    while ((entry = zin.getNextEntry()) != null) {
+                        ZipEntry _new = new ZipEntry(entry.getName())
+                        _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
+                        zout.putNextEntry(_new)
+                        IOUtils.copy(zin, zout)
+                    }
+                }
+            }
+        }
+    }
+
+    @InputFiles
+    abstract ConfigurableFileCollection getInputJars()
+
+    @OutputFile
+    abstract RegularFileProperty getOutput()
+}
@@ -0,0 +1,64 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+
+abstract class SetupCheckJarCompatibility extends DefaultTask {
+    SetupCheckJarCompatibility() {
+        group = 'jar compatibility'
+        onlyIf {
+            inputVersion.getOrNull() != null
+        }
+
+        baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
+    }
+
+    @TaskAction
+    void run() {
+        def inputVersion = inputVersion.get()
+        def fmlLibs = project.configurations.detachedConfiguration(project.PACKED_DEPS.collect {
+            def artifactId = it.split(':')[1]
+            return project.dependencies.create("net.minecraftforge:${artifactId}:${inputVersion}")
+        }.toArray(Dependency[]::new))
+
+        project.tasks.named('checkJarCompatibility') {
+            baseLibraries.from(project.tasks.createJoinedSRG.output)
+            baseLibraries.from(project.provider {
+                fmlLibs.resolvedConfiguration.lenientConfiguration.files
+            })
+
+            inputJar = project.tasks.reobfJar.output
+            concreteLibraries.from(project.PACKED_DEPS.collect { project.rootProject.tasks.getByPath(it).archiveFile })
+
+            commonLibraries.from(project.configurations.minecraftImplementation)
+            commonLibraries.from(project.configurations.installer)
+            commonLibraries.from(project.configurations.moduleonly)
+        }
+
+        def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
+        project.rootProject.extensions.download.run {
+            src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-userdev.jar"
+            dest baseForgeUserdev
+        }
+
+        def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
+
+        Files.copy(joinedLzma.toPath(), baseBinPatchesOutput.get().asFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+    }
+
+    @Input
+    @Optional
+    abstract Property<String> getInputVersion()
+
+    @OutputFile
+    abstract RegularFileProperty getBaseBinPatchesOutput()
+}
@@ -18,17 +18,17 @@ public class Util {
 			return md.digest().collect {String.format "%02x", it}.join()
 		}
        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
-	
+
 		File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
        File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
        File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
-		
+
 		Date.metaClass.iso8601 = { ->
 			def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
 			def result = format.format(delegate)
 			return result[0..21] + ':' + result[22..-1]
 		}
-        
+
        String.metaClass.rsplit = { String del, int limit = -1 ->
            def lst = new ArrayList()
            def x = 0, idx
@@ -41,7 +41,7 @@ public class Util {
            return lst
        }
 	}
-	
+
 	public static String[] getClasspath(project, libs, artifact) {
 		def ret = []
 		artifactTree(project, artifact).each { key, lib ->
@@ -51,7 +51,7 @@ public class Util {
 		}
 		return ret
 	}
-	
+
 	public static def getArtifacts(project, config, classifiers) {
 		def ret = [:]
 		config.resolvedConfiguration.resolvedArtifacts.each {
@@ -75,7 +75,7 @@ public class Util {
 				url = "https://maven.minecraftforge.net/${path}"
 			}
 			//TODO remove when Mojang launcher is updated
-			if (!classifiers && art.classifier != null) { 
+			if (!classifiers && art.classifier != null) {
 				//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
 				// However, keep the path normal so that our mirror system works.
 				art.version = "${art.version}-${art.classifier}"
@@ -96,14 +96,14 @@ public class Util {
 		}
 		return ret
 	}
-    
-    public static def getMavenPath(task) {        
+
+    public static def getMavenPath(task) {
        def classifier = task.archiveClassifier.get()
        def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
        return "${task.project.group.replace('.', '/')}/${task.project.name}/${task.project.version}/${task.project.name}-${task.project.version}".toString() + (classifier == '' ? '' : '-' + classifier) + '.jar'
    }
-    
-    public static def getMavenDep(task) {        
+
+    public static def getMavenDep(task) {
        def classifier = task.archiveClassifier.get()
        return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
    }
@@ -127,7 +127,7 @@ public class Util {
 		def files = cfg.resolve()
 		return getArtifacts(project, cfg, true)
 	}
-	
+
 	private static boolean checkExists(url) {
 		try {
 			def code = new URL(url).openConnection().with {
@@ -142,4 +142,9 @@ public class Util {
 			throw e
 		}
 	}
+
+    public static String getLatestForgeVersion(mcVersion) {
+        def json = new JsonSlurper().parseText(new URL("https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json").getText("UTF-8"))
+        return json.promos["$mcVersion-latest"]
+    }
 }
@@ -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.19-&query=$.promos["1.19-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19-&query=$.promos["1.19-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.19-&query=$.promos["1.19.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.2-&query=$.promos["1.19.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
 )](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)](https://discord.gg/UvedJ9m) [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos)

 Forge is a free, open-source modding API all of your favourite mods use!
@@ -5,13 +5,18 @@

 package net.minecraftforge.fml;

+import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.config.IConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.loading.FMLLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import java.util.function.Supplier;

 public class ModLoadingContext
 {
+    private static final Logger LOGGER = LogUtils.getLogger();
    private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
    private Object languageExtension;
    private ModLoadingStage stage;
@@ -46,10 +51,24 @@ public class ModLoadingContext
    }

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

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

@@ -28,7 +28,8 @@ dependencies {
    api("cpw.mods:modlauncher:${MODLAUNCHER_VERSION}")
    api("net.minecraftforge:coremods:${COREMODS_VERSION}")
    api("com.mojang:logging:${MOJANG_LOGGING_VERSION}")
-    api "net.minecraftforge:JarJar:${JARJAR_VERSION}"
+    api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
+    api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"

    implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
    implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading;
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;

+import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
@@ -53,4 +54,16 @@ public class FileUtils
            return "";
        }
    }
+    
+    public static boolean matchFileName(String path, String... matches) {
+        // Extract file name from path
+        String name = path.substring(Math.min(path.lastIndexOf(File.separatorChar) + 1, path.length()));
+        // Check if it contains any of the desired keywords
+        for (String match : matches) {
+            if (name.contains(match)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
@@ -6,21 +6,27 @@
 package net.minecraftforge.fml.loading;

 import com.mojang.logging.LogUtils;
+import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
 import org.slf4j.Logger;

-import java.io.File;
 import java.io.IOException;
+import java.lang.module.ModuleDescriptor;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.zip.ZipFile;
+import java.util.Set;

 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Set<String> SERVICES = Set.of(
+        "cpw.mods.modlauncher.api.ITransformationService",
+        "net.minecraftforge.forgespi.locating.IModLocator",
+        "net.minecraftforge.forgespi.locating.IDependencyLocator"
+    );

    @Override
    public List<NamedPath> candidates(final Path gameDirectory) {
@@ -51,14 +57,11 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
        if (!Files.isRegularFile(path)) return;
        if (!path.toString().endsWith(".jar")) return;
        if (LamdbaExceptionUtils.uncheck(() -> Files.size(path)) == 0) return;
-        try (ZipFile zf = new ZipFile(new File(path.toUri()))) {
-            if (zf.getEntry("META-INF/services/cpw.mods.modlauncher.api.ITransformationService") != null) {
-                found.add(new NamedPath(zf.getName(), path));
-            } else if (zf.getEntry("META-INF/services/net.minecraftforge.forgespi.locating.IModLocator") != null) {
-                found.add(new NamedPath(zf.getName(), path));
-            }
-        } catch (IOException ioe) {
-            LOGGER.error("Zip Error when loading jar file {}", path, ioe);
-        }
+
+        SecureJar jar = SecureJar.from(path);
+        jar.moduleDataProvider().descriptor().provides().stream()
+            .map(ModuleDescriptor.Provides::service)
+            .filter(SERVICES::contains)
+            .forEach(s -> found.add(new NamedPath(s, path)));
    }
 }
@@ -210,10 +210,24 @@ public class ModSorter

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

            return missingVersions.stream()
@@ -225,6 +239,18 @@ public class ModSorter
        return Collections.emptyList();
    }

+    private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
+    {
+        ArtifactVersion installed = modVersions.get(dependency.getModId());
+        return String.format(
+                "\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
+                dependency.getModId(),
+                dependency.getOwner().getModId(),
+                dependency.getVersionRange(),
+                installed != null ? installed.toString() : "[MISSING]"
+        );
+    }
+
    private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
    {
        return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
@@ -106,16 +106,17 @@ public class UniqueModListBuilder
        if (modInfoList.size() > 1) {
            LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
            modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
-            LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), modInfoList.get(0).getModInfos().get(0).getVersion());
+            LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
        }
        return modInfoList.get(0);
    }

    private ArtifactVersion getVersion(final ModFile mf)
    {
-        if (mf.getModFileInfo() == null) {
+        if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
            return mf.getJarVersion();
        }
+
        return mf.getModInfos().get(0).getVersion();
    }

@@ -5,6 +5,7 @@

 package net.minecraftforge.fml.loading;

+import net.minecraftforge.forgespi.language.MavenVersionAdapter;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
@@ -18,16 +19,12 @@ public class VersionSupportMatrix {
    private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
    static {
        final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
-        // if (MavenVersionAdapter.createFromVersionSpec("[1.16.4,1.16.5]").containsVersion(version)) {
-        //     // 1.16.4 is Compatible with 1.16.3
-        //     add("languageloader.javafml", "34");
-        //     add("mod.minecraft",          "1.16.3");
-        //     add("mod.forge",              "34.1.42");
-        //     // 1.16.5 is Compatible with 1.16.4, and thus 1.16.3
-        //     add("languageloader.javafml", "35");
-        //     add("mod.minecraft",          "1.16.4");
-        //     add("mod.forge",              "35.1.37");
-        // }
+         if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
+             // 1.19.2 is Compatible with 1.19.1
+             add("languageloader.javafml", "42");
+             add("mod.minecraft",          "1.19.1");
+             add("mod.forge",              "42.0.9");
+        }
    }
    private static void add(String key, String value) {
        overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));
@@ -46,7 +46,6 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
        final List<IModFile> sources = Lists.newArrayList();
        loadedMods.forEach(sources::add);

-
        final List<IModFile> dependenciesToLoad = JarSelector.detectAndSelect(sources, this::loadResourceFromModFile, this::loadModFileFrom, this::identifyMod, this::exception);

        if (dependenciesToLoad.isEmpty())
@@ -5,8 +5,8 @@

 package net.minecraftforge.fml.loading.targets;

-import com.google.common.base.Strings;
 import cpw.mods.jarhandling.SecureJar;
+import net.minecraftforge.fml.loading.FileUtils;

 import java.io.File;
 import java.nio.file.Path;
@@ -30,7 +30,7 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {

        // The extra jar is on the classpath, so try and pull it out of the legacy classpath
        var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find client-extra").split(File.pathSeparator);
-        var extra = Paths.get(Arrays.stream(legacyCP).filter(e -> e.contains("client-extra")).findFirst().orElseThrow(() -> new IllegalStateException("Could not find client-extra in legacy classpath")));
+        var extra = findJarOnClasspath(legacyCP, "client-extra");
        mcstream.add(extra);

        // The MC code/Patcher edits are in exploded directories
@@ -50,8 +50,6 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
        if (getDist().isDedicatedServer())
            return arguments;

-        fixNatives();
-
        if (isData())
            return arguments;

@@ -80,11 +78,18 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
    protected List<Path> getFmlStuff(String[] classpath) {
        // We also want the FML things, fmlcore, javafmllanguage, mclanguage, I don't like hard coding these, but hey whatever works for now.
        return Arrays.stream(classpath)
-            .filter(e -> e.contains("fmlcore") || e.contains("javafmllanguage") || e.contains("lowcodelanguage") || e.contains("mclanguage"))
+            .filter(e -> FileUtils.matchFileName(e, "fmlcore", "javafmllanguage", "lowcodelanguage", "mclanguage"))
            .map(Paths::get)
            .toList();
    }

+    protected static Path findJarOnClasspath(String[] classpath, String match) {
+        return Paths.get(Arrays.stream(classpath)
+            .filter(e -> FileUtils.matchFileName(e, match))
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("Could not find " + match + " in classpath")));
+    }
+
    protected BiPredicate<String, String> getMcFilter(Path extra, List<Path> minecraft, Stream.Builder<List<Path>> mods) {
        final var packages = getPackages();
        final var extraPath = extra.toString().replace('\\', '/');
@@ -119,18 +124,4 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
        // Generate a time-based random number, to mimic how n.m.client.Main works
        return Long.toString(System.nanoTime() % (int) Math.pow(10, length));
    }
-
-    private static void fixNatives() {
-        String paths = System.getProperty("java.library.path");
-        String nativesDir = System.getProperty("nativesDirectory");
-        if (nativesDir == null)
-            return;
-
-        if (Strings.isNullOrEmpty(paths))
-            paths = nativesDir;
-        else
-            paths += File.pathSeparator + nativesDir;
-
-        System.setProperty("java.library.path", paths);
-    }
 }
@@ -10,8 +10,6 @@ import net.minecraftforge.fml.loading.VersionInfo;

 import java.io.File;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -41,8 +39,4 @@ public abstract class CommonUserdevLaunchHandler extends CommonDevLaunchHandler
    }

    protected abstract void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
-
-    protected static Path findJarOnClasspath(String[] classpath, String match) {
-        return Paths.get(Arrays.stream(classpath).filter(e -> e.contains(match)).findFirst().orElseThrow(() -> new IllegalStateException("Could not find " + match + " in classpath")));
-    }
 }
@@ -13,6 +13,7 @@
        <MarkerFilter marker="REGISTRIES" onMatch="${sys:forge.logging.marker.registries:-DENY}" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="REGISTRYDUMP" onMatch="${sys:forge.logging.marker.registrydump:-DENY}" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="SPLASH" onMatch="${sys:forge.logging.marker.splash:-DENY}" onMismatch="NEUTRAL"/>
+        <MarkerFilter marker="RESOURCE-CACHE" onMatch="${sys:forge.logging.marker.resource.cache:-DENY}" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="FORGEMOD" onMatch="${sys:forge.logging.marker.forgemod:-ACCEPT}" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="LOADING" onMatch="${sys:forge.logging.marker.loading:-ACCEPT}" onMismatch="NEUTRAL"/>
        <MarkerFilter marker="CORE" onMatch="${sys:forge.logging.marker.core:-ACCEPT}" onMismatch="NEUTRAL"/>
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -205,6 +205,12 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
@@ -38,7 +38,7 @@ public class FMLModContainer extends ModContainer
        LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
        this.scanResults = modFileScanResults;
        activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
-        this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).build();
+        this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
        this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
        final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this);
        this.contextExtension = () -> contextExtension;
@@ -12,7 +12,8 @@ dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
 java.withSourcesJar()

 dependencies {
-    compileOnly('org.jetbrains:annotations:21.0.1')
+    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
+
    implementation(project(':fmlloader'))
    implementation(project(':fmlcore'))
 }
@@ -51,7 +51,7 @@ public class LowCodeModLanguageProvider implements IModLanguageProvider
                    throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e);
                }
            } catch (NoSuchMethodException | ClassNotFoundException | InstantiationException | IllegalAccessException e) {
-                LOGGER.fatal(LOADING, "Unable to load FMLModContainer, wut?", e);
+                LOGGER.fatal(LOADING, "Unable to load LowCodeModContainer, wut?", e);
                final Class<RuntimeException> mle = (Class<RuntimeException>) LamdbaExceptionUtils.uncheck(() -> Class.forName("net.minecraftforge.fml.ModLoadingException", true, Thread.currentThread().getContextClassLoader()));
                final Class<ModLoadingStage> mls = (Class<ModLoadingStage>) LamdbaExceptionUtils.uncheck(() -> Class.forName("net.minecraftforge.fml.ModLoadingStage", true, Thread.currentThread().getContextClassLoader()));
                throw LamdbaExceptionUtils.uncheck(() -> LamdbaExceptionUtils.uncheck(() -> mle.getConstructor(IModInfo.class, mls, String.class, Throwable.class)).newInstance(info, Enum.valueOf(mls, "CONSTRUCT"), "fml.modloading.failedtoloadmodclass", e));
@@ -9,6 +9,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.Material;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -75,7 +76,7 @@ public class ExampleMod
    }

    // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
-    @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
+    @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
    public static class ClientModEvents
    {
        @SubscribeEvent
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -80,7 +_,7 @@
+@@ -82,7 +_,7 @@
       GLFW.glfwWindowHint(139267, 2);
       GLFW.glfwWindowHint(139272, 204801);
       GLFW.glfwWindowHint(139270, 1);
@@ -9,7 +9,7 @@
       if (monitor != null) {
          VideoMode videomode = monitor.m_84948_(this.f_85355_ ? this.f_85354_ : Optional.empty());
          this.f_85350_ = this.f_85357_ = monitor.m_84951_() + videomode.m_85332_() / 2 - this.f_85359_ / 2;
-@@ -298,6 +_,7 @@
+@@ -303,6 +_,7 @@
       GLFW.glfwGetFramebufferSize(this.f_85349_, aint, aint1);
       this.f_85361_ = aint[0] > 0 ? aint[0] : 1;
       this.f_85362_ = aint1[0] > 0 ? aint1[0] : 1;
@@ -0,0 +1,11 @@
+--- a/com/mojang/blaze3d/vertex/PoseStack.java
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
+@@ -11,7 +_,7 @@
+ import net.minecraftforge.api.distmarker.OnlyIn;
+ 
+ @OnlyIn(Dist.CLIENT)
+-public class PoseStack {
+public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
+    private final Deque<PoseStack.Pose> f_85834_ = Util.m_137469_(Queues.newArrayDeque(), (p_85848_) -> {
+       Matrix4f matrix4f = new Matrix4f();
+       matrix4f.m_27624_();
@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -55,14 +_,8 @@
+@@ -57,14 +_,8 @@
       if (this.f_127506_ != null && this.f_127506_.length > 0) {
          p_127520_.append("-- Head --\n");
          p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
@@ -17,7 +17,7 @@
       }
 
       for(CrashReportCategory crashreportcategory : this.f_127503_) {
-@@ -70,6 +_,7 @@
+@@ -72,6 +_,7 @@
          p_127520_.append("\n\n");
       }
 
@@ -25,7 +25,7 @@
       this.f_178624_.m_143525_(p_127520_);
    }
 
-@@ -89,23 +_,13 @@
+@@ -91,23 +_,13 @@
          throwable.setStackTrace(this.f_127501_.getStackTrace());
       }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -203,6 +_,7 @@
+@@ -211,6 +_,7 @@
    }
 
    static {
@@ -1,18 +1,18 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -164,6 +_,11 @@
+@@ -170,6 +_,11 @@
       return 255;
    }
 
 +   // We add these inner classes to compensate for Mojang's missing inner classes and shift the anonymous class index.
 +   // This allows us to obfuscate subsequent anonymous inner classes correctly.
-+   @SuppressWarnings("unused") private static LongSupplier INNER_CLASS_SHIFT1 = new LongSupplier() { public long getAsLong() { return 0; } };
-+   @SuppressWarnings("unused") private static LongSupplier INNER_CLASS_SHIFT2 = new LongSupplier() { public long getAsLong() { return 0; } };
+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT1 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT2 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
 +
    public static ExecutorService m_183988_() {
       return f_137443_;
    }
-@@ -242,7 +_,7 @@
+@@ -248,7 +_,7 @@
       try {
          type = DataFixers.m_14512_().getSchema(DataFixUtils.makeKey(SharedConstants.m_183709_().getWorldVersion())).getChoiceType(p_137552_, p_137553_);
       } catch (IllegalArgumentException illegalargumentexception) {
@@ -21,3 +21,13 @@
          if (SharedConstants.f_136183_) {
             throw illegalargumentexception;
          }
+@@ -692,7 +_,8 @@
+ 
+    public static <T, R> Function<T, R> m_143827_(final Function<T, R> p_143828_) {
+       return new Function<T, R>() {
+-         private final Map<T, R> f_211548_ = Maps.newHashMap();
+         // FORGE: Allow using memoized functions from multiple threads.
+         private final Map<T, R> f_211548_ = Maps.newConcurrentMap();
+ 
+          public R apply(T p_214691_) {
+             return this.f_211548_.computeIfAbsent(p_214691_, p_143828_);
@@ -1,5 +1,14 @@
 --- a/net/minecraft/client/ClientRecipeBook.java
 +++ b/net/minecraft/client/ClientRecipeBook.java
+@@ -51,7 +_,7 @@
+       for(Recipe<?> recipe : p_90643_) {
+          if (!recipe.m_5598_() && !recipe.m_142505_()) {
+             RecipeBookCategories recipebookcategories = m_90646_(recipe);
+-            String s = recipe.m_6076_();
+            String s = recipe.m_6076_().isEmpty() ? recipe.m_6423_().toString() : recipe.m_6076_(); // FORGE: Group value defaults to the recipe's ID if the recipe's explicit group is empty.
+             if (s.isEmpty()) {
+                map.computeIfAbsent(recipebookcategories, (p_90645_) -> {
+                   return Lists.newArrayList();
@@ -103,6 +_,8 @@
       } else if (recipetype == RecipeType.f_44113_) {
          return RecipeBookCategories.SMITHING;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -300,7 +_,9 @@
+@@ -299,7 +_,9 @@
          }
 
          Screen screen = this.f_90867_.f_91080_;
@@ -11,7 +11,7 @@
             if (this.f_90867_.f_91066_.f_92105_.m_90832_(p_90895_, p_90896_)) {
                this.f_90867_.m_91268_().m_85438_();
                this.f_90867_.f_91066_.m_231829_().m_231514_(this.f_90867_.m_91268_().m_85440_());
-@@ -318,6 +_,8 @@
+@@ -317,6 +_,8 @@
                });
                return;
             }
@@ -19,8 +19,8 @@
 +               ((KeyBindsScreen)this.f_90867_.f_91080_).f_193975_ = null; //Forge: Unset pure modifiers.
          }
 
-          if (NarratorChatListener.f_93311_.m_93316_()) {
-@@ -340,11 +_,15 @@
+          if (this.f_90867_.m_240477_().m_93316_()) {
+@@ -339,11 +_,15 @@
             Screen.m_96579_(() -> {
                if (p_90897_ != 1 && (p_90897_ != 2 || !this.f_90868_)) {
                   if (p_90897_ == 0) {
@@ -38,7 +38,7 @@
                }
 
             }, "keyPressed event handler", screen.getClass().getCanonicalName());
-@@ -397,22 +_,26 @@
+@@ -396,22 +_,26 @@
                }
             }
          }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -236,7 +_,7 @@
+@@ -244,7 +_,7 @@
 import org.slf4j.Logger;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
    static Minecraft f_90981_;
    private static final Logger f_90982_ = LogUtils.getLogger();
    public static final boolean f_91002_ = Util.m_137581_() == Util.OS.OSX;
-@@ -385,7 +_,7 @@
+@@ -398,7 +_,7 @@
       this.f_91029_ = p_91084_.f_101908_.f_101928_;
       this.f_90986_ = p_91084_.f_101905_.f_101944_;
       this.f_91037_ = new ClientPackSource(new File(this.f_91069_, "server-resource-packs"), p_91084_.f_101907_.m_101925_());
@@ -18,7 +18,7 @@
       this.f_91030_ = p_91084_.f_101905_.f_101945_;
       this.f_231338_ = new YggdrasilAuthenticationService(this.f_91030_);
       this.f_91048_ = this.f_231338_.createMinecraftSessionService();
-@@ -393,7 +_,6 @@
+@@ -406,7 +_,6 @@
       this.f_231339_ = SignatureValidator.m_216358_(this.f_231338_.getServicesKey());
       this.f_90998_ = p_91084_.f_101905_.f_101942_;
       f_90982_.info("Setting user: {}", (Object)this.f_90998_.m_92546_());
@@ -26,15 +26,16 @@
       this.f_91033_ = p_91084_.f_101908_.f_101926_;
       this.f_91034_ = !p_91084_.f_101908_.f_101929_;
       this.f_91035_ = !p_91084_.f_101908_.f_101930_;
-@@ -445,7 +_,6 @@
+@@ -458,7 +_,7 @@
 
       this.f_90990_.m_85380_(this.f_91066_.m_232035_().m_231551_());
       this.f_91067_ = new MouseHandler(this);
 -      this.f_91067_.m_91524_(this.f_90990_.m_85439_());
+      // FORGE: Move mouse handler setup further below
       this.f_91068_ = new KeyboardHandler(this);
       this.f_91068_.m_90887_(this.f_90990_.m_85439_());
       RenderSystem.m_69580_(this.f_91066_.f_92035_, false);
-@@ -453,6 +_,7 @@
+@@ -466,6 +_,7 @@
       this.f_91042_.m_83931_(0.0F, 0.0F, 0.0F, 0.0F);
       this.f_91042_.m_83954_(f_91002_);
       this.f_91036_ = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
@@ -42,7 +43,7 @@
       this.f_91038_.m_10506_();
       this.f_91066_.m_92145_(this.f_91038_);
       this.f_91039_ = new LanguageManager(this.f_91066_.f_92075_);
-@@ -496,10 +_,12 @@
+@@ -510,10 +_,12 @@
       this.f_91063_ = new GameRenderer(this, this.f_90994_.m_234586_(), this.f_91036_, this.f_90993_);
       this.f_91036_.m_7217_(this.f_91063_);
       this.f_91060_ = new LevelRenderer(this, this.f_90994_, this.f_167845_, this.f_90993_);
@@ -55,17 +56,18 @@
       this.f_91036_.m_7217_(this.f_91061_);
       this.f_91053_ = new PaintingTextureManager(this.f_90987_);
       this.f_91036_.m_7217_(this.f_91053_);
-@@ -508,7 +_,8 @@
+@@ -522,7 +_,9 @@
       this.f_91047_ = new GpuWarnlistManager();
       this.f_91036_.m_7217_(this.f_91047_);
       this.f_91036_.m_7217_(this.f_205120_);
 -      this.f_91065_ = new Gui(this, this.f_90995_);
 +      this.f_91065_ = new net.minecraftforge.client.gui.overlay.ForgeGui(this);
-+      this.f_91067_.m_91524_(this.f_90990_.m_85439_()); //Forge: Moved below ingameGUI setting to prevent NPEs in handeler.
+      // FORGE: Moved mouse handler setup below ingame gui creation to prevent NPEs in mouse handler.
+      this.f_91067_.m_91524_(this.f_90990_.m_85439_());
       this.f_91064_ = new DebugRenderer(this);
+       this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this));
       RenderSystem.m_69900_(this::m_91113_);
-       if (this.f_91042_.f_83915_ == this.f_90990_.m_85441_() && this.f_91042_.f_83916_ == this.f_90990_.m_85442_()) {
-@@ -526,6 +_,19 @@
+@@ -541,6 +_,21 @@
          TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
       }
 
@@ -81,33 +83,52 @@
 +      net.minecraftforge.client.gui.overlay.GuiOverlayManager.init();
 +      net.minecraftforge.client.DimensionSpecialEffectsManager.init();
 +      net.minecraftforge.client.NamedRenderTypeManager.init();
+      net.minecraftforge.client.ColorResolverManager.init();
+      net.minecraftforge.client.ItemDecoratorHandler.init();
 +
       this.f_90990_.m_85409_(this.f_91066_.m_231817_().m_231551_());
       this.f_90990_.m_85424_(this.f_91066_.m_232123_().m_231551_());
       this.f_90990_.m_85426_();
-@@ -543,13 +_,16 @@
+@@ -563,23 +_,23 @@
             }
 
             this.f_167847_.m_168556_();
 +            if (net.minecraftforge.client.loading.ClientModLoader.completeModLoading()) return; // Do not overwrite the error screen
 +            // FORGE: Move opening initial screen to after startup and events are enabled.
-+            // Also Fixes MC-145102
 +            if (s != null) {
-+                ConnectScreen.m_169267_(new TitleScreen(), this, new ServerAddress(s, i), (ServerData)null);
+               ConnectScreen.m_169267_(new TitleScreen(), this, new ServerAddress(s, i), (ServerData)null);
+            } else if (this.m_239929_()) {
+               this.m_91152_(BanNoticeScreen.m_239967_((p_238185_) -> {
+                  if (p_238185_) {
+                     Util.m_137581_().m_137646_("https://aka.ms/mcjavamoderation");
+                  }
+
+                  this.m_91152_(new TitleScreen(true));
+               }, this.m_239210_()));
 +            } else {
-+                this.m_91152_(new TitleScreen(true));
+               this.m_91152_(new TitleScreen(true));
 +            }
          });
       }, false));
 -      if (s != null) {
-         ConnectScreen.m_169267_(new TitleScreen(), this, new ServerAddress(s, i), (ServerData)null);
+-         reloadinstance.m_7237_().thenRunAsync(() -> {
+-            ConnectScreen.m_169267_(new TitleScreen(), this, new ServerAddress(s, i), (ServerData)null);
+-         }, this);
+-      } else if (this.m_239929_()) {
+-         this.m_91152_(BanNoticeScreen.m_239967_((p_238185_) -> {
+-            if (p_238185_) {
+-               Util.m_137581_().m_137646_("https://aka.ms/mcjavamoderation");
+-            }
+-
+-            this.m_91152_(new TitleScreen(true));
+-         }, this.m_239210_()));
 -      } else {
 -         this.m_91152_(new TitleScreen(true));
 -      }
 
    }
 
-@@ -592,6 +_,8 @@
+@@ -622,6 +_,8 @@
 
    private UserApiService m_193585_(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
       try {
@@ -116,7 +137,7 @@
          return p_193586_.createUserApiService(p_193587_.f_101905_.f_101942_.m_92547_());
       } catch (AuthenticationException authenticationexception) {
          f_90982_.error("Failed to verify authentication", (Throwable)authenticationexception);
-@@ -604,7 +_,7 @@
+@@ -634,7 +_,7 @@
    }
 
    private void m_91239_(Throwable p_91240_) {
@@ -125,7 +146,7 @@
          this.m_91241_(p_91240_, (Component)null);
       } else {
          Util.m_137559_(p_91240_);
-@@ -762,13 +_,13 @@
+@@ -792,13 +_,13 @@
       Bootstrap.m_135875_(p_91333_.m_127526_());
       if (p_91333_.m_127527_() != null) {
          Bootstrap.m_135875_("#@!@# Game crashed! Crash report saved to: #@!@# " + p_91333_.m_127527_());
@@ -142,7 +163,7 @@
       }
 
    }
-@@ -892,10 +_,6 @@
+@@ -922,10 +_,6 @@
          f_90982_.error("setScreen called from non-game thread");
       }
 
@@ -153,7 +174,7 @@
       if (p_91153_ == null && this.f_91073_ == null) {
          p_91153_ = new TitleScreen();
       } else if (p_91153_ == null && this.f_91074_.m_21224_()) {
-@@ -906,6 +_,19 @@
+@@ -936,6 +_,19 @@
          }
       }
 
@@ -173,7 +194,7 @@
       this.f_91080_ = p_91153_;
       BufferUploader.m_166835_();
       if (p_91153_ != null) {
-@@ -1049,11 +_,14 @@
+@@ -1079,11 +_,14 @@
       RenderSystem.m_69481_();
       this.f_91026_.m_7238_();
       if (!this.f_91079_) {
@@ -188,7 +209,7 @@
       }
 
       if (this.f_91056_ != null) {
-@@ -1180,10 +_,12 @@
+@@ -1210,10 +_,12 @@
       this.f_90990_.m_85378_((double)i);
       if (this.f_91080_ != null) {
          this.f_91080_.m_6574_(this, this.f_90990_.m_85445_(), this.f_90990_.m_85446_());
@@ -201,7 +222,7 @@
       this.f_91063_.m_109097_(this.f_90990_.m_85441_(), this.f_90990_.m_85442_());
       this.f_91067_.m_91599_();
    }
-@@ -1461,6 +_,7 @@
+@@ -1491,6 +_,7 @@
    }
 
    public void m_91395_() {
@@ -209,7 +230,7 @@
       this.f_91019_ = false;
    }
 
-@@ -1490,10 +_,18 @@
+@@ -1520,10 +_,18 @@
          if (p_91387_ && this.f_91077_ != null && this.f_91077_.m_6662_() == HitResult.Type.BLOCK) {
             BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
             BlockPos blockpos = blockhitresult.m_82425_();
@@ -231,7 +252,7 @@
                   this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
                }
             }
-@@ -1518,14 +_,20 @@
+@@ -1548,14 +_,20 @@
          return false;
       } else {
          boolean flag = false;
@@ -250,22 +271,22 @@
                BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
                BlockPos blockpos = blockhitresult.m_82425_();
 -               if (!this.f_91073_.m_8055_(blockpos).m_60795_()) {
-+            if (!this.f_91073_.m_46859_(blockpos)) {
+               if (!this.f_91073_.m_46859_(blockpos)) {
                   this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
                   if (this.f_91073_.m_8055_(blockpos).m_60795_()) {
                      flag = true;
-@@ -1538,8 +_,10 @@
+@@ -1568,8 +_,10 @@
                }
 
                this.f_91074_.m_36334_();
-+            net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
+               net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
          }
 
 +         if (inputEvent.shouldSwingHand())
          this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
          return flag;
       }
-@@ -1554,6 +_,11 @@
+@@ -1584,6 +_,11 @@
             }
 
             for(InteractionHand interactionhand : InteractionHand.values()) {
@@ -277,31 +298,32 @@
                ItemStack itemstack = this.f_91074_.m_21120_(interactionhand);
                if (this.f_91077_ != null) {
                   switch (this.f_91077_.m_6662_()) {
-@@ -1564,6 +_,7 @@
+@@ -1594,13 +_,14 @@
                            return;
                         }
 
-+                     if(!this.f_91074_.canInteractWith(entityhitresult.m_82443_(), 0)) return; //Forge: Entity may be traced via attack range, but the player may not have sufficient reach.  No padding in client code.
+                        if(!this.f_91074_.canInteractWith(entityhitresult.m_82443_(), 0)) break; //Forge: Entity may be traced via attack range, but the player may not have sufficient reach.  No padding in client code.
                         InteractionResult interactionresult = this.f_91072_.m_105230_(this.f_91074_, entity, entityhitresult, interactionhand);
                         if (!interactionresult.m_19077_()) {
                            interactionresult = this.f_91072_.m_105226_(this.f_91074_, entity, interactionhand);
-@@ -1571,6 +_,7 @@
+                         }
 
                         if (interactionresult.m_19077_()) {
-                            if (interactionresult.m_19080_()) {
-+                           if (inputEvent.shouldSwingHand())
+-                           if (interactionresult.m_19080_()) {
+                           if (interactionresult.m_19080_() && inputEvent.shouldSwingHand()) {
                               this.f_91074_.m_6674_(interactionhand);
                            }
 
-@@ -1583,6 +_,7 @@
+@@ -1612,7 +_,7 @@
+                         int i = itemstack.m_41613_();
                         InteractionResult interactionresult1 = this.f_91072_.m_233732_(this.f_91074_, interactionhand, blockhitresult);
                         if (interactionresult1.m_19077_()) {
-                            if (interactionresult1.m_19080_()) {
-+                           if (inputEvent.shouldSwingHand())
+-                           if (interactionresult1.m_19080_()) {
+                           if (interactionresult1.m_19080_() && inputEvent.shouldSwingHand()) {
                               this.f_91074_.m_6674_(interactionhand);
                               if (!itemstack.m_41619_() && (itemstack.m_41613_() != i || this.f_91072_.m_105290_())) {
                                  this.f_91063_.f_109055_.m_109320_(interactionhand);
-@@ -1598,6 +_,9 @@
+@@ -1628,6 +_,9 @@
                   }
                }
 
@@ -311,16 +333,16 @@
                if (!itemstack.m_41619_()) {
                   InteractionResult interactionresult2 = this.f_91072_.m_233721_(this.f_91074_, interactionhand);
                   if (interactionresult2.m_19077_()) {
-@@ -1624,6 +_,8 @@
+@@ -1654,6 +_,8 @@
          --this.f_91011_;
       }
 
 +      net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
 +
       this.f_91026_.m_6180_("gui");
+       this.f_240378_.m_240688_();
       this.f_91065_.m_193832_(this.f_91012_);
-       this.f_91026_.m_7238_();
-@@ -1752,6 +_,8 @@
+@@ -1783,6 +_,8 @@
       this.f_91026_.m_6182_("keyboard");
       this.f_91068_.m_90931_();
       this.f_91026_.m_7238_();
@@ -329,18 +351,7 @@
    }
 
    private boolean m_91278_() {
-@@ -1894,8 +_,8 @@
-          SkullBlockEntity.m_222885_(services, this);
-          GameProfileCache.m_11004_(false);
-          this.f_91007_ = MinecraftServer.m_129872_((p_231361_) -> {
-            return new IntegratedServer(p_231361_, this, p_231382_, p_231383_, p_231384_, services, (p_231447_) -> {
-               StoringChunkProgressListener storingchunkprogresslistener = new StoringChunkProgressListener(p_231447_ + 0);
-+               return new IntegratedServer(p_231361_, this, p_231382_, p_231383_, p_231384_, services, (p_210795_) -> { //TODO-PATCHING: Handle the registry freeze delay again.
-+               StoringChunkProgressListener storingchunkprogresslistener = new StoringChunkProgressListener(p_210795_ + 0);
-                this.f_90999_.set(storingchunkprogresslistener);
-                return ProcessorChunkProgressListener.m_143583_(storingchunkprogresslistener, this.f_91023_::add);
-             });
-@@ -1945,6 +_,7 @@
+@@ -1978,6 +_,7 @@
    }
 
    public void m_91156_(ClientLevel p_91157_) {
@@ -348,20 +359,20 @@
       ProgressScreen progressscreen = new ProgressScreen(true);
       progressscreen.m_6309_(Component.m_237115_("connect.joining"));
       this.m_91362_(progressscreen);
-@@ -1978,10 +_,12 @@
+@@ -2011,10 +_,12 @@
       IntegratedServer integratedserver = this.f_91007_;
       this.f_91007_ = null;
       this.f_91063_.m_109150_();
 +      net.minecraftforge.client.ForgeHooksClient.firePlayerLogout(this.f_91072_, this.f_91074_);
       this.f_91072_ = null;
-       NarratorChatListener.f_93311_.m_93328_();
+       this.f_240365_.m_93328_();
       this.m_91362_(p_91321_);
       if (this.f_91073_ != null) {
 +         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.LevelEvent.Unload(f_91073_));
          if (integratedserver != null) {
             this.f_91026_.m_6180_("waitForServer");
 
-@@ -1996,6 +_,7 @@
+@@ -2029,6 +_,7 @@
          this.f_91065_.m_93089_();
          this.f_91008_ = null;
          this.f_91010_ = false;
@@ -369,7 +380,7 @@
          this.f_91004_.m_90740_();
       }
 
-@@ -2082,6 +_,7 @@
+@@ -2124,6 +_,7 @@
 
    private void m_91280_() {
       if (this.f_91077_ != null && this.f_91077_.m_6662_() != HitResult.Type.MISS) {
@@ -377,7 +388,7 @@
          boolean flag = this.f_91074_.m_150110_().f_35937_;
          BlockEntity blockentity = null;
          HitResult.Type hitresult$type = this.f_91077_.m_6662_();
-@@ -2094,10 +_,7 @@
+@@ -2136,10 +_,7 @@
             }
 
             Block block = blockstate.m_60734_();
@@ -389,7 +400,7 @@
 
             if (flag && Screen.m_96637_() && blockstate.m_155947_()) {
                blockentity = this.f_91073_.m_7702_(blockpos);
-@@ -2108,7 +_,7 @@
+@@ -2150,7 +_,7 @@
             }
 
             Entity entity = ((EntityHitResult)this.f_91077_).m_82443_();
@@ -398,7 +409,7 @@
             if (itemstack == null) {
                return;
             }
-@@ -2632,8 +_,8 @@
+@@ -2688,8 +_,8 @@
       return this.f_90993_;
    }
 
@@ -409,7 +420,7 @@
       Supplier<PackResources> supplier = p_167937_;
       if (i <= 3) {
          supplier = m_91330_(p_167937_);
-@@ -2643,7 +_,7 @@
+@@ -2699,7 +_,7 @@
          supplier = m_91352_(supplier);
       }
 
@@ -418,10 +429,12 @@
    }
 
    private static Supplier<PackResources> m_91330_(Supplier<PackResources> p_91331_) {
-@@ -2662,6 +_,14 @@
-       this.f_91051_.m_119410_(p_91313_);
-    }
+@@ -2716,6 +_,19 @@
 
+    public void m_91312_(int p_91313_) {
+       this.f_91051_.m_119410_(p_91313_);
+   }
+
 +   public ItemColors getItemColors() {
 +      return this.f_91041_;
 +   }
@@ -430,18 +443,9 @@
 +      return this.f_90997_;
 +   }
 +
-    public EntityModelSet m_167973_() {
-       return this.f_167844_;
-    }
-@@ -2719,4 +_,11 @@
- 
-       public abstract boolean m_142594_(boolean p_168035_);
-    }
-+
-+   // FORGE START
 +   private float realPartialTick;
 +   public float getPartialTick() {
 +      return realPartialTick;
-+   }
-+   // FORGE END
- }
+    }
+ 
+    public EntityModelSet m_167973_() {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -515,7 +_,8 @@
+@@ -539,7 +_,8 @@
    }, new OptionInstance.LazyEnum<>(() -> {
       return Stream.concat(Stream.of(""), Minecraft.m_91087_().m_91106_().m_194525_().stream()).toList();
    }, (p_232011_) -> {
@@ -10,7 +10,7 @@
    }, Codec.STRING), "", (p_231994_) -> {
       SoundManager soundmanager = Minecraft.m_91087_().m_91106_();
       soundmanager.m_194526_();
-@@ -772,6 +_,7 @@
+@@ -796,6 +_,7 @@
    }
 
    public Options(Minecraft p_92138_, File p_92139_) {
@@ -18,7 +18,7 @@
       this.f_92060_ = p_92138_;
       this.f_92110_ = new File(p_92139_, "options.txt");
       boolean flag = p_92138_.m_91103_();
-@@ -886,11 +_,20 @@
+@@ -910,11 +_,20 @@
       p_168428_.m_213982_("chatPreview", this.f_231796_);
       p_168428_.m_213982_("onlyShowSecureChat", this.f_231798_);
 
@@ -41,7 +41,7 @@
          }
       }
 
-@@ -911,6 +_,9 @@
+@@ -935,6 +_,9 @@
    }
 
    public void m_92140_() {
@@ -51,7 +51,7 @@
       try {
          if (!this.f_92110_.exists()) {
             return;
-@@ -955,7 +_,8 @@
+@@ -979,7 +_,8 @@
             }
          }
 
@@ -61,7 +61,7 @@
             @Nullable
             private String m_168458_(String p_168459_) {
                return compoundtag1.m_128441_(p_168459_) ? compoundtag1.m_128461_(p_168459_) : null;
-@@ -1058,6 +_,7 @@
+@@ -1082,6 +_,7 @@
    }
 
    public void m_92169_() {
@@ -69,7 +69,7 @@
       try {
          final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.f_92110_), StandardCharsets.UTF_8));
 
-@@ -1205,6 +_,23 @@
+@@ -1229,6 +_,23 @@
       }
 
       p_92146_.m_10509_(set);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Screenshot.java
 +++ b/net/minecraft/client/Screenshot.java
-@@ -59,13 +_,23 @@
+@@ -55,13 +_,23 @@
          file2 = new File(file1, p_92307_);
       }
 
@@ -23,19 +23,10 @@
       this.f_92535_ = p_193799_;
       this.f_92536_ = p_193800_;
       this.f_92537_ = p_193801_;
-@@ -58,10 +_,22 @@
-    public GameProfile m_92548_() {
-       try {
-          UUID uuid = UUIDTypeAdapter.fromString(this.m_92545_());
-         return new GameProfile(uuid, this.m_92546_());
-+         GameProfile ret = new GameProfile(uuid, this.m_92546_());    //Forge: Adds cached GameProfile properties to returned GameProfile.
-+         if (properties != null) ret.getProperties().putAll(properties); // Helps to cut down on calls to the session service,
-+         return ret;                                                     // which helps to fix MC-52974.
-       } catch (IllegalArgumentException illegalargumentexception) {
-          return new GameProfile((UUID)null, this.m_92546_());
+@@ -64,8 +_,22 @@
       }
-+   }
-+
+    }
+ 
 +   //For internal use only. Modders should never need to use this.
 +   public void setProperties(com.mojang.authlib.properties.PropertyMap properties) {
 +       if (this.properties == null)
@@ -44,6 +35,15 @@
 +
 +   public boolean hasCachedProperties() {
 +       return properties != null;
+   }
+
+    public GameProfile m_92548_() {
+-      return new GameProfile(this.m_240411_(), this.m_92546_());
+      // FORGE: Add cached GameProfile properties to returned GameProfile. This helps to cut down on calls to the session service.
+      GameProfile ret = new GameProfile(this.m_240411_(), this.m_92546_());
+      if (this.properties != null)
+         ret.getProperties().putAll(this.properties);
+      return ret;
    }
 
    public User.Type m_168638_() {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -400,6 +_,7 @@
+@@ -389,6 +_,7 @@
                   if (this.f_92986_.f_91076_ != null && this.f_92986_.f_91076_ instanceof LivingEntity && f >= 1.0F) {
                      flag = this.f_92986_.f_91074_.m_36333_() > 5.0F;
                      flag &= this.f_92986_.f_91076_.m_6084_();
@@ -8,7 +8,7 @@
                   }
 
                   int j = this.f_92978_ / 2 - 7 + 16;
-@@ -452,6 +_,10 @@
+@@ -441,6 +_,10 @@
 
          for(MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
             MobEffect mobeffect = mobeffectinstance.m_19544_();
@@ -19,7 +19,7 @@
             if (mobeffectinstance.m_19575_()) {
                int i = this.f_92977_;
                int j = 1;
-@@ -480,6 +_,7 @@
+@@ -469,6 +_,7 @@
                   }
                }
 
@@ -27,7 +27,7 @@
                TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.m_118732_(mobeffect);
                int l = i;
                int i1 = j;
-@@ -609,12 +_,13 @@
+@@ -598,12 +_,13 @@
    public void m_93069_(PoseStack p_93070_) {
       this.f_92986_.m_91307_().m_6180_("selectedItemName");
       if (this.f_92993_ > 0 && !this.f_92994_.m_41619_()) {
@@ -43,7 +43,7 @@
          int j = (this.f_92977_ - i) / 2;
          int k = this.f_92978_ - 59;
          if (!this.f_92986_.f_91072_.m_105205_()) {
-@@ -630,7 +_,13 @@
+@@ -619,7 +_,13 @@
             RenderSystem.m_69478_();
             RenderSystem.m_69453_();
             m_93172_(p_93070_, j - 2, k - 2, j + i + 2, k + 9 + 2, this.f_92986_.f_91066_.m_92143_(0));
@@ -58,7 +58,7 @@
             RenderSystem.m_69461_();
          }
       }
-@@ -1144,7 +_,7 @@
+@@ -1133,7 +_,7 @@
          ItemStack itemstack = this.f_92986_.f_91074_.m_150109_().m_36056_();
          if (itemstack.m_41619_()) {
             this.f_92993_ = 0;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/AbstractSelectionList.java
 +++ b/net/minecraft/client/gui/components/AbstractSelectionList.java
-@@ -532,6 +_,13 @@
+@@ -536,6 +_,13 @@
 
    }
 
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/components/toasts/ToastComponent.java
+++ b/net/minecraft/client/gui/components/toasts/ToastComponent.java
+@@ -103,6 +_,7 @@
+    }
+ 
+    public void m_94922_(Toast p_94923_) {
+      if (net.minecraftforge.client.ForgeHooksClient.onToastAdd(p_94923_)) return;
+       this.f_94916_.add(p_94923_);
+    }
+ 
@@ -101,7 +101,7 @@
          if (j2 + i > this.f_96543_) {
             j2 -= 28 + i;
          }
-@@ -231,15 +_,16 @@
+@@ -227,15 +_,16 @@
          RenderSystem.m_157427_(GameRenderer::m_172811_);
          bufferbuilder.m_166779_(VertexFormat.Mode.QUADS, DefaultVertexFormat.f_85815_);
          Matrix4f matrix4f = p_169384_.m_85850_().m_85861_();
@@ -127,7 +127,7 @@
          RenderSystem.m_69482_();
          RenderSystem.m_69472_();
          RenderSystem.m_69478_();
-@@ -253,7 +_,7 @@
+@@ -249,7 +_,7 @@
 
          for(int i2 = 0; i2 < p_169385_.size(); ++i2) {
             ClientTooltipComponent clienttooltipcomponent1 = p_169385_.get(i2);
@@ -136,7 +136,7 @@
             l1 += clienttooltipcomponent1.m_142103_() + (i2 == 0 ? 2 : 0);
          }
 
-@@ -263,7 +_,7 @@
+@@ -259,7 +_,7 @@
 
          for(int l2 = 0; l2 < p_169385_.size(); ++l2) {
             ClientTooltipComponent clienttooltipcomponent2 = p_169385_.get(l2);
@@ -145,7 +145,7 @@
             l1 += clienttooltipcomponent2.m_142103_() + (l2 == 0 ? 2 : 0);
          }
 
-@@ -363,9 +_,19 @@
+@@ -361,9 +_,19 @@
       this.f_96547_ = p_96607_.f_91062_;
       this.f_96543_ = p_96608_;
       this.f_96544_ = p_96609_;
@@ -165,7 +165,7 @@
    }
 
    protected void m_232761_() {
-@@ -394,6 +_,7 @@
+@@ -392,6 +_,7 @@
    public void m_96558_(PoseStack p_96559_, int p_96560_) {
       if (this.f_96541_.f_91073_ != null) {
          this.m_93179_(p_96559_, 0, 0, this.f_96543_, this.f_96544_, -1072689136, -804253680);
@@ -173,7 +173,7 @@
       } else {
          this.m_96626_(p_96560_);
       }
-@@ -413,6 +_,7 @@
+@@ -411,6 +_,7 @@
       bufferbuilder.m_5483_((double)this.f_96543_, 0.0D, 0.0D).m_7421_((float)this.f_96543_ / 32.0F, (float)p_96627_).m_6122_(64, 64, 64, 255).m_5752_();
       bufferbuilder.m_5483_(0.0D, 0.0D, 0.0D).m_7421_(0.0F, (float)p_96627_).m_6122_(64, 64, 64, 255).m_5752_();
       tesselator.m_85914_();
@@ -181,7 +181,7 @@
    }
 
    public boolean m_7043_() {
-@@ -498,6 +_,10 @@
+@@ -496,6 +_,10 @@
    }
 
    public void m_7400_(List<Path> p_96591_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/TitleScreen.java
 +++ b/net/minecraft/client/gui/screens/TitleScreen.java
-@@ -66,6 +_,7 @@
+@@ -68,6 +_,7 @@
    private long f_96715_;
    @Nullable
    private TitleScreen.WarningLabel f_232768_;
@@ -8,7 +8,7 @@
 
    public TitleScreen() {
       this(false);
-@@ -110,11 +_,16 @@
+@@ -112,11 +_,16 @@
       int j = this.f_96543_ - i - 2;
       int k = 24;
       int l = this.f_96544_ / 4 + 48;
@@ -25,7 +25,7 @@
 
       this.m_142416_(new ImageButton(this.f_96543_ / 2 - 124, l + 72 + 12, 20, 20, 0, 106, 20, Button.f_93617_, 256, 256, (p_96791_) -> {
          this.f_96541_.m_91152_(new LanguageSelectScreen(this, this.f_96541_.f_91066_, this.f_96541_.m_91102_()));
-@@ -169,7 +_,7 @@
+@@ -167,7 +_,7 @@
          Screen screen = (Screen)(this.f_96541_.f_91066_.f_92083_ ? new JoinMultiplayerScreen(this) : new SafetyScreen(this));
          this.f_96541_.m_91152_(screen);
       }, button$ontooltip))).f_93623_ = flag;
@@ -34,7 +34,7 @@
          this.m_96793_();
       }, button$ontooltip))).f_93623_ = flag;
    }
-@@ -298,6 +_,7 @@
+@@ -310,6 +_,7 @@
             this.f_232768_.m_232790_(p_96739_, l);
          }
 
@@ -42,7 +42,7 @@
          if (this.f_96721_ != null) {
             p_96739_.m_85836_();
             p_96739_.m_85837_((double)(this.f_96543_ / 2 + 90), 70.0D, 0.0D);
-@@ -320,7 +_,14 @@
+@@ -332,7 +_,14 @@
             s = s + I18n.m_118938_("menu.modded");
          }
 
@@ -58,8 +58,8 @@
 
          for(GuiEventListener guieventlistener : this.m_6702_()) {
             if (guieventlistener instanceof AbstractWidget) {
-@@ -332,6 +_,7 @@
-          if (this.m_96789_() && f1 >= 1.0F) {
+@@ -345,6 +_,7 @@
+             RenderSystem.m_69482_();
             this.f_96726_.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
          }
 +         if (f1 >= 1.0f) modUpdateNotification.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
@@ -7,7 +7,7 @@
 +   private static int tabPage, maxPages;
 
    public AdvancementsScreen(ClientAdvancements p_97340_) {
-       super(NarratorChatListener.f_93310_);
+       super(GameNarrator.f_93310_);
@@ -57,7 +_,13 @@
       } else {
          this.f_97334_.m_104401_(this.f_97336_ == null ? null : this.f_97336_.m_97182_(), true);
@@ -251,7 +251,7 @@
       this.m_93228_(p_98582_, l, i1, j, k, 28, 32);
       this.f_96542_.f_115093_ = 100.0F;
       l += 6;
-@@ -907,6 +_,22 @@
+@@ -909,6 +_,22 @@
 
       public boolean m_8010_(Player p_98665_) {
          return this.f_98655_.m_8010_(p_98665_);
@@ -1,12 +1,13 @@
 --- a/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
-@@ -42,12 +_,16 @@
+@@ -42,12 +_,17 @@
       if (!collection.isEmpty() && j >= 32) {
          RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
          boolean flag = j >= 120;
-+         var event = net.minecraftforge.client.ForgeHooksClient.onScreenPotionSize(this, j, !flag);
-+         if (event == 0) return; // 0 = cancel rendering
-+         flag = event == 2; // 2 = full-size / 1 = compact
+         var event = net.minecraftforge.client.ForgeHooksClient.onScreenPotionSize(this, j, !flag, i);
+         if (event.isCanceled()) return;
+         flag = !event.isCompact();
+         i = event.getHorizontalOffset();
          int k = 33;
          if (collection.size() > 5) {
             k = 132 / (collection.size() - 1);
@@ -0,0 +1,14 @@
+--- a/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
+++ b/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
+@@ -100,6 +_,11 @@
+    public static void m_98850_(int p_98851_, int p_98852_, int p_98853_, float p_98854_, float p_98855_, LivingEntity p_98856_) {
+       float f = (float)Math.atan((double)(p_98854_ / 40.0F));
+       float f1 = (float)Math.atan((double)(p_98855_ / 40.0F));
+      renderEntityInInventoryRaw(p_98851_, p_98852_, p_98853_, f, f1, p_98856_);
+   }
+   public static void renderEntityInInventoryRaw(int p_98851_, int p_98852_, int p_98853_, float angleXComponent, float angleYComponent, LivingEntity p_98856_) {
+      float f = angleXComponent;
+      float f1 = angleYComponent;
+       PoseStack posestack = RenderSystem.m_157191_();
+       posestack.m_85836_();
+       posestack.m_85837_((double)p_98851_, (double)p_98852_, 1050.0D);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
-@@ -68,6 +_,7 @@
+@@ -65,6 +_,7 @@
    static final DateFormat f_101646_ = new SimpleDateFormat();
    static final ResourceLocation f_101647_ = new ResourceLocation("textures/misc/unknown_server.png");
    static final ResourceLocation f_101648_ = new ResourceLocation("textures/gui/world_selection.png");
@@ -8,7 +8,7 @@
    static final Component f_101649_ = Component.m_237115_("selectWorld.tooltip.fromNewerVersion1").m_130940_(ChatFormatting.RED);
    static final Component f_101650_ = Component.m_237115_("selectWorld.tooltip.fromNewerVersion2").m_130940_(ChatFormatting.RED);
    static final Component f_101651_ = Component.m_237115_("selectWorld.tooltip.snapshot1").m_130940_(ChatFormatting.GOLD);
-@@ -326,6 +_,7 @@
+@@ -325,6 +_,7 @@
          RenderSystem.m_69478_();
          GuiComponent.m_93133_(p_101721_, p_101724_, p_101723_, 0.0F, 0.0F, 32, 32, 32, 32);
          RenderSystem.m_69461_();
@@ -16,17 +16,19 @@
          if (this.f_101693_.f_91066_.m_231828_().m_231551_() || p_101729_) {
             RenderSystem.m_157456_(0, WorldSelectionList.f_101648_);
             GuiComponent.m_93172_(p_101721_, p_101724_, p_101723_, p_101724_ + 32, p_101723_ + 32, -1601138544);
-@@ -647,6 +_,19 @@
+@@ -646,6 +_,21 @@
 
       public boolean m_214209_() {
          return !this.f_101695_.m_164916_();
 +      }
+
+      // FORGE: Patch in experimental warning icon for worlds in the world selection screen
 +      private void renderExperimentalWarning(PoseStack stack, int mouseX, int mouseY, int top, int left) {
 +         if (this.f_101695_.isExperimental()) {
 +            int leftStart = left + WorldSelectionList.this.m_5759_();
 +            RenderSystem.m_157456_(0, WorldSelectionList.FORGE_EXPERIMENTAL_WARNING_ICON);
 +            GuiComponent.m_93133_(stack, leftStart - 36, top, 0.0F, 0.0F, 32, 32, 32, 32);
-+            //Reset texture to what it was before
+            // Reset texture to what it was before
 +            RenderSystem.m_157456_(0, this.f_101698_ != null ? this.f_101696_ : WorldSelectionList.f_101647_);
 +            if (WorldSelectionList.this.m_93412_(mouseX, mouseY) == this && mouseX > leftStart - 36 && mouseX < leftStart) {
 +               List<net.minecraft.util.FormattedCharSequence> tooltip = Minecraft.m_91087_().f_91062_.m_92923_(Component.m_237115_("forge.experimentalsettings.tooltip"), 200);
@@ -1,14 +1,15 @@
 --- a/net/minecraft/client/main/Main.java
 +++ b/net/minecraft/client/main/Main.java
-@@ -49,6 +_,7 @@
+@@ -48,7 +_,7 @@
+ 
    @DontObfuscate
    public static void main(String[] p_129642_) {
-       SharedConstants.m_142977_();
-+      if (!net.minecraftforge.fml.loading.FMLConfig.isOptimizedDFUDisabled())
-       SharedConstants.m_214358_();
-       OptionParser optionparser = new OptionParser();
-       optionparser.allowsUnrecognizedOptions();
-@@ -135,7 +_,7 @@
+-      m_239872_(p_129642_, true);
+      m_239872_(p_129642_, !net.minecraftforge.fml.loading.FMLConfig.isOptimizedDFUDisabled());
+    }
+ 
+    public static void m_239872_(String[] p_239873_, boolean p_239874_) {
+@@ -142,7 +_,7 @@
       }
 
       CrashReport.m_127529_();
@@ -0,0 +1,59 @@
+--- a/net/minecraft/client/model/HumanoidModel.java
+++ b/net/minecraft/client/model/HumanoidModel.java
+@@ -264,6 +_,8 @@
+          case TOOT_HORN:
+             this.f_102811_.f_104203_ = Mth.m_14036_(this.f_102808_.f_104203_, -1.2F, 1.2F) - 1.4835298F;
+             this.f_102811_.f_104204_ = this.f_102808_.f_104204_ - ((float)Math.PI / 6F);
+         default:
+            this.f_102816_.applyTransform(this, p_102876_, net.minecraft.world.entity.HumanoidArm.RIGHT);
+       }
+ 
+    }
+@@ -304,6 +_,8 @@
+          case TOOT_HORN:
+             this.f_102812_.f_104203_ = Mth.m_14036_(this.f_102808_.f_104203_, -1.2F, 1.2F) - 1.4835298F;
+             this.f_102812_.f_104204_ = this.f_102808_.f_104204_ + ((float)Math.PI / 6F);
+         default:
+            this.f_102815_.applyTransform(this, p_102879_, net.minecraft.world.entity.HumanoidArm.LEFT);
+       }
+ 
+    }
+@@ -396,7 +_,7 @@
+    }
+ 
+    @OnlyIn(Dist.CLIENT)
+-   public static enum ArmPose {
+   public static enum ArmPose implements net.minecraftforge.common.IExtensibleEnum {
+       EMPTY(false),
+       ITEM(false),
+       BLOCK(false),
+@@ -411,10 +_,29 @@
+ 
+       private ArmPose(boolean p_102896_) {
+          this.f_102890_ = p_102896_;
+         this.forgeArmPose = null;
+       }
+ 
+       public boolean m_102897_() {
+          return this.f_102890_;
+       }
+      // FORGE START
+      @javax.annotation.Nullable
+      private final net.minecraftforge.client.IArmPoseTransformer forgeArmPose;
+
+      private ArmPose(boolean twoHanded, @javax.annotation.Nonnull net.minecraftforge.client.IArmPoseTransformer forgeArmPose) {
+         this.f_102890_ = twoHanded;
+         com.google.common.base.Preconditions.checkNotNull(forgeArmPose, "Cannot create new ArmPose with null transformer!");
+         this.forgeArmPose = forgeArmPose;
+      }
+
+      public static ArmPose create(String name, boolean twoHanded, @javax.annotation.Nonnull net.minecraftforge.client.IArmPoseTransformer forgeArmPose) {
+         throw new IllegalStateException("Enum not extended");
+      }
+
+      public <T extends LivingEntity> void applyTransform(HumanoidModel<T> model, T entity, net.minecraft.world.entity.HumanoidArm arm) {
+         if (this.forgeArmPose != null) this.forgeArmPose.applyTransform(model, entity, arm);
+      }
+      // FORGE END
+    }
+ }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
 +++ b/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
-@@ -126,6 +_,7 @@
+@@ -130,6 +_,7 @@
       this.f_104521_.accept(Component.m_237115_("connect.joining"));
       this.f_104523_ = p_104547_.m_134774_();
       this.f_104522_.m_129498_(ConnectionProtocol.PLAY);
@@ -8,7 +8,7 @@
       this.f_104522_.m_129505_(new ClientPacketListener(this.f_104519_, this.f_104520_, this.f_104522_, this.f_104523_, this.f_104519_.m_193590_()));
    }
 
-@@ -133,7 +_,7 @@
+@@ -137,7 +_,7 @@
       if (this.f_104520_ != null && this.f_104520_ instanceof RealmsScreen) {
          this.f_104519_.m_91152_(new DisconnectedRealmsScreen(this.f_104520_, CommonComponents.f_130661_, p_104543_));
       } else {
@@ -17,7 +17,7 @@
       }
 
    }
-@@ -154,6 +_,7 @@
+@@ -158,6 +_,7 @@
    }
 
    public void m_7254_(ClientboundCustomQueryPacket p_104545_) {
@@ -1,6 +1,13 @@
 --- a/net/minecraft/client/multiplayer/ClientLevel.java
 +++ b/net/minecraft/client/multiplayer/ClientLevel.java
-@@ -121,6 +_,8 @@
+@@ -115,12 +_,15 @@
+       p_194170_.put(BiomeColors.f_108791_, new BlockTintCache((p_194168_) -> {
+          return this.m_104762_(p_194168_, BiomeColors.f_108791_);
+       }));
+      net.minecraftforge.client.ColorResolverManager.registerBlockTintCaches(ClientLevel.this, p_194170_);
+    });
+    private final ClientChunkCache f_104559_;
+    private final Deque<Runnable> f_194122_ = Queues.newArrayDeque();
    private int f_194123_;
    private final BlockStatePredictionHandler f_233599_ = new BlockStatePredictionHandler();
    private static final Set<Item> f_194124_ = Set.of(Items.f_42127_, Items.f_151033_);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientPacketListener.java
 +++ b/net/minecraft/client/multiplayer/ClientPacketListener.java
-@@ -361,6 +_,7 @@
+@@ -375,6 +_,7 @@
 
       this.f_104888_.f_91064_.m_113434_();
       this.f_104888_.f_91074_.m_172530_();
@@ -8,7 +8,7 @@
       int i = p_105030_.f_132360_();
       this.f_104888_.f_91074_.m_20234_(i);
       this.f_104889_.m_104630_(i, this.f_104888_.f_91074_);
-@@ -373,6 +_,7 @@
+@@ -387,6 +_,7 @@
       this.f_104888_.f_91074_.m_219749_(p_105030_.f_238174_());
       this.f_104888_.f_91072_.m_171805_(p_105030_.f_132363_(), p_105030_.f_132364_());
       this.f_104888_.f_91066_.m_193770_(p_105030_.f_132370_());
@@ -16,16 +16,7 @@
       this.f_104888_.f_91066_.m_92172_();
       this.f_104885_.m_129512_(new ServerboundCustomPayloadPacket(ServerboundCustomPayloadPacket.f_133979_, (new FriendlyByteBuf(Unpooled.buffer())).m_130070_(ClientBrandRetriever.m_129629_())));
       this.f_104888_.m_91309_().m_90739_();
-@@ -768,6 +_,8 @@
-       }
- 
-       Component component = flag ? p_233693_.f_237213_() : p_233693_.m_237220_();
-+      component = net.minecraftforge.client.ForgeHooksClient.onClientChat(p_233692_, component, p_233694_);
-+      if (component == null) return;
-       this.f_104888_.f_91065_.m_232360_(p_233692_, component, p_233694_);
-    }
- 
-@@ -931,8 +_,10 @@
+@@ -941,8 +_,10 @@
          localplayer1.m_21204_().m_22159_(localplayer.m_21204_());
       }
 
@@ -36,7 +27,7 @@
       this.f_104889_.m_104630_(i, localplayer1);
       localplayer1.m_146922_(-180.0F);
       localplayer1.f_108618_ = new KeyboardInput(this.f_104888_.f_91066_);
-@@ -1036,10 +_,7 @@
+@@ -1046,10 +_,7 @@
       PacketUtils.m_131363_(p_104976_, this, this.f_104888_);
       BlockPos blockpos = p_104976_.m_131704_();
       this.f_104888_.f_91073_.m_141902_(blockpos, p_104976_.m_195645_()).ifPresent((p_205557_) -> {
@@ -48,7 +39,7 @@
 
          if (p_205557_ instanceof CommandBlockEntity && this.f_104888_.f_91080_ instanceof CommandBlockEditScreen) {
             ((CommandBlockEditScreen)this.f_104888_.f_91080_).m_98398_();
-@@ -1184,7 +_,9 @@
+@@ -1194,7 +_,9 @@
 
    public void m_7443_(ClientboundCommandsPacket p_104990_) {
       PacketUtils.m_131363_(p_104990_, this, this.f_104888_);
@@ -59,7 +50,7 @@
    }
 
    public void m_7183_(ClientboundStopSoundPacket p_105116_) {
-@@ -1203,6 +_,7 @@
+@@ -1213,6 +_,7 @@
       ClientRecipeBook clientrecipebook = this.f_104888_.f_91074_.m_108631_();
       clientrecipebook.m_90625_(this.f_104900_.m_44051_());
       this.f_104888_.m_231374_(SearchRegistry.f_119943_, clientrecipebook.m_90639_());
@@ -67,7 +58,7 @@
    }
 
    public void m_7244_(ClientboundPlayerLookAtPacket p_105054_) {
-@@ -1304,6 +_,7 @@
+@@ -1314,6 +_,7 @@
 
       this.f_104888_.m_231374_(SearchRegistry.f_119941_, nonnulllist);
       this.f_104888_.m_231374_(SearchRegistry.f_119942_, nonnulllist);
@@ -75,7 +66,7 @@
    }
 
    private <T> void m_205560_(ResourceKey<? extends Registry<? extends T>> p_205561_, TagNetworkSerialization.NetworkPayload p_205562_) {
-@@ -1646,6 +_,7 @@
+@@ -1666,6 +_,7 @@
    }
 
    public void m_7413_(ClientboundCustomPayloadPacket p_105004_) {
@@ -83,7 +74,7 @@
       PacketUtils.m_131363_(p_105004_, this, this.f_104888_);
       ResourceLocation resourcelocation = p_105004_.m_132042_();
       FriendlyByteBuf friendlybytebuf = null;
-@@ -1843,7 +_,7 @@
+@@ -1863,7 +_,7 @@
             int j5 = friendlybytebuf.m_130242_();
             this.f_104888_.f_91064_.f_173815_.m_173830_(positionsource, j5);
          } else {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/PlayerInfo.java
 +++ b/net/minecraft/client/multiplayer/PlayerInfo.java
-@@ -77,6 +_,7 @@
+@@ -82,6 +_,7 @@
    }
 
    protected void m_105317_(GameType p_105318_) {
@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/multiplayer/ProfileKeyPairManager.java
 +++ b/net/minecraft/client/multiplayer/ProfileKeyPairManager.java
-@@ -64,6 +_,8 @@
-                this.m_233776_(profilekeypair);
-                return Optional.of(profilekeypair);
-             } catch (CryptException | MinecraftClientException | IOException ioexception) {
-+               // Forge: The offline user api service always returns a null profile key pair, so let's hide this useless exception if in dev
-+               if (net.minecraftforge.fml.loading.FMLLoader.isProduction() || p_233781_ != UserApiService.OFFLINE)
-                f_233765_.error("Failed to retrieve profile key pair", (Throwable)ioexception);
-                this.m_233776_((ProfileKeyPair)null);
-                return optional;
+@@ -76,6 +_,8 @@
+             this.m_233776_(profilekeypair);
+             return Optional.of(profilekeypair);
+          } catch (CryptException | MinecraftClientException | IOException ioexception) {
+            // Forge: The offline user api service always returns a null profile key pair, so let's hide this useless exception if in dev
+            if (net.minecraftforge.fml.loading.FMLLoader.isProduction() || this.f_243348_ != UserApiService.OFFLINE)
+             f_233765_.error("Failed to retrieve profile key pair", (Throwable)ioexception);
+             this.m_233776_((ProfileKeyPair)null);
+             return p_243401_;
@@ -1,9 +1,9 @@
 --- a/net/minecraft/client/multiplayer/ServerData.java
 +++ b/net/minecraft/client/multiplayer/ServerData.java
-@@ -35,6 +_,7 @@
-    @Nullable
+@@ -36,6 +_,7 @@
    private ServerData.ChatPreview f_233800_;
    private boolean f_233801_ = true;
+    private boolean f_242950_;
 +   public net.minecraftforge.client.ExtendedServerListData forgeData = null;
 
    public ServerData(String p_105375_, String p_105376_, boolean p_105377_) {
@@ -0,0 +1,32 @@
+--- a/net/minecraft/client/multiplayer/chat/ChatListener.java
+++ b/net/minecraft/client/multiplayer/chat/ChatListener.java
+@@ -175,12 +_,16 @@
+          MessageSignature messagesignature = p_242317_.f_240893_();
+          FilterMask filtermask = p_242317_.f_242992_();
+          if (filtermask.m_243095_()) {
+-            this.f_240348_.f_91065_.m_93076_().m_240964_(p_243337_, messagesignature, guimessagetag);
+            Component forgeComponent = net.minecraftforge.client.ForgeHooksClient.onClientChat(p_242290_, p_243337_, p_242317_, p_242317_.m_241067_());
+            if (forgeComponent == null) return false;
+            this.f_240348_.f_91065_.m_93076_().m_240964_(forgeComponent, messagesignature, guimessagetag);
+             this.m_241119_(p_242290_, p_242317_.m_237220_());
+          } else {
+             Component component = filtermask.m_243081_(p_242317_.m_241775_());
+             if (component != null) {
+-               this.f_240348_.f_91065_.m_93076_().m_240964_(p_242290_.m_240977_(component), messagesignature, guimessagetag);
+               Component forgeComponent = net.minecraftforge.client.ForgeHooksClient.onClientChat(p_242290_, p_242290_.m_240977_(component), p_242317_, p_242317_.m_241067_());
+               if (forgeComponent == null) return false;
+               this.f_240348_.f_91065_.m_93076_().m_240964_(forgeComponent, messagesignature, guimessagetag);
+                this.m_241119_(p_242290_, component);
+             }
+          }
+@@ -194,7 +_,9 @@
+    }
+ 
+    boolean m_241171_(ChatType.Bound p_241518_, PlayerChatMessage p_241542_, Component p_241510_) {
+-      this.f_240348_.f_91065_.m_93076_().m_93785_(p_241510_);
+      Component forgeComponent = net.minecraftforge.client.ForgeHooksClient.onClientChat(p_241518_, p_241510_, p_241542_, p_241542_.m_241067_());
+      if (forgeComponent == null) return false;
+      this.f_240348_.f_91065_.m_93076_().m_93785_(forgeComponent);
+       this.m_241119_(p_241518_, p_241542_.m_237220_());
+       this.m_240498_(p_241510_, p_241542_.m_241109_());
+       this.f_240659_ = Util.m_137550_();
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/multiplayer/resolver/AddressCheck.java
+++ b/net/minecraft/client/multiplayer/resolver/AddressCheck.java
+@@ -16,7 +_,7 @@
+    boolean m_142408_(ServerAddress p_171830_);
+ 
+    static AddressCheck m_171828_() {
+-      final ImmutableList<Predicate<String>> immutablelist = Streams.stream(ServiceLoader.load(BlockListSupplier.class)).map(BlockListSupplier::createBlockList).filter(Objects::nonNull).collect(ImmutableList.toImmutableList());
+      final ImmutableList<Predicate<String>> immutablelist = Streams.stream(ServiceLoader.load(BlockListSupplier.class, net.minecraftforge.fml.loading.FMLLoader.class.getClassLoader())).map(BlockListSupplier::createBlockList).filter(Objects::nonNull).collect(ImmutableList.toImmutableList());
+       return new AddressCheck() {
+          public boolean m_142649_(ResolvedServerAddress p_171835_) {
+             String s = p_171835_.m_142727_();
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/particle/EnchantmentTableParticle.java
+++ b/net/minecraft/client/particle/EnchantmentTableParticle.java
+@@ -73,6 +_,7 @@
+          this.f_107212_ = this.f_106461_ + this.f_107215_ * (double)f;
+          this.f_107213_ = this.f_106462_ + this.f_107216_ * (double)f - (double)(f1 * 1.2F);
+          this.f_107214_ = this.f_106460_ + this.f_107217_ * (double)f;
+         this.m_107264_(this.f_107212_, this.f_107213_, this.f_107214_); // FORGE: update the particle's bounding box
+       }
+    }
+ 
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/particle/PortalParticle.java
+++ b/net/minecraft/client/particle/PortalParticle.java
+@@ -75,6 +_,7 @@
+          this.f_107212_ = this.f_107548_ + this.f_107215_ * (double)f2;
+          this.f_107213_ = this.f_107549_ + this.f_107216_ * (double)f2 + (double)(1.0F - f);
+          this.f_107214_ = this.f_107547_ + this.f_107217_ * (double)f2;
+         this.m_107264_(this.f_107212_, this.f_107213_, this.f_107214_); // FORGE: update the particle's bounding box
+       }
+    }
+ 
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/particle/ReversePortalParticle.java
+++ b/net/minecraft/client/particle/ReversePortalParticle.java
+@@ -29,6 +_,7 @@
+          this.f_107212_ += this.f_107215_ * (double)f;
+          this.f_107213_ += this.f_107216_ * (double)f;
+          this.f_107214_ += this.f_107217_ * (double)f;
+         this.m_107264_(this.f_107212_, this.f_107213_, this.f_107214_); // FORGE: update the particle's bounding box
+       }
+    }
+ 
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/particle/VibrationSignalParticle.java
+++ b/net/minecraft/client/particle/VibrationSignalParticle.java
+@@ -100,6 +_,7 @@
+             this.f_107212_ = Mth.m_14139_(d0, this.f_107212_, vec3.m_7096_());
+             this.f_107213_ = Mth.m_14139_(d0, this.f_107213_, vec3.m_7098_());
+             this.f_107214_ = Mth.m_14139_(d0, this.f_107214_, vec3.m_7094_());
+            this.m_107264_(this.f_107212_, this.f_107213_, this.f_107214_); // FORGE: update the particle's bounding box
+             this.f_172460_ = this.f_172462_;
+             this.f_172462_ = (float)Mth.m_14136_(this.f_107212_ - vec3.m_7096_(), this.f_107214_ - vec3.m_7094_());
+          }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/player/AbstractClientPlayer.java
 +++ b/net/minecraft/client/player/AbstractClientPlayer.java
-@@ -146,6 +_,6 @@
+@@ -137,6 +_,6 @@
          }
       }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/player/LocalPlayer.java
 +++ b/net/minecraft/client/player/LocalPlayer.java
-@@ -159,6 +_,7 @@
+@@ -162,6 +_,7 @@
    }
 
    public boolean m_6469_(DamageSource p_108662_, float p_108663_) {
@@ -8,25 +8,24 @@
       return false;
    }
 
-@@ -290,6 +_,9 @@
+@@ -289,6 +_,8 @@
    }
 
-    public void m_234125_(String p_234126_, @Nullable Component p_234127_) {
-+      // TODO-PATCHING: If the chat preview component is not null and the message is changed by this event, it looks like the signatures will de-sync and the server will skip the message. Fix? -SS
-+      p_234126_ = net.minecraftforge.client.ForgeHooksClient.onClientSendMessage(p_234126_);
-+      if (p_234126_.isEmpty()) return;
-       MessageSigner messagesigner = MessageSigner.m_237183_(this.m_20148_());
-       this.m_234141_(messagesigner, p_234126_, p_234127_);
-    }
-@@ -328,6 +_,7 @@
+    public void m_240287_(String p_240288_, @Nullable Component p_240289_) {
+      p_240288_ = net.minecraftforge.client.ForgeHooksClient.onClientSendMessage(p_240288_);
+      if (p_240288_.isEmpty()) return;
+       this.m_240966_(p_240288_, p_240289_);
    }
 
-    private void m_234151_(MessageSigner p_234152_, String p_234153_, @Nullable Component p_234154_) {
-+      if (net.minecraftforge.client.ClientCommandHandler.runCommand(p_234153_)) return;
-       ParseResults<SharedSuggestionProvider> parseresults = this.f_108617_.m_105146_().parse(p_234153_, this.f_108617_.m_105137_());
-       ArgumentSignatures argumentsignatures = this.m_234137_(p_234152_, parseresults, p_234154_);
-       this.f_108617_.m_104955_(new ServerboundChatCommandPacket(p_234153_, p_234152_.f_237170_(), argumentsignatures, p_234154_ != null));
-@@ -544,7 +_,13 @@
+@@ -333,6 +_,7 @@
+    }
+ 
+    private void m_241110_(String p_241331_, @Nullable Component p_241563_) {
+      if (net.minecraftforge.client.ClientCommandHandler.runCommand(p_241331_)) return;
+       ParseResults<SharedSuggestionProvider> parseresults = this.f_108617_.m_105146_().parse(p_241331_, this.f_108617_.m_105137_());
+       MessageSigner messagesigner = this.m_241001_();
+       LastSeenMessages.Update lastseenmessages$update = this.f_108617_.m_241918_();
+@@ -547,7 +_,13 @@
    }
 
    public void m_5496_(SoundEvent p_108651_, float p_108652_, float p_108653_) {
@@ -41,7 +40,7 @@
    }
 
    public void m_6330_(SoundEvent p_108655_, SoundSource p_108656_, float p_108657_, float p_108658_) {
-@@ -700,6 +_,7 @@
+@@ -703,6 +_,7 @@
       this.f_108601_ = !this.m_150110_().f_35935_ && !this.m_6069_() && this.m_20175_(Pose.CROUCHING) && (this.m_6144_() || !this.m_5803_() && !this.m_20175_(Pose.STANDING));
       float f = Mth.m_14036_(0.3F + EnchantmentHelper.m_220302_(this), 0.0F, 1.0F);
       this.f_108618_.m_214106_(this.m_108635_(), f);
@@ -49,7 +48,7 @@
       this.f_108619_.m_91301_().m_120586_(this.f_108618_);
       if (this.m_6117_() && !this.m_20159_()) {
          this.f_108618_.f_108566_ *= 0.2F;
-@@ -726,7 +_,7 @@
+@@ -729,7 +_,7 @@
       }
 
       boolean flag4 = (float)this.m_36324_().m_38702_() > 6.0F || this.m_150110_().f_35936_;
@@ -58,7 +57,7 @@
          if (this.f_108583_ <= 0 && !this.f_108619_.f_91066_.f_92091_.m_90857_()) {
             this.f_108583_ = 7;
          } else {
-@@ -734,15 +_,15 @@
+@@ -737,15 +_,15 @@
          }
       }
 
@@ -77,7 +76,7 @@
                this.m_6858_(false);
             }
          } else if (flag6) {
-@@ -772,14 +_,15 @@
+@@ -775,14 +_,15 @@
 
       if (this.f_108618_.f_108572_ && !flag7 && !flag && !this.m_150110_().f_35935_ && !this.m_20159_() && !this.m_6147_()) {
          ItemStack itemstack = this.m_6844_(EquipmentSlot.CHEST);
@@ -96,7 +95,7 @@
       }
 
       if (this.m_204029_(FluidTags.f_13131_)) {
-@@ -890,6 +_,7 @@
+@@ -893,6 +_,7 @@
 
    public void m_6083_() {
       super.m_6083_();
@@ -104,7 +103,7 @@
       this.f_108611_ = false;
       if (this.m_20202_() instanceof Boat) {
          Boat boat = (Boat)this.m_20202_();
-@@ -1103,6 +_,18 @@
+@@ -1106,6 +_,18 @@
       } else {
          return super.m_7398_(p_108758_);
       }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/FogRenderer.java
 +++ b/net/minecraft/client/renderer/FogRenderer.java
-@@ -182,6 +_,12 @@
+@@ -190,6 +_,12 @@
          f_109012_ = f_109012_ * (1.0F - f7) + f_109012_ * f9 * f7;
       }
 
@@ -13,7 +13,7 @@
       RenderSystem.m_69424_(f_109010_, f_109011_, f_109012_, 0.0F);
    }
 
-@@ -263,6 +_,7 @@
+@@ -271,6 +_,7 @@
       RenderSystem.m_157445_(fogrenderer$fogdata.f_234200_);
       RenderSystem.m_157443_(fogrenderer$fogdata.f_234201_);
       RenderSystem.m_202160_(fogrenderer$fogdata.f_234202_);
@@ -109,7 +109,7 @@
 +      BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
 +   }
 +
-+   public static void setRenderLayer(Fluid fluid, RenderType type) {
+   public static synchronized void setRenderLayer(Fluid fluid, RenderType type) {
 +      com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
 +      checkClientLoading();
 +      FLUID_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(fluid), type);
@@ -24,6 +24,14 @@
             boolean flag1 = CrossbowItem.m_40932_(p_109377_);
             boolean flag2 = humanoidarm == HumanoidArm.RIGHT;
             int i = flag2 ? 1 : -1;
+@@ -384,6 +_,7 @@
+             this.m_109322_(p_109372_, p_109377_, flag2 ? ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND : ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, !flag2, p_109379_, p_109380_, p_109381_);
+          } else {
+             boolean flag3 = humanoidarm == HumanoidArm.RIGHT;
+            if (!net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_109377_).applyForgeHandTransform(p_109379_, f_109299_.f_91074_, humanoidarm, p_109377_, p_109373_, p_109378_, p_109376_)) // FORGE: Allow items to define custom arm animation
+             if (p_109372_.m_6117_() && p_109372_.m_21212_() > 0 && p_109372_.m_7655_() == p_109375_) {
+                int k = flag3 ? 1 : -1;
+                switch (p_109377_.m_41780_()) {
@@ -487,8 +_,16 @@
          this.f_109304_ = Mth.m_14036_(this.f_109304_ - 0.4F, 0.0F, 1.0F);
       } else {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/LevelRenderer.java
 +++ b/net/minecraft/client/renderer/LevelRenderer.java
-@@ -263,6 +_,8 @@
+@@ -264,6 +_,8 @@
    }
 
    private void m_109703_(LightTexture p_109704_, float p_109705_, double p_109706_, double p_109707_, double p_109708_) {
@@ -9,7 +9,7 @@
       float f = this.f_109461_.f_91073_.m_46722_(p_109705_);
       if (!(f <= 0.0F)) {
          p_109704_.m_109896_();
-@@ -383,6 +_,8 @@
+@@ -384,6 +_,8 @@
    }
 
    public void m_109693_(Camera p_109694_) {
@@ -18,7 +18,7 @@
       float f = this.f_109461_.f_91073_.m_46722_(1.0F) / (Minecraft.m_91405_() ? 1.0F : 2.0F);
       if (!(f <= 0.0F)) {
          RandomSource randomsource = RandomSource.m_216335_((long)this.f_109477_ * 312987231L);
-@@ -1140,11 +_,13 @@
+@@ -1141,11 +_,13 @@
       RenderSystem.m_69421_(16640, Minecraft.f_91002_);
       float f = p_109605_.m_109152_();
       boolean flag2 = this.f_109461_.f_91073_.m_104583_().m_5781_(Mth.m_14107_(d0), Mth.m_14107_(d1)) || this.f_109461_.f_91065_.m_93090_().m_93715_();
@@ -32,7 +32,7 @@
       profilerfiller.m_6182_("fog");
       FogRenderer.m_234172_(p_109604_, FogRenderer.FogMode.FOG_TERRAIN, Math.max(f, 32.0F), flag2, p_109601_);
       profilerfiller.m_6182_("terrain_setup");
-@@ -1153,7 +_,9 @@
+@@ -1154,7 +_,9 @@
       this.m_194370_(p_109604_);
       profilerfiller.m_6182_("terrain");
       this.m_172993_(RenderType.m_110451_(), p_109600_, d0, d1, d2, p_109607_);
@@ -42,7 +42,7 @@
       this.m_172993_(RenderType.m_110463_(), p_109600_, d0, d1, d2, p_109607_);
       if (this.f_109465_.m_104583_().m_108885_()) {
          Lighting.m_84925_(p_109600_.m_85850_().m_85861_());
-@@ -1185,7 +_,7 @@
+@@ -1186,7 +_,7 @@
       for(Entity entity : this.f_109465_.m_104735_()) {
          if (this.f_109463_.m_114397_(entity, frustum, d0, d1, d2) || entity.m_20367_(this.f_109461_.f_91074_)) {
             BlockPos blockpos = entity.m_20183_();
@@ -51,7 +51,17 @@
                ++this.f_109439_;
                if (entity.f_19797_ == 0) {
                   entity.f_19790_ = entity.m_20185_();
-@@ -1225,6 +_,7 @@
+@@ -1206,6 +_,9 @@
+                   int i1 = i & 255;
+                   outlinebuffersource.m_109929_(k, l, i1, 255);
+                } else {
+                  if (this.m_109817_() && entity.hasCustomOutlineRendering(this.f_109461_.f_91074_)) { // FORGE: allow custom outline rendering
+                     flag3 = true;
+                  }
+                   multibuffersource = multibuffersource$buffersource;
+                }
+ 
+@@ -1226,6 +_,7 @@
          List<BlockEntity> list = levelrenderer$renderchunkinfo.f_109839_.m_112835_().m_112773_();
          if (!list.isEmpty()) {
             for(BlockEntity blockentity1 : list) {
@@ -59,7 +69,17 @@
                BlockPos blockpos4 = blockentity1.m_58899_();
                MultiBufferSource multibuffersource1 = multibuffersource$buffersource;
                p_109600_.m_85836_();
-@@ -1250,6 +_,7 @@
+@@ -1242,6 +_,9 @@
+                      };
+                   }
+                }
+               if (this.m_109817_() && blockentity1.hasCustomOutlineRendering(this.f_109461_.f_91074_)) { // FORGE: allow custom outline rendering
+                  flag3 = true;
+               }
+ 
+                this.f_172946_.m_112267_(blockentity1, p_109601_, p_109600_, multibuffersource1);
+                p_109600_.m_85849_();
+@@ -1251,9 +_,13 @@
 
       synchronized(this.f_109468_) {
          for(BlockEntity blockentity : this.f_109468_) {
@@ -67,7 +87,13 @@
             BlockPos blockpos3 = blockentity.m_58899_();
             p_109600_.m_85836_();
             p_109600_.m_85837_((double)blockpos3.m_123341_() - d0, (double)blockpos3.m_123342_() - d1, (double)blockpos3.m_123343_() - d2);
-@@ -1289,7 +_,8 @@
+            if (this.m_109817_() && blockentity.hasCustomOutlineRendering(this.f_109461_.f_91074_)) { // FORGE: allow custom outline rendering
+               flag3 = true;
+            }
+             this.f_172946_.m_112267_(blockentity, p_109601_, p_109600_, multibuffersource$buffersource);
+             p_109600_.m_85849_();
+          }
+@@ -1290,7 +_,8 @@
                p_109600_.m_85837_((double)blockpos2.m_123341_() - d0, (double)blockpos2.m_123342_() - d1, (double)blockpos2.m_123343_() - d2);
                PoseStack.Pose posestack$pose = p_109600_.m_85850_();
                VertexConsumer vertexconsumer1 = new SheetedDecalTextureGenerator(this.f_109464_.m_110108_().m_6299_(ModelBakery.f_119229_.get(k1)), posestack$pose.m_85861_(), posestack$pose.m_85864_());
@@ -77,7 +103,7 @@
                p_109600_.m_85849_();
             }
          }
-@@ -1301,10 +_,13 @@
+@@ -1302,10 +_,13 @@
          profilerfiller.m_6182_("outline");
          BlockPos blockpos1 = ((BlockHitResult)hitresult).m_82425_();
          BlockState blockstate = this.f_109465_.m_8055_(blockpos1);
@@ -91,7 +117,7 @@
       }
 
       PoseStack posestack = RenderSystem.m_157191_();
-@@ -1339,7 +_,8 @@
+@@ -1340,7 +_,8 @@
          this.f_109415_.m_83945_(this.f_109461_.m_91385_());
          RenderStateShard.f_110126_.m_110185_();
          profilerfiller.m_6182_("particles");
@@ -101,7 +127,7 @@
          RenderStateShard.f_110126_.m_110188_();
       } else {
          profilerfiller.m_6182_("translucent");
-@@ -1353,7 +_,8 @@
+@@ -1354,7 +_,8 @@
          profilerfiller.m_6182_("string");
          this.m_172993_(RenderType.m_110503_(), p_109600_, d0, d1, d2, p_109607_);
          profilerfiller.m_6182_("particles");
@@ -111,7 +137,7 @@
       }
 
       posestack.m_85836_();
-@@ -1377,6 +_,7 @@
+@@ -1378,6 +_,7 @@
          RenderStateShard.f_110127_.m_110185_();
          profilerfiller.m_6182_("weather");
          this.m_109703_(p_109606_, p_109601_, d0, d1, d2);
@@ -119,7 +145,7 @@
          this.m_173012_(p_109604_);
          RenderStateShard.f_110127_.m_110188_();
          this.f_109418_.m_110023_(p_109601_);
-@@ -1385,6 +_,7 @@
+@@ -1386,6 +_,7 @@
          RenderSystem.m_69458_(false);
          profilerfiller.m_6182_("weather");
          this.m_109703_(p_109606_, p_109601_, d0, d1, d2);
@@ -127,7 +153,7 @@
          this.m_173012_(p_109604_);
          RenderSystem.m_69458_(true);
       }
-@@ -1519,6 +_,7 @@
+@@ -1520,6 +_,7 @@
       shaderinstance.m_173362_();
       VertexBuffer.m_85931_();
       this.f_109461_.m_91307_().m_7238_();
@@ -135,7 +161,7 @@
       p_172994_.m_110188_();
    }
 
-@@ -1780,6 +_,8 @@
+@@ -1781,6 +_,8 @@
    }
 
    public void m_202423_(PoseStack p_202424_, Matrix4f p_202425_, float p_202426_, Camera p_202427_, boolean p_202428_, Runnable p_202429_) {
@@ -144,7 +170,7 @@
       p_202429_.run();
       if (!p_202428_) {
          FogType fogtype = p_202427_.m_167685_();
-@@ -1912,6 +_,8 @@
+@@ -1913,6 +_,8 @@
    }
 
    public void m_172954_(PoseStack p_172955_, Matrix4f p_172956_, float p_172957_, double p_172958_, double p_172959_, double p_172960_) {
@@ -153,7 +179,7 @@
       float f = this.f_109465_.m_104583_().m_108871_();
       if (!Float.isNaN(f)) {
          RenderSystem.m_69464_();
-@@ -2102,7 +_,7 @@
+@@ -2103,7 +_,7 @@
                }
             } else {
                BlockPos blockpos1 = chunkrenderdispatcher$renderchunk.m_112839_().m_7918_(8, 8, 8);
@@ -162,7 +188,7 @@
             }
 
             if (flag) {
-@@ -2399,7 +_,12 @@
+@@ -2400,7 +_,12 @@
       this.f_109469_.m_110859_(p_109502_, p_109503_, p_109504_, p_109505_);
    }
 
@@ -175,7 +201,7 @@
       SoundInstance soundinstance = this.f_109410_.get(p_109516_);
       if (soundinstance != null) {
          this.f_109461_.m_91106_().m_120399_(soundinstance);
-@@ -2407,7 +_,7 @@
+@@ -2408,7 +_,7 @@
       }
 
       if (p_109515_ != null) {
@@ -184,7 +210,7 @@
          if (recorditem != null) {
             this.f_109461_.f_91065_.m_93055_(recorditem.m_43050_());
          }
-@@ -2559,7 +_,7 @@
+@@ -2560,7 +_,7 @@
             break;
          case 1010:
             if (Item.m_41445_(p_234307_) instanceof RecordItem) {
@@ -193,7 +219,7 @@
             } else {
                this.m_109514_((SoundEvent)null, p_234306_);
             }
-@@ -2729,7 +_,7 @@
+@@ -2730,7 +_,7 @@
          case 2001:
             BlockState blockstate = Block.m_49803_(p_234307_);
             if (!blockstate.m_60795_()) {
@@ -202,7 +228,7 @@
                this.f_109465_.m_104677_(p_234306_, soundtype.m_56775_(), SoundSource.BLOCKS, (soundtype.m_56773_() + 1.0F) / 2.0F, soundtype.m_56774_() * 0.8F, false);
             }
 
-@@ -2944,7 +_,7 @@
+@@ -2945,7 +_,7 @@
       } else {
          int i = p_109538_.m_45517_(LightLayer.SKY, p_109540_);
          int j = p_109538_.m_45517_(LightLayer.BLOCK, p_109540_);
@@ -30,3 +30,28 @@
          InputStream inputstream = resource.m_215507_();
 
          try {
+@@ -232,11 +_,11 @@
+                private final Set<String> f_173369_ = Sets.newHashSet();
+ 
+                public String m_142138_(boolean p_173374_, String p_173375_) {
+-                  p_173375_ = FileUtil.m_179924_((p_173374_ ? s1 : "shaders/include/") + p_173375_);
+-                  if (!this.f_173369_.add(p_173375_)) {
+                  // FORGE: use the mod's namespace to look up resources if specified
+                  ResourceLocation resourcelocation = net.minecraftforge.client.ForgeHooksClient.getShaderImportLocation(s1, p_173374_, p_173375_);
+                  if (!this.f_173369_.add(resourcelocation.toString())) {
+                      return null;
+                   } else {
+-                     ResourceLocation resourcelocation = new ResourceLocation(p_173375_);
+ 
+                      try {
+                         Reader reader = p_173341_.m_215597_(resourcelocation);
+@@ -262,7 +_,8 @@
+ 
+                         return s2;
+                      } catch (IOException ioexception) {
+-                        ShaderInstance.f_173323_.error("Could not open GLSL import {}: {}", p_173375_, ioexception.getMessage());
+                        // FORGE: specify the namespace of the failed import in case of duplicates from multiple mods
+                        ShaderInstance.f_173323_.error("Could not open GLSL import {}: {}", resourcelocation, ioexception.getMessage());
+                         return "#error " + ioexception.getMessage();
+                      }
+                   }
@@ -9,7 +9,7 @@
       this.f_110901_ = new LiquidBlockRenderer();
    }
 
-@@ -45,19 +_,27 @@
+@@ -45,19 +_,30 @@
       return this.f_110899_;
    }
 
@@ -31,11 +31,14 @@
 +      renderBatched(p_234356_, p_234357_, p_234358_, p_234359_, p_234360_, p_234361_, p_234362_, net.minecraftforge.client.model.data.ModelData.EMPTY, null);
 +   }
 +   public void renderBatched(BlockState p_234356_, BlockPos p_234357_, BlockAndTintGetter p_234358_, PoseStack p_234359_, VertexConsumer p_234360_, boolean p_234361_, RandomSource p_234362_, net.minecraftforge.client.model.data.ModelData modelData, net.minecraft.client.renderer.RenderType renderType) {
+      renderBatched(p_234356_, p_234357_, p_234358_, p_234359_, p_234360_, p_234361_, p_234362_, modelData, renderType, true);
+   }
+   public void renderBatched(BlockState p_234356_, BlockPos p_234357_, BlockAndTintGetter p_234358_, PoseStack p_234359_, VertexConsumer p_234360_, boolean p_234361_, RandomSource p_234362_, net.minecraftforge.client.model.data.ModelData modelData, net.minecraft.client.renderer.RenderType renderType, boolean queryModelSpecificData) { // TODO 1.20: Move to the signature above
       try {
          RenderShape rendershape = p_234356_.m_60799_();
          if (rendershape == RenderShape.MODEL) {
 -            this.f_110900_.m_234379_(p_234358_, this.m_110910_(p_234356_), p_234356_, p_234357_, p_234359_, p_234360_, p_234361_, p_234362_, p_234356_.m_60726_(p_234357_), OverlayTexture.f_118083_);
-+            this.f_110900_.tesselateBlock(p_234358_, this.m_110910_(p_234356_), p_234356_, p_234357_, p_234359_, p_234360_, p_234361_, p_234362_, p_234356_.m_60726_(p_234357_), OverlayTexture.f_118083_, modelData, renderType);
+            this.f_110900_.tesselateBlock(p_234358_, this.m_110910_(p_234356_), p_234356_, p_234357_, p_234359_, p_234360_, p_234361_, p_234362_, p_234356_.m_60726_(p_234357_), OverlayTexture.f_118083_, modelData, renderType, queryModelSpecificData); // TODO 1.20: Remove last argument
          }
 
       } catch (Throwable throwable) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/block/ModelBlockRenderer.java
 +++ b/net/minecraft/client/renderer/block/ModelBlockRenderer.java
-@@ -40,72 +_,85 @@
+@@ -40,72 +_,88 @@
       this.f_110995_ = p_110999_;
    }
 
@@ -12,10 +12,13 @@
 +      tesselateBlock(p_234380_, p_234381_, p_234382_, p_234383_, p_234384_, p_234385_, p_234386_, p_234387_, p_234388_, p_234389_, net.minecraftforge.client.model.data.ModelData.EMPTY, null);
 +   }
 +   public void tesselateBlock(BlockAndTintGetter p_111048_, BakedModel p_111049_, BlockState p_111050_, BlockPos p_111051_, PoseStack p_111052_, VertexConsumer p_111053_, boolean p_111054_, RandomSource p_111055_, long p_111056_, int p_111057_, net.minecraftforge.client.model.data.ModelData modelData, net.minecraft.client.renderer.RenderType renderType) {
+      tesselateBlock(p_111048_, p_111049_, p_111050_, p_111051_, p_111052_, p_111053_, p_111054_, p_111055_, p_111056_, p_111057_, modelData, renderType, true);
+   }
+   public void tesselateBlock(BlockAndTintGetter p_111048_, BakedModel p_111049_, BlockState p_111050_, BlockPos p_111051_, PoseStack p_111052_, VertexConsumer p_111053_, boolean p_111054_, RandomSource p_111055_, long p_111056_, int p_111057_, net.minecraftforge.client.model.data.ModelData modelData, net.minecraft.client.renderer.RenderType renderType, boolean queryModelSpecificData) { // TODO 1.20: Move to the signature above
 +      boolean flag = Minecraft.m_91086_() && p_111050_.getLightEmission(p_111048_, p_111051_) == 0 && p_111049_.useAmbientOcclusion(p_111050_, renderType);
 +      Vec3 vec3 = p_111050_.m_60824_(p_111048_, p_111051_);
 +      p_111052_.m_85837_(vec3.f_82479_, vec3.f_82480_, vec3.f_82481_);
-+      modelData = p_111049_.getModelData(p_111048_, p_111051_, p_111050_, modelData);
+      if (queryModelSpecificData) modelData = p_111049_.getModelData(p_111048_, p_111051_, p_111050_, modelData); // TODO 1.20: Remove this line entirely
 
       try {
          if (flag) {
@@ -111,6 +114,14 @@
       }
 
    }
+@@ -113,6 +_,7 @@
+    private void m_111012_(BlockAndTintGetter p_111013_, BlockState p_111014_, BlockPos p_111015_, PoseStack p_111016_, VertexConsumer p_111017_, List<BakedQuad> p_111018_, float[] p_111019_, BitSet p_111020_, ModelBlockRenderer.AmbientOcclusionFace p_111021_, int p_111022_) {
+       for(BakedQuad bakedquad : p_111018_) {
+          this.m_111039_(p_111013_, p_111014_, p_111015_, bakedquad.m_111303_(), bakedquad.m_111306_(), p_111019_, p_111020_);
+         if (!net.minecraftforge.client.ForgeHooksClient.calculateFaceWithoutAO(p_111013_, p_111014_, p_111015_, bakedquad, p_111020_.get(0), p_111021_.f_111149_, p_111021_.f_111150_))
+          p_111021_.m_111167_(p_111013_, p_111014_, p_111015_, bakedquad.m_111306_(), p_111019_, p_111020_, bakedquad.m_111307_());
+          this.m_111023_(p_111013_, p_111014_, p_111015_, p_111017_, p_111016_.m_85850_(), bakedquad, p_111021_.f_111149_[0], p_111021_.f_111149_[1], p_111021_.f_111149_[2], p_111021_.f_111149_[3], p_111021_.f_111150_[0], p_111021_.f_111150_[1], p_111021_.f_111150_[2], p_111021_.f_111150_[3], p_111022_);
+       }
@@ -217,17 +_,21 @@
 
    }
@@ -0,0 +1,32 @@
+--- a/net/minecraft/client/renderer/block/model/BakedQuad.java
+++ b/net/minecraft/client/renderer/block/model/BakedQuad.java
+@@ -12,13 +_,19 @@
+    protected final Direction f_111294_;
+    protected final TextureAtlasSprite f_111295_;
+    private final boolean f_111296_;
+   private final boolean hasAmbientOcclusion;
+ 
+    public BakedQuad(int[] p_111298_, int p_111299_, Direction p_111300_, TextureAtlasSprite p_111301_, boolean p_111302_) {
+      this(p_111298_, p_111299_, p_111300_, p_111301_, p_111302_, true);
+   }
+
+   public BakedQuad(int[] p_111298_, int p_111299_, Direction p_111300_, TextureAtlasSprite p_111301_, boolean p_111302_, boolean hasAmbientOcclusion) {
+       this.f_111292_ = p_111298_;
+       this.f_111293_ = p_111299_;
+       this.f_111294_ = p_111300_;
+       this.f_111295_ = p_111301_;
+       this.f_111296_ = p_111302_;
+      this.hasAmbientOcclusion = hasAmbientOcclusion;
+    }
+ 
+    public TextureAtlasSprite m_173410_() {
+@@ -43,5 +_,9 @@
+ 
+    public boolean m_111307_() {
+       return this.f_111296_;
+   }
+
+   public boolean hasAmbientOcclusion() {
+      return this.hasAmbientOcclusion;
+    }
+ }
@@ -1,25 +1,31 @@
 --- a/net/minecraft/client/renderer/block/model/BlockElementFace.java
 +++ b/net/minecraft/client/renderer/block/model/BlockElementFace.java
-@@ -19,12 +_,18 @@
+@@ -19,12 +_,24 @@
    public final int f_111355_;
    public final String f_111356_;
    public final BlockFaceUV f_111357_;
 +   public final int emissivity;
+   public final boolean hasAmbientOcclusion;
 
    public BlockElementFace(@Nullable Direction p_111359_, int p_111360_, String p_111361_, BlockFaceUV p_111362_) {
-+      this(p_111359_, p_111360_, p_111361_, p_111362_, 0);
+      this(p_111359_, p_111360_, p_111361_, p_111362_, 0, true);
 +   }
 +
 +   public BlockElementFace(@Nullable Direction p_111359_, int p_111360_, String p_111361_, BlockFaceUV p_111362_, int emissivity) {
+      this(p_111359_, p_111360_, p_111361_, p_111362_, emissivity, true);
+   }
+
+   public BlockElementFace(@Nullable Direction p_111359_, int p_111360_, String p_111361_, BlockFaceUV p_111362_, int emissivity, boolean hasAmbientOcclusion) {
       this.f_111354_ = p_111359_;
       this.f_111355_ = p_111360_;
       this.f_111356_ = p_111361_;
       this.f_111357_ = p_111362_;
 +      this.emissivity = emissivity;
+      this.hasAmbientOcclusion = hasAmbientOcclusion;
    }
 
    @OnlyIn(Dist.CLIENT)
-@@ -37,7 +_,10 @@
+@@ -37,7 +_,11 @@
          int i = this.m_111368_(jsonobject);
          String s = this.m_111370_(jsonobject);
          BlockFaceUV blockfaceuv = p_111367_.deserialize(jsonobject, BlockFaceUV.class);
@@ -27,7 +33,8 @@
 +         int emissivity = GsonHelper.m_13824_(jsonobject, "emissivity", 0);
 +         if (emissivity != net.minecraft.util.Mth.m_14045_(emissivity, 0, 15))
 +            throw new JsonParseException("The emissivity value must be between 0 and 15. Found: " + emissivity);
-+         return new BlockElementFace(direction, i, s, blockfaceuv, emissivity);
+         boolean hasAmbientOcclusion = GsonHelper.m_13855_(jsonobject, "ambientocclusion", true);
+         return new BlockElementFace(direction, i, s, blockfaceuv, emissivity, hasAmbientOcclusion);
       }
 
       protected int m_111368_(JsonObject p_111369_) {
@@ -49,7 +49,7 @@
       for(BlockElement blockelement : this.m_111436_()) {
          for(BlockElementFace blockelementface : blockelement.f_111310_.values()) {
             Material material = this.m_111480_(blockelementface.f_111356_);
-@@ -181,11 +_,17 @@
+@@ -181,11 +_,18 @@
       return set1;
    }
 
@@ -62,20 +62,12 @@
 +      return net.minecraftforge.client.model.geometry.UnbakedGeometryHelper.bake(this, p_111450_, p_111451_, p_111452_, p_111453_, p_111454_, p_111455_);
 +   }
 +
-+   @Deprecated //Forge: exposed for our callbacks only. Use the above function.
+   @Deprecated(forRemoval = true, since = "1.19.2") // TODO: We cannot remove it since it's vanilla code, but make it private in 1.20
 +   public BakedModel bakeVanilla(ModelBakery p_111450_, BlockModel p_111451_, Function<Material, TextureAtlasSprite> p_111452_, ModelState p_111453_, ResourceLocation p_111454_, boolean p_111455_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
+      if (true) return net.minecraftforge.client.model.geometry.UnbakedGeometryHelper.bakeVanilla(this, p_111450_, p_111451_, p_111452_, p_111453_, p_111454_); // Redirected, in case anyone actually uses this
       TextureAtlasSprite textureatlassprite = p_111452_.apply(this.m_111480_("particle"));
       if (this.m_111490_() == ModelBakery.f_119233_) {
          return new BuiltInModel(this.m_111491_(), this.m_111446_(p_111450_, p_111451_), textureatlassprite, this.m_111479_().m_111526_());
-@@ -204,7 +_,7 @@
-             }
-          }
- 
-         return simplebakedmodel$builder.m_119533_();
-+         return simplebakedmodel$builder.build(renderTypes);
-       }
-    }
- 
@@ -268,7 +_,18 @@
       ItemTransform itemtransform5 = this.m_111444_(ItemTransforms.TransformType.GUI);
       ItemTransform itemtransform6 = this.m_111444_(ItemTransforms.TransformType.GROUND);
@@ -6,7 +6,7 @@
 
 -      return new BakedQuad(aint, p_111603_.f_111355_, direction, p_111604_, p_111608_);
 +      net.minecraftforge.client.ForgeHooksClient.fillNormal(aint, direction);
-+      var quad = new BakedQuad(aint, p_111603_.f_111355_, direction, p_111604_, p_111608_);
+      var quad = new BakedQuad(aint, p_111603_.f_111355_, direction, p_111604_, p_111608_, p_111603_.hasAmbientOcclusion);
 +      net.minecraftforge.client.model.QuadTransformers.settingEmissivity(p_111603_.emissivity).processInPlace(quad);
 +      return quad;
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
 +++ b/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
-@@ -77,12 +_,15 @@
+@@ -78,12 +_,15 @@
    private Vec3 f_112683_ = Vec3.f_82478_;
 
    public ChunkRenderDispatcher(ClientLevel p_194405_, LevelRenderer p_194406_, Executor p_194407_, boolean p_194408_, ChunkBufferBuilderPack p_194409_) {
@@ -17,7 +17,7 @@
       this.f_112678_ = p_194409_;
       List<ChunkBufferBuilderPack> list = Lists.newArrayListWithExpectedSize(l);
 
-@@ -418,7 +_,7 @@
+@@ -419,7 +_,7 @@
          if (!chunkrenderdispatcher$compiledchunk.f_112749_.contains(p_112810_)) {
             return false;
          } else {
@@ -26,7 +26,7 @@
             p_112811_.m_112709_(this.f_112788_);
             return true;
          }
-@@ -450,7 +_,7 @@
+@@ -451,7 +_,7 @@
             this.f_202433_.incrementAndGet();
          }
 
@@ -35,7 +35,7 @@
          return this.f_112787_;
       }
 
-@@ -483,10 +_,20 @@
+@@ -484,10 +_,20 @@
          protected final double f_112847_;
          protected final AtomicBoolean f_112848_ = new AtomicBoolean(false);
          protected final boolean f_194420_;
@@ -56,7 +56,7 @@
          }
 
          public abstract CompletableFuture<ChunkRenderDispatcher.ChunkTaskResult> m_5869_(ChunkBufferBuilderPack p_112853_);
-@@ -498,6 +_,10 @@
+@@ -499,6 +_,10 @@
          public int compareTo(ChunkRenderDispatcher.RenderChunk.ChunkCompileTask p_112855_) {
             return Doubles.compare(this.f_112847_, p_112855_.f_112847_);
          }
@@ -67,7 +67,7 @@
       }
 
       @OnlyIn(Dist.CLIENT)
-@@ -505,8 +_,13 @@
+@@ -506,8 +_,13 @@
          @Nullable
          protected RenderChunkRegion f_112858_;
 
@@ -82,30 +82,30 @@
             this.f_112858_ = p_194428_;
          }
 
-@@ -603,7 +_,10 @@
+@@ -604,7 +_,10 @@
                   }
 
                   if (blockstate.m_60799_() != RenderShape.INVISIBLE) {
 -                     RenderType rendertype2 = ItemBlockRenderTypes.m_109282_(blockstate);
 +                     var model = blockrenderdispatcher.m_110910_(blockstate);
-+                     var modelData = getModelData(blockpos2);
+                     var modelData = model.getModelData(renderchunkregion, blockpos2, blockstate, getModelData(blockpos2));
 +                     randomsource.m_188584_(blockstate.m_60726_(blockpos2));
 +                     for (RenderType rendertype2 : model.getRenderTypes(blockstate, randomsource, modelData)) {
                      BufferBuilder bufferbuilder2 = p_234471_.m_108839_(rendertype2);
                      if (set.add(rendertype2)) {
                         RenderChunk.this.m_112805_(bufferbuilder2);
-@@ -611,8 +_,9 @@
+@@ -612,8 +_,9 @@
 
                      posestack.m_85836_();
                      posestack.m_85837_((double)(blockpos2.m_123341_() & 15), (double)(blockpos2.m_123342_() & 15), (double)(blockpos2.m_123343_() & 15));
 -                     blockrenderdispatcher.m_234355_(blockstate, blockpos2, renderchunkregion, posestack, bufferbuilder2, true, randomsource);
-+                     blockrenderdispatcher.renderBatched(blockstate, blockpos2, renderchunkregion, posestack, bufferbuilder2, true, randomsource, modelData, rendertype2);
+                     blockrenderdispatcher.renderBatched(blockstate, blockpos2, renderchunkregion, posestack, bufferbuilder2, true, randomsource, modelData, rendertype2, false);
                      posestack.m_85849_();
 +                     }
                   }
                }
 
-@@ -641,10 +_,10 @@
+@@ -642,10 +_,10 @@
          private <E extends BlockEntity> void m_234476_(ChunkRenderDispatcher.RenderChunk.RebuildTask.CompileResults p_234477_, E p_234478_) {
             BlockEntityRenderer<E> blockentityrenderer = Minecraft.m_91087_().m_167982_().m_112265_(p_234478_);
             if (blockentityrenderer != null) {
@@ -117,7 +117,7 @@
             }
 
          }
-@@ -672,8 +_,13 @@
+@@ -673,8 +_,13 @@
       class ResortTransparencyTask extends ChunkRenderDispatcher.RenderChunk.ChunkCompileTask {
          private final ChunkRenderDispatcher.CompiledChunk f_112886_;
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/chunk/RenderChunkRegion.java
 +++ b/net/minecraft/client/renderer/chunk/RenderChunkRegion.java
-@@ -66,4 +_,9 @@
+@@ -66,4 +_,14 @@
    public int m_141928_() {
       return this.f_112908_.m_141928_();
    }
@@ -8,5 +8,10 @@
 +   @Override
 +   public float getShade(float normalX, float normalY, float normalZ, boolean shade) {
 +      return this.f_112908_.getShade(normalX, normalY, normalZ, shade);
+   }
+
+   @Override
+   public net.minecraftforge.client.model.data.ModelDataManager getModelDataManager() {
+      return f_112908_.getModelDataManager();
 +   }
 }
@@ -1,11 +1,12 @@
 --- a/net/minecraft/client/renderer/entity/ItemEntityRenderer.java
 +++ b/net/minecraft/client/renderer/entity/ItemEntityRenderer.java
-@@ -62,17 +_,14 @@
+@@ -61,18 +_,15 @@
+       boolean flag = bakedmodel.m_7539_();
       int j = this.m_115042_(itemstack);
       float f = 0.25F;
-       float f1 = Mth.m_14031_(((float)p_115036_.m_32059_() + p_115038_) / 10.0F + p_115036_.f_31983_) * 0.1F + 0.1F;
-      float f2 = bakedmodel.m_7442_().m_111808_(ItemTransforms.TransformType.GROUND).f_111757_.m_122260_();
-+      float f2 = shouldBob() ? bakedmodel.m_7442_().m_111808_(ItemTransforms.TransformType.GROUND).f_111757_.m_122260_() : 0;
+-      float f1 = Mth.m_14031_(((float)p_115036_.m_32059_() + p_115038_) / 10.0F + p_115036_.f_31983_) * 0.1F + 0.1F;
+      float f1 = shouldBob() ? Mth.m_14031_(((float)p_115036_.m_32059_() + p_115038_) / 10.0F + p_115036_.f_31983_) * 0.1F + 0.1F : 0;
+       float f2 = bakedmodel.m_7442_().m_111808_(ItemTransforms.TransformType.GROUND).f_111757_.m_122260_();
       p_115039_.m_85837_(0.0D, (double)(f1 + 0.25F * f2), 0.0D);
       float f3 = p_115036_.m_32008_(p_115038_);
       p_115039_.m_85845_(Vector3f.f_122225_.m_122270_(f3));
@@ -60,6 +60,14 @@
             crashreportcategory.m_128165_("Item Damage", () -> {
                return String.valueOf(p_174237_.m_41773_());
             });
+@@ -362,6 +_,7 @@
+             RenderSystem.m_69482_();
+          }
+ 
+         net.minecraftforge.client.ItemDecoratorHandler.of(p_115176_).render(p_115175_, p_115176_, p_115177_, p_115178_, f_115093_);
+       }
+    }
+ 
@@ -377,5 +_,9 @@
 
    public void m_6213_(ResourceManager p_115105_) {
@@ -10,7 +10,7 @@
    }
 
    public Vec3 m_7860_(AbstractClientPlayer p_117785_, float p_117786_) {
-@@ -126,7 +_,7 @@
+@@ -126,10 +_,13 @@
             if (useanim == UseAnim.TOOT_HORN) {
                return HumanoidModel.ArmPose.TOOT_HORN;
             }
@@ -19,6 +19,12 @@
             return HumanoidModel.ArmPose.CROSSBOW_HOLD;
          }
 
+         HumanoidModel.ArmPose forgeArmPose = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(itemstack).getArmPose(p_117795_, p_117796_, itemstack);
+         if (forgeArmPose != null) return forgeArmPose;
+
+          return HumanoidModel.ArmPose.ITEM;
+       }
+    }
@@ -161,10 +_,12 @@
    }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/texture/TextureAtlas.java
 +++ b/net/minecraft/client/renderer/texture/TextureAtlas.java
-@@ -87,6 +_,7 @@
+@@ -88,6 +_,7 @@
          }
       }
 
@@ -8,7 +8,7 @@
    }
 
    public TextureAtlas.Preparations m_118307_(ResourceManager p_118308_, Stream<ResourceLocation> p_118309_, ProfilerFiller p_118310_, int p_118311_) {
-@@ -101,6 +_,7 @@
+@@ -102,6 +_,7 @@
       int j = Integer.MAX_VALUE;
       int k = 1 << p_118311_;
       p_118310_.m_6182_("extracting_frames");
@@ -16,7 +16,7 @@
 
       for(TextureAtlasSprite.Info textureatlassprite$info : this.m_118304_(p_118308_, set)) {
          j = Math.min(j, Math.min(textureatlassprite$info.m_118434_(), textureatlassprite$info.m_118437_()));
-@@ -115,7 +_,8 @@
+@@ -116,7 +_,8 @@
 
       int i1 = Math.min(j, k);
       int j1 = Mth.m_14173_(i1);
@@ -26,7 +26,7 @@
       if (j1 < p_118311_) {
          f_118261_.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.f_118265_, p_118311_, j1, i1);
          k1 = j1;
-@@ -232,11 +_,14 @@
+@@ -233,11 +_,14 @@
       ResourceLocation resourcelocation = this.m_118324_(p_118289_.m_118431_());
 
       try {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/resources/language/ClientLanguage.java
 +++ b/net/minecraft/client/resources/language/ClientLanguage.java
-@@ -94,4 +_,9 @@
+@@ -95,4 +_,9 @@
    public FormattedCharSequence m_5536_(FormattedText p_118925_) {
       return FormattedBidiReorder.m_118931_(p_118925_, this.f_118911_);
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/resources/language/LanguageInfo.java
 +++ b/net/minecraft/client/resources/language/LanguageInfo.java
-@@ -16,6 +_,12 @@
+@@ -17,6 +_,12 @@
       this.f_118944_ = p_118949_;
       this.f_118945_ = p_118950_;
       this.f_118946_ = p_118951_;
@@ -13,7 +13,7 @@
    }
 
    public String getCode() {
-@@ -53,4 +_,8 @@
+@@ -54,4 +_,8 @@
    public int compareTo(LanguageInfo p_118954_) {
       return this.f_118943_.compareTo(p_118954_.f_118943_);
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/resources/model/ModelBakery.java
 +++ b/net/minecraft/client/resources/model/ModelBakery.java
-@@ -151,6 +_,8 @@
+@@ -152,6 +_,8 @@
    public ModelBakery(ResourceManager p_119247_, BlockColors p_119248_, ProfilerFiller p_119249_, int p_119250_) {
       this.f_119243_ = p_119247_;
       this.f_119209_ = p_119248_;
@@ -9,7 +9,7 @@
       p_119249_.m_6180_("missing_model");
 
       try {
-@@ -184,12 +_,20 @@
+@@ -185,12 +_,20 @@
       p_119249_.m_6182_("special");
       this.m_119306_(new ModelResourceLocation("minecraft:trident_in_hand#inventory"));
       this.m_119306_(new ModelResourceLocation("minecraft:spyglass_in_hand#inventory"));
@@ -30,7 +30,7 @@
       set.stream().filter((p_119357_) -> {
          return !p_119357_.getSecond().equals(f_119236_);
       }).forEach((p_119292_) -> {
-@@ -228,6 +_,7 @@
+@@ -229,6 +_,7 @@
          try {
             bakedmodel = this.m_119349_(p_119369_, BlockModelRotation.X0_Y0);
          } catch (Exception exception) {
@@ -38,7 +38,7 @@
             f_119235_.warn("Unable to bake model: '{}': {}", p_119369_, exception);
          }
 
-@@ -472,7 +_,13 @@
+@@ -473,7 +_,13 @@
    }
 
    @Nullable
@@ -52,7 +52,7 @@
       Triple<ResourceLocation, Transformation, Boolean> triple = Triple.of(p_119350_, p_119351_.m_6189_(), p_119351_.m_7538_());
       if (this.f_119213_.containsKey(triple)) {
          return this.f_119213_.get(triple);
-@@ -483,11 +_,11 @@
+@@ -484,11 +_,11 @@
          if (unbakedmodel instanceof BlockModel) {
             BlockModel blockmodel = (BlockModel)unbakedmodel;
             if (blockmodel.m_111490_() == f_119232_) {
@@ -66,7 +66,7 @@
          this.f_119213_.put(triple, bakedmodel);
          return bakedmodel;
       }
-@@ -542,6 +_,10 @@
+@@ -543,6 +_,10 @@
       public BlockStateDefinitionException(String p_119373_) {
          super(p_119373_);
       }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
-@@ -33,7 +_,7 @@
+@@ -36,7 +_,7 @@
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
 
@@ -8,4 +8,4 @@
 +public class CommandSourceStack implements SharedSuggestionProvider, net.minecraftforge.common.extensions.IForgeCommandSourceStack {
    public static final SimpleCommandExceptionType f_81286_ = new SimpleCommandExceptionType(Component.m_237115_("permissions.requires.player"));
    public static final SimpleCommandExceptionType f_81287_ = new SimpleCommandExceptionType(Component.m_237115_("permissions.requires.entity"));
-    private final CommandSource f_81288_;
+    public final CommandSource f_81288_;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -175,7 +_,7 @@
+@@ -178,7 +_,7 @@
          JfrCommand.m_183645_(this.f_82090_);
       }
 
@@ -9,7 +9,7 @@
          TestCommand.m_127946_(this.f_82090_);
       }
 
-@@ -199,6 +_,7 @@
+@@ -202,6 +_,7 @@
       if (p_230943_.f_82144_) {
          PublishCommand.m_138184_(this.f_82090_);
       }
@@ -17,13 +17,12 @@
 
       this.f_82090_.setConsumer((p_230954_, p_230955_, p_230956_) -> {
          p_230954_.getSource().m_81342_(p_230954_, p_230955_, p_230956_);
-@@ -217,7 +_,17 @@
+@@ -227,7 +_,16 @@
 
       try {
          try {
-            return this.f_82090_.execute(stringreader, p_82118_);
-+            ParseResults<CommandSourceStack> parse = this.f_82090_.parse(stringreader, p_82118_);
-+            net.minecraftforge.event.CommandEvent event = new net.minecraftforge.event.CommandEvent(parse);
+-            return this.f_82090_.execute(p_242844_);
+            net.minecraftforge.event.CommandEvent event = new net.minecraftforge.event.CommandEvent(p_242844_);
 +            if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) {
 +               if (event.getException() instanceof Exception exception) {
 +                  throw exception;
@@ -34,9 +33,9 @@
 +            }
 +            return this.f_82090_.execute(event.getParseResults());
          } catch (CommandRuntimeException commandruntimeexception) {
-             p_82118_.m_81352_(commandruntimeexception.m_79226_());
+             commandsourcestack.m_81352_(commandruntimeexception.m_79226_());
             return 0;
-@@ -273,7 +_,8 @@
+@@ -283,7 +_,8 @@
       Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map = Maps.newHashMap();
       RootCommandNode<SharedSuggestionProvider> rootcommandnode = new RootCommandNode<>();
       map.put(this.f_82090_.getRoot(), rootcommandnode);
@@ -0,0 +1,11 @@
+--- a/net/minecraft/commands/arguments/EntityArgument.java
+++ b/net/minecraft/commands/arguments/EntityArgument.java
+@@ -115,7 +_,7 @@
+       if (s instanceof SharedSuggestionProvider sharedsuggestionprovider) {
+          StringReader stringreader = new StringReader(p_91483_.getInput());
+          stringreader.setCursor(p_91483_.getStart());
+-         EntitySelectorParser entityselectorparser = new EntitySelectorParser(stringreader, sharedsuggestionprovider.m_6761_(2));
+         EntitySelectorParser entityselectorparser = new EntitySelectorParser(stringreader, net.minecraftforge.common.ForgeHooks.canUseEntitySelectors(sharedsuggestionprovider));
+ 
+          try {
+             entityselectorparser.m_121377_();
@@ -0,0 +1,11 @@
+--- a/net/minecraft/commands/arguments/MessageArgument.java
+++ b/net/minecraft/commands/arguments/MessageArgument.java
+@@ -134,7 +_,7 @@
+       }
+ 
+       Component m_232196_(CommandSourceStack p_232197_) throws CommandSyntaxException {
+-         return this.m_96849_(p_232197_, p_232197_.m_6761_(2));
+         return this.m_96849_(p_232197_, net.minecraftforge.common.ForgeHooks.canUseEntitySelectors(p_232197_));
+       }
+ 
+       public Component m_96849_(CommandSourceStack p_96850_, boolean p_96851_) throws CommandSyntaxException {
@@ -0,0 +1,11 @@
+--- a/net/minecraft/commands/arguments/selector/EntitySelector.java
+++ b/net/minecraft/commands/arguments/selector/EntitySelector.java
+@@ -87,7 +_,7 @@
+    }
+ 
+    private void m_121168_(CommandSourceStack p_121169_) throws CommandSyntaxException {
+-      if (this.f_121123_ && !p_121169_.m_6761_(2)) {
+      if (this.f_121123_ && !net.minecraftforge.common.ForgeHooks.canUseEntitySelectors(p_121169_)) {
+          throw EntityArgument.f_91441_.create();
+       }
+    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
 +++ b/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
-@@ -63,6 +_,20 @@
+@@ -64,6 +_,20 @@
 public class ArgumentTypeInfos {
    private static final Map<Class<?>, ArgumentTypeInfo<?, ?>> f_235379_ = Maps.newHashMap();
 
@@ -21,12 +21,20 @@
    private static <A extends ArgumentType<?>, T extends ArgumentTypeInfo.Template<A>> ArgumentTypeInfo<A, T> m_235386_(Registry<ArgumentTypeInfo<?, ?>> p_235387_, String p_235388_, Class<? extends A> p_235389_, ArgumentTypeInfo<A, T> p_235390_) {
       f_235379_.put(p_235389_, p_235390_);
       return Registry.m_122961_(p_235387_, p_235388_, p_235390_);
-@@ -116,7 +_,7 @@
+@@ -117,12 +_,14 @@
       m_235386_(p_235385_, "resource", m_235395_(ResourceKeyArgument.class), new ResourceKeyArgument.Info<Object>());
       m_235386_(p_235385_, "template_mirror", TemplateMirrorArgument.class, SingletonArgumentInfo.m_235451_(TemplateMirrorArgument::m_234343_));
       m_235386_(p_235385_, "template_rotation", TemplateRotationArgument.class, SingletonArgumentInfo.m_235451_(TemplateRotationArgument::m_234414_));
 -      if (SharedConstants.f_136183_) {
-+      if (net.minecraftforge.gametest.ForgeGameTestHooks.isGametestEnabled()) {
+      // Forge: Register before gametest arguments to provide forge server <-> vanilla client interop and matching int ids
+      var uuidInfo = m_235386_(p_235385_, "uuid", UuidArgument.class, SingletonArgumentInfo.m_235451_(UuidArgument::m_113850_));
+      if (true) { // Forge: Always register gametest arguments to prevent issues when connecting from gametest-enabled client/server to non-gametest-enabled client/server
          m_235386_(p_235385_, "test_argument", TestFunctionArgument.class, SingletonArgumentInfo.m_235451_(TestFunctionArgument::m_128088_));
          m_235386_(p_235385_, "test_class", TestClassNameArgument.class, SingletonArgumentInfo.m_235451_(TestClassNameArgument::m_127917_));
       }
+ 
+-      return m_235386_(p_235385_, "uuid", UuidArgument.class, SingletonArgumentInfo.m_235451_(UuidArgument::m_113850_));
+      return uuidInfo;
+    }
+ 
+    private static <T extends ArgumentType<?>> Class<T> m_235395_(Class<? super T> p_235396_) {
@@ -0,0 +1,33 @@
+--- a/net/minecraft/core/HolderSet.java
+++ b/net/minecraft/core/HolderSet.java
+@@ -14,7 +_,7 @@
+ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+ 
+-public interface HolderSet<T> extends Iterable<Holder<T>> {
+public interface HolderSet<T> extends Iterable<Holder<T>>, net.minecraftforge.common.extensions.IForgeHolderSet<T> {
+    Stream<Holder<T>> m_203614_();
+ 
+    int m_203632_();
+@@ -120,6 +_,9 @@
+ 
+       public void m_205835_(List<Holder<T>> p_205836_) {
+          this.f_205830_ = List.copyOf(p_205836_);
+         for (Runnable runnable : this.invalidationCallbacks) {
+            runnable.run(); // FORGE: invalidate listeners when tags rebind
+         }
+       }
+ 
+       public TagKey<T> m_205839_() {
+@@ -144,6 +_,11 @@
+ 
+       public boolean m_207277_(Registry<T> p_211049_) {
+          return this.f_211044_ == p_211049_;
+      }
+      // FORGE: Keep a list of invalidation callbacks so they can be run when tags rebind 
+      private List<Runnable> invalidationCallbacks = new java.util.ArrayList<>();
+      public void addInvalidationListener(Runnable runnable) {
+         invalidationCallbacks.add(runnable);
+       }
+    }
+ }
@@ -88,8 +88,9 @@
    public static final Registry<PositionSourceType<?>> f_175420_ = m_206008_(f_175408_, (p_235761_) -> {
       return PositionSourceType.f_157871_;
    });
-    public static final Registry<ArgumentTypeInfo<?, ?>> f_235729_ = m_206008_(f_235724_, (RegistryBootstrap)ArgumentTypeInfos::m_235384_);
+-   public static final Registry<ArgumentTypeInfo<?, ?>> f_235729_ = m_206008_(f_235724_, (RegistryBootstrap)ArgumentTypeInfos::m_235384_);
 -   public static final Registry<StatType<?>> f_122867_ = m_206008_(f_122917_, (p_235759_) -> {
+   @Deprecated public static final Registry<ArgumentTypeInfo<?, ?>> f_235729_ = forge(f_235724_, (RegistryBootstrap)ArgumentTypeInfos::m_235384_);
 +   @Deprecated public static final Registry<StatType<?>> f_122867_ = forge(f_122917_, (registry) -> {
       return Stats.f_12982_;
    });
@@ -1,6 +1,6 @@
 --- a/net/minecraft/data/loot/BlockLoot.java
 +++ b/net/minecraft/data/loot/BlockLoot.java
-@@ -264,7 +_,7 @@
+@@ -265,7 +_,7 @@
       return LootTable.m_79147_();
    }
 
@@ -9,7 +9,7 @@
       this.m_124288_(Blocks.f_50122_);
       this.m_124288_(Blocks.f_50175_);
       this.m_124288_(Blocks.f_50228_);
-@@ -1311,9 +_,13 @@
+@@ -1312,9 +_,13 @@
       this.m_124165_(Blocks.f_152499_, m_124125_());
       this.m_124165_(Blocks.f_220862_, m_124125_());
       this.m_124165_(Blocks.f_220863_, m_124125_());
@@ -24,7 +24,7 @@
          ResourceLocation resourcelocation = block.m_60589_();
          if (resourcelocation != BuiltInLootTables.f_78712_ && set.add(resourcelocation)) {
             LootTable.Builder loottable$builder = this.f_124070_.remove(resourcelocation);
-@@ -1338,6 +_,10 @@
+@@ -1339,6 +_,10 @@
 
    public static LootTable.Builder m_124137_(Block p_124138_) {
       return m_124161_(p_124138_, DoorBlock.f_52730_, DoubleBlockHalf.LOWER);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/data/loot/EntityLoot.java
 +++ b/net/minecraft/data/loot/EntityLoot.java
-@@ -54,7 +_,7 @@
+@@ -55,7 +_,7 @@
       return LootTable.m_79147_().m_79161_(LootPool.m_79043_().m_165133_(ConstantValue.m_165692_(1.0F)).m_79076_(LootItem.m_79579_(p_124375_))).m_79161_(LootPool.m_79043_().m_165133_(ConstantValue.m_165692_(1.0F)).m_79076_(LootTableReference.m_79776_(EntityType.f_20520_.m_20677_())));
    }
 
@@ -9,7 +9,7 @@
       this.m_124371_(EntityType.f_217014_, LootTable.m_79147_());
       this.m_124371_(EntityType.f_20529_, LootTable.m_79147_());
       this.m_124371_(EntityType.f_147039_, LootTable.m_79147_());
-@@ -150,11 +_,15 @@
+@@ -151,11 +_,15 @@
       this.m_124371_(EntityType.f_20511_, LootTable.m_79147_());
       this.m_124371_(EntityType.f_20512_, LootTable.m_79147_());
       this.m_124371_(EntityType.f_20530_, LootTable.m_79147_().m_79161_(LootPool.m_79043_().m_165133_(ConstantValue.m_165692_(1.0F)).m_79076_(LootItem.m_79579_(Items.f_42583_).m_79078_(SetItemCountFunction.m_165412_(UniformGenerator.m_165780_(0.0F, 2.0F))).m_79078_(LootingEnchantFunction.m_165229_(UniformGenerator.m_165780_(0.0F, 1.0F))))).m_79161_(LootPool.m_79043_().m_165133_(ConstantValue.m_165692_(1.0F)).m_79076_(LootItem.m_79579_(Items.f_42416_)).m_79076_(LootItem.m_79579_(Items.f_42619_)).m_79076_(LootItem.m_79579_(Items.f_42620_).m_79078_(SmeltItemFunction.m_81271_().m_79080_(LootItemEntityPropertyCondition.m_81864_(LootContext.EntityTarget.THIS, f_124366_)))).m_79080_(LootItemKilledByPlayerCondition.m_81901_()).m_79080_(LootItemRandomChanceWithLootingCondition.m_81963_(0.025F, 0.01F))));
@@ -25,9 +25,9 @@
 -         if (!f_124367_.contains(entitytype) && entitytype.m_20674_() == MobCategory.MISC) {
 +         if (isNonLiving(entitytype)) {
             if (resourcelocation != BuiltInLootTables.f_78712_ && this.f_124368_.remove(resourcelocation) != null) {
-                throw new IllegalStateException(String.format("Weird loottable '%s' for '%s', not a LivingEntity so should not have loot", resourcelocation, Registry.f_122826_.m_7981_(entitytype)));
+                throw new IllegalStateException(String.format(Locale.ROOT, "Weird loottable '%s' for '%s', not a LivingEntity so should not have loot", resourcelocation, Registry.f_122826_.m_7981_(entitytype)));
             }
-@@ -169,6 +_,14 @@
+@@ -170,6 +_,14 @@
       }
 
       this.f_124368_.forEach(p_124377_);
@@ -1,8 +1,8 @@
 --- a/net/minecraft/data/tags/GameEventTagsProvider.java
 +++ b/net/minecraft/data/tags/GameEventTagsProvider.java
-@@ -8,8 +_,13 @@
- public class GameEventTagsProvider extends TagsProvider<GameEvent> {
-    private static final GameEvent[] f_236425_ = new GameEvent[]{GameEvent.f_157791_, GameEvent.f_157792_, GameEvent.f_157793_, GameEvent.f_157794_, GameEvent.f_157795_, GameEvent.f_157796_, GameEvent.f_157797_, GameEvent.f_223702_, GameEvent.f_223703_, GameEvent.f_157802_, GameEvent.f_157803_, GameEvent.f_157804_, GameEvent.f_223704_, GameEvent.f_157806_, GameEvent.f_223705_, GameEvent.f_223706_, GameEvent.f_223707_, GameEvent.f_223708_, GameEvent.f_157810_, GameEvent.f_223709_, GameEvent.f_223710_, GameEvent.f_157811_, GameEvent.f_157812_, GameEvent.f_157816_, GameEvent.f_157769_, GameEvent.f_157770_, GameEvent.f_223696_, GameEvent.f_223697_, GameEvent.f_157772_, GameEvent.f_223699_, GameEvent.f_157774_, GameEvent.f_157775_, GameEvent.f_157776_, GameEvent.f_157777_, GameEvent.f_157778_, GameEvent.f_157781_, GameEvent.f_157784_, GameEvent.f_157785_, GameEvent.f_157786_, GameEvent.f_238175_};
+@@ -10,8 +_,13 @@
+    @VisibleForTesting
+    static final GameEvent[] f_236425_ = new GameEvent[]{GameEvent.f_157791_, GameEvent.f_157792_, GameEvent.f_157793_, GameEvent.f_157794_, GameEvent.f_157795_, GameEvent.f_157796_, GameEvent.f_157797_, GameEvent.f_223702_, GameEvent.f_223703_, GameEvent.f_157802_, GameEvent.f_157803_, GameEvent.f_157804_, GameEvent.f_223704_, GameEvent.f_157806_, GameEvent.f_223705_, GameEvent.f_223706_, GameEvent.f_223707_, GameEvent.f_223708_, GameEvent.f_157810_, GameEvent.f_223709_, GameEvent.f_223710_, GameEvent.f_157811_, GameEvent.f_157812_, GameEvent.f_157816_, GameEvent.f_157769_, GameEvent.f_157770_, GameEvent.f_223696_, GameEvent.f_223697_, GameEvent.f_157772_, GameEvent.f_223699_, GameEvent.f_157774_, GameEvent.f_157775_, GameEvent.f_157776_, GameEvent.f_157777_, GameEvent.f_157778_, GameEvent.f_157781_, GameEvent.f_157784_, GameEvent.f_157785_, GameEvent.f_157786_, GameEvent.f_238175_};
 
 +   /** @deprecated Forge: Use the {@link #GameEventTagsProvider(DataGenerator, String, net.minecraftforge.common.data.ExistingFileHelper) mod id variant} */
 +   @Deprecated
@@ -1,6 +1,6 @@
 --- a/net/minecraft/data/tags/TagsProvider.java
 +++ b/net/minecraft/data/tags/TagsProvider.java
-@@ -29,10 +_,32 @@
+@@ -30,10 +_,32 @@
    protected final DataGenerator.PathProvider f_236439_;
    protected final Registry<T> f_126540_;
    protected final Map<ResourceLocation, TagBuilder> f_126543_ = Maps.newLinkedHashMap();
@@ -33,14 +33,14 @@
    }
 
    public String m_6055_() {
-@@ -48,12 +_,13 @@
+@@ -49,12 +_,13 @@
          List<TagEntry> list = p_236450_.m_215904_();
          List<TagEntry> list1 = list.stream().filter((p_236444_) -> {
             return !p_236444_.m_215940_(this.f_126540_::m_7804_, this.f_126543_::containsKey);
 -         }).toList();
 +         }).filter(this::missing).collect(Collectors.toList()); // Forge: Add validation via existing resources
          if (!list1.isEmpty()) {
-             throw new IllegalArgumentException(String.format("Couldn't define tag %s as it is missing following references: %s", p_236449_, list1.stream().map(Objects::toString).collect(Collectors.joining(","))));
+             throw new IllegalArgumentException(String.format(Locale.ROOT, "Couldn't define tag %s as it is missing following references: %s", p_236449_, list1.stream().map(Objects::toString).collect(Collectors.joining(","))));
          } else {
             JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, false)).getOrThrow(false, f_126541_::error);
 -            Path path = this.f_236439_.m_236048_(p_236449_);
@@ -49,7 +49,7 @@
 
             try {
                DataProvider.m_236072_(p_236446_, jsonelement, path);
-@@ -65,24 +_,36 @@
+@@ -66,24 +_,36 @@
       });
    }
 
@@ -89,7 +89,7 @@
       }
 
       public TagsProvider.TagAppender<T> m_126582_(T p_126583_) {
-@@ -120,6 +_,19 @@
+@@ -121,6 +_,19 @@
             this.f_126568_.m_215900_(p_126587_);
          });
          return this;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -86,6 +_,7 @@
+@@ -82,6 +_,7 @@
    private float f_129477_;
    private int f_129478_;
    private boolean f_129479_;
@@ -8,7 +8,7 @@
 
    public Connection(PacketFlow p_129482_) {
       this.f_129466_ = p_129482_;
-@@ -95,6 +_,7 @@
+@@ -91,6 +_,7 @@
       super.channelActive(p_129525_);
       this.f_129468_ = p_129525_.channel();
       this.f_129469_ = this.f_129468_.remoteAddress();
@@ -16,7 +16,7 @@
 
       try {
          this.m_129498_(ConnectionProtocol.HANDSHAKING);
-@@ -190,7 +_,7 @@
+@@ -186,7 +_,7 @@
       ++this.f_129475_;
       if (connectionprotocol1 != connectionprotocol) {
          f_129465_.debug("Disabled auto read");
@@ -25,7 +25,7 @@
       }
 
       if (this.f_129468_.eventLoop().inEventLoop()) {
-@@ -288,7 +_,9 @@
+@@ -292,7 +_,9 @@
    }
 
    public static Connection m_178300_(InetSocketAddress p_178301_, boolean p_178302_) {
@@ -35,7 +35,7 @@
       Class<? extends SocketChannel> oclass;
       LazyLoadedValue<? extends EventLoopGroup> lazyloadedvalue;
       if (Epoll.isAvailable() && p_178302_) {
-@@ -314,6 +_,7 @@
+@@ -318,6 +_,7 @@
 
    public static Connection m_129493_(SocketAddress p_129494_) {
       final Connection connection = new Connection(PacketFlow.CLIENTBOUND);
@@ -43,7 +43,7 @@
       (new Bootstrap()).group(f_129464_.m_13971_()).handler(new ChannelInitializer<Channel>() {
          protected void initChannel(Channel p_129557_) {
             p_129557_.pipeline().addLast("packet_handler", connection);
-@@ -400,6 +_,14 @@
+@@ -404,6 +_,14 @@
 
    public float m_129543_() {
       return this.f_129477_;
@@ -1,11 +0,0 @@
--- a/net/minecraft/network/chat/ChatDecorator.java
-+++ b/net/minecraft/network/chat/ChatDecorator.java
-@@ -29,7 +_,7 @@
- 
-    default CompletableFuture<FilteredText<PlayerChatMessage>> m_236964_(@Nullable ServerPlayer p_236965_, FilteredText<Component> p_236966_, MessageSignature p_236967_, boolean p_236968_) {
-       return this.m_236969_(p_236965_, p_236966_).thenApply((p_236956_) -> {
-         return PlayerChatMessage.m_237223_(p_236966_, p_236956_, p_236967_, p_236968_);
-+         return PlayerChatMessage.filteredSigned(p_236966_, p_236956_, p_236967_, p_236968_, p_236965_);
-       });
-    }
- }
@@ -1,21 +0,0 @@
--- a/net/minecraft/network/chat/PlayerChatMessage.java
-+++ b/net/minecraft/network/chat/PlayerChatMessage.java
-@@ -24,10 +_,17 @@
-       }
-    }
- 
-+   // Forge: Bouncer for the version with player context
-    public static FilteredText<PlayerChatMessage> m_237223_(FilteredText<Component> p_237224_, FilteredText<Component> p_237225_, MessageSignature p_237226_, boolean p_237227_) {
-+      return filteredSigned(p_237224_, p_237225_, p_237226_, p_237227_, null);
-+   }
-+
-+   public static FilteredText<PlayerChatMessage> filteredSigned(FilteredText<Component> p_237224_, FilteredText<Component> p_237225_, MessageSignature p_237226_, boolean p_237227_, @org.jetbrains.annotations.Nullable ServerPlayer player) {
-       Component component = p_237224_.f_215168_();
-       Component component1 = p_237225_.f_215168_();
-      PlayerChatMessage playerchatmessage = m_237237_(component, component1, p_237226_, p_237227_);
-+      Component forgeComponent = net.minecraftforge.common.ForgeHooks.onServerChatEvent(player, p_237224_.f_215168_().getString(), component);
-+      // TODO: this overrides the signed ("normal") component from the player, but ignores the unsigned component. What do we do here? This is a mess. -C
-+      PlayerChatMessage playerchatmessage = m_237237_(forgeComponent, component1, p_237226_, p_237227_);
-       if (p_237225_.m_215174_()) {
-          PlayerChatMessage playerchatmessage1 = Util.m_214614_(p_237225_.f_215169_(), PlayerChatMessage::m_237235_);
-          return new FilteredText<>(playerchatmessage, playerchatmessage1);
Author	SHA1	Message	Date
LexManos	617ecb7ad3	43.2 Recommended Build.	2022-12-07 23:20:28 -08:00
Su5eD	dd8239c255	Allow discovering services from the mods folder that use java's modular definition. (#9143 )	2022-11-30 14:50:30 -08:00
Brennan Ward	bdddc8c5d4	Make Datapack Registries support ICondition(s) (#9113 )	2022-11-30 14:45:00 -08:00
Marc Hermans	c1c619a109	Enable additional build types to handle pull request validation. (#9159 )	2022-11-30 14:08:05 -08:00
sciwhiz12	f7eea35cb9	Check source permission level before selector permission (#9147 ) In some situations, such as execution of a function by an advancement as part of its reward, a command source stack may have a backing source of a ServerPlayer which may lack the entity selector permission and have an explicit permission level that should allow the use of entity selectors, through CommandSourceStack#withPermission. We now check if the permission level of the command source stack is sufficient for entity selectors _before_ checking if the source is a player and if they have the requisite permission. This means that an operator permission level of 2 will always override the Forge entity selector permission. Fixes #9137	2022-11-30 14:07:18 -08:00
J.T. McQuigg	a2434e1607	Fix fires spreading too/igniting custom portal frames. (#9142 )	2022-11-30 14:06:22 -08:00
Minecraftschurli	b806ecd0ff	Add supplier to FlowerBlock so it works with custom MobEffects (#9139 )	2022-11-30 14:04:15 -08:00
KnightMiner	8358b800e9	Fix some logical bugs related to the Grindstone Event (#9089 )	2022-11-30 14:00:59 -08:00
Néstor Amador	b25a092cf1	Call baked model's `getModelData` before `getRenderTypes` (#9163 )	2022-11-28 17:53:19 +01:00
Jonathan Coates	d812fdd0a3	Make Util.memoize thread-safe (#9155 )	2022-11-23 09:18:04 +01:00
Néstor Amador	2d3ee8a228	Rendering tweaks and fixes: Part 4 (#9065 )	2022-11-23 09:17:43 +01:00
matyrobbrt	97a9ca65f1	Fix `Transformation` loading `PoseStack` (#9083 )	2022-11-21 20:49:41 +01:00
Néstor Amador	f043fbbc51	Add simple block appearance API (#9066 )	2022-11-21 20:48:30 +01:00
SizableShrimp	a19ab3a8d4	Fix invalidated modded packets when on LAN (#9157 )	2022-11-20 18:34:21 -08:00
Dennis C	bc0517a404	Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130 )	2022-11-08 12:18:48 -08:00
Su5eD	dc9c0d7e35	Fix launch handler minecraft classpath locator (#9120 )	2022-11-08 12:17:48 -08:00
matyrobbrt	1a2207b3b2	Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135 )	2022-11-08 12:17:18 -08:00
sciwhiz12	84ab9764e3	Throw aggregate exception for erroneous registry event dispatch (#9111 ) This means that exceptions occurring during the dispatch of the registry events, such as those from the suppliers of RegistryObjects, properly cause a crash rather than merely being logged and allowing the game to reach the main menu. Fixes #8720	2022-11-08 12:17:00 -08:00
Nexus-Dino	bef68991f0	Add missing semi-colon near the Dist import statement in example mod.	2022-11-08 12:16:49 -08:00
Nexus-Dino	526c13d662	Fix ClientModEvents example not subscribing to client-sided events (#9097 )	2022-10-21 13:22:57 -07:00
matyrobbrt	67ffb78c23	Use GitHub action to lock issues with the `spam` label (#9087 )	2022-10-21 13:22:31 -07:00
sciwhiz12	8f407c3a22	Remove structures slave map to Feature registry (#9091 )	2022-10-21 13:22:18 -07:00
Dennis C	8980252e16	Improve logging of missing or unsupported dependencies (#9104 )	2022-10-21 13:21:49 -07:00
DBotThePony	3baee80485	[1.19.x] Fix ValueSpec caching the return value incorrectly (#9046 )	2022-10-14 17:43:21 +01:00
eerussianguy	ca9599bb4d	[1.19.x] Add event for registering spawn placements, and modifying existing (#9024 )	2022-10-14 17:39:14 +01:00
eerussianguy	051db7907a	[1.19.x] Add event for items being stacked or swapped in a GUI. (#9050 )	2022-10-14 17:30:12 +01:00
Magnus Jensen	bdba5ef2d3	[1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079 )	2022-10-14 17:18:17 +01:00
DBotThePony	838b9c0eda	Fix canceling phantom spawns preventing any further attempts that tick. (#9041 )	2022-10-13 11:40:56 -07:00
Magnus Jensen	be584c54aa	Rename fluid type milk translation keys (#9077 )	2022-10-12 12:54:34 -07:00
ChampionAsh5357	1b3640b42d	Fix minecart speed with water (#9076 )	2022-10-12 12:51:13 -07:00
Sara Freimer	be5dab5801	Add a cancellable event that gets fired when a Totem of Undying is used (#9069 )	2022-10-12 12:46:08 -07:00
Marc Hermans	aae628cd18	Fix performance issue and logging when resource caching is enabled (#9029 )	2022-10-12 12:00:25 -07:00
Magnus Jensen	e7bd08649f	Fix NPE when feeding wolves and cats (#9074 )	2022-10-07 19:55:40 -07:00
Paint_Ninja	e1017a4c7e	Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061 )	2022-10-03 11:50:32 -07:00
SizableShrimp	6f8ba9d295	Fix ServiceLoader bug Signed-off-by: SizableShrimp <[email protected]>	2022-09-29 22:11:12 -07:00
SizableShrimp	ac94478ae7	Fix ClientChatReceivedEvent for system messages Signed-off-by: SizableShrimp <[email protected]>	2022-09-29 22:11:12 -07:00
DBotThePony	515c6082e0	Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056 )	2022-09-27 23:23:59 -07:00
ChampionAsh5357	a753598113	Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057 )	2022-09-27 11:15:11 -07:00
J.T. McQuigg	bc6c4be4e4	Fix is_desert tag not being applied correctly. (#9051 )	2022-09-26 11:08:24 -07:00
Andy Dingley	98823a8f07	Fix mob griefing event for SmallFireballs not using owner entity. (#9038 )	2022-09-21 13:24:25 -07:00
David Dempsey	ecd8f1e54d	Fix minecarts on rails not properly slowing down in water (#9033 )	2022-09-21 13:20:03 -07:00
LexManos	b0caea8e20	Change codestyle for BookShelves tag. Closes #9027 Add IS_CAVE tag Closes #8885 Add IS_DESERT tag Closes #8979 Simplify Mangrove Swamp tags Closes #8980	2022-09-09 11:27:39 -07:00
nikita488	e0477f8776	Allow faces of an "elements" model to have disabled ambient occlusion (#9019 )	2022-09-08 16:17:44 +01:00
bconlon	94e1e54b53	[1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876 )	2022-09-08 16:13:07 +01:00
nitro_dynamite18	9ce72331b7	Update fence_gates/wooden (#8936 )	2022-09-08 16:12:26 +01:00
Jais Djurhuus-Kempel	1c31f42dae	[1.19.x] Added event for growing fungus (#8981 )	2022-09-08 16:11:59 +01:00
agnor99	0978a94358	Added Bookshelves block tag (#8991 )	2022-09-08 16:11:39 +01:00
GizmoTheMoonPig	e956a9c9f3	Create a Forge EntityType Tag for Bosses (#9017 )	2022-09-08 16:10:48 +01:00
Monica S	82026d11a4	Allow mods to specify shader import namespace (#9021 )	2022-09-08 16:10:31 +01:00
ferriarnus	6d233ac75c	Grindstone Events (#8934 ) One to modify the output, and one to modify the input.	2022-09-08 15:55:43 +01:00
Reece Mackie	73c1934e7e	Fix the serialized names of the enum (#9014 )	2022-09-04 19:46:54 +01:00
Technici4n	bf1194ec75	Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004 )	2022-09-03 21:48:07 +01:00
Ted Senft	22d2740725	Add mod mismatch event (#8989 )	2022-09-03 21:26:43 +01:00
Minecraftschurli	02f26dc7a1	[1.19.x] add methods with more context to tree growers (#8956 )	2022-09-03 20:24:00 +01:00
28Pollux28	db14cbb0e0	[1.19.X] Adding more precise events for Advancements (#8360 )	2022-09-03 20:17:16 +01:00
Luke BemishandLexManos	a2b35cae92	Default IItemHandler capability for shulker box itemstacks (#8827 ) Co-authored-by: LexManos <[email protected]>	2022-09-03 20:16:25 +01:00
Take Weiland	aab0e4c82e	[1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872 )	2022-09-03 20:12:13 +01:00
Reece Mackieandsciwhiz12	6609708d14	[1.19.x] Block Model Builder Root Transform Support (#8860 ) Co-authored-by: sciwhiz12 <[email protected]>	2022-09-03 20:11:46 +01:00
Budschie	ed198f062c	[1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918 ) (#8954 )	2022-09-03 20:11:10 +01:00
thedarkcolour	4e2d656e9d	[1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999 )	2022-09-03 20:07:09 +01:00
bconlon	2a4230868f	[1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000 )	2022-09-03 20:06:35 +01:00
Sirttas	cf778b1759	fix misplaced patch in sapling block (#9005 )	2022-09-03 20:05:37 +01:00
Brennan Ward	1b6daddd40	Fix failed entity interactions consuming the click. (#9007 )	2022-09-03 20:00:57 +01:00
sciwhiz12	d7b137d144	Fix entity selector permission check to check original source (#8995 ) Permission checks should be against the command source and not the target entity, as is done in vanilla. Fixes #8994	2022-08-25 11:42:11 -07:00
한현빈	b5d5855559	Hotfix for 1.19.2 item animation bug (#8987 ) * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error Signed-off-by: tmvkrpxl0 <[email protected]>	2022-08-20 11:38:24 +02:00
LexManos	c0aa8dd808	Add ability to Auto register capabilities via annotation (#8972 )	2022-08-17 15:06:35 -07:00
LexManos	4f2f5c02a0	1.19.2 RB	2022-08-17 14:58:14 -07:00
agnor99	7a6843fa4a	Added ItemDecorator API (#8794 )	2022-08-17 23:39:56 +02:00
한현빈	f0ecf16c6b	[1.19.x] Custom usage animations for items (#8932 )	2022-08-17 23:08:13 +02:00
Take Weiland	8998fa71b2	Allow registering custom `ColorResolver`s (#8880 )	2022-08-17 22:51:05 +02:00
Dennis C	4e677a7558	[1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938 )	2022-08-17 00:01:33 +02:00
sciwhiz12	07254b36d7	Redirect checks for entity selector use to a permission (#8947 ) This allows greater flexibility for configuring servers with operator-like permissions to user groups through the permissions API and their permissions handler of choice without needing to grant the vanilla operator permission to any player. The new permission is "forge:use_entity_selectors", which is granted by default to players with permission level 2 (GAMEMASTERS) and above. The hook falls back to checking the permission level if the source of the command is not a ServerPlayer, such as for command blocks and functions.	2022-08-16 14:11:54 -07:00
Brennan Ward	a51b8d256d	Allow FakePlayer to report its position (#8963 )	2022-08-16 14:09:09 -07:00
Sara Freimer	75fcd9448e	Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961 )	2022-08-16 13:57:30 -07:00
eerussianguy	6b45999702	Add cancellable ToastAddEvent (#8952 )	2022-08-16 13:48:55 -07:00
eerussianguy	a4f52f4057	Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951 )	2022-08-16 13:47:57 -07:00
Brennan Ward	b8b3201372	Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948 )	2022-08-16 13:40:10 -07:00
LexManos	41deadc1e2	Remove reflective implementation of ICustomPacket. (#8973 ) Make vanilla custom packets able to be sent multiple times. Closes #8969	2022-08-16 13:17:25 -07:00
LexManos	82e8d06e54	Filter name spaces to directories only. Closes #8413	2022-08-14 12:22:38 -07:00
Marc Hermans	51db5f2ff7	Fix a corner case where the UMLB can not extract a version from a library. (#8967 )	2022-08-14 12:18:22 -07:00
Alex O'Neill	2ec9e515ff	Fix worlds with removed dimension types unable to load. (#8959 ) Closes #8800	2022-08-14 12:17:22 -07:00
Alex O'Neill	0579572148	Fix issue where unknown chunk generators would cause DFU to fail. (#8957 )	2022-08-10 23:13:44 -07:00
TheMuso	83f4e6353c	Fix comments and documentation that were missed during the review of #8712 (#8945 )	2022-08-09 12:49:00 -07:00
Luis	130953e519	Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905 )	2022-08-09 12:48:46 -07:00
Sirttas	7981093591	Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933 )	2022-08-09 12:27:26 -07:00
Joseph B	79112d6208	Add Custom HolderSet Types allowing for logical combining of sets. (#8928 )	2022-08-09 12:25:12 -07:00
Sara Freimer	a3eb6263f4	Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946 )	2022-08-09 12:15:58 -07:00
Redstone_Dubstep	d91bc9c73d	Fix certain particles not updating their bounding box when their position changes (#8925 )	2022-08-08 15:09:13 +02:00
LexManos	c807665ab9	Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924	2022-08-07 17:35:15 -07:00
LexManos	7b97c181b9	1.19.2	2022-08-05 16:35:02 -07:00
Brennan Ward	c42b0847d2	Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927 )	2022-08-05 11:35:47 -07:00
Sirttas	f182cb00c1	Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914 )	2022-08-05 11:32:53 -07:00
J.T. McQuigg	3181b5da23	Add Biomes.BEACH to Tags (#8892 )	2022-08-05 11:31:32 -07:00
Mysticdrew	983c119477	Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921 )	2022-08-05 11:31:11 -07:00
Sara Freimer	874ff1bba2	Add an event for when the chunk ticket level is updated (#8909 )	2022-08-05 11:21:14 -07:00
TheMuso	06d9d89f98	Re-add PotentialSpawns event (#8712 )	2022-08-05 09:29:02 -07:00
Dennis C	c713bad8c3	Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919 )	2022-08-04 22:14:28 -07:00
Marc Hermans	fe19491822	[1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931 )	2022-08-03 22:32:32 +01:00
SizableShrimp	c80e8a1aca	Match Mojang's action bar fix for MC-72687 (#8917 )	2022-07-29 01:09:33 -07:00
SizableShrimp	6845c094ab	Forge 1.19.1 Load natives from classpath Make command argument types a forge registry Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` Overhaul `ServerChatEvent` to use `ChatDecorator` system Remove `ClientChatEvent#setMessage` for now Gradle 7.5 Signed-off-by: SizableShrimp <[email protected]>	2022-07-28 00:20:31 -05:00