1.19.2 RB 5

https://forums.minecraftforge.net/topic/154385-forge-435-minecraft-1192/
Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10464 )
2026-11-14 01:04:24 +00:00 · 2025-03-04 16:55:07 -08:00 · 2025-03-04 14:44:47 -08:00 · 2025-03-04 14:40:07 -08:00 · 2025-03-04 14:39:51 -08:00 · 2025-02-18 14:29:30 -08:00
817 changed files with 9359 additions and 8222 deletions
@@ -37,7 +37,7 @@ project {

    params {
        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("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.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*)
@@ -155,7 +155,7 @@ object PullRequestChecks : BuildType({
            enableStacktrace = true
            dockerImage = "%docker_gradle_image%"
            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                --network=host
                -u 1000:1000
@@ -189,7 +189,7 @@ object PullRequestCompatibility : BuildType({
            enableStacktrace = true
            dockerImage = "%docker_gradle_image%"
            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                --network=host
                -u 1000:1000
@@ -1,125 +0,0 @@
-@Library('forge-shared-library')_
-
-pipeline {
-    options {
-        disableConcurrentBuilds()
-    }
-    agent {
-        docker {
-            image 'gradle:7-jdk16'
-            //args '-v forgegc:/home/gradle/.gradle_cache/'
-        }
-    }
-    environment {
-        GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
-        DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook')
-        DISCORD_PREFIX = "Job: Forge Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}"
-        JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
-    }
-
-    stages {
-        stage('notify_start') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                discordSend(
-                    title: "${DISCORD_PREFIX} Started",
-                    successful: true,
-                    result: 'ABORTED', //White border
-                    thumbnail: JENKINS_HEAD,
-                    webhookURL: DISCORD_WEBHOOK
-                )
-            }
-        }
-        /*
-        stage('pull_cache') {
-            steps {
-                sh 'cp -r /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/'
-                sh 'cp -r /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/'
-                sh 'cp -r /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/'
-            }
-        }
-        */
-        stage('setup') {
-            steps {
-                withGradle {
-                    sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
-                }
-                script {
-                    env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "^version:" | cut -d" " -f2').trim()
-                    env.FMLONLY_VERSION = sh(returnStdout: true, script: './gradlew :fmlonly:properties -q | grep "^version:" | cut -d" " -f2').trim()
-                }
-            }
-        }
-        stage('changelog') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                writeChangelog(currentBuild, 'build/changelog.txt')
-            }
-        }
-        stage('publish') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            environment {
-                CROWDIN = credentials('forge-crowdin')
-                KEYSTORE = credentials('forge-jenkins-keystore-old')
-                KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
-                KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
-            }
-            steps {
-                withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
-                    withGradle {
-                        sh './gradlew ${GRADLE_ARGS} publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
-                    }
-                }
-            }
-            post {
-                success {
-                    build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false
-                    build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:fmlonly ${env.FMLONLY_VERSION} latest")], propagate: false, wait: false
-                }
-            }
-        }
-        stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
-            when {
-                changeRequest()
-            }
-            environment {
-                CROWDIN = credentials('forge-crowdin')
-            }
-            steps {
-                withGradle {
-                    sh './gradlew ${GRADLE_ARGS} publish -PcrowdinKey=${CROWDIN}'
-                }
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
-
-                if (env.CHANGE_ID == null) { // This is unset for non-PRs
-                    discordSend(
-                        title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
-                        description: '```\n' + getChanges(currentBuild) + '\n```',
-                        successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"),
-                        result: currentBuild.currentResult,
-                        thumbnail: JENKINS_HEAD,
-                        webhookURL: DISCORD_WEBHOOK
-                    )
-                }
-            }
-        }
-    }
-}
@@ -1,3 +1,4 @@
+import de.undercouch.gradle.tasks.download.Download
 import groovy.json.JsonBuilder

 import java.nio.file.Files
@@ -16,12 +17,13 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder

 plugins {
    id 'org.cadixdev.licenser' version '0.6.1'
-    id 'com.github.ben-manes.versions' version '0.36.0'
-    id 'net.minecraftforge.gradleutils' version '2.+'
+    id 'com.github.ben-manes.versions' version '0.46.0'
+    id 'net.minecraftforge.gradleutils' version '[2.2,2.3)'
    id 'eclipse'
-    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
+    id 'idea'
+    id 'de.undercouch.download' version '5.4.0'
+    id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false
 }

 Util.init() //Init all our extension methods!
@@ -36,19 +38,19 @@ ext {
        ]
    }
    MAPPING_CHANNEL = 'official'
-    MAPPING_VERSION = '1.19.3'
-    MC_VERSION = '1.19.3'
+    MAPPING_VERSION = '1.19.2'
+    MC_VERSION = '1.19.2'
    MC_NEXT_VERSION = '1.20'
-    MCP_VERSION = '20221207.122022'
+    MCP_VERSION = '20220805.130853'
    SPI_VERSION = '6.0.0'
    ACCESSTRANSFORMERS_VERSION = '8.0.4'
-    COREMODS_VERSION = '5.0.1'
+    COREMODS_VERSION = '5.2.4'
    EVENTBUS_VERSION = '6.0.3'
    MODLAUNCHER_VERSION = '10.0.8'
    SECUREJARHANDLER_VERSION = '2.1.4'
    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
-    ASM_VERSION = '9.3'
-    INSTALLER_VERSION = '2.1.+'
+    ASM_VERSION = '9.7.1'
+    INSTALLER_VERSION = '2.2.+'
    MIXIN_VERSION = '0.8.5'
    TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
    JLINE_VERSION = '3.12.+'
@@ -56,17 +58,17 @@ ext {
    JETBRAINS_ANNOTATIONS_VERSION = '23.0.0'
    SLF4J_API_VERSION = '1.8.0-beta4'
    APACHE_MAVEN_ARTIFACT_VERSION = '3.8.5'
-    JARJAR_VERSION = '0.3.18'

    // These versions should be kept in sync with the version manifest JSON
    // To use a version newer than the version manifest JSON, the dependency must be added to the installer configuration
-    MOJANG_LOGGING_VERSION = '1.1.1'
+    MOJANG_LOGGING_VERSION = '1.0.0'
    LOG4J_VERSION = '2.19.0'
-    GUAVA_VERSION = '31.1-jre'
-    GSON_VERSION = '2.10'
+    GUAVA_VERSION = '31.0.1-jre'
+    GSON_VERSION = '2.8.9'
    APACHE_COMMONS_LANG3_VERSION = '3.12.0'
    JOPT_SIMPLE_VERSION = '5.0.4'
    COMMONS_IO_VERSION = '2.11.0'
+    JARJAR_VERSION = '0.3.16'

    GIT_INFO = gradleutils.gitInfo
    VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
@@ -74,7 +76,7 @@ ext {
    FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)

    BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.1.1:fatjar'
-    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
+    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.1'
    JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
    MIN_TAG_FOR_CHANGELOG = '41.0'
@@ -95,7 +97,7 @@ def extraTxts = [
    rootProject.tasks.createChangelog.outputFile
 ]

-task downloadVersionManifest(type: Download) {
+tasks.register('downloadVersionManifest', Download) {
    src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'
    dest file('build/versions/version_manifest.json')
    useETag 'all'
@@ -210,46 +212,53 @@ project(':mcp') {
    }
 }

-project(':clean') {
-    evaluationDependsOn(':mcp')
-    apply plugin: 'net.minecraftforge.gradle.patcher'
-    tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
+if (!System.env.TEAMCITY_VERSION) {
+    project(':clean') {
+        evaluationDependsOn(':mcp')
+        apply plugin: 'net.minecraftforge.gradle.patcher'
+        tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything

-    dependencies {
-        implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
-    }
+        dependencies {
+            implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
+        }

-    patcher {
-        parent = project(':mcp')
-        mcVersion = MC_VERSION
-        patchedSrc = file('src/main/java')
+        patcher {
+            parent = project(':mcp')
+            mcVersion = MC_VERSION
+            patchedSrc = file('src/main/java')

-        mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
+            mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION

-        runs {
-            clean_client {
-                client true
-                taskName 'clean_client'
-                ideaModule "${rootProject.name}.${project.name}.main"
+            runs {
+                clean_client {
+                    client true
+                    taskName 'clean_client'
+                    ideaModule "${rootProject.name}.${project.name}.main"

-                main 'net.minecraft.client.main.Main'
-                workingDirectory project.file('run')
+                    main 'net.minecraft.client.main.Main'
+                    workingDirectory project.file('run')

-                args '--gameDir', '.'
-                args '--version', MC_VERSION
-                args '--assetsDir', downloadAssets.output
-                args '--assetIndex', '{asset_index}'
-                args '--accessToken', '0'
+                    args '--gameDir', '.'
+                    args '--version', MC_VERSION
+                    args '--assetsDir', downloadAssets.output
+                    args '--assetIndex', '{asset_index}'
+                    args '--accessToken', '0'
+                }
+
+                clean_server {
+                    client false
+                    taskName 'clean_server'
+                    ideaModule "${rootProject.name}.${project.name}.main"
+
+                    main 'net.minecraft.server.Main'
+                    workingDirectory project.file('run')
+                }
            }
+        }

-            clean_server {
-                client false
-                taskName 'clean_server'
-                ideaModule "${rootProject.name}.${project.name}.main"
-
-                main 'net.minecraft.server.Main'
-                workingDirectory project.file('run')
-            }
+        // Disabling clean with CI causes an error if we don't have this...
+        compileJava {
+            dependsOn 'extractMapped'
        }
    }
 }
@@ -285,9 +294,14 @@ def sharedDeps = {
    installer "org.jline:jline-reader:${JLINE_VERSION}"   // Dep of TerminalConsoleAppender
    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 'org.openjdk.nashorn:nashorn-core:15.4'
    installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
    installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
+    installer "org.apache.logging.log4j:log4j-slf4j-impl:${LOG4J_VERSION}" // Bumped for CoreMods
+    installer "org.apache.logging.log4j:log4j-api:${LOG4J_VERSION}" // Bumped for CoreMods
+    installer "org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}" // Bumped for CoreMods
+    installer 'net.java.dev.jna:jna:5.12.1'
+    installer 'net.java.dev.jna:jna-platform:5.12.1'

    /*
    installer 'org.lwjgl:lwjgl:3.2.2'
@@ -338,7 +352,7 @@ def sharedFmlonlyForge = { Project prj ->
    }

    prj.task([type: DownloadMavenArtifact], 'downloadInstaller') {
-        artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:shrunk"
+        artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:fatjar"
        changing = true
    }

@@ -446,7 +460,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'
+        run.property 'mergeModules', 'jna-5.12.1.jar,jna-platform-5.12.1.jar'
        if (userdevRuns.contains(run)) {
            run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
            run.jvmArgs '-p', '{modules}'
@@ -869,10 +883,15 @@ project(':fmlonly') {

    // Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
    afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) }
+
+    // Disabling clean with CI causes an error if we don't have this...
+    compileJava {
+        dependsOn 'extractMapped'
+    }
 }

 project(':forge') {
-    evaluationDependsOn(':clean')
+    evaluationDependsOn(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
    apply plugin: 'java-library'
    apply plugin: 'net.minecraftforge.gradle.patcher'
    apply plugin: 'org.cadixdev.licenser'
@@ -946,13 +965,19 @@ project(':forge') {

    patcher {
        excs.from file("$rootDir/src/main/resources/forge.exc")
-        parent = project(':clean')
+        parent = project(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
        patches = file("$rootDir/patches/minecraft")
        patchedSrc = file('src/main/java')
        srgPatches = true
        accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
        sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")

+        // the clean project provides these. if we're not using it, we need to provide them ourselves
+        if (System.env.TEAMCITY_VERSION) {
+            mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
+            mcVersion = MC_VERSION
+        }
+
        runs {
            forge_client {
                property 'eventbus.checkTypesOnDispatch', 'true'
@@ -1130,9 +1155,12 @@ project(':forge') {
        ]
    }

-    task crowdin(type: Crowdin) {
-        key = project.hasProperty('crowdinKey') ? project.crowdinKey : null
-        //TODO: Merge our english.json?
+    tasks.register('downloadCrowdin', Download) {
+        src 'https://files.minecraftforge.net/crowdin.zip'
+        dest file('build/crowdin.zip')
+        useETag 'all'
+        onlyIfModified true
+        quiet true
    }

    sharedFmlonlyForge.call(project)
@@ -1241,6 +1269,14 @@ project(':forge') {
        dependsOn 'setupCheckJarCompatibility'

        baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output }
+        baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
+
+        inputJar = project.tasks.named('reobfJar').flatMap { it.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)
    }

    task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks, checkPatches, checkLicenses]){}
@@ -1502,9 +1538,12 @@ project(':forge') {
        from extraTxts

        // add crowdin locales
-        from { crowdin.output.present && crowdin.output.get().asFile.exists() ? zipTree(crowdin.output) : null}
-        dependsOn crowdin
-        duplicatesStrategy = 'exclude'
+        from zipTree(downloadCrowdin.dest).matching {
+            include 'assets/forge/lang/*.json'
+        }
+
+        dependsOn downloadCrowdin
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE

        doFirst {
            MANIFESTS.each{ pkg, values ->
@@ -1549,7 +1588,7 @@ project(':forge') {
                    exclude it
            }
            filter(ReplaceTokens, tokens: [
-                FORGE_VERSION: project.version,
+                FORGE_VERSION: FORGE_VERSION,
                FORGE_GROUP: project.group,
                FORGE_NAME: project.name,
                MC_VERSION: MC_VERSION,
@@ -1692,11 +1731,17 @@ project(':forge') {
    tasks.withType(JavaCompile).configureEach {
        options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
    }
+
+    // Disabling clean with CI causes an error if we don't have this...
+    compileJava {
+        dependsOn 'extractMapped'
+    }
 }

 //evaluationDependsOnChildren()
 task setup() {  //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
-    dependsOn ':clean:extractMapped'
+    if (!System.env.TEAMCITY_VERSION)
+        dependsOn ':clean:extractMapped'
    if (symlinkValid)
        dependsOn ':fmlonly:extractMapped'
    dependsOn ':forge:extractMapped'
@@ -1712,4 +1757,12 @@ if (System.env.TEAMCITY_VERSION) {
            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
        }
    }
+}
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
 }
@@ -4,8 +4,8 @@ repositories {
 }

 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'
+    implementation 'org.ow2.asm:asm:9.5'
+    implementation 'org.ow2.asm:asm-tree:9.5'
+    implementation 'net.minecraftforge:srgutils:0.5.+'
+    implementation 'commons-io:commons-io:2.12.0'
 }
@@ -4,7 +4,7 @@ import groovy.json.JsonBuilder
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.Opcodes
@@ -17,7 +17,9 @@ import java.util.zip.ZipInputStream

 abstract class BytecodeFinder extends DefaultTask {
    @InputFile abstract RegularFileProperty getJar()
-    @OutputFile abstract RegularFileProperty getOutput()
+    // It should be fine to mark the output as internal as we want to control when we run it anyways.
+    // This also shuts Gradle 8 up about implicit task dependencies.
+    @Internal abstract RegularFileProperty getOutput()

    BytecodeFinder() {
        output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
@@ -18,6 +18,7 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
        onlyIf {
            inputVersion.getOrNull() != null
        }
+        outputs.upToDateWhen { false } // Never up to date, because this setup task should always run

        baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
    }
@@ -31,17 +32,9 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
        }.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
@@ -74,14 +74,6 @@ public class Util {
 			if (!checkExists(url)) {
 				url = "https://maven.minecraftforge.net/${path}"
 			}
-			//TODO remove when Mojang launcher is updated
-			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}"
-				art.classifier = null
-				art.extension = 'jar'
-			}
 			ret[key] = [
 				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
 				downloads: [
@@ -2,16 +2,15 @@

 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19-&query=$.promos["1.19.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
+[![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.2-&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)
+)](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos)

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

-| Version |    Support    |
-|---------| ------------- |
-| 1.19.x  |    Active     |
-| 1.18.x  |    LTS        |
+| Version      | Support                     |
+|--------------|-----------------------------|
+| All versions | [Supported][Support-Policy] |

 * [Download]
 * [Forum]
@@ -29,24 +28,35 @@ You can download the installer for the *Recommended Build* or the
 into your vanilla launcher environment, where you can then create a new
 profile using that version and play the game!
 
-For support and questions, visit [the Support Forum](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/) or [the Forge Discord server](https://discord.gg/forge).
+For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].

-[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
+## Required Java Versions
+
+We require the version of Java that Minecraft requires, which is currently:
+
+| Minecraft     | Java              |
+|---------------|-------------------|
+| 1.20.6+       | [21][Adoptium-21] |
+| 1.18 - 1.20.4 | [17][Adoptium-17] |
+| 1.17.1        | [16][Adoptium-16] |
+| 1.16.5-       | [8][Adoptium-8]   |
+
+**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**

 # Creating Mods

-[See the "Getting Started" section in the Forge Documentation](https://mcforge.readthedocs.io/en/latest/gettingstarted/).
+[See the "Getting Started" section in the Forge Documentation](https://docs.minecraftforge.net/en/1.19.2/gettingstarted/).

 # Contribute to Forge

 If you wish to actually inspect Forge, submit PRs or otherwise work
 with Forge itself, you're in the right place!

- [See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
+ [See the guide to setting up a Forge workspace](https://docs.minecraftforge.net/en/1.19.2/forgedev/).

 ### Pull requests

-[See the "Making Changes and Pull Requests" section in the Forge documentation](https://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
+[See the "Making Changes and Pull Requests" section in the Forge documentation](https://docs.minecraftforge.net/en/1.19.2/forgedev/#making-changes-and-pull-requests).

 Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.

@@ -61,6 +71,22 @@ Please ensure you have a valid email address associated with your GitHub account
 [becoming a patron](https://www.patreon.com/LexManos).*

 [Download]: https://files.minecraftforge.net/
-[Forum]: https://www.minecraftforge.net/forum/
-[Discord]: https://discord.gg/UvedJ9m
-[Documentation]: https://mcforge.readthedocs.io
+
+[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
+[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
+[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
+[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
+[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
+
+[Forum]: https://forums.minecraftforge.net/
+[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
+[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
+
+[Discord]: https://discord.minecraftforge.net/
+
+[Documentation]: https://docs.minecraftforge.net/en/1.19.2/
+[Getting-Started]: https://docs.minecraftforge.net/en/1.19.2/gettingstarted/
+[ForgeDev]: https://docs.minecraftforge.net/en/1.19.2/forgedev/
+[Pull-Requests]: https://docs.minecraftforge.net/en/1.19.2/forgedev/#making-changes-and-pull-requests
+
+[Patreon]: https://www.patreon.com/LexManos
@@ -5,36 +5,36 @@

 package net.minecraftforge.fml;

-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;

+import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;

 public class Bindings {
-    private static final Bindings INSTANCE = new Bindings();
+    private Bindings() {}

-    private final IBindingsProvider provider;
-
-    private Bindings() {
-        final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList();
-        if (providers.size() != 1) {
-            throw new IllegalStateException("Could not find bindings provider");
-        }
-        this.provider = providers.get(0);
-    }
+    /**
+     * The provider of the bindings
+     * @implNote May also throw a {@link ServiceConfigurationError}
+     */
+    private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
+            .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));

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

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

    public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return INSTANCE.provider.getConfigConfiguration();
+        return PROVIDER.getConfigConfiguration();
    }
 }
@@ -95,5 +95,24 @@ public interface IExtensionPoint<T extends Record>
    @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
    record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
        public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
+
+        /**
+         * Ignores any version information coming from the server - use for server only mods
+         */
+        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
+
+        /**
+         * Ignores all information and provides no information
+         */
+        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
+
+        /**
+         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
+         * instead of a {@link Supplier}.
+         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
+         */
+        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+            this(() -> version, remoteVersionTest);
+        }
    }
 }
@@ -9,6 +9,7 @@ import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;

 import java.util.EnumMap;
@@ -20,6 +21,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

@@ -57,15 +59,16 @@ public abstract class ModContainer
        this.modInfo = info;
        this.modLoadingStage = ModLoadingStage.CONSTRUCT;

-        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
+        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
+                .orElseGet(() -> (Boolean) info.getOwningFile().getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE) ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
        Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
            case "MATCH_VERSION" -> // default displaytest checks for version string match
                    () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
                        (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
            case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
            case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    () -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
            case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
            default -> // any other value throws an exception
                    throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
@@ -142,6 +145,22 @@ public abstract class ModContainer
        extensionPoints.put(point, extension);
    }

+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
+    }
+
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
+    }
+
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
    public void addConfig(final ModConfig modConfig) {
       configs.put(modConfig.getType(), modConfig);
    }
@@ -22,7 +22,13 @@ import net.minecraftforge.forgespi.locating.IModFile;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;
@@ -250,22 +256,10 @@ public class ModLoader
                .filter(Objects::nonNull)
                .collect(Collectors.toList());
        if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
-
            LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                    modFile.getFilePath(),
-                    containers.size(), containerIds,
-                    modInfoMap.size(), modIds);
-
-            var missingClasses = new ArrayList<>(modIds);
-            missingClasses.removeAll(containerIds);
-            LOGGER.fatal(LOADING, "The following classes are missing, but are reported in the mods.toml: {}", missingClasses);
-
-            var missingMods = new ArrayList<>(containerIds);
-            missingMods.removeAll(modIds);
-            LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
-
+                    containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList()),
+                    modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList()));
            loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
        }
        // remove errored mod containers
@@ -311,14 +305,6 @@ public class ModLoader
        }
        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
    }
