1.19.4 RB 3

https://forums.minecraftforge.net/topic/149473-forge-453-minecraft-1194/
Bump gradle to 8.8
2026-11-14 01:04:24 +00:00 · 2024-06-03 14:16:14 -07:00 · 2024-06-03 13:59:53 -07:00 · 2024-04-18 21:32:03 +01:00 · 2024-04-18 21:09:30 +01:00 · 2024-04-18 21:09:04 +01:00
419 changed files with 6615 additions and 1931 deletions
@@ -34,6 +34,7 @@
 /repo/
 src/generated/resources/.cache/
 src/generated_test/resources/.cache/
+src/generated_mdk/resources/.cache/

 #Patch rejects
 /patches-/
@@ -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
@@ -19,15 +20,16 @@ import net.minecraftforge.gradle.common.tasks.SignJar
 import net.minecraftforge.gradle.userdev.tasks.RenameJar
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
+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 '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!
@@ -53,8 +55,8 @@ ext {
    MODLAUNCHER_VERSION = '10.0.8'
    SECUREJARHANDLER_VERSION = '2.1.6'
    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
-    ASM_VERSION = '9.3'
-    INSTALLER_VERSION = '2.1.+'
+    ASM_VERSION = '9.7'
+    INSTALLER_VERSION = '2.2.+'
    MIXIN_VERSION = '0.8.5'
    TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
    JLINE_VERSION = '3.12.+'
@@ -80,7 +82,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'
@@ -101,7 +103,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'
@@ -344,7 +346,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
    }

@@ -883,6 +885,10 @@ project(':forge') {
    apply plugin: 'net.minecraftforge.gradle.patcher'
    apply plugin: 'org.cadixdev.licenser'

+    applyPatches { 
+        level 'WARNING'
+    }
+
    sourceSets {
        main {
            java {
@@ -1077,11 +1083,38 @@ project(':forge') {
                            '--mod', 'data_pack_registries_test',
                            '--mod', 'biome_modifiers_test',
                            '--mod', 'structure_modifiers_test',
+                            '--mod', 'custom_preset_editor_test',
                            '--output', rootProject.file('src/generated_test/resources/'),
                            '--existing', sourceSets.main.resources.srcDirs[0],
                            '--existing', sourceSets.test.resources.srcDirs[0]
                }
            }
+
+            forge_mdk_data {
+                parent runs.forge_data
+                taskName 'forge_mdk_data'
+
+                environment 'MOD_CLASSES', 'dummy' // Needed to work around FG limitation, FG will replace this!
+
+                ideaModule "${rootProject.name}.${project.name}.test"
+
+                mods {
+                    tests { sources sourceSets.test }
+                }
+
+                afterEvaluate {
+                    // Clear forge's main datagen args
+                    args.removeAll {
+                        forgeDataArgs.contains(it instanceof File ? (it as File).absolutePath : it.toString())
+                    }
+
+                    args '--flat', '--all', '--validate',
+                            '--mod', 'mdk_datagen',
+                            '--output', rootProject.file('src/generated_mdk/resources/'),
+                            '--existing', sourceSets.main.resources.srcDirs[0],
+                            '--existing', sourceSets.test.resources.srcDirs[0]
+                }
+            }
        }
    }

@@ -1136,9 +1169,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)
@@ -1174,12 +1210,31 @@ project(':forge') {
        }
    }

+    task findFinalizeSpawnTargets(type: BytecodePredicateFinder, dependsOn: ['createJoinedSRG']) {
+        jar = createJoinedSRG.output
+        output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
+        predicate = {
+            parent, node, insn ->
+                'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
+                && insn.getOpcode() == Opcodes.INVOKEVIRTUAL
+                && insn.name.equals('m_6518_')
+                && insn.desc.equals('(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;')
+        }
+    }
+
+    tasks.register('validateDeprecations', ValidateDeprecations) {
+        input = tasks.jar.archiveFile
+        mcVersion = MC_VERSION
+    }
+
+    tasks.jar.finalizedBy 'validateDeprecations'
+
    tasks.register('checkAll') {
        dependsOn 'checkLicenses'
        group = 'checks'
    }
    tasks.register('checkAllAndFix') {
-        dependsOn 'findFieldInstanceChecks', 'checkLicenses'
+        dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses'
        group = 'checks'
    }

@@ -1218,7 +1273,7 @@ project(':forge') {
    }

    def baseForgeVersionProperty = project.objects.property(String)
-    baseForgeVersionProperty.set(project.provider { getLatestForgeVersion(MC_VERSION) }.map { MC_VERSION + '-' + it })
+    baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) })
    baseForgeVersionProperty.finalizeValueOnRead()
    def jarCompatibilityTaskSetup = { task ->
        task.group = 'jar compatibility'
@@ -1525,9 +1580,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 ->
@@ -1572,7 +1630,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,
@@ -1584,6 +1642,10 @@ project(':forge') {
            rename 'gitignore\\.txt', '.gitignore'
            rename 'gitattributes\\.txt', '.gitattributes'
        }
+        from(rootProject.file('src/generated_mdk/resources/')) {
+            into('src/main/resources/')
+            exclude '**/.cache/'
+        }
    }

    license {
@@ -1735,4 +1797,4 @@ if (System.env.TEAMCITY_VERSION) {
            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
        }
    }
-}
+}
@@ -4,9 +4,10 @@ repositories {
 }

 dependencies {
-	implementation 'org.ow2.asm:asm:9.3'
-	implementation 'org.ow2.asm:asm-tree:9.3'
-    implementation 'net.minecraftforge:srgutils:0.4.+'
-    implementation 'commons-io:commons-io:2.8.0'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'org.ow2.asm:asm:9.5'
+    implementation 'org.ow2.asm:asm-tree:9.5'
+    implementation 'net.minecraftforge:srgutils:0.5.+'
+    implementation 'commons-io:commons-io:2.12.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
 }
@@ -4,20 +4,17 @@ import groovy.json.JsonBuilder
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode

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

    BytecodeFinder() {
        output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
@@ -33,18 +30,7 @@ abstract class BytecodeFinder extends DefaultTask {

        pre()

-        jar.get().asFile.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
-                    if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(Opcodes.ASM9)
-                        new ClassReader(zin).accept(node, 0)
-                        process(node)
-                    }
-                }
-            }
-        }
+        Util.processClassNodes(jar.get().asFile, this::process)

        post()
        outputFile.text = new JsonBuilder(getData()).toPrettyString()
