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

.gitignore

@@ -9,24 +9,19 @@
 
 #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/
@@ -37,7 +32,6 @@ src/generated/resources/.cache/
 #Patch rejects
 /patches-/
 *.patch.rej
-/projects/*/rejects/
 
 # FML changelog
 changelog.txt
@@ -45,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

@@ -1,5 +1,7 @@
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
+import jetbrains.buildServer.configs.kotlin.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 
 /*
 The settings script is an entry point for defining a TeamCity
@@ -30,11 +32,13 @@ project {
     buildType(Build)
     buildType(BuildSecondaryBranches)
     buildType(PullRequests)
+    buildType(PullRequestChecks)
+    buildType(PullRequestCompatibility)
 
     params {
-        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.4", 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.18.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_jdk_version", "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*)
                 +:refs/heads/(master*)
@@ -43,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")
@@ -72,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({
@@ -125,6 +114,32 @@ object PullRequests : BuildType({
             allowEmpty = false
         )
     }
+})
+
+object PullRequestChecks : BuildType({
+    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
+    id("MinecraftForge_MinecraftForge__PullRequestChecks")
+    name = "Pull Requests (Checks)"
+    description = "Checks pull requests for the project"
+
+    steps {
+        gradle {
+            name = "Check"
+            id = "RUNNER_10_Check"
+
+            tasks = "checkAll"
+            gradleParams = "--continue %gradle_custom_args%"
+            enableStacktrace = true
+            dockerImage = "%docker_gradle_image%"
+            dockerRunParameters = """
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
+                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
+                --network=host
+                -u 1000:1000
+                %docker_additional_args%
+            """.trimIndent()
+        }
+    }
 
     vcs {
         branchFilter = """
@@ -134,3 +149,37 @@ object PullRequests : BuildType({
         """.trimIndent()
     }
 })
+
+object PullRequestCompatibility : BuildType({
+    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
+    id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
+    name = "Pull Requests (Compatibility)"
+    description = "Validates binary compatibility for pull requests made to the project"
+
+    steps {
+        gradle {
+            name = "Validate"
+            id = "RUNNER_10_Compatibility"
+
+            tasks = "checkJarCompatibility"
+            gradleParams = "--continue %gradle_custom_args%"
+            enableStacktrace = true
+            dockerImage = "%docker_gradle_image%"
+            dockerRunParameters = """
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
+                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
+                --network=host
+                -u 1000:1000
+                %docker_additional_args%
+            """.trimIndent()
+        }
+    }
+
+    vcs {
+        branchFilter = """
+            +:*
+            -:1.*
+            -:<default>
+        """.trimIndent()
+    }
+})

Jenkinsfile

@@ -6,8 +6,8 @@ pipeline {
     }
     agent {
         docker {
-            image 'gradle:7-jdk16'
-            //args '-v forgegc:/home/gradle/.gradle_cache/'
+            image 'gradle:jdk8'
+            args '-v forgegc:/home/gradle/.gradle/'
         }
     }
     environment {
@@ -34,15 +34,6 @@ pipeline {
                 )
             }
         }
-        /*
-        stage('pull_cache') {
-            steps {
-                sh 'cp -r /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/'
-                sh 'cp -r /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/'
-                sh 'cp -r /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/'
-            }
-        }
-        */
         stage('setup') {
             steps {
                 withGradle {
@@ -50,7 +41,6 @@ pipeline {
                 }
                 script {
                     env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "^version:" | cut -d" " -f2').trim()
-                    env.FMLONLY_VERSION = sh(returnStdout: true, script: './gradlew :fmlonly:properties -q | grep "^version:" | cut -d" " -f2').trim()
                 }
             }
         }
@@ -79,14 +69,13 @@ pipeline {
             steps {
                 withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
                     withGradle {
-                        sh './gradlew ${GRADLE_ARGS} publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
+                        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
-                    build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:fmlonly ${env.FMLONLY_VERSION} latest")], propagate: false, wait: false
                 }
             }
         }
@@ -99,7 +88,7 @@ pipeline {
             }
             steps {
                 withGradle {
-                    sh './gradlew ${GRADLE_ARGS} publish -PcrowdinKey=${CROWDIN}'
+                    sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}'
                 }
             }
         }

LICENSE-header.txt

@@ -1,2 +1,2 @@
-Minecraft Forge - Forge Development LLC
+Copyright (c) Forge Development LLC and contributors
 SPDX-License-Identifier: LGPL-2.1-only

buildSrc/.gitignore

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

buildSrc/build.gradle

