1.20.1 RB

.gitattributes

@@ -21,6 +21,3 @@ src/generated/**/*.json text eol=lf
 src/generated_test/**/.cache/cache text eol=lf
 src/generated_test/**/*.json text eol=lf
 
-# We force eclipse to use unix line endings
-ide/eclipse/template/.settings/*.prefs text eol=lf
-

.gitignore

@@ -13,9 +13,6 @@
 /classes
 *.iml
 
-# We however WANT the ide folder as it has tempaltes/configs for developing Forge.
-!ide/**
-
 #gradle
 /build
 /.gradle
@@ -26,6 +23,7 @@
 /projects/mcp/
 /projects/clean/
 /projects/forge/
+/projects/fmlonly/
 #/patches/*
 
 #occupational hazards
@@ -34,10 +32,9 @@
 /projects/**/run/
 /projects/**/*.launch
 /repo/
-src/*/generated/**/.cache/
-# Generated by gradle every import
-**/src/main/resources/META-INF/MANIFEST.MF
-/fmlloader/src/main/resources/forge_version.json
+src/generated/resources/.cache/
+src/generated_test/resources/.cache/
+src/generated_mdk/resources/.cache/
 
 #Patch rejects
 #/patches-/
@@ -50,5 +47,3 @@ changelog.txt
 *.7z
 /logs/
 
-/ForgeRoot.ipr
-/ForgeRoot.iws

.teamcity/settings.kts