@@ -0,0 +1,32 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.CompileStatic
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Internal
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.MethodNode
+
+@CompileStatic
+abstract class BytecodePredicateFinder extends BytecodeFinder {
+
+    @Internal
+    abstract Property<Closure<Boolean>> getPredicate()
+
+    private final Set<String> matches = new HashSet()
+
+    @Override
+    protected process(ClassNode parent, MethodNode node) {
+        for (final current : node.instructions) {
+            if (predicate.get().call(parent, node, current)) {
+                matches.add(parent.name)
+                return
+            }
+        }
+    }
+
+    @Internal
+    @Override
+    protected Object getData() {
+        return matches.stream().sorted().toList() ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
+    }
+}
@@ -6,7 +6,7 @@ import org.gradle.api.provider.SetProperty

 abstract class InstallerJar extends Zip {
    @Input @Optional abstract SetProperty<String> getPackedDependencies()
-    
+
    InstallerJar() {
        archiveClassifier.set('installer')
        archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
@@ -15,7 +15,7 @@ abstract class InstallerJar extends Zip {
        def installerJson = project.tasks.installerJson
        def launcherJson = project.tasks.launcherJson
        def downloadInstaller = project.tasks.downloadInstaller
-        
+
        dependsOn(installerJson, launcherJson, downloadInstaller)
        from(installerJson, launcherJson)

@@ -24,13 +24,13 @@ abstract class InstallerJar extends Zip {
            from(project.zipTree(downloadInstaller.output)) {
                duplicatesStrategy = 'exclude'
            }
-            
-            if (!System.env.MAVEN_USER) {
+
+            if (!System.env.TEAMCITY_VERSION) {
                dependsOn(project.universalJar)
                from(project.universalJar) {
                    into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/'
                }
-    
+
                packedDependencies.get().forEach {
                    def jarTask = project.rootProject.getTasks().findByPath(it)
                    dependsOn(jarTask)
@@ -0,0 +1,74 @@
+package net.minecraftforge.forge.tasks
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import groovy.transform.CompileStatic
+import org.eclipse.jgit.api.Git
+
+import javax.annotation.Nullable
+import java.util.stream.Collectors
+
+@CompileStatic
+class TeamcityRequests {
+    public static final Gson GSON = new Gson()
+
+    @Nullable
+    static <T> T jsonRequest(TypeToken<T> clazz, String url) throws Exception {
+        final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection()
+        conn.setRequestProperty('Accept', 'application/json')
+        conn.setReadTimeout(5 * 1000)
+        conn.setConnectTimeout(5 * 1000)
+        conn.connect()
+
+        if (conn.responseCode !== 200) {
+            return null
+        }
+
+        try (final InputStream is = conn.getInputStream()) {
+            GSON.fromJson(new InputStreamReader(is), clazz.getType())
+        }
+    }
+
+    @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),defaultFilter:false,count:300,status:SUCCESS')
+                ?.build?.forEach {
+            it.revisions.revision.each { rev -> builds[rev.version] = it }
+        }
+        return builds
+    }
+
+    @Nullable
+    static String attemptFindBase(File gitPath) {
+        try (final git = Git.open(gitPath)) {
+            final Map<String, Build> buildByCommit = buildsByCommit()
+            for (final commit in git.log().setMaxCount(100).call()) {
+                // Find the first commit which was built on CI
+                final build = buildByCommit[commit.id.name]
+                if (build) {
+                    return build.number
+                }
+            }
+        } catch (Exception ignored) {}
+        return null
+    }
+
+    static final class Builds {
+        public List<Build> build
+    }
+
+    static final class Build {
+        public String number
+        public Revisions revisions
+    }
+
+    static final class Revisions {
+        public int count
+        public List<Revision> revision
+    }
+
+    static final class Revision {
+        public String version
+    }
+}
@@ -2,13 +2,20 @@ package net.minecraftforge.forge.tasks

 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.tree.ClassNode

 import java.io.File
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream

 public class Util {
+    static final ASM_LEVEL = Opcodes.ASM9
+
 	static void init() {
 		File.metaClass.sha1 = { ->
 			MessageDigest md = MessageDigest.getInstance('SHA-1')
@@ -74,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: [
@@ -143,8 +142,24 @@ public class Util {
 		}
 	}

-    public static String getLatestForgeVersion(mcVersion) {
-        def json = new JsonSlurper().parseText(new URL("https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json").getText("UTF-8"))
-        return json.promos["$mcVersion-latest"]
+    static String getLatestForgeVersion(mcVersion) {
+        final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
+        final ver = json.promos["$mcVersion-latest"]
+        ver === null ? null : (mcVersion + '-' + ver)
+    }
+
+    static void processClassNodes(File file, Closure process) {
+        file.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                ZipEntry zein
+                while ((zein = zin.nextEntry) != null) {
+                    if (zein.name.endsWith('.class')) {
+                        def node = new ClassNode(ASM_LEVEL)
+                        new ClassReader(zin).accept(node, 0)
+                        process(node)
+                    }
+                }
+            }
+        }
    }
 }
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.forge.tasks
+
+import net.minecraftforge.srgutils.MinecraftVersion
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import org.objectweb.asm.tree.AnnotationNode
+import org.objectweb.asm.tree.ClassNode
+
+abstract class ValidateDeprecations extends DefaultTask {
+    @InputFile
+    abstract RegularFileProperty getInput()
+
+    @Input
+    abstract Property<String> getMcVersion()
+
+    ValidateDeprecations() {
+        this.onlyIf { !System.env.TEAMCITY_VERSION }
+    }
+
+    @TaskAction
+    protected void exec() {
+        def mcVer = MinecraftVersion.from(mcVersion.get())
+        def errors = []
+
+        Util.processClassNodes(input.get().asFile) {
+            processNode(mcVer, errors, it)
+        }
+
+        if (!errors.isEmpty()) {
+            errors.forEach {
+                this.logger.error("Deprecated ${it[0]} is marked for removal in ${it[1]} but is not yet removed")
+            }
+            throw new IllegalStateException("Found deprecated members marked for removal but not yet removed in ${mcVer}; see log for details")
+        }
+    }
+
+    protected processNode(MinecraftVersion mcVer, List<String> errors, ClassNode node) {
+        node.visibleAnnotations?.each { annotation ->
+            ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
+                "class ${node.name}"
+            }
+        }
+        node.fields?.each { field ->
+            field.visibleAnnotations?.each { annotation ->
+                ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
+                    "field ${node.name}#${field.name}"
+                }
+            }
+        }
+        node.methods?.each { method ->
+            method.visibleAnnotations?.each { annotation ->
+                ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
+                    "method ${node.name}#${method.name}${method.desc}"
+                }
+            }
+        }
+    }
+
+    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure context) {
+        def values = annotation.values
+        if (values === null)
+            return
+        int forRemoval = values.indexOf('forRemoval')
+        int since = values.indexOf('since')
+        if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
+            def oldVersion = MinecraftVersion.from(values[since + 1])
+            def split = ValidateDeprecations.splitDots(oldVersion.toString())
+            if (split.length < 2)
+                return
+            def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
+            if (removeVersion <= mcVer)
+                errors.add([context(), removeVersion])
+        }
+    }
+
+    private static int[] splitDots(String version) {
+        String[] pts = version.split('\\.')
+        int[] values = new int[pts.length]
+        for (int x = 0; x < pts.length; x++)
+            values[x] = Integer.parseInt(pts[x])
+        return values
+    }
+}
@@ -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()
@@ -1,5 +1,6 @@
 package net.minecraftforge.forge.tasks.checks

+import net.minecraftforge.forge.tasks.Util
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
@@ -7,7 +8,6 @@ import org.gradle.api.tasks.InputFiles
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
-import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type

 import java.util.zip.ZipEntry
@@ -67,7 +67,7 @@ abstract class CheckExcs extends CheckTask {
    private void collectKnown(Collection<String> known) {
        binary.get().asFile.withInputStream { i ->
            new ZipInputStream(i).withCloseable { zin ->
-                final visitor = new ClassVisitor(Opcodes.ASM9) {
+                final visitor = new ClassVisitor(Util.ASM_LEVEL) {
                    private String cls
                    @Override
                    void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
@@ -35,6 +35,11 @@ abstract class CheckPatches extends CheckTask {
            }
        }
    }
+    
+    def accessChange(previous, current) {
+        //return ACCESS_MAP[previous] < ACCESS_MAP[current]
+        return previous != current
+    }

    void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
        final oldFixedErrors = reporter.fixed.size()
@@ -87,7 +92,7 @@ abstract class CheckPatches extends CheckTask {
                            pMatcher.group(6) == cMatcher.group(6) && // = ...
                            pMatcher.group(5) == cMatcher.group(5) && // field name
                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (ACCESS_MAP[pMatcher.group(2)] < ACCESS_MAP[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
+                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
                    }

@@ -98,7 +103,7 @@ abstract class CheckPatches extends CheckTask {
                            pMatcher.group(6) == cMatcher.group(6) && // params
                            pMatcher.group(5) == cMatcher.group(5) && // <T> void name
                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (ACCESS_MAP[pMatcher.group(2)] < ACCESS_MAP[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
+                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
                    }

@@ -109,7 +114,7 @@ abstract class CheckPatches extends CheckTask {
                            pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
                            pMatcher.group(5) == cMatcher.group(5) && // class | interface
                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (ACCESS_MAP[pMatcher.group(2)] < ACCESS_MAP[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
+                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
                    }
                }
@@ -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") }
    }
@@ -7,7 +7,7 @@ Contributing to Forge

 3) Follow the code style of the class you're working in (braces on newlines & spaces instead of tabs in Forge classes, inline brackets in patches, etc).

-For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
+For more information, refer to [the wiki][Wiki].


 Contributor License Agreement
@@ -16,3 +16,5 @@ Contributor License Agreement
 - You assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the LGPLv2.1 license.

 "Forge" is Forge Development LLC, a legally incorporated entity in Oregon, USA.
+
+[Wiki]: https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge
@@ -2,16 +2,17 @@

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

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

 | Version |    Support    |
 |---------| ------------- |
-| 1.19.x  |    Active     |
-| 1.18.x  |    LTS        |
+| 1.20.x  |    Active     |
+| 1.19.4  |    Legacy     |
+| 1.19.2  |    Legacy     |

 * [Download]
 * [Forum]
@@ -20,7 +21,7 @@ Forge is a free, open-source modding API all of your favourite mods use!

 # Installing Forge

-Go to [the Forge website](https://files.minecraftforge.net)
+Go to [the Forge website][Download]
 and select the Minecraft version you wish to get Forge for from the list.

 You can download the installer for the *Recommended Build* or the
@@ -29,38 +30,48 @@ You can download the installer for the *Recommended Build* or the
 into your vanilla launcher environment, where you can then create a new
 profile using that version and play the game!
 
-For support and questions, visit [the Support Forum](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/) or [the Forge Discord server](https://discord.gg/forge).
-
-[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
+For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].

 # Creating Mods

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

 # Contribute to Forge

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

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

 ### Pull requests

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

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

 ### Contributor License Agreement
-We require all contributors to acknowledge the [Forge Contributor License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). 
+We require all contributors to acknowledge the [Forge Contributor License Agreement][CLA]. 
 Please ensure you have a valid email address associated with your GitHub account to do this. If you have previously 
 signed it, you should be OK.

 #### Donate
 *Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free 
 to use and modify. However, it costs money to run such a large project as this, so please consider 
- [becoming a patron](https://www.patreon.com/LexManos).*
+ [becoming a patron][Patreon].*
+
+[Contributing]: ./CONTRIBUTING.md
+[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge

 [Download]: https://files.minecraftforge.net/
-[Forum]: https://www.minecraftforge.net/forum/
-[Discord]: https://discord.gg/UvedJ9m
-[Documentation]: https://mcforge.readthedocs.io
+
+[Forum]: https://forums.minecraftforge.net/
+[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
+
+[Discord]: https://discord.minecraftforge.net/
+
+[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
@@ -1,7 +1,7 @@
 Getting Support Surrounding Forge
 =================================

-**If you do not want to read the following wall of text, no matter its relevance for helping get your issue resolved quickly, please refer to the [Forge Forums](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) for support.**
+**If you do not want to read the following wall of text, no matter its relevance for helping get your issue resolved quickly, please refer to the [Forge Forums][Bug-Reports] for support.**

 Before reporting an issue on this repository's bug tracker, please carefully read this document. There are various resources that are more likely to be able to help you with certain kinds of issues. This document provides instructions on how to determine which place best to report to.

@@ -44,7 +44,7 @@ You can generally tell pretty quickly what caused the error at the head of your
 1. If you can find the name of a mod in the trace, that mod most likely is the culprit.
    - Be aware that you may find multiple mods as participants of a crash. In that case, you can either report to both or try to reason (using the names in the stacktrace) about which mod is at fault.
 2. If you can only find Forge (usually starting with `net.minecraftforge`) alongside Vanilla (usually starting with `net.minecraft`) references, chances are that you have found a bug in Forge. In this case, use one of the various [support channels](#forge-support) listed below.
-    - The occurence of a single call to Forge somewhere in the stacktrace *does not* warrant a report to Forge if there are mods present in the crash report.
+    - The occurrence of a single call to Forge somewhere in the stacktrace *does not* warrant a report to Forge if there are mods present in the crash report.
 3. If there's no mention of Forge or a mod, but any Vanilla class, you might have found a Vanilla bug. You should probably still report it via the Forge channels first, however, due the nature of modded environments and the rarity of Vanilla crash bugs.
 4. Always check whether there's a mention of coremods at the beginning of a crash report. If there is and you can't find any clear culprit, consider reporting to these coremods first, since they are free to change any of the code executed in your environment.

@@ -74,10 +74,10 @@ Please note that this list has to be considered incomplete as there is a large n

 If you're certain you've found an issue that is directly caused by Forge, you have the following three platforms available for dealing with it, with decreasing relevance for end-users:

- 1. **Forge Forums:** There's a dedicated [Support & Bug Report](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) section on the Forge forums, which is led by team of moderators and volunteers who will try to deal with your reports as quickly as possible. *As a player you should probably report here first.*
-   - For modders, there also is a separate [Modder Support](http://www.minecraftforge.net/forum/forum/70-modder-support/) section where you can ask all your development-related questions. *You should prefer this section for coding help.*
- 2. **Forge Discord Server:** You can find a lot of help on the official [Discord Server](https://discord.gg/forge), especially smaller issues that you quickly need help with. *Be aware that the channel is more suited towards development questions, so while you may get support there as a player, you should almost always prefer the forums.*
- 3. **Forge Issue Tracker:** If you're absolutely certain that you've found an issue in the Forge codebase (e.g. you're a modder yourself and have analyzed the stacktrace and relevant code), don't refrain from reporting it on this repository's [issue tracker](https://github.com/MinecraftForge/MinecraftForge/issues). *Please do not use the issues as a means of getting coding help. For developers, the IRC and the [official documentation](https://mcforge.readthedocs.io) are the best sources of information.*
+ 1. **Forge Forums:** There's a dedicated [Support & Bug Report][Bug-Reports] section on the Forge forums, which is led by team of moderators and volunteers who will try to deal with your reports as quickly as possible. *As a player you should probably report here first.*
+   - For modders, there also is a separate [Modder Support][Modder-Support] section where you can ask all your development-related questions. *You should prefer this section for coding help.*
+ 2. **Forge Discord Server:** You can find a lot of help on the official [Discord Server][Discord], especially smaller issues that you quickly need help with. *Be aware that the channel is more suited towards development questions, so while you may get support there as a player, you should almost always prefer the forums.*
+ 3. **Forge Issue Tracker:** If you're absolutely certain that you've found an issue in the Forge codebase (e.g. you're a modder yourself and have analyzed the stacktrace and relevant code), don't refrain from reporting it on this repository's [issue tracker](https://github.com/MinecraftForge/MinecraftForge/issues). *Please do not use the issues as a means of getting coding help. For developers, the IRC and the [official documentation][Documentation] are the best sources of information.*

 ### Mod Support

@@ -99,7 +99,7 @@ Now that you've identified the source of your issue and decided on the correct s
 ### Preventing Duplicates and Unnecessary Reports
 Use the target issue tracker's search functionality to look for issues which have descriptions similar to yours, but make sure to also search for already closed issues. If you can find one, verify it is in fact the same (or a very similar issue) and simply comment on it if you have anything else to contribute to the discussion, such as other steps to reproduce it. *Do not create duplicates of an existing issue, since it only puts extra effort on maintainers to recognize and close/mark them.*

-Additionally, always check the *latest* changelogs of Forge and participating mods to find out if the bug was already noticed and fixed by the developer. Often the maintainer may only support newer versions of the game, so also check the changelogs for versions of Minecraft you don't actually actively play. If the issue was adressed already, *do not report it*, even if the fix only exists for a newer version of the game, since the developer probably had a good reason to do so. If your issue only exists with versions of a mod that are for very old versions of the game, also refrain from reporting them, considering most modders only support the two latest versions of Minecraft, if at all.
+Additionally, always check the *latest* changelogs of Forge and participating mods to find out if the bug was already noticed and fixed by the developer. Often the maintainer may only support newer versions of the game, so also check the changelogs for versions of Minecraft you don't actually actively play. If the issue was addressed already, *do not report it*, even if the fix only exists for a newer version of the game, since the developer probably had a good reason to do so. If your issue only exists with versions of a mod that are for very old versions of the game, also refrain from reporting them, considering most modders only support the two latest versions of Minecraft, if at all.

 ### Required Information
 If you're certain that your issue went unnoticed up until now, you can get to actually writing up the report. Below you can find a list of the *required* information any bug report should contain:
@@ -144,4 +144,11 @@ After you have written your bug report, it is time to *wait*. Please be *patient

 Every project has a different way of dealing with issues, so don't wonder if there's no comment on it, but somebody "labels" it with certain markers. This helps developers to more easily keep track of bugs and priorities. When any further input from you is required, you will be asked specifically. Do not bug anyone through other channels about resolving your issue.

-Once your issue is closed, you will know whether it was valid or turned out to be irreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.
+Once your issue is closed, you will know whether it was valid or turned out to be unreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.
+
+[Bug-Reports]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
+[Modder-Support]: https://forums.minecraftforge.net/forum/70-modder-support/
+
+[Discord]: https://discord.minecraftforge.net/
+
+[Documentation]: https://docs.minecraftforge.net/
@@ -5,33 +5,93 @@

 package net.minecraftforge.fml;

+import com.mojang.logging.LogUtils;
+import org.slf4j.Logger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;

-public class CrashReportCallables {
+public class CrashReportCallables
+{
+    private static final Logger LOGGER = LogUtils.getLogger();
    private static final List<ISystemReportExtender> crashCallables = Collections.synchronizedList(new ArrayList<>());

+    /**
+     * Register a custom {@link ISystemReportExtender}
+     */
    public static void registerCrashCallable(ISystemReportExtender callable)
    {
        crashCallables.add(callable);
    }

-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator) {
-        registerCrashCallable(new ISystemReportExtender() {
+    /**
+     * Register a {@link ISystemReportExtender system report extender} with the given header name and content
+     * generator, which will always be appended to the system report
+     * @param headerName The name of the system report entry
+     * @param reportGenerator The report generator to be called when a crash report is built
+     */
+    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator)
+    {
+        registerCrashCallable(new ISystemReportExtender()
+        {
            @Override
-            public String getLabel() {
+            public String getLabel()
+            {
                return headerName;
            }
+
            @Override
-            public String get() {
+            public String get()
+            {
                return reportGenerator.get();
            }
        });
    }

-    public static List<ISystemReportExtender> allCrashCallables() {
+    /**
+     * Register a {@link ISystemReportExtender system report extender} with the given header name and content
+     * generator, which will only be appended to the system report when the given {@link BooleanSupplier} returns true
+     * @param headerName The name of the system report entry
+     * @param reportGenerator The report generator to be called when a crash report is built
+     * @param active The supplier of the flag to be checked when a crash report is built
+     */
+    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator, BooleanSupplier active)
+    {
+        registerCrashCallable(new ISystemReportExtender()
+        {
+            @Override
+            public String getLabel()
+            {
+                return headerName;
+            }
+
+            @Override
+            public String get()
+            {
+                return reportGenerator.get();
+            }
+
+            @Override
+            public boolean isActive()
+            {
+                try
+                {
+                    return active.getAsBoolean();
+                }
+                catch (Throwable t)
+                {
+                    LOGGER.warn("CrashCallable '{}' threw an exception while checking the active flag, disabling", headerName, t);
+                    return false;
+                }
+            }
+        });
+    }
+
+    public static List<ISystemReportExtender> allCrashCallables()
+    {
        return List.copyOf(crashCallables);
    }
 }
@@ -11,9 +11,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.function.Supplier;

 import com.google.common.base.Stopwatch;
@@ -53,17 +55,29 @@ public class DeferredWorkQueue
    public void runTasks() {
        if (tasks.isEmpty()) return;
        LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
+        RuntimeException aggregate = new RuntimeException();
        Stopwatch timer = Stopwatch.createStarted();
-        tasks.forEach(t->makeRunnable(t, Runnable::run));
+        tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
        timer.stop();
-        LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
+        if (aggregate.getSuppressed().length > 0) {
+            LOGGER.fatal(
+                    LOADING,
+                    "Synchronous work queue completed exceptionally in {}, see suppressed exceptions for details:",
+                    timer,
+                    aggregate
+            );
+            //TODO 1.20: throw aggregate exception
+        } else {
+            LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
+        }
    }

-    private static void makeRunnable(TaskInfo ti, Executor executor) {
+    private static void makeRunnable(TaskInfo ti, Executor executor, RuntimeException aggregate) {
        executor.execute(() -> {
            Stopwatch timer = Stopwatch.createStarted();
            ModLoadingContext.get().setActiveContainer(ti.owner);
            try {
+                ti.future.exceptionally(t -> captureException(ti.owner.getModId(), aggregate, t));
                ti.task.run();
            } finally {
                ModLoadingContext.get().setActiveContainer(null);
@@ -75,13 +89,38 @@ public class DeferredWorkQueue
        });
    }

+    private static <T> T captureException(String modId, RuntimeException aggregate, Throwable throwable) {
+        if (throwable instanceof CompletionException ce) {
+            throwable = ce.getCause();
+        }
+        aggregate.addSuppressed(throwable);
+        LOGGER.error("Mod '{}' encountered an error in a deferred task:", modId, throwable);
+        return null;
+    }
+
    public CompletableFuture<Void> enqueueWork(final ModContainer modInfo, final Runnable work) {
-        return CompletableFuture.runAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
+        return enqueueWork(modInfo, taskInfo -> CompletableFuture.runAsync(work, r -> taskInfo.task = r));
    }

    public <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, final Supplier<T> work) {
-        return CompletableFuture.supplyAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
+        return enqueueWork(modInfo, taskInfo -> CompletableFuture.supplyAsync(work, r -> taskInfo.task = r));
    }

-    record TaskInfo(ModContainer owner, Runnable task) {}
+    private <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, Function<TaskInfo, CompletableFuture<T>> futureGen) {
+        TaskInfo taskInfo = new TaskInfo(modInfo);
+        CompletableFuture<T> future = futureGen.apply(taskInfo);
+        taskInfo.future = future;
+        tasks.add(taskInfo);
+        return future;
+    }
+
+    private static class TaskInfo {
+        private final ModContainer owner;
+        private Runnable task;
+        private CompletableFuture<?> future;
+
+        private TaskInfo(ModContainer owner) {
+            this.owner = owner;
+        }
+    }
 }
@@ -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);
+        }
    }
 }
@@ -10,4 +10,9 @@ import java.util.function.Supplier;
 public interface ISystemReportExtender extends Supplier<String>
 {
    String getLabel();
+
+    default boolean isActive()
+    {
+        return true;
+    }
 }
@@ -20,6 +20,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;

@@ -63,9 +64,9 @@ public abstract class ModContainer
                    () -> 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 +143,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);
    }
@@ -82,6 +82,7 @@ public class ModLoader
    private boolean loadingStateValid;
    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
    private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
+    private final Set<IModLoadingState> completedStates = new HashSet<>();
    private ModList modList;

    private ModLoader()
@@ -200,6 +201,7 @@ public class ModLoader
        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
        state.buildTransition(syncExecutor, parallelExecutor).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        completedStates.add(state);
    }

    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
@@ -210,6 +212,7 @@ public class ModLoader
        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
        state.buildTransition(syncExecutor, parallelExecutor, preSyncTask, postSyncTask).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        completedStates.add(state);
    }

    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
@@ -296,6 +299,11 @@ public class ModLoader
        return get().loadingStateValid;
    }

+    public boolean hasCompletedState(final String stateName) {
+        IModLoadingState state = stateManager.findState(stateName);
+        return completedStates.contains(state);
+    }
+
    public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
        if (!loadingStateValid) {
            LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
@@ -319,6 +327,9 @@ public class ModLoader
        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
        return e;
    }
+    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
+        postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
+    }
    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
        if (!loadingStateValid) {
            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
@@ -12,6 +12,7 @@ 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
@@ -50,6 +51,44 @@ public class ModLoadingContext
        getActiveContainer().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) {
+        getActiveContainer().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) {
+        getActiveContainer().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) {
+        getActiveContainer().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) {
+        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
        if (spec.isEmpty())
        {
@@ -39,4 +39,13 @@ public class ModStateManager {
        nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
        return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
    }
+
+    public IModLoadingState findState(final String stateName) {
+        return stateMap.values()
+                .stream()
+                .flatMap(Collection::stream)
+                .filter(mls -> mls.name().equals(stateName))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
+    }
 }
@@ -10,17 +10,11 @@ import net.minecraftforge.fml.Bindings;

 import java.util.function.Function;

-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;

 public interface IConfigEvent {
-    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {
-        @Deprecated(since = "1.19.3", forRemoval = true)
-        @ApiStatus.Internal
-        ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading) {
-            this(loading, reloading, null);
-        }
-    }
+    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
+
    ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();

    static IConfigEvent reloading(ModConfig modConfig) {
@@ -69,7 +69,7 @@ public class FMLConfig
            LOGGER.trace(CORE, "Version check is {}", FMLConfig.runVersionCheck());
            LOGGER.trace(CORE, "Default config paths at {}", FMLConfig.defaultConfigPath());
        }
-        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.defaultConfigPath()), "default config directory");
+        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.defaultConfigPath()));
    }

    public static boolean splashScreenEnabled() {
@@ -9,6 +9,8 @@ import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.IEnvironment;
 import org.slf4j.Logger;

+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -57,9 +59,13 @@ public enum FMLPaths
        for (FMLPaths path : FMLPaths.values())
        {
            path.absolutePath = rootPath.resolve(path.relativePath).toAbsolutePath().normalize();
-            if (path.isDirectory)
+            if (path.isDirectory && !Files.isDirectory(path.absolutePath))
            {
-                FileUtils.getOrCreateDirectory(path.absolutePath, path.name());
+                try {
+                   Files.createDirectories(path.absolutePath);
+                } catch (IOException e) {
+                   throw new RuntimeException(e);
+                }
            }
            if (LOGGER.isDebugEnabled(CORE))
            {
@@ -68,8 +74,26 @@ public enum FMLPaths
        }
    }

+    /**
+     * @deprecated Use {@link #getOrCreateGameRelativePath(Path)} instead.
+     */
+    @Deprecated(forRemoval = true, since = "1.19.4")
    public static Path getOrCreateGameRelativePath(Path path, String name) {
-        return FileUtils.getOrCreateDirectory(FMLPaths.GAMEDIR.get().resolve(path), name);
+        return getOrCreateGameRelativePath(path);
+    }
+
+    public static Path getOrCreateGameRelativePath(Path path) {
+        Path gameFolderPath = FMLPaths.GAMEDIR.get().resolve(path);
+
+        if (!Files.isDirectory(gameFolderPath)) {
+            try {
+                Files.createDirectories(gameFolderPath);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return gameFolderPath;
    }

    public Path relative() {
@@ -10,37 +10,27 @@ import org.slf4j.Logger;

 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;

-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-
 public class FileUtils
 {
    private static final Logger LOGGER = LogUtils.getLogger();

+   /**
+    * @deprecated Use normal Java NIO methods instead
+    */
+    @Deprecated(forRemoval = true, since = "1.19.4")
    public static Path getOrCreateDirectory(Path dirPath, String dirLabel) {
-        if (!Files.isDirectory(dirPath.getParent())) {
-            getOrCreateDirectory(dirPath.getParent(), "parent of "+dirLabel);
-        }
        if (!Files.isDirectory(dirPath))
        {
-            LOGGER.debug(CORE, "Making {} directory : {}", dirLabel, dirPath);
            try {
-                Files.createDirectory(dirPath);
+                Files.createDirectories(dirPath);
            } catch (IOException e) {
-                if (e instanceof FileAlreadyExistsException) {
-                    LOGGER.error(CORE, "Failed to create {} directory - there is a file in the way", dirLabel);
-                } else {
-                    LOGGER.error(CORE, "Problem with creating {} directory (Permissions?)", dirLabel, e);
-                }
                throw new RuntimeException("Problem creating directory", e);
            }
-            LOGGER.debug(CORE, "Created {} directory : {}", dirLabel, dirPath);
-        } else {
-            LOGGER.debug(CORE, "Found existing {} directory : {}", dirLabel, dirPath);
        }
+
        return dirPath;
    }

@@ -54,7 +44,7 @@ public class FileUtils
            return "";
        }
    }
-    
+
    public static boolean matchFileName(String path, String... matches) {
        // Extract file name from path
        String name = path.substring(Math.min(path.lastIndexOf(File.separatorChar) + 1, path.length()));
@@ -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
@@ -38,7 +38,7 @@ public abstract class AbstractModProvider implements IModProvider
        var sj = SecureJar.from(
                Manifest::new,
                jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-                (root, p) -> true,
+                null,
                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();
@@ -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
@@ -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());
@@ -52,7 +52,7 @@ public class ClientModLoader
            }
        }
    }
-    public static void begin(final Minecraft minecraft, final PackRepository defaultResourcePacks, final ReloadableResourceManager mcResourceManager, ClientPackSource metadataSerializer)
+    public static void begin(final Minecraft minecraft, final PackRepository defaultResourcePacks, final ReloadableResourceManager mcResourceManager)
    {
        // force log4j to shutdown logging in a shutdown hook. This is because we disable default shutdown hook so the server properly logs it's shutdown
        Runtime.getRuntime().addShutdownHook(new Thread(LogManager::shutdown));
@@ -0,0 +1,56 @@
+/*
+ * Minecraft Forge - Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fmlonlyserver;
+
+import joptsimple.OptionParser;
+import net.minecraftforge.fml.LoadingFailedException;
+import net.minecraftforge.fml.ModLoader;
+import net.minecraftforge.fml.ModLoadingWarning;
+import net.minecraftforge.fml.ModWorkManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.util.List;
+
+import static net.minecraftforge.fml.Logging.LOADING;
+
+public class ServerModLoader
+{
+    private static final Logger LOGGER = LogManager.getLogger();
+    private static boolean hasErrors = false;
+
+    public static void addOptions(OptionParser parser)
+    {
+        // We consume this argument as we use it in the launcher and the client side.
+        parser.accepts("gameDir").withRequiredArg().ofType(File.class).defaultsTo(new File("."));
+    }
+
+    public static void load()
+    {
+        try
+        {
+            ModLoader.get().gatherAndInitializeMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), () -> {});
+            ModLoader.get().loadMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), () -> {});
+            ModLoader.get().finishMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), () -> {});
+        } catch (LoadingFailedException error)
+        {
+            ServerModLoader.hasErrors = true;
+            throw error;
+        }
+        List<ModLoadingWarning> warnings = ModLoader.get().getWarnings();
+        if (!warnings.isEmpty())
+        {
+            LOGGER.warn(LOADING, "Mods loaded with {} warnings", warnings.size());
+            warnings.forEach(warning -> LOGGER.warn(LOADING, warning.formatToString()));
+        }
+    }
+
+    public static boolean hasErrors()
+    {
+        return ServerModLoader.hasErrors;
+    }
+}
@@ -1,3 +1,4 @@
 {
-  "load_fml_client": "coremods/load_fml_client.js"
+  "load_fml_client": "coremods/load_fml_client.js",
+  "load_fml_server": "coremods/load_fml_server.js"
 }
@@ -15,16 +15,13 @@ function initializeCoreMod() {
                var meth = ASMAPI.getMethodNode();
                var resourcePackRepository = ASMAPI.mapField("f_91038_")
                var resourceManager = ASMAPI.mapField("f_91036_")
-                var clientPackSource = ASMAPI.mapField("f_91037_")
-                
+
                meth.visitVarInsn(Opcodes.ALOAD, 0);
                meth.visitVarInsn(Opcodes.ALOAD, 0);
                meth.visitFieldInsn(Opcodes.GETFIELD, "net/minecraft/client/Minecraft", resourcePackRepository, "Lnet/minecraft/server/packs/repository/PackRepository;");
                meth.visitVarInsn(Opcodes.ALOAD, 0);
                meth.visitFieldInsn(Opcodes.GETFIELD, "net/minecraft/client/Minecraft", resourceManager, "Lnet/minecraft/server/packs/resources/ReloadableResourceManager;");
-                meth.visitVarInsn(Opcodes.ALOAD, 0);
-                meth.visitFieldInsn(Opcodes.GETFIELD, "net/minecraft/client/Minecraft", clientPackSource, "Lnet/minecraft/client/resources/ClientPackSource;");
-                meth.visitMethodInsn(Opcodes.INVOKESTATIC, "net/minecraftforge/fmlonlyclient/ClientModLoader", "begin", "(Lnet/minecraft/client/Minecraft;Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/server/packs/resources/ReloadableResourceManager;Lnet/minecraft/client/resources/ClientPackSource;)V", false)
+                meth.visitMethodInsn(Opcodes.INVOKESTATIC, "net/minecraftforge/fmlonlyclient/ClientModLoader", "begin", "(Lnet/minecraft/client/Minecraft;Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/server/packs/resources/ReloadableResourceManager;)V", false)
                for (var i=0; i<methodNode.instructions.size(); i++) {
                    var ain = methodNode.instructions.get(i);
                    if (ain.getOpcode() == Opcodes.PUTFIELD && ain.name.equals(resourceManager)) {
@@ -0,0 +1,35 @@
+var ASMAPI = Java.type('net.minecraftforge.coremod.api.ASMAPI')
+var Opcodes = Java.type('org.objectweb.asm.Opcodes')
+
+function initializeCoreMod() {
+    return {
+        'minecraft': {
+            'target': {
+                'type': 'METHOD',
+                'class': 'net.minecraft.server.Main',
+                'methodName': 'main',
+                'methodDesc': '([Ljava/lang/String;)V'
+            },
+            'transformer': function(methodNode) {
+                var meth = ASMAPI.getMethodNode();
+                meth.visitMethodInsn(Opcodes.INVOKESTATIC, 'net/minecraftforge/fmlonlyserver/ServerModLoader', 'load', '()V', false)
+
+                var methOptions = ASMAPI.getMethodNode();
+                methOptions.visitIntInsn(Opcodes.ALOAD, 1);
+                methOptions.visitMethodInsn(Opcodes.INVOKESTATIC, 'net/minecraftforge/fmlonlyserver/ServerModLoader', 'addOptions', '(Ljoptsimple/OptionParser;)V', false)
+
+                for (var i=0; i<methodNode.instructions.size(); i++) {
+                    var ain = methodNode.instructions.get(i);
+                    if (ain.getOpcode() == Opcodes.INVOKESPECIAL && ain.owner == 'joptsimple/OptionParser' && ain.name == '<init>' && ain.desc == '()V') {
+                        // Inject after the STORE
+                        methodNode.instructions.insert(methodNode.instructions.get(i + 1), methOptions.instructions);
+                    } else if (ain.getOpcode() == Opcodes.INVOKESTATIC && ain.owner == 'net/minecraft/Util' && ain.name == ASMAPI.mapMethod('m_137584_') /* startTimerHackThread */ && ain.desc == '()V') {
+                        methodNode.instructions.insert(ain, meth.instructions);
+                        break; // By this point we've already reached the first injection point so break
+                    }
+                }
+                return methodNode;
+            }
+        },
+    }
+}
@@ -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%

@@ -21,6 +21,8 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;

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

 public class FMLModContainer extends ModContainer
@@ -70,6 +72,11 @@ public class FMLModContainer extends ModContainer
        }
        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());
+    }
+}
@@ -15,7 +15,9 @@ import net.minecraftforge.event.CreativeModeTabEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.ModLoadingContext;
 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;
