1.21.1 RB 1

https://forums.minecraftforge.net/topic/154391-forge-521-minecraft-1211/

.gitattributes

@@ -3,7 +3,6 @@
 *.patch text eol=lf
 *.java text eol=lf
 *.gradle text eol=crlf
-**/MANIFEST.MF text eol=crlf
 *.png binary
 *.gif binary
 *.exe binary

.gitignore

@@ -26,6 +26,7 @@
 /projects/mcp/
 /projects/clean/
 /projects/forge/
+#/patches/*
 
 #occupational hazards
 /projects/**/build/
@@ -34,15 +35,20 @@
 /projects/**/*.launch
 /repo/
 src/*/generated/**/.cache/
-
 # Generated by gradle every import
 **/src/main/resources/META-INF/MANIFEST.MF
 /fmlloader/src/main/resources/forge_version.json
 
+#Patch rejects
+#/patches-/
+#*.patch.rej
+#/projects/*/rejects/
+
+# FML changelog
+changelog.txt
+*.py
+*.7z
+/logs/
+
 /ForgeRoot.ipr
 /ForgeRoot.iws
-
-# APT stuff
-/*/.gitignore
-/*/.factorypath
-/*/.apt_generated/

build.gradle

@@ -4,7 +4,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'net.minecraftforge.licenser' version '1.0.1'
     id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'net.minecraftforge.gradleutils' version '[2.6.4,2.7)'
+    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.22,6.2)' apply false
@@ -16,7 +16,8 @@ plugins {
 Util.init() //Init all our extension methods!
 
 ext {
-    VERSION = gitversion.getMCTagOffsetBranch(MC_VERSION)
+    GIT_INFO = gradleutils.gitInfo
+    VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
     FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
 }
 

buildSrc/build.gradle

@@ -4,8 +4,8 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:9.8'
-    implementation 'org.ow2.asm:asm-tree:9.8'
+    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'

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

@@ -3,7 +3,6 @@ package net.minecraftforge.forge.tasks
 import groovy.transform.CompileStatic
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Internal
-import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 
@@ -13,19 +12,13 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
     @Internal
     abstract Property<Closure<Boolean>> getPredicate()
 
-    private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
+    private final Set<String> matches = new HashSet<>()
 
     @Override
     protected process(ClassNode parent, MethodNode node) {
         for (final current : node.instructions) {
             if (predicate.get().call(parent, node, current)) {
-                var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
-
-                // only add non-synthetic methods
-                if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
-                    methods.add(node.name + node.desc)
-                }
-
+                matches.add(parent.name)
                 return
             }
         }
@@ -34,15 +27,6 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
     @Internal
     @Override
     protected Object getData() {
-        var array = new ArrayList<Object>()
-        matches.forEach { c, m ->
-            {
-                array.add(
-                        'class': c,
-                        'methods': m
-                )
-            }
-        }
-        return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
+        return matches.toSorted(Comparator.<String>naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
     }
 }

build_forge.gradle

@@ -47,7 +47,6 @@ jarSigner.autoDetect('forge')
 applyPatches {
     level 'WARNING'
     failOnError = UPDATING != 'true'
-    rejects = rootProject.layout.projectDirectory.dir('rejects').asFile
 }
 
 sourceSets {
@@ -71,7 +70,7 @@ sourceSets {
     }
 }
 
-final String SPEC_VERSION = gitversion.info.tag
+final String 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.
@@ -92,18 +91,18 @@ 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.1:fatjar'
+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 }
-    installer {
+    installer { 
         extendsFrom(bootstrap)
-        transitive = false
+        transitive = false 
     }
-    installerextra {
+    installerextra { 
         extendsFrom(bootstrap)
-        transitive = false
+        transitive = false 
     }
     api.extendsFrom(installer)
 }
@@ -117,14 +116,14 @@ dependencies {
     bootstrap(libs.securemodules) // Has Union file system in it
     bootstrap(libs.unsafe)        // Needed by securemodules
     bootstrap(libs.bundles.asm)   // Needed by securemodules
-
+    
     implementation(libs.jopt.simple)
-
+    
     installer(libs.bootstrap)
     installer(libs.bootstrap.api) // Needed by securemodules
     installer(libs.accesstransformers)
     installer(libs.eventbus)
-    installer(libs.jspecify) // Dep of EventBus
+    installer(libs.typetools) // Dep of EventBus
     installer(libs.forgespi)
     installer(libs.coremods)
     installer(libs.nashorn) // Dep of Coremods
@@ -147,8 +146,6 @@ dependencies {
 
     runtimeOnly(libs.bootstrap)
     runtimeOnly(libs.bootstrap.dev)
-
-    annotationProcessor(libs.eventbus.validator)
 }
 
 tasks.named('extractRangeMap').configure {
@@ -168,7 +165,7 @@ patcher {
 
     runs {
         forge_client {
-            property 'eventbus.api.strictRuntimeChecks', 'true'
+            property 'eventbus.checkTypesOnDispatch', 'true'
             property 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
 
             args '--launchTarget', 'forge_dev_client',
@@ -211,6 +208,7 @@ patcher {
                  '--all',
                  '--validate',
                  '--output', rootProject.file('src/main/generated/'),
+                 '--validate',
                  '--existing', sourceSets.main.resources.srcDirs[0],
                  '--assetsDir', downloadAssets.output,
                  '--assetIndex', "{asset_index}"
@@ -228,30 +226,6 @@ patcher {
                  '--assetsDir', downloadAssets.output,
                  '--assetIndex', "{asset_index}"
         }
-
-        forge_client_data {
-            args '--launchTarget', 'forge_dev_client_data',
-                 '--mod', 'forge',
-                 '--all',
-                 '--output', rootProject.file('src/main/generated/'),
-                 '--existing', sourceSets.main.resources.srcDirs[0],
-                 '--assetsDir', downloadAssets.output,
-                 '--assetIndex', "{asset_index}"
-        }
-
-        forge_client_data_test {
-            source sourceSets.test
-            args '--launchTarget', 'forge_dev',
-                 '--launchEntry', 'minecraft/net.minecraft.client.data.Main',
-                 '--launchData',
-                 '--mod', '.+',
-                 '--all',
-                 '--output', rootProject.file('src/test/generated/'),
-                 '--existing', sourceSets.main.resources.srcDirs[0],
-                 '--existing', sourceSets.test.resources.srcDirs[0],
-                 '--assetsDir', downloadAssets.output,
-                 '--assetIndex', "{asset_index}"
-        }
     }
 }
 
@@ -293,11 +267,11 @@ tasks.register('downloadCrowdin', Download) {
 tasks.userdevConfig.configure {
     configurations.installer.allDependencies.forEach {
         def dep = it.toString()
-        if (it instanceof ProjectDependency)
+        if (it instanceof ProjectDependency) 
             dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version"
         libraries.add(dep)
     }
-
+    
     inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
     runs {
         client {
@@ -309,13 +283,6 @@ tasks.userdevConfig.configure {
             args '--assetsDir', '{assets_root}'
         }
 
-        clientData {
-            environment 'MCP_MAPPINGS', '{mcp_mappings}'
-            args '--launchTarget', "forge_userdev_client_data"
-            args '--assetIndex', '{asset_index}'
-            args '--assetsDir', '{assets_root}'
-        }
-
         server {
             environment 'MCP_MAPPINGS', '{mcp_mappings}'
             property 'forge.enableGameTest', 'true'
@@ -413,14 +380,14 @@ tasks.register('extractInheritance', ExtractInheritance) {
     }
 }
 tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
-    jar = createClientOfficial.output
+    jar = createJoinedSRG.output
     output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
     predicate = {
         parent, node, insn ->
             return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
             && insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
-            && insn.name == 'finalizeSpawn'
-            && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
+            && 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) {
@@ -525,7 +492,7 @@ tasks.register('serverShimJar', Jar) {
         from {
             zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
         }
-
+        
         attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
     }
     archiveClassifier = 'shim'
@@ -618,7 +585,7 @@ tasks.register('checkJarCompatibility', CheckJarCompatibility) {
     baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
 
     inputJar = project.tasks.named('reobfJar').flatMap { it.output }
-
+    
     commonLibraries.from(project.configurations.minecraftImplementation)
     commonLibraries.from(project.configurations.installer)
 }
@@ -639,11 +606,11 @@ tasks.register('launcherJson', LauncherJson).configure {
 
 tasks.register('installerJson', InstallerJson) {
     icon = rootProject.file('icon.ico')
-
+    
     // Json to install into the client's launcher
     dependsOn(launcherJson)
     input.from(launcherJson.output)
-
+    
     // Download Official Mappings
     dependsOn(downloadClientMappings, downloadServerMappings)
     input.from(downloadClientMappings.output, downloadServerMappings.output)
@@ -955,9 +922,6 @@ tasks.register('mdkZip', Zip) {
         rename 'gitignore\\.txt', '.gitignore'
         rename 'gitattributes\\.txt', '.gitattributes'
     }
-    from(rootProject.file('src/test/java/com/example/examplemod/')) {
-        into('src/main/java/com/example/examplemod/')
-    }
     from(rootProject.file('src/test/generated/mdk_datagen/')) {
         into('src/main/resources/')
         exclude '**/.cache/'
@@ -1091,7 +1055,7 @@ publishing {
             license gradleutils.pom.Licenses.LGPLv2_1
         }
     }
-
+    
     repositories {
         maven gradleutils.publishingForgeMaven
     }

build_shared.gradle

