Fix ForgeDev run configs, and bump ForgeGradle (#10613)

* ForgeGradle 6, Gradle 8.4, ASM 9.6
* Apply official mappings to patches (still using MCP classnames)
* Remove reference to SpecialSource in reobfJar-like tasks
* Backport modern MDK
* Rename TransformationMatrix methods to prevent reobf, add back vanilla name via coremod

.github/support.yml

@@ -0,0 +1,16 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: Forum
+# Comment to post on issues marked as support requests. Add a link
+# to a support page, or set to `false` to disable
+supportComment: >
+  👋 We use the issue tracker exclusively for final bug reports and feature requests.
+  However, this issue appears to be better suited for the
+  [Forge Support Forums](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
+  Please create a new topic on the support forum with this issue, and the conversation can
+  continue there.
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: true

.github/workflows/comments.yml

@@ -1,16 +0,0 @@
-name: 'Comment actions'
-
-on: issue_comment
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/comment_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}

.github/workflows/issues.yml

@@ -1,16 +0,0 @@
-name: 'Issue actions'
-
-on: issues
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/issue_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}

.github/workflows/pull_request_review.yml

@@ -1,13 +0,0 @@
-name: 'PR Review'
-
-on: pull_request_review
-
-jobs:
-  upload_payload:
-    name: Upload payload
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
-        with:
-          name: payload
-          path: ${{ github.event_path }}

.github/workflows/pull_request_review_comment.yml

@@ -1,13 +0,0 @@
-name: 'PR Review Comment'
-
-on: pull_request_review_comment
-
-jobs:
-  upload_payload:
-    name: Upload payload
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
-        with:
-          name: payload
-          path: ${{ github.event_path }}

.github/workflows/pull_request_review_comment_run.yml

@@ -1,20 +0,0 @@
-name: 'Pull Request Review Comment actions'
-
-on:
-  workflow_run:
-    workflows: [PR Review Comment]
-    types:
-      - completed
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/pr_review_comment_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}

.github/workflows/pull_request_review_run.yml

@@ -1,20 +0,0 @@
-name: 'Pull Request Review actions'
-
-on:
-  workflow_run:
-    workflows: [PR Review]
-    types:
-      - completed
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/pr_review_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}

.github/workflows/pull_requests.yml

@@ -1,18 +0,0 @@
-name: 'Pull Request actions'
-
-on:
-  pull_request_target:
-    types: [assigned, unassigned, labeled, unlabeled, opened, edited, closed, reopened, synchronize, converted_to_draft, ready_for_review, locked, unlocked, review_requested, review_request_removed, auto_merge_enabled, auto_merge_disabled]
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/pr_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}

.github/workflows/push.yml

@@ -1,16 +0,0 @@
-name: 'Push actions'
-
-on: push
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/push_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}

.gitignore

@@ -9,37 +9,29 @@
 
 #idea
 /.idea
-/*/out
 /classes
 *.iml
 
 #gradle
 /build
 /.gradle
-/*/build
-/*/.gradle
+/mdk/.gradle
+/mdk/build
 
-# Projects repo, either ignore it, or ignore patches.
+#occupational hazards
 /projects/mcp/
 /projects/clean/
 /projects/forge/
-/projects/fmlonly/
-#/patches/*
-
-#occupational hazards
 /projects/**/build/
 /projects/**/out/
 /projects/**/run/
 /projects/**/*.launch
 /repo/
 src/generated/resources/.cache/
-src/generated_test/resources/.cache/
-src/generated_mdk/resources/.cache/
 
 #Patch rejects
 /patches-/
 *.patch.rej