@@ -59,13 +61,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
+        ModLoadingContext.get().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,32 +6,30 @@
 # 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
 # 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.
@@ -41,30 +39,26 @@ authors="Love, Cheese and small house plants" #optional
 #displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)

 # The description text for the mod (multi line!) (#mandatory)
-description='''
-This is a long form description of the mod. You can write whatever you want here
-
-Have some lorem ipsum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-'''
+description='''${mod_description}'''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.examplemod]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="[@FORGE_SPEC_VERSION@,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
-    side="BOTH"
+[[dependencies.${mod_id}]] #optional
+# the modid of the dependency
+modId="forge" #mandatory
+# Does this dependency have to exist - if not, ordering below must be specified
+mandatory=true #mandatory
+# The version range of the dependency
+versionRange="${forge_version_range}" #mandatory
+# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
+# BEFORE - This mod is loaded BEFORE the dependency
+# AFTER - This mod is loaded AFTER the dependency
+ordering="NONE"
+# Side this dependency is applied on - BOTH, CLIENT, or SERVER
+side="BOTH"
 # Here's another dependency
-[[dependencies.examplemod]]
-    modId="minecraft"
-    mandatory=true
+[[dependencies.${mod_id}]]
+modId="minecraft"
+mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[@MC_VERSION@,@MC_NEXT_VERSION@)"
-    ordering="NONE"
-    side="BOTH"
+versionRange="${minecraft_version_range}"
+ordering="NONE"
+side="BOTH"
@@ -1,8 +0,0 @@
-{
-    "pack": {
-        "description": "examplemod resources",
-        "pack_format": 12,
-        "forge:resource_pack_format": 12,
-        "forge:data_pack_format": 10
-    }
-}
@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -57,14 +_,8 @@
+@@ -57,14 +_,9 @@
       if (this.f_127506_ != null && this.f_127506_.length > 0) {
          p_127520_.append("-- Head --\n");
          p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
@@ -12,6 +12,7 @@
 -         }
 -
 -         p_127520_.append("\n");
