1.21.1

Add gametest to verify that it functions.

.teamcity/settings.kts

@@ -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.20.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.7", 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.21.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*)

CREDITS.txt

@@ -3,7 +3,7 @@ Minecraft Forge: Credits/Thank You
 Forge is a set of tools and modifications to the Minecraft base game code to assist 
 mod developers in creating new and exciting content. It has been in development for 
 several years now, but I would like to take this time thank a few people who have 
-helped it along it's way.
+helped it along its way.
 
 First, the people who originally created the Forge projects way back in Minecraft 
 alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
@@ -11,7 +11,7 @@ of me taking over the project, who knows what Minecraft modding would be today.
 
 Secondly, someone who has worked with me, and developed some of the core features
 that allow modding to be as functional, and as simple as it is, cpw. For developing
-FML, which stabelized the client and server modding ecosystem. As well as the base
+FML, which stabilized the client and server modding ecosystem. As well as the base
 loading system that allows us to modify Minecraft's code as elegently as possible.
 
 Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
@@ -45,11 +45,11 @@ and minecraft clients.
 The code is authored by cpw.
 
 It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
-http://www.minecraftforum.net/topic/75440-
+https://www.minecraftforum.net/topic/75440-
 This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
 
 It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
-http://www.minecraftforge.net/
+https://minecraftforge.net/
 
 Additionally, it contains an implementation of topological sort based on that 
 published at http://keithschwarz.com/interesting/code/?dir=topological-sort

build.gradle

@@ -2,13 +2,13 @@ import net.minecraftforge.forge.tasks.*
 import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1'
+    id 'net.minecraftforge.licenser' version '1.0.1'
     id 'com.github.ben-manes.versions' version '0.46.0'
     id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
     id 'eclipse'
     id 'de.undercouch.download' version '5.4.0'
-    id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.16,6.2)' apply false
+    id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false
     id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
     id 'org.barfuin.gradle.taskinfo' version '2.1.0'
 }