-/projects/*/rejects/
 
 # FML changelog
 changelog.txt
@@ -47,3 +39,8 @@ changelog.txt
 *.7z
 /logs/
 
+/projects/forge/rejects/
+
+# Srg2Source causes import bugs on these patches. If you intentionnally change these, remove the ignore.
+/patches/minecraft/net/minecraft/client/renderer/ViewFrustum.java.patch
+/patches/minecraft/net/minecraft/data/BlockModelDefinition.java.patch

.teamcity/settings.kts

@@ -36,8 +36,8 @@ project {
     buildType(PullRequestCompatibility)
 
     params {
-        text("docker_jdk_version", "21", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "8.8", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_jdk_version", "8", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_gradle_version", "7.3.3", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("git_branch_spec", """
                 +:refs/heads/(main*)
@@ -47,14 +47,12 @@ 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)
-        password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN)
-        text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
+        password("env.LEGACY_KEYSTORE_URL", "credentialsJSON:a2d2efc7-4492-47b6-9826-d14b2c1243a0", display = ParameterDisplay.HIDDEN)
+        password("env.LEGACY_KEYSTORE_PASSWORD", "credentialsJSON:9f9a1a9e-f91b-40d5-b888-8ebc79a99ded", display = ParameterDisplay.HIDDEN)
+        text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.LEGACY_KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.LEGACY_KEYSTORE_PASSWORD% -Pkeystore=%env.LEGACY_KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
 
         checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
             checked = "true", unchecked = "false")
@@ -76,19 +74,6 @@ 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({
@@ -129,14 +114,6 @@ object PullRequests : BuildType({
             allowEmpty = false
         )
     }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
 })
 
 object PullRequestChecks : BuildType({
@@ -155,7 +132,7 @@ object PullRequestChecks : BuildType({
             enableStacktrace = true
             dockerImage = "%docker_gradle_image%"
             dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
                 -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                 --network=host
                 -u 1000:1000
@@ -189,7 +166,7 @@ object PullRequestCompatibility : BuildType({
             enableStacktrace = true
             dockerImage = "%docker_gradle_image%"
             dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
                 -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                 --network=host
                 -u 1000:1000
@@ -205,4 +182,4 @@ object PullRequestCompatibility : BuildType({
             -:<default>
         """.trimIndent()
     }
-})
+})

Jenkinsfile

@@ -0,0 +1,114 @@
+@Library('forge-shared-library')_
+
+pipeline {
+    options {
+        disableConcurrentBuilds()
+    }
+    agent {
+        docker {
+            image 'gradle:jdk8'
+            args '-v forgegc:/home/gradle/.gradle/'
+        }
+    }
+    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('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()
+                }
+            }
+        }
+        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} :forge: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
+                }
+            }
+        }
+        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} :forge: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/.gitignore

@@ -1,3 +1,2 @@
 /.gradle/
 /build/
-/out/

buildSrc/build.gradle

@@ -1,13 +1,11 @@
 repositories {
-    maven { url = 'https://maven.minecraftforge.net/' }
+	maven { url = 'https://maven.minecraftforge.net/' }
 	mavenCentral()
 }
-
 dependencies {
-    implementation 'org.ow2.asm:asm:9.5'
-    implementation 'org.ow2.asm:asm-tree:9.5'
-    implementation 'net.minecraftforge:srgutils:0.5.+'
-    implementation 'commons-io:commons-io:2.12.0'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
+	implementation 'org.ow2.asm:asm:9.6'
+	implementation 'org.ow2.asm:asm-tree:9.6'
+	implementation 'net.minecraftforge:srgutils:0.4.+'
+	implementation 'commons-io:commons-io:2.12.0'
+	implementation 'com.google.code.gson:gson:2.10'
 }

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

@@ -6,10 +6,15 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
 abstract class BytecodeFinder extends DefaultTask {
     @InputFile abstract RegularFileProperty getJar()
     // It should be fine to mark the output as internal as we want to control when we run it anyways.
@@ -30,7 +35,18 @@ abstract class BytecodeFinder extends DefaultTask {
 
         pre()
 
-        Util.processClassNodes(jar.get().asFile, this::process)
+        jar.get().asFile.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                ZipEntry zein
+                while ((zein = zin.nextEntry) != null) {
+                    if (zein.name.endsWith('.class')) {
+                        def node = new ClassNode(Opcodes.ASM9)
+                        new ClassReader(zin).accept(node, 0)
+                        process(node)
+                    }
+                }
+            }
+        }
 
         post()
         outputFile.text = new JsonBuilder(getData()).toPrettyString()

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

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

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

@@ -1,15 +1,12 @@
 package net.minecraftforge.forge.tasks
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.OutputFiles
-import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
 
 import java.nio.file.Files
 

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

@@ -1,20 +1,11 @@
 package net.minecraftforge.forge.tasks
 
 import groovy.transform.EqualsAndHashCode
-
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.TreeMap
-import java.util.TreeSet
-import java.util.function.BiConsumer
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.*
-
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.Type
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Nested
+import org.gradle.api.tasks.Optional
 import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
 import static org.objectweb.asm.Opcodes.*

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

@@ -46,4 +46,4 @@ final class InheritanceData implements Annotatable {
 @CompileStatic
 interface Annotatable {
     List<InheritanceData.Annotation> getAnnotations()
-}
+}

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

@@ -1,44 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.tasks.*
-import org.gradle.api.provider.SetProperty
-
-abstract class InstallerJar extends Zip {
-    @Input @Optional abstract SetProperty<String> getPackedDependencies()
-
-    InstallerJar() {
-        archiveClassifier.set('installer')
-        archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
-        destinationDirectory.set(project.layout.buildDirectory.dir('libs'))
-
-        def installerJson = project.tasks.installerJson
-        def launcherJson = project.tasks.launcherJson
-        def downloadInstaller = project.tasks.downloadInstaller
-
-        dependsOn(installerJson, launcherJson, downloadInstaller)
-        from(installerJson, launcherJson)
-
-        from(project.rootProject.file('/src/main/resources/url.png'))
-        project.afterEvaluate {
-            from(project.zipTree(downloadInstaller.output)) {
-                duplicatesStrategy = 'exclude'
-            }
-
-            if (!System.env.TEAMCITY_VERSION) {
-                dependsOn(project.universalJar)
-                from(project.universalJar) {
-                    into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/'
-                }
-
-                packedDependencies.get().forEach {
-                    def jarTask = project.rootProject.getTasks().findByPath(it)
-                    dependsOn(jarTask)
-                    from(jarTask) {
-                        into '/maven/' + jarTask.project.group.replace('.', '/') + '/' + jarTask.archiveBaseName.get() + '/' + jarTask.project.version + '/'
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,81 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.provider.SetProperty
-import org.gradle.api.tasks.*
-
-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()
-    @Input abstract Property<String> getLauncherJsonName()
-    @Input abstract Property<String> getLogo()
-    @Input abstract Property<String> getMirrors()
-    @Input abstract Property<String> getWelcome()
-
-    InstallerJson() {
-        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 {
-            (packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]).forEach {
-                dependsOn(it)
-                input.from it.archiveFile
-            }
-        }
-    }
-
-    @TaskAction
-    protected void exec() {
-        def libs = libraries
-        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: path,
-                        url: "https://maven.minecraftforge.net/${path}",
-                        sha1: child.archiveFile.get().asFile.sha1(),
-                        size: child.archiveFile.get().asFile.length()
-                    ]
-                ]
-            ])
-        }
-        json.libraries = libs.values().sort{a,b -> a.name.compareTo(b.name)}
-        json.icon = "data:image/png;base64," + new String(Base64.getEncoder().encode(Files.readAllBytes(icon.get().asFile.toPath())))
-        json.json = launcherJsonName.get()
-        json.logo = logo.get()
-        if (!mirrors.get().isEmpty())
-            json.mirrorList = mirrors.get()
-        json.welcome = welcome.get()
-
-        Files.writeString(output.get().getAsFile().toPath(), new JsonBuilder(json).toPrettyString())
-    }
-}

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

@@ -1,74 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.SetProperty
-import org.gradle.api.tasks.*
-
-import java.nio.file.Files
-
-import static net.minecraftforge.forge.tasks.Util.getArtifacts
-import static net.minecraftforge.forge.tasks.Util.iso8601Now
-
-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() {
-        getOutput().convention(project.layout.buildDirectory.file('version.json'))
-
-        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() {
-        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: path,
-                        url: "https://maven.minecraftforge.net/${path}",
-                        sha1: it.archiveFile.get().asFile.sha1(),
-                        size: it.archiveFile.get().asFile.length()
-                    ]
-                ]
-            ]
-        }
-        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/MergeJars.groovy

@@ -41,4 +41,4 @@ abstract class MergeJars extends DefaultTask {
 
     @OutputFile
     abstract RegularFileProperty getOutput()
-}
+}

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

@@ -26,16 +26,6 @@ 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 {
@@ -54,4 +44,4 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
 
     @OutputFile
     abstract RegularFileProperty getBaseBinPatchesOutput()
-}
+}

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

@@ -1,74 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import groovy.transform.CompileStatic
-import org.eclipse.jgit.api.Git
-
-import javax.annotation.Nullable
-import java.util.stream.Collectors
-
-@CompileStatic
-class TeamcityRequests {
-    public static final Gson GSON = new Gson()
-
-    @Nullable
-    static <T> T jsonRequest(TypeToken<T> clazz, String url) throws Exception {
-        final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection()
-        conn.setRequestProperty('Accept', 'application/json')
-        conn.setReadTimeout(5 * 1000)
-        conn.setConnectTimeout(5 * 1000)
-        conn.connect()
-
-        if (conn.responseCode !== 200) {
-            return null
-        }
-
-        try (final InputStream is = conn.getInputStream()) {
-            GSON.fromJson(new InputStreamReader(is), clazz.getType())
-        }
-    }
-
-    @Nullable
-    static Map<String, Build> buildsByCommit() throws IOException {
-        final Map<String, Build> builds = [:]
-        jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
-                ?.build?.forEach {
-            it.revisions.revision.each { rev -> builds[rev.version] = it }
-        }
-        return builds
-    }
-
-    @Nullable
-    static String attemptFindBase(File gitPath) {
-        try (final git = Git.open(gitPath)) {
-            final Map<String, Build> buildByCommit = buildsByCommit()
-            for (final commit in git.log().setMaxCount(100).call()) {
-                // Find the first commit which was built on CI
-                final build = buildByCommit[commit.id.name]
-                if (build) {
-                    return build.number
-                }
-            }
-        } catch (Exception ignored) {}
-        return null
-    }
-
-    static final class Builds {
-        public List<Build> build
-    }
-
-    static final class Build {
-        public String number
-        public Revisions revisions
-    }
-
-    static final class Revisions {
-        public int count
-        public List<Revision> revision
-    }
-
-    static final class Revision {
-        public String version
-    }
-}

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

@@ -1,21 +1,11 @@
 package net.minecraftforge.forge.tasks
 
-import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.tree.ClassNode
 
-import java.io.File
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
 
 public class Util {
-    static final ASM_LEVEL = Opcodes.ASM9
-
 	static void init() {
 		File.metaClass.sha1 = { ->
 			MessageDigest md = MessageDigest.getInstance('SHA-1')
@@ -24,18 +14,15 @@ public class Util {
 			}
 			return md.digest().collect {String.format "%02x", it}.join()
 		}
-        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
-
+	
 		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]
 		}
-
+        
         String.metaClass.rsplit = { String del, int limit = -1 ->
             def lst = new ArrayList()
             def x = 0, idx
@@ -48,7 +35,7 @@ public class Util {
             return lst
         }
 	}
-
+	
 	public static String[] getClasspath(project, libs, artifact) {
 		def ret = []
 		artifactTree(project, artifact).each { key, lib ->
@@ -58,7 +45,7 @@ public class Util {
 		}
 		return ret
 	}
-
+	
 	public static def getArtifacts(project, config, classifiers) {
 		def ret = [:]
 		config.resolvedConfiguration.resolvedArtifacts.each {
@@ -81,6 +68,14 @@ public class Util {
 			if (!checkExists(url)) {
 				url = "https://maven.minecraftforge.net/${path}"
 			}
+			//TODO remove when Mojang launcher is updated
+			if (!classifiers && art.classifier != null) { 
+				//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
+				// However, keep the path normal so that our mirror system works.
+				art.version = "${art.version}-${art.classifier}"
+				art.classifier = null
+				art.extension = 'jar'
+			}
 			ret[key] = [
 				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
 				downloads: [
@@ -96,17 +91,6 @@ public class Util {
 		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 def getMavenDep(task) {
-        def classifier = task.archiveClassifier.get()
-        return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
-    }
-
 	public static def iso8601Now() { new Date().iso8601() }
 
 	public static def sha1(file) {
@@ -126,7 +110,7 @@ public class Util {
 		def files = cfg.resolve()
 		return getArtifacts(project, cfg, true)
 	}
-
+	
 	private static boolean checkExists(url) {
 		try {
 			def code = new URL(url).openConnection().with {
@@ -142,24 +126,8 @@ public class Util {
 		}
 	}
 
-    static String getLatestForgeVersion(mcVersion) {
-        final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
-        final ver = json.promos["$mcVersion-latest"]
-        ver === null ? null : (mcVersion + '-' + ver)
-    }
-
-    static void processClassNodes(File file, Closure process) {
-        file.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
-                    if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(ASM_LEVEL)
-                        new ClassReader(zin).accept(node, 0)
-                        process(node)
-                    }
-                }
-            }
-        }
-    }
+	public static String getLatestForgeVersion(mcVersion) {
+		def json = new JsonSlurper().parseText(new URL("https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json").getText("UTF-8"))
+		return json.promos["$mcVersion-latest"]
+	}
 }

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

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

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

@@ -1,6 +1,5 @@
 package net.minecraftforge.forge.tasks.checks
 
-import net.minecraftforge.forge.tasks.Util
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
@@ -8,6 +7,7 @@ import org.gradle.api.tasks.InputFiles
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
+import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 
 import java.util.zip.ZipEntry
@@ -67,7 +67,7 @@ abstract class CheckExcs extends CheckTask {
     private void collectKnown(Collection<String> known) {
         binary.get().asFile.withInputStream { i ->
             new ZipInputStream(i).withCloseable { zin ->
-                final visitor = new ClassVisitor(Util.ASM_LEVEL) {
+                final visitor = new ClassVisitor(Opcodes.ASM9) {
                     private String cls
                     @Override
                     void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {

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

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

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

@@ -91,20 +91,18 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
                                                    @DelegatesTo(genericTypeIndex = 0, target = 'type') Closure configuration) {
         taskName = taskName.capitalize()
         tasks.register("check$taskName", clazz) { CheckTask task ->
-            def castedTask = task as T
-            configuration.setDelegate(castedTask)
-            configuration.call(castedTask)
-            castedTask.mode.set(CheckMode.CHECK)
-            castedTask.group = 'checks'
+            configuration.setDelegate((T) task)
+            configuration.call(task)
+            task.mode.set(CheckMode.CHECK)
+            task.group = 'checks'
         }
         tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
 
         tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
-            def castedTask = task as T
-            configuration.setDelegate(castedTask)
-            configuration.call(castedTask)
-            castedTask.mode.set(CheckMode.CHECK)
-            castedTask.group = 'checks'
+            configuration.setDelegate((T) task)
+            configuration.call(task)
+            task.mode.set(CheckMode.FIX)
+            task.group = 'checks'
         }
         tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
     }

docs/CONTRIBUTING.md

@@ -1,13 +1,13 @@
 Contributing to Forge
 =====================
 
-1) Keep patches to Minecraft classes together. If you need a lot of things done, you may either add to relevant forge classes or make a new class. Try not to spread out your patches across multiple disjoint lines, as this makes maintenance of your patches difficult.
+1) Keep patches to Minecraft classes minimal. If you need a lot of things done, you may either add to relevant forge classes or make a new class.
 
-2) TODO: Test Mods
+2) An example mod must be provided for all PRs adding events/hooks to Forge. Whether it's a full mod using your proposed hooks, or just a pastebin containing a simple example, an example mod is required. Please also explain in detail what your new hook does.
 
-3) Follow the code style of the class you're working in (braces on newlines & spaces instead of tabs in Forge classes, inline brackets in patches, etc).
+3) Follow Forge coding guidelines (braces on newlines, spaces instead of tabs, etc)
 
-For more information, refer to [the wiki][Wiki].
+For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
 
 
 Contributor License Agreement
@@ -15,6 +15,8 @@ Contributor License Agreement
 - You grant Forge a license to use your code contributed to the primary codebase (everything **not** under patches) in Forge, under the LGPLv2.1 license.
 - You assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the LGPLv2.1 license.
 
-"Forge" is Forge Development LLC, a legally incorporated entity in Oregon, USA.
+Additionally, while 1.9.4 is being maintained, you will be asked to acknowledge these two additional clauses.
+- You grant Forge a license to use your code contributed to the primary codebase (everything **not** under patches) in Forge, under the MinecraftForge license.
+- You grant assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the MinecraftForge license.
 
-[Wiki]: https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge
+"Forge" is Forge Development LLC, a legally incorporated entity in Oregon, USA.

docs/EnergySystems.md

@@ -0,0 +1,9 @@
+# On the Contribution of an RF-lite Energy System: "Energy"
+Forge has acquired an Energy system, after many years of debate on the topic. The prevalence of the RF API has warranted the inclusion of a similar (but simpler) implementation to forge for 1.10.2 and onwards.
+Those who wish to use an RF like API, feel free to use it. If you don't want to think about Energy, but know you need it, you can use it *if you wish*. If you want to interoperate with other energy systems, feel free to use this to broker with them.
+
+# On Diversity in Energy Systems
+Forge has always supported diversity in energy-like systems. If you have a burning desire to simulate electricity flow in all it's glory, we fully support you and look forward to playing your mod. If you wish to have pneumatic power, we have no objections, and would love to see your wonderful creations. If you have a power system of your own devising that is simply beyond our imagination, please, blow us away.
+
+# On Modder Obligations
+As a modder, you are under *no* obligation to use or support the forge Energy system. If anyone, user, mod-pack maker or even us, tells you otherwise, refer them to this statement. The Forge energy system is not intended to supplant diversity in energy systems. It is not intended to be one-size-fits-all. The choice to support it, is the choice of the modder.

docs/NewFML.md

@@ -0,0 +1,127 @@
+# FML
+
+Entrypoint : ```FMLServiceProvider.onLoad```
+
+- Verify environment
+-- Check all libraries are present: ```accesstransformer```, ```coremod```, ```deobfuscator```
+-- Check versions are suitable: ```modlauncher```, ```accesstransformer```, ```coremod```, ```deobfuscator```
+- Find deobfuscated and patched MC
+-- If not found, trigger job to generate that (loaded later at FMLLaunchProvider.launch)
+
+Injected arguments:
+
+- ```mods``` : CSV list of mod files to load
+- ```modlist``` : JSON formatted list of mod files in a maven-like repository format
+
+Entrypoint : ```FMLServiceProvider.initializer```
+- Setup paths
+-- ```mods``` folder
+-- ```config``` folder
+- FML config file read (JSON?)
+- Trigger initial loading
+
+Entrypoint : ```FMLLaunchProvider.launch```
+- Launches the patched and deobfuscated game
+- - If that wasn't found it'll be generated from the vanilla jar and patch/deobf files (see above)
+- Possible we'll use an alternative launch for the development environment
+
+(A goal is that we pre-generate this JAR during forge installation or modpack installation)
+
+## Loading
+
+- First we discover all mods
+- - IModLocator instances present in system are found and queried to compile a master list of all mod artifacts of the three types
+- LANGPROVIDERs are added to the supported language system : IModLanguageProvider
+- The MODS from the list have their META-INF/mods.json file queried for mod instances to load
+- - MODS are cross-referenced for their language being available
+- - MODS are cross-referenced for their libraries being available
+- - MODS are cross-referenced for their MOD dependencies being available
+- - MODS with META-INF/coremods.json specification are loaded into the COREMOD system
+- - MODS with META-INF/accesstransformer.json are loaded into the ACCESSTRANSFORMER system
+- - MODS are enqueued to the background loading system
+- FMLLaunchProvider will be triggered from the ModLauncher to start the game
+
+## Game loading
+
+- Events triggered from loadGame will launch various phases of modloading as before
+-- Deprecation of old "FML" events in favour of Forge events
+-- If a mod hasn't completed scanning there might be a pause waiting for it to complete before loading (testing indicates this should be a very rare occurrence and isn't worse than existing status quo where all scanning and loading is on-thread)
+
+### ```IModLocator```
+
+Finds mods from various sources of various types
+manifest is queried for type: FMLModType
+
+- MOD : this file will be scanned as a mod. This is default if nothing is present
+- LIBRARY : this file will be added to the classpath and no further processing is done
+- LANGPROVIDER : this file will be loaded as a language provider
+
+#### ```ModsFolderLocator```
+
+- scans for jar files from mods folder
+-- able to load all types
+-- loads in all environments
+-- maybe able to do runtime name transformation for dev time?
+
+Standard mechanism to find and load mods
+
+#### ```ExplodedDirectoryLocator```
+
+- loads a directory as a mod
+-- only able to load mods
+-- should only load in dev env
+
+Intended as a mechanism to allow development of mods easily by pointing at a compiled output directory
+
+#### ```ArgumentModsLocator``` : NYI
+
+- loads mods from the arguments on the command line
+-- able to load all types
+-- loads in all environments
+
+### ```IModLanguageProvider```
+
+Provides mod and language provider services
+
+- Provides a means to transform a Mod File (from the IModLocator) into a list of modcontainer objects based on mods.json
+- Scanning work will be done in background threads
+- Language providers can be provided as JARs via the modlocator for ease of distribution
+
+#### ```FMLModLanguageProvider```
+
+This is the standard Java @Mod implementation provider
+
+- provided by default (always supported)
+- All scanning for @Mod will be done in the background thread
+
+#### ```ScalaModLanguageProvider```
+
+This is the scala language provider. It'll be provided separately as a JAR mod download.
+
+- API contract will need definition
+
+Other languages? Kotlin? Alternative Scala versions? Javascript?
+
+## Coremods
+
+Coremods are now forcefully separated into _injection_ and _runtime_ phases.
+
+### Injection
+
+Injection is the act of intercepting the loading of a class and modifying the inbound class with alterations such as additions, replacements and deletions
+
+Injections will be written using Javascript. Two functions are required: a function providing the list of injection sites, and the function to transform the injection site.
+
+All injection sites will need to be pre-specified by the coremod in their metadata. Lookup services should be provided in the Javascript API.
+
+Javascript API for common coremod injection tasks needs to be developed, to allow common best-practice tooling for these complex tasks.
+
+Runtime coremod code (code that has been injected) is Java as usual.
+
+## Background loading thread
+
+Early in loading, a background thread is triggered which will perform scanning tasks for common resources, such as @Mod instances and other annotations. This thread will also be responsible for loading any cached resources, either those defined at build time or pre-computed from previous runs. It may also be tasked with writing those precomputed resources.
+
+There will be a IPreLoaderJobProvider that will allow extension of the scope of these tasks
+
+

docs/README.md

@@ -2,24 +2,28 @@
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19.4-&query=$.promos["1.19.4-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.4-&query=$.promos["1.19.4-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
-)][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon]
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.16.5-&query=$.promos["1.16.5-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.16.5-&query=$.promos["1.16.5-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+)](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)](https://discord.gg/UvedJ9m) [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos)
 
 Forge is a free, open-source modding API all of your favourite mods use!
 
-| Version      | Support                     |
-|--------------|-----------------------------|
-| All versions | [Supported][Support-Policy] |
+| Version  | Support |
+| ------------- | ------------- |
+| 1.16.x  | Active  |
+| 1.15.x  | LTS  |
 
 * [Download]
 * [Forum]
 * [Discord]
 * [Documentation]
 
+#### Notes:
+- Introduced in 1.13 was a new FML, information found [here](NewFML.md).
+
 # Installing Forge
 
-Go to [the Forge website][Download]
+Go to [the Forge website](https://files.minecraftforge.net)
  and select the Minecraft version you wish to get Forge for from the list.
 
 You can download the installer for the *Recommended Build* or the
@@ -28,68 +32,37 @@ You can download the installer for the *Recommended Build* or the
  into your vanilla launcher environment, where you can then create a new
  profile using that version and play the game!
  
-For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
+For support and questions, visit [the Support Forum](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
 
-## Required Java Versions
-
-We require the version of Java that Minecraft requires, which is currently:
-
-| Minecraft     | Java              |
-|---------------|-------------------|
-| 1.20.6+       | [21][Adoptium-21] |
-| 1.18 - 1.20.4 | [17][Adoptium-17] |
-| 1.17.1        | [16][Adoptium-16] |
-| 1.16.5-       | [8][Adoptium-8]   |
-
-**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
+[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
 
 # Creating Mods
 
-[See the "Getting Started" section in the Forge Documentation][Getting-Started].
+[See the "Getting Started" section in the Forge Documentation](https://mcforge.readthedocs.io/en/latest/gettingstarted/).
 
 # Contribute to Forge
 
 If you wish to actually inspect Forge, submit PRs or otherwise work
  with Forge itself, you're in the right place!
-
- [See the guide to setting up a Forge workspace][ForgeDev].
+ 
+ [See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
 
 ### Pull requests
 
-[See the "Making Changes and Pull Requests" section in the Forge documentation][Pull-Requests].
+[See the "Making Changes and Pull Requests" section in the Forge documentation](https://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
 
-Please read the contributing guidelines found [here][Contributing] before making a pull request.
+Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
 
 ### Contributor License Agreement
-We require all contributors to acknowledge the [Forge Contributor License Agreement][CLA]. 
-Please ensure you have a valid email address associated with your GitHub account to do this. If you have previously 
+We require all contributors to acknowledge the [Forge Contributor
+ License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). Please ensure you have a valid email address
+ associated with your GitHub account to do this. If you have previously
  signed it, you should be OK.
 
 #### Donate
-*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free 
- to use and modify. However, it costs money to run such a large project as this, so please consider 
- [becoming a patron][Patreon].*
-
-[Contributing]: ./CONTRIBUTING.md
-[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
+*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free to use and modify. However, it costs money to run such a large project as this, so please consider [becoming a patron](https://www.patreon.com/LexManos).*
 
 [Download]: https://files.minecraftforge.net/
-
-[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
-[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
-[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
-[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
-[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
-
-[Forum]: https://forums.minecraftforge.net/
-[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
-[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
-
-[Discord]: https://discord.minecraftforge.net/
-
-[Documentation]: https://docs.minecraftforge.net/en/1.19.x/
-[Getting-Started]: https://docs.minecraftforge.net/en/1.19.x/gettingstarted/
-[ForgeDev]: https://docs.minecraftforge.net/en/1.19.x/forgedev/
-[Pull-Requests]: https://docs.minecraftforge.net/en/1.19.x/forgedev/#making-changes-and-pull-requests
-
-[Patreon]: https://www.patreon.com/LexManos
+[Forum]: https://www.minecraftforge.net/forum/
+[Discord]: https://discord.gg/UvedJ9m
+[Documentation]: https://mcforge.readthedocs.io

docs/SUPPORT.md

@@ -1,7 +1,7 @@
 Getting Support Surrounding Forge
 =================================
 
-**If you do not want to read the following wall of text, no matter its relevance for helping get your issue resolved quickly, please refer to the [Forge Forums][Bug-Reports] for support.**
+**If you do not want to read the following wall of text, no matter its relevance for helping get your issue resolved quickly, please refer to the [Forge Forums](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) for support.**
 
 Before reporting an issue on this repository's bug tracker, please carefully read this document. There are various resources that are more likely to be able to help you with certain kinds of issues. This document provides instructions on how to determine which place best to report to.
 
@@ -44,7 +44,7 @@ You can generally tell pretty quickly what caused the error at the head of your
  1. If you can find the name of a mod in the trace, that mod most likely is the culprit.
     - Be aware that you may find multiple mods as participants of a crash. In that case, you can either report to both or try to reason (using the names in the stacktrace) about which mod is at fault.
  2. If you can only find Forge (usually starting with `net.minecraftforge`) alongside Vanilla (usually starting with `net.minecraft`) references, chances are that you have found a bug in Forge. In this case, use one of the various [support channels](#forge-support) listed below.
-    - The occurrence of a single call to Forge somewhere in the stacktrace *does not* warrant a report to Forge if there are mods present in the crash report.
+    - The occurence of a single call to Forge somewhere in the stacktrace *does not* warrant a report to Forge if there are mods present in the crash report.
  3. If there's no mention of Forge or a mod, but any Vanilla class, you might have found a Vanilla bug. You should probably still report it via the Forge channels first, however, due the nature of modded environments and the rarity of Vanilla crash bugs.
  4. Always check whether there's a mention of coremods at the beginning of a crash report. If there is and you can't find any clear culprit, consider reporting to these coremods first, since they are free to change any of the code executed in your environment.
 
@@ -74,18 +74,17 @@ Please note that this list has to be considered incomplete as there is a large n
 
 If you're certain you've found an issue that is directly caused by Forge, you have the following three platforms available for dealing with it, with decreasing relevance for end-users:
 
- 1. **Forge Forums:** There's a dedicated [Support & Bug Report][Bug-Reports] section on the Forge forums, which is led by team of moderators and volunteers who will try to deal with your reports as quickly as possible. *As a player you should probably report here first.*
-   - For modders, there also is a separate [Modder Support][Modder-Support] section where you can ask all your development-related questions. *You should prefer this section for coding help.*
- 2. **Forge Discord Server:** You can find a lot of help on the official [Discord Server][Discord], especially smaller issues that you quickly need help with. *Be aware that the channel is more suited towards development questions, so while you may get support there as a player, you should almost always prefer the forums.*
- 3. **Forge Issue Tracker:** If you're absolutely certain that you've found an issue in the Forge codebase (e.g. you're a modder yourself and have analyzed the stacktrace and relevant code), don't refrain from reporting it on this repository's [issue tracker](https://github.com/MinecraftForge/MinecraftForge/issues). *Please do not use the issues as a means of getting coding help. For developers, the IRC and the [official documentation][Documentation] are the best sources of information.*
+ 1. **Forge Forums:** There's a dedicated [Support & Bug Report](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) section on the Forge forums, which is led by team of moderators and volunteers who will try to deal with your reports as quickly as possible. *As a player you should probably report here first.*
+   - For modders, there also is a separate [Modder Support](http://www.minecraftforge.net/forum/forum/70-modder-support/) section where you can ask all your development-related questions. *You should prefer this section for coding help.*
+ 2. **Forge IRC Channel:** You can find a lot of help on the official [`#minecraftforge`](irc://irc.esper.net:6667/minecraftforge) channel on EsperNet. Especially smaller issues that you quickly need help with could be reported there. *Be aware that the channel is more suited towards development questions, so while you may get support there as a player, you should almost always prefer the forums.*
+ 3. **Forge Issue Tracker:** If you're absolutely certain that you've found an issue in the Forge codebase (e.g. you're a modder yourself and have analyzed the stacktrace and relevant code), don't refrain from reporting it on this repository's [issue tracker](https://github.com/MinecraftForge/MinecraftForge/issues). *Please do not use the issues as a means of getting coding help. For developers, the IRC and the [official documentation](https://mcforge.readthedocs.io) are the best sources of information.*
 
 ### Mod Support
 
 A lot of mods also use GitHub or other source management systems and their integrated issue trackers. The following options will give you the best chances of reporting your issue in the right place:
 
  - **CurseForge:** Many mods are hosted on the [CurseForge platform](https://minecraft.curseforge.com) nowadays. Chances are you already downloaded them from there or as a part of a modpack hosted there. Projects may specify an issue reporting link on their own page, so simply look for it on the mod's project page and you should be directed to the preferred means of error reporting.
- - **Modrinth:** Some modders use [Modrinth](https://modrinth.com/mods) to host their mods, but be mindful that not all mods on this platform are for the Forge modloader.
- - **Searching for a repository directly:** You may need to try and find a repository directly on source control sites. The most common ones are [GitHub](https://github.com), [GitLab](https://gitlab.com), and [BitBucket](https://bitbucket.org). Both come with search capabilities, so simply try to search for the mod's name.
+ - **Searching for a repository directly:** You may need to try and find a repository directly on source control sites. The most common ones are [GitHub](https://github.com) and [BitBucket](https://bitbucket.org). Both come with search capabilities, so simply try to search for the mod's name.
 
 ### Vanilla Support
 
@@ -99,7 +98,7 @@ Now that you've identified the source of your issue and decided on the correct s
 ### Preventing Duplicates and Unnecessary Reports
 Use the target issue tracker's search functionality to look for issues which have descriptions similar to yours, but make sure to also search for already closed issues. If you can find one, verify it is in fact the same (or a very similar issue) and simply comment on it if you have anything else to contribute to the discussion, such as other steps to reproduce it. *Do not create duplicates of an existing issue, since it only puts extra effort on maintainers to recognize and close/mark them.*
 
-Additionally, always check the *latest* changelogs of Forge and participating mods to find out if the bug was already noticed and fixed by the developer. Often the maintainer may only support newer versions of the game, so also check the changelogs for versions of Minecraft you don't actually actively play. If the issue was addressed already, *do not report it*, even if the fix only exists for a newer version of the game, since the developer probably had a good reason to do so. If your issue only exists with versions of a mod that are for very old versions of the game, also refrain from reporting them, considering most modders only support the two latest versions of Minecraft, if at all.
+Additionally, always check the *latest* changelogs of Forge and participating mods to find out if the bug was already noticed and fixed by the developer. Often the maintainer may only support newer versions of the game, so also check the changelogs for versions of Minecraft you don't actually actively play. If the issue was adressed already, *do not report it*, even if the fix only exists for a newer version of the game, since the developer probably had a good reason to do so. If your issue only exists with versions of a mod that are for very old versions of the game, also refrain from reporting them, considering most modders only support the two latest versions of Minecraft, if at all.
 
 ### Required Information
 If you're certain that your issue went unnoticed up until now, you can get to actually writing up the report. Below you can find a list of the *required* information any bug report should contain:
@@ -144,11 +143,4 @@ After you have written your bug report, it is time to *wait*. Please be *patient
 
 Every project has a different way of dealing with issues, so don't wonder if there's no comment on it, but somebody "labels" it with certain markers. This helps developers to more easily keep track of bugs and priorities. When any further input from you is required, you will be asked specifically. Do not bug anyone through other channels about resolving your issue.
 
-Once your issue is closed, you will know whether it was valid or turned out to be unreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.
-
-[Bug-Reports]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
-[Modder-Support]: https://forums.minecraftforge.net/forum/70-modder-support/
-
-[Discord]: https://discord.minecraftforge.net/
-
-[Documentation]: https://docs.minecraftforge.net/
+Once your issue is closed, you will know whether it was valid or turned out to be irreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.

docs/assets/Forge_logo.svg

@@ -1,7 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="164.072 372.466 294.41 46.56">
-  <g fill="#DFA86A">
-    <path d="M266.16 417.99h10.96v-16.94h17.97v-10.27h-17.97v-7.01h19.06V373.5h-30.02zM337.33 378.7c-2.103-2.057-4.629-3.64-7.51-4.704-2.743-1.015-5.786-1.528-9.041-1.528l-.356.002c-3.362 0-6.503.556-9.338 1.651-2.857 1.106-5.357 2.707-7.434 4.761-2.073 2.052-3.714 4.559-4.877 7.45-1.158 2.876-1.748 6.104-1.748 9.59 0 3.417.59 6.582 1.753 9.403 1.163 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.834 1.096 5.975 1.651 9.339 1.651h.023c3.402-.043 6.57-.639 9.42-1.772 2.863-1.142 5.375-2.757 7.465-4.804 2.091-2.051 3.742-4.524 4.91-7.358 1.162-2.823 1.75-5.987 1.75-9.402 0-3.487-.588-6.705-1.748-9.568-1.168-2.874-2.82-5.371-4.913-7.425zm-4.644 16.762c0 1.96-.302 3.782-.896 5.413-.587 1.607-1.42 3.011-2.479 4.167-1.05 1.147-2.335 2.065-3.821 2.728-1.479.656-3.164.99-5.008.99-1.84 0-3.514-.333-4.973-.988-1.47-.662-2.747-1.578-3.799-2.729-1.062-1.156-1.895-2.559-2.479-4.167-.595-1.63-.896-3.451-.896-5.413 0-1.801.298-3.497.887-5.044.584-1.536 1.419-2.894 2.479-4.037 1.048-1.132 2.323-2.03 3.792-2.674 1.465-.642 3.145-.968 4.988-.968 1.848 0 3.539.326 5.025.971 1.481.643 2.766 1.541 3.812 2.671 1.062 1.143 1.896 2.501 2.479 4.036.589 1.548.889 3.245.889 5.044zM376.27 395.65c1.902-2.327 2.867-5.221 2.867-8.603 0-2.614-.508-4.84-1.506-6.613-.997-1.762-2.354-3.188-4.035-4.234-1.603-.995-3.445-1.705-5.482-2.114-1.938-.388-3.969-.583-6.037-.583h-16.021v44.487h10.961v-17.282h2.35l9.447 17.282h13.127l-11.199-18.646c2.262-.728 4.116-1.964 5.528-3.694zm-19.254-12.223h4.426c.844 0 1.73.054 2.636.16.784.094 1.503.283 2.132.568.496.225.888.553 1.193.998.283.415.428 1.031.428 1.836 0 .931-.16 1.643-.459 2.06-.34.472-.771.813-1.32 1.046-.686.289-1.459.477-2.301.554-.975.089-1.963.136-2.938.136h-3.795l-.002-7.358z"/>
-    <path d="M394.82 386.38c1.05-1.132 2.325-2.03 3.793-2.674 1.464-.642 3.144-.968 4.988-.968 1.843 0 3.611.311 5.26.921 1.609.599 2.992 1.449 4.107 2.531l1.314 1.278 8.019-8.105-1.454-1.298c-2.355-2.103-5.066-3.586-8.058-4.407-2.879-.789-5.987-1.189-9.247-1.189-3.361 0-6.503.556-9.339 1.651-2.856 1.106-5.355 2.707-7.431 4.761-2.074 2.052-3.716 4.559-4.88 7.45-1.158 2.876-1.746 6.104-1.746 9.59 0 3.417.59 6.582 1.752 9.403 1.164 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.832 1.096 5.975 1.651 9.339 1.651 6.501 0 12.475-1.432 17.751-4.25l.979-.522v-23.814h-19.313v10.27h8.354v6.639c-.871.397-1.834.709-2.881.933-1.5.314-3.127.478-4.83.478-1.841 0-3.514-.333-4.973-.988-1.472-.662-2.748-1.578-3.801-2.729-1.06-1.156-1.893-2.559-2.478-4.167-.595-1.63-.896-3.451-.896-5.413 0-1.801.299-3.497.887-5.044.586-1.54 1.421-2.897 2.479-4.041zM437.69 407.72v-7.36h18.72v-10.27h-18.72v-6.32h19.75V373.5h-30.72v44.49h31.76v-10.27z"/>
-  </g>
-  <path fill="#1E2D41" d="m243.63 379.09-37.842-1.852 46.229-.034v-3.727h-52.125l-.001 7.798v6.201c0 .115-1.52-9.144-1.87-11.734h-4.098v13.029c0 .123-1.753-10.888-1.939-12.264H164.07c1.902 1.648 12.401 10.598 19.865 14.28 3.741 1.846 8.33 1.86 12.414 1.974 2.075.06 4.25.217 5.803 1.754 2.255 2.236 2.758 5.704.814 8.33-1.922 2.594-7.335 3.156-7.335 3.156l-4.509 5.531v6.424h10.251l.319-6.348 8.863-6.285c-.946.757-3.058 2.783-6.229 7.666-.717 1.102-1.275 2.306-1.711 3.49 2.238-1.896 6.84-3.194 12.153-3.194 5.307 0 9.903 1.295 12.146 3.188-.437-1.185-.994-2.385-1.709-3.483-3.172-4.883-5.284-6.909-6.229-7.666l8.863 6.285.32 6.348h9.565v-6.424l-4.507-5.531s-6.675-.425-8.423-3.156c-5.032-7.869 2.115-20.082 18.836-23.756z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg enable-background="new 164.072 372.466 294.41 46.56" version="1.1" viewBox="164.072 372.466 294.41 46.56" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#DFA86A">
+		<polygon points="266.16 417.99 277.12 417.99 277.12 401.05 295.09 401.05 295.09 390.78 277.12 390.78 277.12 383.77 296.18 383.77 296.18 373.5 266.16 373.5"/>
+		<path d="m337.33 378.7c-2.103-2.057-4.629-3.64-7.51-4.704-2.743-1.015-5.786-1.528-9.041-1.528l-0.356 2e-3c-3.362 0-6.503 0.556-9.338 1.651-2.857 1.106-5.357 2.707-7.434 4.761-2.073 2.052-3.714 4.559-4.877 7.45-1.158 2.876-1.748 6.104-1.748 9.59 0 3.417 0.59 6.582 1.753 9.403 1.163 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.834 1.096 5.975 1.651 9.339 1.651h0.023c3.402-0.043 6.57-0.639 9.42-1.772 2.863-1.142 5.375-2.757 7.465-4.804 2.091-2.051 3.742-4.524 4.91-7.358 1.162-2.823 1.75-5.987 1.75-9.402 0-3.487-0.588-6.705-1.748-9.568-1.168-2.874-2.82-5.371-4.913-7.425zm-4.644 16.762c0 1.96-0.302 3.782-0.896 5.413-0.587 1.607-1.42 3.011-2.479 4.167-1.05 1.147-2.335 2.065-3.821 2.728-1.479 0.656-3.164 0.99-5.008 0.99-1.84 0-3.514-0.333-4.973-0.988-1.47-0.662-2.747-1.578-3.799-2.729-1.062-1.156-1.895-2.559-2.479-4.167-0.595-1.63-0.896-3.451-0.896-5.413 0-1.801 0.298-3.497 0.887-5.044 0.584-1.536 1.419-2.894 2.479-4.037 1.048-1.132 2.323-2.03 3.792-2.674 1.465-0.642 3.145-0.968 4.988-0.968 1.848 0 3.539 0.326 5.025 0.971 1.481 0.643 2.766 1.541 3.812 2.671 1.062 1.143 1.896 2.501 2.479 4.036 0.589 1.548 0.889 3.245 0.889 5.044z"/>
+		<path d="m376.27 395.65c1.902-2.327 2.867-5.221 2.867-8.603 0-2.614-0.508-4.84-1.506-6.613-0.997-1.762-2.354-3.188-4.035-4.234-1.603-0.995-3.445-1.705-5.482-2.114-1.938-0.388-3.969-0.583-6.037-0.583h-16.021v44.487h10.961v-17.282h2.35l9.447 17.282h13.127l-11.199-18.646c2.262-0.728 4.116-1.964 5.528-3.694zm-19.254-12.223h4.426c0.844 0 1.73 0.054 2.636 0.16 0.784 0.094 1.503 0.283 2.132 0.568 0.496 0.225 0.888 0.553 1.193 0.998 0.283 0.415 0.428 1.031 0.428 1.836 0 0.931-0.16 1.643-0.459 2.06-0.34 0.472-0.771 0.813-1.32 1.046-0.686 0.289-1.459 0.477-2.301 0.554-0.975 0.089-1.963 0.136-2.938 0.136h-3.795l-2e-3 -7.358z"/>
+		<path d="m394.82 386.38c1.05-1.132 2.325-2.03 3.793-2.674 1.464-0.642 3.144-0.968 4.988-0.968 1.843 0 3.611 0.311 5.26 0.921 1.609 0.599 2.992 1.449 4.107 2.531l1.314 1.278 8.019-8.105-1.454-1.298c-2.355-2.103-5.066-3.586-8.058-4.407-2.879-0.789-5.987-1.189-9.247-1.189-3.361 0-6.503 0.556-9.339 1.651-2.856 1.106-5.355 2.707-7.431 4.761-2.074 2.052-3.716 4.559-4.88 7.45-1.158 2.876-1.746 6.104-1.746 9.59 0 3.417 0.59 6.582 1.752 9.403 1.164 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.832 1.096 5.975 1.651 9.339 1.651 6.501 0 12.475-1.432 17.751-4.25l0.979-0.522v-23.814h-19.313v10.27h8.354v6.639c-0.871 0.397-1.834 0.709-2.881 0.933-1.5 0.314-3.127 0.478-4.83 0.478-1.841 0-3.514-0.333-4.973-0.988-1.472-0.662-2.748-1.578-3.801-2.729-1.06-1.156-1.893-2.559-2.478-4.167-0.595-1.63-0.896-3.451-0.896-5.413 0-1.801 0.299-3.497 0.887-5.044 0.586-1.54 1.421-2.897 2.479-4.041z"/>
+		<polygon points="437.69 407.72 437.69 400.36 456.41 400.36 456.41 390.09 437.69 390.09 437.69 383.77 457.44 383.77 457.44 373.5 426.72 373.5 426.72 417.99 458.48 417.99 458.48 407.72"/>
+	</g>
+	<path d="m243.63 379.09l-37.842-1.852 46.229-0.034v-3.727h-52.125l-1e-3 7.798v6.201c0 0.115-1.52-9.144-1.87-11.734h-4.098v13.029c0 0.123-1.753-10.888-1.939-12.264h-27.914c1.902 1.648 12.401 10.598 19.865 14.28 3.741 1.846 8.33 1.86 12.414 1.974 2.075 0.06 4.25 0.217 5.803 1.754 2.255 2.236 2.758 5.704 0.814 8.33-1.922 2.594-7.335 3.156-7.335 3.156l-4.509 5.531v6.424h10.251l0.319-6.348 8.863-6.285c-0.946 0.757-3.058 2.783-6.229 7.666-0.717 1.102-1.275 2.306-1.711 3.49 2.238-1.896 6.84-3.194 12.153-3.194 5.307 0 9.903 1.295 12.146 3.188-0.437-1.185-0.994-2.385-1.709-3.483-3.172-4.883-5.284-6.909-6.229-7.666l8.863 6.285 0.32 6.348h9.565v-6.424l-4.507-5.531s-6.675-0.425-8.423-3.156c-5.032-7.869 2.115-20.082 18.836-23.756z" fill="#1E2D41"/>
 </svg>

fmlcore/build.gradle

@@ -1,73 +0,0 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
-    id 'org.cadixdev.licenser'
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
-
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
-
-dependencies {
-    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
-
-    api("net.minecraftforge:eventbus:${EVENTBUS_VERSION}")
-
-    implementation(project(':fmlloader'))
-    implementation("commons-io:commons-io:${COMMONS_IO_VERSION}")
-}
-
-task sourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-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 Loader',
-            '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)
-    }
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:unchecked'
-}
-
-license {
-    header = rootProject.file('LICENSE-header.txt')
-
-    include 'net/minecraftforge/'
-}
-
-artifacts {
-    archives jar
-    archives sourcesJar
-}
-
-publishing.publications.mavenJava(MavenPublication) {
-    from components.java
-    artifact sourcesJar
-}

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

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.config.IConfigEvent;
-import net.minecraftforge.fml.loading.FMLLoader;
-
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-import java.util.function.Supplier;
-
-public class Bindings {
-    private Bindings() {}
-
-    /**
-     * The provider of the bindings
-     * @implNote May also throw a {@link ServiceConfigurationError}
-     */
-    private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
-            .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
-
-    /**
-     * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
-     */
-    public static Supplier<IEventBus> getForgeBus() {
-        return PROVIDER.getForgeBusSupplier();
-    }
-
-    public static Supplier<I18NParser> getMessageParser() {
-        return PROVIDER.getMessageParser();
-    }
-
-    public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return PROVIDER.getConfigConfiguration();
-    }
-}

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

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-public class CrashReportCallables
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final List<ISystemReportExtender> crashCallables = Collections.synchronizedList(new ArrayList<>());
-
-    /**
-     * Register a custom {@link ISystemReportExtender}
-     */
-    public static void registerCrashCallable(ISystemReportExtender callable)
-    {
-        crashCallables.add(callable);
-    }
-
-    /**
-     * Register a {@link ISystemReportExtender system report extender} with the given header name and content
-     * generator, which will always be appended to the system report
-     * @param headerName The name of the system report entry
-     * @param reportGenerator The report generator to be called when a crash report is built
-     */
-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator)
-    {
-        registerCrashCallable(new ISystemReportExtender()
-        {
-            @Override
-            public String getLabel()
-            {
-                return headerName;
-            }
-
-            @Override
-            public String get()
-            {
-                return reportGenerator.get();
-            }
-        });
-    }
-
-    /**
-     * Register a {@link ISystemReportExtender system report extender} with the given header name and content
-     * generator, which will only be appended to the system report when the given {@link BooleanSupplier} returns true
-     * @param headerName The name of the system report entry
-     * @param reportGenerator The report generator to be called when a crash report is built
-     * @param active The supplier of the flag to be checked when a crash report is built
-     */
-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator, BooleanSupplier active)
-    {
-        registerCrashCallable(new ISystemReportExtender()
-        {
-            @Override
-            public String getLabel()
-            {
-                return headerName;
-            }
-
-            @Override
-            public String get()
-            {
-                return reportGenerator.get();
-            }
-
-            @Override
-            public boolean isActive()
-            {
-                try
-                {
-                    return active.getAsBoolean();
-                }
-                catch (Throwable t)
-                {
-                    LOGGER.warn("CrashCallable '{}' threw an exception while checking the active flag, disabling", headerName, t);
-                    return false;
-                }
-            }
-        });
-    }
-
-    public static List<ISystemReportExtender> allCrashCallables()
-    {
-        return List.copyOf(crashCallables);
-    }
-}

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