-    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return e;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-        return e;
-    }
    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
        if (!loadingStateValid) {
            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
@@ -8,38 +8,54 @@ 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.BiPredicate;
 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 ModContainer activeContainer;
    private Object languageExtension;
    private ModLoadingStage stage;

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

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

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

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

+    public ModContainer getContainer() {
+        return getActiveContainer();
+    }
+
    /**
     * Register an {@link IExtensionPoint} with the mod container.
     * @param point The extension point to register
@@ -47,29 +63,67 @@ public class ModLoadingContext
     * @param <T> The type signature of the extension operator
     */
    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
-        getActiveContainer().registerExtensionPoint(point, extension);
+        getContainer().registerExtensionPoint(point, extension);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
+     */
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        getContainer().registerDisplayTest(() -> displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
+     */
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        getContainer().registerDisplayTest(displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
+     */
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
+     */
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
    }

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

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

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

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


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

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

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

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

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

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

        if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
        {
-            classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f ->
+            classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
            {
                int prev = f.access;
                f.access &= ~Opcodes.ACC_FINAL;
@@ -66,6 +66,9 @@ public class FMLLoader
            throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
        }

+        // Allows us to communicate properties with other services through ModLauncher
+        setupBlackboardKeys();
+
        accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
            LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
            return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
@@ -127,6 +130,12 @@ public class FMLLoader
        }
    }

+    private static void setupBlackboardKeys() {
+        LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
+        var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
+        Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
+    }
+
    static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
    {
        final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
@@ -11,11 +11,17 @@ import net.minecraftforge.forgespi.language.IModInfo;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.slf4j.Logger;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;

-import static java.util.stream.Collectors.*;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.joining;
+import static net.minecraftforge.fml.loading.LogMarkers.LOADING;

 public class UniqueModListBuilder
 {
@@ -66,28 +72,34 @@ public class UniqueModListBuilder

        // Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
        // We can't handle this
-        final List<IModInfo> dupedMods = modIds.values().stream()
+        final List<String> dupedModErrors = modIds.values().stream()
                .filter(modInfos -> modInfos.size() > 1)
-                .map(modInfos -> modInfos.get(0))
-                .toList();
+                .map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
+                        mods.get(0).getModId(),
+                        mods.stream()
+                                .map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
+                )).toList();

-        if (!dupedMods.isEmpty()) {
-            final List<EarlyLoadingException.ExceptionData> duplicateModErrors = dupedMods.stream()
-                                                                                   .map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedmod", dm, Objects.toString(dm)))
-                                                                                   .toList();
-            throw new EarlyLoadingException("Duplicate mods found", null,  duplicateModErrors);
+        if (!dupedModErrors.isEmpty()) {
+            LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
+            throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
+                    .map(s -> new EarlyLoadingException.ExceptionData(s))
+                    .toList());
        }

-        final List<ModFile> dupedLibs = versionedLibIds.values().stream()
+        final List<String> dupedLibErrors = versionedLibIds.values().stream()
                .filter(modFiles -> modFiles.size() > 1)
-                .map(modFiles -> modFiles.get(0))
-                .toList();
+                .map(mods -> String.format("\tLibrary: '%s' from files: %s",
+                        getModId(mods.get(0)),
+                        mods.stream()
+                                .map(modFile -> modFile.getFileName()).collect(joining(", "))
+                )).toList();

-        if (!dupedLibs.isEmpty()) {
-            final List<EarlyLoadingException.ExceptionData> duplicateLibErrors = dupedLibs.stream()
-                .map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedlib.versioned", dm, Objects.toString(dm)))
-                .toList();
-            throw new EarlyLoadingException("Duplicate plugins or libraries found", null,  duplicateLibErrors);
+        if (!dupedLibErrors.isEmpty()) {
+            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
+            throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
+                    .map(s -> new EarlyLoadingException.ExceptionData(s))
+                    .toList());
        }

        // Collect unique mod files by module name. This will be used for deduping purposes
@@ -34,18 +34,23 @@ public abstract class AbstractModProvider implements IModProvider
    protected static final String MANIFEST = "META-INF/MANIFEST.MF";

    protected IModLocator.ModFileOrException createMod(Path... path) {
+        return this.createMod(getDefaultJarModType(), path);
+    }
+
+    // FORGE: Backporting artifact, the defaultType must be the first parameter since path is varargs
+    protected IModLocator.ModFileOrException createMod(String defaultType, Path... path) {
        var mjm = new ModJarMetadata();
        var sj = SecureJar.from(
                Manifest::new,
                jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-                (root, p) -> true,
+                null,
                path
        );

        IModFile mod;
        var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
        if (type == null) {
-            type = getDefaultJarModType();
+            type = defaultType;
        }
        if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
@@ -34,7 +34,7 @@ public class ExplodedDirectoryLocator implements IModLocator {
        explodedMods.forEach(explodedMod ->
                ModJarMetadata.buildFile(this,
                        jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(),
-                        (a,b) -> true,
+                        null,
                        explodedMod.paths().toArray(Path[]::new))
                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
        return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();
@@ -81,7 +81,14 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
            final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
            final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
            final Path pathInFS = zipFS.getPath("/");
-            return Optional.of(createMod(pathInFS).file());
+            final IModFile.Type parentType = file.getType();
+            final String modType;
+            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
+                modType = IModFile.Type.LIBRARY.name();
+            } else {
+                modType = IModFile.Type.GAMELIBRARY.name();
+            }
+            return Optional.of(createMod(modType, pathInFS).file());
        }
        catch (Exception e)
        {
@@ -12,6 +12,7 @@ import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.UniqueModListBuilder;
 import net.minecraftforge.fml.loading.progress.StartupMessageManager;
@@ -20,6 +21,7 @@ import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

 import java.util.ArrayList;
@@ -67,6 +69,7 @@ public class ModDiscoverer {
        boolean successfullyLoadedMods = true;
        List<IModFileInfo> brokenFiles = new ArrayList<>();

+        boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
        //Loop all mod locators to get the prime mods to load from.
        for (IModLocator locator : modLocatorList) {
            try {
@@ -84,8 +87,24 @@ public class ModDiscoverer {
                if (!badModFiles.isEmpty()) {
                    LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
                    brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
+                    locatedFiles.removeAll(badModFiles);
                }
-                locatedFiles.removeAll(badModFiles);
+
+                if (distIsDedicatedServer) {
+                    var clientOnlyModFiles = locatedFiles.stream()
+                            .filter(file -> {
+                                // some mod files can have null infos, like javafml, mclanguage, lowcode, and fmlcore
+                                @Nullable var info = file.getModFileInfo();
+
+                                return info != null && (Boolean) info.getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE);
+                            })
+                            .toList();
+                    if (!clientOnlyModFiles.isEmpty()) {
+                        LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
+                        locatedFiles.removeAll(clientOnlyModFiles);
+                    }
+                }
+
                LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
                handleLocatedFiles(loadedFiles, locatedFiles);
            } catch (InvalidModFileException imfe) {
@@ -43,6 +43,10 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
    private final String license;
    private final List<String> usesServices;

+    public static final String CLIENT_SIDE_ONLY_PROP = "__FORGE_clientSideOnly";
+
+    private static final Map<String, Object> CLIENT_SIDE_ONLY_MAP = Map.of(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
+
    ModFileInfo(final ModFile modFile, final IConfigurable config)
    {
        this.modFile = modFile;
@@ -56,8 +60,21 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
        this.license = config.<String>getConfigElement("license")
            .orElse("");
        this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false);
+        boolean clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly").orElse(false);
        this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of());
-        this.properties = config.<Map<String, Object>>getConfigElement("properties").orElse(Collections.emptyMap());
+
+        var maybeProps = config.<Map<String, Object>>getConfigElement("properties");
+        if (clientSideOnly) {
+            if (maybeProps.isPresent()) {
+                this.properties = new HashMap<>(maybeProps.get());
+                this.properties.put(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
+            } else {
+                this.properties = CLIENT_SIDE_ONLY_MAP;
+            }
+        } else {
+            this.properties = maybeProps.orElse(Collections.emptyMap());
+        }
+
        this.modFile.setFileProperties(this.properties);
        this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null);
        final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
@@ -69,7 +69,9 @@ public class ModInfo implements IModInfo, IConfigurable
                .map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
                .map(DefaultArtifactVersion::new).orElse(DEFAULT_VERSION);
        this.displayName = config.<String>getConfigElement("displayName").orElse(this.modId);
-        this.description = config.<String>getConfigElement("description").orElse("MISSING DESCRIPTION");
+        this.description = config.<String>getConfigElement("description")
+                .orElse("MISSING DESCRIPTION")
+                .replace("\r\n", "\n").stripIndent();

        this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
                .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile")).orElse(null)));
@@ -196,7 +198,7 @@ public class ModInfo implements IModInfo, IConfigurable
        private final boolean mandatory;
        private final Ordering ordering;
        private final DependencySide side;
-        private Optional<URL> referralUrl;
+        private final Optional<URL> referralUrl;

        public ModVersion(final IModInfo owner, final IConfigurable config) {
            this.owner = owner;
@@ -31,7 +31,7 @@ public final class ModJarMetadata implements JarMetadata {
    // TODO: Remove helper functions to cleanup api
    @Deprecated(forRemoval = true, since="1.18")
    static IModFile buildFile(IModLocator locator, Path... files) {
-        return buildFile(locator, j->true, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
+        return buildFile(locator, j->true, null, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
    }

    // TODO: Remove helper functions to cleanup api
@@ -45,7 +45,7 @@ public class Scanner {
        try (InputStream in = Files.newInputStream(path)){
            ModClassVisitor mcv = new ModClassVisitor();
            ClassReader cr = new ClassReader(in);
-            cr.accept(mcv, 0);
+            cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
            mcv.buildData(result.getClasses(), result.getAnnotations());
        } catch (IOException | IllegalArgumentException e) {
            // mark path bad
@@ -43,7 +43,7 @@ public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
        var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
        var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());

-        return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
+        return new LocatedPaths(mcstream.build().toList(), null, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
    }

    protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
@@ -43,12 +43,18 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
            }, mcextra
        );
        BiPredicate<String, String> filter = (path, base) -> true;
+        final BiPredicate<String, String> alwaysTrueFilter = filter;

        var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
        var modstream = Stream.<List<Path>>builder();

        filter = processMCStream(vers, mcstream, filter, modstream);

+        // Ensure backwards compatibility if anything overrides processMCStream()
+        // and expects the default always true filter by only changing it to null afterwards if left unchanged.
+        if (filter == alwaysTrueFilter)
+            filter = null;
+
        var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
        var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
        var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
@@ -19,7 +19,6 @@ public final class CyclePresentException extends IllegalArgumentException {
     * @param cycles the cycles present
     */
    CyclePresentException(Set<Set<?>> cycles) {
-        super("Cycles present in graph: " + cycles);
        this.cycles = cycles;
    }

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
    esac
 done

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
    done
 fi

+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

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

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

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

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

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

+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 import java.util.Optional;

 public class FMLModContainer extends ModContainer
@@ -31,6 +34,7 @@ public class FMLModContainer extends ModContainer
    private final IEventBus eventBus;
    private Object modInstance;
    private final Class<?> modClass;
+    private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);

    public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
    {
@@ -40,8 +44,7 @@ public class FMLModContainer extends ModContainer
        activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
        this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
        this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
-        final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this);
-        this.contextExtension = () -> contextExtension;
+        this.contextExtension = () -> context;
        try
        {
            var layer = gameLayer.findModule(info.getOwningFile().moduleName()).orElseThrow();
@@ -65,11 +68,22 @@ public class FMLModContainer extends ModContainer
        try
        {
            LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
-            this.modInstance = modClass.getDeclaredConstructor().newInstance();
+            Constructor<?> constructor;
+            try {
+                constructor = modClass.getDeclaredConstructor(context.getClass());
+            } catch (NoSuchMethodException | SecurityException exception) {
+                constructor = modClass.getDeclaredConstructor();
+            }
+            this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context);
            LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
        }
        catch (Throwable e)
        {
+            // When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the
+            // actual exception from the mod loading error screen.
+            if (e instanceof InvocationTargetException wrapped)
+                e = Objects.requireNonNullElse(wrapped.getCause(), e); // unwrap the exception
+
            LOGGER.error(LOADING,"Failed to create mod instance. ModID: {}, class {}", getModId(), modClass.getName(), e);
            throw new ModLoadingException(modInfo, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmod", e, modClass);
        }
@@ -16,14 +16,14 @@ Step 1: Open your command-line and browse to the folder where you extracted the

 Step 2: You're left with a choice.
 If you prefer to use Eclipse:
-1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux)
+1. Run the following command: `./gradlew genEclipseRuns`
 2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
   or run `gradlew eclipse` to generate the project.

 If you prefer to use IntelliJ:
 1. Open IDEA, and import project.
 2. Select your build.gradle file and have it import.
-3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux)
+3. Run the following command: `./gradlew genIntellijRuns`
 4. Refresh the Gradle Project in IDEA if required.

 If at any point you are missing libraries in your IDE, or you've run into problems you can 
@@ -40,7 +40,7 @@ https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md

 Additional Resources: 
 =========================
-Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/  
-LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0  
-Forge Forum: https://forums.minecraftforge.net/  
-Forge Discord: https://discord.gg/UvedJ9m  
+Community Documentation: https://docs.minecraftforge.net/en/1.19.2/gettingstarted/
+LexManos' Install Video: https://youtu.be/8VEdtQLuLO0
+Forge Forums: https://forums.minecraftforge.net/
+Forge Discord: https://discord.minecraftforge.net/
@@ -1,12 +1,16 @@
 plugins {
    id 'eclipse'
+    id 'idea'
    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }

-version = '1.0'
-group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'modid'
+version = mod_version
+group = mod_group_id
+
+base {
+    archivesName = mod_id
+}

 // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -26,14 +30,36 @@ minecraft {
    //
    // Use non-default mappings at your own risk. They may not always work.
    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: '@MAPPING_CHANNEL@', version: '@MAPPING_VERSION@'
+    mappings channel: mapping_channel, version: mapping_version

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

    // Default run configurations.
    // These can be tweaked, removed, or duplicated as needed.
    runs {
-        client {
+        // applies to all the run configs below
+        configureEach {
            workingDirectory project.file('run')

            // Recommended logging data for a userdev environment
@@ -49,65 +75,38 @@ minecraft {
            property 'forge.logging.console.level', 'debug'

            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', 'examplemod'
+            property 'forge.enabledGameTestNamespaces', mod_id

            mods {
-                examplemod {
+                "${mod_id}" {
                    source sourceSets.main
                }
            }
        }

+        client {
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', mod_id
+        }
+
        server {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', 'examplemod'
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
+            property 'forge.enabledGameTestNamespaces', mod_id
+            args '--nogui'
        }

        // This run config launches GameTestServer and runs all registered gametests, then exits.
        // By default, the server will crash when no gametests are provided.
        // The gametest system is also enabled by default for other run configs under the /test command.
        gameTestServer {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', 'examplemod'
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
+            property 'forge.enabledGameTestNamespaces', mod_id
        }

        data {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
+            // example of overriding the workingDirectory set in configureEach above
+            workingDirectory project.file('run-data')

            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
+            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
        }
    }
 }
@@ -126,46 +125,73 @@ repositories {
 }

 dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft '@FORGE_GROUP@:@FORGE_NAME@:@FORGE_VERSION@'
+    // Specify the version of Minecraft to use.
+    // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact.
+    // The "userdev" classifier will be requested and setup by ForgeGradle.
+    // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
+    // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

    // Real mod deobf dependency examples - these get remapped to your current mappings
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
+    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency

-    // Examples using mod jars from ./libs
+    // Example mod dependency using a mod jar from ./libs with a flat dir repository
+    // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
+    // The group id is ignored when searching -- in this case, it is "blank"
    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")

-    // For more info...
+    // For more info:
    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
    // http://www.gradle.org/docs/current/userguide/dependency_management.html
 }

-// Example for how to get properties into the manifest for reading at runtime.
-jar {
-    manifest {
-        attributes([
-                "Specification-Title"     : "examplemod",
-                "Specification-Vendor"    : "examplemodsareus",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "examplemodsareus",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
+// This block of code expands all declared replace properties in the specified resource targets.
+// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
+// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
+// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
+tasks.named('processResources', ProcessResources).configure {
+    var replaceProperties = [
+            minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
+            forge_version: forge_version, forge_version_range: forge_version_range,
+            loader_version_range: loader_version_range,
+            mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
+            mod_authors: mod_authors, mod_description: mod_description,
+    ]
+    inputs.properties replaceProperties
+
+    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+        expand replaceProperties + [project: project]
    }
 }

-// Example configuration to allow publishing using the maven-publish plugin
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-// publish.dependsOn('reobfJar')
+// Example for how to get properties into the manifest for reading at runtime.
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+                'Specification-Title'     : mod_id,
+                'Specification-Vendor'    : mod_authors,
+                'Specification-Version'   : '1', // We are version 1 of ourselves
+                'Implementation-Title'    : project.name,
+                'Implementation-Version'  : project.jar.archiveVersion,
+                'Implementation-Vendor'   : mod_authors,
+                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
+    }
+
+    // This is the preferred method to reobfuscate your jar file
+    finalizedBy 'reobfJar'
+}
+
+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
+// tasks.named('publish').configure {
+//     dependsOn 'reobfJar'
+// }

 publishing {
    publications {
-        mavenJava(MavenPublication) {
+        register('mavenJava', MavenPublication) {
            artifact jar
        }
    }
@@ -1,4 +1,59 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
+
+
+## Environment Properties
+
+# The Minecraft version must agree with the Forge version to get a valid artifact
+minecraft_version=@MC_VERSION@
+# The Minecraft version range can use any release version of Minecraft as bounds.
+# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
+# as they do not follow standard versioning conventions.
+minecraft_version_range=[@MC_VERSION@,@MC_NEXT_VERSION@)
+# The Forge version must agree with the Minecraft version to get a valid artifact
+forge_version=@FORGE_VERSION@
+# The Forge version range can use any version of Forge as bounds or match the loader version range
+forge_version_range=[@FORGE_SPEC_VERSION@,)
+# The loader version range can only use the major version of Forge/FML as bounds
+loader_version_range=[@FORGE_SPEC_VERSION@,)
+# The mapping channel to use for mappings.
+# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
+# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
+#
+# | Channel   | Version              |                                                                                |
+# |-----------|----------------------|--------------------------------------------------------------------------------|
+# | official  | MCVersion            | Official field/method names from Mojang mapping files                          |
+# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
+#
+# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+#
+# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
+# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
+mapping_channel=@MAPPING_CHANNEL@
+# The mapping version to query from the mapping channel.
+# This must match the format required by the mapping channel.
+mapping_version=@MAPPING_VERSION@
+
+
+## Mod Properties
+
+# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
+# Must match the String constant located in the main mod class annotated with @Mod.
+mod_id=examplemod
+# The human-readable display name for the mod.
+mod_name=Example Mod
+# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
+mod_license=All Rights Reserved
+# The mod version. See https://semver.org/
+mod_version=1.0.0
+# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
+# This should match the base package used for the mod sources.
+# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
+mod_group_id=com.example.examplemod
+# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
+mod_authors=YourNameHere, OtherNameHere
+# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
+mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.
@@ -1,6 +1,13 @@
 pluginManagement {
    repositories {
        gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
    }
-}
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
@@ -0,0 +1,64 @@
+package com.example.examplemod;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.config.ModConfigEvent;
+import net.minecraftforge.registries.ForgeRegistries;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
+// Demonstrates how to use Forge's config APIs
+@Mod.EventBusSubscriber(modid = ExampleMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class Config
+{
+    private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+
+    private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
+            .comment("Whether to log the dirt block on common setup")
+            .define("logDirtBlock", true);
+
+    private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER
+            .comment("A magic number")
+            .defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE);
+
+    public static final ForgeConfigSpec.ConfigValue<String> MAGIC_NUMBER_INTRODUCTION = BUILDER
+            .comment("What you want the introduction message to be for the magic number")
+            .define("magicNumberIntroduction", "The magic number is... ");
+
+    // a list of strings that are treated as resource locations for items
+    private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER
+            .comment("A list of items to log on common setup.")
+            .defineListAllowEmpty(Collections.singletonList("items"), () -> List.of("minecraft:iron_ingot"), Config::validateItemName);
+
+    static final ForgeConfigSpec SPEC = BUILDER.build();
+
+    public static boolean logDirtBlock;
+    public static int magicNumber;
+    public static String magicNumberIntroduction;
+    public static Set<Item> items;
+
+    private static boolean validateItemName(final Object obj)
+    {
+        return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
+    }
+
+    @SubscribeEvent
+    static void onLoad(final ModConfigEvent event)
+    {
+        logDirtBlock = LOG_DIRT_BLOCK.get();
+        magicNumber = MAGIC_NUMBER.get();
+        magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
+
+        // convert the list of strings into a set of items
+        items = ITEM_STRINGS.get().stream()
+                .map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName)))
+                .collect(Collectors.toSet());
+    }
+}
@@ -3,7 +3,7 @@ package com.example.examplemod;
 import com.mojang.logging.LogUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -11,13 +11,16 @@ 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.event.CreativeModeTabEvent;
-import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -40,11 +43,11 @@ public class ExampleMod
    // Creates a new Block with the id "examplemod:example_block", combining the namespace and path
    public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
    // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
-    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties()));
+    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));

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

        // Register the commonSetup method for modloading
        modEventBus.addListener(this::commonSetup);
@@ -57,16 +60,21 @@ public class ExampleMod
        // Register ourselves for server and other game events we are interested in
        MinecraftForge.EVENT_BUS.register(this);

-        // Register the item to a creative tab
-        modEventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS,
-                EXAMPLE_BLOCK_ITEM.get()));
+        // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
+        context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
    }

    private void commonSetup(final FMLCommonSetupEvent event)
    {
        // Some common setup code
        LOGGER.info("HELLO FROM COMMON SETUP");
-        LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
+
+        if (Config.logDirtBlock)
+            LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
+
+        LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber);
+
+        Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString()));
    }

    // You can use SubscribeEvent and let the Event Bus discover methods to call
@@ -6,65 +6,62 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[@FORGE_SPEC_VERSION@,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="All rights reserved"
+license="${mod_license}"
 # A URL to refer people to when problems occur with this mod
 #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
+# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
+# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
+#clientSideOnly=true #optional - defaults to false if absent
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
-modId="examplemod" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
-# see the associated build.gradle script for how to populate this completely automatically during a build
-version="${file.jarVersion}" #mandatory
- # A display name for the mod
-displayName="Example Mod" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
+modId="${mod_id}" #mandatory
+# The version number of the mod
+version="${mod_version}" #mandatory
+# A display name for the mod
+displayName="${mod_name}" #mandatory
+# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 # A URL for the "homepage" for this mod, displayed in the mod UI
 #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
 # A file name (in the root of the mod JAR) containing a logo for display
-logoFile="examplemod.png" #optional
+#logoFile="examplemod.png" #optional
 # A text field displayed in the mod UI
-credits="Thanks for this example mod goes to Java" #optional
+#credits="" #optional
 # A text field displayed in the mod UI
-authors="Love, Cheese and small house plants" #optional
+authors="${mod_authors}" #optional
 # Display Test controls the display for your mod in the server connection screen
 # MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
 # IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
 # IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
 # NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
 # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
+#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)

 # The description text for the mod (multi line!) (#mandatory)
-description='''
-This is a long form description of the mod. You can write whatever you want here
-
-Have some lorem ipsum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-'''
+description='''${mod_description}'''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.examplemod]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="[@FORGE_SPEC_VERSION@,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
-    side="BOTH"
+[[dependencies.${mod_id}]] #optional
+# the modid of the dependency
+modId="forge" #mandatory
+# Does this dependency have to exist - if not, ordering below must be specified
+mandatory=true #mandatory
+# The version range of the dependency
+versionRange="${forge_version_range}" #mandatory
+# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
+# BEFORE - This mod is loaded BEFORE the dependency
+# AFTER - This mod is loaded AFTER the dependency
+ordering="NONE"
+# Side this dependency is applied on - BOTH, CLIENT, or SERVER
+side="BOTH"
 # Here's another dependency