@@ -44,7 +44,7 @@ tasks.withType(JavaCompile).configureEach {
     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 += '-Xmx6G' // Needed to make compiling faster, and not run out of heap space in some cases.
+    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

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.21.8-&query=$.promos["1.21.8-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.21.8-&query=$.promos["1.21.8-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.21.1-&query=$.promos["1.21.1-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.21.1-&query=$.promos["1.21.1-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!
@@ -70,11 +70,6 @@ Please ensure you have a valid email address associated with your GitHub account
  to use and modify. However, it costs money to run such a large project as this, so please consider 
  [becoming a patron][Patreon].*
 
-### Thanks
-[![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)
-
-YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
-
 [Contributing]: ./CONTRIBUTING.md
 [CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
 
@@ -98,4 +93,3 @@ YourKit for providing us accesss to their [YourKit Java Profiler] which helps id
 [Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
 
 [Patreon]: https://www.patreon.com/LexManos
-[YourKit Java Profiler]: https://www.yourkit.com/java/profiler/

fmlcore/build.gradle

@@ -10,10 +10,9 @@ plugins {
 apply from: rootProject.file('build_shared.gradle')
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
+    compileOnly(libs.nulls)
 
     api(libs.eventbus)
-    annotationProcessor(libs.eventbus.validator)
 
     implementation(project(':fmlloader'))
     implementation(libs.commons.io)

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

@@ -5,7 +5,7 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
 
@@ -29,7 +29,7 @@ public class Bindings {
     /**
      * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
      */
-    public static Supplier<BusGroup> getForgeBus() {
+    public static Supplier<IEventBus> getForgeBus() {
         return PROVIDER.getForgeBusSupplier();
     }
 

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

@@ -25,18 +25,7 @@ import java.util.function.Supplier;
  * <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
  * <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
  * </ul>
- *
- * @deprecated Historically, this allowed for safe execution of code on the correct side by exploiting a low-level
- * detail in Java 8, but in newer versions a simple if check is enough.
- * <br>
- * For example:
- * <pre>{@code
- * if (FMLEnvironment.dist.isClient()) {
- *     // client code here
- * }
- * }</pre>
  */
-@Deprecated(since = "1.21.5", forRemoval = true)
 public final class DistExecutor
 {
     private static final Logger LOGGER = LogManager.getLogger();

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

@@ -5,13 +5,13 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 
 import java.util.function.Supplier;
 
 public interface IBindingsProvider {
-    Supplier<BusGroup> getForgeBusSupplier();
+    Supplier<IEventBus> getForgeBusSupplier();
     Supplier<I18NParser> getMessageParser();
     Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
 }

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

@@ -5,6 +5,8 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 import java.util.Optional;
@@ -59,27 +61,27 @@ public interface IModLoadingState {
     /**
      * Builds the transition task for this state with a blank pre-sync and post-sync task.
      *
+     * @param <T>              a type of event fired on the mod-specific event bus
      * @param syncExecutor     a synchronous executor
      * @param parallelExecutor a parallel executor
      * @param progressBar      a progress meter for tracking progress
      * @return a transition task for this state
      * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
      */
-    default Optional<CompletableFuture<Void>> buildTransition(
-        final Executor syncExecutor,
-        final Executor parallelExecutor,
-        final ProgressMeter progressBar
-    ) {
+    default <T extends Event & IModBusEvent>
+    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
+                                                      final Executor parallelExecutor,
+                                                      final ProgressMeter progressBar) {
         return buildTransition(syncExecutor, parallelExecutor, progressBar,
-            e -> CompletableFuture.completedFuture(null),
-            e -> CompletableFuture.completedFuture(null)
-        );
+                e -> CompletableFuture.runAsync(() -> {}, e),
+                e -> CompletableFuture.runAsync(() -> {}, e));
     }
 
     /**
      * Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
      * to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
      *
+     * @param <T>              a type of event fired on the mod-specific event bus
      * @param syncExecutor     a synchronous executor
      * @param parallelExecutor a parallel executor
      * @param progressBar      a progress meter for tracking progress
@@ -87,6 +89,7 @@ public interface IModLoadingState {
      * @param postSyncTask     a function which returns a task to run after event post-dispatch hook
      * @return a transition task for this state
      */
+    <T extends Event & IModBusEvent>
     Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
                                                       final Executor parallelExecutor,
                                                       final ProgressMeter progressBar,

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

@@ -5,9 +5,12 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
@@ -15,67 +18,103 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.jetbrains.annotations.Nullable;
-
+@SuppressWarnings("unchecked")
 public interface IModStateTransition {
-    /** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
-
     static IModStateTransition buildNoopTransition() {
-        return ModStateTransitionHelper.NOOP;
+        return new NoopTransition();
     }
 
-    default CompletableFuture<Void> build(
-        final String name,
-        final Executor syncExecutor,
-        final Executor parallelExecutor,
-        final ProgressMeter progressBar,
-        final Function<Executor, CompletableFuture<Void>> preSyncTask,
-        final Function<Executor, CompletableFuture<Void>> postSyncTask
-    ) {
-        return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
+    default <T extends Event & IModBusEvent>
+    CompletableFuture<Void> build(final String name,
+                                  final Executor syncExecutor,
+                                  final Executor parallelExecutor,
+                                  final ProgressMeter progressBar,
+                                  final Function<Executor, CompletableFuture<Void>> preSyncTask,
+                                  final Function<Executor, CompletableFuture<Void>> postSyncTask) {
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+
+        this.eventFunctionStream().get()
+                .map(f -> (EventGenerator<T>) f)
+                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
+                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
+
+        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
+        final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
+        final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
+                .thenApplyAsync(n -> {
+                    progressBar.label(progressBar.name() + ": dispatching "+name);
+                    return null;
+                }, parallelExecutor)
+                .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
+                .thenApply(r -> {
+                    postSyncTask.apply(syncExecutor);
+                    return null;
+                });
+        return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
     }
 
     default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
         return ModLoadingStage::nextState;
     }
 
-    /**
-     * This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
-     * ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
-     */
-    @Deprecated(since = "1.21.3", forRemoval = true)
-    default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
-        return () -> Stream.ofNullable(eventFunction());
-    }
-
-    @Nullable
-    default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
-        return null;
+    private <T extends Event & IModBusEvent>
+    EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
+                                                             final Executor parallelExecutor,
+                                                             final List<CompletableFuture<Void>> completableFutures,
+                                                             final ProgressMeter progressBar,
+                                                             final EventGenerator<T> eventGenerator,
+                                                             final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
+                                                             final EventGenerator<T> nextGenerator) {
+        final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
+
+        var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
+        completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
+
+        completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
+
+        var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
+        completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
+
+        return nextGenerator;
     }
 
+    Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
     ThreadSelector threadSelector();
     BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
+    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
+    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
 
-    /**
-     * I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
-     * However, the Future returned by this was never linked to the main transition future in any way.  Which means that it was run
-     * in parallel and couldn't guarantee the state of the ModContainer.
-     * <p>
-     * Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
-     * <p>
-     * If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
-     * <p>
-     * Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
-     */
-    @Deprecated(since = "1.21.3", forRemoval = true)
-    default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() { return NULL_HOOK; }
-    @Deprecated(since = "1.21.3", forRemoval = true)
-    default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
-
-    interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
-        static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
+    interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
+        static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
             return fn::apply;
         }
     }
+}
+
+record NoopTransition() implements IModStateTransition {
+
+    @Override
+    public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
+        return Stream::of;
+    }
+
+    @Override
+    public ThreadSelector threadSelector() {
+        return ThreadSelector.SYNC;
+    }
+
+    @Override
+    public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
+        return (e, t) -> t.thenApplyAsync(Function.identity(), e);
+    }
+
+    @Override
+    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
+        return (t, f)-> CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
+        return (t, f)-> CompletableFuture.completedFuture(null);
+    }
 }

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

@@ -5,18 +5,22 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModInfo;
 
 import java.util.EnumMap;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
+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;
@@ -29,8 +33,13 @@ import java.util.function.Supplier;
  * a mechanism by which we can wrap actual mod code so that the loader and other
  * facilities can treat mods at arms length.
  * </p>
+ *
+ * @author cpw
+ *
  */
-public abstract class ModContainer {
+
+public abstract class ModContainer
+{
     protected final String modId;
     protected final String namespace;
     protected final IModInfo modInfo;
@@ -39,14 +48,11 @@ public abstract class ModContainer {
     protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
     protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
     protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
-    final Set<ModContainer> dependencies = new HashSet<>();
-    /**
-     * If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
-     */
-    @Deprecated(since = "1.21.3", forRemoval = true)
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
 
-    public ModContainer(IModInfo info) {
+    public ModContainer(IModInfo info)
+    {
         this.modId = info.getModId();
         // TODO: Currently not reading namespace from configuration..
         this.namespace = this.modId;
@@ -76,35 +82,58 @@ public abstract class ModContainer {
     /**
      * Errored container state, used for filtering. Does nothing.
      */
-    ModContainer() {
+    ModContainer()
+    {
         this.modLoadingStage = ModLoadingStage.ERROR;
         modId = "BROKEN";
         namespace = "BROKEN";
         modInfo = null;
     }
-
     /**
      * @return the modid for this mod
      */
-    public final String getModId() {
+    public final String getModId()
+    {
         return modId;
     }
 
     /**
      * @return the resource prefix for the mod
      */
-    public final String getNamespace() {
+    public final String getNamespace()
+    {
         return namespace;
     }
 
     /**
      * @return The current loading stage for this mod
      */
-    public ModLoadingStage getCurrentState() {
+    public ModLoadingStage getCurrentState()
+    {
         return modLoadingStage;
     }
 
-    public IModInfo getModInfo() {
+    public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
+            final ModContainer target,
+            final IModStateTransition.EventGenerator<T> eventGenerator,
+            final ProgressMeter progressBar,
+            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
+            final Executor executor) {
+        return CompletableFuture
+                .runAsync(() -> {
+                    ModLoadingContext.get().setActiveContainer(target);
+                    target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
+                    target.acceptEvent(eventGenerator.apply(target));
+                }, executor)
+                .whenComplete((mc, exception) -> {
+                    target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
+                    progressBar.increment();
+                    ModLoadingContext.get().setActiveContainer(null);
+                });
+    }
+
+    public IModInfo getModInfo()
+    {
         return modInfo;
     }
 
@@ -113,7 +142,8 @@ public abstract class ModContainer {
         return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
     }
 
-    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
+    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
+    {
         extensionPoints.put(point, extension);
     }
 
@@ -161,5 +191,5 @@ public abstract class ModContainer {
      * Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
      * @param e Event to accept
      */
-    protected <T extends IModBusEvent> void acceptEvent(T e) {}
+    protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
 }

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

@@ -5,6 +5,9 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
@@ -12,15 +15,27 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
-import java.util.Collections;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -30,25 +45,27 @@ import java.util.stream.Stream;
  * Master list of all mods - game-side version. This is classloaded in the game scope and
  * can dispatch game level events as a result.
  */
-public class ModList {
+public class ModList
+{
+    //private static final Logger LOGGER = LogManager.getLogger();
     private static ModList INSTANCE;
     private final List<IModFileInfo> modFiles;
     private final List<IModInfo> sortedList;
-    private final Map<String, IModFileInfo> fileById;
+    private final Map<String, ModFileInfo> fileById;
     private List<ModContainer> mods;
     private Map<String, ModContainer> indexedMods;
     private List<ModFileScanData> modFileScanData;
     private List<ModContainer> sortedContainers;
 
-    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
-        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
-        this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
-        var byId = new HashMap<String, IModFileInfo>();
-        for (var file : this.modFiles) {
-            for (var mod : file.getMods())
-                byId.put(mod.getModId(), mod.getOwningFile());
-        }
-        this.fileById = Collections.unmodifiableMap(byId);
+    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
+    {
+        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
+        this.sortedList = sortedList.stream().
+                map(ModInfo.class::cast).
+                collect(Collectors.toList());
+        this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
+                map(ModInfo.class::cast).
+                collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
         CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
     }
 
@@ -65,12 +82,12 @@ public class ModList {
                 getModContainerState(mainMod.getModId()),
                 ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
     }
-
     private String crashReport() {
         return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
     }
 
-    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
+    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
+    {
         INSTANCE = new ModList(modFiles, sortedList);
         return INSTANCE;
     }
@@ -79,47 +96,103 @@ public class ModList {
         return INSTANCE;
     }
 
-    public List<IModFileInfo> getModFiles() {
+    public List<IModFileInfo> getModFiles()
+    {
         return modFiles;
     }
 
-    public IModFileInfo getModFileById(String modid) {
+    public IModFileInfo getModFileById(String modid)
+    {
         return this.fileById.get(modid);
     }
 
-    void setLoadedMods(final List<ModContainer> modContainers) {
+    <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
+            final IModStateTransition.EventGenerator<T> eventGenerator,
+            final ProgressMeter progressBar,
+            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
+        return executor -> gather(
+                this.mods.stream()
+                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, 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).toList();
+            CompletableFuture<Void> cf = new CompletableFuture<>();
+            final RuntimeException accumulator = new RuntimeException();
+            cf.completeExceptionally(accumulator);
+            for (Throwable exception : throwables) {
+                if (exception instanceof CompletionException) {
+                    exception = exception.getCause();
+                }
+                if (exception.getSuppressed().length != 0) {
+                    for (Throwable throwable : exception.getSuppressed()) {
+                        accumulator.addSuppressed(throwable);
+                    }
+                } else {
+                    accumulator.addSuppressed(exception);
+                }
+            }
+            return cf;
+        }
+    }
+
+    static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
+        List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
+        CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
+        for (var future : futures) {
+            int i = list.size();
+            list.add(null);
+            results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
+        }
+        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
+    }
+
+    void setLoadedMods(final List<ModContainer> modContainers)
+    {
         this.mods = modContainers;
-        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
+        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
         this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
     }
 
     @SuppressWarnings("unchecked")
-    public <T> Optional<T> getModObjectById(String modId) {
+    public <T> Optional<T> getModObjectById(String modId)
+    {
         return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
     }
 
-    public Optional<? extends ModContainer> getModContainerById(String modId) {
+    public Optional<? extends ModContainer> getModContainerById(String modId)
+    {
         return Optional.ofNullable(this.indexedMods.get(modId));
     }
 
-    public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
+    public Optional<? extends ModContainer> getModContainerByObject(Object obj)
+    {
         return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
     }
 
-    public List<IModInfo> getMods() {
+    public List<IModInfo> getMods()
+    {
         return this.sortedList;
     }
 
-    public boolean isLoaded(String modTarget) {
+    public boolean isLoaded(String modTarget)
+    {
         return this.indexedMods.containsKey(modTarget);
     }
 
-    public int size() {
+    public int size()
+    {
         return mods.size();
     }
 
-    public List<ModFileScanData> getAllScanData() {
-        if (modFileScanData == null) {
+    public List<ModFileScanData> getAllScanData()
+    {
+        if (modFileScanData == null)
+        {
             modFileScanData = this.sortedList.stream().
                     map(IModInfo::getOwningFile).
                     filter(Objects::nonNull).
@@ -132,7 +205,8 @@ public class ModList {
 
     }
 
-    public void forEachModFile(Consumer<IModFile> fileConsumer) {
+    public void forEachModFile(Consumer<IModFile> fileConsumer)
+    {
         modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
     }
 
@@ -148,11 +222,13 @@ public class ModList {
         this.sortedContainers.forEach(containerConsumer);
     }
 
-    public List<ModContainer> getLoadedMods() {
-        return this.sortedContainers;
-    }
-
     public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
         return indexedMods.values().stream().map(function);
     }
+
+    private static class UncaughtModLoadingException extends ModLoadingException {
+        public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
+            super(null, stage, "fml.modloading.uncaughterror", originalException);
+        }
+    }
 }

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

@@ -6,6 +6,8 @@
 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;
 import net.minecraftforge.fml.loading.FMLLoader;
@@ -31,6 +33,8 @@ 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;
 
@@ -70,7 +74,8 @@ import static net.minecraftforge.fml.Logging.LOADING;
  *     and completes the mod loading sequence.</dd>
  * </dl>
  */
-public class ModLoader {
+public class ModLoader
+{
     private static final Logger LOGGER = LogManager.getLogger();
     private final LoadingModList loadingModList;
 
@@ -79,11 +84,13 @@ public class ModLoader {
     private final List<ModLoadingWarning> loadingWarnings;
     private final ModStateManager stateManager;
     private static boolean loadingStateValid;
-    private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
     private final Set<IModLoadingState> completedStates = new HashSet<>();
     private ModList modList;
 
-    private ModLoader() {
+    private ModLoader()
+    {
         this.loadingModList = FMLLoader.getLoadingModList();
         this.loadingExceptions = this.loadingModList.getErrors().stream()
                 .flatMap(ModLoadingException::fromEarlyException)
@@ -149,22 +156,20 @@ public class ModLoader {
                 loadingModList.getMods());
         if (!this.loadingExceptions.isEmpty()) {
             LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
-            statusConsumer.accept("ERROR DURING MOD LOADING");
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(loadingExceptions);
         }
-        var failedBounds = new ArrayList<ForgeFeature.Bound>();
-        for (var mod : loadingModList.getMods()) {
-            for (var feature : mod.getForgeFeatures()) {
-                if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
-                    failedBounds.add(feature);
-            }
-        }
+        List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
+                .map(ModInfo::getForgeFeatures)
+                .flatMap(List::stream)
+                .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
+                .toList();
 
         if (!failedBounds.isEmpty()) {
             LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
-            statusConsumer.accept("ERROR DURING MOD LOADING");
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(failedBounds.stream()
@@ -172,42 +177,19 @@ public class ModLoader {
                     .toList());
         }
 
-        final var modContainers = new HashMap<String, ModContainer>();
-        for (var file : loadingModList.getModFiles()) {
-            var containers = this.buildMods(file.getFile());
-            for (var container : containers)
-                modContainers.put(container.getModId(), container);
-        }
-
+        final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
+                .map(ModFileInfo::getFile)
+                .map(this::buildMods)
+                .flatMap(List::stream)
+                .toList();
         if (!loadingExceptions.isEmpty()) {
             LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
-            statusConsumer.accept("ERROR DURING MOD LOADING");
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(loadingExceptions);
         }
-
-        // Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
-        for (var mod : modContainers.values()) {
-            for (var dep : mod.getModInfo().getDependencies()) {
-                var target = modContainers.get(dep.getModId());
-                if (target == null)
-                    continue;
-
-                switch (dep.getOrdering()) {
-                    case AFTER:
-                        mod.dependencies.add(target);
-                        break;
-                    case BEFORE:
-                        target.dependencies.add(mod);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        modList.setLoadedMods(modContainers.values().stream().toList());
+        modList.setLoadedMods(modContainers);
         this.modList = modList;
         var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
         var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
@@ -232,7 +214,7 @@ public class ModLoader {
         for (IModLoadingState mls : stateList) {
             dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
         }
-        statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
+        statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
         progress.complete();
     }
 
@@ -261,12 +243,10 @@ public class ModLoader {
         pb.complete();
         syncExecutor.drive(ticker);
     }
-
     private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
         while (!transition.isDone()) {
             syncExecutor.drive(ticker);
         }
-
         try {
             transition.join();
         } catch (CompletionException e) {
@@ -276,38 +256,36 @@ public class ModLoader {
                     .anyMatch(obj -> !(obj instanceof ModLoadingException));
             if (hasNotModLoadingEx) {
                 LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                statusConsumer.accept("ERROR DURING MOD LOADING");
+                statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
                 throw e;
             }
 
             final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
                     .filter(ModLoadingException.class::isInstance)
                     .map(ModLoadingException.class::cast)
-                    .toList();
+                    .collect(Collectors.toList());
             LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            statusConsumer.accept("ERROR DURING MOD LOADING");
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             throw new LoadingFailedException(modLoadingExceptions);
         }
     }
 
-    private List<ModContainer> buildMods(final IModFile modFile) {
-        final Map<String, IModInfo> modInfoMap = new HashMap<>();
-        for (var mod : modFile.getModFileInfo().getMods())
-            modInfoMap.put(mod.getModId(), mod);
+    private List<ModContainer> buildMods(final IModFile modFile)
+    {
+        final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
 
         LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
-        final List<ModContainer> containers = new ArrayList<>();
-        for (var entry : modFile.getScanResult().getTargets().entrySet()) {
-            var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
-            if (container != null)
-                containers.add(container);
-        }
-
+        final List<ModContainer> containers = modFile.getScanResult().getTargets()
+                .entrySet()
+                .stream()
+                .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
+                .filter(Objects::nonNull)
+                .toList();
         if (containers.size() != modInfoMap.size()) {
             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: {}",
+            LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                     modFile.getFilePath(),
                     containers.size(), containerIds,
                     modInfoMap.size(), modIds);
@@ -322,15 +300,15 @@ 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).toList();
     }
 
-    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
-        final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
-    ) {
+    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
         try {
+            final String modId = idToProviderEntry.getKey();
+            final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
+
             IModInfo info = modInfoMap.get(modId);
             // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
             if (info == null)
@@ -358,60 +336,51 @@ public class ModLoader {
         return completedStates.contains(state);
     }
 
-    public <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
+    public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
             return;
         }
-        for (var mod : ModList.get().getLoadedMods())
-            mod.acceptEvent(generator.apply(mod));
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
     }
 
-    public <T extends IModBusEvent> void postEvent(T e) {
-        var cls = e.getClass();
+    public <T extends Event & IModBusEvent> void postEvent(T e) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;
         }
-        for (var mod : ModList.get().getLoadedMods())
-            mod.acceptEvent(e);
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
     }
-
-    public <T extends IModBusEvent> T postEventWithReturn(T e) {
+    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return e;
         }
-        for (var mod : ModList.get().getLoadedMods())
-            mod.acceptEvent(e);
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
         return e;
     }
-
-    @SuppressWarnings("removal")
-    public <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
-        postEventWithWrapInModOrder(event,
-            (mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
-            (mc, e) -> ModLoadingContext.get().setActiveContainer(null)
-        );
+    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
+        postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
     }
-
-    public <T extends IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
+    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;
         }
-        for (var mod : ModList.get().getLoadedMods()) {
-            pre.accept(mod, e);
-            mod.acceptEvent(e);
-            post.accept(mod, e);
-        }
+        ModList.get().forEachModInOrder(mc -> {
+            pre.accept(mc, e);
+            mc.acceptEvent(e);
+            post.accept(mc, e);
+        });
     }
 
-    public List<ModLoadingWarning> getWarnings() {
+    public List<ModLoadingWarning> getWarnings()
+    {
         return ImmutableList.copyOf(this.loadingWarnings);
     }
 
-    public void addWarning(ModLoadingWarning warning) {
+    public void addWarning(ModLoadingWarning warning)
+    {
         this.loadingWarnings.add(warning);
     }
 
@@ -421,7 +390,7 @@ public class ModLoader {
         return runningDataGen;
     }
 
-    private static final class ErroredModContainer extends ModContainer {
+    private static class ErroredModContainer extends ModContainer {
         public ErroredModContainer() {
             super();
         }

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

@@ -8,15 +8,20 @@ package net.minecraftforge.fml;
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.config.IConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.loading.FMLLoader;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
-public class ModLoadingContext {
+public class ModLoadingContext
+{
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
     private ModContainer activeContainer;
     private Object languageExtension;
+    private ModLoadingStage stage;
 
     /**
      * @deprecated Use the context provided by your language loader in your mod's constructor

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

@@ -5,6 +5,8 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 import java.util.Optional;
@@ -24,23 +26,19 @@ import java.util.function.ToIntFunction;
  * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
  * @param transition     optional state transition information
  */
-public record ModLoadingState(
-    String name,
-    String previous,
-    Function<ModList, String> message,
-    ToIntFunction<ModList> size,
-    ModLoadingPhase phase,
-    Optional<Consumer<ModList>> inlineRunnable,
-    Optional<IModStateTransition> transition
-) implements IModLoadingState {
+public record ModLoadingState(String name, String previous,
+                              Function<ModList, String> message,
+                              ToIntFunction<ModList> size,
+                              ModLoadingPhase phase,
+                              Optional<Consumer<ModList>> inlineRunnable,
+                              Optional<IModStateTransition> transition) implements IModLoadingState {
     @Override
-    public Optional<CompletableFuture<Void>> buildTransition(
-        final Executor syncExecutor,
-        final Executor parallelExecutor,
-        final ProgressMeter progressBar,
-        final Function<Executor, CompletableFuture<Void>> preSyncTask,
-        final Function<Executor, CompletableFuture<Void>> postSyncTask
-    ) {
+    public <T extends Event & IModBusEvent>
+    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
+                                                      final Executor parallelExecutor,
+                                                      final ProgressMeter progressBar,
+                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
+                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask) {
         var transition = this.transition.orElse(null);
         return transition == null
                 ? Optional.empty()
@@ -54,12 +52,9 @@ public record ModLoadingState(
      * @param name     the name of the state
      * @param previous the name of the immediately previous state to this state
      * @param phase    the mod loading phase the state belongs to
-     *
-     * @deprecated Use the builder
      */
-    @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return of(name, phase).after(previous).empty();
+        return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
     }
 
     /**
@@ -70,13 +65,11 @@ public record ModLoadingState(
      * @param previous   the name of the immediately previous state to this state
      * @param phase      the mod loading phase the state belongs to
      * @param transition the state transition information
-     *
-     * @deprecated Use the builder
+     * @return a mod loading state with state transition information and a default message
      */
-    @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
                                                  final IModStateTransition transition) {
-        return of(name, phase).after(previous).withTransition(transition);
+        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
     }
 
     /**
@@ -88,14 +81,11 @@ public record ModLoadingState(
      * @param phase      the mod loading phase the state belongs to
      * @param transition the state transition information
      * @return a mod loading state with state transition information and a custom message
-     *
-     * @deprecated Use the builder
      */
-    @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withTransition(final String name, final String previous,
                                                  final Function<ModList, String> message, final ModLoadingPhase phase,
                                                  final IModStateTransition transition) {
-        return of(name, phase).after(previous).message(message).withTransition(transition);
+        return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
     }
 
     /**
@@ -107,59 +97,9 @@ public record ModLoadingState(
      * @param phase    the mod loading phase the state belongs to
      * @param inline   an optional runnable, which runs before starting the transition from this state to the next
      * @return a mod loading state with an inline runnable and default message
-     *
-     * @deprecated Use the builder
      */
-    @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
                                              final Consumer<ModList> inline) {
-        return of(name, phase).after(previous).withInline(inline);
-    }
-
-    public static Builder of(final String name, final ModLoadingPhase phase) {
-        return new Builder(name, phase);
-    }
-
-    public static class Builder {
-        private final String name;
-        private final ModLoadingPhase phase;
-        private String after;
-        private Function<ModList, String> message = null;
-        private ToIntFunction<ModList> size = null;
-
-        private Builder(final String name, final ModLoadingPhase phase) {
-            this.name = name;
-            this.phase = phase;
-        }
-
-        public Builder after(final ModLoadingState value) { return after(value.name()); }
-        public Builder after(final String value) {
-            this.after = value;
-            return this;
-        }
-
-        public Builder message(final String value) { return message(ml -> value); }
-        public Builder message(final Function<ModList, String> value) {
-            this.message = value;
-            return this;
-        }
-
-        public Builder size(final int value) { return size(ml -> value); }
-        public Builder size(final ToIntFunction<ModList> value) {
-            this.size = value;
-            return this;
-        }
-
-        public ModLoadingState empty() {
-            return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty());
-        }
-
-        public ModLoadingState withTransition(final IModStateTransition transition) {
-            return new ModLoadingState(name, after, message != null ? message : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
-        }
-
-        public ModLoadingState withInline(final Consumer<ModList> inline) {
-            return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty());
-        }
+        return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
     }
 }

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

@@ -1,184 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import org.jetbrains.annotations.ApiStatus;
-
-import net.minecraftforge.fml.IModStateTransition.EventGenerator;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
-
-@ApiStatus.Internal
-class ModStateTransitionHelper {
-    static final IModStateTransition NOOP = new NoopTransition();
-    record NoopTransition() implements IModStateTransition {
-        @Override
-        public ThreadSelector threadSelector() {
-            return ThreadSelector.SYNC;
-        }
-
-        @Override
-        public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
-            return (e, t) -> t.thenApplyAsync(Function.identity(), e);
-        }
-    }
-
-    static <V> CompletionStage<Void> completableFutureFromExceptionList(List<FutureResult<V>> t) {
-        if (t.stream().noneMatch(e -> e.exception() != null)) {
-            return CompletableFuture.completedFuture(null);
-        } else {
-            final var throwables = t.stream().map(FutureResult::exception).filter(Objects::nonNull).toList();
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            final RuntimeException accumulator = new RuntimeException();
-            cf.completeExceptionally(accumulator);
-            for (Throwable exception : throwables) {
-                if (exception instanceof CompletionException) {
-                    exception = exception.getCause();
-                }
-                if (exception.getSuppressed().length != 0) {
-                    for (Throwable throwable : exception.getSuppressed()) {
-                        accumulator.addSuppressed(throwable);
-                    }
-                } else {
-                    accumulator.addSuppressed(exception);
-                }
-            }
-            return cf;
-        }
-    }
-
-    record FutureResult<V>(V value, Throwable exception){}
-
-    static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
-        var list = new ArrayList<FutureResult<V>>(futures.size());
-        var results = new CompletableFuture[futures.size()];
-
-        for (var future : futures) {
-            int i = list.size();
-            list.add(null);
-            @SuppressWarnings("unchecked") // Bypass a weird javac error with generic by forcing it to be the exact type we want.
-            var raw = ((CompletableFuture<V>)future);
-            results[i] = raw.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
-        }
-
-        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
-    }
-
-    private static <T extends IModBusEvent> void addCompletableFutureTaskForModDispatch(
-        final IModStateTransition transition,
-        final Executor executor,
-        final List<CompletableFuture<Void>> completableFutures,
-        final ProgressMeter progressBar,
-        final EventGenerator<T> eventGenerator,
-        final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
-     ) {
-
-        @SuppressWarnings("removal")
-        var preDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
-        if (preDispatchHook != null)
-            completableFutures.add(preDispatchHook);
-
-        var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
-        for (var mod : ModList.get().getLoadedMods()) {
-
-            CompletableFuture<Void> parent = null;
-            if (mod.dependencies.isEmpty()) {
-                parent = CompletableFuture.allOf();
-            } else {
-                var deps = new CompletableFuture[mod.dependencies.size()];
-                int idx = 0;
-                for (var depContainer : mod.dependencies) {
-                    var future = modFutures.get(depContainer.getModId());
-                    if (future == null)
-                        throw new IllegalStateException("Could not find dependency future " + depContainer.getModId() + " for " + mod.getModId());
-                    deps[idx++] = future;
-                }
-                parent = CompletableFuture.allOf(deps);
-            }
-
-            @SuppressWarnings("removal")
-            var dispatch = parent
-                .thenRunAsync(() -> {
-                    ModLoadingContext.get().setActiveContainer(mod);
-                    var handler = mod.activityMap.get(mod.modLoadingStage);
-                    if (handler != null)
-                        handler.run();
-                    mod.acceptEvent(eventGenerator.apply(mod));
-                }, executor)
-                .whenComplete((mc, exception) -> {
-                    mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
-                    progressBar.increment();
-                    ModLoadingContext.get().setActiveContainer(null);
-                });
-
-            modFutures.put(mod.getModId(), dispatch);
-        }
-
-        var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
-        completableFutures.add(dispatch);
-
-        @SuppressWarnings("removal")
-        var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
-        if (postDispatchHook != null)
-            completableFutures.add(postDispatchHook);
-    }
-
-    private static <T extends IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
-        if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
-        @SuppressWarnings("unchecked")
-        var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
-        return hookTyped.apply(executor, eventGenerator);
-    }
-
-    static <T extends IModBusEvent> CompletableFuture<Void> build(
-        final IModStateTransition transition,
-        final String name,
-        final Executor syncExecutor,
-        final Executor parallelExecutor,
-        final ProgressMeter progressBar,
-        final Function<Executor, CompletableFuture<Void>> preSyncTask,
-        final Function<Executor, CompletableFuture<Void>> postSyncTask
-    ) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-        final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
-
-        @SuppressWarnings({ "removal", "unchecked" })
-        var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList();
-        for (int x = 0; x < events.size(); x++) {
-            var gen = events.get(x);
-            BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1
-                ? transition.nextModLoadingStage()
-                : ModLoadingStage::currentState;
-            addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state);
-        }
-
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        final CompletableFuture<Void> eventDispatchCF = gather(futures).thenCompose(ModStateTransitionHelper::completableFutureFromExceptionList);
-        final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
-            .thenApplyAsync(n -> {
-                progressBar.label(progressBar.name() + ": dispatching " + name);
-                return null;
-            }, parallelExecutor)
-            .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
-            .thenApply(r -> {
-                postSyncTask.apply(syncExecutor);
-                return null;
-            });
-        return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
-    }
-}

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

@@ -5,7 +5,7 @@
 
 package net.minecraftforge.fml.config;
 
-import net.minecraftforge.eventbus.api.event.InheritableEvent;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.Bindings;
 
 import java.util.function.Function;
@@ -29,7 +29,7 @@ public interface IConfigEvent {
     ModConfig getConfig();
 
     @SuppressWarnings("unchecked")
-    default <T extends InheritableEvent & IConfigEvent> T self() {
+    default <T extends Event & IConfigEvent> T self() {
         return (T) this;
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/event/IModBusEvent.java

@@ -5,27 +5,8 @@
 
 package net.minecraftforge.fml.event;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
-import net.minecraftforge.eventbus.api.bus.EventBus;
-import net.minecraftforge.eventbus.api.event.InheritableEvent;
-
 /**
  * Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
  */
-public interface IModBusEvent extends InheritableEvent {
-    /**
-     * @param modEventBusGroup Obtained from {@link net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup()} or your language provider's equivalent.
-     * @param eventClass The event type you want to get the associated bus for.
-     */
-    static <T extends IModBusEvent> EventBus<T> getBus(BusGroup modEventBusGroup, Class<T> eventClass) {
-        // Do not copy! Temporary solution until the FML rewrite is complete. May throw in future
-        // without prior notice.
-        //
-        // Mods creating their own events should directly assign the result of the create method to a
-        // static final field in their event class, without wrapping or calling multiple times.
-        //
-        // Mods using existing events should instead use the existing static final BUS field in the
-        // event class (for most events) or getBus(BusGroup) method (for mod bus events).
-        return EventBus.create(modEventBusGroup, eventClass);
-    }
+public interface IModBusEvent {
 }

fmlearlydisplay/build.gradle

@@ -28,7 +28,7 @@ java {
 }
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
+    compileOnly(libs.nulls)
     implementation(project(':fmlloader'))
     implementation(project(':fmlcore'))
     implementation(libs.bundles.lwjgl)

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

@@ -85,17 +85,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
     private ScheduledFuture<?> initializationFuture;
 
     private PerformanceInfo performanceInfo;
-    @SuppressWarnings("unused")
     private ScheduledFuture<?> performanceTick;
     // The GL ID of the window. Used for all operations
     private long window;
     // The thread that contains and ticks the window while Forge is loading mods
-    private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
-        final var thread = Executors.defaultThreadFactory().newThread(r);
-        thread.setName("EarlyDisplay");
-        thread.setDaemon(true);
-        return thread;
-    });
+    private ScheduledExecutorService renderScheduler;
     private int fbWidth;
     private int fbHeight;
     private int fbScale;
@@ -154,7 +148,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         }
         this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
 
-        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion()));
+        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion));
         performanceInfo = new PerformanceInfo();
         return start(mcVersion, forgeVersion);
     }
@@ -243,7 +237,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
 
         var date = Calendar.getInstance();
         if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
-            this.elements.addFirst(RenderElement.squir());
+            this.elements.add(0, RenderElement.squir());
 
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -263,11 +257,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-        for (var itr = this.elements.iterator(); itr.hasNext(); ) {
-            var element = itr.next();
-            if (!element.render(context, framecount))
-                itr.remove();
-        }
+        this.elements.removeIf(element -> !element.render(context, framecount));
         if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
             framecount++;
     }
@@ -292,6 +282,12 @@ public class DisplayWindow implements ImmediateWindowProvider {
      * Start the window and Render Thread; we're ready to go.
      */
     public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
+        renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+            final var thread = Executors.defaultThreadFactory().newThread(r);
+            thread.setName("EarlyDisplay");
+            thread.setDaemon(true);
+            return thread;
+        });
         initWindow(mcVersion);
         this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
         return this::periodicTick;
@@ -303,7 +299,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         return this.glVersion;
     }
 
-    private static void crashElegantly(String errorDetails) {
+    private void crashElegantly(String errorDetails) {
         StringBuilder msgBuilder = new StringBuilder(2000);
         msgBuilder.append("Failed to initialize graphics window with current settings.\n");
         msgBuilder.append("\n\n");
@@ -492,6 +488,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
         glfwPollEvents();
     }
 
+    private void badWindowHandler(final int code, final long desc) {
+        LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
+    }
+
     private void winResize(long window, int width, int height) {
         if (window == this.window && width != 0 && height != 0) {
             this.winWidth = width;
@@ -511,7 +511,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
             this.winY = y;
         }
     }
-    private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
+    private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
         try (MemoryStack memorystack = MemoryStack.stackPush()) {
             PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
             int error = glfwGetError(pointerbuffer);
@@ -639,7 +639,8 @@ public class DisplayWindow implements ImmediateWindowProvider {
     }
 
     public void addMojangTexture(final int textureId) {
-        this.elements.addFirst(RenderElement.mojang(textureId, framecount));
+        this.elements.add(0, RenderElement.mojang(textureId, framecount));
+//        this.elements.get(0).retire(framecount + 1);
     }
 
     public void close() {

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

@@ -22,8 +22,8 @@ public class RenderElement {
     static int globalAlpha = 255;
     private int retireCount;
 
-    @FunctionalInterface
     interface Renderer {
+
         void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
 
         default Renderer then(Renderer r) {
@@ -38,9 +38,6 @@ public class RenderElement {
     interface TextureRenderer {
         void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
     }
-
-    /** @deprecated Use {@link Renderer} directly. This was always eagerly resolved, making it an unnecessary wrapper. */
-    @Deprecated(since = "1.21.5", forRemoval = true)
     @FunctionalInterface
     interface Initializer extends Supplier<Renderer> {}
 
@@ -59,18 +56,11 @@ public class RenderElement {
         }
     }
 
-    /** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */
-    @Deprecated(since = "1.21.5", forRemoval = true)
     public RenderElement(final Initializer rendererInitializer) {
         this.bb = new SimpleBufferBuilder(1);
         this.renderer = rendererInitializer.get();
     }
 
-    public RenderElement(Renderer renderer) {
-        this.bb = new SimpleBufferBuilder(1);
-        this.renderer = renderer;
-    }
-
     public boolean render(DisplayContext ctx, int count) {
         this.renderer.accept(bb, ctx, count);
         return this.retireCount == 0 || this.retireCount < count;
@@ -85,7 +75,7 @@ public class RenderElement {
         List<SimpleFont.DisplayText> texts = new ArrayList<>();
         for (int i = messages.size() - 1; i >= 0; i--) {
             final StartupNotificationManager.AgeMessage pair = messages.get(i);
-            final float fade = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
+            final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
             if (fade <0.01f) continue;
             Message msg = pair.message();
             int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
@@ -94,9 +84,19 @@ public class RenderElement {
 
         font.generateVerticesForTexts(10, context.scaledHeight() -  texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
     }
+    public static RenderElement monag() {
+        return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
+            var size = 256;
+            var x0 = (ctx.width() - 2 * size) / 2;
+            var y0 = 64;
+            QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
+            QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
+        }));
+
+    }
 
     public static RenderElement mojang(final int textureId, final int frameStart) {
-        return new RenderElement((bb, ctx, frame) -> {
+        return new RenderElement(()->(bb, ctx, frame) -> {
             var size = 256 * ctx.scale();
             var x0 = (ctx.scaledWidth() - 2 * size) / 2;
             var y0 = 64 * ctx.scale() + 32;
@@ -148,11 +148,11 @@ public class RenderElement {
         }));
     }
     public static RenderElement progressBars(SimpleFont font) {
-        return new RenderElement((bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
+        return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
     }
 
     public static RenderElement performanceBar(SimpleFont font) {
-        return new RenderElement((bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
+        return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
     }
 
     public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
@@ -187,10 +187,10 @@ public class RenderElement {
     }
     private static float[] indeterminateBar(int frame, boolean isActive) {
         if (RenderElement.globalAlpha != 0xFF || !isActive) {
-            return new float[] { 0f, 1f };
+            return new float[] {0f,1f};
         } else {
-            int progress = frame % 100;
-            return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
+            var progress = frame % 100;
+            return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
         }
     }
 
@@ -249,8 +249,8 @@ public class RenderElement {
         };
     }
 
-    private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) {
-        return (bb, context, frame) -> renderText(font, textGenerator, bb, context);
+    private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
+        return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
     }
 
     private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
@@ -264,13 +264,14 @@ public class RenderElement {
     private static TextGenerator text(int x, int y, String text, int colour) {
         return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
     }
-
-    private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
-        int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
-        return (bb, ctx, frame) -> {
-            ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
-            ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
-            renderTexture(bb, ctx, frame, imgSize, positionAndColour);
+    private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
+        return ()->{
+            int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
+            return (bb, ctx, frame) -> {
+                ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
+                ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
+                renderTexture(bb, ctx, frame, imgSize, positionAndColour);
+            };
         };
     }
 
@@ -280,13 +281,21 @@ public class RenderElement {
         bb.draw();
     }
 
-    @Deprecated(since = "1.21.5", forRemoval = true)
+
     public static float clamp(float num, float min, float max) {
-        return Math.clamp(num, min, max);
+        if (num < min) {
+            return min;
+        } else {
+            return Math.min(num, max);
+        }
     }
 
     public static int clamp(int num, int min, int max) {
-        return Math.min(max, Math.max(num, min));
+        if (num < min) {
+            return min;
+        } else {
+            return Math.min(num, max);
+        }
     }
 
     public static int hsvToRGB(float hue, float saturation, float value) {

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

@@ -11,6 +11,8 @@ import org.lwjgl.stb.STBTTFontinfo;
 import org.lwjgl.stb.STBTTPackContext;
 import org.lwjgl.stb.STBTTPackRange;
 import org.lwjgl.stb.STBTTPackedchar;
+import org.lwjgl.system.MemoryStack;
+
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
@@ -22,7 +24,7 @@ public class SimpleFont {
     private final int textureNumber;
     private final int lineSpacing;
     private final int descent;
-    private static final int GLYPH_COUNT = 127 - 32;
+    private final int GLYPH_COUNT = 127-32;
     private final Glyph[] glyphs;
 
     private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
@@ -120,7 +122,7 @@ public class SimpleFont {
                 case '\n', '\t' -> 0;
                 case ' ' -> glyphs[0].charwidth();
                 default -> {
-                    if (c - 32 < GLYPH_COUNT && c > 32) {
+                    if (c - 32 < this.GLYPH_COUNT && c > 32) {
                         yield this.glyphs[c - 32].charwidth();
                     } else {
                         yield 0;
@@ -151,7 +153,7 @@ public class SimpleFont {
                     case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
                     case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
                     default -> {
-                        if (c-32 < GLYPH_COUNT && c > 32) {
+                        if (c-32 < font.GLYPH_COUNT && c > 32) {
                             pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
                         }
                         yield pos;

fmlloader/build.gradle

@@ -5,7 +5,6 @@ plugins {
     id 'maven-publish'
     id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
-    alias(libs.plugins.apt)
 }
 
 apply from: rootProject.file('build_shared.gradle')
@@ -13,7 +12,7 @@ apply from: rootProject.file('build_shared.gradle')
 configurations.forEach{ it.transitive = false }
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
+    compileOnly(libs.nulls)
 
     api(libs.bundles.asm) // Needed by all the black magic
     api(libs.forgespi)
@@ -37,11 +36,10 @@ dependencies {
     implementation(libs.terminalconsoleappender)
     implementation(libs.jimfs)
 
-    // Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
     implementation(libs.log4j.core)
     annotationProcessor(libs.bundles.log4j)
 
-    testCompileOnly(libs.jetbrains.annotations)
+    testCompileOnly(libs.nulls)
     testRuntimeOnly(libs.bootstrap)
 }
 
@@ -87,7 +85,7 @@ publishing {
             license PomUtils.Licenses.LGPLv2_1
         }
     }
-
+    
     repositories {
         maven gradleutils.publishingForgeMaven
     }
@@ -104,23 +102,5 @@ tasks.register('writeForgeVersionJson') {
 }
 
 tasks.named('generateResources').configure {
-    dependsOn('eclipseJdt')
-    dependsOn('eclipseJdtApt')
-    dependsOn('eclipseFactorypath')
     dependsOn('writeForgeVersionJson')
 }
-
-eclipse {
-    classpath {
-       // We need to set the default output directory for the log4j annotation processor
-       // Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
-       // So we have to do a hacky whenMerged
-       //defaultOutputDir = file('bin/main')
-       file.whenMerged {
-           entries.each { entry ->
-               if (entry.kind == 'output' && entry.hasProperty('path'))
-                   entry.path = 'bin/main'
-           }
-       }
-    }
-}

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

@@ -6,13 +6,14 @@
 package net.minecraftforge.fml.loading;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 public class BackgroundWaiter {
+    private static final ExecutorService runner = Executors.newSingleThreadExecutor();
 
     public static void runAndTick(Runnable r, Runnable tick) {
-        var runner = Executors.newSingleThreadExecutor();
         ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
         final Future<?> work = runner.submit(r);
         do {

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

@@ -54,8 +54,12 @@ public class FMLLoader {
         LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
         LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());
 
+        // Allows us to communicate properties with other services through ModLauncher
+        setupBlackboardKeys();
+
         checkPackage(ITransformationService.class, "4.0", "ModLauncher");
         accessTransformer  = getPlugin(env, "accesstransformer",  "1.0", "AccessTransformer");
+        /*eventBus       =*/ getPlugin(env, "eventbus",           "1.0", "EventBus");
         runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
         coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
         LOGGER.debug(CORE, "FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
@@ -117,6 +121,12 @@ public class FMLLoader {
           return providers.get(0);
     }
 
+    private static void setupBlackboardKeys() {
+        LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
+        var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
+        Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
+    }
+
     static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments) {
         final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
         arguments.put("launchTarget", launchTarget);

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

@@ -7,6 +7,7 @@ package net.minecraftforge.fml.loading;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.*;
+import joptsimple.OptionSpecBuilder;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.Environment;
 import org.jetbrains.annotations.NotNull;
@@ -18,6 +19,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BiFunction;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 public class FMLServiceProvider implements ITransformationService {

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

@@ -5,25 +5,31 @@
 
 package net.minecraftforge.fml.loading;
 
+import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
 /**
  * Master list of all mods <em>in the loading context. This class cannot refer outside the
  * loading package</em>
  */
-public class LoadingModList {
+public class LoadingModList
+{
     private static LoadingModList INSTANCE;
     private final List<ModFileInfo> modFiles;
     private final List<ModInfo> sortedList;
@@ -31,14 +37,15 @@ public class LoadingModList {
     private final List<EarlyLoadingException> preLoadErrors;
     private List<IModFile> brokenFiles;
 
-    private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
+    private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
+    {
         this.modFiles = modFiles.stream()
                 .map(ModFile::getModFileInfo)
                 .map(ModFileInfo.class::cast)
-                .toList();
+                .collect(Collectors.toList());
         this.sortedList = sortedList.stream()
                 .map(ModInfo.class::cast)
-                .toList();
+                .collect(Collectors.toList());
         this.fileById = this.modFiles.stream()
                 .map(ModFileInfo::getMods)
                 .flatMap(Collection::stream)
@@ -47,18 +54,21 @@ public class LoadingModList {
         this.preLoadErrors = new ArrayList<>();
     }
 
-    public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) {
+    public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException)
+    {
         INSTANCE = new LoadingModList(modFiles, sortedList);
         if (earlyLoadingException != null)
+        {
             INSTANCE.preLoadErrors.add(earlyLoadingException);
+        }
         return INSTANCE;
     }
 
     public static LoadingModList get() {
         return INSTANCE;
     }
-
-    public void addCoreMods() {
+    public void addCoreMods()
+    {
         modFiles.stream()
                 .map(ModFileInfo::getFile)
                 .map(ModFile::getCoreMods)
@@ -66,7 +76,8 @@ public class LoadingModList {
                 .forEach(FMLLoader.getCoreModProvider()::addCoreMod);
     }
 
-    public void addAccessTransformers() {
+    public void addAccessTransformers()
+    {
         for (ModFileInfo modFile : modFiles) {
             ModFile mod = modFile.getFile();
             var at = mod.getAccessTransformer().orElse(null);
@@ -76,18 +87,21 @@ public class LoadingModList {
         }
     }
 
-    public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
+    public void addForScanning(BackgroundScanHandler backgroundScanHandler)
+    {
         backgroundScanHandler.setLoadingModList(this);
         modFiles.stream()
                 .map(ModFileInfo::getFile)
                 .forEach(backgroundScanHandler::submitForScanning);
     }
 
-    public List<ModFileInfo> getModFiles() {
+    public List<ModFileInfo> getModFiles()
+    {
         return modFiles;
     }
 
-    public Path findResource(final String className) {
+    public Path findResource(final String className)
+    {
         for (ModFileInfo mf : modFiles) {
             final Path resource = mf.getFile().findResource(className);
             if (Files.exists(resource)) return resource;
@@ -95,11 +109,55 @@ public class LoadingModList {
         return null;
     }
 
-    public ModFileInfo getModFileById(String modid) {
+    public Enumeration<URL> findAllURLsForResource(final String resName) {
+        final String resourceName;
+        // strip a leading slash
+        if (resName.startsWith("/")) {
+            resourceName = resName.substring(1);
+        } else {
+            resourceName = resName;
+        }
+        return new Enumeration<URL>() {
+            private final Iterator<ModFileInfo> modFileIterator = modFiles.iterator();
+            private URL next;
+            @Override
+            public boolean hasMoreElements() {
+                if (next!=null) return true;
+                next = findNextURL();
+                return next != null;
+            }
+
+            @Override
+            public URL nextElement() {
+                if (next == null) {
+                    next = findNextURL();
+                    if (next == null) throw new NoSuchElementException();
+                }
+                URL result = next;
+                next = null;
+                return result;
+            }
+
+            private URL findNextURL() {
+                while (modFileIterator.hasNext()) {
+                    final ModFileInfo next = modFileIterator.next();
+                    final Path resource = next.getFile().findResource(resourceName);
+                    if (Files.exists(resource)) {
+                        return LamdbaExceptionUtils.uncheck(()->new URL("modjar://" + next.getMods().get(0).getModId() + "/" + resourceName));
+                    }
+                }
+                return null;
+            }
+        };
+    }
+
+    public ModFileInfo getModFileById(String modid)
+    {
         return this.fileById.get(modid);
     }
 
-    public List<ModInfo> getMods() {
+    public List<ModInfo> getMods()
+    {
         return this.sortedList;
     }
 

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

@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
 import com.google.common.graph.GraphBuilder;
 import com.google.common.graph.MutableGraph;
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
+import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
@@ -20,250 +20,235 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.util.stream.Collectors.*;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-public class ModSorter {
+public class ModSorter
+{
     private static final Logger LOGGER = LogUtils.getLogger();
+    private final UniqueModListBuilder uniqueModListBuilder;
+    private List<ModFile> modFiles;
+    private List<ModInfo> sortedList;
+    private Map<String, IModInfo> modIdNameLookup;
+    private List<ModFile> systemMods;
 
-    private record State(List<ModFile> files, List<ModInfo> mods) {}
-
-    private ModSorter() {}
-
-    @SuppressWarnings("removal")
-    public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
-        State systemMods = detectSystemMods(mods);
-        List<ModFile> modFiles;
+    private ModSorter(final List<ModFile> modFiles)
+    {
+        this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
+    }
 
+    public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
+    {
+        final ModSorter ms = new ModSorter(mods);
         try {
-            modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
+            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(systemMods.files(), systemMods.mods(), e);
+            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), e);
         }
-
-        var named = new HashMap<String, ModInfo>();
-        for (var file : modFiles) {
-            for (var info : file.getModInfos())
-                named.put(info.getModId(), (ModInfo)info);
-        }
-
         // try and validate dependencies
-        final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
-
+        final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
         // if we miss one or the other, we abort now
         if (!failedList.isEmpty()) {
-            return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
+            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), new EarlyLoadingException("failure to validate mod list", null, failedList));
         } else {
             // Otherwise, lets try and sort the modlist and proceed
+            EarlyLoadingException earlyLoadingException = null;
             try {
-                var sorted = sort(modFiles, named);
-                return LoadingModList.of(sorted.files(), sorted.mods(), null);
+                ms.sort();
             } catch (EarlyLoadingException e) {
-                // The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
-                return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
+                earlyLoadingException = e;
             }
+            return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
         }
     }
 
-    private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
-        final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
+    private void sort()
+    {
+        // lambdas are identity based, so sorting them is impossible unless you hold reference to them
+        final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
+        AtomicInteger counter = new AtomicInteger();
+        Map<ModFileInfo, Integer> infos = modFiles.stream()
+                .map(ModFile::getModFileInfo)
+                .filter(ModFileInfo.class::isInstance)
+                .map(ModFileInfo.class::cast)
+                .collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
+        infos.keySet().forEach(graph::addNode);
+        modFiles.stream()
+                .map(ModFile::getModInfos)
+                .flatMap(List::stream)
+                .map(IModInfo::getDependencies)
+                .<IModInfo.ModVersion>flatMap(List::stream)
+                .forEach(dep -> addDependency(graph, dep));
 
-        int counter = 0;
-        var infos = new HashMap<ModInfo, Integer>();
-        for (var file : modFiles) {
-            if (file.getModFileInfo() instanceof ModFileInfo info) {
-                for (var imod : info.getMods()) {
-                    var mod = (ModInfo)imod;
-                    infos.put(mod, counter++);
-                    graph.addNode(mod);
-                }
-            }
-        }
-
-        for (var file : modFiles) {
-            for (var info : file.getModInfos()) {
-                for (var dep : info.getDependencies()) {
-                    // Ordering isn't effected by sides, should it be?
-                    //if (!dep.getSide().isCorrectSide())
-                    //    continue;
-
-                    var target = named.get(dep.getModId());
-
-                    // soft dep that doesn't exist. No edge required.
-                    if (target == null)
-                        continue;
-
-                    var self = (ModInfo)dep.getOwner();
-
-                    switch (dep.getOrdering()) {
-                        case BEFORE -> graph.putEdge(self, target);
-                        case AFTER -> graph.putEdge(target, self);
-                        default -> {}
-                    }
-                }
-            }
-        }
-
-        final List<ModInfo> sorted;
-        try {
+        final List<ModFileInfo> sorted;
+        try
+        {
             sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
-        } catch (CyclePresentException e) {
-            Set<Set<ModInfo>> cycles = e.getCycles();
-            var buf = new StringBuilder();
-            buf.append("Mod Sorting failed - Detected Cycles: \n");
-
-            var dataList = new ArrayList<ExceptionData>();
-            for (var cycle : cycles) {
-                buf.append("\tCycle:\n");
-                for (var mod : cycle) {
-                    var modDeps = new StringBuilder()
-                        .append(mod.getModId())
-                        .append(' ')
-                        .append(mod.getDependencies().stream()
-                            .filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
-                            .map(dep -> dep.getOrdering().name() + " " + dep.getModId())
-                            .collect(Collectors.joining(", "))
-                        );
-                    dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
-                    buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
-                }
+        }
+        catch (CyclePresentException e)
+        {
+            Set<Set<ModFileInfo>> cycles = e.getCycles();
+            if (LOGGER.isErrorEnabled(LOADING))
+            {
+                LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
             }
-
-            LOGGER.error(LOADING, buf.toString());
-
+            var dataList = cycles.stream()
+                    .flatMap(Set::stream)
+                    .<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
+                    .map(IModInfo::getModId)
+                    .map(list -> new ExceptionData("fml.modloading.cycle", list))
+                    .toList();
             throw new EarlyLoadingException("Sorting error", e, dataList);
         }
-
-        var files = new LinkedHashSet<ModFile>();
-        var list = new ArrayList<ModInfo>();
-
-        for (var mod : sorted) {
-            files.add(mod.getOwningFile().getFile());
-            list.add(mod);
-        }
-
-        return new State(files.stream().toList(), list);
+        this.sortedList = sorted.stream()
+                .map(ModFileInfo::getMods)
+                .flatMap(List::stream)
+                .map(ModInfo.class::cast)
+                .collect(toList());
+        this.modFiles = sorted.stream()
+                .map(ModFileInfo::getFile)
+                .collect(toList());
     }
 
-    private static State detectSystemMods(final List<ModFile> modFiles) {
+    private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
+    {
+        final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
+        // soft dep that doesn't exist. Just return. No edge required.
+        if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
+
+        final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
+        if (self == target)
+            return; // in case a jar has two mods that have dependencies between
+
+        switch (dep.getOrdering()) {
+            case BEFORE -> topoGraph.putEdge(self, target);
+            case AFTER -> topoGraph.putEdge(target, self);
+            default -> {}
+        }
+    }
+
+    private void buildUniqueList()
+    {
+        final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
+
+        this.modFiles = uniqueModListData.modFiles();
+
+        detectSystemMods(uniqueModListData.modFilesByFirstId());
+
+        modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
+                .filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
+                .collect(Collectors.toMap(
+                    Map.Entry::getKey,
+                    e -> e.getValue().get(0).getModInfos().get(0)
+                  ));
+    }
+
+    private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
         // Capture system mods (ex. MC, Forge) here, so we can keep them for later
         var systemMods = List.of("minecraft", "forge");
         LOGGER.debug("Configured system mods: {}", systemMods);
 
-        var mods = new ArrayList<ModInfo>();
-        var files = new ArrayList<ModFile>();
+        this.systemMods = new ArrayList<>();
         for (var systemMod : systemMods) {
-            var mod = findMod(modFiles, systemMod);
-            if (mod == null)
+            var container = modFilesByFirstId.get(systemMod);
+            if (container != null && !container.isEmpty()) {
+                LOGGER.debug("Found system mod: {}", systemMod);
+                this.systemMods.add(container.getFirst());
+            } else {
                 throw new IllegalStateException("Failed to find system mod: " + systemMod);
-
-            LOGGER.debug("Found system mod: {}", systemMod);
-            mods.add(mod.info());
-            files.add(mod.file());
-        }
-
-        return new State(files, mods);
-    }
-
-    private record ModPair(ModFile file, ModInfo info) {}
-    private static ModPair findMod(final List<ModFile> modFiles, String name) {
-        for (var file : modFiles) {
-            for (var mod : file.getModFileInfo().getMods()) {
-                if (name.equals(mod.getModId()))
-                    return new ModPair(file, (ModInfo)mod);
             }
         }
-        return null;
     }
 
-    private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
-        final var modVersions = new HashMap<String, ArtifactVersion>();
-        final var modRequirements = new HashSet<ModVersion>();
-        int mandatoryRequired = 0;
+    private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
+    {
+        final var modVersions = modFiles.stream()
+                .map(ModFile::getModInfos)
+                .flatMap(List::stream)
+                .collect(toMap(IModInfo::getModId, IModInfo::getVersion));
 
-        for (var file : files) {
-            for (var info : file.getModInfos()) {
-                modVersions.put(info.getModId(), info.getVersion());
-                for (var dep : info.getDependencies()) {
-                    if (dep.getSide().isCorrectSide()) {
-                        if (modRequirements.add(dep) && dep.isMandatory())
-                            mandatoryRequired++;
-                    }
-                }
-            }
-        }
+        final var modVersionDependencies = modFiles.stream()
+                .map(ModFile::getModInfos)
+                .flatMap(List::stream)
+                .collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
 
+        final var modRequirements = modVersionDependencies.values().stream()
+                .<IModInfo.ModVersion>flatMap(List::stream)
+                .filter(mv -> mv.getSide().isCorrectSide())
+                .collect(toSet());
+
+        final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
         LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
+        final var missingVersions = modRequirements.stream()
+                .filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && !modVersionContained(mv, modVersions))
+                .collect(toSet());
+        final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
+        LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
 
-        final var missingMandatory = new HashSet<ModVersion>();
-        final var missingOptional = new HashSet<ModVersion>();
+        if (!missingVersions.isEmpty()) {
+            if (mandatoryMissing > 0) {
+                LOGGER.error(
+                        LOADING,
+                        "Missing or unsupported mandatory dependencies:\n{}",
+                        missingVersions.stream()
+                                .filter(IModInfo.ModVersion::isMandatory)
+                                .map(ver -> formatDependencyError(ver, modVersions))
+                                .collect(Collectors.joining("\n"))
+                );
+            }
+            if (missingVersions.size() - mandatoryMissing > 0) {
+                LOGGER.error(
+                        LOADING,
+                        "Unsupported installed optional dependencies:\n{}",
+                        missingVersions.stream()
+                                .filter(ver -> !ver.isMandatory())
+                                .map(ver -> formatDependencyError(ver, modVersions))
+                                .collect(Collectors.joining("\n"))
+                );
+            }
 
-        for (var dep : modRequirements) {
-            var modId = dep.getModId();
-            var existing = modVersions.get(modId);
-
-            if (!dep.isMandatory() && existing == null)
-                continue;
-
-            var range = dep.getVersionRange();
-            if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
-                continue;
-
-            if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
-                (dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
+            return missingVersions.stream()
+                    .map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
+                            mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
+                            modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
+                    .toList();
         }
-
-
-        LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
-
-        var ret = new ArrayList<ExceptionData>();
-
-        if (!missingMandatory.isEmpty()) {
-            LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
-            for (var mv : missingMandatory)
-                ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
-        }
-
-        if (!missingOptional.isEmpty()) {
-            LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
-            for (var mv : missingMandatory)
-                ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
-        }
-
-        return ret;
+        return Collections.emptyList();
     }
 
-    private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
-        var ret = new ArrayList<String>();
-        for (var dep : missing) {
-            var installed = modVersions.get(dep.getModId());
-            ret.add(String.format(
+    private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
+    {
+        ArtifactVersion installed = modVersions.get(dependency.getModId());
+        return String.format(
                 "\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
-                dep.getModId(),
-                dep.getOwner().getModId(),
-                dep.getVersionRange(),
+                dependency.getModId(),
+                dependency.getOwner().getModId(),
+                dependency.getVersionRange(),
                 installed != null ? installed.toString() : "[MISSING]"
-            ));
-        }
-        return String.join("\n", ret);
+        );
     }
 
-    private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
-    private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
-        return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
+    private static boolean modVersionContained(IModInfo.ModVersion mv, Map<String, ArtifactVersion> modVersions) {
+        var modId = mv.getModId();
+        var range = mv.getVersionRange();
+        if (modVersions.containsKey(modId)
+                && (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE")))
+            return true;
+
+        return VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod");
     }
 }

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

@@ -40,21 +40,6 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
         return "runtimedistcleaner";
     }
 
-    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
-    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
-
-    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty)
-            return NAY;
-
-        String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraftforge/"))
-            return NAY;
-
-        return YAY;
-    }
-
     @Override
     public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
         var changed = false;
@@ -213,6 +198,21 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
         };
     }
 
+    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
+    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
+
+    @Override
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        return YAY;
+    }
+
     private static class LambdaGatherer extends MethodVisitor {
         private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
                 "java/lang/invoke/LambdaMetafactory", "metafactory",

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

@@ -9,7 +9,6 @@ import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.language.IModInfo;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
@@ -24,18 +23,16 @@ import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-@ApiStatus.Internal
-@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
-public class UniqueModListBuilder {
+public class UniqueModListBuilder
+{
     private final static Logger LOGGER = LogUtils.getLogger();
 
     private final List<ModFile> modFiles;
 
-    public UniqueModListBuilder(final List<ModFile> modFiles) {
-        this.modFiles = modFiles;
-    }
+    public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
 
-    public UniqueModListData buildUniqueList() {
+    public UniqueModListData buildUniqueList()
+    {
         List<ModFile> uniqueModList;
         List<ModFile> uniqueLibListWithVersion;
 
@@ -142,4 +139,5 @@ public class UniqueModListBuilder {
     }
 
     public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
+
 }

fmlloader/src/main/java/net/minecraftforge/fml/loading/log4j/ForgeHighlight.java

@@ -18,7 +18,9 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.

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

@@ -9,6 +9,7 @@ import cpw.mods.modlauncher.api.LamdbaExceptionUtils.Supplier_WithExceptions;
 import net.minecraftforge.fml.loading.StringUtils;
 
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.stream.Stream;

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

@@ -43,10 +43,10 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
         mods.set("modId", "minecraft");
         mods.set("version", FMLLoader.versionInfo().mcVersion());
         mods.set("displayName", "Minecraft");
-        //mods.set("logoFile", "mcplogo.png");
-        //mods.set("credits", "Mojang, deobfuscated by MCP");
-        //mods.set("authors", "MCP: Searge,ProfMobius,IngisKahn,Fesh0r,ZeuX,R4wk,LexManos,Bspkrs");
-        mods.set("description", "The base Minecraft game, published by Mojang decompiled and deobfuscated by Forge");
+        mods.set("logoFile", "mcplogo.png");
+        mods.set("credits", "Mojang, deobfuscated by MCP");
+        mods.set("authors", "MCP: Searge,ProfMobius,IngisKahn,Fesh0r,ZeuX,R4wk,LexManos,Bspkrs");
+        mods.set("description", "Minecraft, decompiled and deobfuscated with MCP technology");
         conf.set("mods", List.of(mods));
 
         var configWrapper = new NightConfigWrapper(conf);

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

@@ -68,7 +68,6 @@ public class ModDiscoverer {
         }
     }
 
-    @SuppressWarnings("removal")
     public ModValidator discoverMods() {
         LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
         List<ModFile> loadedFiles = new ArrayList<>();

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

@@ -39,13 +39,14 @@ import java.util.jar.Manifest;
 public class ModFile implements IModFile {
     private static final Logger LOGGER = LogUtils.getLogger();
     private final String jarVersion;
+    private final ModFileFactory.ModFileInfoParser parser;
     private Map<String, Object> fileProperties;
     private List<IModLanguageProvider> loaders;
     private Throwable scanError;
     private final SecureJar jar;
     private final Type modFileType;
     private final IModProvider provider;
-    private final IModFileInfo modFileInfo;
+    private       IModFileInfo modFileInfo;
     private ModFileScanData fileModFileScanData;
     private CompletableFuture<ModFileScanData> futureScanResult;
     private List<CoreModFile> coreMods;
@@ -61,11 +62,12 @@ public class ModFile implements IModFile {
     public ModFile(final SecureJar jar, final IModProvider provider, final ModFileFactory.ModFileInfoParser parser, String type) {
         this.provider = provider;
         this.jar = jar;
+        this.parser = parser;
 
         var manifest = this.jar.moduleDataProvider().getManifest();
         modFileType = Type.valueOf(type);
         jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE");
-        this.modFileInfo = ModFileParser.readModList(this, parser);
+        this.modFileInfo = ModFileParser.readModList(this, this.parser);
     }
 
     @Override
@@ -97,6 +99,7 @@ public class ModFile implements IModFile {
     }
 
     public boolean identifyMods() {
+        this.modFileInfo = ModFileParser.readModList(this, this.parser);
         if (this.modFileInfo == null) return this.getType() != Type.MOD;
         LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
         this.coreMods = ModFileParser.getCoreMods(this);

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

@@ -17,6 +17,7 @@ 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;
 

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

@@ -81,10 +81,6 @@ class ArgumentList {
             .toArray(String[]::new);
     }
 
-    public boolean has(String key) {
-        return this.values.containsKey(key);
-    }
-
     public boolean hasValue(String key) {
         return getOrDefault(key, null) != null;
     }

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

@@ -22,10 +22,6 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
         super(type, prefix);
     }
 
-    protected CommonDevLaunchHandler(String name) {
-        super(name);
-    }
-
     @Override public String getNaming() { return "mcp"; }
     @Override public boolean isProduction() { return false; }
 
@@ -33,35 +29,13 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
     protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
         super.preLaunch(arguments, layer);
 
-        var args = ArgumentList.from(arguments);
-
-        if (this.module == null) {
-            var entry = args.get("launchEntry");
-            if (entry == null)
-                throw new IllegalArgumentException("When using " + this.name() + " launch target you must specify a --launchEntry argument");
-
-            args.remove("launchEntry");
-
-            int idx = entry.indexOf('/');
-            if (idx == -1) {
-                this.module = "minecraft";
-                this.main = entry;
-            } else {
-                this.module = entry.substring(0, idx);
-                this.main = entry.substring(idx + 1);
-            }
-
-            if (args.has("launchData")) {
-                args.remove("launchData");
-                this.isData = true;
-            }
-        }
-
         if (getDist().isDedicatedServer())
-            return args.getArguments();
+            return arguments;
 
         if (isData())
-            return args.getArguments();
+            return arguments;
+
+        var args = ArgumentList.from(arguments);
 
         String username = args.get("username");
         if (username != null) { // Replace '#' placeholders with random numbers

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

@@ -29,27 +29,17 @@ import java.util.List;
 public abstract class CommonLaunchHandler implements ILaunchHandlerService {
     protected static final Logger LOGGER = LogUtils.getLogger();
 
-    private final String name;
-    protected Dist dist = Dist.CLIENT;
-    protected boolean isData = false;
-    protected String module;
-    protected String main;
+    protected final LaunchType type;
+    private final String prefix;
 
     protected CommonLaunchHandler(LaunchType type, String prefix) {
-        this(prefix + type.name());
-        this.dist = type.dist();
-        this.isData = type.data();
-        this.module = type.module();
-        this.main = type.main();
+        this.type = type;
+        this.prefix = prefix;
     }
 
-    protected CommonLaunchHandler(String name) {
-        this.name = name;
-    }
-
-    @Override public String name() { return this.name; }
-    public Dist getDist() { return this.dist; }
-    public boolean isData() { return this.isData; }
+    @Override public String name() { return this.prefix + this.type.name(); }
+    public Dist getDist() { return this.type.dist(); }
+    public boolean isData() { return this.type.data(); }
     public boolean isProduction() { return false; }
     public abstract String getNaming();
 
@@ -76,15 +66,14 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
     }
 
     protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
-        return () -> runTarget(this.module, this.main, arguments, gameLayer);
+        return () -> runTarget(this.type.module(), this.type.main(), arguments, gameLayer);
     }
 
     protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
     protected static final LaunchType CLIENT          = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
-    protected static final LaunchType CLIENT_DATA     = new LaunchType("client_data", "minecraft", "net.minecraft.client.data.Main", Dist.CLIENT, true);
     protected static final LaunchType DATA            = new LaunchType("data",   "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
     protected static final LaunchType SERVER          = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
-    protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "minecraft", "net.minecraft.gametest.Main", Dist.DEDICATED_SERVER, false);
+    protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
 
     protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
         var mod = layer.findModule(module).orElse(null);

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

@@ -14,14 +14,12 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
         super(type, "forge_dev_");
     }
 
-    private ForgeDevLaunchHandler(String name) {
-        super(name);
-    }
-
     @Override
     public List<Path> getMinecraftPaths() {
-        // The client extra jar is on the classpath we can try locating it using the .mcassetsroot which vanilla uses for loading data
-        var extra = getPathFromResource("assets/.mcassetsroot");
+
+        // The extra jar is on the classpath, so try and pull it out of the legacy classpath
+        var legacyCP = findClassPath();
+        var extra = findJarOnClasspath(legacyCP, "client-extra");
         // Minecraft is an exploded directory, so find it.
         var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class");
         var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
@@ -41,12 +39,6 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
         }
     }
 
-    public static final class ClientData extends ForgeDevLaunchHandler {
-        public ClientData() {
-            super(CLIENT_DATA);
-        }
-    }
-
     public static final class Data extends ForgeDevLaunchHandler {
         public Data() {
             super(DATA);
@@ -64,10 +56,4 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
             super(SERVER_GAMETEST);
         }
     }
-
-    public static final class Custom extends ForgeDevLaunchHandler {
-        public Custom() {
-            super("forge_dev");
-        }
-    }
 }

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

@@ -96,14 +96,14 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
 
             // Find resource directories for every mod in this group
             var paths = new LinkedHashSet<Path>();
-            for (var modid : modids.stream().sorted().toList()) {
+            for (var modid : modids) {
                 var rsc = path.resolve(modid);
                 if (Files.exists(rsc))
                     paths.add(rsc);
             }
 
             var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
-            buildModsToml(paths, modids, root, pkg.startsWith("net/minecraftforge/debug/client/"));
+            buildModsToml(paths, modids, root);
             buildPackMeta(paths, root);
             moveModuleInfo(paths, root);
 
@@ -187,7 +187,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
     }
 
     // Builds or update the mods.toml file for all @Mods in this package
-    private static void buildModsToml(Set<Path> resources, Set<String> modids, Path root, boolean clientOnly) {
+    private static void buildModsToml(Set<Path> resources, Set<String> modids, Path root) {
         var toml = resources.stream()
             .map(p -> p.resolve(MODS_TOML))
             .filter(Files::exists)
@@ -205,8 +205,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
         var defaults = Map.of(
             "modLoader", "javafml",
             "loaderVersion", "[0,)",
-            "license", "Doesnt fucking matter",
-            "clientSideOnly", clientOnly
+            "license", "Doesnt fucking matter"
         );
 
         for (var key : defaults.keySet()) {

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

@@ -8,18 +8,17 @@ package net.minecraftforge.fml.loading.targets;
 import net.minecraftforge.fml.loading.FMLLoader;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.function.BiPredicate;
 import org.jetbrains.annotations.ApiStatus;
 
+import cpw.mods.jarhandling.SecureJar;
+
 @ApiStatus.Internal
 sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
     private ForgeUserdevLaunchHandler(LaunchType type) {
         super(type, "forge_userdev_");
     }
 
-    private ForgeUserdevLaunchHandler(String name) {
-        super(name);
-    }
-
     @Override
     public List<Path> getMinecraftPaths() {
         var legacyCP = findClassPath();
@@ -27,7 +26,7 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
 
         // Minecraft is extra jar {resources} + forge jar {patches}
         // The MC extra and forge jars are on the classpath, so try and pull them out
-        var extra = findJarOnClasspath(legacyCP, "client-extra"); // This should be "client-" + vers.mcAndMCPVersion() + "-extra" but FG6 qwerks
+        var extra = findJarOnClasspath(legacyCP, "client-extra");
         var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion());
         // We need to filter the forge jar to just MC code
         var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge);
@@ -40,12 +39,6 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
         }
     }
 
-    public static final class ClientData extends ForgeUserdevLaunchHandler {
-        public ClientData() {
-            super(CLIENT_DATA);
-        }
-    }
-
     public static final class Data extends ForgeUserdevLaunchHandler {
         public Data() {
             super(DATA);
@@ -63,10 +56,4 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
             super(SERVER_GAMETEST);
         }
     }
-
-    public static final class Custom extends ForgeUserdevLaunchHandler {
-        public Custom() {
-            super("forge_userdev");
-        }
-    }
 }

fmlloader/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ILaunchHandlerService

@@ -4,16 +4,12 @@ net.minecraftforge.fml.loading.targets.ForgeProdLaunchHandler$Server
 
 # Mod Developers
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Client
-net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ClientData
-net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Custom
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Data
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Server
 net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ServerGameTest
 
 #Working on Forge itself
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Client
-net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ClientData
-net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Custom
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Data
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Server
 net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ServerGameTest

fmlloader/src/main/resources/log4j2.xml

@@ -4,7 +4,7 @@
     SPDX-License-Identifier: LGPL-2.1-only
 -->
 
-<Configuration status="warn" shutdownHook="disable">
+<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"/>
         <MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>

gradle.properties

@@ -1,17 +1,17 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx6G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
 
 JAVA_VERSION=21
-MC_VERSION=1.21.8
+MC_VERSION=1.21.1
 MC_NEXT_VERSION=1.22
-MCP_VERSION=20250717.105350
+MCP_VERSION=20240808.132146
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.21.8
+MAPPING_VERSION=1.21.1
 
-# Set to true before the first build of a new MC version, so we don't do compatibility checks
+// 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=false
+// Set to true to allow for fuzzy patching. Useful during updateing
+UPDATING=false

javafmllanguage/build.gradle

@@ -10,7 +10,7 @@ plugins {
 apply from: rootProject.file('build_shared.gradle')
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
+    compileOnly(libs.nulls)
     implementation(project(':fmlloader'))
     implementation(project(':fmlcore'))
     implementation(libs.unsafe)

javafmllanguage/src/main/java/net/minecraftforge/fml/common/Mod.java

@@ -12,10 +12,9 @@ import java.lang.annotation.Target;
 import java.util.function.Supplier;
 
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.Bindings;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import org.jspecify.annotations.Nullable;
 
 /**
  * This defines a Mod to FML.
@@ -25,11 +24,12 @@ import org.jspecify.annotations.Nullable;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface Mod {
+public @interface Mod
+{
     /**
      * The unique mod identifier for this mod.
-     * <b>Required to be lowercased in the English locale for compatibility. Will be truncated to 64 characters long.</b>
-     * <br>
+     * <b>Required to be lowercased in the english locale for compatibility. Will be truncated to 64 characters long.</b>
+     *
      * This will be used to identify your mod for third parties (other mods), it will be used to identify your mod for registries such as block and item registries.
      * By default, you will have a resource domain that matches the modid. All these uses require that constraints are imposed on the format of the modid.
      */
@@ -61,40 +61,32 @@ public @interface Mod {
         String modid() default "";
 
         /**
-         * Specify an alternative bus to listen to.
-         * <br>
-         * If you know all listeners in this class are for a specific bus, you can set it here to speed up registration.
+         * Specify an alternative bus to listen to
          *
          * @return the bus you wish to listen to
          */
-        Bus bus() default Bus.BOTH;
+        Bus bus() default Bus.FORGE;
 
         enum Bus {
             /**
-             * The main BusGroup that most game events are fired on.
+             * The main Forge Event Bus.
+             *
+             * <p>See {@code MinecraftForge#EVENT_BUS}</p>
              */
             FORGE(Bindings.getForgeBus()),
-
             /**
-             * The mod-specific event BusGroup, usually for mod lifecycle events.
-             * @see FMLJavaModLoadingContext#getModBusGroup()
+             * The mod specific Event bus.
+             * @see FMLJavaModLoadingContext#getModEventBus()
              */
-            MOD(()-> FMLJavaModLoadingContext.get().getModBusGroup()),
+            MOD(()-> FMLJavaModLoadingContext.get().getModEventBus());
 
-            /**
-             * Both the {@link #FORGE} and {@link #MOD} buses. This is slower to register events in your class but
-             * allows you to listen to events from different BusGroup types without needing separate classes annotated
-             * with {@link EventBusSubscriber}.
-             */
-            BOTH(() -> null);
+            private final Supplier<IEventBus> busSupplier;
 
-            private final Supplier<@Nullable BusGroup> busSupplier;
-
-            Bus(Supplier<@Nullable BusGroup> eventBusSupplier) {
+            Bus(final Supplier<IEventBus> eventBusSupplier) {
                 this.busSupplier = eventBusSupplier;
             }
 
-            public Supplier<@Nullable BusGroup> bus() {
+            public Supplier<IEventBus> bus() {
                 return busSupplier;
             }
         }

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

@@ -7,40 +7,22 @@ package net.minecraftforge.fml.javafmlmod;
 
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.eventbus.api.bus.BusGroup;
-import net.minecraftforge.eventbus.api.bus.CancellableEventBus;
-import net.minecraftforge.eventbus.api.bus.EventBus;
-import net.minecraftforge.eventbus.api.event.characteristic.Cancellable;
-import net.minecraftforge.eventbus.api.listener.EventListener;
-import net.minecraftforge.eventbus.api.listener.ObjBooleanBiConsumer;
-import net.minecraftforge.eventbus.api.listener.Priority;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
-import net.minecraftforge.eventbus.internal.Event;
 import net.minecraftforge.fml.Logging;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import net.minecraftforge.forgespi.language.ModFileScanData.AnnotationData;
 import net.minecraftforge.forgespi.language.ModFileScanData.EnumData;
 import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.unsafe.UnsafeHacks;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jspecify.annotations.Nullable;
 import org.objectweb.asm.Type;
 
-import java.lang.invoke.LambdaMetafactory;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -93,7 +75,7 @@ public class AutomaticEventSubscriber {
             if (Objects.equals(mod.getModId(), modId) && sides.contains(FMLEnvironment.dist)) {
                 try {
                     LOGGER.debug(Logging.LOADING, "Auto-subscribing {} to {}", data.clazz().getClassName(), busTarget);
-                    EventBusSubscriberLogic.register(busTarget.bus().get(), Class.forName(data.clazz().getClassName(), true, loader));
+                    busTarget.bus().get().register(Class.forName(data.clazz().getClassName(), true, loader));
                 } catch (ClassNotFoundException e) {
                     LOGGER.fatal(Logging.LOADING, "Failed to load mod class {} for @EventBusSubscriber annotation", data.clazz(), e);
                     throw new RuntimeException(e);
@@ -106,320 +88,4 @@ public class AutomaticEventSubscriber {
     private static <R> R value(AnnotationData data, String key, R value) {
         return (R)data.annotationData().getOrDefault(key, value);
     }
-
-    /**
-     * This is mostly a carbon copy of EventBus 7's internal EventListenerFactory, with some changes to support adding
-     * to different BusGroups based on the event type, among other things.
-     */
-    private static final class EventBusSubscriberLogic {
-        private EventBusSubscriberLogic() {}
-
-        private static final boolean STRICT_RUNTIME_CHECKS = Boolean.getBoolean("eventbus.api.strictRuntimeChecks");
-
-        /**
-         * If true, performs exhaustive validation on bulk registration to aid debugging.
-         */
-        private static final boolean STRICT_REGISTRATION_CHECKS = STRICT_RUNTIME_CHECKS || Boolean.getBoolean("eventbus.api.strictRegistrationChecks");
-
-        private static final MethodType RETURNS_CONSUMER = MethodType.methodType(Consumer.class);
-        private static final MethodType RETURNS_PREDICATE = MethodType.methodType(Predicate.class);
-        private static final MethodType RETURNS_MONITOR = MethodType.methodType(ObjBooleanBiConsumer.class);
-
-        /** The method type of the {@link Consumer} functional interface ({@code void accept(Object)}) */
-        private static final MethodType CONSUMER_FI_TYPE = MethodType.methodType(void.class, Object.class);
-
-        /** The method type of the {@link Predicate} functional interface ({@code boolean test(Object)}) */
-        private static final MethodType PREDICATE_FI_TYPE = CONSUMER_FI_TYPE.changeReturnType(boolean.class);
-
-        /** The method type of the {@link ObjBooleanBiConsumer} functional interface ({@code void accept(Object, boolean)}) */
-        private static final MethodType MONITOR_FI_TYPE = MethodType.methodType(void.class, Object.class, boolean.class);
-
-        public static void register(@Nullable BusGroup busGroup, Class<?> listenerClass) {
-            if (STRICT_REGISTRATION_CHECKS) registerStrict(busGroup, listenerClass);
-            else registerLenient(busGroup, listenerClass);
-        }
-
-        @SuppressWarnings({"unchecked", "rawtypes"})
-        public static void registerLenient(@Nullable BusGroup busGroup, Class<?> listenerClass) {
-            Method[] declaredMethods = listenerClass.getDeclaredMethods();
-            if (declaredMethods.length == 0)
-                throw new IllegalArgumentException("No declared methods found in " + listenerClass);
-
-            Class<?> firstValidListenerEventType = null;
-
-            int listenersCount = 0;
-            for (var method : declaredMethods) {
-                if (!Modifier.isStatic(method.getModifiers()))
-                    continue;
-
-                if (method.isSynthetic())
-                    continue; // EventBus#89
-
-                int paramCount = method.getParameterCount();
-                if (paramCount == 0 || paramCount > 2)
-                    continue;
-
-                Class<?> returnType = method.getReturnType();
-                if (returnType != void.class && returnType != boolean.class)
-                    continue;
-
-                if (!method.isAnnotationPresent(SubscribeEvent.class))
-                    continue;
-
-                Class<?>[] parameterTypes = method.getParameterTypes();
-                if (!Event.class.isAssignableFrom(parameterTypes[0]))
-                    throw new IllegalArgumentException("First parameter of a @SubscribeEvent method must be an event");
-
-                Class<? extends Event> eventType = (Class<? extends Event>) parameterTypes[0];
-                var subscribeEventAnnotation = method.getAnnotation(SubscribeEvent.class);
-
-                registerListener(busGroup, paramCount, returnType, eventType, subscribeEventAnnotation, method);
-                listenersCount++;
-
-                if (firstValidListenerEventType == null)
-                    firstValidListenerEventType = eventType;
-            }
-
-            if (listenersCount == 0)
-                throw new IllegalArgumentException("No listeners found in " + listenerClass);
-            else if (firstValidListenerEventType == null)
-                throw new IllegalArgumentException("No valid listeners found in " + listenerClass);
-        }
-
-        @SuppressWarnings({"unchecked"})
-        public static void registerStrict(BusGroup busGroup, Class<?> listenerClass) {
-            Class<? extends Event> firstValidListenerEventType = null;
-
-            List<Method> declaredMethods = Arrays.stream(listenerClass.getDeclaredMethods())
-                    .filter(Predicate.not(Method::isSynthetic)) // EventBus#89
-                    .toList();
-            if (declaredMethods.isEmpty()) {
-                var errMsg = "No declared methods found in " + listenerClass.getName();
-                var superClass = listenerClass.getSuperclass();
-                if (superClass != null && superClass != Record.class && superClass != Enum.class) {
-                    errMsg += ". Note that listener inheritance is not supported. " +
-                            "If you are trying to inherit listeners, please use @Override and @SubscribeEvent on the method in the subclass.";
-                }
-                throw fail(listenerClass, errMsg);
-            }
-
-            int listenersCount = 0;
-            for (var method : declaredMethods) {
-                var hasSubscribeEvent = method.isAnnotationPresent(SubscribeEvent.class);
-                int paramCount = method.getParameterCount();
-
-                if (hasSubscribeEvent && (paramCount == 0 || paramCount > 2))
-                    throw fail(method, "Invalid number of parameters: " + paramCount + " (expected 1 or 2)");
-
-                if (paramCount == 0)
-                    continue;
-
-                Class<?> returnType = method.getReturnType();
-                Class<?>[] parameterTypes = method.getParameterTypes();
-                var firstParamExtendsEvent = Event.class.isAssignableFrom(parameterTypes[0]);
-
-                if (!hasSubscribeEvent && firstParamExtendsEvent)
-                    throw fail(method, "Missing @SubscribeEvent annotation");
-
-                if (hasSubscribeEvent) {
-                    var firstParamExtendsCancellable = Cancellable.class.isAssignableFrom(parameterTypes[0]);
-                    var subscribeEventAnnotation = method.getAnnotation(SubscribeEvent.class);
-                    var isMonitoringPriority = subscribeEventAnnotation.priority() == Priority.MONITOR;
-
-                    if (!firstParamExtendsEvent)
-                        throw fail(method, "First parameter of a @SubscribeEvent method must be an event");
-
-                    var eventType = (Class<? extends Event>) parameterTypes[0];
-
-                    if (returnType != void.class && returnType != boolean.class)
-                        throw fail(method, "Invalid return type: " + returnType.getName() + " (expected void or boolean)");
-
-                    if (!Modifier.isStatic(method.getModifiers()))
-                        throw fail(method, "Listener method needs to be static");
-
-                    if (isMonitoringPriority && (returnType == boolean.class || subscribeEventAnnotation.alwaysCancelling()))
-                        throw fail(method, "Monitoring listeners cannot cancel events");
-
-                    if (paramCount == 2) {
-                        if (!firstParamExtendsCancellable)
-                            throw fail(method, "Cancellation-aware monitoring listeners are only valid for cancellable events");
-
-                        if (!boolean.class.isAssignableFrom(parameterTypes[1]))
-                            throw fail(method, "Second parameter of a cancellation-aware monitoring listener must be a boolean");
-
-                        if (!isMonitoringPriority)
-                            throw fail(method, "Cancellation-aware monitoring listeners must have a priority of MONITOR");
-                    }
-
-                    if (!firstParamExtendsCancellable) {
-                        if (subscribeEventAnnotation.alwaysCancelling())
-                            throw fail(method, "Always cancelling listeners are only valid for cancellable events");
-
-                        if (returnType == boolean.class)
-                            throw fail(method, "Return type boolean is only valid for cancellable events");
-                    }
-
-                    registerListener(busGroup, paramCount, returnType, eventType, subscribeEventAnnotation, method);
-                    listenersCount++;
-
-                    if (firstValidListenerEventType == null)
-                        firstValidListenerEventType = eventType;
-                }
-            }
-
-            if (listenersCount == 0)
-                throw fail(listenerClass, "No listeners found");
-            else if (firstValidListenerEventType == null)
-                throw fail(listenerClass, "No valid listeners found");
-        }
-
-        @SuppressWarnings({"unchecked", "rawtypes"})
-        private static EventListener registerListener(@Nullable BusGroup busGroup,
-                                                      int paramCount, Class<?> returnType, Class<? extends Event> eventType,
-                                                      SubscribeEvent subscribeEventAnnotation, Method method) {
-            if (busGroup == null) {
-                busGroup = IModBusEvent.class.isAssignableFrom(eventType)
-                        ? FMLJavaModLoadingContext.get().getModBusGroup()
-                        : BusGroup.DEFAULT;
-            }
-
-            // determine the listener type from its parameters and return type
-            if (paramCount == 1) {
-                var priority = subscribeEventAnnotation.priority();
-                if (returnType == void.class) {
-                    if (Cancellable.class.isAssignableFrom(eventType)) {
-                        // Consumer<Event & Cancellable>
-                        var eventBus = CancellableEventBus.create(busGroup, (Class) eventType);
-                        if (subscribeEventAnnotation.alwaysCancelling()) {
-                            return eventBus.addListener(priority, true, createConsumer(method));
-                        } else {
-                            return eventBus.addListener(priority, createConsumer(method));
-                        }
-                    } else {
-                        // Consumer<Event>
-                        return EventBus.create(busGroup, eventType)
-                                .addListener(priority, createConsumer(method));
-                    }
-                } else {
-                    // Predicate<Event & EventCharacteristic.Cancellable>
-                    if (!Cancellable.class.isAssignableFrom(eventType))
-                        throw fail(method, "Return type boolean is only valid for cancellable events");
-
-                    if (subscribeEventAnnotation.alwaysCancelling())
-                        throw new IllegalArgumentException("Always cancelling listeners must have a void return type");
-
-                    return CancellableEventBus.create(busGroup, (Class) eventType)
-                            .addListener(priority, createPredicate(method));
-                }
-            } else {
-                // ObjBooleanBiConsumer<Event & Cancellable>
-                if (returnType != void.class)
-                    throw new IllegalArgumentException("Cancellation-aware monitoring listeners must have a void return type");
-
-                if (subscribeEventAnnotation.alwaysCancelling())
-                    throw new IllegalArgumentException("Monitoring listeners cannot cancel events");
-
-                return CancellableEventBus.create(busGroup, (Class) eventType).addListener(createMonitor(method));
-            }
-        }
-
-        private static IllegalArgumentException fail(Class<?> listenerClass, String reason) {
-            return new IllegalArgumentException("Failed to register " + listenerClass.getName() + ": " + reason);
-        }
-
-        private static IllegalArgumentException fail(Method mtd, String reason) {
-            return new IllegalArgumentException("Failed to register " + mtd.getDeclaringClass().getName() + "." + mtd.getName() + ": " + reason);
-        }
-
-        @SuppressWarnings("unchecked")
-        private static <T extends Event> Consumer<T> createConsumer(Method callback) {
-            var factoryMH = getOrMakeFactory(callback, RETURNS_CONSUMER, CONSUMER_FI_TYPE, "accept");
-
-            try {
-                return (Consumer<T>) factoryMH.invokeExact();
-            } catch (Exception e) {
-                throw makeRuntimeException(callback, e);
-            } catch (Throwable t) {
-                throw new RuntimeException(t);
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private static <T extends Event> Predicate<T> createPredicate(Method callback) {
-            var factoryMH = getOrMakeFactory(callback, RETURNS_PREDICATE, PREDICATE_FI_TYPE, "test");
-
-            try {
-                return (Predicate<T>) factoryMH.invokeExact();
-            } catch (Exception e) {
-                throw makeRuntimeException(callback, e);
-            } catch (Throwable t) {
-                throw new RuntimeException(t);
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private static <T extends Event> ObjBooleanBiConsumer<T> createMonitor(Method callback) {
-            var factoryMH = getOrMakeFactory(callback, RETURNS_MONITOR, MONITOR_FI_TYPE, "accept");
-
-            try {
-                return (ObjBooleanBiConsumer<T>) factoryMH.invokeExact();
-            } catch (Exception e) {
-                throw makeRuntimeException(callback, e);
-            } catch (Throwable t) {
-                throw new RuntimeException(t);
-            }
-        }
-
-        private static MethodHandle getOrMakeFactory(Method callback, MethodType factoryReturnType,
-                                                     MethodType fiMethodType, String fiMethodName) {
-            return makeFactory(callback, factoryReturnType, fiMethodType, fiMethodName);
-        }
-
-        private static MethodHandle makeFactory(Method callback,
-                                                MethodType factoryReturnType,
-                                                MethodType fiMethodType, String fiMethodName) {
-            final class DodgyLookup {
-                private DodgyLookup() {}
-                private static final MethodHandles.Lookup INSTANCE;
-                static {
-                    try {
-                        var lookupField = MethodHandles.Lookup.class.getDeclaredField("IMPL_LOOKUP");
-                        UnsafeHacks.setAccessible(lookupField);
-                        INSTANCE = (MethodHandles.Lookup) lookupField.get(null);
-                    } catch (NoSuchFieldException | IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-
-            try {
-                var callbackDeclaredClass = callback.getDeclaringClass();
-                var lookup = DodgyLookup.INSTANCE.in(callbackDeclaredClass);
-                var mh = lookup.unreflect(callback);
-
-                return LambdaMetafactory.metafactory(
-                        lookup, fiMethodName, factoryReturnType, fiMethodType, mh, mh.type()
-                ).getTarget();
-            } catch (Exception e) {
-                throw makeRuntimeException(callback, e);
-            }
-        }
-
-        private static RuntimeException makeRuntimeException(Method callback, Exception e) {
-            return switch (e) {
-                case IllegalAccessException iae -> {
-                    var errMsg = "Failed to create listener";
-                    if (!Modifier.isPublic(callback.getModifiers()))
-                        errMsg += " - is it public?";
-
-                    yield new RuntimeException(errMsg, iae);
-                }
-                case NullPointerException npe -> new RuntimeException(
-                        "Failed to create listener - was given a non-static method without an instance to invoke it with",
-                        npe
-                );
-                default -> new RuntimeException("Failed to create listener", e);
-            };
-        }
-    }
 }

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

@@ -5,13 +5,14 @@
 
 package net.minecraftforge.fml.javafmlmod;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;
 
 /**
  * Use the context provided by your language loader in your mod's constructor
  */
-public class FMLJavaModLoadingContext extends ModLoadingContext {
+public class FMLJavaModLoadingContext extends ModLoadingContext
+{
     private final FMLModContainer container;
 
     FMLJavaModLoadingContext(FMLModContainer container) {
@@ -19,10 +20,11 @@ public class FMLJavaModLoadingContext extends ModLoadingContext {
     }
 
     /**
-     * @return The mod's event bus group, to allow subscription to Mod specific events
+     * @return The mod's event bus, to allow subscription to Mod specific events
      */
-    public BusGroup getModBusGroup() {
-        return container.getModBusGroup();
+    public IEventBus getModEventBus()
+    {
+        return container.getEventBus();
     }
 
     /**
@@ -37,15 +39,9 @@ public class FMLJavaModLoadingContext extends ModLoadingContext {
      * Helper to get the right instance from the {@link ModLoadingContext} correctly.
      * @return The FMLJavaMod language specific extension from the ModLoadingContext
      *
-     * @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor. For example: {@snippet :
-     * @Mod("examplemod")
-     * public final class ExampleMod {
-     *     public ExampleMod(FMLJavaModLoadingContext context) {
-     *          // Use context from the param instead of FMLJavaModLoadingContext.get() or ModLoadingContext.get()
-     *     }
-     * }}
+     * @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
      */
-    @Deprecated(forRemoval = true, since = "1.21.1")
+    @Deprecated(forRemoval = true, since="1.21.1")
     public static FMLJavaModLoadingContext get() {
         return ModLoadingContext.get().extension();
     }

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

@@ -5,12 +5,14 @@
 
 package net.minecraftforge.fml.javafmlmod;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
-import net.minecraftforge.eventbus.api.bus.EventBus;
+import net.minecraftforge.eventbus.EventBusErrorMessage;
+import net.minecraftforge.eventbus.api.BusBuilder;
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.IEventListener;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModLoadingException;
 import net.minecraftforge.fml.ModLoadingStage;
-import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
@@ -27,13 +29,14 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.jar.Attributes;
 
 public class FMLModContainer extends ModContainer {
     private static final Logger LOGGER = LogManager.getLogger();
     private static final Marker LOADING = MarkerManager.getMarker("LOADING");
     private final ModFileScanData scanResults;
-    private final BusGroup eventBusGroup;
+    private final IEventBus eventBus;
     private Object modInstance;
     private final Class<?> modClass;
     private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);
@@ -43,7 +46,8 @@ public class FMLModContainer extends ModContainer {
         LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
         this.scanResults = modFileScanResults;
         activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
-        this.eventBusGroup = BusGroup.create("modBusFor" + info.getModId());
+        this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
+        this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
         this.contextExtension = () -> context;
         try {
             var moduleName = info.getOwningFile().moduleName();
@@ -125,6 +129,10 @@ public class FMLModContainer extends ModContainer {
         implAddExportsOrOpens.invoke(target, pkg, reader, open, /*syncVM*/true);
     }
 
+    private static void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
+        LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
+    }
+
     private void constructMod() {
         try {
             LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
@@ -166,33 +174,19 @@ public class FMLModContainer extends ModContainer {
         return modInstance;
     }
 
-    public BusGroup getModBusGroup() {
-        return this.eventBusGroup;
+    public IEventBus getEventBus() {
+        return this.eventBus;
     }
 
     @Override
-    protected <T extends IModBusEvent> void acceptEvent(final T e) {
+    protected <T extends Event & IModBusEvent> void acceptEvent(final T e) {
         try {
             LOGGER.trace(LOADING, "Firing event for modid {} : {}", this.getModId(), e);
-            @SuppressWarnings("unchecked")
-            var eventBus = (EventBus<T>) IModBusEvent.getBus(eventBusGroup, e.getClass());
-            eventBus.post(e);
+            this.eventBus.post(e);
             LOGGER.trace(LOADING, "Fired event for modid {} : {}", this.getModId(), e);
         } catch (Throwable t) {
             LOGGER.error(LOADING,"Caught exception during event {} dispatch for modid {}", e, this.getModId(), t);
             throw new ModLoadingException(modInfo, modLoadingStage, "fml.modloading.errorduringevent", t);
         }
     }
-
-    @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    public void dispatchConfigEvent(IConfigEvent event) {
-        var eventBus = (EventBus) EventBus.create(eventBusGroup, event.self().getClass());
-        eventBus.post(event.self());
-    }
-
-    @Override
-    public String toString() {
-        return "FMLModContainer[" + this.getModInfo().getModId() + ", " + this.getClass().getName() + "]";
-    }
 }

lowcodelanguage/build.gradle

@@ -15,7 +15,7 @@ java {
 }
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
+    compileOnly(libs.nulls)
 
     implementation(project(':fmlloader'))
     implementation(project(':fmlcore'))

lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModContainer.java

@@ -6,32 +6,41 @@
 package net.minecraftforge.fml.lowcodemod;
 
 import com.mojang.logging.LogUtils;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModContainer;
-import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.slf4j.Logger;
 
-public class LowCodeModContainer extends ModContainer {
+import java.util.Objects;
+
+import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
+
+public class LowCodeModContainer extends ModContainer
+{
     private static final Logger LOGGER = LogUtils.getLogger();
     private final Object modInstance;
 
-    public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer) {
+    public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
+    {
         super(info);
-        LOGGER.debug(LogMarkers.LOADING, "Creating LowCodeModContainer for {}", info.getModId());
+        LOGGER.debug(LOADING, "Creating LowCodeModContainer for {}", info.getModId());
         this.modInstance = new Object();
         this.contextExtension = () -> null;
         this.extensionPoints.remove(IExtensionPoint.DisplayTest.class);
     }
 
     @Override
-    public boolean matches(Object mod) {
+    public boolean matches(Object mod)
+    {
         return mod == modInstance;
     }
 
     @Override
-    public Object getMod() {
+    public Object getMod()
+    {
         return modInstance;
     }
 }

mclanguage/build.gradle

@@ -10,7 +10,7 @@ plugins {
 apply from: rootProject.file('build_shared.gradle')
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
+    compileOnly(libs.nulls)
     implementation(project(':fmlloader'))
     implementation(project(':fmlcore'))
 }

mclanguage/src/main/java/net/minecraftforge/fml/mclanguageprovider/MinecraftModContainer.java

@@ -8,6 +8,8 @@ package net.minecraftforge.fml.mclanguageprovider;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.forgespi.language.IModInfo;
 
+import java.util.Objects;
+
 public class MinecraftModContainer extends ModContainer {
     private static final String MCMODINSTANCE = "minecraft, the mod";
 
@@ -18,7 +20,7 @@ public class MinecraftModContainer extends ModContainer {
 
     @Override
     public boolean matches(final Object mod) {
-        return MCMODINSTANCE.equals(mod);
+        return Objects.equals(mod, MCMODINSTANCE);
     }
 
     @Override

mclanguage/src/main/java/net/minecraftforge/fml/mclanguageprovider/MinecraftModLanguageProvider.java

@@ -10,6 +10,7 @@ import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
@@ -19,7 +20,7 @@ import java.util.function.Supplier;
 import static net.minecraftforge.fml.Logging.LOADING;
 
 public class MinecraftModLanguageProvider implements IModLanguageProvider {
-
+    private static final Logger LOGGER = LogManager.getLogger();
     @Override
     public String name() {
         return "minecraft";
@@ -44,7 +45,7 @@ public class MinecraftModLanguageProvider implements IModLanguageProvider {
                 final Class<?> mcModClass = Class.forName(getClass().getModule(), "net.minecraftforge.fml.mclanguageprovider.MinecraftModContainer");
                 return (T)mcModClass.getConstructor(IModInfo.class).newInstance(info);
             } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-                LogManager.getLogger().fatal(LOADING, "Unable to load MinecraftModContainer, wut?", e);
+                LOGGER.fatal(LOADING,"Unable to load MinecraftModContainer, wut?", e);
                 throw new RuntimeException(e);
             }
         }

mdk/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
 }
 
 version = mod_version
@@ -22,13 +22,17 @@ minecraft {
     // official   MCVersion             Official field/method names from Mojang mapping files
     // parchment  YYYY.MM.DD-MCVersion  Open community-sourced parameter names and javadocs layered on top of official
     //
+    // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+    //
     // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
     // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
     //
+    // 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
-
-    // Forge 1.20.6 and newer use official mappings at runtime, so we shouldn't reobf from official to SRG
+    
+    // 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.
@@ -46,7 +50,8 @@ minecraft {
     // By default, the folder name of a run configuration is the name of the Gradle project containing it.
     // generateRunFolders = true
 
-    // This property enables access transformers for use in development, applied to the Minecraft artifact.
+    // This property enables access transformers for use in development.
+    // They will be applied to the Minecraft artifact.
     // The access transformer file can be anywhere in the project.
     // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
     // This default location is a best practice to automatically put the file in the right place in the final jar.
@@ -60,18 +65,17 @@ minecraft {
         configureEach {
             workingDirectory project.file('run')
 
-            // Optional additional logging. The markers can be added/remove as needed, separated by commas.
+            // Recommended logging data for a userdev environment
+            // The markers can be added/remove as needed separated by commas.
             // "SCAN": For mods scan.
             // "REGISTRIES": For firing of registry events.
             // "REGISTRYDUMP": For getting the contents of all registries.
-//            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.markers', 'REGISTRIES'
 
+            // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
-
-            // Recommended for development - enables more descriptive errors at the cost of slower startup and registration.
-            property 'eventbus.api.strictRuntimeChecks', 'true'
-
-//            arg "-mixin.config=${mod_id}.mixins.json"
         }
 
         client {
@@ -106,26 +110,7 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
     // Put repositories for dependencies here
-    mavenCentral()
-    maven {
-        name = 'Forge'
-        url = 'https://maven.minecraftforge.net'
-    }
-    maven {
-        name = 'Minecraft libraries'
-        url = 'https://libraries.minecraft.net'
-    }
-    exclusiveContent {
-        forRepository {
-            maven {
-                name = 'Sponge'
-                url = 'https://repo.spongepowered.org/repository/maven-public'
-            }
-        }
-        filter {
-            includeGroupAndSubgroups('org.spongepowered')
-        }
-    }
+    // ForgeGradle automatically adds the Forge maven and Maven Central for you
 
     // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
@@ -142,11 +127,6 @@ 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}"
 
-    // Forge 1.21.6+ uses EventBus 7, which shifts most of its runtime validation to compile-time via an annotation processor
-    // to improve performance in production environments. This line is required to enable said compile-time validation
-    // in your development environment, helping you catch issues early.
-    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10'
-
     // Example mod dependency with JEI
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
     // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
@@ -167,7 +147,7 @@ dependencies {
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
 // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-tasks.named('processResources', ProcessResources) {
+tasks.named('processResources', ProcessResources).configure {
     var replaceProperties = [
             minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
             forge_version: forge_version, forge_version_range: forge_version_range,
@@ -183,7 +163,7 @@ tasks.named('processResources', ProcessResources) {
 }
 
 // Example for how to get properties into the manifest for reading at runtime.
-tasks.named('jar', Jar) {
+tasks.named('jar', Jar).configure {
     manifest {
         attributes([
             'Specification-Title'     : mod_id,
@@ -193,7 +173,6 @@ tasks.named('jar', Jar) {
             'Implementation-Version'  : project.jar.archiveVersion,
             'Implementation-Vendor'   : mod_authors
         ])
-//        attributes['MixinConfigs'] = "${mod_id}.mixins.json"
     }
 }
 
@@ -215,7 +194,8 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
-// IntelliJ no longer downloads javadocs and sources by default, this tells Gradle to force IntelliJ to do it.
+// IntelliJ no longer downloads javadocs and sources by default.
+// This tells Gradle to force IDEA to do it.
 idea.module { downloadJavadoc = downloadSources = true }
 
 eclipse {
@@ -225,7 +205,8 @@ eclipse {
     synchronizationTasks 'genEclipseRuns'
 }
 
-// Merge the resources and classes into the same directory, because Java expects modules to be in a single directory.
+// Merge the resources and classes into the same directory. 
+// This is done because java expects modules to be in a single directory.
 // And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
 // This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
 sourceSets.each {

mdk/gradle.properties

@@ -1,15 +1,8 @@
-# Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx5G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-# In the case that Gradle needs to fork to recompile, this will set the memory for that process.
-systemProp.net.minecraftforge.gradle.repo.recompile.fork=true
-systemProp.net.minecraftforge.gradle.repo.recompile.fork.args=-Xmx5G
-
-# Opts-out of ForgeGradle automatically adding mavenCentral(), Forge's maven and MC libs maven to the repositories block
-systemProp.net.minecraftforge.gradle.repo.attach=false
-
 
 ## Environment Properties
 

mdk/settings.gradle

@@ -9,5 +9,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
-}
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}

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

@@ -3,11 +3,12 @@ package com.example.examplemod;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.config.ModConfigEvent;
 import net.minecraftforge.registries.ForgeRegistries;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -15,7 +16,8 @@ import java.util.stream.Collectors;
 // An example config class. This is not required, but it's a good idea to have one to keep your config organized.
 // Demonstrates how to use Forge's config APIs
 @Mod.EventBusSubscriber(modid = ExampleMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
-public class Config {
+public class Config
+{
     private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
 
     private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
@@ -42,12 +44,14 @@ public class Config {
     public static String magicNumberIntroduction;
     public static Set<Item> items;
 
-    private static boolean validateItemName(final Object obj) {
+    private static boolean validateItemName(final Object obj)
+    {
         return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(ResourceLocation.tryParse(itemName));
     }
 
     @SubscribeEvent
-    static void onLoad(final ModConfigEvent event) {
+    static void onLoad(final ModConfigEvent event)
+    {
         logDirtBlock = LOG_DIRT_BLOCK.get();
         magicNumber = MAGIC_NUMBER.get();
         magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();

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

@@ -13,8 +13,11 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -27,7 +30,8 @@ import org.slf4j.Logger;
 
 // The value here should match an entry in the META-INF/mods.toml file
 @Mod(ExampleMod.MODID)
-public final class ExampleMod {
+public class ExampleMod
+{
     // Define mod id in a common place for everything to reference
     public static final String MODID = "examplemod";
     // Directly reference a slf4j logger
@@ -40,29 +44,13 @@ public final class ExampleMod {
     public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
 
     // Creates a new Block with the id "examplemod:example_block", combining the namespace and path
-    public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block",
-        () -> new Block(BlockBehaviour.Properties.of()
-            .setId(BLOCKS.key("example_block"))
-            .mapColor(MapColor.STONE)
-        )
-    );
+    public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE)));
     // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
-    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block",
-        () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().setId(ITEMS.key("example_block")))
-    );
+    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties()));
 
     // 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()
-            .setId(ITEMS.key("example_item"))
-            .food(new FoodProperties.Builder()
-                .alwaysEdible()
-                .nutrition(1)
-                .saturationModifier(2f)
-                .build()
-            )
-        )
-    );
+    public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
+            .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()
@@ -72,27 +60,32 @@ public final class ExampleMod {
                 output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
             }).build());
 
-    public ExampleMod(FMLJavaModLoadingContext context) {
-        var modBusGroup = context.getModBusGroup();
+    public ExampleMod(FMLJavaModLoadingContext context)
+    {
+        IEventBus modEventBus = context.getModEventBus();
 
         // Register the commonSetup method for modloading
-        FMLCommonSetupEvent.getBus(modBusGroup).addListener(this::commonSetup);
+        modEventBus.addListener(this::commonSetup);
 
         // Register the Deferred Register to the mod event bus so blocks get registered
-        BLOCKS.register(modBusGroup);
+        BLOCKS.register(modEventBus);
         // Register the Deferred Register to the mod event bus so items get registered
-        ITEMS.register(modBusGroup);
+        ITEMS.register(modEventBus);
         // Register the Deferred Register to the mod event bus so tabs get registered
-        CREATIVE_MODE_TABS.register(modBusGroup);
+        CREATIVE_MODE_TABS.register(modEventBus);
+
+        // Register ourselves for server and other game events we are interested in
+        MinecraftForge.EVENT_BUS.register(this);
 
         // Register the item to a creative tab
-        BuildCreativeModeTabContentsEvent.getBus(modBusGroup).addListener(ExampleMod::addCreative);
+        modEventBus.addListener(this::addCreative);
 
         // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
         context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
     }
 
-    private void commonSetup(final FMLCommonSetupEvent event) {
+    private void commonSetup(final FMLCommonSetupEvent event)
+    {
         // Some common setup code
         LOGGER.info("HELLO FROM COMMON SETUP");
 
@@ -105,16 +98,27 @@ public final class ExampleMod {
     }
 
     // Add the example block item to the building blocks tab
-    private static void addCreative(BuildCreativeModeTabContentsEvent event) {
+    private void addCreative(BuildCreativeModeTabContentsEvent event)
+    {
         if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS)
             event.accept(EXAMPLE_BLOCK_ITEM);
     }
 
+    // You can use SubscribeEvent and let the Event Bus discover methods to call
+    @SubscribeEvent
+    public void onServerStarting(ServerStartingEvent event)
+    {
+        // Do something when the server starts
+        LOGGER.info("HELLO from server starting");
+    }
+
     // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
-    @Mod.EventBusSubscriber(modid = MODID, value = Dist.CLIENT)
-    public static class ClientModEvents {
+    @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+    public static class ClientModEvents
+    {
         @SubscribeEvent
-        public static void onClientSetup(FMLClientSetupEvent event) {
+        public static void onClientSetup(FMLClientSetupEvent event)
+        {
             // Some client setup code
             LOGGER.info("HELLO FROM CLIENT SETUP");
             LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());

patches/minecraft/com/mojang/blaze3d/opengl/GlCommandEncoder.java.patch

@@ -1,12 +0,0 @@
---- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
-+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
-@@ -132,6 +_,9 @@
-             GlStateManager._colorMask(true, true, true, true);
-             GlStateManager._clear(16384);
-             GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
-+            // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
-+            if (p_394273_.isStencilEnabled())
-+                GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, GlConst.GL_TEXTURE_2D, 0, 0);
-             GlStateManager._glBindFramebuffer(36160, 0);
-         }
-     }

patches/minecraft/com/mojang/blaze3d/opengl/GlDebug.java.patch

@@ -1,34 +0,0 @@
---- a/com/mojang/blaze3d/opengl/GlDebug.java
-+++ b/com/mojang/blaze3d/opengl/GlDebug.java
-@@ -23,6 +_,14 @@
- 
- @OnlyIn(Dist.CLIENT)
- public class GlDebug {
-+    /**
-+     * TODO: [Forge][Rendering][VEN] Expose this in the configs
-+     * <p>
-+     * Will enable synchronous OpenGL debug logging, which means the message will be sent from the call that
-+     * would have caused the error. Additionally, enables printing a stacktrace when and where this occurs.
-+     */
-+    private static final boolean PRINT_STACKTRACE_ON_ERROR = Boolean.getBoolean("forge.printGLStackOnError");
-+
-     private static final Logger LOGGER = LogUtils.getLogger();
-     private static final int CIRCULAR_LOG_SIZE = 10;
-     private final Queue<GlDebug.LogEntry> MESSAGE_BUFFER = EvictingQueue.create(10);
-@@ -105,6 +_,8 @@
-         }
- 
-         LOGGER.info("OpenGL debug message: {}", gldebug$logentry);
-+        // TODO: [VEN] Trim the stack trace
-+        if (PRINT_STACKTRACE_ON_ERROR) LOGGER.info("Trace: ", new Throwable("GlDebug"));
-     }
- 
-     public List<String> getLastOpenGlDebugMessages() {
-@@ -121,6 +_,7 @@
- 
-     @Nullable
-     public static GlDebug enableDebugCallback(int p_394351_, boolean p_393026_, Set<String> p_393339_) {
-+        p_393026_ |= PRINT_STACKTRACE_ON_ERROR;
-         if (p_394351_ <= 0) {
-             return null;
-         } else {

patches/minecraft/com/mojang/blaze3d/opengl/GlDevice.java.patch

@@ -1,74 +0,0 @@
---- a/com/mojang/blaze3d/opengl/GlDevice.java
-+++ b/com/mojang/blaze3d/opengl/GlDevice.java
-@@ -89,8 +_,15 @@
-     public GpuTexture createTexture(
-         @Nullable Supplier<String> p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_
-     ) {
-+        return createTexture(p_397830_, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_, false);
-+    }
-+
-+    @Override
-+    public GpuTexture createTexture(
-+            @Nullable Supplier<String> p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_, boolean stencil
-+        ) {
-         return this.createTexture(
--            this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_
-+            this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_, stencil
-         );
-     }
- 
-@@ -98,6 +_,15 @@
-     public GpuTexture createTexture(
-         @Nullable String p_394142_, int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_
-     ) {
-+        return createTexture(p_394142_, p_395535_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, false);
-+    }
-+
-+    @Override
-+    public GpuTexture createTexture(
-+        @Nullable String p_394142_, int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_, boolean stencil
-+    ) {
-+        // Forge: stencil rendering is only for depth
-+        stencil &= p_394951_.hasDepthAspect();
-         if (p_406483_ < 1) {
-             throw new IllegalArgumentException("mipLevels must be at least 1");
-         } else if (p_408015_ < 1) {
-@@ -148,11 +_,14 @@
-                         GlStateManager._texImage2D(
-                             k,
-                             l,
-+                            stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
-                             GlConst.toGlInternalId(p_394951_),
-                             p_393944_ >> l,
-                             p_392329_ >> l,
-                             0,
-+                            stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL :
-                             GlConst.toGlExternalId(p_394951_),
-+                            stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV :
-                             GlConst.toGlType(p_394951_),
-                             null
-                         );
-@@ -163,11 +_,14 @@
-                     GlStateManager._texImage2D(
-                         j,
-                         i1,
-+                        stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
-                         GlConst.toGlInternalId(p_394951_),
-                         p_393944_ >> i1,
-                         p_392329_ >> i1,
-                         0,
-+                        stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL :
-                         GlConst.toGlExternalId(p_394951_),
-+                        stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV :
-                         GlConst.toGlType(p_394951_),
-                         null
-                     );
-@@ -180,7 +_,7 @@
-             } else if (j1 != 0) {
-                 throw new IllegalStateException("OpenGL error " + j1);
-             } else {
--                GlTexture gltexture = new GlTexture(p_395535_, p_394142_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, i);
-+                GlTexture gltexture = new GlTexture(p_395535_, p_394142_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, i, stencil);
-                 this.debugLabels.applyLabel(gltexture);
-                 return gltexture;
-             }

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

@@ -1,32 +0,0 @@
---- a/com/mojang/blaze3d/opengl/GlStateManager.java
-+++ b/com/mojang/blaze3d/opengl/GlStateManager.java
-@@ -89,6 +_,11 @@
-         }
-     }
- 
-+    public static boolean _isBlendEnabled() {
-+        RenderSystem.assertOnRenderThread();
-+        return BLEND.mode.enabled;
-+    }
-+
-     public static void _disableBlend() {
-         RenderSystem.assertOnRenderThread();
-         BLEND.mode.disable();
-@@ -404,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_393876_, int p_397998_, int p_396741_) {
-         RenderSystem.assertOnRenderThread();
-         GL11.glTexParameteri(p_393876_, p_397998_, p_396741_);
-+        if (p_393876_ == GL13.GL_TEXTURE1) {
-+            lastBrightnessX = p_397998_;
-+            lastBrightnessY = p_396741_;
-+        }
-     }
- 
-     public static int _getTexLevelParameter(int p_393352_, int p_397204_, int p_396319_) {

patches/minecraft/com/mojang/blaze3d/opengl/GlTexture.java.patch

@@ -1,33 +0,0 @@
---- a/com/mojang/blaze3d/opengl/GlTexture.java
-+++ b/com/mojang/blaze3d/opengl/GlTexture.java
-@@ -19,8 +_,13 @@
-     private int views;
- 
-     protected GlTexture(int p_394590_, String p_393950_, TextureFormat p_392837_, int p_391379_, int p_391947_, int p_396659_, int p_408255_, int p_408889_) {
-+        this(p_394590_, p_393950_, p_392837_, p_391379_, p_391947_, p_396659_, p_408255_, p_408889_, false);
-+    }
-+
-+    protected GlTexture(int p_394590_, String p_393950_, TextureFormat p_392837_, int p_391379_, int p_391947_, int p_396659_, int p_408255_, int p_408889_, boolean stencil) {
-         super(p_394590_, p_393950_, p_392837_, p_391379_, p_391947_, p_396659_, p_408255_);
-         this.id = p_408889_;
-+        this.stencilEnabled = stencil;
-     }
- 
-     @Override
-@@ -93,6 +_,16 @@
-     public void setTextureFilter(FilterMode p_394977_, FilterMode p_397175_, boolean p_393558_) {
-         super.setTextureFilter(p_394977_, p_397175_, p_393558_);
-         this.modesDirty = true;
-+    }
-+
-+
-+    /* FORGE START */
-+
-+    private final boolean stencilEnabled;
-+
-+    @Override
-+    public boolean isStencilEnabled() {
-+        return this.stencilEnabled;
-     }
- 
-     @Override

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

@@ -1,18 +1,35 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -92,7 +_,7 @@
-             this.width = p_83951_;
-             this.height = p_83952_;
-             if (this.useDepth) {
--                this.depthTexture = gpudevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, p_83951_, p_83952_, 1, 1);
-+                this.depthTexture = gpudevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, p_83951_, p_83952_, 1, 1, this.stencilEnabled);
-                 this.depthTextureView = gpudevice.createTextureView(this.depthTexture);
-                 this.depthTexture.setTextureFilter(FilterMode.NEAREST, false);
-                 this.depthTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE);
-@@ -166,5 +_,26 @@
-     @Nullable
-     public GpuTextureView getDepthTextureView() {
-         return this.depthTextureView;
+@@ -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, 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();
+@@ -257,5 +_,26 @@
+ 
+     public int getDepthTextureId() {
+         return this.depthBufferId;
 +    }
 +
 +    private boolean stencilEnabled = false;
@@ -25,7 +42,7 @@
 +    public void enableStencil() {
 +        if (stencilEnabled) return;
 +        stencilEnabled = true;
-+        this.resize(viewWidth, viewHeight);
++        this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
 +    }
 +
 +    /**

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

@@ -0,0 +1,20 @@
+--- a/com/mojang/blaze3d/platform/GlStateManager.java
++++ b/com/mojang/blaze3d/platform/GlStateManager.java
+@@ -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_;
++        }
+     }
+ 
+     public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {

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

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -88,7 +_,8 @@
+@@ -84,7 +_,8 @@
          GLFW.glfwWindowHint(139267, 2);
          GLFW.glfwWindowHint(139272, 204801);
          GLFW.glfwWindowHint(139270, 1);
@@ -10,15 +10,15 @@
          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;
-@@ -100,6 +_,7 @@
+@@ -96,6 +_,7 @@
              this.windowedX = this.x = aint1[0];
              this.windowedY = this.y = aint[0];
          }
 +        }
  
-         this.setMode();
-         this.refreshFramebufferSize();
-@@ -266,6 +_,9 @@
+         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;

patches/minecraft/com/mojang/blaze3d/systems/GpuDevice.java.patch

@@ -1,20 +0,0 @@
---- a/com/mojang/blaze3d/systems/GpuDevice.java
-+++ b/com/mojang/blaze3d/systems/GpuDevice.java
-@@ -26,7 +_,17 @@
-         @Nullable Supplier<String> p_394357_, int p_395623_, TextureFormat p_395807_, int p_395802_, int p_396157_, int p_408810_, int p_407070_
-     );
- 
-+    /** Forge: same as {@link #createTexture(Supplier, int, TextureFormat, int, int, int)} but with stencil support */
-+    default GpuTexture createTexture(@Nullable Supplier<String> p_394357_, int p_395623_, TextureFormat p_395807_, int p_395802_, int p_396157_, int p_408810_, int p_407070_, boolean stencil) {
-+        return this.createTexture(p_394357_, p_395623_, p_395807_, p_395802_, p_396157_, p_408810_, p_407070_);
-+    }
-+
-     GpuTexture createTexture(@Nullable String p_391798_, int p_391800_, TextureFormat p_393333_, int p_395600_, int p_394065_, int p_408732_, int p_407125_);
-+
-+    /** Forge: same as {@link #createTexture(String, int, TextureFormat, int, int, int)} but with stencil support */
-+    default GpuTexture createTexture(@Nullable String p_391798_, int p_391800_, TextureFormat p_393333_, int p_395600_, int p_394065_, int p_408732_, int p_407125_, boolean stencil) {
-+        return this.createTexture(p_391798_, p_391800_, p_393333_, p_395600_, p_394065_, p_408732_, p_407125_);
-+    }
- 
-     GpuTextureView createTextureView(GpuTexture p_409045_);
- 

patches/minecraft/com/mojang/blaze3d/textures/GpuTexture.java.patch

@@ -1,11 +0,0 @@
---- a/com/mojang/blaze3d/textures/GpuTexture.java
-+++ b/com/mojang/blaze3d/textures/GpuTexture.java
-@@ -6,7 +_,7 @@
- 
- @OnlyIn(Dist.CLIENT)
- @DontObfuscate
--public abstract class GpuTexture implements AutoCloseable {
-+public abstract class GpuTexture implements AutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture {
-     public static final int USAGE_COPY_DST = 1;
-     public static final int USAGE_COPY_SRC = 2;
-     public static final int USAGE_TEXTURE_BINDING = 4;

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
-@@ -15,7 +_,7 @@
- import org.joml.Vector3fc;
+@@ -13,7 +_,7 @@
+ import org.joml.Vector3f;
  
  @OnlyIn(Dist.CLIENT)
 -public class PoseStack {
 +public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
-     private final List<PoseStack.Pose> poses = new ArrayList<>(16);
-     private int lastIndex;
- 
+     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

@@ -0,0 +1,11 @@
+--- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
++++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
+@@ -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,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -15,7 +_,7 @@
+@@ -12,7 +_,7 @@
  import org.lwjgl.system.MemoryStack;
  
  @OnlyIn(Dist.CLIENT)
@@ -9,15 +9,16 @@
      VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
  
      VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
-@@ -135,9 +_,11 @@
+@@ -135,10 +_,11 @@
+                 }
  
-                 int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
-                 int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
-+                k1 = applyBakedLighting(k1, bytebuffer);
+                 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(), j1, f10, f9, p_85993_, k1, vector3f.x(), vector3f.y(), vector3f.z());
+                 this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), i1, f10, f9, p_85993_, j1, vector3f.x(), vector3f.y(), vector3f.z());
              }
          }

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

@@ -1,23 +1,23 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -21,7 +_,7 @@
+@@ -13,7 +_,7 @@
+ import net.minecraftforge.api.distmarker.OnlyIn;
  
  @OnlyIn(Dist.CLIENT)
- @DontObfuscate
 -public class VertexFormat {
 +public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
      public static final int UNKNOWN_ELEMENT = -1;
-     private static final boolean USE_STAGING_BUFFER_WORKAROUND = Util.getPlatform() == Util.OS.WINDOWS && Util.isAarch64();
+     private final List<VertexFormatElement> elements;
+     private final List<String> names;
+@@ -22,6 +_,7 @@
+     private final int[] offsetsByElement = new int[32];
      @Nullable
-@@ -35,6 +_,7 @@
-     private GpuBuffer immediateDrawVertexBuffer;
-     @Nullable
-     private GpuBuffer immediateDrawIndexBuffer;
+     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_;
-@@ -47,6 +_,11 @@
+@@ -34,6 +_,11 @@
              int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
              this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
          }
@@ -29,13 +29,13 @@
      }
  
      public static VertexFormat.Builder builder() {
-@@ -169,6 +_,9 @@
-         );
-         return this.immediateDrawIndexBuffer;
+@@ -158,6 +_,9 @@
+ 
+         return vertexbuffer;
      }
 +
 +    public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
 +    public int getOffset(int index) { return offsetsByElement[index]; }
  
      @OnlyIn(Dist.CLIENT)
-     @DontObfuscate
+     public static class Builder {

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

@@ -1,15 +1,15 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
-@@ -14,7 +_,7 @@
+@@ -13,7 +_,7 @@
  import org.joml.Quaternionf;
  import org.joml.Vector3f;
  
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
-     private final Matrix4fc matrix;
+     private final Matrix4f matrix;
      public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
          p_269604_ -> p_269604_.group(
-@@ -174,5 +_,19 @@
+@@ -169,5 +_,19 @@
          vector3f1.lerp(p_175938_.getScale(), p_175939_);
          quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
          return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);

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

@@ -34,4 +34,4 @@
 +        this.stackTrace = t.getStackTrace();
      }
  
-     public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, 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,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -175,6 +_,7 @@
+@@ -171,6 +_,7 @@
      }
  
      static {

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

@@ -1,7 +1,7 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -268,7 +_,7 @@
-                 .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().dataVersion().version()))
+@@ -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_);

patches/minecraft/net/minecraft/advancements/Advancement.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -226,7 +_,11 @@
+@@ -214,7 +_,11 @@
          }
  
          public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {

patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -43,6 +_,7 @@
-         LootParams lootparams = new LootParams.Builder(serverlevel)
+@@ -40,6 +_,7 @@
+         LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
              .withParameter(LootContextParams.THIS_ENTITY, p_9990_)
              .withParameter(LootContextParams.ORIGIN, p_9990_.position())
 +            .withLuck(p_9990_.getLuck())

patches/minecraft/net/minecraft/client/Camera.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -133,9 +_,13 @@
+@@ -105,9 +_,13 @@
      }
  
      protected void setRotation(float p_90573_, float p_90574_) {
@@ -15,7 +15,7 @@
          FORWARDS.rotate(this.rotation, this.forwards);
          UP.rotate(this.rotation, this.up);
          LEFT.rotate(this.rotation, this.left);
-@@ -251,6 +_,13 @@
+@@ -223,6 +_,13 @@
  
      public float getPartialTickTime() {
          return this.partialTickTime;
@@ -28,4 +28,4 @@
 +            return this.level.getBlockState(this.blockPosition).getStateAtViewpoint(this.level, this.blockPosition, this.position);
      }
  
-     @Override
+     @OnlyIn(Dist.CLIENT)

patches/minecraft/net/minecraft/client/ClientRecipeBook.java.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/client/ClientRecipeBook.java
++++ b/net/minecraft/client/ClientRecipeBook.java
+@@ -65,7 +_,7 @@
+             Recipe<?> recipe = recipeholder.value();
+             if (!recipe.isSpecial() && !recipe.isIncomplete()) {
+                 RecipeBookCategories recipebookcategories = getCategory(recipeholder);
+-                String s = recipe.getGroup();
++                String s = recipe.getGroup().isEmpty() ? recipeholder.id().toString() : recipe.getGroup(); // FORGE: Group value defaults to the recipe's ID if the recipe's explicit group is empty.
+                 if (s.isEmpty()) {
+                     map.computeIfAbsent(recipebookcategories, p_90645_ -> Lists.newArrayList()).add(ImmutableList.of(recipeholder));
+                 } else {
+@@ -125,6 +_,8 @@
+             } else if (recipetype == RecipeType.SMITHING) {
+                 return RecipeBookCategories.SMITHING;
+             } else {
++                var categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType)recipetype, p_299041_);
++                if (categories != null) return categories;
+                 LOGGER.warn(
+                     "Unknown recipe category: {}/{}",
+                     LogUtils.defer(() -> BuiltInRegistries.RECIPE_TYPE.getKey(recipe.getType())),

patches/minecraft/net/minecraft/client/KeyMapping.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -15,9 +_,9 @@
+@@ -14,9 +_,9 @@
  import net.minecraftforge.api.distmarker.OnlyIn;
  
  @OnlyIn(Dist.CLIENT)
@@ -12,7 +12,7 @@
      private static final Set<String> CATEGORIES = Sets.newHashSet();
      public static final String CATEGORY_MOVEMENT = "key.categories.movement";
      public static final String CATEGORY_MISC = "key.categories.misc";
-@@ -43,14 +_,14 @@
+@@ -42,14 +_,14 @@
      private int clickCount;
  
      public static void click(InputConstants.Key p_90836_) {
@@ -29,7 +29,7 @@
          if (keymapping != null) {
              keymapping.setDown(p_90839_);
          }
-@@ -101,7 +_,7 @@
+@@ -100,7 +_,7 @@
      }
  
      public boolean isDown() {
@@ -38,7 +38,7 @@
      }
  
      public String getCategory() {
-@@ -137,7 +_,16 @@
+@@ -136,7 +_,16 @@
      public int compareTo(KeyMapping p_90841_) {
          return this.category.equals(p_90841_.category)
              ? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
@@ -56,7 +56,7 @@
      }
  
      public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -146,6 +_,20 @@
+@@ -145,6 +_,20 @@
      }
  
      public boolean same(KeyMapping p_90851_) {
@@ -77,7 +77,7 @@
          return this.key.equals(p_90851_.key);
      }
  
-@@ -164,11 +_,13 @@
+@@ -163,11 +_,13 @@
      }
  
      public Component getTranslatedKeyMessage() {
@@ -92,10 +92,10 @@
      }
  
      public String saveString() {
-@@ -182,5 +_,88 @@
-     @Nullable
-     public static KeyMapping get(String p_378660_) {
-         return ALL.get(p_378660_);
+@@ -176,5 +_,88 @@
+ 
+     public void setDown(boolean p_90846_) {
+         this.isDown = p_90846_;
 +    }
 +
 +    private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;

patches/minecraft/net/minecraft/client/KeyboardHandler.java.patch

@@ -1,21 +1,18 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -440,12 +_,12 @@
-             if (screen != null) {
-                 try {
-                     if (p_90897_ != 1 && p_90897_ != 2) {
--                        if (p_90897_ == 0 && screen.keyReleased(p_90895_, p_90896_, p_90898_)) {
-+                        if (p_90897_ == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, p_90895_, p_90896_, p_90898_)) {
-                             return;
-                         }
-                     } else {
+@@ -405,9 +_,9 @@
+                 Screen.wrapScreenError(() -> {
+                     if (p_90897_ == 1 || p_90897_ == 2) {
                          screen.afterKeyboardAction();
--                        if (screen.keyPressed(p_90895_, p_90896_, p_90898_)) {
-+                        if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, p_90895_, p_90896_, p_90898_)) {
-                             return;
-                         }
+-                        aboolean[0] = screen.keyPressed(p_90895_, p_90896_, p_90898_);
++                        net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(aboolean, screen, p_90895_, p_90896_, p_90898_);
+                     } else if (p_90897_ == 0) {
+-                        aboolean[0] = screen.keyReleased(p_90895_, p_90896_, p_90898_);
++                        net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(aboolean, screen, p_90895_, p_90896_, p_90898_);
                      }
-@@ -504,6 +_,7 @@
+                 }, "keyPressed event handler", screen.getClass().getCanonicalName());
+                 if (aboolean[0]) {
+@@ -476,20 +_,21 @@
                      }
                  }
              }
@@ -23,17 +20,20 @@
          }
      }
  
-@@ -513,10 +_,10 @@
-             if (screen != null && this.minecraft.getOverlay() == null) {
-                 try {
-                     if (Character.isBmpCodePoint(p_90891_)) {
--                        screen.charTyped((char)p_90891_, p_90892_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, (char)p_90891_, p_90892_);
-                     } else if (Character.isValidCodePoint(p_90891_)) {
--                        screen.charTyped(Character.highSurrogate(p_90891_), p_90892_);
--                        screen.charTyped(Character.lowSurrogate(p_90891_), p_90892_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.highSurrogate(p_90891_), p_90892_);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.lowSurrogate(p_90891_), p_90892_);
+     private void charTyped(long p_90890_, int p_90891_, int p_90892_) {
+         if (p_90890_ == this.minecraft.getWindow().getWindow()) {
+-            GuiEventListener guieventlistener = this.minecraft.screen;
++            Screen guieventlistener = this.minecraft.screen;
+             if (guieventlistener != null && this.minecraft.getOverlay() == null) {
+                 if (Character.charCount(p_90891_) == 1) {
+                     Screen.wrapScreenError(
+-                        () -> guieventlistener.charTyped((char)p_90891_, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName()
++                        () -> net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(guieventlistener, (char)p_90891_, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName()
+                     );
+                 } else {
+                     for (char c0 : Character.toChars(p_90891_)) {
+-                        Screen.wrapScreenError(() -> guieventlistener.charTyped(c0, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName());
++                        Screen.wrapScreenError(() -> net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(guieventlistener, c0, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName());
                      }
-                 } catch (Throwable throwable) {
-                     CrashReport crashreport = CrashReport.forThrowable(throwable, "charTyped event handler");
+                 }
+             }

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -256,7 +_,7 @@
+@@ -254,7 +_,7 @@
  import org.slf4j.Logger;
  
  @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
      static Minecraft instance;
      private static final Logger LOGGER = LogUtils.getLogger();
      public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
-@@ -435,7 +_,6 @@
+@@ -431,7 +_,6 @@
              }
          }, Util.nonCriticalIoPool());
          LOGGER.info("Setting user: {}", this.user.getName());
@@ -17,35 +17,39 @@
          this.demo = p_91084_.game.demo;
          this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
          this.allowsChat = !p_91084_.game.disableChat;
-@@ -486,10 +_,9 @@
-             LOGGER.error("Couldn't set icon", (Throwable)ioexception);
+@@ -468,15 +_,15 @@
          }
  
+         this.window.setFramerateLimit(this.options.framerateLimit().get());
 +        // FORGE: Move mouse and keyboard handler setup further below
          this.mouseHandler = new MouseHandler(this);
 -        this.mouseHandler.setup(this.window.getWindow());
          this.keyboardHandler = new KeyboardHandler(this);
 -        this.keyboardHandler.setup(this.window.getWindow());
-         RenderSystem.initRenderer(
-             this.window.getWindow(),
-             this.options.glDebugVerbosity,
-@@ -500,6 +_,7 @@
-         LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
+         RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
          this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
+         this.mainRenderTarget.setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
+         this.mainRenderTarget.clear(ON_OSX);
          this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
 +        net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
          this.resourcePackRepository.reload();
          this.options.loadSelectedResourcePacks(this.resourcePackRepository);
          this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
-@@ -578,6 +_,7 @@
-         this.blockEntityRenderDispatcher = new BlockEntityRenderDispatcher(this.font, this.modelManager.entityModels(), this.blockRenderer, this.itemModelResolver, this.itemRenderer, this.entityRenderDispatcher);
-         this.resourceManager.registerReloadListener(this.blockEntityRenderDispatcher);
+@@ -540,6 +_,7 @@
+         this.entityRenderDispatcher = new EntityRenderDispatcher(this, this.textureManager, this.itemRenderer, this.blockRenderer, this.font, this.options, this.entityModels);
+         this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
          this.particleEngine = new ParticleEngine(this.level, this.textureManager);
 +        net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
          this.resourceManager.registerReloadListener(this.particleEngine);
          this.paintingTextures = new PaintingTextureManager(this.textureManager);
          this.resourceManager.registerReloadListener(this.paintingTextures);
-@@ -593,6 +_,9 @@
+@@ -552,11 +_,15 @@
+         this.gameRenderer = new GameRenderer(this, this.entityRenderDispatcher.getItemInHandRenderer(), this.resourceManager, this.renderBuffers);
+         this.resourceManager.registerReloadListener(this.gameRenderer.createReloadListener());
+         this.levelRenderer = new LevelRenderer(this, this.entityRenderDispatcher, this.blockEntityRenderDispatcher, this.renderBuffers);
++        net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RenderLevelStageEvent.RegisterStageEvent());
+         this.resourceManager.registerReloadListener(this.levelRenderer);
+         this.gpuWarnlistManager = new GpuWarnlistManager();
          this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
          this.resourceManager.registerReloadListener(this.regionalCompliancies);
          this.gui = new Gui(this);
@@ -53,17 +57,17 @@
 +        this.mouseHandler.setup(this.window.getWindow());
 +        this.keyboardHandler.setup(this.window.getWindow());
          this.debugRenderer = new DebugRenderer(this);
-         RealmsClient realmsclient = RealmsClient.getOrCreate(this);
+         RealmsClient realmsclient = RealmsClient.create(this);
          this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
-@@ -626,6 +_,7 @@
-             }
+@@ -580,6 +_,7 @@
+             this.options.fullscreen().set(this.window.isFullscreen());
          }
  
 +        net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
          this.window.updateVsync(this.options.enableVsync().get());
          this.window.updateRawMouseInput(this.options.rawMouseInput().get());
          this.window.setDefaultErrorCallback();
-@@ -648,16 +_,17 @@
+@@ -600,16 +_,17 @@
          GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
          Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
          this.setOverlay(
@@ -71,20 +75,20 @@
 -                this, reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
 +            net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(
 +                () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
-                     if (SharedConstants.IS_RUNNING_IN_IDE) {
-                         this.selfTest();
-                     }
+                         if (SharedConstants.IS_RUNNING_IN_IDE) {
+                             this.selfTest();
+                         }
  
-                     this.reloadStateTracker.finishReload();
-                     this.onResourceLoadFinished(minecraft$gameloadcookie);
-+                    net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
-                 }), false
+                         this.reloadStateTracker.finishReload();
+                         this.onResourceLoadFinished(minecraft$gameloadcookie);
++                        net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
+                     }), false
 -            )
 +            ).get()
          );
-         this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.logPath());
-         this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
-@@ -759,6 +_,7 @@
+         this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
+     }
+@@ -698,6 +_,7 @@
          StringBuilder stringbuilder = new StringBuilder("Minecraft");
          if (checkModStatus().shouldReportAsModified()) {
              stringbuilder.append("*");
@@ -92,7 +96,7 @@
          }
  
          stringbuilder.append(" ");
-@@ -782,6 +_,8 @@
+@@ -721,6 +_,8 @@
      }
  
      private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
@@ -101,7 +105,7 @@
          return p_193587_.user.user.getType() != User.Type.MSA
              ? UserApiService.OFFLINE
              : p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
-@@ -792,7 +_,7 @@
+@@ -731,7 +_,7 @@
      }
  
      private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
@@ -110,7 +114,7 @@
              this.clearResourcePacksOnError(p_91240_, null, p_299515_);
          } else {
              Util.throwAsRuntime(p_91240_);
-@@ -1078,12 +_,6 @@
+@@ -991,12 +_,6 @@
              LOGGER.error("setScreen called from non-game thread");
          }
  
@@ -123,7 +127,7 @@
          if (p_91153_ == null && this.clientLevelTeardownInProgress) {
              throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
          } else {
-@@ -1097,6 +_,23 @@
+@@ -1010,6 +_,23 @@
                  }
              }
  
@@ -147,40 +151,40 @@
              this.screen = p_91153_;
              if (this.screen != null) {
                  this.screen.added();
-@@ -1180,6 +_,7 @@
+@@ -1088,6 +_,7 @@
+             this.resourceManager.close();
              FreeTypeUtil.destroy();
              Util.shutdownExecutors();
-             RenderSystem.getDevice().close();
 +            net.minecraftforge.fml.config.ConfigTracker.INSTANCE.forceUnload();
          } catch (Throwable throwable) {
              LOGGER.error("Shutdown failure!", throwable);
              throw throwable;
-@@ -1248,9 +_,11 @@
+@@ -1155,9 +_,11 @@
          this.mouseHandler.handleAccumulatedMovement();
-         profilerfiller.pop();
+         this.profiler.pop();
          if (!this.noRender) {
-+            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
-             profilerfiller.popPush("gameRenderer");
-             this.gameRenderer.render(this.deltaTracker, p_91384_);
-             profilerfiller.pop();
-+            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
++            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.timer);
+             this.profiler.popPush("gameRenderer");
+             this.gameRenderer.render(this.timer, p_91384_);
+             this.profiler.pop();
++            net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.timer);
          }
  
-         profilerfiller.push("blit");
-@@ -1379,10 +_,12 @@
-         this.window.setGuiScale(i);
+         if (this.fpsPieResults != null) {
+@@ -1283,10 +_,12 @@
+         this.window.setGuiScale((double)i);
          if (this.screen != null) {
              this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
 +            net.minecraftforge.client.ForgeHooksClient.resizeGuiLayers(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
          }
  
          RenderTarget rendertarget = this.getMainRenderTarget();
-         rendertarget.resize(this.window.getWidth(), this.window.getHeight());
+         rendertarget.resize(this.window.getWidth(), this.window.getHeight(), ON_OSX);
 +        if (this.gameRenderer != null)
          this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
          this.mouseHandler.setIgnoreFirstMove();
      }
-@@ -1520,6 +_,7 @@
+@@ -1554,6 +_,7 @@
      }
  
      public void stop() {
@@ -188,14 +192,14 @@
          this.running = false;
      }
  
-@@ -1547,10 +_,18 @@
+@@ -1582,10 +_,18 @@
              if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
                  BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                  BlockPos blockpos = blockhitresult.getBlockPos();
 -                if (!this.level.getBlockState(blockpos).isAir()) {
 +                if (!this.level.isEmptyBlock(blockpos)) {
-+                    var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
-+                    if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
++                    var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
++                    if (inputEvent.isCanceled()) {
 +                       if (inputEvent.shouldSwingHand()) {
 +                          this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
 +                          this.player.swing(InteractionHand.MAIN_HAND);
@@ -210,16 +214,16 @@
                          this.player.swing(InteractionHand.MAIN_HAND);
                      }
                  }
-@@ -1578,6 +_,8 @@
+@@ -1613,6 +_,8 @@
                  return false;
              } else {
                  boolean flag = false;
-+                var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
-+                if (!net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent))
++                var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
++                if (!inputEvent.isCanceled())
                  switch (this.hitResult.getType()) {
                      case ENTITY:
                          this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
-@@ -1585,7 +_,7 @@
+@@ -1620,7 +_,7 @@
                      case BLOCK:
                          BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
                          BlockPos blockpos = blockhitresult.getBlockPos();
@@ -228,7 +232,7 @@
                              this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
                              if (this.level.getBlockState(blockpos).isAir()) {
                                  flag = true;
-@@ -1598,8 +_,10 @@
+@@ -1633,8 +_,10 @@
                          }
  
                          this.player.resetAttackStrengthTicker();
@@ -239,12 +243,12 @@
                  this.player.swing(InteractionHand.MAIN_HAND);
                  return flag;
              }
-@@ -1615,6 +_,12 @@
+@@ -1650,6 +_,12 @@
                  }
  
                  for (InteractionHand interactionhand : InteractionHand.values()) {
-+                    var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(1, this.options.keyUse, interactionhand);
-+                    if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
++                    var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(1, this.options.keyUse, interactionhand);
++                    if (inputEvent.isCanceled()) {
 +                       if (inputEvent.shouldSwingHand()) this.player.swing(interactionhand);
 +                       return;
 +                    }
@@ -252,68 +256,68 @@
                      ItemStack itemstack = this.player.getItemInHand(interactionhand);
                      if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
                          return;
-@@ -1635,7 +_,7 @@
+@@ -1670,7 +_,7 @@
                                  }
  
-                                 if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
--                                    if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT) {
-+                                    if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
+                                 if (interactionresult.consumesAction()) {
+-                                    if (interactionresult.shouldSwing()) {
++                                    if (interactionresult.shouldSwing() && inputEvent.shouldSwingHand()) {
                                          this.player.swing(interactionhand);
                                      }
  
-@@ -1647,7 +_,7 @@
+@@ -1682,7 +_,7 @@
                                  int i = itemstack.getCount();
                                  InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
-                                 if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
--                                    if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
-+                                    if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
+                                 if (interactionresult1.consumesAction()) {
+-                                    if (interactionresult1.shouldSwing()) {
++                                    if (interactionresult1.shouldSwing() && inputEvent.shouldSwingHand()) {
                                          this.player.swing(interactionhand);
-                                         if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.player.hasInfiniteMaterials())) {
+                                         if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
                                              this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
-@@ -1663,6 +_,9 @@
+@@ -1698,6 +_,9 @@
                          }
                      }
  
 +                    if (itemstack.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS))
 +                       net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, interactionhand);
 +
-                     if (!itemstack.isEmpty()
-                         && this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
-                         if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
-@@ -1692,6 +_,8 @@
+                     if (!itemstack.isEmpty()) {
+                         InteractionResult interactionresult2 = this.gameMode.useItem(this.player, interactionhand);
+                         if (interactionresult2.consumesAction()) {
+@@ -1728,6 +_,8 @@
+             this.rightClickDelay--;
          }
  
-         ProfilerFiller profilerfiller = Profiler.get();
 +        net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
 +
-         profilerfiller.push("gui");
+         this.profiler.push("gui");
          this.chatListener.tick();
          this.gui.tick(this.pause);
-@@ -1778,6 +_,7 @@
+@@ -1811,6 +_,7 @@
  
                  this.tutorial.tick();
  
 +                net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
                  try {
                      this.level.tick(() -> true);
-                 } catch (Throwable throwable1) {
-@@ -1791,6 +_,7 @@
+                 } catch (Throwable throwable) {
+@@ -1824,6 +_,7 @@
  
-                     throw new ReportedException(crashreport1);
+                     throw new ReportedException(crashreport);
                  }
 +                net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
              }
  
-             profilerfiller.popPush("animateTick");
-@@ -1815,6 +_,7 @@
-         profilerfiller.popPush("keyboard");
+             this.profiler.popPush("animateTick");
+@@ -1843,6 +_,7 @@
+         this.profiler.popPush("keyboard");
          this.keyboardHandler.tick();
-         profilerfiller.pop();
+         this.profiler.pop();
 +        net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
      }
  
      private boolean isLevelRunningNormally() {
-@@ -2031,6 +_,7 @@
+@@ -2043,6 +_,7 @@
      }
  
      public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
@@ -321,7 +325,7 @@
          this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
          this.level = p_91157_;
          this.updateLevelInEngines(p_91157_);
-@@ -2068,6 +_,7 @@
+@@ -2080,6 +_,7 @@
          IntegratedServer integratedserver = this.singleplayerServer;
          this.singleplayerServer = null;
          this.gameRenderer.resetData();
@@ -329,15 +333,15 @@
          this.gameMode = null;
          this.narrator.clear();
          this.clientLevelTeardownInProgress = true;
-@@ -2075,6 +_,7 @@
+@@ -2087,6 +_,7 @@
          try {
              this.updateScreenAndTick(p_335030_);
              if (this.level != null) {
 +                net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
                  if (integratedserver != null) {
-                     ProfilerFiller profilerfiller = Profiler.get();
-                     profilerfiller.push("waitForServer");
-@@ -2088,6 +_,7 @@
+                     this.profiler.push("waitForServer");
+ 
+@@ -2099,6 +_,7 @@
  
                  this.gui.onDisconnected();
                  this.isLocalServer = false;
@@ -345,11 +349,40 @@
              }
  
              this.level = null;
-@@ -2236,6 +_,7 @@
+@@ -2245,6 +_,7 @@
  
      private void pickBlock() {
          if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
-+            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInputPickBlock(this.options.keyPickItem)) return;
-             boolean flag = Screen.hasControlDown();
-             switch (this.hitResult) {
-                 case BlockHitResult blockhitresult:
++            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
+             boolean flag = this.player.getAbilities().instabuild;
+             BlockEntity blockentity = null;
+             HitResult.Type hitresult$type = this.hitResult.getType();
+@@ -2257,7 +_,7 @@
+                 }
+ 
+                 Block block = blockstate.getBlock();
+-                itemstack = block.getCloneItemStack(this.level, blockpos, blockstate);
++                itemstack = blockstate.getCloneItemStack(this.hitResult, this.level, blockpos, this.player);
+                 if (itemstack.isEmpty()) {
+                     return;
+                 }
+@@ -2271,7 +_,7 @@
+                 }
+ 
+                 Entity entity = ((EntityHitResult)this.hitResult).getEntity();
+-                itemstack = entity.getPickResult();
++                itemstack = entity.getPickedResult(this.hitResult);
+                 if (itemstack == null) {
+                     return;
+                 }
+@@ -2855,6 +_,10 @@
+     @Nullable
+     public static String getLauncherBrand() {
+         return System.getProperty("minecraft.launcher.brand");
++    }
++
++    public ItemColors getItemColors() {
++       return this.itemColors;
+     }
+ 
+     @OnlyIn(Dist.CLIENT)

patches/minecraft/net/minecraft/client/MouseHandler.java.patch

@@ -1,68 +1,62 @@
 --- a/net/minecraft/client/MouseHandler.java
 +++ b/net/minecraft/client/MouseHandler.java
-@@ -90,6 +_,7 @@
+@@ -79,6 +_,7 @@
                  this.activeButton = -1;
              }
  
 +            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(p_91532_, p_91533_, p_91534_)) return;
+             boolean[] aboolean = new boolean[]{false};
              if (this.minecraft.getOverlay() == null) {
                  if (this.minecraft.screen == null) {
-                     if (!this.mouseGrabbed && flag) {
-@@ -103,7 +_,7 @@
+@@ -91,9 +_,9 @@
+                     Screen screen = this.minecraft.screen;
+                     if (flag) {
                          screen.afterMouseAction();
- 
-                         try {
--                            if (screen.mouseClicked(d0, d1, i)) {
-+                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, d0, d1, i)) {
-                                 return;
-                             }
-                         } catch (Throwable throwable1) {
-@@ -116,7 +_,7 @@
-                         }
+-                        Screen.wrapScreenError(() -> aboolean[0] = screen.mouseClicked(d0, d1, i), "mouseClicked event handler", screen.getClass().getCanonicalName());
++                        Screen.wrapScreenError(() -> net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(aboolean, screen, d0, d1, i), "mouseClicked event handler", screen.getClass().getCanonicalName());
                      } else {
-                         try {
--                            if (screen.mouseReleased(d0, d1, i)) {
-+                            if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, d0, d1, i)) {
-                                 return;
-                             }
-                         } catch (Throwable throwable) {
-@@ -150,6 +_,7 @@
+-                        Screen.wrapScreenError(() -> aboolean[0] = screen.mouseReleased(d0, d1, i), "mouseReleased event handler", screen.getClass().getCanonicalName());
++                        Screen.wrapScreenError(() -> net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(aboolean, screen, d0, d1, i), "mouseReleased event handler", screen.getClass().getCanonicalName());
+                     }
                  }
              }
+@@ -116,6 +_,7 @@
+                     }
+                 }
+             }
++            net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
          }
-+        net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
      }
  
-     public void fillMousePositionDetails(CrashReportCategory p_398230_, Window p_398216_) {
-@@ -189,7 +_,9 @@
+@@ -129,7 +_,9 @@
                  if (this.minecraft.screen != null) {
-                     double d3 = this.getScaledXPos(this.minecraft.getWindow());
-                     double d4 = this.getScaledYPos(this.minecraft.getWindow());
+                     double d3 = this.xpos * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
+                     double d4 = this.ypos * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
 -                    this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
 +                    if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPre(this.minecraft.screen, d3, d4, d1, d2)) return;
 +                    if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return;
 +                    net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPost(this.minecraft.screen, d3, d4, d1, d2);
                      this.minecraft.screen.afterMouseAction();
                  } else if (this.minecraft.player != null) {
-                     Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
-@@ -198,6 +_,7 @@
-                     }
- 
-                     int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
+                     if (this.accumulatedScrollX != 0.0 && Math.signum(d1) != Math.signum(this.accumulatedScrollX)) {
+@@ -151,6 +_,7 @@
+                     this.accumulatedScrollX -= (double)j;
+                     this.accumulatedScrollY -= (double)i;
+                     int k = i == 0 ? -j : i;
 +                    if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseScroll(this, d1, d2)) return;
                      if (this.minecraft.player.isSpectator()) {
                          if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
-                             this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
-@@ -303,7 +_,7 @@
-                     double d5 = getScaledYPos(window, this.accumulatedDY);
+                             this.minecraft.gui.getSpectatorGui().onMouseScrolled(-k);
+@@ -236,7 +_,7 @@
+                 if (this.activeButton != -1 && this.mousePressedTime > 0.0) {
+                     double d4 = this.accumulatedDX * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
+                     double d5 = this.accumulatedDY * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
+-                    Screen.wrapScreenError(() -> screen.mouseDragged(d2, d3, this.activeButton, d4, d5), "mouseDragged event handler", screen.getClass().getCanonicalName());
++                    Screen.wrapScreenError(() -> net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5), "mouseDragged event handler", screen.getClass().getCanonicalName());
+                 }
  
-                     try {
--                        screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
-+                        net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5);
-                     } catch (Throwable throwable) {
-                         CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
-                         screen.fillCrashDetails(crashreport1);
-@@ -393,6 +_,14 @@
+                 screen.afterMouseMove();
+@@ -303,6 +_,14 @@
  
      public double ypos() {
          return this.ypos;

patches/minecraft/net/minecraft/client/Options.java.patch

@@ -1,24 +1,16 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -671,7 +_,8 @@
+@@ -681,7 +_,8 @@
          },
          new OptionInstance.LazyEnum<>(
              () -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
 -            p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
 +            // FORGE: fix incorrect string comparison - PR #8767
 +            p_232011_ -> Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
-                 ? Optional.empty()
-                 : Optional.of(p_232011_),
+                     ? Optional.empty()
+                     : Optional.of(p_232011_),
              Codec.STRING
-@@ -705,6 +_,7 @@
-     );
-     public boolean syncWrites;
-     public boolean startedCleanly = true;
-+    private final Map<String, String> unknownKeys = new java.util.HashMap<>();
- 
-     public OptionInstance<Boolean> darkMojangStudiosBackground() {
-         return this.darkMojangStudiosBackground;
-@@ -1088,6 +_,7 @@
+@@ -1050,6 +_,7 @@
      }
  
      public Options(Minecraft p_92138_, File p_92139_) {
@@ -26,16 +18,15 @@
          this.minecraft = p_92138_;
          this.optionsFile = new File(p_92139_, "options.txt");
          boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
-@@ -1222,15 +_,28 @@
-         this.startedCleanly = p_168428_.process("startedCleanly", this.startedCleanly);
-         p_168428_.process("showNowPlayingToast", this.showNowPlayingToast);
-         p_168428_.process("musicFrequency", this.musicFrequency);
-+        processOptionsKeysOnly(p_168428_);
-+        processOptionsEnd(p_168428_);
+@@ -1184,12 +_,22 @@
+         p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
+         this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
+         p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
++        processOptionsForge(p_168428_);
 +    }
  
-+    // FORGE: split off to allow reloading keys after mod loading is done
-+    private void processOptionsKeysOnly(Options.FieldAccess p_168428_) {
++    // FORGE: split off to allow reloading options after mod loading is done
++    private void processOptionsForge(Options.FieldAccess p_168428_) {
          for (KeyMapping keymapping : this.keyMappings) {
 -            String s = keymapping.saveString();
 +            String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : "");
@@ -50,13 +41,8 @@
 +                }
              }
          }
-+    }
  
-+    private void processOptionsEnd(Options.FieldAccess p_168428_) {
-         for (SoundSource soundsource : SoundSource.values()) {
-             p_168428_.process("soundCategory_" + soundsource.getName(), this.soundSourceVolumes.get(soundsource));
-         }
-@@ -1245,6 +_,10 @@
+@@ -1207,6 +_,10 @@
      }
  
      public void load() {
@@ -67,68 +53,25 @@
          try {
              if (!this.optionsFile.exists()) {
                  return;
-@@ -1269,7 +_,8 @@
-                 this.graphicsMode.set(isTrue(optional.get()) ? GraphicsStatus.FANCY : GraphicsStatus.FAST);
+@@ -1234,7 +_,8 @@
+                 }
              }
  
 -            this.processOptions(
-+            java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsKeysOnly : this::processOptions;
++            java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsForge : this::processOptions;
 +            processor.accept(
                  new Options.FieldAccess() {
                      @Nullable
-                     private String getValue(String p_394210_) {
-@@ -1350,6 +_,17 @@
-             );
-             compoundtag1.getString("fullscreenResolution").ifPresent(p_389133_ -> this.fullscreenVideoModeString = p_389133_);
-             KeyMapping.resetMapping();
-+
-+            if (limited) {
-+                this.unknownKeys.clear();
-+            } else {
-+                var knownKeys = Arrays.stream(this.keyMappings).map(k -> "key_" + k.getName()).collect(Collectors.toSet());
-+                for (var entry : compoundtag1.entrySet()) {
-+                    if (entry.getKey().startsWith("key_") && entry.getValue().asString().isPresent() && !knownKeys.contains(entry.getKey()))
-+                        this.unknownKeys.put(entry.getKey(), entry.getValue().asString().get());
-+                }
-+            }
-+
-         } catch (Exception exception) {
-             LOGGER.error("Failed to load options", (Throwable)exception);
-         }
-@@ -1377,9 +_,11 @@
-     public void save() {
-         try (final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
-             printwriter.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version());
-+            var seen = new java.util.HashSet<String>();
-             this.processOptions(
-                 new Options.FieldAccess() {
-                     public void writePrefix(String p_168491_) {
-+                        seen.add(p_168491_);
-                         printwriter.print(p_168491_);
-                         printwriter.print(':');
-                     }
-@@ -1435,6 +_,12 @@
-             if (s != null) {
-                 printwriter.println("fullscreenResolution:" + s);
-             }
-+            // Forge add any unknown keys so that Mods can add keybindings between vanilla loading/saving its config.
-+            for (var entry : this.unknownKeys.entrySet()) {
-+                if (!seen.contains(entry.getKey()))
-+                    printwriter.println(entry.getKey() + ":" + entry.getValue());
-+            }
-+
-         } catch (Exception exception) {
-             LOGGER.error("Failed to save options", (Throwable)exception);
-         }
-@@ -1473,6 +_,7 @@
+                     private String getValueOrNull(String p_168459_) {
+@@ -1428,6 +_,7 @@
      }
  
      public void broadcastOptions() {
 +        if (net.minecraftforge.client.loading.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
          if (this.minecraft.player != null) {
-             this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
+             this.minecraft.player.connection.send(new ServerboundClientInformationPacket(this.buildPlayerInformation()));
          }
-@@ -1586,6 +_,23 @@
+@@ -1546,6 +_,23 @@
  
      public static Component genericValueLabel(Component p_231901_, int p_231902_) {
          return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));

patches/minecraft/net/minecraft/client/RecipeBookCategories.java.patch

@@ -0,0 +1,45 @@
+--- a/net/minecraft/client/RecipeBookCategories.java
++++ b/net/minecraft/client/RecipeBookCategories.java
+@@ -12,7 +_,7 @@
+ import net.minecraftforge.api.distmarker.OnlyIn;
+ 
+ @OnlyIn(Dist.CLIENT)
+-public enum RecipeBookCategories {
++public enum RecipeBookCategories implements net.minecraftforge.common.IExtensibleEnum {
+     CRAFTING_SEARCH(new ItemStack(Items.COMPASS)),
+     CRAFTING_BUILDING_BLOCKS(new ItemStack(Blocks.BRICKS)),
+     CRAFTING_REDSTONE(new ItemStack(Items.REDSTONE)),
+@@ -38,7 +_,7 @@
+     public static final List<RecipeBookCategories> CRAFTING_CATEGORIES = ImmutableList.of(
+         CRAFTING_SEARCH, CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE
+     );
+-    public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = ImmutableMap.of(
++    public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = net.minecraftforge.client.RecipeBookManager.getAggregateCategories(ImmutableMap.of(
+         CRAFTING_SEARCH,
+         ImmutableList.of(CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE),
+         FURNACE_SEARCH,
+@@ -47,7 +_,7 @@
+         ImmutableList.of(BLAST_FURNACE_BLOCKS, BLAST_FURNACE_MISC),
+         SMOKER_SEARCH,
+         ImmutableList.of(SMOKER_FOOD)
+-    );
++    ));
+     private final List<ItemStack> itemIcons;
+ 
+     private RecipeBookCategories(final ItemStack... p_92267_) {
+@@ -60,10 +_,15 @@
+             case FURNACE -> FURNACE_CATEGORIES;
+             case BLAST_FURNACE -> BLAST_FURNACE_CATEGORIES;
+             case SMOKER -> SMOKER_CATEGORIES;
++            default -> net.minecraftforge.client.RecipeBookManager.getCustomCategoriesOrEmpty(p_92270_);
+         };
+     }
+ 
+     public List<ItemStack> getIconItems() {
+         return this.itemIcons;
++    }
++
++    public static RecipeBookCategories create(String name, ItemStack... icons) {
++        throw new IllegalStateException("Enum not extended");
+     }
+ }

patches/minecraft/net/minecraft/client/Screenshot.java.patch

@@ -1,32 +1,30 @@
 --- a/net/minecraft/client/Screenshot.java
 +++ b/net/minecraft/client/Screenshot.java
-@@ -43,6 +_,13 @@
-                     file2 = new File(file1, p_92297_);
-                 }
+@@ -54,14 +_,24 @@
+             file2 = new File(file1, p_92307_);
+         }
  
-+                var event = new net.minecraftforge.client.event.ScreenshotEvent(p_389141_, file2);
-+                if (net.minecraftforge.client.event.ScreenshotEvent.BUS.post(event)) {
-+                    p_92301_.accept(event.getCancelMessage());
-+                    return;
-+                }
-+                final File target = event.getScreenshotFile();
++        var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenshot(nativeimage, file2);
++        if (event.isCanceled()) {
++           p_92311_.accept(event.getCancelMessage());
++           return;
++        }
++        final File target = event.getScreenshotFile();
 +
-                 Util.ioPool()
-                     .execute(
-                         () -> {
-@@ -50,10 +_,13 @@
-                                 NativeImage $$4x = p_389141_;
- 
-                                 try {
--                                    p_389141_.writeToFile(file2);
--                                    Component component = Component.literal(file2.getName())
-+                                    p_389141_.writeToFile(target);
-+                                    Component component = Component.literal(target.getName())
-                                         .withStyle(ChatFormatting.UNDERLINE)
-                                         .withStyle(p_389149_ -> p_389149_.withClickEvent(new ClickEvent.OpenFile(file2.getAbsoluteFile())));
-+                                    if (event.getResultMessage() != null)
-+                                        p_92301_.accept(event.getResultMessage());
-+                                    else
-                                     p_92301_.accept(Component.translatable("screenshot.success", component));
-                                 } catch (Throwable throwable1) {
-                                     if (p_389141_ != null) {
+         Util.ioPool()
+             .execute(
+                 () -> {
+                     try {
+-                        nativeimage.writeToFile(file2);
+-                        Component component = Component.literal(file2.getName())
++                        nativeimage.writeToFile(target);
++                        Component component = Component.literal(target.getName())
+                             .withStyle(ChatFormatting.UNDERLINE)
+-                            .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file2.getAbsolutePath())));
++                            .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, target.getAbsolutePath())));
++                        if (event.getResultMessage() != null)
++                            p_92311_.accept(event.getResultMessage());
++                        else
+                         p_92311_.accept(Component.translatable("screenshot.success", component));
+                     } catch (Exception exception) {
+                         LOGGER.warn("Couldn't save screenshot", (Throwable)exception);

patches/minecraft/net/minecraft/client/color/block/BlockColors.java.patch

@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/color/block/BlockColors.java
 +++ b/net/minecraft/client/color/block/BlockColors.java
-@@ -30,7 +_,8 @@
+@@ -29,7 +_,8 @@
+ @OnlyIn(Dist.CLIENT)
+ public class BlockColors {
      private static final int DEFAULT = -1;
-     public static final int LILY_PAD_IN_WORLD = -14647248;
-     public static final int LILY_PAD_DEFAULT = -9321636;
 -    private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
 +    // Forge: Use registry delegate as non-Vanilla block ids are not constant
 +    private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
      private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
  
      public static BlockColors createDefault() {
-@@ -95,11 +_,12 @@
+@@ -91,11 +_,12 @@
          }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
          blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
          blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
@@ -24,7 +24,7 @@
          if (blockcolor != null) {
              return blockcolor.getColor(p_92583_, null, null, 0);
          } else {
-@@ -109,13 +_,15 @@
+@@ -105,13 +_,15 @@
      }
  
      public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {

patches/minecraft/net/minecraft/client/color/item/ItemColors.java.patch

@@ -0,0 +1,35 @@
+--- a/net/minecraft/client/color/item/ItemColors.java
++++ b/net/minecraft/client/color/item/ItemColors.java
+@@ -26,7 +_,8 @@
+ @OnlyIn(Dist.CLIENT)
+ public class ItemColors {
+     private static final int DEFAULT = -1;
+-    private final IdMapper<ItemColor> itemColors = new IdMapper<>(32);
++    // Forge: Use registry delegate as non-Vanilla item ids are not constant
++    private final java.util.Map<net.minecraft.core.Holder.Reference<Item>, ItemColor> itemColors = new java.util.HashMap<>(32);
+ 
+     public static ItemColors createDefault(BlockColors p_92684_) {
+         ItemColors itemcolors = new ItemColors();
+@@ -105,17 +_,20 @@
+                     : FastColor.ARGB32.opaque(p_325310_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
+             Items.FILLED_MAP
+         );
++        net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
+         return itemcolors;
+     }
+ 
+     public int getColor(ItemStack p_92677_, int p_92678_) {
+-        ItemColor itemcolor = this.itemColors.byId(BuiltInRegistries.ITEM.getId(p_92677_.getItem()));
++        ItemColor itemcolor = this.itemColors.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.getItem()));
+         return itemcolor == null ? -1 : itemcolor.getColor(p_92677_, p_92678_);
+     }
+ 
++    /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Item} */
++    @Deprecated
+     public void register(ItemColor p_92690_, ItemLike... p_92691_) {
+         for (ItemLike itemlike : p_92691_) {
+-            this.itemColors.addMapping(p_92690_, Item.getId(itemlike.asItem()));
++            this.itemColors.put(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(itemlike.asItem()), p_92690_);
+         }
+     }
+ }

patches/minecraft/net/minecraft/client/data/Main.java.patch

@@ -1,22 +0,0 @@
---- a/net/minecraft/client/data/Main.java
-+++ b/net/minecraft/client/data/Main.java
-@@ -31,13 +_,18 @@
-         OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
-         OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
-         OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
-+        OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg();
-+        var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true);
-         OptionSet optionset = optionparser.parse(p_375526_);
--        if (!optionset.has(optionspec) && optionset.hasOptions()) {
-+        if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
-+            var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList();
-             Path path = Paths.get(optionspec3.value(optionset));
-             boolean flag = optionset.has(optionspec2);
-             boolean flag1 = flag || optionset.has(optionspec1);
-             Bootstrap.bootStrap();
-             ClientBootstrap.bootstrap();
-+            if (!loader.run(optionset, path, input, flag, flag1, flag, flag, true))
-+                return;
-             DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
-             addClientProviders(datagenerator, flag1);
-             datagenerator.run();

patches/minecraft/net/minecraft/client/data/models/ItemModelGenerators.java.patch

@@ -1,12 +0,0 @@
---- a/net/minecraft/client/data/models/ItemModelGenerators.java
-+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
-@@ -871,6 +_,9 @@
-         this.declareCustomModelItem(Items.COD);
-         this.declareCustomModelItem(Items.FEATHER);
-         this.declareCustomModelItem(Items.LEAD);
-+        // moved from validate to here, because it's just vanilla default blocks
-+        if (this.itemModelOutput instanceof ModelProvider.ItemInfoCollector collector)
-+            collector.generateDefaultBlockModels();
-     }
- 
-     @OnlyIn(Dist.CLIENT)

patches/minecraft/net/minecraft/client/data/models/ModelProvider.java.patch

@@ -1,111 +0,0 @@
---- a/net/minecraft/client/data/models/ModelProvider.java
-+++ b/net/minecraft/client/data/models/ModelProvider.java
-@@ -45,11 +_,11 @@
- 
-     @Override
-     public CompletableFuture<?> run(CachedOutput p_376268_) {
--        ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector();
--        ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector();
-+        ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(this::getKnownItems);
-+        ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
-         ModelProvider.SimpleModelCollector modelprovider$simplemodelcollector = new ModelProvider.SimpleModelCollector();
--        new BlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
--        new ItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-+         getBlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-+         getItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
-         modelprovider$blockstategeneratorcollector.validate();
-         modelprovider$iteminfocollector.finalizeAndValidate();
-         return CompletableFuture.allOf(
-@@ -59,6 +_,22 @@
-         );
-     }
- 
-+    protected Stream<Block> getKnownBlocks() {
-+         return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace()));
-+    }
-+
-+    protected Stream<Item> getKnownItems() {
-+        return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace()));
-+    }
-+
-+    protected BlockModelGenerators getBlockModelGenerators(BlockStateGeneratorCollector blocks, ItemInfoCollector items, SimpleModelCollector models) {
-+        return new BlockModelGenerators(blocks, items, models);
-+    }
-+
-+    protected ItemModelGenerators getItemModelGenerators(ItemInfoCollector items, SimpleModelCollector models) {
-+        return new ItemModelGenerators(items, models);
-+    }
-+
-     @Override
-     public final String getName() {
-         return "Model Definitions";
-@@ -67,6 +_,15 @@
-     @OnlyIn(Dist.CLIENT)
-     public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> {
-         private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>();
-+        private final Supplier<Stream<Block>> known;
-+
-+        public BlockStateGeneratorCollector() {
-+            this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace())));
-+        }
-+
-+        public BlockStateGeneratorCollector(Supplier<Stream<Block>> known) {
-+            this.known = known;
-+        }
- 
-         public void accept(BlockModelDefinitionGenerator p_393399_) {
-             Block block = p_393399_.block();
-@@ -77,7 +_,7 @@
-         }
- 
-         public void validate() {
--            Stream<Holder.Reference<Block>> stream = BuiltInRegistries.BLOCK.listElements().filter(p_376480_ -> true);
-+            Stream<Holder.Reference<Block>> stream = known.get().map(Block::builtInRegistryHolder);
-             List<ResourceLocation> list = stream.filter(p_378423_ -> !this.generators.containsKey(p_378423_.value()))
-                 .map(p_378200_ -> p_378200_.key().location())
-                 .toList();
-@@ -97,6 +_,15 @@
-     public static class ItemInfoCollector implements ItemModelOutput {
-         private final Map<Item, ClientItem> itemInfos = new HashMap<>();
-         private final Map<Item, Item> copies = new HashMap<>();
-+        private final Supplier<Stream<Item>> known;
-+
-+        public ItemInfoCollector() {
-+            this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace())));
-+        }
-+
-+        public ItemInfoCollector(Supplier<Stream<Item>> known) {
-+            this.known = known;
-+        }
- 
-         @Override
-         public void accept(Item p_376450_, ItemModel.Unbaked p_378513_) {
-@@ -115,7 +_,7 @@
-             this.copies.put(p_376965_, p_377438_);
-         }
- 
--        public void finalizeAndValidate() {
-+        public void generateDefaultBlockModels() {
-             BuiltInRegistries.ITEM.forEach(p_378629_ -> {
-                 if (!this.copies.containsKey(p_378629_)) {
-                     if (p_378629_ instanceof BlockItem blockitem && !this.itemInfos.containsKey(blockitem)) {
-@@ -124,6 +_,8 @@
-                     }
-                 }
-             });
-+        }
-+        public void finalizeAndValidate() {
-             this.copies.forEach((p_376289_, p_375718_) -> {
-                 ClientItem clientitem = this.itemInfos.get(p_375718_);
-                 if (clientitem == null) {
-@@ -132,8 +_,8 @@
-                     this.register(p_376289_, clientitem);
-                 }
-             });
--            List<ResourceLocation> list = BuiltInRegistries.ITEM
--                .listElements()
-+            List<ResourceLocation> list = known.get()
-+                .map(item -> item.builtInRegistryHolder())
-                 .filter(p_377225_ -> !this.itemInfos.containsKey(p_377225_.value()))
-                 .map(p_378591_ -> p_378591_.key().location())
-                 .toList();

patches/minecraft/net/minecraft/client/gui/Font.java.patch

@@ -1,11 +1,20 @@
 --- a/net/minecraft/client/gui/Font.java
 +++ b/net/minecraft/client/gui/Font.java
-@@ -32,7 +_,7 @@
- import org.joml.Matrix4f;
+@@ -31,7 +_,7 @@
+ import org.joml.Vector3f;
  
  @OnlyIn(Dist.CLIENT)
 -public class Font {
 +public class Font implements net.minecraftforge.client.extensions.IForgeFont {
      private static final float EFFECT_DEPTH = 0.01F;
-     private static final float OVER_EFFECT_DEPTH = 0.01F;
-     private static final float UNDER_EFFECT_DEPTH = -0.01F;
+     private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
+     public static final int ALPHA_CUTOFF = 8;
+@@ -322,6 +_,8 @@
+     public StringSplitter getSplitter() {
+         return this.splitter;
+     }
++
++    @Override public Font self() { return this; }
+ 
+     @OnlyIn(Dist.CLIENT)
+     public static enum DisplayMode {

patches/minecraft/net/minecraft/client/gui/Gui.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -151,7 +_,7 @@
+@@ -131,7 +_,7 @@
      public float vignetteBrightness = 1.0F;
      private int toolHighlightTimer;
      private ItemStack lastToolHighlight = ItemStack.EMPTY;
@@ -9,63 +9,44 @@
      private final SubtitleOverlay subtitleOverlay;
      private final SpectatorGui spectatorGui;
      private final PlayerTabOverlay tabList;
-@@ -194,6 +_,7 @@
-             () -> new JumpableVehicleBarRenderer(p_330021_)
-         );
-         this.resetTitleTimes();
-+        net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.init(this, p_330021_);
-     }
- 
-     public void resetTitleTimes() {
-@@ -204,6 +_,10 @@
- 
-     public void render(GuiGraphics p_282884_, DeltaTracker p_342095_) {
-         if (this.minecraft.screen == null || !(this.minecraft.screen instanceof ReceivingLevelScreen)) {
-+            if (Boolean.valueOf(true)) {
-+                net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.beginRender(p_282884_, p_342095_);
-+                return;
-+            }
-             if (!this.minecraft.options.hideGui) {
-                 this.renderCameraOverlays(p_282884_, p_342095_);
-                 this.renderCrosshair(p_282884_, p_342095_);
-@@ -377,7 +_,7 @@
-             int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
-             int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
-             p_329202_.nextStratum();
+@@ -318,7 +_,7 @@
+             Window window = this.minecraft.getWindow();
+             int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
+             int j = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
 -            this.chat.render(p_329202_, this.tickCount, i, j, false);
 +            net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
          }
      }
  
-@@ -472,6 +_,8 @@
+@@ -434,6 +_,8 @@
  
              for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
                  Holder<MobEffect> holder = mobeffectinstance.getEffect();
 +                var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
 +                if (!renderer.isVisibleInGui(mobeffectinstance)) continue;
                  if (mobeffectinstance.showIcon()) {
-                     int k = p_282812_.guiWidth();
-                     int l = 1;
-@@ -502,6 +_,7 @@
+                     int i = p_282812_.guiWidth();
+                     int j = 1;
+@@ -463,6 +_,7 @@
                          }
                      }
  
-+                    if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, k, l, 0, f)) continue;
-                     p_282812_.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(holder), k + 3, l + 3, 18, 18, ARGB.white(f));
-                 }
-             }
-@@ -598,6 +_,10 @@
++                    if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, i, j, 0, f)) continue;
+                     TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
+                     int l1 = i;
+                     int i1 = j;
+@@ -625,6 +_,10 @@
      }
  
-     public void renderSelectedItemName(GuiGraphics p_283501_) {
+     private void renderSelectedItemName(GuiGraphics p_283501_) {
 +        renderSelectedItemName(p_283501_, 0);
 +    }
 +
 +    public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
-         Profiler.get().push("selectedItemName");
+         this.minecraft.getProfiler().push("selectedItemName");
          if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
              MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
-@@ -605,9 +_,13 @@
+@@ -632,9 +_,13 @@
                  mutablecomponent.withStyle(ChatFormatting.ITALIC);
              }
  
@@ -81,17 +62,17 @@
              if (!this.minecraft.gameMode.canHurtPlayer()) {
                  k += 14;
              }
-@@ -618,7 +_,7 @@
+@@ -645,7 +_,7 @@
              }
  
              if (l > 0) {
--                p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, ARGB.color(l, -1));
-+                p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, ARGB.color(l, -1));
+-                p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, FastColor.ARGB32.color(l, -1));
++                p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, FastColor.ARGB32.color(l, -1));
              }
          }
  
 @@ -1146,7 +_,7 @@
-             ItemStack itemstack = this.minecraft.player.getInventory().getSelectedItem();
+             ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
              if (itemstack.isEmpty()) {
                  this.toolHighlightTimer = 0;
 -            } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {