Add protection against large network channel lists

Better optimize the scanning for object holders by unrolling streams.

.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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,4 +10,4 @@ assignees: ''
 <!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
 <!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
 <!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
-<!-- Discord: https://discord..minecraftforge.net/ -->
+<!-- Discord: https://discord.gg/UvedJ9m -->

.github/ISSUE_TEMPLATE/issue_report.md

@@ -11,7 +11,6 @@ assignees: ''
 
 <!-- For support with crashes and issues, please create a post on the forum instead: -->
 <!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
-<!-- You can also use the discord for support, https://discord.minecraftforge.net/ -->
 
 **Minecraft Version:** {Minecraft version}
 

.github/workflows/publish.yml

@@ -2,7 +2,7 @@ name: Publish
 
 on:
   push:
-    branches: [ '26.1.2' ]
+    branches: [ '1.21.3' ]
 
 permissions:
   contents: read

.gitignore

@@ -41,9 +41,3 @@ src/*/generated/**/.cache/
 
 /ForgeRoot.ipr
 /ForgeRoot.iws
-
-# APT stuff
-/*/.gitignore
-/*/.factorypath
-/*/.apt_generated/
-/fmlcore/logs/

build.gradle

@@ -4,19 +4,20 @@ 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.51,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.51,6.2)' apply false
+    id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false
     id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
-    id 'org.barfuin.gradle.taskinfo' version '3.0.1'
+    id 'org.barfuin.gradle.taskinfo' version '2.1.0'
 }
 
 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)
 }
 
@@ -41,9 +42,6 @@ project(':mcp') {
         config MC_VERSION + '-' + MCP_VERSION
         pipeline = 'joined'
     }
-    repositories {
-        mavenLocal()
-    }
 }
 
 if (System.env.TEAMCITY_VERSION) {

buildSrc/build.gradle

@@ -7,7 +7,6 @@ dependencies {
     implementation 'org.ow2.asm:asm:9.9.1'
     implementation 'org.ow2.asm:asm-tree:9.9.1'
     implementation 'net.minecraftforge:srgutils:0.6.2'
-    implementation 'net.minecraftforge:JarJarMetadata:0.3.27'
     implementation 'commons-io:commons-io:2.13.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'

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

@@ -10,11 +10,13 @@ import java.util.zip.ZipFile
 
 abstract class BundleList extends DefaultTask {
     @InputFiles abstract ConfigurableFileCollection getConfig()
+    @InputFiles abstract ConfigurableFileCollection getConfigExtra()
     @InputFile abstract RegularFileProperty getServerBundle()
     @OutputFile abstract RegularFileProperty getOutput()
 
     BundleList() {
         config.setFrom(project.configurations.installer)
+        configExtra.setFrom(project.configurations.installerextra)
         output.convention(project.layout.buildDirectory.file("$name/output.list"))
         configure {
             dependsOn(project.tasks.universalJar)
@@ -34,6 +36,13 @@ abstract class BundleList extends DefaultTask {
             entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
         }
 
+        resolved = project.configurations.installerextra.resolvedConfiguration.resolvedArtifacts
+        for (def dep : resolved) {
+            def info = Util.getMavenInfoFromDep(dep)
+            //println("$dep.file.sha1\t$info.name\t$info.path")
+            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
+        }
+
         var packed = (AbstractArchiveTask) project.tasks.universalJar
         var info = Util.getMavenInfoFromTask(packed)
         def file = packed.archiveFile.get().asFile
@@ -53,10 +62,6 @@ abstract class BundleList extends DefaultTask {
                 def (group, name, other) = artifact.split(':', 3)
                 //println("Group: $group Name: $name")
                 def key = "$group:$name"
-                if (other.indexOf(':') != -1){
-                    key += ':' + other.split(':', 2)[1]
-                    //println("\tKey: $key")
-                }
                 if (!entries.containsKey(key))
                     entries.put(key, line)
             }

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/JarJarMetadataOptions.java

@@ -1,415 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.forge.tasks;
-
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.minecraftforge.jarjar.metadata.ContainedJarIdentifier;
-import net.minecraftforge.jarjar.metadata.ContainedJarMetadata;
-import net.minecraftforge.jarjar.metadata.ContainedVersion;
-import net.minecraftforge.jarjar.metadata.Metadata;
-import net.minecraftforge.jarjar.metadata.MetadataIOHandler;
-import net.minecraftforge.jarjar.metadata.json.ArtifactVersionSerializer;
-import net.minecraftforge.jarjar.metadata.json.ContainedJarIdentifierSerializer;
-import net.minecraftforge.jarjar.metadata.json.ContainedJarMetadataSerializer;
-import net.minecraftforge.jarjar.metadata.json.ContainedVersionSerializer;
-import net.minecraftforge.jarjar.metadata.json.MetadataSerializer;
-import net.minecraftforge.jarjar.metadata.json.VersionRangeSerializer;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.groovy.runtime.InvokerHelper;
-import org.gradle.api.Action;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.ExternalModuleDependency;
-import org.gradle.api.artifacts.FileCollectionDependency;
-import org.gradle.api.artifacts.MinimalExternalModuleDependency;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.ResolvedArtifact;
-import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.provider.SetProperty;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.TaskAction;
-
-import javax.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serial;
-import java.io.Serializable;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.zip.ZipFile;
-
-// TODO SUPER SUPER SUPER UGLY, CLEAN UP IN FORGEDEV 7
-@Deprecated(forRemoval = true) // Will be moved to JarJar plugin in ForgeDev 7
-public abstract class JarJarMetadataOptions extends DefaultTask {
-    private static final Gson GSON = new GsonBuilder()
-        .registerTypeAdapter(VersionRange.class, new VersionRangeSerializer())
-        .registerTypeAdapter(ArtifactVersion.class, new ArtifactVersionSerializer())
-        .registerTypeAdapter(DefaultArtifactVersion.class, new ArtifactVersionSerializer())
-        .registerTypeAdapter(ContainedJarIdentifier.class, new ContainedJarIdentifierSerializer())
-        .registerTypeAdapter(ContainedJarMetadata.class, new ContainedJarMetadataSerializer())
-        .registerTypeAdapter(ContainedVersion.class, new ContainedVersionSerializer())
-        .registerTypeAdapter(Metadata.class, new MetadataSerializer())
-        .setPrettyPrinting()
-        .create();
-
-    protected abstract @Input SetProperty<ResolvedDependencyInfoImpl> getResolvedDependencies();
-
-    protected abstract @OutputFile RegularFileProperty getMetadataFile();
-
-    protected abstract @Inject ProjectLayout getLayout();
-
-    // NOTE: I'm not adding a non-provider version. please just use the version catalog entries for now.
-    public void add(Provider<MinimalExternalModuleDependency> dependency, Action<? super ResolvedDependencyInfo> action) {
-        this.getResolvedDependencies().add(dependency.map(d -> {
-            var ret = ResolvedDependencyInfoImpl.from(this.getProject().getConfigurations(), d);
-            action.execute(ret);
-            return ret;
-        }));
-    }
-
-    @Inject
-    public JarJarMetadataOptions() {
-        this.getMetadataFile().convention(this.getLayout().getBuildDirectory().file(this.getName() + "/options.json"));
-    }
-
-    @TaskAction
-    protected void exec() {
-        record ForgeLocaterOptions(String resource, String layer, String id, List<ContainedJarMetadata> deps, ContainedJarMetadata meta, boolean nested) { }
-
-        var resolved = this.getResolvedDependencies().get();
-        var jars = new ArrayList<ForgeLocaterOptions>(resolved.size());
-        for (var dependency : resolved) {
-            var deps = new ArrayList<ContainedJarMetadata>();
-            try (var zip = new ZipFile(dependency.artifact)) {
-                var entry = zip.getEntry("META-INF/jarjar/metadata.json");
-                if (entry != null) {
-                    try (var stream = zip.getInputStream(entry)) {
-                        var meta = MetadataIOHandler.fromStream(stream).orElse(null);
-                        if (meta == null)
-                            throw new IllegalStateException("Corrupt metadata.json in " + dependency.artifact.getAbsolutePath());
-                        for (var dep : meta.jars())
-                            deps.add(new ContainedJarMetadata(dep.identifier(), dep.version(), "", dep.isObfuscated()));
-                    }
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-            jars.add(new ForgeLocaterOptions(
-                dependency.resource,
-                dependency.layer,
-                dependency.identifier,
-                deps,
-                new ContainedJarMetadata(
-                    new ContainedJarIdentifier(validateGroup(dependency), dependency.module.getName()),
-                    new ContainedVersion(null, parseVersion(dependency)),
-                    Objects.requireNonNull(dependency.path, "Dependency path is unspecified: " + dependency.asString),
-                    false
-                ),
-                dependency.nested
-            ));
-        }
-
-        try {
-            record Meta(List<ForgeLocaterOptions> options){}
-
-            Files.writeString(
-                this.getMetadataFile().getAsFile().get().toPath(),
-                GSON.toJson(new Meta(jars), Meta.class)
-            );
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private String validateGroup(ResolvedDependencyInfoImpl dependency) {
-        try {
-            return Objects.requireNonNull(dependency.module.getGroup());
-        } catch (NullPointerException e) {
-            throw new IllegalArgumentException("Module dependency has no group: " + dependency.asString, e);
-        }
-    }
-
-    private ArtifactVersion parseVersion(ResolvedDependencyInfoImpl resolved) {
-        try {
-            return VersionRange.createFromVersionSpec(Objects.requireNonNull(resolved.version)).getRecommendedVersion();
-        } catch (InvalidVersionSpecificationException e) {
-            throw new IllegalArgumentException("Version is invalid for: " + resolved.asString, e);
-        } catch (NullPointerException e) {
-            throw new IllegalArgumentException("Version is unspecified for: " + resolved.asString, e);
-        }
-    }
-
-    private VersionRange parseVersionRange(ResolvedDependencyInfoImpl dependency) {
-        if (dependency.hasManuallySpecifiedRange) {
-            try {
-                return VersionRange.createFromVersionSpec(dependency.versionRange);
-            } catch (InvalidVersionSpecificationException e) {
-                throw new IllegalArgumentException("Version is invalid for: " + dependency.asString, e);
-            }
-        } else {
-            try {
-                return VersionRange.createFromVersionSpec("[%s,)".formatted(Objects.requireNonNull(dependency.versionRange)));
-            } catch (InvalidVersionSpecificationException e) {
-                throw new IllegalArgumentException("Version range is invalid for: " + dependency.asString, e);
-            } catch (NullPointerException e) {
-                throw new IllegalArgumentException("Version is unspecified for: " + dependency.asString, e);
-            }
-        }
-    }
-
-    public interface ResolvedDependencyInfo {
-        void containedJarMetadata(Action<? super ContainedJarMetadataInfo> action);
-
-        void setResource(String resource);
-
-        void setLayer(String layer);
-
-        void setId(String identifier);
-
-        void setNested(boolean nested);
-
-        interface ContainedJarMetadataInfo {
-            void setGroup(String group);
-
-            void setName(String name);
-
-            void setPath(String version);
-        }
-    }
-
-    static final class ResolvedDependencyInfoImpl implements ResolvedDependencyInfo, ResolvedDependencyInfo.ContainedJarMetadataInfo, Serializable {
-        private static final @Serial long serialVersionUID = -7577318115877822993L;
-
-        final MinimalModuleVersionIdentifier module;
-        final String version;
-        String versionRange;
-        boolean hasManuallySpecifiedRange;
-        boolean nested;
-        final File artifact;
-        String path;
-        String resource;
-        String layer;
-        String identifier;
-        final String asString;
-
-        public ResolvedDependencyInfoImpl(MinimalModuleVersionIdentifier module, String version, File artifact, String asString) {
-            this.module = module;
-            this.version = version;
-            this.artifact = artifact;
-            this.asString = asString;
-        }
-
-        @Override
-        public void containedJarMetadata(Action<? super ContainedJarMetadataInfo> action) {
-            action.execute(this);
-        }
-
-        @Override
-        public void setGroup(String group) {
-            this.module.group = group;
-        }
-
-        @Override
-        public void setName(String name) {
-            this.module.name = name;
-        }
-
-        @Override
-        public void setPath(String path) {
-            this.path = path;
-        }
-
-        @Override
-        public void setResource(String resource) {
-            this.resource = resource;
-        }
-
-        @Override
-        public void setLayer(String layer) {
-            this.layer = layer;
-        }
-
-        @Override
-        public void setId(String identifier) {
-            this.identifier = identifier;
-        }
-
-        @Override
-		public void setNested(boolean nested) {
-			this.nested = nested;
-		}
-
-        static Set<File> getFiles(Set<ResolvedDependencyInfoImpl> resolvedDependencies) {
-            var ret = new HashSet<File>(resolvedDependencies.size());
-            for (var dependency : resolvedDependencies) {
-                ret.add(dependency.artifact);
-            }
-            return ret;
-        }
-
-        static ResolvedDependencyInfoImpl from(ConfigurationContainer configurations, Dependency dependency) {
-            var group = dependency.getGroup();
-            var name = dependency.getName();
-            var version = dependency.getVersion();
-
-            if (dependency instanceof FileCollectionDependency filesDependency) {
-                File artifact;
-                try {
-                    artifact = filesDependency.getFiles().getSingleFile();
-                } catch (IllegalStateException e) {
-                    // TODO fileCollectionDependencyIsNotSingleFile
-                    throw e;
-                }
-
-                return new ResolvedDependencyInfoImpl(
-                    new MinimalModuleVersionIdentifier(group, name, version),
-                    version,
-                    artifact,
-                    filesDependency.toString()
-                );
-            } else if (dependency instanceof ModuleDependency moduleDependency) {
-                moduleDependency = moduleDependency.copy();
-                if (moduleDependency instanceof ExternalModuleDependency externalModuleDependency) {
-                    externalModuleDependency.version(v -> v.strictly(version.toString()));
-                }
-
-                var detachedConfiguration = configurations.detachedConfiguration(moduleDependency);
-                detachedConfiguration.setTransitive(false);
-
-                ResolvedDependencyInfoImpl ret = null;
-                for (var artifact : detachedConfiguration.getResolvedConfiguration().getFirstLevelModuleDependencies().iterator().next().getModuleArtifacts()) {
-                    var fileName = getFileName(artifact);
-                    if (!fileName.endsWith(".jar"))
-                        continue;
-
-                    if (ret != null)
-                        throw new IllegalArgumentException("Module dependency has too many Jar artifacts: " + moduleDependency);
-
-                    ret = new ResolvedDependencyInfoImpl(
-                        new MinimalModuleVersionIdentifier(group, name, artifact.getModuleVersion().getId().getVersion()),
-                        version,
-                        artifact.getFile(),
-                        moduleDependency.toString()
-                    );
-                }
-                if (ret == null)
-                    throw new IllegalArgumentException("Module dependency has no Jar artifacts: " + moduleDependency);
-
-                return ret;
-            } else {
-                throw new IllegalArgumentException("Unsupported dependency type: " + dependency.getClass().getName() + " -- " + dependency);
-            }
-        }
-
-        private static String getFileName(ResolvedArtifact artifact) {
-            try {
-                return InvokerHelper.getProperty(artifact.getId(), "fileName").toString();
-            } catch (Throwable e) {
-                // NOTE: Why not just use this to begin with?
-                // ComponentArtifactIdentifier can have a getFileName() method, which doesn't necessarily resolve the file itself.
-                // This allows us to get the name of the file to be used without asking Gradle to download the file.
-                // So, if a file is not a JAR file, we can check the name without actually downloading it.
-                return artifact.getFile().getName();
-            }
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) return true;
-            if (obj == null || obj.getClass() != this.getClass()) return false;
-            var that = (ResolvedDependencyInfoImpl) obj;
-            return Objects.equals(this.module, that.module) &&
-                Objects.equals(this.version, that.version) &&
-                Objects.equals(this.versionRange, that.versionRange) &&
-                Objects.equals(this.artifact, that.artifact);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(module, version, versionRange, artifact);
-        }
-
-        @Override
-        public String toString() {
-            return "ResolvedDependencyInfo[" +
-                "module=" + module + ", " +
-                "fixedVersion=" + version + ", " +
-                "versionRange=" + versionRange + ", " +
-                "artifact=" + artifact + ']';
-        }
-
-        static final class MinimalModuleVersionIdentifier implements ModuleIdentifier, ModuleVersionIdentifier {
-            private static final @Serial long serialVersionUID = -955346236759069739L;
-
-            private String group;
-            private String name;
-            private final String version;
-
-            @Inject
-            public MinimalModuleVersionIdentifier(String group, String name, String version) {
-                this.group = group;
-                this.name = name;
-                this.version = version;
-            }
-
-            @Override
-            public ModuleIdentifier getModule() {
-                return this;
-            }
-
-            @Override
-            public String getGroup() {
-                return this.group;
-            }
-
-            @Override
-            public String getName() {
-                return this.name;
-            }
-
-            @Override
-            public String getVersion() {
-                return this.version;
-            }
-
-            @Override
-            public boolean equals(Object obj) {
-                return this == obj || obj instanceof MinimalModuleVersionIdentifier o
-                    && Objects.equals(this.group, o.group)
-                    && Objects.equals(this.name, o.name)
-                    && Objects.equals(this.version, o.version);
-            }
-
-            @Override
-            public int hashCode() {
-                return Objects.hash(group, name, version);
-            }
-
-            @Override
-            public String toString() {
-                return "MinimalModuleVersionIdentifier[" +
-                    "group=" + group + ", " +
-                    "name=" + name + ", " +
-                    "version=" + version + ']';
-            }
-        }
-    }
-}

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

@@ -24,6 +24,7 @@ abstract class LauncherJson extends DefaultTask {
         dependsOn(project.tasks.universalJar)
         input.from(project.tasks.universalJar.archiveFile)
         input.from(project.configurations.installer)
+        input.from(project.configurations.installerextra)
         configure {
             def mc    = project.rootProject.ext.MC_VERSION
             def forge = project.rootProject.ext.FORGE_VERSION
@@ -88,6 +89,7 @@ abstract class LauncherJson extends DefaultTask {
             ]
         ])
 
+        json.libraries.addAll(getArtifacts(project.configurations.installerextra).values())
         json.libraries.addAll(getArtifacts(project.configurations.installer).values())
         Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
     }

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

@@ -17,15 +17,17 @@ abstract class CheckATs extends CheckTask {
 
     @InputFile abstract RegularFileProperty getInheritance()
     @InputFiles abstract ConfigurableFileCollection getAts()
+    @InputFile @Optional abstract RegularFileProperty getMappings()
 
     @Override
     void check(Reporter reporter, boolean fix) {
+        final IMappingFile mappings = mappings.map { RegularFile it -> IMappingFile.load(it.asFile) }.getOrNull()
         final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
 
         ats.each {
             final lines = process(it, reporter, inheritance)
             if (fix) {
-                it.text = joinBack(lines, inheritance).join('\n')
+                it.text = joinBack(lines, inheritance, mappings).join('\n')
             }
         }
     }
@@ -168,18 +170,45 @@ abstract class CheckATs extends CheckTask {
         return lines
     }
 
-    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance) {
+    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance, IMappingFile mappings) {
         final data = [] as List<String>
+        final remapComment = { ATParser.Entry entry ->
+            if (!mappings || !entry || !entry.desc) return null
+            final comment = entry.comment?.substring(1)?.trim()
+            final jsonCls = inheritance.get(entry.cls.replaceAll('\\.', '/'))
+            final mappingsClass = mappings?.getClass(jsonCls.name)
+            if (mappingsClass === null) return entry.comment
+            final idx = entry.desc.indexOf('(')
+
+            String mappedName = idx == -1
+                    ? mappingsClass.remapField(entry.desc)
+                    : mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
+            if (!mappedName) return entry.comment
+            if (mappedName == '<init>')
+                mappedName = 'constructor'
+
+            if (comment?.startsWith(mappedName))
+                return '# ' + comment
+            if (comment && comment.indexOf(' ') !== -1) {
+                def split = comment.split(' - ').toList()
+                if (split[0].indexOf(' ') !== -1)
+                // The first string is more than one word, so append before it
+                    return "# ${mappedName} - ${comment}"
+                split.remove(0)
+                return "# ${mappedName} - ${String.join(' - ', split)}"
+            }
+            return '# ' + mappedName
+        }
         lines.each { key, value ->
             if (!value.group) {
-                def comment = null //value.comment
+                def comment = remapComment.call(value)
                 data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
             } else {
                 data.add(('#group ' + value.modifier + ' ' + key + ' ' + (value.comment ?: '')).trim())
                 value.children.each {
                     final line = value.modifier + ' ' + it
                     final entry = ATParser.parseEntry(line)
-                    final comment = null //entry.comment
+                    final comment = remapComment(entry)
                     data.add(line + (comment ? ' ' + comment : ''))
                 }
                 data.add('#endgroup')
@@ -260,7 +289,6 @@ class ATParser {
         final String comment = idx === -1 ? null : line.substring(idx)
         if (idx !== -1) line = line.substring(0, idx - 1)
         final data = (line.trim() + '     ').split(' ', -1)
-    	data[1] = data[1].replaceAll('/', '.') // Convert to Source names, internal names are fine by spec, but not supported by old AST based AT implementations.
         new Entry(data[0], data[1], data[2], comment)
     }
 

build_forge.gradle

@@ -71,7 +71,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.
@@ -88,17 +88,21 @@ ext {
 }
 final String MAVEN_PATH = ext.MAVEN_PATH
 
-final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.3.0:fatjar'
-final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.5'
+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.2.0: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 { 
+        extendsFrom(bootstrap)
+        transitive = false 
     }
     api.extendsFrom(installer)
 }
@@ -108,30 +112,28 @@ dependencies {
     // And this is only needed because custom file systems are REQUIRED to be on the boot classloader.
     // This has ASM/BootStrap/Unsafe all because I haven't gotten around to moving UnionFileSystem out to its own project.
     bootstrap(libs.jarjar.fs)     // JarInJar file system
-    bootstrap(libs.roimfs)        // JarInJar File System - FileSystems need to be on boot loader.
     bootstrap(libs.bundles.jimfs) // In memory file system used for ForgeDev launches
     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.api)
+    installer(libs.coremods)
+    installer(libs.nashorn) // Dep of Coremods
     installer(libs.modlauncher)
     installer(libs.mergetool.api)
     installer(libs.bundles.night.config)
     installer(libs.maven.artifact)
     installer(libs.bundles.terminalconsoleappender)
     installer(libs.mixin)
-    installer(libs.mixinextras.forge)
     installer(libs.bundles.jarjar)
-    installer(libs.roimfs)
 
     installer(project(':fmlcore'))
     installer(project(':fmlloader'))
@@ -139,28 +141,16 @@ dependencies {
     installer(project(':javafmllanguage'))
     installer(project(':lowcodelanguage'))
     installer(project(':mclanguage'))
-    installer(project(':forge-transformers'))
+
+    installerextra("${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:srg2off")
 
     runtimeOnly(libs.bootstrap)
     runtimeOnly(libs.bootstrap.dev)
-
-    annotationProcessor(libs.eventbus.validator)
 }
 
 tasks.named('extractRangeMap').configure {
     tool = S2S_TOOL
 }
-tasks.named('applyRangeMap').configure {
-	tool = S2S_TOOL
-}
-tasks.named('applyRangeMapBase').configure {
-	tool = S2S_TOOL
-}
-
-// Disable all tests, we have GameTests not JUnit tests
-test {
-    exclude '**/*'
-}
 
 patcher {
     excs.from file("$rootDir/src/main/resources/forge.exc")
@@ -175,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',
@@ -216,7 +206,9 @@ patcher {
             args '--launchTarget', 'forge_dev_data',
                  '--mod', 'forge',
                  '--all',
+                 '--validate',
                  '--output', rootProject.file('src/main/generated/'),
+                 '--validate',
                  '--existing', sourceSets.main.resources.srcDirs[0],
                  '--assetsDir', downloadAssets.output,
                  '--assetIndex', "{asset_index}"
@@ -227,30 +219,7 @@ patcher {
             args '--launchTarget', 'forge_dev_data',
                  '--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}"
-        }
-
-        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',
+                 '--validate',
                  '--output', rootProject.file('src/test/generated/'),
                  '--existing', sourceSets.main.resources.srcDirs[0],
                  '--existing', sourceSets.test.resources.srcDirs[0],
@@ -269,6 +238,21 @@ afterEvaluate {
         userdevJar {
             onlyIf = { t -> true }
         }
+        def patches = project.file('build/genPatchesForUserdev/output/')
+        patches.mkdirs()
+        def genPatchesForUserdev = tasks.register('genPatchesForUserdev', GeneratePatches){
+            base = project(':mcp').setupMCP.output
+            modified = applyRangeMapBase.output
+            originalPrefix = genPatches.originalPrefix
+            modifiedPrefix = genPatches.modifiedPrefix
+            output = patches
+            autoHeader true
+            lineEnding = '\n'
+        }
+        bakePatches {
+            dependsOn = []
+            input = genPatchesForUserdev.get().output
+        }
     }
 }
 
@@ -283,16 +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)
     }