-[[dependencies.examplemod]]
-    modId="minecraft"
-    mandatory=true
+[[dependencies.${mod_id}]]
+modId="minecraft"
+mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[@MC_VERSION@,@MC_NEXT_VERSION@)"
-    ordering="NONE"
-    side="BOTH"
+versionRange="${minecraft_version_range}"
+ordering="NONE"
+side="BOTH"
@@ -1,8 +1,8 @@
 {
    "pack": {
-        "description": "examplemod resources",
-        "pack_format": 12,
-        "forge:resource_pack_format": 12,
+        "description": "${mod_id} resources",
+        "pack_format": 9,
+        "forge:resource_pack_format": 9,
        "forge:data_pack_format": 10
    }
 }
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -510,9 +_,16 @@
+@@ -539,9 +_,16 @@
       f_84077_[f_84076_].f_84800_ = false;
    }
 
@@ -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;
-@@ -263,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;
@@ -1,7 +1,7 @@
 --- a/com/mojang/blaze3d/vertex/BufferBuilder.java
 +++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
@@ -486,4 +_,14 @@
-          this.f_166822_ = p_254368_;
+          this.f_166822_ = p_166829_;
       }
    }
 +
@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
@@ -11,7 +_,7 @@
- import org.joml.Quaternionf;
+ 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();
-       Matrix3f matrix3f = new Matrix3f();
+       matrix4f.m_27624_();
@@ -20,7 +20,7 @@
       float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
       int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
       int[] aint1 = p_85997_.m_111303_();
-@@ -99,11 +_,13 @@
+@@ -101,12 +_,14 @@
                f5 = afloat[k] * p_86001_;
             }
 
@@ -28,11 +28,12 @@
 +            int l = applyBakedLighting(p_86002_[k], bytebuffer);
             float f9 = bytebuffer.getFloat(16);
             float f10 = bytebuffer.getFloat(20);
-             Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
-            this.m_5954_(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
-+            applyBakedNormals(vector3f, bytebuffer, p_85996_.m_252943_());
+             Vector4f vector4f = new Vector4f(f, f1, f2, 1.0F);
+             vector4f.m_123607_(matrix4f);
+-            this.m_5954_(vector4f.m_123601_(), vector4f.m_123615_(), vector4f.m_123616_(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.m_122239_(), vector3f.m_122260_(), vector3f.m_122269_());
+            applyBakedNormals(vector3f, bytebuffer, p_85996_.m_85864_());
 +            float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
-+            this.m_5954_(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
+            this.m_5954_(vector4f.m_123601_(), vector4f.m_123615_(), vector4f.m_123616_(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.m_122239_(), vector3f.m_122260_(), vector3f.m_122269_());
          }
-       }
- 
+       } catch (Throwable throwable1) {
+          if (memorystack != null) {
@@ -0,0 +1,13 @@
+--- a/com/mojang/math/Matrix3f.java
+++ b/com/mojang/math/Matrix3f.java
+@@ -588,4 +_,10 @@
+    public Matrix3f m_8183_() {
+       return new Matrix3f(this);
+    }
+
+    public void multiplyBackward(Matrix3f other) {
+        Matrix3f copy = other.m_8183_();
+        copy.m_8178_(this);
+        this.m_8169_(copy);
+    }
+ }
@@ -0,0 +1,43 @@
+--- a/com/mojang/math/Matrix4f.java
+++ b/com/mojang/math/Matrix4f.java
+@@ -559,4 +_,40 @@
+       matrix4f.f_27614_ = p_27656_;
+       return matrix4f;
+    }
+
+    // Forge start
+    public Matrix4f(float[] values) {
+        f_27603_ = values[0];
+        f_27604_ = values[1];
+        f_27605_ = values[2];
+        f_27606_ = values[3];
+        f_27607_ = values[4];
+        f_27608_ = values[5];
+        f_27609_ = values[6];
+        f_27610_ = values[7];
+        f_27611_ = values[8];
+        f_27612_ = values[9];
+        f_27613_ = values[10];
+        f_27614_ = values[11];
+        f_27615_ = values[12];
+        f_27616_ = values[13];
+        f_27617_ = values[14];
+        f_27618_ = values[15];
+    }
+
+    public void multiplyBackward(Matrix4f other) {
+        Matrix4f copy = other.m_27658_();
+        copy.m_27644_(this);
+        this.m_162210_(copy);
+    }
+
+    public void setTranslation(float x, float y, float z) {
+        this.f_27603_ = 1.0F;
+        this.f_27608_ = 1.0F;
+        this.f_27613_ = 1.0F;
+        this.f_27618_ = 1.0F;
+        this.f_27606_ = x;
+        this.f_27610_ = y;
+        this.f_27614_ = z;
+    }
+ }
@@ -1,15 +1,15 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
-@@ -12,7 +_,7 @@
- import org.joml.Vector3f;
- import org.joml.Vector3fc;
+@@ -6,7 +_,7 @@
+ import net.minecraft.Util;
+ import org.apache.commons.lang3.tuple.Triple;
 
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.client.extensions.IForgeTransformation {
    private final Matrix4f f_121078_;
    private boolean f_121079_;
    @Nullable
-@@ -139,6 +_,19 @@
+@@ -145,6 +_,19 @@
    public int hashCode() {
       return Objects.hash(this.f_121078_);
    }
@@ -22,10 +22,10 @@
 +    private void checkNormalTransform() {
 +        if (normalTransform == null) {
 +            normalTransform = new Matrix3f(f_121078_);
-+            normalTransform.invert();
-+            normalTransform.transpose();
+            normalTransform.m_8187_();
+            normalTransform.m_8155_();
 +        }
 +    }
 
    public Transformation m_175937_(Transformation p_175938_, float p_175939_) {
-       Vector3f vector3f = this.m_252829_();
+       Vector3f vector3f = this.m_175940_();
@@ -0,0 +1,28 @@
+--- a/com/mojang/math/Vector3f.java
+++ b/com/mojang/math/Vector3f.java
+@@ -138,7 +_,7 @@
+ 
+    public boolean m_122278_() {
+       float f = this.f_122228_ * this.f_122228_ + this.f_122229_ * this.f_122229_ + this.f_122230_ * this.f_122230_;
+-      if ((double)f < 1.0E-5D) {
+      if (f < Float.MIN_NORMAL) { //Forge: Fix MC-239212
+          return false;
+       } else {
+          float f1 = Mth.m_14195_(f);
+@@ -207,4 +_,16 @@
+    public String toString() {
+       return "[" + this.f_122228_ + ", " + this.f_122229_ + ", " + this.f_122230_ + "]";
+    }
+
+    public Vector3f(float[] values) {
+        set(values);
+    }
+    public void set(float[] values) {
+        this.f_122228_ = values[0];
+        this.f_122229_ = values[1];
+        this.f_122230_ = values[2];
+    }
+    public void setX(float x) { this.f_122228_ = x; }
+    public void setY(float y) { this.f_122229_ = y; }
+    public void setZ(float z) { this.f_122230_ = z; }
+ }
@@ -0,0 +1,18 @@
+--- a/com/mojang/math/Vector4f.java
+++ b/com/mojang/math/Vector4f.java
+@@ -147,4 +_,15 @@
+    public String toString() {
+       return "[" + this.f_123589_ + ", " + this.f_123590_ + ", " + this.f_123591_ + ", " + this.f_123592_ + "]";
+    }
+
+    public void set(float[] values) {
+        this.f_123589_ = values[0];
+        this.f_123590_ = values[1];
+        this.f_123591_ = values[2];
+        this.f_123592_ = values[3];
+    }
+    public void setX(float x) { this.f_123589_ = x; }
+    public void setY(float y) { this.f_123590_ = y; }
+    public void setZ(float z) { this.f_123591_ = z; }
+    public void setW(float w) { this.f_123592_ = w; }
+ }
@@ -13,6 +13,6 @@
 +       return super.m_7933_(key, scanCode, modifiers);
 +    }
 +
-    public void m_86412_(PoseStack p_88679_, int p_88680_, int p_88681_, float p_88682_) {
+    public void m_6305_(PoseStack p_88679_, int p_88680_, int p_88681_, float p_88682_) {
       this.m_7333_(p_88679_);
       m_93215_(p_88679_, this.f_96547_, this.f_200947_.getFirst(), this.f_96543_ / 2, 80, 16777215);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -57,14 +_,8 @@
+@@ -57,14 +_,9 @@
       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");
@@ -12,6 +12,7 @@
 -         }
 -
 -         p_127520_.append("\n");
+         p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.f_127501_, this.f_127506_));
 +         p_127520_.append("Stacktrace:");
 +         p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.f_127506_));
       }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -214,6 +_,7 @@
+@@ -211,6 +_,7 @@
    }
 
    static {
@@ -12,7 +12,7 @@
    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,6 +1,6 @@
 --- a/net/minecraft/advancements/critereon/ItemPredicate.java
 +++ b/net/minecraft/advancements/critereon/ItemPredicate.java
-@@ -29,6 +_,8 @@
+@@ -28,6 +_,8 @@
 import net.minecraft.world.level.ItemLike;
 
 public class ItemPredicate {
@@ -9,7 +9,7 @@
    public static final ItemPredicate f_45028_ = new ItemPredicate();
    @Nullable
    private final TagKey<Item> f_45029_;
-@@ -81,7 +_,7 @@
+@@ -80,7 +_,7 @@
          return false;
       } else {
          if (this.f_45033_.length > 0) {
@@ -18,7 +18,7 @@
 
             for(EnchantmentPredicate enchantmentpredicate : this.f_45033_) {
                if (!enchantmentpredicate.m_30476_(map)) {
-@@ -108,6 +_,11 @@
+@@ -107,6 +_,11 @@
    public static ItemPredicate m_45051_(@Nullable JsonElement p_45052_) {
       if (p_45052_ != null && !p_45052_.isJsonNull()) {
          JsonObject jsonobject = GsonHelper.m_13918_(p_45052_, "item");
@@ -30,7 +30,7 @@
          MinMaxBounds.Ints minmaxbounds$ints = MinMaxBounds.Ints.m_55373_(jsonobject.get("count"));
          MinMaxBounds.Ints minmaxbounds$ints1 = MinMaxBounds.Ints.m_55373_(jsonobject.get("durability"));
          if (jsonobject.has("data")) {
-@@ -215,6 +_,14 @@
+@@ -214,6 +_,14 @@
       } else {
          return new ItemPredicate[0];
       }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -206,6 +_,18 @@
+@@ -211,6 +_,18 @@
       this.f_90549_ = false;
    }
 
@@ -9,12 +9,12 @@
             if (s.isEmpty()) {
                map.computeIfAbsent(recipebookcategories, (p_90645_) -> {
                   return Lists.newArrayList();
-@@ -138,6 +_,8 @@
-          } else if (recipetype == RecipeType.f_44113_) {
-             return RecipeBookCategories.SMITHING;
-          } else {
-+            RecipeBookCategories categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType) recipetype, p_90647_);
-+            if (categories != null) return categories;
-             f_90618_.warn("Unknown recipe category: {}/{}", LogUtils.defer(() -> {
-                return BuiltInRegistries.f_256990_.m_7981_(p_90647_.m_6671_());
-             }), LogUtils.defer(p_90647_::m_6423_));
+@@ -103,6 +_,8 @@
+       } else if (recipetype == RecipeType.f_44113_) {
+          return RecipeBookCategories.SMITHING;
+       } else {
+         RecipeBookCategories categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType) recipetype, p_90647_);
+         if (categories != null) return categories;
+          f_90618_.warn("Unknown recipe category: {}/{}", LogUtils.defer(() -> {
+             return Registry.f_122864_.m_7981_(p_90647_.m_6671_());
+          }), LogUtils.defer(p_90647_::m_6423_));
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -298,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_());
-@@ -316,6 +_,8 @@
+@@ -317,6 +_,8 @@
                });
                return;
             }
@@ -20,9 +20,9 @@
          }
 
          if (this.f_90867_.m_240477_().m_93316_()) {
-@@ -338,11 +_,15 @@
+@@ -339,11 +_,15 @@
             Screen.m_96579_(() -> {
-                if (p_90897_ != 1 && p_90897_ != 2) {
+                if (p_90897_ != 1 && (p_90897_ != 2 || !this.f_90868_)) {
                   if (p_90897_ == 0) {
 -                     aboolean[0] = screen.m_7920_(p_90895_, p_90896_, p_90898_);
 +                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPre(screen, p_90895_, p_90896_, p_90898_);
@@ -38,7 +38,7 @@
                }
 
             }, "keyPressed event handler", screen.getClass().getCanonicalName());
-@@ -395,22 +_,26 @@
+@@ -396,22 +_,26 @@
                }
             }
          }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -245,7 +_,7 @@
+@@ -244,7 +_,7 @@
 import org.slf4j.Logger;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,16 @@
    static Minecraft f_90981_;
    private static final Logger f_90982_ = LogUtils.getLogger();
    public static final boolean f_91002_ = Util.m_137581_() == Util.OS.OSX;
-@@ -410,7 +_,6 @@
+@@ -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_());
+-      this.f_91038_ = new PackRepository(Minecraft::m_167933_, this.f_91037_, new FolderRepositorySource(this.f_90985_, PackSource.f_10527_));
+      this.f_91038_ = new PackRepository(Minecraft::createClientPackAdapter, this.f_91037_, new FolderRepositorySource(this.f_90985_, PackSource.f_10527_));
+       this.f_91030_ = p_91084_.f_101905_.f_101945_;
+       this.f_231338_ = new YggdrasilAuthenticationService(this.f_91030_);
+       this.f_91048_ = this.f_231338_.createMinecraftSessionService();
+@@ -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_());
@@ -17,7 +26,7 @@
       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_;
-@@ -459,7 +_,7 @@
+@@ -458,7 +_,7 @@
 
       this.f_90990_.m_85380_(this.f_91066_.m_232035_().m_231551_());
       this.f_91067_ = new MouseHandler(this);
@@ -26,30 +35,28 @@
       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);
-@@ -467,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);
-+      net.minecraftforge.client.loading.ClientModLoader.begin(this, this.f_91038_, this.f_91036_);
+      net.minecraftforge.client.loading.ClientModLoader.begin(this, this.f_91038_, this.f_91036_, this.f_91037_);
       this.f_91038_.m_10506_();
       this.f_91066_.m_92145_(this.f_91038_);
       this.f_91039_ = new LanguageManager(this.f_91066_.f_92075_);
-@@ -511,10 +_,13 @@
+@@ -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_.m_247116_());
+       this.f_91036_.m_7217_(this.f_91063_);
       this.f_91060_ = new LevelRenderer(this, this.f_90994_, this.f_167845_, this.f_90993_);
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RenderLevelStageEvent.RegisterStageEvent());
       this.f_91036_.m_7217_(this.f_91060_);
-      this.m_91271_();
-+      // Forge: We delay this to allow registration of modded creative mode tabs
-+      // this.createSearchTrees();
+       this.m_91271_();
       this.f_91036_.m_7217_(this.f_90997_);
       this.f_91061_ = new ParticleEngine(this.f_91073_, this.f_90987_);
 +      net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(f_91061_);
       this.f_91036_.m_7217_(this.f_91061_);
       this.f_91053_ = new PaintingTextureManager(this.f_90987_);
       this.f_91036_.m_7217_(this.f_91053_);
-@@ -523,7 +_,9 @@
+@@ -522,7 +_,9 @@
       this.f_91047_ = new GpuWarnlistManager();
       this.f_91036_.m_7217_(this.f_91047_);
       this.f_91036_.m_7217_(this.f_205120_);
@@ -60,7 +67,7 @@
       this.f_91064_ = new DebugRenderer(this);
       this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this));
       RenderSystem.m_69900_(this::m_91113_);
-@@ -542,6 +_,21 @@
+@@ -541,6 +_,21 @@
          TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
       }
 
@@ -82,15 +89,14 @@
       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_();
-@@ -565,24 +_,24 @@
+@@ -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.
 +            if (s != null) {
-+               ServerAddress serveraddress = new ServerAddress(s, i);
-+               ConnectScreen.m_169267_(new TitleScreen(), this, serveraddress, new ServerData(I18n.m_118938_("selectServer.defaultName"), serveraddress.toString(), false));
+               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_) {
@@ -105,9 +111,8 @@
          });
       }, false));
 -      if (s != null) {
-         ServerAddress serveraddress = new ServerAddress(s, i);
 -         reloadinstance.m_7237_().thenRunAsync(() -> {
-            ConnectScreen.m_169267_(new TitleScreen(), this, serveraddress, new ServerData(I18n.m_118938_("selectServer.defaultName"), serveraddress.toString(), false));
+-            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_) -> {
@@ -123,7 +128,7 @@
 
    }
 
-@@ -634,6 +_,8 @@
+@@ -622,6 +_,8 @@
 
    private UserApiService m_193585_(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
       try {
@@ -132,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);
-@@ -646,7 +_,7 @@
+@@ -634,7 +_,7 @@
    }
 
    private void m_91239_(Throwable p_91240_) {
@@ -141,45 +146,7 @@
          this.m_91241_(p_91240_, (Component)null);
       } else {
          Util.m_137559_(p_91240_);
-@@ -723,7 +_,10 @@
-    }
- 
-    public void m_91271_() {
-      this.f_90997_.m_235232_(SearchRegistry.f_119941_, (p_231451_) -> {
-+      var nameSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getNameSearchKeys();
-+      var tagSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getTagSearchKeys();
-+      for (var nameSearchKey : nameSearchKeys.values())
-+      this.f_90997_.m_235232_(nameSearchKey, (p_231451_) -> {
-          return new FullTextSearchTree<>((p_210797_) -> {
-             return p_210797_.m_41651_((Player)null, TooltipFlag.Default.f_256752_.m_257777_()).stream().map((p_210807_) -> {
-                return ChatFormatting.m_126649_(p_210807_.getString()).trim();
-@@ -734,7 +_,8 @@
-             return Stream.of(BuiltInRegistries.f_257033_.m_7981_(p_91317_.m_41720_()));
-          }, p_231451_);
-       });
-      this.f_90997_.m_235232_(SearchRegistry.f_119942_, (p_231430_) -> {
-+      for (var tagSearchKey : tagSearchKeys.values())
-+      this.f_90997_.m_235232_(tagSearchKey, (p_231430_) -> {
-          return new IdSearchTree<>((p_231353_) -> {
-             return p_231353_.m_204131_().map(TagKey::f_203868_);
-          }, p_231430_);
-@@ -754,9 +_,12 @@
-             });
-          }, p_231389_);
-       });
-      CreativeModeTabs.m_258007_().m_257882_((p_255439_) -> {
-         this.m_231374_(SearchRegistry.f_119941_, p_255439_);
-         this.m_231374_(SearchRegistry.f_119942_, p_255439_);
-+      nameSearchKeys.forEach((tab, nameSearchKey) -> {
-+         var tagSearchKey = tagSearchKeys.get(tab);
-+         tab.m_257882_(contents -> {
-+            this.m_231374_(nameSearchKey, contents);
-+            this.m_231374_(tagSearchKey, contents);
-+         });
-       });
-    }
- 
-@@ -808,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_());
@@ -196,7 +163,7 @@
       }
 
    }
-@@ -932,10 +_,6 @@
+@@ -922,10 +_,6 @@
          f_90982_.error("setScreen called from non-game thread");
       }
 
@@ -207,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_()) {
-@@ -946,6 +_,19 @@
+@@ -936,6 +_,19 @@
          }
       }
 
@@ -227,7 +194,7 @@
       this.f_91080_ = p_91153_;
       BufferUploader.m_166835_();
       if (p_91153_ != null) {
-@@ -1091,11 +_,14 @@
+@@ -1079,11 +_,14 @@
       RenderSystem.m_69481_();
       this.f_91026_.m_7238_();
       if (!this.f_91079_) {
@@ -242,7 +209,7 @@
       }
 
       if (this.f_91056_ != null) {
-@@ -1223,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_());
@@ -255,7 +222,7 @@
       this.f_91063_.m_109097_(this.f_90990_.m_85441_(), this.f_90990_.m_85442_());
       this.f_91067_.m_91599_();
    }
-@@ -1499,6 +_,7 @@
+@@ -1491,6 +_,7 @@
    }
 
    public void m_91395_() {
@@ -263,7 +230,7 @@
       this.f_91019_ = false;
    }
 
-@@ -1528,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_();
@@ -285,41 +252,41 @@
                   this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
                }
             }
-@@ -1560,14 +_,20 @@
-             return false;
-          } else {
-             boolean flag = false;
-            switch (this.f_91077_.m_6662_()) {
-+            var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.f_91066_.f_92096_, InteractionHand.MAIN_HAND);
-+            HitResult.Type hitType = this.f_91077_.m_6662_();
-+            if (this.f_91077_ instanceof EntityHitResult entityHit) { // Forge: Perform attack range checks here, instead of in GameRenderer#pick, so extended-reach interactions work.
-+               if (!f_91074_.canHit(entityHit.m_82443_(), 0)) hitType = HitResult.Type.MISS; // No padding in client code.
-+            }
-+            if (!inputEvent.isCanceled())
-+            switch(hitType) {
-                case ENTITY:
-                   this.f_91072_.m_105223_(this.f_91074_, ((EntityHitResult)this.f_91077_).m_82443_());
-                   break;
-                case BLOCK:
-                   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)) {
-                      this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
-                      if (this.f_91073_.m_8055_(blockpos).m_60795_()) {
-                         flag = true;
-@@ -1580,8 +_,10 @@
-                   }
+@@ -1548,14 +_,20 @@
+          return false;
+       } else {
+          boolean flag = false;
+-         switch (this.f_91077_.m_6662_()) {
+         var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.f_91066_.f_92096_, InteractionHand.MAIN_HAND);
+         HitResult.Type hitType = this.f_91077_.m_6662_();
+         if(this.f_91077_ instanceof EntityHitResult entityHit) { // Forge: Perform attack range checks here, instead of in GameRenderer#pick, so extended-reach interactions work.
+             if(!f_91074_.canHit(entityHit.m_82443_(), 0)) hitType = HitResult.Type.MISS; // No padding in client code.
+         }
+         if (!inputEvent.isCanceled())
+         switch(hitType) {
+             case ENTITY:
+                this.f_91072_.m_105223_(this.f_91074_, ((EntityHitResult)this.f_91077_).m_82443_());
+                break;
+             case BLOCK:
+                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)) {
+                   this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
+                   if (this.f_91073_.m_8055_(blockpos).m_60795_()) {
+                      flag = true;
+@@ -1568,8 +_,10 @@
+                }
 
-                   this.f_91074_.m_36334_();
-+                  net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
-             }
- 
-+            if (inputEvent.shouldSwingHand())
-             this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
-             return flag;
+                this.f_91074_.m_36334_();
+               net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
          }