@@ -1,9 +1,11 @@
 repositories {
-    maven { url = 'https://maven.minecraftforge.net/' }
+	maven { url = 'https://maven.minecraftforge.net/' }
 	mavenCentral()
 }
 dependencies {
-	implementation 'org.ow2.asm:asm:9.1'
-	implementation 'org.ow2.asm:asm-tree:9.1'
-    implementation 'net.minecraftforge:srgutils:0.4.+'
+	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

@@ -4,7 +4,7 @@ import groovy.json.JsonBuilder
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.Opcodes
@@ -17,7 +17,9 @@ import java.util.zip.ZipInputStream
 
 abstract class BytecodeFinder extends DefaultTask {
     @InputFile abstract RegularFileProperty getJar()
-    @OutputFile abstract RegularFileProperty getOutput()
+    // It should be fine to mark the output as internal as we want to control when we run it anyways.
+    // This also shuts Gradle 8 up about implicit task dependencies.
+    @Internal abstract RegularFileProperty getOutput()
 
     BytecodeFinder() {
         output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })

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

@@ -1,267 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import net.minecraftforge.srgutils.IMappingFile
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.TaskAction
-import org.objectweb.asm.Opcodes
-
-abstract class CheckATs extends DefaultTask {
-	@InputFile abstract RegularFileProperty getInheritance()
-	@InputFiles abstract ConfigurableFileCollection getAts()
-    @InputFile @Optional abstract RegularFileProperty getMappings()
-	
-    @TaskAction
-    protected void exec() {
-        def mappings = mappings.map { IMappingFile.load(it.asFile) }.getOrNull()
-		Util.init()
-		def parse = { line ->
-			def idx = line.indexOf('#')
-			def comment = idx == -1 ? null : line.substring(idx)
-			if (idx != -1) line = line.substring(0, idx - 1)
-			def (modifier, cls, desc) = (line.trim() + '     ').split(' ', -1)
-			def key = cls + (desc.isEmpty() ? '' : ' ' + desc)
-			return [modifier, cls, desc, comment, key]
-		}
-		def accessLevel = { access ->
-			if ((access & Opcodes.ACC_PUBLIC)    != 0) return 3
-			if ((access & Opcodes.ACC_PROTECTED) != 0) return 2
-			if ((access & Opcodes.ACC_PRIVATE)   != 0) return 0
-			return 1
-		}
-		def accessStr = { access ->
-			if (access.endsWith('-f') || access.endsWith('+f'))
-				return 4
-			switch (access.toLowerCase()) {
-				case 'public':    return 3
-				case 'protected': return 2
-				case 'default':   return 1
-				case 'private':   return 0
-				default:          return -1
-			}
-		}
-		def json = inheritance.get().asFile.json()
-		
-		ats.each { f -> 
-			TreeMap lines = [:]
-			def group = null
-			for (def line : f.readLines()) {
-				if (line.isEmpty()) continue
-				if (line.startsWith('#group ')) {
-					def (modifier, cls, desc, comment, key) = parse.call(line.substring(7))
-					
-					if (desc != '*' && desc != '*()' && desc != '<init>')
-						throw new IllegalStateException('Invalid group: ' + line)
-					
-					group = [modifier: modifier, cls: cls, desc: desc, comment: comment, 
-						existing: [] as Set,
-						children: [] as TreeSet,
-						group: true
-					]
-					if (lines.containsKey(key))
-						throw new IllegalStateException('Duplicate group: ' + line)
-					
-					lines[key] = group
-				} else if (group != null) {
-					if (line.startsWith('#endgroup')) {
-						group = null
-					} else {
-						def (modifier, cls, desc, comment, key) = parse.call(line)
-						group['existing'].add(key)
-					}
-				} else if (line.startsWith('#endgroup')) {
-					throw new IllegalStateException('Invalid group ending: ' + line)
-				} else if (line.startsWith('#')) {
-					//Nom
-				} else {
-					def (modifier, cls, desc, comment, key) = parse.call(line)
-					if (lines.containsKey(key)) {
-						println('Duplicate: ' + line)
-						continue
-					}
-					lines[key] = [modifier: modifier, cls: cls, desc: desc, comment: comment, group: false]
-				}
-			}
-			
-			// Process Groups, this will remove any entries outside the group that is covered by the group
-			for (def key : new ArrayList<>(lines.keySet())) {
-				def entry = lines.get(key)
-				if (entry != null && entry['group']) {
-					def cls = entry['cls']
-					def jcls = json.get(cls.replaceAll('\\.', '/'))
-					if (jcls == null) {
-						lines.remove(key)
-						println('Invalid Group: ' + key)
-					} else if ('*' == entry['desc']) {
-						if (!jcls.containsKey('fields')) {
-							lines.remove(key)
-							println('Invalid Group, Class has no fields: ' + key)
-						} else {
-							jcls['fields'].each { field, value ->
-								def fkey = cls + ' ' + field
-								if (accessLevel.call(value['access']) < accessStr.call(entry['modifier'])) {
-									if (lines.containsKey(fkey)) {
-										lines.remove(fkey)
-									} else if (!entry['existing'].contains(fkey)) {
-										println('Added: ' + fkey)
-									}
-									entry['children'].add(fkey)
-								} else if (lines.containsKey(fkey)) {
-									lines.remove(fkey)
-									println('Removed: ' + fkey)
-								}
-							}
-							entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
-						}
-					} else if ('*()' == entry['desc']) {
-						if (!jcls.containsKey('methods')) {
-							lines.remove(key)
-							println('Invalid Group, Class has no methods: ' + key)
-						} else {
-							jcls['methods'].each{ mtd, value ->
-								if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$'))
-									return
-								key = cls + ' ' + mtd.replace(' ', '')
-								if (accessLevel.call(value['access']) < accessStr.call(entry['modifier'])) {
-									if (lines.containsKey(key)) {
-										lines.remove(key)
-									} else if (!entry['existing'].contains(key)) {
-										println('Added: ' + key)
-									}
-									entry['children'].add(key)
-								} else if (lines.containsKey(key)) {
-									lines.remove(key)
-									println('Removed: ' + key)
-								}
-							}
-							entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
-						}
-					} else if ('<init>' == entry['desc']) { //Make all public non-abstract subclasses
-						json.each{ tcls,value -> 
-							if (!value.containsKey('methods') || ((value['access'] & Opcodes.ACC_ABSTRACT) != 0))
-								return
-							def parents = [] as Set
-							def parent = tcls
-							while (parent != null && json.containsKey(parent)) {
-								parents.add(parent)
-								def p = json[parent]
-								parent = p == null ? null : p['superName']
-							}
-							if (parents.contains(cls.replaceAll('\\.', '/'))) {
-								value['methods'].each{ mtd, v -> 
-									if (mtd.startsWith('<init>')) {
-										def child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
-										if (accessLevel.call(v['access']) < 3) {
-											if (lines.containsKey(child)) {
-												lines.remove(child)
-											} else if (!entry['existing'].contains(child)) {
-												println('Added: ' + child)
-											}
-											entry['children'].add(child)
-										} else if (lines.containsKey(child)) {
-											lines.remove(child)
-											println('Removed: ' + child)
-										}
-									}
-								}
-							}
-						}
-						entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
-					}
-				}
-			}
-			
-			// Process normal lines, remove invalid and remove narrowing
-			for (def key : new ArrayList<>(lines.keySet())) {
-				def entry = lines.get(key)
-				if (entry != null && !entry['group']) {
-					def cls = entry['cls']
-					def jcls = json.get(cls.replaceAll('\\.', '/'))
-					if (jcls == null) {
-						lines.remove(key)
-						println('Invalid: ' + key)
-					} else if (entry['desc'] == '') {
-						if (accessLevel.call(jcls['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
-							lines.remove(key)
-							println('Invalid Narrowing: ' + key)
-						}
-					} else if (!entry['desc'].contains('(')) {
-						if (!jcls.containsKey('fields') || !jcls['fields'].containsKey(entry['desc'])) {
-							lines.remove(key)
-							println('Invalid: ' + key)
-						} else {
-							def value = jcls['fields'][entry['desc']]
-							if (accessLevel.call(value['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
-								lines.remove(key)
-								println('Invalid Narrowing: ' + key)
-								println(entry.comment)
-							}
-						}
-					} else {
-						def jdesc = entry['desc'].replace('(', ' (')
-						if (!jcls.containsKey('methods') || !jcls['methods'].containsKey(jdesc)) {
-							lines.remove(key)
-							println('Invalid: ' + key)
-						} else {
-							def value = jcls['methods'][jdesc]
-							if (accessLevel.call(value['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
-								lines.remove(key)
-								println('Invalid Narrowing: ' + key)
-							}
-						}
-					}
-				}
-			}
-
-			
-			def data = []
-            def remapComment = { entry ->
-                if (!mappings || !entry || !entry.desc) return null
-                def comment = entry.comment?.substring(1)?.trim()
-                def jsonCls = json.get(entry.cls.replaceAll('\\.', '/'))
-                def mappingsClass = mappings?.getClass(jsonCls.name)
-                if (!mappingsClass) return entry.comment
-                def idx = entry.desc.indexOf('(')
-                def mappedName = idx == -1
-                        ? mappingsClass.remapField(entry.desc)
-                        : mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
-                if (!mappedName) return entry.comment
-                if (mappedName == '<init>')
-                    mappedName = 'constructor'
-
-                if (comment?.startsWith(mappedName))
-                    return '# ' + comment
-                if (comment && comment.indexOf(' ') != -1) {
-                    def split = comment.split(" - ").toList()
-                    if (split[0].indexOf(' ') != -1)
-                        // The first string is more than one word, so append before it
-                        return "# ${mappedName} - ${comment}"
-                    split.remove(0)
-                    return "# ${mappedName} - ${String.join(' - ', split)}"
-                }
-                return '# ' + mappedName
-            }
-			lines.each { key,value -> 
-				if (!value.group) {
-                    def comment = remapComment.call(value)
-					data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
-				} else {
-					data.add('#group ' + value.modifier + ' ' + key + (value.comment == null ? '' : ' ' + value.comment))
-					value.children.each {
-                        def line = value.modifier + ' ' + it
-                        def (modifier, cls, desc, comment) = parse.call(line)
-                        comment = remapComment.call([modifier: modifier, cls: cls, desc: desc, comment: comment])
-                        data.add(line + (comment ? ' ' + comment : ''))
-                    }
-					data.add('#endgroup')
-				}
-			}
-			f.text = data.join('\n')
-		}
-	}
-}

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

@@ -1,94 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.TaskAction
-
-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
-import java.util.zip.ZipInputStream
-
-abstract class CheckExcs extends DefaultTask {
-	@InputFile abstract RegularFileProperty getBinary()
-	@InputFiles abstract ConfigurableFileCollection getExcs()
-	
-    @TaskAction
-    protected void exec() {
-		Util.init()
-		def known = []
-		binary.get().asFile.withInputStream { i ->
-			new ZipInputStream(i).withCloseable { zin ->
-				def visitor = new ClassVisitor(Opcodes.ASM9) {
-					private String cls
-					@Override
-					public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-						this.cls = name
-					}
-					
-					@Override
-					public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-						known.add(this.cls + '.' + name + descriptor)
-						super.visitMethod(access, name, descriptor, signature, exceptions)
-					}
-				}
-				ZipEntry zein
-				while ((zein = zin.nextEntry) != null) {
-					if (zein.name.endsWith('.class')) {
-						ClassReader reader = new ClassReader(zin)
-						reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
-					}
-				}
-			}
-		}
-		
-		excs.each { f -> 
-			def lines = []
-			f.eachLine { line ->
-				def idx = line.indexOf('#')
-				if (idx == 0 || line.isEmpty()) {
-					return
-				}
-				
-				def comment = idx == -1 ? null : line.substring(idx)
-				if (idx != -1) line = line.substring(0, idx - 1)
-				
-				if (!line.contains('=')) {
-					println('Invalid: ' + line)
-					return
-				}
-				
-				def (key, value) = line.split('=', 2)
-				if (!known.contains(key)) {
-					println('Unknown: ' + line)
-					return
-				}
-				
-				def (cls, desc) = key.split('\\.', 2)
-				if (!desc.contains('(')) {
-					println('Invalid: ' + line)
-					return
-				}
-				def name = desc.split('\\(', 2)[0]
-				desc = '(' + desc.split('\\(', 2)[1]
-				
-				def (exceptions, args) = value.contains('|') ? value.split('|', 2) : [value, '']
-				
-				if (args.split(',').length != Type.getArgumentTypes(desc).length) {
-					println('Invalid: ' + line)
-					return
-				}
-				lines.add(line)
-			}
-			f.text = lines.sort().join('\n')
-		}
-	}
-}

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

@@ -1,219 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.TaskAction
-
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.util.regex.Pattern
-
-abstract class CheckPatches extends DefaultTask {
-    @InputDirectory abstract DirectoryProperty getPatchDir()
-    @Input boolean autoFix = false
-
-    @TaskAction
-    protected void exec() {
-        def hasS2SArtifact = [
-                Paths.get("patches/minecraft/net/minecraft/client/renderer/ViewArea.java.patch"),
-                Paths.get("patches/minecraft/net/minecraft/data/models/blockstates/Variant.java.patch")
-        ]
-
-        def verified = true;
-        patchDir.get().asFileTree.each { patch ->
-            def patchPath = project.rootDir.toPath().relativize(patch.toPath())
-            verified &= verifyPatch(patch, autoFix, patchPath.toString(), hasS2SArtifact.contains(patchPath))
-        }
-
-        if (!verified)
-            throw new RuntimeException('One or more patches failed verification. Check the log for errors.')
-    }
-
-    def verifyPatch(patch, fix, patchPath, hasS2SArtifact) {
-        def hunk_start_pattern = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
-        def white_space_pattern = Pattern.compile('^[+\\-]\\s*$')
-        def import_pattern = Pattern.compile('^[+\\-]\\s*import.*')
-        def field_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
-        def method_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
-        def class_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
-
-        def accessMap = [("private"):0, (null):1, ("protected"):2, ("public"):3]
-
-        def hasProblem = false;
-        def lines = patch.readLines()
-
-        def hunksStart = 0
-        def onlyWhiteSpace = false
-
-        def didFix = false
-        def newLines = []
-        def whiteSpaceErrors = []
-
-        // First two lines are file name ++/-- and we do not care
-        newLines.add(lines[0] + '\n')
-        newLines.add(lines[1] + '\n')
-
-        int i = 2
-        for (; i < lines.size(); ++i) {
-            def line = lines[i]
-            newLines.add(line + '\n')
-
-            if (hunk_start_pattern.matcher(line).find()) {
-                if (onlyWhiteSpace) {
-                    if (fix || hasS2SArtifact) {
-                        logger.lifecycle("Removing white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                        def toRemove = i - hunksStart;
-                        while (toRemove-- > 0)
-                            newLines.remove(newLines.size() - 1)
-                        didFix = true
-                    }
-                    else {
-                        logger.lifecycle("Patch contains only white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                        hasProblem = true
-                    }
-                }
-                else {
-                    if (!whiteSpaceErrors.empty)
-                        hasProblem = true
-                    whiteSpaceErrors.each { error -> logger.lifecycle(error) }
-                    whiteSpaceErrors.clear()
-                }
-                hunksStart = i
-                onlyWhiteSpace = true
-                continue
-            }
-
-            if (line.startsWithAny('+','-')) {
-                def prefixChange = false
-                def prevLine = lines[i - 1]
-
-                if (line.charAt(0) == (char)'+' && prevLine.charAt(0) == (char)'-') {
-                    def prevTrim = prevLine.substring(1).replaceAll("\\s", "")
-                    def currTrim = line.substring(1).replaceAll("\\s", "")
-
-                    if (prevTrim.equals(currTrim)) {
-                        prefixChange = true
-                    }
-
-                    def pMatcher = field_pattern.matcher(prevLine)
-                    def cMatcher = field_pattern.matcher(line)
-
-                    if (pMatcher.find() && cMatcher.find() &&
-                            pMatcher.group(6) == cMatcher.group(6) && // = ...
-                            pMatcher.group(5) == cMatcher.group(5) && // field name
-                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
-                        logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-
-                    pMatcher = method_pattern.matcher(prevLine)
-                    cMatcher = method_pattern.matcher(line)
-
-                    if (pMatcher.find() && cMatcher.find() &&
-                            pMatcher.group(6) == cMatcher.group(6) && // params
-                            pMatcher.group(5) == cMatcher.group(5) && // <T> void name
-                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
-                        logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-
-                    pMatcher = class_pattern.matcher(prevLine)
-                    cMatcher = class_pattern.matcher(line)
-
-                    if (pMatcher.find() && cMatcher.find() &&
-                            pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
-                            pMatcher.group(5) == cMatcher.group(5) && // class | interface
-                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
-                        logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-                }
-
-                if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
-                    def nextLine = lines[i + 1]
-                    if (nextLine.charAt(0) == (char)'+') {
-                        def nextTrim = nextLine.substring(1).replaceAll("\\s", "")
-                        def currTrim = line.substring(1).replaceAll("\\s", "")
-
-                        if (nextTrim.equals(currTrim)) {
-                            prefixChange = true
-                        }
-                    }
-                }
-
-                def isWhiteSpaceChange = white_space_pattern.matcher(line).find()
-
-                if (!prefixChange && !isWhiteSpaceChange) {
-                    onlyWhiteSpace = hasS2SArtifact && import_pattern.matcher(line).find()
-                }
-                else if (isWhiteSpaceChange) {
-                    def prevLineChange = prevLine.startsWithAny('+','-')
-                    def nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
-
-                    if (!prevLineChange && !nextLineChange) {
-                        whiteSpaceErrors.add(String.format("Patch contains white space change in valid hunk at line %d (cannot auto fix), file: %s", i + 1, patchPath))
-                    }
-                }
-
-                if (line.contains("\t")) {
-                    if (!fix) {
-                        logger.lifecycle("Patch contains tabs on line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-                    else {
-                        logger.lifecycle("Fixing tabs on line {}, file: {}", i + 1, patchPath)
-                        line = line.replaceAll('\t', '    ')
-                        newLines.remove(newLines.size() - 1)
-                        newLines.add(line + '\n')
-                        didFix = true
-                    }
-                }
-
-                if (import_pattern.matcher(line).find() && !hasS2SArtifact) {
-                    logger.lifecycle("Patch contains import change on line {}, file: {}", i + 1, patchPath)
-                    hasProblem = true
-                }
-            }
-        }
-
-        if (onlyWhiteSpace) {
-            if (fix || hasS2SArtifact) {
-                logger.lifecycle("Removing white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                def toRemove = i - hunksStart;
-                while (toRemove-- > 0)
-                    newLines.remove(newLines.size() - 1)
-                didFix = true
-            }
-            else {
-                logger.lifecycle("Patch contains only white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                hasProblem = true
-            }
-        }
-        else {
-            if (!whiteSpaceErrors.empty)
-                hasProblem = true
-            whiteSpaceErrors.each { error -> logger.lifecycle(error) }
-        }
-
-        if (didFix) {
-            if (newLines.size() <= 2) {
-                logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
-                Files.delete(patch.toPath())
-            }
-            else {
-                if (!hasS2SArtifact)
-                    logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
-                patch.withWriter('UTF-8') { writer ->
-                    newLines.each { l -> writer.write(l) }
-                }
-            }
-        }
-
-        return !hasProblem
-    }
-}

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

@@ -1,63 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.TaskAction
-
-abstract class CheckSAS extends DefaultTask {
-	@InputFile abstract RegularFileProperty getInheritance()
-	@InputFiles abstract ConfigurableFileCollection getSass()
-	
-    @TaskAction
-    protected void exec() {
-		Util.init()
-		def json = inheritance.get().asFile.json()
-		
-		sass.each { f -> 
-			def lines = []
-			f.eachLine { line ->
-				if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
-				def idx = line.indexOf('#')
-				if (idx == 0 || line.isEmpty()) {
-					lines.add(line)
-					return
-				}
-				def comment = idx == -1 ? null : line.substring(idx)
-				if (idx != -1) line = line.substring(0, idx - 1)
-				def (cls, desc) = (line.trim() + '    ').split(' ', -1)
-				cls = cls.replaceAll('\\.', '/')
-				desc = desc.replace('(', ' (')
-
-				if (json[cls] == null || (!desc.isEmpty() && (json[cls]['methods'] == null || json[cls]['methods'][desc] == null))) {
-					println('Invalid: ' + line)
-					return
-				}
-
-				//Class SAS
-				if (desc.isEmpty()) {
-					lines.add(cls + (comment == null ? '' : ' ' + comment))
-					if (json[cls]['methods'] != null)
-						(json[cls]['methods'] as TreeMap).each {
-							findChildMethods(json, cls, it.key).each { lines.add('\t' + it) }
-						}
-					return
-				}
-
-				//Method SAS
-				lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
-				findChildMethods(json, cls, desc).each { lines.add('\t' + it) }
-			}
-			f.text = lines.join('\n')
-		}
-	}
-
-	protected static findChildMethods(json, cls, desc)
-	{
-		return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
-				.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
-	}
-}

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

@@ -0,0 +1,49 @@
+package net.minecraftforge.forge.tasks
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import groovy.transform.CompileStatic
+import groovy.transform.TupleConstructor
+
+@CompileStatic
+@TupleConstructor
+final class InheritanceData implements Annotatable {
+    String name
+    int access
+    String superName
+    List<String> interfaces = []
+    Map<String, Method> methods = [:]
+    Map<String, Field> fields = [:]
+    List<Annotation> annotations = []
+
+    @TupleConstructor
+    static final class Method implements Annotatable {
+        int access
+        String override
+        List<Annotation> annotations = []
+    }
+
+    @TupleConstructor
+    static final class Field implements Annotatable {
+        int access
+        String desc
+        List<Annotation> annotations = []
+    }
+
+    @TupleConstructor
+    static final class Annotation {
+        String desc
+    }
+
+    private static final Gson GSON = new Gson()
+    static Map<String, InheritanceData> parse(File file) {
+        try (final reader = file.newReader()) {
+            return GSON.fromJson(reader, new TypeToken<Map<String, InheritanceData>>() {})
+        }
+    }
+}
+
+@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.MAVEN_USER) {
-                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

@@ -0,0 +1,44 @@
+package net.minecraftforge.forge.tasks
+
+import org.apache.commons.io.IOUtils
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+abstract class MergeJars extends DefaultTask {
+    MergeJars() {
+        output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
+    }
+
+    @TaskAction
+    void run() {
+        def jars = inputJars.files
+
+        try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
+            for (def jar : jars) {
+                try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
+                    def entry
+                    while ((entry = zin.getNextEntry()) != null) {
+                        ZipEntry _new = new ZipEntry(entry.getName())
+                        _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
+                        zout.putNextEntry(_new)
+                        IOUtils.copy(zin, zout)
+                    }
+                }
+            }
+        }
+    }
+
+    @InputFiles
+    abstract ConfigurableFileCollection getInputJars()
+
+    @OutputFile
+    abstract RegularFileProperty getOutput()
+}

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

@@ -0,0 +1,47 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+
+abstract class SetupCheckJarCompatibility extends DefaultTask {
+    SetupCheckJarCompatibility() {
+        group = 'jar compatibility'
+        onlyIf {
+            inputVersion.getOrNull() != null
+        }
+        outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
+
+        baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
+    }
+
+    @TaskAction
+    void run() {
+        def inputVersion = inputVersion.get()
+
+        def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
+        project.rootProject.extensions.download.run {
+            src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-userdev.jar"
+            dest baseForgeUserdev
+        }
+
+        def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
+
+        Files.copy(joinedLzma.toPath(), baseBinPatchesOutput.get().asFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+    }
+
+    @Input
+    @Optional
+    abstract Property<String> getInputVersion()
+
+    @OutputFile
+    abstract RegularFileProperty getBaseBinPatchesOutput()
+}

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

@@ -1,12 +1,9 @@
 package net.minecraftforge.forge.tasks
 
-import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
 
-import java.io.File
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
-import java.util.Date
 
 public class Util {
 	static void init() {
@@ -17,11 +14,8 @@ 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")
@@ -96,17 +90,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() }
 
@@ -142,4 +125,9 @@ public class Util {
 			throw e
 		}
 	}
+
+	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/checks/CheckATs.groovy

@@ -0,0 +1,310 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import groovy.transform.TupleConstructor
+import net.minecraftforge.forge.tasks.InheritanceData
+import net.minecraftforge.srgutils.IMappingFile
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFile
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Optional
+import org.objectweb.asm.Opcodes
+
+@CompileStatic
+abstract class CheckATs extends CheckTask {
+
+    @InputFile abstract RegularFileProperty getInheritance()
+    @InputFiles abstract ConfigurableFileCollection getAts()
+    @InputFile @Optional abstract RegularFileProperty getMappings()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final IMappingFile mappings = mappings.map { RegularFile it -> IMappingFile.load(it.asFile) }.getOrNull()
+        final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
+
+        ats.each {
+            final lines = process(it, reporter, inheritance)
+            if (fix) {
+                it.text = joinBack(lines, inheritance, mappings).join('\n')
+            }
+        }
+    }
+
+    private static TreeMap<String, ATParser.Entry> process(File file, Reporter reporter, Map<String, InheritanceData> inheritance) {
+        final TreeMap<String, ATParser.Entry> lines = ATParser.parse(file.readLines(), reporter)
+        final Map<String, ATParser.Entry> constructorGroups = [:]
+
+        final itr = lines.entrySet().iterator()
+        final toRemove = []
+        while (itr.hasNext()) {
+            final next = itr.next()
+            String key = next.key
+            final entry = next.value
+            if (entry === null) continue
+
+            final binaryName = entry.cls.replaceAll('\\.', '/')
+
+            // Process Groups, this will remove any entries outside the group that is covered by the group
+            if (entry.group) {
+                final jcls = inheritance[binaryName]
+                if (jcls === null) {
+                    itr.remove()
+                    reporter.report("Invalid group: $key")
+                } else if ('*' == entry.desc) {
+                    if (!jcls.fields) {
+                        itr.remove()
+                        reporter.report("Invalid group, class has no fields: $key")
+                    } else {
+                        jcls.fields.each { field, value ->
+                            final fkey = entry.cls + ' ' + field
+                            if (accessLevel(value.access) < accessStr(entry.modifier)) {
+                                if (lines.containsKey(fkey)) {
+                                    toRemove.add(fkey)
+                                } else if (!entry.existing.contains(fkey)) {
+                                    reporter.report("Missing group entry: $fkey")
+                                }
+                                entry.children.add(fkey)
+                            } else if (lines.containsKey(fkey)) {
+                                toRemove.add(fkey)
+                                reporter.report("Found invalid group entry: $fkey")
+                            }
+                        }
+                        entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
+                    }
+                } else if ('*()' == entry.desc) {
+                    if (!jcls.methods) {
+                        itr.remove()
+                        reporter.report("Invalid group, class has no methods: $key")
+                    } else {
+                        jcls.methods.each { mtd, value ->
+                            if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$')) return
+                            key = entry.cls + ' ' + mtd.replace(' ', '')
+                            if (accessLevel(value.access) < accessStr(entry.modifier)) {
+                                if (lines.containsKey(key)) {
+                                    toRemove.add(key)
+                                } else if (!entry.existing.contains(key)) {
+                                    reporter.report("Missing group entry: $key")
+                                }
+                                entry.children.add(key)
+                            } else if (lines.containsKey(key)) {
+                                toRemove.add(key)
+                                reporter.report("Found invalid group entry: $key")
+                            }
+                        }
+                        entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
+                    }
+                } else if ('<init>' == entry.desc) { //Make all public non-abstract subclasses
+                    constructorGroups.put(binaryName, entry)
+                }
+            }
+
+            // Process normal lines, remove invalid and remove narrowing
+            else {
+                def jcls = inheritance.get(binaryName)
+                if (jcls === null) {
+                    itr.remove()
+                    reporter.report("Invalid: $key")
+                } else if (entry.desc == '') {
+                    if (accessLevel(jcls.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
+                        itr.remove()
+                        reporter.report("Invalid Narrowing: $key")
+                    }
+                } else if (!entry.desc.contains('(')) {
+                    if (!jcls.fields || !jcls.fields.containsKey(entry.desc)) {
+                        itr.remove()
+                        reporter.report("Invalid: $key")
+                    } else {
+                        final value = jcls.fields[entry.desc]
+                        if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
+                            itr.remove()
+                            reporter.report("Invalid Narrowing: $key - ${entry.comment}")
+                        }
+                    }
+                } else {
+                    final jdesc = entry.desc.replace('(', ' (')
+                    if (!jcls.methods || !jcls.methods.containsKey(jdesc)) {
+                        itr.remove()
+                        reporter.report("Invalid: $key")
+                    } else {
+                        final value = jcls.methods[jdesc]
+                        if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
+                            itr.remove()
+                            reporter.report("Invalid Narrowing: $key")
+                        }
+                    }
+                }
+            }
+        }
+
+        inheritance.each { tcls, value ->
+            if (!value.methods || ((value.access & Opcodes.ACC_ABSTRACT) !== 0)) return
+            String parent = tcls
+            while (parent !== null) {
+                constructorGroups[parent]?.tap { entry ->
+                    value.methods.each { mtd, v ->
+                        if (mtd.startsWith('<init>')) {
+                            final child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
+                            if (accessLevel(v.access) < 3) {
+                                if (lines.containsKey(child)) {
+                                    toRemove.add(child)
+                                } else if (child !in entry.existing) {
+                                    reporter.report("Missing group entry: $child")
+                                }
+                                entry.children.add(child)
+                            } else if (lines.containsKey(child)) {
+                                toRemove.add(child)
+                                reporter.report("Found invalid group entry: $child")
+                            }
+                        }
+                    }
+                }
+                parent = inheritance[parent]?.superName
+            }
+        }
+        constructorGroups.values().each { entry -> entry.existing.findAll { it !in entry.children }.each{  reporter.report("Found invalid group entry: $it") } }
+
+        toRemove.each(lines.&remove)
+
+        return lines
+    }
+
+    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance, IMappingFile mappings) {
+        final List<String> data = []
+        final remapComment = { ATParser.Entry entry ->
+            if (!mappings || !entry || !entry.desc) return null
+            final comment = entry.comment?.substring(1)?.trim()
+            final jsonCls = inheritance.get(entry.cls.replaceAll('\\.', '/'))
+            final mappingsClass = mappings?.getClass(jsonCls.name)
+            if (mappingsClass === null) return entry.comment
+            final idx = entry.desc.indexOf('(')
+
+            String mappedName = idx == -1
+                    ? mappingsClass.remapField(entry.desc)
+                    : mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
+            if (!mappedName) return entry.comment
+            if (mappedName == '<init>')
+                mappedName = 'constructor'
+
+            if (comment?.startsWith(mappedName))
+                return '# ' + comment
+            if (comment && comment.indexOf(' ') !== -1) {
+                def split = comment.split(' - ').toList()
+                if (split[0].indexOf(' ') !== -1)
+                // The first string is more than one word, so append before it
+                    return "# ${mappedName} - ${comment}"
+                split.remove(0)
+                return "# ${mappedName} - ${String.join(' - ', split)}"
+            }
+            return '# ' + mappedName
+        }
+        lines.each { key, value ->
+            if (!value.group) {
+                def comment = remapComment.call(value)
+                data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
+            } else {
+                data.add(('#group ' + value.modifier + ' ' + key + ' ' + (value.comment ?: '')).trim())
+                value.children.each {
+                    final line = value.modifier + ' ' + it
+                    final entry = ATParser.parseEntry(line)
+                    final comment = remapComment(entry)
+                    data.add(line + (comment ? ' ' + comment : ''))
+                }
+                data.add('#endgroup')
+            }
+        }
+        return data
+    }
+
+    static int accessStr(String access) {
+        if (access.endsWith('-f') || access.endsWith('+f')) return 4
+        switch (access.toLowerCase()) {
+            case 'public':    return 3
+            case 'protected': return 2
+            case 'default':   return 1
+            case 'private':   return 0
+            default:          return -1
+        }
+    }
+
+    static int accessLevel(int access) {
+        if ((access & Opcodes.ACC_PUBLIC)    !== 0) return 3
+        if ((access & Opcodes.ACC_PROTECTED) !== 0) return 2
+        if ((access & Opcodes.ACC_PRIVATE)   !== 0) return 0
+        return 1
+    }
+}
+
+@CompileStatic
+class ATParser {
+    static TreeMap<String, Entry> parse(List<String> lines, CheckTask.Reporter reporter) {
+        TreeMap<String, Entry> outLines = new TreeMap<>()
+        Entry group = null
+        for (final line : lines) {
+            if (line.isEmpty()) continue
+            if (line.startsWith('#group ')) {
+                final entry = parseEntry(line.substring(7))
+
+                if (entry.desc != '*' && entry.desc != '*()' && entry.desc != '<init>') {
+                    reporter.report("Invalid group: $line", false)
+                }
+
+                entry.group = true
+                entry.children = []
+                entry.existing = []
+
+                group = entry
+
+                if (outLines.containsKey(entry.key)) {
+                    reporter.report("Duplicate group: $line", false)
+                }
+
+                outLines[entry.key] = group
+            } else if (group !== null) {
+                if (line.startsWith('#endgroup')) {
+                    group = null
+                } else {
+                    final key = parseEntry(line).key
+                    group.existing.add(key)
+                }
+            } else if (line.startsWith('#endgroup')) {
+                reporter.report("Invalid group ending: $line", false)
+            } else if (line.startsWith('#')) {
+                //Nom
+            } else {
+                final entry = parseEntry(line)
+                if (outLines.containsKey(entry.key)) {
+                    reporter.report("Found duplicate: $line")
+                    continue
+                }
+                outLines[entry.key] = entry
+            }
+        }
+        return outLines
+    }
+
+    static Entry parseEntry(String line) {
+        final idx = line.indexOf('#')
+        final String comment = idx === -1 ? null : line.substring(idx)
+        if (idx !== -1) line = line.substring(0, idx - 1)
+        final data = (line.trim() + '     ').split(' ', -1)
+        new Entry(data[0], data[1], data[2], comment)
+    }
+
+    @TupleConstructor
+    static final class Entry {
+        String modifier, cls, desc, comment
+
+        Set<String> existing
+        TreeSet<String> children
+        boolean group = false
+
+        @Lazy
+        String key = {cls + (desc.isEmpty() ? '' : ' ' + desc)}()
+
+        Object getAt(String key) {
+            return getProperty(key)
+        }
+    }
+}

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

@@ -0,0 +1,93 @@
+package net.minecraftforge.forge.tasks.checks
+
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+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
+import java.util.zip.ZipInputStream
+
+abstract class CheckExcs extends CheckTask {
+
+    @InputFile abstract RegularFileProperty getBinary()
+    @InputFiles abstract ConfigurableFileCollection getExcs()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final Set<String> known = []
+        collectKnown(known)
+
+        excs.each { f ->
+            final lines = []
+            f.eachLine { line ->
+                def idx = line.indexOf('#')
+                if (idx == 0 || line.isEmpty()) {
+                    return
+                }
+
+                if (idx != -1) line = line.substring(0, idx - 1)
+
+                if (!line.contains('=')) {
+                    reporter.report("Invalid: $line")
+                    return
+                }
+
+                def (String key, String value) = line.split('=', 2)
+                if (!known.contains(key)) {
+                    reporter.report("Unknown: $line")
+                    return
+                }
+
+                String desc = key.split('\\.', 2)[1]
+                if (!desc.contains('(')) {
+                    reporter.report("Invalid: $line")
+                    return
+                }
+                desc = '(' + desc.split('\\(', 2)[1]
+
+                def (exceptions, String args) = value.contains('|') ? value.split('|', 2) : [value, '']
+
+                if (args.split(',').length !== Type.getArgumentTypes(desc).length) {
+                    reporter.report("Invalid: $line")
+                    return
+                }
+                lines.add(line)
+            }
+
+            if (fix) f.text = lines.sort().join('\n')
+        }
+    }
+
+    private void collectKnown(Collection<String> known) {
+        binary.get().asFile.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                final visitor = new ClassVisitor(Opcodes.ASM9) {
+                    private String cls
+                    @Override
+                    void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+                        this.cls = name
+                    }
+
+                    @Override
+                    MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+                        known.add(this.cls + '.' + name + descriptor)
+                        super.visitMethod(access, name, descriptor, signature, exceptions)
+                    }
+                }
+                ZipEntry zein
+                while ((zein = zin.nextEntry) !== null) {
+                    if (zein.name.endsWith('.class')) {
+                        ClassReader reader = new ClassReader(zin)
+                        reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+enum CheckMode {
+    CHECK,
+    FIX
+}

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

@@ -0,0 +1,177 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Optional
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.regex.Pattern
+
+@CompileStatic
+abstract class CheckPatches extends CheckTask {
+
+    private static final Pattern HUNK_START_PATTERN = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
+    private static final Pattern WHITESPACE_PATTERN = Pattern.compile('^[+\\-]\\s*$')
+    private static final Pattern IMPORT_PATTERN = Pattern.compile('^[+\\-]\\s*import.*')
+    private static final Pattern FIELD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
+    private static final Pattern METHOD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
+    private static final Pattern CLASS_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
+    private static final Map<String, Integer> ACCESS_MAP = [private: 0, protected: 2, public: 3].tap { it.put(null, 1) }
+
+    @InputDirectory abstract DirectoryProperty getPatchDir()
+    @Input @Optional abstract ListProperty<String> getPatchesWithS2SArtifact()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final patchDir = getPatchDir().get().asFile.toPath()
+        Files.walk(patchDir).withCloseable {
+            it.filter(Files.&isRegularFile).forEach { path ->
+                final String relativeName = patchDir.relativize(path).toString()
+                verifyPatch(path, reporter, fix, relativeName, patchesWithS2SArtifact.get().contains(relativeName.replace('\\', '/')))
+            }
+        }
+    }
+
+    void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
+        final oldFixedErrors = reporter.fixed.size()
+
+        final lines = Files.readAllLines(patch)
+
+        int hunksStart = 0
+        boolean onlyWhiteSpace = false
+
+        final List<String> newLines = []
+
+        // First two lines are file name ++/-- and we do not care
+        newLines.add(lines[0] + '\n')
+        newLines.add(lines[1] + '\n')
+
+        int i
+        for (i = 2; i < lines.size(); ++i) {
+            def line = lines[i]
+            newLines.add(line + '\n')
+
+            if (HUNK_START_PATTERN.matcher(line).find()) {
+                if (onlyWhiteSpace) {
+                    if (!hasS2SArtifact)
+                        reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
+                    int toRemove = i - hunksStart
+                    while (toRemove-- > 0)
+                        newLines.remove(newLines.size() - 1)
+                }
+                hunksStart = i
+                onlyWhiteSpace = true
+                continue
+            }
+
+            if (line.startsWithAny('+','-')) {
+                def prefixChange = false
+                def prevLine = lines[i - 1]
+
+                if (line.charAt(0) == (char)'+' && prevLine.charAt(0) == (char)'-') {
+                    def prevTrim = prevLine.substring(1).replaceAll("\\s", "")
+                    def currTrim = line.substring(1).replaceAll("\\s", "")
+
+                    if (prevTrim == currTrim) {
+                        prefixChange = true
+                    }
+
+                    def pMatcher = FIELD_PATTERN.matcher(prevLine)
+                    def cMatcher = FIELD_PATTERN.matcher(line)
+
+                    if (pMatcher.find() && cMatcher.find() &&
+                            pMatcher.group(6) == cMatcher.group(6) && // = ...
+                            pMatcher.group(5) == cMatcher.group(5) && // field name
+                            pMatcher.group(3) == cMatcher.group(3) && // static
+                            (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)
+                    }
+
+                    pMatcher = METHOD_PATTERN.matcher(prevLine)
+                    cMatcher = METHOD_PATTERN.matcher(line)
+
+                    if (pMatcher.find() && cMatcher.find() &&
+                            pMatcher.group(6) == cMatcher.group(6) && // params
+                            pMatcher.group(5) == cMatcher.group(5) && // <T> void name
+                            pMatcher.group(3) == cMatcher.group(3) && // static
+                            (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)
+                    }
+
+                    pMatcher = CLASS_PATTERN.matcher(prevLine)
+                    cMatcher = CLASS_PATTERN.matcher(line)
+
+                    if (pMatcher.find() && cMatcher.find() &&
+                            pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
+                            pMatcher.group(5) == cMatcher.group(5) && // class | interface
+                            pMatcher.group(3) == cMatcher.group(3) && // static
+                            (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)
+                    }
+                }
+
+                if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
+                    final nextLine = lines[i + 1]
+                    if (nextLine.charAt(0) == (char)'+') {
+                        final nextTrim = nextLine.substring(1).replaceAll("\\s", "")
+                        final currTrim = line.substring(1).replaceAll("\\s", "")
+
+                        if (nextTrim == currTrim) {
+                            prefixChange = true
+                        }
+                    }
+                }
+
+                final isWhiteSpaceChange = WHITESPACE_PATTERN.matcher(line).find()
+
+                if (!prefixChange && !isWhiteSpaceChange) {
+                    onlyWhiteSpace = hasS2SArtifact && IMPORT_PATTERN.matcher(line).find()
+                } else if (isWhiteSpaceChange) {
+                    final prevLineChange = prevLine.startsWithAny('+','-')
+                    final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
+
+                    if (!prevLineChange && !nextLineChange) {
+                        reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath", false)
+                    }
+                }
+
+                if (line.contains('\t')) {
+                    reporter.report("Patch contains tabs on line ${i + 1}, file: $patchPath")
+                    line = line.replaceAll('\t', '    ')
+                    newLines.remove(newLines.size() - 1)
+                    newLines.add(line + '\n')
+                }
+
+                if (IMPORT_PATTERN.matcher(line).find() && !hasS2SArtifact) {
+                    reporter.report("Patch contains import change on line ${i + 1}, file: $patchPath", false)
+                }
+            }
+        }
+
+        if (onlyWhiteSpace) {
+            if (!hasS2SArtifact)
+                reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
+            def toRemove = i - hunksStart;
+            while (toRemove-- > 0)
+                newLines.remove(newLines.size() - 1)
+        }
+
+        if ((reporter.fixed.size() > oldFixedErrors && fix) || hasS2SArtifact) {
+            if (newLines.size() <= 2) {
+                logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
+                Files.delete(patch)
+            }
+            else {
+                if (!hasS2SArtifact)
+                    logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
+                Files.newBufferedWriter(patch).withCloseable {
+                    newLines.each { l -> it.write(l) }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,110 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import net.minecraftforge.forge.tasks.Annotatable
+import net.minecraftforge.forge.tasks.InheritanceData
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+
+@CompileStatic
+abstract class CheckSAS extends CheckTask {
+
+    @InputFile abstract RegularFileProperty getInheritance()
+    @InputFiles abstract ConfigurableFileCollection getSass()
+
+    @Override
+    void check(Reporter reporter, boolean fix) {
+        final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
+
+        sass.each { f ->
+            final lines = []
+            f.eachLine { line ->
+                if (line[0] == '\t') return // Skip any tabbed lines, those are ones we add
+                final idx = line.indexOf('#')
+                if (idx == 0 || line.isEmpty()) {
+                    lines.add(line)
+                    return
+                }
+                def comment = idx == -1 ? null : line.substring(idx)
+                if (idx != -1) line = line.substring(0, idx - 1)
+                final spl = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
+                def (String cls, String name, String desc) = [spl[0], spl[1], spl[2]]
+                cls = cls.replaceAll('\\.', '/')
+
+                if (inheritance[cls] === null) {
+                    reporter.report("Invalid: $line")
+                } else if (name.isEmpty()) { //Class SAS
+                    final toAdd = []
+                    final clsSided = isSided(inheritance[cls])
+                    boolean sided = clsSided
+
+                    /* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null) {
+                        for (entry in json[cls]['fields']) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key)
+                            }
+						}
+                    } */
+
+                    final clsInh = inheritance[cls]
+                    if (clsInh.methods) {
+                        for (entry in clsInh.methods) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
+                                findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
+                                findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
+                            } else if (clsSided) {
+                                findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
+                                findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
+                            }
+                        }
+                    }
+
+                    if (sided) {
+                        lines.add(cls + (comment == null ? '' : ' ' + comment))
+                        lines.addAll(toAdd.sort())
+                    } else {
+                        reporter.report("Invalid: $line")
+                    }
+
+                } else if (desc.isEmpty()) { // Fields
+                    /* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
+                        lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
+                    else */
+                    reporter.report("Invalid: $line")
+                } else { // Methods
+                    final clsInh = inheritance[cls]
+                    if (clsInh.methods === null || !isSided(clsInh.methods[name + ' ' + desc]))
+                        reporter.report("Invalid: $line")
+                    else {
+                        lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
+                        findChildMethods(inheritance, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
+                        findChildMethods(inheritance, cls, name + ' ' + desc).each { lines.add('\t' + it) }
+                    }
+                }
+            }
+
+            if (fix) f.text = lines.join('\n')
+        }
+    }
+
+    protected static isSided(Annotatable annotatable) {
+        if (annotatable === null) return false
+        for (ann in annotatable.annotations) {
+            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
+                return true
+        }
+        return false
+    }
+    
+    protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
+        return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
+                .collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
+    }
+}

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

@@ -0,0 +1,109 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import net.minecraftforge.forge.tasks.Util
+import org.gradle.api.Action
+import org.gradle.api.DefaultTask
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskContainer
+import org.gradle.api.tasks.VerificationTask
+
+@CompileStatic
+abstract class CheckTask extends DefaultTask implements VerificationTask {
+    @Input
+    abstract Property<CheckMode> getMode()
+
+    private boolean ignoreFailures = false
+
+    @Input
+    @Override
+    boolean getIgnoreFailures() {
+        return ignoreFailures
+    }
+
+    @Override
+    void setIgnoreFailures(boolean ignoreFailures) {
+        this.ignoreFailures = ignoreFailures
+    }
+
+    @TaskAction
+    void run() {
+        Util.init()
+
+        final doFix = getMode().get() === CheckMode.FIX
+        final Reporter reporter = new Reporter(doFix)
+        check(reporter, doFix)
+        
+        if (reporter.messages) {
+            if (getMode().get() === CheckMode.CHECK) {
+                logger.error("Check task '{}' found errors:\n{}", name, reporter.messages.join('\n'))
+                if (!ignoreFailures) {
+                    throw new IllegalArgumentException("${reporter.messages.size()} errors were found!")
+                }
+            } else {
+                if (logger.isEnabled(LogLevel.DEBUG)) {
+                    logger.warn("Check task '{}' found {} errors and fixed {}:\n{}", name, reporter.messages.size(), reporter.fixed.size(), reporter.fixed.join('\n'))
+                } else {
+                    logger.warn("Check task '{}' found {} errors and fixed {}.", name, reporter.messages.size(), reporter.fixed.size())
+                }
+
+                if (reporter.notFixed) {
+                    logger.error('{} errors could not be fixed:\n{}', reporter.notFixed.size(), reporter.notFixed.join('\n'))
+                    if (!ignoreFailures) {
+                        throw new IllegalArgumentException("${reporter.notFixed.size()} errors which cannot be fixed were found!")
+                    }
+                }
+            }
+        }
+    }
+
+    abstract void check(Reporter reporter, boolean fix)
+
+    @CompileStatic
+    static final class Reporter {
+        final boolean trackFixed
+        Reporter(boolean trackFixed) {
+            this.trackFixed = trackFixed
+        }
+
+        public final List<String> messages = []
+
+        public final List<String> fixed = []
+        public final List<String> notFixed = []
+
+        void report(String message, boolean canBeFixed = true) {
+            messages.add(message)
+
+            if (trackFixed) {
+                if (canBeFixed) {
+                    fixed.add(message)
+                } else {
+                    notFixed.add(message)
+                }
+            }
+        }
+    }
+
+    static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
+                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type') Closure configuration) {
+        taskName = taskName.capitalize()
+        tasks.register("check$taskName", clazz) { CheckTask task ->
+            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 ->
+            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

@@ -15,4 +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.
 
+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.
+
 "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,22 +2,25 @@
 
 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.18-&query=$.promos["1.18-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.18-&query=$.promos["1.18-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.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    |
+| Version  | Support |
 | ------------- | ------------- |
-|    1.18.x     |    Active     |
-|    1.16.x     |    LTS        |
+| 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](https://files.minecraftforge.net)

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,64 +0,0 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
-
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
-
-dependencies {
-    compileOnly('org.jetbrains:annotations:21.0.1')
-    implementation(project(':fmlloader'))
-    api('net.minecraftforge:eventbus:5.0.+')
-    implementation('commons-io:commons-io:2.5')
-}
-
-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'
-}
-
-artifacts {
-    archives jar
-    archives sourcesJar
-}
-
-publishing.publications.mavenJava(MavenPublication) {
-    from components.java
-    artifact sourcesJar
-}

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

@@ -1,35 +0,0 @@
-package net.minecraftforge.fml;
-
-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.config.IConfigEvent;
-import net.minecraftforge.fml.loading.FMLLoader;
-
-import java.util.ServiceLoader;
-import java.util.function.Supplier;
-
-public class Bindings {
-    private static final Bindings INSTANCE = new Bindings();
-
-    private final IBindingsProvider provider;
-
-    private Bindings() {
-        final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList();
-        if (providers.size() != 1) {
-            throw new IllegalStateException("Could not find bindings provider");
-        }
-        this.provider = providers.get(0);
-    }
-
-    public static Supplier<IEventBus> getForgeBus() {
-        return INSTANCE.provider.getForgeBusSupplier();
-    }
-
-    public static Supplier<I18NParser> getMessageParser() {
-        return INSTANCE.provider.getMessageParser();
-    }
-
-    public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return INSTANCE.provider.getConfigConfiguration();
-    }
-}

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

@@ -1,32 +0,0 @@
-package net.minecraftforge.fml;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Supplier;
-
-public class CrashReportCallables {
-    private static final List<ISystemReportExtender> crashCallables = Collections.synchronizedList(new ArrayList<>());
-
-    public static void registerCrashCallable(ISystemReportExtender callable)
-    {
-        crashCallables.add(callable);
-    }
-
-    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();
-            }
-        });
-    }
-
-    public static List<ISystemReportExtender> allCrashCallables() {
-        return List.copyOf(crashCallables);
-    }
-}

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

@@ -1,101 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-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.ConcurrentLinkedDeque;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-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());
-        Stopwatch timer = Stopwatch.createStarted();
-        tasks.forEach(t->makeRunnable(t, Runnable::run));
-        timer.stop();
-        LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
-    }
-
-    private static void makeRunnable(TaskInfo ti, Executor executor) {
-        executor.execute(() -> {
-            Stopwatch timer = Stopwatch.createStarted();
-            ModLoadingContext.get().setActiveContainer(ti.owner);
-            try {
-                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);
-            }
-        });
-    }
-
-    public CompletableFuture<Void> enqueueWork(final ModContainer modInfo, final Runnable work) {
-        return CompletableFuture.runAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
-    }
-
-    public <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, final Supplier<T> work) {
-        return CompletableFuture.supplyAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
-    }
-
-    record TaskInfo(ModContainer owner, Runnable task) {}
-}

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

@@ -1,6 +0,0 @@
-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,12 +0,0 @@
-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/IModLoadingState.java

@@ -1,25 +0,0 @@
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-public interface IModLoadingState {
-    String name();
-    String previous();
-    ModLoadingPhase phase();
-    Function<ModList, String> message();
-    Optional<Consumer<ModList>> inlineRunnable();
-
-    default <T extends Event & IModBusEvent> Optional<CompletableFuture<List<Throwable>>> buildTransition(final Executor syncExecutor, final Executor parallelExecutor) {
-        return buildTransition(syncExecutor, parallelExecutor, e->CompletableFuture.runAsync(()->{}, e), e->CompletableFuture.runAsync(()->{}, e));
-    }
-
-    <T extends Event & IModBusEvent> Optional<CompletableFuture<List<Throwable>>> buildTransition(Executor syncExecutor, Executor parallelExecutor, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask);
-}

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

@@ -1,7 +0,0 @@
-package net.minecraftforge.fml;
-
-import java.util.List;
-
-public interface IModStateProvider {
-    List<IModLoadingState> getAllStates();
-}

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

@@ -1,87 +0,0 @@
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.ArrayList;
-import java.util.Collections;
-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<List<Throwable>> build(Executor syncExecutor, Executor parallelExecutor, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        List<CompletableFuture<List<Throwable>>> cfs = new ArrayList<>();
-        this.eventFunctionStream().get()
-                .map(f->(EventGenerator<T>)f)
-                .reduce((head, tail)-> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, cfs, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last-> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, cfs, last, nextModLoadingStage(), null));
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        final CompletableFuture<List<Throwable>> eventDispatchCF = ModList.gather(cfs).thenCompose(ModList::completableFutureFromExceptionList);
-        final CompletableFuture<List<Throwable>> postEventDispatchCF = preSyncTaskCF.thenComposeAsync(n -> eventDispatchCF, parallelExecutor).thenApply(r -> {
-            postSyncTask.apply(syncExecutor);
-            return r;
-        });
-        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<List<Throwable>>> completeableFutures, final EventGenerator<T> eventGenerator, BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState, final EventGenerator<T> nextGenerator) {
-        completeableFutures.add(((BiFunction<Executor, EventGenerator<T>, CompletableFuture<List<Throwable>>>)preDispatchHook()).apply(threadSelector().apply(syncExecutor, parallelExecutor), eventGenerator));
-        completeableFutures.add(ModList.get().futureVisitor(eventGenerator, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
-        completeableFutures.add(((BiFunction<Executor, EventGenerator<T>, CompletableFuture<List<Throwable>>>)postDispatchHook()).apply(threadSelector().apply(syncExecutor, parallelExecutor), eventGenerator));
-        return nextGenerator;
-    }
-
-    Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
-    ThreadSelector threadSelector();
-    BiFunction<Executor, CompletableFuture<List<Throwable>>, CompletableFuture<List<Throwable>>> finalActivityGenerator();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> preDispatchHook();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> 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<List<Throwable>>, CompletableFuture<List<Throwable>>> finalActivityGenerator() {
-        return (e, t) -> t.thenApplyAsync(Function.identity(), e);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> preDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(Collections.emptyList());
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> postDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(Collections.emptyList());
-    }
-}

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

@@ -1,27 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml;
-
-import java.util.function.Supplier;
-
-public interface ISystemReportExtender extends Supplier<String>
-{
-    String getLabel();
-}

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

@@ -1,40 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class LoadingFailedException extends RuntimeException {
-    private final List<ModLoadingException> loadingExceptions;
-
-    public LoadingFailedException(final List<ModLoadingException> loadingExceptions) {
-        this.loadingExceptions = loadingExceptions;
-    }
-
-    public List<ModLoadingException> getErrors() {
-        return this.loadingExceptions;
-    }
-
-    @Override
-    public String getMessage() {
-        return "Loading errors encountered: " + this.loadingExceptions.stream().map(ModLoadingException::getMessage).collect(Collectors.joining(",\n\t", "[\n\t", "\n]"));
-    }
-}

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

@@ -1,39 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml;
-
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
-
-public class Logging
-{
-    // Lots of markers
-    public static final Marker CORE = MarkerManager.getMarker("CORE");
-    public static final Marker LOADING = MarkerManager.getMarker("LOADING");
-    public static final Marker SCAN = MarkerManager.getMarker("SCAN");
-    public static final Marker SPLASH = MarkerManager.getMarker("SPLASH");
-    public static final Marker CAPABILITIES = MarkerManager.getMarker("CAPABILITIES");
-    public static final Marker MODELLOADING = MarkerManager.getMarker("MODELLOADING");
-    public static final Marker FORGEMOD = MarkerManager.getMarker("FORGEMOD").addParents(LOADING);
-
-    // --log CORE:+DEBUG,SCAN:-OFF
-    // forge log debug 5
-
-}

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

@@ -1,41 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml;
-
-public enum LogicalSide
-{
-    CLIENT, SERVER;
-
-    /**
-     * @return if the logical side is a server.
-     */
-    public boolean isServer()
-    {
-        return !isClient();
-    }
-
-    /**
-     * @return if the logical side is a client.
-     */
-    public boolean isClient()
-    {
-        return this == CLIENT;
-    }
-}

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

@@ -1,75 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.fml.config.IConfigSpec;
-import net.minecraftforge.fml.config.ModConfig;
-
-import java.util.function.Supplier;
-
-public class ModLoadingContext
-{
-    private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
-    private Object languageExtension;
-    private ModLoadingStage stage;
-
-    public static ModLoadingContext get() {
-        return context.get();
-    }
-
-    private ModContainer activeContainer;
-
-    public void setActiveContainer(final ModContainer container) {
-        this.activeContainer = container;
-        this.languageExtension = container == null ? null : container.contextExtension.get();
-    }
-
-    public ModContainer getActiveContainer() {
-        return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
-    }
-
-    public String getActiveNamespace() {
-        return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
-    }
-
-    /**
-     * 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) {
-        getActiveContainer().registerExtensionPoint(point, extension);
-    }
-
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
-    }
-
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public <T> T extension() {
-        return (T)languageExtension;
-    }
-}

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

@@ -1,9 +0,0 @@
-package net.minecraftforge.fml;
-
-public enum ModLoadingPhase {
-    ERROR, // Special state for error handling
-    GATHER,
-    LOAD,
-    COMPLETE,
-    DONE;
-}

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

@@ -1,51 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml;
-
-public enum ModLoadingStage
-{
-    ERROR,
-    VALIDATE,
-    CONSTRUCT,
-    COMMON_SETUP,
-    SIDED_SETUP,
-    ENQUEUE_IMC,
-    PROCESS_IMC,
-    COMPLETE,
-    DONE;
-
-    private final DeferredWorkQueue deferredWorkQueue;
-
-    ModLoadingStage() {
-        deferredWorkQueue = new DeferredWorkQueue(this);
-    }
-
-    ModLoadingStage nextState(Throwable exception) {
-        return exception != null ? ERROR : values()[this.ordinal()+1];
-    }
-
-    public ModLoadingStage currentState(Throwable exception) {
-        return exception != null ? ERROR : this;
-    }
-
-    public DeferredWorkQueue getDeferredWorkQueue() {
-        return deferredWorkQueue;
-    }
-}

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

@@ -1,33 +0,0 @@
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-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<List<Throwable>>> buildTransition(final Executor syncExecutor, final Executor parallelExecutor, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        return transition.map(t->t.build(syncExecutor, parallelExecutor, preSyncTask, postSyncTask));
-    }
-
-    public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, ml->"", phase, Optional.empty(), Optional.empty());
-    }
-
-    public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase, IModStateTransition transition) {
-        return new ModLoadingState(name, previous, ml->"Processing transition "+name, phase, Optional.empty(), Optional.of(transition));
-    }
-
-    public static ModLoadingState withTransition(final String name, final String previous, final Function<ModList, String> message, final ModLoadingPhase phase, IModStateTransition transition) {
-        return new ModLoadingState(name, previous, message, phase, Optional.empty(), Optional.of(transition));
-    }
-    public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase, 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,37 +0,0 @@
-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();
-    }
-}

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

@@ -1,37 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-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,20 +0,0 @@
-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/config/IConfigEvent.java

@@ -1,24 +0,0 @@
-package net.minecraftforge.fml.config;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.Bindings;
-
-import java.util.function.Function;
-
-public interface IConfigEvent {
-    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading) {}
-    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);
-    }
-    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,21 +0,0 @@
-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/event/IModBusEvent.java

@@ -1,26 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.event;
-
-/**
- * Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
- */
-public interface IModBusEvent {
-}

fmlcore/src/main/java/net/minecraftforge/fml/util/LoaderException.java

@@ -1,48 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.util;
-
-
-public class LoaderException extends EnhancedRuntimeException
-{
-    /**
-     *
-     */
-    private static final long serialVersionUID = -5675297950958861378L;
-
-    public LoaderException(Throwable wrapped)
-    {
-        super(wrapped);
-    }
-
-    public LoaderException()
-    {
-    }
-    public LoaderException(String message)
-    {
-        super(message);
-    }
-    public LoaderException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-
-    @Override protected void printStackTrace(WrappedPrintStream stream){}
-}

fmlcore/src/main/java/net/minecraftforge/fml/util/LoaderExceptionModCrash.java

@@ -1,39 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.util;
-
-/**
- * Prevent LoaderException from adding its own stack trace to the wrapped throwable's stack trace.
- */
-public class LoaderExceptionModCrash extends LoaderException
-{
-    private static final long serialVersionUID = 1L;
-
-    public LoaderExceptionModCrash(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace()
-    {
-        return this;
-    }
-}

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

@@ -1,30 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.util.thread;
-
-import net.minecraftforge.fml.LogicalSide;
-
-public class EffectiveSide
-{
-    public static LogicalSide get() {
-        final ThreadGroup group = Thread.currentThread().getThreadGroup();
-        return group instanceof SidedThreadGroup ? ((SidedThreadGroup) group).getSide() : LogicalSide.CLIENT;
-    }
-}

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

@@ -1,55 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.util.thread;
-
-import net.minecraftforge.fml.LogicalSide;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.concurrent.ThreadFactory;
-
-/**
- * A thread group and factory combination which belongs to a {@link LogicalSide}.
- */
-public final class SidedThreadGroup extends ThreadGroup implements ThreadFactory
-{
-    private final LogicalSide side;
-
-    SidedThreadGroup(final LogicalSide side)
-    {
-        super(side.name());
-        this.side = side;
-    }
-
-    /**
-     * Gets the side this sided thread group belongs to.
-     *
-     * @return the side
-     */
-    public LogicalSide getSide()
-    {
-        return this.side;
-    }
-
-    @Override
-    public Thread newThread(@NotNull final Runnable runnable)
-    {
-        return new Thread(this, runnable);
-    }
-}

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

@@ -1,31 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.util.thread;
-
-import net.minecraftforge.fml.LogicalSide;
-
-public final class SidedThreadGroups
-{
-    public static final SidedThreadGroup CLIENT = new SidedThreadGroup(LogicalSide.CLIENT);
-    public static final SidedThreadGroup SERVER = new SidedThreadGroup(LogicalSide.SERVER);
-
-    private SidedThreadGroups() {
-    }
-}

fmlloader/build.gradle

@@ -1,81 +0,0 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
-
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
-configurations.forEach{ it.transitive = false }
-
-dependencies {
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4')
-    compileOnly('org.jetbrains:annotations:23.0.0')
-    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:4.0.+')
-    api('org.apache.logging.log4j:log4j-api:2.17.0')
-    api('org.slf4j:slf4j-api:1.8.0-beta4')
-    api('com.google.guava:guava:21.0')
-    api('com.google.code.gson:gson:2.8.9')
-    api('org.apache.maven:maven-artifact:3.8.1')
-    api('org.apache.commons:commons-lang3:3.12.0')
-    api('com.electronwill.night-config:core:3.6.4')
-    api('com.electronwill.night-config:toml:3.6.4')
-    api('cpw.mods:modlauncher:9.0.+')
-    api('net.minecraftforge:coremods:5.0.+')
-    implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
-    implementation('org.apache.logging.log4j:log4j-core:2.17.0')
-    annotationProcessor('org.apache.logging.log4j:log4j-core:2.17.0')
-    implementation('net.minecraftforge:accesstransformers:8.0.4')
-    implementation('net.minecrell:terminalconsoleappender:1.2.0')
-//    implementation('org.jline:jline:3.12.+')
-    testCompileOnly('org.jetbrains:annotations:21.0.0')
-    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'
-}
-
-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,134 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-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/loading/LibraryFinder.java

@@ -1,67 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class LibraryFinder {
-    private static final Logger LOGGER = LogManager.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,30 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading;
-
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
-
-public class LogMarkers {
-    public static final Marker CORE = MarkerManager.getMarker("CORE");
-    public static final Marker LOADING = MarkerManager.getMarker("LOADING");
-    public static final Marker SCAN = MarkerManager.getMarker("SCAN");
-    public static final Marker SPLASH = MarkerManager.getMarker("SPLASH");
-}

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

@@ -1,17 +0,0 @@
-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,54 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading;
-
-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.16.4,1.16.5]").containsVersion(version)) {
-        //     // 1.16.4 is Compatible with 1.16.3
-        //     add("languageloader.javafml", "34");
-        //     add("mod.minecraft",          "1.16.3");
-        //     add("mod.forge",              "34.1.42");
-        //     // 1.16.5 is Compatible with 1.16.4, and thus 1.16.3
-        //     add("languageloader.javafml", "35");
-        //     add("mod.minecraft",          "1.16.4");
-        //     add("mod.forge",              "35.1.37");
-        // }
-    }
-    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,37 +0,0 @@
-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/AbstractJarFileLocator.java

@@ -1,71 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2022.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import cpw.mods.jarhandling.SecureJar;
-import cpw.mods.jarhandling.JarMetadata;
-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 org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-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.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.jar.Manifest;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public abstract class AbstractJarFileLocator extends AbstractModLocator {
-    private static final Logger LOGGER = LogManager.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);
-    }
-
-    @Override
-    public List<IModFile> scanMods() {
-        return scanCandidates()
-                .map(this::createMod)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
-    }
-
-    public abstract Stream<Path> scanCandidates();
-}

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