@@ -1,126 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import static net.minecraftforge.fml.Logging.LOADING;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import com.google.common.base.Stopwatch;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Utility for running code on the main launch thread at the next available
- * opportunity. There is no guaranteed order that work from various mods will be
- * run, but your own work will be run sequentially.
- * <p>
- * <strong>Use of this class after startup is not possible.</strong> At that
- * point, {@code ReentrantBlockableEventLoop} should be used instead.
- * <p>
- * Exceptions from tasks will be handled gracefully, causing a mod loading
- * error. Tasks that take egregiously long times to run will be logged.
- */
-public class DeferredWorkQueue
-{
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    private static final Map<ModLoadingStage, DeferredWorkQueue> workQueues = new HashMap<>();
-
-    private final ConcurrentLinkedDeque<TaskInfo> tasks = new ConcurrentLinkedDeque<>();
-    private final ModLoadingStage modLoadingStage;
-
-    public DeferredWorkQueue(ModLoadingStage modLoadingStage) {
-        this.modLoadingStage = modLoadingStage;
-        workQueues.put(modLoadingStage, this);
-    }
-
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    public static Optional<DeferredWorkQueue> lookup(Optional<ModLoadingStage> parallelClass) {
-        return Optional.ofNullable(workQueues.get(parallelClass.orElse(null)));
-    }
-
-    public void runTasks() {
-        if (tasks.isEmpty()) return;
-        LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
-        RuntimeException aggregate = new RuntimeException();
-        Stopwatch timer = Stopwatch.createStarted();
-        tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
-        timer.stop();
-        if (aggregate.getSuppressed().length > 0) {
-            LOGGER.fatal(
-                    LOADING,
-                    "Synchronous work queue completed exceptionally in {}, see suppressed exceptions for details:",
-                    timer,
-                    aggregate
-            );
-            //TODO 1.20: throw aggregate exception
-        } else {
-            LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
-        }
-    }
-
-    private static void makeRunnable(TaskInfo ti, Executor executor, RuntimeException aggregate) {
-        executor.execute(() -> {
-            Stopwatch timer = Stopwatch.createStarted();
-            ModLoadingContext.get().setActiveContainer(ti.owner);
-            try {
-                ti.future.exceptionally(t -> captureException(ti.owner.getModId(), aggregate, t));
-                ti.task.run();
-            } finally {
-                ModLoadingContext.get().setActiveContainer(null);
-            }
-            timer.stop();
-            if (timer.elapsed(TimeUnit.SECONDS) >= 1) {
-                LOGGER.warn(LOADING, "Mod '{}' took {} to run a deferred task.", ti.owner.getModId(), timer);
-            }
-        });
-    }
-
-    private static <T> T captureException(String modId, RuntimeException aggregate, Throwable throwable) {
-        if (throwable instanceof CompletionException ce) {
-            throwable = ce.getCause();
-        }
-        aggregate.addSuppressed(throwable);
-        LOGGER.error("Mod '{}' encountered an error in a deferred task:", modId, throwable);
-        return null;
-    }
-
-    public CompletableFuture<Void> enqueueWork(final ModContainer modInfo, final Runnable work) {
-        return enqueueWork(modInfo, taskInfo -> CompletableFuture.runAsync(work, r -> taskInfo.task = r));
-    }
-
-    public <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, final Supplier<T> work) {
-        return enqueueWork(modInfo, taskInfo -> CompletableFuture.supplyAsync(work, r -> taskInfo.task = r));
-    }
-
-    private <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, Function<TaskInfo, CompletableFuture<T>> futureGen) {
-        TaskInfo taskInfo = new TaskInfo(modInfo);
-        CompletableFuture<T> future = futureGen.apply(taskInfo);
-        taskInfo.future = future;
-        tasks.add(taskInfo);
-        return future;
-    }
-
-    private static class TaskInfo {
-        private final ModContainer owner;
-        private Runnable task;
-        private CompletableFuture<?> future;
-
-        private TaskInfo(ModContainer owner) {
-            this.owner = owner;
-        }
-    }
-}

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

@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-public interface I18NParser {
-    String parseMessage(String i18nMessage, Object... args);
-    String stripControlCodes(String toStrip);
-}

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

@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.config.IConfigEvent;
-
-import java.util.function.Supplier;
-
-public interface IBindingsProvider {
-    Supplier<IEventBus> getForgeBusSupplier();
-    Supplier<I18NParser> getMessageParser();
-    Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
-}

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

@@ -1,5 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-

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

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.function.BiPredicate;
-import java.util.function.Supplier;
-
-/**
- * An extension point for a mod container.
- *
- * <p>An extension point can be registered for a mod container using {@link ModContainer#registerExtensionPoint(Class, Supplier)}
- * and retrieved (if present) using {@link ModContainer#getCustomExtension(Class)}. An extension point allows a mod to
- * supply an arbitrary value as a record class to another mod or framework through their mod container class, avoiding
- * the use of {@link InterModComms} or other external frameworks to pass around these values.</p>
- *
- * <p>The usual way to declare an extension point is to implement this interface on a record class, with the type
- * parameter being a reference to the class itself. For example, {@code record MyExtension(...) extends
- * IExtensionPoint<MyExtension>} would declare an extension point which supplies a {@code MyExtension} object. However,
- * there is no hard requirement that an extension point's type parameter must be in reference to itself; the type
- * parameter may reference another record class instead.</p>
- *
- * @param <T> the type of the record which is held by the extension point
- */
-@SuppressWarnings("unused") // Type parameter T
-public interface IExtensionPoint<T extends Record>
-{
-    /**
-     * Extension point for the compatibility display test used on the server selection screen.
-     *
-     * <em>Note: "server" and "client" refers to the {@linkplain net.minecraftforge.api.distmarker.Dist#DEDICATED_SERVER dedicated server}
-     * and {@linkplain net.minecraftforge.api.distmarker.Dist#CLIENT game client} physical distributions, rather than the
-     * {@linkplain LogicalSide logical server and client}.</em>
-     *
-     * <p>The {@link Supplier} provides the local compatibility version, which is sent from the server to the client
-     * for multiplayer connections or stored to disk for the world save. The {@link BiPredicate} accepts the remote
-     * compatibility version and a boolean indicating whether the remote version is from the server or a world save,
-     * 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 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>
-     *
-     * <p><strong>The compatibility display test does not necessarily indicate the success or failure of an actual
-     * connection attempt.</strong> Factors such as display test extension misconfiguration, truncation of ping data,
-     * difference of registry data or network channels between server and client, and others may cause the result of the
-     * compatibility test to not reflect the actual likelihood of a connection successfully being established between
-     * the server and the client.</p>
-     *
-     * <p>An example declaration of a display test extension registration for a regular mod (requires to be present on
-     * server and client) is as follows:</p>
-     * <pre>{@code
-     * String compatibilityVersion = "1"; // Could be linked with a network channel version or mod version
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 () -> compatibilityVersion,
-     *                 (remoteVersion, isFromServer) -> remoteVersion.equals(compatibilityVersion)
-     *         )
-     * );
-     * }</pre>
-     *
-     * <p>An example declaration of a display test extension registration for a <em>server-side-only</em> mod (does not
-     * require to be present on the client) is as follows:</p>
-     * <pre>{@code
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 // Ignore this mod if not present on the client
-     *                 () -> NetworkConstants.IGNORESERVERONLY,
-     *                 // If present on the client, accept any version if from a server
-     *                 (remoteVersion, isFromServer) -> isFromServer
-     *         )
-     * );
-     * }</pre>
-     *
-     * <p>An example declaration of a display test extension registration for a <em>client-side-only</em> mod (does not
-     * require to be present on the server) is as follows:</p>
-     * <pre>{@code
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 // Send any version from server to client, since we will be accepting any version as well
-     *                 () -> "dQw4w9WgXcQ",
-     *                 // Accept any version on the client, from server or from save
-     *                 (remoteVersion, isFromServer) -> true
-     *         )
-     * );
-     * }</pre>
-     *
-     * @see net.minecraftforge.network.ServerStatusPing
-     * @see net.minecraftforge.client.ForgeHooksClient#processForgeListPingData(net.minecraft.network.protocol.status.ServerStatus, net.minecraft.client.multiplayer.ServerData)
-     */
-    @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
-    record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
-        public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
-
-        /**
-         * Ignores any version information coming from the server - use for server only mods
-         */
-        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
-
-        /**
-         * Ignores all information and provides no information
-         */
-        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
-
-        /**
-         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
-         * instead of a {@link Supplier}.
-         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
-         */
-        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-            this(() -> version, remoteVersionTest);
-        }
-    }
-}

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

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
- * grouped into various {@link ModLoadingPhase phases}.
- *
- * @see IModStateProvider
- */
-public interface IModLoadingState {
-    /**
-     * {@return the name of this state}
-     */
-    String name();
-
-    /**
-     * {@return the name of the state immediately previous to this state} This may be a blank name, which indicates this
-     * is either the first mod loading state or an exceptional mod loading state (such as a situation where errors
-     * prevent the loading process from continuing normally).
-     */
-    String previous();
-
-    /**
-     * {@return the mod loading phase this state belongs to} For exceptional mod loading states, this should be
-     * {@link ModLoadingPhase#ERROR}.
-     */
-    ModLoadingPhase phase();
-
-    /**
-     * {@return a function returning a human-friendly message for this state}
-     */
-    Function<ModList, String> message();
-
-    /**
-     * {@return an optional runnable, which runs before starting the transition from this state to the next}
-     * @see #buildTransition(Executor, Executor, Function, Function)
-     */
-    Optional<Consumer<ModList>> inlineRunnable();
-
-    /**
-     * Builds the transition task for this state with a blank pre-sync and post-sync task.
-     *
-     * @param syncExecutor a synchronous executor
-     * @param parallelExecutor a parallel executor
-     * @param <T> a type of event fired on the mod-specific event bus
-     * @return a transition task for this state
-     * @see #buildTransition(Executor, Executor, Function, Function)
-     */
-    default <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor) {
-        return buildTransition(syncExecutor, parallelExecutor,
-                e -> CompletableFuture.runAsync(() -> {}, e),
-                e -> CompletableFuture.runAsync(() -> {}, e));
-    }
-
-    /**
-     * Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
-     * to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
-     *
-     * @param syncExecutor a synchronous executor
-     * @param parallelExecutor a parallel executor
-     * @param preSyncTask a function which returns a task to run before event pre-dispatch hook
-     * @param postSyncTask a function which returns a task to run after event post-dispatch hook
-     * @param <T> a type of event fired on the mod-specific event bus
-     * @return a transition task for this state
-     */
-    <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask);
-}

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

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.List;
-
-/**
- * Provides a list of mod loading states which the mod loader may transition between.
- *
- * <p>There may be multiple mod state providers in a single application, where all states from each provider is
- * combined into a single list and ordered.</p>
- */
-public interface IModStateProvider {
-    /**
-     * {@return the list of mod loading states known to this provider}
-     */
-    List<IModLoadingState> getAllStates();
-}

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

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-@SuppressWarnings("unchecked")
-public interface IModStateTransition {
-    static IModStateTransition buildNoopTransition() {
-        return new NoopTransition();
-    }
-
-    default <T extends Event & IModBusEvent>
-    CompletableFuture<Void> build(final Executor syncExecutor,
-                                  final Executor parallelExecutor,
-                                  final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                  final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-
-        this.eventFunctionStream().get()
-                .map(f -> (EventGenerator<T>) f)
-                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, last, nextModLoadingStage(), null));
-
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
-        final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
-                .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
-                .thenApply(r -> {
-                    postSyncTask.apply(syncExecutor);
-                    return null;
-                });
-        return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
-    }
-
-    default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
-        return ModLoadingStage::nextState;
-    }
-
-    private <T extends Event & IModBusEvent>
-    EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
-                                                             final Executor parallelExecutor,
-                                                             final List<CompletableFuture<Void>> completableFutures,
-                                                             final EventGenerator<T> eventGenerator,
-                                                             final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
-                                                             final EventGenerator<T> nextGenerator) {
-        final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
-
-        var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
-        completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        completableFutures.add(ModList.get().futureVisitor(eventGenerator, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
-
-        var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
-        completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        return nextGenerator;
-    }
-
-    Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
-    ThreadSelector threadSelector();
-    BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
-
-    interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
-        static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
-            return fn::apply;
-        }
-    }
-}
-
-record NoopTransition() implements IModStateTransition {
-
-    @Override
-    public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
-        return Stream::of;
-    }
-
-    @Override
-    public ThreadSelector threadSelector() {
-        return ThreadSelector.SYNC;
-    }
-
-    @Override
-    public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
-        return (e, t) -> t.thenApplyAsync(Function.identity(), e);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
-    }
-}

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.function.Supplier;
-
-public interface ISystemReportExtender extends Supplier<String>
-{
-    String getLabel();
-
-    default boolean isActive()
-    {
-        return true;
-    }
-}

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

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-/**
- * A logical side of the Minecraft game.
- * <p>
- * The {@linkplain Dist#CLIENT client distribution} has a copy of the logical client and the logical server, while the
- * {@linkplain Dist#DEDICATED_SERVER dedicated server distribution} only holds
- * the logical server.
- *
- * @see Dist
- */
-public enum LogicalSide
-{
-    /**
-     * The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
-     * viewpoint.
-     * <p>
-     * The logical client is only shipped with the client distribution of the game.
-     *
-     * @see Dist#CLIENT
-     */
-    CLIENT,
-    /**
-     * The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
-     * on the level.
-     * <p>
-     * The logical server is shipped with both client and dedicated server distributions. The client distribution runs
-     * the logical server for singleplayer mode and LAN play.
-     *
-     * @see Dist#DEDICATED_SERVER
-     */
-    SERVER;
-
-    /**
-     * {@return if this logical side is the server}
-     */
-    public boolean isServer()
-    {
-        return !isClient();
-    }
-
-    /**
-     * {@return if the logical side is the client}
-     */
-    public boolean isClient()
-    {
-        return this == CLIENT;
-    }
-}

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