-
-    // TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config
-    //      so we don't gotta keep making exceptions for MixinExtras
-    addCompileDependency(libs.mixinextras.common)
-    addAnnotationProcessorDependency(libs.mixinextras.common)
-
+    
     inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
     runs {
         client {
@@ -304,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'
@@ -335,7 +307,7 @@ for (def run in patcher.runs + tasks.userdevConfig.runs) {
     if (run.parents) continue // We already added this to the parent run config
     //run.property 'bsl.debug', 'true'
     run.args '--gameDir', '.'
-    run.jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
+    run.jvmArgs '-Djava.net.preferIPv6Addresses=system'
     run.client run.name.contains('client')
     run.main 'net.minecraftforge.bootstrap.ForgeBootstrap'
 }
@@ -408,9 +380,8 @@ tasks.register('extractInheritance', ExtractInheritance) {
     }
 }
 tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
-	dependsOn downloadClientRaw
-    jar = downloadClientRaw.dest
-    output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json')
+    jar = createClientOfficial.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.
@@ -434,39 +405,62 @@ tasks.register("downloadServerShim", DownloadMavenArtifact) {
     artifact = libs.bootstrap.shim.get().toString()
     changing = true
 }
+tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
+    ext.output = file('build/client_mappings.tsrg')
+    tool = INSTALLER_TOOLS + ':fatjar'
+    args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'client', '--output', output.absolutePath]
+    outputs.file(output)
+}
+tasks.register('downloadServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
+    ext.output = file('build/server_mappings.tsrg')
+    tool = INSTALLER_TOOLS + ':fatjar'
+    args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath]
+    outputs.file(output)
+}
 tasks.register("createJoinedSRG", DownloadMavenArtifact) {
-    artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}"
+    artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg"
+}
+tasks.register("createClientOfficial", RenameJar) {
+    tool = FART + ':all'
+    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
+    mappings = downloadClientMappings.output
+    dependsOn(downloadClientRaw, downloadClientMappings)
+    input = downloadClientRaw.dest
+    output = file("build/createClientOfficial/output.jar")
+}
+tasks.register("createServerOfficial", RenameJar) {
+    tool = FART + ':all'
+    args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
+    mappings = downloadServerMappings.output
+    dependsOn(downloadServerMappings)
+    input = extractServer.output
+    output = file("build/createServerOfficial/output.jar")
 }
 tasks.named('genClientBinPatches').configure {
-    dependsOn(downloadClientRaw)
     tool = BINPATCH_TOOL
-    cleanJar = downloadClientRaw.dest
+    cleanJar = createClientOfficial.output
     dirtyJar = jar.archiveFile
 }
 tasks.named('genServerBinPatches').configure {
-    dependsOn(extractServer)
     tool = BINPATCH_TOOL
-    cleanJar = extractServer.output
+    cleanJar = createServerOfficial.output
     dirtyJar = jar.archiveFile
 }
 tasks.named('genJoinedBinPatches').configure {
     tool = BINPATCH_TOOL
     cleanJar = createJoinedSRG.output
-    dirtyJar = jar.archiveFile
 }
 tasks.register('applyClientBinPatches', ApplyBinPatches) {
-    dependsOn downloadClientRaw
     tool = BINPATCH_TOOL
-    clean = downloadClientRaw.dest
+    clean = createClientOfficial.output
     patch = genClientBinPatches.output
-    args.addAll(['--data', '--unpatched', '--store', '--marker', '.forge_patched_minecraft'])
+    args.addAll(['--data', '--unpatched'])
 }
 tasks.register('applyServerBinPatches', ApplyBinPatches) {
-    dependsOn extractServer
     tool = BINPATCH_TOOL
-    clean = extractServer.output
+    clean = createServerOfficial.output
     patch = genServerBinPatches.output
-    args.addAll(['--data', '--unpatched', '--store'])
+    args.addAll(['--data', '--unpatched'])
 }
 tasks.register('applyJoinedBinPatches', ApplyBinPatches) {
     tool = BINPATCH_TOOL
@@ -482,7 +476,7 @@ tasks.register('createServerShimConfig') {
     doLast {
         var cfg = new CleanProperties()
         cfg['Main-Class'] = 'net.minecraftforge.bootstrap.ForgeBootstrap'
-        cfg['Java-Version'] = '25'
+        cfg['Java-Version'] = '21'
         cfg['Arguments'] = '--launchTarget forge_server'
         cfg.store(output)
     }
@@ -498,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'
@@ -514,9 +508,10 @@ tasks.register('checkAllAndFix') {
 }
 
 CheckTask.registerTask(tasks, 'ATs', CheckATs) {
-    dependsOn extractInheritance
+    dependsOn extractInheritance, createSrg2Mcp
     ats.from patcher.accessTransformers
     inheritance = extractInheritance.output
+    mappings = createSrg2Mcp.output
 }
 
 CheckTask.registerTask(tasks, 'SAS', CheckSAS) {
@@ -590,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)
 }
@@ -603,8 +598,7 @@ tasks.register('launcherJson', LauncherJson).configure {
                 '--launchTarget', 'forge_client'
             ],
             jvm: [
-                '-Djava.net.preferIPv6Addresses=system',
-                '-XX:+UseCompactObjectHeaders'
+                '-Djava.net.preferIPv6Addresses=system'
             ]
         ]
     ] as LinkedHashMap)
@@ -612,14 +606,20 @@ 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)
     // Get 'base' MC jar, Client is straight download, server is extracted from the bundle
     dependsOn(downloadClientRaw, extractServer)
     input.from(downloadClientRaw.dest, extractServer.output)
+    // Rename MC Jar
+    dependsOn(createClientOfficial, createServerOfficial)
+    input.from(createClientOfficial.output, createServerOfficial.output)
     // Apply Binary patches to vanilla jar
     dependsOn(applyClientBinPatches, applyServerBinPatches)
     input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)