@@ -1,110 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2022.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-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 org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.nio.file.Path;
-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 AbstractModLocator implements IModLocator {
-    private static final Logger LOGGER = LogManager.getLogger();
-    protected static final String MODS_TOML = "META-INF/mods.toml";
-    protected static final String MANIFEST = "META-INF/MANIFEST.MF";
-
-    protected Optional<IModFile> createMod(Path... path) {
-        var mjm = new ModJarMetadata();
-        var sj = SecureJar.from(
-                Manifest::new,
-                jar -> jar.findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-                (root, p) -> true,
-                path
-        );
-
-        IModFile mod;
-        var type = sj.getManifest().getMainAttributes().getValue(ModFile.TYPE);
-        if (sj.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);
-        } else {
-            return Optional.empty();
-        }
-
-        mjm.setModFile(mod);
-        return Optional.of(mod);
-    }
-
-    protected IModFileInfo manifestParser(final IModFile mod) {
-        Function<String, Optional<String>> cfg = name -> Optional.ofNullable(mod.getSecureJar().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 IModFileInfo() {
-            @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 dummy; }
-
-            // These Should never be called as it's only called from ModJarMetadata.version and we bypass that
-            @Override public String moduleName() { return mod.getSecureJar().name(); }
-            @Override public String versionString() { return null; }
-            @Override public List<String> usesServices() { return null; }
-
-            @Override
-            public String toString() {
-                return "IModFileInfo(" + mod.getFilePath() + ")";
-            }
-        };
-    }
-
-    @Override
-    public boolean isValid(final IModFile modFile) {
-        return true;
-    }
-}

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