@@ -47,6 +47,8 @@ project {
             """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
         text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
+        text("env.PUBLISHED_JAVA_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
+        text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
         text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
         //These are references and not actually keys
         password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
@@ -74,6 +76,19 @@ object Build : BuildType({
     id("MinecraftForge_MinecraftForge__Build")
     name = "Build"
     description = "Builds and Publishes the main branches of the project."
+
+    features {
+        feature {
+            id = "trigger_fml_only_files_generator"
+            type = "triggerBuildFeature"
+            param("triggers", "MinecraftForge_FilesGenerator_GeneratePages")
+            param("parameters", """
+                env.PUBLISHED_JAVA_FML_ARTIFACT_ID~env.PUBLISHED_JAVA_ARTIFACT_ID
+                env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION~env.PUBLISHED_JAVA_ARTIFACT_VERSION
+                env.PUBLISHED_JAVA_GROUP
+            """.trimIndent())
+        }
+    }
 })
 
 object BuildSecondaryBranches : BuildType({

Jenkinsfile

@@ -0,0 +1,125 @@
+@Library('forge-shared-library')_
+
+pipeline {
+    options {
+        disableConcurrentBuilds()
+    }
+    agent {
+        docker {
+            image 'gradle:7-jdk16'
+            //args '-v forgegc:/home/gradle/.gradle_cache/'
+        }
+    }
+    environment {
+        GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
+        DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook')
+        DISCORD_PREFIX = "Job: Forge Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}"
+        JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
+    }
+
+    stages {
+        stage('notify_start') {
+            when {
+                not {
+                    changeRequest()
+                }
+            }
+            steps {
+                discordSend(
+                    title: "${DISCORD_PREFIX} Started",
+                    successful: true,
+                    result: 'ABORTED', //White border
+                    thumbnail: JENKINS_HEAD,
+                    webhookURL: DISCORD_WEBHOOK
+                )
+            }
+        }
+        /*
+        stage('pull_cache') {
+            steps {
+                sh 'cp -r /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/'
+                sh 'cp -r /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/'
+                sh 'cp -r /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/'
+            }
+        }
+        */
+        stage('setup') {
+            steps {
+                withGradle {
+                    sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
+                }
+                script {
+                    env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "^version:" | cut -d" " -f2').trim()
+                    env.FMLONLY_VERSION = sh(returnStdout: true, script: './gradlew :fmlonly:properties -q | grep "^version:" | cut -d" " -f2').trim()
+                }
+            }
+        }
+        stage('changelog') {
+            when {
+                not {
+                    changeRequest()
+                }
+            }
+            steps {
+                writeChangelog(currentBuild, 'build/changelog.txt')
+            }
+        }
+        stage('publish') {
+            when {
+                not {
+                    changeRequest()
+                }
+            }
+            environment {
+                CROWDIN = credentials('forge-crowdin')
+                KEYSTORE = credentials('forge-jenkins-keystore-old')
+                KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
+                KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
+            }
+            steps {
+                withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
+                    withGradle {
+                        sh './gradlew ${GRADLE_ARGS} publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
+                    }
+                }
+            }
+            post {
+                success {
+                    build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false
+                    build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:fmlonly ${env.FMLONLY_VERSION} latest")], propagate: false, wait: false
+                }
+            }
+        }
+        stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
+            when {
+                changeRequest()
+            }
+            environment {
+                CROWDIN = credentials('forge-crowdin')
+            }
+            steps {
+                withGradle {
+                    sh './gradlew ${GRADLE_ARGS} publish -PcrowdinKey=${CROWDIN}'
+                }
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
+
+                if (env.CHANGE_ID == null) { // This is unset for non-PRs
+                    discordSend(
+                        title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
+                        description: '```\n' + getChanges(currentBuild) + '\n```',
+                        successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"),
+                        result: currentBuild.currentResult,
+                        thumbnail: JENKINS_HEAD,
+                        webhookURL: DISCORD_WEBHOOK
+                    )
+                }
+            }
+        }
+    }
+}

buildSrc/build.gradle

@@ -1,6 +1,6 @@
 repositories {
     maven { url = 'https://maven.minecraftforge.net/' }
-    mavenCentral()
+	 mavenCentral()
 }
 
 dependencies {

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

@@ -1,55 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.tasks.*
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-abstract class BundleList extends DefaultTask {
-    @InputFiles abstract ConfigurableFileCollection getConfig()
-    @InputFile abstract RegularFileProperty getServerBundle()
-    @OutputFile abstract RegularFileProperty getOutput()
-
-    BundleList() {
-        config.setFrom(project.configurations.installer)
-        output.convention(project.layout.buildDirectory.file("$name/output.list"))
-        configure {
-            dependsOn(project.tasks.universalJar)
-            inputs.file(project.tasks.universalJar.archiveFile)
-        }
-    }
-    
-    @TaskAction
-    void run() {
-        def entries = [:] as TreeMap
-        def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
-        for (var dep : resolved) {
-            def info = Util.getMavenInfoFromDep(dep)
-            //println("$dep.file.sha1\t$info.name\t$info.path")
-            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
-        }
-        
-        [
-            project.tasks.universalJar
-        ].forEach{ packed -> 
-            def info = Util.getMavenInfoFromTask(packed)
-            def file = packed.archiveFile.get().asFile
-            entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
-        }
-        
-        try (def zip = new java.util.zip.ZipFile(serverBundle.get().asFile)) {
-            def entry = zip.getEntry('META-INF/libraries.list')
-            def data = zip.getInputStream(entry).text.split('\n')
-            for (def line : data) {
-                def (sha, artifact, path) = line.split('\t')
-                def (group, name, other) = artifact.split(':', 3)
-                //println("Group: $group Name: $name")
-                def key = "$group:$name"
-                if (!entries.containsKey(key))
-                    entries.put(key, line)
-            }
-        }
-        
-        output.get().asFile.text = entries.values().join('\n')
-    }
-}

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

@@ -1,92 +0,0 @@
-package net.minecraftforge.forge.tasks;
-
-import java.util.Properties;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.TreeSet;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.Reader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * Eclipse config files are literally just java properties, with the header cleaned up.
- * https://github.com/eclipse/buildship/blob/5b2c7fca7fa86cd74d71b3c099c7b1559eba038e/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/internal/configuration/PreferenceStore.java#L238
- *
- * This does the same thing, as well as sorting alphabetically.
- * It also ignores all comments. We can add them latter if someone cares.
- */
-public class CleanProperties extends Properties {
-    private static final long serialVersionUID = 1L;
-    private static final String LINE_SEP = System.getProperty("line.separator");
-    private static final String UNIX_LINE_SEP = "\n";
-    private static final Charset ENCODING = StandardCharsets.UTF_8;
-
-    public CleanProperties load(File input) throws IOException {
-        if (input.exists()) {
-            try (Reader is = new InputStreamReader(new FileInputStream(input), ENCODING)) {
-                super.load(is);
-            }
-        }
-        return this;
-    }
-
-    public void store(File out) throws IOException {
-        if (!out.getParentFile().exists())
-            out.getParentFile().mkdirs();
-
-        try (OutputStream os = new FileOutputStream(out)) {
-            store(os, null);
-        }
-    }
-
-    @Override
-    public synchronized Enumeration<Object> keys() {
-        Set<Object> ret = new TreeSet<>();
-        for (Enumeration<?> e = super.keys(); e.hasMoreElements();)
-            ret.add(e.nextElement());
-        return Collections.enumeration(ret);
-    }
-
-    @Override
-    public Set<Map.Entry<Object, Object>> entrySet() {
-        Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
-        ret.addAll(super.entrySet());
-        return ret;
-    }
-
-    @Override
-    public void store(OutputStream out, String comments) throws IOException {
-        out.write(clean().getBytes(ENCODING));
-        out.flush();
-    }
-
-    @Override
-    public void store(Writer out, String comments) throws IOException {
-        out.write(clean());
-        out.flush();
-    }
-
-    private String clean() throws IOException {
-        ByteArrayOutputStream tmp = new ByteArrayOutputStream();
-        try {
-            super.store(tmp, null);
-        } finally {
-            tmp.close();
-        }
-
-        String ret = tmp.toString(ENCODING).replace(LINE_SEP, UNIX_LINE_SEP);
-        ret = ret.substring(ret.indexOf(UNIX_LINE_SEP) + 1);
-        return ret;
-    }
-}

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

@@ -0,0 +1,73 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+abstract class Crowdin extends DefaultTask {
+    @Input abstract Property<String> getId()
+	@Input @Optional abstract Property<String> getKey()
+	@Input boolean json = true
+	@OutputFile abstract RegularFileProperty getOutput()
+	@OutputFile abstract RegularFileProperty getExport()
+
+    Crowdin() {
+		outputs.upToDateWhen{ false }
+		id.convention('minecraft-forge')
+		output.convention(project.layout.buildDirectory.dir(name).map {it.file("output.zip") })
+		export.convention(project.layout.buildDirectory.dir(name).map {it.file("export.json") })
+	}
+
+    @TaskAction
+    def run() {
+		File outputFile = output.get().asFile
+		File exportFile = export.get().asFile
+		if (outputFile.exists())
+			outputFile.delete()
+		
+		if (!key.isPresent())
+			return
+		String key = this.key.get()
+		String id = this.id.get()
+		
+		// Force an export
+		new URL("https://api.crowdin.com/api/project/${id}/export?key=${key}").withInputStream { i ->
+			exportFile.withOutputStream { it << i }
+		}
+		
+		if (!exportFile.text.contains('success')) {
+			throw new RuntimeException("Crowdin export failed, see ${exportFile} for more info")
+		}
+
+		new URL("https://api.crowdin.com/api/project/${id}/download/all.zip?key=${key}").withInputStream { i -> 
+			new ZipInputStream(i).withCloseable { zin ->
+				outputFile.withOutputStream { out ->
+					new ZipOutputStream(out).withCloseable { zout -> 
+						ZipEntry zein
+						while ((zein = zin.nextEntry) != null) {
+							if (zein.isDirectory()) {
+								zout.putNextEntry(new ZipEntry(zein.name))
+							} else {
+								// 1.13+ uses json
+								if (zein.name.endsWith('.json') == json) {
+									ZipEntry zeout = new ZipEntry(json ? zein.name.toLowerCase() : zein.name)
+									zeout.time = 1
+									zout.putNextEntry(zeout)
+									zout << zin
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+    }
+}

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

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

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

@@ -0,0 +1,40 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.TaskAction
+
+import java.nio.file.Files
+
+abstract class FixPatchImports extends DefaultTask {
+
+    @InputDirectory abstract DirectoryProperty getClean()
+    @InputDirectory abstract DirectoryProperty getPatched()
+
+    @TaskAction
+    void run() {
+        final patchedPath = getPatched().get().asFile.toPath()
+        final cleanPath = getClean().get().asFile.toPath()
+
+        try (final var stream = Files.find(patchedPath, Integer.MAX_VALUE, (path, attr) -> path.toString().endsWith('.java'))) {
+            final itr = stream.iterator()
+            while (itr.hasNext()) {
+                final next = itr.next()
+                final clean = cleanPath.resolve(patchedPath.relativize(next).toString())
+
+                final patchedLines = Files.readAllLines(next)
+                final cleanLines = Files.readAllLines(clean)
+
+                final patchedImport = patchedLines.findLastIndexOf(2) { it.startsWith('import ') }
+                final cleanImport = cleanLines.findLastIndexOf(2) { it.startsWith('import ') }
+
+                if (cleanImport !== patchedImport) {
+                    patchedLines.removeIf {  it.startsWith('import ') }
+                    patchedLines.addAll(2, cleanLines.subList(2, cleanImport + 1))
+                    Files.write(next, patchedLines)
+                }
+            }
+        }
+    }
+}

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

@@ -2,26 +2,21 @@ package net.minecraftforge.forge.tasks
 
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.*
-import org.gradle.api.DefaultTask
-import org.gradle.api.provider.Property
-import groovy.json.JsonSlurper
+import org.gradle.api.provider.SetProperty
 
 abstract class InstallerJar extends Zip {
-    @Input @Optional abstract Property<Boolean> getFat()
-    @Input @Optional abstract Property<Boolean> getOffline()
+    @Input @Optional abstract SetProperty<String> getPackedDependencies()
 
     InstallerJar() {
         archiveClassifier.set('installer')
         archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
         destinationDirectory.set(project.layout.buildDirectory.dir('libs'))
-        fat.convention(false)
-        offline.convention(false)
 
         def installerJson = project.tasks.installerJson
         def launcherJson = project.tasks.launcherJson
         def downloadInstaller = project.tasks.downloadInstaller
 
-        dependsOn(installerJson, launcherJson, downloadInstaller, project.configurations.installer)
+        dependsOn(installerJson, launcherJson, downloadInstaller)
         from(installerJson, launcherJson)
 
         from(project.rootProject.file('/src/main/resources/url.png'))
@@ -29,128 +24,21 @@ abstract class InstallerJar extends Zip {
             from(project.zipTree(downloadInstaller.output)) {
                 duplicatesStrategy = 'exclude'
             }
-            
-            if (fat.get() || offline.get()) {
-                def cfg = project.tasks.register(name + "Config", Configure)
-                cfg.get().configure {
-                    parent = this
-                    dependsOn(project.tasks.installerJson, project.tasks.launcherJson)
+
+            if (!System.env.TEAMCITY_VERSION) {
+                dependsOn(project.universalJar)
+                from(project.universalJar) {
+                    into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/'
                 }
-                dependsOn(cfg)
-            } else {
-                // Things we ALWAYS bundle, this just the server shim jar, because the installer spec only says to extract the file. 
-                // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
-                [
-                    project.tasks.serverShimJar // Server bootstrap executable jar
-                ].forEach { packed ->
-                    def path = Util.getMavenInfoFromTask(packed).path
-                    from(packed) {
-                        rename { "maven/$path" }
+
+                packedDependencies.get().forEach {
+                    def jarTask = project.rootProject.getTasks().findByPath(it)
+                    dependsOn(jarTask)
+                    from(jarTask) {
+                        into '/maven/' + jarTask.project.group.replace('.', '/') + '/' + jarTask.archiveBaseName.get() + '/' + jarTask.project.version + '/'
                     }
                 }
             }
         }
     }
-    
-    static abstract class Configure extends DefaultTask {
-        public Zip parent
-        private int count = 0;
-        
-        @TaskAction
-        protected void exec() {
-            def deps = [:] as java.util.TreeMap
-            
-            // Gather all things that need downloading
-            [
-                project.tasks.installerJson, 
-                project.tasks.launcherJson
-            ].each { task ->
-                def json = task.output.get().asFile.json
-                json.libraries.each { lib -> 
-                    deps.put(lib.name, lib.downloads.artifact)
-                    //println(lib.name)
-                }
-            }
-            
-            // First find things we build in this project.
-            [
-                project.tasks.universalJar, // Forge runtime code
-                project.tasks.serverShimJar // Shim jar for dedicated server
-            ].forEach { packed ->
-                def name = Util.getMavenInfoFromTask(packed).name
-                def info = deps.remove(name)
-                if (info != null) {
-                    println("Adding: $packed.path $name")
-                    parent.from(packed) {
-                        rename { "maven/$info.path" }
-                    }
-                }
-            }
-            
-            // Find any artifacts from the 'installer' config
-            // This config specifies the runtime files we intend for the interaller to have.
-            // And are typically what we would be developing and testing alongside Forge. 
-            // So we may have local modified versions
-            def cfg = project.configurations.installer
-            while (cfg != null) {
-                //println('')
-                def resolved = cfg.resolvedConfiguration.resolvedArtifacts
-                int found = 0
-                for (var dep : resolved) {
-                    def name = Util.getMavenInfoFromDep(dep).name
-                    def info = deps.remove(name)
-                    if (info == null) {
-                        //println("Skipping: $name")
-                        continue
-                    }
-                    //println("-$name")
-                    found++
-                    addFile(dep.file, info)
-                }
-                
-                if (deps.isEmpty()) {
-                    cfg = null
-                    continue
-                }
-                
-                // Prevent infinite loops if something fucky happens
-                if (found == 0)
-                    throw new IllegalStateException("Failed to find any installer dependencies") 
-                
-                def seen = [] as Set
-                cfg = project.configurations.detachedConfiguration()
-                cfg.transitive = false
-                for (def key : deps.keySet()) {
-                    def (group, artifact, other) = key.split(':', 3)
-                    // Only resolve unique group:artifact so we don't get version overrides
-                    if (seen.add(group + ':' + artifact)) {
-                        //println("+$key")
-                        cfg.dependencies.add(project.dependencies.create(key))
-                    }
-                }
-            }
-        }
-        
-        void addFile(file, info) {
-            def pack = parent.offline.get() || info.url.isEmpty()
-            
-            // If it's a offline jar just always pack
-            if (!pack) {
-                try {
-                    def remote = new URL("${info.url}.sha1").getText('UTF-8')
-                    pack = !info.sha1.equals(remote)
-                } catch (FileNotFoundException e) {
-                    pack = !info.url.startsWith('https://libraries.minecraft.net/')
-                    // Oh noes its not there!
-                }
-            }
-            
-            if (pack) {
-                println("Adding: $file.absolutePath")
-                parent.from(file) {
-                    rename { "maven/$info.path" }
-                }
-            }
-        }
-    }
 }

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

@@ -13,6 +13,7 @@ import java.nio.file.Files
 abstract class InstallerJson extends DefaultTask {
     @OutputFile abstract RegularFileProperty getOutput()
     @InputFiles abstract ConfigurableFileCollection getInput()
+    @Input @Optional abstract SetProperty<String> getPackedDependencies()
     @Input @Optional final Map<String, Object> libraries = new LinkedHashMap<>()
     @Input Map<String, Object> json = new LinkedHashMap<>()
     @InputFile abstract RegularFileProperty getIcon()
@@ -22,19 +23,29 @@ abstract class InstallerJson extends DefaultTask {
     @Input abstract Property<String> getWelcome()
 
     InstallerJson() {
-        launcherJsonName.convention('/version.json')
-        logo.convention('/big_logo.png')
-        mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json')
-        welcome.convention("Welcome to the ${project.name.capitalize()} installer.")
-        output.convention(project.layout.buildDirectory.file('libs/install_profile.json'))
+        getLauncherJsonName().convention('/version.json')
+        getLogo().convention('/big_logo.png')
+        getMirrors().convention('https://files.minecraftforge.net/mirrors-2.0.json')
+        getWelcome().convention("Welcome to the simple ${project.name.capitalize()} installer.")
+                
+        getOutput().convention(project.layout.buildDirectory.file('install_profile.json'))
+
+        ['client', 'server'].each { side ->
+            ['slim', 'extra'].each { type ->
+                def tsk = project.tasks.getByName("download${side.capitalize()}${type.capitalize()}")
+                dependsOn(tsk)
+                input.from(tsk.output)
+            }
+            def tsk = project.tasks.getByName("create${side.capitalize()}SRG")
+            dependsOn(tsk)
+            input.from(tsk.output)
+        }
+
         
         project.afterEvaluate {
-            [
-                project.tasks.universalJar,
-                project.tasks.serverShimJar
-            ].forEach { packed ->
-                dependsOn(packed)
-                input.from packed.archiveFile
+            (packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]).forEach {
+                dependsOn(it)
+                input.from it.archiveFile
             }
         }
     }
@@ -42,19 +53,17 @@ abstract class InstallerJson extends DefaultTask {
     @TaskAction
     protected void exec() {
         def libs = libraries
-        [
-            project.tasks.universalJar,
-            project.tasks.serverShimJar
-        ].forEach { packed ->
-            def info = Util.getMavenInfoFromTask(packed)
-            libs.put(info.name, [
-                name: info.name,
+        for (def child : packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]) {
+            def dep = Util.getMavenDep(child)
+            def path = Util.getMavenPath(child)
+            libs.put(dep.toString(), [
+                name: dep,
                 downloads: [
                     artifact: [
-                        path: info.path,
-                        url: "https://maven.minecraftforge.net/$info.path",
-                        sha1: packed.archiveFile.get().asFile.sha1(),
-                        size: packed.archiveFile.get().asFile.length()
+                        path: path,
+                        url: "https://maven.minecraftforge.net/${path}",
+                        sha1: child.archiveFile.get().asFile.sha1(),
+                        size: child.archiveFile.get().asFile.length()
                     ]
                 ]
             ])

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

@@ -16,63 +16,59 @@ abstract class LauncherJson extends DefaultTask {
     @OutputFile abstract RegularFileProperty getOutput()
     @InputFiles abstract ConfigurableFileCollection getInput()
     @Input Map<String, Object> json = new LinkedHashMap<>()
+    @Input @Optional abstract SetProperty<String> getPackedDependencies()
+    
+    @Internal final vanilla = project.project(':mcp').file('build/mcp/downloadJson/version.json')
+    @Internal final timestamp = iso8601Now()
+    @Internal final comment = [
+        "Please do not automate the download and installation of Forge.",
+        "Our efforts are supported by ads from the download page.",
+        "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
+    ]
+    @Internal final id = "${project.rootProject.ext.MC_VERSION}-${project.name}${project.version.substring(project.rootProject.ext.MC_VERSION.length())}"
 
     LauncherJson() {
-        output.convention(project.layout.buildDirectory.file('libs/version.json'))
+        getOutput().convention(project.layout.buildDirectory.file('version.json'))
 
-        dependsOn(project.tasks.universalJar)
-        input.from(project.tasks.universalJar.archiveFile)
-        input.from(project.configurations.installer)
-        configure {
-            def mc    = project.rootProject.ext.MC_VERSION
-            def forge = project.rootProject.ext.FORGE_VERSION
-            def timestamp = iso8601Now()
-            json.putAll([
-                _comment: [
-                    "Please do not automate the download and installation of Forge.",
-                    "Our efforts are supported by ads from the download page.",
-                    "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
-                ],
-                id: "$mc-$project.name$forge",
-                time: timestamp,
-                releaseTime: timestamp,
-                inheritsFrom: mc,
-                type: 'release',
-                logging: [:],
-                mainClass: '',
-                libraries: []
-            ] as LinkedHashMap)
-            
-            [
-                project.tasks.universalJar
-            ].forEach { packed ->
-                dependsOn(packed)
-                input.from packed.archiveFile
+        dependsOn(':fmlloader:jar', 'universalJar')
+        getInput().from(project.tasks.universalJar.archiveFile,
+                project.project(':fmlloader').jar.archiveFile,
+                vanilla)
+                
+        project.afterEvaluate {
+            packedDependencies.get().forEach {
+                def jarTask = project.rootProject.tasks.findByPath(it)
+                dependsOn(jarTask)
+                input.from jarTask.archiveFile
             }
         }
     }
 
     @TaskAction
     protected void exec() {
-        [
-            project.tasks.universalJar
-        ].forEach { packed ->
-            def info = Util.getMavenInfoFromTask(packed)
-            json.libraries.add([
-                name: info.name,
+        if (!json.libraries)
+            json.libraries = []
+        def libs = [:]
+        getArtifacts(project, project.configurations.installer, false).each { key, lib -> libs[key] = lib }
+        getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> libs[key] = lib }
+
+        packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) }.forEach {
+            def path = Util.getMavenPath(it)
+            def key = Util.getMavenDep(it)
+            
+            libs[key] = [
+                name: key,
                 downloads: [
                     artifact: [
-                        path: info.path,
-                        url: "https://maven.minecraftforge.net/$info.path",
-                        sha1: packed.archiveFile.get().asFile.sha1(),
-                        size: packed.archiveFile.get().asFile.length()
+                        path: path,
+                        url: "https://maven.minecraftforge.net/${path}",
+                        sha1: it.archiveFile.get().asFile.sha1(),
+                        size: it.archiveFile.get().asFile.length()
                     ]
                 ]
-            ])
-        }
-        getArtifacts(project, project.configurations.installer).each { key, lib -> 
-            json.libraries.add(lib)
+            ]
         }
+        libs.each { key, lib -> json.libraries.add(lib) }
         Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
     }
 }

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

@@ -26,6 +26,16 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
     @TaskAction
     void run() {
         def inputVersion = inputVersion.get()
+        def fmlLibs = project.configurations.detachedConfiguration(project.PACKED_DEPS.collect {
+            def artifactId = it.split(':')[1]
+            return project.dependencies.create("net.minecraftforge:${artifactId}:${inputVersion}")
+        }.toArray(Dependency[]::new))
+
+        project.tasks.named('checkJarCompatibility') {
+            baseLibraries.from(project.provider {
+                fmlLibs.resolvedConfiguration.lenientConfiguration.files
+            })
+        }
 
         def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
         project.rootProject.extensions.download.run {

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

@@ -16,33 +16,25 @@ import java.util.zip.ZipInputStream
 public class Util {
     static final ASM_LEVEL = Opcodes.ASM9
 
-    static void init() {
-        File.metaClass.sha1 = { ->
-            MessageDigest md = MessageDigest.getInstance('SHA-1')
-            delegate.eachByte 4096, {bytes, size ->
-                md.update(bytes, 0, size)
-            }
-            return md.digest().collect {String.format "%02x", it}.join()
-        }
+	static void init() {
+		File.metaClass.sha1 = { ->
+			MessageDigest md = MessageDigest.getInstance('SHA-1')
+			delegate.eachByte 4096, {bytes, size ->
+				md.update(bytes, 0, size)
+			}
+			return md.digest().collect {String.format "%02x", it}.join()
+		}
         File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
-        File.metaClass.sha256 = { ->
-            MessageDigest md = MessageDigest.getInstance('SHA-256')
-            delegate.eachByte 4096, {bytes, size ->
-                md.update(bytes, 0, size)
-            }
-            return md.digest().collect {String.format "%02x", it}.join()
-        }
-        File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
 
-        File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
+		File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
         File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
         File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
 
-        Date.metaClass.iso8601 = { ->
-            def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-            def result = format.format(delegate)
-            return result[0..21] + ':' + result[22..-1]
-        }
+		Date.metaClass.iso8601 = { ->
+			def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+			def result = format.format(delegate)
+			return result[0..21] + ':' + result[22..-1]
+		}
 
         String.metaClass.rsplit = { String del, int limit = -1 ->
             def lst = new ArrayList()
@@ -55,117 +47,100 @@ public class Util {
             lst.add(0, tmp)
             return lst
         }
+	}
+
+	public static String[] getClasspath(project, libs, artifact) {
+		def ret = []
+		artifactTree(project, artifact).each { key, lib ->
+			libs[lib.name] = lib
+			if (lib.name != artifact)
+				ret.add(lib.name)
+		}
+		return ret
+	}
+
+	public static def getArtifacts(project, config, classifiers) {
+		def ret = [:]
+		config.resolvedConfiguration.resolvedArtifacts.each {
+			def art = [
+				group: it.moduleVersion.id.group,
+				name: it.moduleVersion.id.name,
+				version: it.moduleVersion.id.version,
+				classifier: it.classifier,
+				extension: it.extension,
+				file: it.file
+			]
+			def key = art.group + ':' + art.name
+			def folder = "${art.group.replace('.', '/')}/${art.name}/${art.version}/"
+			def filename = "${art.name}-${art.version}"
+			if (art.classifier != null)
+				filename += "-${art.classifier}"
+			filename += ".${art.extension}"
+			def path = "${folder}${filename}"
+			def url = "https://libraries.minecraft.net/${path}"
+			if (!checkExists(url)) {
+				url = "https://maven.minecraftforge.net/${path}"
+			}
+			ret[key] = [
+				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
+				downloads: [
+					artifact: [
+						path: path,
+						url: url,
+						sha1: sha1(art.file),
+						size: art.file.length()
+					]
+				]
+			]
+		}
+		return ret
+	}
+
+    public static def getMavenPath(task) {
+        def classifier = task.archiveClassifier.get()
+        def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
+        return "${task.project.group.replace('.', '/')}/${task.project.name}/${task.project.version}/${task.project.name}-${task.project.version}".toString() + (classifier == '' ? '' : '-' + classifier) + '.jar'
     }
 
-    public static String[] getClasspath(project, libs, artifact) {
-        def ret = []
-        artifactTree(project, artifact).each { key, lib ->
-            libs[lib.name] = lib
-            if (lib.name != artifact)
-                ret.add(lib.name)
-        }
-        return ret
+    public static def getMavenDep(task) {
+        def classifier = task.archiveClassifier.get()
+        return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
     }
 
-    public static def getArtifacts(project, config) {
-        def ret = [:]
-        config.resolvedConfiguration.resolvedArtifacts.each { dep ->
-            def info = getMavenInfoFromDep(dep)
-            def url = "https://libraries.minecraft.net/$info.path"
-            if (!checkExists(url))
-                url = "https://maven.minecraftforge.net/$info.path"
-                
-            ret[info.key] = [
-                name: info.name,
-                downloads: [
-                    artifact: [
-                        path: info.path,
-                        url: url,
-                        sha1: dep.file.sha1(),
-                        size: dep.file.length()
-                    ]
-                ]
-            ]
-        }
-        return ret
-    }
-    
-    public static Map getMavenInfoFromDep(dep) {
-        return getMavenInfoFromMap([
-            group: dep.moduleVersion.id.group,
-            name: dep.moduleVersion.id.name,
-            version: dep.moduleVersion.id.version,
-            classifier: dep.classifier,
-            extension: dep.extension
-        ])
-    }
-    public static Map getMavenInfoFromTask(task) {
-        return getMavenInfoFromMap([
-            group: task.project.group,
-            name: task.project.name,
-            version: task.project.version,
-            classifier: task.archiveClassifier.get(),
-            extension: task.archiveExtension.get()
-        ])
-    }
-    
-    private static Map getMavenInfoFromMap(art) {
-        def key = "$art.group:$art.name"
-        def name = "$art.group:$art.name:$art.version"
-        def path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
-        if (art.classifier != null) {
-            name += ":$art.classifier"
-            path += "-$art.classifier"
-        }
-        if (!'jar'.equals(art.extension)) {
-            name += "@$art.extension"
-            path += ".$art.extension"
-        } else {
-            path += ".jar"
-        }
-        return [
-            key: key,
-            name: name,
-            path: path,
-            art: art
-        ]
-    }
+	public static def iso8601Now() { new Date().iso8601() }
 
-    public static def iso8601Now() { new Date().iso8601() }
+	public static def sha1(file) {
+		MessageDigest md = MessageDigest.getInstance('SHA-1')
+		file.eachByte 4096, {bytes, size ->
+			md.update(bytes, 0, size)
+		}
+		return md.digest().collect {String.format "%02x", it}.join()
+	}
 
-    public static def sha1(file) {
-        MessageDigest md = MessageDigest.getInstance('SHA-1')
-        file.eachByte 4096, {bytes, size ->
-            md.update(bytes, 0, size)
-        }
-        return md.digest().collect {String.format "%02x", it}.join()
-    }
+	private static def artifactTree(project, artifact) {
+		if (!project.ext.has('tree_resolver'))
+			project.ext.tree_resolver = 1
+		def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
+		def dep = project.dependencies.create(artifact)
+		cfg.dependencies.add(dep)
+		def files = cfg.resolve()
+		return getArtifacts(project, cfg, true)
+	}
 
-    private static def artifactTree(project, artifact, transitive = true) {
-        if (!project.ext.has('tree_resolver'))
-            project.ext.tree_resolver = 1
-        def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
-        cfg.transitive = transitive
-        def dep = project.dependencies.create(artifact)
-        cfg.dependencies.add(dep)
-        def files = cfg.resolve()
-        return getArtifacts(project, cfg)
-    }
-
-    static boolean checkExists(url) {
-        try {
-            def code = new URL(url).openConnection().with {
-                requestMethod = 'HEAD'
-                connect()
-                responseCode
-            }
-            return code == 200
-        } catch (Exception e) {
-            if (e.toString().contains('unable to find valid certification path to requested target'))
-                throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
-            throw e
-        }
-    }
+	private static boolean checkExists(url) {
+		try {
+			def code = new URL(url).openConnection().with {
+				requestMethod = 'HEAD'
+				connect()
+				responseCode
+			}
+			return code == 200
+		} catch (Exception e) {
+			if (e.toString().contains('unable to find valid certification path to requested target'))
+				throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
+			throw e
+		}
+	}
 
     static String getLatestForgeVersion(mcVersion) {
         final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))

build_clean.gradle

@@ -1,65 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'org.cadixdev.licenser'
-    id 'net.minecraftforge.gradle.patcher'
-}
-
-evaluationDependsOn(':mcp')
-
-repositories {
-    mavenCentral()
-    maven gradleutils.forgeMaven
-    maven gradleutils.minecraftLibsMaven
-}
-    
-java.toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-
-dependencies {
-	implementation(libs.forgespi)
-}
-
-patcher {
-	parent = project(':mcp')
-	mcVersion = MC_VERSION
-	patchedSrc = file('src/main/java')
-
-	mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
-
-	runs {
-		clean_client {
-			client true
-			taskName 'clean_client'
-			ideaModule "${rootProject.name}.${project.name}.main"
-
-			main 'net.minecraft.client.main.Main'
-			workingDirectory project.file('run/client')
-
-			args '--gameDir', '.'
-			args '--version', MC_VERSION
-			args '--assetsDir', downloadAssets.output
-			args '--assetIndex', '{asset_index}'
-			args '--accessToken', '0'
-		}
-
-		clean_server {
-			client false
-			taskName 'clean_server'
-			ideaModule "${rootProject.name}.${project.name}.main"
-
-			main 'net.minecraft.server.Main'
-			workingDirectory project.file('run/server')
-		}
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-    options.warnings = false // Shutup deprecated for removal warnings
-}
-
-eclipse.classpath.file.whenMerged {
-	// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
-	def src = entries.find { it.path == 'src/main/java' }
-    if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
-    src.entryAttributes['ignore_optional_problems'] = 'true'
-}

build_forge_eclipse.gradle

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

build_shared.gradle

@@ -1,76 +0,0 @@
-import net.minecraftforge.forge.tasks.CleanProperties
-
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'net.minecraftforge.gradleutils'
-
-group = 'net.minecraftforge'
-version = VERSION
-println("Version: $version")
-
-repositories {
-    mavenCentral()
-    maven gradleutils.forgeMaven
-    maven gradleutils.minecraftLibsMaven
-    //mavenLocal()
-}
-
-tasks.withType(Javadoc).configureEach {
-    options.tags = [
-        'apiNote:a:<em>API Note:</em>',
-        'implSpec:a:<em>Implementation Requirements:</em>',
-        'implNote:a:<em>Implementation Note:</em>'
-    ]
-    options.addStringOption('Xdoclint:all,-missing', '-public')
-}
-
-// We need to write the manifest to the binary file so we have properly versioned packaged at dev time.
-tasks.register('writeManifest') {
-    doLast {
-        if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project
-            universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF'))
-        else
-            jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF'))
-    }
-}
-
-tasks.register('generateResources') {
-    dependsOn('writeManifest')
-}
-
-// 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
-}
-
-// Merge the resources and classes into the same directory. We'll need to split them at runtime because
-// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now..
-sourceSets.each {
-    def dir = layout.buildDirectory.dir("classes/java/$it.name")
-    it.output.resourcesDir = dir
-    it.java.destinationDirectory = dir
-}
-
-tasks.register('copyEclipseSettings') {
-    doLast {
-        rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file ->
-            def target = project.file('.settings/' + file.name)
-            def temp = new CleanProperties().load(file)
-            def exst = new CleanProperties().load(target)
-            exst.put('eclipse.preferences.version', '1')
-            temp.forEach(exst::put)
-            exst.store(target)
-        }
-    }
-}
-
-// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import.
-eclipse {
-    // Run everytime eclipse builds the code
-    //autoBuildTasks writeManifest
-    // Run when importing the project
-    synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
-}

docs/README.md

@@ -2,8 +2,8 @@
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.2&query=$.promos["1.20.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.2-&query=$.promos["1.20.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.1&query=$.promos["1.20.1-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.1-&query=$.promos["1.20.1-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
 )][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon]
 
 Forge is a free, open-source modding API all of your favourite mods use!
@@ -27,7 +27,7 @@ You can download the installer for the *Recommended Build* or the
  *Latest build* there. Latest builds may have newer features but may be
  more unstable as a result. The installer will attempt to install Forge
  into your vanilla launcher environment, where you can then create a new
- profile using that version and play the game!
+ profile using that version and play the game! 
  
 For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
 
@@ -73,4 +73,4 @@ Please ensure you have a valid email address associated with your GitHub account
 [ForgeDev]: https://docs.minecraftforge.net/en/latest/forgedev/
 [Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
 
-[Patreon]: https://www.patreon.com/LexManos
+[Patreon]: https://www.patreon.com/MinecraftForge

fmlcore/build.gradle

@@ -1,67 +1,74 @@
-import net.minecraftforge.gradleutils.PomUtils
-
 plugins {
-    id 'java-library'
-    id 'maven-publish'
+    id 'com.github.ben-manes.versions'
+    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
     id 'org.cadixdev.licenser'
-    id 'net.minecraftforge.gradleutils'
 }
+apply plugin: 'java-library'
+apply plugin: 'jacoco'
+apply plugin: 'org.javamodularity.moduleplugin'
 
-apply from: rootProject.file('build_shared.gradle')
+dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
 
 dependencies {
-    compileOnly(libs.nulls)
+    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
 
-    api(libs.eventbus)
+    api("net.minecraftforge:eventbus:${EVENTBUS_VERSION}")
 
     implementation(project(':fmlloader'))
-    implementation(libs.commons.io)
+    implementation("commons-io:commons-io:${COMMONS_IO_VERSION}")
 }
 
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-    withSourcesJar()
+task sourcesJar(type: Jar) {
+    archiveClassifier = 'sources'
+    from sourceSets.main.allSource
 }
 
-tasks.named('jar', Jar).configure {
-    manifest {
-        attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
-            'FMLModType': 'LIBRARY'
-        ] as LinkedHashMap)
-        attributes([
-            'Specification-Title':      'FML',
+ext {
+    MANIFESTS = [
+        '': [
+            'FMLModType': 'LIBRARY',
+            'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+            'Git-Commit': GIT_INFO.abbreviatedId,
+            'Git-Branch': GIT_INFO.branch,
+            'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}"
+        ] as LinkedHashMap,
+        'net/minecraftforge/fml/loading/': [
+            'Specification-Title':      'FMLLoader',
             'Specification-Vendor':     'Forge Development LLC',
             'Specification-Version':    '1',
-            'Implementation-Title':     'FML',
+            'Implementation-Title':     'FML Loader',
             'Implementation-Version':   '1.0',
-            'Implementation-Vendor':    'Forge Development LLC'
-        ] as LinkedHashMap, 'net/minecraftforge/fml/')
+            'Implementation-Vendor':    'Forge'
+        ] as LinkedHashMap
+    ]
+}
+
+jar.doFirst {
+    manifest.attributes['Automatic-Module-Name'] = project.name
+    MANIFESTS.each { pkg, values ->
+        if (pkg == '')
+            manifest.attributes(values)
+        else
+            manifest.attributes(values, pkg)
     }
 }
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:-unchecked'
+    options.compilerArgs << '-Xlint:unchecked'
 }
 
 license {
     header = rootProject.file('LICENSE-header.txt')
+
+    include 'net/minecraftforge/'
 }
 
-publishing {
-    publications.register('mavenJava', MavenPublication).configure {
-        from components.java
-        artifactId = 'fmlcore'
-        pom {
-            name = project.name
-            description = 'Modifactions to Minecraft to enable mod developers.'
-            url = 'https://github.com/MinecraftForge/MinecraftForge'
-            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
-            license PomUtils.Licenses.LGPLv2_1
-        }
-    }
-    
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
+artifacts {
+    archives jar
+    archives sourcesJar
+}
+
+publishing.publications.mavenJava(MavenPublication) {
+    from components.java
+    artifact sourcesJar
 }

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

@@ -5,12 +5,11 @@
 
 package net.minecraftforge.fml;
 
+import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
 
-import java.util.ArrayList;
-import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
@@ -20,18 +19,10 @@ public class Bindings {
     private final IBindingsProvider provider;
 
     private Bindings() {
-        var providers = new ArrayList<IBindingsProvider>(1);
-        for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) {
-            try {
-                providers.add(itr.next());
-            } catch (ServiceConfigurationError sce) {
-                sce.printStackTrace();
-            }
+        final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList();
+        if (providers.size() != 1) {
+            throw new IllegalStateException("Could not find bindings provider");
         }
-
-        if (providers.size() != 1)
-            throw new IllegalStateException("Could not find bindings provider: " + providers);
-
         this.provider = providers.get(0);
     }
 

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

@@ -25,7 +25,6 @@ import java.util.function.Supplier;
  * @param <T> the type of the record which is held by the extension point
  */
 @SuppressWarnings("unused") // Type parameter T
-// TODO: Complete re-write, this hasnt actually be used in a generic way by mods and we could make it a lot simpler.
 public interface IExtensionPoint<T extends Record>
 {
     /**
@@ -41,7 +40,7 @@ public interface IExtensionPoint<T extends Record>
      * where {@code true} means it is from the server and {@code false} means it is from the world save. The return
      * value of the predicate determines whether the remote version is "compatible" for the purposes of the display test.</p>
      *
-     * <p>The local compatibility version may be of the value {@link DisplayTest#IGNORESERVERONLY},
+     * <p>The local compatibility version may be of the value {@link net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY},
      * in which case clients will ignore the mod's presence if it is present on the server but not on the client.
      * However, the remote version test predicate must still accept this value as a remote version in order to display
      * as compatible if the mod is present on the client.</p>
@@ -95,6 +94,6 @@ public interface IExtensionPoint<T extends Record>
      */
     @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
     record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
-        public static final String IGNORESERVERONLY = "SERVER_ONLY";
+        public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
     }
 }

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

@@ -7,6 +7,7 @@ package net.minecraftforge.fml;
 
 import com.google.gson.Gson;
 import net.minecraftforge.fml.loading.FMLConfig;
+import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.forgespi.language.IModInfo;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -34,68 +35,81 @@ import java.util.zip.GZIPInputStream;
 
 import static net.minecraftforge.fml.VersionChecker.Status.*;
 
-public class VersionChecker {
+public class VersionChecker
+{
     private static final Logger LOGGER = LogManager.getLogger();
     private static final int MAX_HTTP_REDIRECTS = Integer.getInteger("http.maxRedirects", 20);
     private static final int HTTP_TIMEOUT_SECS = Integer.getInteger("http.timeoutSecs", 15);
 
-    public enum Status {
+    public enum Status
+    {
         PENDING(),
         FAILED(),
         UP_TO_DATE(),
-        OUTDATED(3, true, true),
+        OUTDATED(3, true),
         AHEAD(),
         BETA(),
-        BETA_OUTDATED(6, true, true);
+        BETA_OUTDATED(6, true);
 
         final int sheetOffset;
         final boolean draw, animated;
 
-        Status() {
+        Status()
+        {
             this(0, false, false);
         }
 
-        Status(int sheetOffset, boolean draw, boolean animated) {
+        Status(int sheetOffset)
+        {
+            this(sheetOffset, true, false);
+        }
+
+        Status(int sheetOffset, boolean animated)
+        {
+            this(sheetOffset, true, animated);
+        }
+
+        Status(int sheetOffset, boolean draw, boolean animated)
+        {
             this.sheetOffset = sheetOffset;
             this.draw = draw;
             this.animated = animated;
         }
 
-        public int getSheetOffset() {
+        public int getSheetOffset()
+        {
             return sheetOffset;
         }
 
-        public boolean shouldDraw() {
+        public boolean shouldDraw()
+        {
             return draw;
         }
 
-        public boolean isAnimated() {
+        public boolean isAnimated()
+        {
             return animated;
         }
+
     }
 
     public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
 
-    public static void startVersionCheck() {
-        new Thread("Forge Version Check") {
+    public static void startVersionCheck()
+    {
+        new Thread("Forge Version Check")
+        {
             private HttpClient client;
-            private String mcVersion;
-            private String agent;
 
             @Override
-            public void run() {
-                if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK)) {
+            public void run()
+            {
+                if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK))
+                {
                     LOGGER.info("Global Forge version check system disabled, no further processing.");
                     return;
                 }
 
-                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")
-                    + " MinecraftForge/" + mcVersion + '-' + forge.get().getModInfo().getVersion();
-
                 client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build();
                 gatherMods().forEach(this::process);
             }
@@ -105,9 +119,15 @@ public class VersionChecker {
              */
             private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException {
                 URL currentUrl = url;
-                var userAgent = this.agent + ' ' + mod.getModId() + '/' + mod.getVersion();
 
-                for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++) {
+                final StringBuilder sb = new StringBuilder();
+                sb.append("Java-http-client/").append(System.getProperty("java.version")).append(' ');
+                sb.append("MinecraftForge/").append(FMLLoader.versionInfo().mcAndForgeVersion()).append(' ');
+                sb.append(mod.getModId()).append('/').append(mod.getVersion());
+                final String userAgent = sb.toString();
+
+                for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++)
+                {
                     var request = HttpRequest.newBuilder()
                             .uri(currentUrl.toURI())
                             .timeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS))
@@ -119,7 +139,8 @@ public class VersionChecker {
                     final HttpResponse<InputStream> response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
 
                     int responseCode = response.statusCode();
-                    if (responseCode >= 300 && responseCode <= 399) {
+                    if (responseCode >= 300 && responseCode <= 399)
+                    {
                         String newLocation = response.headers().firstValue("Location")
                                 .orElseThrow(() -> new IOException("Got a 3xx response code but Location header was null while trying to fetch " + url));
                         currentUrl = new URL(currentUrl, newLocation);
@@ -129,22 +150,26 @@ public class VersionChecker {
                     final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip");
 
                     final String bodyStr;
-                    try (var inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body();
-                         var bufferedReader = new BufferedReader(new InputStreamReader(inStream))
-                    ) {
-                        bodyStr = bufferedReader.lines().collect(Collectors.joining("\n"));
+                    try (InputStream inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body())
+                    {
+                        try (var bufferedReader = new BufferedReader(new InputStreamReader(inStream)))
+                        {
+                            bodyStr = bufferedReader.lines().collect(Collectors.joining("\n"));
+                        }
                     }
                     return bodyStr;
                 }
                 throw new IOException("Too many redirects while trying to fetch " + url);
             }
 
-            private void process(IModInfo mod) {
+            private void process(IModInfo mod)
+            {
                 Status status = PENDING;
                 ComparableVersion target = null;
                 Map<ComparableVersion, String> changes = null;
                 String display_url = null;
-                try {
+                try
+                {
                     if (mod.getUpdateURL().isEmpty()) return;
                     URL url = mod.getUpdateURL().get();
                     LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString());
@@ -153,40 +178,54 @@ public class VersionChecker {
 
                     LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);
 
+
                     @SuppressWarnings("unchecked")
                     Map<String, Object> json = new Gson().fromJson(data, Map.class);
                     @SuppressWarnings("unchecked")
                     Map<String, String> promos = (Map<String, String>)json.get("promos");
                     display_url = (String)json.get("homepage");
 
+                    var mcVersion = FMLLoader.versionInfo().mcVersion();
                     String rec = promos.get(mcVersion + "-recommended");
                     String lat = promos.get(mcVersion + "-latest");
                     ComparableVersion current = new ComparableVersion(mod.getVersion().toString());
 
-                    if (rec != null) {
+                    if (rec != null)
+                    {
                         ComparableVersion recommended = new ComparableVersion(rec);
                         int diff = recommended.compareTo(current);
 
                         if (diff == 0)
                             status = UP_TO_DATE;
-                        else if (diff < 0) {
+                        else if (diff < 0)
+                        {
                             status = AHEAD;
-                            if (lat != null) {
+                            if (lat != null)
+                            {
                                 ComparableVersion latest = new ComparableVersion(lat);
-                                if (current.compareTo(latest) < 0) {
+                                if (current.compareTo(latest) < 0)
+                                {
                                     status = OUTDATED;
                                     target = latest;
                                 }
                             }
-                        } else {
+                        }
+                        else
+                        {
                             status = OUTDATED;
                             target = recommended;
                         }
-                    } else if (lat != null) {
+                    }
+                    else if (lat != null)
+                    {
                         ComparableVersion latest = new ComparableVersion(lat);
-                        status = current.compareTo(latest) < 0 ? BETA_OUTDATED : BETA;
+                        if (current.compareTo(latest) < 0)
+                            status = BETA_OUTDATED;
+                        else
+                            status = BETA;
                         target = latest;
-                    } else
+                    }
+                    else
                         status = BETA;
 
                     LOGGER.info("[{}] Found status: {} Current: {} Target: {}", mod.getModId(), status, current, target);
@@ -194,20 +233,27 @@ public class VersionChecker {
                     changes = new LinkedHashMap<>();
                     @SuppressWarnings("unchecked")
                     Map<String, String> tmp = (Map<String, String>)json.get(mcVersion);
-                    if (tmp != null) {
+                    if (tmp != null)
+                    {
                         List<ComparableVersion> ordered = new ArrayList<>();
-                        for (String key : tmp.keySet()) {
+                        for (String key : tmp.keySet())
+                        {
                             ComparableVersion ver = new ComparableVersion(key);
                             if (ver.compareTo(current) > 0 && (target == null || ver.compareTo(target) < 1))
+                            {
                                 ordered.add(ver);
+                            }
                         }
                         Collections.sort(ordered);
 
-                        for (ComparableVersion ver : ordered) {
+                        for (ComparableVersion ver : ordered)
+                        {
                             changes.put(ver, tmp.get(ver.toString()));
                         }
                     }
-                } catch (Exception e) {
+                }
+                catch (Exception e)
+                {
                     LOGGER.warn("Failed to process update information", e);
                     status = FAILED;
                 }
@@ -217,7 +263,8 @@ 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() {
+    private static List<IModInfo> gatherMods()
+    {
         List<IModInfo> ret = new LinkedList<>();
         for (IModInfo info : ModList.get().getMods()) {
             if (info.getUpdateURL().isPresent())
@@ -229,7 +276,9 @@ public class VersionChecker {
     private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
     private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
 
-    public static CheckResult getResult(IModInfo mod) {
+    public static CheckResult getResult(IModInfo mod)
+    {
         return results.getOrDefault(mod, PENDING_CHECK);
     }
+
 }

fmlearlydisplay/build.gradle

@@ -1,15 +1,14 @@
-import net.minecraftforge.gradleutils.PomUtils
-
 plugins {
-    id 'java-library'
-    id 'maven-publish'
+    id 'com.github.ben-manes.versions'
+    id 'org.javamodularity.moduleplugin' version '1.8.7' apply false
     id 'org.cadixdev.licenser'
-    id 'net.minecraftforge.gradleutils'
 }
-
-apply from: rootProject.file('build_shared.gradle')
+apply plugin: 'java-library'
+apply plugin: 'jacoco'
+apply plugin: 'org.javamodularity.moduleplugin'
 
 import org.gradle.internal.os.OperatingSystem
+
 switch (OperatingSystem.current()) {
 	case OperatingSystem.LINUX:
 		project.ext.lwjglNatives = "natives-linux"
@@ -22,18 +21,22 @@ switch (OperatingSystem.current()) {
 		break
 }
 
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-    withSourcesJar()
-}
+
+dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
+
+java.withSourcesJar()
 
 dependencies {
-    compileOnly(libs.nulls)
+    compileOnly('org.jetbrains:annotations:23.0.0')
     implementation(project(':fmlloader'))
     implementation(project(':fmlcore'))
-    implementation(libs.bundles.lwjgl)
+    implementation('org.lwjgl:lwjgl:3.3.1')
+    implementation('org.lwjgl:lwjgl-glfw:3.3.1')
+    implementation('org.lwjgl:lwjgl-opengl:3.3.1')
+    implementation('org.lwjgl:lwjgl-stb:3.3.1')
+    implementation('org.lwjgl:lwjgl-tinyfd:3.3.1')
     implementation('org.slf4j:slf4j-api:1.8.0-beta4')
-    implementation(libs.jopt.simple)
+    implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
     testImplementation('org.powermock:powermock-core:2.0.9')
     testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.8.2')
@@ -48,20 +51,31 @@ test {
     useJUnitPlatform()
 }
 
-jar {
-    manifest {
-        attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
-            'Forge-Module-Layer':    'boot'
-        ] as LinkedHashMap)
-        attributes([
-            'Specification-Title':      'FML Early Display',
+ext {
+    MANIFESTS = [
+        '': [
+            'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+            'Git-Commit': GIT_INFO.abbreviatedId,
+            'Git-Branch': GIT_INFO.branch,
+            'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}",
+        ] as LinkedHashMap,
+        'net/minecraftforge/fml/earlydisplay/': [
+            'Specification-Title':      'FMLEarlyDisplay',
             'Specification-Vendor':     'Forge Development LLC',
             'Specification-Version':    '1',
             'Implementation-Title':     'FML Early Display',
-            'Implementation-Vendor':    'Forge Development LLC',
-            'Implementation-Version':   '1.0'
-        ] as LinkedHashMap, 'net/minecraftforge/fml/earlydisplay/')
+            'Implementation-Version':   '1.0',
+            'Implementation-Vendor':    'Forge'
+        ] as LinkedHashMap
+    ]
+}
+
+jar.doFirst {
+    MANIFESTS.each { pkg, values ->
+        if (pkg == '')
+            manifest.attributes(values)
+        else
+            manifest.attributes(values, pkg)
     }
 }
 
@@ -71,22 +85,9 @@ tasks.withType(JavaCompile) {
 
 license {
     header = rootProject.file('LICENSE-header.txt')
+    include 'net/minecraftforge/'
 }
 
-publishing {
-    publications.register('mavenJava', MavenPublication).configure {
-        from components.java
-        artifactId = 'fmlearlydisplay'
-        pom {
-            name = project.name
-            description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
-            url = 'https://github.com/MinecraftForge/MinecraftForge'
-            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
-            license PomUtils.Licenses.LGPLv2_1
-        }
-    }
-    
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
+publishing.publications.mavenJava(MavenPublication) {
+    from components.java
 }

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

@@ -40,13 +40,11 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.StringJoiner;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -88,7 +86,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
     private int framecount;
     private EarlyFramebuffer framebuffer;
     private ScheduledFuture<?> windowTick;
-    private ScheduledFuture<?> initializationFuture;
 
     private PerformanceInfo performanceInfo;
     private ScheduledFuture<?> performanceTick;
@@ -114,13 +111,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
     public String name() {
         return "fmlearlywindow";
     }
-
     @Override
     public Runnable initialize(String[] arguments) {
-        String mcVersion = FMLLoader.versionInfo().mcVersion();
-        String forgeVersion = FMLLoader.versionInfo().forgeVersion();
-
         final OptionParser parser = new OptionParser();
+        var mcversionopt = parser.accepts("fml.mcVersion").withRequiredArg().ofType(String.class);
+        var forgeversionopt = parser.accepts("fml.forgeVersion").withRequiredArg().ofType(String.class);
         var widthopt = parser.accepts("width")
                 .withRequiredArg().ofType(Integer.class)
                 .defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH));
@@ -135,7 +130,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
         FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH, winWidth);
         FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT, winHeight);
         fbScale = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_FBSCALE);
-        if (System.getenv("FML_EARLY_WINDOW_DARK") != null) {
+        if (System.getenv("FML_EARLY_WINDOW_DARK")!= null) {
             this.colourScheme = ColourScheme.BLACK;
         } else {
             try {
@@ -150,9 +145,10 @@ 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 " + forgeVersion));
+        var forgeVersion = parsed.valueOf(forgeversionopt);
+        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading "+ forgeVersion));
         performanceInfo = new PerformanceInfo();
-        return start(mcVersion, forgeVersion);
+        return start(parsed.valueOf(mcversionopt), forgeVersion);
     }
 
     private static final long MINFRAMETIME = TimeUnit.MILLISECONDS.toNanos(10); // This is the FPS cap on the window - note animation is capped at 20FPS via the tickTimer
@@ -230,11 +226,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
             crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
         }
         this.elements = new ArrayList<>(Arrays.asList(
-            RenderElement.anvil(font),
-            RenderElement.logMessageOverlay(font),
-            RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion),
-            RenderElement.performanceBar(font),
-            RenderElement.progressBars(font)
+                RenderElement.anvil(font),
+                RenderElement.logMessageOverlay(font),
+                RenderElement.forgeVersionOverlay(font, mcVersion+"-"+forgeVersion.split("-")[0]),
+                RenderElement.performanceBar(font),
+                RenderElement.progressBars(font)
         ));
 
         var date = Calendar.getInstance();
@@ -268,6 +264,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
     public void render(int alpha) {
         var currentVAO = glGetInteger(GL_VERTEX_ARRAY_BINDING);
         var currentFB = glGetInteger(GL_READ_FRAMEBUFFER_BINDING);
+        glfwSwapInterval(0);
         glViewport(0, 0, this.context.scaledWidth(), this.context.scaledHeight());
         RenderElement.globalAlpha = alpha;
         framebuffer.activate();
@@ -286,12 +283,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
     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);
+        renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
         return this::periodicTick;
     }
 
@@ -522,16 +518,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
      * @return the Window we own.
      */
     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);
-        } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
-        } catch (TimeoutException e) {
-            Thread.dumpStack();
-            crashElegantly("We seem to be having trouble initializing the window, waited for 30 seconds");
-        }
-
         // we have to spin wait for the window ticker
         ImmediateWindowHandler.updateProgress("Initializing Game Graphics");
         while (!this.windowTick.isDone()) {

fmlloader/build.gradle

@@ -1,67 +1,78 @@
-import net.minecraftforge.gradleutils.PomUtils
-
 plugins {
-    id 'java-library'
-    id 'maven-publish'
+    id 'com.github.ben-manes.versions'
+    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
     id 'org.cadixdev.licenser'
-    id 'net.minecraftforge.gradleutils'
 }
+apply plugin: 'java-library'
+apply plugin: 'jacoco'
+apply plugin: 'org.javamodularity.moduleplugin'
 
-apply from: rootProject.file('build_shared.gradle')
-
+dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
 configurations.forEach{ it.transitive = false }
 
 dependencies {
-    compileOnly(libs.nulls)
+    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
 
-    api(libs.bundles.asm) // Needed by all the black magic
-    api(libs.forgespi)
-    api(libs.mergetool.api)
-    api(libs.log4j.api)
-    api(libs.slf4j.api)
-    api(libs.guava)
-    api(libs.gson)
-    api(libs.maven.artifact)
-    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)
+    api("org.ow2.asm:asm:${ASM_VERSION}")
+    api("org.ow2.asm:asm-tree:${ASM_VERSION}")
+    api("org.ow2.asm:asm-commons:${ASM_VERSION}")
+    api("net.minecraftforge:forgespi:${SPI_VERSION}")
+    api("net.minecraftforge:mergetool:${MERGETOOL_VERSION}:api")
+    api("org.apache.logging.log4j:log4j-api:${LOG4J_VERSION}")
+    api("org.slf4j:slf4j-api:${SLF4J_API_VERSION}")
+    api("com.google.guava:guava:${GUAVA_VERSION}")
+    api("com.google.code.gson:gson:${GSON_VERSION}")
+    api("org.apache.maven:maven-artifact:${APACHE_MAVEN_ARTIFACT_VERSION}")
+    api("org.apache.commons:commons-lang3:${APACHE_COMMONS_LANG3_VERSION}")
+    api("com.electronwill.night-config:core:${NIGHTCONFIG_VERSION}")
+    api("com.electronwill.night-config:toml:${NIGHTCONFIG_VERSION}")
+    api("cpw.mods:modlauncher:${MODLAUNCHER_VERSION}")
+    api("net.minecraftforge:coremods:${COREMODS_VERSION}")
+    api("com.mojang:logging:${MOJANG_LOGGING_VERSION}")
+    api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
+    api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
 
-    implementation(libs.jopt.simple)
-    implementation(libs.securemodules)
-    implementation(libs.accesstransformers)
-    implementation(libs.terminalconsoleappender)
-    implementation(libs.jimfs)
+    implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
+    implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
+    implementation("net.minecraftforge:accesstransformers:${ACCESSTRANSFORMERS_VERSION}")
+    implementation("net.minecrell:terminalconsoleappender:${TERMINALCONSOLEAPPENDER_VERSION}")
+    // implementation("org.jline:jline:${JLINE_VERSION}")
 
-    implementation(libs.log4j.core)
-    annotationProcessor(libs.log4j.core)
+    implementation("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
+    annotationProcessor("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
 
-    testCompileOnly(libs.nulls)
-    testRuntimeOnly(libs.bootstrap)
+    testCompileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
+    testRuntimeOnly("cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}")
 }
 
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-    withSourcesJar()
+task sourcesJar(type: Jar) {
+    archiveClassifier = 'sources'
+    from sourceSets.main.allSource
 }
 
-tasks.named('jar', Jar).configure {
-    manifest {
-        attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
-            'Forge-Module-Layer':    'boot'
-        ] as LinkedHashMap)
-        attributes([
-            'Specification-Title':   'FMLLoader',
-            'Specification-Vendor':  'Forge Development LLC',
-            'Specification-Version': '1',
-            'Implementation-Title':  'FMLLoader',
-            'Implementation-Vendor': 'Forge Development LLC',
-            'Implementation-Version': FORGE_VERSION
-        ] as LinkedHashMap, 'net/minecraftforge/fml/loading/')
+ext {
+    MANIFESTS = [
+        '/': [
+            'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+            'Git-Commit': GIT_INFO.abbreviatedId,
+            'Git-Branch': GIT_INFO.branch,
+            'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}",
+        ] as LinkedHashMap,
+        'net/minecraftforge/fml/loading/': [
+            'Specification-Title':      'FMLLoader',
+            'Specification-Vendor':     'Forge Development LLC',
+            'Specification-Version':    '1',
+            'Implementation-Title':     'FML Loader',
+            'Implementation-Version':   '1.0',
+            'Implementation-Vendor':    'Forge'
+        ] as LinkedHashMap
+    ]
+}
+
+jar.doFirst {
+    manifest.attributes['Automatic-Module-Name'] = project.name
+    MANIFESTS.each { pkg, values ->
+        manifest.attributes(values, pkg)
     }
 }
 
@@ -71,36 +82,16 @@ tasks.withType(JavaCompile) {
 
 license {
     header = rootProject.file('LICENSE-header.txt')
+
+    include 'net/minecraftforge/'
 }
 
-publishing {
-    publications.register('mavenJava', MavenPublication).configure {
-        from components.java
-        artifactId = 'fmlloader'
-        pom {
-            name = project.name
-            description = 'Modifactions to Minecraft to enable mod developers.'
-            url = 'https://github.com/MinecraftForge/MinecraftForge'
-            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
-            license PomUtils.Licenses.LGPLv2_1
-        }
-    }
-    
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
+artifacts {
+    archives jar
+    archives sourcesJar
 }
 
-tasks.register('writeForgeVersionJson') {
-    doLast {
-        file('src/main/resources/forge_version.json').json = [
-            'forge': FORGE_VERSION,
-            'mc': MC_VERSION,
-            'mcp': MCP_VERSION
-        ] as LinkedHashMap
-    }
-}
-
-tasks.named('generateResources').configure {
-    dependsOn('writeForgeVersionJson')
-}
+publishing.publications.mavenJava(MavenPublication) {
+    from components.java
+    artifact sourcesJar
+}

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

@@ -56,7 +56,6 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
         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();

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

@@ -20,6 +20,8 @@ import org.objectweb.asm.tree.MethodNode;
 
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 import org.slf4j.Logger;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 
 /**
  * Modifies specified enums to allow runtime extension by making the $VALUES field non-final and

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

@@ -5,6 +5,8 @@
 
 package net.minecraftforge.fml.loading;
 
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading;
+
+import cpw.mods.modlauncher.api.NamedPath;
+import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
+import org.apache.logging.log4j.LogManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+
+public class ClasspathTransformerDiscoverer implements ITransformerDiscoveryService {
+
+    private final List<Path> legacyClasspath = Arrays.stream(System.getProperty("legacyClassPath", "").split(File.pathSeparator)).map(Path::of).toList();
+
+    @Override
+    public List<NamedPath> candidates(Path gameDirectory) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<NamedPath> candidates(final Path gameDirectory, final String launchTarget) {
+        if (launchTarget != null && launchTarget.contains("dev")) {
+            this.scan(gameDirectory);
+        }
+        return List.copyOf(found);
+    }
+
+    private final static List<NamedPath> found = new ArrayList<>();
+
+    public static List<Path> allExcluded() {
+        return found.stream().map(np->np.paths()[0]).toList();
+    }
+    
+    private void scan(final Path gameDirectory) {
+        try {
+            locateTransformers("META-INF/services/cpw.mods.modlauncher.api.ITransformationService");
+            locateTransformers("META-INF/services/net.minecraftforge.forgespi.locating.IModLocator");
+        } catch (IOException e) {
+            LogManager.getLogger().error("Error during discovery of transform services from the classpath", e);
+        }
+    }
+
+    private void locateTransformers(String resource) throws IOException {
+        final Enumeration<URL> resources = ClassLoader.getSystemClassLoader().getResources(resource);
+        while (resources.hasMoreElements()) {
+            URL url = resources.nextElement();
+            Path path = ClasspathLocatorUtils.findJarPathFor(resource, url.toString(), url);
+            if (legacyClasspath.stream().anyMatch(path::equals) || !Files.exists(path) || Files.isDirectory(path))
+                continue;
+            found.add(new NamedPath(path.toUri().toString(), path));
+        }
+    }
+}

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

@@ -14,8 +14,6 @@ import java.util.List;
  * or server.
  */
 public class EarlyLoadingException extends RuntimeException {
-    private static final long serialVersionUID = 2302192216172508006L;
-
     public static class ExceptionData {
         private final IModInfo modInfo;
         private final String i18message;

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

@@ -42,6 +42,7 @@ public class FMLConfig
         private final String entry;
         private final Object defaultValue;
         private final String comment;
+        private final Class<?> valueType;
         private final Function<Object, Object> entryFunction;
 
         ConfigValue(final String entry, final Object defaultValue, final String comment) {
@@ -51,6 +52,7 @@ public class FMLConfig
             this.entry = entry;
             this.defaultValue = defaultValue;
             this.comment = comment;
+            this.valueType = defaultValue.getClass();
             this.entryFunction = entryFunction;
         }
 

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

@@ -8,12 +8,15 @@ package net.minecraftforge.fml.loading;
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.*;
+import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
+import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModValidator;
 import net.minecraftforge.accesstransformer.service.AccessTransformerService;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
 import net.minecraftforge.forgespi.Environment;
 import net.minecraftforge.forgespi.coremod.ICoreModProvider;
@@ -22,29 +25,27 @@ import org.slf4j.Logger;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
 
-public class FMLLoader {
+public class FMLLoader
+{
     private static final Logger LOGGER = LogUtils.getLogger();
     private static AccessTransformerService accessTransformer;
     private static ModDiscoverer modDiscoverer;
     private static ICoreModProvider coreModProvider;
+    private static ILaunchPluginService eventBus;
     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 VersionInfo versionInfo = VersionInfo.detect();
+    private static VersionInfo versionInfo;
     private static String launchHandlerName;
     private static CommonLaunchHandler commonLaunchHandler;
     public static Runnable progressWindowTick;
@@ -53,74 +54,80 @@ public class FMLLoader {
     private static boolean production;
     private static IModuleLayerManager moduleLayerManager;
 
-    static void onInitialLoad(IEnvironment env, Set<String> otherServices) throws IncompatibleEnvironmentException {
-        LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
-        LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());
+    static void onInitialLoad(IEnvironment environment, Set<String> otherServices) throws IncompatibleEnvironmentException
+    {
+        final String version = LauncherVersion.getVersion();
+        LOGGER.debug(CORE,"FML {} loading", version);
+        final Package modLauncherPackage = ITransformationService.class.getPackage();
+        LOGGER.debug(CORE,"FML found ModLauncher version : {}", modLauncherPackage.getImplementationVersion());
+        if (!modLauncherPackage.isCompatibleWith("4.0")) {
+            LOGGER.error(CORE, "Found incompatible ModLauncher specification : {}, version {} from {}", modLauncherPackage.getSpecificationVersion(), modLauncherPackage.getImplementationVersion(), modLauncherPackage.getImplementationVendor());
+            throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
+        }
 
-        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");
+        accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
+            LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
+            return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
+        });
+
+        final Package atPackage = accessTransformer.getClass().getPackage();
+        LOGGER.debug(CORE,"FML found AccessTransformer version : {}", atPackage.getImplementationVersion());
+        if (!atPackage.isCompatibleWith("1.0")) {
+            LOGGER.error(CORE, "Found incompatible AccessTransformer specification : {}, version {} from {}", atPackage.getSpecificationVersion(), atPackage.getImplementationVersion(), atPackage.getImplementationVendor());
+            throw new IncompatibleEnvironmentException("Incompatible accesstransformer found "+atPackage.getSpecificationVersion());
+        }
+
+        eventBus = environment.findLaunchPlugin("eventbus").orElseThrow(()-> {
+            LOGGER.error(CORE, "Event Bus library is missing, we need this to run");
+            return new IncompatibleEnvironmentException("Missing EventBus, cannot run");
+        });
+
+        final Package eventBusPackage = eventBus.getClass().getPackage();
+        LOGGER.debug(CORE,"FML found EventBus version : {}", eventBusPackage.getImplementationVersion());
+        if (!eventBusPackage.isCompatibleWith("1.0")) {
+            LOGGER.error(CORE, "Found incompatible EventBus specification : {}, version {} from {}", eventBusPackage.getSpecificationVersion(), eventBusPackage.getImplementationVersion(), eventBusPackage.getImplementationVendor());
+            throw new IncompatibleEnvironmentException("Incompatible eventbus found "+eventBusPackage.getSpecificationVersion());
+        }
+
+        runtimeDistCleaner = (RuntimeDistCleaner)environment.findLaunchPlugin("runtimedistcleaner").orElseThrow(()-> {
+            LOGGER.error(CORE, "Dist Cleaner is missing, we need this to run");
+            return new IncompatibleEnvironmentException("Missing DistCleaner, cannot run!");
+        });
+        LOGGER.debug(CORE, "Found Runtime Dist Cleaner");
+
+        var coreModProviders = ServiceLoaderUtils.streamWithErrorHandling(ServiceLoader.load(FMLLoader.class.getModule().getLayer(), ICoreModProvider.class), sce -> LOGGER.error(CORE, "Failed to load a coremod library, expect problems", sce)).toList();
+
+        if (coreModProviders.isEmpty()) {
+            LOGGER.error(CORE, "Found no coremod provider. Cannot run");
+            throw new IncompatibleEnvironmentException("No coremod library found");
+        } else if (coreModProviders.size() > 1) {
+            LOGGER.error(CORE, "Found multiple coremod providers : {}. Cannot run", coreModProviders.stream().map(p -> p.getClass().getName()).collect(Collectors.toList()));
+            throw new IncompatibleEnvironmentException("Multiple coremod libraries found");
+        }
+
+        coreModProvider = coreModProviders.get(0);
+        final Package coremodPackage = coreModProvider.getClass().getPackage();
+        LOGGER.debug(CORE,"FML found CoreMod version : {}", coremodPackage.getImplementationVersion());
+
+
+        LOGGER.debug(CORE, "Found ForgeSPI package implementation version {}", Environment.class.getPackage().getImplementationVersion());
+        LOGGER.debug(CORE, "Found ForgeSPI package specification {}", Environment.class.getPackage().getSpecificationVersion());
+        if (Integer.parseInt(Environment.class.getPackage().getSpecificationVersion()) < 2) {
+            LOGGER.error(CORE, "Found an out of date ForgeSPI implementation: {}, loading cannot continue", Environment.class.getPackage().getSpecificationVersion());
+            throw new IncompatibleEnvironmentException("ForgeSPI is out of date, we cannot continue");
+        }
 
         try {
-            Class.forName("com.electronwill.nightconfig.core.Config", false, env.getClass().getClassLoader());
-            Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, env.getClass().getClassLoader());
+            Class.forName("com.electronwill.nightconfig.core.Config", false, environment.getClass().getClassLoader());
+            Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, environment.getClass().getClassLoader());
         } catch (ClassNotFoundException e) {
             LOGGER.error(CORE, "Failed to load NightConfig");
             throw new IncompatibleEnvironmentException("Missing NightConfig");
         }
     }
 
-    private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
-        @SuppressWarnings("unchecked")
-        var plugin = (T)env.findLaunchPlugin(id).orElseThrow(() -> {
-            LOGGER.error(CORE, "{} library is missing, we need this to run", name);
-            return new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
-        });
-        checkPackage(plugin.getClass(), version, name);
-        return plugin;
-    }
-
-    private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
-        var pkg = cls.getPackage();
-        var info = JarVersionLookupHandler.getInfo(pkg);
-        LOGGER.debug(CORE, "Found {} version: {}", name, info.impl().version().orElse("MISSING"));
-
-        if (!pkg.isCompatibleWith(version)) {
-            LOGGER.error(CORE, "Found incompatible {} specification: {}, version {} from {}", name,
-                 info.spec().version().orElse("MISSING"),
-                 info.impl().version().orElse("MISSING"),
-                 info.impl().vendor().orElse("MISSING")
-             );
-            throw new IncompatibleEnvironmentException("Incompatible " + name + " found " + info.spec().version().orElse("MISSING"));
-        }
-    }
-
-    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(); ) {
-              try {
-                  providers.add(itr.next());
-              } catch (ServiceConfigurationError e) {
-                  LOGGER.error(CORE, "Failed to load a " + name + " library, expect problems", e);
-              }
-          }
-
-          if (providers.isEmpty()) {
-              LOGGER.error(CORE, "Found no {} provider. Cannot run", name);
-              throw new IncompatibleEnvironmentException("No " + name + " library found");
-          } else if (providers.size() > 1) {
-              LOGGER.error(CORE, "Found multiple {} providers: {}. Cannot run", name, providers.stream().map(p -> p.getClass().getName()).toList());
-              throw new IncompatibleEnvironmentException("Multiple " + name + " libraries found");
-          }
-
-          return providers.get(0);
-    }
-
-    static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments) {
+    static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
+    {
         final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
         arguments.put("launchTarget", launchTarget);
         final Optional<ILaunchHandlerService> launchHandler = environment.findLaunchHandler(launchTarget);
@@ -130,7 +137,6 @@ public class FMLLoader {
             throw new RuntimeException("Missing launch handler: " + launchTarget);
         }
 
-        // TODO: [FML][Loader] What the fuck is the point of using a service if you require a specific concrete class
         if (!(launchHandler.get() instanceof CommonLaunchHandler)) {
             LOGGER.error(CORE, "Incompatible Launch handler found - type {}, cannot continue", launchHandler.get().getClass().getName());
             throw new RuntimeException("Incompatible launch handler found");
@@ -143,12 +149,16 @@ public class FMLLoader {
         dist = commonLaunchHandler.getDist();
         production = commonLaunchHandler.isProduction();
 
+        versionInfo = new VersionInfo(arguments);
+
         accessTransformer.getExtension().accept(Pair.of(naming, "srg"));
 
+        LOGGER.debug(CORE,"Received command line version data  : {}", versionInfo);
+
         runtimeDistCleaner.getExtension().accept(dist);
     }
-
-    public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
+    public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments)
+    {
         LOGGER.debug(SCAN,"Scanning for Mod Locators");
         modDiscoverer = new ModDiscoverer(arguments);
         modValidator = modDiscoverer.discoverMods();
@@ -168,7 +178,8 @@ public class FMLLoader {
         return coreModProvider;
     }
 
-    public static LanguageLoadingProvider getLanguageLoadingProvider() {
+    public static LanguageLoadingProvider getLanguageLoadingProvider()
+    {
         return languageLoadingProvider;
     }
 
@@ -180,26 +191,31 @@ public class FMLLoader {
         return commonLaunchHandler;
     }
 
-    public static void addAccessTransformer(Path atPath, ModFile modName) {
+    public static void addAccessTransformer(Path atPath, ModFile modName)
+    {
         LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath());
         accessTransformer.offerResource(atPath, modName.getFileName());
     }
 
-    public static Dist getDist() {
+    public static Dist getDist()
+    {
         return dist;
     }
 
-    public static void beforeStart(ModuleLayer gameLayer) {
+    public static void beforeStart(ModuleLayer gameLayer)
+    {
         ImmediateWindowHandler.acceptGameLayer(gameLayer);
         ImmediateWindowHandler.updateProgress("Launching minecraft");
         progressWindowTick.run();
     }
 
-    public static LoadingModList getLoadingModList() {
+    public static LoadingModList getLoadingModList()
+    {
         return loadingModList;
     }
 
-    public static Path getGamePath() {
+    public static Path getGamePath()
+    {
         return gamePath;
     }
 
@@ -216,7 +232,7 @@ public class FMLLoader {
     }
 
     public static List<Map<String, String>> modLauncherModList() {
-        return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElse(List.of());
+        return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElseGet(Collections::emptyList);
     }
 
     public static String launcherHandlerName() {

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.ArgumentAcceptingOptionSpec;
 import joptsimple.OptionSpecBuilder;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.Environment;
@@ -14,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -22,18 +24,36 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
-public class FMLServiceProvider implements ITransformationService {
+public class FMLServiceProvider implements ITransformationService
+{
     private static final Logger LOGGER = LogUtils.getLogger();
+    private ArgumentAcceptingOptionSpec<String> modsOption;
+    private ArgumentAcceptingOptionSpec<String> modListsOption;
+    private ArgumentAcceptingOptionSpec<String> mavenRootsOption;
+    private ArgumentAcceptingOptionSpec<String> forgeOption;
+    private ArgumentAcceptingOptionSpec<String> mcOption;
+    private ArgumentAcceptingOptionSpec<String> forgeGroupOption;
+    private ArgumentAcceptingOptionSpec<String> mcpOption;
+    private ArgumentAcceptingOptionSpec<String> mappingsOption;
+    private List<String> modsArgumentList;
+    private List<String> modListsArgumentList;
+    private List<String> mavenRootsArgumentList;
+    private String targetForgeVersion;
+    private String targetMcVersion;
+    private String targetMcpVersion;
+    private String targetMcpMappings;
+    private String targetForgeGroup;
     private Map<String, Object> arguments;
 
-    public FMLServiceProvider() {
-        var markers = System.getProperty("forge.logging.markers", "").split(",");
-        for (var marker : markers)
-            System.setProperty("forge.logging.marker." + marker.toLowerCase(Locale.ROOT), "ACCEPT");
+    public FMLServiceProvider()
+    {
+        final String markerselection = System.getProperty("forge.logging.markers", "");
+        Arrays.stream(markerselection.split(",")).forEach(marker -> System.setProperty("forge.logging.marker." + marker.toLowerCase(Locale.ROOT), "ACCEPT"));
     }
 
     @Override
-    public String name() {
+    public String name()
+    {
         return "fml";
     }
 
@@ -46,6 +66,14 @@ public class FMLServiceProvider implements ITransformationService {
         LOGGER.debug(CORE, "Preparing ModFile");
         environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
         arguments = new HashMap<>();
+        arguments.put("modLists", modListsArgumentList);
+        arguments.put("mods", modsArgumentList);
+        arguments.put("mavenRoots", mavenRootsArgumentList);
+        arguments.put("forgeVersion", targetForgeVersion);
+        arguments.put("forgeGroup", targetForgeGroup);
+        arguments.put("mcVersion", targetMcVersion);
+        arguments.put("mcpVersion", targetMcpVersion);
+        arguments.put("mcpMappings", targetMcpMappings);
         LOGGER.debug(CORE, "Preparing launch handler");
         FMLLoader.setupLaunchHandler(environment, arguments);
         FMLEnvironment.setupInteropEnvironment(environment);
@@ -64,22 +92,45 @@ public class FMLServiceProvider implements ITransformationService {
     }
 
     @Override
-    public void onLoad(IEnvironment environment, Set<String> otherServices) throws IncompatibleEnvironmentException {
+    public void onLoad(IEnvironment environment, Set<String> otherServices) throws IncompatibleEnvironmentException
+    {
+//        LOGGER.debug("Injecting tracing printstreams for STDOUT/STDERR.");
+//        System.setOut(new TracingPrintStream(LogManager.getLogger("STDOUT"), System.out));
+//        System.setErr(new TracingPrintStream(LogManager.getLogger("STDERR"), System.err));
         FMLLoader.onInitialLoad(environment, otherServices);
     }
 
     @Override
-    public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder) {
+    public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder)
+    {
+        forgeOption = argumentBuilder.apply("forgeVersion", "Forge Version number").withRequiredArg().ofType(String.class).required();
+        forgeGroupOption = argumentBuilder.apply("forgeGroup", "Forge Group (for testing)").withRequiredArg().ofType(String.class).defaultsTo("net.minecraftforge");
+        mcOption = argumentBuilder.apply("mcVersion", "Minecraft Version number").withRequiredArg().ofType(String.class).required();
+        mcpOption = argumentBuilder.apply("mcpVersion", "MCP Version number").withRequiredArg().ofType(String.class).required();
+        mappingsOption = argumentBuilder.apply("mcpMappings", "MCP Mappings Channel and Version").withRequiredArg().ofType(String.class);
+        modsOption = argumentBuilder.apply("mods", "List of mods to add").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
+        modListsOption = argumentBuilder.apply("modLists", "JSON modlists").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
+        mavenRootsOption = argumentBuilder.apply("mavenRoots", "Maven root directories").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
     }
 
     @Override
-    public void argumentValues(OptionResult option) {
+    public void argumentValues(OptionResult option)
+    {
+        modsArgumentList = option.values(modsOption);
+        modListsArgumentList = option.values(modListsOption);
+        mavenRootsArgumentList = option.values(mavenRootsOption);
+        targetForgeVersion = option.value(forgeOption);
+        targetForgeGroup = option.value(forgeGroupOption);
+        targetMcVersion = option.value(mcOption);
+        targetMcpVersion = option.value(mcpOption);
+        targetMcpMappings = option.value(mappingsOption);
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public @NotNull List<ITransformer> transformers() {
+    public @NotNull List<ITransformer> transformers()
+    {
         LOGGER.debug(CORE, "Loading coremod transformers");
         return new ArrayList<>(FMLLoader.getCoreModProvider().getCoreModTransformers());
     }
+
 }

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading;
+
+import java.io.File;
+import java.nio.file.Path;
+
+public class FileUtils
+{
+
+    public static String fileExtension(final Path path) {
+        String fileName = path.getFileName().toString();
+        int idx = fileName.lastIndexOf('.');
+        if (idx > -1) {
+            return fileName.substring(idx+1);
+        } else {
+            return "";
+        }
+    }
+
+    public static boolean matchFileName(String path, String... matches) {
+        // Extract file name from path
+        String name = path.substring(Math.min(path.lastIndexOf(File.separatorChar) + 1, path.length()));
+        // Check if it contains any of the desired keywords
+        for (String match : matches) {
+            if (name.contains(match)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -23,7 +23,7 @@ public class ImmediateWindowHandler {
 
     private static ProgressMeter earlyProgress;
     public static void load(final String launchTarget, final String[] arguments) {
-        if (!launchTarget.contains("client")) {
+        if (!List.of("forgeclient", "forgeclientuserdev", "forgeclientdev").contains(launchTarget)) {
             provider = new DummyProvider();
             LOGGER.info("ImmediateWindowProvider not loading because launch target is {}", launchTarget);
         } else if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_CONTROL)) {
@@ -32,16 +32,15 @@ public class ImmediateWindowHandler {
         } else {
             final var providername = FMLConfig.getConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER);
             LOGGER.info("Loading ImmediateWindowProvider {}", providername);
-            for (var service : ServiceLoader.load(ImmediateWindowProvider.class)) {
-                if (providername.equals(service.name())) {
-                    provider = service;
-                    break;
-                }
-            }
-            if (provider == null) {
+            final var maybeProvider = ServiceLoader.load(ImmediateWindowProvider.class)
+                    .stream()
+                    .map(ServiceLoader.Provider::get)
+                    .filter(p -> Objects.equals(p.name(), providername))
+                    .findFirst();
+            provider = maybeProvider.or(() -> {
                 LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
-                provider = new DummyProvider();
-            }
+                return Optional.of(new DummyProvider());
+            }).orElseThrow();
         }
         // Only update config if the provider isn't the dummy provider
         if (!Objects.equals(provider.name(), "dummyprovider"))

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

@@ -11,72 +11,31 @@ import java.util.Optional;
  * Finds Version data from a package, with possible default values
  */
 public class JarVersionLookupHandler {
-    public record Version(Optional<String> title, Optional<String> vendor, Optional<String> version) {
-        @Override
-        public String toString() {
-            return "[" +
-                "title=" + title.orElse(null) +
-                ", vendor=" + vendor.orElse(null) +
-                ", version=" + version.orElse(null) +
-            "]";
-        }
-    }
-    public record Info(Version spec, Version impl) {}
-
-    @SuppressWarnings("deprecation")
-    public static Info getInfo(String pkgName) {
-        return getInfo(Package.getPackage(pkgName));
-    }
-
-    public static Info getInfo(Class<?> clazz) {
-        return getInfo(clazz.getPackage());
-    }
-
-    public static Info getInfo(Package pkg) {
-        return new Info(
-            new Version(
-                Optional.ofNullable(pkg.getSpecificationTitle()),
-                Optional.ofNullable(pkg.getSpecificationVendor()),
-                Optional.ofNullable(pkg.getSpecificationVersion())
-            ),
-            new Version(
-                Optional.ofNullable(pkg.getImplementationTitle()),
-                Optional.ofNullable(pkg.getImplementationVendor()),
-                Optional.ofNullable(pkg.getImplementationVersion())
-            )
-        );
-    }
-
-
-    @Deprecated(forRemoval = true, since = "1.20.2")
     public static Optional<String> getImplementationVersion(final String pkgName) {
         // Note that with Java 9, you'll probably want the module's version data, hence pulling this out
         final String pkgVersion = Package.getPackage(pkgName).getImplementationVersion();
         return Optional.ofNullable(pkgVersion);
     }
 
-    @Deprecated(forRemoval = true, since = "1.20.2")
     public static Optional<String> getSpecificationVersion(final String pkgName) {
         // Note that with Java 9, you'll probably want the module's version data, hence pulling this out
         final String pkgVersion = Package.getPackage(pkgName).getSpecificationVersion();
         return Optional.ofNullable(pkgVersion);
     }
 
-    @Deprecated(forRemoval = true, since = "1.20.2")
     public static Optional<String> getImplementationVersion(final Class<?> clazz) {
         // With java 9 we'll use the module's version if it exists in preference.
         final String pkgVersion = clazz.getPackage().getImplementationVersion();
         return Optional.ofNullable(pkgVersion);
     }
 
-    @Deprecated(forRemoval = true, since = "1.20.2")
     public static Optional<String> getImplementationTitle(final Class<?> clazz) {
         // With java 9 we'll use the module's version if it exists in preference.
         final String pkgVersion = clazz.getPackage().getImplementationTitle();
         return Optional.ofNullable(pkgVersion);
     }
 
-    @Deprecated(forRemoval = true, since = "1.20.2")
+
     public static Optional<String> getSpecificationVersion(final Class<?> clazz) {
         // With java 9 we'll use the module's version if it exists in preference.
         final String pkgVersion = clazz.getPackage().getSpecificationVersion();

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

@@ -7,19 +7,27 @@ package net.minecraftforge.fml.loading;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.Launcher;
-import cpw.mods.modlauncher.api.IModuleLayerManager.Layer;
+import cpw.mods.modlauncher.api.IModuleLayerManager;
+import cpw.mods.modlauncher.util.ServiceLoaderUtils;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
+import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.slf4j.Logger;
 
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceConfigurationError;
+import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -28,97 +36,115 @@ import java.util.stream.Stream;
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
-public class LanguageLoadingProvider {
-    public void forEach(Consumer<IModLanguageProvider> consumer) {
-        providers.forEach(consumer);
-    }
-
-    public <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
-        return providers.stream().map(function);
-    }
-
-    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 SHIT                                     *
-     *==========================================================================*/
+public class LanguageLoadingProvider
+{
     private static final Logger LOGGER = LogUtils.getLogger();
+    private final List<IModLanguageProvider> languageProviders = new ArrayList<>();
     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 final Map<String, ModLanguageWrapper> languageProviderMap = new HashMap<>();
+    private List<Path> languagePaths = new ArrayList<>();
 
-    private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
+    public void forEach(final Consumer<IModLanguageProvider> consumer)
+    {
+        languageProviders.forEach(consumer);
+    }
+
+    public <T> Stream<T> applyForEach(final Function<IModLanguageProvider, T> function) {
+        return languageProviders.stream().map(function);
+    }
+
+    private static class ModLanguageWrapper {
+        private final IModLanguageProvider modLanguageProvider;
+
+        private final ArtifactVersion version;
+        public ModLanguageWrapper(IModLanguageProvider modLanguageProvider, ArtifactVersion version)
+        {
+            this.modLanguageProvider = modLanguageProvider;
+            this.version = version;
+        }
+        public ArtifactVersion getVersion()
+        {
+            return version;
+        }
+
+        public IModLanguageProvider getModLanguageProvider()
+        {
+            return modLanguageProvider;
+        }
+
+
+    }
 
     LanguageLoadingProvider() {
-        var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
+        var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm->lm.getLayer(IModuleLayerManager.Layer.PLUGIN)).orElseThrow();
         serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
         loadLanguageProviders();
     }
-
     private void loadLanguageProviders() {
-        providers.clear();
-        providersByName.clear();
-
-        serviceLoader.reload();
-        for (var itr = serviceLoader.iterator(); itr.hasNext(); ) {
-            try {
-                var srvc = itr.next();
-                providers.add(srvc);
-            } catch (ServiceConfigurationError sce) {
-                LOGGER.error(CORE, "Failed to load IModLauguageProvider Service: " + sce.getMessage());
-            }
-        }
-
-        LOGGER.debug(CORE, "Found {} language providers", providers.size());
-
+        LOGGER.debug(CORE, "Found {} language providers", ServiceLoaderUtils.streamServiceLoader(()->serviceLoader, sce->LOGGER.error("Problem with language loaders")).count());
+        serviceLoader.forEach(languageProviders::add);
         ImmediateWindowHandler.updateProgress("Loading language providers");
-        for (var provider : providers) {
-            var info = JarVersionLookupHandler.getInfo(provider.getClass());
-
-            if (info.impl().version().isEmpty() && FMLEnvironment.production) {
-                LOGGER.error(CORE, "Found unversioned language provider {}: {}", provider.name(), provider.getClass().getName());
-                throw new RuntimeException("Failed to find implementation version for language provider " + provider.name() + " of type " + provider.getClass().getName());
+        languageProviders.forEach(lp -> {
+            final Path lpPath;
+            try {
+                lpPath = Paths.get(lp.getClass().getProtectionDomain().getCodeSource().getLocation().toURI());
+            } catch (URISyntaxException e) {
+                throw new RuntimeException("Huh?", e);
             }
+            Optional<String> implementationVersion = JarVersionLookupHandler.getImplementationVersion(lp.getClass());
+            String impl = implementationVersion.orElse(Files.isDirectory(lpPath) ? FMLLoader.versionInfo().forgeVersion().split("\\.")[0] : null);
+            if (impl == null) {
+                LOGGER.error(CORE, "Found unversioned language provider {}", lp.name());
+                throw new RuntimeException("Failed to find implementation version for language provider "+ lp.name());
+            }
+            LOGGER.debug(CORE, "Found language provider {}, version {}", lp.name(), impl);
+            ImmediateWindowHandler.updateProgress("Loaded language provider "+lp.name()+ " " + impl);
+            languageProviderMap.put(lp.name(), new ModLanguageWrapper(lp, new DefaultArtifactVersion(impl)));
+        });
+    }
 
-            var version = info.impl().version().map(DefaultArtifactVersion::new).orElse(IN_DEV);
-
-            LOGGER.debug(CORE, "Found language provider {}, version {}", provider.name(), version);
-            ImmediateWindowHandler.updateProgress("Loaded language provider " + provider.name() + " " + version);
-            providersByName.put(provider.name(), new Wrapper(version, provider));
+    void addForgeLanguage(final Path forgePath) {
+        if (!languageProviderMap.containsKey("javafml")) {
+            LOGGER.debug(CORE,"Adding forge as a language from {}", forgePath.toString());
+            addLanguagePaths(Stream.of(forgePath));
+            serviceLoader.reload();
+            loadLanguageProviders();
+        } else {
+            LOGGER.debug(CORE, "Skipping adding forge jar - javafml is already present");
         }
     }
 
-    public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
-        var consumer = mod.getFileName();
-        var wrapper = providersByName.get(language);
+    private void addLanguagePaths(final Stream<Path> langPaths) {
+        languageProviders.clear();
+        languageProviderMap.clear();
+//        langPaths.peek(languagePaths::add).map(Path::toFile).map(File::toURI).map(rethrowFunction(URI::toURL)).forEach(languageClassLoader::addURL);
+    }
 
-        if (wrapper == null) {
-            LOGGER.error(LOADING, "Missing language {} version {} wanted by {}", language, versionRange, consumer);
-            var data = new EarlyLoadingException.ExceptionData("fml.language.missingversion", language, versionRange, consumer, "null");
-            throw new EarlyLoadingException("Missing language " + language, null, List.of(data));
+    public void addAdditionalLanguages(List<ModFile> modFiles)
+    {
+        if (modFiles==null) return;
+        Stream<Path> langPaths = modFiles.stream().map(ModFile::getFilePath);
+        addLanguagePaths(langPaths);
+        serviceLoader.reload();
+        loadLanguageProviders();
+    }
+
+    Stream<Path> getLibraries() {
+        return languagePaths.stream();
+    }
+
+    public IModLanguageProvider findLanguage(ModFile mf, String modLoader, VersionRange modLoaderVersion) {
+        final String languageFileName = mf.getProvider() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName();
+        final ModLanguageWrapper mlw = languageProviderMap.get(modLoader);
+        if (mlw == null) {
+            LOGGER.error(LOADING,"Missing language {} version {} wanted by {}", modLoader, modLoaderVersion, languageFileName);
+            throw new EarlyLoadingException("Missing language "+modLoader, null, Collections.singletonList(new EarlyLoadingException.ExceptionData("fml.language.missingversion", modLoader, modLoaderVersion, languageFileName, "null")));
+        }
+        if (!VersionSupportMatrix.testVersionSupportMatrix(modLoaderVersion, modLoader, "languageloader", (llid, range) -> range.containsVersion(mlw.getVersion()))) {
+            LOGGER.error(LOADING,"Missing language {} version {} wanted by {}, found {}", modLoader, modLoaderVersion, languageFileName, mlw.getVersion());
+            throw new EarlyLoadingException("Missing language "+ modLoader + " matching range "+modLoaderVersion + " found "+mlw.getVersion(), null, Collections.singletonList(new EarlyLoadingException.ExceptionData("fml.language.missingversion", modLoader, modLoaderVersion, languageFileName, mlw.getVersion())));
         }
 
-        var version = wrapper.version();
-        if (version == IN_DEV) {
-            LOGGER.debug(LOADING, "Language Provider {} version is unknown, but {} was requested by {}. Proceeding as this is development environement", language, versionRange, consumer);
-            return wrapper.service();
-        }
-
-        if (!versionRange.containsVersion(version)) {
-            LOGGER.error(LOADING, "Missing language {} version {} wanted by {}, found {}", language, versionRange, consumer, version);
-            var data = new EarlyLoadingException.ExceptionData("fml.language.missingversion", language, versionRange, consumer, version);
-            throw new EarlyLoadingException("Missing language " + language + " matching range " + versionRange + " found " + version, null, List.of(data));
-        }
-
-        return wrapper.service();
+        return mlw.getModLanguageProvider();
     }
 }

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

@@ -8,19 +8,21 @@ package net.minecraftforge.fml.loading;
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;
 
+import static net.minecraftforge.fml.loading.LogMarkers.CORE;
+
 public class LauncherVersion {
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final String launcherVersion;
 
     static {
-        var info = JarVersionLookupHandler.getInfo(LauncherVersion.class);
-        if (info.impl().version().isEmpty())
-            throw new IllegalStateException("Failed to find version for package " + LauncherVersion.class.getPackageName() + " This is an invalid environment");
-        launcherVersion = info.impl().version().get();
-        LOGGER.debug(LogMarkers.CORE, "Found FMLLauncher version {}", launcherVersion);
+        String vers = JarVersionLookupHandler.getImplementationVersion(LauncherVersion.class).orElse(System.getenv("LAUNCHER_VERSION"));
+        if (vers == null) throw new RuntimeException("Missing FMLLauncher version, cannot continue");
+        launcherVersion = vers;
+        LOGGER.debug(CORE, "Found FMLLauncher version {}", launcherVersion);
     }
 
-    public static String getVersion() {
+    public static String getVersion()
+    {
         return launcherVersion;
     }
 }

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

@@ -5,20 +5,45 @@
 
 package net.minecraftforge.fml.loading;
 
+import com.mojang.logging.LogUtils;
+import org.slf4j.Logger;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 public class LibraryFinder {
+    private static final Logger LOGGER = LogUtils.getLogger();
     private static Path libsPath;
     static Path findLibsPath() {
         if (libsPath == null) {
-            libsPath = Path.of(System.getProperty("libraryDirectory", "libraries"));
-            if (!Files.isDirectory(libsPath))
-                throw new IllegalStateException("Library directory: `" + libsPath + "` does not exist. Set it via the `libraryDirectory` system property.");
+            libsPath = Path.of(System.getProperty("libraryDirectory","crazysnowmannonsense/cheezwhizz"));
+            if (!Files.isDirectory(libsPath)) {
+                throw new IllegalStateException("Missing libraryDirectory system property, cannot continue");
+            }
         }
         return libsPath;
     }
 
+    static Path getForgeLibraryPath(final String mcVersion, final String forgeVersion, final String forgeGroup) {
+        Path forgePath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", "universal", mcVersion+"-"+forgeVersion));
+        LOGGER.debug(LogMarkers.CORE, "Found forge path {} is {}", forgePath, pathStatus(forgePath));
+        return forgePath;
+    }
+
+    static String pathStatus(final Path path) {
+        return Files.exists(path) ? "present" : "missing";
+    }
+
+    static Path[] getMCPaths(final String mcVersion, final String mcpVersion, final String forgeVersion, final String forgeGroup, final String type) {
+        Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion));
+        Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "extra", mcVersion+"-"+mcpVersion));
+        Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion));
+        LOGGER.debug(LogMarkers.CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath));
+        LOGGER.debug(LogMarkers.CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath));
+        LOGGER.debug(LogMarkers.CORE,"Forge patches at {} is {}", patchedBinariesPath.toString(), pathStatus(patchedBinariesPath));
+        return new Path[] { patchedBinariesPath, mcExtrasPath, srgMcPath };
+    }
+
     public static Path findPathForMaven(final String group, final String artifact, final String extension, final String classifier, final String version) {
         return findLibsPath().resolve(MavenCoordinateResolver.get(group, artifact, extension, classifier, version));
     }

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

@@ -7,6 +7,7 @@ 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.serviceapi.ITransformerDiscoveryService;
@@ -18,6 +19,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ServiceLoader;
+import java.util.zip.ZipFile;
 import java.util.Set;
 
 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {

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

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading;
+
+import com.mojang.logging.LogUtils;
+import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.jar.Manifest;
+
+import static net.minecraftforge.fml.loading.LogMarkers.CORE;
+
+public class ModJarURLHandler extends URLStreamHandler
+{
+    private static final Logger LOGGER = LogUtils.getLogger();
+    // modjar://modid/path/to/file
+    @Override
+    protected URLConnection openConnection(URL url) {
+        return new ModJarURLConnection(url);
+    }
+
+    @Override
+    protected int hashCode(final URL u) {
+        return Objects.hash(u.getHost(), u.getFile());
+    }
+
+    @Override
+    protected boolean equals(final URL u1, final URL u2) {
+        return Objects.equals(u1.getProtocol(), u2.getProtocol())
+                && Objects.equals(u1.getHost(), u2.getHost())
+                && Objects.equals(u1.getFile(), u2.getFile());
+    }
+
+    static class ModJarURLConnection extends URLConnection {
+        private Path resource;
+        private String modpath;
+        private String modid;
+        private Optional<Manifest> manifest;
+
+        public ModJarURLConnection(final URL url) {
+            super(url);
+        }
+
+        @Override
+        public void connect()
+        {
+//            if (resource == null) {
+//                modid = url.getHost();
+//                // trim first char
+//                modpath = url.getPath().substring(1);
+//                resource = FMLLoader.getLoadingModList().getModFileById(modid).getFile().findResource(modpath);
+//                manifest = FMLLoader.getLoadingModList().getModFileById(modid).getManifest();
+//            }
+        }
+
+        @Override
+        public InputStream getInputStream() throws IOException
+        {
+            connect();
+            LOGGER.trace(CORE, "Loading modjar URL {} got resource {} {}", url, resource, resource != null ? Files.exists(resource) : "missing");
+            return Files.newInputStream(resource);
+        }
+
+        @Override
+        public long getContentLengthLong() {
+            try {
+                connect();
+                return Files.size(resource);
+            } catch (IOException e) {
+                return -1L;
+            }
+        }
+
+        // Used to cache protectiondomains by "top level object" aka the modid
+        @Override
+        public URL getURL() {
+            return LamdbaExceptionUtils.uncheck(()->new URL("modjar://"+modid));
+        }
+
+        public Optional<Manifest> getManifest() {
+            return manifest;
+        }
+    }
+}

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

@@ -8,6 +8,9 @@ package net.minecraftforge.fml.loading;
 import com.google.common.graph.GraphBuilder;
 import com.google.common.graph.MutableGraph;
 import com.mojang.logging.LogUtils;
+import cpw.mods.jarhandling.SecureJar;
+import net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator;
+import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
@@ -19,14 +22,10 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.slf4j.Logger;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
+import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -73,6 +72,7 @@ public class ModSorter
         }
     }
 
+    @SuppressWarnings("UnstableApiUsage")
     private void sort()
     {
         // lambdas are identity based, so sorting them is impossible unless you hold reference to them
@@ -121,6 +121,7 @@ public class ModSorter
                 .collect(toList());
     }
 
+    @SuppressWarnings("UnstableApiUsage")
     private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
     {
         final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
@@ -132,7 +133,6 @@ public class ModSorter
         switch (dep.getOrdering()) {
             case BEFORE -> topoGraph.putEdge(self, target);
             case AFTER -> topoGraph.putEdge(target, self);
-            default -> {}
         }
     }
 
@@ -152,13 +152,27 @@ public class ModSorter
                   ));
     }
 
-    private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
+    private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId)
+    {
         // Capture system mods (ex. MC, Forge) here, so we can keep them for later
-        var systemMods = List.of("minecraft", "forge");
+        final Set<String> systemMods = new HashSet<>();
+        // The minecraft mod is always a system mod
+        systemMods.add("minecraft");
+        // Find mod file from MinecraftLocator to define the system mods
+        modFiles.stream()
+                .filter(modFile -> modFile.getProvider().getClass() == MinecraftLocator.class)
+                .map(ModFile::getSecureJar)
+                .map(SecureJar::moduleDataProvider)
+                .map(SecureJar.ModuleDataProvider::getManifest)
+                .map(Manifest::getMainAttributes)
+                .map(mf -> mf.getValue("FML-System-Mods"))
+                .filter(Objects::nonNull)
+                .findFirst()
+                .ifPresent(value -> systemMods.addAll(Arrays.asList(value.split(","))));
         LOGGER.debug("Configured system mods: {}", systemMods);
 
         this.systemMods = new ArrayList<>();
-        for (var systemMod : systemMods) {
+        for (String systemMod : systemMods) {
             var container = modFilesByFirstId.get(systemMod);
             if (container != null && !container.isEmpty()) {
                 LOGGER.debug("Found system mod: {}", systemMod);

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

@@ -5,37 +5,42 @@
 
 package net.minecraftforge.fml.loading;
 
+import com.google.common.collect.ImmutableMap;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
-
-import java.util.Map;
-
 import org.apache.commons.lang3.text.StrLookup;
 import org.apache.commons.lang3.text.StrSubstitutor;
 
+import java.util.Map;
+
 @SuppressWarnings("deprecation")
-public class StringSubstitutor {
+public class StringSubstitutor
+{
+    private static final Map<String,String> globals = ImmutableMap.of(
+            "mcVersion", FMLLoader.versionInfo().mcVersion(),
+            "forgeVersion", FMLLoader.versionInfo().forgeVersion()
+    );
+
     public static String replace(final String in, final ModFile file) {
         return new StrSubstitutor(getStringLookup(file)).replace(in);
     }
 
     private static StrLookup<String> getStringLookup(final ModFile file) {
-        var globals = Map.of(
-            "mcVersion", FMLLoader.versionInfo().mcVersion(),
-            "forgeVersion", FMLLoader.versionInfo().forgeVersion()
-        );
-        return new StrLookup<String>() {
+        return new StrLookup<String>()
+        {
             @Override
-            public String lookup(String key) {
-                var parts = key.split("\\.");
-                if (parts.length == 1)
-                    return key;
-                var pfx = parts[0];
-
+            public String lookup(String key)
+            {
+                final String[] parts = key.split("\\.");
+                if (parts.length == 1) return key;
+                final String pfx = parts[0];
                 if ("global".equals(pfx))
+                {
                     return globals.get(parts[1]);
+                }
                 else if ("file".equals(pfx) && file != null)
+                {
                     return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));
-
+                }
                 return key;
             }
         };

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

@@ -5,45 +5,18 @@
 
 package net.minecraftforge.fml.loading;
 
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.util.Map;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
-
-/** TODO: [FML][Loader] Remove VersionInfo - we shouldn't need to base any decisions on forge or mc version info at the loader level. So once I get a proper replacement i'm gunna kill this. */
 public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersion, String forgeGroup) {
+    VersionInfo(Map<String, ?> arguments) {
+        this((String) arguments.get("forgeVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("mcpVersion"), (String) arguments.get("forgeGroup"));
+    }
+
     public String mcAndForgeVersion() {
-        return mcVersion + "-" + forgeVersion;
+        return mcVersion+"-"+forgeVersion;
     }
 
     public String mcAndMCPVersion() {
         return mcVersion + "-" + mcpVersion;
     }
-
-    /*==========================================================================*
-     *                        INTERNAL SHIT                                     *
-     *==========================================================================*/
-    private static Gson GSON = new GsonBuilder().create();
-    private static <T> T readJson(String path, Class<T> type) {
-        try (var is = VersionInfo.class.getResourceAsStream(path)) {
-            if (is == null)
-                return null;
-
-            try (var reader = new InputStreamReader(is)) {
-                return GSON.fromJson(reader, type);
-            }
-        } catch (IOException | JsonSyntaxException e) {
-            throw new IllegalStateException("Failed to parse version info from " + path , e);
-        }
-    }
-
-    static VersionInfo detect() {
-        var forge = readJson("/forge_version.json", JSON.class);
-        if (forge == null)
-            throw new IllegalStateException("Failed to find /forge_version.json This is a critical issue");
-        return new VersionInfo(forge.forge(), forge.mc(), forge.mcp(), "net.minecraftforge");
-    }
-    private record JSON(String forge, String mcp, String mc) {}
 }

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

@@ -18,7 +18,7 @@ import java.util.function.BiPredicate;
 public class VersionSupportMatrix {
     private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
     static {
-         final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
+        final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
          if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
              // 1.19.2 is Compatible with 1.19.1
              add("languageloader.javafml", "42");
@@ -31,7 +31,7 @@ public class VersionSupportMatrix {
     }
     public static <T> boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
         if (standardLookup.test(lookupId, declaredRange)) return true;
-        List<ArtifactVersion> custom = overrideVersions.get(type + "." + lookupId);
+        List<ArtifactVersion> custom = overrideVersions.get(type +"." +lookupId);
         return custom == null ? false  : custom.stream().anyMatch(declaredRange::containsVersion);
     }
 }

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import com.mojang.logging.LogUtils;
+import net.minecraftforge.forgespi.locating.IDependencyLocator;
+import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.forgespi.locating.ModFileLoadingException;
+import org.slf4j.Logger;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+public abstract class AbstractJarFileDependencyLocator extends AbstractJarFileModProvider implements IDependencyLocator
+{
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    protected Optional<InputStream> loadResourceFromModFile(final IModFile modFile, final Path path) {
+        try {
+            return Optional.of(Files.newInputStream(modFile.findResource(path.toString())));
+        }
+        catch (final FileNotFoundException e) {
+            LOGGER.debug("Failed to load resource {} from {}, it does not contain dependency information.", path, modFile.getFileName());
+            return Optional.empty();
+        }
+        catch (final Exception e) {
+            LOGGER.error("Failed to load resource {} from mod {}, cause {}", path, modFile.getFileName(), e);
+            return Optional.empty();
+        }
+    }
+
+    protected Optional<IModFile> loadModFileFrom(final IModFile file, final Path path) {
+        try {
+            final Path pathInModFile = file.findResource(path.toString());
+            return Optional.of(createMod(pathInModFile).file());
+        }
+        catch (Exception e) {
+            LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
+            throw new ModFileLoadingException("Failed to load mod file "+file.getFileName());
+        }
+    }
+
+    protected String identifyMod(final IModFile modFile) {
+        return modFile.getFileName();
+    }
+}

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import net.minecraftforge.forgespi.locating.IModLocator;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+public abstract class AbstractJarFileModLocator extends AbstractJarFileModProvider implements IModLocator
+{
+    @Override
+    public List<IModLocator.ModFileOrException> scanMods()
+    {
+        return scanCandidates().map(this::createMod).toList();
+    }
+
+    public abstract Stream<Path> scanCandidates();
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import com.mojang.logging.LogUtils;
+import cpw.mods.jarhandling.SecureJar;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.forgespi.locating.IModFile;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+public abstract class AbstractJarFileModProvider extends AbstractModProvider
+{
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    @Override
+    public void scanFile(final IModFile file, final Consumer<Path> pathConsumer) {
+        LOGGER.debug(LogMarkers.SCAN,"Scan started: {}", file);
+        final Function<Path, SecureJar.Status> status = p->file.getSecureJar().verifyPath(p);
+        try (Stream<Path> files = Files.find(file.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
+            file.setSecurityStatus(files.peek(pathConsumer).map(status).reduce((s1, s2)-> SecureJar.Status.values()[Math.min(s1.ordinal(), s2.ordinal())]).orElse(SecureJar.Status.INVALID));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        LOGGER.debug(LogMarkers.SCAN,"Scan finished: {}", file);
+    }
+}

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

@@ -16,53 +16,54 @@ import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
 import net.minecraftforge.forgespi.locating.IModProvider;
 import net.minecraftforge.forgespi.locating.ModFileLoadingException;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.jar.JarFile;
+import java.util.function.Function;
+import java.util.jar.Manifest;
 
-@ApiStatus.Internal
-public abstract class AbstractModProvider implements IModProvider {
+public abstract class AbstractModProvider implements IModProvider
+{
     private static final   Logger LOGGER    = LogUtils.getLogger();
     protected static final String MODS_TOML = "META-INF/mods.toml";
+    protected static final String MANIFEST = "META-INF/MANIFEST.MF";
 
-    protected IModLocator.ModFileOrException createMod(Path path) {
+    protected IModLocator.ModFileOrException createMod(Path... path) {
         var mjm = new ModJarMetadata();
         var sj = SecureJar.from(
-            jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-            path
+                Manifest::new,
+                jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
+                (root, p) -> true,
+                path
         );
 
         IModFile mod;
         var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
-        if (type == null)
+        if (type == null) {
             type = getDefaultJarModType();
-
+        }
         if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
             LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
             mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
         } else if (type != null) {
-            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
+            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MANIFEST, type, path);
             mod = new ModFile(sj, this, this::manifestParser, type);
-        } else
-            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
+        } else {
+            return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found "+ Arrays.toString(path)));
+        }
 
         mjm.setModFile(mod);
         return new IModLocator.ModFileOrException(mod, null);
     }
 
     protected IModFileInfo manifestParser(final IModFile mod) {
-        var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
-        var license = mf.getValue("LICENSE");
+        Function<String, Optional<String>> cfg = name -> Optional.ofNullable(mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes().getValue(name));
+        var license = cfg.apply("LICENSE").orElse("");
         var dummy = new IConfigurable() {
             @Override
             public <T> Optional<T> getConfigElement(String... key) {
@@ -74,7 +75,7 @@ public abstract class AbstractModProvider implements IModProvider {
             }
         };
 
-        return new DefaultModFileInfo(mod, license == null ? "" : license, dummy);
+        return new DefaultModFileInfo(mod, license, dummy);
     }
 
     @Override
@@ -82,64 +83,41 @@ public abstract class AbstractModProvider implements IModProvider {
         return true;
     }
 
-    @Override
-    public void initArguments(final Map<String, ?> arguments) {
-    }
-
     protected String getDefaultJarModType() {
         return null;
     }
 
-    @Override
-    public void scanFile(IModFile file, Consumer<Path> pathConsumer) {
-        LOGGER.debug(LogMarkers.SCAN, "Scan started: {}", file);
-        var jar = file.getSecureJar();
-        var root = jar.getRootPath();
-        Consumer<Path> consumer = pathConsumer;
-
-        //TODO: [SecureJar] Actually redesign this to have a proper validation.
-        var holder = new Holder<SecureJar.Status>();
-        holder.value = SecureJar.Status.NONE;
-        if (jar.hasSecurityData()) {
-            consumer = path -> {
-                pathConsumer.accept(path);
-                var status = jar.verifyPath(path);
-                if (status.ordinal() < holder.value.ordinal())
-                    holder.value = status;
-            };
-        }
-
-        try {
-            Files.walk(root)
-                .filter(p -> p.toString().endsWith(".class"))
-                .forEach(consumer);
-
-            file.setSecurityStatus(holder.value);
-        } catch(IOException e) {
-            e.printStackTrace();
-        }
-
-        LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", file);
-    }
-
-    private static class Holder<T> {
-        T value;
-    }
-
     private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
-        @Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
-        @Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
+        @Override
+        public <T> Optional<T> getConfigElement(final String... strings)
+        {
+            return Optional.empty();
+        }
+
+        @Override
+        public List<? extends IConfigurable> getConfigList(final String... strings)
+        {
+            return null;
+        }
+
         @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
         @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
         @Override public boolean showAsResourcePack() { return false; }
         @Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); }
-        @Override public String getLicense() { return license; }
+        @Override
+        public String getLicense() { return license; }
+
         @Override public IModFile getFile() { return mod; }
         @Override public IConfigurable getConfig() { return configurable; }
+
         // These Should never be called as it's only called from ModJarMetadata.version and we bypass that
         @Override public String moduleName() { return mod.getSecureJar().name(); }
         @Override public String versionString() { return null; }
         @Override public List<String> usesServices() { return null; }
-        @Override public String toString() { return "IModFileInfo(" + mod.getFilePath() + ")"; }
+
+        @Override
+        public String toString() {
+            return "IModFileInfo(" + mod.getFilePath() + ")";
+        }
     }
 }

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

@@ -9,11 +9,13 @@ import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.slf4j.Logger;
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.*;
 
@@ -30,6 +32,9 @@ public class BackgroundScanHandler
 
     private static final Logger LOGGER = LogUtils.getLogger();
     private final ExecutorService modContentScanner;
+    private final List<ModFile> pendingFiles;
+    private final List<ModFile> scannedFiles;
+    private final List<ModFile> allFiles;
     private final List<ModFile> modFiles;
     private ScanStatus status;
     private LoadingModList loadingModList;
@@ -41,6 +46,9 @@ public class BackgroundScanHandler
             thread.setDaemon(true);
             return thread;
         });
+        scannedFiles = new ArrayList<>();
+        pendingFiles = new ArrayList<>();
+        allFiles = new ArrayList<>();
         status = ScanStatus.NOT_STARTED;
     }
 
@@ -55,6 +63,8 @@ public class BackgroundScanHandler
         }
         status = ScanStatus.RUNNING;
         ImmediateWindowHandler.updateProgress("Scanning mod candidates");
+        allFiles.add(file);
+        pendingFiles.add(file);
         final CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
                 .whenComplete(file::setScanResult)
                 .whenComplete((r,t)-> this.addCompletedFile(file,r,t));
@@ -66,6 +76,8 @@ public class BackgroundScanHandler
             status = ScanStatus.ERRORED;
             LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable);
         }
+        pendingFiles.remove(file);
+        scannedFiles.add(file);
     }
 
     public void setLoadingModList(LoadingModList loadingModList)

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

@@ -5,109 +5,90 @@
 
 package net.minecraftforge.fml.loading.moddiscovery;
 
+import net.minecraftforge.fml.loading.ClasspathLocatorUtils;
 import com.mojang.logging.LogUtils;
-
 import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.forgespi.locating.IModLocator;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
+import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
+import java.util.Map;
+import java.util.stream.Stream;
 
-@ApiStatus.Internal
-public class ClasspathLocator extends AbstractModProvider implements IModLocator {
+public class ClasspathLocator extends AbstractJarFileModLocator
+{
     private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");
+    private final List<Path> legacyClasspath = Arrays.stream(System.getProperty("legacyClassPath", "").split(File.pathSeparator)).map(Path::of).toList();
+    private boolean enabled = false;
 
     @Override
     public String name() {
-        return "classpath";
+        return "userdev classpath";
     }
 
     @Override
-    public List<ModFileOrException> scanMods() {
-        //var cl = ClassLoader.getSystemClassLoader();
-        var cl = getClass().getClassLoader();
+    public Stream<Path> scanCandidates() {
+        if (!enabled)
+            return Stream.of();
 
-        // 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/obfuscate/DontObfuscate.class");
+        try {
+            var claimed = new ArrayList<>(legacyClasspath);
+            var paths = Stream.<Path>builder();
 
-        var claimed = new HashSet<Path>();
-        var tomls = getUrls(cl, MODS_TOML);
-        for (var url : tomls) {
-            var path = getPath(url, MODS_TOML);
-            if (!path.equals(minecraft))
-                claimed.add(path);
+            findPaths(claimed, MODS_TOML).forEach(paths::add);
+            findPaths(claimed, MANIFEST).forEach(paths::add);
+
+            return paths.build();
+        } catch (IOException e) {
+            LOGGER.error(LogMarkers.SCAN, "Error trying to find resources", e);
+            throw new RuntimeException(e);
         }
+    }
 
-        var manifests = getUrls(cl, JarFile.MANIFEST_NAME);
-        for (var url : manifests) {
-            var path = getPath(url, JarFile.MANIFEST_NAME);
-            if (claimed.contains(path))
+    private List<Path> findPaths(List<Path> claimed, String resource) throws IOException {
+        var ret = new ArrayList<Path>();
+        final Enumeration<URL> resources = ClassLoader.getSystemClassLoader().getResources(resource);
+        while (resources.hasMoreElements()) {
+            URL url = resources.nextElement();
+            Path path = ClasspathLocatorUtils.findJarPathFor(resource, resource, url);
+            if (claimed.stream().anyMatch(path::equals) || !Files.exists(path) || Files.isDirectory(path))
                 continue;
-
-            try (var is = url.openStream()) {
-                var mf = new Manifest(is);
-                var type = mf.getMainAttributes().getValue(MOD_TYPE);
-                if (type != null)
-                    claimed.add(path);
-            } catch (IOException e) {
-                LOGGER.warn(LogMarkers.SCAN, "Error reading manifest from: " + url, e);
-            }
+            ret.add(path);
         }
-
-        var ret = new ArrayList<ModFileOrException>();
-        for (var path : claimed)
-            ret.add(createMod(path));
         return ret;
     }
 
-    private List<URL> getUrls(ClassLoader cl, String resource) {
+    @Override
+    public void initArguments(Map<String, ?> arguments) {
+        var launchTarget = (String) arguments.get("launchTarget");
+        enabled = launchTarget != null && launchTarget.contains("dev");
+    }
+
+    private Path findJarPathFor(final String resourceName, final String jarName, final URL resource) {
         try {
-            var lst = Collections.list(cl.getResources(resource));
-            if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
-                Collections.sort(lst, (a, b) -> a.toString().compareTo(b.toString()));
-                LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
-                for (var url : lst)
-                    LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
+            Path path;
+            final URI uri = resource.toURI();
+            if (uri.getScheme().equals("jar") && uri.getRawSchemeSpecificPart().contains("!/")) {
+                int lastExcl = uri.getRawSchemeSpecificPart().lastIndexOf("!/");
+                path = Paths.get(new URI(uri.getRawSchemeSpecificPart().substring(0, lastExcl)));
+            } else {
+                path = Paths.get(new URI("file://"+uri.getRawSchemeSpecificPart().substring(0, uri.getRawSchemeSpecificPart().length()-resourceName.length())));
             }
-            return lst;
-        } catch (IOException e) {
-            LOGGER.warn(LogMarkers.SCAN, "Error finding resources for: " + resource, e);
-            return List.of();
+            //LOGGER.debug(CORE, "Found JAR {} at path {}", jarName, path.toString());
+            return path;
+        } catch (NullPointerException | URISyntaxException e) {
+            LOGGER.error(LogMarkers.SCAN, "Failed to find JAR for class {} - {}", resourceName, jarName);
+            throw new RuntimeException("Unable to locate "+resourceName+" - "+jarName, e);
         }
     }
-
-    private static Path getPath(URL url, String resource) {
-        var str = url.toString();
-        int len = resource.length();
-        if ("jar".equalsIgnoreCase(url.getProtocol())) {
-            str = url.getFile();
-            len += 2;
-        }
-        str = str.substring(0, str.length() - len);
-        var path = Paths.get(URI.create(str));
-        return path;
-    }
-
-    private static Path getPathFromResource(ClassLoader cl, String resource) {
-        var url = cl.getResource(resource);
-        if (url == null)
-            return null;
-        return getPath(url, resource);
-    }
 }

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

@@ -12,9 +12,6 @@ import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.jetbrains.annotations.ApiStatus;
-
-@ApiStatus.Internal
 public class CoreModFile implements ICoreModFile {
     private final Path internalPath;
     private final ModFile file;

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import com.mojang.logging.LogUtils;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.forgespi.locating.IModLocator;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+public class ExplodedDirectoryLocator implements IModLocator {
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    public record ExplodedMod(String modid, List<Path> paths) {}
+
+    private final List<ExplodedMod> explodedMods = new ArrayList<>();
+    private final Map<ExplodedMod, IModFile> mods = new HashMap<>();
+
+    @Override
+    public List<IModLocator.ModFileOrException> scanMods() {
+        explodedMods.forEach(explodedMod ->
+                ModJarMetadata.buildFile(this,
+                        jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(),
+                        (a,b) -> true,
+                        explodedMod.paths().toArray(Path[]::new))
+                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
+        return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();
+    }
+
+    @Override
+    public String name() {
+        return "exploded directory";
+    }
+
+    @Override
+    public void scanFile(final IModFile file, final Consumer<Path> pathConsumer) {
+        LOGGER.debug(LogMarkers.SCAN,"Scanning exploded directory {}", file.getFilePath().toString());
+        try (Stream<Path> files = Files.find(file.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
+            files.forEach(pathConsumer);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        LOGGER.debug(LogMarkers.SCAN,"Exploded directory scan complete {}", file.getFilePath().toString());
+    }
+
+    @Override
+    public String toString()
+    {
+        return "{ExplodedDir locator}";
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void initArguments(final Map<String, ?> arguments) {
+        final var explodedTargets = ((Map<String, List<ExplodedMod>>) arguments).get("explodedTargets");
+        if (explodedTargets != null && !explodedTargets.isEmpty()) {
+            explodedMods.addAll(explodedTargets);
+        }
+    }
+
+    @Override
+    public boolean isValid(final IModFile modFile) {
+        return true;
+    }
+}

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

@@ -11,11 +11,12 @@ import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import java.util.Locale;
 import java.util.Optional;
 
-public class InvalidModFileException extends ModFileLoadingException {
-    private static final long serialVersionUID = 1230464325917450374L;
+public class InvalidModFileException extends ModFileLoadingException
+{
     private final IModFileInfo modFileInfo;
 
-    public InvalidModFileException(String message, IModFileInfo modFileInfo) {
+    public InvalidModFileException(String message, IModFileInfo modFileInfo)
+    {
         super(String.format(Locale.ROOT, "%s (%s)", message, Optional.ofNullable(modFileInfo).map(mf->mf.getFile().getFileName()).orElse("MISSING FILE NAME")));
         this.modFileInfo = modFileInfo;
     }

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

@@ -10,21 +10,17 @@ import com.google.common.collect.Lists;
 import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
 import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.ModFileLoadingException;
 import net.minecraftforge.jarjar.selection.JarSelector;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
-import java.io.InputStream;
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
@@ -34,35 +30,26 @@ 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 COLOR_CODE = "\u00a7";
-    private static final String RESET  = COLOR_CODE + "r";
-    private static final String YELLOW = COLOR_CODE + "e";
-    private static final String RED    = COLOR_CODE + "4";
-    private static final String GREEN  = COLOR_CODE + "2";
-
+public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
+{
     private static final Logger LOGGER = LogUtils.getLogger();
 
     @Override
-    public String name() {
+    public String name()
+    {
         return "JarInJar";
     }
 
     @Override
-    public List<IModFile> scanMods(Iterable<IModFile> loadedMods) {
+    public List<IModFile> scanMods(final Iterable<IModFile> loadedMods)
+    {
         final List<IModFile> sources = Lists.newArrayList();
         loadedMods.forEach(sources::add);
 
-        var dependenciesToLoad = JarSelector.detectAndSelect(
-            sources,
-            this::loadResourceFromModFile,
-            this::loadModFileFrom,
-            this::identifyMod,
-            this::exception
-        );
+        final List<IModFile> dependenciesToLoad = JarSelector.detectAndSelect(sources, this::loadResourceFromModFile, this::loadModFileFrom, this::identifyMod, this::exception);
 
-        if (dependenciesToLoad.isEmpty()) {
+        if (dependenciesToLoad.isEmpty())
+        {
             LOGGER.info("No dependencies to load found. Skipping!");
             return Collections.emptyList();
         }
@@ -72,27 +59,43 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
     }
 
     @Override
-    protected String getDefaultJarModType() {
+    public void initArguments(final Map<String, ?> arguments)
+    {
+        // NO-OP, for now
+    }
+
+    @Override
+    protected String getDefaultJarModType()
+    {
         return IModFile.Type.GAMELIBRARY.name();
     }
 
-    protected Optional<IModFile> loadModFileFrom(IModFile file, Path path) {
-        try {
+    @SuppressWarnings("resource")
+    @Override
+    protected Optional<IModFile> loadModFileFrom(final IModFile file, final 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("/");
             return Optional.of(createMod(pathInFS).file());
-        } catch (Exception e) {
+        }
+        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) {
+    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(this::buildExceptionData)
@@ -102,7 +105,8 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
     }
 
     @NotNull
-    private EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
+    private EarlyLoadingException.ExceptionData buildExceptionData(final JarSelector.ResolutionFailureInformation<IModFile> entry)
+    {
         return new EarlyLoadingException.ExceptionData(
                 getErrorTranslationKey(entry),
                 entry.identifier().group() + ":" + entry.identifier().artifact(),
@@ -115,14 +119,16 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
     }
 
     @NotNull
-    private String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
+    private String getErrorTranslationKey(final JarSelector.ResolutionFailureInformation<IModFile> entry)
+    {
         return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
                        "fml.dependencyloading.conflictingdependencies" :
                        "fml.dependencyloading.mismatchedcontaineddependencies";
     }
 
     @NotNull
-    private Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
+    private Stream<ModWithVersionRange> getModWithVersionRangeStream(final JarSelector.SourceWithRequestedVersionRange<IModFile> file)
+    {
         return file.sources()
                    .stream()
                    .map(IModFile::getModFileInfo)
@@ -130,37 +136,23 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
                    .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 String formatError(ModWithVersionRange modWithVersionRange){
-        return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " +
-               RED + modWithVersionRange.versionRange().toString() + RESET + " - " +
-               GREEN + modWithVersionRange.artifactVersion().toString() + RESET;
+    private String formatError(final ModWithVersionRange modWithVersionRange)
+    {
+        return "\u00a7e" + modWithVersionRange.modInfo().getModId() + "\u00a7r - \u00a74" + modWithVersionRange.versionRange().toString() + "\u00a74 - \u00a72" + modWithVersionRange.artifactVersion().toString() + "\u00a72";
     }
 
-    protected String identifyMod(IModFile modFile) {
-        if (modFile.getModFileInfo() != null && !modFile.getModInfos().isEmpty())
-            return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining());
+    @Override
+    protected String identifyMod(final IModFile modFile)
+    {
+        if (modFile.getModFileInfo() == null || modFile.getModInfos().isEmpty())
+        {
+            return modFile.getFileName();
+        }
 
-        var module = modFile.getSecureJar().moduleDataProvider().name();
-        if (module != null && !module.isEmpty())
-            return module;
-
-        return modFile.getFileName();
+        return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining());
     }
 
-    private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion) {}
+    private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion)
+    {}
 }

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.loading.MavenCoordinateResolver;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class MavenDirectoryLocator extends AbstractJarFileModLocator
+{
+    private List<Path> modCoords;
+
+    @Override
+    public Stream<Path> scanCandidates() {
+        return modCoords.stream();
+    }
+
+    @Override
+    public String name() {
+        return "maven libs";
+    }
+
+    public String toString() {
+        return "{Maven Directory locator for mods "+this.modCoords+"}";
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void initArguments(final Map<String, ?> arguments) {
+        final List<String> mavenRoots = (List<String>) arguments.get("mavenRoots");
+        final List<Path> mavenRootPaths = mavenRoots.stream().map(n -> FMLPaths.GAMEDIR.get().resolve(n)).collect(Collectors.toList());
+        final List<String> mods = (List<String>) arguments.get("mods");
+        final List<String> listedMods = ModListHandler.processModLists((List<String>) arguments.get("modLists"), mavenRootPaths);
+
+        List<Path> localModCoords = Stream.concat(mods.stream(),listedMods.stream()).map(MavenCoordinateResolver::get).collect(Collectors.toList());
+        // find the modCoords path in each supplied maven path, and turn it into a mod file. (skips not found files)
+
+        this.modCoords = localModCoords.stream().map(mc -> mavenRootPaths.stream().map(root -> root.resolve(mc)).filter(path -> Files.exists(path)).findFirst().orElseThrow(() -> new IllegalArgumentException("Failed to locate requested mod coordinate " + mc))).collect(Collectors.toList());
+    }
+}

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

@@ -6,36 +6,62 @@
 package net.minecraftforge.fml.loading.moddiscovery;
 
 import com.electronwill.nightconfig.core.Config;
+import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import org.jetbrains.annotations.ApiStatus;
+public class MinecraftLocator extends AbstractModProvider implements IModLocator
+{
+    private static final Logger LOGGER = LogUtils.getLogger();
 
-@ApiStatus.Internal
-public class MinecraftLocator extends AbstractModProvider implements IModLocator {
     @Override
     public List<IModLocator.ModFileOrException> scanMods() {
-        var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
+        final var launchHandler = FMLLoader.getLaunchHandler();
+        var baseMC = launchHandler.getMinecraftPaths();
+        var mcjar = ModJarMetadata.buildFile(j->ModFileFactory.FACTORY.build(j, this, this::buildMinecraftTOML), j->true, baseMC.minecraftFilter(), baseMC.minecraftPaths().toArray(Path[]::new)).orElseThrow();
+        var artifacts = baseMC.otherArtifacts().stream()
+                .map(SecureJar::from)
+                .map(sj -> new ModFile(sj, this, ModFileParser::modsTomlParser))
+                .collect(Collectors.<IModFile>toList());
+        var othermods = baseMC.otherModPaths().stream()
+                .map(p -> createMod(p.toArray(Path[]::new)))
+                .filter(Objects::nonNull);
+        artifacts.add(mcjar);
 
-        // Minecraft itself.
-        var meta = new ModJarMetadata();
-        var mcjar = SecureJar.from(
-            jar -> meta,
-            minecraft.toArray(Path[]::new)
-        );
-        var mc = ModFileFactory.FACTORY.build(mcjar, this, this::buildMinecraftTOML);
-        meta.setModFile(mc);
-
-        return List.of(new ModFileOrException(mc, null));
+        return Stream.concat(artifacts.stream().map(f -> new ModFileOrException(f, null)), othermods).toList();
     }
 
     private IModFileInfo buildMinecraftTOML(final IModFile iModFile) {
+        final ModFile modFile = (ModFile) iModFile;
+        /*
+        final Path mcmodtoml = modFile.findResource("META-INF", "minecraftmod.toml");
+        if (Files.notExists(mcmodtoml)) {
+            LOGGER.fatal(LOADING, "Mod file {} is missing minecraftmod.toml file", modFile.getFilePath());
+            return null;
+        }
+
+        final FileConfig mcmodstomlfile = FileConfig.builder(mcmodtoml).build();
+        mcmodstomlfile.load();
+        mcmodstomlfile.close();
+        */
+
+
         // We haven't changed this in years, and I can't be asked right now to special case this one file in the path.
         final var conf = Config.inMemory();
         conf.set("modLoader", "minecraft");
@@ -50,13 +76,47 @@ public class MinecraftLocator extends AbstractModProvider implements IModLocator
         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));
+        /*
+        conf.putAll(mcmodstomlfile);
 
-        var configWrapper = new NightConfigWrapper(conf);
-        return new ModFileInfo((ModFile)iModFile, configWrapper, configWrapper::setFile, List.of());
+        final var extralangs = Stream.<IModFileInfo.LanguageSpec>builder();
+        final Path forgemodtoml = modFile.findResource("META-INF", "mods.toml");
+        if (Files.notExists(forgemodtoml)) {
+            LOGGER.info("No forge mods.toml file found, not loading forge mod");
+        } else {
+            final FileConfig forgemodstomlfile = FileConfig.builder(forgemodtoml).build();
+            forgemodstomlfile.load();
+            forgemodstomlfile.close();
+            conf.putAll(forgemodstomlfile);
+            conf.<List<Object>>get("mods").add(0, mcmodstomlfile.<List<Object>>get("mods").get(0)); // Add MC as a sub-mod
+            extralangs.add(new IModFileInfo.LanguageSpec(mcmodstomlfile.get("modLoader"), MavenVersionAdapter.createFromVersionSpec(mcmodstomlfile.get("loaderVersion"))));
+        }
+        */
+
+
+        final NightConfigWrapper configWrapper = new NightConfigWrapper(conf);
+        //final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper, extralangs.build().toList());
+        return new ModFileInfo(modFile, configWrapper, configWrapper::setFile, List.of());
     }
 
     @Override
     public String name() {
         return "minecraft";
     }
+
+    @Override
+    public void scanFile(final IModFile modFile, final Consumer<Path> pathConsumer) {
+        LOGGER.debug(LogMarkers.SCAN, "Scan started: {}", modFile);
+        try (Stream<Path> files = Files.find(modFile.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
+            files.forEach(pathConsumer);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", modFile);
+    }
+
+    @Override
+    public void initArguments(final Map<String, ?> arguments) {
+        // no op
+    }
 }

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

@@ -7,42 +7,65 @@ package net.minecraftforge.fml.loading.moddiscovery;
 
 import java.lang.annotation.ElementType;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraftforge.forgespi.language.ModFileScanData;
-import net.minecraftforge.forgespi.language.ModFileScanData.EnumData;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.objectweb.asm.Type;
 
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
-@ApiStatus.Internal
-class ModAnnotation {
-    public static ModFileScanData.AnnotationData fromModAnnotation(Type clazz, ModAnnotation annotation) {
+public class ModAnnotation
+{
+    public static ModFileScanData.AnnotationData fromModAnnotation(final Type clazz, final ModAnnotation annotation) {
         return new ModFileScanData.AnnotationData(annotation.asmType, annotation.type, clazz, annotation.member, annotation.values);
     }
 
+    public static class EnumHolder
+    {
+        private final String desc;
+        private final String value;
+
+        public EnumHolder(String desc, String value)
+        {
+            this.desc = desc;
+            this.value = value;
+        }
+
+        public String getDesc()
+        {
+            return desc;
+        }
+
+        public String getValue()
+        {
+            return value;
+        }
+    }
     private final ElementType type;
     private final Type asmType;
     private final String member;
-    private final Map<String,Object> values = new HashMap<>();
+    private final Map<String,Object> values = Maps.newHashMap();
 
     private ArrayList<Object> arrayList;
     private String arrayName;
-    public ModAnnotation(ElementType type, Type asmType, String member) {
+    public ModAnnotation(ElementType type, Type asmType, String member)
+    {
         this.type = type;
         this.asmType = asmType;
         this.member = member;
     }
-
-    public ModAnnotation(Type asmType, ModAnnotation parent) {
-        this(parent.type, asmType, parent.member);
+    
+    public ModAnnotation(Type asmType, ModAnnotation parent)
+    {
+        this.type = parent.type;
+        this.asmType = asmType;
+        this.member = parent.member;
     }
-
     @Override
-    public String toString() {
+    public String toString()
+    {
         return MoreObjects.toStringHelper("Annotation")
                 .add("type",type)
                 .add("name",asmType.getClassName())
@@ -51,45 +74,52 @@ class ModAnnotation {
                 .toString();
     }
 
-    public ElementType getType() {
+    public ElementType getType()
+    {
         return type;
     }
-
-    public Type getASMType() {
+    public Type getASMType()
+    {
         return asmType;
     }
-
-    public String getMember() {
+    public String getMember()
+    {
         return member;
     }
-
-    public Map<String, Object> getValues() {
+    public Map<String, Object> getValues()
+    {
         return values;
     }
-
-    public void addArray(String name) {
-        this.arrayList = new ArrayList<>();
+    public void addArray(String name)
+    {
+        this.arrayList = Lists.newArrayList();
         this.arrayName = name;
     }
-
-    public void addProperty(String key, Object value) {
+    public void addProperty(String key, Object value)
+    {
         if (this.arrayList != null)
+        {
             arrayList.add(value);
+        }
         else
+        {
             values.put(key, value);
+        }
     }
 
-    public void addEnumProperty(String key, String enumName, String value) {
-        addProperty(key, new EnumData(Type.getType(enumName), value));
+    public void addEnumProperty(String key, String enumName, String value)
+    {
+        addProperty(key, new EnumHolder(enumName, value));
     }
 
-    public void endArray() {
+    public void endArray()
+    {
         values.put(arrayName, arrayList);
         arrayList = null;
     }
-
-    public ModAnnotation addChildAnnotation(String name, String desc) {
-        var child = new ModAnnotation(Type.getType(desc), this);
+    public ModAnnotation addChildAnnotation(String name, String desc)
+    {
+        ModAnnotation child = new ModAnnotation(Type.getType(desc), this);
         addProperty(name, child.getValues());
         return child;
     }

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.util.LinkedList;
+
+public class ModAnnotationVisitor extends AnnotationVisitor
+{
+    private final ModAnnotation annotation;
+    private LinkedList<ModAnnotation> annotations;
+    private boolean array;
+    private String name;
+    private boolean isSubAnnotation;
+
+    public ModAnnotationVisitor(LinkedList<ModAnnotation> annotations, ModAnnotation annotation)
+    {
+        super(Opcodes.ASM9);
+        this.annotations = annotations;
+        this.annotation = annotation;
+    }
+
+    public ModAnnotationVisitor(LinkedList<ModAnnotation> annotations, ModAnnotation annotation, String name)
+    {
+        this(annotations, annotation);
+        this.array = true;
+        this.name = name;
+        annotation.addArray(name);
+    }
+
+    public ModAnnotationVisitor(LinkedList<ModAnnotation> annotations, ModAnnotation annotation, boolean isSubAnnotation)
+    {
+        this(annotations, annotation);
+        this.isSubAnnotation = true;
+    }
+
+    @Override
+    public void visit(String key, Object value)
+    {
+        annotation.addProperty(key, value);
+    }
+
+    @Override
+    public void visitEnum(String name, String desc, String value)
+    {
+        annotation.addEnumProperty(name, desc, value);
+    }
+
+    @Override
+    public AnnotationVisitor visitArray(String name)
+    {
+        return new ModAnnotationVisitor(annotations, annotation, name);
+    }
+    @Override
+    public AnnotationVisitor visitAnnotation(String name, String desc)
+    {
+        ModAnnotation ma = annotations.getFirst();
+        final ModAnnotation childAnnotation = ma.addChildAnnotation(name, desc);
+        annotations.addFirst(childAnnotation);
+        return new ModAnnotationVisitor(annotations, childAnnotation,true);
+    }
+    @Override
+    public void visitEnd()
+    {
+        if (array)
+        {
+            annotation.endArray();
+        }
+
+        if (isSubAnnotation)
+        {
+            ModAnnotation child = annotations.removeFirst();
+            annotations.addLast(child);
+        }
+    }
+}

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

@@ -6,8 +6,6 @@
 package net.minecraftforge.fml.loading.moddiscovery;
 
 import net.minecraftforge.forgespi.language.ModFileScanData;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.FieldVisitor;
@@ -17,118 +15,58 @@ import org.objectweb.asm.Type;
 
 import java.lang.annotation.ElementType;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@ApiStatus.Internal
-class ModClassVisitor extends ClassVisitor {
+public class ModClassVisitor extends ClassVisitor
+{
     private Type asmType;
     private Type asmSuperType;
     private Set<Type> interfaces;
     private final LinkedList<ModAnnotation> annotations = new LinkedList<>();
-
-    ModClassVisitor() {
+    public ModClassVisitor()
+    {
         super(Opcodes.ASM9);
     }
 
+
     @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+    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() ? Type.getObjectType(superName) : null;
+        this.asmSuperType = superName != null && superName.length() > 0 ? 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) {
-        var ann = new ModAnnotation(ElementType.TYPE, Type.getType(annotationName), this.asmType.getClassName());
+    public AnnotationVisitor visitAnnotation(final String annotationName, final boolean runtimeVisible)
+    {
+        ModAnnotation ann = new ModAnnotation(ElementType.TYPE, Type.getType(annotationName), this.asmType.getClassName());
         annotations.addFirst(ann);
-        return new ModAnnotationVisitor(ann);
+        return new ModAnnotationVisitor(annotations, ann);
+    }
+
+
+    @Override
+    public FieldVisitor visitField(int access, String name, String desc, String signature, Object value)
+    {
+        return new ModFieldVisitor(name, annotations);
     }
 
     @Override
-    public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
-        return new FieldVisitor(Opcodes.ASM9) {
-            @Override
-            public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) {
-                var ann = new ModAnnotation(ElementType.FIELD, Type.getType(annotationName), name);
-                annotations.addFirst(ann);
-                return new ModAnnotationVisitor(ann);
-            }
-        };
+    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions)
+    {
+        return new ModMethodVisitor(name, desc, annotations);
     }
 
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-        return new MethodVisitor(Opcodes.ASM9) {
-            @Override
-            public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) {
-                ModAnnotation ann = new ModAnnotation(ElementType.METHOD, Type.getType(annotationName), name + desc);
-                annotations.addFirst(ann);
-                return new ModAnnotationVisitor(ann);
-            }
-        };
-    }
-
-    public void buildData(final Set<ModFileScanData.ClassData> classes, final Set<ModFileScanData.AnnotationData> baked) {
+    public void buildData(final Set<ModFileScanData.ClassData> classes, final Set<ModFileScanData.AnnotationData> annotations) {
         classes.add(new ModFileScanData.ClassData(this.asmType, this.asmSuperType, this.interfaces));
-        for (var a : this.annotations) {
-            //if (ModFileScanData.interestingAnnotations().test(a.getASMType())) // Always true, so who cares. Left as a note to remove this in SPI later.
-            baked.add(ModAnnotation.fromModAnnotation(this.asmType, a));
-        }
+        final List<ModFileScanData.AnnotationData> collect = this.annotations.stream().
+                filter(ma->ModFileScanData.interestingAnnotations().test(ma.getASMType())).
+                map(a -> ModAnnotation.fromModAnnotation(this.asmType, a)).collect(Collectors.toList());
+        annotations.addAll(collect);
     }
 
-    private class ModAnnotationVisitor extends AnnotationVisitor {
-        private final ModAnnotation annotation;
-        private boolean array;
-        private boolean isSubAnnotation;
-
-        public ModAnnotationVisitor(ModAnnotation annotation) {
-            super(Opcodes.ASM9);
-            this.annotation = annotation;
-        }
-
-        public ModAnnotationVisitor(ModAnnotation annotation, String name) {
-            this(annotation);
-            this.array = true;
-            annotation.addArray(name);
-        }
-
-        public ModAnnotationVisitor(ModAnnotation annotation, boolean isSubAnnotation) {
-            this(annotation);
-            this.isSubAnnotation = true;
-        }
-
-        @Override
-        public void visit(String key, Object value) {
-            annotation.addProperty(key, value);
-        }
-
-        @Override
-        public void visitEnum(String name, String desc, String value) {
-            annotation.addEnumProperty(name, desc, value);
-        }
-
-        @Override
-        public AnnotationVisitor visitArray(String name) {
-            return new ModAnnotationVisitor(annotation, name);
-        }
-
-        @Override
-        public AnnotationVisitor visitAnnotation(String name, String desc) {
-            var ma = annotations.getFirst();
-            var childAnnotation = ma.addChildAnnotation(name, desc);
-            annotations.addFirst(childAnnotation);
-            return new ModAnnotationVisitor(childAnnotation, true);
-        }
-
-        @Override
-        public void visitEnd() {
-            if (array)
-                annotation.endArray();
-
-            if (isSubAnnotation)
-                annotations.addLast(annotations.removeFirst());
-        }
-    }
 }

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

@@ -21,8 +21,6 @@ import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
@@ -32,7 +30,6 @@ import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.stream.Collectors;
 
-@ApiStatus.Internal
 public class ModDiscoverer {
     private static final Logger LOGGER = LogUtils.getLogger();
     private final ServiceLoader<IModLocator> modLocators;

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import java.lang.annotation.ElementType;
+import java.util.LinkedList;
+
+public class ModFieldVisitor extends FieldVisitor
+{
+    private final LinkedList<ModAnnotation> annotations;
+    private final String fieldName;
+
+    public ModFieldVisitor(String name, final LinkedList<ModAnnotation> annotations)
+    {
+        super(Opcodes.ASM9);
+        this.fieldName = name;
+        this.annotations = annotations;
+    }
+    
+    @Override
+    public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible)
+    {
+        ModAnnotation ann = new ModAnnotation(ElementType.FIELD, Type.getType(annotationName), fieldName);
+        annotations.addFirst(ann);
+        return new ModAnnotationVisitor(annotations, ann);
+    }
+}

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

@@ -10,6 +10,7 @@ import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
@@ -23,8 +24,6 @@ import org.slf4j.Logger;
 
 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;
@@ -37,7 +36,16 @@ import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
 public class ModFile implements IModFile {
+    // Mods either must have a mods.toml or a manifest. We can no longer just put any jar on the classpath.
+    @Deprecated(forRemoval = true, since = "1.18")
+    public static final Manifest DEFAULTMANIFEST;
     private static final Logger LOGGER = LogUtils.getLogger();
+
+    static {
+        DEFAULTMANIFEST = new Manifest();
+        DEFAULTMANIFEST.getMainAttributes().putValue("FMLModType", "MOD");
+    }
+
     private final String jarVersion;
     private final ModFileFactory.ModFileInfoParser parser;
     private Map<String, Object> fileProperties;
@@ -169,13 +177,9 @@ 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 = services.findLanguage(this, spec.languageName(), spec.acceptedVersions());
-            lst.add(service);
-        }
-        this.loaders = Collections.unmodifiableList(lst);
+        this.loaders = this.modFileInfo.requiredLanguageLoaders().stream()
+                .map(spec-> FMLLoader.getLanguageLoadingProvider().findLanguage(this, spec.languageName(), spec.acceptedVersions()))
+                .toList();
     }
 
     @Override
@@ -203,11 +207,8 @@ public class ModFile implements IModFile {
         this.securityStatus = status;
     }
 
-    public SecureJar.Status getSecurityStatus() {
-        return this.securityStatus;
-    }
-
-    public ArtifactVersion getJarVersion() {
+    public ArtifactVersion getJarVersion()
+    {
         return new DefaultArtifactVersion(this.jarVersion);
     }
 

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

@@ -22,6 +22,7 @@ import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class ModFileParser {
     private static final Logger LOGGER = LogUtils.getLogger();

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

@@ -15,7 +15,6 @@ import net.minecraftforge.forgespi.locating.ForgeFeature;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
 import java.net.URL;
@@ -25,8 +24,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-@ApiStatus.Internal
-public class ModInfo implements IModInfo, IConfigurable {
+public class ModInfo implements IModInfo, IConfigurable
+{
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1");
     private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$");
@@ -81,8 +80,7 @@ public class ModInfo implements IModInfo, IConfigurable {
         this.displayName = config.<String>getConfigElement("displayName")
                 .orElse(this.modId);
         this.description = config.<String>getConfigElement("description")
-                .orElse("MISSING DESCRIPTION")
-                .replace("\r\n", "\n").stripIndent();
+                .orElse("MISSING DESCRIPTION");
         this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
                 .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile"))
                         .orElse(null)));
@@ -207,7 +205,7 @@ public class ModInfo implements IModInfo, IConfigurable {
         private final boolean mandatory;
         private final Ordering ordering;
         private final DependencySide side;
-        private final Optional<URL> referralUrl;
+        private Optional<URL> referralUrl;
 
         public ModVersion(final IModInfo owner, final IConfigurable config) {
             this.owner = owner;

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

@@ -6,17 +6,48 @@
 package net.minecraftforge.fml.loading.moddiscovery;
 
 import cpw.mods.jarhandling.JarMetadata;
+import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.forgespi.locating.IModLocator;
+
 import java.lang.module.ModuleDescriptor;
+import java.nio.file.Path;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
-import org.jetbrains.annotations.ApiStatus;
-
-@ApiStatus.Internal
 public final class ModJarMetadata implements JarMetadata {
     private IModFile modFile;
     private ModuleDescriptor descriptor;
 
+    // TODO: Remove helper functions to cleanup api
+    @Deprecated(forRemoval = true, since="1.18")
+    static Optional<IModFile> buildFile(IModLocator locator, Predicate<SecureJar> jarTest, BiPredicate<String, String> filter, Path... files) {
+        return buildFile(j->new ModFile(j, locator, ModFileParser::modsTomlParser), jarTest, filter, files);
+    }
+
+    // TODO: Remove helper functions to cleanup api
+    @Deprecated(forRemoval = true, since="1.18")
+    static IModFile buildFile(IModLocator locator, Path... files) {
+        return buildFile(locator, j->true, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
+    }
+
+    // TODO: Remove helper functions to cleanup api
+    @Deprecated(forRemoval = true, since="1.18")
+    static Optional<IModFile> buildFile(Function<SecureJar, IModFile> mfConstructor, Predicate<SecureJar> jarTest, BiPredicate<String, String> filter, Path... files) {
+        var mjm = new ModJarMetadata();
+        var sj = SecureJar.from(()->ModFile.DEFAULTMANIFEST, j->mjm, filter, files);
+        if (jarTest.test(sj)) {
+            var mf = mfConstructor.apply(sj);
+            mjm.setModFile(mf);
+            return Optional.of(mf);
+        } else {
+            return Optional.empty();
+        }
+    }
+
     ModJarMetadata() {
     }
 

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import com.mojang.logging.LogUtils;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.loading.FileUtils;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.MavenCoordinateResolver;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class ModListHandler {
+    private static final Logger LOGGER = LogUtils.getLogger();
+    /**
+     * Reads the modList paths specified, and searches each maven root for mods matching. Returns a list of mods
+     * found.
+     *
+     * @param modListPaths Paths to search for mod file lists
+     * @param mavenRootPaths Roots to look for mods listed
+     * @return list of found mod coordinates
+     */
+    public static List<String> processModLists(final List<String> modListPaths, final List<Path> mavenRootPaths) {
+        final List<String> modCoordinates = modListPaths.stream().map(ModListHandler::transformPathToList).
+                flatMap(Collection::stream).
+                collect(Collectors.toList());
+
+        List<Pair<Path,String>> localModCoords = modCoordinates.stream().map(mc->Pair.of(MavenCoordinateResolver.get(mc), mc)).collect(Collectors.toList());
+        final List<Pair<Path, String>> foundCoordinates = localModCoords.stream().
+                map(mc -> mavenRootPaths.stream().
+                        map(root -> Pair.of(root.resolve(mc.getLeft()), mc.getRight())).
+                        filter(path -> Files.exists(path.getLeft())).
+                        findFirst().
+                        orElseGet(()->{
+                            LOGGER.warn(LogMarkers.CORE, "Failed to find coordinate {}", mc);
+                            return null;
+                })).
+                filter(Objects::nonNull).
+                collect(Collectors.toList());
+
+        final List<String> found = foundCoordinates.stream().map(Pair::getRight).collect(Collectors.toList());
+        LOGGER.debug(LogMarkers.CORE, "Found mod coordinates from lists: {}", found);
+        return found;
+    }
+
+    private static List<String> transformPathToList(final String path) {
+        LOGGER.debug(LogMarkers.CORE, "Reading mod list {}", path);
+        Path filePath = FMLPaths.GAMEDIR.get().resolve(path);
+        if (!Files.exists(filePath)) {
+            LOGGER.warn(LogMarkers.CORE, "Failed to find modlist file at {}", filePath);
+            return Collections.emptyList();
+        }
+
+        String extension = FileUtils.fileExtension(filePath);
+        if (Objects.equals("list",extension)) {
+            return readListFile(filePath).stream().filter(s -> !s.isEmpty()).collect(Collectors.toList());
+        } else {
+            LOGGER.warn(LogMarkers.CORE, "Failed to read unknown file list type {} for file {}", extension, filePath);
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * Simple list file, ending in ".list" with one mod coordinate per line
+     * @param filePath path
+     * @return list
+     */
+    private static List<String> readListFile(final Path filePath) {
+        try {
+            return Files.readAllLines(filePath);
+        } catch (IOException e) {
+            LOGGER.warn(LogMarkers.CORE, "Failed to read file list {}", filePath, e);
+            return Collections.emptyList();
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import java.lang.annotation.ElementType;
+import java.util.LinkedList;
+
+public class ModMethodVisitor extends MethodVisitor {
+
+    private final LinkedList<ModAnnotation> annotations;
+    private String methodName;
+    private String methodDescriptor;
+
+    public ModMethodVisitor(String name, String desc, final LinkedList<ModAnnotation> annotations)
+    {
+        super(Opcodes.ASM9);
+        this.methodName = name;
+        this.methodDescriptor = desc;
+        this.annotations = annotations;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible)
+    {
+        ModAnnotation ann = new ModAnnotation(ElementType.METHOD, Type.getType(annotationName), methodName+methodDescriptor);
+        annotations.addFirst(ann);
+        return new ModAnnotationVisitor(annotations, ann);
+    }
+
+}

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

@@ -9,6 +9,7 @@ import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.api.ITransformationService;
 import net.minecraftforge.fml.loading.*;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.jetbrains.annotations.NotNull;
@@ -22,7 +23,7 @@ import java.util.stream.Collectors;
 
 public class ModValidator {
     private static final Logger LOGGER = LogUtils.getLogger();
-    //private final Map<IModFile.Type, List<ModFile>> modFiles;
+    private final Map<IModFile.Type, List<ModFile>> modFiles;
     private final List<ModFile> candidatePlugins;
     private final List<ModFile> candidateMods;
     private LoadingModList loadingModList;
@@ -30,7 +31,7 @@ public class ModValidator {
     private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;
 
     public ModValidator(final Map<IModFile.Type, List<ModFile>> modFiles, final List<IModFileInfo> brokenFiles, final List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
-        //this.modFiles = modFiles;
+        this.modFiles = modFiles;
         this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
         this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY)));
         this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));

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

@@ -9,28 +9,33 @@ import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.FMLPaths;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
-import net.minecraftforge.forgespi.locating.IModLocator;
-
+import net.minecraftforge.fml.loading.StringUtils;
 import org.slf4j.Logger;
 
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck;
 
 /**
  * Support loading mods located in JAR files in the mods folder
  */
-public class ModsFolderLocator extends AbstractModProvider implements IModLocator {
+public class ModsFolderLocator extends AbstractJarFileModLocator
+{
     private static final String SUFFIX = ".jar";
     private static final Logger LOGGER = LogUtils.getLogger();
     private final Path modFolder;
     private final String customName;
 
     public ModsFolderLocator() {
-        this(FMLPaths.MODSDIR.get(), "mods folder");
+        this(FMLPaths.MODSDIR.get());
+    }
+
+    ModsFolderLocator(Path modFolder) {
+        this(modFolder, "mods folder");
     }
 
     ModsFolderLocator(Path modFolder, String name) {
@@ -39,22 +44,13 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
     }
 
     @Override
-    public List<IModLocator.ModFileOrException> scanMods() {
-        LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
+    public Stream<Path> scanCandidates() {
+        LOGGER.debug(LogMarkers.SCAN,"Scanning mods dir {} for mods", this.modFolder);
         var excluded = ModDirTransformerDiscoverer.allExcluded();
-        try (var stream = Files.list(this.modFolder)) {
-            return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX))
-                .sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT)))
-                .map(this::createMod)
-                .toList();
-        } catch (IOException e) {
-            return sneak(e);
-        }
-    }
 
-    @SuppressWarnings("unchecked")
-    private static <E extends Throwable, R> R sneak(Throwable e) throws E {
-        throw (E)e;
+        return uncheck(()-> Files.list(this.modFolder))
+                .filter(p-> !excluded.contains(p) && StringUtils.toLowerCase(p.getFileName().toString()).endsWith(SUFFIX))
+                .sorted(Comparator.comparing(path-> StringUtils.toLowerCase(path.getFileName().toString())));
     }
 
     @Override
@@ -66,4 +62,8 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
     public String toString() {
         return "{"+customName+" locator at "+this.modFolder+"}";
     }
+
+    @Override
+    public void initArguments(final Map<String, ?> arguments) {
+    }
 }

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

@@ -15,12 +15,9 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.jetbrains.annotations.ApiStatus;
-
 import static java.util.Arrays.asList;
 
-@ApiStatus.Internal
-class NightConfigWrapper implements IConfigurable {
+public class NightConfigWrapper implements IConfigurable {
     private final UnmodifiableConfig config;
     private IModFileInfo file;
 

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

@@ -9,8 +9,6 @@ import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
 import net.minecraftforge.forgespi.language.ModFileScanData;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.objectweb.asm.ClassReader;
 import org.slf4j.Logger;
 
@@ -20,8 +18,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 
-@ApiStatus.Internal
-class Scanner {
+public class Scanner {
     private static final Logger LOGGER = LogUtils.getLogger();
     private final ModFile fileToScan;
 

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

@@ -10,6 +10,8 @@ import com.google.common.base.CharMatcher;
 
 import java.util.*;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 public class StartupNotificationManager {
     private static volatile EnumMap<Message.MessageType, List<Message>> messages = new EnumMap<>(Message.MessageType.class);

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

@@ -6,8 +6,6 @@
 package net.minecraftforge.fml.loading.targets;
 
 import com.mojang.logging.LogUtils;
-
-import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
@@ -21,7 +19,6 @@ import java.util.function.Supplier;
  * A class that attempts to parse command line arguments into key value pairs to allow addition and editing.
  * Can not use JOptSimple as that doesn't parse out the values for keys unless the spec says it has a value.
  */
-@ApiStatus.Internal
 class ArgumentList {
     private static final Logger LOGGER = LogUtils.getLogger();
     private List<Supplier<String[]>> entries = new ArrayList<>();

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import cpw.mods.modlauncher.api.ServiceRunner;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LibraryFinder;
+import net.minecraftforge.fml.loading.VersionInfo;
+import net.minecraftforge.api.distmarker.Dist;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
+    @Override public Dist getDist()  { return Dist.CLIENT; }
+    @Override public String getNaming() { return "srg"; }
+    @Override public boolean isProduction() { return true; }
+
+    @Override
+    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
+        return ()->clientService(arguments, gameLayer);
+    }
+
+    @Override
+    public LocatedPaths getMinecraftPaths() {
+        final var vers = FMLLoader.versionInfo();
+        var mc = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "srg", vers.mcAndMCPVersion());
+        var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "extra", vers.mcAndMCPVersion());
+        var mcstream = Stream.<Path>builder().add(mc).add(mcextra);
+        var modstream = Stream.<List<Path>>builder();
+
+        processMCStream(vers, mcstream, modstream);
+
+        var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
+        var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
+        var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
+        var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
+
+        return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
+    }
+
+    protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
+}

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

@@ -7,24 +7,46 @@ package net.minecraftforge.fml.loading.targets;
 
 import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.ServiceRunner;
+import net.minecraftforge.fml.loading.FileUtils;
+
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import java.util.function.BiPredicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
-import org.jetbrains.annotations.ApiStatus;
-
-@ApiStatus.Internal
-abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
-    protected CommonDevLaunchHandler(LaunchType type, String prefix) {
-        super(type, prefix);
-    }
-
+public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
     @Override public String getNaming() { return "mcp"; }
     @Override public boolean isProduction() { return false; }
 
+    @Override
+    public LocatedPaths getMinecraftPaths() {
+        // Minecraft is extra jar {resources} + our exploded directories in dev
+        final var mcstream = Stream.<Path>builder();
+
+        // The extra jar is on the classpath, so try and pull it out of the legacy classpath
+        var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find client-extra").split(File.pathSeparator);
+        var extra = findJarOnClasspath(legacyCP, "client-extra");
+
+        // The MC code/Patcher edits are in exploded directories
+        final var modstream = Stream.<List<Path>>builder();
+        final var mods = getModClasses();
+        final var minecraft = mods.remove("minecraft");
+        if (minecraft == null)
+            throw new IllegalStateException("Could not find 'minecraft' mod paths.");
+        minecraft.stream().distinct().forEach(mcstream::add);
+        mods.values().forEach(modstream::add);
+
+        mcstream.add(extra);
+        var mcFilter = getMcFilter(extra, minecraft, modstream);
+        return new LocatedPaths(mcstream.build().toList(), mcFilter, modstream.build().toList(), getFmlStuff(legacyCP));
+    }
+
     @Override
     protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
         super.preLaunch(arguments, layer);
@@ -57,47 +79,24 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
         return args.getArguments();
     }
 
-    private static String getRandomNumbers(int length) {
-        // Generate a time-based random number, to mimic how n.m.client.Main works
-        return Long.toString(System.nanoTime() % (int) Math.pow(10, length));
-    }
-
-    @Override
-    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
-        return super.makeService(preLaunch(arguments, gameLayer), gameLayer);
-    }
-
-    protected static String[] findClassPath() {
-        var classpath = System.getProperty("legacyClassPath");
-        if (classpath == null)
-            classpath = System.getProperty("java.class.path");
-        return classpath.split(File.pathSeparator);
+    protected List<Path> getFmlStuff(String[] classpath) {
+        // We also want the FML things, fmlcore, javafmllanguage, mclanguage, I don't like hard coding these, but hey whatever works for now.
+        return Arrays.stream(classpath)
+            .filter(e -> FileUtils.matchFileName(e, "fmlcore", "javafmllanguage", "lowcodelanguage", "mclanguage"))
+            .map(Paths::get)
+            .toList();
     }
 
     protected static Path findJarOnClasspath(String[] classpath, String match) {
-        String ret = null;
-
-        for (var entry : classpath) {
-            int idx = entry.lastIndexOf(File.separatorChar);
-            if (idx == -1) continue;
-
-            var name = entry.substring(idx + 1);
-            if (name.startsWith(match)) {
-                ret = entry;
-                break;
-            }
-        }
-
-        if (ret == null)
-            throw new IllegalStateException("Could not find " + match + " in classpath");
-
-        return Paths.get(ret);
+        return Paths.get(Arrays.stream(classpath)
+            .filter(e -> FileUtils.matchFileName(e, match))
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("Could not find " + match + " in classpath")));
     }
 
-    // TODO: [Forge][UFS][DEV] Make Forge and MC seperate sources at dev time so we don't have to filter
-    protected static Path getMinecraftOnly(Path extra, Path forge) {
-        var packages = getPackages(); // Pulled out so it is passed to the lambda as value
-        var extraPath = extra.toString().replace('\\', '/');
+    protected BiPredicate<String, String> getMcFilter(Path extra, List<Path> minecraft, Stream.Builder<List<Path>> mods) {
+        final var packages = getPackages();
+        final var extraPath = extra.toString().replace('\\', '/');
 
         // We serve everything, except for things in the forge packages.
         BiPredicate<String, String> mcFilter = (path, base) -> {
@@ -107,31 +106,34 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
                 if (path.startsWith(pkg)) return false;
             return true;
         };
-        var fs = UnionHelper.newFileSystem(mcFilter, new Path[] { forge, extra });
-        return fs.getRootDirectories().iterator().next();
-    }
 
-    // TODO: [Forge][UFS][DEV] Make Forge and MC seperate sources at dev time so we don't have to filter
-    protected static Path getForgeOnly(Path forge) {
-        var packages = getPackages(); // Pulled out so it is passed to the lambda as value
         // We need to separate out our resources/code so that we can show up as a different data pack.
         var modJar = SecureJar.from((path, base) -> {
             if (!path.endsWith(".class")) return true;
             for (var pkg : packages)
                 if (path.startsWith(pkg)) return true;
             return false;
-        }, new Path[] { forge });
-
+        }, minecraft.stream().distinct().toArray(Path[]::new));
         //modJar.getPackages().stream().sorted().forEach(System.out::println);
-        return modJar.getRootPath();
+        mods.add(List.of(modJar.getRootPath()));
+
+        return mcFilter;
     }
 
-    private static String[] getPackages() {
-        return new String[] {
-            "net/minecraftforge/",
-            "META-INF/services/",
-            "META-INF/coremods.json",
-            "META-INF/mods.toml"
-        };
+    protected String[] getPackages() {
+        return new String[]{ "net/minecraftforge/", "META-INF/services/", "META-INF/coremods.json", "META-INF/mods.toml" };
     }
+
+    private static String getRandomNumbers(int length) {
+        // Generate a time-based random number, to mimic how n.m.client.Main works
+        return Long.toString(System.nanoTime() % (int) Math.pow(10, length));
+    }
+
+    @Override
+    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
+        var args = preLaunch(arguments, gameLayer);
+        return ()->devService(args, gameLayer);
+    }
+
+    abstract void devService(final String[] arguments, final ModuleLayer gameLayer) throws Throwable;
 }

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

@@ -10,49 +10,54 @@ import cpw.mods.modlauncher.api.ILaunchHandlerService;
 import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
 import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.api.distmarker.Dist;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.slf4j.Logger;
+import sun.misc.Unsafe;
+
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiPredicate;
+import java.util.stream.Collectors;
 
-/**
- * This is required by FMLLoader because ILaunchHandlerService doesn't have the context we need.
- * I need to clean this up to make proper api. But that involves editing ModLauncher itself which i'm not gunna do right now.
- *
- * So until that happens, guess this is public api.
- */
 public abstract class CommonLaunchHandler implements ILaunchHandlerService {
+    public record LocatedPaths(List<Path> minecraftPaths, BiPredicate<String, String> minecraftFilter, List<List<Path>> otherModPaths, List<Path> otherArtifacts) {}
+
     protected static final Logger LOGGER = LogUtils.getLogger();
 
-    protected final LaunchType type;
-    private final String prefix;
+    public abstract Dist getDist();
 
-    protected CommonLaunchHandler(LaunchType type, String prefix) {
-        this.type = type;
-        this.prefix = prefix;
-    }
-
-    @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();
 
-    public abstract List<Path> getMinecraftPaths();
+    public boolean isProduction() {
+        return false;
+    }
+
+    public boolean isData() {
+        return false;
+    }
+
+    public abstract LocatedPaths getMinecraftPaths();
 
     @Override
     public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) {
+
     }
 
     protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
         URI uri;
-        try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) {
+        try (var reader = layer.configuration().findModule("fmlloader").orElseThrow().reference().open()) {
             uri = reader.find("log4j2.xml").orElseThrow();
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -64,29 +69,45 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
         return arguments;
     }
 
+    protected final Map<String, List<Path>> getModClasses() {
+        final String modClasses = Optional.ofNullable(System.getenv("MOD_CLASSES")).orElse("");
+        LOGGER.debug(LogMarkers.CORE, "Got mod coordinates {} from env", modClasses);
+
+        record ExplodedModPath(String modid, Path path) {}
+        // "a/b/;c/d/;" -> "modid%%c:\fish\pepper;modid%%c:\fish2\pepper2\;modid2%%c:\fishy\bums;modid2%%c:\hmm"
+        final var modClassPaths = Arrays.stream(modClasses.split(File.pathSeparator))
+                .map(inp -> inp.split("%%", 2))
+                .map(splitString -> new ExplodedModPath(splitString.length == 1 ? "defaultmodid" : splitString[0], Paths.get(splitString[splitString.length - 1])))
+                .collect(Collectors.groupingBy(ExplodedModPath::modid, Collectors.mapping(ExplodedModPath::path, Collectors.toList())));
+
+        LOGGER.debug(LogMarkers.CORE, "Found supplied mod coordinates [{}]", modClassPaths);
+
+        //final var explodedTargets = ((Map<String, List<ExplodedDirectoryLocator.ExplodedMod>>)arguments).computeIfAbsent("explodedTargets", a -> new ArrayList<>());
+        //modClassPaths.forEach((modlabel,paths) -> explodedTargets.add(new ExplodedDirectoryLocator.ExplodedMod(modlabel, paths)));
+        return modClassPaths;
+    }
+
     @Override
     public ServiceRunner launchService(final String[] arguments, final ModuleLayer gameLayer) {
         FMLLoader.beforeStart(gameLayer);
         return makeService(arguments, gameLayer);
     }
 
-    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
-        return () -> runTarget(this.type.module(), this.type.main(), arguments, gameLayer);
+    protected abstract ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer);
+
+    protected void clientService(final String[] arguments, final ModuleLayer layer) throws Throwable {
+        runTarget("net.minecraft.client.main.Main", arguments, layer);
     }
 
-    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 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", "forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
+    protected void serverService(final String[] arguments, final ModuleLayer layer) throws Throwable {
+        runTarget("net.minecraft.server.Main", arguments, layer);
+    }
 
-    protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
-        var mod = layer.findModule(module).orElse(null);
-        if (mod == null) throw new IllegalStateException("Could not find module " + module);
-        var cls = Class.forName(mod, target);
-        if (cls == null) throw new IllegalStateException("Could not find class " + target + " in module " + module);
-        var mtd = cls.getMethod("main", String[].class);
-        if (mtd == null) throw new IllegalStateException("Class " + target + " in module " + module + " does not have a main(String[]) method");
-        mtd.invoke(null, (Object)arguments);
+    protected void dataService(final String[] arguments, final ModuleLayer layer) throws Throwable {
+        runTarget("net.minecraft.data.Main", arguments, layer);
+    }
+
+    protected void runTarget(final String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
+        Class.forName(layer.findModule("minecraft").orElseThrow(),target).getMethod("main", String[].class).invoke(null, (Object)arguments);
     }
 }

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import cpw.mods.jarhandling.SecureJar;
+import cpw.mods.modlauncher.api.ServiceRunner;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LibraryFinder;
+import net.minecraftforge.fml.loading.VersionInfo;
+import net.minecraftforge.api.distmarker.Dist;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.BiPredicate;
+import java.util.stream.Stream;
+
+public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
+    @Override public Dist getDist()  { return Dist.DEDICATED_SERVER; }
+    @Override public String getNaming() { return "srg"; }
+    @Override public boolean isProduction() { return true; }
+
+    @Override
+    protected ServiceRunner makeService(String[] arguments, ModuleLayer layer) {
+        return () -> serverService(arguments, layer);
+    }
+
+    @Override
+    public LocatedPaths getMinecraftPaths() {
+        final var vers = FMLLoader.versionInfo();
+        var mc = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "srg", vers.mcAndMCPVersion());
+        var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "extra", vers.mcAndMCPVersion());
+        var mcextra_filtered = SecureJar.from( // We only want it for it's resources. So filter everything else out.
+            (path, base) -> {
+                return path.equals("META-INF/versions/") || // This is required because it bypasses our filter for the manifest, and it's a multi-release jar.
+                     (!path.endsWith(".class") &&
+                      !path.startsWith("META-INF/"));
+            }, mcextra
+        );
+        BiPredicate<String, String> filter = (path, base) -> true;
+
+        var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
+        var modstream = Stream.<List<Path>>builder();
+
+        filter = processMCStream(vers, mcstream, filter, modstream);
+
+        var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
+        var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
+        var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
+        var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
+
+        return new LocatedPaths(mcstream.build().toList(), filter, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
+    }
+
+    protected abstract BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods);
+}

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.VersionInfo;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public abstract class CommonUserdevLaunchHandler extends CommonDevLaunchHandler {
+    @Override
+    public LocatedPaths getMinecraftPaths() {
+        final var vers = FMLLoader.versionInfo();
+
+        // Minecraft is extra jar {resources} + forge jar {patches}
+        final var mcstream = Stream.<Path>builder();
+        // Mod code is in exploded directories
+        final var modstream = Stream.<List<Path>>builder();
+
+        // The MC extra and forge jars are on the classpath, so try and pull them out
+        var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find userdev jars").split(File.pathSeparator);
+        var extra = findJarOnClasspath(legacyCP, "client-extra");
+
+        processStreams(legacyCP, vers, mcstream, modstream);
+        getModClasses().forEach((modid, paths) -> modstream.add(paths));
+
+        var minecraft = mcstream.build().collect(Collectors.toList());
+        var mcFilter = getMcFilter(extra, minecraft, modstream);
+        minecraft.add(extra); // Add extra late so the filter is made correctly
+        return new LocatedPaths(minecraft, mcFilter, modstream.build().toList(), getFmlStuff(legacyCP));
+    }
+
+    protected abstract void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class FMLClientDevLaunchHandler extends CommonDevLaunchHandler {
+    @Override public String name() { return "fmlclientdev"; }
+    @Override public Dist getDist() { return Dist.CLIENT; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        clientService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+import net.minecraftforge.fml.loading.LibraryFinder;
+import net.minecraftforge.fml.loading.VersionInfo;
+
+public class FMLClientLaunchHandler extends CommonClientLaunchHandler {
+    @Override public String name() { return "fmlclient"; }
+
+    @Override
+    protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
+        var fmlonly = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "fmlonly", "", "universal", versionInfo.mcAndForgeVersion());
+        mods.add(List.of(fmlonly));
+    }
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class FMLClientUserdevLaunchHandler extends FMLUserdevLaunchHandler {
+    @Override
+    public String name() { return "fmlclientuserdev"; }
+
+    @Override
+    public Dist getDist() { return Dist.CLIENT; }
+
+    @Override
+    protected void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        clientService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class FMLDataUserdevLaunchHandler extends FMLUserdevLaunchHandler {
+    @Override
+    public String name() { return "fmldatauserdev"; }
+
+    @Override
+    public Dist getDist() { return Dist.CLIENT; }
+
+    @Override
+    public boolean isData() { return true; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        dataService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class FMLServerDevLaunchHandler extends CommonDevLaunchHandler {
+    @Override public String name() { return "fmlserverdev"; }
+    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        serverService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import cpw.mods.modlauncher.api.ILaunchHandlerService;
+import net.minecraftforge.fml.loading.LibraryFinder;
+import net.minecraftforge.fml.loading.VersionInfo;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.BiPredicate;
+import java.util.stream.Stream;
+
+public class FMLServerLaunchHandler extends CommonServerLaunchHandler implements ILaunchHandlerService {
+    @Override public String name() { return "fmlserver"; }
+
+    @Override
+    protected BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods) {
+        var fmlonly = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "fmlonly", "", "universal", versionInfo.mcAndForgeVersion());
+        mods.add(List.of(fmlonly));
+        return filter;
+    }
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class FMLServerUserdevLaunchHandler extends FMLUserdevLaunchHandler {
+    @Override public String name() { return "fmlserveruserdev"; }
+    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        serverService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.fml.loading.VersionInfo;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+public abstract class FMLUserdevLaunchHandler extends CommonUserdevLaunchHandler {
+    @Override
+    protected void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
+        var fmlonly = findJarOnClasspath(classpath, "fmlonly-" + versionInfo.mcAndForgeVersion());
+        mc.add(fmlonly);
+    }
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class ForgeClientDevLaunchHandler extends CommonDevLaunchHandler {
+    @Override public String name() { return "forgeclientdev"; }
+    @Override public Dist getDist() { return Dist.CLIENT; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        clientService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+import net.minecraftforge.fml.loading.LibraryFinder;
+import net.minecraftforge.fml.loading.VersionInfo;
+
+public class ForgeClientLaunchHandler extends CommonClientLaunchHandler {
+    @Override public String name() { return "forgeclient"; }
+
+    @Override
+    protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
+        var forgepatches = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "forge", "", "client", versionInfo.mcAndForgeVersion());
+        var forgejar = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "forge", "", "universal", versionInfo.mcAndForgeVersion());
+        mc.add(forgepatches);
+        mods.add(List.of(forgejar));
+    }
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class ForgeClientUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
+    @Override
+    public String name() { return "forgeclientuserdev"; }
+
+    @Override
+    public Dist getDist() { return Dist.CLIENT; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        clientService(arguments, layer);
+    }
+}

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

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class ForgeDataDevLaunchHandler extends CommonDevLaunchHandler {
+    @Override public String name() { return "forgedatadev"; }
+    @Override public Dist getDist() { return Dist.CLIENT; }
+    @Override public boolean isData() { return true; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) arguments);
+    }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class ForgeDataUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
+    @Override
+    public String name() { return "forgedatauserdev"; }
+
+    @Override
+    public Dist getDist() { return Dist.CLIENT; }
+
+    @Override
+    public boolean isData() { return true; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        dataService(arguments, layer);
+    }
+}

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

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.targets;
-import java.net.URI;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import org.jetbrains.annotations.ApiStatus;
-
-@ApiStatus.Internal
-abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
-    private ForgeDevLaunchHandler(LaunchType type) {
-        super(type, "forge_dev_");
-    }
-
-    @Override
-    public List<Path> getMinecraftPaths() {
-
-        // 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");
-
-        // If both Forge and MC are in the same folder, then we are in intellij or gradle
-        // So we have to create a filtered jar
-        if (!forge.equals(minecraft))
-            return List.of(minecraft, extra);
-
-        var filtered = CommonDevLaunchHandler.getMinecraftOnly(extra, minecraft);
-        return List.of(filtered);
-    }
-
-    static Path getPathFromResource(String resource) {
-        var cl = ForgeDevLaunchHandler.class.getClassLoader();
-        var url = cl.getResource(resource);
-        if (url == null)
-            throw new IllegalStateException("Could not find " + resource + " in classloader " + cl);
-
-        var str = url.toString();
-        int len = resource.length();
-        if ("jar".equalsIgnoreCase(url.getProtocol())) {
-            str = url.getFile();
-            len += 2;
-        }
-        str = str.substring(0, str.length() - len);
-        var path = Paths.get(URI.create(str));
-        return path;
-    }
-
-    public static class Client extends ForgeDevLaunchHandler {
-        public Client() {
-            super(CLIENT);
-        }
-    }
-
-    public static class Data extends ForgeDevLaunchHandler {
-        public Data() {
-            super(DATA);
-        }
-    }
-
-    public static class Server extends ForgeDevLaunchHandler {
-        public Server() {
-            super(SERVER);
-        }
-    }
-
-    public static class ServerGameTest extends ForgeDevLaunchHandler {
-        public ServerGameTest() {
-            super(SERVER_GAMETEST);
-        }
-    }
-}

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

@@ -1,276 +0,0 @@
-package net.minecraftforge.fml.loading.targets;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.jetbrains.annotations.ApiStatus;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.electronwill.nightconfig.core.Config;
-import com.electronwill.nightconfig.core.file.FileNotFoundAction;
-import com.electronwill.nightconfig.core.io.WritingMode;
-import com.electronwill.nightconfig.toml.TomlParser;
-import com.electronwill.nightconfig.toml.TomlWriter;
-import com.google.common.jimfs.Jimfs;
-
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
-import net.minecraftforge.forgespi.locating.IModLocator;
-
-@ApiStatus.Internal
-public class ForgeDevLocator extends AbstractModProvider implements IModLocator {
-    private static final String PACK_META = "pack.mcmeta";
-
-    @Override
-    public String name() {
-        return "forge_dev_locator";
-    }
-
-    @Override
-    public List<ModFileOrException> scanMods() {
-        var handler = FMLLoader.getLaunchHandler();
-
-        if (!(handler instanceof ForgeDevLaunchHandler))
-            return List.of();
-
-        var mods = getMods();
-        var ret = new ArrayList<ModFileOrException>();
-        for (var path : mods) {
-            var mod = createMod(path);
-            if (mod != null)
-                ret.add(mod);
-        }
-        return ret;
-    }
-
-    private List<Path> getMods() {
-        // Forge is an exploded directory as well
-        var minecraft = ForgeDevLaunchHandler.getPathFromResource("net/minecraft/client/Minecraft.class");
-        var forge = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
-        if (minecraft.equals(forge)) {
-            // If both Forge and MC are in the same folder, then we are in intellij or gradle
-            // So we have to create a filtered jar
-            forge = CommonDevLaunchHandler.getForgeOnly(forge);
-        }
-        var ret = new ArrayList<Path>();
-        ret.add(forge);
-
-        var isTest = Boolean.getBoolean("forgedev.enableTestMods");
-        if (!isTest)
-            return ret;
-
-        var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class");
-        // Explode our test mods into a framework that treats them all as separate jars.
-        var tests = explodeTestMods(test);
-        ret.addAll(tests);
-
-        return ret;
-    }
-
-    private List<Path> explodeTestMods(Path path) {
-        var mod = new ArrayList<Path>();
-        var memory = Jimfs.newFileSystem();
-
-        // First lets find all class files, that have the @Mod annotation and map packages to modids.
-        var packages = findTestModPackages(path);
-        for (var entry : packages.entrySet()) {
-            var pkg = entry.getKey();
-            var modids = entry.getValue();
-
-            // Find resource directories for every mod in this group
-            var resourcePaths = new LinkedHashSet<Path>();
-            for (var modid : modids) {
-                var rsc = path.resolve(modid);
-                if (Files.exists(rsc))
-                    resourcePaths.add(rsc);
-            }
-
-            var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
-            buildModsToml(resourcePaths, modids, root);
-            buildPackMeta(resourcePaths, root);
-
-            if (Files.exists(root))
-                resourcePaths.add(root);
-
-            // We want just the class files from the root of the input paths. So make a new union with a filter.
-            var classes = UnionHelper.newFileSystem(
-                (name, base) -> {
-                    if (name.endsWith("/")) {
-                        if (name.startsWith("/"))
-                            name = name.substring(1);
-                        return pkg.startsWith(name) || name.startsWith(pkg);
-                    }
-                    return name.endsWith(".class") && name.startsWith(pkg);
-                }, new Path[] { path }
-            );
-
-            // And we want the resources, and none of the classes, just in case things get kinda fucky and somehow a package overlaps a sub package {shading?}
-            var resources = UnionHelper.newFileSystem((name, base) -> !name.endsWith(".class"), resourcePaths.toArray(Path[]::new));
-
-            // Union of unions, Yay!
-            var union = UnionHelper.newFileSystem(null, new Path[] {
-                classes.getRootDirectories().iterator().next(),
-                resources.getRootDirectories().iterator().next()
-            });
-            mod.add(union.getRootDirectories().iterator().next());
-        }
-
-        return mod;
-    }
-
-    // Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories,
-    // I could make it merge all the way up, but I think this would be fine.
-    private Map<String, Set<String>> findTestModPackages(Path path) {
-        var mods = new HashMap<String, Set<String>>();
-        try (var files = Files.walk(path)) {
-            var classes = files
-                .filter(Files::isRegularFile)
-                .filter(p -> p.getFileName().toString().endsWith(".class"))
-                .toList();
-
-            for (var cls : classes) {
-                try (var is = Files.newInputStream(cls)) {
-                    var reader = new ClassReader(is);
-                    reader.accept(new ClassVisitor(Opcodes.ASM9) {
-                        private String clsName;
-                        @Override
-                        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-                            this.clsName = name;
-                            super.visit(version, access, name, signature, superName, interfaces);
-                        }
-
-                        @Override
-                        public AnnotationVisitor visitAnnotation(String name, boolean runtime) {
-                            if (!"Lnet/minecraftforge/fml/common/Mod;".equals(name))
-                                return super.visitAnnotation(name, runtime);
-
-                            return new AnnotationVisitor(Opcodes.ASM9) {
-                                @Override
-                                public void visit(String key, Object value) {
-                                    if ("value".equals(key)) {
-                                        int idx = clsName.lastIndexOf('/');
-                                        var pkg = clsName.substring(0, idx);
-                                        mods.computeIfAbsent(pkg, k -> new HashSet<>()).add((String)value);
-
-                                        idx = pkg.lastIndexOf('/');
-                                        while (idx != -1) {
-                                            pkg = pkg.substring(0, idx);
-                                            idx = pkg.lastIndexOf('/');
-                                            if (mods.containsKey(pkg))
-                                                throw new IllegalStateException("Invalid ForgeDev test mod layout, conflicting packages: " + pkg + " for " + clsName);
-                                        }
-                                    }
-                                }
-                            };
-                        }
-                    }, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
-                }
-            }
-        } catch (IOException e) {
-            sneak(e);
-        }
-        return mods;
-    }
-
-    // Builds or update the mods.toml file for all @Mods in this package
-    private void buildModsToml(Set<Path> resources, Set<String> modids, Path root) {
-        var toml = resources.stream()
-            .map(p -> p.resolve(MODS_TOML))
-            .filter(Files::exists)
-            .findFirst()
-            .orElse(null);
-
-        Config cfg = null;
-
-        if (toml != null)
-            cfg = new TomlParser().parse(toml, FileNotFoundAction.READ_NOTHING);
-        else
-            cfg = Config.inMemory();
-
-        boolean modified = false;
-        var defaults = Map.of(
-            "modLoader", "javafml",
-            "loaderVersion", "[0,)",
-            "license", "Doesnt fucking matter"
-        );
-
-        for (var key : defaults.keySet()) {
-            if (!cfg.contains(key)) {
-                cfg.set(key, defaults.get(key));
-                modified = true;
-            }
-        }
-
-        var modlist = new ArrayList<Config>();
-        if (cfg.contains("mods")) {
-            @SuppressWarnings("unchecked")
-            var existing = ((List<Config>)cfg.get("mods"));
-            modlist.addAll(existing);
-        }
-
-        for (var modid : modids) {
-            if (!modlist.stream().anyMatch(c -> modid.equals(c.get("modId")))) {
-                modified = true;
-                var tmp = Config.inMemory();
-                tmp.set("modId", modid);
-                modlist.add(tmp);
-            }
-        }
-
-        cfg.set("mods", modlist);
-
-        if (modified) {
-            var target = root.resolve(MODS_TOML);
-            try {
-                Files.createDirectories(target.getParent());
-                new TomlWriter().write(cfg, target, WritingMode.REPLACE);
-            } catch (IOException e) {
-                throw new IllegalStateException("Failed to create in memory toml: " + target, e);
-            }
-        }
-    }
-
-    // This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there.
-    private void buildPackMeta(Set<Path> paths, Path root) {
-        var existing = paths.stream()
-                .map(p -> p.resolve(PACK_META))
-                .filter(Files::exists)
-                .findFirst()
-                .orElse(null);
-
-        if (existing != null)
-            return;
-        var target = root.resolve(PACK_META);
-        try {
-            Files.createDirectories(target.getParent());
-            Files.writeString(target,
-            """
-            {
-                "pack": {
-                    "description": "doesn't matter",
-                    "pack_format": 18
-                 }
-            }
-            """, StandardCharsets.UTF_8, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to make in memory pack.mcmeta: " + target, e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <E extends Throwable, R> R sneak(Throwable e) throws E {
-        throw (E)e;
-    }
-}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class ForgeGametestDevLaunchHandler extends CommonDevLaunchHandler {
+    @Override public String name() { return "forgegametestserverdev"; }
+    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
+    }
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.targets;
+
+import net.minecraftforge.api.distmarker.Dist;
+
+public class ForgeGametestUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
+    @Override public String name() { return "forgegametestserveruserdev"; }
+    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
+
+    @Override
+    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
+        Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
+    }
+}

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

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import java.nio.file.Path;
-import java.util.List;
-import org.jetbrains.annotations.ApiStatus;
-
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LibraryFinder;
-
-@ApiStatus.Internal
-abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
-    protected ForgeProdLaunchHandler(LaunchType type) {
-        super(type, "forge_");
-    }
-
-    @Override public String getNaming() { return "srg"; }
-    @Override public boolean isProduction() { return true; }
-
-    @Override
-    public List<Path> getMinecraftPaths() {
-        var vers = FMLLoader.versionInfo();
-        var mc = LibraryFinder.findPathForMaven(vers.forgeGroup(), "forge", "", this.type.name(), vers.mcAndForgeVersion());
-        return List.of(mc);
-    }
-
-    public static class Client extends ForgeProdLaunchHandler {
-        public Client() {
-            super(CLIENT);
-        }
-    }
-
-    public static class Server extends ForgeProdLaunchHandler {
-        public Server() {
-            super(SERVER);
-        }
-    }
-}