-@@ -1597,6 +_,11 @@
+ 
+         if (inputEvent.shouldSwingHand())
+          this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
+          return flag;
+       }
+@@ -1584,6 +_,11 @@
             }
 
             for(InteractionHand interactionhand : InteractionHand.values()) {
@@ -329,9 +296,9 @@
 +                  return;
 +               }
                ItemStack itemstack = this.f_91074_.m_21120_(interactionhand);
-                if (!itemstack.m_246617_(this.f_91073_.m_246046_())) {
-                   return;
-@@ -1611,13 +_,14 @@
+                if (this.f_91077_ != null) {
+                   switch (this.f_91077_.m_6662_()) {
+@@ -1594,13 +_,14 @@
                            return;
                         }
 
@@ -347,7 +314,7 @@
                               this.f_91074_.m_6674_(interactionhand);
                            }
 
-@@ -1629,7 +_,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_()) {
@@ -356,7 +323,7 @@
                               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);
-@@ -1645,6 +_,9 @@
+@@ -1628,6 +_,9 @@
                   }
                }
 
@@ -366,7 +333,7 @@
                if (!itemstack.m_41619_()) {
                   InteractionResult interactionresult2 = this.f_91072_.m_233721_(this.f_91074_, interactionhand);
                   if (interactionresult2.m_19077_()) {
-@@ -1671,6 +_,8 @@
+@@ -1654,6 +_,8 @@
          --this.f_91011_;
       }
 
@@ -375,7 +342,23 @@
       this.f_91026_.m_6180_("gui");
       this.f_240378_.m_240688_();
       this.f_91065_.m_193832_(this.f_91012_);
-@@ -1800,6 +_,8 @@
+@@ -1749,6 +_,7 @@
+ 
+             this.f_91005_.m_120596_();
+ 
+            net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.f_91073_, () -> true);
+             try {
+                this.f_91073_.m_104726_(() -> {
+                   return true;
+@@ -1764,6 +_,7 @@
+ 
+                throw new ReportedException(crashreport);
+             }
+            net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.f_91073_, () -> true);
+          }
+ 
+          this.f_91026_.m_6182_("animateTick");
+@@ -1783,6 +_,8 @@
       this.f_91026_.m_6182_("keyboard");
       this.f_91068_.m_90931_();
       this.f_91026_.m_7238_();
@@ -384,7 +367,7 @@
    }
 
    private boolean m_91278_() {
-@@ -1996,6 +_,7 @@
+@@ -1978,6 +_,7 @@
    }
 
    public void m_91156_(ClientLevel p_91157_) {
@@ -392,7 +375,7 @@
       ProgressScreen progressscreen = new ProgressScreen(true);
       progressscreen.m_6309_(Component.m_237115_("connect.joining"));
       this.m_91362_(progressscreen);
-@@ -2029,10 +_,12 @@
+@@ -2011,10 +_,12 @@
       IntegratedServer integratedserver = this.f_91007_;
       this.f_91007_ = null;
       this.f_91063_.m_109150_();
@@ -405,15 +388,15 @@
          if (integratedserver != null) {
             this.f_91026_.m_6180_("waitForServer");
 
-@@ -2046,6 +_,7 @@
-          this.f_243981_.m_246151_();
+@@ -2029,6 +_,7 @@
          this.f_91065_.m_93089_();
+          this.f_91008_ = null;
          this.f_91010_ = false;
 +         net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(f_91073_);
          this.f_91004_.m_90740_();
       }
 
-@@ -2153,6 +_,7 @@
+@@ -2124,6 +_,7 @@
 
    private void m_91280_() {
       if (this.f_91077_ != null && this.f_91077_.m_6662_() != HitResult.Type.MISS) {
@@ -421,7 +404,7 @@
          boolean flag = this.f_91074_.m_150110_().f_35937_;
          BlockEntity blockentity = null;
          HitResult.Type hitresult$type = this.f_91077_.m_6662_();
-@@ -2165,10 +_,7 @@
+@@ -2136,10 +_,7 @@
             }
 
             Block block = blockstate.m_60734_();
@@ -433,7 +416,7 @@
 
             if (flag && Screen.m_96637_() && blockstate.m_155947_()) {
                blockentity = this.f_91073_.m_7702_(blockpos);
-@@ -2179,7 +_,7 @@
+@@ -2150,7 +_,7 @@
             }
 
             Entity entity = ((EntityHitResult)this.f_91077_).m_82443_();
@@ -442,7 +425,27 @@
             if (itemstack == null) {
                return;
             }
-@@ -2721,6 +_,19 @@
+@@ -2688,8 +_,8 @@
+       return this.f_90993_;
+    }
+ 
+-   private static Pack m_167933_(String p_167934_, Component p_167935_, boolean p_167936_, Supplier<PackResources> p_167937_, PackMetadataSection p_167938_, Pack.Position p_167939_, PackSource p_167940_) {
+-      int i = p_167938_.m_10374_();
+   private static Pack createClientPackAdapter(String p_167934_, Component p_167935_, boolean p_167936_, Supplier<PackResources> p_167937_, PackMetadataSection p_167938_, Pack.Position p_167939_, PackSource p_167940_, boolean hidden) {
+      int i = p_167938_.getPackFormat(PackType.CLIENT_RESOURCES);
+       Supplier<PackResources> supplier = p_167937_;
+       if (i <= 3) {
+          supplier = m_91330_(p_167937_);
+@@ -2699,7 +_,7 @@
+          supplier = m_91352_(supplier);
+       }
+ 
+-      return new Pack(p_167934_, p_167935_, p_167936_, supplier, p_167938_, PackType.CLIENT_RESOURCES, p_167939_, p_167940_);
+      return new Pack(p_167934_, p_167935_, p_167936_, supplier, p_167938_, PackType.CLIENT_RESOURCES, p_167939_, p_167940_, hidden);
+    }
+ 
+    private static Supplier<PackResources> m_91330_(Supplier<PackResources> p_91331_) {
+@@ -2716,6 +_,19 @@
 
    public void m_91312_(int p_91313_) {
       this.f_91051_.m_119410_(p_91313_);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -507,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_();
-@@ -788,6 +_,7 @@
+@@ -796,6 +_,7 @@
    }
 
    public Options(Minecraft p_92138_, File p_92139_) {
@@ -18,9 +18,9 @@
       this.f_92060_ = p_92138_;
       this.f_92110_ = new File(p_92139_, "options.txt");
       boolean flag = p_92138_.m_91103_();
-@@ -904,11 +_,20 @@
-       p_168428_.m_213982_("panoramaScrollSpeed", this.f_244402_);
-       p_168428_.m_213982_("telemetryOptInExtra", this.f_260461_);
+@@ -910,11 +_,20 @@
+       p_168428_.m_213982_("chatPreview", this.f_231796_);
+       p_168428_.m_213982_("onlyShowSecureChat", this.f_231798_);
 
 +      processOptionsForge(p_168428_);
 +   }
@@ -41,7 +41,7 @@
          }
       }
 
-@@ -927,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,15 +61,15 @@
             @Nullable
             private String m_168458_(String p_168459_) {
                return compoundtag1.m_128441_(p_168459_) ? compoundtag1.m_128461_(p_168459_) : null;
-@@ -1118,6 +_,7 @@
+@@ -1082,6 +_,7 @@
    }
 
-    public void m_92172_() {
+    public void m_92169_() {
 +      if (net.minecraftforge.client.loading.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
-       if (this.f_92060_.f_91074_ != null) {
-          int i = 0;
+       try {
+          final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.f_92110_), StandardCharsets.UTF_8));
 
-@@ -1182,6 +_,23 @@
+@@ -1229,6 +_,23 @@
       }
 
       p_92146_.m_10509_(set);
@@ -18,16 +18,14 @@
    private final List<ItemStack> f_92261_;
 
    private RecipeBookCategories(ItemStack... p_92267_) {
-@@ -59,7 +_,7 @@
-             list = f_92256_;
-             break;
+@@ -54,11 +_,15 @@
+          case SMOKER:
+             return f_92256_;
          default:
-            throw new IncompatibleClassChangeError();
+-            return ImmutableList.of();
 +            return net.minecraftforge.client.RecipeBookManager.getCustomCategoriesOrEmpty(p_92270_);
       }
- 
-       return list;
-@@ -67,5 +_,9 @@
+    }
 
    public List<ItemStack> m_92268_() {
       return this.f_92261_;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Screenshot.java
 +++ b/net/minecraft/client/Screenshot.java
-@@ -56,13 +_,23 @@
+@@ -55,13 +_,23 @@
          file2 = new File(file1, p_92307_);
       }
 
@@ -19,7 +19,7 @@
    }
 
    public int m_92582_(BlockState p_92583_, Level p_92584_, BlockPos p_92585_) {
-      BlockColor blockcolor = this.f_92571_.m_7942_(BuiltInRegistries.f_256975_.m_7447_(p_92583_.m_60734_()));
+-      BlockColor blockcolor = this.f_92571_.m_7942_(Registry.f_122824_.m_7447_(p_92583_.m_60734_()));
 +      BlockColor blockcolor = this.f_92571_.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92583_.m_60734_()));
       if (blockcolor != null) {
          return blockcolor.m_92566_(p_92583_, (BlockAndTintGetter)null, (BlockPos)null, 0);
@@ -28,7 +28,7 @@
    }
 
    public int m_92577_(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
-      BlockColor blockcolor = this.f_92571_.m_7942_(BuiltInRegistries.f_256975_.m_7447_(p_92578_.m_60734_()));
+-      BlockColor blockcolor = this.f_92571_.m_7942_(Registry.f_122824_.m_7447_(p_92578_.m_60734_()));
 +      BlockColor blockcolor = this.f_92571_.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92578_.m_60734_()));
       return blockcolor == null ? -1 : blockcolor.m_92566_(p_92578_, p_92579_, p_92580_, p_92581_);
    }
@@ -37,7 +37,7 @@
 +   @Deprecated
    public void m_92589_(BlockColor p_92590_, Block... p_92591_) {
       for(Block block : p_92591_) {
-         this.f_92571_.m_122664_(p_92590_, BuiltInRegistries.f_256975_.m_7447_(block));
+-         this.f_92571_.m_122664_(p_92590_, Registry.f_122824_.m_7447_(block));
 +         this.f_92571_.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), p_92590_);
       }
 
@@ -19,7 +19,7 @@
    }
 
    public int m_92676_(ItemStack p_92677_, int p_92678_) {
-      ItemColor itemcolor = this.f_92674_.m_7942_(BuiltInRegistries.f_257033_.m_7447_(p_92677_.m_41720_()));
+-      ItemColor itemcolor = this.f_92674_.m_7942_(Registry.f_122827_.m_7447_(p_92677_.m_41720_()));
 +      ItemColor itemcolor = this.f_92674_.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.m_41720_()));
       return itemcolor == null ? -1 : itemcolor.m_92671_(p_92677_, p_92678_);
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -392,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;
-@@ -444,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;
-@@ -472,6 +_,7 @@
+@@ -469,6 +_,7 @@
                   }
                }
 
@@ -27,7 +27,7 @@
                TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.m_118732_(mobeffect);
                int l = i;
                int i1 = j;
-@@ -603,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_()) {
-@@ -624,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_();
          }
       }
-@@ -1138,7 +_,7 @@
+@@ -1133,7 +_,7 @@
          ItemStack itemstack = this.f_92986_.f_91074_.m_150109_().m_36056_();
          if (itemstack.m_41619_()) {
             this.f_92993_ = 0;
@@ -6,5 +6,5 @@
             if (!p_93294_ || mapdecoration.m_77809_()) {
 +               if (mapdecoration.render(k)) { k++; continue; }
                p_93292_.m_85836_();
-                p_93292_.m_252880_(0.0F + (float)mapdecoration.m_77804_() / 2.0F + 64.0F, 0.0F + (float)mapdecoration.m_77805_() / 2.0F + 64.0F, -0.02F);
-                p_93292_.m_252781_(Axis.f_252403_.m_252977_((float)(mapdecoration.m_77806_() * 360) / 16.0F));
+                p_93292_.m_85837_((double)(0.0F + (float)mapdecoration.m_77804_() / 2.0F + 64.0F), (double)(0.0F + (float)mapdecoration.m_77805_() / 2.0F + 64.0F), (double)-0.02F);
+                p_93292_.m_85845_(Vector3f.f_122227_.m_122240_((float)(mapdecoration.m_77806_() * 360) / 16.0F));
@@ -1,15 +1,15 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -130,7 +_,7 @@
-       this.m_93228_(p_93676_, this.m_252754_(), this.m_252907_(), 0, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
-       this.m_93228_(p_93676_, this.m_252754_() + this.f_93618_ / 2, this.m_252907_(), 200 - this.f_93618_ / 2, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
+@@ -85,7 +_,7 @@
+       this.m_93228_(p_93676_, this.f_93620_, this.f_93621_, 0, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
+       this.m_93228_(p_93676_, this.f_93620_ + this.f_93618_ / 2, this.f_93621_, 200 - this.f_93618_ / 2, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
       this.m_7906_(p_93676_, minecraft, p_93677_, p_93678_);
 -      int j = this.f_93623_ ? 16777215 : 10526880;
 +      int j = getFGColor();
-       m_93215_(p_93676_, font, this.m_6035_(), this.m_252754_() + this.f_93618_ / 2, this.m_252907_() + (this.f_93619_ - 8) / 2, j | Mth.m_14167_(this.f_93625_ * 255.0F) << 24);
+       m_93215_(p_93676_, font, this.m_6035_(), this.f_93620_ + this.f_93618_ / 2, this.f_93621_ + (this.f_93619_ - 8) / 2, j | Mth.m_14167_(this.f_93625_ * 255.0F) << 24);
    }
 
-@@ -222,6 +_,10 @@
+@@ -180,6 +_,10 @@
       this.f_93618_ = p_93675_;
    }
 
@@ -20,7 +20,7 @@
    public void m_93650_(float p_93651_) {
       this.f_93625_ = p_93651_;
    }
-@@ -244,6 +_,19 @@
+@@ -202,6 +_,19 @@
 
    protected void m_93692_(boolean p_93693_) {
       this.f_93616_ = p_93693_;
@@ -3,7 +3,7 @@
@@ -409,6 +_,7 @@
             list.add("");
             list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
-             list.add(String.valueOf((Object)BuiltInRegistries.f_256780_.m_7981_(entity.m_6095_())));
+             list.add(String.valueOf((Object)Registry.f_122826_.m_7981_(entity.m_6095_())));
 +            entity.m_6095_().m_204041_().m_203616_().forEach(t -> list.add("#" + t.f_203868_()));
          }
 
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/gui/screens/ConnectScreen.java
+++ b/net/minecraft/client/gui/screens/ConnectScreen.java
+@@ -73,6 +_,8 @@
+                }
+ 
+                if (!optional.isPresent()) {
+                  ConnectScreen.f_95683_.error("Couldn't connect to server: Unknown host \"{}\"", p_169266_.m_171863_());
+                  net.minecraftforge.network.DualStackUtils.logInitialPreferences();
+                   p_169265_.execute(() -> {
+                      p_169265_.m_91152_(new DisconnectedScreen(ConnectScreen.this.f_95686_, CommonComponents.f_130661_, ConnectScreen.f_169260_));
+                   });
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/screens/DeathScreen.java
+++ b/net/minecraft/client/gui/screens/DeathScreen.java
+@@ -36,6 +_,7 @@
+       })));
+       this.f_169295_.add(this.m_142416_(new Button(this.f_96543_ / 2 - 100, this.f_96544_ / 4 + 96, 200, 20, Component.m_237115_("deathScreen.titleScreen"), (p_95925_) -> {
+          if (this.f_95908_) {
+            m_95931_(true);
+             this.m_95934_();
+          } else {
+             ConfirmScreen confirmscreen = new ConfirmScreen(this::m_95931_, Component.m_237115_("deathScreen.quit.confirm"), CommonComponents.f_237098_, Component.m_237115_("deathScreen.titleScreen"), Component.m_237115_("deathScreen.respawn"));
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/LoadingOverlay.java
 +++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
-@@ -121,6 +_,7 @@
+@@ -119,6 +_,7 @@
       int k1 = (int)((double)this.f_96163_.m_91268_().m_85446_() * 0.8325D);
       float f6 = this.f_96164_.m_7750_();
       this.f_96167_ = Mth.m_14036_(this.f_96167_ * 0.95F + f6 * 0.050000012F, 0.0F, 1.0F);
@@ -8,7 +8,7 @@
       if (f < 1.0F) {
          this.m_96182_(p_96178_, i / 2 - j1, k1 - 5, i / 2 + j1, k1 + 5, 1.0F - Mth.m_14036_(f, 0.0F, 1.0F));
       }
-@@ -130,6 +_,7 @@
+@@ -128,6 +_,7 @@
       }
 
       if (this.f_96168_ == -1L && this.f_96164_.m_7746_() && (!this.f_96166_ || f1 >= 2.0F)) {
@@ -16,7 +16,7 @@
          try {
             this.f_96164_.m_7748_();
             this.f_96165_.accept(Optional.empty());
-@@ -137,7 +_,6 @@
+@@ -135,7 +_,6 @@
             this.f_96165_.accept(Optional.of(throwable));
          }
 
@@ -13,7 +13,7 @@
       } else {
@@ -47,9 +_,10 @@
          if (screenconstructor == null) {
-             f_96195_.warn("Failed to create screen for menu type: {}", (Object)BuiltInRegistries.f_256818_.m_7981_(p_96202_));
+             f_96195_.warn("Failed to create screen for menu type: {}", (Object)Registry.f_122863_.m_7981_(p_96202_));
          } else {
 -            screenconstructor.m_96209_(p_96205_, p_96202_, p_96203_, p_96204_);
 +            return java.util.Optional.of(screenconstructor);
@@ -1,9 +1,10 @@
 --- a/net/minecraft/client/gui/screens/OptionsScreen.java
 +++ b/net/minecraft/client/gui/screens/OptionsScreen.java
-@@ -168,6 +_,14 @@
-       super.m_86412_(p_96249_, p_96250_, p_96251_, p_96252_);
+@@ -140,4 +_,12 @@
+       m_93215_(p_96249_, this.f_96547_, this.f_96539_, this.f_96543_ / 2, 15, 16777215);
+       super.m_6305_(p_96249_, p_96250_, p_96251_, p_96252_);
    }
- 
+
 +    @Override
 +    public void m_7379_() {
 +        // We need to consider 2 potential parent screens here:
@@ -11,7 +12,4 @@
 +        // 2. From the pause menu, in which case exit back to game
 +        this.f_96541_.m_91152_(this.f_96235_ instanceof PauseScreen ? null : this.f_96235_);
 +    }
-+
-    private Button m_260993_(Component p_261565_, Supplier<Screen> p_262119_) {
-       return Button.m_253074_(p_261565_, (p_261361_) -> {
-          this.f_96541_.m_91152_(p_262119_.get());
+ }
@@ -0,0 +1,14 @@
+--- a/net/minecraft/client/gui/screens/PauseScreen.java
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
+@@ -77,9 +_,10 @@
+             this.f_96541_.m_91152_(new SocialInteractionsScreen());
+          }));
+       }
+      this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 120 - 16, 204, 20, Component.m_237115_("fml.menu.mods"), modButton -> this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this))));
+ 
+       Component component = this.f_96541_.m_91090_() ? Component.m_237115_("menu.returnToMenu") : Component.m_237115_("menu.disconnect");
+-      this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 120 + -16, 204, 20, component, (p_96315_) -> {
+      this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 144 + -16, 204, 20, component, (p_96315_) -> {
+          boolean flag = this.f_96541_.m_91090_();
+          boolean flag1 = this.f_96541_.m_91294_();
+          p_96315_.f_93623_ = false;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/Screen.java
 +++ b/net/minecraft/client/gui/screens/Screen.java
-@@ -143,7 +_,7 @@
+@@ -126,7 +_,7 @@
    }
 
    public void m_7379_() {
@@ -8,8 +8,8 @@
 +      this.f_96541_.popGuiLayer();
    }
 
-    protected <T extends GuiEventListener & Renderable & NarratableEntry> T m_142416_(T p_169406_) {
-@@ -180,15 +_,29 @@
+    protected <T extends GuiEventListener & Widget & NarratableEntry> T m_142416_(T p_169406_) {
+@@ -163,15 +_,29 @@
       this.f_169368_.clear();
    }
 
@@ -40,16 +40,16 @@
 -         list.add(1, ClientTooltipComponent.m_169950_(p_169399_));
 -      });
 +      List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_169390_, p_169391_, p_169392_, f_96543_, f_96544_, this.tooltipFont, this.f_96547_);
-       this.m_262809_(p_169389_, list, p_169392_, p_169393_, DefaultTooltipPositioner.f_262752_);
+       this.m_169383_(p_169389_, list, p_169392_, p_169393_);
    }
 
-@@ -201,24 +_,48 @@
+@@ -184,20 +_,44 @@
    }
 
    public void m_96597_(PoseStack p_96598_, List<Component> p_96599_, int p_96600_, int p_96601_) {
 -      this.m_96617_(p_96598_, Lists.transform(p_96599_, Component::m_7532_), p_96600_, p_96601_);
 +      List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_96599_, p_96600_, f_96543_, f_96544_, this.tooltipFont, this.f_96547_);
-+      this.m_262809_(p_96598_, components, p_96600_, p_96601_, DefaultTooltipPositioner.f_262752_);
+      this.m_169383_(p_96598_, components, p_96600_, p_96601_);
 +   }
 +   public void renderComponentTooltip(PoseStack poseStack, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
 +      this.renderComponentTooltip(poseStack, tooltips, mouseX, mouseY, null, stack);
@@ -62,13 +62,13 @@
 +      this.tooltipFont = font;
 +      this.tooltipStack = stack;
 +      List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, f_96543_, f_96544_, this.tooltipFont, this.f_96547_);