@@ -1,106 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import net.minecraftforge.fml.loading.LogMarkers;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.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 AbstractJarFileLocator {
-    private static final Logger LOGGER = LogManager.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.fatal(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 = 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.fatal(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,92 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.forgespi.locating.IModLocator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.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 = LogManager.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<IModFile> scanMods() {
-        explodedMods.forEach(explodedMod ->
-                ModJarMetadata.buildFile(this,
-                        jar->jar.findFile("/META-INF/mods.toml").isPresent(),
-                        (a,b) -> true,
-                        explodedMod.paths().toArray(Path[]::new))
-                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
-        return List.copyOf(mods.values());
-    }
-
-    @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,35 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2022.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import net.minecraftforge.forgespi.language.IModFileInfo;
-
-import java.util.Locale;
-
-public class InvalidModFileException extends RuntimeException
-{
-    private final IModFileInfo modFileInfo;
-
-    public InvalidModFileException(String message, IModFileInfo modFileInfo)
-    {
-        super(String.format(Locale.ENGLISH, "%s (%s)", message, ((ModFileInfo)modFileInfo).getFile().getFileName()));
-        this.modFileInfo = modFileInfo;
-    }
-}

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

@@ -1,135 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2022.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import com.electronwill.nightconfig.core.Config;
-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.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.nio.file.*;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class MinecraftLocator extends AbstractModLocator {
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    @Override
-    public List<IModFile> 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)).orElse(null))
-                .filter(Objects::nonNull)
-                .toList();
-        artifacts.add(mcjar);
-        artifacts.addAll(othermods);
-        return artifacts;
-    }
-
-    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,80 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.moddiscovery;
-
-import cpw.mods.modlauncher.Launcher;
-import cpw.mods.modlauncher.api.IModuleLayerManager;
-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.forgespi.Environment;
-import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.forgespi.locating.IModLocator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.stream.Collectors;
-
-public class ModDiscoverer {
-    private static final Logger LOGGER = LogManager.getLogger();
-    private final ServiceLoader<IModLocator> locators;
-    private final List<IModLocator> locatorList;
-
-    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();
-        locators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
-        locatorList = ServiceLoaderUtils.streamServiceLoader(()->locators, sce->LOGGER.error("Failed to load locator list", sce)).collect(Collectors.toList());
-        locatorList.forEach(l->l.initArguments(arguments));
-        LOGGER.debug(LogMarkers.CORE,"Found Mod Locators : {}", ()->locatorList.stream().map(iModLocator -> "("+iModLocator.name() + ":" + iModLocator.getClass().getPackage().getImplementationVersion()+")").collect(Collectors.joining(",")));
-    }
-
-    ModDiscoverer(List<IModLocator> locatorList) {
-        this.locatorList = locatorList;
-        this.locators = null;
-    }
-
-    public ModValidator discoverMods() {
-        LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", locatorList.size());
-        var loadedFiles = new ArrayList<>();
-        for (IModLocator locator : locatorList) {
-            LOGGER.debug(LogMarkers.SCAN,"Trying locator {}", locator);
-            var modFiles = locator.scanMods();
-            for (IModFile mf : modFiles) {
-                LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with locator {}", mf.getFileName(), mf.getType(), mf.getLocator());
-                StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found mod file "+mf.getFileName()+" of type "+mf.getType()));
-            }
-            loadedFiles.addAll(modFiles);
-        }
-        final var modFilesMap = loadedFiles.stream()
-                .map(ModFile.class::cast)
-                .collect(Collectors.groupingBy(IModFile::getType));
-
-        var validator = new ModValidator(modFilesMap);
-        validator.stage1Validation();
-        return validator;
-    }
-
-}

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