@@ -1,190 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.config.IConfigEvent;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-/**
- * The container that wraps around mods in the system.
- * <p>
- * The philosophy is that individual mod implementation technologies should not
- * impact the actual loading and management of mod code. This class provides
- * a mechanism by which we can wrap actual mod code so that the loader and other
- * facilities can treat mods at arms length.
- * </p>
- *
- * @author cpw
- *
- */
-
-public abstract class ModContainer
-{
-    protected final String modId;
-    protected final String namespace;
-    protected final IModInfo modInfo;
-    protected ModLoadingStage modLoadingStage;
-    protected Supplier<?> contextExtension;
-    protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>();
-    protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
-    protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
-
-    public ModContainer(IModInfo info)
-    {
-        this.modId = info.getModId();
-        // TODO: Currently not reading namespace from configuration..
-        this.namespace = this.modId;
-        this.modInfo = info;
-        this.modLoadingStage = ModLoadingStage.CONSTRUCT;
-
-        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
-                .orElseGet(() -> (Boolean) info.getOwningFile().getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE) ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
-        Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
-            case "MATCH_VERSION" -> // default displaytest checks for version string match
-                    () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
-                        (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
-            case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
-            case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
-            case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
-            default -> // any other value throws an exception
-                    throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
-        };
-        if (displayTestSupplier != null)
-            registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTestSupplier);
-        else
-            extensionPoints.remove(IExtensionPoint.DisplayTest.class);
-    }
-
-    /**
-     * Errored container state, used for filtering. Does nothing.
-     */
-    ModContainer()
-    {
-        this.modLoadingStage = ModLoadingStage.ERROR;
-        modId = "BROKEN";
-        namespace = "BROKEN";
-        modInfo = null;
-    }
-    /**
-     * @return the modid for this mod
-     */
-    public final String getModId()
-    {
-        return modId;
-    }
-
-    /**
-     * @return the resource prefix for the mod
-     */
-    public final String getNamespace()
-    {
-        return namespace;
-    }
-
-    /**
-     * @return The current loading stage for this mod
-     */
-    public ModLoadingStage getCurrentState()
-    {
-        return modLoadingStage;
-    }
-
-    public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
-            final ModContainer target,
-            final IModStateTransition.EventGenerator<T> eventGenerator,
-            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
-            final Executor executor) {
-        return CompletableFuture
-                .runAsync(() -> {
-                    ModLoadingContext.get().setActiveContainer(target);
-                    target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
-                    target.acceptEvent(eventGenerator.apply(target));
-                }, executor)
-                .whenComplete((mc, exception) -> {
-                    target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
-                    ModLoadingContext.get().setActiveContainer(null);
-                });
-    }
-
-    public IModInfo getModInfo()
-    {
-        return modInfo;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Record> Optional<T> getCustomExtension(Class<? extends IExtensionPoint<T>> point) {
-        return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
-    }
-
-    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
-    {
-        extensionPoints.put(point, extension);
-    }
-
-    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
-        registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
-    }
-
-    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
-        registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
-    }
-
-    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-        registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
-    }
-
-    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
-        registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
-    }
-
-    public void addConfig(final ModConfig modConfig) {
-       configs.put(modConfig.getType(), modConfig);
-    }
-
-    public void dispatchConfigEvent(IConfigEvent event) {
-        configHandler.ifPresent(configHandler->configHandler.accept(event));
-    }
-
-    /**
-     * Does this mod match the supplied mod?
-     *
-     * @param mod to compare
-     * @return if the mod matches
-     */
-    public abstract boolean matches(Object mod);
-
-    /**
-     * @return the mod object instance
-     */
-    public abstract Object getMod();
-
-    /**
-     * Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
-     * @param e Event to accept
-     */
-    protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
-}

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

@@ -1,237 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.ModFileScanData;
-import net.minecraftforge.fml.loading.moddiscovery.ModFile;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.forgespi.locating.IModFile;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Master list of all mods - game-side version. This is classloaded in the game scope and
- * can dispatch game level events as a result.
- */
-public class ModList
-{
-    private static Logger LOGGER = LogManager.getLogger();
-    private static ModList INSTANCE;
-    private final List<IModFileInfo> modFiles;
-    private final List<IModInfo> sortedList;
-    private final Map<String, ModFileInfo> fileById;
-    private List<ModContainer> mods;
-    private Map<String, ModContainer> indexedMods;
-    private List<ModFileScanData> modFileScanData;
-    private List<ModContainer> sortedContainers;
-
-    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
-    {
-        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
-        this.sortedList = sortedList.stream().
-                map(ModInfo.class::cast).
-                collect(Collectors.toList());
-        this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
-                map(ModInfo.class::cast).
-                collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
-        CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
-    }
-
-    private String getModContainerState(String modId) {
-        return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
-    }
-
-    private String fileToLine(IModFile mf) {
-        return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
-                mf.getModInfos().get(0).getDisplayName(),
-                mf.getModInfos().get(0).getModId(),
-                mf.getModInfos().get(0).getVersion(),
-                getModContainerState(mf.getModInfos().get(0).getModId()),
-                ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
-    }
-    private String crashReport() {
-        return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
-    }
-
-    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
-    {
-        INSTANCE = new ModList(modFiles, sortedList);
-        return INSTANCE;
-    }
-
-    public static ModList get() {
-        return INSTANCE;
-    }
-
-    private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
-        ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
-        thread.setName("modloading-worker-" + thread.getPoolIndex());
-        // The default sets it to the SystemClassloader, so copy the current one.
-        thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
-        return thread;
-    }
-
-    public List<IModFileInfo> getModFiles()
-    {
-        return modFiles;
-    }
-
-    public IModFileInfo getModFileById(String modid)
-    {
-        return this.fileById.get(modid);
-    }
-
-    <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
-            final IModStateTransition.EventGenerator<T> eventGenerator,
-            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
-        return executor -> gather(
-                this.mods.stream()
-                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, stateChange, executor))
-                .collect(Collectors.toList()))
-            .thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
-    }
-    static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
-        if (t.stream().noneMatch(e->e.getValue()!=null)) {
-            return CompletableFuture.completedFuture(null);
-        } else {
-            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            final RuntimeException accumulator = new RuntimeException();
-            cf.completeExceptionally(accumulator);
-            throwables.forEach(exception -> {
-                if (exception instanceof CompletionException) {
-                    exception = exception.getCause();
-                }
-                if (exception.getSuppressed().length!=0) {
-                    Arrays.stream(exception.getSuppressed()).forEach(accumulator::addSuppressed);
-                } else {
-                    accumulator.addSuppressed(exception);
-                }
-            });
-            return cf;
-        }
-    }
-
-    static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
-        List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
-        CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
-        futures.forEach(future -> {
-            int i = list.size();
-            list.add(null);
-            results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
-        });
-        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
-    }
-
-    void setLoadedMods(final List<ModContainer> modContainers)
-    {
-        this.mods = modContainers;
-        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
-        this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> Optional<T> getModObjectById(String modId)
-    {
-        return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
-    }
-
-    public Optional<? extends ModContainer> getModContainerById(String modId)
-    {
-        return Optional.ofNullable(this.indexedMods.get(modId));
-    }
-
-    public Optional<? extends ModContainer> getModContainerByObject(Object obj)
-    {
-        return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
-    }
-
-    public List<IModInfo> getMods()
-    {
-        return this.sortedList;
-    }
-
-    public boolean isLoaded(String modTarget)
-    {
-        return this.indexedMods.containsKey(modTarget);
-    }
-
-    public int size()
-    {
-        return mods.size();
-    }
-
-    public List<ModFileScanData> getAllScanData()
-    {
-        if (modFileScanData == null)
-        {
-            modFileScanData = this.sortedList.stream().
-                    map(IModInfo::getOwningFile).
-                    filter(Objects::nonNull).
-                    map(IModFileInfo::getFile).
-                    distinct().
-                    map(IModFile::getScanResult).
-                    collect(Collectors.toList());
-        }
-        return modFileScanData;
-
-    }
-
-    public void forEachModFile(Consumer<IModFile> fileConsumer)
-    {
-        modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
-    }
-
-    public <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
-        return modFiles.stream().map(IModFileInfo::getFile).map(function);
-    }
-
-    public void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
-        indexedMods.forEach(modContainerConsumer);
-    }
-
-    public void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
-        this.sortedContainers.forEach(containerConsumer);
-    }
-
-    public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
-        return indexedMods.values().stream().map(function);
-    }
-
-    private static class UncaughtModLoadingException extends ModLoadingException {
-        public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
-            super(null, stage, "fml.modloading.uncaughterror", originalException);
-        }
-    }
-}

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

@@ -1,376 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.common.collect.ImmutableList;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.IModLanguageProvider;
-import net.minecraftforge.forgespi.locating.ForgeFeature;
-import net.minecraftforge.forgespi.locating.IModFile;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.Executor;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static net.minecraftforge.fml.Logging.CORE;
-import static net.minecraftforge.fml.Logging.LOADING;
-
-/**
- * Loads mods.
- *
- * Dispatch cycle is seen in {@code #loadMods()} and {@code #finishMods()}
- *
- * Overall sequence for loadMods is:
- * <dl>
- *     <dt>CONSTRUCT</dt>
- *     <dd>Constructs the mod instance. Mods can typically setup basic environment such as Event listeners
- *     and Configuration specifications here.</dd>
- *     <dt>Automated dispatches</dt>
- *     <dd>Dispatches automated elements : {@code net.minecraftforge.fml.common.Mod.EventBusSubscriber},
- *     {@code net.minecraftforge.event.RegistryEvent}, {@code net.minecraftforge.common.capabilities.CapabilityInject}
- *     and others</dd>
- *     <dt>CONFIG_LOAD</dt>
- *     <dd>Dispatches ConfigLoadEvent to mods</dd>
- *     <dt>COMMON_SETUP</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent} to mods</dd>
- *     <dt>SIDED_SETUP</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent} or
- *     {@code net.minecraftforge.fml.event.lifecycle.FMLDedicatedServerSetupEvent} to mods</dd>
- * </dl>
- *
- * Overall sequence for finishMods is:
- * <dl>
- *     <dt>ENQUEUE_IMC</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent} to mods,
- *     for enqueuing {@link InterModComms} messages for other mods to receive subsequently</dd>
- *     <dt>PROCESS_IMC</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.InterModProcessEvent} to mods,
- *     for processing {@link InterModComms} messages received from other mods prior to this event</dd>
- *     <dt>COMPLETE</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent} to mods,
- *     and completes the mod loading sequence.</dd>
- * </dl>
- */
-public class ModLoader
-{
-    private static final Logger LOGGER = LogManager.getLogger();
-    private static ModLoader INSTANCE;
-    private final LoadingModList loadingModList;
-
-    private final List<ModLoadingException> loadingExceptions;
-    private final List<ModLoadingWarning> loadingWarnings;
-    private final ModStateManager stateManager;
-    private boolean loadingStateValid;
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
-    private final Set<IModLoadingState> completedStates = new HashSet<>();
-    private ModList modList;
-
-    private ModLoader()
-    {
-        INSTANCE = this;
-        this.loadingModList = FMLLoader.getLoadingModList();
-        this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream()
-                .flatMap(ModLoadingException::fromEarlyException)
-                .collect(Collectors.toList());
-        this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
-                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
-                .collect(Collectors.toList());
-        FMLLoader.getLoadingModList().getModFiles().stream()
-                .filter(ModFileInfo::missingLicense)
-                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
-                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
-                .forEach(this.loadingExceptions::add);
-        this.stateManager = new ModStateManager();
-        CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
-        CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
-        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
-        CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
-        CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
-    }
-
-    private String computeLanguageList() {
-        return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", ""));
-    }
-
-    private String computeModLauncherServiceList() {
-        final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
-        return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
-                " "+mod.getOrDefault("name", "missing")+
-                " "+mod.getOrDefault("type","NOTYPE")+
-                " "+mod.getOrDefault("description", "")).
-                collect(Collectors.joining("\n\t\t","\t\t",""));
-    }
-
-    public static ModLoader get()
-    {
-        return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE;
-    }
-
-    /**
-     * Run on the primary starting thread by ClientModLoader and ServerModLoader
-     * @param syncExecutor An executor to run tasks on the main thread
-     * @param parallelExecutor An executor to run tasks on a parallel loading thread pool
-     * @param periodicTask Optional periodic task to perform on the main thread while other activities run
-     */
-    public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        ForgeFeature.registerFeature("java_version", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.SERVER, System.getProperty("java.version")));
-        loadingStateValid = true;
-        statusConsumer.ifPresent(c->c.accept("Waiting for scan to complete"));
-        FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
-        statusConsumer.ifPresent(c->c.accept("Loading mods"));
-        final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
-                loadingModList.getMods());
-        if (!this.loadingExceptions.isEmpty()) {
-            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(loadingExceptions);
-        }
-        statusConsumer.ifPresent(c->c.accept("Validating features"));
-        List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
-                .map(ModInfo::getForgeFeatures)
-                .flatMap(Collection::stream)
-                .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
-                .toList();
-
-        if (!failedBounds.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods");
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(failedBounds.stream()
-                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb.featureName(), fb.featureBound(), ForgeFeature.featureValue(fb)))
-                    .toList());
-        }
-
-        statusConsumer.ifPresent(c->c.accept("Building Mod List"));
-        final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
-                .map(ModFileInfo::getFile)
-                .map(this::buildMods)
-                .<ModContainer>mapMulti(Iterable::forEach)
-                .toList();
-        if (!loadingExceptions.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(loadingExceptions);
-        }
-        modList.setLoadedMods(modContainers);
-        this.modList = modList;
-        statusConsumer.ifPresent(c->c.accept("Dispatching gathering events"));
-        stateManager.getStates(ModLoadingPhase.GATHER).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept("Gathering phase complete"));
-    }
-
-    public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        statusConsumer.ifPresent(c->c.accept("Performing load phase"));
-        stateManager.getStates(ModLoadingPhase.LOAD).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept("Mod setup complete"));
-    }
-
-    public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        statusConsumer.ifPresent(c->c.accept("Performing completion phase"));
-        stateManager.getStates(ModLoadingPhase.COMPLETE).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
-    }
-
-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker) {
-        if (!isLoadingStateValid()) {
-            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
-            return;
-        }
-        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
-        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
-        state.buildTransition(syncExecutor, parallelExecutor).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
-        completedStates.add(state);
-    }
-
-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        if (!isLoadingStateValid()) {
-            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
-            return;
-        }
-        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
-        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
-        state.buildTransition(syncExecutor, parallelExecutor, preSyncTask, postSyncTask).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
-        completedStates.add(state);
-    }
-
-    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
-        while (!transition.isDone()) {
-            syncExecutor.drive(ticker);
-        }
-        try {
-            transition.join();
-        } catch (CompletionException e) {
-            loadingStateValid = false;
-            Throwable t = e.getCause();
-            final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed())
-                    .filter(obj -> !(obj instanceof ModLoadingException))
-                    .collect(Collectors.toList());
-            if (!notModLoading.isEmpty()) {
-                LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                throw e;
-            }
-
-            final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
-                    .filter(ModLoadingException.class::isInstance)
-                    .map(ModLoadingException.class::cast)
-                    .collect(Collectors.toList());
-            LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            throw new LoadingFailedException(modLoadingExceptions);
-        }
-    }
-
-    private List<ModContainer> buildMods(final IModFile modFile)
-    {
-        final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
-
-        LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
-        final List<ModContainer> containers = modFile.getScanResult().getTargets()
-                .entrySet()
-                .stream()
-                .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
-
-            LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
-                    modFile.getFilePath(),
-                    containers.size(), containerIds,
-                    modInfoMap.size(), modIds);
-
-            var missingClasses = new ArrayList<>(modIds);
-            missingClasses.removeAll(containerIds);
-            LOGGER.fatal(LOADING, "The following classes are missing, but are reported in the mods.toml: {}", missingClasses);
-
-            var missingMods = new ArrayList<>(containerIds);
-            missingMods.removeAll(modIds);
-            LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
-
-            loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
-        }
-        // remove errored mod containers
-        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
-    }
-
-    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
-        try {
-            final String modId = idToProviderEntry.getKey();
-            final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
-            IModInfo info = Optional.ofNullable(modInfoMap.get(modId)).
-                    // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
-                    orElseThrow(()->new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId));
-            return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
-        } catch (ModLoadingException mle) {
-            // exceptions are caught and added to the error list for later handling
-            loadingExceptions.add(mle);
-            // return an errored container instance here, because we tried and failed building a container.
-            return new ErroredModContainer();
-        }
-    }
-
-    /**
-     * @return If the current mod loading state is valid. Use if you interact with vanilla systems directly during loading
-     * and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
-     */
-    public static boolean isLoadingStateValid() {
-        return get().loadingStateValid;
-    }
-
-    public boolean hasCompletedState(final String stateName) {
-        IModLoadingState state = stateManager.findState(stateName);
-        return completedStates.contains(state);
-    }
-
-    public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
-    }
-
-    public <T extends Event & IModBusEvent> void postEvent(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-    }
-    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return e;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-        return e;
-    }
-    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
-        postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
-    }
-    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> {
-            pre.accept(mc, e);
-            mc.acceptEvent(e);
-            post.accept(mc, e);
-        });
-    }
-
-    public List<ModLoadingWarning> getWarnings()
-    {
-        return ImmutableList.copyOf(this.loadingWarnings);
-    }
-
-    public void addWarning(ModLoadingWarning warning)
-    {
-        this.loadingWarnings.add(warning);
-    }
-
-    private static boolean runningDataGen = false;
-
-    public static boolean isDataGenRunning () {
-        return runningDataGen;
-    }
-
-    private static class ErroredModContainer extends ModContainer {
-        public ErroredModContainer() {
-            super();
-        }
-
-        @Override
-        public boolean matches(final Object mod) {
-            return false;
-        }
-
-        @Override
-        public Object getMod() {
-            return null;
-        }
-    }
-}

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

@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.config.IConfigSpec;
-import net.minecraftforge.fml.config.ModConfig;
-import org.slf4j.Logger;
-
-import java.util.function.BiPredicate;
-import java.util.function.Supplier;
-
-public class ModLoadingContext
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
-    private ModContainer activeContainer;
-    private Object languageExtension;
-    private ModLoadingStage stage;
-
-    /**
-     * @deprecated Use the context provided by your language loader in your mod's constructor.
-     */
-    @Deprecated(forRemoval = true, since = "1.21.1")
-    public static ModLoadingContext get() {
-        return context.get();
-    }
-
-    /**
-     * @deprecated Going to be moved to ForgeHooks for internal use.
-     */
-    @Deprecated(forRemoval = true, since = "1.21.1")
-    public void setActiveContainer(final ModContainer container) {
-        this.activeContainer = container;
-        this.languageExtension = container == null ? null : container.contextExtension.get();
-    }
-
-    /**
-     * Going to be moved to ForgeHooks for internal use.
-     * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
-     */
-    @Deprecated(forRemoval = true, since = "1.21.1")
-    public ModContainer getActiveContainer() {
-        return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
-    }
-
-    @Deprecated(forRemoval = true, since = "1.21.1")
-    public String getActiveNamespace() {
-        return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
-    }
-
-    public ModContainer getContainer() {
-        return getActiveContainer();
-    }
-
-    /**
-     * Register an {@link IExtensionPoint} with the mod container.
-     * @param point The extension point to register
-     * @param extension An extension operator
-     * @param <T> The type signature of the extension operator
-     */
-    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
-        getContainer().registerExtensionPoint(point, extension);
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
-     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
-     */
-    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
-        getContainer().registerDisplayTest(() -> displayTest);
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
-     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
-     */
-    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
-        getContainer().registerDisplayTest(displayTest);
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
-     * creates the DisplayTest instance for you using the provided parameters.</p>
-     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
-     */
-    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
-     * creates the DisplayTest instance for you using the provided parameters.</p>
-     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
-     */
-    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
-        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
-    }
-
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        if (spec.isEmpty())
-        {
-            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
-            return;
-        }
-
-        getContainer().addConfig(new ModConfig(type, spec, getContainer()));
-    }
-
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        if (spec.isEmpty())
-        {
-            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
-            return;
-        }
-
-        getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public <T> T extension() {
-        return (T)languageExtension;
-    }
-}

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

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-/**
- * Phases of mod loading, for grouping mod loading states.
- */
-public enum ModLoadingPhase {
-    /**
-     * Special phase for exceptional situations and error handling, where mod loading cannot continue normally.
-     *
-     * <p>There is conventionally only one state with this phase.</p>
-     */
-    ERROR, // Special state for error handling
-    /**
-     * Phase for discovering and gathering mods for loading.
-     */
-    GATHER,
-    /**
-     * Phase for the loading of mods found from mod discovery.
-     *
-     * @see #GATHER
-     */
-    LOAD,
-    /**
-     * Phase after mod loading has completed, for post-loading tasks.
-     *
-     * @see #LOAD
-     */
-    COMPLETE,
-    /**
-     * Marker phase for the last state in the full mod loading process.
-     */
-    DONE
-}

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

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-/**
- * Mod loading stage of mod containers during the mod loading process. These will have a corresponding {@link ModLoadingState}
- * in the basic mod loading process provided by FML.
- *
- * <p>Each mod loading stage has a global {@link DeferredWorkQueue}, which is populated during the execution of the state
- * associated with this stage and emptied at the end of the state's execution.</p>
- */
-public enum ModLoadingStage
-{
-    /**
-     * Special stage for exceptional situations and error handling.
-     */
-    ERROR,
-    /**
-     * Validation of the mod list.
-     * TODO: figure out where this is used and why this exists instead of CONSTRUCT being the first normal stage
-     */
-    VALIDATE,
-    /**
-     * Default stage of mod containers after construction.
-     */
-    CONSTRUCT,
-    /**
-     * Common (non-side-specific) setup and initialization.
-     */
-    COMMON_SETUP,
-    /**
-     * Side-specific setup and initialization.
-     *
-     * @see net.minecraftforge.api.distmarker.Dist
-     */
-    SIDED_SETUP,
-    /**
-     * Stage for enqueuing {@link net.minecraftforge.fml.InterModComms} messages for later processing.
-     */
-    ENQUEUE_IMC,
-    /**
-     * Stage for processing received messages though {@link net.minecraftforge.fml.InterModComms}.
-     */
-    PROCESS_IMC,
-    /**
-     * Marks the completion of mod loading for this container.
-     */
-    COMPLETE,
-    /**
-     * Marks the completion of the full mod loading process.
-     */
-    DONE;
-
-    private final DeferredWorkQueue deferredWorkQueue;
-
-    ModLoadingStage() {
-        deferredWorkQueue = new DeferredWorkQueue(this);
-    }
-
-    /**
-     * {@return the next stage after this stage, or {@link #ERROR} if the exception is not {@code null}}
-     *
-     * @param exception the exception that occurred during this stage, may be {@code null}
-     */
-    ModLoadingStage nextState(Throwable exception) {
-        return exception != null ? ERROR : values()[this.ordinal()+1];
-    }
-
-    /**
-     * {@return this stage, or {@link #ERROR} if the exception is not {@code null}}
-     *
-     * @param exception the exception that occurred during this stage, may be {@code null}
-     */
-    public ModLoadingStage currentState(Throwable exception) {
-        return exception != null ? ERROR : this;
-    }
-
-    /**
-     * {@return the deferred work queue for this stage}
-     */
-    public DeferredWorkQueue getDeferredWorkQueue() {
-        return deferredWorkQueue;
-    }
-}

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

