1.19.4 RB 4

https://forums.minecraftforge.net/topic/154386-forge-454-minecraft-1194/
Cache this.useItem before running item break logic, Fixes #10344 (#10381 )
2026-11-14 09:05:17 +00:00 · 2025-03-04 16:44:50 -05:00 · 2025-03-04 13:39:35 -08:00 · 2025-03-04 13:34:26 -08:00 · 2025-03-04 13:33:54 -08:00 · 2025-02-18 14:09:27 -08:00
149 changed files with 3174 additions and 655 deletions
@@ -36,9 +36,9 @@ project {
    buildType(PullRequestCompatibility)

    params {
-        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.5.1", 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("docker_jdk_version", "21", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_gradle_version", "8.8", 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.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
        text("git_branch_spec", """
                +:refs/heads/(main*)
                +:refs/heads/(master*)
@@ -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 net.minecraftforge.forge.tasks.checks.CheckATs
 import net.minecraftforge.forge.tasks.checks.CheckExcs
@@ -23,12 +24,13 @@ import org.objectweb.asm.Opcodes

 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!
@@ -49,13 +51,13 @@ ext {
    MCP_VERSION = '20230314.122934'
    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.6'
    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
-    ASM_VERSION = '9.5'
-    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.+'
@@ -81,7 +83,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'
@@ -102,7 +104,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'
@@ -217,45 +219,47 @@ 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"
+                clean_server {
+                    client false
+                    taskName 'clean_server'
+                    ideaModule "${rootProject.name}.${project.name}.main"

-                main 'net.minecraft.server.Main'
-                workingDirectory project.file('run')
+                    main 'net.minecraft.server.Main'
+                    workingDirectory project.file('run')
+                }
            }
        }
    }
@@ -292,9 +296,11 @@ 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 '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'
@@ -345,7 +351,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
    }

@@ -453,7 +459,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}'
@@ -879,11 +885,15 @@ project(':fmlonly') {
 }

 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'

+    applyPatches { 
+        level 'WARNING'
+    }
+
    sourceSets {
        main {
            java {
@@ -953,13 +963,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'
@@ -1164,9 +1180,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)
@@ -1572,9 +1591,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 ->
@@ -1619,7 +1641,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,
@@ -1770,7 +1792,8 @@ project(':forge') {

 //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'
@@ -1787,3 +1810,11 @@ if (System.env.TEAMCITY_VERSION) {
        }
    }
 }
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
@@ -7,7 +7,7 @@ dependencies {
    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.8.0'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'commons-io:commons-io:2.12.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
 }
@@ -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.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
@@ -12,7 +12,9 @@ import org.objectweb.asm.tree.MethodNode

 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") })
@@ -27,6 +27,6 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
    @Internal
    @Override
    protected Object getData() {
-        return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
+        return matches.stream().sorted().toList() ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
    }
 }
@@ -32,7 +32,7 @@ class TeamcityRequests {
    @Nullable
    static Map<String, Build> buildsByCommit() throws IOException {
        final Map<String, Build> builds = [:]
-        jsonRequest(new TypeToken<Builds>() {}, "https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),count:300,status:SUCCESS")
+        jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
                ?.build?.forEach {
            it.revisions.revision.each { rev -> builds[rev.version] = it }
        }
@@ -81,14 +81,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: [
@@ -171,7 +171,7 @@ abstract class CheckATs extends CheckTask {
    }

    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance, IMappingFile mappings) {
-        final data = []
+        final List<String> data = []
        final remapComment = { ATParser.Entry entry ->
            if (!mappings || !entry || !entry.desc) return null
            final comment = entry.comment?.substring(1)?.trim()
@@ -91,18 +91,20 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type') Closure configuration) {
        taskName = taskName.capitalize()
        tasks.register("check$taskName", clazz) { CheckTask task ->
-            configuration.setDelegate((T) task)
-            configuration.call(task)
-            task.mode.set(CheckMode.CHECK)
-            task.group = 'checks'
+            def castedTask = task as T
+            configuration.setDelegate(castedTask)
+            configuration.call(castedTask)
+            castedTask.mode.set(CheckMode.CHECK)
+            castedTask.group = 'checks'
        }
        tasks.named('checkAll').configure { it.dependsOn("check$taskName") }

        tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
-            configuration.setDelegate((T) task)
-            configuration.call(task)
-            task.mode.set(CheckMode.FIX)
-            task.group = 'checks'
+            def castedTask = task as T
+            configuration.setDelegate(castedTask)
+            configuration.call(castedTask)
+            castedTask.mode.set(CheckMode.CHECK)
+            castedTask.group = 'checks'
        }
        tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
    }
@@ -8,10 +8,9 @@ MinecraftForge

 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]
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
 
 For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].

+## 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][Getting-Started].
@@ -63,14 +75,21 @@ Please ensure you have a valid email address associated with your GitHub account

 [Download]: https://files.minecraftforge.net/

+[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/
-[Getting-Started]: https://docs.minecraftforge.net/en/latest/gettingstarted/
-[ForgeDev]: https://docs.minecraftforge.net/en/latest/forgedev/
-[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
+[Documentation]: https://docs.minecraftforge.net/en/1.19.x/
+[Getting-Started]: https://docs.minecraftforge.net/en/1.19.x/gettingstarted/
+[ForgeDev]: https://docs.minecraftforge.net/en/1.19.x/forgedev/
+[Pull-Requests]: https://docs.minecraftforge.net/en/1.19.x/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);
    }
@@ -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));
    }


@@ -51,8 +51,8 @@ public class VersionChecker
        BETA(),
        BETA_OUTDATED(6, true);

-        final int sheetOffset;
-        final boolean draw, animated;
+        private final int sheetOffset;
+        private final boolean draw, animated;

        Status()
        {
@@ -91,6 +91,9 @@ public class VersionChecker
            return animated;
        }

+        public boolean isOutdated() {
+            return this == OUTDATED || this == BETA_OUTDATED;
+        }
    }

    public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
@@ -257,7 +260,7 @@ public class VersionChecker
                    LOGGER.warn("Failed to process update information", e);
                    status = FAILED;
                }
-                results.put(mod, new CheckResult(status, target, changes, display_url));
+                RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
            }
        }.start();
    }
@@ -273,12 +276,12 @@ public class VersionChecker
        return ret;
    }

-    private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
+    private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
    private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);

    public static CheckResult getResult(IModInfo mod)
    {
-        return results.getOrDefault(mod, PENDING_CHECK);
+        return RESULTS.getOrDefault(mod, PENDING_CHECK);
    }

 }
@@ -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,35 @@ 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()
-                .filter(modFiles -> modFiles.size() > 1)
-                .map(modFiles -> modFiles.get(0))
-                .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);
+        final List<String> dupedLibErrors = versionedLibIds.values().stream()
+                .filter(modFiles -> modFiles.size() > 1)
+                .map(mods -> String.format("\tLibrary: '%s' from files: %s",
+                        getModId(mods.get(0)),
+                        mods.stream()
+                                .map(modFile -> modFile.getFileName()).collect(joining(", "))
+                )).toList();
+
+        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);
@@ -42,13 +42,21 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
                      !path.startsWith("META-INF/"));
            }, mcextra
        );
+
+        // Todo in 1.20.2: Change the default filter to null instead of always true.
        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());
@@ -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)
 2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
+1. Run the following command: `./gradlew genEclipseRuns`
   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.x/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/')
        }
    }
 }
@@ -119,53 +118,83 @@ repositories {
    // Put repositories for dependencies here
    // ForgeGradle automatically adds the Forge maven and Maven Central for you

-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
+    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
    // flatDir {
    //     dir 'libs'
    // }
 }

 dependencies {
-    // 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
-    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
+    // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
+    // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
+    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")

-    // 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'
+// }
+
+// Example configuration to allow publishing using the maven-publish plugin
 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());
+    }
+}
@@ -16,6 +16,7 @@ import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 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.javafmlmod.FMLJavaModLoadingContext;
@@ -42,9 +43,9 @@ public class ExampleMod
    // 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 ExampleMod()
+    public ExampleMod(FMLJavaModLoadingContext context)
    {
-        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        IEventBus modEventBus = context.getModEventBus();

        // Register the commonSetup method for modloading
        modEventBus.addListener(this::commonSetup);
@@ -59,13 +60,22 @@ public class ExampleMod

        // Register the item to a creative tab
        modEventBus.addListener(this::addCreative);
+
+        // 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()));
    }

    private void addCreative(CreativeModeTabEvent.BuildContents event)
@@ -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
+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,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_));
       }
@@ -12,6 +12,15 @@
    private static final Set<String> f_90811_ = Sets.newHashSet();
    public static final String f_167805_ = "key.categories.movement";
    public static final String f_167806_ = "key.categories.misc";
+@@ -41,7 +_,7 @@
+    private int f_90818_;
+ 
+    public static void m_90835_(InputConstants.Key p_90836_) {
+-      KeyMapping keymapping = f_90810_.get(p_90836_);
+      for (KeyMapping keymapping : f_90810_.getAll(p_90836_))
+       if (keymapping != null) {
+          ++keymapping.f_90818_;
+       }
@@ -49,7 +_,7 @@
    }
 
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/gui/screens/ConnectScreen.java
+++ b/net/minecraft/client/gui/screens/ConnectScreen.java
+@@ -72,6 +_,8 @@
+                }
+ 
+                if (!optional.isPresent()) {
+                  ConnectScreen.f_95683_.error("Couldn't connect to server: Unknown host \"{}\"", p_249536_.m_171863_());
+                  net.minecraftforge.network.DualStackUtils.logInitialPreferences();
+                   p_251955_.execute(() -> {
+                      p_251955_.m_91152_(new DisconnectedScreen(ConnectScreen.this.f_95686_, CommonComponents.f_130661_, ConnectScreen.f_169260_));
+                   });
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/screens/PauseScreen.java
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
+@@ -83,6 +_,7 @@
+       } else {
+          gridlayout$rowhelper.m_264139_(this.m_262456_(f_262254_, SocialInteractionsScreen::new));
+       }
+      gridlayout$rowhelper.m_264108_(Button.m_253074_(Component.m_237115_("fml.menu.mods"), button -> this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this))).m_252780_(f_262268_).m_253136_(), 2);
+ 
+       Component component = this.f_96541_.m_91090_() ? f_262217_ : f_262246_;
+       this.f_252482_ = gridlayout$rowhelper.m_264108_(Button.m_253074_(component, (p_275864_) -> {
@@ -34,7 +34,7 @@
                this.f_97334_.m_104401_(advancementtab.m_97182_(), true);
                break;
             }
-@@ -98,6 +_,11 @@
+@@ -98,9 +_,15 @@
       int i = (this.f_96543_ - 252) / 2;
       int j = (this.f_96544_ - 140) / 2;
       this.m_7333_(p_97361_);
@@ -46,6 +46,10 @@
       this.m_97373_(p_97361_, p_97362_, p_97363_, i, j);
       this.m_97356_(p_97361_, i, j);
       this.m_97381_(p_97361_, p_97362_, p_97363_, i, j);
+      super.m_86412_(p_97361_, p_97362_, p_97363_, p_97364_);
+    }
+ 
+    public boolean m_7979_(double p_97347_, double p_97348_, int p_97349_, double p_97350_, double p_97351_) {
@@ -138,10 +_,12 @@
          RenderSystem.m_157456_(0, f_97330_);
 
@@ -1,5 +1,14 @@
 --- a/net/minecraft/client/particle/TerrainParticle.java
 +++ b/net/minecraft/client/particle/TerrainParticle.java
+@@ -28,7 +_,7 @@
+       this.f_107227_ = 0.6F;
+       this.f_107228_ = 0.6F;
+       this.f_107229_ = 0.6F;
+-      if (!p_172458_.m_60713_(Blocks.f_50440_)) {
+      if (net.minecraftforge.client.extensions.common.IClientBlockExtensions.of(p_172458_).areBreakingParticlesTinted(p_172458_, p_172451_, p_172459_)) {
+          int i = Minecraft.m_91087_().m_91298_().m_92577_(p_172458_, p_172451_, p_172459_, 0);
+          this.f_107227_ *= (float)(i >> 16 & 255) / 255.0F;
+          this.f_107228_ *= (float)(i >> 8 & 255) / 255.0F;
@@ -69,7 +_,13 @@
    public static class Provider implements ParticleProvider<BlockParticleOption> {
       public Particle m_6966_(BlockParticleOption p_108304_, ClientLevel p_108305_, double p_108306_, double p_108307_, double p_108308_, double p_108309_, double p_108310_, double p_108311_) {
@@ -52,16 +52,23 @@
    public static RenderType m_109279_(ItemStack p_109280_, boolean p_109281_) {
       Item item = p_109280_.m_41720_();
       if (item instanceof BlockItem) {
-@@ -362,8 +_,73 @@
+@@ -362,11 +_,79 @@
    }
 
    public static RenderType m_109287_(FluidState p_109288_) {
 -      RenderType rendertype = f_109276_.get(p_109288_.m_76152_());
 +      RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.m_76152_()));
       return rendertype != null ? rendertype : RenderType.m_110451_();
+    }
+ 
+    public static void m_109291_(boolean p_109292_) {
+       f_109277_ = p_109292_;
 +   }
 +
-+   // FORGE START
+   /** Forge: Check if we are running in {@linkplain net.minecraft.client.Minecraft#useFancyGraphics() fancy graphics} to account for fast graphics render types */
+   public static boolean isFancy() {
+      return f_109277_;
+   }
 +
 +   private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110457_());
 +   private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110451_());
@@ -79,7 +86,7 @@
 +   });
 +
 +   /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
-+   @Deprecated(forRemoval = true, since = "1.19")
+   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
 +      Block block = state.m_60734_();
 +      if (block instanceof LeavesBlock) {
@@ -90,20 +97,20 @@
 +   }
 +
 +   /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+   @Deprecated(forRemoval = true, since = "1.19")
+   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static void setRenderLayer(Block block, RenderType type) {
 +      com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
 +      setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
 +   }
 +
 +   /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+   @Deprecated(forRemoval = true, since = "1.19")
+   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
 +      setRenderLayer(block, createSetFromPredicate(predicate));
 +   }
 +
 +   /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+   @Deprecated(forRemoval = true, since = "1.19")
+   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
 +      checkClientLoading();
 +      BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
@@ -125,5 +132,4 @@
 +   private static net.minecraftforge.client.ChunkRenderTypeSet createSetFromPredicate(java.util.function.Predicate<RenderType> predicate) {
 +      return net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110506_().stream().filter(predicate).toArray(RenderType[]::new));
    }
- 
-    public static void m_109291_(boolean p_109292_) {
+ }
@@ -1,13 +1,15 @@
 --- a/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
 +++ b/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
-@@ -34,7 +_,9 @@
+@@ -34,7 +_,11 @@
             p_114637_.m_85836_();
             BlockPos blockpos = BlockPos.m_274561_(p_114634_.m_20185_(), p_114634_.m_20191_().f_82292_, p_114634_.m_20189_());
             p_114637_.m_85837_(-0.5D, 0.0D, -0.5D);
 -            this.f_234617_.m_110937_().m_234379_(level, this.f_234617_.m_110910_(blockstate), blockstate, blockpos, p_114637_, p_114638_.m_6299_(ItemBlockRenderTypes.m_109293_(blockstate)), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_);
 +            var model = this.f_234617_.m_110910_(blockstate);
-+            for (var renderType : model.getRenderTypes(blockstate, RandomSource.m_216335_(blockstate.m_60726_(p_114634_.m_31978_())), net.minecraftforge.client.model.data.ModelData.EMPTY))
+            for (var renderType : model.getRenderTypes(blockstate, RandomSource.m_216335_(blockstate.m_60726_(p_114634_.m_31978_())), net.minecraftforge.client.model.data.ModelData.EMPTY)) {
+               renderType = net.minecraftforge.client.RenderTypeHelper.getMovingBlockRenderType(renderType);
 +               this.f_234617_.m_110937_().tesselateBlock(level, model, blockstate, blockpos, p_114637_, p_114638_.m_6299_(renderType), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_, net.minecraftforge.client.model.data.ModelData.EMPTY, renderType);
+            }
             p_114637_.m_85849_();
             super.m_7392_(p_114634_, p_114635_, p_114636_, p_114637_, p_114638_, p_114639_);
          }
@@ -5,7 +5,7 @@
       int k1 = Mth.m_14173_(j1);
       int l1;
 -      if (k1 < p_261919_) {
-+      if (false) { // Forge: Do not lower the mipmap level
+      if (k1 < p_261919_ && net.minecraftforge.common.ForgeConfig.CLIENT.allowMipmapLowering()) { // Forge: Do not lower the mipmap level
          f_244357_.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.f_244500_, p_261919_, k1, j1);
          l1 = k1;
       } else {
@@ -1,39 +1,81 @@
 --- a/net/minecraft/client/resources/model/SimpleBakedModel.java
 +++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
-@@ -26,8 +_,17 @@
+@@ -26,8 +_,44 @@
    protected final TextureAtlasSprite f_119485_;
    protected final ItemTransforms f_119486_;
    protected final ItemOverrides f_119487_;
+   /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +   protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
+   /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
+   protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypesFast;
+   /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +   protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
+   /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
+   protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypesFast;
+   /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FABULOUS fabulous graphics} */
 +   protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
+   /** Forge: If this model's {@linkplain #blockRenderTypes block render types} are rendering cutout, to account for older leaves model JSONs */
+   protected final boolean isRenderingCutout;
 
-+   /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
+   /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
 +   @Deprecated
    public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) {
 +      this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY);
 +   }
 +
+   /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup for fast graphics} **/
+   @Deprecated(forRemoval = true, since = "1.21.4")
 +   public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
+      this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
+   }
+
+   /** Constructor with {@link net.minecraftforge.client.RenderTypeGroup RenderTypeGroup} for fancy and fast graphics. Preferred over {@link net.minecraft.client.renderer.ItemBlockRenderTypes#setRenderLayer(net.minecraft.world.level.block.Block, net.minecraft.client.renderer.RenderType) ItemBlockRenderTypes.setRenderLayer(Block, RenderType)}. */
+   public SimpleBakedModel(
+      List<BakedQuad> p_119489_,
+      Map<Direction, List<BakedQuad>> p_119490_,
+      boolean p_119491_,
+      boolean p_119492_,
+      boolean p_119493_,
+      TextureAtlasSprite p_119494_,
+      ItemTransforms p_119495_,
+      ItemOverrides p_119496_,
+      net.minecraftforge.client.RenderTypeGroup renderTypes,
+      net.minecraftforge.client.RenderTypeGroup renderTypesFast
+   ) {
       this.f_119480_ = p_119489_;
       this.f_119481_ = p_119490_;
       this.f_119482_ = p_119491_;
-@@ -36,6 +_,9 @@
+@@ -36,6 +_,15 @@
       this.f_119485_ = p_119494_;
       this.f_119486_ = p_119495_;
       this.f_119487_ = p_119496_;
-+      this.blockRenderTypes = !renderTypes.isEmpty() ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
-+      this.itemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entity()) : null;
-+      this.fabulousItemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entityFabulous()) : null;
+
+      boolean hasRenderTypes = renderTypes != null && !renderTypes.isEmpty();
+      boolean hasRenderTypesFast = renderTypesFast != null && !renderTypesFast.isEmpty();
+      this.blockRenderTypes = hasRenderTypes ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
+      this.blockRenderTypesFast = hasRenderTypesFast ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypesFast.block()) : null;
+      this.itemRenderTypes = hasRenderTypes ? List.of(renderTypes.entity()) : null;
+      this.itemRenderTypesFast = hasRenderTypesFast ? List.of(renderTypesFast.entity()) : null;
+      this.fabulousItemRenderTypes = hasRenderTypes ? List.of(renderTypes.entityFabulous()) : null;
+      this.isRenderingCutout = hasRenderTypes && (renderTypes.block() == net.minecraft.client.renderer.RenderType.m_110463_() || renderTypes.block() == net.minecraft.client.renderer.RenderType.m_110457_());
    }
 
    public List<BakedQuad> m_213637_(@Nullable BlockState p_235054_, @Nullable Direction p_235055_, RandomSource p_235056_) {
-@@ -70,6 +_,25 @@
+@@ -70,6 +_,40 @@
       return this.f_119487_;
    }
 
+   private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID_BLOCK = net.minecraftforge.client.ChunkRenderTypeSet.of(net.minecraft.client.renderer.RenderType.m_110451_());
+   private static final List<net.minecraft.client.renderer.RenderType> SOLID_BLOCK_ITEM = List.of(net.minecraft.client.renderer.RenderType.m_110451_());
+
 +   @Override
 +   public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(@org.jetbrains.annotations.NotNull BlockState state, @org.jetbrains.annotations.NotNull RandomSource rand, @org.jetbrains.annotations.NotNull net.minecraftforge.client.model.data.ModelData data) {
+      if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
+         if (blockRenderTypesFast != null)
+            return blockRenderTypesFast;
+         if (isRenderingCutout && state.m_60734_() instanceof net.minecraft.world.level.block.LeavesBlock)
+            return SOLID_BLOCK;
+      }
 +      if (blockRenderTypes != null)
 +         return blockRenderTypes;
 +      return BakedModel.super.getRenderTypes(state, rand, data);
@@ -42,11 +84,17 @@
 +   @Override
 +   public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
 +      if (!fabulous) {
+         if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
+            if (itemRenderTypesFast != null)
+               return itemRenderTypesFast;
+            if (isRenderingCutout && itemStack.m_41720_() instanceof net.minecraft.world.item.BlockItem blockItem && blockItem.m_40614_() instanceof net.minecraft.world.level.block.LeavesBlock)
+               return SOLID_BLOCK_ITEM;
+         }
 +         if (itemRenderTypes != null)
-+             return itemRenderTypes;
+            return itemRenderTypes;
 +      } else {
 +         if (fabulousItemRenderTypes != null)
-+             return fabulousItemRenderTypes;
+            return fabulousItemRenderTypes;
 +      }
 +      return BakedModel.super.getRenderTypes(itemStack, fabulous);
 +   }
@@ -54,22 +102,50 @@
    @OnlyIn(Dist.CLIENT)
    public static class Builder {
       private final List<BakedQuad> f_119508_ = Lists.newArrayList();
-@@ -116,11 +_,17 @@
+@@ -116,11 +_,45 @@
          return this;
       }
 
 +      /** @deprecated Forge: Use {@linkplain #build(net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
 +      @Deprecated
       public BakedModel m_119533_() {
-+         return build(net.minecraftforge.client.RenderTypeGroup.EMPTY);
+         return build(net.minecraftforge.client.RenderTypeGroup.EMPTY, net.minecraftforge.client.RenderTypeGroup.EMPTY);
 +      }
 +
+      /**
+       * Builds with the render type to be used for this model, which will be used for any graphics setting.
+       * <p>
+       * If you need to set a specific render type for
+       * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}, consider using
+       * {@link #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
+       * renderTypes(RenderTypeGroup, RenderTypeGroup)} instead which allows choosing render types for both fancy and
+       * fast graphics.
+       *
+       * @apiNote If this model is for {@linkplain net.minecraft.world.level.block.LeavesBlock leaves} and if the
+       * given render type is either {@linkplain net.minecraft.client.renderer.RenderType#cutout() cutout} or
+       * {@linkplain net.minecraft.client.renderer.RenderType#cutoutMipped() cutout mipped}, it will be overridden
+       * with {@linkplain net.minecraft.client.renderer.RenderType#solid() solid} when fast graphics is enabled.
+       * @see #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
+       * renderTypes(RenderTypeGroup, RenderTypeGroup)
+       */
 +      public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes) {
+         return this.build(renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
+      }
+
+      /**
+       * Builds with the render types to be used for this model: one for
+       * {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} and one for
+       * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
+       *
+       * @see #build(net.minecraftforge.client.RenderTypeGroup)
+       */
+      public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes, net.minecraftforge.client.RenderTypeGroup renderTypesFast) {
          if (this.f_119512_ == null) {
             throw new RuntimeException("Missing particle!");
          } else {
 -            return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_);
-+            return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_, renderTypes);
+            // Forge: Account for render types in model JSONs
+            return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_, renderTypes, renderTypesFast);
          }
       }
    }
@@ -9,21 +9,13 @@
          this.f_120088_.setSoTimeout(5000);
          this.f_120088_.joinGroup(this.f_120087_);
       }
-@@ -87,7 +_,19 @@
+@@ -87,7 +_,11 @@
          String s = LanServerPinger.m_120111_(p_120097_);
          String s1 = LanServerPinger.m_120116_(p_120097_);
          if (s1 != null) {
 -            s1 = p_120098_.getHostAddress() + ":" + s1;
 +            if (net.minecraftforge.network.DualStackUtils.checkIPv6(p_120098_)) {
-+               final String ip;
-+
-+               // compress to short form if enabled in config
-+               if (net.minecraftforge.common.ForgeConfig.CLIENT.compressLanIPv6Addresses.get())
-+                  ip = com.google.common.net.InetAddresses.toAddrString(p_120098_);
-+               else
-+                  ip = p_120098_.getHostAddress();
-+
-+               s1 = "[" + ip + "]:" + s1;
+               s1 = "[" + com.google.common.net.InetAddresses.toAddrString(p_120098_) + "]:" + s1;
 +            } else {
 +               s1 = p_120098_.getHostAddress() + ":" + s1;
 +            }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/server/LanServerPinger.java
 +++ b/net/minecraft/client/server/LanServerPinger.java
-@@ -16,7 +_,7 @@
+@@ -13,7 +_,7 @@
 public class LanServerPinger extends Thread {
    private static final AtomicInteger f_120101_ = new AtomicInteger(0);
    private static final Logger f_120102_ = LogUtils.getLogger();
@@ -9,7 +9,7 @@
    public static final int f_174975_ = 4445;
    private static final long f_174976_ = 1500L;
    private final String f_120103_;
-@@ -39,7 +_,7 @@
+@@ -36,7 +_,7 @@
 
       while(!this.isInterrupted() && this.f_120105_) {
          try {
@@ -1,5 +1,29 @@
 --- a/net/minecraft/resources/ResourceLocation.java
 +++ b/net/minecraft/resources/ResourceLocation.java
+@@ -34,6 +_,8 @@
+       this.f_135805_ = p_249394_;
+    }
+ 
+   /** @deprecated Forge: Consider using {@link #fromNamespaceAndPath(String, String)} instead, as Mojang made this constructor private in 1.21 */
+   @Deprecated(forRemoval = true, since = "1.20.6")
+    public ResourceLocation(String p_135811_, String p_135812_) {
+       this(m_245413_(p_135811_, p_135812_), m_245185_(p_135811_, p_135812_), (ResourceLocation.Dummy)null);
+    }
+@@ -42,10 +_,14 @@
+       this(p_135814_[0], p_135814_[1]);
+    }
+ 
+   /** @deprecated Forge: Consider using {@link #parse(String)} instead, as Mojang made this constructor private in 1.21 */
+   @Deprecated(forRemoval = true, since = "1.20.6")
+    public ResourceLocation(String p_135809_) {
+       this(m_135832_(p_135809_, ':'));
+    }
+ 
+   /** @deprecated Forge: Consider using {@link #bySeparator(String, char)} instead, as Mojang removed this method in 1.21 */
+   @Deprecated(forRemoval = true, since = "1.20.6")
+    public static ResourceLocation m_135822_(String p_135823_, char p_135824_) {
+       return new ResourceLocation(m_135832_(p_135823_, p_135824_));
+    }
@@ -143,6 +_,12 @@
       return i;
    }
@@ -13,3 +37,55 @@
    public String m_179910_() {
       return this.toString().replace('/', '_').replace(':', '_');
    }
+@@ -243,6 +_,51 @@
+ 
+       public JsonElement serialize(ResourceLocation p_135855_, Type p_135856_, JsonSerializationContext p_135857_) {
+          return new JsonPrimitive(p_135855_.toString());
+      }
+   }
+
+   /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String, String)}. */
+   public static ResourceLocation fromNamespaceAndPath(String namespace, String path) {
+      return new ResourceLocation(namespace, path);
+   }
+
+   /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String)}. */
+   public static ResourceLocation parse(String location) {
+      return new ResourceLocation(location);
+   }
+
+   /**
+    * Forge: This is a backported method from 1.21, and acts as an alternative to using {@link #parse(String)}. If you
+    * know for sure you are going to be using the {@linkplain #DEFAULT_NAMESPACE default namespace}
+    * ({@code "minecraft"}), use this.
+    */
+   public static ResourceLocation withDefaultNamespace(String path) {
+      return new ResourceLocation(f_179908_, m_245185_(f_179908_, path), null);
+   }
+
+   /** Forge: This is a backported method from 1.21, and is the replacement for {@link #of(String, char)}. */
+   public static ResourceLocation bySeparator(String location, char separator) {
+      return m_135822_(location, separator);
+   }
+
+   /**
+    * Forge: This is a backported method from 1.21, and is the same as {@link #bySeparator(String, char)} but returns
+    * {@code null} if a resource location cannot be created.
+    */
+   public static @Nullable ResourceLocation tryBySeparator(String location, char separator) {
+      int i = location.indexOf(separator);
+      if (i >= 0) {
+         String s = location.substring(i + 1);
+         if (!m_135841_(s)) {
+            return null;
+         } else if (i != 0) {
+            String s1 = location.substring(0, i);
+            return m_135843_(s1) ? new ResourceLocation(s1, s, null) : null;
+         } else {
+            return new ResourceLocation(f_179908_, s, null);
+         }
+      } else {
+         return m_135841_(location) ? new ResourceLocation(f_179908_, location, null) : null;
+       }
+    }
+ }
@@ -1,10 +1,15 @@
 --- a/net/minecraft/server/Bootstrap.java
 +++ b/net/minecraft/server/Bootstrap.java
-@@ -47,6 +_,8 @@
+@@ -47,6 +_,13 @@
                DispenseItemBehavior.m_123402_();
                CauldronInteraction.m_175649_();
                BuiltInRegistries.m_257498_();
 +               net.minecraftforge.registries.GameData.vanillaSnapshot();
+               // Forge: Hacky fix to ensure that NetworkConstants is loaded before mods are constructed.
+               // Many older mods use network internals that shouldn't be used, yet are exposed so they get used anyways.
+               // This can cause class-loading issues with ForgeMod loading NetworkConstants and HandshakeResolver.
+               // To ensure that doesn't happen, we load it here and now. This is not an issue in 1.20.2 and newer.
+               net.minecraftforge.network.NetworkHooks.init();
 +               if (false) // skip redirectOutputToLog, Forge already redirects stdout and stderr output to log so that they print with more context
                m_135890_();
             }
@@ -1,5 +1,14 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -68,6 +_,8 @@
+    private MinecraftServerGui f_139605_;
+    @Nullable
+    private final TextFilterClient f_139606_;
+   @Nullable
+   private net.minecraft.client.server.LanServerPinger dediLanPinger;
+ 
+    public DedicatedServer(Thread p_214789_, LevelStorageSource.LevelStorageAccess p_214790_, PackRepository p_214791_, WorldStem p_214792_, DedicatedServerSettings p_214793_, DataFixer p_214794_, Services p_214795_, ChunkProgressListenerFactory p_214796_) {
+       super(p_214789_, p_214790_, p_214791_, p_214792_, Proxy.NO_PROXY, p_214794_, p_214795_, p_214796_);
@@ -79,6 +_,7 @@
    public boolean m_7038_() throws IOException {
       Thread thread = new Thread("Server console handler") {
@@ -22,7 +31,7 @@
          if (dedicatedserverproperties.f_139744_ != null) {
             this.m_129900_().m_46170_(GameRules.f_46153_).m_46246_(dedicatedserverproperties.f_139744_, this);
          }
-@@ -183,12 +_,13 @@
+@@ -183,12 +_,18 @@
             thread1.start();
          }
 
@@ -33,7 +42,34 @@
          }
 
 -         return true;
+         if (net.minecraftforge.common.ForgeConfig.SERVER.advertiseDedicatedServerToLan.get()) {
+            this.dediLanPinger = new net.minecraft.client.server.LanServerPinger(this.m_129916_(), String.valueOf(this.m_7448_()));
+            this.dediLanPinger.start();
+         }
+
 +         return net.minecraftforge.server.ServerLifecycleHooks.handleServerStarting(this);
       }
    }
 
+@@ -263,6 +_,10 @@
+          this.f_139601_.m_7530_();
+       }
+ 
+      if (this.dediLanPinger != null) {
+         this.dediLanPinger.interrupt();
+         this.dediLanPinger = null;
+      }
+    }
+ 
+    public void m_5703_(BooleanSupplier p_139661_) {
+@@ -492,6 +_,10 @@
+ 
+    public void m_7041_() {
+       super.m_7041_();
+      if (this.dediLanPinger != null) {
+         this.dediLanPinger.interrupt();
+         this.dediLanPinger = null;
+      }
+       Util.m_137580_();
+       SkullBlockEntity.m_196704_();
+    }
@@ -84,6 +84,14 @@
       }
 
    }
+@@ -659,6 +_,7 @@
+          return BuiltInRegistries.f_256780_.m_7981_(p_8648_.m_6095_()).toString();
+       });
+       profilerfiller.m_6174_("tickNonPassenger");
+      if (p_8648_.canUpdate())
+       p_8648_.m_8119_();
+       this.m_46473_().m_7238_();
+ 
@@ -678,6 +_,7 @@
                return BuiltInRegistries.f_256780_.m_7981_(p_8664_.m_6095_()).toString();
             });
@@ -15,6 +15,16 @@
          this.m_10055_();
       } else if (this.f_10019_ == ServerLoginPacketListenerImpl.State.DELAY_ACCEPT) {
          ServerPlayer serverplayer = this.f_10018_.m_6846_().m_11259_(this.f_10021_.getId());
+@@ -138,7 +_,8 @@
+    }
+ 
+    public String m_10056_() {
+-      return this.f_10021_ != null ? this.f_10021_ + " (" + this.f_10013_.m_129523_() + ")" : String.valueOf((Object)this.f_10013_.m_129523_());
+      final String addressString = net.minecraftforge.network.DualStackUtils.getAddressString(this.f_10013_.m_129523_());
+      return this.f_10021_ != null ? this.f_10021_ + " (" + addressString + ")" : addressString;
+    }
+ 
+    public void m_5990_(ServerboundHelloPacket p_10047_) {
@@ -147,14 +_,14 @@
       GameProfile gameprofile = this.f_10018_.m_236731_();
       if (gameprofile != null && p_10047_.f_238040_().equalsIgnoreCase(gameprofile.getName())) {
@@ -5,7 +5,7 @@
 
    public PackRepository(RepositorySource... p_251886_) {
 -      this.f_10497_ = ImmutableSet.copyOf(p_251886_);
-+      this.f_10497_ = new java.util.HashSet<>(List.of(p_251886_)); //Forge: This needs to be a mutable set, so that we can add to it later on.
+      this.f_10497_ = new java.util.LinkedHashSet<>(List.of(p_251886_)); //Forge: This needs to be a mutable set, so that we can add to it later on.
    }
 
    public void m_10506_() {
@@ -8,7 +8,15 @@
 
    public PlayerList(MinecraftServer p_203842_, LayeredRegistryAccess<RegistryLayer> p_251844_, PlayerDataStorage p_203844_, int p_203845_) {
       this.f_11195_ = p_203842_;
-@@ -168,6 +_,7 @@
+@@ -161,13 +_,14 @@
+       p_11263_.m_143425_(serverlevel1);
+       String s1 = "local";
+       if (p_11262_.m_129523_() != null) {
+-         s1 = p_11262_.m_129523_().toString();
+         s1 = net.minecraftforge.network.DualStackUtils.getAddressString(p_11262_.m_129523_());
+       }
+ 
+       f_11188_.info("{}[{}] logged in with entity id {} at ({}, {}, {})", p_11263_.m_7755_().getString(), s1, p_11263_.m_19879_(), p_11263_.m_20185_(), p_11263_.m_20186_(), p_11263_.m_20189_());
       LevelData leveldata = serverlevel1.m_6106_();
       p_11263_.m_143427_(compoundtag);
       ServerGamePacketListenerImpl servergamepacketlistenerimpl = new ServerGamePacketListenerImpl(this.f_11195_, p_11262_, p_11263_);
@@ -160,7 +160,7 @@
          this.m_5496_(soundtype.m_56776_(), soundtype.m_56773_() * 0.15F, soundtype.m_56774_());
       }
    }
-@@ -1074,19 +_,22 @@
+@@ -1074,31 +_,38 @@
 
    public void m_5844_() {
       if (this.m_6069_()) {
@@ -188,6 +188,24 @@
    }
 
    void m_20074_() {
+       Entity entity = this.m_20202_();
+      java.util.function.BooleanSupplier updateFluidHeight = () -> this.m_204031_(FluidTags.f_13131_, 0.014D);
+       if (entity instanceof Boat boat) {
+          if (!boat.m_5842_()) {
+             this.f_19798_ = false;
+-            return;
+            updateFluidHeight = () -> {
+               this.updateFluidHeightAndDoFluidPushing(state -> this.shouldUpdateFluidWhileBoating(state, boat));
+               return false;
+            };
+          }
+       }
+ 
+-      if (this.m_204031_(FluidTags.f_13131_, 0.014D)) {
+      if (updateFluidHeight.getAsBoolean()) {
+          if (!this.f_19798_ && !this.f_19803_) {
+             this.m_5841_();
+          }
@@ -1115,6 +_,7 @@
    private void m_20323_() {
       this.f_19800_ = this.m_204029_(FluidTags.f_13131_);
@@ -414,19 +432,24 @@
          });
       }
 
-@@ -2861,9 +_,17 @@
+@@ -2861,9 +_,22 @@
       this.f_19859_ = this.m_146908_();
    }
 
-+   @Deprecated // Forge: Use no parameter version instead, only for vanilla Tags
+   @Deprecated // Forge: Use predicate version instead, only for vanilla Tags
    public boolean m_204031_(TagKey<Fluid> p_204032_, double p_204033_) {
-+      this.updateFluidHeightAndDoFluidPushing();
+      this.updateFluidHeightAndDoFluidPushing(com.google.common.base.Predicates.alwaysTrue());
 +      if(p_204032_ == FluidTags.f_13131_) return this.isInFluidType(net.minecraftforge.common.ForgeMod.WATER_TYPE.get());
 +      else if (p_204032_ == FluidTags.f_13132_) return this.isInFluidType(net.minecraftforge.common.ForgeMod.LAVA_TYPE.get());
 +      else return false;
 +   }
 +
+   @Deprecated(forRemoval = true, since = "1.19.4")
 +   public void updateFluidHeightAndDoFluidPushing() {
+      this.updateFluidHeightAndDoFluidPushing(com.google.common.base.Predicates.alwaysTrue());
+   }
+
+   public void updateFluidHeightAndDoFluidPushing(Predicate<FluidState> shouldUpdate) {
       if (this.m_146899_()) {
 -         return false;
 +         return;
@@ -446,7 +469,7 @@
                   FluidState fluidstate = this.f_19853_.m_6425_(blockpos$mutableblockpos);
 -                  if (fluidstate.m_205070_(p_204032_)) {
 +                  net.minecraftforge.fluids.FluidType fluidType = fluidstate.getFluidType();
-+                  if (!fluidType.isAir()) {
+                  if (!fluidType.isAir() && shouldUpdate.test(fluidstate)) {
                      double d1 = (double)((float)i2 + fluidstate.m_76155_(this.f_19853_, blockpos$mutableblockpos));
                      if (d1 >= aabb.f_82289_) {
                         flag1 = true;
@@ -564,7 +564,7 @@
       ItemStack itemstack = this.m_21120_(p_21159_);
       if (!itemstack.m_41619_() && !this.m_6117_()) {
 +         int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.m_41779_());
-+         if (duration <= 0) return;
+         if (duration < net.minecraftforge.common.ForgeConfig.SERVER.getUseItemDuration()) return;
          this.f_20935_ = itemstack;
 -         this.f_20936_ = itemstack.m_41779_();
 +         this.f_20936_ = duration;
@@ -721,7 +721,7 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
-+      if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_()) {
 +         if (facing == null) return handlers[2].cast();
 +         else if (facing.m_122434_().m_122478_()) return handlers[0].cast();
 +         else if (facing.m_122434_().m_122479_()) return handlers[1].cast();
@@ -38,7 +38,7 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
-+      if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && itemHandler != null)
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && itemHandler != null && this.m_6084_())
 +         return itemHandler.cast();
 +      return super.getCapability(capability, facing);
 +   }
@@ -0,0 +1,21 @@
+--- a/net/minecraft/world/entity/npc/VillagerTrades.java
+++ b/net/minecraft/world/entity/npc/VillagerTrades.java
+@@ -152,6 +_,7 @@
+       private final int f_35667_;
+ 
+       public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
+         if (false) // FORGE: Modders can add custom villager types, so remove this validation
+          BuiltInRegistries.f_256934_.m_123024_().filter((p_35680_) -> {
+             return !p_35672_.containsKey(p_35680_);
+          }).findAny().ifPresent((p_258962_) -> {
+@@ -166,7 +_,9 @@
+       @Nullable
+       public MerchantOffer m_213663_(Entity p_219685_, RandomSource p_219686_) {
+          if (p_219685_ instanceof VillagerDataHolder) {
+-            ItemStack itemstack = new ItemStack(this.f_35664_.get(((VillagerDataHolder)p_219685_).m_7141_().m_35560_()), this.f_35665_);
+            Item item = this.f_35664_.get(((VillagerDataHolder)p_219685_).m_7141_().m_35560_());
+            if (item == null) return null; // FORGE: Account for modded villager types by returning null if there is no trade
+            ItemStack itemstack = new ItemStack(item, this.f_35665_);
+             return new MerchantOffer(itemstack, new ItemStack(Items.f_42616_), this.f_35666_, this.f_35667_, 0.05F);
+          } else {
+             return null;
@@ -0,0 +1,12 @@
+--- a/net/minecraft/world/entity/npc/VillagerType.java
+++ b/net/minecraft/world/entity/npc/VillagerType.java
+@@ -67,4 +_,9 @@
+    public static VillagerType m_204073_(Holder<Biome> p_204074_) {
+       return p_204074_.m_203543_().map(f_35827_::get).orElse(f_35821_);
+    }
+
+   /** FORGE: Registers the VillagerType that will spawn in the given biome. This method should be called during FMLCommonSetupEvent using event.enqueueWork() */
+   public static void registerBiomeType(ResourceKey<Biome> biomeKey, VillagerType villagerType) {
+      f_35827_.put(biomeKey, villagerType);
+   }
+ }
@@ -135,15 +135,23 @@
          if (!this.f_19853_.f_46443_) {
             this.m_36246_(Stats.f_12982_.m_12902_(this.f_20935_.m_41720_()));
          }
-@@ -864,6 +_,8 @@
+@@ -862,10 +_,15 @@
+          if (p_36383_ >= 3.0F) {
+             int i = 1 + Mth.m_14143_(p_36383_);
             InteractionHand interactionhand = this.m_7655_();
+            // FORGE: cache this.useItem -- if this.stopUsingItem() is called, it will be set to ItemStack.EMPTY
+            ItemStack currentItem = this.f_20935_;
             this.f_20935_.m_41622_(i, this, (p_219739_) -> {
                p_219739_.m_21190_(interactionhand);
 +               net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.f_20935_, interactionhand);
-+               m_5810_(); // Forge: fix MC-168573
+               if (this.f_20935_ == currentItem) m_5810_(); // Forge: fix MC-168573
             });
-             if (this.f_20935_.m_41619_()) {
+-            if (this.f_20935_.m_41619_()) {
+            // FORGE: use cached item since this.useItem could be ItemStack.EMPTY
+            if (currentItem.m_41619_()) {
                if (interactionhand == InteractionHand.MAIN_HAND) {
+                   this.m_8061_(EquipmentSlot.MAINHAND, ItemStack.f_41583_);
+                } else {
@@ -882,10 +_,13 @@
 
    protected void m_6475_(DamageSource p_36312_, float p_36313_) {
@@ -445,7 +453,7 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
-+      if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_()) {
 +         if (facing == null) return playerJoinedHandler.cast();
 +         else if (facing.m_122434_().m_122478_()) return playerMainHandler.cast();
 +         else if (facing.m_122434_().m_122479_()) return playerEquipmentHandler.cast();
@@ -19,7 +19,7 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
-+      if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER)
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_())
 +         return itemHandler.cast();
 +      return super.getCapability(capability, facing);
 +   }
@@ -63,20 +63,3 @@
    }
 
    protected int m_213801_() {
-@@ -858,6 +_,16 @@
- 
-    public boolean m_5842_() {
-       return this.f_38279_ == Boat.Status.UNDER_WATER || this.f_38279_ == Boat.Status.UNDER_FLOWING_WATER;
-+   }
-+
-+   // Forge: Fix MC-119811 by instantly completing lerp on board
-+   @Override
-+   protected void m_20348_(Entity passenger) {
-+      super.m_20348_(passenger);
-+      if (this.m_6109_() && this.f_38267_ > 0) {
-+         this.f_38267_ = 0;
-+         this.m_19890_(this.f_38268_, this.f_38269_, this.f_38270_, (float)this.f_38271_, (float)this.f_38272_);
-+      }
-    }
- 
-    public ItemStack m_142340_() {
@@ -9,7 +9,7 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
-+      if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER)
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_())
 +         return itemHandler.cast();
 +      return super.getCapability(capability, facing);
 +   }
@@ -15,7 +15,7 @@
       ItemStack itemstack = p_40529_.m_43722_();
       Optional<BlockState> optional3 = Optional.empty();
       if (optional.isPresent()) {
-@@ -71,9 +_,20 @@
+@@ -71,9 +_,25 @@
       }
    }
 
@@ -34,5 +34,10 @@
 +   @Override
 +   public boolean canPerformAction(ItemStack stack, net.minecraftforge.common.ToolAction toolAction) {
 +      return net.minecraftforge.common.ToolActions.DEFAULT_AXE_ACTIONS.contains(toolAction);
+   }
+
+   @Override
+   public boolean canDisableShield(ItemStack stack, ItemStack shield, net.minecraft.world.entity.LivingEntity entity, net.minecraft.world.entity.LivingEntity attacker) {
+      return true;
    }
 }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
 +++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
-@@ -43,7 +_,7 @@
+@@ -43,11 +_,11 @@
       BlockPos blockpos = p_220982_.m_7494_();
       if (p_220981_.m_46859_(blockpos) && blockpos.m_123342_() < p_220981_.m_151558_()) {
          int i = p_220980_.m_61143_(f_51647_);
@@ -9,6 +9,20 @@
             boolean flag = false;
             boolean flag1 = false;
             BlockState blockstate = p_220981_.m_8055_(p_220982_.m_7495_());
+-            if (blockstate.m_60713_(Blocks.f_50259_)) {
+            if (blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+                flag = true;
+             } else if (blockstate.m_60713_(this.f_51648_)) {
+                int j = 1;
+@@ -55,7 +_,7 @@
+                for(int k = 0; k < 4; ++k) {
+                   BlockState blockstate1 = p_220981_.m_8055_(p_220982_.m_6625_(j + 1));
+                   if (!blockstate1.m_60713_(this.f_51648_)) {
+-                     if (blockstate1.m_60713_(Blocks.f_50259_)) {
+                     if (blockstate1.m_60713_(Blocks.f_50259_) || blockstate1.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+                         flag1 = true;
+                      }
+                      break;
@@ -99,7 +_,7 @@
             } else {
                this.m_51658_(p_220981_, p_220982_);
@@ -18,3 +32,12 @@
          }
       }
    }
+@@ -134,7 +_,7 @@
+ 
+    public boolean m_7898_(BlockState p_51683_, LevelReader p_51684_, BlockPos p_51685_) {
+       BlockState blockstate = p_51684_.m_8055_(p_51685_.m_7495_());
+-      if (!blockstate.m_60713_(this.f_51648_) && !blockstate.m_60713_(Blocks.f_50259_)) {
+      if (!blockstate.m_60713_(this.f_51648_) && !blockstate.m_60713_(Blocks.f_50259_) && !blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+          if (!blockstate.m_60795_()) {
+             return false;
+          } else {
@@ -0,0 +1,36 @@
+--- a/net/minecraft/world/level/block/ChorusPlantBlock.java
+++ b/net/minecraft/world/level/block/ChorusPlantBlock.java
+@@ -30,7 +_,7 @@
+       BlockState blockstate3 = p_51711_.m_8055_(p_51712_.m_122029_());
+       BlockState blockstate4 = p_51711_.m_8055_(p_51712_.m_122019_());
+       BlockState blockstate5 = p_51711_.m_8055_(p_51712_.m_122024_());
+-      return this.m_49966_().m_61124_(f_55153_, Boolean.valueOf(blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50491_) || blockstate.m_60713_(Blocks.f_50259_))).m_61124_(f_55152_, Boolean.valueOf(blockstate1.m_60713_(this) || blockstate1.m_60713_(Blocks.f_50491_))).m_61124_(f_55148_, Boolean.valueOf(blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50491_))).m_61124_(f_55149_, Boolean.valueOf(blockstate3.m_60713_(this) || blockstate3.m_60713_(Blocks.f_50491_))).m_61124_(f_55150_, Boolean.valueOf(blockstate4.m_60713_(this) || blockstate4.m_60713_(Blocks.f_50491_))).m_61124_(f_55151_, Boolean.valueOf(blockstate5.m_60713_(this) || blockstate5.m_60713_(Blocks.f_50491_)));
+      return this.m_49966_().m_61124_(f_55153_, Boolean.valueOf(blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50491_) || blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON))).m_61124_(f_55152_, Boolean.valueOf(blockstate1.m_60713_(this) || blockstate1.m_60713_(Blocks.f_50491_))).m_61124_(f_55148_, Boolean.valueOf(blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50491_))).m_61124_(f_55149_, Boolean.valueOf(blockstate3.m_60713_(this) || blockstate3.m_60713_(Blocks.f_50491_))).m_61124_(f_55150_, Boolean.valueOf(blockstate4.m_60713_(this) || blockstate4.m_60713_(Blocks.f_50491_))).m_61124_(f_55151_, Boolean.valueOf(blockstate5.m_60713_(this) || blockstate5.m_60713_(Blocks.f_50491_)));
+    }
+ 
+    public BlockState m_7417_(BlockState p_51728_, Direction p_51729_, BlockState p_51730_, LevelAccessor p_51731_, BlockPos p_51732_, BlockPos p_51733_) {
+@@ -38,7 +_,7 @@
+          p_51731_.m_186460_(p_51732_, this, 1);
+          return super.m_7417_(p_51728_, p_51729_, p_51730_, p_51731_, p_51732_, p_51733_);
+       } else {
+-         boolean flag = p_51730_.m_60713_(this) || p_51730_.m_60713_(Blocks.f_50491_) || p_51729_ == Direction.DOWN && p_51730_.m_60713_(Blocks.f_50259_);
+         boolean flag = p_51730_.m_60713_(this) || p_51730_.m_60713_(Blocks.f_50491_) || p_51729_ == Direction.DOWN && (p_51730_.m_60713_(Blocks.f_50259_) || p_51730_.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON));
+          return p_51728_.m_61124_(f_55154_.get(p_51729_), Boolean.valueOf(flag));
+       }
+    }
+@@ -63,13 +_,13 @@
+             }
+ 
+             BlockState blockstate2 = p_51725_.m_8055_(blockpos.m_7495_());
+-            if (blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50259_)) {
+            if (blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50259_) || blockstate2.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+                return true;
+             }
+          }
+       }
+ 
+-      return blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50259_);
+      return blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON);
+    }
+ 
+    protected void m_7926_(StateDefinition.Builder<Block, BlockState> p_51735_) {
@@ -38,12 +38,12 @@
       }
    }
 
-+   @Deprecated //Forge: Prefer using IForgeBlock#catchFire
+   @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
    public static void m_57433_(Level p_57434_, BlockPos p_57435_) {
       m_57436_(p_57434_, p_57435_, (LivingEntity)null);
    }
 
-+   @Deprecated //Forge: Prefer using IForgeBlock#catchFire
+   @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
    private static void m_57436_(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_) {
       if (!p_57437_.f_46443_) {
          PrimedTnt primedtnt = new PrimedTnt(p_57437_, (double)p_57438_.m_123341_() + 0.5D, (double)p_57438_.m_123342_(), (double)p_57438_.m_123343_() + 0.5D, p_57439_);
@@ -153,7 +153,7 @@
       }
    }
 
-@@ -487,5 +_,34 @@
+@@ -487,5 +_,33 @@
          p_58342_.m_36491_(itemstack);
       }
 
@@ -164,13 +164,12 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
-+      if (!this.f_58859_ && facing != null && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
-+         if (facing == Direction.UP)
-+            return handlers[0].cast();
-+         else if (facing == Direction.DOWN)
-+            return handlers[1].cast();
-+         else
-+            return handlers[2].cast();
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && facing != null && !this.f_58859_) {
+          return switch (facing) {
+              case UP -> handlers[0].cast();
+              case DOWN -> handlers[1].cast();
+              default -> handlers[2].cast();
+          };
 +      }
 +      return super.getCapability(capability, facing);
 +   }
@@ -11,7 +11,7 @@
 +   }
 +
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, @org.jetbrains.annotations.Nullable net.minecraft.core.Direction side) {
-+      if (!this.f_58859_ && cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER)
+      if (cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && !this.f_58859_)
 +         return itemHandler.cast();
 +      return super.getCapability(cap, side);
 +   }
@@ -51,7 +51,7 @@
       }
    }
 
-@@ -255,5 +_,34 @@
+@@ -255,5 +_,33 @@
 
    protected AbstractContainerMenu m_6555_(int p_58990_, Inventory p_58991_) {
       return new BrewingStandMenu(p_58990_, p_58991_, this, this.f_58971_);
@@ -62,13 +62,12 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
-+      if (!this.f_58859_ && facing != null && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
-+         if (facing == Direction.UP)
-+            return handlers[0].cast();
-+         else if (facing == Direction.DOWN)
-+            return handlers[1].cast();
-+         else
-+            return handlers[2].cast();
+      if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && facing != null && !this.f_58859_) {
+          return switch (facing) {
+              case UP -> handlers[0].cast();
+              case DOWN -> handlers[1].cast();
+              default -> handlers[2].cast();
+          };
 +      }
 +      return super.getCapability(capability, facing);
 +   }
@@ -17,7 +17,7 @@
 +
 +   @Override
 +   public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, Direction side) {
-+       if (!this.f_58859_ && cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
+       if (cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && !this.f_58859_) {
 +          if (this.chestHandler == null)
 +             this.chestHandler = net.minecraftforge.common.util.LazyOptional.of(this::createHandler);
 +          return this.chestHandler.cast();
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
+++ b/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
+@@ -72,7 +_,7 @@
+       for(int i = 2; i >= -3; --i) {
+          BlockPos blockpos = p_225975_.m_6630_(i);
+          if (Feature.m_65788_(p_225974_.m_226058_(), blockpos)) {
+-            p_225974_.m_226061_(blockpos, this.f_69303_.m_213972_(p_225974_.m_226067_(), p_225975_));
+            p_225974_.m_226061_(blockpos, net.minecraftforge.event.ForgeEventFactory.alterGround(p_225974_.m_226058_(), p_225974_.m_226067_(), blockpos, this.f_69303_.m_213972_(p_225974_.m_226067_(), p_225975_)));
+             break;
+          }
+ 
@@ -6,6 +6,20 @@ pluginManagement {
    }
 }

+buildscript {
+    dependencies {
+        classpath('com.google.code.gson:gson') {
+            version {
+                strictly '2.10.1'
+            }
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
+
 rootProject.name = 'ForgeRoot'

 include 'fmlloader'
@@ -15,11 +29,14 @@ include 'javafmllanguage'
 include 'lowcodelanguage'

 include ':mcp'
-include ':clean'
 include ':fmlonly'
 include ':forge'

 project(":mcp").projectDir = file("projects/mcp")
-project(":clean").projectDir = file("projects/clean")
 project(":fmlonly").projectDir = file("projects/fmlonly")
 project(":forge").projectDir = file("projects/forge")
+
+if (!System.env.TEAMCITY_VERSION) {
+    include ':clean'
+    project(":clean").projectDir = file("projects/clean")
+}
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#forge:end_stones"
+  ]
+}
@@ -1,7 +1,7 @@
 {
  "pack": {
    "description": {
-      "text": "examplemod resources"
+      "text": "${mod_id} resources"
    },
    "forge:server_data_pack_format": 12,
    "pack_format": 13
@@ -0,0 +1,12 @@
+{
+  "textures": [
+    "minecraft:generic_7",
+    "minecraft:generic_6",
+    "minecraft:generic_5",
+    "minecraft:generic_4",
+    "minecraft:generic_3",
+    "minecraft:generic_2",
+    "minecraft:generic_1",
+    "minecraft:generic_0"
+  ]
+}
@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "minecraft:drip_hang"
+  ]
+}
@@ -0,0 +1,30 @@
+{
+  "textures": [
+    "minecraft:sga_a",
+    "minecraft:sga_b",
+    "minecraft:sga_c",
+    "minecraft:sga_d",
+    "minecraft:sga_e",
+    "minecraft:sga_f",
+    "minecraft:sga_g",
+    "minecraft:sga_h",
+    "minecraft:sga_i",
+    "minecraft:sga_j",
+    "minecraft:sga_k",
+    "minecraft:sga_l",
+    "minecraft:sga_m",
+    "minecraft:sga_n",
+    "minecraft:sga_o",
+    "minecraft:sga_p",
+    "minecraft:sga_q",
+    "minecraft:sga_r",
+    "minecraft:sga_s",
+    "minecraft:sga_t",
+    "minecraft:sga_u",
+    "minecraft:sga_v",
+    "minecraft:sga_w",
+    "minecraft:sga_x",
+    "minecraft:sga_y",
+    "minecraft:sga_z"
+  ]
+}
@@ -0,0 +1,8 @@
+{
+  "textures": [
+    "minecraft:splash_0",
+    "minecraft:splash_1",
+    "minecraft:splash_2",
+    "minecraft:splash_3"
+  ]
+}
@@ -13,10 +13,30 @@ import net.minecraftforge.forgespi.language.IModInfo;

 import java.util.Optional;
 import java.util.function.BiFunction;
+import java.util.function.Function;

 public class ConfigScreenHandler
 {
-    public record ConfigScreenFactory(BiFunction<Minecraft, Screen, Screen> screenFunction) implements IExtensionPoint<ConfigScreenFactory> {}
+    /**
+     * @param screenFunction A function that takes the {@link Minecraft} client instance and the mods screen as
+     *                       arguments and returns your config screen to show when the player clicks the config button
+     *                       for your mod on the mods screen.
+     *                       <p>You should call {@link Minecraft#setScreen(Screen)} with the provided client instance
+     *                       and mods screen for the action of your close button.</p>
+     */
+    public record ConfigScreenFactory(BiFunction<Minecraft, Screen, Screen> screenFunction) implements IExtensionPoint<ConfigScreenFactory> {
+        /**
+         * @param screenFunction A function that takes the mods screen as an argument and returns your config screen to
+         *                       show when the player clicks the config button for your mod on the mods screen.
+         *                       <p>You should call {@link Minecraft#setScreen(Screen)} with the provided mods screen
+         *                       for the action of your close button, using {@link Screen#minecraft} to get the client
+         *                       instance.</p>
+         */
+        public ConfigScreenFactory(Function<Screen, Screen> screenFunction) {
+            this((mcClient, modsScreen) -> screenFunction.apply(modsScreen));
+        }
+    }
+
    public static Optional<BiFunction<Minecraft, Screen, Screen>> getScreenFactoryFor(IModInfo selectedMod)
    {
        return ModList.get().getModContainerById(selectedMod.getModId()).
@@ -15,6 +15,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.datafixers.util.Either;
 import net.minecraft.ChatFormatting;
+import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
 import net.minecraft.FileUtil;
 import net.minecraft.client.Camera;
 import net.minecraft.client.KeyMapping;
@@ -92,7 +93,9 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ItemStackLinkedSet;
@@ -100,7 +103,9 @@ import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LeavesBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.FogType;
@@ -67,15 +67,15 @@ public interface IForgeDimensionSpecialEffects
     * Allows for manipulating the coloring of the lightmap texture.
     * Will be called for each 16*16 combination of sky/block light values.
     *
-     * @param level        The current level (client-side).
-     * @param partialTicks Progress between ticks.
-     * @param skyDarken    Current darkness of the sky.
-     * @param skyLight     Sky light brightness factor.
-     * @param blockLight   Block light brightness factor.
-     * @param pixelX       X-coordinate of the lightmap texture.
-     * @param pixelY       Y-coordinate of the lightmap texture.
-     * @param colors       The color values that will be used: [r, g, b].
+     * @param level                The current level (client-side).
+     * @param partialTicks         Progress between ticks.
+     * @param skyDarken            Current darkness of the sky (can be used to calculate sky light).
+     * @param blockLightRedFlicker Block light flicker factor (red color) (can be used to calculate block light).
+     * @param skyLight             Sky light brightness (accounting for sky darkness).
+     * @param pixelX               X-coordinate of the lightmap texture (block).
+     * @param pixelY               Y-coordinate of the lightmap texture (sky).
+     * @param colors               The color values that will be used: [r, g, b].
     * @see LightTexture#updateLightTexture(float)
     */
-    default void adjustLightmapColors(ClientLevel level, float partialTicks, float skyDarken, float skyLight, float blockLight, int pixelX, int pixelY, Vector3f colors) {}
+    default void adjustLightmapColors(ClientLevel level, float partialTicks, float skyDarken, float blockLightRedFlicker, float skyLight, int pixelX, int pixelY, Vector3f colors) {}
 }
@@ -5,6 +5,7 @@

 package net.minecraftforge.client.extensions.common;

+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.ParticleEngine;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.effect.MobEffects;
@@ -14,6 +15,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.HitResult;
@@ -111,4 +113,17 @@ public interface IClientBlockExtensions
        }
        return originalColor;
    }
+
+    /**
+     * Returns true if the breaking particles created from the {@link BlockState} passed should be tinted with biome colors. 
+     * 
+     * @param state The state of this block
+     * @param level The level the particles are spawning in
+     * @param pos The position of the block
+     * @return {@code true} if the particles should be tinted.
+     */
+    default boolean areBreakingParticlesTinted(BlockState state, ClientLevel level, BlockPos pos)
+    {
+        return !state.is(Blocks.GRASS_BLOCK);
+    }
 }
@@ -17,6 +17,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;

 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.logging.LogUtils;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.server.packs.resources.IoSupplier;
@@ -26,8 +27,6 @@ import net.minecraftforge.client.gui.widget.ScrollPanel;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.resource.PathPackResources;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.maven.artifact.versioning.ComparableVersion;

 import com.mojang.blaze3d.systems.RenderSystem;
@@ -60,11 +59,12 @@ import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
+import org.slf4j.Logger;

 public class ModListScreen extends Screen
 {
    private static String stripControlCodes(String value) { return net.minecraft.util.StringUtil.stripColor(value); }
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger LOGGER = LogUtils.getLogger();
    private enum SortType implements Comparator<IModInfo>
    {
        NORMAL,
@@ -87,7 +87,7 @@ public class ModListScreen extends Screen

    private static final int PADDING = 6;

-    private Screen parentScreen;
+    private final Screen parentScreen;

    private ModListWidget modList;
    private InfoPanel modInfo;
@@ -98,7 +98,7 @@ public class ModListScreen extends Screen
    private Button configButton, openModsFolderButton, doneButton;

    private int buttonMargin = 1;
-    private int numButtons = SortType.values().length;
+    private final int numButtons = SortType.values().length;
    private String lastFilterText = "";

    private EditBox search;
@@ -265,10 +265,19 @@ public class ModListScreen extends Screen
        int y = this.height - 20 - PADDING;
        int fullButtonHeight = PADDING + 20 + PADDING;

-        doneButton = Button.builder(Component.translatable("gui.done"), b -> ModListScreen.this.onClose()).bounds(((listWidth + PADDING + this.width - doneButtonWidth) / 2), y, doneButtonWidth, 20).build();
-        openModsFolderButton = Button.builder(Component.translatable("fml.menu.mods.openmodsfolder"), b -> Util.getPlatform().openFile(FMLPaths.MODSDIR.get().toFile())).bounds(6, y, this.listWidth, 20).build();
+        doneButton = Button.builder(Component.translatable("gui.done"), b -> ModListScreen.this.onClose())
+                .bounds(((listWidth + PADDING + this.width - doneButtonWidth) / 2), y, doneButtonWidth, 20)
+                .build();
+
+        openModsFolderButton = Button.builder(Component.translatable("fml.menu.mods.openmodsfolder"), b -> Util.getPlatform().openFile(FMLPaths.MODSDIR.get().toFile()))
+                .bounds(6, y, this.listWidth, 20)
+                .build();
+
        y -= 20 + PADDING;
-        configButton = Button.builder(Component.translatable("fml.menu.mods.config"), b -> ModListScreen.this.displayModConfig()).bounds(6, y, this.listWidth, 20).build();
+        configButton = Button.builder(Component.translatable("fml.menu.mods.config"), b -> ModListScreen.this.displayModConfig())
+                .bounds(6, y, this.listWidth, 20)
+                .build();
+
        y -= 14 + PADDING;
        search = new EditBox(getFontRenderer(), PADDING + 1, y, listWidth - 2, 14, Component.translatable("fml.menu.mods.search"));

@@ -289,11 +298,20 @@ public class ModListScreen extends Screen

        final int width = listWidth / numButtons;
        int x = PADDING;
-        addRenderableWidget(SortType.NORMAL.button = Button.builder(SortType.NORMAL.getButtonText(), b -> resortMods(SortType.NORMAL)).bounds(x, PADDING, width - buttonMargin, 20).build());
+        addRenderableWidget(SortType.NORMAL.button = Button.builder(SortType.NORMAL.getButtonText(), b -> resortMods(SortType.NORMAL))
+                .bounds(x, PADDING, width - buttonMargin, 20)
+                .build());
+
        x += width + buttonMargin;
-        addRenderableWidget(SortType.A_TO_Z.button = Button.builder(SortType.A_TO_Z.getButtonText(), b -> resortMods(SortType.A_TO_Z)).bounds(x, PADDING, width - buttonMargin, 20).build());
+        addRenderableWidget(SortType.A_TO_Z.button = Button.builder(SortType.A_TO_Z.getButtonText(), b -> resortMods(SortType.A_TO_Z))
+                .bounds(x, PADDING, width - buttonMargin, 20)
+                .build());
+
        x += width + buttonMargin;
-        addRenderableWidget(SortType.Z_TO_A.button = Button.builder(SortType.Z_TO_A.getButtonText(), b -> resortMods(SortType.Z_TO_A)).bounds(x, PADDING, width - buttonMargin, 20).build());
+        addRenderableWidget(SortType.Z_TO_A.button = Button.builder(SortType.Z_TO_A.getButtonText(), b -> resortMods(SortType.Z_TO_A))
+                .bounds(x, PADDING, width - buttonMargin, 20)
+                .build());
+
        resortMods(SortType.NORMAL);
        updateCache();
    }
@@ -303,7 +321,9 @@ public class ModListScreen extends Screen
        if (selected == null) return;
        try
        {
-            ConfigScreenHandler.getScreenFactoryFor(selected.getInfo()).map(f->f.apply(this.minecraft, this)).ifPresent(newScreen -> this.minecraft.setScreen(newScreen));
+            ConfigScreenHandler.getScreenFactoryFor(selected.getInfo())
+                    .map(f -> f.apply(this.minecraft, this))
+                    .ifPresent(newScreen -> this.minecraft.setScreen(newScreen));
        }
        catch (final Exception e)
        {
@@ -330,7 +350,10 @@ public class ModListScreen extends Screen
            modList.refreshList();
            if (selected != null)
            {
-                selected = modList.children().stream().filter(e -> e.getInfo() == selected.getInfo()).findFirst().orElse(null);
+                selected = modList.children().stream()
+                        .filter(e -> e.getInfo() == selected.getInfo())
+                        .findFirst()
+                        .orElse(null);
                updateCache();
            }
            sorted = true;
@@ -339,7 +362,9 @@ public class ModListScreen extends Screen

    public <T extends ObjectSelectionList.Entry<T>> void buildModList(Consumer<T> modListViewConsumer, Function<IModInfo, T> newEntry)
    {
-        mods.forEach(mod->modListViewConsumer.accept(newEntry.apply(mod)));
+        for (IModInfo mod : mods) {
+            modListViewConsumer.accept(newEntry.apply(mod));
+        }
    }

    private void reloadMods()
@@ -451,7 +476,7 @@ public class ModListScreen extends Screen
        else
            lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.childmods", selectedMod.getOwningFile().getMods().stream().map(IModInfo::getDisplayName).collect(Collectors.joining(","))));

-        if (vercheck.status() == VersionChecker.Status.OUTDATED || vercheck.status() == VersionChecker.Status.BETA_OUTDATED)
+        if (vercheck.status().isOutdated())
            lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.updateavailable", vercheck.url() == null ? "" : vercheck.url()));
        lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.license", ((ModFileInfo) selectedMod.getOwningFile()).getLicense()));
        lines.add(null);
@@ -467,7 +492,7 @@ public class ModListScreen extends Screen
        }
        */

-        if ((vercheck.status() == VersionChecker.Status.OUTDATED || vercheck.status() == VersionChecker.Status.BETA_OUTDATED) && vercheck.changes().size() > 0)
+        if (vercheck.status().isOutdated() && !vercheck.changes().isEmpty())
        {
            lines.add(null);
            lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.changelogheader"));
@@ -496,6 +496,13 @@ public class ForgeGui extends Gui
        }
    }

+    @Override
+    public void clearCache()
+    {
+        super.clearCache();
+        this.debugOverlay.clearChunkCache();
+    }
+
    protected void renderRecordOverlay(int width, int height, float partialTick, PoseStack pStack)
    {
        if (overlayMessageTime > 0)
@@ -27,7 +27,7 @@ public class ModListWidget extends ObjectSelectionList<ModListWidget.ModEntry>
    private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
    private final int listWidth;

-    private ModListScreen parent;
+    private final ModListScreen parent;

    public ModListWidget(ModListScreen parent, int listWidth, int top, int bottom)
    {
@@ -133,8 +133,8 @@ public class ClientModLoader
    {
        boolean anyOutdated = ModList.get().getMods().stream()
                .map(VersionChecker::getResult)
-                .map(result -> result.status())
-                .anyMatch(status -> status == VersionChecker.Status.OUTDATED || status == VersionChecker.Status.BETA_OUTDATED);
+                .map(VersionChecker.CheckResult::status)
+                .anyMatch(VersionChecker.Status::isOutdated);
        return anyOutdated ? VersionChecker.Status.OUTDATED : null;
    }

@@ -257,6 +257,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
            private final ItemTransforms transforms;
            private TextureAtlasSprite particle;
            private RenderTypeGroup lastRenderTypes = RenderTypeGroup.EMPTY;
+            private RenderTypeGroup lastRenderTypesFast = RenderTypeGroup.EMPTY;

            private Builder(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, ItemTransforms transforms)
            {
@@ -270,27 +271,38 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>

            public void addLayer(BakedModel model)
            {
-                flushQuads(null);
+                flushQuads(RenderTypeGroup.EMPTY, RenderTypeGroup.EMPTY);
                children.add(model);
            }

            private void addLayer(RenderTypeGroup renderTypes, List<BakedQuad> quads)
            {
-                var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes);
+                this.addLayer(renderTypes, RenderTypeGroup.EMPTY, quads);
+            }
+
+            private void addLayer(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, List<BakedQuad> quads)
+            {
+                var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes, renderTypesFast);
                quads.forEach(modelBuilder::addUnculledFace);
                children.add(modelBuilder.build());
            }

            private void flushQuads(RenderTypeGroup renderTypes)
+            {
+                this.flushQuads(renderTypes, RenderTypeGroup.EMPTY);
+            }
+
+            private void flushQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
            {
                if (!Objects.equals(renderTypes, lastRenderTypes))
                {
                    if (quads.size() > 0)
                    {
-                        addLayer(lastRenderTypes, quads);
+                        addLayer(lastRenderTypes, lastRenderTypesFast, quads);
                        quads.clear();
                    }
                    lastRenderTypes = renderTypes;
+                    lastRenderTypesFast = renderTypesFast;
                }
            }

@@ -302,14 +314,24 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>

            public Builder addQuads(RenderTypeGroup renderTypes, BakedQuad... quadsToAdd)
            {
-                flushQuads(renderTypes);
+                return this.addQuads(renderTypes, RenderTypeGroup.EMPTY, quadsToAdd);
+            }
+
+            public Builder addQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, BakedQuad... quadsToAdd)
+            {
+                flushQuads(renderTypes, renderTypesFast);
                Collections.addAll(quads, quadsToAdd);
                return this;
            }

            public Builder addQuads(RenderTypeGroup renderTypes, Collection<BakedQuad> quadsToAdd)
            {
-                flushQuads(renderTypes);
+                return this.addQuads(renderTypes, RenderTypeGroup.EMPTY, quadsToAdd);
+            }
+
+            public Builder addQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, Collection<BakedQuad> quadsToAdd)
+            {
+                flushQuads(renderTypes, renderTypesFast);
                quads.addAll(quadsToAdd);
                return this;
            }
@@ -318,7 +340,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
            {
                if (quads.size() > 0)
                {
-                    addLayer(lastRenderTypes, quads);
+                    addLayer(lastRenderTypes, lastRenderTypesFast, quads);
                }
                var childrenBuilder = ImmutableMap.<String, BakedModel>builder();
                var itemPassesBuilder = ImmutableList.<BakedModel>builder();
@@ -63,7 +63,7 @@ public class EmptyModel extends SimpleUnbakedGeometry<EmptyModel>

        public Baked()
        {
-            super(List.of(), Map.of(), false, false, false, UnitTextureAtlasSprite.INSTANCE, ItemTransforms.NO_TRANSFORMS, ItemOverrides.EMPTY, RenderTypeGroup.EMPTY);
+            super(List.of(), Map.of(), false, false, false, UnitTextureAtlasSprite.INSTANCE, ItemTransforms.NO_TRANSFORMS, ItemOverrides.EMPTY, RenderTypeGroup.EMPTY, RenderTypeGroup.EMPTY);
        }

        @Override
@@ -73,6 +73,12 @@ public class ExtendedBlockModelDeserializer extends BlockModel.Deserializer
            model.customData.setRenderTypeHint(new ResourceLocation(renderTypeHintName));
        }

+        if (jsonobject.has("render_type_fast"))
+        {
+            var renderTypeHintName = GsonHelper.getAsString(jsonobject, "render_type_fast");
+            model.customData.setRenderTypeFastHint(new ResourceLocation(renderTypeHintName));
+        }
+
        if (jsonobject.has("visibility"))
        {
            JsonObject visibility = GsonHelper.getAsJsonObject(jsonobject, "visibility");
@@ -34,6 +34,16 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
        return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes);
    }

+    /**
+     * Creates a new model builder that uses the provided attributes in the final baked model.
+     */
+    static IModelBuilder<?> of(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
+                               ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
+                               RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
+    {
+        return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes, renderTypesFast);
+    }
+
    /**
     * Creates a new model builder that collects quads to the provided list, returning
     * {@linkplain EmptyModel#BAKED an empty model} if you call {@link #build()}.
@@ -53,13 +63,22 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
    {
        private final SimpleBakedModel.Builder builder;
        private final RenderTypeGroup renderTypes;
+        private final RenderTypeGroup renderTypesFast;

        private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
                       ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
                       RenderTypeGroup renderTypes)
+        {
+            this(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes, RenderTypeGroup.EMPTY);
+        }
+
+        private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
+                       ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
+                       RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
        {
            this.builder = new SimpleBakedModel.Builder(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides).particle(particle);
            this.renderTypes = renderTypes;
+            this.renderTypesFast = renderTypesFast;
        }

        @Override
@@ -80,7 +99,7 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
        @Override
        public BakedModel build()
        {
-            return builder.build(renderTypes);
+            return builder.build(renderTypes, renderTypesFast);
        }
    }

@@ -45,12 +45,19 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
    private ImmutableList<Material> textures;
    private final Int2ObjectMap<ForgeFaceData> layerData;
    private final Int2ObjectMap<ResourceLocation> renderTypeNames;
+    private final Int2ObjectMap<ResourceLocation> renderTypeNamesFast;

    private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames)
+    {
+        this(textures, layerData, renderTypeNames, new Int2ObjectOpenHashMap<>());
+    }
+
+    private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ResourceLocation> renderTypeNamesFast)
    {
        this.textures = textures;
        this.layerData = layerData;
        this.renderTypeNames = renderTypeNames;
+        this.renderTypeNamesFast = renderTypeNamesFast;
    }

    @Override
@@ -82,7 +89,9 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
            var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> sprite, modelState, modelLocation);
            var renderTypeName = renderTypeNames.get(i);
            var renderTypes = renderTypeName != null ? context.getRenderType(renderTypeName) : null;
-            builder.addQuads(renderTypes != null ? renderTypes : normalRenderTypes, quads);
+            var renderTypeNameFast = renderTypeNamesFast.get(i);
+            var renderTypesFast = renderTypeNameFast != null ? context.getRenderType(renderTypeNameFast) : null;
+            builder.addQuads(renderTypes != null ? renderTypes : normalRenderTypes, renderTypesFast != null ? renderTypesFast : RenderTypeGroup.EMPTY, quads);
        }

        return builder.build();
@@ -108,16 +117,35 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
                }
            }

+            var renderTypeNamesFast = new Int2ObjectOpenHashMap<ResourceLocation>();
+            if (jsonObject.has("render_types_fast"))
+            {
+                var renderTypes = jsonObject.getAsJsonObject("render_types_fast");
+                for (Map.Entry<String, JsonElement> entry : renderTypes.entrySet())
+                {
+                    var renderType = new ResourceLocation(entry.getKey());
+                    for (var layer : entry.getValue().getAsJsonArray())
+                        if (renderTypeNamesFast.put(layer.getAsInt(), renderType) != null)
+                            throw new JsonParseException("Registered duplicate fast graphics render type for layer " + layer);
+                }
+            }
+
            var emissiveLayers = new Int2ObjectArrayMap<ForgeFaceData>();
            if(jsonObject.has("forge_data"))
            {
                JsonObject forgeData = jsonObject.get("forge_data").getAsJsonObject();
-                readLayerData(forgeData, "layers", renderTypeNames, emissiveLayers, false);    
+                readLayerData(forgeData, "layers", renderTypeNames, renderTypeNamesFast, emissiveLayers, false);
            }
-            return new ItemLayerModel(null, emissiveLayers, renderTypeNames);
+            return new ItemLayerModel(null, emissiveLayers, renderTypeNames, renderTypeNamesFast);
        }

        protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning)
+        {
+            this.readLayerData(jsonObject, name, renderTypeNames, new Int2ObjectOpenHashMap<>(), layerData, logWarning);
+        }
+
+        @Deprecated(forRemoval = true, since = "1.21.4")
+        protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNamesFast, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning)
        {
            if (!jsonObject.has(name))
            {
@@ -251,6 +251,42 @@ public abstract class BlockStateProvider implements DataProvider {
            models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType));
    }

+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, String renderType, String renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), renderType, renderTypeFast);
+    }
+
+    public void logBlockWithRenderTypeAndFast(RotatedPillarBlock block, String renderType, String renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), extend(blockTexture(block), "_top"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation baseName, String renderType, String renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, extend(baseName, "_side"), extend(baseName, "_end"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end, String renderType, String renderTypeFast) {
+        axisBlock(block,
+            models().cubeColumn(name(block), side, end).renderType(renderType, renderTypeFast),
+            models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType, renderTypeFast));
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), renderType, renderTypeFast);
+    }
+
+    public void logBlockWithRenderType(RotatedPillarBlock block, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), extend(blockTexture(block), "_top"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation baseName, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, extend(baseName, "_side"), extend(baseName, "_end"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlock(block,
+            models().cubeColumn(name(block), side, end).renderType(renderType, renderTypeFast),
+            models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType, renderTypeFast));
+    }
+
    public void axisBlock(RotatedPillarBlock block, ModelFile vertical, ModelFile horizontal) {
        getVariantBuilder(block)
            .partialState().with(RotatedPillarBlock.AXIS, Axis.Y)
@@ -382,6 +418,38 @@ public abstract class BlockStateProvider implements DataProvider {
        stairsBlockInternalWithRenderType(block, name + "_stairs", side, bottom, top, renderType);
    }

+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, name, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, key(block).toString(), side, bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, name + "_stairs", side, bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, name, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, key(block).toString(), side, bottom, top, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, name + "_stairs", side, bottom, top, renderType, renderTypeFast);
+    }
+
    private void stairsBlockInternal(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
        ModelFile stairs = models().stairs(baseName, side, bottom, top);
        ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top);
@@ -396,6 +464,13 @@ public abstract class BlockStateProvider implements DataProvider {
        stairsBlock(block, stairs, stairsInner, stairsOuter);
    }

+    private void stairsBlockInternalWithRenderTypeAndFast(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile stairs = models().stairs(baseName, side, bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile stairsOuter = models().stairsOuter(baseName + "_outer", side, bottom, top).renderType(renderType, renderTypeFast);
+        stairsBlock(block, stairs, stairsInner, stairsOuter);
+    }
+
    public void stairsBlock(StairBlock block, ModelFile stairs, ModelFile stairsInner, ModelFile stairsOuter) {
        getVariantBuilder(block)
            .forAllStatesExcept(state -> {
@@ -533,6 +608,32 @@ public abstract class BlockStateProvider implements DataProvider {
            models().fenceSide(name + "_fence_side", texture).renderType(renderType));
    }

+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        String baseName = key(block).toString();
+        fourWayBlock(block,
+            models().fencePost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(baseName + "_side", texture).renderType(renderType, renderTypeFast));
+    }
+
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        fourWayBlock(block,
+            models().fencePost(name + "_fence_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(name + "_fence_side", texture).renderType(renderType, renderTypeFast));
+    }
+
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        String baseName = key(block).toString();
+        fourWayBlock(block,
+            models().fencePost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(baseName + "_side", texture).renderType(renderType, renderTypeFast));
+    }
+
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        fourWayBlock(block,
+            models().fencePost(name + "_fence_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(name + "_fence_side", texture).renderType(renderType, renderTypeFast));
+    }
+
    public void fenceGateBlock(FenceGateBlock block, ResourceLocation texture) {
        fenceGateBlockInternal(block, key(block).toString(), texture);
    }
@@ -557,6 +658,22 @@ public abstract class BlockStateProvider implements DataProvider {
        fenceGateBlockInternalWithRenderType(block, name + "_fence_gate", texture, renderType);
    }

+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, name + "_fence_gate", texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, renderType, renderTypeFast);
+    }
+
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, name + "_fence_gate", texture, renderType, renderTypeFast);
+    }
+
    private void fenceGateBlockInternal(FenceGateBlock block, String baseName, ResourceLocation texture) {
        ModelFile gate = models().fenceGate(baseName, texture);
        ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture);
@@ -573,6 +690,14 @@ public abstract class BlockStateProvider implements DataProvider {
        fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen);
    }

+    private void fenceGateBlockInternalWithRenderTypeAndFast(FenceGateBlock block, String baseName, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile gate = models().fenceGate(baseName, texture).renderType(renderType, renderTypeFast);
+        ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast);
+        ModelFile gateWall = models().fenceGateWall(baseName + "_wall", texture).renderType(renderType, renderTypeFast);
+        ModelFile gateWallOpen = models().fenceGateWallOpen(baseName + "_wall_open", texture).renderType(renderType, renderTypeFast);
+        fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen);
+    }
+
    public void fenceGateBlock(FenceGateBlock block, ModelFile gate, ModelFile gateOpen, ModelFile gateWall, ModelFile gateWallOpen) {
        getVariantBuilder(block).forAllStatesExcept(state -> {
            ModelFile model = gate;
@@ -614,6 +739,22 @@ public abstract class BlockStateProvider implements DataProvider {
        wallBlockInternalWithRenderType(block, name + "_wall", texture, renderType);
    }

+    public void wallBlockWithRenderTypeAndFast(WallBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, name + "_wall", texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, renderType, renderTypeFast);
+    }
+
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, name + "_wall", texture, renderType, renderTypeFast);
+    }
+
    private void wallBlockInternal(WallBlock block, String baseName, ResourceLocation texture) {
        wallBlock(block, models().wallPost(baseName + "_post", texture),
            models().wallSide(baseName + "_side", texture),
@@ -626,6 +767,12 @@ public abstract class BlockStateProvider implements DataProvider {
            models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType));
    }

+    private void wallBlockInternalWithRenderTypeAndFast(WallBlock block, String baseName, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        wallBlock(block, models().wallPost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
+            models().wallSide(baseName + "_side", texture).renderType(renderType, renderTypeFast),
+            models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType, renderTypeFast));
+    }
+
    public static final ImmutableMap<Direction, Property<WallSide>> WALL_PROPS = ImmutableMap.<Direction, Property<WallSide>>builder()
    		.put(Direction.EAST,  BlockStateProperties.EAST_WALL)
    		.put(Direction.NORTH, BlockStateProperties.NORTH_WALL)
@@ -678,6 +825,22 @@ public abstract class BlockStateProvider implements DataProvider {
        paneBlockInternalWithRenderType(block, name + "_pane", pane, edge, renderType);
    }

+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge, String renderType, String renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, key(block).toString(), pane, edge, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge, String renderType, String renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, name + "_pane", pane, edge, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, key(block).toString(), pane, edge, renderType, renderTypeFast);
+    }
+
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, name + "_pane", pane, edge, renderType, renderTypeFast);
+    }
+
    private void paneBlockInternal(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge) {
        ModelFile post = models().panePost(baseName + "_post", pane, edge);
        ModelFile side = models().paneSide(baseName + "_side", pane, edge);
@@ -696,6 +859,15 @@ public abstract class BlockStateProvider implements DataProvider {
        paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
    }

+    private void paneBlockInternalWithRenderTypeAndFast(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile post = models().panePost(baseName + "_post", pane, edge).renderType(renderType, renderTypeFast);
+        ModelFile side = models().paneSide(baseName + "_side", pane, edge).renderType(renderType, renderTypeFast);
+        ModelFile sideAlt = models().paneSideAlt(baseName + "_side_alt", pane, edge).renderType(renderType, renderTypeFast);
+        ModelFile noSide = models().paneNoSide(baseName + "_noside", pane).renderType(renderType, renderTypeFast);
+        ModelFile noSideAlt = models().paneNoSideAlt(baseName + "_noside_alt", pane).renderType(renderType, renderTypeFast);
+        paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
+    }
+
    public void paneBlock(IronBarsBlock block, ModelFile post, ModelFile side, ModelFile sideAlt, ModelFile noSide, ModelFile noSideAlt) {
        MultiPartBlockStateBuilder builder = getMultipartBuilder(block)
            .part().modelFile(post).addModel().end();
@@ -735,6 +907,22 @@ public abstract class BlockStateProvider implements DataProvider {
        doorBlockInternalWithRenderType(block, name + "_door", bottom, top, renderType);
    }

+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, String name, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, name + "_door", bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), bottom, top, renderType, renderTypeFast);
+    }
+
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, String name, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, name + "_door", bottom, top, renderType, renderTypeFast);
+    }
+
    private void doorBlockInternal(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top) {
        ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top);
        ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top);
@@ -759,6 +947,18 @@ public abstract class BlockStateProvider implements DataProvider {
        doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen);
    }

+    private void doorBlockInternalWithRenderTypeAndFast(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile bottomRight = models().doorBottomRight(baseName + "_bottom_right", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile bottomRightOpen = models().doorBottomRightOpen(baseName + "_bottom_right_open", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topLeft = models().doorTopLeft(baseName + "_top_left", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topLeftOpen = models().doorTopLeftOpen(baseName + "_top_left_open", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topRight = models().doorTopRight(baseName + "_top_right", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topRightOpen = models().doorTopRightOpen(baseName + "_top_right_open", bottom, top).renderType(renderType, renderTypeFast);
+        doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen);
+    }
+
    public void doorBlock(DoorBlock block, ModelFile bottomLeft, ModelFile bottomLeftOpen, ModelFile bottomRight, ModelFile bottomRightOpen, ModelFile topLeft, ModelFile topLeftOpen, ModelFile topRight, ModelFile topRightOpen) {
        getVariantBuilder(block).forAllStatesExcept(state -> {
            int yRot = ((int) state.getValue(DoorBlock.FACING).toYRot()) + 90;
@@ -825,6 +1025,22 @@ public abstract class BlockStateProvider implements DataProvider {
        trapdoorBlockInternalWithRenderType(block, name + "_trapdoor", texture, orientable, renderType);
    }

+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, ResourceLocation texture, boolean orientable, String renderType, String renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, orientable, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, String name, ResourceLocation texture, boolean orientable, String renderType, String renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, name + "_trapdoor", texture, orientable, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, orientable, renderType, renderTypeFast);
+    }
+
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, String name, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, name + "_trapdoor", texture, orientable, renderType, renderTypeFast);
+    }
+
    private void trapdoorBlockInternal(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable) {
        ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture) : models().trapdoorBottom(baseName + "_bottom", texture);
        ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture) : models().trapdoorTop(baseName + "_top", texture);
@@ -839,6 +1055,13 @@ public abstract class BlockStateProvider implements DataProvider {
        trapdoorBlock(block, bottom, top, open, orientable);
    }

+    private void trapdoorBlockInternalWithRenderTypeAndFast(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture).renderType(renderType, renderTypeFast) : models().trapdoorBottom(baseName + "_bottom", texture).renderType(renderType, renderTypeFast);
+        ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture).renderType(renderType, renderTypeFast) : models().trapdoorTop(baseName + "_top", texture).renderType(renderType, renderTypeFast);
+        ModelFile open = orientable ? models().trapdoorOrientableOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast) : models().trapdoorOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast);
+        trapdoorBlock(block, bottom, top, open, orientable);
+    }
+
    public void trapdoorBlock(TrapDoorBlock block, ModelFile bottom, ModelFile top, ModelFile open, boolean orientable) {
        getVariantBuilder(block).forAllStatesExcept(state -> {
            int xRot = 0;
Author	SHA1	Message	Date
Jonathing	4952622785	1.19.4 RB 4 https://forums.minecraftforge.net/topic/154386-forge-454-minecraft-1194/	2025-03-04 16:44:50 -05:00
Jonathing	ae82ec12d2	Cache this.useItem before running item break logic, Fixes #10344 (#10381 )	2025-03-04 13:39:35 -08:00
Jonathing	99818c4fdd	Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10463 )	2025-03-04 13:34:26 -08:00
JonathingandLexManos	0e9ba58f19	Speed up mod annotation scanning by ~30% (#10471 ) Co-authored-by: LexManos <[email protected]>	2025-03-04 13:33:54 -08:00
Jonathing	5f5a9a8d2a	Add fast graphics render type to block model jsons (#10399 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-18 14:09:27 -08:00
Jonathing	3bba5bf4ec	Backport even more future ResourceLocation methods (#10429 )	2025-02-18 13:51:24 -08:00
Jonathing	8090d1d099	Ensure NetworkConstants is loaded before mod construction (#10447 )	2025-02-18 13:51:08 -08:00
JonathingandPaint_Ninja	09cb6bd11e	Add `clientSideOnly` feature to mods.toml (#10085 ) (backport of #9804 to 1.20.1) (#10366 ) Co-authored-by: Paint_Ninja <[email protected]>	2025-02-18 13:50:42 -08:00
Jonathing	d744f0b254	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10359 ) Add VillagerType#registerBiomeType Co-authored-by: Joseph T. McQuigg <[email protected]>	2025-01-27 20:25:22 -08:00
Jonathing	15c989bd77	Fix incorrect method reference in TntBlock.explode() (#10332 )	2025-01-27 20:24:53 -08:00
Jonathing	b022b84756	Fix issue with shields being disabled by an attacker (#10322 )	2025-01-27 20:24:44 -08:00
Jonathing	5122b0bc3c	Fix non-passengers being tickable without checking canUpdate() (#10305 )	2025-01-22 13:54:20 -08:00
Jonathing	9b47c8647f	Fix finalizeSpawn's return value not being used correctly (#10308 )	2025-01-22 13:54:12 -08:00
Jonathing	5f47cf52fa	Bump CoreMods to 5.2.4 (#10270 )	2024-12-23 20:40:36 -08:00
Jonathing	550925b9c9	Allow mipmap lowering to be disabled (#10251 )	2024-12-23 20:40:21 -08:00
Jonathing	8448cda699	Add optional fix of use item duration, disabled by default (#10245 )	2024-12-23 20:22:56 -08:00
JonathingandPaint_Ninja	f2887142bd	Backport some Vanilla 1.21 `ResourceLocation` methods (#10240 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 20:05:07 -08:00
JonathingandPaint_Ninja	b54d77bffb	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10227 ) ConditionalRecipe still uses an ObjectHolder Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 20:04:31 -08:00
Jonathing	4a90846be3	Disable clean on TeamCity (#10259 )	2024-12-23 19:48:13 -08:00
Jonathing	0b9573a91f	Bump JNA to 5.12.1 (#10187 )	2024-11-26 12:29:04 -08:00
Jonathing	621d3f8494	[1.19.4] Bump CoreMods to 5.2 (#10131 ) 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 - Updated ASM to 9.7.1 - Updated Nashorn to 15.4	2024-11-08 18:19:04 -08:00
Paint_Ninja	fb7e448ff1	Remove unneeded boat patch (backport of #10061 to 1.19.4) (#10102 )	2024-10-06 18:06:48 -07:00
Paint_Ninja	23db859f86	Minor cleanup to ModListScreen and VersionChecker (backport of #9988 to 1.19.4) (#10104 )	2024-09-12 14:09:33 +01:00
Paint_Ninja	ffcf183f3f	Cleanup FML Bindings (backport of #10004 to 1.19.4) (#10101 )	2024-09-12 14:09:21 +01:00
Paint_NinjaandRealMangoRage	05fc73aa8d	Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.19.4) (#10103 ) Co-authored-by: RealMangoRage <[email protected]>	2024-09-12 14:09:11 +01:00
Jonathingandthedarkcolour	6d94dd5306	Choose default JarJar mod file type based on parent JAR (#10024 ) Co-authored-by: thedarkcolour <[email protected]>	2024-07-02 12:23:06 -07:00
JonathingandVen	bfd3ed64a4	Fixed falling block entities not rendering as moving blocks (#10006 ) (#10019 ) Co-authored-by: Ven <[email protected]>	2024-07-02 11:45:48 -07:00
Edouard127andLexManos	cc5a9a43b9	Unlock wrapped registries when firing register events. (#10034 ) Co-authored-by: LexManos <[email protected]>	2024-07-02 11:26:20 -07:00
LexManos	a855b83de8	1.19.4 RB 3 https://forums.minecraftforge.net/topic/149473-forge-453-minecraft-1194/	2024-06-03 14:16:14 -07:00
LexManos	1c2de0cc72	Bump gradle to 8.8	2024-06-03 13:59:53 -07:00
Paint_NinjaandJ-RAP	388976f288	Fix NPE when acceptableValues in defineInList() does not allow nulls, backport of #9903 (#9908 ) Co-authored-by: J-RAP <[email protected]>	2024-04-18 21:32:03 +01:00
Paint_Ninja	2b67a9f36d	Optimise capabilities a tad, backport of #9886 (#9917 )	2024-04-18 21:09:30 +01:00
Paint_Ninja	9305aff10f	Make common config screen registration tasks easier, backport of #9884 (#9913 )	2024-04-18 21:09:04 +01:00
Paint_Ninja	dbd0dba883	Fix crowdin (#9924 )	2024-04-15 22:34:03 +01:00
Paint_Ninja	959a2db3e0	Fix userdev by reverting CoreMods upgrades (#9923 ) Was an obscure transitive dep issue	2024-04-15 21:25:00 +01:00
Paint_Ninja	ae0c1fb4c1	[1.19.4] Bump CoreMods and ASM (#9898 ) - CoreMods 5.1.2 -> 5.1.6 - ASM 9.6 -> 9.7	2024-04-04 14:01:57 +01:00
J-RAP	6b166f3f40	Bump some deps (#9879 ) - 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:24:22 +00:00
Paint_Ninja	b1c0cc77bb	Make common DisplayTest registration tasks easier (#9837 ) Backport of #9822 to 1.19.4	2023-12-31 15:36:57 +00:00
Paint_Ninja	c369f8186b	Optimise ForgeConfigSpec and make Range public (#9826 ) Backport of #9810 to 1.19.4	2023-12-30 21:13:33 +00:00
Paint_Ninja	de4946a1ae	Backport CrashReportAnalyser to 1.19.4 (#9756 )	2023-11-02 13:19:07 -07:00
Paint_NinjaandSu5eD	76e3afd528	Improve mod description formatting in mods screen (#9770 ) Co-authored-by: Su5eD <[email protected]>	2023-11-02 13:18:57 -07:00
Paint_Ninja	4a62c9ed87	Update to FG6 and Gradle 8, backport 1.20 MDK (#9753 )	2023-10-18 13:39:53 -07:00
BigBigZhe	cc75529ec4	Fix Melon/Pumpkin stems having wrong plant type causing them to remain after trampling farmland.	2023-10-11 22:55:40 -07:00
Paint_Ninja	bbd8c2e07e	Optimise path filter in mod loading (#9711 )	2023-09-28 14:56:42 -07:00
Paint_NinjaandJab125	dfef5101f1	Improve mod loading error message for errors inside mod constructors (#9708 ) Co-authored-by: Jab125 <[email protected]>	2023-09-28 14:56:12 -07:00
LexManos	664a2c06ad	1.19.4 RB 2	2023-09-21 11:52:10 -07:00
Paint_Ninjaandmalte0811	e85295a837	Fix `Level` leak in debug HUD (#9700 ) Co-authored-by: malte0811 <[email protected]>	2023-09-02 17:02:03 -07:00
Paint_Ninjaanddhyces	21582ef641	Keep order of sources in PackRepository (#9703 ) Co-authored-by: dhyces <[email protected]>	2023-09-02 16:21:21 -07:00
Paint_Ninja	020ec3d51b	Fix DelegatingPackResources searching resource path twice (#9698 )	2023-08-30 14:10:38 -07:00
Jonathan Colmenares	774b79e609	Fix parameter names in IForgeDimensionSpecialEffects.adjustLightmapColors to better describe what they are. (#9657 )	2023-07-17 09:45:29 -07:00
Jonathan Colmenares	ee6022b006	Add mods button to pause menu (#9654 )	2023-07-17 08:41:11 -07:00
brandon3055	37efd2b8ae	Fixed FluidUtil#tryFillContainer returning invalid result when simulating #9358	2023-07-15 10:52:26 -07:00
Random832	cf3d42ef38	Fix conflicting keybindings not having the correct click count set. #9360	2023-07-15 10:44:29 -07:00
RealMangoRage	03a505a3f2	Fixed AdvancementsScreen.java to render next/previous page buttons now. (#9650 )	2023-07-14 19:22:33 -07:00
ChampionAsh5357	bdc856edf5	Properly Handle Fluid Updates while in a Boat Fix #9256 (#9428 )	2023-07-14 19:06:07 -07:00
Silver_David	6eebea0896	New hook in IClientBlockExtensions to handle enabling tinting on breaking particles. #9446	2023-07-14 16:08:51 -07:00
Technici4n	9218e08955	Add `EmptyEnergyStorage` (#9487 )	2023-07-14 11:34:12 -07:00
Paint_Ninja	7006fe4f29	Support IPv6 address compression for logged IPs	2023-07-14 11:30:57 -07:00
Paint_Ninja	301e7252b0	Add option to advertise dedicated servers to LAN. (#9502 )	2023-07-14 07:07:36 -07:00
ChampionAsh5357	2b5852072c	Add particle description data provider (#9510 )	2023-07-13 19:35:07 -07:00
bconlon	0b38373a45	AlterGroundEvent for modifying block placement performed by AlterGroundDecorator (#9636 )	2023-07-13 17:30:45 -07:00
Paint_Ninja	07e538f3dd	Improve logging for server connections (#9622 )	2023-07-11 11:04:45 -07:00
cech12	b39e300c1b	Fix placing fluids into waterlogged blocks with FluidUtil::tryPlaceFluid. To behave more like vanilla MC-127110 (#9519 )	2023-07-11 11:04:26 -07:00
LexManos	50db51a366	Add proper duplicate mod error message that includes the mod id(s) and mod files. (#9474 )	2023-06-20 14:18:14 -07:00
LexManos	df80acc49d	Make 1.20.x the main TC branch.	2023-06-20 14:07:42 -07:00