@@ -1,98 +0,0 @@
-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, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
-    }
-
-    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.18")
-    static Optional<IModFile> buildFile(Function<SecureJar, IModFile> mfConstructor, Predicate<SecureJar> jarTest, BiPredicate<String, String> filter, Path... files) {
-        var mjm = new ModJarMetadata();
-        var sj = SecureJar.from(()->ModFile.DEFAULTMANIFEST, j->mjm, filter, files);
-        if (jarTest.test(sj)) {
-            var mf = mfConstructor.apply(sj);
-            mjm.setModFile(mf);
-            return Optional.of(mf);
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    ModJarMetadata() {
-    }
-
-    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,90 +0,0 @@
-package net.minecraftforge.fml.loading.moddiscovery;
-
-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.locating.IModFile;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.*;
-
-public class ModValidator {
-    private static final Logger LOGGER = LogManager.getLogger();
-    private final Map<IModFile.Type, List<ModFile>> modFiles;
-    private final List<ModFile> candidatePlugins;
-    private final List<ModFile> candidateMods;
-    private LoadingModList loadingModList;
-    private List<ModFile> brokenFiles;
-
-    public ModValidator(final Map<IModFile.Type, List<ModFile>> modFiles) {
-        this.modFiles = modFiles;
-        this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
-        this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY)));
-        this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));
-        this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
-    }
-
-    private static List<ModFile> lst(List<ModFile> files) {
-        return files == null ? new ArrayList<>() : new ArrayList<>(files);
-    }
-
-    public void stage1Validation() {
-        brokenFiles = validateFiles(candidateMods);
-        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 mod = iterator.next();
-            if (!mod.getLocator().isValid(mod) || !mod.identifyMods()) {
-                LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", mod.getFilePath());
-                iterator.remove();
-                brokenFiles.add(mod);
-            }
-        }
-        return brokenFiles;
-    }
-
-    public ITransformationService.Resource getPluginResources() {
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.PLUGIN, this.candidatePlugins.stream().map(ModFile::getSecureJar).toList());
-    }
-
-    public ITransformationService.Resource getModResources() {
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, this.candidateMods.stream().map(ModFile::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();
-        loadingModList = ModSorter.sort(candidateMods, errors);
-        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/progress/EarlyProgressVisualization.java

@@ -1,80 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.progress;
-
-import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.api.distmarker.Dist;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.IntConsumer;
-import java.util.function.IntSupplier;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-public enum EarlyProgressVisualization {
-    INSTANCE;
-
-    private Visualization visualization;
-
-    public Runnable accept(Dist dist, boolean isData)
-    {
-        return accept(dist, isData, null);
-    }
-
-    public Runnable accept(final Dist dist, final boolean isData, @Nullable String mcVersion) {
-//        visualization = !isData && dist.isClient() && Boolean.parseBoolean(System.getProperty("fml.earlyprogresswindow", "true")) ? new ClientVisualization() : new NoVisualization();
-        visualization = new NoVisualization();
-        return visualization.start(mcVersion);
-    }
-
-    public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
-        return visualization.handOffWindow(width, height, title, monitor);
-    }
-
-    public void updateFBSize(IntConsumer width, IntConsumer height) {
-        visualization.updateFBSize(width, height);
-    }
-
-    interface Visualization {
-        Runnable start(@Nullable String mcVersion);
-
-        default long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, LongSupplier monitorSupplier) {
-            return FMLLoader.getGameLayer().findModule("forge")
-                    .map(l->Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback"))
-                    .map(LamdbaExceptionUtils.rethrowFunction(c->c.getMethod("fallback", IntSupplier.class, IntSupplier.class, Supplier.class, LongSupplier.class)))
-                    .map(LamdbaExceptionUtils.rethrowFunction(m->(LongSupplier)m.invoke(null, width, height, title, monitorSupplier)))
-                    .map(LongSupplier::getAsLong)
-                    .orElseThrow(()->new IllegalStateException("Why are you here?"));
-        }
-
-        default void updateFBSize(IntConsumer width, IntConsumer height) {
-        }
-    }
-
-    private static class NoVisualization implements Visualization {
-        @Override
-        public Runnable start(@Nullable String mcVersion) {
-            return () -> {};
-        }
-    }
-
-}
-

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

@@ -1,68 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LibraryFinder;
-import net.minecraftforge.fml.loading.VersionInfo;
-import net.minecraftforge.api.distmarker.Dist;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.stream.Stream;
-
-public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    @Override public Dist getDist()  { return Dist.CLIENT; }
-    @Override public String getNaming() { return "srg"; }
-    @Override public boolean isProduction() { return true; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object)arguments);
-            return null;
-        };
-    }
-
-    @Override
-    public LocatedPaths getMinecraftPaths() {
-        final var vers = FMLLoader.versionInfo();
-        var mc = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "srg", vers.mcAndMCPVersion());
-        var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "extra", vers.mcAndMCPVersion());
-        var mcstream = Stream.<Path>builder().add(mc).add(mcextra);
-        var modstream = Stream.<List<Path>>builder();
-
-        processMCStream(vers, mcstream, modstream);
-
-        var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
-        var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
-        var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
-
-        return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, mclang));
-    }
-
-    protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
-}

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