@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * Implementation of the {@link IModLoadingState} interface.
- *
- * @param name           the name of this state
- * @param previous       the name of the state immediately previous to this state
- * @param message        a function returning a human-friendly message for this state
- * @param phase          the mod loading phase this state belongs to
- * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
- * @param transition     optional state transition information
- */
-public record ModLoadingState(String name, String previous,
-                              Function<ModList, String> message,
-                              ModLoadingPhase phase,
-                              Optional<Consumer<ModList>> inlineRunnable,
-                              Optional<IModStateTransition> transition) implements IModLoadingState {
-    @Override
-    public <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        return transition.map(t -> t.build(syncExecutor, parallelExecutor, preSyncTask, postSyncTask));
-    }
-
-    /**
-     * {@return an empty mod loading state} The mod loading state has a blank human-readable message, no inline runnable,
-     * and no state transition information.
-     *
-     * @param name     the name of the state
-     * @param previous the name of the immediately previous state to this state
-     * @param phase    the mod loading phase the state belongs to
-     */
-    public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, ml -> "", phase, Optional.empty(), Optional.empty());
-    }
-
-    /**
-     * Returns a mod loading state with state transition information and a default human-friendly message of
-     * {@code Processing transition [name]}.
-     *
-     * @param name       the name of the state
-     * @param previous   the name of the immediately previous state to this state
-     * @param phase      the mod loading phase the state belongs to
-     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a default message
-     */
-    public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
-                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, phase, Optional.empty(), Optional.of(transition));
-    }
-
-    /**
-     * Returns a mod loading state with state transition information and a custom human-friendly message function.
-     *
-     * @param name       the name of the state
-     * @param previous   the name of the immediately previous state to this state
-     * @param message    a function returning a human-friendly message for this state
-     * @param phase      the mod loading phase the state belongs to
-     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a custom message
-     */
-    public static ModLoadingState withTransition(final String name, final String previous,
-                                                 final Function<ModList, String> message, final ModLoadingPhase phase,
-                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, message, phase, Optional.empty(), Optional.of(transition));
-    }
-
-    /**
-     * Returns a mod loading state with an inline runnable and a default human-friendly message of {@code Processing
-     * work [name]}.
-     *
-     * @param name     the name of the state
-     * @param previous the name of the immediately previous state to this state
-     * @param phase    the mod loading phase the state belongs to
-     * @param inline   an optional runnable, which runs before starting the transition from this state to the next
-     * @return a mod loading state with an inline runnable and default message
-     */
-    public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
-                                             final Consumer<ModList> inline) {
-        return new ModLoadingState(name, previous, ml -> "Processing work " + name, phase, Optional.of(inline), Optional.empty());
-    }
-}

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

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.common.graph.GraphBuilder;
-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.toposort.TopologicalSort;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-@SuppressWarnings("UnstableApiUsage")
-public class ModStateManager {
-    static ModStateManager INSTANCE;
-    private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
-
-    public ModStateManager() {
-        INSTANCE = this;
-        final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
-        this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
-                .map(IModStateProvider::getAllStates)
-                .<IModLoadingState>mapMulti(Iterable::forEach)
-                .collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
-    }
-
-    public List<IModLoadingState> getStates(final ModLoadingPhase phase) {
-        var nodes = stateMap.get(phase);
-        var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
-
-        var graph = GraphBuilder.directed().allowsSelfLoops(false).<IModLoadingState>build();
-        var dummy = ModLoadingState.empty("", "", phase);
-        nodes.forEach(graph::addNode);
-        graph.addNode(dummy);
-        nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
-        return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
-    }
-
-    public IModLoadingState findState(final String stateName) {
-        return stateMap.values()
-                .stream()
-                .flatMap(Collection::stream)
-                .filter(mls -> mls.name().equals(stateName))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
-    }
-}

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

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-public class StartupMessageManager {
-    public static void addModMessage(final String message) {
-        net.minecraftforge.fml.loading.progress.StartupMessageManager.addModMessage(message);
-    }
-
-    public static Optional<Consumer<String>> modLoaderConsumer() {
-        return net.minecraftforge.fml.loading.progress.StartupMessageManager.modLoaderConsumer();
-    }
-
-    public static Optional<Consumer<String>> mcLoaderConsumer() {
-        return net.minecraftforge.fml.loading.progress.StartupMessageManager.mcLoaderConsumer();
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.concurrent.Executor;
-import java.util.function.BinaryOperator;
-
-public enum ThreadSelector implements BinaryOperator<Executor> {
-    SYNC((sync, parallel) -> sync),
-    PARALLEL((sync, parallel) -> parallel);
-
-    private final BinaryOperator<Executor> selector;
-
-    ThreadSelector(final BinaryOperator<Executor> selector) {
-        this.selector = selector;
-    }
-
-    @Override
-    public Executor apply(final Executor sync, final Executor parallel) {
-        return this.selector.apply(sync, parallel);
-    }
-}

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

@@ -1,287 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-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;
-import org.apache.maven.artifact.versioning.ComparableVersion;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPInputStream;
-
-import static net.minecraftforge.fml.VersionChecker.Status.*;
-
-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
-    {
-        PENDING(),
-        FAILED(),
-        UP_TO_DATE(),
-        OUTDATED(3, true),
-        AHEAD(),
-        BETA(),
-        BETA_OUTDATED(6, true);
-
-        private final int sheetOffset;
-        private final boolean draw, animated;
-
-        Status()
-        {
-            this(0, false, false);
-        }
-
-        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()
-        {
-            return sheetOffset;
-        }
-
-        public boolean shouldDraw()
-        {
-            return draw;
-        }
-
-        public boolean isAnimated()
-        {
-            return animated;
-        }
-
-        public boolean isOutdated() {
-            return this == OUTDATED || this == BETA_OUTDATED;
-        }
-    }
-
-    public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
-
-    public static void startVersionCheck()
-    {
-        new Thread("Forge Version Check")
-        {
-            private HttpClient client;
-
-            @Override
-            public void run()
-            {
-                if (!FMLConfig.runVersionCheck())
-                {
-                    LOGGER.info("Global Forge version check system disabled, no further processing.");
-                    return;
-                }
-
-                client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build();
-                gatherMods().forEach(this::process);
-            }
-
-            /**
-             * Returns the response body as a String for the given URL while following redirects
-             */
-            private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException {
-                URL currentUrl = url;
-
-                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))
-                            .setHeader("Accept-Encoding", "gzip")
-                            .setHeader("User-Agent", userAgent)
-                            .GET()
-                            .build();
-
-                    final HttpResponse<InputStream> response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
-
-                    int responseCode = response.statusCode();
-                    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);
-                        continue;
-                    }
-
-                    final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip");
-
-                    final String bodyStr;
-                    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)
-            {
-                Status status = PENDING;
-                ComparableVersion target = null;
-                Map<ComparableVersion, String> changes = null;
-                String display_url = null;
-                try
-                {
-                    if (mod.getUpdateURL().isEmpty()) return;
-                    URL url = mod.getUpdateURL().get();
-                    LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString());
-
-                    String data = openUrlString(url, mod);
-
-                    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)
-                    {
-                        ComparableVersion recommended = new ComparableVersion(rec);
-                        int diff = recommended.compareTo(current);
-
-                        if (diff == 0)
-                            status = UP_TO_DATE;
-                        else if (diff < 0)
-                        {
-                            status = AHEAD;
-                            if (lat != null)
-                            {
-                                ComparableVersion latest = new ComparableVersion(lat);
-                                if (current.compareTo(latest) < 0)
-                                {
-                                    status = OUTDATED;
-                                    target = latest;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            status = OUTDATED;
-                            target = recommended;
-                        }
-                    }
-                    else if (lat != null)
-                    {
-                        ComparableVersion latest = new ComparableVersion(lat);
-                        if (current.compareTo(latest) < 0)
-                            status = BETA_OUTDATED;
-                        else
-                            status = BETA;
-                        target = latest;
-                    }
-                    else
-                        status = BETA;
-
-                    LOGGER.info("[{}] Found status: {} Current: {} Target: {}", mod.getModId(), status, current, target);
-
-                    changes = new LinkedHashMap<>();
-                    @SuppressWarnings("unchecked")
-                    Map<String, String> tmp = (Map<String, String>)json.get(mcVersion);
-                    if (tmp != null)
-                    {
-                        List<ComparableVersion> ordered = new ArrayList<>();
-                        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)
-                        {
-                            changes.put(ver, tmp.get(ver.toString()));
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    LOGGER.warn("Failed to process update information", e);
-                    status = FAILED;
-                }
-                RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
-            }
-        }.start();
-    }
-
-    // Gather a list of mods that have opted in to this update system by providing a URL.
-    private static List<IModInfo> gatherMods()
-    {
-        List<IModInfo> ret = new LinkedList<>();
-        for (IModInfo info : ModList.get().getMods()) {
-            if (info.getUpdateURL().isPresent())
-                ret.add(info);
-        }
-        return ret;
-    }
-
-    private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
-    private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
-
-    public static CheckResult getResult(IModInfo mod)
-    {
-        return RESULTS.getOrDefault(mod, PENDING_CHECK);
-    }
-
-}

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