-+      this.m_262809_(poseStack, components, mouseX, mouseY, DefaultTooltipPositioner.f_262752_);
+      this.m_169383_(poseStack, components, mouseX, mouseY);
 +      this.tooltipFont = null;
 +      this.tooltipStack = ItemStack.f_41583_;
    }
 
    public void m_96617_(PoseStack p_96618_, List<? extends FormattedCharSequence> p_96619_, int p_96620_, int p_96621_) {
-       this.m_262809_(p_96618_, p_96619_.stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_96620_, p_96621_, DefaultTooltipPositioner.f_262752_);
+       this.m_169383_(p_96618_, p_96619_.stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_96620_, p_96621_);
    }
 
 +   public void renderTooltip(PoseStack poseStack, List<? extends FormattedCharSequence> lines, int x, int y, Font font) {
@@ -77,68 +77,81 @@
 +      this.tooltipFont = null;
 +   }
 +
-    private void m_262835_(PoseStack p_263080_, Screen.DeferredTooltipRendering p_262968_, int p_263034_, int p_263076_) {
-       this.m_262809_(p_263080_, p_262968_.f_262736_().stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_263034_, p_263076_, p_262968_.f_262758_());
-    }
- 
-    private void m_262809_(PoseStack p_263064_, List<ClientTooltipComponent> p_262990_, int p_263065_, int p_262996_, ClientTooltipPositioner p_262920_) {
-       if (!p_262990_.isEmpty()) {
-+         net.minecraftforge.client.event.RenderTooltipEvent.Pre preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, p_263064_, p_263065_, p_262996_, f_96543_, f_96544_, p_262990_, this.tooltipFont, this.f_96547_);
+    private void m_169383_(PoseStack p_169384_, List<ClientTooltipComponent> p_169385_, int p_169386_, int p_169387_) {
+       if (!p_169385_.isEmpty()) {
+         net.minecraftforge.client.event.RenderTooltipEvent.Pre preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, p_169384_, p_169386_, p_169387_, f_96543_, f_96544_, p_169385_, this.tooltipFont, this.f_96547_);
 +         if (preEvent.isCanceled()) return;
          int i = 0;
-          int j = p_262990_.size() == 1 ? -2 : 0;
+          int j = p_169385_.size() == 1 ? -2 : 0;
 
-          for(ClientTooltipComponent clienttooltipcomponent : p_262990_) {
+          for(ClientTooltipComponent clienttooltipcomponent : p_169385_) {
 -            int k = clienttooltipcomponent.m_142069_(this.f_96547_);
 +            int k = clienttooltipcomponent.m_142069_(preEvent.getFont());
             if (k > i) {
                i = k;
             }
-@@ -226,8 +_,8 @@
+@@ -205,8 +_,8 @@
             j += clienttooltipcomponent.m_142103_();
          }
 
-         int k1 = p_263065_ + 12;
-         int l1 = p_262996_ - 12;
-+         int k1 = preEvent.getX() + 12;
-+         int l1 = preEvent.getY() - 12;
-          Vector2ic vector2ic = p_262920_.m_262814_(this, k1, l1, i, j);
-          k1 = vector2ic.x();
-          l1 = vector2ic.y();
-@@ -240,6 +_,8 @@
+-         int j2 = p_169386_ + 12;
+-         int k2 = p_169387_ - 12;
+         int j2 = preEvent.getX() + 12;
+         int k2 = preEvent.getY() - 12;
+          if (j2 + i > this.f_96543_) {
+             j2 -= 28 + i;
+          }
+@@ -227,15 +_,16 @@
          RenderSystem.m_157427_(GameRenderer::m_172811_);
          bufferbuilder.m_166779_(VertexFormat.Mode.QUADS, DefaultVertexFormat.f_85815_);
-          Matrix4f matrix4f = p_263064_.m_85850_().m_252922_();
-+         // TODO 1.19.3: Tooltip rendering changed, rethink the color event.
-+         // net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_263064_, k1, l1, preEvent.getFont(), p_262990_);
-          TooltipRenderUtil.m_262796_((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> {
-             GuiComponent.m_93123_(p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_);
-          }, matrix4f, bufferbuilder, k1, l1, i, j, 400);
-@@ -256,7 +_,7 @@
+          Matrix4f matrix4f = p_169384_.m_85850_().m_85861_();
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 4, j2 + i + 3, k2 - 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 3, j2 + i + 3, k2 + j + 4, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 + j + 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 4, k2 - 3, j2 - 3, k2 + j + 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 + i + 3, k2 - 3, j2 + i + 4, k2 + j + 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3 + 1, j2 - 3 + 1, k2 + j + 3 - 1, 400, 1347420415, 1344798847);
+-         m_93123_(matrix4f, bufferbuilder, j2 + i + 2, k2 - 3 + 1, j2 + i + 3, k2 + j + 3 - 1, 400, 1347420415, 1344798847);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 - 3 + 1, 400, 1347420415, 1347420415);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 2, j2 + i + 3, k2 + j + 3, 400, 1344798847, 1344798847);
+         net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_169384_, j2, k2, preEvent.getFont(), p_169385_);
+         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 4, j2 + i + 3, k2 - 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundStart());
+         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 3, j2 + i + 3, k2 + j + 4, 400, colorEvent.getBackgroundEnd(), colorEvent.getBackgroundEnd());
+         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 + j + 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd());
+         m_93123_(matrix4f, bufferbuilder, j2 - 4, k2 - 3, j2 - 3, k2 + j + 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd());
+         m_93123_(matrix4f, bufferbuilder, j2 + i + 3, k2 - 3, j2 + i + 4, k2 + j + 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd());
+         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3 + 1, j2 - 3 + 1, k2 + j + 3 - 1, 400, colorEvent.getBorderStart(), colorEvent.getBorderEnd());
+         m_93123_(matrix4f, bufferbuilder, j2 + i + 2, k2 - 3 + 1, j2 + i + 3, k2 + j + 3 - 1, 400, colorEvent.getBorderStart(), colorEvent.getBorderEnd());
+         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 - 3 + 1, 400, colorEvent.getBorderStart(), colorEvent.getBorderStart());
+         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 2, j2 + i + 3, k2 + j + 3, 400, colorEvent.getBorderEnd(), colorEvent.getBorderEnd());
+          RenderSystem.m_69482_();
+          RenderSystem.m_69472_();
+          RenderSystem.m_69478_();
+@@ -249,7 +_,7 @@
 
-          for(int j1 = 0; j1 < p_262990_.size(); ++j1) {
-             ClientTooltipComponent clienttooltipcomponent1 = p_262990_.get(j1);
-            clienttooltipcomponent1.m_142440_(this.f_96547_, k1, i1, matrix4f, multibuffersource$buffersource);
-+            clienttooltipcomponent1.m_142440_(preEvent.getFont(), k1, i1, matrix4f, multibuffersource$buffersource);
-             i1 += clienttooltipcomponent1.m_142103_() + (j1 == 0 ? 2 : 0);
+          for(int i2 = 0; i2 < p_169385_.size(); ++i2) {
+             ClientTooltipComponent clienttooltipcomponent1 = p_169385_.get(i2);
+-            clienttooltipcomponent1.m_142440_(this.f_96547_, j2, l1, matrix4f, multibuffersource$buffersource);
+            clienttooltipcomponent1.m_142440_(preEvent.getFont(), j2, l1, matrix4f, multibuffersource$buffersource);
+             l1 += clienttooltipcomponent1.m_142103_() + (i2 == 0 ? 2 : 0);
          }
 
-@@ -266,7 +_,7 @@
+@@ -259,7 +_,7 @@
 
-          for(int i2 = 0; i2 < p_262990_.size(); ++i2) {
-             ClientTooltipComponent clienttooltipcomponent2 = p_262990_.get(i2);
-            clienttooltipcomponent2.m_183452_(this.f_96547_, k1, i1, p_263064_, this.f_96542_, 400);
-+            clienttooltipcomponent2.m_183452_(preEvent.getFont(), k1, i1, p_263064_, this.f_96542_, 400);
-             i1 += clienttooltipcomponent2.m_142103_() + (i2 == 0 ? 2 : 0);
+          for(int l2 = 0; l2 < p_169385_.size(); ++l2) {
+             ClientTooltipComponent clienttooltipcomponent2 = p_169385_.get(l2);
+-            clienttooltipcomponent2.m_183452_(this.f_96547_, j2, l1, p_169384_, this.f_96542_, 400);
+            clienttooltipcomponent2.m_183452_(preEvent.getFont(), j2, l1, p_169384_, this.f_96542_, 400);
+             l1 += clienttooltipcomponent2.m_142103_() + (l2 == 0 ? 2 : 0);
          }
 
-@@ -368,9 +_,19 @@
+@@ -361,9 +_,19 @@
       this.f_96547_ = p_96607_.f_91062_;
       this.f_96543_ = p_96608_;
       this.f_96544_ = p_96609_;
 +      java.util.function.Consumer<GuiEventListener> add = (b) -> {
-+         if (b instanceof Renderable r)
-+            this.f_169369_.add(r);
+         if (b instanceof Widget w)
+            this.f_169369_.add(w);
 +         if (b instanceof NarratableEntry ne)
 +            this.f_169368_.add(ne);
 +         f_96540_.add(b);
@@ -152,7 +165,7 @@
    }
 
    protected void m_232761_() {
-@@ -399,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);
@@ -160,7 +173,7 @@
       } else {
          this.m_96626_(p_96560_);
       }
-@@ -418,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_();
@@ -168,7 +181,7 @@
    }
 
    public boolean m_7043_() {
-@@ -503,6 +_,10 @@
+@@ -496,6 +_,10 @@
    }
 
    public void m_7400_(List<Path> p_96591_) {
@@ -8,7 +8,7 @@
 
    public TitleScreen() {
       this(false);
-@@ -112,11 +_,15 @@
+@@ -112,11 +_,16 @@
       int j = this.f_96543_ - i - 2;
       int k = 24;
       int l = this.f_96544_ / 4 + 48;
@@ -17,31 +17,32 @@
          this.m_96772_(l, 24);
       } else {
          this.m_96763_(l, 24);
-+         modButton = this.m_142416_(Button.m_253074_(Component.m_237115_("fml.menu.mods"), button -> this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this)))
-+            .m_252794_(this.f_96543_ / 2 - 100, l + 24 * 2).m_253046_(98, 20).m_253136_());
+         modButton = this.m_142416_(new Button(this.f_96543_ / 2 - 100, l + 24 * 2, 98, 20, Component.m_237115_("fml.menu.mods"), button -> {
+            this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this));
+         }));
       }
 +      modUpdateNotification = net.minecraftforge.client.gui.TitleScreenModUpdateIndicator.init(this, modButton);
 
       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_()));
-@@ -161,7 +_,7 @@
-       }).m_252987_(this.f_96543_ / 2 - 100, p_96764_ + p_96765_ * 1, 200, 20).m_257505_(tooltip).m_253136_())).f_93623_ = flag;
-       (this.m_142416_(Button.m_253074_(Component.m_237115_("menu.online"), (p_210872_) -> {
+@@ -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;
+-      (this.m_142416_(new Button(this.f_96543_ / 2 - 100, p_96764_ + p_96765_ * 2, 200, 20, Component.m_237115_("menu.online"), (p_210872_) -> {
+      (this.m_142416_(new Button(this.f_96543_ / 2 + 2, p_96764_ + p_96765_ * 2, 98, 20, Component.m_237115_("menu.online"), (p_96771_) -> {
          this.m_96793_();
-      }).m_252987_(this.f_96543_ / 2 - 100, p_96764_ + p_96765_ * 2, 200, 20).m_257505_(tooltip).m_253136_())).f_93623_ = flag;
-+      }).m_252987_(this.f_96543_ / 2 + 2, p_96764_ + p_96765_ * 2, 98, 20).m_257505_(tooltip).m_253136_())).f_93623_ = flag;
+       }, button$ontooltip))).f_93623_ = flag;
    }
- 
-    @Nullable
-@@ -267,6 +_,7 @@
+@@ -310,6 +_,7 @@
             this.f_232768_.m_232790_(p_96739_, l);
          }
 
 +         net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, p_96739_, this.f_96547_, this.f_96543_, this.f_96544_, l);
          if (this.f_96721_ != null) {
             p_96739_.m_85836_();
-             p_96739_.m_252880_((float)(this.f_96543_ / 2 + 90), 70.0F, 0.0F);
-@@ -289,7 +_,14 @@
+             p_96739_.m_85837_((double)(this.f_96543_ / 2 + 90), 70.0D, 0.0D);
+@@ -332,7 +_,14 @@
             s = s + I18n.m_118938_("menu.modded");
          }
 
@@ -57,11 +58,11 @@
 
          for(GuiEventListener guieventlistener : this.m_6702_()) {
             if (guieventlistener instanceof AbstractWidget) {
-@@ -302,6 +_,7 @@
+@@ -345,6 +_,7 @@
             RenderSystem.m_69482_();
-             this.f_96726_.m_86412_(p_96739_, p_96740_, p_96741_, p_96742_);
+             this.f_96726_.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
          }
-+         if (f1 >= 1.0f) modUpdateNotification.m_86412_(p_96739_, p_96740_, p_96741_, p_96742_);
+         if (f1 >= 1.0f) modUpdateNotification.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
 
       }
    }
@@ -8,7 +8,7 @@
 
    public AdvancementsScreen(ClientAdvancements p_97340_) {
       super(GameNarrator.f_93310_);
-@@ -57,7 +_,15 @@
+@@ -57,7 +_,13 @@
       } else {
          this.f_97334_.m_104401_(this.f_97336_ == null ? null : this.f_97336_.m_97182_(), true);
       }
@@ -16,10 +16,8 @@
 +      if (this.f_97335_.size() > AdvancementTabType.MAX_TABS) {
 +          int guiLeft = (this.f_96543_ - 252) / 2;
 +          int guiTop = (this.f_96544_ - 140) / 2;
-+          m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_("<"), b -> tabPage = Math.max(tabPage - 1, 0       ))
-+              .m_252794_(guiLeft, guiTop - 50).m_253046_(20, 20).m_253136_());
-+          m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages))
-+              .m_252794_(guiLeft + f_169556_ - 20, guiTop - 50).m_253046_(20, 20).m_253136_());
+          m_142416_(new net.minecraft.client.gui.components.Button(guiLeft,            guiTop - 50, 20, 20, Component.m_237113_("<"), b -> tabPage = Math.max(tabPage - 1, 0       )));
+          m_142416_(new net.minecraft.client.gui.components.Button(guiLeft + 252 - 20, guiTop - 50, 20, 20, Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages)));
 +          maxPages = this.f_97335_.size() / AdvancementTabType.MAX_TABS;
 +      }
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/controls/KeyBindsList.java
 +++ b/net/minecraft/client/gui/screens/controls/KeyBindsList.java