@@ -1,150 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import com.google.common.base.Strings;
-import cpw.mods.jarhandling.SecureJar;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.BiPredicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
-    @Override public String getNaming() { return "mcp"; }
-    @Override public boolean isProduction() { return false; }
-
-    @Override
-    public LocatedPaths getMinecraftPaths() {
-        // Minecraft is extra jar {resources} + our exploded directories in dev
-        final var mcstream = Stream.<Path>builder();
-
-        // The extra jar is on the classpath, so try and pull it out of the legacy classpath
-        var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find client-extra").split(File.pathSeparator);
-        var extra = Paths.get(Arrays.stream(legacyCP).filter(e -> e.contains("client-extra")).findFirst().orElseThrow(() -> new IllegalStateException("Could not find client-extra in legacy classpath")));
-        mcstream.add(extra);
-
-        // The MC code/Patcher edits are in exploded directories
-        final var modstream = Stream.<List<Path>>builder();
-        final var mods = getModClasses();
-        final var minecraft = mods.remove("minecraft");
-        if (minecraft == null)
-            throw new IllegalStateException("Could not find 'minecraft' mod paths.");
-        minecraft.stream().distinct().forEach(mcstream::add);
-        mods.values().forEach(modstream::add);
-
-        var mcFilter = getMcFilter(extra, minecraft, modstream);
-        return new LocatedPaths(mcstream.build().toList(), mcFilter, modstream.build().toList(), getFmlStuff(legacyCP));
-    }
-
-    protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
-        if (getDist().isDedicatedServer())
-            return arguments;
-
-        fixNatives();
-
-        if (isData())
-            return arguments;
-
-        var args = ArgumentList.from(arguments);
-
-        String username = args.get("username");
-        if (username != null) { // Replace '#' placeholders with random numbers
-            Matcher m = Pattern.compile("#+").matcher(username);
-            StringBuffer replaced = new StringBuffer();
-            while (m.find()) {
-                m.appendReplacement(replaced, getRandomNumbers(m.group().length()));
-            }
-            m.appendTail(replaced);
-            args.put("username", replaced.toString());
-        } else {
-            args.putLazy("username", "Dev");
-        }
-
-        if (!args.hasValue("accessToken")) {
-            args.put("accessToken", "0");
-        }
-
-        return args.getArguments();
-    }
-
-    protected List<Path> getFmlStuff(String[] classpath) {
-        // We also want the FML things, fmlcore, javafmllanguage, mclanguage, I don't like hard coding these, but hey whatever works for now.
-        return Arrays.stream(classpath)
-            .filter(e -> e.contains("fmlcore") || e.contains("javafmllanguage") || e.contains("mclanguage"))
-            .map(Paths::get)
-            .toList();
-    }
-
-    protected BiPredicate<String, String> getMcFilter(Path extra, List<Path> minecraft, Stream.Builder<List<Path>> mods) {
-        final var packages = getPackages();
-        final var extraPath = extra.toString().replace('\\', '/');
-
-        // We serve everything, except for things in the forge packages.
-        BiPredicate<String, String> mcFilter = (path, base) -> {
-            if (base.equals(extraPath) ||
-                    path.endsWith("/")) return true;
-            for (var pkg : packages)
-                if (path.startsWith(pkg)) return false;
-            return true;
-        };
-
-        // We need to separate out our resources/code so that we can show up as a different data pack.
-        var modJar = SecureJar.from((path, base) -> {
-            if (!path.endsWith(".class")) return true;
-            for (var pkg : packages)
-                if (path.startsWith(pkg)) return true;
-            return false;
-        }, minecraft.stream().distinct().toArray(Path[]::new));
-        //modJar.getPackages().stream().sorted().forEach(System.out::println);
-        mods.add(List.of(modJar.getRootPath()));
-
-        return mcFilter;
-    }
-
-    protected String[] getPackages() {
-        return new String[]{ "net/minecraftforge/", "META-INF/services/", "META-INF/coremods.json", "META-INF/mods.toml" };
-    }
-
-    private static String getRandomNumbers(int length) {
-        // Generate a time-based random number, to mimic how n.m.client.Main works
-        return Long.toString(System.nanoTime() % (int) Math.pow(10, length));
-    }
-
-    private static void fixNatives() {
-        String paths = System.getProperty("java.library.path");
-        String nativesDir = System.getProperty("nativesDirectory");
-        if (nativesDir == null)
-            return;
-
-        if (Strings.isNullOrEmpty(paths))
-            paths = nativesDir;
-        else
-            paths += File.pathSeparator + nativesDir;
-
-        System.setProperty("java.library.path", paths);
-    }
-}

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