+         p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.f_127501_, this.f_127506_));
 +         p_127520_.append("Stacktrace:");
 +         p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.f_127506_));
       }
@@ -1,10 +0,0 @@
--- a/net/minecraft/advancements/AdvancementList.java
-+++ b/net/minecraft/advancements/AdvancementList.java
-@@ -90,6 +_,7 @@
-          }
-       }
- 
-+      net.minecraftforge.common.AdvancementLoadFix.buildSortedTrees(this.f_139327_);
-       f_139325_.info("Loaded {} advancements", (int)this.f_139326_.size());
-    }
- 
@@ -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 @@
    }
 
@@ -60,29 +60,15 @@
       this.f_91064_ = new DebugRenderer(this);
       this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this));
       RenderSystem.m_69900_(this::m_91113_);
-@@ -545,6 +_,21 @@
+@@ -545,6 +_,7 @@
          TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
       }
 
-+      net.minecraftforge.gametest.ForgeGameTestHooks.registerGametests();
-+      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RegisterClientReloadListenersEvent(this.f_91036_));
-+      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.RegisterLayerDefinitions());
-+      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.RegisterRenderers());
-+      net.minecraftforge.client.textures.TextureAtlasSpriteLoaderManager.init();
-+      net.minecraftforge.client.gui.ClientTooltipComponentManager.init();
-+      net.minecraftforge.client.EntitySpectatorShaderManager.init();
-+      net.minecraftforge.client.ForgeHooksClient.onRegisterKeyMappings(f_91066_);
-+      net.minecraftforge.client.RecipeBookManager.init();
-+      net.minecraftforge.client.gui.overlay.GuiOverlayManager.init();
-+      net.minecraftforge.client.DimensionSpecialEffectsManager.init();
-+      net.minecraftforge.client.NamedRenderTypeManager.init();
-+      net.minecraftforge.client.ColorResolverManager.init();
-+      net.minecraftforge.client.ItemDecoratorHandler.init();
-+
+      net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.f_91036_);
       this.f_90990_.m_85409_(this.f_91066_.m_231817_().m_231551_());
       this.f_90990_.m_85424_(this.f_91066_.m_232123_().m_231551_());
       this.f_90990_.m_85426_();
-@@ -568,26 +_,24 @@
+@@ -568,26 +_,26 @@
             }
 
             this.f_167847_.m_168556_();
@@ -99,6 +85,8 @@
 +
 +                  this.m_91152_(new TitleScreen(true));
 +               }, this.m_239210_()));
+            } else if (this.f_91066_.f_263744_) {
+               this.m_91152_(new AccessibilityOnboardingScreen(this.f_91066_));
 +            } else {
 +               this.m_91152_(new TitleScreen(true));
 +            }
@@ -285,21 +273,16 @@
                   this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
                }
             }
-@@ -1581,14 +_,20 @@
+@@ -1581,6 +_,8 @@
             return false;
          } else {
             boolean flag = false;
-            switch (this.f_91077_.m_6662_()) {
 +            var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.f_91066_.f_92096_, InteractionHand.MAIN_HAND);
-+            HitResult.Type hitType = this.f_91077_.m_6662_();
-+            if (this.f_91077_ instanceof EntityHitResult entityHit) { // Forge: Perform attack range checks here, instead of in GameRenderer#pick, so extended-reach interactions work.
-+               if (!f_91074_.canHit(entityHit.m_82443_(), 0)) hitType = HitResult.Type.MISS; // No padding in client code.
-+            }
 +            if (!inputEvent.isCanceled())
-+            switch(hitType) {
+             switch (this.f_91077_.m_6662_()) {
                case ENTITY:
                   this.f_91072_.m_105223_(this.f_91074_, ((EntityHitResult)this.f_91077_).m_82443_());
-                   break;
+@@ -1588,7 +_,7 @@
                case BLOCK:
                   BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
                   BlockPos blockpos = blockhitresult.m_82425_();
@@ -331,14 +314,7 @@
                ItemStack itemstack = this.f_91074_.m_21120_(interactionhand);
                if (!itemstack.m_246617_(this.f_91073_.m_246046_())) {
                   return;
-@@ -1632,13 +_,14 @@
-                            return;
-                         }
- 
-+                        if(!this.f_91074_.canInteractWith(entityhitresult.m_82443_(), 0)) break; //Forge: Entity may be traced via attack range, but the player may not have sufficient reach.  No padding in client code.
-                         InteractionResult interactionresult = this.f_91072_.m_105230_(this.f_91074_, entity, entityhitresult, interactionhand);
-                         if (!interactionresult.m_19077_()) {
-                            interactionresult = this.f_91072_.m_105226_(this.f_91074_, entity, interactionhand);
+@@ -1638,7 +_,7 @@
                         }
 
                         if (interactionresult.m_19077_()) {
@@ -1,13 +1,5 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -374,6 +_,7 @@
-                   if (this.f_92986_.f_91076_ != null && this.f_92986_.f_91076_ instanceof LivingEntity && f >= 1.0F) {
-                      flag = this.f_92986_.f_91074_.m_36333_() > 5.0F;
-                      flag &= this.f_92986_.f_91076_.m_6084_();
-+                     flag &= this.f_92986_.f_91074_.canHit(this.f_92986_.f_91076_, 0);
-                   }
- 
-                   int j = this.f_92978_ / 2 - 7 + 16;
@@ -428,6 +_,10 @@
 
          for(MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
@@ -58,15 +50,6 @@
          }
       }
 
-@@ -924,7 +_,7 @@
-       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
-    }
- 
-   public void m_264541_(PoseStack p_265563_, float p_265127_) {
-+   protected void m_264541_(PoseStack p_265563_, float p_265127_) {
-       RenderSystem.m_69465_();
-       RenderSystem.m_69458_(false);
-       float f = (float)Math.min(this.f_92977_, this.f_92978_);
@@ -1054,7 +_,7 @@
          ItemStack itemstack = this.f_92986_.f_91074_.m_150109_().m_36056_();
          if (itemstack.m_41619_()) {
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/gui/screens/ChatScreen.java
+++ b/net/minecraft/client/gui/screens/ChatScreen.java
+@@ -225,7 +_,7 @@
+             this.f_96541_.f_91074_.f_108617_.m_246175_(p_242400_);
+          }
+ 
+-         return true;
+         return f_96541_.f_91080_ == this; // FORGE: Prevent closing the screen if another screen has been opened.
+       }
+    }
+ 
@@ -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_) -> {
@@ -103,15 +103,19 @@
          int l = vector2ic.x();
          int i1 = vector2ic.y();
          p_263064_.m_85836_();
-@@ -307,6 +_,8 @@
+@@ -307,9 +_,10 @@
          RenderSystem.m_157427_(GameRenderer::m_172811_);
          bufferbuilder.m_166779_(VertexFormat.Mode.QUADS, DefaultVertexFormat.f_85815_);
          Matrix4f matrix4f = p_263064_.m_85850_().m_252922_();
-+         // TODO 1.19.3: Tooltip rendering changed, rethink the color event.
-+         // net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_263064_, k1, l1, preEvent.getFont(), p_262990_);
-          TooltipRenderUtil.m_262796_((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> {
+-         TooltipRenderUtil.m_262796_((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> {
+         net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_263064_, l, i1, preEvent.getFont(), p_262990_);
+         TooltipRenderUtil.renderTooltipBackground((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> {
             GuiComponent.m_93123_(p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_);
-          }, matrix4f, bufferbuilder, l, i1, i, j, 400);
+-         }, matrix4f, bufferbuilder, l, i1, i, j, 400);
+         }, matrix4f, bufferbuilder, l, i1, i, j, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd(), colorEvent.getBorderStart(), colorEvent.getBorderEnd());
+          RenderSystem.m_69482_();
+          RenderSystem.m_69478_();
+          RenderSystem.m_69453_();
@@ -320,7 +_,7 @@
 
          for(int l1 = 0; l1 < p_262990_.size(); ++l1) {
@@ -126,29 +130,32 @@
          for(int i2 = 0; i2 < p_262990_.size(); ++i2) {
             ClientTooltipComponent clienttooltipcomponent2 = p_262990_.get(i2);
 -            clienttooltipcomponent2.m_183452_(this.f_96547_, l, k1, p_263064_, this.f_96542_);
-+            clienttooltipcomponent2.m_183452_(preEvent.getFont(), k1, i1, p_263064_, this.f_96542_);
+            clienttooltipcomponent2.m_183452_(preEvent.getFont(), l, k1, p_263064_, this.f_96542_);
             k1 += clienttooltipcomponent2.m_142103_() + (i2 == 0 ? 2 : 0);
          }
 
-@@ -438,8 +_,18 @@
+@@ -432,7 +_,10 @@
+       this.f_96543_ = p_96608_;
+       this.f_96544_ = p_96609_;
+       if (!this.f_267454_) {
+         if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Pre(this, this.f_96540_, this::addEventWidget, this::m_169411_))) {
+          this.m_7856_();
+         }
+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Post(this, this.f_96540_, this::addEventWidget, this::m_169411_));
+       } else {
+          this.m_267719_();
       }
- 
-       this.f_267454_ = true;
-+      java.util.function.Consumer<GuiEventListener> add = (b) -> {
-+         if (b instanceof Renderable r)
-+            this.f_169369_.add(r);
-+         if (b instanceof NarratableEntry ne)
-+            this.f_169368_.add(ne);
-+         f_96540_.add(b);
-+      };
-+      if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Pre(this, this.f_96540_, add, this::m_169411_))) {
-       this.m_169407_(false);
-       this.m_169378_(f_169370_);
+@@ -445,7 +_,10 @@
+    protected void m_232761_() {
+       this.m_169413_();
+       this.m_264131_();
+      if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Pre(this, this.f_96540_, this::addEventWidget, this::m_169411_))) {
+       this.m_7856_();
 +      }
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Post(this, this.f_96540_, add, this::m_169411_));
+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Post(this, this.f_96540_, this::addEventWidget, this::m_169411_));
    }
 