@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
-
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ConfigTracker {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
-    public static final ConfigTracker INSTANCE = new ConfigTracker();
-    private final ConcurrentHashMap<String, ModConfig> fileMap;
-    private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets;
-    private final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> configsByMod;
-
-    private ConfigTracker() {
-        this.fileMap = new ConcurrentHashMap<>();
-        this.configSets = new EnumMap<>(ModConfig.Type.class);
-        this.configsByMod = new ConcurrentHashMap<>();
-        this.configSets.put(ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()));
-        this.configSets.put(ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()));
-//        this.configSets.put(ModConfig.Type.PLAYER, new ConcurrentSkipListSet<>());
-        this.configSets.put(ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>()));
-    }
-
-    void trackConfig(final ModConfig config) {
-        if (this.fileMap.containsKey(config.getFileName())) {
-            LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), this.fileMap.get(config.getFileName()).getModId(), config.getModId());
-            throw new RuntimeException("Config conflict detected!");
-        }
-        this.fileMap.put(config.getFileName(), config);
-        this.configSets.get(config.getType()).add(config);
-        this.configsByMod.computeIfAbsent(config.getModId(), (k)->new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
-        LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
-    }
-
-    public void loadConfigs(ModConfig.Type type, Path configBasePath) {
-        LOGGER.debug(CONFIG, "Loading configs type {}", type);
-        this.configSets.get(type).forEach(config -> openConfig(config, configBasePath));
-    }
-
-    public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
-        LOGGER.debug(CONFIG, "Unloading configs type {}", type);
-        this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath));
-    }
-
-    private void openConfig(final ModConfig config, final Path configBasePath) {
-        LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
-        final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
-        config.setConfigData(configData);
-        config.fireEvent(IConfigEvent.loading(config));
-        config.save();
-    }
-
-    private void closeConfig(final ModConfig config, final Path configBasePath) {
-        if (config.getConfigData() != null) {
-            LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
-            // stop the filewatcher before we save the file and close it, so reload doesn't fire
-            config.getHandler().unload(configBasePath, config);
-            var unloading = IConfigEvent.unloading(config);
-            if (unloading != null)
-                config.fireEvent(unloading);
-            config.save();
-            config.setConfigData(null);
-        }
-    }
-
-    public void loadDefaultServerConfigs() {
-        configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> {
-            final CommentedConfig commentedConfig = CommentedConfig.inMemory();
-            modConfig.getSpec().correct(commentedConfig);
-            modConfig.setConfigData(commentedConfig);
-            modConfig.fireEvent(IConfigEvent.loading(modConfig));
-        });
-    }
-
-    public String getConfigFileName(String modId, ModConfig.Type type) {
-        return Optional.ofNullable(configsByMod.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
-                map(ModConfig::getFullPath).map(Object::toString).orElse(null);
-    }
-
-    public Map<ModConfig.Type, Set<ModConfig>> configSets() {
-        return configSets;
-    }
-
-    public ConcurrentHashMap<String, ModConfig> fileMap() {
-        return fileMap;
-    }
-}

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

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.Bindings;
-
-import java.util.function.Function;
-
-import org.jetbrains.annotations.Nullable;
-
-public interface IConfigEvent {
-    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
-
-    ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
-
-    static IConfigEvent reloading(ModConfig modConfig) {
-        return CONFIGCONFIG.reloading().apply(modConfig);
-    }
-    static IConfigEvent loading(ModConfig modConfig) {
-        return CONFIGCONFIG.loading().apply(modConfig);
-    }
-    @Nullable static IConfigEvent unloading(ModConfig modConfig) {
-        return CONFIGCONFIG.unloading() == null ? null : CONFIGCONFIG.unloading().apply(modConfig);
-    }
-    ModConfig getConfig();
-
-    @SuppressWarnings("unchecked")
-    default <T extends Event & IConfigEvent> T self() {
-        return (T) this;
-    }
-}

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

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.electronwill.nightconfig.core.UnmodifiableConfig;
-
-public interface IConfigSpec<T extends IConfigSpec<T>> extends UnmodifiableConfig {
-    @SuppressWarnings("unchecked")
-    default T self() {
-        return (T) this;
-    }
-
-    void acceptConfig(CommentedConfig data);
-
-    boolean isCorrecting();
-
-    boolean isCorrect(CommentedConfig commentedFileConfig);
-
-    int correct(CommentedConfig commentedFileConfig);
-
-    void afterReload();
-}

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

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.electronwill.nightconfig.toml.TomlFormat;
-import net.minecraftforge.fml.ModContainer;
-import net.minecraftforge.fml.loading.StringUtils;
-
-import java.io.ByteArrayInputStream;
-import java.nio.file.Path;
-import java.util.Locale;
-import java.util.concurrent.Callable;
-
-public class ModConfig
-{
-    private final Type type;
-    private final IConfigSpec<?> spec;
-    private final String fileName;
-    private final ModContainer container;
-    private final ConfigFileTypeHandler configHandler;
-    private CommentedConfig configData;
-    private Callable<Void> saveHandler;
-
-    public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
-        this.type = type;
-        this.spec = spec;
-        this.fileName = fileName;
-        this.container = container;
-        this.configHandler = ConfigFileTypeHandler.TOML;
-        ConfigTracker.INSTANCE.trackConfig(this);
-    }
-
-    public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) {
-        this(type, spec, activeContainer, defaultConfigName(type, activeContainer.getModId()));
-    }
-
-    private static String defaultConfigName(Type type, String modId) {
-        // config file name would be "forge-client.toml" and "forge-server.toml"
-        return String.format(Locale.ROOT, "%s-%s.toml", modId, type.extension());
-    }
-    public Type getType() {
-        return type;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public ConfigFileTypeHandler getHandler() {
-        return configHandler;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends IConfigSpec<T>> IConfigSpec<T> getSpec() {
-        return (IConfigSpec<T>) spec;
-    }
-
-    public String getModId() {
-        return container.getModId();
-    }
-
-    public CommentedConfig getConfigData() {
-        return this.configData;
-    }
-
-    void setConfigData(final CommentedConfig configData) {
-        this.configData = configData;
-        this.spec.acceptConfig(this.configData);
-    }
-
-    void fireEvent(final IConfigEvent configEvent) {
-        this.container.dispatchConfigEvent(configEvent);
-    }
-
-    public void save() {
-        ((CommentedFileConfig)this.configData).save();
-    }
-
-    public Path getFullPath() {
-        return ((CommentedFileConfig)this.configData).getNioPath();
-    }
-
-    public void acceptSyncedConfig(byte[] bytes) {
-        setConfigData(TomlFormat.instance().createParser().parse(new ByteArrayInputStream(bytes)));
-        fireEvent(IConfigEvent.reloading(this));
-    }
-
-    public enum Type {
-        /**
-         * Common mod config for configuration that needs to be loaded on both environments.
-         * Loaded on both servers and clients.
-         * Stored in the global config directory.
-         * Not synced.
-         * Suffix is "-common" by default.
-         */
-        COMMON,
-        /**
-         * Client config is for configuration affecting the ONLY client state such as graphical options.
-         * Only loaded on the client side.
-         * Stored in the global config directory.
-         * Not synced.
-         * Suffix is "-client" by default.
-         */
-        CLIENT,
-//        /**
-//         * Player type config is configuration that is associated with a player.
-//         * Preferences around machine states, for example.
-//         */
-//        PLAYER,
-        /**
-         * Server type config is configuration that is associated with a server instance.
-         * Only loaded during server startup.
-         * Stored in a server/save specific "serverconfig" directory.
-         * Synced to clients during connection.
-         * Suffix is "-server" by default.
-         */
-        SERVER;
-
-        public String extension() {
-            return StringUtils.toLowerCase(name());
-        }
-    }
-}

fmlloader/build.gradle

@@ -1,95 +0,0 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
-    id 'org.cadixdev.licenser'
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
-
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
-configurations.forEach{ it.transitive = false }
-
-dependencies {
-    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
-
-    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("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("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("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
-    annotationProcessor("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
-
-    testCompileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
-    testRuntimeOnly("cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}")
-}
-
-task sourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-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 {
-    MANIFESTS.each { pkg, values ->
-        manifest.attributes(values, pkg)
-    }
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:unchecked'
-}
-
-license {
-    header = rootProject.file('LICENSE-header.txt')
-
-    include 'net/minecraftforge/'
-}
-
-artifacts {
-    archives jar
-    archives sourcesJar
-}
-
-publishing.publications.mavenJava(MavenPublication) {
-    from components.java
-    artifact sourcesJar
-}

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

@@ -1,120 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.common.asm;
-
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.EnumSet;
-
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
-
-import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
-
-/**
- * Implements getType() in CapabilityToken subclasses.
- *
- * Using the class's signature to determine the generic type of TypeToken, and then implements getType() using that value.
- * <pre>
- * Example:
- *
- *  <code>new CapabilityToken&lt;String>(){}</code>
- *  Has the signature <code>"CapabilityToken&lt;Ljava/lang/String;>"</code>
- *
- *  Implements the method:
- *  <code>public String getType() {
- *    return "java/lang/String";
- *  }</code>
- * </pre>
- */
-public class CapabilityTokenSubclass implements ILaunchPluginService {
-
-    private final String FUNC_NAME = "getType";
-    private final String FUNC_DESC = "()Ljava/lang/String;";
-    private final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
-
-    @Override
-    public String name() {
-        return "capability_token_subclass";
-    }
-
-    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
-    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
-
-    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
-    }
-
-    @Override
-    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
-    {
-        if (CAP_INJECT.equals(classNode.name))
-        {
-            for (MethodNode mtd : classNode.methods)
-            {
-                if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc))
-                {
-                    mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
-                }
-            }
-            return ComputeFlags.SIMPLE_REWRITE;
-        }
-        else if (CAP_INJECT.equals(classNode.superName))
-        {
-            Holder cls = new Holder();
-
-            SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
-            reader.accept(new SignatureVisitor(Opcodes.ASM9)
-            {
-                Deque<String> stack = new ArrayDeque<>();
-
-                @Override
-                public void visitClassType(final String name)
-                {
-                    stack.push(name);
-                }
-
-                @Override
-                public void visitInnerClassType(final String name)
-                {
-                    stack.push(stack.pop() + '$' + name);
-                }
-
-                @Override
-                public void visitEnd()
-                {
-                    var val = stack.pop();
-                    if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
-                        cls.value = val;
-                }
-            });
-
-            if (cls.value == null)
-                throw new IllegalStateException("Could not find signature for CapabilityToken on " + classNode.name + " from " + classNode.signature);
-
-            var mtd = classNode.visitMethod(Opcodes.ACC_PUBLIC, FUNC_NAME, FUNC_DESC, null, new String[0]);
-            mtd.visitLdcInsn(cls.value);
-            mtd.visitInsn(Opcodes.ARETURN);
-            mtd.visitEnd();
-            return ComputeFlags.COMPUTE_MAXS;
-        }
-        else
-        {
-            return ComputeFlags.NO_REWRITE;
-        }
-    }
-
-    private static class Holder {
-        String value;
-    }
-
-}

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

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

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

@@ -1,38 +0,0 @@
-/*
- * 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 org.slf4j.Logger;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class ClasspathLocatorUtils {
-    
-    private static final Logger LOGGER = LogUtils.getLogger();
-
-    public static Path findJarPathFor(final String resourceName, final String jarName, final URL resource) {
-        try {
-            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())));
-            }
-            //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);
-        }
-    }
-}

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

@@ -1,61 +0,0 @@
-/*
- * 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/FMLConfig.java

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import com.electronwill.nightconfig.core.ConfigSpec;
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.electronwill.nightconfig.core.file.FileNotFoundAction;
-import com.electronwill.nightconfig.core.io.ParsingException;
-import com.electronwill.nightconfig.core.io.WritingMode;
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-
-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-
-public class FMLConfig
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static FMLConfig INSTANCE = new FMLConfig();
-    private static ConfigSpec configSpec = new ConfigSpec();
-    static {
-        configSpec.define("splashscreen", Boolean.TRUE);
-        configSpec.define("maxThreads", -1);
-        configSpec.define("versionCheck", Boolean.TRUE);
-        configSpec.define("defaultConfigPath",  "defaultconfigs");
-        configSpec.define("disableOptimizedDFU", Boolean.TRUE);
-    }
-
-    private CommentedFileConfig configData;
-
-    private void loadFrom(final Path configFile)
-    {
-        configData = CommentedFileConfig.builder(configFile).sync()
-                .onFileNotFound(FileNotFoundAction.copyData(Objects.requireNonNull(getClass().getResourceAsStream("/META-INF/defaultfmlconfig.toml"))))
-                .autosave().autoreload()
-                .writingMode(WritingMode.REPLACE)
-                .build();
-        try
-        {
-            configData.load();
-        }
-        catch (ParsingException e)
-        {
-            throw new RuntimeException("Failed to load FML config from " + configFile.toString(), e);
-        }
-        if (!configSpec.isCorrect(configData)) {
-            LOGGER.warn(CORE, "Configuration file {} is not correct. Correcting", configFile);
-            configSpec.correct(configData, (action, path, incorrectValue, correctedValue) ->
-                    LOGGER.warn(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue));
-        }
-        configData.save();
-    }
-
-    public static void load()
-    {
-        final Path configFile = FMLPaths.FMLCONFIG.get();
-        INSTANCE.loadFrom(configFile);
-        if (LOGGER.isTraceEnabled(CORE))
-        {
-            LOGGER.trace(CORE, "Loaded FML config from {}", FMLPaths.FMLCONFIG.get());
-            LOGGER.trace(CORE, "Splash screen is {}", FMLConfig.splashScreenEnabled());
-            LOGGER.trace(CORE, "Max threads for mod loading computed at {}", FMLConfig.loadingThreadCount());
-            LOGGER.trace(CORE, "Version check is {}", FMLConfig.runVersionCheck());
-            LOGGER.trace(CORE, "Default config paths at {}", FMLConfig.defaultConfigPath());
-        }
-        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.defaultConfigPath()));
-    }
-
-    public static boolean splashScreenEnabled() {
-        return INSTANCE.configData.<Boolean>getOptional("splashscreen").orElse(Boolean.FALSE);
-    }
-
-    public static int loadingThreadCount() {
-        int val = INSTANCE.configData.<Integer>getOptional("maxThreads").orElse(-1);
-        if (val <= 0) return Runtime.getRuntime().availableProcessors();
-        return val;
-    }
-
-    public static boolean runVersionCheck() {
-        return INSTANCE.configData.<Boolean>getOptional("versionCheck").orElse(Boolean.TRUE);
-    }
-
-    public static String defaultConfigPath() {
-        return INSTANCE.configData.<String>getOptional("defaultConfigPath").orElse("defaultconfigs");
-    }
-
-    public static boolean isOptimizedDFUDisabled() {
-        return INSTANCE.configData.<Boolean>getOptional("disableOptimizedDFU").orElse(Boolean.TRUE);
-    }
-}

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

@@ -1,268 +0,0 @@
-/*
- * 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.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.EarlyProgressVisualization;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
-import net.minecraftforge.forgespi.Environment;
-import net.minecraftforge.forgespi.coremod.ICoreModProvider;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-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
-{
-    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;
-    private static String launchHandlerName;
-    private static CommonLaunchHandler commonLaunchHandler;
-    public static Runnable progressWindowTick;
-    private static ModValidator modValidator;
-    public static BackgroundScanHandler backgroundScanHandler;
-    private static boolean production;
-    private static IModuleLayerManager moduleLayerManager;
-
-    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());
-        }
-
-        // Allows us to communicate properties with other services through ModLauncher
-        setupBlackboardKeys();
-
-        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, 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 void setupBlackboardKeys() {
-        LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
-        var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
-        Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
-    }
-
-    static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
-    {
-        final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
-        arguments.put("launchTarget", launchTarget);
-        final Optional<ILaunchHandlerService> launchHandler = environment.findLaunchHandler(launchTarget);
-        LOGGER.debug(CORE, "Using {} as launch service", launchTarget);
-        if (launchHandler.isEmpty()) {
-            LOGGER.error(CORE, "Missing LaunchHandler {}, cannot continue", launchTarget);
-            throw new RuntimeException("Missing launch handler: " + launchTarget);
-        }
-
-        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");
-        }
-        commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
-        launchHandlerName = launchHandler.get().name();
-        gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath());
-
-        naming = commonLaunchHandler.getNaming();
-        dist = commonLaunchHandler.getDist();
-        production = commonLaunchHandler.isProduction();
-
-        versionInfo = new VersionInfo(arguments);
-
-        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Early Loading!"));
-        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)
-    {
-        LOGGER.debug(SCAN,"Scanning for Mod Locators");
-        modDiscoverer = new ModDiscoverer(arguments);
-        modValidator = modDiscoverer.discoverMods();
-        var pluginResources = modValidator.getPluginResources();
-        return List.of(pluginResources);
-    }
-
-    public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) {
-        progressWindowTick = EarlyProgressVisualization.INSTANCE.accept(dist, commonLaunchHandler.isData(), versionInfo.mcVersion());
-        moduleLayerManager = layerManager;
-        languageLoadingProvider = new LanguageLoadingProvider();
-        backgroundScanHandler = modValidator.stage2Validation();
-        loadingModList = backgroundScanHandler.getLoadingModList();
-        return List.of(modValidator.getModResources());
-    }
-
-    public static ICoreModProvider getCoreModProvider() {
-        return coreModProvider;
-    }
-
-    public static LanguageLoadingProvider getLanguageLoadingProvider()
-    {
-        return languageLoadingProvider;
-    }
-
-    static ModDiscoverer getModDiscoverer() {
-        return modDiscoverer;
-    }
-
-    public static CommonLaunchHandler getLaunchHandler() {
-        return commonLaunchHandler;
-    }
-
-    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()
-    {
-        return dist;
-    }
-
-    public static void beforeStart(ClassLoader launchClassLoader)
-    {
-        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Launching minecraft"));
-        progressWindowTick.run();
-    }
-
-    public static LoadingModList getLoadingModList()
-    {
-        return loadingModList;
-    }
-
-    public static Path getGamePath()
-    {
-        return gamePath;
-    }
-
-    public static String getNaming() {
-        return naming;
-    }
-
-    public static Optional<BiFunction<INameMappingService.Domain, String, String>> getNameFunction(final String naming) {
-        return Launcher.INSTANCE.environment().findNameMapping(naming);
-    }
-
-    public static String getLauncherInfo() {
-        return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MLIMPL_VERSION.get()).orElse("MISSING");
-    }
-
-    public static List<Map<String, String>> modLauncherModList() {
-        return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElseGet(Collections::emptyList);
-    }
-
-    public static String launcherHandlerName() {
-        return launchHandlerName;
-    }
-
-    public static boolean isProduction() {
-        return production;
-    }
-
-    public static boolean isSecureJarEnabled() {
-        return true;
-    }
-
-    public static ModuleLayer getGameLayer() {
-        return moduleLayerManager.getLayer(IModuleLayerManager.Layer.GAME).orElseThrow();
-    }
-
-    public static VersionInfo versionInfo() {
-        return versionInfo;
-    }
-}

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

@@ -1,106 +0,0 @@
-/*
- * 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.IEnvironment;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-
-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-
-public enum FMLPaths
-{
-    GAMEDIR(),
-    MODSDIR("mods"),
-    CONFIGDIR("config"),
-    FMLCONFIG(false, CONFIGDIR, "fml.toml");
-
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private final Path relativePath;
-    private final boolean isDirectory;
-    private Path absolutePath;
-
-    FMLPaths() {
-        this("");
-    }
-
-    FMLPaths(String... path) {
-        relativePath = computePath(path);
-        this.isDirectory = true;
-    }
-
-    FMLPaths(boolean isDir, FMLPaths parent, String... path) {
-        this.relativePath = parent.relativePath.resolve(computePath(path));
-        this.isDirectory = isDir;
-    }
-
-    private Path computePath(String... path)
-    {
-        return Paths.get(path[0], Arrays.copyOfRange(path, 1, path.length));
-    }
-
-    public static void setup(IEnvironment env) {
-        final Path rootPath = env.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElseThrow(() -> new RuntimeException("No game path found"));
-
-        loadAbsolutePaths(rootPath);
-    }
-
-    public static void loadAbsolutePaths(Path rootPath)
-    {
-        for (FMLPaths path : FMLPaths.values())
-        {
-            path.absolutePath = rootPath.resolve(path.relativePath).toAbsolutePath().normalize();
-            if (path.isDirectory && !Files.isDirectory(path.absolutePath))
-            {
-                try {
-                   Files.createDirectories(path.absolutePath);
-                } catch (IOException e) {
-                   throw new RuntimeException(e);
-                }
-            }
-            if (LOGGER.isDebugEnabled(CORE))
-            {
-                LOGGER.debug(CORE, "Path {} is {}", path, path.absolutePath);
-            }
-        }
-    }
-
-    /**
-     * @deprecated Use {@link #getOrCreateGameRelativePath(Path)} instead.
-     */
-    @Deprecated(forRemoval = true, since = "1.19.4")
-    public static Path getOrCreateGameRelativePath(Path path, String name) {
-        return getOrCreateGameRelativePath(path);
-    }
-
-    public static Path getOrCreateGameRelativePath(Path path) {
-        Path gameFolderPath = FMLPaths.GAMEDIR.get().resolve(path);
-
-        if (!Files.isDirectory(gameFolderPath)) {
-            try {
-                Files.createDirectories(gameFolderPath);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return gameFolderPath;
-    }
-
-    public Path relative() {
-        return relativePath;
-    }
-
-    public Path get() {
-        return absolutePath;
-    }
-}

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

@@ -1,59 +0,0 @@
-/*
- * 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 org.slf4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class FileUtils
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-
-   /**
-    * @deprecated Use normal Java NIO methods instead
-    */
-    @Deprecated(forRemoval = true, since = "1.19.4")
-    public static Path getOrCreateDirectory(Path dirPath, String dirLabel) {
-        if (!Files.isDirectory(dirPath))
-        {
-            try {
-                Files.createDirectories(dirPath);
-            } catch (IOException e) {
-                throw new RuntimeException("Problem creating directory", e);
-            }
-        }
-
-        return dirPath;
-    }
-
-
-    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/LibraryFinder.java

@@ -1,53 +0,0 @@
-/*
- * 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 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","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));
-    }
-    public static Path findPathForMaven(final String maven) {
-        return findLibsPath().resolve(MavenCoordinateResolver.get(maven));
-    }
-}

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

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
-
-public class LogMarkers {
-    public static final Marker CORE = MarkerFactory.getMarker("CORE");
-    public static final Marker LOADING = MarkerFactory.getMarker("LOADING");
-    public static final Marker SCAN = MarkerFactory.getMarker("SCAN");
-    public static final Marker SPLASH = MarkerFactory.getMarker("SPLASH");
-}

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

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import com.mojang.logging.LogUtils;
-import cpw.mods.modlauncher.api.INameMappingService;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-
-public class MCPNamingService implements INameMappingService {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private HashMap<String, String> methods;
-    private HashMap<String, String> fields;
-
-    @Override
-    public String mappingName() {
-        return "srgtomcp";
-    }
-
-    @Override
-    public String mappingVersion() {
-        return "1234"; //TODO: Minecraft Version?
-    }
-
-    @Override
-    public Map.Entry<String, String> understanding() {
-        return Pair.of("srg", "mcp");
-    }
-
-    @Override
-    public BiFunction<Domain, String, String> namingFunction() {
-        return this::findMapping;
-    }
-
-    private String findMapping(final Domain domain, final String srgName) {
-        switch (domain) {
-            case CLASS:
-                return srgName;
-            case FIELD:
-                return findFieldMapping(srgName);
-            case METHOD:
-                return findMethodMapping(srgName);
-        }
-        return srgName;
-    }
-
-    private String findMethodMapping(final String origin) {
-        if (methods == null) {
-            HashMap<String,String> tmpmethods = new HashMap<>(1000);
-            loadMappings("methods.csv", tmpmethods::put);
-            methods = tmpmethods;
-            LOGGER.debug(LogMarkers.CORE, "Loaded {} method mappings from methods.csv", methods.size());
-        }
-        return methods.getOrDefault(origin, origin);
-    }
-
-    private String findFieldMapping(final String origin) {
-        if (fields == null) {
-            HashMap<String,String> tmpfields = new HashMap<>(1000);
-            loadMappings("fields.csv", tmpfields::put);
-            fields = tmpfields;
-            LOGGER.debug(LogMarkers.CORE, "Loaded {} field mappings from fields.csv", fields.size());
-        }
-        return fields.getOrDefault(origin, origin);
-    }
-
-    private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
-        URL path = ClassLoader.getSystemResource(mappingFileName); //We EXPLICITLY go through the SystemClassLoader here because this is dev-time only. And will be on the root classpath.
-        if (path == null)
-            return;
-
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(path.openStream()))) {
-            reader.lines().skip(1).map(e -> e.split(",")).forEach(e -> mapStore.accept(e[0], e[1]));
-        } catch (IOException e1) {
-            LOGGER.error(LogMarkers.CORE, "Error reading mappings", e1);
-        }
-    }
-}

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

@@ -1,67 +0,0 @@
-/*
- * 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.jarhandling.SecureJar;
-import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
-import cpw.mods.modlauncher.api.NamedPath;
-import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-import java.lang.module.ModuleDescriptor;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Set<String> SERVICES = Set.of(
-        "cpw.mods.modlauncher.api.ITransformationService",
-        "net.minecraftforge.forgespi.locating.IModLocator",
-        "net.minecraftforge.forgespi.locating.IDependencyLocator"
-    );
-
-    @Override
-    public List<NamedPath> candidates(final Path gameDirectory) {
-        ModDirTransformerDiscoverer.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 static void scan(final Path gameDirectory) {
-        final Path modsDir = gameDirectory.resolve(FMLPaths.MODSDIR.relative()).toAbsolutePath().normalize();
-        if (!Files.exists(modsDir)) {
-            // Skip if the mods dir doesn't exist yet.
-            return;
-        }
-        try (var walk = Files.walk(modsDir, 1)){
-            walk.forEach(ModDirTransformerDiscoverer::visitFile);
-        } catch (IOException | IllegalStateException ioe) {
-            LOGGER.error("Error during early discovery", ioe);
-        }
-    }
-
-    private static void visitFile(Path path) {
-        if (!Files.isRegularFile(path)) return;
-        if (!path.toString().endsWith(".jar")) return;
-        if (LamdbaExceptionUtils.uncheck(() -> Files.size(path)) == 0) return;
-
-        SecureJar jar = SecureJar.from(path);
-        jar.moduleDataProvider().descriptor().provides().stream()
-            .map(ModuleDescriptor.Provides::service)
-            .filter(SERVICES::contains)
-            .forEach(s -> found.add(new NamedPath(s, path)));
-    }
-}

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

@@ -1,259 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-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;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.fml.loading.toposort.CyclePresentException;
-import net.minecraftforge.fml.loading.toposort.TopologicalSort;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.slf4j.Logger;
-
-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;
-
-import static java.util.stream.Collectors.*;
-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-
-public class ModSorter
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private final UniqueModListBuilder uniqueModListBuilder;
-    private List<ModFile> modFiles;
-    private List<ModInfo> sortedList;
-    private Map<String, IModInfo> modIdNameLookup;
-    private List<ModFile> systemMods;
-
-    private ModSorter(final List<ModFile> modFiles)
-    {
-        this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
-    }
-
-    public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
-    {
-        final ModSorter ms = new ModSorter(mods);
-        try {
-            ms.buildUniqueList();
-        } catch (EarlyLoadingException e) {
-            // We cannot build any list with duped mods. We have to abort immediately and report it
-            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
-        }
-        // try and validate dependencies
-        final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
-        // if we miss one or the other, we abort now
-        if (!failedList.isEmpty()) {
-            return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), new EarlyLoadingException("failure to validate mod list", null, failedList));
-        } else {
-            // Otherwise, lets try and sort the modlist and proceed
-            EarlyLoadingException earlyLoadingException = null;
-            try {
-                ms.sort();
-            } catch (EarlyLoadingException e) {
-                earlyLoadingException = e;
-            }
-            return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
-        }
-    }
-
-    @SuppressWarnings("UnstableApiUsage")
-    private void sort()
-    {
-        // lambdas are identity based, so sorting them is impossible unless you hold reference to them
-        final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
-        AtomicInteger counter = new AtomicInteger();
-        Map<ModFileInfo, Integer> infos = modFiles.stream()
-                .map(ModFile::getModFileInfo)
-                .filter(ModFileInfo.class::isInstance)
-                .map(ModFileInfo.class::cast)
-                .collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
-        infos.keySet().forEach(graph::addNode);
-        modFiles.stream()
-                .map(ModFile::getModInfos)
-                .<IModInfo>mapMulti(Iterable::forEach)
-                .map(IModInfo::getDependencies)
-                .<IModInfo.ModVersion>mapMulti(Iterable::forEach)
-                .forEach(dep -> addDependency(graph, dep));
-
-        final List<ModFileInfo> sorted;
-        try
-        {
-            sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
-        }
-        catch (CyclePresentException e)
-        {
-            Set<Set<ModFileInfo>> cycles = e.getCycles();
-            if (LOGGER.isErrorEnabled(LOADING))
-            {
-                LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
-            }
-            var dataList = cycles.stream()
-                    .<ModFileInfo>mapMulti(Iterable::forEach)
-                    .<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
-                    .map(IModInfo::getModId)
-                    .map(list -> new ExceptionData("fml.modloading.cycle", list))
-                    .toList();
-            throw new EarlyLoadingException("Sorting error", e, dataList);
-        }
-        this.sortedList = sorted.stream()
-                .map(ModFileInfo::getMods)
-                .<IModInfo>mapMulti(Iterable::forEach)
-                .map(ModInfo.class::cast)
-                .collect(toList());
-        this.modFiles = sorted.stream()
-                .map(ModFileInfo::getFile)
-                .collect(toList());
-    }
-
-    @SuppressWarnings("UnstableApiUsage")
-    private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
-    {
-        final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
-        final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
-        // soft dep that doesn't exist. Just return. No edge required.
-        if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
-        if (self == target)
-            return; // in case a jar has two mods that have dependencies between
-        switch (dep.getOrdering()) {
-            case BEFORE -> topoGraph.putEdge(self, target);
-            case AFTER -> topoGraph.putEdge(target, self);
-        }
-    }
-
-    private void buildUniqueList()
-    {
-        final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
-
-        this.modFiles = uniqueModListData.modFiles();
-
-        detectSystemMods(uniqueModListData.modFilesByFirstId());
-
-        modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
-                .filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
-                .collect(Collectors.toMap(
-                    Map.Entry::getKey,
-                    e -> e.getValue().get(0).getModInfos().get(0)
-                  ));
-    }
-
-    private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId)
-    {
-        // Capture system mods (ex. MC, Forge) here, so we can keep them for later
-        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 (String systemMod : systemMods) {
-            var container = modFilesByFirstId.get(systemMod);
-            if (container != null && !container.isEmpty()) {
-                LOGGER.debug("Found system mod: {}", systemMod);
-                this.systemMods.add((ModFile) container.get(0));
-            } else {
-                throw new IllegalStateException("Failed to find system mod: " + systemMod);
-            }
-        }
-    }
-
-    private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
-    {
-        final var modVersions = modFiles.stream()
-                .map(ModFile::getModInfos)
-                .<IModInfo>mapMulti(Iterable::forEach)
-                .collect(toMap(IModInfo::getModId, IModInfo::getVersion));
-
-        final var modVersionDependencies = modFiles.stream()
-                .map(ModFile::getModInfos)
-                .<IModInfo>mapMulti(Iterable::forEach)
-                .collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
-
-        final var modRequirements = modVersionDependencies.values().stream()
-                .<IModInfo.ModVersion>mapMulti(Iterable::forEach)
-                .filter(mv -> mv.getSide().isCorrectSide())
-                .collect(toSet());
-
-        final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
-        LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
-        final var missingVersions = modRequirements.stream()
-                .filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && this.modVersionNotContained(mv, modVersions))
-                .collect(toSet());
-        final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
-        LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
-
-        if (!missingVersions.isEmpty()) {
-            if (mandatoryMissing > 0) {
-                LOGGER.error(
-                        LOADING,
-                        "Missing or unsupported mandatory dependencies:\n{}",
-                        missingVersions.stream()
-                                .filter(IModInfo.ModVersion::isMandatory)
-                                .map(ver -> formatDependencyError(ver, modVersions))
-                                .collect(Collectors.joining("\n"))
-                );
-            }
-            if (missingVersions.size() - mandatoryMissing > 0) {
-                LOGGER.error(
-                        LOADING,
-                        "Unsupported installed optional dependencies:\n{}",
-                        missingVersions.stream()
-                                .filter(ver -> !ver.isMandatory())
-                                .map(ver -> formatDependencyError(ver, modVersions))
-                                .collect(Collectors.joining("\n"))
-                );
-            }
-
-            return missingVersions.stream()
-                    .map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
-                            mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
-                            modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
-                    .toList();
-        }
-        return Collections.emptyList();
-    }
-
-    private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
-    {
-        ArtifactVersion installed = modVersions.get(dependency.getModId());
-        return String.format(
-                "\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
-                dependency.getModId(),
-                dependency.getOwner().getModId(),
-                dependency.getVersionRange(),
-                installed != null ? installed.toString() : "[MISSING]"
-        );
-    }
-
-    private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
-    {
-        return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
-                (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE"))));
-    }
-}

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

@@ -1,146 +0,0 @@
-/*
- * 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 net.minecraftforge.fml.loading.moddiscovery.ModFile;
-import net.minecraftforge.forgespi.language.IModInfo;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.joining;
-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-
-public class UniqueModListBuilder
-{
-    private final static Logger LOGGER = LogUtils.getLogger();
-
-    private final List<ModFile> modFiles;
-
-    public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
-
-    public UniqueModListData buildUniqueList()
-    {
-        List<ModFile> uniqueModList;
-        List<ModFile> uniqueLibListWithVersion;
-
-        // Collect mod files by module name. This will be used for deduping purposes
-        final Map<String, List<ModFile>> modFilesByFirstId = modFiles.stream()
-                .filter(mf -> mf.getModFileInfo() != null)
-                .collect(groupingBy(UniqueModListBuilder::getModId));
-
-        final Map<String, List<ModFile>> libFilesWithVersionByModuleName = modFiles.stream()
-                .filter(mf -> mf.getModFileInfo() == null)
-                .collect(groupingBy(UniqueModListBuilder::getModId));
-
-        // Select the newest by artifact version sorting of non-unique files thus identified
-        uniqueModList = modFilesByFirstId.entrySet().stream()
-                .map(this::selectNewestModInfo)
-                .toList();
-
-        // Select the newest by artifact version sorting of non-unique files thus identified
-        uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
-                .map(this::selectNewestModInfo)
-                .toList();
-
-        // Transform to the full mod id list
-        final Map<String, List<IModInfo>> modIds = uniqueModList.stream()
-                .filter(mf -> mf.getModFileInfo() != null) //Filter out non-mod files, we don't care about those for now.....
-                .map(ModFile::getModInfos)
-                .flatMap(Collection::stream)
-                .collect(groupingBy(IModInfo::getModId));
-
-        // Transform to the full lib id list
-        final Map<String, List<ModFile>> versionedLibIds = uniqueLibListWithVersion.stream()
-                .map(UniqueModListBuilder::getModId)
-                .collect(Collectors.toMap(
-                    Function.identity(),
-                    libFilesWithVersionByModuleName::get
-                ));
-
-        // Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
-        // We can't handle this
-        final List<String> dupedModErrors = modIds.values().stream()
-                .filter(modInfos -> modInfos.size() > 1)
-                .map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
-                        mods.get(0).getModId(),
-                        mods.stream()
-                                .map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
-                )).toList();
-
-        if (!dupedModErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
-            throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
-                    .map(s -> new EarlyLoadingException.ExceptionData(s))
-                    .toList());
-        }
-
-
-        final List<String> dupedLibErrors = versionedLibIds.values().stream()
-                .filter(modFiles -> modFiles.size() > 1)
-                .map(mods -> String.format("\tLibrary: '%s' from files: %s",
-                        getModId(mods.get(0)),
-                        mods.stream()
-                                .map(modFile -> modFile.getFileName()).collect(joining(", "))
-                )).toList();
-
-        if (!dupedLibErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
-            throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
-                    .map(s -> new EarlyLoadingException.ExceptionData(s))
-                    .toList());
-        }
-
-        // Collect unique mod files by module name. This will be used for deduping purposes
-        final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
-                .collect(groupingBy(UniqueModListBuilder::getModId));
-
-        final List<ModFile> loadedList = new ArrayList<>();
-        loadedList.addAll(uniqueModList);
-        loadedList.addAll(uniqueLibListWithVersion);
-
-        return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
-    }
-
-    private ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
-        List<ModFile> modInfoList = fullList.getValue();
-        if (modInfoList.size() > 1) {
-            LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
-            modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
-            LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
-        }
-        return modInfoList.get(0);
-    }
-
-    private ArtifactVersion getVersion(final ModFile mf)
-    {
-        if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
-            return mf.getJarVersion();
-        }
-
-        return mf.getModInfos().get(0).getVersion();
-    }
-
-    private static String getModId(ModFile modFile) {
-        if (modFile.getModFileInfo() == null || modFile.getModFileInfo().getMods().isEmpty()) {
-            return modFile.getSecureJar().name();
-        }
-
-        return modFile.getModFileInfo().moduleName();
-    }
-
-    public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
-
-}

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import java.util.Map;
-
-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;
-    }
-
-    public String mcAndMCPVersion() {
-        return mcVersion + "-" + mcpVersion;
-    }
-}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import net.minecraftforge.forgespi.language.MavenVersionAdapter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.VersionRange;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-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());
-         if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
-             // 1.19.2 is Compatible with 1.19.1
-             add("languageloader.javafml", "42");
-             add("mod.minecraft",          "1.19.1");
-             add("mod.forge",              "42.0.9");
-        }
-    }
-    private static void add(String key, String value) {
-        overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));
-    }
-    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);
-        return custom == null ? false  : custom.stream().anyMatch(declaredRange::containsVersion);
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.log4j;
-
-import cpw.mods.modlauncher.api.NamedPath;
-import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
-import org.objectweb.asm.Type;
-import org.slf4j.LoggerFactory;
-
-import java.util.EnumSet;
-
-public class SLF4JFixerLaunchPluginService implements ILaunchPluginService {
-    private static final EnumSet<Phase> NO_PHASES = EnumSet.noneOf(Phase.class);
-
-    @Override
-    public String name() {
-        return "slf4jfixer";
-    }
-
-    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        return NO_PHASES;
-    }
-
-    @Override
-    public void initializeLaunch(ITransformerLoader transformerLoader, NamedPath[] specialPaths) {
-        Thread curThread = Thread.currentThread();
-        ClassLoader contextClassLoader = curThread.getContextClassLoader();
-
-        // Set the CCL of the current thread to MC-BOOTSTRAP ModuleClassLoader
-        curThread.setContextClassLoader(this.getClass().getClassLoader());
-
-        // Force SLF4J to bind the service providers while we manually set the context classloader to be correct
-        LoggerFactory.getILoggerFactory();
-
-        // Set CCL back to TransformingClassLoader
-        curThread.setContextClassLoader(contextClassLoader);
-    }
-}

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

@@ -1,52 +0,0 @@
-/*
- * 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

@@ -1,23 +0,0 @@
-/*
- * 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

@@ -1,36 +0,0 @@
-/*
- * 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

@@ -1,128 +0,0 @@
-/*
- * 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.JarMetadata;
-import cpw.mods.jarhandling.SecureJar;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.forgespi.language.IConfigurable;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-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.slf4j.Logger;
-
-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.Function;
-import java.util.jar.Manifest;
-
-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) {
-        return this.createMod(getDefaultJarModType(), path);
-    }
-
-    // FORGE: Backporting artifact, the defaultType must be the first parameter since path is varargs
-    protected IModLocator.ModFileOrException createMod(String defaultType, Path... path) {
-        var mjm = new ModJarMetadata();
-        var sj = SecureJar.from(
-                Manifest::new,
-                jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-                null,
-                path
-        );
-
-        IModFile mod;
-        var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
-        if (type == null) {
-            type = defaultType;
-        }
-        if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
-            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
-            mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
-        } else if (type != null) {
-            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 "+ Arrays.toString(path)));
-        }
-
-        mjm.setModFile(mod);
-        return new IModLocator.ModFileOrException(mod, null);
-    }
-
-    protected IModFileInfo manifestParser(final IModFile mod) {
-        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) {
-                return Optional.empty();
-            }
-            @Override
-            public List<? extends IConfigurable> getConfigList(String... key) {
-                return Collections.emptyList();
-            }
-        };
-
-        return new DefaultModFileInfo(mod, license, dummy);
-    }
-
-    @Override
-    public boolean isValid(final IModFile modFile) {
-        return true;
-    }
-
-    protected String getDefaultJarModType() {
-        return null;
-    }
-
-    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 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 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() + ")";
-        }
-    }
-}

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

@@ -1,94 +0,0 @@
-/*
- * 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.ClasspathLocatorUtils;
-import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.LogMarkers;
-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.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-public class ClasspathLocator extends AbstractJarFileModLocator
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    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 "userdev classpath";
-    }
-
-    @Override
-    public Stream<Path> scanCandidates() {
-        if (!enabled)
-            return Stream.of();
-
-        try {
-            var claimed = new ArrayList<>(legacyClasspath);
-            var paths = Stream.<Path>builder();
-
-            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);
-        }
-    }
-
-    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;
-            ret.add(path);
-        }
-        return ret;
-    }
-
-    @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 {
-            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())));
-            }
-            //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);
-        }
-    }
-}

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

@@ -1,78 +0,0 @@
-/*
- * 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(),
-                        null,
-                        explodedMod.paths().toArray(Path[]::new))
-                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
-        return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();
-    }
-
-    @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

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.locating.ModFileLoadingException;
-
-import java.util.Locale;
-import java.util.Optional;
-
-public class InvalidModFileException extends ModFileLoadingException
-{
-    private final 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;
-    }
-
-    public IModFileInfo getBrokenFile() {
-        return modFileInfo;
-    }
-}

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

@@ -1,165 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import com.google.common.collect.ImmutableMap;
-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.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.NotNull;
-import org.slf4j.Logger;
-
-import java.net.URI;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-
-    @Override
-    public String name()
-    {
-        return "JarInJar";
-    }
-
-    @Override
-    public List<IModFile> scanMods(final Iterable<IModFile> loadedMods)
-    {
-        final List<IModFile> sources = Lists.newArrayList();
-        loadedMods.forEach(sources::add);
-
-        final List<IModFile> dependenciesToLoad = JarSelector.detectAndSelect(sources, this::loadResourceFromModFile, this::loadModFileFrom, this::identifyMod, this::exception);
-
-        if (dependenciesToLoad.isEmpty())
-        {
-            LOGGER.info("No dependencies to load found. Skipping!");
-            return Collections.emptyList();
-        }
-
-        LOGGER.info("Found {} dependencies adding them to mods collection", dependenciesToLoad.size());
-        return dependenciesToLoad;
-    }
-
-    @Override
-    public void initArguments(final Map<String, ?> arguments)
-    {
-        // NO-OP, for now
-    }
-
-    @Override
-    protected String getDefaultJarModType()
-    {
-        return IModFile.Type.GAMELIBRARY.name();
-    }
-
-    @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("/");
-            final IModFile.Type parentType = file.getType();
-            final String modType;
-            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
-                modType = IModFile.Type.LIBRARY.name();
-            } else {
-                modType = IModFile.Type.GAMELIBRARY.name();
-            }
-            return Optional.of(createMod(modType, pathInFS).file());
-        }
-        catch (Exception e)
-        {
-            LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
-            final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
-            exception.initCause(e);
-
-            throw exception;
-        }
-    }
-
-    protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies)
-    {
-
-        final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
-               .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
-               .map(this::buildExceptionData)
-               .toList();
-
-        return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
-    }
-
-    @NotNull
-    private EarlyLoadingException.ExceptionData buildExceptionData(final JarSelector.ResolutionFailureInformation<IModFile> entry)
-    {
-        return new EarlyLoadingException.ExceptionData(
-                getErrorTranslationKey(entry),
-                entry.identifier().group() + ":" + entry.identifier().artifact(),
-                entry.sources()
-                     .stream()
-                     .flatMap(this::getModWithVersionRangeStream)
-                     .map(this::formatError)
-                     .collect(Collectors.joining(", "))
-        );
-    }
-
-    @NotNull
-    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(final JarSelector.SourceWithRequestedVersionRange<IModFile> file)
-    {
-        return file.sources()
-                   .stream()
-                   .map(IModFile::getModFileInfo)
-                   .flatMap(modFileInfo -> modFileInfo.getMods().stream())
-                   .map(modInfo -> new ModWithVersionRange(modInfo, file.requestedVersionRange(), file.includedVersion()));
-    }
-
-    @NotNull
-    private String formatError(final ModWithVersionRange modWithVersionRange)
-    {
-        return "\u00a7e" + modWithVersionRange.modInfo().getModId() + "\u00a7r - \u00a74" + modWithVersionRange.versionRange().toString() + "\u00a74 - \u00a72" + modWithVersionRange.artifactVersion().toString() + "\u00a72";
-    }
-
-    @Override
-    protected String identifyMod(final IModFile modFile)
-    {
-        if (modFile.getModFileInfo() == null || modFile.getModInfos().isEmpty())
-        {
-            return modFile.getFileName();
-        }
-
-        return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining());
-    }
-
-    private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion)
-    {}
-}

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

@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-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;
-
-public class MinecraftLocator extends AbstractModProvider implements IModLocator
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-
-    @Override
-    public List<IModLocator.ModFileOrException> scanMods() {
-        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);
-
-        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");
-        conf.set("loaderVersion", "1");
-        conf.set("license", "Mojang Studios, All Rights Reserved");
-        final var mods = Config.inMemory();
-        mods.set("modId", "minecraft");
-        mods.set("version", FMLLoader.versionInfo().mcVersion());
-        mods.set("displayName", "Minecraft");
-        mods.set("logoFile", "mcplogo.png");
-        mods.set("credits", "Mojang, deobfuscated by MCP");
-        mods.set("authors", "MCP: Searge,ProfMobius,IngisKahn,Fesh0r,ZeuX,R4wk,LexManos,Bspkrs");
-        mods.set("description", "Minecraft, decompiled and deobfuscated with MCP technology");
-        conf.set("mods", List.of(mods));
-        /*
-        conf.putAll(mcmodstomlfile);
-
-        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());
-        final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper, List.of());
-        configWrapper.setFile(modFileInfo);
-        return modFileInfo;
-    }
-
-    @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/ModDiscoverer.java

@@ -1,194 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.mojang.logging.LogUtils;
-import cpw.mods.modlauncher.Launcher;
-import cpw.mods.modlauncher.api.IModuleLayerManager;
-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.fml.loading.EarlyLoadingException;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.UniqueModListBuilder;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.forgespi.Environment;
-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.Nullable;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.ServiceLoader;
-import java.util.stream.Collectors;
-
-public class ModDiscoverer {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private final ServiceLoader<IModLocator> modLocators;
-    private final ServiceLoader<IDependencyLocator> dependencyLocators;
-    private final List<IModLocator>          modLocatorList;
-    private final List<IDependencyLocator>   dependencyLocatorList;
-
-    public ModDiscoverer(Map<String, ?> arguments) {
-        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), v->ModsFolderLocator::new);
-        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v-> StartupMessageManager.locatorConsumer().orElseGet(()-> s->{}));
-        final var moduleLayerManager = Launcher.INSTANCE.environment().findModuleLayerManager().orElseThrow();
-        modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
-        dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
-        modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList());
-        modLocatorList.forEach(l->l.initArguments(arguments));
-        dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList());
-        dependencyLocatorList.forEach(l->l.initArguments(arguments));
-        if (LOGGER.isDebugEnabled(LogMarkers.CORE))
-        {
-            LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream()
-                                                                       .map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
-                                                                         modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
-        }
-        if (LOGGER.isDebugEnabled(LogMarkers.CORE))
-        {
-            LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream()
-                                                                       .map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
-                                                                         dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
-        }
-    }
-
-    public ModValidator discoverMods() {
-        LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
-        List<ModFile> loadedFiles = new ArrayList<>();
-        List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>();
-        boolean successfullyLoadedMods = true;
-        List<IModFileInfo> brokenFiles = new ArrayList<>();
-
-        boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
-        //Loop all mod locators to get the prime mods to load from.
-        for (IModLocator locator : modLocatorList) {
-            try {
-                LOGGER.debug(LogMarkers.SCAN, "Trying locator {}", locator);
-                var candidates = locator.scanMods();
-                LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} candidates or errors", locator, candidates.size());
-                var exceptions = candidates.stream().map(IModLocator.ModFileOrException::ex).filter(Objects::nonNull).toList();
-                if (!exceptions.isEmpty()) {
-                    LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} invalid mod files", locator, exceptions.size());
-                    brokenFiles.addAll(exceptions.stream().map(e->e instanceof InvalidModFileException ime ? ime.getBrokenFile() : null).filter(Objects::nonNull).toList());
-                }
-                var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).collect(Collectors.toList());
-
-                var badModFiles = locatedFiles.stream().filter(file -> !(file instanceof ModFile)).toList();
-                if (!badModFiles.isEmpty()) {
-                    LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
-                    brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
-                    locatedFiles.removeAll(badModFiles);
-                }
-
-                if (distIsDedicatedServer) {
-                    var clientOnlyModFiles = locatedFiles.stream()
-                            .filter(file -> {
-                                // some mod files can have null infos, like javafml, mclanguage, lowcode, and fmlcore
-                                @Nullable var info = file.getModFileInfo();
-
-                                return info != null && (Boolean) info.getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE);
-                            })
-                            .toList();
-                    if (!clientOnlyModFiles.isEmpty()) {
-                        LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
-                        locatedFiles.removeAll(clientOnlyModFiles);
-                    }
-                }
-
-                LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
-                handleLocatedFiles(loadedFiles, locatedFiles);
-            } catch (InvalidModFileException imfe) {
-                // We don't generally expect this exception, since it should come from the candidates stream above and be handled in the Locator, but just in case.
-                LOGGER.error(LogMarkers.SCAN, "Locator {} found an invalid mod file {}", locator, imfe.getBrokenFile(), imfe);
-                brokenFiles.add(imfe.getBrokenFile());
-            } catch (EarlyLoadingException exception) {
-                LOGGER.error(LogMarkers.SCAN, "Failed to load mods with locator {}", locator, exception);
-                discoveryErrorData.addAll(exception.getAllData());
-            }
-        }
-
-        //First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped.
-        Map<IModFile.Type, List<ModFile>> modFilesMap = Maps.newHashMap();
-        try {
-            final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
-            final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList();
-
-            //Grab the temporary results.
-            //This allows loading to continue to a base state, in case dependency loading fails.
-            modFilesMap = uniqueModsData.modFiles().stream()
-                            .collect(Collectors.groupingBy(IModFile::getType));
-            loadedFiles = uniqueModsData.modFiles();
-        }
-        catch (EarlyLoadingException exception) {
-            LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after mod discovery.", exception);
-            discoveryErrorData.addAll(exception.getAllData());
-            successfullyLoadedMods = false;
-        }
-
-        //We can continue loading if prime mods loaded successfully.
-        if (successfullyLoadedMods) {
-            LOGGER.debug(LogMarkers.SCAN, "Successfully Loaded {} mods. Attempting to load dependencies...", loadedFiles.size());
-            for (IDependencyLocator locator : dependencyLocatorList) {
-                try {
-                    LOGGER.debug(LogMarkers.SCAN,"Trying locator {}", locator);
-                    final List<IModFile> locatedMods = ImmutableList.copyOf(loadedFiles);
-
-                    var locatedFiles = locator.scanMods(locatedMods);
-                    if (locatedFiles.stream().anyMatch(file -> !(file instanceof ModFile))) {
-                        LOGGER.error(LogMarkers.SCAN, "A dependency locator returned a file which is not a ModFile instance!. They will be skipped!");
-                    }
-
-                    handleLocatedFiles(loadedFiles, locatedFiles);
-                }
-                catch (EarlyLoadingException exception) {
-                    LOGGER.error(LogMarkers.SCAN, "Failed to load dependencies with locator {}", locator, exception);
-                    discoveryErrorData.addAll(exception.getAllData());
-                }
-            }
-
-            //Second processing run of the mod list. Any duplicates will cause resolution failure and only the mods list will be loaded.
-            try {
-                final UniqueModListBuilder modsAndDependenciesUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
-                final UniqueModListBuilder.UniqueModListData uniqueModsAndDependenciesData = modsAndDependenciesUniqueListBuilder.buildUniqueList();
-
-                //We now only need the mod files map, not the list.
-                modFilesMap = uniqueModsAndDependenciesData.modFiles().stream()
-                                .collect(Collectors.groupingBy(IModFile::getType));
-            } catch (EarlyLoadingException exception) {
-                LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after dependency discovery.", exception);
-                discoveryErrorData.addAll(exception.getAllData());
-                modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType));
-            }
-        }
-        else {
-            //Failure notify the listeners.
-            LOGGER.error(LogMarkers.SCAN, "Mod Discovery failed. Skipping dependency discovery.");
-        }
-
-        //Validate the loading. With a deduplicated list, we can now successfully process the artifacts and load
-        //transformer plugins.
-        var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData);
-        validator.stage1Validation();
-        return validator;
-    }
-
-    private void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles)
-    {
-        var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
-        for (IModFile mf : locatedModFiles) {
-            LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
-            StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found mod file "+mf.getFileName()+" of type "+mf.getType()));
-        }
-        loadedFiles.addAll(locatedModFiles);
-    }
-}

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

@@ -1,221 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import com.google.common.collect.ImmutableMap;
-import com.mojang.logging.LogUtils;
-import cpw.mods.jarhandling.SecureJar;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.IModLanguageProvider;
-import net.minecraftforge.forgespi.language.ModFileScanData;
-import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.forgespi.locating.IModProvider;
-import net.minecraftforge.forgespi.locating.ModFileFactory;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.slf4j.Logger;
-
-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.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-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;
-    private List<IModLanguageProvider> loaders;
-    private Throwable scanError;
-    private final SecureJar jar;
-    private final Type modFileType;
-    private final Manifest     manifest;
-    private final IModProvider provider;
-    private       IModFileInfo modFileInfo;
-    private ModFileScanData fileModFileScanData;
-    private CompletableFuture<ModFileScanData> futureScanResult;
-    private List<CoreModFile> coreMods;
-    private Path accessTransformer;
-
-    static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
-    private SecureJar.Status securityStatus;
-
-    public ModFile(final SecureJar jar, final IModProvider provider, final ModFileFactory.ModFileInfoParser parser) {
-        this(jar, provider, parser, parseType(jar));
-    }
-
-    public ModFile(final SecureJar jar, final IModProvider provider, final ModFileFactory.ModFileInfoParser parser, String type) {
-        this.provider = provider;
-        this.jar = jar;
-        this.parser = parser;
-
-        manifest = this.jar.moduleDataProvider().getManifest();
-        modFileType = Type.valueOf(type);
-        jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE");
-        this.modFileInfo = ModFileParser.readModList(this, this.parser);
-    }
-
-    @Override
-    public Supplier<Map<String,Object>> getSubstitutionMap() {
-        return () -> ImmutableMap.<String,Object>builder().put("jarVersion", jarVersion).putAll(fileProperties).build();
-    }
-    @Override
-    public Type getType() {
-        return modFileType;
-    }
-
-    @Override
-    public Path getFilePath() {
-        return jar.getPrimaryPath();
-    }
-
-    @Override
-    public SecureJar getSecureJar() {
-        return this.jar;
-    }
-
-    @Override
-    public List<IModInfo> getModInfos() {
-        return modFileInfo.getMods();
-    }
-
-    public Optional<Path> getAccessTransformer() {
-        return Optional.ofNullable(Files.exists(accessTransformer) ? accessTransformer : null);
-    }
-
-    public boolean identifyMods() {
-        this.modFileInfo = ModFileParser.readModList(this, this.parser);
-        if (this.modFileInfo == null) return this.getType() != Type.MOD;
-        LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
-        this.coreMods = ModFileParser.getCoreMods(this);
-        this.coreMods.forEach(mi-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {}", mi.getPath()));
-        this.accessTransformer = findResource("META-INF", "accesstransformer.cfg");
-        return true;
-    }
-
-    public List<CoreModFile> getCoreMods() {
-        return coreMods;
-    }
-
-    /**
-     * Run in an executor thread to harvest the class and annotation list
-     */
-    public ModFileScanData compileContent() {
-        return new Scanner(this).scan();
-    }
-
-    public void scanFile(Consumer<Path> pathConsumer) {
-        provider.scanFile(this, pathConsumer);
-    }
-
-    public void setFutureScanResult(CompletableFuture<ModFileScanData> future) {
-        this.futureScanResult = future;
-    }
-
-    @Override
-    public ModFileScanData getScanResult() {
-        if (this.futureScanResult != null) {
-            try {
-                this.futureScanResult.get();
-            } catch (InterruptedException | ExecutionException e) {
-                LOGGER.error("Caught unexpected exception processing scan results", e);
-            }
-        }
-        if (this.scanError != null) {
-            throw new RuntimeException(this.scanError);
-        }
-        return this.fileModFileScanData;
-    }
-
-    public void setScanResult(final ModFileScanData modFileScanData, final Throwable throwable) {
-        this.futureScanResult = null;
-        this.fileModFileScanData = modFileScanData;
-        if (throwable != null) {
-            this.scanError = throwable;
-        }
-        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Completed deep scan of "+this.getFileName()));
-    }
-
-    public void setFileProperties(Map<String, Object> fileProperties) {
-        this.fileProperties = fileProperties;
-    }
-
-    @Override
-    public List<IModLanguageProvider> getLoaders() {
-        return loaders;
-    }
-
-    @Override
-    public Path findResource(String... path) {
-        if (path.length < 1) {
-            throw new IllegalArgumentException("Missing path");
-        }
-        return getSecureJar().getPath(String.join("/", path));
-    }
-
-    public void identifyLanguage() {
-        this.loaders = this.modFileInfo.requiredLanguageLoaders().stream()
-                .map(spec-> FMLLoader.getLanguageLoadingProvider().findLanguage(this, spec.languageName(), spec.acceptedVersions()))
-                .toList();
-    }
-
-    @Override
-    public String toString() {
-        return "Mod File: " + Objects.toString(this.jar.getPrimaryPath());
-    }
-
-    @Override
-    public String getFileName() {
-        return getFilePath().getFileName().toString();
-    }
-
-    @Override
-    public IModProvider getProvider() {
-        return provider;
-    }
-
-    @Override
-    public IModFileInfo getModFileInfo() {
-        return modFileInfo;
-    }
-
-    @Override
-    public void setSecurityStatus(final SecureJar.Status status) {
-        this.securityStatus = status;
-    }
-
-    public ArtifactVersion getJarVersion()
-    {
-        return new DefaultArtifactVersion(this.jarVersion);
-    }
-
-    private static String parseType(final SecureJar jar) {
-        final Manifest m = jar.moduleDataProvider().getManifest();
-        final Optional<String> value = Optional.ofNullable(m.getMainAttributes().getValue(TYPE));
-        return value.orElse("MOD");
-    }
-}

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

@@ -1,212 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import com.google.common.base.Strings;
-import com.mojang.logging.LogUtils;
-import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.StringUtils;
-import net.minecraftforge.forgespi.language.IConfigurable;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.MavenVersionAdapter;
-import org.slf4j.Logger;
-import javax.security.auth.x500.X500Principal;
-import java.net.URL;
-import java.security.CodeSigner;
-import java.security.InvalidKeyException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class ModFileInfo implements IModFileInfo, IConfigurable
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private final IConfigurable config;
-    private final ModFile modFile;
-    private final URL issueURL;
-    private final List<LanguageSpec> languageSpecs;
-    private final boolean showAsResourcePack;
-    private final List<IModInfo> mods;
-    private final Map<String,Object> properties;
-    private final String license;
-    private final List<String> usesServices;
-
-    public static final String CLIENT_SIDE_ONLY_PROP = "__FORGE_clientSideOnly";
-
-    private static final Map<String, Object> CLIENT_SIDE_ONLY_MAP = Map.of(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
-
-    ModFileInfo(final ModFile modFile, final IConfigurable config)
-    {
-        this.modFile = modFile;
-        this.config = config;
-        var modLoader = config.<String>getConfigElement("modLoader")
-                .orElseThrow(()->new InvalidModFileException("Missing ModLoader in file", this));
-        var modLoaderVersion = config.<String>getConfigElement("loaderVersion")
-                .map(MavenVersionAdapter::createFromVersionSpec)
-                .orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this));
-        this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
-        this.license = config.<String>getConfigElement("license")
-            .orElse("");
-        this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false);
-        boolean clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly").orElse(false);
-        this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of());
-
-        var maybeProps = config.<Map<String, Object>>getConfigElement("properties");
-        if (clientSideOnly) {
-            if (maybeProps.isPresent()) {
-                this.properties = new HashMap<>(maybeProps.get());
-                this.properties.put(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
-            } else {
-                this.properties = CLIENT_SIDE_ONLY_MAP;
-            }
-        } else {
-            this.properties = maybeProps.orElse(Collections.emptyMap());
-        }
-
-        this.modFile.setFileProperties(this.properties);
-        this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null);
-        final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
-        if (modConfigs.isEmpty())
-        {
-            throw new InvalidModFileException("Missing mods list", this);
-        }
-        this.mods = modConfigs.stream()
-                .map(mi-> new ModInfo(this, mi))
-                .collect(Collectors.toList());
-        if (LOGGER.isDebugEnabled(LogMarkers.LOADING))
-        {
-            LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
-                    this.modFile.getFileName(),
-                    this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
-                    this.mods.stream().map(IModInfo::getVersion).map(Objects::toString).collect(Collectors.joining(",", "{", "}")));
-        }
-    }
-
-    public ModFileInfo(final ModFile file, final IConfigurable config, final List<LanguageSpec> languageSpecs) {
-        this(file, config);
-        this.languageSpecs.addAll(languageSpecs);
-    }
-
-    @Override
-    public List<IModInfo> getMods()
-    {
-        return mods;
-    }
-
-    public ModFile getFile()
-    {
-        return this.modFile;
-    }
-
-    @Override
-    public List<LanguageSpec> requiredLanguageLoaders() {
-        return this.languageSpecs;
-    }
-
-    @Override
-    public Map<String, Object> getFileProperties()
-    {
-        return this.properties;
-    }
-
-    @Override
-    public boolean showAsResourcePack()
-    {
-        return this.showAsResourcePack;
-    }
-
-    @Override
-    public <T> Optional<T> getConfigElement(final String... key)
-    {
-        return this.config.getConfigElement(key);
-    }
-
-    @Override
-    public List<? extends IConfigurable> getConfigList(final String... key)
-    {
-        return this.config.getConfigList(key);
-    }
-
-    @Override
-    public String getLicense()
-    {
-        return license;
-    }
-
-    @Override
-    public IConfigurable getConfig() {
-        return this;
-    }
-
-    public URL getIssueURL()
-    {
-        return issueURL;
-    }
-
-    public boolean missingLicense()
-    {
-        return Strings.isNullOrEmpty(license);
-    }
-
-    public Optional<String> getCodeSigningFingerprint() {
-        var signers = this.modFile.getSecureJar().getManifestSigners();
-        return (signers == null ? Stream.<CodeSigner>of() : Arrays.stream(signers))
-                .flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
-                .findFirst()
-                .map(LamdbaExceptionUtils.rethrowFunction(Certificate::getEncoded))
-                .map(bytes->LamdbaExceptionUtils.uncheck(()->MessageDigest.getInstance("SHA-256")).digest(bytes))
-                .map(StringUtils::binToHex)
-                .map(str-> String.join(":", str.split("(?<=\\G.{2})")));
-    }
-
-    public Optional<String> getTrustData() {
-        return Arrays.stream(this.modFile.getSecureJar().getManifestSigners())
-                .flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
-                .findFirst()
-                .map(X509Certificate.class::cast)
-                .map(c->{
-                    StringBuffer sb = new StringBuffer();
-                    sb.append(c.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
-                    boolean selfSigned = false;
-                   try {
-                       c.verify(c.getPublicKey());
-                       selfSigned = true;
-                   } catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
-                       // not self signed
-                   }
-                   if (selfSigned) {
-                    sb.append(" self-signed");
-                   } else {
-                       sb.append(" signed by ").append(c.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
-                   };
-                   return sb.toString();
-                });
-    }
-
-    @Override
-    public String moduleName() {
-        return getMods().get(0).getModId();
-    }
-
-    @Override
-    public String versionString()  {
-        return getMods().get(0).getVersion().toString();
-    }
-
-    @Override
-    public List<String> usesServices() {
-        return usesServices;
-    }
-}

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

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import com.electronwill.nightconfig.core.file.FileConfig;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.forgespi.locating.ModFileFactory;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class ModFileParser {
-    private static final Logger LOGGER = LogUtils.getLogger();
-
-    public static IModFileInfo readModList(final ModFile modFile, final ModFileFactory.ModFileInfoParser parser) {
-        return parser.build(modFile);
-    }
-
-    public static IModFileInfo modsTomlParser(final IModFile imodFile) {
-        ModFile modFile = (ModFile) imodFile;
-        LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
-        final Path modsjson = modFile.findResource("META-INF", "mods.toml");
-        if (!Files.exists(modsjson)) {
-            LOGGER.warn(LogMarkers.LOADING, "Mod file {} is missing mods.toml file", modFile.getFilePath());
-            return null;
-        }
-
-        final FileConfig fileConfig = FileConfig.builder(modsjson).build();
-        fileConfig.load();
-        fileConfig.close();
-        final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
-        final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper);
-        configWrapper.setFile(modFileInfo);
-        return modFileInfo;
-    }
-
-    protected static List<CoreModFile> getCoreMods(final ModFile modFile) {
-        Map<String,String> coreModPaths;
-        try {
-            final Path coremodsjson = modFile.findResource("META-INF", "coremods.json");
-            if (!Files.exists(coremodsjson)) {
-                return Collections.emptyList();
-            }
-            final Type type = new TypeToken<Map<String, String>>() {}.getType();
-            final Gson gson = new Gson();
-            coreModPaths = gson.fromJson(Files.newBufferedReader(coremodsjson), type);
-        } catch (IOException e) {
-            LOGGER.debug(LogMarkers.LOADING,"Failed to read coremod list coremods.json", e);
-            return Collections.emptyList();
-        }
-
-        return coreModPaths.entrySet().stream()
-                .peek(e-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {} with Javascript path {}", e.getKey(), e.getValue()))
-                .map(e -> new CoreModFile(e.getKey(), modFile.findResource(e.getValue()),modFile))
-                .collect(Collectors.toList());
-    }
-}

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