@@ -1,80 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import cpw.mods.modlauncher.api.ILaunchHandlerService;
-import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
-import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.api.distmarker.Dist;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
-
-public abstract class CommonLaunchHandler implements ILaunchHandlerService {
-    public record LocatedPaths(List<Path> minecraftPaths, BiPredicate<String, String> minecraftFilter, List<List<Path>> otherModPaths, List<Path> otherArtifacts) {}
-
-    protected static final Logger LOGGER = LogManager.getLogger();
-
-    public abstract Dist getDist();
-
-    public abstract String getNaming();
-
-    public boolean isProduction() {
-        return false;
-    }
-
-    public boolean isData() {
-        return false;
-    }
-
-    public abstract LocatedPaths getMinecraftPaths();
-
-    @Override
-    public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) {
-
-    }
-
-    protected final Map<String, List<Path>> getModClasses() {
-        final String modClasses = Optional.ofNullable(System.getenv("MOD_CLASSES")).orElse("");
-        LOGGER.debug(LogMarkers.CORE, "Got mod coordinates {} from env", modClasses);
-
-        record ExplodedModPath(String modid, Path path) {}
-        // "a/b/;c/d/;" -> "modid%%c:\fish\pepper;modid%%c:\fish2\pepper2\;modid2%%c:\fishy\bums;modid2%%c:\hmm"
-        final var modClassPaths = Arrays.stream(modClasses.split(File.pathSeparator))
-                .map(inp -> inp.split("%%", 2))
-                .map(splitString -> new ExplodedModPath(splitString.length == 1 ? "defaultmodid" : splitString[0], Paths.get(splitString[splitString.length - 1])))
-                .collect(Collectors.groupingBy(ExplodedModPath::modid, Collectors.mapping(ExplodedModPath::path, Collectors.toList())));
-
-        LOGGER.debug(LogMarkers.CORE, "Found supplied mod coordinates [{}]", modClassPaths);
-
-        //final var explodedTargets = ((Map<String, List<ExplodedDirectoryLocator.ExplodedMod>>)arguments).computeIfAbsent("explodedTargets", a -> new ArrayList<>());
-        //modClassPaths.forEach((modlabel,paths) -> explodedTargets.add(new ExplodedDirectoryLocator.ExplodedMod(modlabel, paths)));
-        return modClassPaths;
-    }
-}

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