-@@ -50,7 +_,7 @@
+@@ -51,7 +_,7 @@
    }
 
    protected int m_5756_() {
@@ -9,30 +9,34 @@
    }
 
    public int m_5759_() {
-@@ -108,10 +_,11 @@
+@@ -107,7 +_,7 @@
+       KeyEntry(final KeyMapping p_193916_, final Component p_193917_) {
+          this.f_193910_ = p_193916_;
          this.f_193911_ = p_193917_;
-          this.f_193912_ = Button.m_253074_(p_193917_, (p_193939_) -> {
+-         this.f_193912_ = new Button(0, 0, 75, 20, p_193917_, (p_193939_) -> {
+         this.f_193912_ = new Button(0, 0, 75 + 20 /* Forge: Add space */, 20, p_193917_, (p_193939_) -> {
             KeyBindsList.this.f_193858_.f_193975_ = p_193916_;
-         }).m_252987_(0, 0, 75, 20).m_252778_((p_253311_) -> {
-+         }).m_252987_(0, 0, 75 + 20 /* Forge: Add space */, 20).m_252778_((p_253311_) -> {
-             return p_193916_.m_90862_() ? Component.m_237110_("narrator.controls.unbound", p_193917_) : Component.m_237110_("narrator.controls.bound", p_193917_, p_253311_.get());
-          }).m_253136_();
-          this.f_193913_ = Button.m_253074_(Component.m_237115_("controls.reset"), (p_193935_) -> {
+          }) {
+             protected MutableComponent m_5646_() {
+@@ -115,6 +_,7 @@
+             }
+          };
+          this.f_193913_ = new Button(0, 0, 50, 20, Component.m_237115_("controls.reset"), (p_193935_) -> {
 +            this.f_193910_.setToDefault();
             KeyBindsList.this.f_93386_.f_91066_.m_92159_(p_193916_, p_193916_.m_90861_());
             KeyMapping.m_90854_();
-          }).m_252987_(0, 0, 50, 20).m_252778_((p_253313_) -> {
-@@ -123,7 +_,7 @@
+          }) {
+@@ -128,7 +_,7 @@
          boolean flag = KeyBindsList.this.f_193858_.f_193975_ == this.f_193910_;
          float f = (float)(p_193926_ + 90 - KeyBindsList.this.f_193859_);
          KeyBindsList.this.f_93386_.f_91062_.m_92889_(p_193923_, this.f_193911_, f, (float)(p_193925_ + p_193928_ / 2 - 9 / 2), 16777215);
-         this.f_193913_.m_252865_(p_193926_ + 190);
-+         this.f_193913_.m_252865_(p_193926_ + 190 + 20);
-          this.f_193913_.m_252888_(p_193925_);
+-         this.f_193913_.f_93620_ = p_193926_ + 190;
+         this.f_193913_.f_93620_ = p_193926_ + 190 + 20;
+          this.f_193913_.f_93621_ = p_193925_;
          this.f_193913_.f_93623_ = !this.f_193910_.m_90864_();
-          this.f_193913_.m_86412_(p_193923_, p_193929_, p_193930_, p_193932_);
-@@ -131,11 +_,12 @@
-          this.f_193912_.m_252888_(p_193925_);
+          this.f_193913_.m_6305_(p_193923_, p_193929_, p_193930_, p_193932_);
+@@ -136,11 +_,12 @@
+          this.f_193912_.f_93621_ = p_193925_;
          this.f_193912_.m_93666_(this.f_193910_.m_90863_());
          boolean flag1 = false;
 +         boolean keyCodeModifierConflict = true; // gracefully handle conflicts like SHIFT vs SHIFT+G
@@ -45,7 +49,7 @@
                }
             }
          }
-@@ -143,7 +_,7 @@
+@@ -148,7 +_,7 @@
          if (flag) {
             this.f_193912_.m_93666_(Component.m_237113_("> ").m_7220_(this.f_193912_.m_6035_().m_6881_().m_130940_(ChatFormatting.YELLOW)).m_130946_(" <").m_130940_(ChatFormatting.YELLOW));
          } else if (flag1) {
@@ -53,4 +57,4 @@
 +            this.f_193912_.m_93666_(this.f_193912_.m_6035_().m_6881_().m_130940_(keyCodeModifierConflict ? ChatFormatting.GOLD : ChatFormatting.RED));
          }
 
-          this.f_193912_.m_86412_(p_193923_, p_193929_, p_193930_, p_193932_);
+          this.f_193912_.m_6305_(p_193923_, p_193929_, p_193930_, p_193932_);
@@ -2,7 +2,7 @@
 +++ b/net/minecraft/client/gui/screens/controls/KeyBindsScreen.java
@@ -31,7 +_,7 @@
       this.m_7787_(this.f_193977_);
-       this.f_193978_ = this.m_142416_(Button.m_253074_(Component.m_237115_("controls.resetAll"), (p_193999_) -> {
+       this.f_193978_ = this.m_142416_(new Button(this.f_96543_ / 2 - 155, this.f_96544_ - 29, 150, 20, Component.m_237115_("controls.resetAll"), (p_193999_) -> {
          for(KeyMapping keymapping : this.f_96282_.f_92059_) {
 -            keymapping.m_90848_(keymapping.m_90861_());
 +            keymapping.setToDefault();
@@ -1,14 +1,14 @@
 --- a/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
-@@ -89,6 +_,7 @@
+@@ -90,6 +_,7 @@
       int i = this.f_97735_;
       int j = this.f_97736_;
       this.m_7286_(p_97795_, p_97798_, p_97796_, p_97797_);
 +      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ContainerScreenEvent.Render.Background(this, p_97795_, p_97796_, p_97797_));
       RenderSystem.m_69465_();
-       super.m_86412_(p_97795_, p_97796_, p_97797_, p_97798_);
+       super.m_6305_(p_97795_, p_97796_, p_97797_, p_97798_);
       PoseStack posestack = RenderSystem.m_157191_();
-@@ -110,11 +_,12 @@
+@@ -111,11 +_,12 @@
             this.f_97734_ = slot;
             int l = slot.f_40220_;
             int i1 = slot.f_40221_;
@@ -22,7 +22,7 @@
       ItemStack itemstack = this.f_97711_.m_41619_() ? this.f_97732_.m_142621_() : this.f_97711_;
       if (!itemstack.m_41619_()) {
          int l1 = 8;
-@@ -154,9 +_,13 @@
+@@ -155,9 +_,13 @@
    }
 
    public static void m_169606_(PoseStack p_169607_, int p_169608_, int p_169609_, int p_169610_) {
@@ -37,7 +37,7 @@
       RenderSystem.m_69444_(true, true, true, true);
       RenderSystem.m_69482_();
    }
-@@ -174,8 +_,10 @@
+@@ -175,8 +_,10 @@
       RenderSystem.m_157182_();
       this.m_93250_(200);
       this.f_96542_.f_115093_ = 200.0F;
@@ -49,7 +49,7 @@
       this.m_93250_(0);
       this.f_96542_.f_115093_ = 0.0F;
    }
-@@ -285,7 +_,8 @@
+@@ -286,7 +_,8 @@
       if (super.m_6375_(p_97748_, p_97749_, p_97750_)) {
          return true;
       } else {
@@ -59,7 +59,7 @@
          Slot slot = this.m_97744_(p_97748_, p_97749_);
          long i = Util.m_137550_();
          this.f_97723_ = this.f_97709_ == slot && i - this.f_97721_ < 250L && this.f_97722_ == p_97750_;
-@@ -296,6 +_,7 @@
+@@ -297,6 +_,7 @@
             int j = this.f_97735_;
             int k = this.f_97736_;
             boolean flag1 = this.m_7467_(p_97748_, p_97749_, j, k, p_97750_);
@@ -67,7 +67,7 @@
             int l = -1;
             if (slot != null) {
                l = slot.f_40219_;
-@@ -321,7 +_,7 @@
+@@ -322,7 +_,7 @@
                   }
                } else if (!this.f_97738_) {
                   if (this.f_97732_.m_142621_().m_41619_()) {
@@ -76,7 +76,7 @@
                         this.m_6597_(slot, l, p_97750_, ClickType.CLONE);
                      } else {
                         boolean flag2 = l != -999 && (InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 340) || InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 344));
-@@ -345,7 +_,7 @@
+@@ -346,7 +_,7 @@
                         this.f_97717_ = 0;
                      } else if (p_97750_ == 1) {
                         this.f_97717_ = 1;
@@ -85,7 +85,7 @@
                         this.f_97717_ = 2;
                      }
                   }
-@@ -414,10 +_,13 @@
+@@ -415,10 +_,13 @@
    }
 
    public boolean m_6348_(double p_97812_, double p_97813_, int p_97814_) {
@@ -99,7 +99,7 @@
       int k = -1;
       if (slot != null) {
          k = slot.f_40219_;
-@@ -431,7 +_,7 @@
+@@ -432,7 +_,7 @@
          if (m_96638_()) {
             if (!this.f_97724_.m_41619_()) {
                for(Slot slot2 : this.f_97732_.f_38839_) {
@@ -108,7 +108,7 @@
                      this.m_6597_(slot2, slot2.f_40219_, p_97814_, ClickType.QUICK_MOVE);
                   }
                }
-@@ -494,7 +_,7 @@
+@@ -495,7 +_,7 @@
 
             this.m_6597_((Slot)null, -999, AbstractContainerMenu.m_38930_(2, this.f_97717_), ClickType.QUICK_CRAFT);
          } else if (!this.f_97732_.m_142621_().m_41619_()) {
@@ -117,7 +117,7 @@
                this.m_6597_(slot, k, p_97814_, ClickType.CLONE);
             } else {
                boolean flag1 = k != -999 && (InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 340) || InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 344));
-@@ -541,34 +_,39 @@
+@@ -542,34 +_,39 @@
    }
 
    public boolean m_7933_(int p_97765_, int p_97766_, int p_97767_) {
@@ -164,7 +164,7 @@
                this.m_6597_(this.f_97734_, this.f_97734_.f_40219_, i, ClickType.SWAP);
                return true;
             }
-@@ -603,6 +_,18 @@
+@@ -604,6 +_,18 @@
 
    public T m_6262_() {
       return this.f_97732_;
@@ -1,271 +1,257 @@
 --- a/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
-@@ -75,6 +_,8 @@
+@@ -72,6 +_,8 @@
+    private Slot f_98512_;
+    private CreativeInventoryListener f_98513_;
+    private boolean f_98514_;
+   private static int tabPage = 0;
+   private int maxPages = 0;
    private boolean f_98515_;
    private final Set<TagKey<Item>> f_98516_ = new HashSet<>();
-    private final boolean f_256872_;
-+   private final List<net.minecraftforge.client.gui.CreativeTabsScreenPage> pages = new java.util.ArrayList<>();
-+   private net.minecraftforge.client.gui.CreativeTabsScreenPage currentPage = new net.minecraftforge.client.gui.CreativeTabsScreenPage(new java.util.ArrayList<>());
 
-    public CreativeModeInventoryScreen(Player p_259788_, FeatureFlagSet p_260074_, boolean p_259569_) {
-       super(new CreativeModeInventoryScreen.ItemPickerMenu(p_259788_), p_259788_.m_150109_(), CommonComponents.f_237098_);
-@@ -109,7 +_,7 @@
-    private void m_257687_(Collection<ItemStack> p_261591_) {
-       int i = this.f_97732_.m_257485_(this.f_98508_);
-       (this.f_97732_).f_98639_.clear();
-      if (f_98507_.m_257962_() == CreativeModeTab.Type.SEARCH) {
-+      if (f_98507_.hasSearchBar()) {
-          this.m_98630_();
-       } else {
-          (this.f_97732_).f_98639_.addAll(p_261591_);
-@@ -273,6 +_,30 @@
+@@ -231,6 +_,12 @@
    protected void m_7856_() {
       if (this.f_96541_.f_91072_.m_105290_()) {
          super.m_7856_();
-+         this.pages.clear();
-+         int tabIndex = 0;
-+         List<CreativeModeTab> currentPage = new java.util.ArrayList<>();
-+         for (CreativeModeTab sortedCreativeModeTab : net.minecraftforge.common.CreativeModeTabRegistry.getSortedCreativeModeTabs()) {
-+            currentPage.add(sortedCreativeModeTab);
-+            tabIndex++;
-+            if (tabIndex == 10) {
-+               this.pages.add(new net.minecraftforge.client.gui.CreativeTabsScreenPage(currentPage));
-+               currentPage = new java.util.ArrayList<>();
-+               tabIndex = 0;
-+            }
-+         }
-+         if (tabIndex != 0) {
-+            this.pages.add(new net.minecraftforge.client.gui.CreativeTabsScreenPage(currentPage));
-+         }
-+         if (this.pages.isEmpty()) {
-+            this.currentPage = new net.minecraftforge.client.gui.CreativeTabsScreenPage(new java.util.ArrayList<>());
-+         } else {
-+            this.currentPage = this.pages.get(0);
-+         }
-+         if (this.pages.size() > 1) {
-+            m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_("<"), b -> setCurrentPage(this.pages.get(Math.max(this.pages.indexOf(this.currentPage) - 1, 0)))).m_252794_(f_97735_,  f_97736_ - 50).m_253046_(20, 20).m_253136_());
-+            m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_(">"), b -> setCurrentPage(this.pages.get(Math.min(this.pages.indexOf(this.currentPage) + 1, this.pages.size() - 1)))).m_252794_(f_97735_ + f_97726_ - 20, f_97736_ - 50).m_253046_(20, 20).m_253136_());
+         int tabCount = CreativeModeTab.f_40748_.length;
+         if (tabCount > 12) {
+            m_142416_(new net.minecraft.client.gui.components.Button(f_97735_,              f_97736_ - 50, 20, 20, Component.m_237113_("<"), b -> tabPage = Math.max(tabPage - 1, 0       )));
+            m_142416_(new net.minecraft.client.gui.components.Button(f_97735_ + f_97726_ - 20, f_97736_ - 50, 20, 20, Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages)));
+            maxPages = (int) Math.ceil((tabCount - 12) / 10D);
 +         }
+          this.f_96541_.f_91068_.m_90926_(true);
          this.f_98510_ = new EditBox(this.f_96547_, this.f_97735_ + 82, this.f_97736_ + 6, 80, 9, Component.m_237115_("itemGroup.search"));
          this.f_98510_.m_94199_(50);
-          this.f_98510_.m_94182_(false);
-@@ -318,7 +_,7 @@
+@@ -272,7 +_,7 @@
    public boolean m_5534_(char p_98521_, int p_98522_) {
       if (this.f_98514_) {
          return false;
-      } else if (f_98507_.m_257962_() != CreativeModeTab.Type.SEARCH) {
-+      } else if (!f_98507_.hasSearchBar()) {
+-      } else if (f_98507_ != CreativeModeTab.f_40754_.m_40775_()) {
+      } else if (!CreativeModeTab.f_40748_[f_98507_].hasSearchBar()) {
          return false;
       } else {
          String s = this.f_98510_.m_94155_();
-@@ -336,7 +_,7 @@
+@@ -290,7 +_,7 @@
 
    public boolean m_7933_(int p_98547_, int p_98548_, int p_98549_) {
       this.f_98514_ = false;
-      if (f_98507_.m_257962_() != CreativeModeTab.Type.SEARCH) {
-+      if (!f_98507_.hasSearchBar()) {
+-      if (f_98507_ != CreativeModeTab.f_40754_.m_40775_()) {
+      if (!CreativeModeTab.f_40748_[f_98507_].hasSearchBar()) {
          if (this.f_96541_.f_91066_.f_92098_.m_90832_(p_98547_, p_98548_)) {
             this.f_98514_ = true;
-             this.m_98560_(CreativeModeTabs.m_258007_());
-@@ -371,6 +_,7 @@
-    }
- 
+             this.m_98560_(CreativeModeTab.f_40754_);
+@@ -327,6 +_,32 @@
    private void m_98630_() {
-+      if (!f_98507_.hasSearchBar()) return;
       (this.f_97732_).f_98639_.clear();
       this.f_98516_.clear();
+
+      CreativeModeTab tab = CreativeModeTab.f_40748_[f_98507_];
+      if (tab.hasSearchBar() && tab != CreativeModeTab.f_40754_) {
+         tab.m_6151_(f_97732_.f_98639_);
+         if (!this.f_98510_.m_94155_().isEmpty()) {
+            //TODO: Make this a SearchTree not a manual search
+            String search = this.f_98510_.m_94155_().toLowerCase(Locale.ROOT);
+            java.util.Iterator<ItemStack> itr = f_97732_.f_98639_.iterator();
+            while (itr.hasNext()) {
+               ItemStack stack = itr.next();
+               boolean matches = false;
+               for (Component line : stack.m_41651_(this.f_96541_.f_91074_, this.f_96541_.f_91066_.f_92125_ ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL)) {
+                  if (ChatFormatting.m_126649_(line.getString()).toLowerCase(Locale.ROOT).contains(search)) {
+                     matches = true;
+                     break;
+                  }
+               }
+               if (!matches)
+                  itr.remove();
+            }
+         }
+         this.f_98508_ = 0.0F;
+         f_97732_.m_98642_(0.0F);
+         return;
+      }
+
       String s = this.f_98510_.m_94155_();
-@@ -380,10 +_,10 @@
-          SearchTree<ItemStack> searchtree;
-          if (s.startsWith("#")) {
-             s = s.substring(1);
-            searchtree = this.f_96541_.m_231372_(SearchRegistry.f_119942_);
-+            searchtree = this.f_96541_.m_231372_(net.minecraftforge.client.CreativeModeTabSearchRegistry.getNameSearchKey(f_98507_));
-             this.m_98619_(s);
-          } else {
-            searchtree = this.f_96541_.m_231372_(SearchRegistry.f_119941_);
-+            searchtree = this.f_96541_.m_231372_(net.minecraftforge.client.CreativeModeTabSearchRegistry.getTagSearchKey(f_98507_));
-          }
+       if (s.isEmpty()) {
+          for(Item item : Registry.f_122827_) {
+@@ -371,9 +_,9 @@
 
-          (this.f_97732_).f_98639_.addAll(searchtree.m_6293_(s.toLowerCase(Locale.ROOT)));
-@@ -416,7 +_,7 @@
    protected void m_7027_(PoseStack p_98616_, int p_98617_, int p_98618_) {
-       if (f_98507_.m_40789_()) {
+       CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[f_98507_];
+-      if (creativemodetab.m_40789_()) {
+      if (creativemodetab != null && creativemodetab.m_40789_()) {
          RenderSystem.m_69461_();
-         this.f_96547_.m_92889_(p_98616_, f_98507_.m_40786_(), 8.0F, 6.0F, 4210752);
-+         this.f_96547_.m_92889_(p_98616_, f_98507_.m_40786_(), 8.0F, 6.0F, f_98507_.getLabelColor());
+-         this.f_96547_.m_92889_(p_98616_, creativemodetab.m_40786_(), 8.0F, 6.0F, 4210752);
+         this.f_96547_.m_92889_(p_98616_, creativemodetab.m_40786_(), 8.0F, 6.0F, creativemodetab.getLabelColor());
       }
 
    }
-@@ -426,7 +_,7 @@
-          double d0 = p_98531_ - (double)this.f_97735_;
+@@ -384,7 +_,7 @@
          double d1 = p_98532_ - (double)this.f_97736_;
 
-         for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+         for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-             if (this.m_98562_(creativemodetab, d0, d1)) {
+          for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
+-            if (this.m_98562_(creativemodetab, d0, d1)) {
+            if (creativemodetab != null && this.m_98562_(creativemodetab, d0, d1)) {
                return true;
             }
-@@ -447,7 +_,7 @@
-          double d1 = p_98623_ - (double)this.f_97736_;
+          }
+@@ -405,7 +_,7 @@
          this.f_98509_ = false;
 
-         for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+         for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-             if (this.m_98562_(creativemodetab, d0, d1)) {
+          for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
+-            if (this.m_98562_(creativemodetab, d0, d1)) {
+            if (creativemodetab != null && this.m_98562_(creativemodetab, d0, d1)) {
                this.m_98560_(creativemodetab);
                return true;
-@@ -465,6 +_,7 @@
+             }
+@@ -416,12 +_,15 @@
+    }
+ 
+    private boolean m_98631_() {
+      if (CreativeModeTab.f_40748_[f_98507_] == null) return false;
+       return f_98507_ != CreativeModeTab.f_40761_.m_40775_() && CreativeModeTab.f_40748_[f_98507_].m_40791_() && this.f_97732_.m_98654_();
+    }
+ 
    private void m_98560_(CreativeModeTab p_98561_) {
-       CreativeModeTab creativemodetab = f_98507_;
-       f_98507_ = p_98561_;
+      if (p_98561_ == null) return;
+       int i = f_98507_;
+       f_98507_ = p_98561_.m_40775_();
 +      slotColor = p_98561_.getSlotColor();
       this.f_97737_.clear();
       (this.f_97732_).f_98639_.clear();
       this.m_238391_();
-@@ -541,13 +_,15 @@
-          this.f_98511_ = null;
+@@ -499,13 +_,15 @@
       }
 
-      if (f_98507_.m_257962_() == CreativeModeTab.Type.SEARCH) {
-+      if (f_98507_.hasSearchBar()) {
-          this.f_98510_.m_94194_(true);
-          this.f_98510_.m_94190_(false);
-          this.f_98510_.m_94178_(true);
-          if (creativemodetab != p_98561_) {
-             this.f_98510_.m_94144_("");
-          }
-+         this.f_98510_.m_93674_(f_98507_.getSearchBarWidth());
-+         this.f_98510_.m_252865_(this.f_97735_ + (82 /*default left*/ + 89 /*default width*/) - this.f_98510_.m_5711_());
+       if (this.f_98510_ != null) {
+-         if (p_98561_ == CreativeModeTab.f_40754_) {
+         if (p_98561_.hasSearchBar()) {
+             this.f_98510_.m_94194_(true);
+             this.f_98510_.m_94190_(false);
+             this.f_98510_.m_94178_(true);
+             if (i != p_98561_.m_40775_()) {
+                this.f_98510_.m_94144_("");
+             }
+            this.f_98510_.m_93674_(p_98561_.getSearchbarWidth());
+            this.f_98510_.f_93620_ = this.f_97735_ + (82 /*default left*/ + 89 /*default width*/) - this.f_98510_.m_5711_();
 
-          this.m_98630_();
-       } else {
-@@ -604,7 +_,7 @@
+             this.m_98630_();
+          } else {
+@@ -565,16 +_,34 @@
       this.m_7333_(p_98577_);
-       super.m_86412_(p_98577_, p_98578_, p_98579_, p_98580_);
+       super.m_6305_(p_98577_, p_98578_, p_98579_, p_98580_);
 
-      for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+      for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-          if (this.m_98584_(p_98577_, creativemodetab, p_98578_, p_98579_)) {
+-      for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
+-         if (this.m_98584_(p_98577_, creativemodetab, p_98578_, p_98579_)) {
+      int start = tabPage * 10;
+      int end = Math.min(CreativeModeTab.f_40748_.length, ((tabPage + 1) * 10) + 2);
+      if (tabPage != 0) start += 2;
+      boolean rendered = false;
+
+      for (int x = start; x < end; x++) {
+         CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[x];
+         if (creativemodetab != null && this.m_98584_(p_98577_, creativemodetab, p_98578_, p_98579_)) {
+            rendered = true;
             break;
          }
-@@ -614,6 +_,15 @@
+       }
+      if (!rendered && !this.m_98584_(p_98577_, CreativeModeTab.f_40754_, p_98578_, p_98579_))
+         this.m_98584_(p_98577_, CreativeModeTab.f_40761_, p_98578_, p_98579_);
+ 
+       if (this.f_98512_ != null && f_98507_ == CreativeModeTab.f_40761_.m_40775_() && this.m_6774_(this.f_98512_.f_40220_, this.f_98512_.f_40221_, 16, 16, (double)p_98578_, (double)p_98579_)) {
          this.m_96602_(p_98577_, f_98506_, p_98578_, p_98579_);
       }
 
-+      if (this.pages.size() != 1) {
-+         Component page = Component.m_237113_(String.format("%d / %d", this.pages.indexOf(this.currentPage) + 1, this.pages.size()));
-+         this.m_93250_(300);
-+         this.f_96542_.f_115093_ = 300.0F;
-+         f_96547_.m_92744_(p_98577_, page.m_7532_(), f_97735_ + (f_97726_ / 2f) - (f_96547_.m_92852_(page) / 2f), f_97736_ - 44, -1);
-+         this.m_93250_(0);
-+         this.f_96542_.f_115093_ = 0.0F;
+      if (maxPages != 0) {
+          Component page = Component.m_237113_(String.format("%d / %d", tabPage + 1, maxPages + 1));
+          this.m_93250_(300);
+          this.f_96542_.f_115093_ = 300.0F;
+          f_96547_.m_92744_(p_98577_, page.m_7532_(), f_97735_ + (f_97726_ / 2) - (f_96547_.m_92852_(page) / 2), f_97736_ - 44, -1);
+          this.m_93250_(0);
+          this.f_96542_.f_115093_ = 0.0F;
 +      }
 +
       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
       this.m_7025_(p_98577_, p_98578_, p_98579_);
    }
-@@ -621,7 +_,7 @@
-    protected void m_6057_(PoseStack p_98590_, ItemStack p_98591_, int p_98592_, int p_98593_) {
-       boolean flag = this.f_97734_ != null && this.f_97734_ instanceof CreativeModeInventoryScreen.CustomCreativeSlot;
-       boolean flag1 = f_98507_.m_257962_() == CreativeModeTab.Type.CATEGORY;
-      boolean flag2 = f_98507_.m_257962_() == CreativeModeTab.Type.SEARCH;
-+      boolean flag2 = f_98507_.hasSearchBar();
-       TooltipFlag.Default tooltipflag$default = this.f_96541_.f_91066_.f_92125_ ? TooltipFlag.Default.f_256730_ : TooltipFlag.Default.f_256752_;
-       TooltipFlag tooltipflag = flag ? tooltipflag$default.m_257777_() : tooltipflag$default;
-       List<Component> list = p_98591_.m_41651_(this.f_96541_.f_91074_, tooltipflag);
-@@ -641,8 +_,8 @@
- 
-          int i = 1;
- 
-         for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-            if (creativemodetab.m_257962_() != CreativeModeTab.Type.SEARCH && creativemodetab.m_257694_(p_98591_)) {
-+         for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-+            if (!creativemodetab.hasSearchBar() && creativemodetab.m_257694_(p_98591_)) {
-                list1.add(i++, creativemodetab.m_40786_().m_6881_().m_130940_(ChatFormatting.BLUE));
-             }
+@@ -609,7 +_,7 @@
+             list1.add(1, creativemodetab.m_40786_().m_6881_().m_130940_(ChatFormatting.BLUE));
          }
-@@ -654,7 +_,7 @@
-    protected void m_7286_(PoseStack p_98572_, float p_98573_, int p_98574_, int p_98575_) {
-       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
 
-      for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+      for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
+-         this.m_169388_(p_98590_, list1, p_98591_.m_150921_(), p_98592_, p_98593_);
+         this.renderTooltip(p_98590_, list1, p_98591_.m_150921_(), p_98592_, p_98593_, p_98591_);
+       } else {
+          super.m_6057_(p_98590_, p_98591_, p_98592_, p_98593_);
+       }
+@@ -620,16 +_,32 @@
+       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
+       CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[f_98507_];
+ 
+-      for(CreativeModeTab creativemodetab1 : CreativeModeTab.f_40748_) {
+      int start = tabPage * 10;
+      int end = Math.min(CreativeModeTab.f_40748_.length, ((tabPage + 1) * 10 + 2));
+      if (tabPage != 0) start += 2;
+
+      for (int idx = start; idx < end; idx++) {
          RenderSystem.m_157427_(GameRenderer::m_172817_);
-          RenderSystem.m_157456_(0, f_98504_);
-          if (creativemodetab != f_98507_) {
-@@ -663,7 +_,7 @@
+-         RenderSystem.m_157456_(0, f_98504_);
+-         if (creativemodetab1.m_40775_() != f_98507_) {
+         CreativeModeTab creativemodetab1 = CreativeModeTab.f_40748_[idx];
+         if (creativemodetab1 != null && creativemodetab1.m_40775_() != f_98507_) {
+            RenderSystem.m_157456_(0, creativemodetab1.getTabsImage());
+             this.m_98581_(p_98572_, creativemodetab1);
+          }
       }
 
       RenderSystem.m_157427_(GameRenderer::m_172817_);
-      RenderSystem.m_157456_(0, new ResourceLocation("textures/gui/container/creative_inventory/tab_" + f_98507_.m_40788_()));
-+      RenderSystem.m_157456_(0, f_98507_.getBackgroundLocation());
+-      RenderSystem.m_157456_(0, new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativemodetab.m_40788_()));
+      if (tabPage != 0) {
+         if (creativemodetab != CreativeModeTab.f_40754_) {
+            RenderSystem.m_157456_(0, CreativeModeTab.f_40754_.getTabsImage());
+            m_98581_(p_98572_, CreativeModeTab.f_40754_);
+         }
+         if (creativemodetab != CreativeModeTab.f_40761_) {
+            RenderSystem.m_157456_(0, CreativeModeTab.f_40761_.getTabsImage());
+            m_98581_(p_98572_, CreativeModeTab.f_40761_);
+         }
+      }
+
+      RenderSystem.m_157456_(0, creativemodetab.getBackgroundImage());
       this.m_93228_(p_98572_, this.f_97735_, this.f_97736_, 0, 0, this.f_97726_, this.f_97727_);
-       this.f_98510_.m_86412_(p_98572_, p_98574_, p_98575_, p_98573_);
+       this.f_98510_.m_6305_(p_98572_, p_98574_, p_98575_, p_98573_);
       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
-@@ -671,7 +_,7 @@
-       int k = this.f_97736_ + 18;
-       int i = k + 112;
+@@ -637,11 +_,14 @@
+       int j = this.f_97736_ + 18;
+       int k = j + 112;
       RenderSystem.m_157427_(GameRenderer::m_172817_);
 -      RenderSystem.m_157456_(0, f_98504_);
-+      RenderSystem.m_157456_(0, f_98507_.getTabsImage());
-       if (f_98507_.m_40791_()) {
-          this.m_93228_(p_98572_, j, k + (int)((float)(i - k - 17) * this.f_98508_), 232 + (this.m_98631_() ? 0 : 12), 0, 12, 15);
+      RenderSystem.m_157456_(0, creativemodetab.getTabsImage());
+       if (creativemodetab.m_40791_()) {
+          this.m_93228_(p_98572_, i, j + (int)((float)(k - j - 17) * this.f_98508_), 232 + (this.m_98631_() ? 0 : 12), 0, 12, 15);
       }
-@@ -684,7 +_,7 @@
+ 
+      if ((creativemodetab == null || creativemodetab.getTabPage() != tabPage) && (creativemodetab != CreativeModeTab.f_40754_ && creativemodetab != CreativeModeTab.f_40761_))
+         return;
+
+       this.m_98581_(p_98572_, creativemodetab);
+       if (creativemodetab == CreativeModeTab.f_40761_) {
+          InventoryScreen.m_98850_(this.f_97735_ + 88, this.f_97736_ + 45, 20, (float)(this.f_97735_ + 88 - p_98574_), (float)(this.f_97736_ + 45 - 30 - p_98575_), this.f_96541_.f_91074_);
+@@ -650,6 +_,7 @@
    }
 
-    private int m_258094_(CreativeModeTab p_260136_) {
-      int i = p_260136_.m_257903_();
-+      int i = currentPage.getColumn(p_260136_);
-       int j = 27;
-       int k = 27 * i;
-       if (p_260136_.m_6563_()) {
-@@ -696,7 +_,7 @@
- 
-    private int m_257995_(CreativeModeTab p_260181_) {
-       int i = 0;
-      if (p_260181_.m_258064_() == CreativeModeTab.Row.TOP) {
-+      if (currentPage.isTop(p_260181_)) {
-          i -= 32;
-       } else {
-          i += this.f_97727_;
-@@ -724,8 +_,8 @@
- 
-    protected void m_98581_(PoseStack p_98582_, CreativeModeTab p_98583_) {
-       boolean flag = p_98583_ == f_98507_;
-      boolean flag1 = p_98583_.m_258064_() == CreativeModeTab.Row.TOP;
-      int i = p_98583_.m_257903_();
-+      boolean flag1 = currentPage.isTop(p_98583_);
-+      int i = currentPage.getColumn(p_98583_);
-       int j = i * 26;
+    protected boolean m_98562_(CreativeModeTab p_98563_, double p_98564_, double p_98565_) {
+      if (p_98563_.getTabPage() != tabPage && p_98563_ != CreativeModeTab.f_40754_ && p_98563_ != CreativeModeTab.f_40761_) return false;
+       int i = p_98563_.m_40793_();
+       int j = 28 * i;
       int k = 0;
-       int l = this.f_97735_ + this.m_258094_(p_98583_);
-@@ -742,6 +_,7 @@
+@@ -718,6 +_,7 @@
          i1 += this.f_97727_ - 4;
       }
 
 +      RenderSystem.m_69478_(); //Forge: Make sure blend is enabled else tabs show a white border.
-       this.m_93228_(p_98582_, l, i1, j, k, 26, 32);
+       this.m_93228_(p_98582_, l, i1, j, k, 28, 32);
       this.f_96542_.f_115093_ = 100.0F;
-       l += 5;
-@@ -784,6 +_,15 @@
- 
-    }
- 
-+   public net.minecraftforge.client.gui.CreativeTabsScreenPage getCurrentPage() {
-+      return currentPage;
-+   }
-+
-+   public void setCurrentPage(net.minecraftforge.client.gui.CreativeTabsScreenPage currentPage) {
-+      this.currentPage = currentPage;
-+      this.m_98560_(currentPage.getDefaultTab());
-+   }
-+
-    @OnlyIn(Dist.CLIENT)
-    static class CustomCreativeSlot extends Slot {
-       public CustomCreativeSlot(Container p_98633_, int p_98634_, int p_98635_, int p_98636_) {
-@@ -947,6 +_,22 @@
+       l += 6;
+@@ -909,6 +_,22 @@
 
       public boolean m_8010_(Player p_98665_) {
          return this.f_98655_.m_8010_(p_98665_);
@@ -30,7 +30,7 @@
 +         }
          MobEffect mobeffect = mobeffectinstance.m_19544_();
          TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.m_118732_(mobeffect);
-          RenderSystem.m_157456_(0, textureatlassprite.m_247685_());
+          RenderSystem.m_157456_(0, textureatlassprite.m_118414_().m_118330_());
@@ -108,6 +_,11 @@
       int i = this.f_97736_;
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
-@@ -147,7 +_,7 @@
+@@ -150,7 +_,7 @@
             int i2 = 86 - this.f_96547_.m_92895_(s);
             FormattedText formattedtext = EnchantmentNames.m_98734_().m_98737_(this.f_96547_, i2);
             int j2 = 6839882;
@@ -9,7 +9,7 @@
                this.m_93228_(p_98762_, j1, j + 14 + 19 * i1, 0, 185, 108, 19);
                this.m_93228_(p_98762_, j1 + 1, j + 15 + 19 * i1, 16 * i1, 239, 16, 16);
                this.f_96547_.m_92857_(formattedtext, k1, j + 16 + 19 * i1, i2, (j2 & 16711422) >> 1);
-@@ -186,10 +_,13 @@
+@@ -189,10 +_,13 @@
          Enchantment enchantment = Enchantment.m_44697_((this.f_97732_).f_39447_[j]);
          int l = (this.f_97732_).f_39448_[j];
          int i1 = j + 1;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
-@@ -99,6 +_,11 @@
+@@ -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));
@@ -11,4 +11,4 @@
 +      float f1 = angleYComponent;
       PoseStack posestack = RenderSystem.m_157191_();
       posestack.m_85836_();
-       posestack.m_252880_((float)p_98851_, (float)p_98852_, 1050.0F);
+       posestack.m_85837_((double)p_98851_, (double)p_98852_, 1050.0D);
@@ -9,7 +9,7 @@
 +         PoseStack posestack = new PoseStack();
 +         posestack.m_85837_(0.0D, 0.0D, (f_96542_.f_115093_ + 200.0F));
 +         net.minecraft.client.renderer.MultiBufferSource.BufferSource bufferSource = net.minecraft.client.renderer.MultiBufferSource.m_109898_(com.mojang.blaze3d.vertex.Tesselator.m_85913_().m_85915_());
-+         f_96547_.m_252905_(String.valueOf(p_99164_.m_41613_()), (p_99166_ + 14) + 19 - 2 - f_96547_.m_92895_(String.valueOf(p_99164_.m_41613_())), p_99167_ + 6 + 3, 0xFFFFFF, true, posestack.m_85850_().m_252922_(), bufferSource, false, 0, 15728880);
+         f_96547_.m_92811_(String.valueOf(p_99164_.m_41613_()), (p_99166_ + 14) + 19 - 2 - f_96547_.m_92895_(String.valueOf(p_99164_.m_41613_())), p_99167_ + 6 + 3, 0xFFFFFF, true, posestack.m_85850_().m_85861_(), bufferSource, false, 0, 15728880);
 +         bufferSource.m_109911_();
          RenderSystem.m_157427_(GameRenderer::m_172817_);
          RenderSystem.m_157456_(0, f_99113_);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
-@@ -259,6 +_,11 @@
+@@ -263,6 +_,11 @@
 
    }
 
@@ -1,9 +1,9 @@
 --- a/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
 +++ b/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
-@@ -130,7 +_,7 @@
+@@ -137,7 +_,7 @@
+ 
    private void m_100013_(TransferableSelectionList p_100014_, Stream<PackSelectionModel.Entry> p_100015_) {
       p_100014_.m_6702_().clear();
-       p_100014_.m_6987_((TransferableSelectionList.PackEntry)null);
 -      p_100015_.forEach((p_170000_) -> {
 +      p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach((p_170000_) -> {
          p_100014_.m_6702_().add(new TransferableSelectionList.PackEntry(this.f_96541_, p_100014_, this, p_170000_));
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
 +++ b/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
-@@ -108,7 +_,7 @@
+@@ -106,7 +_,7 @@
       this.m_5674_();
       this.f_100279_.clear();
 
@@ -9,7 +9,7 @@
          this.f_100279_.add(new RecipeBookTabButton(recipebookcategories));
       }
 
-@@ -305,7 +_,7 @@
+@@ -318,7 +_,7 @@
       }
 
       if (itemstack != null && this.f_100272_.f_91080_ != null) {
@@ -1,40 +1,39 @@
 --- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
 +++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
-@@ -113,7 +_,8 @@
+@@ -112,7 +_,7 @@
    public static void m_232896_(Minecraft p_232897_, @Nullable Screen p_232898_) {
       m_232899_(p_232897_, f_232866_);
-       PackRepository packrepository = new PackRepository(new ServerPacksSource());
-      WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, WorldDataConfiguration.f_244649_);
-+      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.event.AddPackFindersEvent(net.minecraft.server.packs.PackType.SERVER_DATA, packrepository::addPackFinder));
-+      WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_)); // FORGE: Load vanilla fallback with vanilla datapacks.
-       CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.m_214362_(worldloader$initconfig, (p_247792_) -> {
-          return new WorldLoader.DataLoadOutput<>(new CreateWorldScreen.DataPackReloadCookie(new WorldGenSettings(WorldOptions.m_247394_(), WorldPresets.m_246552_(p_247792_.f_244104_())), p_247792_.f_244127_()), p_247792_.f_243759_());
-       }, (p_247798_, p_247799_, p_247800_, p_247801_) -> {
-@@ -121,7 +_,10 @@
-          return new WorldCreationContext(p_247801_.f_243966_(), p_247800_, p_247799_, p_247801_.f_243979_());
+       PackRepository packrepository = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
+-      WorldLoader.InitConfig worldloader$initconfig = m_232872_(packrepository, DataPackConfig.f_45842_);
+      WorldLoader.InitConfig worldloader$initconfig = m_232872_(packrepository, new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of())); // FORGE: Load vanilla fallback with vanilla datapacks.
+       CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.m_214362_(worldloader$initconfig, (p_232935_, p_232936_) -> {
+          RegistryAccess.Frozen registryaccess$frozen = RegistryAccess.m_206197_().m_203557_();
+          WorldGenSettings worldgensettings = WorldPresets.m_226449_(registryaccess$frozen);
+@@ -122,7 +_,10 @@
+          return new WorldCreationContext(p_232884_, Lifecycle.stable(), p_232883_, p_232882_);
       }, Util.m_183991_(), p_232897_);
       p_232897_.m_18701_(completablefuture::isDone);
-      p_232897_.m_91152_(new CreateWorldScreen(p_232898_, WorldDataConfiguration.f_244649_, new WorldGenSettingsComponent(completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty())));
+-      p_232897_.m_91152_(new CreateWorldScreen(p_232898_, DataPackConfig.f_45842_, new WorldGenSettingsComponent(completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty())));
 +      // FORGE: Force load mods' datapacks after setting screen and ensure datapack selection reverts to vanilla if invalid.
-+      CreateWorldScreen createWorldScreen = new CreateWorldScreen(p_232898_, new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_), new WorldGenSettingsComponent(completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty()));
+      CreateWorldScreen createWorldScreen = new CreateWorldScreen(p_232898_, new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), new WorldGenSettingsComponent(completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty()));
 +      p_232897_.m_91152_(createWorldScreen);
 +      createWorldScreen.m_100878_(packrepository);
    }
 
-    public static CreateWorldScreen m_247077_(@Nullable Screen p_249522_, LevelSettings p_249091_, WorldCreationContext p_249742_, @Nullable Path p_252076_) {
-@@ -491,7 +_,7 @@
-                   if (p_232949_) {
-                      this.m_100975_();
-                   } else {
-                     this.f_244371_ = WorldDataConfiguration.f_244649_;
-+                     this.f_244371_ = new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_); // FORGE: Revert to *actual* vanilla data
-                      this.f_96541_.m_91152_(this);
-                   }
+    public static CreateWorldScreen m_205426_(@Nullable Screen p_205427_, WorldStem p_205428_, @Nullable Path p_205429_) {
+@@ -478,7 +_,7 @@
+                      if (p_232949_) {
+                         this.m_100975_();
+                      } else {
+-                        this.f_100846_ = DataPackConfig.f_45842_;
+                        this.f_100846_ = new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()); // FORGE: Revert to *actual* vanilla data
+                         this.f_96541_.m_91152_(this);
+                      }
 
-@@ -612,6 +_,7 @@
-       if (path != null) {
+@@ -653,6 +_,7 @@
+          File file1 = path.toFile();
          if (this.f_100832_ == null) {
-             this.f_100832_ = ServerPacksSource.m_245786_(path);
+             this.f_100832_ = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource(), new FolderRepositorySource(file1, PackSource.f_10527_));
 +            net.minecraftforge.resource.ResourcePackLoader.loadResourcePacks(this.f_100832_, net.minecraftforge.server.ServerLifecycleHooks::buildPackFinder);
             this.f_100832_.m_10506_();
          }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
-@@ -158,13 +_,23 @@
+@@ -132,13 +_,23 @@
    }
 
    private void m_233145_(Screen p_233146_, String p_233147_, boolean p_233148_, boolean p_233149_) {
@@ -12,7 +12,7 @@
 +   private void doLoadLevel(Screen p_233146_, String p_233147_, boolean p_233148_, boolean p_233149_, boolean confirmExperimentalWarning) {
       LevelStorageSource.LevelStorageAccess levelstoragesource$levelstorageaccess = this.m_233155_(p_233147_);
       if (levelstoragesource$levelstorageaccess != null) {
-          PackRepository packrepository = ServerPacksSource.m_247728_(levelstoragesource$levelstorageaccess);
+          PackRepository packrepository = m_233105_(levelstoragesource$levelstorageaccess);
 
          WorldStem worldstem;
          try {
@@ -22,20 +22,20 @@
 +               pld.withConfirmedWarning(true);
 +            }
          } catch (Exception exception) {
-             f_233088_.warn("Failed to load level data or datapacks, can't proceed with server load", (Throwable)exception);
+             f_233088_.warn("Failed to load datapacks, can't proceed with server load", (Throwable)exception);
             this.f_233089_.m_91152_(new DatapackLoadFailureScreen(() -> {
-@@ -177,7 +_,9 @@
+@@ -151,7 +_,9 @@
          WorldData worlddata = worldstem.f_206895_();
-          boolean flag = worlddata.m_246337_().m_247070_();
+          boolean flag = worlddata.m_5961_().m_64670_();
          boolean flag1 = worlddata.m_5754_() != Lifecycle.stable();
 -         if (!p_233149_ || !flag && !flag1) {
 +         // Forge: Skip confirmation if it has been done already for this world
 +         boolean skipConfirmation = worlddata instanceof PrimaryLevelData pld && pld.hasConfirmedExperimentalWarning();
 +         if (skipConfirmation || !p_233149_ || !flag && !flag1) {
-             this.f_233089_.m_247489_().m_247400_(levelstoragesource$levelstorageaccess).thenApply((p_233177_) -> {
+             this.f_233089_.m_91100_().m_235003_(levelstoragesource$levelstorageaccess).thenApply((p_233177_) -> {
                return true;
             }).exceptionallyComposeAsync((p_233183_) -> {
-@@ -199,9 +_,11 @@
+@@ -173,9 +_,11 @@
                return null;
             });
          } else {
@@ -16,7 +16,7 @@
          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);
-@@ -560,6 +_,21 @@
+@@ -646,6 +_,21 @@
 
       public boolean m_214209_() {
          return !this.f_101695_.m_164916_();
@@ -24,7 +24,7 @@
 +
 +      // 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_.isLifecycleExperimental()) {
+         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);
@@ -1,8 +1,8 @@
 --- a/net/minecraft/client/model/geom/LayerDefinitions.java
 +++ b/net/minecraft/client/model/geom/LayerDefinitions.java
-@@ -313,6 +_,7 @@
-       WoodType.m_61843_().forEach((p_247864_) -> {
-          builder.put(ModelLayers.m_247439_(p_247864_), layerdefinition24);
+@@ -293,6 +_,7 @@
+       WoodType.m_61843_().forEach((p_171114_) -> {
+          builder.put(ModelLayers.m_171291_(p_171114_), layerdefinition20);
       });
 +      net.minecraftforge.client.ForgeHooksClient.loadLayerDefinitions(builder);
       ImmutableMap<ModelLayerLocation, LayerDefinition> immutablemap = builder.build();
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/model/geom/ModelLayers.java
 +++ b/net/minecraft/client/model/geom/ModelLayers.java
-@@ -217,11 +_,13 @@
+@@ -207,7 +_,8 @@
    }
 
    public static ModelLayerLocation m_171291_(WoodType p_171292_) {
@@ -9,10 +9,4 @@
 +      return new ModelLayerLocation(new ResourceLocation(location.m_135827_(), "sign/" + location.m_135815_()), "main");
    }
 
-    public static ModelLayerLocation m_247439_(WoodType p_252225_) {
-      return m_171300_("hanging_sign/" + p_252225_.m_61846_(), "main");
-+      ResourceLocation location = new ResourceLocation(p_252225_.m_61846_());
-+      return new ModelLayerLocation(new ResourceLocation(location.m_135827_(), "hanging_sign/" + location.m_135815_()), "main");
-    }
- 
    public static Stream<ModelLayerLocation> m_171288_() {
@@ -1,11 +0,0 @@
--- a/net/minecraft/client/multiplayer/AccountProfileKeyPairManager.java
-+++ b/net/minecraft/client/multiplayer/AccountProfileKeyPairManager.java
-@@ -75,6 +_,8 @@
-                this.m_253216_(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_252526_ != UserApiService.OFFLINE)
-                f_252448_.error("Failed to retrieve profile key pair", (Throwable)ioexception);
-                this.m_253216_((ProfileKeyPair)null);
-                return p_254074_;
@@ -1,14 +1,14 @@
 --- a/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
 +++ b/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
-@@ -127,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);
 +      net.minecraftforge.network.NetworkHooks.handleClientLoginSuccess(this.f_104522_);
-       this.f_104522_.m_129505_(new ClientPacketListener(this.f_104519_, this.f_104520_, this.f_104522_, this.f_243717_, this.f_104523_, this.f_104519_.m_261007_().m_260825_(this.f_260722_, this.f_260612_)));
+       this.f_104522_.m_129505_(new ClientPacketListener(this.f_104519_, this.f_104520_, this.f_104522_, this.f_104523_, this.f_104519_.m_193590_()));
    }
 
-@@ -134,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 @@
       }
 
    }
-@@ -155,6 +_,7 @@
+@@ -158,6 +_,7 @@
    }
 
    public void m_7254_(ClientboundCustomQueryPacket p_104545_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientLevel.java
 +++ b/net/minecraft/client/multiplayer/ClientLevel.java
-@@ -117,12 +_,15 @@
+@@ -115,12 +_,15 @@
       p_194170_.put(BiomeColors.f_108791_, new BlockTintCache((p_194168_) -> {
          return this.m_104762_(p_194168_, BiomeColors.f_108791_);
       }));
@@ -16,7 +16,7 @@
 
    public void m_233651_(int p_233652_) {
       this.f_233599_.m_233856_(p_233652_, this);
-@@ -176,6 +_,8 @@
+@@ -174,6 +_,8 @@
       this.f_194123_ = p_205510_;
       this.m_46465_();
       this.m_46466_();
@@ -25,15 +25,15 @@
    }
 
    public void m_194171_(Runnable p_194172_) {
-@@ -262,6 +_,7 @@
+@@ -260,6 +_,7 @@
       this.m_46473_().m_6521_(() -> {
-          return BuiltInRegistries.f_256780_.m_7981_(p_104640_.m_6095_()).toString();
+          return Registry.f_122826_.m_7981_(p_104640_.m_6095_()).toString();
       });
 +      if (p_104640_.canUpdate())
       p_104640_.m_8119_();
       this.m_46473_().m_7238_();
 
-@@ -324,8 +_,10 @@
+@@ -322,8 +_,10 @@
    }
 
    private void m_104739_(int p_104740_, Entity p_104741_) {
@@ -44,33 +44,33 @@
    }
 
    public void m_171642_(int p_171643_, Entity.RemovalReason p_171644_) {
-@@ -452,6 +_,12 @@
+@@ -450,6 +_,12 @@
    }
 
-    public void m_262808_(@Nullable Player p_263381_, double p_263372_, double p_263404_, double p_263365_, Holder<SoundEvent> p_263335_, SoundSource p_263417_, float p_263416_, float p_263349_, long p_263408_) {
-+      net.minecraftforge.event.PlayLevelSoundEvent.AtPosition event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtPosition(this, p_263372_, p_263404_, p_263365_, p_263335_, p_263417_, p_263416_, p_263349_);
+    public void m_214150_(@Nullable Player p_233621_, double p_233622_, double p_233623_, double p_233624_, SoundEvent p_233625_, SoundSource p_233626_, float p_233627_, float p_233628_, long p_233629_) {
+      net.minecraftforge.event.PlayLevelSoundEvent.AtPosition event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtPosition(this, p_233622_, p_233623_, p_233624_, p_233625_, p_233626_, p_233627_, p_233628_);
 +      if (event.isCanceled() || event.getSound() == null) return;
-+      p_263335_ = event.getSound();
-+      p_263417_ = event.getSource();
-+      p_263416_ = event.getNewVolume();
-+      p_263349_ = event.getNewPitch();
-       if (p_263381_ == this.f_104565_.f_91074_) {
-          this.m_233602_(p_263372_, p_263404_, p_263365_, p_263335_.m_203334_(), p_263417_, p_263416_, p_263349_, false, p_263408_);
+      p_233625_ = event.getSound();
+      p_233626_ = event.getSource();
+      p_233627_ = event.getNewVolume();
+      p_233628_ = event.getNewPitch();
+       if (p_233621_ == this.f_104565_.f_91074_) {
+          this.m_233602_(p_233622_, p_233623_, p_233624_, p_233625_, p_233626_, p_233627_, p_233628_, false, p_233629_);
       }
-@@ -459,6 +_,12 @@
+@@ -457,6 +_,12 @@
    }
 
-    public void m_213890_(@Nullable Player p_263514_, Entity p_263536_, Holder<SoundEvent> p_263518_, SoundSource p_263487_, float p_263538_, float p_263524_, long p_263509_) {
-+      net.minecraftforge.event.PlayLevelSoundEvent.AtEntity event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtEntity(p_263536_, p_263518_, p_263487_, p_263538_, p_263524_);
+    public void m_213890_(@Nullable Player p_233631_, Entity p_233632_, SoundEvent p_233633_, SoundSource p_233634_, float p_233635_, float p_233636_, long p_233637_) {
+      net.minecraftforge.event.PlayLevelSoundEvent.AtEntity event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtEntity(p_233632_, p_233633_, p_233634_, p_233635_, p_233636_);
 +      if (event.isCanceled() || event.getSound() == null) return;
-+      p_263518_ = event.getSound();
-+      p_263487_ = event.getSource();
-+      p_263538_ = event.getNewVolume();
-+      p_263524_ = event.getNewPitch();
-       if (p_263514_ == this.f_104565_.f_91074_) {
-          this.f_104565_.m_91106_().m_120367_(new EntityBoundSoundInstance(p_263518_.m_203334_(), p_263487_, p_263538_, p_263524_, p_263536_, p_263509_));
+      p_233633_ = event.getSound();
+      p_233634_ = event.getSource();
+      p_233635_ = event.getNewVolume();
+      p_233636_ = event.getNewPitch();
+       if (p_233631_ == this.f_104565_.f_91074_) {
+          this.f_104565_.m_91106_().m_120367_(new EntityBoundSoundInstance(p_233633_, p_233634_, p_233635_, p_233636_, p_233632_, p_233637_));
       }
-@@ -907,6 +_,7 @@
+@@ -902,6 +_,7 @@
       }
 
       public void m_104851_(Difficulty p_104852_) {
@@ -78,7 +78,7 @@
          this.f_104840_ = p_104852_;
       }
 
-@@ -944,14 +_,46 @@
+@@ -939,14 +_,46 @@
             ClientLevel.this.f_104566_.add((AbstractClientPlayer)p_171712_);
          }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/ClientPacketListener.java
 +++ b/net/minecraft/client/multiplayer/ClientPacketListener.java
-@@ -398,6 +_,7 @@
+@@ -375,6 +_,7 @@
 
       this.f_104888_.f_91064_.m_113434_();
       this.f_104888_.f_91074_.m_172530_();
@@ -8,15 +8,15 @@
       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_);
-@@ -410,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_());
 +      net.minecraftforge.network.NetworkHooks.sendMCRegistryPackets(f_104885_, "PLAY_TO_SERVER");
       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_244346_ = new LastSeenMessagesTracker(20);
-@@ -1003,8 +_,10 @@
+       this.f_104888_.m_91309_().m_90739_();
+@@ -941,8 +_,10 @@
          localplayer1.m_21204_().m_22159_(localplayer.m_21204_());
       }
 
@@ -27,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_);
-@@ -1109,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_) -> {
@@ -39,18 +39,18 @@
 
          if (p_205557_ instanceof CommandBlockEntity && this.f_104888_.f_91080_ instanceof CommandBlockEditScreen) {
             ((CommandBlockEditScreen)this.f_104888_.f_91080_).m_98398_();
-@@ -1257,7 +_,9 @@
+@@ -1194,7 +_,9 @@
 
    public void m_7443_(ClientboundCommandsPacket p_104990_) {
       PacketUtils.m_131363_(p_104990_, this, this.f_104888_);
-      this.f_104899_ = new CommandDispatcher<>(p_104990_.m_237624_(CommandBuildContext.m_255418_(this.f_104903_.m_247579_(), this.f_244039_)));
-+      var context = CommandBuildContext.m_255418_(this.f_104903_.m_247579_(), this.f_244039_);
+-      this.f_104899_ = new CommandDispatcher<>(p_104990_.m_237624_(new CommandBuildContext(this.f_104903_)));
+      var context = new CommandBuildContext(this.f_104903_);
 +      this.f_104899_ = new CommandDispatcher<>(p_104990_.m_237624_(context));
 +      this.f_104899_ = net.minecraftforge.client.ClientCommandHandler.mergeServerCommands(this.f_104899_, context);
    }
 
    public void m_7183_(ClientboundStopSoundPacket p_105116_) {
-@@ -1276,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_());
@@ -58,17 +58,15 @@
    }
 
    public void m_7244_(ClientboundPlayerLookAtPacket p_105054_) {
-@@ -1368,7 +_,8 @@
-          Blocks.m_50758_();
-       }
+@@ -1314,6 +_,7 @@
 
-      CreativeModeTabs.m_258007_().m_257466_();
-+      CreativeModeTabs.m_257478_().stream().filter(net.minecraft.world.item.CreativeModeTab::hasSearchBar).forEach(net.minecraft.world.item.CreativeModeTab::m_257466_);
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.TagsUpdatedEvent(this.f_104903_.m_247579_(), true, f_104885_.m_129531_()));
+       this.f_104888_.m_231374_(SearchRegistry.f_119941_, nonnulllist);
+       this.f_104888_.m_231374_(SearchRegistry.f_119942_, nonnulllist);
+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.TagsUpdatedEvent(this.f_104903_, true, f_104885_.m_129531_()));
    }
 
-    public void m_241155_(ClientboundUpdateEnabledFeaturesPacket p_251591_) {
-@@ -1753,6 +_,7 @@
+    private <T> void m_205560_(ResourceKey<? extends Registry<? extends T>> p_205561_, TagNetworkSerialization.NetworkPayload p_205562_) {
+@@ -1666,6 +_,7 @@
    }
 
    public void m_7413_(ClientboundCustomPayloadPacket p_105004_) {
@@ -76,7 +74,7 @@
       PacketUtils.m_131363_(p_105004_, this, this.f_104888_);
       ResourceLocation resourcelocation = p_105004_.m_132042_();
       FriendlyByteBuf friendlybytebuf = null;
-@@ -1950,7 +_,7 @@
+@@ -1863,7 +_,7 @@
             int j5 = friendlybytebuf.m_130242_();
             this.f_104888_.f_91064_.f_173815_.m_173830_(positionsource, j5);
          } else {
@@ -85,20 +83,3 @@
          }
       } finally {
          if (friendlybytebuf != null) {
-@@ -2284,6 +_,8 @@
-    }
- 
-    public void m_246175_(String p_249888_) {
-+      p_249888_ = net.minecraftforge.client.ForgeHooksClient.onClientSendMessage(p_249888_);
-+      if (p_249888_.isEmpty()) return;
-       Instant instant = Instant.now();
-       long i = Crypt.SaltSupplier.m_216113_();
-       LastSeenMessagesTracker.Update lastseenmessagestracker$update = this.f_244346_.m_246442_();
-@@ -2292,6 +_,7 @@
-    }
- 
-    public void m_246623_(String p_250092_) {
-+      if (net.minecraftforge.client.ClientCommandHandler.runCommand(p_250092_)) return;
-       Instant instant = Instant.now();
-       long i = Crypt.SaltSupplier.m_216113_();
-       LastSeenMessagesTracker.Update lastseenmessagestracker$update = this.f_244346_.m_246442_();
@@ -79,7 +79,7 @@
             if (this.f_105193_ >= 1.0F) {
                this.f_105196_ = false;
                this.m_233729_(this.f_105189_.f_91073_, (p_233739_) -> {
-@@ -247,7 +_,7 @@
+@@ -263,7 +_,7 @@
    }
 
    public float m_105286_() {
@@ -88,7 +88,7 @@
    }
 
    public void m_105287_() {
-@@ -264,7 +_,7 @@
+@@ -280,7 +_,7 @@
       ItemStack itemstack = this.f_105189_.f_91074_.m_21205_();
       boolean flag = this.f_105192_.m_41619_() && itemstack.m_41619_();
       if (!this.f_105192_.m_41619_() && !itemstack.m_41619_()) {
@@ -97,7 +97,7 @@
       }
 
       return p_105282_.equals(this.f_105191_) && flag;
-@@ -296,25 +_,38 @@
+@@ -312,20 +_,33 @@
    private InteractionResult m_233746_(LocalPlayer p_233747_, InteractionHand p_233748_, BlockHitResult p_233749_) {
       BlockPos blockpos = p_233749_.m_82425_();
       ItemStack itemstack = p_233747_.m_21120_(p_233748_);
@@ -119,13 +119,8 @@
 +         boolean flag = !p_233747_.m_21205_().doesSneakBypassUse(p_233747_.m_9236_(), blockpos, p_233747_) || !p_233747_.m_21206_().doesSneakBypassUse(p_233747_.m_9236_(), blockpos, p_233747_);
          boolean flag1 = p_233747_.m_36341_() && flag;
 -         if (!flag1) {
-             BlockState blockstate = this.f_105189_.f_91073_.m_8055_(blockpos);
-             if (!this.f_105190_.m_246351_(blockstate.m_60734_().m_245183_())) {
-                return InteractionResult.FAIL;
-             }
- 
 +         if (event.getUseBlock() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1)) {
-             InteractionResult interactionresult = blockstate.m_60664_(this.f_105189_.f_91073_, p_233747_, p_233748_, p_233749_);
+             InteractionResult interactionresult = this.f_105189_.f_91073_.m_8055_(blockpos).m_60664_(this.f_105189_.f_91073_, p_233747_, p_233748_, p_233749_);
             if (interactionresult.m_19077_()) {
                return interactionresult;
             }
@@ -140,7 +135,7 @@
             InteractionResult interactionresult1;
             if (this.f_105197_.m_46408_()) {
                int i = itemstack.m_41613_();
-@@ -345,10 +_,17 @@
+@@ -356,10 +_,17 @@
                mutableobject.setValue(InteractionResult.PASS);
                return serverbounduseitempacket;
             } else {
@@ -158,7 +153,7 @@
                }
 
                mutableobject.setValue(interactionresultholder.m_19089_());
-@@ -387,6 +_,9 @@
+@@ -398,6 +_,9 @@
       this.m_105297_();
       Vec3 vec3 = p_105233_.m_82450_().m_82492_(p_105232_.m_20185_(), p_105232_.m_20186_(), p_105232_.m_20189_());
       this.f_105190_.m_104955_(ServerboundInteractPacket.m_179612_(p_105232_, p_105231_.m_6144_(), p_105234_, vec3));
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/multiplayer/PlayerInfo.java
 +++ b/net/minecraft/client/multiplayer/PlayerInfo.java
-@@ -74,6 +_,7 @@
+@@ -82,6 +_,7 @@
    }
 
    protected void m_105317_(GameType p_105318_) {
Author	SHA1	Message	Date
Jonathing	e0717f5765	1.19.2 RB 5 https://forums.minecraftforge.net/topic/154385-forge-435-minecraft-1192/	2025-03-04 16:55:07 -08:00
Jonathing	b3703dac1d	Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10464 )	2025-03-04 14:44:47 -08:00
JonathingandLexManos	11e74bf8d3	Speed up mod annotation scanning by ~30% (#10472 ) Co-authored-by: LexManos <[email protected]>	2025-03-04 14:40:07 -08:00
Jonathing	dc0da958e0	Fix continuing to use items after dropping or when a shield breaks (#10382 ) Fixes MC-231097 and MC-168573 Cache this.useItem before running item break logic, Fixes #10344	2025-03-04 14:39:51 -08:00
Jonathing	defeedd11d	Add fast graphics render type to block model jsons (#10400 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-18 14:29:30 -08:00
Jonathing	756731a61f	Backport even more future ResourceLocation methods (#10430 )	2025-02-18 14:16:44 -08:00
Jonathing	fd1b206cf2	Ensure NetworkConstants is loaded before mod construction (#10448 )	2025-02-18 14:16:07 -08:00
JonathingandPaint_Ninja	dfe1f9240c	Add `clientSideOnly` feature to mods.toml (#10085 ) (backport of #9804 to 1.20.1) (#10367 ) Co-authored-by: Paint_Ninja <[email protected]>	2025-02-18 14:15:55 -08:00
Jonathing	f2c46fc2c1	Fix incorrect method reference in TntBlock.explode() (#10333 )	2025-01-27 20:32:43 -08:00
Jonathing	9cb47ed7b7	Fix issue with shields being disabled by an attacker (#10323 )	2025-01-27 20:32:33 -08:00
Jonathing	1f321b8bd2	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10360 ) Add VillagerType#registerBiomeType Co-authored-by: Joseph T. McQuigg <[email protected]>	2025-01-27 20:31:51 -08:00
Jonathing	b1c37c25b5	Fix non-passengers being tickable without checking canUpdate() (#10306 )	2025-01-22 14:33:21 -08:00
Jonathing	f1a52f7326	Bump CoreMods to 5.2.4 (#10269 )	2024-12-23 22:02:24 -08:00
Jonathing	9e54667efa	Allow mipmap lowering to be disabled (#10250 )	2024-12-23 22:02:10 -08:00
Jonathing	8383a0ebac	Add optional fix of use item duration, disabled by default (#10244 )	2024-12-23 21:37:27 -08:00
JonathingandPaint_Ninja	43850be0f6	Backport some Vanilla 1.21 `ResourceLocation` methods (#10239 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 21:24:20 -08:00
JonathingandPaint_Ninja	729cc6ab55	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10226 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 21:24:13 -08:00
Jonathing	92998b1c32	Disable clean on TeamCity (#10260 )	2024-12-23 21:06:13 -08:00
Jonathing	babb17f2ad	Bump JNA to 5.12.1 (#10186 )	2024-11-26 12:09:30 -08:00
Jonathing	85d0c98e6b	Bump CoreMods to 5.2 (#10132 ) Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 The key features are: - ES6 language support - Thoroughly updated ASMAPI, with full documentation - Bug fixes (some optional for backwards-compatibility) - Partial internal code cleanup - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default Related dependency bumps: - Updated ASM to 9.7.1 - Updated Nashorn to 15.4 - Updated Log4J to 2.19.0 (included with installer)	2024-11-10 13:24:52 -08:00
Paint_Ninja	dfcdb4f010	Cleanup FML Bindings (backport of #10004 to 1.19.2) (#10105 )	2024-09-12 14:12:03 +01:00
Paint_NinjaandRealMangoRage	85c3ffffd1	Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.19.2) (#10106 ) Co-authored-by: RealMangoRage <[email protected]>	2024-09-12 14:11:54 +01:00
JonathingandVen	f090e53e55	Fixed falling block entities not rendering as moving blocks (#10006 ) (#10020 ) Co-authored-by: Ven <[email protected]>	2024-07-02 12:42:53 -07:00
Jonathingandthedarkcolour	c1e29d2dfc	Choose default JarJar mod file type based on parent JAR (#10025 ) Co-authored-by: thedarkcolour <[email protected]>	2024-07-02 12:05:00 -07:00
LexManos	b2d42fa577	1.19.2 RB 4 https://forums.minecraftforge.net/topic/149548-forge-434-minecraft-1192/	2024-06-06 15:04:11 -07:00
LexManos	1b5c118ec2	Update Gradle to 8.8	2024-06-06 14:37:37 -07:00
Paint_NinjaandJ-RAP	d399884186	Fix NPE when acceptableValues in defineInList() does not allow nulls, fixes #9300 , backport of #9903 (#9909 ) Co-authored-by: J-RAP <[email protected]>	2024-04-18 21:41:55 +01:00
Paint_Ninja	091cc791b6	Optimise capabilities a tad, backport of #9886 (#9918 )	2024-04-18 21:18:36 +01:00
Paint_Ninja	c921aeec50	Make common config screen registration tasks easier, backport of #9884 (#9914 )	2024-04-18 21:18:16 +01:00
Paint_Ninja	f4aea1d8df	Bump ASM, fix userdev, fix crowdin (#9925 )	2024-04-18 19:57:21 +01:00
J-RAP	ad271df245	Bump some deps (#9878 ) - CoreMods 5.0.1 -> 5.1.2 - ASM 9.5 -> 9.6 - Installer 2.1 -> 2.2 - Installer tools 1.3.0 -> 1.4.1	2024-03-10 21:25:19 +00:00
Jonathan Colmenares	39dc348f8b	Fix TagsProvider not honoring replace attribute (#9865 )	2024-02-10 16:02:14 -08:00
Paint_Ninja	75eedc04a1	Make common DisplayTest registration tasks easier (#9838 ) Backport of #9822 to 1.19.2	2023-12-31 15:37:33 +00:00
Paint_Ninja	81f99b0116	Optimise ForgeConfigSpec and make Range public (#9827 ) Backport of #9810 to 1.19.2	2023-12-30 21:16:43 +00:00
Paint_Ninja	f0a7a457bb	Update to FG6 and Gradle 8, backport 1.20 MDK (#9754 )	2023-11-02 13:41:09 -07:00
Paint_NinjaandSu5eD	cf454b7da8	Improve mod description formatting in mods screen (#9771 ) Co-authored-by: Su5eD <[email protected]>	2023-11-02 13:40:46 -07:00
Paint_Ninja	afcce7d4e7	Backport CrashReportAnalyser to 1.19.2 (#9758 )	2023-11-02 13:40:30 -07:00
Paint_Ninjaandembeddedt	d4a2fbffa3	Optimise path filter in mod loading (#9712 ) Co-authored-by: embeddedt <[email protected]>	2023-09-28 16:40:49 -07:00
Paint_NinjaandJab125	4b61de2088	Improve mod loading error message for errors inside mod constructors (#9709 ) Co-authored-by: Jab125 <[email protected]>	2023-09-28 16:40:36 -07:00
LexManos	bc2d0d1b25	1.19.2 RB 3	2023-09-21 11:59:41 -07:00
Paint_Ninja	e2c1da98be	Fix `Level` leak in debug HUD (#9701 )	2023-09-03 11:03:37 -07:00
Paint_Ninjaanddhyces	0f6d11b1ee	Keep order of sources in PackRepository (#9704 ) Co-authored-by: dhyces <[email protected]>	2023-09-02 16:21:33 -07:00
Jonathan Colmenares	340d332e19	Fix parameter names in IForgeDimensionSpecialEffects.adjustLightmapColors to better describe what they are. (#9658 )	2023-07-17 09:45:45 -07:00
Jonathan Colmenares	56f19dd53d	Re-add in-game mod menu (#9655 )	2023-07-17 08:51:03 -07:00
brandon3055	1fe420e4ab	Fixed FluidUtil#tryFillContainer returning invalid result when simulating (#9358 )	2023-07-15 10:52:57 -07:00
bconlon	945209c283	AlterGroundEvent for modifying block placement performed by AlterGroundDecorator (#9635 )	2023-07-13 17:32:31 -07:00
embeddedt	3e5c3cabd5	Bump ASM to 9.5 (#9516 )	2023-07-11 09:26:12 -07:00
Paint_Ninja	b0f5a13f52	Improve logging for server connections (#9623 )	2023-07-11 09:25:56 -07:00
Paint_Ninja	15fe8441f0	Log a proper duplicate mod(s) error message (#9625 )	2023-07-11 09:25:42 -07:00
Brennan Ward	babef71616	Fix erroneous getLevel call when firing SpecialSpawn (#9520 )	2023-06-07 13:22:00 +00:00
Brennan Ward	1dd18ca27c	[1.19.2] Fix the rest of the spawn event calls (#9482 )	2023-05-31 11:52:38 +00:00
TelepathicGrunt	65c7390874	Loosen access for BucketItem's canBlockContainFluid (#9429 )	2023-05-29 19:16:05 +00:00
Brennan WardandBrennan Ward	fe3ad3b8f2	Fix event result being ignored (#9484 ) Co-authored-by: Brennan Ward <[email protected]>	2023-05-08 22:52:15 +01:00
Brennan WardandBrennan Ward	d05e76f7c4	Fix incorrect SpecialSpawn fire location (#9480 ) Co-authored-by: Brennan Ward <[email protected]>	2023-05-03 07:08:07 +01:00
SizableShrimp	bfa97bf097	[1.19.2] Fix forge grindstone hooks allowing stacks of non-stackable items (#9466 )	2023-05-01 18:39:56 -05:00
Dennis C	469e9a6c1a	Fix JSON model root transforms (#9411 )	2023-03-22 11:09:58 +01:00
ferriarnus	58456c85af	Fix StemBlock not checking canSustainPlant for the correct block It now checks for Melons/Pumpkins instead of the stem itself.	2023-03-15 11:50:31 -07:00
cech12	7fe5b02ef3	Fix of inconsistent vaporization in BucketItem & FluidType (#9340 )	2023-02-24 13:18:43 -08:00
SizableShrimp	184392e02e	Backport `ClientChatReceivedEvent.System` for 1.19.2. Fixes #9352 (#9355 )	2023-02-24 10:47:07 -08:00
Jonathan Colmenares	d25a5466db	Fire TickEvent.LevelTickEvent on ClientLevel tick (#9302 )	2023-01-25 13:41:46 -08:00
Dennis C	b5073c10ef	Disable guiLight3d for generated item models (#9231 )	2022-12-30 17:59:43 +01:00
sciwhiz12	16bc7cf783	Fix config key used by resource cache (#9253 ) This bring it in line with the config key defined in the spec and default config file in ResourceManagerBootCacheConfigurationHandler. Fixes #9252	2022-12-26 13:20:27 -08:00
sciwhiz12	2d714f034f	[1.19.2] Fix compatibility checker task configuration (#9233 ) * Fix compatibility checker task configuration The setupCheckJarCompatibility task exists to configure the main compatibility checker task, checkJarCompatibility, because certain configuration steps for that task could not be done until after the configuration phase of Gradle. However, that setup task previously held all the configuration for the main check task in its task action. This caused problems because the main check task's inputs are linked to other tasks, and the previous situation made it so its configuration (by the setup task) happened _after_ Gradle built the task dependency model/tree. This meant that certain tasks which the main check task depended on did not run before that task, because Gradle was unaware of this inter-task dependency until it was too late (when it was already executing tasks). This fixes the issue by moving the bulk of the configuration for the main check task from the action of the setup task to the main buildscript, therefore allowing Gradle to know about those task dependencies and factor them in to its process of determining what tasks to run and in what order. The remaining configuration step in the setup task for the main check task is linked to the setup task, and does not affect the task's dependencies (because it uses a configuration which it resolves immediately), so it stays in the setup task. * Force checker setup task to never be up-to-date The setup task configures the main check task, so it should always run before that task. However, because it has an input and output, the setup task is affected by Gradle's incremental build feature, which leads to the possibility that Gradle considers the setup task as up-to-date, therefore not executing its action and causing errors with the main check task down the line.	2022-12-17 18:50:26 +01:00