@@ -1,271 +0,0 @@
-/*
- * 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.StringSubstitutor;
-import net.minecraftforge.fml.loading.StringUtils;
-import net.minecraftforge.forgespi.language.IConfigurable;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.MavenVersionAdapter;
-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.slf4j.Logger;
-
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-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}$");
-    private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$");
-    private static final Pattern VALID_VERSION = Pattern.compile("^\\d+.*");
-
-    private final ModFileInfo owningFile;
-    private final String modId;
-    private final String namespace;
-    private final ArtifactVersion version;
-    private final String displayName;
-    private final String description;
-    private final Optional<String> logoFile;
-    private final boolean logoBlur;
-    private final Optional<URL> updateJSONURL;
-    private final List<? extends IModInfo.ModVersion> dependencies;
-
-    private final List<ForgeFeature.Bound> features;
-    private final Map<String,Object> properties;
-    private final IConfigurable config;
-    private final Optional<URL> modUrl;
-
-    public ModInfo(final ModFileInfo owningFile, final IConfigurable config)
-    {
-        Optional<ModFileInfo> ownFile = Optional.ofNullable(owningFile);
-        this.owningFile = owningFile;
-        this.config = config;
-        this.modId = config.<String>getConfigElement("modId")
-                .orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile));
-        if (!VALID_MODID.matcher(this.modId).matches()) {
-            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern());
-            throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile);
-        }
-        this.namespace = config.<String>getConfigElement("namespace").orElse(this.modId);
-        if (!VALID_NAMESPACE.matcher(this.namespace).matches()) {
-            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern());
-            throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile);
-        }
-        this.version = config.<String>getConfigElement("version")
-                .map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
-                .map(DefaultArtifactVersion::new).orElse(DEFAULT_VERSION);
-        this.displayName = config.<String>getConfigElement("displayName").orElse(this.modId);
-        this.description = config.<String>getConfigElement("description")
-                .orElse("MISSING DESCRIPTION")
-                .replace("\r\n", "\n").stripIndent();
-
-        this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
-                .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile")).orElse(null)));
-        this.logoBlur = config.<Boolean>getConfigElement("logoBlur")
-                .orElseGet(() -> ownFile.flatMap(f -> f.<Boolean>getConfigElement("logoBlur"))
-                        .orElse(true));
-
-        this.updateJSONURL = config.<String>getConfigElement("updateJSONURL")
-                .map(StringUtils::toURL);
-
-        this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId)
-                .stream()
-                .map(dep -> new ModVersion(this, dep))
-                .collect(Collectors.toList()))
-                .orElse(Collections.emptyList());
-
-        this.features = ownFile.map(mfi -> mfi.<Map<String, String>>getConfigElement("features", this.modId)
-                .stream()
-                .flatMap(m->m.entrySet().stream())
-                .map(e->new ForgeFeature.Bound(e.getKey(), e.getValue(), this))
-                .collect(Collectors.toList())).orElse(Collections.emptyList());
-
-        this.properties = ownFile.map(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId)
-                .orElse(Collections.emptyMap()))
-                .orElse(Collections.emptyMap());
-
-        this.modUrl = config.<String>getConfigElement("modUrl")
-                .map(StringUtils::toURL);
-
-        // verify we have a valid mod version otherwise throw an exception
-        if (!VALID_VERSION.matcher(this.version.toString()).matches()) {
-            throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile());
-        }
-    }
-
-    @Override
-    public ModFileInfo getOwningFile() {
-        return owningFile;
-    }
-
-    @Override
-    public String getModId() {
-        return modId;
-    }
-
-    @Override
-    public String getDisplayName()
-    {
-        return this.displayName;
-    }
-
-    @Override
-    public String getDescription()
-    {
-        return this.description;
-    }
-
-    @Override
-    public ArtifactVersion getVersion() {
-        return version;
-    }
-
-    @Override
-    public List<? extends IModInfo.ModVersion> getDependencies() {
-        return this.dependencies;
-    }
-
-    @Override
-    public String getNamespace() {
-        return this.namespace;
-    }
-
-    @Override
-    public Map<String, Object> getModProperties() {
-        return this.properties;
-    }
-
-    @Override
-    public Optional<URL> getUpdateURL() {
-        return this.updateJSONURL;
-    }
-
-    @Override
-    public Optional<String> getLogoFile()
-    {
-        return this.logoFile;
-    }
-
-    @Override
-    public boolean getLogoBlur()
-    {
-        return this.logoBlur;
-    }
-
-    @Override
-    public IConfigurable getConfig() {
-        return this;
-    }
-
-    @Override
-    public List<? extends ForgeFeature.Bound> getForgeFeatures() {
-        return this.features;
-    }
-
-    @Override
-    public <T> Optional<T> getConfigElement(final String... key) {
-        return this.config.getConfigElement(key);
-    }
-
-    @Override
-    public List<? extends IConfigurable> getConfigList(final String... key) {
-        return null;
-    }
-
-    @Override
-    public Optional<URL> getModURL() {
-        return modUrl;
-    }
-
-    class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion {
-        private IModInfo owner;
-        private final String modId;
-        private final VersionRange versionRange;
-        private final boolean mandatory;
-        private final Ordering ordering;
-        private final DependencySide side;
-        private final Optional<URL> referralUrl;
-
-        public ModVersion(final IModInfo owner, final IConfigurable config) {
-            this.owner = owner;
-            this.modId = config.<String>getConfigElement("modId")
-                    .orElseThrow(()->new InvalidModFileException("Missing required field modid in dependency", getOwningFile()));
-            this.mandatory = config.<Boolean>getConfigElement("mandatory")
-                    .orElseThrow(()->new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile()));
-            this.versionRange = config.<String>getConfigElement("versionRange")
-                    .map(MavenVersionAdapter::createFromVersionSpec)
-                    .orElse(UNBOUNDED);
-            this.ordering = config.<String>getConfigElement("ordering")
-                    .map(Ordering::valueOf)
-                    .orElse(Ordering.NONE);
-            this.side = config.<String>getConfigElement("side")
-                    .map(DependencySide::valueOf)
-                    .orElse(DependencySide.BOTH);
-            this.referralUrl = config.<String>getConfigElement("referralUrl")
-                    .map(StringUtils::toURL);
-        }
-
-
-        @Override
-        public String getModId()
-        {
-            return modId;
-        }
-
-        @Override
-        public VersionRange getVersionRange()
-        {
-            return versionRange;
-        }
-
-        @Override
-        public boolean isMandatory()
-        {
-            return mandatory;
-        }
-
-        @Override
-        public Ordering getOrdering()
-        {
-            return ordering;
-        }
-
-        @Override
-        public DependencySide getSide()
-        {
-            return side;
-        }
-
-        @Override
-        public void setOwner(final IModInfo owner)
-        {
-            this.owner = owner;
-        }
-
-        @Override
-        public IModInfo getOwner()
-        {
-            return owner;
-        }
-
-        @Override
-        public Optional<URL> getReferralURL() {
-            return referralUrl;
-        }
-    }
-
-}

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

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-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;
-
-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, null, 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() {
-    }
-
-    public void setModFile(IModFile file) {
-        this.modFile = file;
-    }
-
-    @Override
-    public String name() {
-        return modFile.getModFileInfo().moduleName();
-    }
-
-    @Override
-    public String version() {
-        return modFile.getModFileInfo().versionString();
-    }
-
-    @Override
-    public ModuleDescriptor descriptor() {
-        if (descriptor != null) return descriptor;
-        var bld = ModuleDescriptor.newAutomaticModule(name())
-                .version(version())
-                .packages(modFile.getSecureJar().getPackages());
-        modFile.getSecureJar().getProviders().stream()
-                .filter(p -> !p.providers().isEmpty())
-                .forEach(p -> bld.provides(p.serviceName(), p.providers()));
-        modFile.getModFileInfo().usesServices().forEach(bld::uses);
-        descriptor = bld.build();
-        return descriptor;
-    }
-
-    public IModFile modFile() {
-        return modFile;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) return true;
-        if (obj == null || obj.getClass() != this.getClass()) return false;
-        var that = (ModJarMetadata) obj;
-        return Objects.equals(this.modFile, that.modFile);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(modFile);
-    }
-
-    @Override
-    public String toString() {
-        return "ModJarMetadata[" +"modFile=" + modFile + ']';
-    }
-}

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

@@ -1,109 +0,0 @@
-/*
- * 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.modlauncher.api.IModuleLayerManager;
-import cpw.mods.modlauncher.api.ITransformationService;
-import net.minecraftforge.fml.loading.EarlyLoadingException;
-import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.ModSorter;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.locating.IModFile;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class ModValidator {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private final Map<IModFile.Type, List<ModFile>> modFiles;
-    private final List<ModFile> candidatePlugins;
-    private final List<ModFile> candidateMods;
-    private LoadingModList loadingModList;
-    private List<IModFile> brokenFiles;
-    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.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
-        this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY)));
-        this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));
-        this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
-        this.discoveryErrorData = discoveryErrorData;
-        this.brokenFiles = brokenFiles.stream().map(IModFileInfo::getFile).collect(Collectors.toList()); // mutable list
-    }
-
-    private static List<ModFile> lst(List<ModFile> files) {
-        return files == null ? new ArrayList<>() : new ArrayList<>(files);
-    }
-
-    public void stage1Validation() {
-        brokenFiles.addAll(validateFiles(candidateMods));
-        if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
-            LOGGER.debug(LogMarkers.SCAN, "Found {} mod files with {} mods", candidateMods.size(), candidateMods.stream().mapToInt(mf -> mf.getModInfos().size()).sum());
-        }
-        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found "+ candidateMods.size()+" modfiles to load"));
-    }
-
-    @NotNull
-    private List<ModFile> validateFiles(final List<ModFile> mods) {
-        final List<ModFile> brokenFiles = new ArrayList<>();
-        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext(); )
-        {
-            ModFile modFile = iterator.next();
-            if (!modFile.getProvider().isValid(modFile) || !modFile.identifyMods()) {
-                LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", modFile.getFilePath());
-                iterator.remove();
-                brokenFiles.add(modFile);
-            }
-        }
-        return brokenFiles;
-    }
-
-    public ITransformationService.Resource getPluginResources() {
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.PLUGIN, this.candidatePlugins.stream().map(IModFile::getSecureJar).toList());
-    }
-
-    public ITransformationService.Resource getModResources() {
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, this.candidateMods.stream().map(IModFile::getSecureJar).toList());
-    }
-
-    private List<EarlyLoadingException.ExceptionData> validateLanguages() {
-        List<EarlyLoadingException.ExceptionData> errorData = new ArrayList<>();
-        for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext(); ) {
-            final ModFile modFile = iterator.next();
-            try {
-                modFile.identifyLanguage();
-            } catch (EarlyLoadingException e) {
-                errorData.addAll(e.getAllData());
-                iterator.remove();
-            }
-        }
-        return errorData;
-    }
-
-    public BackgroundScanHandler stage2Validation() {
-        var errors = validateLanguages();
-
-        var allErrors = new ArrayList<>(errors);
-        allErrors.addAll(this.discoveryErrorData);
-
-        loadingModList = ModSorter.sort(candidateMods, allErrors);
-        loadingModList.addCoreMods();
-        loadingModList.addAccessTransformers();
-        loadingModList.setBrokenFiles(brokenFiles);
-        BackgroundScanHandler backgroundScanHandler = new BackgroundScanHandler(candidateMods);
-        loadingModList.addForScanning(backgroundScanHandler);
-        return backgroundScanHandler;
-    }
-}

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

@@ -1,69 +0,0 @@
-/*
- * 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.LogMarkers;
-import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
-import net.minecraftforge.fml.loading.StringUtils;
-import org.slf4j.Logger;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-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 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());
-    }
-
-    ModsFolderLocator(Path modFolder) {
-        this(modFolder, "mods folder");
-    }
-
-    ModsFolderLocator(Path modFolder, String name) {
-        this.modFolder = modFolder;
-        this.customName = name;
-    }
-
-    @Override
-    public Stream<Path> scanCandidates() {
-        LOGGER.debug(LogMarkers.SCAN,"Scanning mods dir {} for mods", this.modFolder);
-        var excluded = ModDirTransformerDiscoverer.allExcluded();
-
-        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
-    public String name() {
-        return customName;
-    }
-
-    @Override
-    public String toString() {
-        return "{"+customName+" locator at "+this.modFolder+"}";
-    }
-
-    @Override
-    public void initArguments(final Map<String, ?> arguments) {
-    }
-}