@@ -1,78 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import cpw.mods.jarhandling.SecureJar;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LibraryFinder;
-import net.minecraftforge.fml.loading.VersionInfo;
-import net.minecraftforge.api.distmarker.Dist;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.function.BiPredicate;
-import java.util.stream.Stream;
-
-public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
-    protected static final Logger LOGGER = LogManager.getLogger();
-
-    @Override public Dist getDist()  { return Dist.DEDICATED_SERVER; }
-    @Override public String getNaming() { return "srg"; }
-    @Override public boolean isProduction() { return true; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)arguments);
-            return null;
-        };
-    }
-
-    @Override
-    public LocatedPaths getMinecraftPaths() {
-        final var vers = FMLLoader.versionInfo();
-        var mc = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "srg", vers.mcAndMCPVersion());
-        var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "extra", vers.mcAndMCPVersion());
-        var mcextra_filtered = SecureJar.from( // We only want it for it's resources. So filter everything else out.
-            (path, base) -> {
-                return path.equals("META-INF/versions/") || // This is required because it bypasses our filter for the manifest, and it's a multi-release jar.
-                     (!path.endsWith(".class") &&
-                      !path.startsWith("META-INF/"));
-            }, mcextra
-        );
-        BiPredicate<String, String> filter = (path, base) -> true;
-
-        var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
-        var modstream = Stream.<List<Path>>builder();
-
-        filter = processMCStream(vers, mcstream, filter, modstream);
-
-        var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
-        var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
-        var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
-
-        return new LocatedPaths(mcstream.build().toList(), filter, modstream.build().toList(), List.of(fmlcore, javafmllang, mclang));
-    }
-
-    protected abstract BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods);
-}

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

@@ -1,62 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.VersionInfo;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public abstract class CommonUserdevLaunchHandler extends CommonDevLaunchHandler {
-    @Override
-    public LocatedPaths getMinecraftPaths() {
-        final var vers = FMLLoader.versionInfo();
-
-        // Minecraft is extra jar {resources} + forge jar {patches}
-        final var mcstream = Stream.<Path>builder();
-        // Mod code is in exploded directories
-        final var modstream = Stream.<List<Path>>builder();
-
-        // The MC extra and forge jars are on the classpath, so try and pull them out
-        var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find userdev jars").split(File.pathSeparator);
-        var extra = findJarOnClasspath(legacyCP, "client-extra");
-
-        processStreams(legacyCP, vers, mcstream, modstream);
-        getModClasses().forEach((modid, paths) -> modstream.add(paths));
-
-        var minecraft = mcstream.build().collect(Collectors.toList());
-        var mcFilter = getMcFilter(extra, minecraft, modstream);
-        minecraft.add(extra); // Add extra late so the filter is made correctly
-        return new LocatedPaths(minecraft, mcFilter, modstream.build().toList(), getFmlStuff(legacyCP));
-    }
-
-    protected abstract void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
-
-    protected static Path findJarOnClasspath(String[] classpath, String match) {
-        return Paths.get(Arrays.stream(classpath).filter(e -> e.contains(match)).findFirst().orElseThrow(() -> new IllegalStateException("Could not find " + match + " in classpath")));
-    }
-}

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

@@ -1,38 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-import java.util.concurrent.Callable;
-
-public class FMLClientDevLaunchHandler extends CommonDevLaunchHandler {
-    @Override public String name() { return "fmlclientdev"; }
-    @Override public Dist getDist() { return Dist.CLIENT; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,37 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-import net.minecraftforge.fml.loading.LibraryFinder;
-import net.minecraftforge.fml.loading.VersionInfo;
-
-public class FMLClientLaunchHandler extends CommonClientLaunchHandler {
-    @Override public String name() { return "fmlclient"; }
-
-    @Override
-    protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
-        var fmlonly = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "fmlonly", "", "universal", versionInfo.mcAndForgeVersion());
-        mods.add(List.of(fmlonly));
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class FMLClientUserdevLaunchHandler extends FMLUserdevLaunchHandler {
-    @Override
-    public String name() { return "fmlclientuserdev"; }
-
-    @Override
-    public Dist getDist() { return Dist.CLIENT; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,45 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class FMLDataUserdevLaunchHandler extends FMLUserdevLaunchHandler {
-    @Override
-    public String name() { return "fmldatauserdev"; }
-
-    @Override
-    public Dist getDist() { return Dist.CLIENT; }
-
-    @Override
-    public boolean isData() { return true; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,19 +0,0 @@
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-import java.util.concurrent.Callable;
-
-public class FMLServerDevLaunchHandler extends CommonDevLaunchHandler {
-    @Override public String name() { return "fmlserverdev"; }
-    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
-            return null;
-        };
-    }
-}

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

@@ -1,40 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import cpw.mods.modlauncher.api.ILaunchHandlerService;
-import net.minecraftforge.fml.loading.LibraryFinder;
-import net.minecraftforge.fml.loading.VersionInfo;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.function.BiPredicate;
-import java.util.stream.Stream;
-
-public class FMLServerLaunchHandler extends CommonServerLaunchHandler implements ILaunchHandlerService {
-    @Override public String name() { return "fmlserver"; }
-
-    @Override
-    protected BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods) {
-        var fmlonly = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "fmlonly", "", "universal", versionInfo.mcAndForgeVersion());
-        mods.add(List.of(fmlonly));
-        return filter;
-    }
-}

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

@@ -1,20 +0,0 @@
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class FMLServerUserdevLaunchHandler extends FMLUserdevLaunchHandler {
-    @Override public String name() { return "fmlserveruserdev"; }
-    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
-            return null;
-        };
-    }
-}

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

@@ -1,34 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.fml.loading.VersionInfo;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-public abstract class FMLUserdevLaunchHandler extends CommonUserdevLaunchHandler {
-    @Override
-    protected void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
-        var fmlonly = findJarOnClasspath(classpath, "fmlonly-" + versionInfo.mcAndForgeVersion());
-        mc.add(fmlonly);
-    }
-}

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

@@ -1,38 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-import java.util.concurrent.Callable;
-
-public class ForgeClientDevLaunchHandler extends CommonDevLaunchHandler {
-    @Override public String name() { return "forgeclientdev"; }
-    @Override public Dist getDist() { return Dist.CLIENT; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,39 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-import net.minecraftforge.fml.loading.LibraryFinder;
-import net.minecraftforge.fml.loading.VersionInfo;
-
-public class ForgeClientLaunchHandler extends CommonClientLaunchHandler {
-    @Override public String name() { return "forgeclient"; }
-
-    @Override
-    protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
-        var forgepatches = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "forge", "", "client", versionInfo.mcAndForgeVersion());
-        var forgejar = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "forge", "", "universal", versionInfo.mcAndForgeVersion());
-        mc.add(forgepatches);
-        mods.add(List.of(forgejar));
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class ForgeClientUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
-    @Override
-    public String name() { return "forgeclientuserdev"; }
-
-    @Override
-    public Dist getDist() { return Dist.CLIENT; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,40 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class ForgeDataDevLaunchHandler extends CommonDevLaunchHandler {
-    @Override public String name() { return "forgedatadev"; }
-    @Override public Dist getDist() { return Dist.CLIENT; }
-    @Override public boolean isData() { return true; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,45 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class ForgeDataUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
-    @Override
-    public String name() { return "forgedatauserdev"; }
-
-    @Override
-    public Dist getDist() { return Dist.CLIENT; }
-
-    @Override
-    public boolean isData() { return true; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args);
-            return null;
-        };
-    }
-}

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

@@ -1,39 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class ForgeGametestDevLaunchHandler extends CommonDevLaunchHandler {
-    @Override public String name() { return "forgegametestserverdev"; }
-    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args);
-            return null;
-        };
-    }
-}

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

@@ -1,39 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-import java.util.concurrent.Callable;
-
-public class ForgeGametestUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
-    @Override public String name() { return "forgegametestserveruserdev"; }
-    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args);
-            return null;
-        };
-    }
-}

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

@@ -1,19 +0,0 @@
-package net.minecraftforge.fml.loading.targets;
-
-import net.minecraftforge.api.distmarker.Dist;
-import java.util.concurrent.Callable;
-
-public class ForgeServerDevLaunchHandler extends CommonDevLaunchHandler {
-    @Override public String name() { return "forgeserverdev"; }
-    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }
-
-    @Override
-    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
-        return () -> {
-            var args = preLaunch(arguments, layer);
-
-            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
-            return null;
-        };
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.fml.loading.targets;
-
-import cpw.mods.modlauncher.api.ILaunchHandlerService;
-import net.minecraftforge.fml.loading.LibraryFinder;
-import net.minecraftforge.fml.loading.VersionInfo;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.function.BiPredicate;
-import java.util.stream.Stream;
-
-public class ForgeServerLaunchHandler extends CommonServerLaunchHandler implements ILaunchHandlerService {
-    @Override public String name() { return "forgeserver"; }
-
-    @Override
-    protected BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods) {
-        var forgepatches = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "forge", "", "server", versionInfo.mcAndForgeVersion());
-        var forgejar = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "forge", "", "universal", versionInfo.mcAndForgeVersion());
-        mc.add(forgepatches);
-        mods.add(List.of(forgejar));
-        return filter;
-    }
-}