-    protected void m_232761_() {
+    public List<? extends GuiEventListener> m_6702_() {
@@ -467,6 +_,7 @@
    public void m_7333_(PoseStack p_96557_) {
       if (this.f_96541_.f_91073_ != null) {
@@ -165,14 +172,28 @@
    }
 
    public boolean m_7043_() {
-@@ -570,6 +_,10 @@
+@@ -572,6 +_,10 @@
+    public void m_7400_(List<Path> p_96591_) {
    }
 
-    public void m_7400_(List<Path> p_96591_) {
-+   }
-+
 +   public Minecraft getMinecraft() {
 +      return this.f_96541_;
-    }
- 
+   }
+
    private void m_169380_(long p_169381_, boolean p_169382_) {
+       this.f_169377_ = Util.m_137550_() + p_169381_;
+       if (p_169382_) {
+@@ -733,5 +_,13 @@
+          this.f_169421_ = p_169425_;
+          this.f_169422_ = p_169426_;
+       }
+   }
+
+   private void addEventWidget(GuiEventListener b) {
+      if (b instanceof Renderable r)
+         this.f_169369_.add(r);
+      if (b instanceof NarratableEntry ne)
+         this.f_169368_.add(ne);
+      f_96540_.add(b);
+    }
+ }
@@ -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_);
 
@@ -0,0 +1,49 @@
+--- a/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java
+++ b/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java
+@@ -18,16 +_,21 @@
+    private static final int f_262743_ = 1344798847;
+ 
+    public static void m_262796_(TooltipRenderUtil.BlitPainter p_262929_, Matrix4f p_263052_, BufferBuilder p_263082_, int p_263046_, int p_263101_, int p_263024_, int p_262926_, int p_263038_) {
+      renderTooltipBackground(p_262929_, p_263052_, p_263082_, p_263046_, p_263101_, p_263024_, p_262926_, p_263038_, f_262744_, f_262744_, f_262725_, f_262743_);
+   }
+
+   // Forge: Allow specifying colors for the inner border gradient and a gradient instead of a single color for the background and outer border
+   public static void renderTooltipBackground(TooltipRenderUtil.BlitPainter p_262929_, Matrix4f p_263052_, BufferBuilder p_263082_, int p_263046_, int p_263101_, int p_263024_, int p_262926_, int p_263038_, int backgroundTop, int backgroundBottom, int borderTop, int borderBottom) {
+       int i = p_263046_ - 3;
+       int j = p_263101_ - 3;
+       int k = p_263024_ + 3 + 3;
+       int l = p_262926_ + 3 + 3;
+-      m_262855_(p_262929_, p_263052_, p_263082_, i, j - 1, k, p_263038_, -267386864);
+-      m_262855_(p_262929_, p_263052_, p_263082_, i, j + l, k, p_263038_, -267386864);
+-      m_262805_(p_262929_, p_263052_, p_263082_, i, j, k, l, p_263038_, -267386864);
+-      m_262798_(p_262929_, p_263052_, p_263082_, i - 1, j, l, p_263038_, -267386864);
+-      m_262798_(p_262929_, p_263052_, p_263082_, i + k, j, l, p_263038_, -267386864);
+-      m_262846_(p_262929_, p_263052_, p_263082_, i, j + 1, k, l, p_263038_, 1347420415, 1344798847);
+      m_262855_(p_262929_, p_263052_, p_263082_, i, j - 1, k, p_263038_, backgroundTop);
+      m_262855_(p_262929_, p_263052_, p_263082_, i, j + l, k, p_263038_, backgroundBottom);
+      renderRectangle(p_262929_, p_263052_, p_263082_, i, j, k, l, p_263038_, backgroundTop, backgroundBottom);
+      m_262849_(p_262929_, p_263052_, p_263082_, i - 1, j, l, p_263038_, backgroundTop, backgroundBottom);
+      m_262849_(p_262929_, p_263052_, p_263082_, i + k, j, l, p_263038_, backgroundTop, backgroundBottom);
+      m_262846_(p_262929_, p_263052_, p_263082_, i, j + 1, k, l, p_263038_, borderTop, borderBottom);
+    }
+ 
+    private static void m_262846_(TooltipRenderUtil.BlitPainter p_262974_, Matrix4f p_263030_, BufferBuilder p_263061_, int p_262982_, int p_262912_, int p_262946_, int p_263049_, int p_263118_, int p_263104_, int p_262979_) {
+@@ -49,8 +_,17 @@
+       p_262966_.m_262815_(p_263094_, p_262943_, p_262949_, p_263068_, p_262949_ + p_263111_, p_263068_ + 1, p_263095_, p_262918_, p_262918_);
+    }
+ 
+   /**
+    * @deprecated Forge: Use gradient overload instead
+    */
+   @Deprecated
+    private static void m_262805_(TooltipRenderUtil.BlitPainter p_262933_, Matrix4f p_263035_, BufferBuilder p_263084_, int p_262945_, int p_262955_, int p_263017_, int p_262978_, int p_262950_, int p_262931_) {
+-      p_262933_.m_262815_(p_263035_, p_263084_, p_262945_, p_262955_, p_262945_ + p_263017_, p_262955_ + p_262978_, p_262950_, p_262931_, p_262931_);
+      renderRectangle(p_262933_, p_263035_, p_263084_, p_262945_, p_262955_, p_263017_, p_262978_, p_262950_, p_262931_, p_262931_);
+   }
+
+   // Forge: Allow specifying a gradient instead of a single color for the background
+   private static void renderRectangle(TooltipRenderUtil.BlitPainter p_262933_, Matrix4f p_263035_, BufferBuilder p_263084_, int p_262945_, int p_262955_, int p_263017_, int p_262978_, int p_262950_, int p_262931_, int colorTo) {
+      p_262933_.m_262815_(p_263035_, p_263084_, p_262945_, p_262955_, p_262945_ + p_263017_, p_262955_ + p_262978_, p_262950_, p_262931_, colorTo);
+    }
+ 
+    @FunctionalInterface
@@ -1,27 +1,13 @@
 --- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
 +++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
-@@ -119,7 +_,8 @@
+@@ -119,6 +_,7 @@
    public static void m_232896_(Minecraft p_232897_, @Nullable Screen p_232898_) {
       m_232899_(p_232897_, f_232866_);
       PackRepository packrepository = new PackRepository(new ServerPacksSource());
-      WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, WorldDataConfiguration.f_244649_);
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.event.AddPackFindersEvent(net.minecraft.server.packs.PackType.SERVER_DATA, packrepository::addPackFinder));
-+      WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_)); // FORGE: Load vanilla fallback with vanilla datapacks.
+       WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, WorldDataConfiguration.f_244649_);
       CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.m_214362_(worldloader$initconfig, (p_247792_) -> {
          return new WorldLoader.DataLoadOutput<>(new CreateWorldScreen.DataPackReloadCookie(new WorldGenSettings(WorldOptions.m_247394_(), WorldPresets.m_246552_(p_247792_.f_244104_())), p_247792_.f_244127_()), p_247792_.f_243759_());
-       }, (p_247798_, p_247799_, p_247800_, p_247801_) -> {
-@@ -127,7 +_,10 @@
-          return new WorldCreationContext(p_247801_.f_243966_(), p_247800_, p_247799_, p_247801_.f_243979_());
-       }, Util.m_183991_(), p_232897_);
-       p_232897_.m_18701_(completablefuture::isDone);
-      p_232897_.m_91152_(new CreateWorldScreen(p_232897_, p_232898_, completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty()));
-+      // FORGE: Force load mods' datapacks after setting screen and ensure datapack selection reverts to vanilla if invalid.
-+      CreateWorldScreen createWorldScreen = new CreateWorldScreen(p_232897_, p_232898_, completablefuture.join().withDataConfiguration(new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_)), Optional.of(WorldPresets.f_226437_), OptionalLong.empty());
-+      p_232897_.m_91152_(createWorldScreen);
-+      createWorldScreen.m_269443_(packrepository, true, createWorldScreen::m_267734_);
-    }
- 
-    public static CreateWorldScreen m_275847_(Minecraft p_276017_, @Nullable Screen p_276029_, LevelSettings p_276055_, WorldCreationContext p_276028_, @Nullable Path p_276040_) {
@@ -368,7 +_,7 @@
                if (p_269627_) {
                   p_270552_.accept(this.f_267389_.m_267573_().f_243842_());
@@ -0,0 +1,13 @@
+--- a/net/minecraft/client/gui/screens/worldselection/PresetEditor.java
+++ b/net/minecraft/client/gui/screens/worldselection/PresetEditor.java
+@@ -28,6 +_,10 @@
+ 
+ @OnlyIn(Dist.CLIENT)
+ public interface PresetEditor {
+   /**
+    * @deprecated Forge: Use {@link net.minecraftforge.client.PresetEditorManager#get(ResourceKey)} instead.
+    */
+   @Deprecated
+    Map<Optional<ResourceKey<WorldPreset>>, PresetEditor> f_232950_ = Map.of(Optional.of(WorldPresets.f_226438_), (p_232974_, p_232975_) -> {
+       ChunkGenerator chunkgenerator = p_232975_.f_243796_().m_246737_();
+       RegistryAccess registryaccess = p_232975_.m_246480_();
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
+@@ -226,7 +_,7 @@
+    @Nullable
+    public PresetEditor m_267744_() {
+       Holder<WorldPreset> holder = this.m_267828_().f_267398_();
+-      return holder != null ? PresetEditor.f_232950_.get(holder.m_203543_()) : null;
+      return holder != null ? holder.m_203543_().map(net.minecraftforge.client.PresetEditorManager::get).orElse(null) : null; // FORGE: redirect lookup to expanded map
+    }
+ 
+    public List<WorldCreationUiState.WorldTypeEntry> m_267815_() {
@@ -12,7 +12,7 @@
          }
 
          this.f_104411_.m_171649_(chunkpos);
-+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.ChunkEvent.Load(levelchunk));
+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.ChunkEvent.Load(levelchunk, false));
          return levelchunk;
       }
    }
@@ -72,7 +72,7 @@
    }
 
    public void m_7413_(ClientboundCustomPayloadPacket p_105004_) {
-+      if (!f_104888_.m_18695_() && net.minecraftforge.network.NetworkHooks.onCustomPayload(p_105004_, this.f_104885_)) return;
+      if (net.minecraftforge.network.NetworkHooks.onCustomPayload(p_105004_, this.f_104885_)) return;
       PacketUtils.m_131363_(p_105004_, this, this.f_104888_);
       ResourceLocation resourcelocation = p_105004_.m_132042_();
       FriendlyByteBuf friendlybytebuf = null;
@@ -84,7 +84,7 @@
 
    public float m_105286_() {
 -      return this.f_105197_.m_46408_() ? 5.0F : 4.5F;
-+      return (float) this.f_105189_.f_91074_.getReachDistance();
+      return (float) this.f_105189_.f_91074_.getBlockReach();
    }
 
    public void m_105287_() {
@@ -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_) {
@@ -64,7 +64,7 @@
 +         boolean flag8 = flag7 || this.f_19862_ && !this.f_185931_ || this.m_20069_() && !this.m_5842_() || (this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType)) && !this.canStartSwimming());
          if (this.m_6069_()) {
 -            if (!this.f_19861_ && !this.f_108618_.f_108573_ && flag7 || !this.m_20069_()) {
-+            if (!this.f_19861_ && !this.f_108618_.f_108573_ && flag5 || !(this.m_20069_() || this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType)))) {
+            if (!this.f_19861_ && !this.f_108618_.f_108573_ && flag7 || !(this.m_20069_() || this.isInFluidType((fluidType, height) -> this.canSwimInFluidType(fluidType)))) {
                this.m_6858_(false);
             }
          } else if (flag8) {
@@ -17,37 +17,49 @@
       } catch (IOException ioexception) {
          list1.forEach((p_172729_) -> {
             p_172729_.getFirst().close();
-@@ -678,19 +_,21 @@
+@@ -673,12 +_,13 @@
+             this.f_109059_.m_91307_().m_6180_("pick");
+             this.f_109059_.f_91076_ = null;
+             double d0 = (double)this.f_109059_.f_91072_.m_105286_();
+-            this.f_109059_.f_91077_ = entity.m_19907_(d0, p_109088_, false);
+            double entityReach = this.f_109059_.f_91074_.getEntityReach(); // Note - MC-76493 - We must validate players cannot click-through objects.
+            this.f_109059_.f_91077_ = entity.m_19907_(Math.max(d0, entityReach), p_109088_, false); // Run pick() with the max of the two, so we can prevent click-through.
+             Vec3 vec3 = entity.m_20299_(p_109088_);
             boolean flag = false;
             int i = 3;
             double d1 = d0;
-+            double atkRange = this.f_109059_.f_91074_.getAttackRange();
-             if (this.f_109059_.f_91072_.m_105291_()) {
-               d1 = 6.0D;
-+               d1 = Math.max(d0, atkRange);
+-            if (this.f_109059_.f_91072_.m_105291_()) {
+            if (false && this.f_109059_.f_91072_.m_105291_()) {
+                d1 = 6.0D;
                d0 = d1;
             } else {
-               if (d0 > 3.0D) {
-+               if (d0 > atkRange) {
-                   flag = true;
-                }
+@@ -688,10 +_,19 @@
 
                d0 = d0;
-+               d0 = d1 = Math.max(d0, atkRange); // Pick entities with the max of the reach distance and attack range.
             }
+            d0 = d1 = Math.max(d0, entityReach); // Pick entities with the max of both for the same reason.
 
             d1 *= d1;
 -            if (this.f_109059_.f_91077_ != null) {
-+            if (this.f_109059_.f_91077_ != null && this.f_109059_.f_91077_.m_6662_() != HitResult.Type.MISS) { // Add != MISS to ensure Attack Range is not clamped at the value of Reach Distance.
+            // If we picked a block, we need to ignore entities past that block. Added != MISS check to not truncate on failed picks.
+            // Also fixes MC-250858
+            if (this.f_109059_.f_91077_ != null && this.f_109059_.f_91077_.m_6662_() != HitResult.Type.MISS) {
                d1 = this.f_109059_.f_91077_.m_82450_().m_82557_(vec3);
+               double blockReach = this.f_109059_.f_91074_.getBlockReach();
+               // Discard the result as a miss if it is outside the block reach.
+               if (d1 > blockReach * blockReach) {
+                  Vec3 pos = this.f_109059_.f_91077_.m_82450_();
+                  this.f_109059_.f_91077_ = BlockHitResult.m_82426_(pos, Direction.m_122366_(vec3.f_82479_, vec3.f_82480_, vec3.f_82481_), BlockPos.m_274446_(pos));
+               }
             }
 
+             Vec3 vec31 = entity.m_20252_(1.0F);
@@ -705,7 +_,7 @@
                Entity entity1 = entityhitresult.m_82443_();
                Vec3 vec33 = entityhitresult.m_82450_();
                double d2 = vec3.m_82557_(vec33);
 -               if (flag && d2 > 9.0D) {
-+               if (false && flag && d2 > 9.0D) { //Forge: Always keep the entity result to allow for extended reach interactions.
+               if (d2 > d1 || d2 > entityReach * entityReach) { // Discard if the result is behind a block, or past the entity reach max. The var "flag" no longer has a use.
                   this.f_109059_.f_91077_ = BlockHitResult.m_82426_(vec33, Direction.m_122366_(vec31.f_82479_, vec31.f_82480_, vec31.f_82481_), BlockPos.m_274446_(vec33));
                } else if (d2 < d1 || this.f_109059_.f_91077_ == null) {
                   this.f_109059_.f_91077_ = entityhitresult;
@@ -225,24 +225,24 @@
          if (recorditem != null) {
             this.f_109461_.f_91065_.m_93055_(recorditem.m_43050_());
          }
+@@ -2503,7 +_,7 @@
+          case 1010:
+             Item item = Item.m_41445_(p_234307_);
+             if (item instanceof RecordItem recorditem) {
+-               this.m_109514_(recorditem.m_43051_(), p_234306_);
+               this.playStreamingMusic(recorditem.m_43051_(), p_234306_, recorditem);
+             }
+             break;
+          case 1011:
@@ -2656,7 +_,7 @@
          case 2001:
             BlockState blockstate = Block.m_49803_(p_234307_);
             if (!blockstate.m_60795_()) {
 -               SoundType soundtype = blockstate.m_60827_();
-+            SoundType soundtype = blockstate.getSoundType(this.f_109465_, p_234306_, null);
+               SoundType soundtype = blockstate.getSoundType(this.f_109465_, p_234306_, null);
                this.f_109465_.m_245747_(p_234306_, soundtype.m_56775_(), SoundSource.BLOCKS, (soundtype.m_56773_() + 1.0F) / 2.0F, soundtype.m_56774_() * 0.8F, false);
             }
 
-@@ -2751,7 +_,7 @@
-             break;
-          case 3002:
-             if (p_234307_ >= 0 && p_234307_ < Direction.Axis.f_122448_.length) {
-               ParticleUtils.m_144967_(Direction.Axis.f_122448_[p_234307_], this.f_109465_, p_234306_, 0.125D, ParticleTypes.f_175830_, UniformInt.m_146622_(10, 19));
-+            this.playStreamingMusic(((RecordItem)Item.m_41445_(p_234307_)).m_43051_(), p_234306_, (RecordItem) Item.m_41445_(p_234307_));
-             } else {
-                ParticleUtils.m_216313_(this.f_109465_, p_234306_, ParticleTypes.f_175830_, UniformInt.m_146622_(3, 5));
-             }
@@ -2875,7 +_,7 @@
       } else {
          int i = p_109538_.m_45517_(LightLayer.SKY, p_109540_);
@@ -1,21 +1,30 @@
 --- a/net/minecraft/client/renderer/RenderType.java
 +++ b/net/minecraft/client/renderer/RenderType.java
+@@ -308,7 +_,7 @@
+    }
+ 
+    public static RenderType m_110497_(ResourceLocation p_110498_) {
+-      return f_173173_.apply(p_110498_);
+      return net.minecraftforge.client.ForgeRenderTypes.getText(p_110498_);
+    }
+ 
+    public static RenderType m_269058_() {
@@ -316,19 +_,19 @@
    }
 
    public static RenderType m_173237_(ResourceLocation p_173238_) {
 -      return f_173174_.apply(p_173238_);
-+      return net.minecraftforge.client.ForgeRenderTypes.getText(p_173238_);
+      return net.minecraftforge.client.ForgeRenderTypes.getTextIntensity(p_173238_);
    }
 
    public static RenderType m_181444_(ResourceLocation p_181445_) {
 -      return f_181442_.apply(p_181445_);
-+      return net.minecraftforge.client.ForgeRenderTypes.getTextIntensity(p_181445_);
+      return net.minecraftforge.client.ForgeRenderTypes.getTextPolygonOffset(p_181445_);
    }
 
    public static RenderType m_181446_(ResourceLocation p_181447_) {
 -      return f_181443_.apply(p_181447_);
-+      return net.minecraftforge.client.ForgeRenderTypes.getTextPolygonOffset(p_181447_);
+      return net.minecraftforge.client.ForgeRenderTypes.getTextIntensityPolygonOffset(p_181447_);
    }
 
    public static RenderType m_110500_(ResourceLocation p_110501_) {
@@ -16,10 +16,11 @@
    }
 
    public static Material m_173381_(WoodType p_173382_) {
-@@ -209,5 +_,13 @@
+@@ -208,6 +_,23 @@
+          case SINGLE:
          default:
             return p_110773_;
-       }
+      }
 +   }
 +
 +   /**
@@ -28,5 +29,14 @@
 +   public static void addWoodType(WoodType woodType) {
 +      f_110743_.put(woodType, m_173385_(woodType));
 +      f_244291_.put(woodType, m_245275_(woodType));
+   }
+
+   static {
+      if (net.minecraftforge.fml.ModLoader.isLoadingStateValid() && !net.minecraftforge.fml.ModLoader.get().hasCompletedState("LOAD_REGISTRIES")) {
+         com.mojang.logging.LogUtils.getLogger().error(
+                 "net.minecraft.client.renderer.Sheets loaded too early, modded registry-based materials may not work correctly",
+                 new IllegalStateException("net.minecraft.client.renderer.Sheets loaded too early")
+         );
+       }
    }
 }
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/culling/Frustum.java
+++ b/net/minecraft/client/renderer/culling/Frustum.java
+@@ -59,6 +_,8 @@
+    }
+ 
+    public boolean m_113029_(AABB p_113030_) {
+      // FORGE: exit early for infinite bounds, these would otherwise fail in the intersection test at certain camera angles (GH-9321)
+      if (p_113030_.equals(net.minecraftforge.common.extensions.IForgeBlockEntity.INFINITE_EXTENT_AABB)) return true;
+       return this.m_113006_(p_113030_.f_82288_, p_113030_.f_82289_, p_113030_.f_82290_, p_113030_.f_82291_, p_113030_.f_82292_, p_113030_.f_82293_);
+    }
+ 
@@ -64,7 +64,7 @@
          }
 
          p_275269_.m_85849_();
-+         net.minecraftforge.client.ItemDecoratorHandler.of(p_275590_).render(p_275652_, p_275590_, p_275202_, p_275508_, 0);
+         net.minecraftforge.client.ItemDecoratorHandler.of(p_275590_).render(p_275269_, p_275652_, p_275590_, p_275202_, p_275508_);
       }
    }
 
@@ -16,11 +16,11 @@
                float f2 = (float)(i & 255) / 255.0F;
 -               this.m_117106_(p_117119_, p_117120_, p_117123_, armoritem, flag, p_117124_, flag1, f, f1, f2, (String)null);
 -               this.m_117106_(p_117119_, p_117120_, p_117123_, armoritem, flag, p_117124_, flag1, 1.0F, 1.0F, 1.0F, "overlay");
-+               this.renderModel(p_117119_, p_117120_, p_117123_, flag1, model, f, f1, f2, this.getArmorResource(p_117121_, itemstack, p_117122_, null));
-+               this.renderModel(p_117119_, p_117120_, p_117123_, flag1, model, 1.0F, 1.0F, 1.0F, this.getArmorResource(p_117121_, itemstack, p_117122_, "overlay"));
+               this.renderModel(p_117119_, p_117120_, p_117123_, flag, model, f, f1, f2, this.getArmorResource(p_117121_, itemstack, p_117122_, null));
+               this.renderModel(p_117119_, p_117120_, p_117123_, flag, model, 1.0F, 1.0F, 1.0F, this.getArmorResource(p_117121_, itemstack, p_117122_, "overlay"));
             } else {
 -               this.m_117106_(p_117119_, p_117120_, p_117123_, armoritem, flag, p_117124_, flag1, 1.0F, 1.0F, 1.0F, (String)null);
-+               this.renderModel(p_117119_, p_117120_, p_117123_, flag1, model, 1.0F, 1.0F, 1.0F, this.getArmorResource(p_117121_, itemstack, p_117122_, null));
+               this.renderModel(p_117119_, p_117120_, p_117123_, flag, model, 1.0F, 1.0F, 1.0F, this.getArmorResource(p_117121_, itemstack, p_117122_, null));
             }
 
             if (p_117121_.f_19853_.m_246046_().m_245372_(FeatureFlags.f_244168_)) {
@@ -30,15 +30,6 @@
    }
 
    public void m_246368_(int p_248864_) {
-@@ -70,7 +_,7 @@
-       }
-    }
- 
-   int m_245088_() {
-+   private int m_245088_() {
-       return this.f_244575_ != null ? this.f_244575_.f_243714_.size() : 1;
-    }
- 
@@ -124,6 +_,9 @@
 
    void m_247381_(int p_248895_, int p_250245_, int p_250458_, int p_251337_, NativeImage[] p_248825_) {
@@ -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 {
@@ -13,7 +13,7 @@
          friendlybytebuf.m_130130_(0);
          friendlybytebuf.writeBytes(p_129453_);
       } else {
-+         if (!DISABLE_PACKET_DEBUG && i > 2097152) {
+         if (!DISABLE_PACKET_DEBUG && i > net.minecraft.network.CompressionDecoder.f_182672_) {
 +             p_129453_.markReaderIndex();
 +             LOGGER.error("Attempted to send packet over maximum protocol size: {} > 2097152\nData:\n{}", i,
 +                     net.minecraftforge.logging.PacketDump.getContentDump(p_129453_));
@@ -32,13 +32,3 @@
       }
 
       if (flag1 && !advancementprogress.m_8193_()) {
-@@ -253,6 +_,9 @@
-          Set<Advancement> set = new HashSet<>();
-          Set<ResourceLocation> set1 = new HashSet<>();
- 
-+         if (net.minecraftforge.common.ForgeConfig.SERVER.fixAdvancementLoading.get())
-+            net.minecraftforge.common.AdvancementLoadFix.loadVisibility(this, this.f_135965_, this.f_263821_, this.f_263740_, this.f_135967_, advancement -> AdvancementVisibilityEvaluator.isVisible(advancement, adv -> m_135996_(adv).m_8193_()));
-+         else
-          for(Advancement advancement : this.f_263821_) {
-             this.m_264265_(advancement, set, set1);
-          }
@@ -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_();
+    }
@@ -24,7 +24,7 @@
 +               p_140384_.currentlyLoading = levelchunk; // Forge - bypass the future chain when getChunk is called, this prevents deadlocks.
                levelchunk.m_156369_();
                levelchunk.m_187958_(this.f_140133_);
-+               net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.ChunkEvent.Load(levelchunk));
+               net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.ChunkEvent.Load(levelchunk, !(protochunk instanceof ImposterProtoChunk)));
 +               } finally {
 +                   p_140384_.currentlyLoading = null; // Forge - Stop bypassing the future chain.
 +               }
@@ -9,7 +9,7 @@
 +      if (event.isCanceled() || (!this.m_9295_() && event.getResult() == net.minecraftforge.eventbus.api.Event.Result.DENY)) {
 +         return;
 +      }
-+      if (!this.f_9245_.canInteractWith(p_215120_, 1)) {
+      if (!this.f_9245_.canReach(p_215120_, 1.5)) { // Vanilla check is eye-to-center distance < 6, so padding is 6 - 4.5 = 1.5
          this.m_215125_(p_215120_, false, p_215124_, "too far");
       } else if (p_215120_.m_123342_() >= p_215123_) {
          this.f_9245_.f_8906_.m_9829_(new ClientboundBlockUpdatePacket(p_215120_, this.f_9244_.m_8055_(p_215120_)));
@@ -0,0 +1,10 @@
+--- a/net/minecraft/server/level/WorldGenRegion.java
+++ b/net/minecraft/server/level/WorldGenRegion.java
+@@ -297,6 +_,7 @@
+    }
+ 
+    public boolean m_7967_(Entity p_9580_) {
+      if (p_9580_ instanceof net.minecraft.world.entity.Mob mob && mob.isSpawnCancelled()) return false;
+       int i = SectionPos.m_123171_(p_9580_.m_146903_());
+       int j = SectionPos.m_123171_(p_9580_.m_146907_());
+       this.m_6325_(i, j).m_6286_(p_9580_);
@@ -6,8 +6,8 @@
    private static final int f_143608_ = 15000;
 +   /**
 +    * Forge: Deprecated in favor of range/reach attributes.
-+    * @see net.minecraftforge.common.ForgeMod#REACH_DISTANCE
-+    * @see net.minecraftforge.common.ForgeMod#ATTACK_RANGE
+    * @see net.minecraftforge.common.ForgeMod#BLOCK_REACH
+    * @see net.minecraftforge.common.ForgeMod#ENTITY_REACH
 +    */
 +   @Deprecated
    public static final double f_215198_ = Mth.m_144952_(6.0D);
@@ -39,7 +39,7 @@
          BlockPos blockpos = blockhitresult.m_82425_();
          Vec3 vec31 = Vec3.m_82512_(blockpos);
 -         if (!(this.f_9743_.m_146892_().m_82557_(vec31) > f_215198_)) {
-+         if (this.f_9743_.canInteractWith(blockpos, 3)) {
+         if (this.f_9743_.canReach(blockpos, 1.5)) { // Vanilla uses eye-to-center distance < 6, which implies a padding of 1.5
             Vec3 vec32 = vec3.m_82546_(vec31);
             double d0 = 1.0000001D;
             if (Math.abs(vec32.m_7096_()) < 1.0000001D && Math.abs(vec32.m_7098_()) < 1.0000001D && Math.abs(vec32.m_7094_()) < 1.0000001D) {
@@ -68,18 +68,15 @@
                      this.m_243086_(playerchatmessage1);
                   }, p_248212_);
                });
-@@ -1435,9 +_,10 @@
+@@ -1435,7 +_,7 @@
          }
 
          AABB aabb = entity.m_20191_();
 -         if (aabb.m_272282_(this.f_9743_.m_146892_()) < f_215198_) {
-+         if (true) { //Forge: Perform distance checks below since interactions and attacks differ.
+         if (this.f_9743_.canReach(entity, 3)) { // Vanilla padding is 3.0 (distSq < 6.0 * 6.0)
             p_9866_.m_179617_(new ServerboundInteractPacket.Handler() {
                private void m_143678_(InteractionHand p_143679_, ServerGamePacketListenerImpl.EntityInteraction p_143680_) {
-+                  if(!ServerGamePacketListenerImpl.this.f_9743_.canInteractWith(entity, 1.5D)) return; //Forge: If the entity cannot be reached, do nothing. Original check was dist < 6, range is 4.5, so vanilla used padding=1.5
                   ItemStack itemstack = ServerGamePacketListenerImpl.this.f_9743_.m_21120_(p_143679_);
-                   if (itemstack.m_246617_(serverlevel.m_246046_())) {
-                      ItemStack itemstack1 = itemstack.m_41777_();
@@ -1458,6 +_,8 @@
 
                public void m_142143_(InteractionHand p_143682_, Vec3 p_143683_) {
@@ -89,15 +86,6 @@
                      return p_143687_.m_7111_(p_143686_, p_143683_, p_143688_);
                   });
                }
-@@ -1466,6 +_,8 @@
-                   if (!(entity instanceof ItemEntity) && !(entity instanceof ExperienceOrb) && !(entity instanceof AbstractArrow) && entity != ServerGamePacketListenerImpl.this.f_9743_) {
-                      ItemStack itemstack = ServerGamePacketListenerImpl.this.f_9743_.m_21120_(InteractionHand.MAIN_HAND);
-                      if (itemstack.m_246617_(serverlevel.m_246046_())) {
-+                     //Forge: Perform attack range check. Original check was dist < 6, range is 3, so vanilla used padding=3
-+                     if(ServerGamePacketListenerImpl.this.f_9743_.canHit(entity, 3))
-                         ServerGamePacketListenerImpl.this.f_9743_.m_5706_(entity);
-                      }
-                   } else {
@@ -1670,6 +_,7 @@
    }
 
@@ -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_);
@@ -1,11 +0,0 @@
--- a/net/minecraft/world/damagesource/DamageSource.java
-+++ b/net/minecraft/world/damagesource/DamageSource.java
-@@ -32,7 +_,7 @@
-       return this.f_268569_ != this.f_268595_;
-    }
- 
-   public DamageSource(Holder<DamageType> p_270906_, @Nullable Entity p_270796_, @Nullable Entity p_270459_, @Nullable Vec3 p_270623_) {
-+   private DamageSource(Holder<DamageType> p_270906_, @Nullable Entity p_270796_, @Nullable Entity p_270459_, @Nullable Vec3 p_270623_) {
-       this.f_268495_ = p_270906_;
-       this.f_268569_ = p_270459_;
-       this.f_268595_ = p_270796_;
@@ -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;
@@ -48,14 +48,6 @@
    }
 
    @Nullable
-@@ -380,6 +_,7 @@
-    public T m_262455_(ServerLevel p_262704_, @Nullable CompoundTag p_262603_, @Nullable Consumer<T> p_262621_, BlockPos p_262672_, MobSpawnType p_262644_, boolean p_262690_, boolean p_262590_) {
-       T t = this.m_262451_(p_262704_, p_262603_, p_262621_, p_262672_, p_262644_, p_262690_, p_262590_);
-       if (t != null) {
-+         if (t instanceof net.minecraft.world.entity.Mob && net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn((net.minecraft.world.entity.Mob) t, p_262704_, p_262672_.m_123341_(), p_262672_.m_123342_(), p_262672_.m_123343_(), null, p_262644_)) return null;
-          p_262704_.m_47205_(t);
-       }
- 
@@ -600,14 +_,23 @@
    }
 
@@ -5,7 +5,7 @@
 import org.slf4j.Logger;
 
 -public abstract class LivingEntity extends Entity implements Attackable {
-+public abstract class LivingEntity extends Entity implements net.minecraftforge.common.extensions.IForgeLivingEntity {
+public abstract class LivingEntity extends Entity implements Attackable, net.minecraftforge.common.extensions.IForgeLivingEntity {
    private static final Logger f_201943_ = LogUtils.getLogger();
    private static final UUID f_20929_ = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
    private static final UUID f_20959_ = UUID.fromString("87f46a96-686f-4796-b035-22e16ee9e038");
@@ -371,24 +371,14 @@
          p_21241_ = this.m_21161_(p_21240_, p_21241_);
          p_21241_ = this.m_6515_(p_21240_, p_21241_);
          float f1 = Math.max(p_21241_ - this.m_6103_(), 0.0F);
-@@ -1560,14 +_,16 @@
-             Entity entity = p_21240_.m_7639_();
-             if (entity instanceof ServerPlayer) {
-                ServerPlayer serverplayer = (ServerPlayer)entity;
-               serverplayer.m_36222_(Stats.f_12929_, Math.round(f * 10.0F));
+@@ -1564,6 +_,7 @@
             }
-+            ((ServerPlayer)p_21240_.m_7639_()).m_6278_(Stats.f_12988_.m_12902_(Stats.f_12929_), Math.round(f * 10.0F));
          }
 
 +         f1 = net.minecraftforge.common.ForgeHooks.onLivingDamage(this, p_21240_, f1);
          if (f1 != 0.0F) {
             float f2 = this.m_21223_();
             this.m_21231_().m_19289_(p_21240_, f2, f1);
-             this.m_21153_(f2 - f1);
-+            this.m_21153_(f1 - f2); // Forge: moved to fix MC-121048
-             this.m_7911_(this.m_6103_() - f1);
-             this.m_146850_(GameEvent.f_223706_);
-          }
@@ -1622,6 +_,8 @@
    }
 
@@ -529,25 +519,37 @@
          if (itemstack.m_150930_(Items.f_42741_) && ElytraItem.m_41140_(itemstack)) {
             flag = true;
             int i = this.f_20937_ + 1;
-@@ -2786,8 +_,16 @@
+@@ -2786,8 +_,11 @@
 
    private void m_21329_() {
       if (this.m_6117_()) {
 -         if (ItemStack.m_41746_(this.m_21120_(this.m_7655_()), this.f_20935_)) {
 -            this.f_20935_ = this.m_21120_(this.m_7655_());
 +         ItemStack itemStack = this.m_21120_(this.m_7655_());
-+         if (net.minecraftforge.common.ForgeHooks.canContinueUsing(this.f_20935_, itemStack)) this.f_20935_ = itemStack;
+         if (net.minecraftforge.common.ForgeHooks.canContinueUsing(this.f_20935_, itemStack)) {
+            this.f_20935_ = itemStack;
+         }
 +         if (itemStack == this.f_20935_) {
-+
-+            if (!this.f_20935_.m_41619_()) {
-+              f_20936_ = net.minecraftforge.event.ForgeEventFactory.onItemUseTick(this, f_20935_, f_20936_);
-+              if (f_20936_ > 0)
-+                 f_20935_.onUsingTick(this, f_20936_);
-+            }
-+
             this.m_142106_(this.f_20935_);
          } else {
             this.m_5810_();
+@@ -2797,12 +_,15 @@
+    }
+ 
+    protected void m_142106_(ItemStack p_147201_) {
+      if (!p_147201_.m_41619_())
+          this.f_20936_ = net.minecraftforge.event.ForgeEventFactory.onItemUseTick(this, p_147201_, this.m_21212_());
+      if (this.m_21212_() > 0)
+       p_147201_.m_41731_(this.f_19853_, this, this.m_21212_());
+       if (this.m_21332_()) {
+          this.m_21137_(p_147201_, 5);
+       }
+ 
+-      if (--this.f_20936_ == 0 && !this.f_19853_.f_46443_ && !p_147201_.m_41781_()) {
+      if (--this.f_20936_ <= 0 && !this.f_19853_.f_46443_ && !p_147201_.m_41781_()) {
+          this.m_8095_();
+       }
+ 
@@ -2810,7 +_,7 @@
 
    private boolean m_21332_() {
@@ -719,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();
@@ -1,5 +1,15 @@
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
+@@ -116,6 +_,9 @@
+    private CompoundTag f_21359_;
+    private BlockPos f_21360_ = BlockPos.f_121853_;
+    private float f_21341_ = -1.0F;
+   @Nullable
+   private MobSpawnType spawnType;
+   private boolean spawnCancelled = false;
+ 
+    protected Mob(EntityType<? extends Mob> p_21368_, Level p_21369_) {
+       super(p_21368_, p_21369_);
@@ -224,7 +_,11 @@
    }
 
@@ -13,6 +23,31 @@
    }
 
    public boolean m_6549_(EntityType<?> p_21399_) {
+@@ -422,6 +_,9 @@
+          p_21484_.m_128379_("NoAI", this.m_21525_());
+       }
+ 
+      if (this.spawnType != null) {
+         p_21484_.m_128359_("forge:spawn_type", this.spawnType.name());
+      }
+    }
+ 
+    public void m_7378_(CompoundTag p_21450_) {
+@@ -474,6 +_,14 @@
+       }
+ 
+       this.m_21557_(p_21450_.m_128471_("NoAI"));
+      
+      if (p_21450_.m_128441_("forge:spawn_type")) {
+         try {
+            this.spawnType = MobSpawnType.valueOf(p_21450_.m_128461_("forge:spawn_type"));
+         } catch (Exception ex) {
+            p_21450_.m_128473_("forge:spawn_type");
+         }
+      }
+    }
+ 
+    protected void m_7625_(DamageSource p_21389_, boolean p_21390_) {
@@ -513,9 +_,9 @@
    public void m_8107_() {
       super.m_8107_();
@@ -28,7 +63,7 @@
          this.m_146870_();
       } else if (!this.m_21532_() && !this.m_8023_()) {
          Entity entity = this.f_19853_.m_45930_(this, -1.0D);
-+         net.minecraftforge.eventbus.api.Event.Result result = net.minecraftforge.event.ForgeEventFactory.canEntityDespawn(this);
+         net.minecraftforge.eventbus.api.Event.Result result = net.minecraftforge.event.ForgeEventFactory.canEntityDespawn(this, (ServerLevel) this.f_19853_);
 +         if (result == net.minecraftforge.eventbus.api.Event.Result.DENY) {
 +            f_20891_ = 0;
 +            entity = null;
@@ -39,7 +74,32 @@
          if (entity != null) {
             double d0 = entity.m_20280_(this);
             int i = this.m_6095_().m_20674_().m_21611_();
-@@ -1410,13 +_,23 @@
+@@ -1020,6 +_,16 @@
+ 
+    }
+ 
+   /**
+    * Forge: Override-Only, call via ForgeEventFactory.onFinalizeSpawn.<br>
+    * Overrides are allowed. Do not wrap super calls within override (as that will cause stack overflows).<br>
+    * Vanilla calls are replaced with a transformer, and are not visible in source.<br>
+    * <p>
+    * Be certain to either call super.finalizeSpawn or set the {@link #spawnType} field from within your override.
+    * @see {@link net.minecraftforge.event.ForgeEventFactory#onFinalizeSpawn onFinalizeSpawn} for additional documentation.
+    */
+   @Deprecated
+   @org.jetbrains.annotations.ApiStatus.OverrideOnly
+    @Nullable
+    public SpawnGroupData m_6518_(ServerLevelAccessor p_21434_, DifficultyInstance p_21435_, MobSpawnType p_21436_, @Nullable SpawnGroupData p_21437_, @Nullable CompoundTag p_21438_) {
+       RandomSource randomsource = p_21434_.m_213780_();
+@@ -1030,6 +_,7 @@
+          this.m_21559_(false);
+       }
+ 
+      this.spawnType = p_21436_;
+       return p_21437_;
+    }
+ 
+@@ -1410,15 +_,25 @@
       return false;
    }
 
@@ -56,11 +116,54 @@
          this.m_20256_(this.m_20184_().m_82520_(0.0D, 0.3D, 0.0D));
       }
 
-+   }
-+
+    }
+ 
 +   @Override
 +   public void jumpInFluid(net.minecraftforge.fluids.FluidType type) {
 +      this.jumpInLiquidInternal(() -> super.jumpInFluid(type));
-    }
- 
+   }
+
    public void m_147272_() {
+       this.m_262441_((p_262562_) -> {
+          return true;
+@@ -1442,5 +_,40 @@
+    public ItemStack m_142340_() {
+       SpawnEggItem spawneggitem = SpawnEggItem.m_43213_(this.m_6095_());
+       return spawneggitem == null ? null : new ItemStack(spawneggitem);
+   }
+
+   /**
+   * Returns the type of spawn that created this mob, if applicable.
+   * If it could not be determined, this will return null.
+   * <p>
+   * This is set via {@link Mob#finalizeSpawn}, so you should not call this from within that method, instead using the parameter.
+   */
+   @Nullable
+   public final MobSpawnType getSpawnType() {
+      return this.spawnType;
+   }
+
+   /**
+    * This method exists so that spawns can be cancelled from the {@link net.minecraftforge.event.entity.living.MobSpawnEvent.FinalizeSpawn FinalizeSpawnEvent} 
+    * without needing to hook up an additional handler for the {@link net.minecraftforge.event.entity.EntityJoinLevelEvent EntityJoinLevelEvent}.
+    * @return if this mob will be blocked from spawning during {@link Level#addFreshEntity(Entity)}
+    * @apiNote Not public-facing API.
+    */
+   @org.jetbrains.annotations.ApiStatus.Internal
+   public final boolean isSpawnCancelled() {
+      return this.spawnCancelled;
+   }
+
+   /**
+    * Marks this mob as being disallowed to spawn during {@link Level#addFreshEntity(Entity)}.<p>
+    * @throws UnsupportedOperationException if this entity has already been {@link Entity#isAddedToWorld() added to the world}. 
+    * @apiNote Not public-facing API.
+    */
+   @org.jetbrains.annotations.ApiStatus.Internal
+   public final void setSpawnCancelled(boolean cancel) {
+      if (this.isAddedToWorld()) {
+         throw new UnsupportedOperationException("Late invocations of Mob#setSpawnCancelled are not permitted.");
+      }
+      this.spawnCancelled = cancel;
+    }
+ }
@@ -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);
 +   }
Author	SHA1	Message	Date
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
LexManos	658e614dc1	1.19.4 Recommended Build	2023-06-07 12:08:15 -07:00
Apex	9abfcbc90b	Add method to GatherDataEvent to obtain collection of all input paths. (#9499 )	2023-05-29 13:47:21 -07:00
Dennis C	6ee20899bf	Log error when Sheets is class-loaded before registration is completed (#9475 )	2023-05-29 13:47:04 -07:00
Dennis C	42115d37d6	[1.19.x] Re-implement RenderTooltipEvent.Color (#9497 ) * Reimplement RenderTooltipEvent.Color * Formatting, comments, EXC * Deprecate instead of replacing	2023-05-16 12:24:27 +02:00
Joseph B	8abe9b6b0c	Add API for registering custom world preset editors (#9436 )	2023-05-14 15:53:34 -05:00
embeddedt	fc91dfd1d1	Remove unneeded extra reload of datapacks on world creation screen (#9454 )	2023-05-14 15:52:57 -05:00
SizableShrimp	8cd6f2d237	Bump ASM to 9.5	2023-05-14 15:50:07 -05:00
SizableShrimp	f1702495ef	Fix crash when running server from root directory Fixes #9498	2023-05-14 15:26:24 -05:00
Dennis C	2ab2ced589	Fix root transform matrix format, allow using all four root transform formats (#9496 )	2023-05-12 11:20:01 -07:00
Apex	c8f9e59fef	Add missing AT lines to allow registering custom game rule boolean/integer types (#9489 )	2023-05-10 09:27:10 -07:00
Brennan WardandBrennan Ward	9a25527a54	[1.19.x] Fix SaplingGrowTreeEvent#setFeature being ignored in FungusBlock (#9485 ) Co-authored-by: Brennan Ward <[email protected]>	2023-05-05 23:09:13 -05:00
SizableShrimp	ad6d11671e	Restore AccessibilityOnboardingScreen Fixes #9488	2023-05-05 23:07:49 -05:00
Brennan Ward	3c93cd414d	Update documentation on FinalizeSpawn (#9467 )	2023-05-05 10:26:41 -07:00
DBotThePony	2c243626f6	Fix fluids without sound event causing exception in tryFillContainer and tryEmptyContainer (#9445 )	2023-05-05 10:26:28 -07:00
Technici4n	ae05036bb3	Make FakePlayerFactory respect the given ServerLevel (#9479 )	2023-05-05 10:03:55 -07:00
Dennis C	3de22ffba3	Collect and log exceptions occurring in DeferredWorkQueue tasks (#9449 )	2023-05-04 16:43:34 -07:00
matyrobbrt	e1bf07dece	Fix `NamespacedWrapper#wrapAsHolder` (#9450 )	2023-05-04 16:42:02 -07:00
RealMangoRage	0ae63b0b07	Fixes ChatScreen calling .setScreen (#9443 ) Fix test compile failures also.	2023-04-30 22:57:52 +01:00
matyrobbrt	d4f211b815	Determine the Forge version the PR was built against when running PR compat checks (#9374 )	2023-04-24 10:59:56 -07:00
SizableShrimp	393b28d7bb	Add buildscript test to error on deprecated members that should of been removed. (#9460 )	2023-04-24 10:59:37 -07:00
sciwhiz12	47c807c0e3	Remove erroneous brace patch in Inventory (#9462 ) Fixes #9459	2023-04-23 13:24:20 +01:00
Dennis C	b398f52a7f	[1.19.4] Move root transform builder to ModelBuilder to allow use in ItemModelBuilder (#9456 )	2023-04-20 09:27:30 +02:00
SizableShrimp	f2aeeeb1fe	Fix forge grindstone hooks allowing stacks of non-stackable items (#9457 )	2023-04-20 00:19:35 -07:00
matyrobbrt	dcef406df8	[1.19.4] Fix FMLOnly (#9415 )	2023-04-18 16:46:04 +01:00
Dennis C	01846c729a	Fix ItemLayerModel erroneously adding particle texture to layer texture list (#9441 )	2023-04-07 08:16:17 +02:00
LexManos	e6aaaff3f3	Temporary fix for Canceling ProjectileImpactEvents of Piercing ammo. Event needs to be re-worked to have finer control. #9370	2023-04-05 11:16:39 -07:00
Brennan Ward	d4836bc769	Fix dummy air blocks not being marked as air (#9440 )	2023-04-03 15:04:34 -07:00
matyrobbrt	b5655b0ddc	Add support for splitting the login packet (#9367 ) It contains full copies of data registries and can easily surpass vanilla's limits	2023-03-30 15:59:01 -07:00
Brennan Ward	d75d333e13	Remove Attack Range and Reach Distance and add Block Reach and Entity Reach (#9361 )	2023-03-29 18:53:41 -07:00
ChampionAsh5357	f5e16aa353	Add default bucket sounds for milk (#9432 )	2023-03-29 18:48:29 -07:00
LexManos	4e5eecac12	Deprecate Item.onUsingTick, as vanilla provides the same function in Item.onUseTick now. Closes #9342	2023-03-29 18:46:00 -07:00
Brennan Ward	a111073181	Fix ScreenEvent.Init.[Pre/Post] not working correctly (#9431 )	2023-03-29 18:18:38 -07:00
LexManos	a05f555ab8	Allow FenceGateBlock to be used without a WoodType. Closes #9392	2023-03-29 17:59:51 -07:00
LexManos	df3db236e5	Deprecate duplicate tool tags that vanilla added in 1.19.4 We will maintain a seperate 'tools' tag until Mojang adds all relevent tool tags. Closes #9393	2023-03-29 17:59:50 -07:00
LexManos	71b115c8fe	Fix BlockEvent.Break not using ItemStack enchantment hooks.	2023-03-29 17:59:49 -07:00
LexManos	3e1b01af2c	Move Block.onCatchFire to above block removal to allow usage of BlockEntity data. Closes #9400	2023-03-29 17:59:48 -07:00
Brennan Ward	1ab0685d04	Fix FinalizeSpawn not blocking spawns during worldgen (#9420 )	2023-03-29 16:10:59 -07:00
LexManos	5c44992d1c	Fixed issue with MutableHashedLinkedMap when removing multiple sequential entries in the middle of the map. Added Unit tests for MutableHashLinkedMap Added support for removing using the iterator Added concurrent modification detection to the iterator Added default constructor with basic hashing strategy. Closes #9426	2023-03-29 15:49:49 -07:00
TelepathicGrunt	d448ffd539	Loosen access for BucketItem's canBlockContainFluid (#9421 )	2023-03-28 13:34:10 -07:00
ChampionAsh5357	9f895a79f2	Update and Regenerate Datapacks (#9419 ) Add generation for pack.mcmeta	2023-03-28 13:33:59 -07:00
Paint_Ninja	6e1de81ff5	Restore ability to change message in ClientChatEvent (#9377 )	2023-03-27 14:35:05 -07:00
sciwhiz12	b493a63fb6	Remove duplicate line in FoodData patch (#9424 ) The line was accidentally duplicated in the 1.19.4 update and patching process. Fixes #9422	2023-03-27 12:51:53 -07:00
Joseph B	ae65f5a255	Rename RegisterParticleProviderEvent's register methods to describe what kind of particle providers they register (deprecating old methods to avoid breaking) and minor docs tweaks (#9388 )	2023-03-25 19:57:39 -07:00
noeppi_noeppi	bb49b9e6dc	Update pack versions (#9414 )	2023-03-24 13:17:22 -07:00
Brennan Ward	2815e69407	[1.19.4] Revamp and fix spawn events (#9133 )	2023-03-23 18:29:06 +00:00
Exopandora	b33efc0727	[1.19.4] Replace blitOffset parameter with PoseStack in IItemDecorator (#9409 ) * Replace blitOffset with PoseStack in IItemDecorator * Circumvent breaking changes * Fix blitOffset type	2023-03-22 11:11:01 +01:00
Dennis C	434c1ec4f8	Fix JSON model root transforms (#9410 )	2023-03-22 11:09:41 +01:00
Dennis C	c58d922324	Fix tossed items not being able to be picked up by other players. Closes #9412 (#9404 )	2023-03-21 19:15:04 -07:00
Dennis C	331374dc7a	Fix infinite BE render bounds failing frustum intersection test. Closes #9321 (#9407 )	2023-03-21 12:16:49 -07:00
matyrobbrt	c18eb23259	Make ForgeSlider use the new vanilla texture (#9406 )	2023-03-20 14:16:35 -07:00
J.T. McQuigg	d0e2242043	Add BlockSetType#register to accesstransformer.cfg (#9386 )	2023-03-20 14:16:18 -07:00
Dennis C	684d36201f	Add option to completely hide a crash-callable depending on a runtime value (#9372 )	2023-03-20 14:15:59 -07:00
Jason	7b8ca60d32	Add isNewChunk to ChunkEvent.Load (#9369 )	2023-03-20 14:15:33 -07:00
sciwhiz12	576ff81856	Remove DistExecutor calls in PistonEventTest (#9348 )	2023-03-20 14:14:21 -07:00
sciwhiz12	73e68c9322	Fix hardcoded precipitation in ClimateSettingsBuilder (#9402 ) This effectively caused all biomes to have precipitation, such as minecraft:desert. Fixes #9397	2023-03-20 08:56:10 +01:00
sciwhiz12	3cd758647d	Fix incorrect variable used for swimming check (#9403 ) Because of the incorrect variable, the check to stop sprinting (and stop swimming) never fired correctly. 1.19.3's `flag5` variable was renamed to `flag7` in 1.19.4; however, this was not caught during patching because of the fuzzy patcher. Fixes #9399	2023-03-20 08:44:34 +01:00
sciwhiz12	14bc8d6611	Fix incorrect boolean used for glint effect (#9401 ) The `flag1` variable is ultimately controlled by whether the armor slot being rendered is for the leggings, which explains this bug where the leggings always had the enchantment glint but not any other armor piece. Fixes #9394	2023-03-20 08:02:18 +01:00
Redstone_Dubstep	d552ce5eac	Fixed ModMismatchDisconnectedScreen displaying missing mods wrongly (#9398 )	2023-03-19 15:51:03 -07:00
Dennis C	f03adc840e	Fix misaligned text render type patch (#9391 )	2023-03-16 14:44:20 -07:00
LexManos	31e73355c3	Remove thread filter from processing clientside custom payloads. Closes @9390	2023-03-16 11:51:46 -07:00
LexManos	88368dfa1c	Fix LivingEntity patch which caused crash while entities got hurt. Closes #9389	2023-03-16 11:50:11 -07:00
matyrobbrt	7e6c8351c3	Fix wrong parameters in `Screen#renderTooltipInternal` patch (#9387 )	2023-03-15 13:05:46 -07:00
LexManos	fb20e4fa90	Fix misaligned patch in LevelRenderer. Closes #9385	2023-03-15 13:04:16 -07:00
Jonathan Coates	94c5699a03	Remove our fix for MC-121048 as it has been fixed by Vanilla (#9381 )	2023-03-15 11:42:02 -07:00
LexManos	58626d1a22	Fix advancements not loading, bug seems to be fixed by vanilla now. Closes #9384	2023-03-15 11:41:12 -07:00
LexManos	631e72f99d	Fixed patch verifier for cases where patches lowered access levels. Closes #9383	2023-03-15 11:39:42 -07:00
LexManos	3fffc18729	Fix crouching while sprinting stopping the player when step height is modified. Closes #9376	2023-03-14 23:56:29 -07:00