@@ -19,10 +19,6 @@ ext {
     GIT_INFO = gradleutils.gitInfo
     VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
     FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
-
-    BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
-    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
-    FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
 }
 
 changelog {
@@ -50,10 +46,10 @@ project(':mcp') {
 
 if (System.env.TEAMCITY_VERSION) {
     //Only setup the CI environment if and only if the environment variables are set.
-    tasks.configureTeamCity {
+    tasks.named('configureTeamCity').configure {
         doLast {
             println "##teamcity[buildNumber '${project(':forge').version}']"
             println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
         }
     }
-}
+}

buildSrc/build.gradle

@@ -4,10 +4,10 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:9.5'
-    implementation 'org.ow2.asm:asm-tree:9.5'
-    implementation 'net.minecraftforge:srgutils:0.5.+'
-    implementation 'commons-io:commons-io:2.12.0'
+    implementation 'org.ow2.asm:asm:9.7'
+    implementation 'org.ow2.asm:asm-tree:9.7'
+    implementation 'net.minecraftforge:srgutils:0.5.10'
+    implementation 'commons-io:commons-io:2.13.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
-}
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BundleList.groovy

@@ -4,14 +4,19 @@ import org.gradle.api.tasks.*
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+import java.util.zip.ZipFile
 
 abstract class BundleList extends DefaultTask {
     @InputFiles abstract ConfigurableFileCollection getConfig()
+    @InputFiles abstract ConfigurableFileCollection getConfigExtra()
     @InputFile abstract RegularFileProperty getServerBundle()
     @OutputFile abstract RegularFileProperty getOutput()
 
     BundleList() {
         config.setFrom(project.configurations.installer)
+        configExtra.setFrom(project.configurations.installerextra)
         output.convention(project.layout.buildDirectory.file("$name/output.list"))
         configure {
             dependsOn(project.tasks.universalJar)
@@ -23,21 +28,31 @@ abstract class BundleList extends DefaultTask {
     void run() {
         def entries = [:] as TreeMap
         def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
-        for (var dep : resolved) {
+        for (def dep : resolved) {
             def info = Util.getMavenInfoFromDep(dep)
             //println("$dep.file.sha1\t$info.name\t$info.path")
             entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
         }
-        
-        [
-            project.tasks.universalJar
-        ].forEach{ packed -> 
-            def info = Util.getMavenInfoFromTask(packed)
-            def file = packed.archiveFile.get().asFile
-            entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
+
+        resolved = project.configurations.installerextra.resolvedConfiguration.resolvedArtifacts
+        for (def dep : resolved) {
+            def info = Util.getMavenInfoFromDep(dep)
+            //println("$dep.file.sha1\t$info.name\t$info.path")
+            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
         }
+
+        var packed = (AbstractArchiveTask) project.tasks.universalJar
+        var info = Util.getMavenInfoFromTask(packed)
+        def file = packed.archiveFile.get().asFile
+        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
+
+        var classifier = 'server'
+        var genned = project.tasks.applyServerBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        file = genned.output.get().asFile
+        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
         
-        try (def zip = new java.util.zip.ZipFile(serverBundle.get().asFile)) {
+        try (def zip = new ZipFile(serverBundle.get().asFile)) {
             def entry = zip.getEntry('META-INF/libraries.list')
             def data = zip.getInputStream(entry).text.split('\n')
             for (def line : data) {

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BytecodeFinder.groovy

@@ -1,6 +1,7 @@
 package net.minecraftforge.forge.tasks
 
 import groovy.json.JsonBuilder
+import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
@@ -10,6 +11,7 @@ import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
+@CompileStatic
 abstract class BytecodeFinder extends DefaultTask {
     @InputFile abstract RegularFileProperty getJar()
     // It should be fine to mark the output as internal as we want to control when we run it anyways.
@@ -24,13 +26,13 @@ abstract class BytecodeFinder extends DefaultTask {
     protected void exec() {
         Util.init()
 
-        def outputFile = output.get().asFile
+        var outputFile = output.get().asFile
         if (outputFile.exists())
             outputFile.delete()
 
         pre()
 
-        Util.processClassNodes(jar.get().asFile, this::process)
+        Util.processClassNodes(jar.get().asFile, this.&process)
 
         post()
         outputFile.text = new JsonBuilder(getData()).toPrettyString()
@@ -38,8 +40,8 @@ abstract class BytecodeFinder extends DefaultTask {
 
 
     protected process(ClassNode node) {
-        if (node.fields != null) node.fields.each { process(node, it) }
-        if (node.methods != null) node.methods.each { process(node, it) }
+        if (node.fields !== null) node.fields.each { process(node, it) }
+        if (node.methods !== null) node.methods.each { process(node, it) }
     }
 
     protected pre() {}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BytecodePredicateFinder.groovy

@@ -12,7 +12,7 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
     @Internal
     abstract Property<Closure<Boolean>> getPredicate()
 
-    private final Set<String> matches = new HashSet()
+    private final Set<String> matches = new HashSet<>()
 
     @Override
     protected process(ClassNode parent, MethodNode node) {

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CleanProperties.groovy

@@ -1,5 +1,8 @@
 package net.minecraftforge.forge.tasks;
 
+import groovy.transform.CompileDynamic;
+import groovy.transform.CompileStatic;
+
 import java.util.Properties;
 import java.util.Enumeration;
 import java.util.Map;
@@ -26,6 +29,7 @@ import java.util.Set;
  * This does the same thing, as well as sorting alphabetically.
  * It also ignores all comments. We can add them latter if someone cares.
  */
+@CompileStatic
 public class CleanProperties extends Properties {
     private static final long serialVersionUID = 1L;
     private static final String LINE_SEP = System.getProperty("line.separator");
@@ -58,6 +62,7 @@ public class CleanProperties extends Properties {
         return Collections.enumeration(ret);
     }
 
+    @CompileDynamic
     @Override
     public Set<Map.Entry<Object, Object>> entrySet() {
         Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ClosureHelper.groovy

@@ -1,5 +1,7 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.stc.FirstParam
+
 import java.util.function.BiConsumer
 
 public class ClosureHelper {
@@ -22,7 +24,7 @@ public class ClosureHelper {
         }
     }
     
-    static <T> T apply(T obj, Closure cl) {
+    static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
         cl.delegate = obj
         cl.resolveStrategy = Closure.DELEGATE_FIRST
         cl()

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/DownloadLibraries.groovy

@@ -27,7 +27,7 @@ abstract class DownloadLibraries extends DefaultTask {
     def run() {
 		Util.init()
 		File outputDir = output.get().asFile
-        def libraries = new ArrayList()
+        var libraries = new ArrayList<String>()
 
 		def json = input.get().asFile.json().libraries.each { lib ->
 		    //TODO: Thread?
@@ -35,7 +35,7 @@ abstract class DownloadLibraries extends DefaultTask {
 			artifacts.each{ art -> 
 				def target = new File(outputDir, art.path)
 				libraries.add(target.absolutePath)
-				if (!target.exists() || !art.sha1.equals(target.sha1())) {
+				if (!target.exists() || art.sha1 != target.sha1()) {
 					project.logger.lifecycle("Downloading ${art.url}")
 					if (!target.parentFile.exists()) {
 						target.parentFile.mkdirs()
@@ -43,7 +43,7 @@ abstract class DownloadLibraries extends DefaultTask {
 					new URL(art.url).withInputStream { i ->
 						target.withOutputStream { it << i }
 					}
-					if (!art.sha1.equals(target.sha1())) {
+					if (art.sha1 != target.sha1()) {
 						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
 					}
 				}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ExtractFile.groovy

@@ -1,10 +1,14 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
 
+import java.util.zip.ZipFile
+
+@CompileStatic
 abstract class ExtractFile extends DefaultTask {
     @InputFile abstract RegularFileProperty getInput()
     @Input abstract Property<String> getTarget()
@@ -12,11 +16,11 @@ abstract class ExtractFile extends DefaultTask {
 
     @TaskAction
     protected void exec() {
-        def zip = new java.util.zip.ZipFile(input.get().asFile);
-        def entry = zip.getEntry(target.get())
+        var zip = new ZipFile(input.get().asFile);
+        var entry = zip.getEntry(target.get())
         if (entry == null)
             throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
-        def stream = zip.getInputStream(entry)
+        var stream = zip.getInputStream(entry)
         output.get().asFile.withOutputStream { out ->
             stream.transferTo(out)
         }

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/FieldCompareFinder.groovy

@@ -1,20 +1,11 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.CompileStatic
 import groovy.transform.EqualsAndHashCode
 
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.TreeMap
-import java.util.TreeSet
-import java.util.function.BiConsumer
-
-import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.*
-
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.Type
+import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
 import static org.objectweb.asm.Opcodes.*
@@ -34,17 +25,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
     
     @Override
     protected process(ClassNode parent, MethodNode node) {
-        def last = null
+        AbstractInsnNode last = null
         def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
         for (int x = 0; x < node.instructions.size(); x++) {
             def current = node.instructions.get(x)
-            if (current.opcode == IF_ACMPEQ || current.opcode == IF_ACMPNE) {
-                if (last != null && (last.opcode == GETSTATIC || last.opcode == GETFIELD)) {
+            if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
+                if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
                     def target = new Search(cls: last.owner, name: last.name)
                     def wanted = fieldsReverse.get(target)
                     def original = fields.get(wanted)
                     def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
-                    if (wanted != null && (original.blacklist == null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
+                    if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
                         targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
                     }
                 }
@@ -68,9 +59,10 @@ abstract class FieldCompareFinder extends BytecodeFinder {
 		}
         return ret
     }
-    
+
+    @CompileStatic
     @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
-    public static class Search {
+    static class Search {
         @Input
         String cls
         
@@ -89,17 +81,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
             return cls + '.' + name
         }
         
-        def blacklist(def owner, def name, def desc) {
-            if (blacklist == null)
-                blacklist = new HashSet()
+        def blacklist(String owner, String name, String desc) {
+            if (blacklist === null)
+                blacklist = new HashSet<>()
             blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
         }
-        def blacklist(def owner) {
+        def blacklist(String owner) {
             blacklist(owner, '', '')
         }
     }
     
-    def fields(Closure cl) {
+    void fields(Closure cl) {
         new ClosureHelper(cl, {name, ccl ->
             def search = ClosureHelper.apply(new Search(), ccl)
             this.fields.put(name, search)

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy

@@ -1,5 +1,7 @@
 package net.minecraftforge.forge.tasks
 
+import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.*
 import org.gradle.api.DefaultTask
@@ -27,7 +29,7 @@ abstract class InstallerJar extends Zip {
         from(project.rootProject.file('/src/main/resources/url.png'))
         project.afterEvaluate {
             from(project.zipTree(downloadInstaller.output)) {
-                duplicatesStrategy = 'exclude'
+                duplicatesStrategy = DuplicatesStrategy.EXCLUDE
             }
             
             if (fat.get() || offline.get()) {
@@ -42,7 +44,7 @@ abstract class InstallerJar extends Zip {
                 // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
                 [
                     project.tasks.serverShimJar // Server bootstrap executable jar
-                ].forEach { packed ->
+                ].forEach { AbstractArchiveTask packed ->
                     def path = Util.getMavenInfoFromTask(packed).path
                     from(packed) {
                         rename { "maven/$path" }
@@ -67,8 +69,8 @@ abstract class InstallerJar extends Zip {
             ].each { task ->
                 def json = task.output.get().asFile.json
                 json.libraries.each { lib -> 
-                    deps.put(lib.name, lib.downloads.artifact)
-                    //println(lib.name)
+                    if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
+                        deps.put(lib.name, lib.downloads.artifact)
                 }
             }
             
@@ -76,10 +78,10 @@ abstract class InstallerJar extends Zip {
             [
                 project.tasks.universalJar, // Forge runtime code
                 project.tasks.serverShimJar // Shim jar for dedicated server
-            ].forEach { packed ->
+            ].forEach { AbstractArchiveTask packed ->
                 def name = Util.getMavenInfoFromTask(packed).name
                 def info = deps.remove(name)
-                if (info != null) {
+                if (info !== null) {
                     println("Adding: $packed.path $name")
                     parent.from(packed) {
                         rename { "maven/$info.path" }
@@ -96,7 +98,7 @@ abstract class InstallerJar extends Zip {
                 //println('')
                 def resolved = cfg.resolvedConfiguration.resolvedArtifacts
                 int found = 0
-                for (var dep : resolved) {
+                for (def dep : resolved) {
                     def name = Util.getMavenInfoFromDep(dep).name
                     def info = deps.remove(name)
                     if (info == null) {
@@ -132,13 +134,13 @@ abstract class InstallerJar extends Zip {
         }
         
         void addFile(file, info) {
-            def pack = parent.offline.get() || info.url.isEmpty()
+            boolean pack = parent.offline.get() || info.url.isEmpty()
             
             // If it's a offline jar just always pack
             if (!pack) {
                 try {
-                    def remote = new URL("${info.url}.sha1").getText('UTF-8')
-                    pack = !info.sha1.equals(remote)
+                    var remote = new URL("${info.url}.sha1").getText('UTF-8')
+                    pack = info.sha1 != remote
                 } catch (FileNotFoundException e) {
                     pack = !info.url.startsWith('https://libraries.minecraft.net/')
                     // Oh noes its not there!

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy

@@ -7,6 +7,7 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
 import java.nio.file.Files
 
@@ -45,7 +46,7 @@ abstract class InstallerJson extends DefaultTask {
         [
             project.tasks.universalJar,
             project.tasks.serverShimJar
-        ].forEach { packed ->
+        ].forEach { AbstractArchiveTask packed ->
             def info = Util.getMavenInfoFromTask(packed)
             libs.put(info.name, [
                 name: info.name,

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy

@@ -6,6 +6,7 @@ import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
 import java.nio.file.Files
 
@@ -23,6 +24,7 @@ abstract class LauncherJson extends DefaultTask {
         dependsOn(project.tasks.universalJar)
         input.from(project.tasks.universalJar.archiveFile)
         input.from(project.configurations.installer)
+        input.from(project.configurations.installerextra)
         configure {
             def mc    = project.rootProject.ext.MC_VERSION
             def forge = project.rootProject.ext.FORGE_VERSION
@@ -33,7 +35,7 @@ abstract class LauncherJson extends DefaultTask {
                     "Our efforts are supported by ads from the download page.",
                     "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
                 ],
-                id: "$mc-$project.name$forge",
+                id: "$mc-$project.name-$forge",
                 time: timestamp,
                 releaseTime: timestamp,
                 inheritsFrom: mc,
@@ -49,30 +51,46 @@ abstract class LauncherJson extends DefaultTask {
                 dependsOn(packed)
                 input.from packed.archiveFile
             }
+            
+            def patched = project.tasks.applyClientBinPatches
+            dependsOn(patched)
+            input.from patched.output
         }
     }
 
     @TaskAction
     protected void exec() {
-        [
-            project.tasks.universalJar
-        ].forEach { packed ->
-            def info = Util.getMavenInfoFromTask(packed)
-            json.libraries.add([
-                name: info.name,
-                downloads: [
-                    artifact: [
-                        path: info.path,
-                        url: "https://maven.minecraftforge.net/$info.path",
-                        sha1: packed.archiveFile.get().asFile.sha1(),
-                        size: packed.archiveFile.get().asFile.length()
-                    ]
+        var packed = (AbstractArchiveTask) project.tasks.universalJar
+        def info = Util.getMavenInfoFromTask(packed)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "https://maven.minecraftforge.net/$info.path",
+                    sha1: packed.archiveFile.get().asFile.sha1(),
+                    size: packed.archiveFile.get().asFile.length()
                 ]
-            ])
-        }
-        getArtifacts(project, project.configurations.installer).each { key, lib -> 
-            json.libraries.add(lib)
-        }
+            ]
+        ])
+
+        var classifier = 'client'
+        var genned = project.tasks.applyClientBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "",
+                    sha1: genned.output.get().asFile.sha1(),
+                    size: genned.output.get().asFile.length()
+                ]
+            ]
+        ])
+
+        json.libraries.addAll(getArtifacts(project.configurations.installerextra).values())
+        json.libraries.addAll(getArtifacts(project.configurations.installer).values())
         Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
     }
 }

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/MergeJars.groovy

@@ -1,5 +1,6 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.CompileStatic
 import org.apache.commons.io.IOUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
@@ -12,6 +13,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
+@CompileStatic
 abstract class MergeJars extends DefaultTask {
     MergeJars() {
         output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
@@ -24,8 +26,8 @@ abstract class MergeJars extends DefaultTask {
         try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
             for (def jar : jars) {
                 try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
-                    def entry
-                    while ((entry = zin.getNextEntry()) != null) {
+                    ZipEntry entry
+                    while ((entry = zin.getNextEntry()) !== null) {
                         ZipEntry _new = new ZipEntry(entry.getName())
                         _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
                         zout.putNextEntry(_new)

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ObjectTarget.groovy

@@ -27,6 +27,6 @@ public class ObjectTarget implements Comparable<ObjectTarget> {
     
     @Override
     int compareTo(ObjectTarget o) {
-        return toString().compareTo(o.toString())
+        return toString() <=> o.toString()
     }
 }

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy

@@ -16,7 +16,7 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
     SetupCheckJarCompatibility() {
         group = 'jar compatibility'
         onlyIf {
-            inputVersion.getOrNull() != null
+            inputVersion.getOrNull() !== null
         }
         outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
 

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy

@@ -2,35 +2,47 @@ package net.minecraftforge.forge.tasks
 
 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
+import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.SimpleType
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ResolvedArtifact
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 
-import java.io.File
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Semaphore
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
-public class Util {
-    static final ASM_LEVEL = Opcodes.ASM9
+final class Util {
+    public static final int ASM_LEVEL = Opcodes.ASM9
+    private static final HttpClient HTTP = HttpClient.newBuilder().build()
 
     static void init() {
         File.metaClass.sha1 = { ->
             MessageDigest md = MessageDigest.getInstance('SHA-1')
-            delegate.eachByte 4096, {bytes, size ->
+            delegate.eachByte(4096) { byte[] bytes, int size ->
                 md.update(bytes, 0, size)
             }
-            return md.digest().collect {String.format "%02x", it}.join()
+            return md.digest().collect(this.&toHex).join('')
         }
         File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
         File.metaClass.sha256 = { ->
             MessageDigest md = MessageDigest.getInstance('SHA-256')
-            delegate.eachByte 4096, {bytes, size ->
+            delegate.eachByte(4096) { byte[] bytes, int size ->
                 md.update(bytes, 0, size)
             }
-            return md.digest().collect {String.format "%02x", it}.join()
+            return md.digest().collect(this.&toHex).join('')
         }
         File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
 
@@ -39,16 +51,17 @@ public class Util {
         File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
 
         Date.metaClass.iso8601 = { ->
-            def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-            def result = format.format(delegate)
+            var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+            var result = format.format(delegate)
             return result[0..21] + ':' + result[22..-1]
         }
 
         String.metaClass.rsplit = { String del, int limit = -1 ->
-            def lst = new ArrayList()
-            def x = 0, idx
-            def tmp = delegate
-            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit == -1 || x++ < limit)) {
+            var lst = new ArrayList<String>()
+            int x = 0
+            int idx
+            String tmp = delegate
+            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
                 lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
                 tmp = tmp.substring(0, idx)
             }
@@ -57,7 +70,7 @@ public class Util {
         }
     }
 
-    public static String[] getClasspath(project, libs, artifact) {
+    static String[] getClasspath(Project project, Map libs, String artifact) {
         def ret = []
         artifactTree(project, artifact).each { key, lib ->
             libs[lib.name] = lib
@@ -67,30 +80,38 @@ public class Util {
         return ret
     }
 
-    public static def getArtifacts(project, config) {
-        def ret = [:]
-        config.resolvedConfiguration.resolvedArtifacts.each { dep ->
-            def info = getMavenInfoFromDep(dep)
-            def url = "https://libraries.minecraft.net/$info.path"
+    @CompileStatic
+    static Map getArtifacts(Configuration config) {
+        var ret = [:]
+        var semaphore = new Semaphore(1, true)
+        config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
+            var info = getMavenInfoFromDep(dep)
+            var domain = 'libraries.minecraft.net'
+            var url = "https://$domain/$info.path"
             if (!checkExists(url))
-                url = "https://maven.minecraftforge.net/$info.path"
-                
+                url.values[0] = 'maven.minecraftforge.net'
+
+            var sha1 = sha1(dep.file)
+
+            semaphore.acquire()
             ret[info.key] = [
                 name: info.name,
                 downloads: [
                     artifact: [
                         path: info.path,
-                        url: url,
-                        sha1: dep.file.sha1(),
+                        url: url.toString(),
+                        sha1: sha1,
                         size: dep.file.length()
                     ]
                 ]
             ]
-        }
+            semaphore.release()
+        })
         return ret
     }
-    
-    public static Map getMavenInfoFromDep(dep) {
+
+    @CompileStatic
+    static Map getMavenInfoFromDep(ResolvedArtifact dep) {
         return getMavenInfoFromMap([
             group: dep.moduleVersion.id.group,
             name: dep.moduleVersion.id.name,
@@ -99,49 +120,69 @@ public class Util {
             extension: dep.extension
         ])
     }
-    public static Map getMavenInfoFromTask(task) {
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(AbstractArchiveTask task) {
         return getMavenInfoFromMap([
-            group: task.project.group,
+            group: task.project.group.toString(),
             name: task.project.name,
-            version: task.project.version,
+            version: task.project.version.toString(),
             classifier: task.archiveClassifier.get(),
             extension: task.archiveExtension.get()
         ])
     }
-    
-    private static Map getMavenInfoFromMap(art) {
-        def key = "$art.group:$art.name"
-        def name = "$art.group:$art.name:$art.version"
-        def path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
-        if (art.classifier != null) {
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(Task task, String classifier) {
+        return getMavenInfoFromMap([
+            group: task.project.group.toString(),
+            name: task.project.name,
+            version: task.project.version.toString(),
+            classifier: classifier,
+            extension: 'jar'
+        ])
+    }
+
+    @CompileStatic
+    private static Map getMavenInfoFromMap(Map<String, String> art) {
+        var key = "$art.group:$art.name"
+        var name = "$art.group:$art.name:$art.version"
+        var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
+        if (art.classifier !== null) {
             name += ":$art.classifier"
             path += "-$art.classifier"
         }
-        if (!'jar'.equals(art.extension)) {
+        if ('jar' != art.extension) {
             name += "@$art.extension"
             path += ".$art.extension"
         } else {
             path += ".jar"
         }
         return [
-            key: key,
-            name: name,
-            path: path,
+            key: key.toString(),
+            name: name.toString(),
+            path: path.toString(),
             art: art
         ]
     }
 
-    public static def iso8601Now() { new Date().iso8601() }
+    static String iso8601Now() { new Date().iso8601() }
 
-    public static def sha1(file) {
+    @CompileStatic
+    static String sha1(File file) {
         MessageDigest md = MessageDigest.getInstance('SHA-1')
-        file.eachByte 4096, {bytes, size ->
+        file.eachByte(4096) { byte[] bytes, int size ->
             md.update(bytes, 0, size)
         }
-        return md.digest().collect {String.format "%02x", it}.join()
+        return md.digest().collect(this.&toHex).join('')
     }
 
-    private static def artifactTree(project, artifact, transitive = true) {
+    @CompileStatic
+    private static String toHex(byte bite) {
+        return String.format('%02x', bite)
+    }
+
+    private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
         if (!project.ext.has('tree_resolver'))
             project.ext.tree_resolver = 1
         def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
@@ -149,37 +190,36 @@ public class Util {
         def dep = project.dependencies.create(artifact)
         cfg.dependencies.add(dep)
         def files = cfg.resolve()
-        return getArtifacts(project, cfg)
+        return getArtifacts(cfg)
     }
 
-    static boolean checkExists(url) {
+    @CompileStatic
+    static boolean checkExists(String url) {
         try {
-            def code = new URL(url).openConnection().with {
-                requestMethod = 'HEAD'
-                connect()
-                responseCode
-            }
-            return code == 200
+            return HTTP.send(HttpRequest.newBuilder(new URI(url))
+                    .method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
+            ).statusCode() === 200
         } catch (Exception e) {
             if (e.toString().contains('unable to find valid certification path to requested target'))
-                throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
+                throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
             throw e
         }
     }
 
-    static String getLatestForgeVersion(mcVersion) {
+    static String getLatestForgeVersion(String 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) {
+    @CompileStatic
+    static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
         file.withInputStream { i ->
             new ZipInputStream(i).withCloseable { zin ->
                 ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
+                while ((zein = zin.nextEntry) !== null) {
                     if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(ASM_LEVEL)
+                        var node = new ClassNode(ASM_LEVEL)
                         new ClassReader(zin).accept(node, 0)
                         process(node)
                     }
@@ -187,4 +227,4 @@ public class Util {
             }
         }
     }
-}
+}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ValidateDeprecations.groovy

@@ -5,6 +5,7 @@
 
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.CompileStatic
 import net.minecraftforge.srgutils.MinecraftVersion
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
@@ -28,8 +29,8 @@ abstract class ValidateDeprecations extends DefaultTask {
 
     @TaskAction
     protected void exec() {
-        def mcVer = MinecraftVersion.from(mcVersion.get())
-        def errors = []
+        var mcVer = MinecraftVersion.from(mcVersion.get())
+        List<String> errors = []
 
         Util.processClassNodes(input.get().asFile) {
             processNode(mcVer, errors, it)
@@ -65,7 +66,7 @@ abstract class ValidateDeprecations extends DefaultTask {
         }
     }
 
-    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure context) {
+    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
         def values = annotation.values
         if (values === null)
             return
@@ -73,7 +74,7 @@ abstract class ValidateDeprecations extends DefaultTask {
         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())
+            int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
             if (split.length < 2)
                 return
             def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
@@ -82,6 +83,7 @@ abstract class ValidateDeprecations extends DefaultTask {
         }
     }
 
+    @CompileStatic
     private static int[] splitDots(String version) {
         String[] pts = version.split('\\.')
         int[] values = new int[pts.length]

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckExcs.groovy

@@ -26,12 +26,12 @@ abstract class CheckExcs extends CheckTask {
         excs.each { f ->
             final lines = []
             f.eachLine { line ->
-                def idx = line.indexOf('#')
-                if (idx == 0 || line.isEmpty()) {
+                int idx = line.indexOf('#')
+                if (idx === 0 || line.isEmpty()) {
                     return
                 }
 
-                if (idx != -1) line = line.substring(0, idx - 1)
+                if (idx !== -1) line = line.substring(0, idx - 1)
 
                 if (!line.contains('=')) {
                     reporter.report("Invalid: $line")
@@ -58,6 +58,8 @@ abstract class CheckExcs extends CheckTask {
                     return
                 }
                 lines.add(line)
+
+                return
             }
 
             if (fix) f.text = lines.sort().join('\n')

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckMode.groovy

@@ -6,4 +6,6 @@ import groovy.transform.CompileStatic
 enum CheckMode {
     CHECK,
     FIX
+
+    CheckMode() {}
 }

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckPatches.groovy

@@ -36,13 +36,13 @@ abstract class CheckPatches extends CheckTask {
         }
     }
     
-    def accessChange(previous, current) {
+    static boolean accessChange(String previous, String 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()
+        int oldFixedErrors = reporter.fixed.size()
 
         final lines = Files.readAllLines(patch)
 
@@ -140,7 +140,7 @@ abstract class CheckPatches extends CheckTask {
                     final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
 
                     if (!prevLineChange && !nextLineChange) {
-                        reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath", false)
+                        reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath \n$prevLine\n$line\n${lines[i+1]}", false)
                     }
                 }
 

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckSAS.groovy

@@ -94,7 +94,7 @@ abstract class CheckSAS extends CheckTask {
         }
     }
 
-    protected static isSided(Annotatable annotatable) {
+    protected static boolean isSided(Annotatable annotatable) {
         if (annotatable === null) return false
         for (ann in annotatable.annotations) {
             if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
@@ -104,7 +104,7 @@ abstract class CheckSAS extends CheckTask {
     }
     
     protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
-        return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
+        return json.values().findAll{ it.methods !== null && it.methods[desc] !== null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
                 .collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
     }
 }

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckTask.groovy

@@ -1,6 +1,8 @@
 package net.minecraftforge.forge.tasks.checks
 
 import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.ThirdParam
 import net.minecraftforge.forge.tasks.Util
 import org.gradle.api.Action
 import org.gradle.api.DefaultTask
@@ -33,7 +35,7 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
     void run() {
         Util.init()
 
-        final doFix = getMode().get() === CheckMode.FIX
+        boolean doFix = getMode().get() === CheckMode.FIX
         final Reporter reporter = new Reporter(doFix)
         check(reporter, doFix)
 
@@ -88,7 +90,8 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
     }
 
     static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
-                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type') Closure configuration) {
+                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type')
+                                                   @ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
         taskName = taskName.capitalize()
         tasks.register("check$taskName", clazz) { CheckTask task ->
             def castedTask = task as T

build_clean.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'java-library'
-    id 'org.cadixdev.licenser'
     id 'net.minecraftforge.gradle.patcher'
 }
 
@@ -62,4 +61,13 @@ eclipse.classpath.file.whenMerged {
 	def src = entries.find { it.path == 'src/main/java' }
     if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
     src.entryAttributes['ignore_optional_problems'] = 'true'
+}
+
+tasks.named('genPatches').configure {
+    onlyIf { false }
+}
+
+tasks.named('extractRangeMap').configure {
+    onlyIf { false }
+    tool = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
 }

build_forge.gradle

@@ -1,20 +1,20 @@
+import de.undercouch.gradle.tasks.download.Download
 import net.minecraftforge.forge.tasks.checks.CheckATs
 import net.minecraftforge.forge.tasks.checks.CheckExcs
 import net.minecraftforge.forge.tasks.checks.CheckPatches
 import net.minecraftforge.forge.tasks.checks.CheckSAS
 import net.minecraftforge.forge.tasks.checks.CheckTask
 
-import java.util.Date
-import java.util.LinkedHashMap
+import java.nio.file.Files
 import net.minecraftforge.forge.tasks.*
 import static net.minecraftforge.forge.tasks.Util.*
 import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
 import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility
 import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
 import net.minecraftforge.gradle.common.tasks.ExtractInheritance
+import net.minecraftforge.gradle.patcher.tasks.FilterNewJar
 import net.minecraftforge.gradle.patcher.tasks.GeneratePatches
 import net.minecraftforge.gradle.userdev.tasks.RenameJar
-import net.minecraftforge.gradleutils.PomUtils
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.objectweb.asm.Opcodes
 
@@ -23,7 +23,7 @@ plugins {
     id 'eclipse'
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'de.undercouch.download'
     id 'net.minecraftforge.gradleutils'
     id 'net.minecraftforge.gradle.patcher'
@@ -46,6 +46,7 @@ jarSigner.autoDetect('forge')
 
 applyPatches {
     level 'WARNING'
+    failOnError = UPDATING != 'true'
 }
 
 sourceSets {
@@ -69,27 +70,40 @@ sourceSets {
     }
 }
 
-ext {
-    SPEC_VERSION = gradleutils.gitInfo.tag
-    // The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
-    // ForgeMC is a unique identifier for every MC version we have supported.
-    // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
-    MCP_ARTIFACT = project(':mcp').mcp.config.get()
+final String SPEC_VERSION = gradleutils.gitInfo.tag
 
-    EXTRA_TXTS = [
+// The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
+// ForgeMC is a unique identifier for every MC version we have supported.
+// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
+final def MCP_ARTIFACT = project(':mcp').mcp.config.get()
+
+final List<File> EXTRA_TXTS = [
         rootProject.file('CREDITS.txt'),
         rootProject.file('LICENSE.txt'),
         rootProject.tasks.createChangelog.outputFile
-    ]
+]
+
+ext {
+    MAVEN_PATH = "${group.toString().replace('.', '/')}/${project.name}/${VERSION}".toString()
 }
+final String MAVEN_PATH = ext.MAVEN_PATH
+
+final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
+final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.3'
+final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
+final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
 
 configurations {
     // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
-    bootstrap  { transitive = false }        
+    bootstrap  { transitive = false }
     installer { 
         extendsFrom(bootstrap)
         transitive = false 
     }
+    installerextra { 
+        extendsFrom(bootstrap)
+        transitive = false 
+    }
     api.extendsFrom(installer)
 }
 
@@ -103,10 +117,11 @@ dependencies {
     bootstrap(libs.unsafe)        // Needed by securemodules
     bootstrap(libs.bundles.asm)   // Needed by securemodules
     
+    implementation(libs.jopt.simple) { version { strictly '5.0.4' } }
+    
     installer(libs.bootstrap)
     installer(libs.bootstrap.api) // Needed by securemodules
     installer(libs.accesstransformers)
-    installer(libs.antlr.runtime) // Dep of AccessTransformer
     installer(libs.eventbus)
     installer(libs.typetools) // Dep of EventBus
     installer(libs.forgespi)
@@ -127,7 +142,14 @@ dependencies {
     installer(project(':lowcodelanguage'))
     installer(project(':mclanguage'))
 
+    installerextra("${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:srg2off")
+
     runtimeOnly(libs.bootstrap)
+    runtimeOnly(libs.bootstrap.dev)
+}
+
+tasks.named('extractRangeMap').configure {
+    tool = S2S_TOOL
 }
 
 patcher {
@@ -158,6 +180,7 @@ patcher {
 
         forge_client_test {
             parent runs.forge_client
+            source sourceSets.test
         }
 
         forge_server {
@@ -166,6 +189,7 @@ patcher {
 
         forge_server_test {
             parent runs.forge_server
+            source sourceSets.test
         }
 
         forge_server_gametest {
@@ -174,6 +198,7 @@ patcher {
 
         forge_server_gametest_test {
             parent runs.forge_server_gametest
+            source sourceSets.test
         }
 
         forge_data {
@@ -189,6 +214,7 @@ patcher {
         }
 
         forge_data_test {
+            source sourceSets.test
             args '--launchTarget', 'forge_dev_data',
                  '--mod', '.+',
                  '--all',
@@ -199,7 +225,6 @@ patcher {
                  '--assetsDir', downloadAssets.output,
                  '--assetIndex', "{asset_index}"
         }
-
     }
 }
 
@@ -277,7 +302,7 @@ tasks.userdevConfig.configure {
     }
 }
 
-for (def run : patcher.runs + tasks.userdevConfig.runs) {
+for (def run in patcher.runs + tasks.userdevConfig.runs) {
     if (run.parents) continue // We already added this to the parent run config
     //run.property 'bsl.debug', 'true'
     run.args '--gameDir', '.'
@@ -309,7 +334,7 @@ tasks.register('downloadVersionManifest', Download) {
 tasks.register('downloadJson', Download) {
     dependsOn downloadVersionManifest
     inputs.file downloadVersionManifest.dest
-    src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url }
+    src { downloadVersionManifest.dest.json.versions.find { it.id == MC_VERSION }.url }
     dest file("build/versions/$MC_VERSION/version.json")
     useETag 'all'
     onlyIfModified true
@@ -349,26 +374,8 @@ tasks.register('extractInheritance', ExtractInheritance) {
     tool = INSTALLER_TOOLS + ':fatjar'
     args.add '--annotations'
     input = genJoinedBinPatches.cleanJar
-    libraries.addAll downloadLibraries.librariesOutput.map { rf -> 
-        java.nio.file.Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) 
-    }
-}
-tasks.register("findFieldInstanceChecks", FieldCompareFinder) {
-    jar = createJoinedSRG.output
-    output = rootProject.file('src/main/resources/coremods/field_to_instanceof.json')
-    fields {
-        /* 1.17 changed most things to use Tags. So this isn't nessasary anymore so just make an empty list
-        bows {
-            cls = 'net/minecraft/world/item/Items'
-            name = 'f_42411_'
-            replacement = 'net/minecraft/world/item/BowItem'
-        }
-        crossbows {
-            cls = 'net/minecraft/world/item/Items'
-            name = 'f_42717_'
-            replacement = 'net/minecraft/world/item/CrossbowItem'
-        }
-        */
+    libraries.addAll downloadLibraries.librariesOutput.map { rf ->
+        Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).toList()
     }
 }
 tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
@@ -376,17 +383,19 @@ tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
     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;')
+            return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
+            && insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
+            && insn.name == 'm_6518_'
+            && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
     }
 }
 tasks.register('validateDeprecations', ValidateDeprecations) {
     input = tasks.jar.archiveFile
     mcVersion = MC_VERSION
 }
-tasks.jar.finalizedBy 'validateDeprecations'
+tasks.named('jar', Jar).configure {
+    finalizedBy 'validateDeprecations'
+}
 tasks.register("downloadInstaller", DownloadMavenArtifact) {
     artifact = "net.minecraftforge:installer:2.2.+:fatjar"
     changing = true
@@ -395,16 +404,6 @@ tasks.register("downloadServerShim", DownloadMavenArtifact) {
     artifact = libs.bootstrap.shim.get().toString()
     changing = true
 }
-tasks.register("downloadMCPConfig", DownloadMavenArtifact) {
-    artifact = MCP_ARTIFACT
-}
-tasks.register('extractMCPConfigMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
-    ext.output = file('build/mcp_mappings.tsrg')
-    tool = INSTALLER_TOOLS + ':fatjar'
-    args = ['--task', 'MCP_DATA', '--key', 'mappings', '--input', downloadMCPConfig.output.get().asFile.absolutePath, '--output', output.absolutePath]
-    outputs.file(output)
-    inputs.file(downloadMCPConfig.output)
-}
 tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
     ext.output = file('build/client_mappings.tsrg')
     tool = INSTALLER_TOOLS + ':fatjar'
@@ -417,43 +416,34 @@ tasks.register('downloadServerMappings', net.minecraftforge.gradle.common.tasks.
     args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath]
     outputs.file(output)
 }
-tasks.register('mergeClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
-    ext.output = file('build/client_mappings_merged.tsrg')
-    tool = INSTALLER_TOOLS + ':fatjar'
-    args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadClientMappings.output.absolutePath, '--output', output.absolutePath]
-    outputs.file(output)
-}
-tasks.register('mergeServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
-    ext.output = file('build/server_mappings_merged.tsrg')
-    tool = INSTALLER_TOOLS + ':fatjar'
-    args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadServerMappings.output.absolutePath, '--output', output.absolutePath]
-    outputs.file(output)
-}
 tasks.register("createJoinedSRG", DownloadMavenArtifact) {
     artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg"
 }
-tasks.register("createClientSRG", RenameJar) {
+tasks.register("createClientOfficial", RenameJar) {
     tool = FART + ':all'
-    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs']
-    mappings = createMcp2Srg.srg
-    dependsOn(downloadClientRaw)
+    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
+    mappings = downloadClientMappings.output
+    dependsOn(downloadClientRaw, downloadClientMappings)
     input = downloadClientRaw.dest
-    output = file("build/createClientSRG/output.jar")
+    output = file("build/createClientOfficial/output.jar")
 }
-tasks.register("createServerSRG", RenameJar) {
+tasks.register("createServerOfficial", RenameJar) {
     tool = FART + ':all'
-    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs']
-    mappings = createMcp2Srg.srg
+    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
+    mappings = downloadServerMappings.output
+    dependsOn(downloadServerMappings)
     input = extractServer.output
-    output = file("build/createServerSRG/output.jar")
+    output = file("build/createServerOfficial/output.jar")
 }
 tasks.named('genClientBinPatches').configure {
     tool = BINPATCH_TOOL
-    cleanJar = createClientSRG.output
+    cleanJar = createClientOfficial.output
+    dirtyJar = jar.archiveFile
 }
 tasks.named('genServerBinPatches').configure {
     tool = BINPATCH_TOOL
-    cleanJar = createServerSRG.output
+    cleanJar = createServerOfficial.output
+    dirtyJar = jar.archiveFile
 }
 tasks.named('genJoinedBinPatches').configure {
     tool = BINPATCH_TOOL
@@ -461,13 +451,13 @@ tasks.named('genJoinedBinPatches').configure {
 }
 tasks.register('applyClientBinPatches', ApplyBinPatches) {
     tool = BINPATCH_TOOL
-    clean = createClientSRG.output
+    clean = createClientOfficial.output
     patch = genClientBinPatches.output
     args.addAll(['--data', '--unpatched'])
 }
 tasks.register('applyServerBinPatches', ApplyBinPatches) {
     tool = BINPATCH_TOOL
-    clean = createServerSRG.output
+    clean = createServerOfficial.output
     patch = genServerBinPatches.output
     args.addAll(['--data', '--unpatched'])
 }
@@ -483,10 +473,10 @@ tasks.register('createServerShimClasspath', BundleList) {
 tasks.register('createServerShimConfig') {
     ext.output = file('build/libs/bootstrap-shim.properties')
     doLast {
-        def cfg = new CleanProperties()
-        cfg."Main-Class" = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-        cfg."Java-Version" = '17'
-        cfg."Arguments" = "--launchTarget forge_server"
+        var cfg = new CleanProperties()
+        cfg['Main-Class'] = 'net.minecraftforge.bootstrap.ForgeBootstrap'
+        cfg['Java-Version'] = '21'
+        cfg['Arguments'] = '--launchTarget forge_server'
         cfg.store(output)
     }
 }
@@ -512,7 +502,7 @@ tasks.register('checkAll') {
     group = 'checks'
 }
 tasks.register('checkAllAndFix') {
-    dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses'
+    dependsOn 'findFinalizeSpawnTargets', 'checkLicenses'
     group = 'checks'
 }
 
@@ -536,7 +526,7 @@ CheckTask.registerTask(tasks, 'Excs', CheckExcs) {
 }
 
 CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
-    dependsOn genPatches
+    dependsOn 'genPatches'
     patchDir = file("$rootDir/patches")
     patchesWithS2SArtifact = [
             'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
@@ -544,7 +534,7 @@ CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
     ]
 }
 
-genPatches {
+tasks.named('genPatches', GeneratePatches).configure {
     finalizedBy checkAndFixPatches
     autoHeader true
     lineEnding = '\n'
@@ -553,10 +543,10 @@ genPatches {
 def baseForgeVersionProperty = project.objects.property(String)
 baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) })
 baseForgeVersionProperty.finalizeValueOnRead()
-def jarCompatibilityTaskSetup = { task ->
+final jarCompatibilityTaskSetup = { Task task ->
     task.group = 'jar compatibility'
     task.onlyIf {
-        baseForgeVersionProperty.getOrNull() != null
+        baseForgeVersionProperty.getOrNull() !== null
     }
 }
 
@@ -620,28 +610,22 @@ tasks.register('installerJson', InstallerJson) {
     dependsOn(launcherJson)
     input.from(launcherJson.output)
     
-    // Extract MCP Mappings
-    dependsOn(extractMCPConfigMappings)
-    input.from(extractMCPConfigMappings.output)
     // Download Official Mappings
     dependsOn(downloadClientMappings, downloadServerMappings)
     input.from(downloadClientMappings.output, downloadServerMappings.output)
-    // Merge MCP and Official Mappings
-    dependsOn(mergeClientMappings, mergeServerMappings)
-    input.from(mergeClientMappings.output, mergeServerMappings.output)
     // Get 'base' MC jar, Client is straight download, server is extracted from the bundle
     dependsOn(downloadClientRaw, extractServer)
     input.from(downloadClientRaw.dest, extractServer.output)
     // Rename MC Jar
-    dependsOn(createClientSRG, createServerSRG)
-    input.from(createClientSRG.output, createServerSRG.output)
+    dependsOn(createClientOfficial, createServerOfficial)
+    input.from(createClientOfficial.output, createServerOfficial.output)
     // Apply Binary patches to vanilla jar
     dependsOn(applyClientBinPatches, applyServerBinPatches)
     input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)
 
     doFirst {
-        def libs = libraries
-        def INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS)
+        var libs = libraries
+        String[] INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS)
         json.putAll([
             _comment: launcherJson.json._comment,
             hideExtract: true,
@@ -652,30 +636,14 @@ tasks.register('installerJson', InstallerJson) {
             minecraft: MC_VERSION,
             serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar',
             data: [
-                MAPPINGS: [
-                    client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]",
-                    server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]"
-                ],
-                MAPPINGS_SHA: [
-                    client: "'${extractMCPConfigMappings.output.sha1}'",
-                    server: "'${extractMCPConfigMappings.output.sha1}'"
-                ],
                 MOJMAPS: [
-                    client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]",
-                    server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]"
+                    client: "[net.minecraft:client:${MC_VERSION}:mappings@tsrg]",
+                    server: "[net.minecraft:server:${MC_VERSION}:mappings@tsrg]"
                 ],
                 MOJMAPS_SHA: [
                     client: "'${downloadClientMappings.output.sha1}'",
                     server: "'${downloadServerMappings.output.sha1}'"
                 ],
-                MERGED_MAPPINGS: [
-                    client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]",
-                    server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]"
-                ],
-                MERGED_MAPPINGS_SHA: [
-                    client: "'${mergeClientMappings.output.sha1}'",
-                    server: "'${mergeServerMappings.output.sha1}'"
-                ],
                 MC_UNPACKED: [
                     client: "[net.minecraft:client:${MC_VERSION}]",
                     server: "[net.minecraft:server:${MC_VERSION}:unpacked]"
@@ -684,13 +652,13 @@ tasks.register('installerJson', InstallerJson) {
                     client: "'${downloadClientRaw.dest.sha1}'",
                     server: "'${extractServer.output.get().asFile.sha1}'"
                 ],
-                MC_SRG: [
-                    client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]",
-                    server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]"
+                MC_OFF: [
+                    client: "[net.minecraft:client:${MC_VERSION}:official]",
+                    server: "[net.minecraft:server:${MC_VERSION}:official]"
                 ],
-                MC_SRG_SHA: [
-                    client: "'${createClientSRG.output.get().asFile.sha1}'",
-                    server: "'${createServerSRG.output.get().asFile.sha1}'"
+                MC_OFF_SHA: [
+                    client: "'${createClientOfficial.output.get().asFile.sha1}'",
+                    server: "'${createServerOfficial.output.get().asFile.sha1}'"
                 ],
                 BINPATCH: [
                     client: '/data/client.lzma',
@@ -707,6 +675,34 @@ tasks.register('installerJson', InstallerJson) {
             ],
             processors: [
                 [
+                    sides: ['server'],
+                    jar: INSTALLER_TOOLS,
+                    classpath: INSTALLER_TOOLS_CLASSPATH,
+                    args: [
+                        '--task', 'EXTRACT_FILES',
+                        '--archive', '{INSTALLER}',
+
+                        '--from', 'data/README.txt',
+                        '--to', '{ROOT}/README.txt',
+
+                        '--from', 'data/run.sh',
+                        '--to', '{ROOT}/run.sh',
+                        '--exec', '{ROOT}/run.sh',
+
+                        '--from', 'data/run.bat',
+                        '--to', '{ROOT}/run.bat',
+
+                        '--from', 'data/user_jvm_args.txt',
+                        '--to', '{ROOT}/user_jvm_args.txt',
+                        '--optional', '{ROOT}/user_jvm_args.txt',
+
+                        '--from', 'data/unix_args.txt',
+                        '--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt",
+
+                        '--from', 'data/win_args.txt',
+                        '--to', "{ROOT}/libraries/${MAVEN_PATH}/win_args.txt"
+                    ]
+                ], [
                     sides: ['server'],
                     jar: INSTALLER_TOOLS,
                     classpath: INSTALLER_TOOLS_CLASSPATH,
@@ -729,18 +725,6 @@ tasks.register('installerJson', InstallerJson) {
                     outputs: [
                         '{MC_UNPACKED}': '{MC_UNPACKED_SHA}'
                     ]
-                ], [
-                    jar: INSTALLER_TOOLS,
-                    classpath: INSTALLER_TOOLS_CLASSPATH,
-                    args: [
-                        '--task', 'MCP_DATA',
-                        '--input', "[${MCP_ARTIFACT.descriptor}]",
-                        '--output', '{MAPPINGS}',
-                        '--key', 'mappings'
-                    ],
-                    outputs: [
-                        '{MAPPINGS}': '{MAPPINGS_SHA}'
-                    ]
                 ], [
                     jar: INSTALLER_TOOLS,
                     classpath: INSTALLER_TOOLS_CLASSPATH,
@@ -754,31 +738,18 @@ tasks.register('installerJson', InstallerJson) {
                     outputs: [
                         '{MOJMAPS}': '{MOJMAPS_SHA}'
                     ]
-                ], [
-                    jar: INSTALLER_TOOLS,
-                    classpath: INSTALLER_TOOLS_CLASSPATH,
-                    args: [
-                        '--task', 'MERGE_MAPPING',
-                        '--left', '{MAPPINGS}',
-                        '--right', '{MOJMAPS}',
-                        '--output', '{MERGED_MAPPINGS}',
-                        '--classes', '--reverse-right'
-                    ],
-                    outputs: [
-                        '{MERGED_MAPPINGS}': '{MERGED_MAPPINGS_SHA}'
-                    ]
                 ], [
                     sides: ['server'],
                     jar: FART,
                     classpath: getClasspath(project, libs, FART),
                     args: [
                         '--input', '{MC_UNPACKED}',
-                        '--output', '{MC_SRG}',
-                        '--names', '{MERGED_MAPPINGS}',
-                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'
+                        '--output', '{MC_OFF}',
+                        '--names', '{MOJMAPS}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
                     ],
                     outputs: [
-                        '{MC_SRG}': '{MC_SRG_SHA}'
+                        '{MC_OFF}': '{MC_OFF_SHA}'
                     ]
                 ], [
                     sides: ['client'],
@@ -786,18 +757,18 @@ tasks.register('installerJson', InstallerJson) {
                     classpath: getClasspath(project, libs, FART),
                     args: [
                         '--input', '{MINECRAFT_JAR}',
-                        '--output', '{MC_SRG}',
-                        '--names', '{MERGED_MAPPINGS}',
-                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'
+                        '--output', '{MC_OFF}',
+                        '--names', '{MOJMAPS}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
                     ],
                     outputs: [
-                        '{MC_SRG}': '{MC_SRG_SHA}'
+                        '{MC_OFF}': '{MC_OFF_SHA}'
                     ]
                 ], [
                     jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
                     classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
                     args: [
-                        '--clean', '{MC_SRG}',
+                        '--clean', '{MC_OFF}',
                         '--output', '{PATCHED}',
                         '--apply', '{BINPATCH}',
                         '--data', '--unpatched'
@@ -812,14 +783,35 @@ tasks.register('installerJson', InstallerJson) {
     }
 }
 
+tasks.register('officialClassesOnly', Zip).configure {
+    dependsOn(jar)
+    destinationDirectory = file('build/libs')
+    archiveClassifier = 'official-classes'
+    from zipTree(jar.archiveFile).matching {
+        include '**/*.class'
+        exclude 'mcp/**'
+    }
+}
+
+tasks.named('filterJarNew').configure {
+    dependsOn('officialClassesOnly')
+    input = officialClassesOnly.archiveFile
+}
+
+tasks.register('filterJarNewSRG', FilterNewJar).configure {
+    input = reobfJar.output
+    srg = filterJarNew.srg
+    blacklist = filterJarNew.blacklist
+}
+
 tasks.named('universalJar').configure {
     dependsOn downloadCrowdin
-        from zipTree(downloadCrowdin.dest).matching {
+    from zipTree(downloadCrowdin.dest).matching {
         include 'assets/forge/lang/*.json'
     }
 
     from(EXTRA_TXTS)
-    duplicatesStrategy = 'exclude'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     exclude '.cache'
 
     manifest {
@@ -843,6 +835,20 @@ tasks.named('universalJar').configure {
     jarSigner.sign(it)
 }
 
+tasks.register('universalJarSrg', Jar).configure {
+    from zipTree(filterJarNewSRG.output)
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from zipTree(universalJar.archiveFile)
+    destinationDirectory = file('build/libs')
+    archiveClassifier = 'universal-srg'
+    manifest.from(universalJar.manifest)
+    jarSigner.sign(it)
+}
+
+tasks.named('userdevConfig').configure {
+    universal = "$project.group:$project.name:$project.version:universal-srg@jar"
+}
+
 tasks.register('installerJar', InstallerJar) {
     fat = !System.env.TEAMCITY_VERSION
     //offline = true
@@ -856,6 +862,29 @@ tasks.register('installerJar', InstallerJar) {
     from(genServerBinPatches.output) {
         rename { 'data/server.lzma' }
     }
+
+    final var argsFile = rootProject.file('server_files/args.txt')
+    final Map<String, Map<String, String>> tokens = [tokens: [
+            SHIM_JAR_FILE: serverShimJar.archiveFileName.get(),
+            MAVEN_PATH: MAVEN_PATH
+    ]]
+    from(argsFile) {
+        filter(tokens, ReplaceTokens)
+        into 'data'
+        rename { 'unix_args.txt' }
+    }
+    from(argsFile) {
+        filter(tokens, ReplaceTokens)
+        into 'data'
+        rename { 'win_args.txt' }
+    }
+
+    from(rootProject.file('server_files')) {
+        filter(tokens, ReplaceTokens)
+        into 'data'
+        exclude 'args.txt'
+    }
+
     jarSigner.sign(it)
 }
 
@@ -1006,6 +1035,7 @@ tasks.named('javadoc', Javadoc).configure {
 publishing {
     publications.register('mavenJava', MavenPublication).configure {
         artifact universalJar
+        artifact universalJarSrg
         artifact installerJar
         artifact mdkZip
         artifact userdevJar
@@ -1017,8 +1047,8 @@ publishing {
             name = project.name
             description = 'Modifactions to Minecraft to enable mod developers.'
             url = 'https://github.com/MinecraftForge/MinecraftForge'
-            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
-            license PomUtils.Licenses.LGPLv2_1
+            gradleutils.pom.setGitHubDetails(pom, 'MinecraftForge')
+            license gradleutils.pom.Licenses.LGPLv2_1
         }
     }
     
@@ -1028,7 +1058,5 @@ publishing {
 }
 
 // Make sure we run bin compat checking during local testing.
-if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD)
-    publish.dependsOn(':forge:checkJarCompatibility')
-
-apply from: rootProject.file('build_forge_eclipse.gradle')
+if ((!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) && CHECK_COMPATIBILITY == "true")
+    tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }

build_forge_eclipse.gradle

@@ -1,44 +0,0 @@
-apply plugin: 'eclipse'
-
-eclipse {
-    classpath.file.whenMerged {
-        def minecraft = entries.find { it.path == 'src/main/java' }
-        if (minecraft == null) throw new IllegalStateException("You must run `setup` task before importing")
-        // Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
-        minecraft.entryAttributes['ignore_optional_problems'] = 'true'
-        
-        def mods = [
-            'src/main/java':      'minecraft',
-            'src/main/resources': 'minecraft',
-            'src/test/java':      'minecraft-test',
-            'src/test/resources': 'minecraft-test',
-            
-            'main-java':      'forge',
-            'main-resources': 'forge',
-            'generated':      'forge',
-            
-            'test-java':      'forge-test',
-            'test-resources': 'forge-test',
-            'test-generated': 'forge-test',
-        ]
-        
-        entries.forEach { e -> 
-            if ('src'.equals(e.kind) && e.hasProperty('output')) {
-                if (mods.containsKey(e.path))
-                    e.output = 'bin/' + mods[e.path]
-                //else
-                //    throw new IllegalStateException('Unknown path: ' + e.toString())
-            }
-        }
-    }
-    
-    // Filter out the run directory
-    project.resourceFilter {
-        appliesTo = 'FOLDERS'
-        type = 'EXCLUDE_ALL'
-        matcher {
-            id = 'org.eclipse.ui.ide.multiFilter'
-            arguments = '1.0-name-matches-false-true-run'
-        }
-    }
-}

build_shared.gradle

@@ -40,10 +40,11 @@ tasks.register('generateResources') {
 
 // Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
 tasks.withType(JavaCompile).configureEach {
-    dependsOn(generateResources)
-    dependsOn(processResources) // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
+    dependsOn 'generateResources'
+    dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
     options.warnings = false // Shutup deprecated for removal warnings
+    options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
 }
 
 // Merge the resources and classes into the same directory. We'll need to split them at runtime because
@@ -61,7 +62,7 @@ tasks.register('copyEclipseSettings') {
             def temp = new CleanProperties().load(file)
             def exst = new CleanProperties().load(target)
             exst.put('eclipse.preferences.version', '1')
-            temp.forEach(exst::put)
+            exst.putAll(temp)
             exst.store(target)
         }
     }
@@ -73,4 +74,4 @@ eclipse {
     //autoBuildTasks writeManifest
     // Run when importing the project
     synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
-}
+}

docs/README.md

@@ -2,8 +2,8 @@
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.2&query=$.promos["1.20.2-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.20.2-&query=$.promos["1.20.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.6-&query=$.promos["1.20.6-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.20.6-&query=$.promos["1.20.6-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!

fmlcore/build.gradle

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
@@ -40,7 +40,7 @@ tasks.named('jar', Jar).configure {
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:-unchecked'
 }
 
@@ -64,4 +64,4 @@ publishing {
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-}
+}

fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java

@@ -9,41 +9,35 @@ import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
 
-import java.util.ArrayList;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
+/**
+ * Used to allow access to certain things from the game layer
+ */
 public class Bindings {
-    private static final Bindings INSTANCE = new Bindings();
+    private Bindings() {}
 
-    private final IBindingsProvider provider;
-
-    private Bindings() {
-        var providers = new ArrayList<IBindingsProvider>(1);
-        for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) {
-            try {
-                providers.add(itr.next());
-            } catch (ServiceConfigurationError sce) {
-                sce.printStackTrace();
-            }
-        }
-
-        if (providers.size() != 1)
-            throw new IllegalStateException("Could not find bindings provider: " + providers);
-
-        this.provider = providers.get(0);
-    }
+    /**
+     * The provider of the bindings
+     * @implNote May also throw a {@link ServiceConfigurationError}
+     */
+    private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
+            .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
 
+    /**
+     * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
+     */
     public static Supplier<IEventBus> getForgeBus() {
-        return INSTANCE.provider.getForgeBusSupplier();
+        return PROVIDER.getForgeBusSupplier();
     }
 
     public static Supplier<I18NParser> getMessageParser() {
-        return INSTANCE.provider.getMessageParser();
+        return PROVIDER.getMessageParser();
     }
 
     public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return INSTANCE.provider.getConfigConfiguration();
+        return PROVIDER.getConfigConfiguration();
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/IExtensionPoint.java

@@ -96,5 +96,26 @@ 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 = "SERVER_ONLY";
+
+        /**
+         * 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
+         * <p>Note: If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or
+         * Open to LAN), consider setting {@code clientSideOnly=true} in the root of your mods.toml.</p>
+         */
+        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);
+        }
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/LogicalSide.java

@@ -16,8 +16,7 @@ import net.minecraftforge.api.distmarker.Dist;
  *
  * @see Dist
  */
-public enum LogicalSide
-{
+public enum LogicalSide {
     /**
      * The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
      * viewpoint.
@@ -27,6 +26,7 @@ public enum LogicalSide
      * @see Dist#CLIENT
      */
     CLIENT,
+
     /**
      * The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
      * on the level.
@@ -41,16 +41,14 @@ public enum LogicalSide
     /**
      * {@return if this logical side is the server}
      */
-    public boolean isServer()
-    {
+    public boolean isServer() {
         return !isClient();
     }
 
     /**
      * {@return if the logical side is the client}
      */
-    public boolean isClient()
-    {
+    public boolean isClient() {
         return this == CLIENT;
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java

@@ -21,6 +21,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -58,15 +59,16 @@ public abstract class ModContainer
         this.modInfo = info;
         this.modLoadingStage = ModLoadingStage.CONSTRUCT;
 
-        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
+        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
+                .orElseGet(() -> info.getOwningFile().isClientSideOnly() ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
         Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
             case "MATCH_VERSION" -> // default displaytest checks for version string match
                     () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
                         (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
             case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
             case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    () -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
             case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
             default -> // any other value throws an exception
                     throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
@@ -145,6 +147,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);
     }

fmlcore/src/main/java/net/minecraftforge/fml/ModList.java

@@ -47,7 +47,7 @@ import java.util.stream.Stream;
  */
 public class ModList
 {
-    private static Logger LOGGER = LogManager.getLogger();
+    //private static final Logger LOGGER = LogManager.getLogger();
     private static ModList INSTANCE;
     private final List<IModFileInfo> modFiles;
     private final List<IModInfo> sortedList;
@@ -120,14 +120,14 @@ public class ModList
         return executor -> gather(
                 this.mods.stream()
                 .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
-                .collect(Collectors.toList()))
-            .thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
+                .toList()
+        ).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
     }
     static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
         if (t.stream().noneMatch(e->e.getValue()!=null)) {
             return CompletableFuture.completedFuture(null);
         } else {
-            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
+            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
             CompletableFuture<Void> cf = new CompletableFuture<>();
             final RuntimeException accumulator = new RuntimeException();
             cf.completeExceptionally(accumulator);

fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java

@@ -6,6 +6,7 @@
 package net.minecraftforge.fml;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Streams;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.FMLEnvironment;
@@ -32,6 +33,7 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static net.minecraftforge.fml.Logging.CORE;
 import static net.minecraftforge.fml.Logging.LOADING;
@@ -91,13 +93,13 @@ public class ModLoader
     {
         INSTANCE = this;
         this.loadingModList = FMLLoader.getLoadingModList();
-        this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream()
+        this.loadingExceptions = this.loadingModList.getErrors().stream()
                 .flatMap(ModLoadingException::fromEarlyException)
                 .collect(Collectors.toList());
-        this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
+        this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
                 .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
                 .collect(Collectors.toList());
-        FMLLoader.getLoadingModList().getModFiles().stream()
+        this.loadingModList.getModFiles().stream()
                 .filter(ModFileInfo::missingLicense)
                 .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
                 .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
@@ -228,10 +230,9 @@ public class ModLoader
         } catch (CompletionException e) {
             loadingStateValid = false;
             Throwable t = e.getCause();
-            final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed())
-                    .filter(obj -> !(obj instanceof ModLoadingException))
-                    .collect(Collectors.toList());
-            if (!notModLoading.isEmpty()) {
+            boolean hasNotModLoadingEx = Arrays.stream(t.getSuppressed())
+                    .anyMatch(obj -> !(obj instanceof ModLoadingException));
+            if (hasNotModLoadingEx) {
                 LOGGER.fatal("Encountered non-modloading exceptions!", e);
                 statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
                 throw e;
@@ -257,10 +258,10 @@ public class ModLoader
                 .stream()
                 .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .toList();
         if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
+            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
+            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
 
             LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                     modFile.getFilePath(),
@@ -278,7 +279,7 @@ public class ModLoader
             loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
         }
         // remove errored mod containers
-        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
+        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
     }
 
     private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java

@@ -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())
         {

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingWarning.java

@@ -12,8 +12,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-public class ModLoadingWarning
-{
+public class ModLoadingWarning {
     /**
      * Mod Info for mod with warning
      */

fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java

@@ -48,8 +48,8 @@ public class VersionChecker {
         BETA(),
         BETA_OUTDATED(6, true, true);
 
-        final int sheetOffset;
-        final boolean draw, animated;
+        private final int sheetOffset;
+        private final boolean draw, animated;
 
         Status() {
             this(0, false, false);
@@ -72,6 +72,10 @@ public class VersionChecker {
         public boolean isAnimated() {
             return animated;
         }
+
+        public boolean isOutdated() {
+            return this == OUTDATED || this == BETA_OUTDATED;
+        }
     }
 
     public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
@@ -211,7 +215,7 @@ public class VersionChecker {
                     LOGGER.warn("Failed to process update information", e);
                     status = FAILED;
                 }
-                results.put(mod, new CheckResult(status, target, changes, display_url));
+                RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
             }
         }.start();
     }
@@ -226,10 +230,10 @@ public class VersionChecker {
         return ret;
     }
 
-    private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
+    private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
     private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
 
     public static CheckResult getResult(IModInfo mod) {
-        return results.getOrDefault(mod, PENDING_CHECK);
+        return RESULTS.getOrDefault(mod, PENDING_CHECK);
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java

@@ -47,12 +47,8 @@ public class ConfigFileTypeHandler {
                 throw new ConfigLoadingException(c, ex);
             }
             LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
-            try {
-                FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
-                LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
-            } catch (IOException e) {
-                throw new RuntimeException("Couldn't watch config file", e);
-            }
+            FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
+            LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
             return configData;
         };
     }
@@ -67,7 +63,9 @@ public class ConfigFileTypeHandler {
     }
 
     private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
-        Files.createDirectories(file.getParent());
+        if (!Files.isDirectory(file.getParent())) {
+            Files.createDirectories(file.getParent());
+        }
         Path p = defaultConfigPath.resolve(modConfig.getFileName());
         if (Files.exists(p)) {
             LOGGER.info(CONFIG, "Loading default config file from path {}", p);

fmlearlydisplay/build.gradle

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
@@ -44,11 +44,11 @@ dependencies {
     testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
 }
 
-test {
+tasks.named('test', Test).configure {
     useJUnitPlatform()
 }
 
-jar {
+tasks.named('jar', Jar).configure {
     manifest {
         attributes([
             'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
@@ -65,7 +65,7 @@ jar {
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
@@ -89,4 +89,4 @@ publishing {
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-}
+}

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java

@@ -14,9 +14,7 @@ import net.minecraftforge.fml.loading.ImmediateWindowProvider;
 import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.PointerBuffer;
-import org.lwjgl.glfw.GLFWImage;
 import org.lwjgl.glfw.GLFWVidMode;
-import org.lwjgl.stb.STBImage;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.util.tinyfd.TinyFileDialogs;
@@ -30,9 +28,8 @@ import java.io.InputStreamReader;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.URI;
-import java.nio.ByteBuffer;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -50,7 +47,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.IntConsumer;
 import java.util.function.IntSupplier;
 import java.util.function.LongSupplier;
@@ -80,7 +76,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
     private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
     private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
 
-    private ColourScheme colourScheme;
+    private ColourScheme colourScheme = ColourScheme.RED;
     private ElementShader elementShader;
 
     private RenderElement.DisplayContext context;
@@ -139,13 +135,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
             this.colourScheme = ColourScheme.BLACK;
         } else {
             try {
-                var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Paths.get("options.txt")));
-                var options = optionLines.stream().map(l -> l.split(":")).filter(a -> a.length == 2).collect(Collectors.toMap(a -> a[0], a -> a[1]));
-                var colourScheme = Boolean.parseBoolean(options.getOrDefault("darkMojangStudiosBackground", "false"));
-                this.colourScheme = colourScheme ? ColourScheme.BLACK : ColourScheme.RED;
-            } catch (IOException ioe) {
-                // No options
-                this.colourScheme = ColourScheme.RED; // default to red colourscheme
+                // check the options file for the colour scheme
+                var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
+                var keyName = "darkMojangStudiosBackground:";
+                for (String line : optionLines) {
+                    if (line.startsWith(keyName)) {
+                        this.colourScheme = line.startsWith("true", keyName.length()) ? ColourScheme.BLACK : ColourScheme.RED;
+                        break;
+                    }
+                }
+            } catch (IOException e) {
+                this.colourScheme = ColourScheme.RED; // fallback to red colourScheme
             }
         }
         this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
@@ -229,7 +229,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
             LOGGER.error("Crash during font initialization", t);
             crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
         }
-        this.elements = new ArrayList<>(Arrays.asList(
+        this.elements = new ArrayList<>(List.of(
             RenderElement.anvil(font),
             RenderElement.logMessageOverlay(font),
             RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion),
@@ -364,14 +364,15 @@ public class DisplayWindow implements ImmediateWindowProvider {
         glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
         glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
         glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
-        if (mcVersion != null) {
-            // this emulates what we would get without early progress window
-            // as vanilla never sets these, so GLFW uses the first window title
-            // set them explicitly to avoid it using "FML early loading progress" as the class
-            String vanillaWindowTitle = "Minecraft* " + mcVersion;
-            glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
-            glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
-        }
+
+        String vanillaWindowTitle = "Minecraft* ";
+        if (mcVersion != null) vanillaWindowTitle += mcVersion;
+
+        // this emulates what we would get without early progress window
+        // as vanilla never sets these, so GLFW uses the first window title
+        // set them explicitly to avoid it using "FML early loading progress" as the class
+        glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
+        glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
 
         long primaryMonitor = glfwGetPrimaryMonitor();
         if (primaryMonitor == 0) {
@@ -393,7 +394,8 @@ public class DisplayWindow implements ImmediateWindowProvider {
         }, 10, TimeUnit.SECONDS);
         int versidx = 0;
         var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
-        final String[] lastGLError=new String[GL_VERSIONS.length];
+        boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
+        final String[] lastGLError = new String[GL_VERSIONS.length];
         do {
             final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
             if (skipVersions.contains(glVersionToTry)) {
@@ -402,11 +404,23 @@ public class DisplayWindow implements ImmediateWindowProvider {
                 continue;
             }
             LOGGER.info("Trying GL version " + glVersionToTry);
+            if (showHelpLog && versidx == 0) {
+                LOGGER.info("""
+                If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
+                
+                Possible solutions:
+                A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
+                B) Check for driver updates on the graphics brand's website
+                C) Try reinstalling your graphics drivers
+                D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
+                
+                You can safely ignore this message if the game starts up successfully.""");
+            }
             glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
             glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
             glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
             glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-            window = glfwCreateWindow(winWidth, winHeight, "Minecraft: Forge Loading...", 0L, 0L);
+            window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
             var erridx = versidx;
             handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
             if (lastGLError[versidx] != null) {
@@ -434,6 +448,9 @@ public class DisplayWindow implements ImmediateWindowProvider {
         this.glVersion = gotVersion;
         this.window = window;
 
+        if (showHelpLog)
+            FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
+
         int[] x = new int[1];
         int[] y = new int[1];
         glfwGetMonitorPos(primaryMonitor, x, y);
@@ -451,19 +468,19 @@ public class DisplayWindow implements ImmediateWindowProvider {
         glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
 
         // Attempt setting the icon
-        int[] channels = new int[1];
-        try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
-            final ByteBuffer imgBuffer;
-            try (GLFWImage glfwImages = GLFWImage.malloc()) {
-                imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
-                glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
-                glfwSetWindowIcon(window, glfwImgBuffer);
-                STBImage.stbi_image_free(imgBuffer);
-            }
-        } catch (NullPointerException e) {
-            System.err.println("Failed to load forge logo");
-        }
-        handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
+//        int[] channels = new int[1];
+//        try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
+//            final ByteBuffer imgBuffer;
+//            try (GLFWImage glfwImages = GLFWImage.malloc()) {
+//                imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
+//                glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
+//                glfwSetWindowIcon(window, glfwImgBuffer);
+//                STBImage.stbi_image_free(imgBuffer);
+//            }
+//        } catch (NullPointerException e) {
+//            System.err.println("Failed to load forge logo");
+//        }
+//        handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
 
         glfwSetFramebufferSizeCallback(window, this::fbResize);
         glfwSetWindowPosCallback(window, this::winMove);
@@ -598,8 +615,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         var fm = layer.findModule("forge").orElseThrow();
         getClass().getModule().addReads(fm);
         var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
-        var methods = Arrays.stream(clz.getMethods()).filter(m-> Modifier.isStatic(m.getModifiers())).collect(Collectors.toMap(Method::getName, Function.identity()));
-        loadingOverlay = methods.get("newInstance");
+        loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
     }
 
     public int getFramebufferTextureId() {

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/PerformanceInfo.java

@@ -6,6 +6,7 @@
 package net.minecraftforge.fml.earlydisplay;
 
 import com.sun.management.OperatingSystemMXBean;
+import net.minecraftforge.fml.loading.FMLConfig;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
@@ -13,28 +14,37 @@ import java.lang.management.MemoryUsage;
 
 public class PerformanceInfo {
 
+    private final boolean showCPUUsage;
     private final OperatingSystemMXBean osBean;
     private final MemoryMXBean memoryBean;
-    float memory;
+
+    private float memory;
     private String text;
 
     PerformanceInfo() {
-        osBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class);
+        showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
+        osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
         memoryBean = ManagementFactory.getMemoryMXBean();
     }
 
     void update() {
         final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
         memory = (float) heapusage.getUsed() / heapusage.getMax();
+
+        if (!showCPUUsage) {
+            text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
+            return;
+        }
+
         var cpuLoad = osBean.getProcessCpuLoad();
         String cpuText;
         if (cpuLoad == -1) {
-            cpuText = String.format("*CPU: %.1f%%", osBean.getCpuLoad() * 100f);
+            cpuText = "*CPU: %.1f%%".formatted(osBean.getCpuLoad() * 100f);
         } else {
-            cpuText = String.format("CPU: %.1f%%", cpuLoad * 100f);
+            cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
         }
 
-        text = String.format("Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s", heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
+        text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
     }
 
     String text() {

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java

@@ -34,11 +34,14 @@ public class RenderElement {
             };
         }
     }
+    @FunctionalInterface
     interface TextureRenderer {
         void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
     }
+    @FunctionalInterface
     interface Initializer extends Supplier<Renderer> {}
 
+    @FunctionalInterface
     interface TextGenerator {
         void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx);
     }
@@ -201,14 +204,17 @@ public class RenderElement {
         bar.then(label).accept(buffer, context, frameNumber);
     }
 
+    @FunctionalInterface
     interface ColourFunction {
         int colour(int frame);
     }
 
+    @FunctionalInterface
     interface ProgressDisplay {
         float[] progress(int frame);
     }
 
+    @FunctionalInterface
     interface BarPosition {
         int[] location(DisplayContext context);
     }
@@ -280,7 +286,7 @@ public class RenderElement {
         if (num < min) {
             return min;
         } else {
-            return num > max ? max : num;
+            return Math.min(num, max);
         }
     }
 
@@ -288,7 +294,7 @@ public class RenderElement {
         if (num < min) {
             return min;
         } else {
-            return num > max ? max : num;
+            return Math.min(num, max);
         }
     }
 

fmlloader/build.gradle

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
@@ -37,7 +37,7 @@ dependencies {
     implementation(libs.jimfs)
 
     implementation(libs.log4j.core)
-    annotationProcessor(libs.log4j.core)
+    annotationProcessor(libs.bundles.log4j)
 
     testCompileOnly(libs.nulls)
     testRuntimeOnly(libs.bootstrap)
@@ -65,7 +65,7 @@ tasks.named('jar', Jar).configure {
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
@@ -94,10 +94,10 @@ publishing {
 tasks.register('writeForgeVersionJson') {
     doLast {
         file('src/main/resources/forge_version.json').json = [
-            'forge': FORGE_VERSION,
-            'mc': MC_VERSION,
-            'mcp': MCP_VERSION
-        ] as LinkedHashMap
+            forge: FORGE_VERSION,
+            mc: MC_VERSION,
+            mcp: MCP_VERSION
+        ]
     }
 }
 

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/CapabilityTokenSubclass.java

@@ -49,49 +49,38 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
     @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
         return isEmpty ? NAY : YAY;
     }
 
     @Override
-    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
-    {
-        if (CAP_INJECT.equals(classNode.name))
-        {
-            for (MethodNode mtd : classNode.methods)
-            {
-                if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc))
-                {
+    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
+        if (CAP_INJECT.equals(classNode.name)) {
+            for (MethodNode mtd : classNode.methods) {
+                if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc)) {
                     mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
                 }
             }
             return ComputeFlags.SIMPLE_REWRITE;
-        }
-        else if (CAP_INJECT.equals(classNode.superName))
-        {
+        } else if (CAP_INJECT.equals(classNode.superName)) {
             Holder cls = new Holder();
 
             SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
-            reader.accept(new SignatureVisitor(Opcodes.ASM9)
-            {
+            reader.accept(new SignatureVisitor(Opcodes.ASM9) {
                 Deque<String> stack = new ArrayDeque<>();
 
                 @Override
-                public void visitClassType(final String name)
-                {
+                public void visitClassType(final String name) {
                     stack.push(name);
                 }
 
                 @Override
-                public void visitInnerClassType(final String name)
-                {
+                public void visitInnerClassType(final String name) {
                     stack.push(stack.pop() + '$' + name);
                 }
 
                 @Override
-                public void visitEnd()
-                {
+                public void visitEnd() {
                     var val = stack.pop();
                     if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
                         cls.value = val;
@@ -106,9 +95,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
             mtd.visitInsn(Opcodes.ARETURN);
             mtd.visitEnd();
             return ComputeFlags.COMPUTE_MAXS;
-        }
-        else
-        {
+        } else {
             return ComputeFlags.NO_REWRITE;
         }
     }
@@ -116,5 +103,4 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
     private static class Holder {
         String value;
     }
-
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/BackgroundWaiter.java

@@ -11,7 +11,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 public class BackgroundWaiter {
-    private static ExecutorService runner = Executors.newSingleThreadExecutor();
+    private static final ExecutorService runner = Executors.newSingleThreadExecutor();
 
     public static void runAndTick(Runnable r, Runnable tick) {
         ImmediateWindowHandler.updateProgress("Loading bootstrap resources");

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java

@@ -36,7 +36,9 @@ public class FMLConfig
         EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"),
         EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized"),
         EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
-        EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?")
+        EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
+        EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
+        EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
         ;
 
         private final String entry;

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java

@@ -44,7 +44,7 @@ public class FMLLoader {
     private static LoadingModList loadingModList;
     private static RuntimeDistCleaner runtimeDistCleaner;
     private static Path gamePath;
-    private static VersionInfo versionInfo = VersionInfo.detect();
+    private static final VersionInfo versionInfo = VersionInfo.detect();
     private static String launchHandlerName;
     private static CommonLaunchHandler commonLaunchHandler;
     public static Runnable progressWindowTick;

fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class LibraryFinder {
-    private static Path libsPath;
-    static Path findLibsPath() {
-        if (libsPath == null) {
-            libsPath = Path.of(System.getProperty("libraryDirectory", "libraries"));
-            if (!Files.isDirectory(libsPath))
-                throw new IllegalStateException("Library directory: `" + libsPath + "` does not exist. Set it via the `libraryDirectory` system property.");
-        }
-        return libsPath;
-    }
-
-    public static Path findPathForMaven(final String group, final String artifact, final String extension, final String classifier, final String version) {
-        return findLibsPath().resolve(MavenCoordinateResolver.get(group, artifact, extension, classifier, version));
-    }
-    public static Path findPathForMaven(final String maven) {
-        return findLibsPath().resolve(MavenCoordinateResolver.get(maven));
-    }
-}

fmlloader/src/main/java/net/minecraftforge/fml/loading/MCPNamingService.java

@@ -77,7 +77,7 @@ public class MCPNamingService implements INameMappingService {
     }
 
     private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
-        URL path = ClassLoader.getSystemResource(mappingFileName); //We EXPLICITLY go through the SystemClassLoader here because this is dev-time only. And will be on the root classpath.
+        URL path = MCPNamingService.class.getClassLoader().getResource(mappingFileName);
         if (path == null)
             return;
 

fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java

@@ -10,6 +10,8 @@ import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
+
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -20,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+@ApiStatus.Internal
 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final Set<String> SERVICES = Set.of(
@@ -76,4 +79,15 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
             .filter(SERVICES::contains)
             .forEach(s -> found.add(new NamedPath(s, path)));
     }
+
+    public static boolean isServiceProvider(Path path) {
+        var jar = SecureJar.from(path);
+
+        for (var providers : jar.moduleDataProvider().descriptor().provides()) {
+            if (SERVICES.contains(providers.service()))
+                return true;
+        }
+
+        return false;
+    }
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java

@@ -54,6 +54,9 @@ public class ModSorter
             ms.buildUniqueList();
         } catch (EarlyLoadingException e) {
             // We cannot build any list with duped mods. We have to abort immediately and report it
+            // Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
+            // So all this is really doing is wasting time.
+            // But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
             return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
         }
         // try and validate dependencies

fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java

@@ -57,11 +57,17 @@ public class RuntimeDistCleaner implements ILaunchPluginService
             throw new RuntimeException("Attempted to load class "+ classNode.name  + " for invalid dist "+ DIST);
         }
 
+        if (!FMLEnvironment.production && hasOnlyInWithModAnnotation(classNode.visibleAnnotations))
+        {
+            LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
+            throw new RuntimeException("Found @OnlyIn on @Mod class "+ classNode.name  + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
+        }
+
         if (classNode.interfaces != null )
         {
             unpack(classNode.visibleAnnotations).stream()
                 .filter(ann->Objects.equals(ann.desc, ONLYIN))
-                .filter(ann->ann.values.indexOf("_interface") != -1)
+                .filter(ann-> ann.values.contains("_interface"))
                 .filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST))
                 .map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName())
                 .forEach(intf -> {
@@ -137,22 +143,78 @@ public class RuntimeDistCleaner implements ILaunchPluginService
     }
 
     @SuppressWarnings("unchecked")
-    private static List<AnnotationNode> unpack(final List<AnnotationNode> anns) {
-        if (anns == null) return Collections.emptyList();
-        List<AnnotationNode> ret = anns.stream().filter(ann->Objects.equals(ann.desc, ONLYIN)).collect(Collectors.toList());
-        anns.stream().filter(ann->Objects.equals(ann.desc, ONLYINS) && ann.values != null)
-            .map( ann -> (List<AnnotationNode>)ann.values.get(ann.values.indexOf("value") + 1))
-            .filter(v -> v != null)
-            .forEach(v -> v.forEach(ret::add));
-        return ret;
+    private static List<AnnotationNode> unpack(final List<AnnotationNode> anns)
+    {
+        if (anns == null)
+        {
+            return Collections.emptyList();
+        }
+
+        List<AnnotationNode> unpacked = new ArrayList<>();
+
+        for (var annotationNode : anns)
+        {
+            if (Objects.equals(annotationNode.desc, ONLYINS))
+            {
+                unpacked.add(annotationNode);
+
+                if (annotationNode.values != null)
+                {
+                    List<AnnotationNode> subNodes = (List<AnnotationNode>) annotationNode.values.get(annotationNode.values.indexOf("value") + 1);
+
+                    if (subNodes != null)
+                    {
+                        unpacked.addAll(subNodes);
+                    }
+                }
+            }
+        }
+
+        return unpacked;
     }
 
     private boolean remove(final List<AnnotationNode> anns, final String side)
     {
-        return unpack(anns).stream().
-                filter(ann->Objects.equals(ann.desc, ONLYIN)).
-                filter(ann->ann.values.indexOf("_interface") == -1).
-                anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side));
+        var onlyIns = unpack(anns);
+
+        for (var onlyIn : onlyIns)
+        {
+            if (!Objects.equals(onlyIn.desc, ONLYINS) || onlyIn.values.contains("_interface"))
+            {
+                continue;
+            }
+
+            if (!Objects.equals(((String[])onlyIn.values.get(onlyIn.values.indexOf("value") + 1))[1], side))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean hasOnlyInWithModAnnotation(final List<AnnotationNode> anns)
+    {
+        if (anns == null)
+        {
+            return false;
+        }
+
+        var foundModAnnotation = false;
+        var foundOnlyIn = false;
+
+        for (var ann : anns)
+        {
+            if (ann.desc.equals("Lnet/minecraftforge/fml/common/Mod;"))
+            {
+                foundModAnnotation = true;
+            } else if (Objects.equals(ann.desc, ONLYIN) || Objects.equals(ann.desc, ONLYINS))
+            {
+                foundOnlyIn = true;
+            }
+        }
+
+        return foundModAnnotation && foundOnlyIn;
     }
 
     @SuppressWarnings("unchecked")

fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java

@@ -25,7 +25,7 @@ public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersi
     /*==========================================================================*
      *                        INTERNAL SHIT                                     *
      *==========================================================================*/
-    private static Gson GSON = new GsonBuilder().create();
+    private static final Gson GSON = new GsonBuilder().create();
     private static <T> T readJson(String path, Class<T> type) {
         try (var is = VersionInfo.class.getResourceAsStream(path)) {
             if (is == null)

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java

@@ -18,6 +18,7 @@ import net.minecraftforge.forgespi.locating.IModProvider;
 import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -36,6 +37,16 @@ public abstract class AbstractModProvider implements IModProvider {
     protected static final String MODS_TOML = "META-INF/mods.toml";
 
     protected IModLocator.ModFileOrException createMod(Path path) {
+        return createMod(path, false);
+    }
+
+    @Nullable
+    protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown) {
+        return createMod(path, false, getDefaultJarModType());
+    }
+
+    @Nullable
+    protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
         var mjm = new ModJarMetadata();
         var sj = SecureJar.from(
             jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
@@ -45,14 +56,20 @@ public abstract class AbstractModProvider implements IModProvider {
         IModFile mod;
         var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
         if (type == null)
-            type = getDefaultJarModType();
+            type = defaultType;
 
         if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
             LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
             mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
+            if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
+                LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
+                return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
+            }
         } else if (type != null) {
             LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
             mod = new ModFile(sj, this, this::manifestParser, type);
+        } else if (ignoreUnknown) {
+            return null;
         } else
             return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
 
@@ -109,20 +126,20 @@ public abstract class AbstractModProvider implements IModProvider {
             };
         }
 
-        try {
-            Files.walk(root)
+        try (var files = Files.walk(root)) {
+            files
                 .filter(p -> p.toString().endsWith(".class"))
                 .forEach(consumer);
 
             file.setSecurityStatus(holder.value);
-        } catch(IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
 
         LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", file);
     }
 
-    private static class Holder<T> {
+    private static final class Holder<T> {
         T value;
     }
 
@@ -132,6 +149,7 @@ public abstract class AbstractModProvider implements IModProvider {
         @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
         @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
         @Override public boolean showAsResourcePack() { return false; }
+        @Override public boolean showAsDataPack() { return false; }
         @Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); }
         @Override public String getLicense() { return license; }
         @Override public IModFile getFile() { return mod; }

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java

@@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import com.mojang.logging.LogUtils;
 
 import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
 import net.minecraftforge.forgespi.locating.IModLocator;
 
 import org.jetbrains.annotations.ApiStatus;
@@ -71,8 +72,11 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
         }
 
         var ret = new ArrayList<ModFileOrException>();
-        for (var path : claimed)
-            ret.add(createMod(path));
+        for (var path : claimed) {
+            // Filter out anything found by the ServiceLoader
+            if (!ModDirTransformerDiscoverer.isServiceProvider(path))
+                ret.add(createMod(path));
+        }
         return ret;
     }
 

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/InvalidModIdentifier.java

@@ -12,10 +12,12 @@ import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.BiPredicate;
+import java.util.stream.Stream;
 import java.util.zip.ZipFile;
 
 import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.*;
 
+// TODO: [FML][Loader] By the time this is reached, most stuff this checks for is already filtered out - needs fixing.
 public enum InvalidModIdentifier {
 
     OLDFORGE(filePresent("mcmod.info")),
@@ -23,9 +25,9 @@ public enum InvalidModIdentifier {
     LITELOADER(filePresent("litemod.json")),
     OPTIFINE(filePresent("optifine/Installer.class")),
     BUKKIT(filePresent("plugin.yml")),
-    INVALIDZIP((f,zf) -> !zf.isPresent());
+    INVALIDZIP((f,zf) -> zf.isEmpty()); // note: only this one INVALIDZIP check is ran until the todo on this class is fixed
 
-    private BiPredicate<Path, Optional<ZipFile>> ident;
+    private final BiPredicate<Path, Optional<ZipFile>> ident;
 
     InvalidModIdentifier(BiPredicate<Path, Optional<ZipFile>> identifier)
     {
@@ -40,7 +42,7 @@ public enum InvalidModIdentifier {
     public static Optional<String> identifyJarProblem(Path path)
     {
         Optional<ZipFile> zfo = optionalFromException(() -> new ZipFile(path.toFile()));
-        Optional<String> result = Arrays.stream(values()).
+        Optional<String> result = Stream.of(INVALIDZIP).
                                          filter(i -> i.ident.test(path, zfo)).
                                          map(InvalidModIdentifier::getReason).
                                          findAny();

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java

@@ -83,7 +83,14 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
             final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
             final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
             final Path pathInFS = zipFS.getPath("/");
-            return Optional.of(createMod(pathInFS).file());
+            final IModFile.Type parentType = file.getType();
+            final String modType;
+            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
+                modType = IModFile.Type.LIBRARY.name();
+            } else {
+                modType = IModFile.Type.GAMELIBRARY.name();
+            }
+            return Optional.of(createMod(pathInFS, false, modType).file());
         } catch (Exception e) {
             LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
             final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java

@@ -12,6 +12,7 @@ import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.UniqueModListBuilder;
@@ -22,6 +23,7 @@ import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
 
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
@@ -70,6 +72,8 @@ public class ModDiscoverer {
         List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>();
         boolean successfullyLoadedMods = true;
         List<IModFileInfo> brokenFiles = new ArrayList<>();
+        List<ModFileLoadingException> modFileLoadingExceptions = new ArrayList<>();
+        boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
         ImmediateWindowHandler.updateProgress("Discovering mod files");
         //Loop all mod locators to get the prime mods to load from.
         for (IModLocator locator : modLocatorList) {
@@ -80,7 +84,17 @@ public class ModDiscoverer {
                 var exceptions = candidates.stream().map(IModLocator.ModFileOrException::ex).filter(Objects::nonNull).toList();
                 if (!exceptions.isEmpty()) {
                     LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} invalid mod files", locator, exceptions.size());
-                    brokenFiles.addAll(exceptions.stream().map(e->e instanceof InvalidModFileException ime ? ime.getBrokenFile() : null).filter(Objects::nonNull).toList());
+                    for (ModFileLoadingException ex : exceptions) {
+                        // pipe exception messages through the discoveryErrorData to avoid swallowing some exceptions and improve error messages
+                        // (no longer a generic "Invalid mod file" for all InvalidModExceptions - it actually shows the exception message now)
+                        if (ex instanceof InvalidModFileException invalidModFileEx) {
+                            var modInfo = invalidModFileEx.getBrokenFile();
+                            brokenFiles.add(modInfo);
+                            discoveryErrorData.add(new EarlyLoadingException.ExceptionData(ex.getMessage(), modInfo));
+                        } else {
+                            discoveryErrorData.add(new EarlyLoadingException.ExceptionData(ex.getMessage()));
+                        }
+                    }
                 }
                 var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).collect(Collectors.toList());
 
@@ -88,8 +102,17 @@ public class ModDiscoverer {
                 if (!badModFiles.isEmpty()) {
                     LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
                     brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
+                    locatedFiles.removeAll(badModFiles);
                 }
-                locatedFiles.removeAll(badModFiles);
+
+                if (distIsDedicatedServer) {
+                    var clientOnlyModFiles = locatedFiles.stream().filter(file -> file.getModFileInfo().isClientSideOnly()).toList();
+                    if (!clientOnlyModFiles.isEmpty()) {
+                        LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
+                        locatedFiles.removeAll(clientOnlyModFiles);
+                    }
+                }
+
                 LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
                 handleLocatedFiles(loadedFiles, locatedFiles);
             } catch (InvalidModFileException imfe) {
@@ -162,7 +185,7 @@ public class ModDiscoverer {
 
         //Validate the loading. With a deduplicated list, we can now successfully process the artifacts and load
         //transformer plugins.
-        var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData);
+        var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData, modFileLoadingExceptions);
         validator.stage1Validation();
         return validator;
     }

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java

@@ -7,51 +7,55 @@ package net.minecraftforge.fml.loading.moddiscovery;
 
 import com.google.common.base.Strings;
 import com.mojang.logging.LogUtils;
-import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.StringUtils;
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.MavenVersionAdapter;
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import javax.security.auth.x500.X500Principal;
 import java.net.URL;
-import java.security.CodeSigner;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.SignatureException;
-import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-public class ModFileInfo implements IModFileInfo, IConfigurable
-{
+public class ModFileInfo implements IModFileInfo, IConfigurable {
     private static final Logger LOGGER = LogUtils.getLogger();
+    private static final String MAYBE_NOT_JAVAFML_VER = "[2,)";
+    private static final String JAVAFML = "javafml";
+
+    @ApiStatus.Internal
+    public static final String NOT_A_FORGE_MOD_PROP = "__FORGE__not_a_forge_mod";
+
     private final IConfigurable config;
     private final ModFile modFile;
     private final URL issueURL;
     private final List<LanguageSpec> languageSpecs;
     private final boolean showAsResourcePack;
+    private final boolean clientSideOnly;
+    private final boolean showAsDataPack;
     private final List<IModInfo> mods;
     private final Map<String,Object> properties;
     private final String license;
     private final List<String> usesServices;
 
-    ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer)
-    {
+    ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer) {
         this.modFile = modFile;
         this.config = config;
         configFileConsumer.accept(this);
@@ -59,33 +63,55 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
         var modLoader = config.<String>getConfigElement("modLoader")
                 .orElseThrow(()->new InvalidModFileException("Missing ModLoader in file", this));
         // as is modloader version
-        var modLoaderVersion = config.<String>getConfigElement("loaderVersion")
-                .map(MavenVersionAdapter::createFromVersionSpec)
+        var modLoaderVerStr = config.<String>getConfigElement("loaderVersion")
                 .orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this));
+        var modLoaderVersion = MavenVersionAdapter.createFromVersionSpec(modLoaderVerStr);
         this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
+
+        // if true, this might not be a Forge mod
+        boolean maybeNotAForgeMod = modLoader.equals(JAVAFML)
+                && modLoaderVersion.hasRestrictions() // if loaderVersion is not "*"
+                && modLoaderVerStr.equals(MAYBE_NOT_JAVAFML_VER); // if loaderVersion is exactly "[2,)"
+
         // the remaining properties are optional with sensible defaults
         this.license = config.<String>getConfigElement("license")
                 .orElse("");
         this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack")
                 .orElse(false);
+        this.clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly")
+                .orElse(false);
+        this.showAsDataPack = config.<Boolean>getConfigElement("showAsDataPack")
+                .orElse(false);
         this.usesServices = config.<List<String>>getConfigElement("services")
                 .orElse(List.of());
-        this.properties = config.<Map<String, Object>>getConfigElement("properties")
-                .orElse(Collections.emptyMap());
-        this.modFile.setFileProperties(this.properties);
         this.issueURL = config.<String>getConfigElement("issueTrackerURL")
                 .map(StringUtils::toURL)
                 .orElse(null);
+
+        // if clientSideOnly, then this is definitely a Forge mod
+        if (this.clientSideOnly)
+            maybeNotAForgeMod = false;
+
+        if (maybeNotAForgeMod) {
+            // mark this file as not a Forge mod. Note: this marker may be removed later based on the mod dependencies
+            this.properties = config.<Map<String, Object>>getConfigElement("properties")
+                    .orElse(new LinkedHashMap<>());
+            this.properties.put(NOT_A_FORGE_MOD_PROP, true);
+        } else {
+            this.properties = config.<Map<String, Object>>getConfigElement("properties")
+                    .orElse(Collections.emptyMap());
+        }
+        this.modFile.setFileProperties(this.properties);
+
         final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
         if (modConfigs.isEmpty())
-        {
             throw new InvalidModFileException("Missing mods list", this);
-        }
+
         this.mods = modConfigs.stream()
                 .map(mi-> (IModInfo)new ModInfo(this, mi))
                 .toList();
-        if (LOGGER.isDebugEnabled(LogMarkers.LOADING))
-        {
+
+        if (LOGGER.isDebugEnabled(LogMarkers.LOADING)) {
             LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
                     this.modFile.getFileName(),
                     this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
@@ -99,13 +125,11 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
     }
 
     @Override
-    public List<IModInfo> getMods()
-    {
+    public List<IModInfo> getMods() {
         return mods;
     }
 
-    public ModFile getFile()
-    {
+    public ModFile getFile() {
         return this.modFile;
     }
 
@@ -115,32 +139,37 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
     }
 
     @Override
-    public Map<String, Object> getFileProperties()
-    {
+    public Map<String, Object> getFileProperties() {
         return this.properties;
     }
 
     @Override
-    public boolean showAsResourcePack()
-    {
+    public boolean showAsResourcePack() {
         return this.showAsResourcePack;
     }
 
     @Override
-    public <T> Optional<T> getConfigElement(final String... key)
-    {
+    public boolean isClientSideOnly() {
+        return this.clientSideOnly;
+    }
+
+    @Override
+    public boolean showAsDataPack() {
+        return this.showAsDataPack;
+    }
+
+    @Override
+    public <T> Optional<T> getConfigElement(final String... key) {
         return this.config.getConfigElement(key);
     }
 
     @Override
-    public List<? extends IConfigurable> getConfigList(final String... key)
-    {
+    public List<? extends IConfigurable> getConfigList(final String... key) {
         return this.config.getConfigList(key);
     }
 
     @Override
-    public String getLicense()
-    {
+    public String getLicense() {
         return license;
     }
 
@@ -149,49 +178,78 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
         return this;
     }
 
-    public URL getIssueURL()
-    {
+    public URL getIssueURL() {
         return issueURL;
     }
 
-    public boolean missingLicense()
-    {
+    public boolean missingLicense() {
         return Strings.isNullOrEmpty(license);
     }
 
+    private final char[] HEX = "0123456789ABCDEF".toCharArray();
     public Optional<String> getCodeSigningFingerprint() {
         var signers = this.modFile.getSecureJar().getManifestSigners();
-        return (signers == null ? Stream.<CodeSigner>of() : Arrays.stream(signers))
-                .flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
-                .findFirst()
-                .map(LamdbaExceptionUtils.rethrowFunction(Certificate::getEncoded))
-                .map(bytes->LamdbaExceptionUtils.uncheck(()->MessageDigest.getInstance("SHA-256")).digest(bytes))
-                .map(StringUtils::binToHex)
-                .map(str-> String.join(":", str.split("(?<=\\G.{2})")));
+        if (signers == null)
+            return Optional.empty();
+
+        for (var signer : signers) {
+            for (var cert : signer.getSignerCertPath().getCertificates()) {
+                try {
+                    var encoded = cert.getEncoded();
+                    var sha256 = MessageDigest.getInstance("SHA-256");
+                    var digest = sha256.digest(encoded);
+                    var buf = new StringBuilder(digest.length * 3);
+                    for (int x = 0; x < digest.length - 1; x++) {
+                        buf.append(HEX[(digest[x] & 0xF0) >> 4]);
+                        buf.append(HEX[(digest[x] & 0x0F)     ]);
+                        buf.append(':');
+                    }
+                    buf.append(HEX[(digest[digest.length - 1] & 0xF0) >> 4]);
+                    buf.append(HEX[(digest[digest.length - 1] & 0x0F)     ]);
+
+                    // We only care about the first. Should we list them all?
+                    return Optional.of(buf.toString());
+                } catch (CertificateEncodingException | NoSuchAlgorithmException e) {
+                    sneak(e);
+                }
+            }
+        }
+
+        return Optional.empty();
+
     }
 
     public Optional<String> getTrustData() {
-        return Arrays.stream(this.modFile.getSecureJar().getManifestSigners())
-                .flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
-                .findFirst()
-                .map(X509Certificate.class::cast)
-                .map(c->{
-                    StringBuffer sb = new StringBuffer();
-                    sb.append(c.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
-                    boolean selfSigned = false;
-                   try {
-                       c.verify(c.getPublicKey());
-                       selfSigned = true;
-                   } catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
-                       // not self signed
-                   }
-                   if (selfSigned) {
+        var signers = this.modFile.getSecureJar().getManifestSigners();
+        if (signers == null)
+            return Optional.empty();
+
+        for (var signer : signers) {
+            for (var cert : signer.getSignerCertPath().getCertificates()) {
+                if (!(cert instanceof X509Certificate x509))
+                    continue;
+
+                var sb = new StringBuilder();
+                sb.append(x509.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
+
+                var selfSigned = false;
+                try {
+                    x509.verify(x509.getPublicKey());
+                    selfSigned = true;
+                } catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
+                    // not self signed
+                }
+
+                if (selfSigned)
                     sb.append(" self-signed");
-                   } else {
-                       sb.append(" signed by ").append(c.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
-                   };
-                   return sb.toString();
-                });
+                else
+                    sb.append(" signed by ").append(x509.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
+
+               return Optional.of(sb.toString());
+            }
+        }
+
+        return Optional.empty();
     }
 
     @Override
@@ -208,4 +266,9 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
     public List<String> usesServices() {
         return usesServices;
     }
+
+    @SuppressWarnings("unchecked")
+    private static <E extends Throwable, R> R sneak(Throwable e) throws E {
+        throw (E)e;
+    }
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java

@@ -13,6 +13,7 @@ import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -30,7 +31,7 @@ public class ModFileParser {
         return parser.build(modFile);
     }
 
-    public static IModFileInfo modsTomlParser(final IModFile imodFile) {
+    public static @Nullable IModFileInfo modsTomlParser(final IModFile imodFile) {
         ModFile modFile = (ModFile) imodFile;
         LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
         final Path modsjson = modFile.findResource("META-INF", "mods.toml");

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java

@@ -19,6 +19,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -49,34 +50,39 @@ public class ModInfo implements IModInfo, IConfigurable {
     private final IConfigurable config;
     private final Optional<URL> modUrl;
 
-    public ModInfo(final ModFileInfo owningFile, final IConfigurable config)
-    {
+    public ModInfo(final ModFileInfo owningFile, final IConfigurable config) {
         Optional<ModFileInfo> ownFile = Optional.ofNullable(owningFile);
         this.owningFile = owningFile;
         this.config = config;
+
         // These are sourced from the mod specific [[mod]] entry
         this.modId = config.<String>getConfigElement("modId")
                 .orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile));
+
         // verify we have a valid modid
         if (!VALID_MODID.matcher(this.modId).matches()) {
             LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern());
             throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile);
         }
+
         this.namespace = config.<String>getConfigElement("namespace")
                 .orElse(this.modId);
+
         // verify our namespace is valid
         if (!VALID_NAMESPACE.matcher(this.namespace).matches()) {
             LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern());
             throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile);
         }
+
         this.version = config.<String>getConfigElement("version")
                 .map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
                 .map(DefaultArtifactVersion::new)
                 .orElse(DEFAULT_VERSION);
+
         // verify we have a valid mod version
-        if (!VALID_VERSION.matcher(this.version.toString()).matches()) {
-            throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile());
-        }
+        if (!VALID_VERSION.matcher(this.version.toString()).matches())
+            throw new InvalidModFileException("Illegal version number specified " + this.version, this.getOwningFile());
+
         // The remaining properties all default to sensible values and are not essential
         this.displayName = config.<String>getConfigElement("displayName")
                 .orElse(this.modId);
@@ -87,25 +93,48 @@ public class ModInfo implements IModInfo, IConfigurable {
                 .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile"))
                         .orElse(null)));
         this.logoBlur = config.<Boolean>getConfigElement("logoBlur")
-                .orElseGet(() -> ownFile.flatMap(f -> f.<Boolean>getConfigElement("logoBlur"))
+                .orElseGet(() -> ownFile.flatMap(mf -> mf.<Boolean>getConfigElement("logoBlur"))
                         .orElse(true));
         this.updateJSONURL = config.<String>getConfigElement("updateJSONURL")
                 .map(StringUtils::toURL);
         this.modUrl = config.<String>getConfigElement("modUrl")
                 .map(StringUtils::toURL);
+
         // These are sourced from the file rather than the mod-specific block, but with a modid tag
-        this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId))
-                .orElse(Collections.emptyList())
-                .stream()
-                .map(dep -> new ModVersion(this, dep))
-                .toList();
-        this.features = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("features", this.modId))
-                .stream()
-                .flatMap(m->m.entrySet().stream())
-                .map(this::makeBound)
-                .toList();
-        this.properties = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId))
-                .orElse(Collections.emptyMap());
+        if (ownFile.isEmpty()) {
+            this.dependencies = Collections.emptyList();
+            this.features = Collections.emptyList();
+            this.properties = Collections.emptyMap();
+        } else {
+            var deps = this.owningFile.getConfigList("dependencies", this.modId);
+            if (deps == null || deps.isEmpty()) {
+                this.dependencies = Collections.emptyList();
+            } else {
+                var tmp = new ArrayList<ModVersion>();
+                for (var dep : deps)
+                    tmp.add(new ModVersion(this, dep));
+                this.dependencies = Collections.unmodifiableList(tmp);
+            }
+
+            var feats = this.owningFile.<Map<String, Object>>getConfigElement("features", this.modId).orElse(null);
+            if (feats == null) {
+                this.features = Collections.emptyList();
+            } else {
+                var tmp = new ArrayList<ForgeFeature.Bound>();
+                for (var entry : feats.entrySet()) {
+                    if (!(entry.getValue() instanceof String val))
+                        throw new InvalidModFileException("Invalid feature bound {" + entry.getValue() + "} for key {" + entry.getKey() + "} only strings are accepted", this.owningFile);
+                    tmp.add(new ForgeFeature.Bound(entry.getKey(), val, this));
+                }
+                this.features = Collections.unmodifiableList(tmp);
+            }
+
+            var props = this.owningFile.<Map<String, Object>>getConfigElement("modproperties", this.modId).orElse(null);
+            if (props == null)
+                this.properties = Collections.emptyMap();
+            else
+                this.properties = Collections.unmodifiableMap(props);
+        }
     }
 
     @Override
@@ -119,14 +148,12 @@ public class ModInfo implements IModInfo, IConfigurable {
     }
 
     @Override
-    public String getDisplayName()
-    {
+    public String getDisplayName() {
         return this.displayName;
     }
 
     @Override
-    public String getDescription()
-    {
+    public String getDescription() {
         return this.description;
     }
 
@@ -156,14 +183,12 @@ public class ModInfo implements IModInfo, IConfigurable {
     }
 
     @Override
-    public Optional<String> getLogoFile()
-    {
+    public Optional<String> getLogoFile() {
         return this.logoFile;
     }
 
     @Override
-    public boolean getLogoBlur()
-    {
+    public boolean getLogoBlur() {
         return this.logoBlur;
     }
 
@@ -192,14 +217,6 @@ public class ModInfo implements IModInfo, IConfigurable {
         return modUrl;
     }
 
-    private ForgeFeature.Bound makeBound(Map.Entry<String, Object> e) {
-        if (e.getValue() instanceof String val) {
-            return new ForgeFeature.Bound(e.getKey(), val, this);
-        } else {
-            throw new InvalidModFileException("Invalid feature bound {" + e.getValue() + "} for key {" + e.getKey() + "} only strings are accepted", this.owningFile);
-        }
-    }
-
     class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion {
         private IModInfo owner;
         private final String modId;
@@ -213,8 +230,25 @@ public class ModInfo implements IModInfo, IConfigurable {
             this.owner = owner;
             this.modId = config.<String>getConfigElement("modId")
                     .orElseThrow(()->new InvalidModFileException("Missing required field modid in dependency", getOwningFile()));
-            this.mandatory = config.<Boolean>getConfigElement("mandatory")
-                    .orElseThrow(()->new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile()));
+
+            if (this.modId.equals("forge")) {
+                var fileProps = owner.getOwningFile().getFileProperties();
+                // Checking containsKey to avoid a possible exception if the property is not present (due to Collections.emptyMap())
+                if (!fileProps.isEmpty() && fileProps.containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
+                    // if the mod has a dependency on Forge, but we thought it wasn't a Forge mod earlier, we were wrong
+                    // so remove the flag.
+                    fileProps.remove(ModFileInfo.NOT_A_FORGE_MOD_PROP);
+                }
+            }
+
+            var mandatory = config.<Boolean>getConfigElement("mandatory");
+            if (mandatory.isPresent())
+                this.mandatory = mandatory.get();
+            else if (owner.getOwningFile().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP))
+                this.mandatory = true;
+            else
+                throw new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile());
+
             this.versionRange = config.<String>getConfigElement("versionRange")
                     .map(MavenVersionAdapter::createFromVersionSpec)
                     .orElse(UNBOUNDED);
@@ -228,46 +262,38 @@ public class ModInfo implements IModInfo, IConfigurable {
                     .map(StringUtils::toURL);
         }
 
-
         @Override
-        public String getModId()
-        {
+        public String getModId() {
             return modId;
         }
 
         @Override
-        public VersionRange getVersionRange()
-        {
+        public VersionRange getVersionRange() {
             return versionRange;
         }
 
         @Override
-        public boolean isMandatory()
-        {
+        public boolean isMandatory() {
             return mandatory;
         }
 
         @Override
-        public Ordering getOrdering()
-        {
+        public Ordering getOrdering() {
             return ordering;
         }
 
         @Override
-        public DependencySide getSide()
-        {
+        public DependencySide getSide() {
             return side;
         }
 
         @Override
-        public void setOwner(final IModInfo owner)
-        {
+        public void setOwner(final IModInfo owner) {
             this.owner = owner;
         }
 
         @Override
-        public IModInfo getOwner()
-        {
+        public IModInfo getOwner() {
             return owner;
         }
 
@@ -276,5 +302,4 @@ public class ModInfo implements IModInfo, IConfigurable {
             return referralUrl;
         }
     }
-
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModValidator.java

@@ -6,11 +6,18 @@
 package net.minecraftforge.fml.loading.moddiscovery;
 
 import com.mojang.logging.LogUtils;
+
+import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.api.ITransformationService;
-import net.minecraftforge.fml.loading.*;
+import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.ImmediateWindowHandler;
+import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.ModSorter;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
@@ -18,25 +25,30 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class ModValidator {
     private static final Logger LOGGER = LogUtils.getLogger();
-    //private final Map<IModFile.Type, List<ModFile>> modFiles;
     private final List<ModFile> candidatePlugins;
     private final List<ModFile> candidateMods;
+    private final List<ModFile> gameLibraries;
     private LoadingModList loadingModList;
-    private List<IModFile> brokenFiles;
+    private final List<IModFile> brokenFiles = new ArrayList<>();
     private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;
+    private final List<ModFileLoadingException> modFileLoadingExceptions;
 
-    public ModValidator(final Map<IModFile.Type, List<ModFile>> modFiles, final List<IModFileInfo> brokenFiles, final List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
-        //this.modFiles = modFiles;
+    public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData, List<ModFileLoadingException> modFileLoadingExceptions) {
         this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
-        this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY)));
+        this.gameLibraries = lst(modFiles.get(IModFile.Type.GAMELIBRARY));
+        this.candidateMods.addAll(this.gameLibraries);
         this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));
         this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
         this.discoveryErrorData = discoveryErrorData;
-        this.brokenFiles = brokenFiles.stream().map(IModFileInfo::getFile).collect(Collectors.toList()); // mutable list
+        this.brokenFiles.addAll(brokenFiles.stream().map(IModFileInfo::getFile).toList());
+        this.modFileLoadingExceptions = modFileLoadingExceptions;
+    }
+
+    public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
+        this(modFiles, brokenFiles, discoveryErrorData, List.of());
     }
 
     private static List<ModFile> lst(List<ModFile> files) {
@@ -54,8 +66,7 @@ public class ModValidator {
     @NotNull
     private List<ModFile> validateFiles(final List<ModFile> mods) {
         final List<ModFile> brokenFiles = new ArrayList<>();
-        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext(); )
-        {
+        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
             ModFile modFile = iterator.next();
             if (!modFile.getProvider().isValid(modFile) || !modFile.identifyMods()) {
                 LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", modFile.getFilePath());
@@ -71,7 +82,26 @@ public class ModValidator {
     }
 
     public ITransformationService.Resource getModResources() {
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, this.candidateMods.stream().map(IModFile::getSecureJar).toList());
+        var mods = new ArrayList<SecureJar>();
+        // Add only the valid mods that we will be attempting to load.
+        // If any detectable error happens during the sorting process {missing deps, duplicates,
+        // This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display.
+        // This won't fix them all as they are still loaded and will still apply but it might help
+        for (var info : this.loadingModList.getModFiles())
+            mods.add(info.getFile().getSecureJar());
+
+        // Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing
+        // that clusterfuck of a system, have this simple de-duplication. Order of resource is important, but i'm unsure if duplication is
+        // so might as well waste a few cycles on checking. Still faster then converting from a set to a list.
+        // Ideally we would explicitly list out which mods to load {forge and MC being the only ones} but some coremods could require extra things.
+        // So try game libraries as well
+        for (var lib : this.gameLibraries) {
+            var jar = lib.getSecureJar();
+            if (!mods.contains(jar))
+                mods.add(jar);
+        }
+
+        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, mods);
     }
 
     private List<EarlyLoadingException.ExceptionData> validateLanguages() {

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModsFolderLocator.java

@@ -16,6 +16,7 @@ import org.slf4j.Logger;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
@@ -42,11 +43,21 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
     public List<IModLocator.ModFileOrException> scanMods() {
         LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
         var excluded = ModDirTransformerDiscoverer.allExcluded();
-        try (var stream = Files.list(this.modFolder)) {
-            return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX))
-                .sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT)))
-                .map(this::createMod)
-                .toList();
+        try {
+            var ret = new ArrayList<IModLocator.ModFileOrException>();
+            var files = Files.list(this.modFolder).toList();
+            for (var file : files) {
+                var name = file.getFileName().toString().toLowerCase(Locale.ROOT);
+                if (excluded.contains(file) || !name.endsWith(SUFFIX))
+                    continue;
+                var mod = this.createMod(file, true);
+                if (mod == null) {
+                    LOGGER.debug(LogMarkers.SCAN, "Found unknown jar file {} ignoring", file);
+                } else {
+                    ret.add(mod);
+                }
+            }
+            return ret;
         } catch (IOException e) {
             return sneak(e);
         }

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java

@@ -6,6 +6,8 @@
 package net.minecraftforge.fml.loading.moddiscovery;
 
 import com.electronwill.nightconfig.core.UnmodifiableConfig;
+import com.google.common.collect.ImmutableMap;
+
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 
@@ -38,8 +40,12 @@ class NightConfigWrapper implements IConfigurable {
     public <T> Optional<T> getConfigElement(final String... key) {
         var path = asList(key);
         return this.config.getOptional(path).map(value -> {
-            if (value instanceof UnmodifiableConfig) {
-                return (T) ((UnmodifiableConfig) value).valueMap();
+            if (value instanceof UnmodifiableConfig cfg) {
+                // New Night config doesn't implement valueMap(), so do a copy.
+                var builder = ImmutableMap.builder();
+                for (var e: cfg.entrySet())
+                    builder.put(e.getKey(), e.getValue());
+                return (T)builder.build();
             } else if (value instanceof ArrayList<?> al && al.size() > 0 && al.get(0) instanceof UnmodifiableConfig) {
                 throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
             }

fmlloader/src/main/java/net/minecraftforge/fml/loading/progress/ProgressMeter.java

@@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public final class ProgressMeter {
     private final String name;
     private final int steps;
-    private AtomicInteger current;
+    private final AtomicInteger current;
     private Message label;
 
     public ProgressMeter(String name, int steps, int current, Message label) {

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java

@@ -19,6 +19,7 @@ import org.slf4j.Logger;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 /**
@@ -89,4 +90,24 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
         if (mtd == null) throw new IllegalStateException("Class " + target + " in module " + module + " does not have a main(String[]) method");
         mtd.invoke(null, (Object)arguments);
     }
+
+    protected static Path getPathFromResource(String resource) {
+        return getPathFromResource(resource, ForgeDevLaunchHandler.class.getClassLoader());
+    }
+
+    protected static Path getPathFromResource(String resource, ClassLoader cl) {
+        var url = cl.getResource(resource);
+        if (url == null)
+            throw new IllegalStateException("Could not find " + resource + " in classloader " + cl);
+
+        var str = url.toString();
+        int len = resource.length();
+        if ("jar".equalsIgnoreCase(url.getProtocol())) {
+            str = url.getFile();
+            len += 2;
+        }
+        str = str.substring(0, str.length() - len);
+        var path = Paths.get(URI.create(str));
+        return path;
+    }
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLaunchHandler.java

@@ -4,9 +4,7 @@
  */
 
 package net.minecraftforge.fml.loading.targets;
-import java.net.URI;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -35,23 +33,6 @@ abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
         return List.of(filtered);
     }
 
-    static Path getPathFromResource(String resource) {
-        var cl = ForgeDevLaunchHandler.class.getClassLoader();
-        var url = cl.getResource(resource);
-        if (url == null)
-            throw new IllegalStateException("Could not find " + resource + " in classloader " + cl);
-
-        var str = url.toString();
-        int len = resource.length();
-        if ("jar".equalsIgnoreCase(url.getProtocol())) {
-            str = url.getFile();
-            len += 2;
-        }
-        str = str.substring(0, str.length() - len);
-        var path = Paths.get(URI.create(str));
-        return path;
-    }
-
     public static class Client extends ForgeDevLaunchHandler {
         public Client() {
             super(CLIENT);

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;
 
 import java.io.IOException;
@@ -71,7 +76,7 @@ public class ForgeDevLocator extends AbstractModProvider implements IModLocator
         if (!isTest)
             return ret;
 
-        var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class");
+        var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class", ClassLoader.getSystemClassLoader());
         // Explode our test mods into a framework that treats them all as separate jars.
         var tests = explodeTestMods(test);
         ret.addAll(tests);

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java

@@ -9,34 +9,34 @@ import java.nio.file.Path;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
 
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LibraryFinder;
-
 @ApiStatus.Internal
 abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
     protected ForgeProdLaunchHandler(LaunchType type) {
         super(type, "forge_");
     }
 
-    @Override public String getNaming() { return "srg"; }
+    @Override public String getNaming() { return "mcp"; }
     @Override public boolean isProduction() { return true; }
 
-    @Override
-    public List<Path> getMinecraftPaths() {
-        var vers = FMLLoader.versionInfo();
-        var mc = LibraryFinder.findPathForMaven(vers.forgeGroup(), "forge", "", this.type.name(), vers.mcAndForgeVersion());
-        return List.of(mc);
-    }
-
     public static class Client extends ForgeProdLaunchHandler {
         public Client() {
             super(CLIENT);
         }
+
+        @Override
+        public List<Path> getMinecraftPaths() {
+            return List.of(getPathFromResource("net/minecraft/client/Minecraft.class"));
+        }
     }
 
     public static class Server extends ForgeProdLaunchHandler {
         public Server() {
             super(SERVER);
         }
+
+        @Override
+        public List<Path> getMinecraftPaths() {
+            return List.of(getPathFromResource("net/minecraft/server/MinecraftServer.class"));
+        }
     }
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;
 
 import java.util.List;

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;
 
 import java.io.IOException;

fmlloader/src/main/resources/log4j2.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Forge Development LLC and contributors
+    SPDX-License-Identifier: LGPL-2.1-only
+-->
+
 <Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
     <filters>
         <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>

gradle.properties

@@ -2,10 +2,16 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+org.gradle.parallel=true
 
-JAVA_VERSION=17
-MC_VERSION=1.20.2
-MC_NEXT_VERSION=1.21
-MCP_VERSION=20230921.100330
+JAVA_VERSION=21
+MC_VERSION=1.21.1
+MC_NEXT_VERSION=1.22
+MCP_VERSION=20240808.132146
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.20.2
+MAPPING_VERSION=1.21.1
+
+// Set to true before the first build of a new MC version, so we don't do compatibility checks
+CHECK_COMPATIBILITY=false
+// Set to true to allow for fuzzy patching. Useful during updateing
+UPDATING=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

javafmllanguage/build.gradle

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
@@ -37,7 +37,7 @@ tasks.named('jar', Jar).configure {
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
@@ -61,4 +61,4 @@ publishing {
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-}
+}

javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java

@@ -6,6 +6,7 @@
 package net.minecraftforge.fml.javafmlmod;
 
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.Logging;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.common.Mod;
@@ -19,6 +20,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.Type;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -32,6 +34,7 @@ public class AutomaticEventSubscriber {
     private static final Logger LOGGER = LogManager.getLogger();
     private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
     private static final Type MOD_TYPE = Type.getType(Mod.class);
+    private static final Type ONLY_IN_TYPE = Type.getType(OnlyIn.class);
 
     public static void inject(ModContainer mod, ModFileScanData scanData, ClassLoader loader) {
         if (scanData == null) return;
@@ -41,6 +44,11 @@ public class AutomaticEventSubscriber {
             .filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType()))
             .toList();
 
+        var onlyIns = FMLEnvironment.production ? Collections.emptySet() : scanData.getAnnotations().stream()
+                .filter(data -> ONLY_IN_TYPE.equals(data.annotationType()))
+                .map(data -> data.clazz().getClassName())
+                .collect(Collectors.toSet());
+
         var modids = scanData.getAnnotations().stream()
             .filter(data -> MOD_TYPE.equals(data.annotationType()))
             .collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value")));
@@ -49,6 +57,10 @@ public class AutomaticEventSubscriber {
         var defaultBus = new EnumData(null, "FORGE");
 
         for (var data : targets) {
+            if (!FMLEnvironment.production && onlyIns.contains(data.clazz().getClassName())) {
+                throw new RuntimeException("Found @OnlyIn on @EventBusSubscriber class " + data.clazz().getClassName() + " - this is not allowed as it causes crashes. Remove the OnlyIn and set value=Dist.CLIENT in the EventBusSubscriber annotation instead");
+            }
+
             var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId());
             modId = value(data, "modid", modId);
 

lowcodelanguage/build.gradle

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
@@ -38,7 +38,7 @@ tasks.named('jar', Jar).configure {
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
@@ -62,4 +62,4 @@ publishing {
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-}
+}

mclanguage/build.gradle

@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
@@ -37,7 +37,7 @@ tasks.named('jar', Jar).configure {
     }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
@@ -61,4 +61,4 @@ publishing {
     repositories {
         maven gradleutils.publishingForgeMaven
     }
-}
+}

mdk/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
 }
 
 version = mod_version
@@ -12,8 +12,8 @@ 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)
+// Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21.
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -31,6 +31,9 @@ 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
+    
+    // Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
+    reobf = false
 
     // 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.
@@ -124,11 +127,11 @@ dependencies {
     // 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}"
 
-    // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
+    // Example mod dependency with JEI
     // 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}")
+    // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
+    // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
+    // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
 
     // Example mod dependency using a mod jar from ./libs with a flat dir repository
     // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
@@ -138,6 +141,9 @@ dependencies {
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
+    
+    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+ 
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
@@ -171,16 +177,8 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor'   : mod_authors
         ])
     }
-
-    // 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 {

mdk/src/main/java/com/example/examplemod/Config.java

@@ -46,7 +46,7 @@ public class Config
 
     private static boolean validateItemName(final Object obj)
     {
-        return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
+        return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(ResourceLocation.tryParse(itemName));
     }
 
     @SubscribeEvent
@@ -58,7 +58,7 @@ public class Config
 
         // convert the list of strings into a set of items
         items = ITEM_STRINGS.get().stream()
-                .map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName)))
+                .map(itemName -> ForgeRegistries.ITEMS.getValue(ResourceLocation.tryParse(itemName)))
                 .collect(Collectors.toSet());
     }
 }

mdk/src/main/java/com/example/examplemod/ExampleMod.java

@@ -51,7 +51,7 @@ public class ExampleMod
 
     // Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
     public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
-            .alwaysEat().nutrition(1).saturationMod(2f).build())));
+            .alwaysEdible().nutrition(1).saturationModifier(2f).build())));
 
     // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
     public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()

mdk/src/main/resources/META-INF/mods.toml

@@ -12,6 +12,9 @@ loaderVersion="${loader_version_range}" #mandatory This is typically bumped ever
 license="${mod_license}"
 # A URL to refer people to when problems occur with this mod
 #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
+# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
+# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
+#clientSideOnly=true #optional - defaults to false if absent
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
@@ -36,7 +39,7 @@ authors="${mod_authors}" #optional
 # IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
 # NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
 # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
+#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)
 
 # The description text for the mod (multi line!) (#mandatory)
 description='''${mod_description}'''
@@ -67,4 +70,4 @@ description='''${mod_description}'''
 # that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
 # stop your mod loading on the server for example.
 #[features.${mod_id}]
-#openGLVersion="[3.2,)"
+#openGLVersion="[3.2,)"

patches/minecraft/com/mojang/blaze3d/pipeline/RenderTarget.java.patch

@@ -1,56 +1,55 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -113,7 +_,10 @@
-             GlStateManager._texParameter(3553, 34892, 0);
-             GlStateManager._texParameter(3553, 10242, 33071);
-             GlStateManager._texParameter(3553, 10243, 33071);
-+         if (!stencilEnabled)
-             GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, (IntBuffer)null);
-+         else
-+            GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
-          }
+@@ -104,7 +_,10 @@
+                 GlStateManager._texParameter(3553, 34892, 0);
+                 GlStateManager._texParameter(3553, 10242, 33071);
+                 GlStateManager._texParameter(3553, 10243, 33071);
++                if (!stencilEnabled)
+                 GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
++                else
++                    GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
+             }
  
-          this.setFilterMode(9728);
-@@ -124,7 +_,14 @@
-          GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
-          GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
-          if (this.useDepth) {
-+         if(!stencilEnabled)
-             GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
-+         else if(net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-+         } else {
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
-+         }
-          }
+             this.setFilterMode(9728, true);
+@@ -114,8 +_,13 @@
+             GlStateManager._texImage2D(3553, 0, 32856, this.width, this.height, 0, 6408, 5121, null);
+             GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
+             GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
+-            if (this.useDepth) {
++            if (this.useDepth && !stencilEnabled) {
+                 GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
++            } else if(this.useDepth && net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
++                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
++            } else if (this.useDepth) {
++                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
++                GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
+             }
  
-          this.checkStatus();
-@@ -292,4 +_,27 @@
-    public int getDepthTextureId() {
-       return this.depthBufferId;
-    }
+             this.checkStatus();
+@@ -257,5 +_,26 @@
+ 
+     public int getDepthTextureId() {
+         return this.depthBufferId;
++    }
 +
-+   /*================================ FORGE START ================================================*/
-+   private boolean stencilEnabled = false;
-+   /**
-+    * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
-+    * Modders must call this directly to set things up.
-+    * This is to prevent the default cause where graphics cards do not support stencil bits.
-+    * <b>Make sure to call this on the main render thread!</b>
-+    */
-+   public void enableStencil() {
-+      if(stencilEnabled) return;
-+      stencilEnabled = true;
-+      this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
-+   }
++    private boolean stencilEnabled = false;
++    /**
++     * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
++     * Modders must call this directly to set things up.
++     * This is to prevent the default cause where graphics cards do not support stencil bits.
++     * <b>Make sure to call this on the main render thread!</b>
++     */
++    public void enableStencil() {
++        if (stencilEnabled) return;
++        stencilEnabled = true;
++        this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
++    }
 +
-+   /**
-+    * Returns wither or not this FBO has been successfully initialized with stencil bits.
-+    * If not, and a modder wishes it to be, they must call enableStencil.
-+    */
-+   public boolean isStencilEnabled() {
-+      return this.stencilEnabled;
-+   }
-+   /*================================ FORGE END   ================================================*/
++    /**
++     * Returns wither or not this FBO has been successfully initialized with stencil bits.
++     * If not, and a modder wishes it to be, they must call enableStencil.
++     */
++    public boolean isStencilEnabled() {
++        return this.stencilEnabled;
+     }
  }

patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch

@@ -1,19 +1,20 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -501,9 +_,16 @@
+@@ -493,9 +_,17 @@
+         }
+     }
  
-    }
++    /* Stores the last values sent into glMultiTexCoord2f */
++    public static float lastBrightnessX = 0.0f;
++    public static float lastBrightnessY = 0.0f;
++
+     public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
+         RenderSystem.assertOnRenderThreadOrInit();
+         GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
++        if (p_84161_ == GL13.GL_TEXTURE1) {
++            lastBrightnessX = p_84162_;
++            lastBrightnessY = p_84163_;
++        }
+     }
  
-+   /* Stores the last values sent into glMultiTexCoord2f */
-+   public static float lastBrightnessX = 0.0f;
-+   public static float lastBrightnessY = 0.0f;
-    public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
-       RenderSystem.assertOnRenderThreadOrInit();
-       GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
-+      if (p_84161_ == GL13.GL_TEXTURE1) {
-+          lastBrightnessX = p_84162_;
-+          lastBrightnessY = p_84163_;
-+       }
-    }
- 
-    public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
+     public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {

patches/minecraft/com/mojang/blaze3d/platform/Window.java.patch

@@ -1,28 +1,30 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -81,7 +_,8 @@
-       GLFW.glfwWindowHint(139267, 2);
-       GLFW.glfwWindowHint(139272, 204801);
-       GLFW.glfwWindowHint(139270, 1);
--      this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
-+      this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
-+      if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
-       if (monitor != null) {
-          VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
-          this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
-@@ -93,6 +_,7 @@
-          this.windowedX = this.x = aint1[0];
-          this.windowedY = this.y = aint[0];
-       }
-+      }
+@@ -84,7 +_,8 @@
+         GLFW.glfwWindowHint(139267, 2);
+         GLFW.glfwWindowHint(139272, 204801);
+         GLFW.glfwWindowHint(139270, 1);
+-        this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
++        this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
++        if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
+         if (monitor != null) {
+             VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
+             this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
+@@ -96,6 +_,7 @@
+             this.windowedX = this.x = aint1[0];
+             this.windowedY = this.y = aint[0];
+         }
++        }
  
-       GLFW.glfwMakeContextCurrent(this.window);
-       GL.createCapabilities();
-@@ -242,6 +_,7 @@
-       GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
-       this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
-       this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
-+      if (this.framebufferHeight == 0 || this.framebufferWidth==0) net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w->this.framebufferWidth=w, h->this.framebufferHeight=h);
-    }
+         GLFW.glfwMakeContextCurrent(this.window);
+         GL.createCapabilities();
+@@ -254,6 +_,9 @@
+         GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
+         this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
+         this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
++        if (this.framebufferHeight == 0 || this.framebufferWidth == 0) {
++            net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h);
++        }
+     }
  
-    private void onResize(long p_85428_, int p_85429_, int p_85430_) {
+     private void onResize(long p_85428_, int p_85429_, int p_85430_) {

patches/minecraft/com/mojang/blaze3d/vertex/BufferBuilder.java.patch

@@ -1,17 +0,0 @@
---- a/com/mojang/blaze3d/vertex/BufferBuilder.java
-+++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
-@@ -459,4 +_,14 @@
-          this.sorting = p_277855_;
-       }
-    }
-+
-+   // Forge start
-+   public void putBulkData(ByteBuffer buffer) {
-+      ensureCapacity(buffer.limit() + this.format.getVertexSize());
-+      this.buffer.position(this.nextElementByte);
-+      this.buffer.put(buffer);
-+      this.buffer.position(0);
-+      this.vertices += buffer.limit() / this.format.getVertexSize();
-+      this.nextElementByte += buffer.limit();
-+   }
- }

patches/minecraft/com/mojang/blaze3d/vertex/PoseStack.java.patch

@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
-@@ -11,7 +_,7 @@
- import org.joml.Quaternionf;
+@@ -13,7 +_,7 @@
+ import org.joml.Vector3f;
  
  @OnlyIn(Dist.CLIENT)
 -public class PoseStack {
 +public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
-    private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), (p_85848_) -> {
-       Matrix4f matrix4f = new Matrix4f();
-       Matrix3f matrix3f = new Matrix3f();
+     private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), p_85848_ -> {
+         Matrix4f matrix4f = new Matrix4f();
+         Matrix3f matrix3f = new Matrix3f();

patches/minecraft/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java.patch

@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
 +++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
-@@ -46,7 +_,7 @@
- 
-    public void endVertex() {
-       Vector3f vector3f = this.normalInversePose.transform(new Vector3f(this.nx, this.ny, this.nz));
--      Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
-+      Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
-       Vector4f vector4f = this.cameraInversePose.transform(new Vector4f(this.x, this.y, this.z, 1.0F));
-       vector4f.rotateY((float)Math.PI);
-       vector4f.rotateX((-(float)Math.PI / 2F));
+@@ -62,7 +_,7 @@
+     public VertexConsumer setNormal(float p_344306_, float p_342091_, float p_344579_) {
+         this.delegate.setNormal(p_344306_, p_342091_, p_344579_);
+         Vector3f vector3f = this.normalInversePose.transform(p_344306_, p_342091_, p_344579_, this.normal);
+-        Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
++        Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
+         Vector3f vector3f1 = this.cameraInversePose.transformPosition(this.x, this.y, this.z, this.worldPos);
+         vector3f1.rotateY((float) Math.PI);
+         vector3f1.rotateX((float) (-Math.PI / 2));

patches/minecraft/com/mojang/blaze3d/vertex/VertexConsumer.java.patch

@@ -1,38 +1,24 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -14,7 +_,7 @@
+@@ -12,7 +_,7 @@
  import org.lwjgl.system.MemoryStack;
  
  @OnlyIn(Dist.CLIENT)
 -public interface VertexConsumer {
 +public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
-    VertexConsumer vertex(double p_85945_, double p_85946_, double p_85947_);
+     VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
  
-    VertexConsumer color(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
-@@ -64,6 +_,10 @@
-    }
+     VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
+@@ -135,10 +_,11 @@
+                 }
  
-    default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, int[] p_86002_, int p_86003_, boolean p_86004_) {
-+      putBulkData(p_85996_, p_85997_, p_85998_, p_85999_, p_86000_, p_86001_, 1, p_86002_, p_86003_, p_86004_);
-+   }
-+
-+   default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, float alpha, int[] p_86002_, int p_86003_, boolean p_86004_) {
-       float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
-       int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
-       int[] aint1 = p_85997_.getVertices();
-@@ -99,11 +_,13 @@
-                f5 = afloat[k] * p_86001_;
+                 int i1 = FastColor.ARGB32.color(k, (int)f3, (int)f4, (int)f5);
+-                int j1 = p_331444_[l];
++                int j1 = applyBakedLighting(p_331444_[l], bytebuffer);
+                 float f10 = bytebuffer.getFloat(16);
+                 float f9 = bytebuffer.getFloat(20);
+                 Vector3f vector3f1 = matrix4f.transformPosition(f, f1, f2, new Vector3f());
++                applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
+                 this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), i1, f10, f9, p_85993_, j1, vector3f.x(), vector3f.y(), vector3f.z());
              }
- 
--            int l = aint[k];
-+            int l = applyBakedLighting(p_86002_[k], bytebuffer);
-             float f9 = bytebuffer.getFloat(16);
-             float f10 = bytebuffer.getFloat(20);
-             Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
--            this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
-+            applyBakedNormals(vector3f, bytebuffer, p_85996_.normal());
-+            float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
-+            this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
-          }
-       }
- 
+         }

patches/minecraft/com/mojang/blaze3d/vertex/VertexFormat.java.patch

@@ -1,14 +1,41 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -176,4 +_,11 @@
-          return i;
-       }
-    }
+@@ -13,7 +_,7 @@
+ import net.minecraftforge.api.distmarker.OnlyIn;
+ 
+ @OnlyIn(Dist.CLIENT)
+-public class VertexFormat {
++public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
+     public static final int UNKNOWN_ELEMENT = -1;
+     private final List<VertexFormatElement> elements;
+     private final List<String> names;
+@@ -22,6 +_,7 @@
+     private final int[] offsetsByElement = new int[32];
+     @Nullable
+     private VertexBuffer immediateDrawVertexBuffer;
++    private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
+ 
+     VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
+         this.elements = p_343616_;
+@@ -34,6 +_,11 @@
+             int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
+             this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
+         }
 +
-+   public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
-+   public int getOffset(int index) { return offsets.getInt(index); }
-+   public boolean hasPosition() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.POSITION); }
-+   public boolean hasNormal() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.NORMAL); }
-+   public boolean hasColor() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.COLOR); }
-+   public boolean hasUV(int which) { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.UV && e.getIndex() == which); }
- }
++        ImmutableMap.Builder<String, VertexFormatElement> elements = ImmutableMap.builder();
++        for (int i = 0; i < p_343616_.size(); i++)
++            elements.put(p_345241_.get(i), p_343616_.get(i));
++        this.elementMapping = elements.buildOrThrow();
+     }
+ 
+     public static VertexFormat.Builder builder() {
+@@ -158,6 +_,9 @@
+ 
+         return vertexbuffer;
+     }
++
++    public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
++    public int getOffset(int index) { return offsetsByElement[index]; }
+ 
+     @OnlyIn(Dist.CLIENT)
+     public static class Builder {

patches/minecraft/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch

@@ -1,13 +0,0 @@
---- a/com/mojang/blaze3d/vertex/VertexFormatElement.java
-+++ b/com/mojang/blaze3d/vertex/VertexFormatElement.java
-@@ -90,6 +_,10 @@
-       this.usage.clearBufferState(this.index, p_166964_);
-    }
- 
-+    public int getElementCount() {
-+       return count;
-+    }
-+
-    @OnlyIn(Dist.CLIENT)
-    public static enum Type {
-       FLOAT(4, "Float", 5126),

patches/minecraft/com/mojang/math/Transformation.java.patch

@@ -1,31 +1,31 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
 @@ -13,7 +_,7 @@
+ import org.joml.Quaternionf;
  import org.joml.Vector3f;
- import org.joml.Vector3fc;
  
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
-    private final Matrix4f matrix;
-    public static final Codec<Transformation> CODEC = RecordCodecBuilder.create((p_269604_) -> {
-       return p_269604_.group(ExtraCodecs.VECTOR3F.fieldOf("translation").forGetter((p_269599_) -> {
-@@ -156,6 +_,19 @@
-    public int hashCode() {
-       return Objects.hash(this.matrix);
-    }
+     private final Matrix4f matrix;
+     public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
+         p_269604_ -> p_269604_.group(
+@@ -169,5 +_,19 @@
+         vector3f1.lerp(p_175938_.getScale(), p_175939_);
+         quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
+         return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
++    }
 +
 +    private Matrix3f normalTransform = null;
 +    public Matrix3f getNormalMatrix() {
 +        checkNormalTransform();
 +        return normalTransform;
 +    }
++
 +    private void checkNormalTransform() {
 +        if (normalTransform == null) {
 +            normalTransform = new Matrix3f(matrix);
 +            normalTransform.invert();
 +            normalTransform.transpose();
 +        }
-+    }
- 
-    public Transformation slerp(Transformation p_175938_, float p_175939_) {
-       Vector3f vector3f = this.getTranslation();
+     }
+ }

patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch

@@ -1,10 +1,9 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -61,6 +_,15 @@
-       return Component.empty().append(this.lines.title).append(": ").append(this.lines.detail);
-    }
+@@ -71,6 +_,15 @@
+     }
  
-+    @Override
+     @Override
 +    public boolean keyPressed(int key, int scanCode, int modifiers) {
 +       if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
 +          minecraft.setScreen(this.nextScreen);
@@ -13,6 +12,7 @@
 +       return super.keyPressed(key, scanCode, modifiers);
 +    }
 +
-    public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
-       super.render(p_283497_, p_88680_, p_88681_, p_88682_);
-       p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
++    @Override
+     public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
+         super.render(p_283497_, p_88680_, p_88681_, p_88682_);
+         p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);

patches/minecraft/net/minecraft/CrashReport.java.patch

@@ -1,48 +1,48 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -57,14 +_,9 @@
-       if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
-          p_127520_.append("-- Head --\n");
-          p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
--         p_127520_.append("Stacktrace:\n");
+@@ -58,14 +_,9 @@
+         if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
+             p_127520_.append("-- Head --\n");
+             p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
+-            p_127520_.append("Stacktrace:\n");
+-
+-            for (StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
+-                p_127520_.append("\t").append("at ").append(stacktraceelement);
+-                p_127520_.append("\n");
+-            }
 -
--         for(StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
--            p_127520_.append("\t").append("at ").append((Object)stacktraceelement);
 -            p_127520_.append("\n");
--         }
++            p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
++            p_127520_.append("Stacktrace:");
++            p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
+         }
+ 
+         for (CrashReportCategory crashreportcategory : this.details) {
+@@ -73,6 +_,7 @@
+             p_127520_.append("\n\n");
+         }
+ 
++        net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
+         this.systemReport.appendToCrashReportString(p_127520_);
+     }
+ 
+@@ -92,18 +_,7 @@
+             throwable.setStackTrace(this.exception.getStackTrace());
+         }
+ 
+-        String s;
+-        try {
+-            stringwriter = new StringWriter();
+-            printwriter = new PrintWriter(stringwriter);
+-            throwable.printStackTrace(printwriter);
+-            s = stringwriter.toString();
+-        } finally {
+-            IOUtils.closeQuietly((Writer)stringwriter);
+-            IOUtils.closeQuietly((Writer)printwriter);
+-        }
 -
--         p_127520_.append("\n");
-+         p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
-+         p_127520_.append("Stacktrace:");
-+         p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
-       }
+-        return s;
++        return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
+     }
  
-       for(CrashReportCategory crashreportcategory : this.details) {
-@@ -72,6 +_,7 @@
-          p_127520_.append("\n\n");
-       }
- 
-+      net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
-       this.systemReport.appendToCrashReportString(p_127520_);
-    }
- 
-@@ -91,18 +_,7 @@
-          throwable.setStackTrace(this.exception.getStackTrace());
-       }
- 
--      String s;
--      try {
--         stringwriter = new StringWriter();
--         printwriter = new PrintWriter(stringwriter);
--         throwable.printStackTrace(printwriter);
--         s = stringwriter.toString();
--      } finally {
--         IOUtils.closeQuietly((Writer)stringwriter);
--         IOUtils.closeQuietly((Writer)printwriter);
--      }
--
--      return s;
-+      return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
-    }
- 
-    public String getFriendlyReport() {
+     public String getFriendlyReport(ReportType p_343869_, List<String> p_342487_) {

patches/minecraft/net/minecraft/CrashReportCategory.java.patch

@@ -1,38 +1,37 @@
 --- a/net/minecraft/CrashReportCategory.java
 +++ b/net/minecraft/CrashReportCategory.java
-@@ -102,8 +_,10 @@
-       if (astacktraceelement.length <= 0) {
-          return 0;
-       } else {
--         this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
--         System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
-+         int len = astacktraceelement.length - 3 - p_128149_;
-+         if (len <= 0) len = astacktraceelement.length;
-+         this.stackTrace = new StackTraceElement[len];
-+         System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
-          return this.stackTrace.length;
-       }
-    }
-@@ -147,17 +_,17 @@
+@@ -112,8 +_,10 @@
+         if (astacktraceelement.length <= 0) {
+             return 0;
+         } else {
+-            this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
+-            System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
++            int len = astacktraceelement.length - 3 - p_128149_;
++            if (len <= 0) len = astacktraceelement.length;
++            this.stackTrace = new StackTraceElement[len];
++            System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
+             return this.stackTrace.length;
+         }
+     }
+@@ -160,16 +_,16 @@
  
-       if (this.stackTrace != null && this.stackTrace.length > 0) {
-          p_128169_.append("\nStacktrace:");
+         if (this.stackTrace != null && this.stackTrace.length > 0) {
+             p_128169_.append("\nStacktrace:");
 -
--         for(StackTraceElement stacktraceelement : this.stackTrace) {
--            p_128169_.append("\n\tat ");
--            p_128169_.append((Object)stacktraceelement);
--         }
-+         p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
-       }
+-            for (StackTraceElement stacktraceelement : this.stackTrace) {
+-                p_128169_.append("\n\tat ");
+-                p_128169_.append(stacktraceelement);
+-            }
++            p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
+         }
+     }
  
-    }
- 
-    public StackTraceElement[] getStacktrace() {
-       return this.stackTrace;
-+   }
+     public StackTraceElement[] getStacktrace() {
+         return this.stackTrace;
++    }
 +
-+   public void applyStackTrace(Throwable t) {
-+      this.stackTrace = t.getStackTrace();
-    }
++    public void applyStackTrace(Throwable t) {
++        this.stackTrace = t.getStackTrace();
+     }
  
-    public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
+     public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {

patches/minecraft/net/minecraft/SharedConstants.java.patch

@@ -1,10 +1,10 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -212,6 +_,7 @@
-    }
+@@ -171,6 +_,7 @@
+     }
  
-    static {
-+      if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
-       ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
-       CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
-       CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
+     static {
++        if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
+         ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
+         CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
+         CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();

patches/minecraft/net/minecraft/Util.java.patch

@@ -1,23 +1,11 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -172,6 +_,11 @@
-       return 255;
-    }
- 
-+   // We add these inner classes to compensate for Mojang's missing inner classes and shift the anonymous class index.
-+   // This allows us to obfuscate subsequent anonymous inner classes correctly.
-+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT1 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
-+   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT2 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
-+
-    public static ExecutorService backgroundExecutor() {
-       return BACKGROUND_EXECUTOR;
-    }
-@@ -240,7 +_,7 @@
-       try {
-          type = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())).getChoiceType(p_137552_, p_137553_);
-       } catch (IllegalArgumentException illegalargumentexception) {
--         LOGGER.error("No data fixer registered for {}", (Object)p_137553_);
-+         LOGGER.debug("No data fixer registered for {}", (Object)p_137553_);
-          if (SharedConstants.IS_RUNNING_IN_IDE) {
-             throw illegalargumentexception;
-          }
+@@ -267,7 +_,7 @@
+                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
+                 .getChoiceType(p_137552_, p_137553_);
+         } catch (IllegalArgumentException illegalargumentexception) {
+-            LOGGER.error("No data fixer registered for {}", p_137553_);
++            LOGGER.debug("No data fixer registered for {}", p_137553_);
+             if (SharedConstants.IS_RUNNING_IN_IDE) {
+                 throw illegalargumentexception;
+             }