@@ -637,6 +637,14 @@ tasks.register('installerJson', InstallerJson) {
             minecraft: MC_VERSION,
             serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar',
             data: [
+                MOJMAPS: [
+                    client: "[net.minecraft:client:${MC_VERSION}:mappings@tsrg]",
+                    server: "[net.minecraft:server:${MC_VERSION}:mappings@tsrg]"
+                ],
+                MOJMAPS_SHA: [
+                    client: "'${downloadClientMappings.output.sha1}'",
+                    server: "'${downloadServerMappings.output.sha1}'"
+                ],
                 MC_UNPACKED: [
                     client: "[net.minecraft:client:${MC_VERSION}]",
                     server: "[net.minecraft:server:${MC_VERSION}:unpacked]"
@@ -645,6 +653,14 @@ tasks.register('installerJson', InstallerJson) {
                     client: "'${downloadClientRaw.dest.sha1}'",
                     server: "'${extractServer.output.get().asFile.sha1}'"
                 ],
+                MC_OFF: [
+                    client: "[net.minecraft:client:${MC_VERSION}:official]",
+                    server: "[net.minecraft:server:${MC_VERSION}:official]"
+                ],
+                MC_OFF_SHA: [
+                    client: "'${createClientOfficial.output.get().asFile.sha1}'",
+                    server: "'${createServerOfficial.output.get().asFile.sha1}'"
+                ],
                 BINPATCH: [
                     client: '/data/client.lzma',
                     server: '/data/server.lzma'
@@ -711,27 +727,52 @@ tasks.register('installerJson', InstallerJson) {
                         '{MC_UNPACKED}': '{MC_UNPACKED_SHA}'
                     ]
                 ], [
-                    sides: ['server'],
-                    jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
-                    classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
+                    jar: INSTALLER_TOOLS,
+                    classpath: INSTALLER_TOOLS_CLASSPATH,
                     args: [
-                        '--clean', '{MC_UNPACKED}',
-                        '--output', '{PATCHED}',
-                        '--apply', '{BINPATCH}',
-                        '--data', '--unpatched', '--store'
+                        '--task', 'DOWNLOAD_MOJMAPS',
+                        '--sanitize',
+                        '--version', MC_VERSION,
+                        '--side', '{SIDE}',
+                        '--output', '{MOJMAPS}'
                     ],
                     outputs: [
-                        '{PATCHED}': '{PATCHED_SHA}'
+                        '{MOJMAPS}': '{MOJMAPS_SHA}'
+                    ]
+                ], [
+                    sides: ['server'],
+                    jar: FART,
+                    classpath: getClasspath(project, libs, FART),
+                    args: [
+                        '--input', '{MC_UNPACKED}',
+                        '--output', '{MC_OFF}',
+                        '--names', '{MOJMAPS}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
+                    ],
+                    outputs: [
+                        '{MC_OFF}': '{MC_OFF_SHA}'
                     ]
                 ], [
                     sides: ['client'],
+                    jar: FART,
+                    classpath: getClasspath(project, libs, FART),
+                    args: [
+                        '--input', '{MINECRAFT_JAR}',
+                        '--output', '{MC_OFF}',
+                        '--names', '{MOJMAPS}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
+                    ],
+                    outputs: [
+                        '{MC_OFF}': '{MC_OFF_SHA}'
+                    ]
+                ], [
                     jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
                     classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
                     args: [
-                        '--clean', '{MINECRAFT_JAR}',
+                        '--clean', '{MC_OFF}',
                         '--output', '{PATCHED}',
                         '--apply', '{BINPATCH}',
-                        '--data', '--unpatched', '--store', '--marker', '.forge_patched_minecraft'
+                        '--data', '--unpatched'
                     ],
                     outputs: [
                         '{PATCHED}': '{PATCHED_SHA}'
@@ -756,7 +797,12 @@ tasks.register('officialClassesOnly', Zip).configure {
 tasks.named('filterJarNew').configure {
     dependsOn('officialClassesOnly')
     input = officialClassesOnly.archiveFile
-    filterInners = true
+}
+
+tasks.register('filterJarNewSRG', FilterNewJar).configure {
+    input = reobfJar.output
+    srg = filterJarNew.srg
+    blacklist = filterJarNew.blacklist
 }
 
 tasks.named('universalJar').configure {
@@ -793,8 +839,18 @@ tasks.named('universalJar').configure {
     jarSigner.sign(it)
 }
 
+tasks.register('universalJarSrg', Jar).configure {
+    from zipTree(filterJarNewSRG.output)
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from zipTree(universalJar.archiveFile)
+    destinationDirectory = file('build/libs')
+    archiveClassifier = 'universal-srg'
+    manifest.from(universalJar.manifest)
+    jarSigner.sign(it)
+}
+
 tasks.named('userdevConfig').configure {
-    universal = "$project.group:$project.name:$project.version:universal@jar"
+    universal = "$project.group:$project.name:$project.version:universal-srg@jar"
 }
 
 tasks.register('installerJar', InstallerJar) {
@@ -869,8 +925,7 @@ tasks.register('mdkZip', Zip) {
             MAPPING_CHANNEL: MAPPING_CHANNEL,
             MAPPING_VERSION: MAPPING_VERSION,
             FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0],
-            MC_NEXT_VERSION: MC_NEXT_VERSION,
-            EVENTBUS_VERSION: libs.versions.eventbus.get()
+            MC_NEXT_VERSION: MC_NEXT_VERSION
         ])
         rename 'gitignore\\.txt', '.gitignore'
         rename 'gitattributes\\.txt', '.gitattributes'
@@ -901,7 +956,7 @@ license {
 }
 
 tasks.register('genAllData') {
-    dependsOn 'forge_data', 'forge_data_test', 'forge_client_data_test'
+    dependsOn 'forge_data', 'forge_test_data'
 }
 
 if (project.hasProperty('UPDATE_MAPPINGS')) {
@@ -917,7 +972,7 @@ if (project.hasProperty('UPDATE_MAPPINGS')) {
 
 tasks.named('javadoc', Javadoc).configure {
     description 'Generates the combined javadocs for the FML projects and the main Forge project'
-    var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage', ':forge-transformers' ]
+    var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage' ]
     source includedProjects.collect { project(it).sourceSets.main.allJava }
     classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath })
 
@@ -995,6 +1050,7 @@ tasks.named('javadoc', Javadoc).configure {
 publishing {
     publications.register('mavenJava', MavenPublication).configure {
         artifact universalJar
+        artifact universalJarSrg
         artifact installerJar
         artifact mdkZip
         artifact userdevJar
@@ -1010,7 +1066,7 @@ publishing {
             license gradleutils.pom.Licenses.LGPLv2_1
         }
     }
-
+    
     repositories {
         maven gradleutils.publishingForgeMaven
     }

build_shared.gradle

@@ -38,17 +38,13 @@ tasks.register('generateResources') {
     dependsOn('writeManifest')
 }
 
-tasks.named('processResources') {
-    dependsOn(generateResources)
-}
-
 // Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
 tasks.withType(JavaCompile).configureEach {
     dependsOn 'generateResources'
     dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
     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.11-&query=$.promos["1.21.11-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=26.1.2-&query=$.promos["26.1.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.21.3-&query=$.promos["1.21.3-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.3-&query=$.promos["1.21.3-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!
@@ -34,13 +34,12 @@ For support and questions, visit [the Support Forum][Support-Forum] or [the Forg
 
 We require the version of Java that Minecraft requires, which is currently:
 
-| Minecraft        | Java              |
-|------------------|-------------------|
-| 26.1+            | [25][Adoptium-25] |
-| 1.20.6 - 1.21.11 | [21][Adoptium-21] |
-| 1.18 - 1.20.4    | [17][Adoptium-17] |
-| 1.17.1           | [16][Adoptium-16] |
-| 1.16.5-          | [8][Adoptium-8]   |
+| Minecraft     | Java              |
+|---------------|-------------------|
+| 1.20.6+       | [21][Adoptium-21] |
+| 1.18 - 1.20.4 | [17][Adoptium-17] |
+| 1.17.1        | [16][Adoptium-16] |
+| 1.16.5-       | [8][Adoptium-8]   |
 
 **If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
 
@@ -71,17 +70,11 @@ 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
 
 [Download]: https://files.minecraftforge.net/
 
-[Adoptium-25]: https://adoptium.net/temurin/releases/?version=25
 [Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
 [Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
 [Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
@@ -100,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

@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml;
+
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.Serializable;
+import java.lang.invoke.SerializedLambda;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.function.Supplier;
+
+/**
+ * Use to execute code conditionally based on sidedness.
+ * <ul>
+ * <li>When you want to call something on one side and return a result {@link #safeCallWhenOn(Dist, Supplier)}</li>
+ * <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>
+ */
+public final class DistExecutor
+{
+    private static final Logger LOGGER = LogManager.getLogger();
+    private DistExecutor() {}
+
+    /**
+     * Run the callable in the supplier only on the specified {@link Dist}.
+     * This method is NOT sided-safe and special care needs to be taken in code using this method that implicit class
+     * loading is not triggered by the Callable.
+     *
+     * This method can cause unexpected ClassNotFound exceptions.
+     *
+     * Use {@link #safeCallWhenOn(Dist, Supplier)} where possible.
+     *
+     * @param dist The dist to run on
+     * @param toRun A supplier of the callable to run (Supplier wrapper to ensure classloading only on the appropriate dist)
+     * @param <T> The return type from the callable
+     * @return The callable's result
+     * @deprecated use {@link #safeCallWhenOn(Dist, Supplier)} instead. This remains for advanced use cases.
+     */
+    @Deprecated
+    public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
+        return unsafeCallWhenOn(dist, toRun);
+    }
+
+    public static <T> T unsafeCallWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
+        if (dist == FMLEnvironment.dist) {
+            try
+            {
+                return toRun.get().call();
+            }
+            catch (Exception e)
+            {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Call the SafeCallable when on the correct {@link Dist}.
+     *
+     * <strong>The lambda supplied here is required to be a method reference to a method defined in
+     * another class, otherwise an invalid SafeReferent error will be thrown</strong>
+     * @param dist the dist which this will run on
+     * @param toRun the SafeCallable to run and return the result from
+     * @param <T> The type of the SafeCallable
+     * @return the result of the SafeCallable or null if on the wrong side
+     */
+    public static <T> T safeCallWhenOn(Dist dist, Supplier<SafeCallable<T>> toRun) {
+        validateSafeReferent(toRun);
+        return callWhenOn(dist, toRun::get);
+    }
+
+    /**
+     * Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #callWhenOn(Dist, Supplier)}.
+     *
+     * This method can cause unexpected ClassNotFound exceptions.
+     *
+     * @see #callWhenOn(Dist, Supplier)
+     * @param dist Dist to run this code on
+     * @param toRun The code to run
+     * @deprecated use {@link #safeRunWhenOn(Dist, Supplier)} where possible. Advanced uses only.
+     */
+    @Deprecated
+    public static void runWhenOn(Dist dist, Supplier<Runnable> toRun) {
+        unsafeRunWhenOn(dist, toRun);
+    }
+    /**
+     * Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #unsafeCallWhenOn(Dist, Supplier)}.
+     *
+     * This method can cause unexpected ClassNotFoundException problems in common scenarios. Understand the pitfalls of
+     * the way the class verifier works to load classes before using this.
+     *
+     * Use {@link #safeRunWhenOn(Dist, Supplier)} if you can.
+     *
+     * @see #unsafeCallWhenOn(Dist, Supplier)
+     * @param dist Dist to run this code on
+     * @param toRun The code to run
+     */
+    public static void unsafeRunWhenOn(Dist dist, Supplier<Runnable> toRun) {
+        if (dist == FMLEnvironment.dist) {
+            toRun.get().run();
+        }
+    }
+
+    /**
+     * Call the supplied SafeRunnable when on the correct Dist.
+     * @param dist The dist to run on
+     * @param toRun The code to run
+     */
+    public static void safeRunWhenOn(Dist dist, Supplier<SafeRunnable> toRun) {
+        validateSafeReferent(toRun);
+        if (dist == FMLEnvironment.dist)  {
+            toRun.get().run();
+        }
+    }
+    /**
+     * Executes one of the two suppliers, based on which side is active.
+     *
+     * <p>
+     *     Example (replacement for old SidedProxy):<br/>
+     * {@code Proxy p = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new);}
+     *
+     * NOTE: the double supplier is required to avoid classloading the secondary target.
+     *
+     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
+     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
+     * @param <T> The common type to return
+     * @return The returned instance
+     * @deprecated Use {@link #safeRunForDist(Supplier, Supplier)}
+     */
+    @Deprecated
+    public static <T> T runForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
+        return unsafeRunForDist(clientTarget, serverTarget);
+    }
+
+    /**
+     * Unsafe version of {@link #safeRunForDist(Supplier, Supplier)}. Use only when you know what you're doing
+     * and understand why the verifier can cause unexpected ClassNotFoundException crashes even when code is apparently
+     * not sided. Ensure you test both sides fully to be confident in using this.
+     *
+     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
+     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
+     * @param <T> The common type to return
+     * @return The returned instance
+     */
+    public static <T> T unsafeRunForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
+        switch (FMLEnvironment.dist)
+        {
+            case CLIENT:
+                return clientTarget.get().get();
+            case DEDICATED_SERVER:
+                return serverTarget.get().get();
+            default:
+                throw new IllegalArgumentException("UNSIDED?");
+        }
+    }
+    /**
+     * Executes one of the two suppliers, based on which side is active.
+     *
+     * <p>
+     *     Example (replacement for old SidedProxy):<br/>
+     * {@code Proxy p = DistExecutor.safeRunForDist(()->ClientProxy::new, ()->ServerProxy::new);}
+     *
+     * NOTE: the double supplier is required to avoid classloading the secondary target.
+     *
+     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
+     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
+     * @param <T> The common type to return
+     * @return The returned instance
+     */
+    public static <T> T safeRunForDist(Supplier<SafeSupplier<T>> clientTarget, Supplier<SafeSupplier<T>> serverTarget) {
+        validateSafeReferent(clientTarget);
+        validateSafeReferent(serverTarget);
+        switch (FMLEnvironment.dist)
+        {
+            case CLIENT:
+                return clientTarget.get().get();
+            case DEDICATED_SERVER:
+                return serverTarget.get().get();
+            default:
+                throw new IllegalArgumentException("UNSIDED?");
+        }
+    }
+
+    /**
+     * A safe referent. This will assert that it is being called via a separated class method reference. This will
+     * avoid the common pitfalls of {@link #callWhenOn(Dist, Supplier)} above.
+     *
+     * SafeReferents assert that they are defined as a separate method outside the scope of the calling class.
+     *
+     * <strong>Implementations need to be defined in a separate class to the referring site, with appropriate
+     * visibility to be accessible at the callsite (generally, avoid private methods).</strong>
+     *
+     * <p>
+     * Valid:<br/>
+     *
+     * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->AnotherClass::clientOnlyMethod);}
+     *
+     * <p>
+     * Invalid:<br/>
+     *
+     * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->()->Minecraft.getInstance().world);}
+     */
+    public interface SafeReferent {}
+
+    /**
+     * SafeCallable version of {@link SafeReferent}.
+     * @see SafeReferent
+     * @param <T> The return type of the Callable
+     */
+    public interface SafeCallable<T> extends SafeReferent, Callable<T>, Serializable {}
+
+    /**
+     * SafeSupplier version of {@link SafeReferent}
+     * @param <T> The return type of the Supplier
+     */
+    public interface SafeSupplier<T> extends SafeReferent, Supplier<T>, Serializable {}
+
+    /**
+     * SafeRunnable version of {@link SafeReferent}
+     */
+    public interface SafeRunnable extends SafeReferent, Runnable, Serializable {}
+
+    private static final void validateSafeReferent(Supplier<? extends SafeReferent> safeReferentSupplier) {
+        if (FMLEnvironment.production) return;
+        final SafeReferent setter;
+        try {
+            setter = safeReferentSupplier.get();
+        } catch (Exception e) {
+            // Typically a class cast exception, just return out, expected.
+            return;
+        }
+
+        for (Class<?> cl = setter.getClass(); cl != null; cl = cl.getSuperclass()) {
+            try {
+                Method m = cl.getDeclaredMethod("writeReplace");
+                m.setAccessible(true);
+                Object replacement = m.invoke(setter);
+                if (!(replacement instanceof SerializedLambda))
+                    break;// custom interface implementation
+                SerializedLambda l = (SerializedLambda) replacement;
+                if (Objects.equals(l.getCapturingClass(), l.getImplClass())) {
+                    LOGGER.fatal("Detected unsafe referent usage, please view the code at {}",Thread.currentThread().getStackTrace()[3]);
+                    throw new RuntimeException("Unsafe Referent usage found in safe referent method");
+                }
+            } catch (NoSuchMethodException e) {
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                break;
+            }
+        }
+    }
+}

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,15 +5,16 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.IntSupplier;
-import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
 
 /**
  * A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
@@ -21,7 +22,6 @@ import java.util.function.Supplier;
  *
  * @see IModStateProvider
  */
-@NullMarked
 public interface IModLoadingState {
     /**
      * {@return the name of this state}
@@ -44,39 +44,38 @@ public interface IModLoadingState {
     /**
      * {@return a function returning a human-friendly message for this state}
      */
-    Supplier<String> message();
+    Function<ModList, String> message();
 
     /**
      * @return a function that computes the size of this transition based on the size of the modlist.
      * Used to compute progress.
      */
-    default IntSupplier size() {
-        return ModList::size;
-    }
+    ToIntFunction<ModList> size();
 
     /**
      * {@return an optional runnable, which runs before starting the transition from this state to the next}
      * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
      */
-    @Nullable Runnable inlineRunnable();
+    Optional<Consumer<ModList>> inlineRunnable();
 
     /**
      * 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 @Nullable CompletableFuture<Void> buildTransition(
+    default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
         final Executor syncExecutor,
         final Executor parallelExecutor,
         final ProgressMeter progressBar
     ) {
         return buildTransition(syncExecutor, parallelExecutor, progressBar,
-            _ -> CompletableFuture.completedFuture(null),
-            _ -> CompletableFuture.completedFuture(null)
+            e -> CompletableFuture.completedFuture(null),
+            e -> CompletableFuture.completedFuture(null)
         );
     }
 
@@ -84,6 +83,7 @@ public interface IModLoadingState {
      * 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
@@ -91,7 +91,8 @@ 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
      */
-    @Nullable CompletableFuture<Void> buildTransition(final Executor syncExecutor,
+    <T extends Event & IModBusEvent>
+    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
                                                       final Executor parallelExecutor,
                                                       final ProgressMeter progressBar,
                                                       final Function<Executor, CompletableFuture<Void>> preSyncTask,

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

@@ -5,17 +5,23 @@
 
 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.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
 
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import org.jetbrains.annotations.Nullable;
 
 public interface IModStateTransition {
+    /** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
+    public static final BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
+
     static IModStateTransition buildNoopTransition() {
         return ModStateTransitionHelper.NOOP;
     }
@@ -35,17 +41,42 @@ public interface IModStateTransition {
         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() {
+    default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
         return null;
     }
 
     ThreadSelector threadSelector();
     BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
 
-    interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
-        static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
+    /**
+     * 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 Event & IModBusEvent> extends Function<ModContainer, T> {
+        static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
             return fn::apply;
         }
     }
-}
+}

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

@@ -5,20 +5,63 @@
 
 package net.minecraftforge.fml;
 
+
 import java.util.Iterator;
 import java.util.Spliterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-public final class InterModComms {
-    public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {}
+public class InterModComms
+{
+    public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {
 
-    private static final ConcurrentHashMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
+        /**
+         * Deprecated: use {@link #senderModId()}
+         * @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
+         * Consider it unreliable.
+         */
+        @Deprecated
+        public final String getSenderModId() {
+            return this.senderModId;
+        }
+
+        /**
+         * Deprecated: use {@link #modId()}
+         * @return The modid being sent to.
+         */
+        @Deprecated
+        public final String getModId() {
+            return this.modId;
+        }
+
+        /**
+         * Deprecated: use {@link #method()}
+         * @return The method being sent to.
+         */
+        @Deprecated
+        public final String getMethod() {
+            return this.method;
+        }
+
+        /**
+         * @param <T> The type of the message.
+         * @return A {@link Supplier} of the message.
+         * Use {@link #messageSupplier()}
+         */
+        @SuppressWarnings("unchecked")
+        @Deprecated
+        public final <T> Supplier<T> getMessageSupplier() {
+            return (Supplier<T>) this.messageSupplier;
+        }
+    }
+
+    private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
 
     /**
      * Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
@@ -29,9 +72,8 @@ public final class InterModComms {
      * @return true if the message was enqueued for sending (the target modid is loaded)
      */
     public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) {
-        if (!ModList.isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
-                .add(new IMCMessage(ModLoadingContext.get().getContainer().getModId(), modId, method, thing));
+        if (!ModList.get().isLoaded(modId)) return false;
+        containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing));
         return true;
     }
 
@@ -45,9 +87,8 @@ public final class InterModComms {
      * @return true if the message was enqueued for sending (the target modid is loaded)
      */
     public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) {
-        if (!ModList.isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
-                .add(new IMCMessage(senderModId, modId, method, thing));
+        if (!ModList.get().isLoaded(modId)) return false;
+        containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing));
         return true;
     }
 
@@ -71,7 +112,7 @@ public final class InterModComms {
      * @return All messages
      */
     public static Stream<IMCMessage> getMessages(final String modId) {
-        return getMessages(modId, _ -> true);
+        return getMessages(modId, s->Boolean.TRUE);
     }
 
     private record QueueFilteringSpliterator(
@@ -95,10 +136,13 @@ public final class InterModComms {
         }
 
         @Override
-        public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
+        public boolean tryAdvance(final Consumer<? super IMCMessage> action)
+        {
             IMCMessage next;
-            do {
-                if (!iterator.hasNext()) {
+            do
+            {
+                if (!iterator.hasNext())
+                {
                     return false;
                 }
                 next = this.iterator.next();
@@ -113,5 +157,6 @@ public final class InterModComms {
         public Spliterator<IMCMessage> trySplit() {
             return null;
         }
+
     }
 }

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

@@ -5,7 +5,7 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
@@ -19,6 +19,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiPredicate;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -40,6 +41,11 @@ public abstract class ModContainer {
     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)
+    protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
 
     public ModContainer(IModInfo info) {
         this.modId = info.getModId();
@@ -132,7 +138,12 @@ public abstract class ModContainer {
        configs.put(modConfig.getType(), modConfig);
     }
 
-    public void dispatchConfigEvent(IConfigEvent event) {}
+    public void dispatchConfigEvent(IConfigEvent event) {
+        var handler = configHandler.orElse(null);
+        if (handler != null) {
+            handler.accept(event);
+        }
+    }
 
     /**
      * Does this mod match the supplied mod?
@@ -147,17 +158,9 @@ public abstract class ModContainer {
      */
     public abstract Object getMod();
 
-    /**
-     * @return the mod bus group for this specific mod, or null if there is none.
-     *         Leave null if you use {@link BusGroup#DEFAULT} for your mod lifecycle events.
-     */
-    public BusGroup getModBusGroup() {
-        return null;
-    }
-
     /**
      * 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,14 +5,14 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 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 java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -30,36 +30,33 @@ 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 final class ModList {
-    private ModList() {}
+public class ModList {
+    private static ModList INSTANCE;
+    private final List<IModFileInfo> modFiles;
+    private final List<IModInfo> sortedList;
+    private final Map<String, IModFileInfo> fileById;
+    private List<ModContainer> mods;
+    private Map<String, ModContainer> indexedMods;
+    private List<ModFileScanData> modFileScanData;
+    private List<ModContainer> sortedContainers;
 
-    private static final List<IModFileInfo> MOD_FILES;
-    private static final List<IModInfo> SORTED_LIST;
-    private static final Map<String, IModFileInfo> FILE_BY_ID;
-    private static List<ModContainer> mods;
-    private static Map<String, ModContainer> indexedMods;
-    private static List<ModContainer> sortedContainers;
-
-    static {
-        var loadingModFiles = LoadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList();
-        var loadingSortedList = LoadingModList.getMods();
-
-        var modFileInfos = MOD_FILES = loadingModFiles.stream().map(ModFile::getModFileInfo).toList();
-        SORTED_LIST = loadingSortedList.stream().map(IModInfo.class::cast).toList();
+    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 : modFileInfos) {
+        for (var file : this.modFiles) {
             for (var mod : file.getMods())
                 byId.put(mod.getModId(), mod.getOwningFile());
         }
-        FILE_BY_ID = Map.copyOf(byId);
-        CrashReportCallables.registerCrashCallable("Mod List", ModList::crashReport);
+        this.fileById = Collections.unmodifiableMap(byId);
+        CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
     }
 
-    private static String getModContainerState(String modId) {
+    private String getModContainerState(String modId) {
         return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
     }
 
-    private static String fileToLine(IModFile mf) {
+    private String fileToLine(IModFile mf) {
         var mainMod = mf.getModInfos().getFirst();
         return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
                 mainMod.getDisplayName(),
@@ -69,92 +66,93 @@ public final class ModList {
                 ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
     }
 
-    private static String crashReport() {
-        return "\n" + applyForEachModFile(ModList::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
+    private String crashReport() {
+        return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
     }
 
-    public static void init() {}
-
-    public static List<IModFileInfo> getModFiles() {
-        return MOD_FILES;
+    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
+        INSTANCE = new ModList(modFiles, sortedList);
+        return INSTANCE;
     }
 
-    public static IModFileInfo getModFileById(String modid) {
-        return FILE_BY_ID.get(modid);
+    public static ModList get() {
+        return INSTANCE;
     }
 
-    static void setLoadedMods(final List<ModContainer> modContainers) {
-        mods = modContainers;
-        sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> SORTED_LIST.indexOf(c.getModInfo()))).toList();
-        indexedMods = modContainers.stream().collect(Collectors.toUnmodifiableMap(ModContainer::getModId, Function.identity()));
+    public List<IModFileInfo> getModFiles() {
+        return modFiles;
     }
 
-    static void clearLoadedMods() {
-        mods = List.of();
-        indexedMods = Map.of();
-        sortedContainers = List.of();
+    public IModFileInfo getModFileById(String modid) {
+        return this.fileById.get(modid);
+    }
+
+    void setLoadedMods(final List<ModContainer> modContainers) {
+        this.mods = modContainers;
+        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 static <T> Optional<T> getModObjectById(String modId) {
+    public <T> Optional<T> getModObjectById(String modId) {
         return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
     }
 
-    public static Optional<? extends ModContainer> getModContainerById(String modId) {
-        return Optional.ofNullable(indexedMods.get(modId));
+    public Optional<? extends ModContainer> getModContainerById(String modId) {
+        return Optional.ofNullable(this.indexedMods.get(modId));
     }
 
-    public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
+    public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
         return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
     }
 
-    public static List<IModInfo> getMods() {
-        return SORTED_LIST;
+    public List<IModInfo> getMods() {
+        return this.sortedList;
     }
 
-    public static boolean isLoaded(String modTarget) {
-        return indexedMods.containsKey(modTarget);
+    public boolean isLoaded(String modTarget) {
+        return this.indexedMods.containsKey(modTarget);
     }
 
-    public static int size() {
+    public int size() {
         return mods.size();
     }
 
-    public static List<ModFileScanData> getAllScanData() {
-        final class LazyInit {
-            private LazyInit() {}
-            private static final List<ModFileScanData> MOD_FILE_SCAN_DATA = SORTED_LIST.stream()
-                    .map(IModInfo::getOwningFile)
-                    .filter(Objects::nonNull)
-                    .map(IModFileInfo::getFile)
-                    .distinct()
-                    .map(IModFile::getScanResult)
-                    .toList();
+    public List<ModFileScanData> getAllScanData() {
+        if (modFileScanData == null) {
+            modFileScanData = this.sortedList.stream().
+                    map(IModInfo::getOwningFile).
+                    filter(Objects::nonNull).
+                    map(IModFileInfo::getFile).
+                    distinct().
+                    map(IModFile::getScanResult).
+                    collect(Collectors.toList());
         }
-        return LazyInit.MOD_FILE_SCAN_DATA;
+        return modFileScanData;
+
     }
 
-    public static void forEachModFile(Consumer<IModFile> fileConsumer) {
-        MOD_FILES.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
+    public void forEachModFile(Consumer<IModFile> fileConsumer) {
+        modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
     }
 
-    public static <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
-        return MOD_FILES.stream().map(IModFileInfo::getFile).map(function);
+    public <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
+        return modFiles.stream().map(IModFileInfo::getFile).map(function);
     }
 
-    public static void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
+    public void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
         indexedMods.forEach(modContainerConsumer);
     }
 
-    public static void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
-        sortedContainers.forEach(containerConsumer);
+    public void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
+        this.sortedContainers.forEach(containerConsumer);
     }
 
-    public static List<ModContainer> getLoadedMods() {
-        return sortedContainers;
+    public List<ModContainer> getLoadedMods() {
+        return this.sortedContainers;
     }
 
-    public static <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
+    public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
         return indexedMods.values().stream().map(function);
     }
 }

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

@@ -5,11 +5,16 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.eventbus.api.bus.BusGroup;
+import com.google.common.collect.ImmutableList;
+import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.*;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.ImmediateWindowHandler;
+import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
+import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.IModInfo;
@@ -66,86 +71,100 @@ import static net.minecraftforge.fml.Logging.LOADING;
  *     and completes the mod loading sequence.</dd>
  * </dl>
  */
-public final class ModLoader {
-    private ModLoader() {}
-
+public class ModLoader {
     private static final Logger LOGGER = LogManager.getLogger();
-    private static final ArrayList<ModLoadingException> LOADING_EXCEPTIONS = new ArrayList<>();
-    private static final ArrayList<ModLoadingWarning> LOADING_WARNINGS = new ArrayList<>();
-    private static final Consumer<String> STATUS_CONSUMER = StartupNotificationManager.modLoaderConsumer().orElse(_ -> {});
-    private static final HashSet<IModLoadingState> COMPLETED_STATES = new HashSet<>();
+    private final LoadingModList loadingModList;
+
+    private final List<ModLoadingException> loadingExceptions;
+    private final Set<IModInfo> erroredModInfos;
+    private final List<ModLoadingWarning> loadingWarnings;
+    private final ModStateManager stateManager;
     private static boolean loadingStateValid;
+    private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
+    private final Set<IModLoadingState> completedStates = new HashSet<>();
+    private ModList modList;
+
+    private ModLoader() {
+        this.loadingModList = FMLLoader.getLoadingModList();
+        this.loadingExceptions = this.loadingModList.getErrors().stream()
+                .flatMap(ModLoadingException::fromEarlyException)
+                .toList();
+        this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
+                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
+                .collect(Collectors.toList());
+        if (this.loadingExceptions.isEmpty()) {
+            this.erroredModInfos = Collections.emptySet();
+        } else {
+            this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
+            this.erroredModInfos.addAll(this.loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
+        }
+        this.loadingModList.getModFiles().stream()
+                .filter(ModFileInfo::missingLicense)
+                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
+                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
+                .forEach(this.loadingExceptions::add);
+        this.stateManager = new ModStateManager();
+        CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
+        CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
+        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
+        CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
+        CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
+    }
 
     private static String computeLanguageList() {
-        return "\n" + LanguageLoadingProvider
-                .applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
+        return "\n" + FMLLoader.getLanguageLoadingProvider()
+                .applyForEach(lp -> lp.name() + "@" + lp.getClass().getPackage().getImplementationVersion())
                 .collect(Collectors.joining("\n\t\t", "\t\t", ""));
     }
 
     private static String computeModLauncherServiceList() {
         final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
-        return "\n" + mods.stream().map(mod -> mod.getOrDefault("file","nofile") +
-                ' ' + mod.getOrDefault("name", "missing") +
-                ' ' + mod.getOrDefault("type","NOTYPE") +
-                ' ' + mod.getOrDefault("description", "")).
+        return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
+                " "+mod.getOrDefault("name", "missing")+
+                " "+mod.getOrDefault("type","NOTYPE")+
+                " "+mod.getOrDefault("description", "")).
                 collect(Collectors.joining("\n\t\t","\t\t",""));
     }
 
+    public static ModLoader get() {
+        return LazyInit.INSTANCE;
+    }
+
+    private static final class LazyInit {
+        private static final ModLoader INSTANCE = new ModLoader();
+        private LazyInit() {}
+    }
+
     /**
      * Run on the primary starting thread by ClientModLoader and ServerModLoader
      * @param syncExecutor An executor to run tasks on the main thread
      * @param parallelExecutor An executor to run tasks on a parallel loading thread pool
      * @param periodicTask Optional periodic task to perform on the main thread while other activities run
      */
-    public static void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var loadingExceptions = LoadingModList.getErrors().stream()
-                .flatMap(ModLoadingException::fromEarlyException)
-                .toList();
-        ModLoader.LOADING_EXCEPTIONS.addAll(loadingExceptions);
-        LOADING_WARNINGS.addAll(LoadingModList.getBrokenFiles().stream()
-                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
-                .toList());
-        Set<IModInfo> erroredModInfos;
-        if (loadingExceptions.isEmpty()) {
-            erroredModInfos = Collections.emptySet();
-        } else {
-            erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
-            erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
-        }
-        LoadingModList.getModFiles().stream()
-                .filter(ModFileInfo::missingLicense)
-                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
-                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
-                .forEach(LOADING_EXCEPTIONS::add);
-        CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
-        CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
-        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
-        CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
-        CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
-
+    public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
         ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
         ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
         loadingStateValid = true;
         FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
-        if (!LOADING_EXCEPTIONS.isEmpty()) {
-            LOGGER.fatal(CORE, "Error during pre-loading phase", LOADING_EXCEPTIONS.getFirst());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
+        final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
+                loadingModList.getMods());
+        if (!this.loadingExceptions.isEmpty()) {
+            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
+            statusConsumer.accept("ERROR DURING MOD LOADING");
+            modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
-            throw new LoadingFailedException(LOADING_EXCEPTIONS);
-        }
-        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);
-            }
+            throw new LoadingFailedException(loadingExceptions);
         }
+        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);
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
+            statusConsumer.accept("ERROR DURING MOD LOADING");
+            modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(failedBounds.stream()
                     .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
@@ -153,18 +172,18 @@ public final class ModLoader {
         }
 
         final var modContainers = new HashMap<String, ModContainer>();
-        for (var file : LoadingModList.getModFiles()) {
-            var containers = buildMods(file.getFile());
+        for (var file : loadingModList.getModFiles()) {
+            var containers = this.buildMods(file.getFile());
             for (var container : containers)
                 modContainers.put(container.getModId(), container);
         }
 
-        if (!LOADING_EXCEPTIONS.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to initialize mod containers", LOADING_EXCEPTIONS.getFirst());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
+        if (!loadingExceptions.isEmpty()) {
+            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
+            statusConsumer.accept("ERROR DURING MOD LOADING");
+            modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
-            throw new LoadingFailedException(LOADING_EXCEPTIONS);
+            throw new LoadingFailedException(loadingExceptions);
         }
 
         // Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
@@ -187,47 +206,36 @@ public final class ModLoader {
             }
         }
 
-        ModList.setLoadedMods(modContainers.values().stream().toList());
-        var stateList = ModStateManager.getStates(ModLoadingPhase.GATHER);
-        var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
+        modList.setLoadedMods(modContainers.values().stream().toList());
+        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());
         for (IModLoadingState mls : stateList) {
             dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
         }
         progress.complete();
     }
 
-    public static void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var stateList = ModStateManager.getStates(ModLoadingPhase.LOAD);
-        var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
+    public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
+        var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
+        var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
         for (IModLoadingState mls : stateList) {
             dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
         }
         progress.complete();
     }
 
-    public static void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var stateList = ModStateManager.getStates(ModLoadingPhase.COMPLETE);
-        var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
+    public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
+        var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
+        var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
         for (IModLoadingState mls : stateList) {
             dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
         }
-
-        var modBusGroups = Set.of(
-                ModList.getLoadedMods().stream()
-                        .map(ModContainer::getModBusGroup)
-                        .filter(Objects::nonNull)
-                        .toArray(BusGroup[]::new)
-        );
-        for (var modBusGroup : modBusGroups) {
-            parallelExecutor.execute(modBusGroup::trim);
-        }
-        parallelExecutor.execute(BusGroup.DEFAULT::trim);
-
-        STATUS_CONSUMER.accept("Mod loading complete - %d mods loaded".formatted(ModList.size()));
+        statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
         progress.complete();
     }
 
-    private static void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
+    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
         if (!isLoadingStateValid()) {
             LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
             return;
@@ -235,25 +243,25 @@ public final class ModLoader {
         progressBar.label(progressBar.name() + " working");
         syncExecutor.drive(ticker);
 
-        var inlineRunnable = state.inlineRunnable();
+        var inlineRunnable = state.inlineRunnable().orElse(null);
         if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
 
-        var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar);
+        var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
         if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
 
-        COMPLETED_STATES.add(state);
+        completedStates.add(state);
     }
 
-    private static void handleInlineTransition(final Runnable transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
-        var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0);
+    private void handleInlineTransition(final Consumer<ModList> transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
+        var pb = StartupMessageManager.addProgressBar("State transition " +state.name()+" running", 0);
         syncExecutor.drive(ticker);
-        transition.run();
+        transition.accept(this.modList);
         syncExecutor.drive(ticker);
         pb.complete();
         syncExecutor.drive(ticker);
     }
 
-    private static void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
+    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
         while (!transition.isDone()) {
             syncExecutor.drive(ticker);
         }
@@ -267,7 +275,7 @@ public final class ModLoader {
                     .anyMatch(obj -> !(obj instanceof ModLoadingException));
             if (hasNotModLoadingEx) {
                 LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+                statusConsumer.accept("ERROR DURING MOD LOADING");
                 throw e;
             }
 
@@ -276,12 +284,12 @@ public final class ModLoader {
                     .map(ModLoadingException.class::cast)
                     .toList();
             LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+            statusConsumer.accept("ERROR DURING MOD LOADING");
             throw new LoadingFailedException(modLoadingExceptions);
         }
     }
 
-    private static List<ModContainer> buildMods(final IModFile modFile) {
+    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);
@@ -311,14 +319,14 @@ public final class ModLoader {
             missingMods.removeAll(modIds);
             LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
 
-            LOADING_EXCEPTIONS.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
+            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 static ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
+    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
         final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
     ) {
         try {
@@ -330,7 +338,7 @@ public final class ModLoader {
             return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
         } catch (ModLoadingException mle) {
             // exceptions are caught and added to the error list for later handling
-            LOADING_EXCEPTIONS.add(mle);
+            loadingExceptions.add(mle);
             // return an errored container instance here, because we tried and failed building a container.
             return new ErroredModContainer();
         }
@@ -344,64 +352,62 @@ public final class ModLoader {
         return loadingStateValid;
     }
 
-    public static boolean hasCompletedState(IModLoadingState state) {
-        return COMPLETED_STATES.contains(state);
+    public boolean hasCompletedState(final String stateName) {
+        IModLoadingState state = stateManager.findState(stateName);
+        return completedStates.contains(state);
     }
 
-    public static <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.getLoadedMods())
-            mod.acceptEvent(generator.apply(mod));
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
     }
 
-    public static <T extends IModBusEvent> void postEvent(T e) {
+    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.getLoadedMods())
-            mod.acceptEvent(e);
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
     }
 
-    public static <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.getLoadedMods())
-            mod.acceptEvent(e);
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
         return e;
     }
 
     @SuppressWarnings("removal")
-    public static <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
+    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
         postEventWithWrapInModOrder(event,
             (mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
             (mc, e) -> ModLoadingContext.get().setActiveContainer(null)
         );
     }
 
-    public static <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.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 static List<ModLoadingWarning> getWarnings() {
-        return List.copyOf(LOADING_WARNINGS);
+    public List<ModLoadingWarning> getWarnings() {
+        return ImmutableList.copyOf(this.loadingWarnings);
     }
 
-    public static void addWarning(ModLoadingWarning warning) {
-        LOADING_WARNINGS.add(warning);
+    public void addWarning(ModLoadingWarning warning) {
+        this.loadingWarnings.add(warning);
     }
 
     private static boolean runningDataGen = false;
@@ -410,7 +416,7 @@ public final 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

@@ -19,24 +19,31 @@ public class ModLoadingContext {
     private Object languageExtension;
 
     /**
-     * @deprecated Use the context provided by your language loader in your mod's constructor. Example for Java mods: {@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 the context provided by your language loader in your mod's constructor
      */
     @Deprecated(forRemoval = true, since="1.21.1")
     public static ModLoadingContext get() {
         return context.get();
     }
 
-    void setActiveContainer(final ModContainer container) {
+    /**
+     * @deprecated Going to be moved to ForgeHooks for Internal use.
+     */
+    @Deprecated(forRemoval = true, since="1.21.1")
+    public void setActiveContainer(final ModContainer container) {
         this.activeContainer = container;
         this.languageExtension = container == null ? null : container.contextExtension.get();
     }
 
+    /**
+     * Going to be moved to ForgeHooks for Internal use.
+     * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
+     */
+    @Deprecated(forRemoval = true, since="1.21.1")
+    public ModContainer getActiveContainer() {
+        return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
+    }
+
     /**
      * @deprecated Going to be moved to ForgeHooks for Internal use.
      */
@@ -45,10 +52,11 @@ public class ModLoadingContext {
         return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
     }
 
+    /**
+     * @return {@link ModLoadingContext#getActiveContainer()} by default.
+     */
     public ModContainer getContainer() {
-        return activeContainer == null
-                ? ModList.getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!"))
-                : activeContainer;
+        return getActiveContainer();
     }
 
     /**
@@ -100,7 +108,8 @@ public class ModLoadingContext {
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        if (spec.isEmpty()) {
+        if (spec.isEmpty())
+        {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
             LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
             return;
@@ -110,7 +119,8 @@ public class ModLoadingContext {
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        if (spec.isEmpty()) {
+        if (spec.isEmpty())
+        {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
             LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
             return;
@@ -119,6 +129,7 @@ public class ModLoadingContext {
         getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
     }
 
+
     @SuppressWarnings("unchecked")
     public <T> T extension() {
         return (T)languageExtension;

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

@@ -5,16 +5,16 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
-import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.IntSupplier;
-import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
 
 /**
  * Implementation of the {@link IModLoadingState} interface.
@@ -26,26 +26,27 @@ import java.util.function.Supplier;
  * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
  * @param transition     optional state transition information
  */
-@NullMarked
 public record ModLoadingState(
     String name,
     String previous,
-    Supplier<String> message,
-    IntSupplier size,
+    Function<ModList, String> message,
+    ToIntFunction<ModList> size,
     ModLoadingPhase phase,
-    @Nullable Runnable inlineRunnable,
-    @Nullable IModStateTransition transition
+    Optional<Consumer<ModList>> inlineRunnable,
+    Optional<IModStateTransition> transition
 ) implements IModLoadingState {
     @Override
-    public @Nullable CompletableFuture<Void> buildTransition(
+    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
     ) {
-        if (transition == null) return null;
-        return transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
+        var transition = this.transition.orElse(null);
+        return transition == null
+                ? Optional.empty()
+                : Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
     }
 
     /**
@@ -60,7 +61,7 @@ public record ModLoadingState(
      */
     @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, () -> "", () -> 0, phase, null, null);
+        return of(name, phase).after(previous).empty();
     }
 
     /**
@@ -94,7 +95,7 @@ public record ModLoadingState(
      */
     @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withTransition(final String name, final String previous,
-                                                 final Supplier<String> message, final ModLoadingPhase phase,
+                                                 final Function<ModList, String> message, final ModLoadingPhase phase,
                                                  final IModStateTransition transition) {
         return of(name, phase).after(previous).message(message).withTransition(transition);
     }
@@ -113,7 +114,7 @@ public record ModLoadingState(
      */
     @Deprecated(since = "1.21.3", forRemoval = true)
     public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
-                                             final Runnable inline) {
+                                             final Consumer<ModList> inline) {
         return of(name, phase).after(previous).withInline(inline);
     }
 
@@ -121,28 +122,12 @@ public record ModLoadingState(
         return new Builder(name, phase);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof ModLoadingState that
-                && this.phase == that.phase
-                && this.name.equals(that.name)
-                && this.previous.equals(that.previous);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = phase.hashCode();
-        result = 31 * result + name.hashCode();
-        result = 31 * result + previous.hashCode();
-        return result;
-    }
-
-    public static final class Builder {
+    public static class Builder {
         private final String name;
         private final ModLoadingPhase phase;
-        private String after = "";
-        private @Nullable Supplier<String> message = null;
-        private @Nullable IntSupplier size = null;
+        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;
@@ -155,28 +140,28 @@ public record ModLoadingState(
             return this;
         }
 
-        public Builder message(final String value) { return message(() -> value); }
-        public Builder message(final Supplier<String> value) {
+        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(() -> value); }
-        public Builder size(final IntSupplier value) {
+        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 : () -> "", size != null ? size : () -> 0, phase, null, null);
+            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 : () -> "Processing transition " + name, size != null ? size : ModList::size, phase, null, 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 Runnable inline) {
-            return new ModLoadingState(name, after, message != null ? message : () -> "Processing work " + name, size != null ? size : () -> 0, phase, inline, null);
+        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());
         }
     }
-}
+}

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

@@ -5,27 +5,41 @@
 
 package net.minecraftforge.fml;
 
+import com.google.common.collect.Streams;
 import net.minecraftforge.forgespi.language.IModInfo;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-/**
- * @param modInfo Mod info for mod with warning
- * @param warningStage The stage where this warning was encountered
- * @param i18nMessage I18N message to use for display
- * @param context Context for message display
- */
-public record ModLoadingWarning(IModInfo modInfo, ModLoadingStage warningStage, String i18nMessage, List<Object> context) {
-    public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
-        this(modInfo, warningStage, i18nMessage, List.of(context));
-    }
+public class ModLoadingWarning {
+    /**
+     * Mod Info for mod with warning
+     */
+    private final IModInfo modInfo;
+    /**
+     * The stage where this warning was encountered
+     */
+    private final ModLoadingStage warningStage;
 
-    public ModLoadingWarning {
-        context = List.copyOf(context);
+    /**
+     * I18N message to use for display
+     */
+    private final String i18nMessage;
+
+    /**
+     * Context for message display
+     */
+    private final List<Object> context;
+
+    public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
+        this.modInfo = modInfo;
+        this.warningStage = warningStage;
+        this.i18nMessage = i18nMessage;
+        this.context = Arrays.asList(context);
     }
 
     public String formatToString() {
-        return Bindings.getMessageParser().get().parseMessage(i18nMessage, Stream.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
+        return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
     }
 }

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

@@ -15,19 +15,18 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @SuppressWarnings("UnstableApiUsage")
-public final class ModStateManager {
-    private ModStateManager() {}
-    private static final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
+public class ModStateManager {
+    private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
 
-    static {
+    public ModStateManager() {
         final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
-        stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, _ -> {})
+        this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
                 .map(IModStateProvider::getAllStates)
                 .flatMap(List::stream)
-                .collect(Collectors.groupingBy(IModLoadingState::phase, () -> new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
+                .collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
     }
 
-    public static List<IModLoadingState> getStates(final ModLoadingPhase phase) {
+    public List<IModLoadingState> getStates(final ModLoadingPhase phase) {
         var nodes = stateMap.get(phase);
         var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
 
@@ -41,14 +40,12 @@ public final class ModStateManager {
         return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
     }
 
-    public static IModLoadingState findState(final String stateName) {
-        var result = stateMap.values()
+    public IModLoadingState findState(final String stateName) {
+        return stateMap.values()
                 .stream()
                 .flatMap(List::stream)
                 .filter(mls -> mls.name().equals(stateName))
                 .findFirst()
-                .orElse(null);
-        if (result != null) return result;
-        else throw new IllegalArgumentException("Unknown IModLoadingState: " + stateName);
+                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
     }
 }

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

@@ -9,22 +9,21 @@ 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.eventbus.api.Event;
 import net.minecraftforge.fml.IModStateTransition.EventGenerator;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 @ApiStatus.Internal
-final class ModStateTransitionHelper {
+class ModStateTransitionHelper {
     static final IModStateTransition NOOP = new NoopTransition();
     record NoopTransition() implements IModStateTransition {
         @Override
@@ -42,7 +41,7 @@ final class ModStateTransitionHelper {
         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();
+            final var throwables = t.stream().map(FutureResult::exception).filter(e -> e != null).toList();
             CompletableFuture<Void> cf = new CompletableFuture<>();
             final RuntimeException accumulator = new RuntimeException();
             cf.completeExceptionally(accumulator);
@@ -62,30 +61,7 @@ final class ModStateTransitionHelper {
         }
     }
 
-    /// Same as [#completableFutureFromExceptionList(List)] but specialised for a single future
-    static <V> CompletionStage<Void> completableFutureFromException(FutureResult<V> t) {
-        if (t.exception() == null) {
-            return CompletableFuture.completedFuture(null);
-        } else {
-            var exception = t.exception();
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            RuntimeException accumulator = new RuntimeException();
-            cf.completeExceptionally(accumulator);
-            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) {}
+    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());
@@ -94,22 +70,28 @@ final class ModStateTransitionHelper {
         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)));
+            results[i] = future.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> CompletableFuture<Void> addCompletableFutureTaskForModDispatch(
+    private static <T extends Event & 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.getLoadedMods()) {
+        for (var mod : ModList.get().getLoadedMods()) {
 
             CompletableFuture<Void> parent = null;
             if (mod.dependencies.isEmpty()) {
@@ -144,10 +126,23 @@ final class ModStateTransitionHelper {
             modFutures.put(mod.getModId(), dispatch);
         }
 
-        return gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
+        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);
     }
 
-    static <T extends IModBusEvent> CompletableFuture<Void> build(
+    private static <T extends Event & 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 Event & IModBusEvent> CompletableFuture<Void> build(
         final IModStateTransition transition,
         final String name,
         final Executor syncExecutor,
@@ -156,25 +151,31 @@ final class ModStateTransitionHelper {
         final Function<Executor, CompletableFuture<Void>> preSyncTask,
         final Function<Executor, CompletableFuture<Void>> postSyncTask
     ) {
-        CompletableFuture<Void> future;
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
         final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
 
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
-            .thenRunAsync(() -> progressBar.label(progressBar.name() + ": dispatching " + name), parallelExecutor);
-
-        var eventGenerator = transition.eventFunction();
-        if (eventGenerator != null) {
-            BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = transition.nextModLoadingStage();
-            future = addCompletableFutureTaskForModDispatch(executor, progressBar, eventGenerator, state);
-
-            final CompletableFuture<Void> eventDispatchCF = future.handle(FutureResult::new)
-                    .thenCompose(ModStateTransitionHelper::completableFutureFromException);
-            postEventDispatchCF = postEventDispatchCF.thenComposeAsync(_ -> eventDispatchCF, 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);
         }
 
-        postEventDispatchCF = postEventDispatchCF.thenRun(() -> postSyncTask.apply(syncExecutor));
-
+        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/ModWorkManager.java

@@ -14,12 +14,25 @@ import java.util.concurrent.locks.LockSupport;
 
 import static net.minecraftforge.fml.Logging.LOADING;
 
-public final class ModWorkManager {
+public class ModWorkManager {
     private static final Logger LOGGER = LogManager.getLogger();
     private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
 
-    public sealed interface DrivenExecutor extends Executor {
-        void drive(Runnable ticker);
+    public interface DrivenExecutor extends Executor {
+        boolean selfDriven();
+        boolean driveOne();
+
+        default void drive(Runnable ticker) {
+            if (!selfDriven()) {
+                ticker.run();
+                while (true) {
+                    if (!driveOne()) break;
+                }
+            } else {
+                // park for a bit so other threads can schedule
+                LockSupport.parkNanos(PARK_TIME);
+            }
+        }
     }
 
     private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
@@ -27,7 +40,8 @@ public final class ModWorkManager {
             this(new ConcurrentLinkedDeque<>());
         }
 
-        private boolean driveOne() {
+        @Override
+        public boolean driveOne() {
             final Runnable task = tasks.pollFirst();
             if (task != null) {
                 task.run();
@@ -36,29 +50,30 @@ public final class ModWorkManager {
         }
 
         @Override
-        public void execute(final Runnable command) {
-            tasks.addLast(command);
+        public boolean selfDriven() {
+            return false;
         }
 
         @Override
-        public void drive(Runnable ticker) {
-            ticker.run();
-            while (true) {
-                if (!driveOne()) break;
-            }
+        public void execute(final Runnable command) {
+            tasks.addLast(command);
         }
     }
 
     private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
         @Override
-        public void execute(final Runnable command) {
-            wrapped.execute(command);
+        public boolean selfDriven() {
+            return true;
         }
 
         @Override
-        public void drive(Runnable ticker) {
-            // Park for a bit so other threads can schedule
-            LockSupport.parkNanos(PARK_TIME);
+        public boolean driveOne() {
+            return false;
+        }
+
+        @Override
+        public void execute(final Runnable command) {
+            wrapped.execute(command);
         }
     }
 

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

@@ -43,7 +43,7 @@ public final class OptionalMod<T>
     private T getValue()
     {
         if (!searched) {
-            this.value = ModList.<T>getModObjectById(this.modId).orElse(null);
+            this.value = ModList.get().<T>getModObjectById(this.modId).orElse(null);
             searched = true;
         }
         return this.value;

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

@@ -93,8 +93,8 @@ public class VersionChecker {
                     return;
                 }
 
-                var mc = ModList.getModContainerById("minecraft");
-                var forge = ModList.getModContainerById("forge");
+                var mc = ModList.get().getModContainerById("minecraft");
+                var forge = ModList.get().getModContainerById("forge");
                 this.mcVersion = mc.get().getModInfo().getVersion().toString();
 
                 this.agent = "Java-http-client/" + System.getProperty("java.version")
@@ -223,7 +223,7 @@ public class VersionChecker {
     // Gather a list of mods that have opted in to this update system by providing a URL.
     private static List<IModInfo> gatherMods() {
         List<IModInfo> ret = new LinkedList<>();
-        for (IModInfo info : ModList.getMods()) {
+        for (IModInfo info : ModList.get().getMods()) {
             if (info.getUpdateURL().isPresent())
                 ret.add(info);
         }

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

@@ -8,7 +8,8 @@ package net.minecraftforge.fml.config;
 import com.electronwill.nightconfig.core.CommentedConfig;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.loading.FMLPaths;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
@@ -18,54 +19,57 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-public final class ConfigTracker {
-    private ConfigTracker() {}
-
+public class ConfigTracker {
     private static final Logger LOGGER = LogUtils.getLogger();
     static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
-    private static final ConcurrentHashMap<String, ModConfig> FILE_MAP = new ConcurrentHashMap<>();
-    private static final Map<ModConfig.Type, Set<ModConfig>> CONFIG_SETS = Map.of(
-            ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()),
-            ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()),
-            ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>())
-    );
-    private static final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> CONFIGS_BY_MOD = new ConcurrentHashMap<>();
+    public static final ConfigTracker INSTANCE = new ConfigTracker();
+    private final ConcurrentHashMap<String, ModConfig> fileMap;
+    private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets;
+    private final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> configsByMod;
 
-    static void trackConfig(final ModConfig config) {
-        if (FILE_MAP.containsKey(config.getFileName())) {
-            LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), FILE_MAP.get(config.getFileName()).getModId(), config.getModId());
+    private ConfigTracker() {
+        this.fileMap = new ConcurrentHashMap<>();
+        this.configSets = new EnumMap<>(ModConfig.Type.class);
+        this.configsByMod = new ConcurrentHashMap<>();
+        this.configSets.put(ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()));
+        this.configSets.put(ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()));
+//        this.configSets.put(ModConfig.Type.PLAYER, new ConcurrentSkipListSet<>());
+        this.configSets.put(ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>()));
+    }
+
+    void trackConfig(final ModConfig config) {
+        if (this.fileMap.containsKey(config.getFileName())) {
+            LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), this.fileMap.get(config.getFileName()).getModId(), config.getModId());
             throw new RuntimeException("Config conflict detected!");
         }
-        FILE_MAP.put(config.getFileName(), config);
-        CONFIG_SETS.get(config.getType()).add(config);
-        CONFIGS_BY_MOD.computeIfAbsent(config.getModId(), _ -> new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
+        this.fileMap.put(config.getFileName(), config);
+        this.configSets.get(config.getType()).add(config);
+        this.configsByMod.computeIfAbsent(config.getModId(), (k)->new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
         LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
     }
 
-    public static void loadConfigs(ModConfig.Type type, Path configBasePath) {
+    public void loadConfigs(ModConfig.Type type, Path configBasePath) {
         LOGGER.debug(CONFIG, "Loading configs type {}", type);
-        for (ModConfig config : CONFIG_SETS.get(type)) {
+        for (ModConfig config : this.configSets.get(type)) {
             openConfig(config, configBasePath);
         }
     }
 
     // TODO: [FML] This is only called for the server (outside of forceUnload)
     // rethink config implementation for eventual FML rewrite
-    public static void unloadConfigs(ModConfig.Type type, Path configBasePath) {
+    public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
         LOGGER.debug(CONFIG, "Unloading configs type {}", type);
-        for (ModConfig config : CONFIG_SETS.get(type)) {
+        for (ModConfig config : this.configSets.get(type)) {
             closeConfig(config, configBasePath);
         }
         ConfigFileTypeHandler.get(type).stopWatcher();
     }
 
     // If there is a better way to do this, please tell me. Because this is FUCKED
-    public static void forceUnload() {
+    public void forceUnload() {
         // This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
-        if (FMLEnvironment.dist.isClient())
-            unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get());
-
-        unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
+        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
+        this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
 
         // just in case server watcher is still alive somehow...
         ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
@@ -92,8 +96,8 @@ public final class ConfigTracker {
         }
     }
 
-    public static void loadDefaultServerConfigs() {
-        CONFIG_SETS.get(ModConfig.Type.SERVER).forEach(modConfig -> {
+    public void loadDefaultServerConfigs() {
+        configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> {
             final CommentedConfig commentedConfig = CommentedConfig.inMemory();
             modConfig.getSpec().correct(commentedConfig);
             modConfig.setConfigData(commentedConfig);
@@ -101,16 +105,16 @@ public final class ConfigTracker {
         });
     }
 
-    public static String getConfigFileName(String modId, ModConfig.Type type) {
-        return Optional.ofNullable(CONFIGS_BY_MOD.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
+    public String getConfigFileName(String modId, ModConfig.Type type) {
+        return Optional.ofNullable(configsByMod.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
                 map(ModConfig::getFullPath).map(Object::toString).orElse(null);
     }
 
-    public static Map<ModConfig.Type, Set<ModConfig>> configSets() {
-        return CONFIG_SETS;
+    public Map<ModConfig.Type, Set<ModConfig>> configSets() {
+        return configSets;
     }
 
-    public static ConcurrentHashMap<String, ModConfig> fileMap() {
-        return FILE_MAP;
+    public ConcurrentHashMap<String, ModConfig> fileMap() {
+        return fileMap;
     }
 }

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;
@@ -13,7 +13,6 @@ import java.util.function.Function;
 import org.jetbrains.annotations.Nullable;
 
 public interface IConfigEvent {
-    // TODO: [FML] Get rid of this indirection somehow
     record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
 
     ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
@@ -30,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/config/ModConfig.java

@@ -31,7 +31,7 @@ public class ModConfig
         this.fileName = fileName;
         this.container = container;
         this.configHandler = ConfigFileTypeHandler.get(type);
-        ConfigTracker.trackConfig(this);
+        ConfigTracker.INSTANCE.trackConfig(this);
     }
 
     public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) {
@@ -40,9 +40,8 @@ public class ModConfig
 
     private static String defaultConfigName(Type type, String modId) {
         // config file name would be "forge-client.toml" and "forge-server.toml"
-        return modId + '-' + type.extension() + ".toml";
+        return String.format(Locale.ROOT, "%s-%s.toml", modId, type.extension());
     }
-
     public Type getType() {
         return type;
     }

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

@@ -5,33 +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;
-import org.jspecify.annotations.NonNull;
-
 /**
- * Marker interface for mod lifecycle events dispatched on the
- * {@linkplain net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup() mod BusGroup} instead
- * of the {@linkplain BusGroup#DEFAULT default BusGroup}.
- *
- * @apiNote Each mod gets its own unique mod BusGroup instance, obtained from the mod loading context. Most events
- *          should go on the default BusGroup.
+ * 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> @NonNull EventBus<@NonNull T> getBus(@NonNull BusGroup modEventBusGroup, @NonNull 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 {
 }

fmlcore/src/main/java/net/minecraftforge/fml/util/thread/EffectiveSide.java

@@ -7,11 +7,8 @@ package net.minecraftforge.fml.util.thread;
 
 import net.minecraftforge.fml.LogicalSide;
 
-/**
- * Attempts to determine the effect side of the current thread, based on know threads in networking.
- * This is not guaranteed to be correct, and modders should use other methods to determine the logical side when possible.
- */
-public class EffectiveSide {
+public class EffectiveSide
+{
     public static LogicalSide get() {
         final ThreadGroup group = Thread.currentThread().getThreadGroup();
         return group instanceof SidedThreadGroup ? ((SidedThreadGroup) group).getSide() : LogicalSide.CLIENT;

fmlcore/src/main/java/net/minecraftforge/fml/util/thread/SidedThreadGroups.java

@@ -7,13 +7,11 @@ package net.minecraftforge.fml.util.thread;
 
 import net.minecraftforge.fml.LogicalSide;
 
-public final class SidedThreadGroups {
+public final class SidedThreadGroups
+{
     public static final SidedThreadGroup CLIENT = new SidedThreadGroup(LogicalSide.CLIENT);
     public static final SidedThreadGroup SERVER = new SidedThreadGroup(LogicalSide.SERVER);
 
-    public static SidedThreadGroup get(boolean client) {
-        return client ? CLIENT : SERVER;
+    private SidedThreadGroups() {
     }
-
-    private SidedThreadGroups() { }
 }

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

@@ -46,6 +46,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -68,7 +70,7 @@ import static org.lwjgl.opengl.GL32C.*;
  * Based on the prior ClientVisualization, with some personal touches.
  */
 public class DisplayWindow implements ImmediateWindowProvider {
-    private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}};
+    private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}, {3,2}};
     private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
     private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
 
@@ -88,12 +90,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
     // 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;
@@ -152,7 +149,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);
     }
@@ -241,7 +238,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);
@@ -290,6 +287,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;
@@ -301,7 +304,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");
@@ -312,18 +315,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
         LOGGER.error("ERROR DISPLAY\n"+msgBuilder);
         // we show the display on a new dedicated thread
         Executors.newSingleThreadExecutor().submit(()-> {
-            var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", 0);
-            if (res != 0) {
+            var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", false);
+            if (res) {
                 try {
                     Desktop.getDesktop().browse(URI.create(ERROR_URL));
                 } catch (IOException ioe) {
-                    TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", 0);
+                    TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", false);
                 }
             }
             System.exit(1);
         });
     }
-
     /**
      * Called to initialize the window when preparing for the Render Thread.
      *
@@ -510,7 +512,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);
@@ -528,7 +530,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
      *
      * @return the Window we own.
      */
-    public long setupMinecraftWindow(final int width, final int height, final String title, final long monitorSupplier, final Supplier<Object> backend) {
+    public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
         // wait for the window to actually be initialized
         try {
             this.initializationFuture.get(30, TimeUnit.SECONDS);
@@ -548,11 +550,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
         var renderlockticket = false;
         do {
             try {
-                renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
-                if (++tries > 9) {
-                    Thread.dumpStack();
-                    crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
-                }
+                    renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
+                    if (++tries > 9) {
+                        Thread.dumpStack();
+                        crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
+                    }
             } catch (InterruptedException e) {
                 Thread.interrupted();
             }
@@ -562,7 +564,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
 
         glfwMakeContextCurrent(window);
         // Set the title to what the game wants
-        glfwSetWindowTitle(window, title);
+        glfwSetWindowTitle(window, title.get());
         glfwSwapInterval(0);
         // Clean up our hooks
         glfwSetFramebufferSizeCallback(window, null).free();
@@ -638,7 +640,7 @@ 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));
     }
 
     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

@@ -22,7 +22,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 +120,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 +151,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)
@@ -26,6 +25,7 @@ dependencies {
     api(libs.apache.commons)
     api(libs.bundles.night.config)
     api(libs.modlauncher)
+    api(libs.coremods)
     api(libs.mojang.logging)
     api(libs.jarjar.selector)
     api(libs.jarjar.meta)
@@ -35,13 +35,11 @@ dependencies {
     implementation(libs.accesstransformers)
     implementation(libs.terminalconsoleappender)
     implementation(libs.jimfs)
-    implementation(libs.roimfs)
 
-    // 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
     }
@@ -103,44 +101,6 @@ tasks.register('writeForgeVersionJson') {
     }
 }
 
-tasks.register('jarJarOptionsJson', net.minecraftforge.forge.tasks.JarJarMetadataOptions) {
-    metadataFile = project.file('src/main/resources/jarjar_options.json')
-    // This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually...
-    //add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class')
-    add(libs.mixinextras.forge) {
-        containedJarMetadata {
-            path = ''
-        }
-        resource = 'com/llamalad7/mixinextras/platform/forge/MixinExtrasConfigPlugin.class'
-        layer = 'GAMELIBRARY'
-        id = 'mixinextras'
-        nested = true
-    }
-}
-
 tasks.named('generateResources').configure {
-    dependsOn('eclipseJdt')
-    dependsOn('eclipseJdtApt')
-    dependsOn('eclipseFactorypath')
     dependsOn('writeForgeVersionJson')
-    dependsOn('jarJarOptionsJson')
-}
-
-tasks.named('sourcesJar') {
-    dependsOn('jarJarOptionsJson')
-}
-
-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/common/asm/CapabilityTokenSubclass.java

@@ -34,10 +34,11 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
  *  }</code>
  * </pre>
  */
-public final class CapabilityTokenSubclass implements ILaunchPluginService {
+public class CapabilityTokenSubclass implements ILaunchPluginService {
+
     private static final String FUNC_NAME = "getType";
     private static final String FUNC_DESC = "()Ljava/lang/String;";
-    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; // Don't directly reference this to prevent class loading.
+    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
 
     @Override
     public String name() {
@@ -55,11 +56,8 @@ public final class CapabilityTokenSubclass implements ILaunchPluginService {
         String internalName = classType.getInternalName();
         if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
             return NAY;
-
-        if (internalName.startsWith("net/minecraftforge/common/capabilities/"))
-            return YAY;
         
-        return internalName.contains("$") ? YAY : NAY; // Anonymous subclasses only
+        return YAY;
     }
 
     @Override
@@ -72,7 +70,7 @@ public final class CapabilityTokenSubclass implements ILaunchPluginService {
             }
             return ComputeFlags.SIMPLE_REWRITE;
         } else if (CAP_INJECT.equals(classNode.superName)) {
-            var cls = new Object() { String value = null; };
+            Holder cls = new Holder();
 
             SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
             reader.accept(new SignatureVisitor(Opcodes.ASM9) {
@@ -108,4 +106,8 @@ public final class CapabilityTokenSubclass implements ILaunchPluginService {
             return ComputeFlags.NO_REWRITE;
         }
     }
+
+    private static final class Holder {
+        String value;
+    }
 }

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

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.common.asm;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AnnotationNode;
+import org.objectweb.asm.tree.ClassNode;
+import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
+
+/**
+ * Removes the final modifier from fields with the @ObjectHolder annotation, prevents the JITer from in lining them so our runtime replacements can work.
+ * Will also de-finalize all fields in on class level annotations.
+ */
+public class ObjectHolderDefinalize implements ILaunchPluginService {
+    // Hardcoded map of vanilla classes that should have object holders for each field of the given registry type.
+    // IMPORTANT: Updates to this collection must be reflected in ObjectHolderRegistry. Duplicated cuz classloaders, yay!
+    // Classnames are validated in ObjectHolderRegistry.
+    private static final Map<String, VanillaObjectHolderData> VANILLA_OBJECT_HOLDERS = Stream.of(
+            new VanillaObjectHolderData("net.minecraft.world.level.block.Blocks", "block", "net.minecraft.world.level.block.Block"),
+            new VanillaObjectHolderData("net.minecraft.world.item.Items", "item", "net.minecraft.world.item.Item"),
+            new VanillaObjectHolderData("net.minecraft.world.item.enchantment.Enchantments", "enchantment", "net.minecraft.world.item.enchantment.Enchantment"),
+            new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
+            new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
+            new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
+    ).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
+    private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
+            .map(it -> it.replace('.', '/'))
+            .collect(Collectors.toUnmodifiableSet());
+    private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
+    private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
+
+    @Override
+    public String name() {
+        return "object_holder_definalize";
+    }
+
+    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;
+
+        // Let's skip processing classes that definitely don't have object holders
+        String internalName = classType.getInternalName();
+
+        // Forge classes that aren't in the debug package (that package is used for tests)
+        if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
+            return NAY;
+
+        // Vanilla classes that don't have object holders
+        if (internalName.startsWith("com/mojang/"))
+            return NAY;
+
+        // ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
+        if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
+            return NAY;
+
+        return YAY;
+    }
+
+    private static boolean hasHolder(List<AnnotationNode> lst) {
+        return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
+    }
+
+    @SuppressWarnings("unused")
+    private String getValue(List<AnnotationNode> lst)
+    {
+        AnnotationNode ann = lst.stream().filter(n -> n.desc.equals(OBJECT_HOLDER)).findFirst().get();
+        if (ann.values != null)
+        {
+            for (int x = 0; x < ann.values.size() - 1; x += 2) {
+                if (ann.values.get(x).equals("value")) {
+                    return (String)ann.values.get(x + 1);
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
+    {
+        final AtomicBoolean changes = new AtomicBoolean();
+        //Must be public static finals, and non-array objects
+
+        //Fix Annotated Fields before injecting from class level
+        classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
+        {
+            int prev = f.access;
+            f.access &= ~Opcodes.ACC_FINAL; //Strip final
+            f.access |= Opcodes.ACC_SYNTHETIC; //Add Synthetic so we can check in runtime. ? Good idea?
+            changes.compareAndSet(false, prev != f.access);
+        });
+
+        if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
+        {
+            classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
+            {
+                int prev = f.access;
+                f.access &= ~Opcodes.ACC_FINAL;
+                f.access |= Opcodes.ACC_SYNTHETIC;
+                /*if (!hasHolder(f.visibleAnnotations)) //Add field level annotation, doesn't do anything until after we figure out how ASMDataTable is gatherered
+                {
+                   if (value == null)
+                       f.visitAnnotation(OBJECT_HOLDER, true);
+                   else
+                       f.visitAnnotation(OBJECT_HOLDER, true).visit("value", value + ":" + f.name.toLowerCase());
+                }*/
+                changes.compareAndSet(false, prev != f.access);
+            });
+        }
+        return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
+    }
+
+    private record VanillaObjectHolderData(String holderClass, String registryName, String registryType) {}
+}

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

@@ -7,9 +7,9 @@ package net.minecraftforge.fml.common.asm;
 
 import java.util.EnumSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.LoadingModList;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -47,21 +47,16 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
     private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
-    private static final class LazyInit {
-        private LazyInit() {}
-        private static final boolean ANY_MODS = LoadingModList.getMods().size() > 2; // 2: forge, minecraft
-    }
-
     @Override
     public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty || !LazyInit.ANY_MODS)
+        if (isEmpty)
             return NAY;
 
         String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraft/client/model") || internalName.startsWith("net/minecraft/world"))
-            return YAY;
+        if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
+            return NAY;
 
-        return NAY;
+        return YAY;
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import net.minecraftforge.accesstransformer.service.AccessTransformerService;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
 import net.minecraftforge.forgespi.Environment;
+import net.minecraftforge.forgespi.coremod.ICoreModProvider;
 import org.slf4j.Logger;
 
 import java.nio.file.Path;
@@ -30,11 +31,14 @@ import java.util.function.BiFunction;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
 
-public final class FMLLoader {
+public class FMLLoader {
     private static final Logger LOGGER = LogUtils.getLogger();
     private static AccessTransformerService accessTransformer;
+    private static ICoreModProvider coreModProvider;
+    private static LanguageLoadingProvider languageLoadingProvider;
     private static Dist dist;
     private static String naming;
+    private static LoadingModList loadingModList;
     private static RuntimeDistCleaner runtimeDistCleaner;
     private static Path gamePath;
     private static final VersionInfo versionInfo = VersionInfo.detect();
@@ -52,7 +56,10 @@ public final class FMLLoader {
 
         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"));
         checkPackage(Environment.class, "2.0", "ForgeSPI");
 
         try {
@@ -90,7 +97,6 @@ public final class FMLLoader {
         }
     }
 
-    @SuppressWarnings("unused")
     private static <T> T getSingleService(Class<T> clazz, String name) throws IncompatibleEnvironmentException {
           var providers = new ArrayList<T>();
           for (var itr = ServiceLoader.load(FMLLoader.class.getModule().getLayer(), clazz).iterator(); itr.hasNext(); ) {
@@ -141,25 +147,35 @@ public final class FMLLoader {
     }
 
     public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
-        LOGGER.debug(SCAN, "Scanning for Mod Locators");
-        modValidator = ModDiscoverer.discoverMods(arguments);
+        LOGGER.debug(SCAN,"Scanning for Mod Locators");
+        var modDiscoverer = new ModDiscoverer(arguments);
+        modValidator = modDiscoverer.discoverMods();
         var pluginResources = modValidator.getPluginResources();
         return List.of(pluginResources);
     }
 
     public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) {
         moduleLayerManager = layerManager;
-        LanguageLoadingProvider.reload();
+        languageLoadingProvider = new LanguageLoadingProvider();
         backgroundScanHandler = modValidator.stage2Validation();
+        loadingModList = backgroundScanHandler.getLoadingModList();
         return List.of(modValidator.getModResources());
     }
 
+    public static ICoreModProvider getCoreModProvider() {
+        return coreModProvider;
+    }
+
+    public static LanguageLoadingProvider getLanguageLoadingProvider() {
+        return languageLoadingProvider;
+    }
+
     public static CommonLaunchHandler getLaunchHandler() {
         return commonLaunchHandler;
     }
 
     public static void addAccessTransformer(Path atPath, ModFile modName) {
-        LOGGER.debug(SCAN, "Adding Access Transformer {} in {}", atPath, modName.getFilePath());
+        LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath());
         accessTransformer.offerResource(atPath, modName.getFileName());
     }
 
@@ -173,6 +189,10 @@ public final class FMLLoader {
         progressWindowTick.run();
     }
 
+    public static LoadingModList getLoadingModList() {
+        return loadingModList;
+    }
+
     public static Path getGamePath() {
         return gamePath;
     }

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 {
@@ -68,6 +70,7 @@ public class FMLServiceProvider implements ITransformationService {
     @SuppressWarnings("rawtypes")
     @Override
     public @NotNull List<ITransformer> transformers() {
-        return List.of();
+        LOGGER.debug(CORE, "Loading coremod transformers");
+        return new ArrayList<>(FMLLoader.getCoreModProvider().getCoreModTransformers());
     }
 }

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

@@ -51,8 +51,8 @@ public class ImmediateWindowHandler {
         earlyProgress.label("Bootstrapping Minecraft");
     }
 
-    public static long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
-        return provider.setupMinecraftWindow(width, height, title, monitor, backend);
+    public static long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
+        return provider.setupMinecraftWindow(width, height, title, monitor);
     }
 
     public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
@@ -104,9 +104,9 @@ public class ImmediateWindowHandler {
         }
 
         @Override
-        public long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
+        public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
             try {
-                var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor, backend);
+                var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor);
                 return longsupplier.getAsLong();
             } catch (Throwable e) {
                 throw new IllegalStateException("How did you get here?", e);

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

@@ -8,6 +8,8 @@ package net.minecraftforge.fml.loading;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
 import java.util.function.Supplier;
 
 /**
@@ -64,7 +66,7 @@ public interface ImmediateWindowProvider {
      * @param monitor This is the monitor it should appear on.
      * @return The window id
      */
-    long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend);
+    long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor);
 
     /**
      * This is called after window handoff to allow us to tell Mojang about our window's position. This might give a

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

@@ -18,6 +18,7 @@ import org.slf4j.Logger;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Consumer;
@@ -27,36 +28,43 @@ import java.util.stream.Stream;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-public final class LanguageLoadingProvider {
-    public static void forEach(Consumer<IModLanguageProvider> consumer) {
+public class LanguageLoadingProvider {
+    public void forEach(Consumer<IModLanguageProvider> consumer) {
         providers.forEach(consumer);
     }
 
-    public static <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
+    public <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
         return providers.stream().map(function);
     }
 
-    public static void reload() {
+    public void reload() {
         loadLanguageProviders();
     }
 
+    /** This doesn't actually do anything with the argument, so just call reload(). Not sure when cpw broke that. */
+    @Deprecated(forRemoval = true, since = "1.20.2")
+    public void addAdditionalLanguages(List<ModFile> modFiles) {
+        reload();
+    }
+
     /*==========================================================================*
-     *                        INTERNAL                                          *
+     *                        INTERNAL SHIT                                     *
      *==========================================================================*/
     private static final Logger LOGGER = LogUtils.getLogger();
-    private static final ServiceLoader<IModLanguageProvider> serviceLoader;
-    private static final ArrayList<IModLanguageProvider> providers = new ArrayList<>();
-    private static final HashMap<String, Wrapper> providersByName = new HashMap<>();
+    private final ServiceLoader<IModLanguageProvider> serviceLoader;
+    private final List<IModLanguageProvider> providers = new ArrayList<>();
+    private final Map<String, Wrapper> providersByName = new HashMap<>();
     private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev");
 
     private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
 
-    static {
+    LanguageLoadingProvider() {
         var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
         serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
+        loadLanguageProviders();
     }
 
-    private static void loadLanguageProviders() {
+    private void loadLanguageProviders() {
         providers.clear();
         providersByName.clear();
 
@@ -89,7 +97,7 @@ public final class LanguageLoadingProvider {
         }
     }
 
-    public static IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
+    public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
         var consumer = mod.getFileName();
         var wrapper = providersByName.get(language);
 

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

@@ -5,46 +5,113 @@
 
 package net.minecraftforge.fml.loading;
 
+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 org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
-/// Master list of all mods in the loading context
-public sealed interface LoadingModList permits LoadingModListImpl {
-    static ModFileInfo getModFileById(String modId) {
-        return get().fileById().get(modId);
+/**
+ * Master list of all mods <em>in the loading context. This class cannot refer outside the
+ * loading package</em>
+ */
+public class LoadingModList {
+    private static LoadingModList INSTANCE;
+    private final List<ModFileInfo> modFiles;
+    private final List<ModInfo> sortedList;
+    private final Map<String, ModFileInfo> fileById;
+    private final List<EarlyLoadingException> preLoadErrors;
+    private List<IModFile> brokenFiles;
+
+    private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
+        this.modFiles = modFiles.stream()
+                .map(ModFile::getModFileInfo)
+                .map(ModFileInfo.class::cast)
+                .toList();
+        this.sortedList = sortedList.stream()
+                .map(ModInfo.class::cast)
+                .toList();
+        this.fileById = this.modFiles.stream()
+                .map(ModFileInfo::getMods)
+                .flatMap(Collection::stream)
+                .map(ModInfo.class::cast)
+                .collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
+        this.preLoadErrors = new ArrayList<>();
     }
 
-    static List<ModFileInfo> getModFiles() {
-        return get().getModFiles();
+    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;
     }
 
-    static List<ModInfo> getMods() {
-        return get().getMods();
+    public static LoadingModList get() {
+        return INSTANCE;
     }
 
-    static @Nullable Path findResource(String className) {
-        for (ModFileInfo modFileInfo : get().getModFiles()) {
-            Path resource = modFileInfo.getFile().findResource(className);
+    public void addCoreMods() {
+        modFiles.stream()
+                .map(ModFileInfo::getFile)
+                .map(ModFile::getCoreMods)
+                .flatMap(List::stream)
+                .forEach(FMLLoader.getCoreModProvider()::addCoreMod);
+    }
+
+    public void addAccessTransformers() {
+        for (ModFileInfo modFile : modFiles) {
+            ModFile mod = modFile.getFile();
+            var at = mod.getAccessTransformer().orElse(null);
+            if (at != null) {
+                FMLLoader.addAccessTransformer(at, mod);
+            }
+        }
+    }
+
+    public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
+        backgroundScanHandler.setLoadingModList(this);
+        modFiles.stream()
+                .map(ModFileInfo::getFile)
+                .forEach(backgroundScanHandler::submitForScanning);
+    }
+
+    public List<ModFileInfo> getModFiles() {
+        return modFiles;
+    }
+
+    public Path findResource(final String className) {
+        for (ModFileInfo mf : modFiles) {
+            final Path resource = mf.getFile().findResource(className);
             if (Files.exists(resource)) return resource;
         }
         return null;
     }
 
-    static List<EarlyLoadingException> getErrors() {
-        return get().getErrors();
+    public ModFileInfo getModFileById(String modid) {
+        return this.fileById.get(modid);
     }
 
-    static List<IModFile> getBrokenFiles() {
-        return get().getBrokenFiles();
+    public List<ModInfo> getMods() {
+        return this.sortedList;
     }
 
-    private static LoadingModListImpl get() {
-        return LoadingModListImpl.get();
+    public List<EarlyLoadingException> getErrors() {
+        return preLoadErrors;
+    }
+
+    public void setBrokenFiles(final List<IModFile> brokenFiles) {
+        this.brokenFiles = brokenFiles;
+    }
+
+    public List<IModFile> getBrokenFiles() {
+        return this.brokenFiles;
     }
 }

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

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
-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.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-
-import com.mojang.logging.LogUtils;
-
-/**
- * Master list of all mods <em>in the loading context. This class cannot refer outside the
- * loading package</em>
- */
-record LoadingModListImpl(
-        List<ModFileInfo> getModFiles,
-        List<ModInfo> getMods,
-        Map<String, ModFileInfo> fileById,
-        ArrayList<EarlyLoadingException> getErrors,
-        ArrayList<IModFile> getBrokenFiles
-) implements LoadingModList {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static ModSorter.State temp;
-
-    LoadingModListImpl(List<ModFile> modFiles, List<ModInfo> sortedList) {
-        var modFileInfos = modFiles.stream()
-                .map(ModFile::getModFileInfo)
-                .map(ModFileInfo.class::cast)
-                .toList();
-        sortedList = sortedList.stream().toList();
-        var fileById = modFileInfos.stream()
-                .map(ModFileInfo::getMods)
-                .flatMap(Collection::stream)
-                .map(ModInfo.class::cast)
-                .collect(Collectors.toUnmodifiableMap(ModInfo::getModId, ModInfo::getOwningFile));
-        this(modFileInfos, sortedList, fileById, new ArrayList<>(), new ArrayList<>());
-    }
-
-    static LoadingModListImpl init(ModSorter.State modSorterState, EarlyLoadingException earlyLoadingException) {
-        temp = modSorterState;
-        var instance = get();
-        if (earlyLoadingException != null)
-            instance.getErrors.add(earlyLoadingException);
-        temp = null;
-        instance.addAccessTransformers();
-        return instance;
-    }
-
-    static LoadingModListImpl get() {
-        final class LazyInit {
-            private LazyInit() {}
-            private static final LoadingModListImpl INSTANCE
-                    = new LoadingModListImpl(LoadingModListImpl.temp.files(), LoadingModListImpl.temp.mods());
-        }
-        return LazyInit.INSTANCE;
-    }
-
-    private void addAccessTransformers() {
-        var errors = new ArrayList<ExceptionData>();
-
-        for (ModFileInfo modFile : getModFiles) {
-            ModFile mod = modFile.getFile();
-            for (var at : mod.getAccessTransformers()) {
-                if (!Files.exists(at)) {
-                    var message = "Invalid mod file: " + modFile.getFile().getFileName() + ". Missing Access Transformer: " + at;
-                    errors.add(new ExceptionData(message));
-                    LOGGER.error(message);
-                } else
-                    FMLLoader.addAccessTransformer(at, mod);
-            }
-        }
-
-        if (!errors.isEmpty())
-            getErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
-    }
-}

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

@@ -7,10 +7,8 @@ package net.minecraftforge.fml.loading;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
-import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
-import cpw.mods.modlauncher.api.TypesafeMap;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
 
 import org.jetbrains.annotations.ApiStatus;
@@ -42,17 +40,6 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
 
     @Override
     public void earlyInitialization(final String launchTarget, final String[] arguments) {
-        boolean isMixinEnabledInDev = false;
-        for (String arg : arguments) {
-            if (arg.startsWith("-mixin") || arg.startsWith("--mixin")) {
-                isMixinEnabledInDev = true;
-                break;
-            }
-        }
-        Launcher.INSTANCE.blackboard().putIfAbsent(
-            TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "isMixinEnabledInDev", Boolean.class),
-            isMixinEnabledInDev
-        );
         ImmediateWindowHandler.load(launchTarget, arguments);
     }
 

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

@@ -33,10 +33,10 @@ import java.util.stream.Stream;
 
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-public final class ModSorter {
+public class ModSorter {
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    record State(List<ModFile> files, List<ModInfo> mods) {}
+    private record State(List<ModFile> files, List<ModInfo> mods) {}
 
     private ModSorter() {}
 
@@ -46,13 +46,13 @@ public final class ModSorter {
         List<ModFile> modFiles;
 
         try {
-            modFiles = UniqueModListBuilder.buildUniqueList(mods).modFiles();
+            modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
         } 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 LoadingModListImpl.init(systemMods, e);
+            return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
         }
 
         var named = new HashMap<String, ModInfo>();
@@ -66,15 +66,15 @@ public final class ModSorter {
 
         // if we miss one or the other, we abort now
         if (!failedList.isEmpty()) {
-            return LoadingModListImpl.init(systemMods, new EarlyLoadingException("failure to validate mod list", null, failedList));
+            return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
         } else {
             // Otherwise, lets try and sort the modlist and proceed
             try {
                 var sorted = sort(modFiles, named);
-                return LoadingModListImpl.init(sorted, null);
+                return LoadingModList.of(sorted.files(), sorted.mods(), null);
             } 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 LoadingModListImpl.init(systemMods, e);
+                return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
             }
         }
     }

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

@@ -33,52 +33,28 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
     private static String DIST;
     private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
     private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
+    private static final String MOD = "Lnet/minecraftforge/fml/common/Mod;";
 
     @Override
     public String name() {
         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();
-
-        // Only apply to MC classes when on a dedicated server in a production environment
-        if (FMLEnvironment.production)
-            return FMLEnvironment.dist.isDedicatedServer() && isMinecraftClass(internalName) ? YAY : NAY;
-
-        // For dev time it's a bit trickier so that we can throw exceptions when someone uses @OnlyIn in their mod code,
-        // so that it's more obvious that the behaviour they're expecting won't work in production anymore
-        if (internalName.startsWith("net/minecraftforge/"))
-            return NAY;
-
-        // No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client
-        if (FMLEnvironment.dist.isClient() && isMinecraftClass(internalName))
-            return NAY;
-
-        return YAY; // mod classes might have @OnlyIn, so parse them in dev to find out and throw if they do
-    }
-
     @Override
     public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
         var changed = false;
 
         var annotations = unpack(classNode.visibleAnnotations);
-        var isNonMinecraftClass = !isMinecraftClass(classNode.name);
 
         if (remove(annotations, DIST)) {
             LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
-            throw new RuntimeException("Attempted to load class " + classNode.name  + " for invalid dist " + DIST);
+            throw new RuntimeException("Attempted to load class "+ classNode.name  + " for invalid dist "+ DIST);
         }
 
-        if (isNonMinecraftClass && !annotations.isEmpty())
-            throw new UnsupportedOperationException("Mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
+        if (!FMLEnvironment.production && !annotations.isEmpty() && hasModAnnotation(classNode.visibleAnnotations)) {
+            LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
+            throw new RuntimeException("Found @OnlyIn on @Mod class "+ classNode.name  + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
+        }
 
         if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
             for (var ann : annotations) {
@@ -86,7 +62,7 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
                     continue;
 
                 if (classNode.interfaces.remove(ann.intf)) {
-                    LOGGER.debug(DISTXFORM, "Removing Interface: {} implements {}", classNode.name, ann.intf);
+                    LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, ann.intf);
                     changed = true;
                 }
             }
@@ -110,9 +86,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
                 LOGGER.debug(DISTXFORM, "Removing field: {}.{}", classNode.name, field.name);
                 itr.remove();
                 changed = true;
-
-                if (isNonMinecraftClass)
-                    throw new UnsupportedOperationException("Field " + field.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
             }
         }
 
@@ -124,9 +97,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
                 itr.remove();
                 lambdaGatherer.accept(method);
                 changed = true;
-
-                if (isNonMinecraftClass)
-                    throw new UnsupportedOperationException("Method " + method.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
             }
         }
 
@@ -153,7 +123,7 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         return changed ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
     }
 
-    private record Target(String side, String intf) {
+    private static record Target(String side, String intf) {
         static Target from(final AnnotationNode node) {
             var idx = node.values.indexOf("value");
             var value = (String[])node.values.get(idx + 1); // Enums are stored as [Type, Value]
@@ -207,8 +177,16 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         return false;
     }
 
-    private static boolean isMinecraftClass(final String internalName) {
-        return internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/");
+    private static boolean hasModAnnotation(final List<AnnotationNode> anns) {
+        if (anns == null || anns.isEmpty())
+            return false;
+
+        for (var ann : anns) {
+            if (ann.desc.equals(MOD))
+                return true;
+        }
+
+        return false;
     }
 
     @SuppressWarnings("unchecked")
@@ -220,7 +198,26 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
         };
     }
 
-    private static final class LambdaGatherer extends MethodVisitor {
+    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;
+
+        // No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client
+        if (FMLEnvironment.dist.isClient() && (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/")))
+            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",
                 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",

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

@@ -12,7 +12,6 @@ import java.util.Map;
 import org.apache.commons.lang3.text.StrLookup;
 import org.apache.commons.lang3.text.StrSubstitutor;
 
-// TODO: [FML] Remove this
 @SuppressWarnings("deprecation")
 public class StringSubstitutor {
     private static final Map<String, String> GLOBALS = Map.of(

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

@@ -17,6 +17,8 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
@@ -24,12 +26,19 @@ 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 final class UniqueModListBuilder {
-    private UniqueModListBuilder() {}
+public class UniqueModListBuilder {
+    private final static Logger LOGGER = LogUtils.getLogger();
 
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private final List<ModFile> modFiles;
+
+    public UniqueModListBuilder(final List<ModFile> modFiles) {
+        this.modFiles = modFiles;
+    }
+
+    public UniqueModListData buildUniqueList() {
+        List<ModFile> uniqueModList;
+        List<ModFile> uniqueLibListWithVersion;
 
-    public static UniqueModListData buildUniqueList(List<ModFile> modFiles) {
         // Collect mod files by module name. This will be used for deduping purposes
         final Map<String, List<ModFile>> modFilesByFirstId = modFiles.stream()
                 .filter(mf -> mf.getModFileInfo() != null)
@@ -40,12 +49,12 @@ public final class UniqueModListBuilder {
                 .collect(groupingBy(UniqueModListBuilder::getModId));
 
         // Select the newest by artifact version sorting of non-unique files thus identified
-        final List<ModFile> uniqueModList = modFilesByFirstId.entrySet().stream()
+        uniqueModList = modFilesByFirstId.entrySet().stream()
                 .map(UniqueModListBuilder::selectNewestModInfo)
                 .toList();
 
         // Select the newest by artifact version sorting of non-unique files thus identified
-        final List<ModFile> uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
+        uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
                 .map(UniqueModListBuilder::selectNewestModInfo)
                 .toList();
 
@@ -57,10 +66,12 @@ public final class UniqueModListBuilder {
                 .collect(groupingBy(IModInfo::getModId));
 
         // Transform to the full lib id list
-        final List<List<ModFile>> versionedLibs = uniqueLibListWithVersion.stream()
+        final Map<String, List<ModFile>> versionedLibIds = uniqueLibListWithVersion.stream()
                 .map(UniqueModListBuilder::getModId)
-                .map(libFilesWithVersionByModuleName::get)
-                .toList();
+                .collect(Collectors.toMap(
+                    Function.identity(),
+                    libFilesWithVersionByModuleName::get
+                ));
 
         // Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
         // We can't handle this
@@ -73,24 +84,24 @@ public final class UniqueModListBuilder {
                 )).toList();
 
         if (!dupedModErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate mods:\n{}", String.join("\n", dupedModErrors));
+            LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
             throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
-                    .map(EarlyLoadingException.ExceptionData::new)
+                    .map(s -> new EarlyLoadingException.ExceptionData(s))
                     .toList());
         }
 
 
-        final List<String> dupedLibErrors = versionedLibs.stream()
-                .filter(libModFiles -> libModFiles.size() > 1)
+        final List<String> dupedLibErrors = versionedLibIds.values().stream()
+                .filter(modFiles -> modFiles.size() > 1)
                 .map(mods -> String.format("\tLibrary: '%s' from files: %s",
                         getModId(mods.getFirst()),
                         mods.stream().map(ModFile::getFileName).collect(joining(", "))
                 )).toList();
 
         if (!dupedLibErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", String.join("\n", dupedLibErrors));
+            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
             throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
-                    .map(EarlyLoadingException.ExceptionData::new)
+                    .map(s -> new EarlyLoadingException.ExceptionData(s))
                     .toList());
         }
 
@@ -111,26 +122,23 @@ public final class UniqueModListBuilder {
             modInfoList.sort(Comparator.comparing(UniqueModListBuilder::getVersion).reversed());
             LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
         }
-        return modInfoList.getFirst();
+        return modInfoList.get(0);
     }
 
     private static ArtifactVersion getVersion(final ModFile mf) {
-        List<IModInfo> modInfos;
-        if (mf.getModFileInfo() == null || (modInfos = mf.getModInfos()) == null || modInfos.isEmpty()) {
+        if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
             return mf.getJarVersion();
         }
 
-        return modInfos.getFirst().getVersion();
+        return mf.getModInfos().get(0).getVersion();
     }
 
     private static String getModId(ModFile modFile) {
-        var modFileInfo = modFile.getModFileInfo();
-        List<IModInfo> mods;
-        if (modFileInfo == null || (mods = modFileInfo.getMods()).isEmpty()) {
+        if (modFile.getModFileInfo() == null || modFile.getModFileInfo().getMods().isEmpty()) {
             return modFile.getSecureJar().name();
         }
 
-        return mods.getFirst().getModId();
+        return modFile.getModFileInfo().getMods().get(0).getModId();
     }
 
     public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}

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

@@ -32,6 +32,15 @@ public class VersionSupportMatrix {
         }
     }
 
+    /**
+     * @deprecated Use {@link #testVersionSupportMatrix(VersionRange, String, String)} instead, unwrapping your BiPredicate.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
+    public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
+        if (standardLookup.test(lookupId, declaredRange)) return true;
+        return testVersionSupportMatrix(declaredRange, lookupId, type);
+    }
+
     public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) {
         if (OVERRIDE_VERSIONS.isEmpty()) return false;
         List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId);

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/AbstractModProvider.java

@@ -54,16 +54,12 @@ public abstract class AbstractModProvider implements IModProvider {
 
     @Nullable
     protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
-        var debug = path.toString();
-        if (debug.equals("/"))
-            debug = path.toUri().toString();
-
         var mjm = new ModJarMetadata();
         SecureJar sj = null;
         try {
             sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
         } catch (Throwable t) {
-            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + debug + "\" - " + t.getMessage()));
+            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + path + "\" - " + t.getMessage()));
         }
 
         IModFile mod;
@@ -72,7 +68,7 @@ public abstract class AbstractModProvider implements IModProvider {
             type = defaultType;
 
         if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
-            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, debug);
+            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
             mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
             // ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata
             mjm.setModFile(mod);
@@ -81,17 +77,17 @@ public abstract class AbstractModProvider implements IModProvider {
                 return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
             }
         } else if (type != null) {
-            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, debug);
+            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
             mod = new ModFile(sj, this, this::manifestParser, type);
         } else if (ignoreUnknown) {
             return null;
         } else
-            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + debug));
+            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
 
         return new IModLocator.ModFileOrException(mod, null);
     }
 
-    protected static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
+    private static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
         var info = jar.moduleDataProvider().open(MODULE_INFO).orElse(null);
         if (info != null) {
             try {
@@ -149,12 +145,6 @@ public abstract class AbstractModProvider implements IModProvider {
             public <T> Optional<T> getConfigElement(String... key) {
                 return Optional.empty();
             }
-
-            @Override
-            public List<? extends IConfigurable> getConfigList(String key) {
-                return Collections.emptyList();
-            }
-
             @Override
             public List<? extends IConfigurable> getConfigList(String... key) {
                 return Collections.emptyList();

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

@@ -17,7 +17,8 @@ import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.*;
 
-public final class BackgroundScanHandler {
+public class BackgroundScanHandler
+{
     private enum ScanStatus {
         NOT_STARTED,
         RUNNING,
@@ -32,6 +33,7 @@ public final class BackgroundScanHandler {
     private final ExecutorService modContentScanner;
     private final List<ModFile> modFiles;
     private ScanStatus status;
+    private LoadingModList loadingModList;
 
     public BackgroundScanHandler(final List<ModFile> modFiles) {
         this.modFiles = modFiles;
@@ -67,6 +69,16 @@ public final class BackgroundScanHandler {
         }
     }
 
+    public void setLoadingModList(LoadingModList loadingModList)
+    {
+        this.loadingModList = loadingModList;
+    }
+
+    public LoadingModList getLoadingModList()
+    {
+        return loadingModList;
+    }
+
     public void waitForScanToComplete(final Runnable ticker) {
         boolean timeoutActive = System.getProperty("fml.disableScanTimeout") == null;
         Instant deadline = Instant.now().plus(Duration.ofMinutes(10));

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

@@ -45,7 +45,7 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
         // Find 'minecraft' during dev time this is also Forge. So skip it.
         // Can return null for dedicated server as Minecraft isn't on the classpath
         // On the client it doesn't matter as it's the vanilla jar so wouldnt have mods.toml in it.
-        var minecraft = getPathFromResource(cl, "net/minecraft/world/item/Item.class");
+        var minecraft = getPathFromResource(cl, "net/minecraft/obfuscate/DontObfuscate.class");
 
         var claimed = new HashSet<Path>();
         var tomls = getUrls(cl, MODS_TOML);
@@ -74,8 +74,7 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
         var ret = new ArrayList<ModFileOrException>();
         for (var path : claimed) {
             // Filter out anything found by the ServiceLoader
-            if (!ModDirTransformerDiscoverer.isServiceProvider(path)
-                && !JarInJarDependencyLocator.isOption(path))
+            if (!ModDirTransformerDiscoverer.isServiceProvider(path))
                 ret.add(createMod(path));
         }
         return ret;
@@ -108,7 +107,7 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
         return Path.of(URI.create(str));
     }
 
-    static Path getPathFromResource(ClassLoader cl, String resource) {
+    private static Path getPathFromResource(ClassLoader cl, String resource) {
         var url = cl.getResource(resource);
         if (url == null)
             return null;

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import net.minecraftforge.forgespi.coremod.ICoreModFile;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
+public final class CoreModFile implements ICoreModFile {
+    private final Path internalPath;
+    private final ModFile file;
+    private final String name;
+
+    CoreModFile(final String name, final Path path, final ModFile file) {
+        this.name = name;
+        this.internalPath = path;
+        this.file = file;
+    }
+
+    @Override
+    public Reader readCoreMod() throws IOException {
+        return Files.newBufferedReader(this.internalPath);
+    }
+
+    @Override
+    public Path getPath() {
+        return this.internalPath;
+    }
+
+    @Override
+    public Reader getAdditionalFile(final String fileName) throws IOException {
+        return Files.newBufferedReader(file.findResource(fileName));
+    }
+
+    @Override
+    public String getOwnerId() {
+        return this.file.getModInfos().get(0).getModId();
+    }
+
+    @Override
+    public String toString() {
+        return "{Name: " + name + ", Owner: " + getOwnerId() + " @ " + getPath() + "}";
+    }
+}

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/JarInJarDependencyLocator.java

@@ -5,39 +5,22 @@
 
 package net.minecraftforge.fml.loading.moddiscovery;
 
-import com.electronwill.nightconfig.core.UnmodifiableConfig;
-import com.electronwill.nightconfig.core.file.FileConfig;
+import com.google.common.collect.ImmutableMap;
 import com.mojang.logging.LogUtils;
-
-import cpw.mods.modlauncher.Launcher;
-import cpw.mods.modlauncher.api.TypesafeMap;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
-import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
-import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.forgespi.locating.IModFile.Type;
-import net.minecraftforge.jarjar.metadata.ContainedJarIdentifier;
-import net.minecraftforge.jarjar.metadata.ContainedJarMetadata;
-import net.minecraftforge.jarjar.metadata.ContainedVersion;
-import net.minecraftforge.jarjar.metadata.MetadataIOHandler;
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import net.minecraftforge.jarjar.selection.JarSelector;
-
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.module.ModuleDescriptor;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -45,20 +28,14 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.StringJoiner;
-import java.util.TreeMap;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @ApiStatus.Internal
 public class JarInJarDependencyLocator extends AbstractModProvider implements IDependencyLocator {
-    private static final String ROIMFS = "roimfs";
     private static final String COLOR_CODE = "\u00a7";
     private static final String RESET  = COLOR_CODE + "r";
     private static final String YELLOW = COLOR_CODE + "e";
@@ -66,238 +43,32 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
     private static final String GREEN  = COLOR_CODE + "2";
 
     private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Marker MARKER = MarkerFactory.getMarker("JAR-JAR"); // LogMarkers.SCAN;
-
-    private static final Map<Path, Option> OPTIONS = new HashMap<>();
-    private static volatile boolean optionsLoaded = false;
-
-    private static final Attributes.Name MIXIN_CONFIGS_ATTR = new Attributes.Name("MixinConfigs");
-    private static final Attributes.Name MIXIN_CONNECTOR_ATTR = new Attributes.Name("MixinConnector");
-    private static final ContainedJarMetadata MIXIN_EXTRAS_DEPENDENCY = makeMixinExtraDependency();
-
-    private static ContainedJarMetadata makeMixinExtraDependency() {
-        VersionRange range = null;
-        try {
-            range = VersionRange.createFromVersionSpec("[0,)");
-        } catch (InvalidVersionSpecificationException e) {
-            throw new RuntimeException("Failed to create version range for mixinextras-forge dependency", e);
-        }
-
-        return new ContainedJarMetadata(
-            new ContainedJarIdentifier("io.github.llamalad7", "mixinextras-forge"),
-            new ContainedVersion(range, null),
-            null, false
-        );
-    }
 
     @Override
     public String name() {
         return "JarInJar";
     }
 
-    private int fsID = 0;
-    private synchronized int nextId() {
-        return fsID++;
-    }
-
     @Override
     public List<IModFile> scanMods(Iterable<IModFile> loadedMods) {
-        var mods = new ArrayList<IModFile>();
-        loadedMods.forEach(mods::add);
+        final List<IModFile> sources = new ArrayList<>();
+        loadedMods.forEach(sources::add);
 
-        var selector = new Selector(mods);
+        var dependenciesToLoad = JarSelector.detectAndSelect(
+            sources,
+            this::loadResourceFromModFile,
+            this::loadModFileFrom,
+            this::identifyMod,
+            this::exception
+        );
 
-        // Add a synthetic Mixin-Extras dependency if we detect anyone using Mixin
-        if (anyMixinsLoaded(mods)) {
-            if (!selector.isRequired(MIXIN_EXTRAS_DEPENDENCY.identifier()))
-                selector.addRequirement(MIXIN_EXTRAS_DEPENDENCY);
-        } else if (selector.entries.size() == mods.size()) {
+        if (dependenciesToLoad.isEmpty()) {
             LOGGER.info("No dependencies to load found. Skipping!");
             return Collections.emptyList();
         }
 
-        loadOptions();
-
-        // Ideally, the json would be in order so we only have to loop once. But its written this way just in case.
-        var seen = new HashSet<Option>();
-        var added = false;
-        do {
-            added = false;
-            for (var entry : OPTIONS.values()) {
-                if (seen.contains(entry) || !selector.isRequired(entry.meta.identifier()))
-                    continue;
-
-                seen.add(entry);
-
-                entry.addTo(selector);
-
-                if (entry.deps != null && !entry.deps.isEmpty()) {
-                    added = true;
-                    for (var dep : entry.deps)
-                        selector.addRequirement(dep);
-                }
-            }
-        } while (added);
-
-        var selected = selector.select();
-
-        if (LOGGER.isDebugEnabled()) {
-            var ids = new TreeMap<String, List<Entry>>();
-            for (var entry : selector.entries.values()) {
-                if (entry != FAILED && entry.coord != null)
-                    ids.computeIfAbsent(entry.coord, id -> new ArrayList<>()).add(entry);
-            }
-
-            for (var entry : ids.entrySet()) {
-                LOGGER.info(MARKER, "JarJar Candidated for {}", entry.getKey());
-                Collections.sort(entry.getValue());
-                for (var option : entry.getValue())
-                    LOGGER.info(MARKER, "\t{}{}", selected.contains(option) ? '*' : ' ', option);
-            }
-        }
-
-        if (selected.isEmpty()) {
-            LOGGER.info("No dependencies to load found. Skipping!");
-            return Collections.emptyList();
-        }
-
-        /* Since Java 11, the JRE decompresses all zip files to memory when getting a ByteChannel for them.
-         * JarJar only targets Minecraft 1.18+ which is Java17+ Which means we can exploit the fact that
-         * these are Disjointed file systems, and close all unselected libraries.
-         *
-         * https://github.com/openjdk/jdk11u/blob/25a9b9e5594e88c9e1e66f95c7ca45d5a9da8854/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java#L703
-         *
-         * Combined with the fact that the JarJarFileSystem has always simply called into FileSystems.newFileSystem for its wrapped targets.
-         * https://github.com/MinecraftForge/JarJar/blame/b39b2051439c81519d826d38898778bf3081356f/src/main/java/net/minecraftforge/jarjar/nio/pathfs/PathFileSystem.java#L38
-         *
-         * This effectively means that JarJar has ALWAYS been a wrapper around in-memory copies of every jar it scans.
-         *
-         * It also never closes these FileSystems, which potentially means they are leaked if the GC can't inherently GC them.
-         *
-         * Ideally we would extract these contained jars to a temp folder, so that we can use the nice optimizations Java has for ZipFile/JarFile.
-         * But in order to do that we would need to write the file to a place that could potentially have conflicts.
-         * To resolve those conflicts we should take a hint out of maven/gradle/minecraft's book and key the filepath based on a hash of the file being extracted.
-         * However, because that hash is no available in existing metadata we would need to re-calculate it.
-         *
-         * To do it in an efficient way we I needed to be able to share the single opened FileSystem with both the SecureJar implementation, and with our recursive search.
-         * So I use my new ReadOnlyInMemoryFileSystem which is specifically designed to use the same backing array for the JarInJar search as it does with the resulting dependency
-         * selected SecureJars.
-         *
-         * This means that if we wanted to we could rather efficiently calculate a hash for extracting the file. However, it also means that we don't have to extract to file to
-         * support ZipFileSystem caching properly. So as long as we are okay with not using the JRE's optimized ZipFile implementation, or we want to support legacy JarInJar metadata,
-         * using this efficient in memory file system is the best option performance wise. Extracting the files during launch without an efficient caching/unique identifier system
-         * would incur a lot of Disc IO which can be super slow depending on your setup.
-         *
-         * So, it is a stated goal of our future re-write to extract files into a cache directory to gain the benefits of JRE optimizations, using a FileSystem much simpler then
-         * the existing JarInJarFileSystem is good enough.
-         */
-
-        // Lets close all unselected FileSystems
-        var wasSelected = new HashSet<>(selected);
-        for (var entry : selector.entries.values())
-            entry.cleanup(wasSelected.contains(entry));
-
-        LOGGER.info(MARKER, "Found {} dependencies adding them to mods collection", selected.size());
-        var ret = new ArrayList<IModFile>(selected.size());
-
-        // Now lets build the actual mod files
-        for (var entry : selected) {
-            try {
-                var root = entry.getFinalPath();
-                var mod = createMod(root, false, entry.type.name());
-
-                if (mod.ex() != null)
-                    throw fail("Failed to load JarInJar file " + entry, mod.ex());
-
-                ret.add(mod.file());
-            } catch (EarlyLoadingException e) {
-                throw e;
-            } catch (Throwable e) {
-                throw fail("Failed to load JarInJar file " + entry, e);
-            }
-        }
-
-        return ret;
-    }
-
-    private static Boolean anyMixinsLoaded = null;
-    private static boolean anyMixinsLoaded(List<IModFile> mods) {
-        var ret = anyMixinsLoaded;
-        if (ret != null) return ret;
-
-        if (!FMLEnvironment.production
-                && Launcher.INSTANCE.blackboard().get(TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "isMixinEnabledInDev", Boolean.class)).orElse(false)) {
-            anyMixinsLoaded = true;
-            return true;
-        }
-
-        for (var mod : mods) {
-            var attributes = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
-            if (attributes.getValue(MIXIN_CONFIGS_ATTR) != null || attributes.getValue(MIXIN_CONNECTOR_ATTR) != null) {
-                anyMixinsLoaded = true;
-                return true;
-            }
-        }
-
-        anyMixinsLoaded = false;
-        return false;
-    }
-
-    private record Options(List<OptionMetadata> options) {}
-    private record OptionMetadata(String resource, Type layer, String id, List<ContainedJarMetadata> deps, ContainedJarMetadata meta, boolean nested) {}
-
-    private static void loadOptions() {
-        if (optionsLoaded)
-            return;
-
-        synchronized (OPTIONS) {
-            if (optionsLoaded)
-                return;
-
-            optionsLoaded = true;
-
-            var self = JarInJarDependencyLocator.class;
-
-            try (var stream = self.getModule().getResourceAsStream("/jarjar_options.json")) {
-                if (stream == null) {
-                    LOGGER.error(MARKER, "Failed to find jarjar_options.json");
-                    return;
-                }
-
-                var meta = MetadataIOHandler.getGson().fromJson(new InputStreamReader(stream), Options.class);
-                //var meta = MetadataIOHandler.fromStream(stream).orElse(null);
-                if (meta == null) {
-                    LOGGER.error(MARKER, "Corrupted jarjar_options.json");
-                    return;
-                }
-
-                for (var jar : meta.options()) {
-                    Path path = ClasspathLocator.getPathFromResource(self.getClassLoader(), jar.resource());
-                    if (path == null) {
-                        LOGGER.error(MARKER, "Failed to find JarJar option for {}", jar.resource());
-                        continue;
-                    }
-
-                    LOGGER.debug(MARKER, "Found JarJar Option: {}", path.toAbsolutePath());
-                    if (jar.nested())
-                        OPTIONS.put(path, new NestedOption(jar.id(), path, jar.layer(), jar.meta(), jar.deps()));
-                    else
-                        OPTIONS.put(path, new Option(jar.id(), path, jar.layer(), jar.meta(), jar.deps()));
-                }
-            } catch (Throwable e) {
-                LOGGER.error(MARKER, "Failed to read JarJar Options file", e);
-            }
-        }
-    }
-
-    static boolean isOption(Path path) {
-        loadOptions();
-        return OPTIONS.containsKey(path);
-    }
-
-    private static EarlyLoadingException fail(String message, @Nullable Throwable cause) {
-        LOGGER.error(MARKER, message);
-        return new EarlyLoadingException(message, cause, Collections.emptyList());
+        LOGGER.info("Found {} dependencies adding them to mods collection", dependenciesToLoad.size());
+        return dependenciesToLoad;
     }
 
     @Override
@@ -305,7 +76,89 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
         return IModFile.Type.GAMELIBRARY.name();
     }
 
-    protected static String identifyMod(IModFile modFile) {
+    protected Optional<IModFile> loadModFileFrom(IModFile file, Path path) {
+        try {
+            final Path pathInModFile = file.findResource(path.toString());
+            final URI filePathUri = new URI("jij:" + (pathInModFile.toAbsolutePath().toUri().getRawSchemeSpecificPart())).normalize();
+            final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
+            final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
+            final Path pathInFS = zipFS.getPath("/");
+            final IModFile.Type parentType = file.getType();
+            final String modType;
+            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
+                modType = IModFile.Type.LIBRARY.name();
+            } else {
+                modType = IModFile.Type.GAMELIBRARY.name();
+            }
+            return Optional.of(createMod(pathInFS, false, modType).file());
+        } catch (Exception e) {
+            LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
+            final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
+            exception.initCause(e);
+            throw exception;
+        }
+    }
+
+    protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies) {
+        final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
+               .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
+               .map(JarInJarDependencyLocator::buildExceptionData)
+               .toList();
+
+        return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
+    }
+
+    @NotNull
+    private static EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
+        return new EarlyLoadingException.ExceptionData(
+                getErrorTranslationKey(entry),
+                entry.identifier().group() + ":" + entry.identifier().artifact(),
+                entry.sources()
+                     .stream()
+                     .flatMap(JarInJarDependencyLocator::getModWithVersionRangeStream)
+                     .map(JarInJarDependencyLocator::formatError)
+                     .collect(Collectors.joining(", "))
+        );
+    }
+
+    @NotNull
+    private static String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
+        return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
+                       "fml.dependencyloading.conflictingdependencies" :
+                       "fml.dependencyloading.mismatchedcontaineddependencies";
+    }
+
+    @NotNull
+    private static Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
+        return file.sources()
+                   .stream()
+                   .map(IModFile::getModFileInfo)
+                   .flatMap(modFileInfo -> modFileInfo.getMods().stream())
+                   .map(modInfo -> new ModWithVersionRange(modInfo, file.requestedVersionRange(), file.includedVersion()));
+    }
+
+    protected Optional<InputStream> loadResourceFromModFile(IModFile modFile, Path path) {
+        try {
+            var pathInModFile = modFile.findResource(path.toString());
+            if (!Files.exists(pathInModFile)) {
+                LOGGER.debug("Failed to load resource {} from {}, it does not contain dependency information.", path, modFile.getFileName());
+                return Optional.empty();
+            }
+            return Optional.of(Files.newInputStream(pathInModFile));
+        } catch (Exception e) {
+            LOGGER.error("Failed to load resource {} from mod {}, cause {}", path, modFile.getFileName(), e);
+            return Optional.empty();
+        }
+    }
+
+    @NotNull
+    private static String formatError(ModWithVersionRange modWithVersionRange){
+        return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " +
+               RED + modWithVersionRange.versionRange().toString() + RESET + " - " +
+               GREEN + modWithVersionRange.artifactVersion().toString() + RESET;
+    }
+
+    protected String identifyMod(IModFile modFile) {
         if (modFile.getModFileInfo() != null && !modFile.getModInfos().isEmpty())
             return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining());
 
@@ -316,377 +169,5 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
         return modFile.getFileName();
     }
 
-    private static final Entry FAILED = new Entry("FAILED ENTRY", Path.of(""), Type.LIBRARY, null);
-    private static sealed class Entry implements Comparable<Entry> {
-        final String id;
-        final Path path;
-        final Type type;
-        final @Nullable String coord;
-
-        private Entry(String id, Path path, Type type, @Nullable String coord) {
-            this.id = id;
-            this.path = path;
-            this.type = type;
-            this.coord = coord;
-        }
-
-        Path getFinalPath() {
-            return path;
-        }
-
-        void cleanup(boolean selected) {
-        }
-
-        @Override
-        public String toString() {
-            if (path.getFileName() == null)
-                return path.toUri().toString();
-            return path.getFileName().toString();
-        }
-
-        @Nullable
-        Path getResource(String path) {
-            return null;
-        }
-
-        @Override
-        public int compareTo(Entry o) {
-            return o.toString().compareTo(toString());
-        }
-    }
-
-    private static final class ModEntry extends Entry {
-        private final IModFile mod;
-
-        ModEntry(IModFile mod) {
-            super(identifyMod(mod), mod.getFilePath(), mod.getType(), null);
-            this.mod = mod;
-        }
-
-        @Override
-        @Nullable
-        Path getResource(String path) {
-            return mod.findResource(path);
-        }
-    }
-
-    private static sealed class Option extends Entry {
-        final ContainedJarMetadata meta;
-        final List<ContainedJarMetadata> deps;
-
-        private Option(String id, Path path, Type type, ContainedJarMetadata meta, List<ContainedJarMetadata> deps) {
-            super(id, path, type, meta.identifier().group() + ':' + meta.identifier().artifact());
-            this.meta = meta;
-            this.deps = deps;
-        }
-
-        public void addTo(Selector selector) {
-            selector.option(this, meta);
-        }
-    }
-
-    private static final class NestedOption extends Option {
-        private FileSystem zip;
-        private Path root;
-
-        private NestedOption(String id, Path path, Type type, ContainedJarMetadata meta, List<ContainedJarMetadata> deps) {
-            super(id, path, type, meta, deps);
-        }
-
-        @Override
-        public void addTo(Selector selector) {
-            super.addTo(selector);
-            selector.add(this);
-        }
-
-        @Override
-        void cleanup(boolean selected) {
-            if (this.zip != null) {
-                try {
-                    zip.close();
-                } catch (IOException e) {
-                    LOGGER.error(MARKER, "Failed to close unselected FileSystem {}", this, e);
-                }
-            }
-        }
-
-        @Nullable
-        Path getResource(String path) {
-            if (zip == null) {
-                try {
-                    this.zip = FileSystems.newFileSystem(this.path);
-                    this.root = zip.getRootDirectories().iterator().next();
-                } catch (IOException e) {
-                    LOGGER.error(MARKER, "Failed to open FileSystem for option root {}", this, e);
-                    return null;
-                }
-            }
-
-            var target = root.resolve(path);
-            if (Files.exists(target))
-                return target;
-
-            return null;
-        }
-    }
-
-
-    private static final class Nested extends Entry {
-        private final Entry parent;
-        private final String nestedPath;
-        private final Path zipPath;
-
-        Nested(String id, Path path, Type type, String coords, Entry parent, String nestedPath, Path zipPath) {
-            super(id, path, type, coords);
-            this.parent = parent;
-            this.nestedPath = nestedPath;
-            this.zipPath = zipPath;
-        }
-
-        /*
-         * Due to a bug in Mixin, anything that is not on the DefaultFileSystem MUST be a directory.
-         * Or else it can't resolve resources correctly. So for anything we put on the roimfs we need
-         * to return the nested zip file system.
-         *
-         * This will be an annoying to backport, but we can cross that bridge when we come to it.
-         *
-         * See: https://github.com/SpongePowered/Mixin/blob/4053421aa10aaac6127d969028a29c94fe3054f6/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java#L102
-         */
-        @Override
-        public Path getFinalPath() {
-            return zipPath;
-        }
-
-        @Override
-        void cleanup(boolean selected) {
-            if (selected)
-                return;
-
-            LOGGER.info(MARKER, "Closeing unselected FileSystem {}", this);
-            try {
-                zipPath.getFileSystem().close();
-                path.getFileSystem().close();
-            } catch (IOException e) {
-                LOGGER.error(MARKER, "Failed to close unselected FileSystem {}", this, e);
-            }
-        }
-
-        @Override
-        @Nullable
-        Path getResource(String path) {
-            return zipPath.resolve(path);
-        }
-
-        @Override
-        public String toString() {
-            return parent + "!/" + nestedPath;
-        }
-    }
-
-    private record Key(Entry parent, String path) {}
-
-    private final class Selector extends JarSelector<Entry> {
-        private final HashMap<Key, Entry> entries = new HashMap<>();
-        private final HashMap<Entry, HashMap<String, String>> children = new HashMap<>();
-
-        private Selector(Iterable<IModFile> mods) {
-            for (var mod : mods)
-                this.force(new ModEntry(mod));
-        }
-
-        @Override
-        public void force(Entry entry) {
-            super.force(entry);
-            entries.put(new Key(entry, ""), entry);
-        }
-
-        @Override
-        public void option(Entry entry, ContainedJarMetadata meta) {
-            super.option(entry, meta);
-            entries.put(new Key(entry, ""), entry);
-        }
-
-        @Override
-        public void add(Entry entry) {
-            super.add(entry);
-            entries.put(new Key(entry, ""), entry);
-        }
-
-        @Override
-        @Nullable
-        protected InputStream getResource(Entry source, String path) {
-            try {
-                Path target = source.getResource(path);
-                if (target == null || !Files.exists(target)) {
-                    LOGGER.debug(MARKER, "Failed to load resource {} from {}, it does not contain dependency information.", path, source);
-                    return null;
-                }
-
-                // Read the metadata file and store identifiers so we can group them later.
-                if (JarSelector.CONTAINED_JARS_METADATA_PATH.equals(path)) {
-                    try (var is = Files.newInputStream(target)) {
-                        var meta = MetadataIOHandler.fromStream(is).orElse(null);
-                        if (meta == null)
-                            return Files.newInputStream(target);
-                        var children = new HashMap<String, String>();
-                        for (var child : meta.jars())
-                            children.put(child.path().replace('\\', '/'), child.identifier().group() + ':' + child.identifier().artifact());
-                        this.children.put(source, children);
-                    }
-                }
-
-                return Files.newInputStream(target);
-            } catch (Exception e) {
-                LOGGER.error(MARKER, "Failed to load resource {} from {}, cause {}", path, source, e);
-                return null;
-            }
-        }
-
-
-        @Override
-        protected Entry getNested(Entry source, String path) {
-            var cleaned = path.replace('\\', '/');
-            var key = new Key(source, cleaned);
-            var entry = entries.get(key);
-            if (entry == null) {
-                entry = createNested(source, path, cleaned);
-                if (entry == null)
-                    entry = FAILED;
-                entries.put(key, entry);
-            }
-            return entry == FAILED ? null : entry;
-        }
-
-        private Entry createNested(Entry source, String path, String cleaned) {
-            var targetPath = source.getResource(path);
-
-            if (targetPath == null || !Files.isRegularFile(targetPath))
-                return null;
-
-            Path roimfsPath = null;
-            Path zipPath = null;
-            try {
-                // Lets copy the uncompressed file to memory, and then create a ReadOnlyInMemorryFileSystem for it, this allows us to reference it by URI.
-                // Which is needed because a lot of things require navigation via URI.
-                // And ZipFileSystem only caches the FileSystem instance when accessed via URI.
-                byte[] data = Files.readAllBytes(targetPath);
-                String filename = targetPath.getFileName().toString();
-                URI uri = new URI(ROIMFS, "jar-jar-" + nextId() + "/" + filename, null);
-                var roimfs = FileSystems.newFileSystem(uri, Collections.singletonMap("data", data));
-                roimfsPath = roimfs.getPath(filename);
-                var zip = FileSystems.newFileSystem(new URI("jar:" + roimfsPath.toUri()), Collections.emptyMap());
-                zipPath = zip.getRootDirectories().iterator().next(); // Get first root, which on ZipFileSystem is the only root
-            } catch (IOException | URISyntaxException e) {
-                LOGGER.error(MARKER, "Failed to create FileSystem for nested jar {}", source, e);
-                return null;
-            }
-
-            var mf = new Manifest();
-            var mfPath = zipPath.resolve(JarFile.MANIFEST_NAME);
-            if (Files.exists(mfPath)) {
-                try (var is = Files.newInputStream(mfPath)) {
-                    mf = new Manifest(is);
-                } catch (IOException e) {
-                    LOGGER.error(MARKER, "Failed to read manifest from {}", source, e);
-                }
-            }
-
-            IModFile.Type type = null;
-            String id = null;
-            var tomlPath = zipPath.resolve(MODS_TOML);
-            if (Files.exists(tomlPath)) {
-                var cfg = FileConfig.builder(tomlPath).build();
-                cfg.load();
-                cfg.close();
-                if (cfg.getOrElse("mods", null) instanceof Collection collection) {
-                    @SuppressWarnings("unchecked")
-                    var mods = (Collection<UnmodifiableConfig>)collection;
-                    if (!mods.isEmpty()) {
-                        var first = mods.iterator().next();
-                        var modId = first.getOrElse("modId", null);
-                        if (modId instanceof String str)
-                            id = str;
-                    }
-                }
-                var value = mf.getMainAttributes().getValue(ModFile.TYPE);
-                if (value != null)
-                    type = IModFile.Type.valueOf(value);
-                else
-                    type = IModFile.Type.MOD;
-            } else {
-                var value = mf.getMainAttributes().getValue(ModFile.TYPE);
-                if (value != null)
-                    type = IModFile.Type.valueOf(value);
-                else {
-                    // No mods.toml, no entry value, so decide based on the container's type
-                    if (source.type == IModFile.Type.LIBRARY || source.type == IModFile.Type.LANGPROVIDER)
-                        type = IModFile.Type.LIBRARY;
-                    else
-                        type = IModFile.Type.GAMELIBRARY;
-                }
-            }
-
-            if (id == null) {
-                var modulePath = zipPath.resolve(MODULE_INFO);
-                if (Files.exists(modulePath)) {
-                    try (var is = Files.newInputStream(modulePath)) {
-                        var module = ModuleDescriptor.read(is);
-                        id = module.name();
-                    } catch (IOException e) {
-                        LOGGER.error(MARKER, "Failed to read module-info.class from {}", source, e);
-                    }
-                }
-            }
-
-            if (id == null)
-                id = mf.getMainAttributes().getValue("Automatic-Module-Name");
-
-            if (id == null)
-                id = Path.of(path).getFileName().toString();
-
-            String coords = null;
-            var child = this.children.get(source);
-            if (child != null)
-                coords = child.get(cleaned);
-
-            return new Nested(id, roimfsPath, type, coords, source, cleaned, zipPath);
-        }
-
-        @Override
-        protected String getIdentifier(Entry entry) {
-            return entry.id;
-        }
-
-        @Override
-        protected Throwable getFailureException(Collection<ResolutionFailureInformation<Entry>> failures) {
-            var errors = new ArrayList<ExceptionData>();
-            for (var failure : failures) {
-                var message = failure.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ? "fml.dependencyloading.conflictingdependencies" : "fml.dependencyloading.mismatchedcontaineddependencies";
-                var joiner = new StringJoiner(", ");
-                for (var source : failure.sources()) {
-                    String paths = null;
-                    if (source.sources().size() == 0) {
-                        paths = "[No Sources]";
-                    } else if (source.sources().size() == 1) {
-                        var entry = source.sources().iterator().next();
-                        paths = entry.toString();
-                    } else {
-                        var j = new StringJoiner(", ", "[", "]");
-                        for (var entry : source.sources())
-                            j.add(entry.toString());
-                        paths = j.toString();
-                    }
-
-                    var error = YELLOW + paths + RESET + " - " +
-                                RED + source.requestedVersionRange() + RESET + " - " +
-                                GREEN + source.includedVersion() + RESET;
-                    joiner.add(error);
-                }
-
-                errors.add(new ExceptionData(message, failure.identifier().group() + ":" + failure.identifier().artifact(), joiner.toString()));
-            }
-
-            return new EarlyLoadingException(failures.size() + " Dependency restrictions were not met.", null, errors);
-        }
-    }
+    private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion) {}
 }

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

@@ -14,7 +14,6 @@ import net.minecraftforge.forgespi.locating.IModLocator;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.function.Consumer;
 
 import org.jetbrains.annotations.ApiStatus;
 
@@ -44,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);
@@ -58,9 +57,4 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
     public String name() {
         return "minecraft";
     }
-
-    @Override
-    public void scanFile(IModFile file, Consumer<Path> pathConsumer) {
-        // skip annotation scanning for MC itself
-    }
 }

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

@@ -19,7 +19,7 @@ import org.objectweb.asm.Type;
 import com.google.common.base.MoreObjects;
 
 @ApiStatus.Internal
-final class ModAnnotation {
+class ModAnnotation {
     public static ModFileScanData.AnnotationData fromModAnnotation(Type clazz, ModAnnotation annotation) {
         return new ModFileScanData.AnnotationData(annotation.asmType, annotation.type, clazz, annotation.member, annotation.values);
     }
@@ -84,7 +84,6 @@ final class ModAnnotation {
     }
 
     public void endArray() {
-        arrayList.trimToSize();
         values.put(arrayName, arrayList);
         arrayList = null;
     }

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

@@ -22,47 +22,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @ApiStatus.Internal
-final class ModClassVisitor extends ClassVisitor {
-    private static final Set<String> ANNOTATION_BLACKLIST;
-
-    private static final Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
-    private static final Type RECORD_TYPE = Type.getObjectType("java/lang/Record");
-
-    static {
-        var customBlacklist = System.getProperty("forge.annotationScanningBlacklist");
-        if (customBlacklist != null) {
-            ANNOTATION_BLACKLIST = Set.of(customBlacklist.split(","));
-        } else {
-            ANNOTATION_BLACKLIST = Set.of(
-                    "Ljava/lang/Deprecated;",
-                    "Ljava/lang/FunctionalInterface;",
-                    "Ljava/lang/SafeVarargs;",
-
-                    "Ljava/lang/annotation/Retention;",
-                    "Ljava/lang/annotation/Target;",
-
-                    "Ljavax/annotation/Nullable;",
-
-                    "Lorg/jspecify/nullness/NonNull;",
-                    "Lorg/jspecify/nullness/Nullable;",
-                    "Lorg/jspecify/annotations/NullMarked;",
-                    "Lorg/jspecify/annotations/NullUnmarked;",
-
-                    "Lorg/jetbrains/annotations/ApiStatus$Internal;",
-                    "Lorg/jetbrains/annotations/Contract;",
-                    "Lorg/jetbrains/annotations/Nullable;",
-                    "Lorg/jetbrains/annotations/NotNull;",
-                    "Lorg/jetbrains/annotations/VisibleForTesting;",
-
-                    "Lcom/google/common/annotations/VisibleForTesting;",
-
-                    "Lnet/minecraftforge/api/distmarker/OnlyIn", // should not be used by mods
-                    // @Mod.EventBusSubscriber doesn't use scan data for finding @SubscribeEvent annotated methods
-                    "Lnet/minecraftforge/eventbus/api/listener/SubscribeEvent;"
-            );
-        }
-    }
-
+class ModClassVisitor extends ClassVisitor {
     private Type asmType;
     private Type asmSuperType;
     private Set<Type> interfaces;
@@ -75,17 +35,12 @@ final class ModClassVisitor extends ClassVisitor {
     @Override
     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
         this.asmType = Type.getObjectType(name);
-        this.asmSuperType = superName != null && !superName.isEmpty() ? switch (superName) {
-            case "java/lang/Object" -> OBJECT_TYPE;
-            case "java/lang/Record" -> RECORD_TYPE;
-            default -> Type.getObjectType(superName);
-        } : null;
+        this.asmSuperType = superName != null && !superName.isEmpty() ? Type.getObjectType(superName) : null;
         this.interfaces = Stream.of(interfaces).map(Type::getObjectType).collect(Collectors.toSet());
     }
 
     @Override
     public AnnotationVisitor visitAnnotation(final String annotationName, final boolean runtimeVisible) {
-        if (ANNOTATION_BLACKLIST.contains(annotationName)) return null;
         var ann = new ModAnnotation(ElementType.TYPE, Type.getType(annotationName), this.asmType.getClassName());
         annotations.addFirst(ann);
         return new ModAnnotationVisitor(ann);
@@ -96,7 +51,6 @@ final class ModClassVisitor extends ClassVisitor {
         return new FieldVisitor(Opcodes.ASM9) {
             @Override
             public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) {
-                if (ANNOTATION_BLACKLIST.contains(annotationName)) return null;
                 var ann = new ModAnnotation(ElementType.FIELD, Type.getType(annotationName), name);
                 annotations.addFirst(ann);
                 return new ModAnnotationVisitor(ann);
@@ -109,7 +63,6 @@ final class ModClassVisitor extends ClassVisitor {
         return new MethodVisitor(Opcodes.ASM9) {
             @Override
             public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) {
-                if (ANNOTATION_BLACKLIST.contains(annotationName)) return null;
                 ModAnnotation ann = new ModAnnotation(ElementType.METHOD, Type.getType(annotationName), name + desc);
                 annotations.addFirst(ann);
                 return new ModAnnotationVisitor(ann);
@@ -125,7 +78,7 @@ final class ModClassVisitor extends ClassVisitor {
         }
     }
 
-    private final class ModAnnotationVisitor extends AnnotationVisitor {
+    private class ModAnnotationVisitor extends AnnotationVisitor {
         private final ModAnnotation annotation;
         private boolean array;
         private boolean isSubAnnotation;

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

@@ -5,6 +5,7 @@
 
 package net.minecraftforge.fml.loading.moddiscovery;
 
+import com.google.common.collect.ImmutableList;
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
@@ -34,37 +35,41 @@ import java.util.ServiceLoader;
 import java.util.stream.Collectors;
 
 @ApiStatus.Internal
-public final class ModDiscoverer {
-    private ModDiscoverer() {}
-
+public class ModDiscoverer {
     private static final Logger LOGGER = LogUtils.getLogger();
+    private final ServiceLoader<IModLocator> modLocators;
+    private final ServiceLoader<IDependencyLocator> dependencyLocators;
+    private final List<IModLocator>          modLocatorList;
+    private final List<IDependencyLocator>   dependencyLocatorList;
 
-    @SuppressWarnings("removal")
-    public static ModValidator discoverMods(Map<String, ?> arguments) {
-        var env = Launcher.INSTANCE.environment();
-        env.computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), _ -> ModsFolderLocator::new);
-        env.computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), _ -> StartupNotificationManager.locatorConsumer().orElse(_ -> {}));
-        final var moduleLayerManager = env.findModuleLayerManager().orElseThrow();
-        ServiceLoader<IModLocator> modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
-        ServiceLoader<IDependencyLocator> dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
-        List<IModLocator> modLocatorList = ServiceLoaderUtils.streamWithErrorHandling(modLocators, sce -> LOGGER.error("Failed to load mod locator list", sce)).toList();
+    public ModDiscoverer(Map<String, ?> arguments) {
+        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), v->ModsFolderLocator::new);
+        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v-> StartupNotificationManager.locatorConsumer().orElseGet(()-> s->{}));
+        final var moduleLayerManager = Launcher.INSTANCE.environment().findModuleLayerManager().orElseThrow();
+        modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
+        dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
+        modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList());
         for (IModLocator iModLocator : modLocatorList) {
             iModLocator.initArguments(arguments);
         }
-        List<IDependencyLocator> dependencyLocatorList = ServiceLoaderUtils.streamWithErrorHandling(dependencyLocators, sce -> LOGGER.error("Failed to load dependency locator list", sce)).toList();
+        dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList());
         for (IDependencyLocator l : dependencyLocatorList) {
             l.initArguments(arguments);
         }
-        if (LOGGER.isDebugEnabled(LogMarkers.CORE)) {
+        if (LOGGER.isDebugEnabled(LogMarkers.CORE))
+        {
             LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream()
-                    .map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
-                            modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
+                                                                       .map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
+                                                                         modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
 
             LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream()
-                    .map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
-                            dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
+                                                                       .map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
+                                                                         dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
         }
+    }
 
+    @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<>();
         List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>();
@@ -112,7 +117,7 @@ public final class ModDiscoverer {
                 }
 
                 LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
-                handleLocatedFiles(loadedFiles, locatedFiles, locator);
+                handleLocatedFiles(loadedFiles, locatedFiles);
             } catch (InvalidModFileException imfe) {
                 // We don't generally expect this exception, since it should come from the candidates stream above and be handled in the Locator, but just in case.
                 LOGGER.error(LogMarkers.SCAN, "Locator {} found an invalid mod file {}", locator, imfe.getBrokenFile(), imfe);
@@ -126,7 +131,8 @@ public final class ModDiscoverer {
         //First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped.
         Map<IModFile.Type, List<ModFile>> modFilesMap = new EnumMap<>(IModFile.Type.class);
         try {
-            final UniqueModListBuilder.UniqueModListData uniqueModsData = UniqueModListBuilder.buildUniqueList(loadedFiles);
+            final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
+            final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList();
 
             //Grab the temporary results.
             //This allows loading to continue to a base state, in case dependency loading fails.
@@ -146,10 +152,14 @@ public final class ModDiscoverer {
             for (IDependencyLocator locator : dependencyLocatorList) {
                 try {
                     LOGGER.debug(LogMarkers.SCAN,"Trying locator {}", locator);
-                    final List<IModFile> locatedMods = List.copyOf(loadedFiles);
+                    final List<IModFile> locatedMods = ImmutableList.copyOf(loadedFiles);
 
                     var locatedFiles = locator.scanMods(locatedMods);
-                    handleLocatedFiles(loadedFiles, locatedFiles, locator);
+                    if (locatedFiles.stream().anyMatch(file -> !(file instanceof ModFile))) {
+                        LOGGER.error(LogMarkers.SCAN, "A dependency locator returned a file which is not a ModFile instance!. They will be skipped!");
+                    }
+
+                    handleLocatedFiles(loadedFiles, locatedFiles);
                 }
                 catch (EarlyLoadingException exception) {
                     LOGGER.error(LogMarkers.SCAN, "Failed to load dependencies with locator {}", locator, exception);
@@ -159,7 +169,8 @@ public final class ModDiscoverer {
 
             //Second processing run of the mod list. Any duplicates will cause resolution failure and only the mods list will be loaded.
             try {
-                final UniqueModListBuilder.UniqueModListData uniqueModsAndDependenciesData = UniqueModListBuilder.buildUniqueList(loadedFiles);
+                final UniqueModListBuilder modsAndDependenciesUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
+                final UniqueModListBuilder.UniqueModListData uniqueModsAndDependenciesData = modsAndDependenciesUniqueListBuilder.buildUniqueList();
 
                 //We now only need the mod files map, not the list.
                 modFilesMap = uniqueModsAndDependenciesData.modFiles().stream()
@@ -182,14 +193,11 @@ public final class ModDiscoverer {
         return validator;
     }
 
-    private static void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles, final Object locator) {
-        for (IModFile mf : locatedFiles) {
-            if (mf instanceof ModFile modFile) {
-                LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
-                loadedFiles.add(modFile);
-            } else {
-                LOGGER.error(LogMarkers.SCAN, "Skipping mod file {} found by {}, as it was not a ModFile instance!", mf.getFileName(), locator);
-            }
+    private static void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles) {
+        var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
+        for (IModFile mf : locatedModFiles) {
+            LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
         }
+        loadedFiles.addAll(locatedModFiles);
     }
 }

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

@@ -9,7 +9,6 @@ import com.google.common.collect.ImmutableMap;
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LanguageLoadingProvider;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
@@ -22,13 +21,13 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.slf4j.Logger;
 
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -40,16 +39,18 @@ 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<Path> accessTransformers = List.of();
+    private List<CoreModFile> coreMods;
+    private Path accessTransformer;
 
     static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
     private SecureJar.Status securityStatus;
@@ -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
@@ -92,32 +94,24 @@ public class ModFile implements IModFile {
         return modFileInfo.getMods();
     }
 
-    public List<Path> getAccessTransformers() {
-        return this.accessTransformers;
+    public Optional<Path> getAccessTransformer() {
+        return Optional.ofNullable(Files.exists(accessTransformer) ? accessTransformer : null);
     }
 
     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.getFileName(), this.modFileInfo.requiredLanguageLoaders());
-        var cfg = this.modFileInfo.getConfig()
-            .<List<String>>getConfigElement("accessTransformers")
-            .orElse(null);
-
-        if (cfg == null) {
-            var path = findResource("META-INF", "accesstransformer.cfg");
-            if (Files.exists(path)) {
-                this.accessTransformers = List.of(path);
-            }
-        } else if (!cfg.isEmpty()) {
-            var paths = new ArrayList<Path>(cfg.size());
-            for (var path : cfg)
-                paths.add(getSecureJar().getPath(path.replace('\\', '/')));
-            this.accessTransformers = List.copyOf(paths);
-        }
-
+        LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
+        this.coreMods = ModFileParser.getCoreMods(this);
+        this.coreMods.forEach(mi-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {}", mi.getPath()));
+        this.accessTransformer = findResource("META-INF", "accesstransformer.cfg");
         return true;
     }
 
+    public List<CoreModFile> getCoreMods() {
+        return coreMods;
+    }
+
     /**
      * Run in an executor thread to harvest the class and annotation list
      */
@@ -175,37 +169,22 @@ public class ModFile implements IModFile {
 
     public void identifyLanguage() {
         var lst = new ArrayList<IModLanguageProvider>(this.modFileInfo.requiredLanguageLoaders().size());
+        var services = FMLLoader.getLanguageLoadingProvider();
         for (var spec : this.modFileInfo.requiredLanguageLoaders()) {
-            var service = LanguageLoadingProvider.findLanguage(this, spec.languageName(), spec.acceptedVersions());
+            var service = services.findLanguage(this, spec.languageName(), spec.acceptedVersions());
             lst.add(service);
         }
-        this.loaders = List.copyOf(lst);
+        this.loaders = Collections.unmodifiableList(lst);
     }
 
     @Override
     public String toString() {
-        var path = getFilePath();
-        return "Mod File: " + path == null ? "null" : path.toUri().toString();
+        return "Mod File: " + Objects.toString(this.jar.getPrimaryPath());
     }
 
     @Override
     public String getFileName() {
-        // This is only used for debugging, so lets try and make it a useful debug
-        var path = getFilePath();
-        var filename = path.getFileName();
-
-        // ZipFileSystem toString will return the outer file path
-        var ret = filename == null ? path.getFileSystem().toString() : filename.toString();
-
-        // If it's a directory on the default file system, return the full path
-        if (Files.isDirectory(path) && path.getFileSystem() == FileSystems.getDefault())
-            ret = path.toAbsolutePath().toString();
-
-        // If we are in a FileSystem 'root' like UnionFS, return the full uri
-        if (ret.isEmpty() || ret.equals("/"))
-            ret = path.toUri().toString();
-
-        return ret;
+        return getFilePath().getFileName().toString();
     }
 
     @Override

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

@@ -264,7 +264,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
 
     @Override
     public String versionString()  {
-        return getMods().getFirst().getVersion().toString();
+        return getMods().get(0).getVersion().toString();
     }
 
     @Override

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

@@ -6,16 +6,25 @@
 package net.minecraftforge.fml.loading.moddiscovery;
 
 import com.electronwill.nightconfig.core.file.FileConfig;
+import com.electronwill.nightconfig.core.io.ParsingException;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
+import java.io.IOException;
+import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 public class ModFileParser {
     private static final Logger LOGGER = LogUtils.getLogger();
@@ -24,6 +33,7 @@ public class ModFileParser {
         return parser.build(modFile);
     }
 
+    // Note: Although @Nullable, several other places in FML assume ModFileInfo is not null. Keep this in mind
     public static @Nullable IModFileInfo modsTomlParser(final IModFile imodFile) {
         ModFile modFile = (ModFile) imodFile;
         LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
@@ -34,9 +44,35 @@ public class ModFileParser {
         }
 
         final FileConfig fileConfig = FileConfig.builder(modsjson).build();
-        fileConfig.load();
-        fileConfig.close();
-        final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
-        return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
+        try {
+            fileConfig.load();
+            fileConfig.close();
+            final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
+            return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
+        } catch (ParsingException e) {
+            LOGGER.error("Mod candidate {} contains a corrupt or misconfigured toml.", modFile.getFileName());
+            throw new ModFileLoadingException("Mod candidate " + modFile.getFileName() + " contains a corrupt or misconfigured toml.");
+        }
+    }
+
+    protected static List<CoreModFile> getCoreMods(final ModFile modFile) {
+        Map<String,String> coreModPaths;
+        try {
+            final Path coremodsjson = modFile.findResource("META-INF", "coremods.json");
+            if (!Files.exists(coremodsjson)) {
+                return Collections.emptyList();
+            }
+            final Type type = new TypeToken<Map<String, String>>() {}.getType();
+            final Gson gson = new Gson();
+            coreModPaths = gson.fromJson(Files.newBufferedReader(coremodsjson), type);
+        } catch (IOException e) {
+            LOGGER.debug(LogMarkers.LOADING,"Failed to read coremod list coremods.json", e);
+            return Collections.emptyList();
+        }
+
+        return coreModPaths.entrySet().stream()
+                .peek(e-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {} with Javascript path {}", e.getKey(), e.getValue()))
+                .map(e -> new CoreModFile(e.getKey(), modFile.findResource(e.getValue()),modFile))
+                .toList();
     }
 }

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

@@ -31,8 +31,10 @@ public class ModValidator {
     private final List<ModFile> candidatePlugins;
     private final List<ModFile> candidateMods;
     private final List<ModFile> gameLibraries;
+    private LoadingModList loadingModList;
     private final List<IModFile> brokenFiles = new ArrayList<>();
     private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;
+    private final List<ModFileLoadingException> modFileLoadingExceptions;
 
     public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData, List<ModFileLoadingException> modFileLoadingExceptions) {
         this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
@@ -42,6 +44,7 @@ public class ModValidator {
         this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
         this.discoveryErrorData = discoveryErrorData;
         this.brokenFiles.addAll(brokenFiles.stream().map(IModFileInfo::getFile).toList());
+        this.modFileLoadingExceptions = modFileLoadingExceptions;
     }
 
     public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
@@ -49,9 +52,7 @@ public class ModValidator {
     }
 
     private static List<ModFile> lst(List<ModFile> files) {
-        if (files == null) return new ArrayList<>();
-        if (files instanceof ArrayList) return files;
-        return new ArrayList<>(files);
+        return files == null ? new ArrayList<>() : new ArrayList<>(files);
     }
 
     public void stage1Validation() {
@@ -59,7 +60,7 @@ public class ModValidator {
         if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
             LOGGER.debug(LogMarkers.SCAN, "Found {} mod files with {} mods", candidateMods.size(), candidateMods.stream().mapToInt(mf -> mf.getModInfos().size()).sum());
         }
-        ImmediateWindowHandler.updateProgress("Found " + candidateMods.size() + " mod candidates");
+        ImmediateWindowHandler.updateProgress("Found "+candidateMods.size()+" mod candidates");
     }
 
     @NotNull
@@ -86,7 +87,7 @@ public class ModValidator {
         // If any detectable error happens during the sorting process {missing deps, duplicates,
         // This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display.
         // This won't fix them all as they are still loaded and will still apply but it might help
-        for (var info : LoadingModList.getModFiles())
+        for (var info : this.loadingModList.getModFiles())
             mods.add(info.getFile().getSecureJar());
 
         // Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing
@@ -123,12 +124,12 @@ public class ModValidator {
         var allErrors = new ArrayList<>(errors);
         allErrors.addAll(this.discoveryErrorData);
 
-        ModSorter.sort(candidateMods, allErrors);
-        LoadingModList.getBrokenFiles().addAll(brokenFiles);
-        var backgroundScanHandler = new BackgroundScanHandler(candidateMods);
-        LoadingModList.getModFiles().stream()
-                .map(ModFileInfo::getFile)
-                .forEach(backgroundScanHandler::submitForScanning);
+        loadingModList = ModSorter.sort(candidateMods, allErrors);
+        loadingModList.addCoreMods();
+        loadingModList.addAccessTransformers();
+        loadingModList.setBrokenFiles(brokenFiles);
+        BackgroundScanHandler backgroundScanHandler = new BackgroundScanHandler(candidateMods);
+        loadingModList.addForScanning(backgroundScanHandler);
         return backgroundScanHandler;
     }
 }

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
@@ -156,6 +130,7 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
         return new String[] {
             "net/minecraftforge/",
             "META-INF/services/",
+            "META-INF/coremods.json",
             "META-INF/mods.toml"
         };
     }

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/ForgeProdLaunchHandler.java

@@ -25,9 +25,7 @@ sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
 
         @Override
         public List<Path> getMinecraftPaths() {
-            // We use a marker because 3rd party launcher don't build their class paths correctly
-            // https://github.com/MinecraftForge/MinecraftForge/issues/10797
-            return List.of(getPathFromResource(".forge_patched_minecraft"));
+            return List.of(getPathFromResource("net/minecraft/client/Minecraft.class"));
         }
     }
 

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/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService

@@ -1,4 +1,5 @@
 net.minecraftforge.fml.loading.log4j.SLF4JFixerLaunchPluginService
 net.minecraftforge.fml.loading.RuntimeDistCleaner
 net.minecraftforge.fml.common.asm.RuntimeEnumExtender
+net.minecraftforge.fml.common.asm.ObjectHolderDefinalize
 net.minecraftforge.fml.common.asm.CapabilityTokenSubclass

fmlloader/src/main/resources/jarjar_options.json

@@ -1,35 +0,0 @@
-{
-  "options": [
-    {
-      "resource": "com/llamalad7/mixinextras/platform/forge/MixinExtrasConfigPlugin.class",
-      "layer": "GAMELIBRARY",
-      "id": "mixinextras",
-      "deps": [
-        {
-          "identifier": {
-            "group": "com.github.LlamaLad7",
-            "artifact": "MixinExtras"
-          },
-          "version": {
-            "range": "[0.5.3,)",
-            "artifactVersion": "0.5.3"
-          },
-          "path": "",
-          "isObfuscated": false
-        }
-      ],
-      "meta": {
-        "identifier": {
-          "group": "io.github.llamalad7",
-          "artifact": "mixinextras-forge"
-        },
-        "version": {
-          "artifactVersion": "0.5.3"
-        },
-        "path": "",
-        "isObfuscated": false
-      },
-      "nested": true
-    }
-  ]
-}

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"/>

forge-transformers/build.gradle

@@ -1,73 +0,0 @@
-import net.minecraftforge.gradleutils.PomUtils
-
-plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'net.minecraftforge.licenser'
-    id 'net.minecraftforge.gradleutils'
-    alias(libs.plugins.apt)
-}
-
-apply from: rootProject.file('build_shared.gradle')
-
-configurations.forEach{ it.transitive = false }
-
-dependencies {
-    compileOnly(libs.jetbrains.annotations)
-
-    implementation(libs.bundles.asm) // Needed by all the black magic
-    implementation(libs.log4j.api)
-    implementation(libs.gson)
-    implementation(libs.modlauncher)
-    implementation(libs.coremods.api)
-
-    testCompileOnly(libs.jetbrains.annotations)
-}
-
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-    withSourcesJar()
-}
-
-tasks.named('jar', Jar) {
-    manifest {
-        attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.forge.transformers',
-            'Forge-Module-Layer':    'boot'
-        ] as LinkedHashMap)
-        attributes([
-            'Specification-Title':   'Forge Transformers',
-            'Specification-Vendor':  'Forge Development LLC',
-            'Specification-Version': '1',
-            'Implementation-Title':  'Forge Transformers',
-            'Implementation-Vendor': 'Forge Development LLC',
-            'Implementation-Version': FORGE_VERSION
-        ] as LinkedHashMap, 'net/minecraftforge/forge/transformers/')
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs << '-Xlint:unchecked'
-}
-
-license {
-    header = rootProject.file('LICENSE-header.txt')
-}
-
-publishing {
-    publications.register('mavenJava', MavenPublication) {
-        from components.java
-        artifactId = 'forge-transformers'
-        pom {
-            name = project.name
-            description = 'Forge-specific transformers unrelated to the FML project.'
-            url = 'https://github.com/MinecraftForge/MinecraftForge'
-            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
-            license PomUtils.Licenses.LGPLv2_1
-        }
-    }
-
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
-}

forge-transformers/src/main/java/net/minecraftforge/forge/transformers/FieldToMethodTransformer.java

@@ -1,158 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.forge.transformers;
-
-import cpw.mods.modlauncher.api.ITransformer;
-import cpw.mods.modlauncher.api.ITransformerVotingContext;
-import cpw.mods.modlauncher.api.TransformerVoteResult;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.FieldNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-record FieldToMethodTransformer(String className, Map<String, String> fields) implements ITransformer<ClassNode> {
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    // TODO [Forge][Transformer] Make this properly data driven or configurable.
-    //      It was hard-coded like this before when using JS CoreMods, though.
-    static final Map<String, Map<String, String>> TARGETS = Map.of(
-        "net.minecraft.world.level.biome.Biome",
-        Map.of(
-            "climateSettings", "getModifiedClimateSettings",
-            "specialEffects", "getModifiedSpecialEffects"
-        ),
-
-        "net.minecraft.world.effect.MobEffectInstance",
-        Map.of(
-            "effect", "getEffect"
-        ),
-
-        "net.minecraft.world.level.block.LiquidBlock",
-        Map.of(
-            "fluid", "getFluid"
-        ),
-
-        "net.minecraft.world.item.BucketItem",
-        Map.of(
-            "content", "getFluid"
-        ),
-
-        "net.minecraft.world.level.block.FlowerPotBlock",
-        Map.of(
-            "potted", "getPotted"
-        )
-    );
-
-    @SuppressWarnings("rawtypes")
-    static List<ITransformer> getAll() {
-        var ret = new ArrayList<ITransformer>(TARGETS.size());
-        for (var entry : TARGETS.entrySet()) {
-            ret.add(new FieldToMethodTransformer(entry.getKey(), entry.getValue()));
-        }
-        return ret;
-    }
-
-    @Override
-    public @NotNull ClassNode transform(ClassNode input, ITransformerVotingContext context) {
-        for (var entry : this.fields.entrySet()) {
-            redirectFieldToMethod(input, entry.getKey(), entry.getValue());
-        }
-
-        return input;
-    }
-
-    @Override
-    public @NotNull TransformerVoteResult castVote(ITransformerVotingContext context) {
-        return TransformerVoteResult.YES;
-    }
-
-    @Override
-    public @NotNull Set<Target> targets() {
-        return Set.of(Target.targetClass(this.className));
-    }
-
-    private static final @Nullable FieldNode findField(final ClassNode classNode, final String name) {
-        FieldNode ret = null;
-        for (var fieldNode : classNode.fields) {
-            if (name.equals(fieldNode.name)) {
-                if (ret != null)
-                    throw new IllegalStateException("Found multiple fields with name " + name);
-                ret = fieldNode;
-            }
-        }
-        return ret;
-    }
-
-    private static final @Nullable MethodNode findMethod(final ClassNode classNode, final String name, final String desc) {
-        for (var methodNode : classNode.methods) {
-            if (name.equals(methodNode.name) && desc.equals(methodNode.desc))
-                return methodNode;
-        }
-        return null;
-    }
-
-    /**
-     * Rewrites accesses to a specific field in the given class to a method-call.
-     * <p>
-     * The field specified by fieldName must be private and non-static. The method-call the field-access is redirected
-     * to does not take any parameters and returns an object of the same type as the field. If no methodName is passed,
-     * any method matching the described signature will be used as callable method.
-     *
-     * @param classNode  the class to rewrite the accesses in
-     * @param fieldName  the field accesses should be redirected to
-     * @param methodName the name of the method to redirect accesses through
-     * @apiNote This method was written as a special use case for Forge. It is not recommended to use this method
-     *     unless you know what you are doing.
-     */
-    private static void redirectFieldToMethod(final ClassNode classNode, final String fieldName, final String methodName) {
-        var foundField = findField(classNode, fieldName);
-        if (foundField == null)
-            throw new IllegalStateException("No field with name " + fieldName + " found");
-
-        if (!Modifier.isPrivate(foundField.access) || Modifier.isStatic(foundField.access))
-            throw new IllegalStateException("Field " + fieldName + " is not private and an instance field");
-
-        var methodSignature = "()" + foundField.desc;
-        var foundMethod = findMethod(classNode, methodName, methodSignature);
-        if (foundMethod == null)
-            throw new IllegalStateException("Unable to find method " + methodName + methodSignature);
-
-        for (MethodNode methodNode : classNode.methods) {
-            // skip the found getter method
-            if (methodNode == foundMethod) continue;
-
-            // Why is this filtered? UI twas added in the beginning but would it matter?
-            if (methodSignature.equals(foundMethod)) {
-                LOGGER.debug("FieldToMethodTransformer " + classNode.name + " skipping " + methodNode.name + methodNode.hashCode());
-                continue;
-            }
-
-            for (var insn : methodNode.instructions) {
-                if (insn.getOpcode() != Opcodes.GETFIELD)
-                    continue;
-
-                var fieldInsnNode = (FieldInsnNode)insn;
-                if (fieldName.equals(fieldInsnNode.name)) {
-                    var replace = new MethodInsnNode(Opcodes.INVOKEVIRTUAL, classNode.name, foundMethod.name, foundMethod.desc, false);
-                    methodNode.instructions.set(insn, replace);
-                }
-            }
-        }
-    }
-}

forge-transformers/src/main/java/net/minecraftforge/forge/transformers/ForgeModTransformers.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.forge.transformers;
-
-import cpw.mods.modlauncher.api.IEnvironment;
-import cpw.mods.modlauncher.api.ITransformationService;
-import cpw.mods.modlauncher.api.ITransformer;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.Set;
-
-public record ForgeModTransformers(String name) implements ITransformationService {
-    public ForgeModTransformers() {
-        this("forge");
-    }
-
-    @Override
-    public void initialize(IEnvironment environment) { }
-
-    @Override
-    public void onLoad(IEnvironment env, Set<String> otherServices) { }
-
-    @Override
-    @SuppressWarnings("rawtypes")
-    public @NotNull List<ITransformer> transformers() {
-        List<ITransformer> transformers = FieldToMethodTransformer.getAll();
-        transformers.add(new MethodRedirector());
-        return transformers;
-    }
-}

forge-transformers/src/main/java/net/minecraftforge/forge/transformers/MethodRedirector.java

@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.forge.transformers;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-import cpw.mods.modlauncher.api.ITransformer;
-import cpw.mods.modlauncher.api.ITransformerVotingContext;
-import cpw.mods.modlauncher.api.TransformerVoteResult;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
-
-// NOTE: THIS IS A SINGLETON!
-record MethodRedirector() implements ITransformer<ClassNode> {
-    private static final Logger LOGGER = LogManager.getLogger();
-    private static final Gson GSON = new Gson();
-
-    private static final Replacement[] REPLACEMENTS = {
-        new Replacement(
-            // finalizeSpawn redirection to ForgeEventFactory.onFinalizeSpawn
-            Opcodes.INVOKEVIRTUAL,
-            "finalizeSpawn",
-            "(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;",
-            GSON.fromJson(new InputStreamReader(sneak(() -> MethodRedirector.class.getModule().getResourceAsStream("coremods/finalize_spawn_targets.json"))), Target[].class),
-            insn -> new MethodInsnNode(
-                Opcodes.INVOKESTATIC,
-                "net/minecraftforge/event/ForgeEventFactory",
-                "onFinalizeSpawn",
-                "(Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;",
-                false
-            )
-        )
-    };
-
-    private static <T> T sneak(Callable<T> callable) {
-        try {
-            return callable.call();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    record Replacement(
-        int opcode,
-        String name,
-        String desc,
-        Target[] targets,
-        UnaryOperator<MethodInsnNode> factory
-    ) { }
-
-    record Target(
-        @SerializedName("class") String className,
-        String[] methods
-    ) { }
-
-    @Override
-    public @NotNull TransformerVoteResult castVote(ITransformerVotingContext context) {
-        return TransformerVoteResult.YES;
-    }
-
-    @Override
-    public @NotNull Set<ITransformer.Target> targets() {
-        return Arrays
-            .stream(REPLACEMENTS)
-            .map(Replacement::targets)
-            .flatMap(Arrays::stream)
-            .map(Target::className)
-            .map(ITransformer.Target::targetClass)
-            .collect(Collectors.toUnmodifiableSet());
-    }
-
-    @Override
-    public @NotNull ClassNode transform(ClassNode clazz, ITransformerVotingContext context) {
-        for (var replacement : REPLACEMENTS) {
-            for (var methodString : getClassTargetMethods(clazz, replacement)) {
-                // cut up the string since we've put both the name and desc as the target
-                var splitPos = methodString.indexOf('(');
-                var methodName = methodString.substring(0, splitPos);
-                var methodDesc = methodString.substring(splitPos);
-                var method = findMethodNode(clazz, methodName, methodDesc);
-
-                if (method == null) {
-                    LOGGER.error("Failed to redirect method call for {}! Method {} not found in class {}! This is a Forge bug, and is likely due to a Minecraft update changing something.", replacement.name, methodString, clazz.name);
-                    continue;
-                }
-
-                for (var insn : method.instructions) {
-                    if (!shouldReplace(insn, replacement)) continue;
-
-                    var methodInsn = (MethodInsnNode) insn;
-                    var redirection = replacement.factory.apply(methodInsn);
-                    LOGGER.debug("Redirecting method call {}{} to {}{} inside of {}.{}", methodInsn.name, methodInsn.desc, redirection.name, redirection.desc, clazz.name, method.name);
-                    method.instructions.set(insn, redirection);
-                }
-            }
-        }
-
-        return clazz;
-    }
-
-    private static @Nullable MethodNode findMethodNode(ClassNode clazz, String name, String desc) {
-        for (var method : clazz.methods) {
-            if (name.equals(method.name) && desc.equals(method.desc))
-                return method;
-        }
-        return null;
-    }
-
-    private static boolean shouldReplace(AbstractInsnNode insn, Replacement replacement) {
-        return insn.getOpcode() == replacement.opcode
-            && replacement.name.equals(((MethodInsnNode) insn).name)
-            && replacement.desc.equals(((MethodInsnNode) insn).desc);
-    }
-
-    private static List<String> getClassTargetMethods(ClassNode clazz, Replacement replacement) {
-        for (var t : replacement.targets) {
-            if (!t.className.equals(clazz.name)) continue;
-
-            // declared methods
-            var targets = new ArrayList<>(Arrays.asList(t.methods));
-
-            // synthetic methods
-            for (var method : clazz.methods) {
-                if ((method.access & Opcodes.ACC_SYNTHETIC) != 0)
-                    targets.add(method.name + method.desc);
-            }
-
-            return targets;
-        }
-
-        return List.of();
-    }
-}

forge-transformers/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService

@@ -1 +0,0 @@
-net.minecraftforge.forge.transformers.ForgeModTransformers

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=25
-MC_VERSION=26.1.2
-MC_NEXT_VERSION=26.2
-MCP_VERSION=20260409.101008
+JAVA_VERSION=21
+MC_VERSION=1.21.3
+MC_NEXT_VERSION=1.22
+MCP_VERSION=20241025.112443
 MAPPING_CHANNEL=official
-MAPPING_VERSION=26.1.2
+MAPPING_VERSION=1.21.3
 
-# 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

@@ -6,40 +6,23 @@
 package net.minecraftforge.fml.javafmlmod;
 
 import net.minecraftforge.api.distmarker.Dist;
-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.api.distmarker.OnlyIn;
 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;
 
 /**
@@ -47,12 +30,11 @@ import java.util.stream.Collectors;
  * annotations and passes the class instances to the {@link Bus}
  * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS}
  */
-public final class AutomaticEventSubscriber {
+public class AutomaticEventSubscriber {
     private static final Logger LOGGER = LogManager.getLogger();
     private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
     private static final Type MOD_TYPE = Type.getType(Mod.class);
-    private static final List<EnumData> DEFAULT_SIDES = List.of(new EnumData(null, "CLIENT"), new EnumData(null, "DEDICATED_SERVER"));
-    private static final EnumData DEFAULT_BUS = new EnumData(null, "BOTH");
+    private static final Type ONLY_IN_TYPE = Type.getType(OnlyIn.class);
 
     public static void inject(ModContainer mod, ModFileScanData scanData, ClassLoader loader) {
         if (scanData == null) return;
@@ -62,26 +44,38 @@ public final class AutomaticEventSubscriber {
             .filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType()))
             .toList();
 
+        var onlyIns = FMLEnvironment.production ? Collections.emptySet() : scanData.getAnnotations().stream()
+                .filter(data -> ONLY_IN_TYPE.equals(data.annotationType()))
+                .map(data -> data.clazz().getClassName())
+                .collect(Collectors.toSet());
+
         var modids = scanData.getAnnotations().stream()
             .filter(data -> MOD_TYPE.equals(data.annotationType()))
             .collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value")));
 
+        var defaultSides = List.of(new EnumData(null, "CLIENT"), new EnumData(null, "DEDICATED_SERVER"));
+        var defaultBus = new EnumData(null, "FORGE");
+
         for (var data : targets) {
+            if (!FMLEnvironment.production && onlyIns.contains(data.clazz().getClassName())) {
+                throw new RuntimeException("Found @OnlyIn on @EventBusSubscriber class " + data.clazz().getClassName() + " - this is not allowed as it causes crashes. Remove the OnlyIn and set value=Dist.CLIENT in the EventBusSubscriber annotation instead");
+            }
+
             var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId());
             modId = value(data, "modid", modId);
 
-            var sidesValue = value(data, "value", DEFAULT_SIDES);
+            var sidesValue = value(data, "value", defaultSides);
             var sides = sidesValue.stream()
                 .map(EnumData::value)
                 .map(Dist::valueOf)
                 .collect(Collectors.toSet());
 
-            var busName = value(data, "bus", DEFAULT_BUS).value();
+            var busName = value(data, "bus", defaultBus).value();
             var busTarget = Bus.valueOf(busName);
             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);
@@ -94,333 +88,4 @@ public final 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, false);
-                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, true);
-                    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, boolean strict) {
-            if (busGroup == null) {
-                busGroup = IModBusEvent.class.isAssignableFrom(eventType)
-                        ? FMLJavaModLoadingContext.get().getModBusGroup()
-                        : BusGroup.DEFAULT;
-            } else if (strict) {
-                String solution = "To fix this, remove the bus param from your @EventBusSubscriber annotation or move this event listener to another class.";
-                var isDefaultBusGroup = busGroup == BusGroup.DEFAULT;
-                var isModBusEvent = IModBusEvent.class.isAssignableFrom(eventType);
-                if (isDefaultBusGroup && isModBusEvent) { // requested forge bus and has IModBusEvent
-                    throw fail(method, "Event type " + eventType.getName()
-                            + " is on the mod BusGroup but you are asking to register it on the default BusGroup (BusGroup.DEFAULT/EventBusSubscriber.Bus.FORGE). "
-                            + solution);
-                } else if (!isDefaultBusGroup && !isModBusEvent) { // requested mod bus and does not have IModBusEvent
-                    throw fail(method, "Event type " + eventType.getName()
-                            + " is on the default BusGroup but you are asking to register it on the mod BusGroup (context.getModBusGroup()/EventBusSubscriber.Bus.MOD). "
-                            + solution);
-                }
-            }
-
-            // 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,8 +5,11 @@
 
 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;
@@ -33,7 +36,7 @@ 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,13 +46,12 @@ 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(), IModBusEvent.class);
+        this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
         this.contextExtension = () -> context;
         try {
             var moduleName = info.getOwningFile().moduleName();
-            var module = gameLayer.findModule(moduleName).orElse(null);
-            if (module == null)
-                throw new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer);
+            var module = gameLayer.findModule(moduleName)
+                .orElseThrow(() -> new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer));
 
             openModules(gameLayer, module, info.getOwningFile().getFile().getSecureJar());
 
@@ -126,6 +128,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());
@@ -167,18 +173,15 @@ public class FMLModContainer extends ModContainer {
         return modInstance;
     }
 
-    @Override
-    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);
@@ -187,14 +190,12 @@ public class FMLModContainer extends ModContainer {
     }
 
     @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
     public void dispatchConfigEvent(IConfigEvent event) {
-        var eventBus = (EventBus) EventBus.create(eventBusGroup, event.self().getClass());
-        eventBus.post(event.self());
+        this.eventBus.post(event.self());
     }
 
     @Override
     public String toString() {
-        return "FMLModContainer[" + this.getModInfo().getModId() + ", " + this.getClass().getName() + ']';
+        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;
     }
 }