1.20.4 RB 1

https://forums.minecraftforge.net/topic/149456-forge-491-minecraft-1204/

.gitattributes

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

.github/workflows/comments.yml

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

.github/workflows/issues.yml

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

.github/workflows/pull_request_review.yml

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

.github/workflows/pull_request_review_comment.yml

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

.github/workflows/pull_request_review_comment_run.yml

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

.github/workflows/pull_request_review_run.yml

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

.github/workflows/pull_requests.yml

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

.github/workflows/push.yml

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

.github/workflows/spam-label.yml

@@ -1,42 +0,0 @@
-name: 'Spam label'
-
-on:
-  issues:
-    types: [labeled]
-  pull_request:
-    types: [labeled]
-  discussion:
-    types: [labeled]
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  lock:
-    if: ${{ (github.event.label.name == 'spam') && (github.event.action == 'labeled') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/close-issue@v2
-        name: Close Issue
-        with: 
-          close-reason: 'not_planned'
-        if: ${{ github.event_name != 'pull_request' }}
-      - run: gh pr close ${{ github.event.pull_request.html_url }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        name: Close PR
-        if: ${{ github.event_name == 'pull_request' }}
-      - uses: maxkomarychev/oction-lock-issue@v0.7.1
-        name: Lock PR
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          token: "${{ secrets.GITHUB_TOKEN }}"
-          issue_number: ${{ github.event.number }}
-      - uses: OSDKDev/lock-issues@v1.1
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        name: Lock issue
-        if: ${{ github.event_name != 'pull_request' }}

.github/workflows/support.yml

@@ -1,27 +0,0 @@
-name: Support Requests
-
-on:
-  issues:
-    types:
-    - labeled
-    - unlabeled
-    - reopened
-
-permissions:
-  issues: write
-
-jobs:
-  support:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: dessant/support-requests@v2
-      with:
-        support-label: Forum
-        issue-comment: >
-            :wave: We use the issue tracker exclusively for final bug reports and feature requests. 
-            However, this issue appears to be better suited for the 
-            [Forge Support Forums](https://forums.minecraftforge.net/) or 
-            [Forge Discord](https://discord.gg/UvedJ9m). Please create a new topic on the support forum
-            with this issue or ask in the `#tech-support` channel in the Discord server, and the 
-            conversation can continue there.
-        lock-issue: true

.gitignore

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

.teamcity/settings.kts

@@ -37,8 +37,8 @@ project {
 
     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.19.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_gradle_version", "7.5.1", 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*)
@@ -47,8 +47,6 @@ 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)
@@ -76,19 +74,6 @@ object Build : BuildType({
     id("MinecraftForge_MinecraftForge__Build")
     name = "Build"
     description = "Builds and Publishes the main branches of the project."
-
-    features {
-        feature {
-            id = "trigger_fml_only_files_generator"
-            type = "triggerBuildFeature"
-            param("triggers", "MinecraftForge_FilesGenerator_GeneratePages")
-            param("parameters", """
-                env.PUBLISHED_JAVA_FML_ARTIFACT_ID~env.PUBLISHED_JAVA_ARTIFACT_ID
-                env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION~env.PUBLISHED_JAVA_ARTIFACT_VERSION
-                env.PUBLISHED_JAVA_GROUP
-            """.trimIndent())
-        }
-    }
 })
 
 object BuildSecondaryBranches : BuildType({
@@ -155,7 +140,7 @@ object PullRequestChecks : BuildType({
             enableStacktrace = true
             dockerImage = "%docker_gradle_image%"
             dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
                 -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                 --network=host
                 -u 1000:1000
@@ -189,7 +174,7 @@ object PullRequestCompatibility : BuildType({
             enableStacktrace = true
             dockerImage = "%docker_gradle_image%"
             dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
                 -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                 --network=host
                 -u 1000:1000

CREDITS.txt

@@ -3,7 +3,7 @@ Minecraft Forge: Credits/Thank You
 Forge is a set of tools and modifications to the Minecraft base game code to assist 
 mod developers in creating new and exciting content. It has been in development for 
 several years now, but I would like to take this time thank a few people who have 
-helped it along it's way.
+helped it along its way.
 
 First, the people who originally created the Forge projects way back in Minecraft 
 alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
@@ -11,7 +11,7 @@ of me taking over the project, who knows what Minecraft modding would be today.
 
 Secondly, someone who has worked with me, and developed some of the core features
 that allow modding to be as functional, and as simple as it is, cpw. For developing
-FML, which stabelized the client and server modding ecosystem. As well as the base
+FML, which stabilized the client and server modding ecosystem. As well as the base
 loading system that allows us to modify Minecraft's code as elegently as possible.
 
 Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
@@ -45,11 +45,11 @@ and minecraft clients.
 The code is authored by cpw.
 
 It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
-http://www.minecraftforum.net/topic/75440-
+https://www.minecraftforum.net/topic/75440-
 This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
 
 It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
-http://www.minecraftforge.net/
+https://minecraftforge.net/
 
 Additionally, it contains an implementation of topological sort based on that 
 published at http://keithschwarz.com/interesting/code/?dir=topological-sort

Jenkinsfile

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

LICENSE.txt

@@ -57,6 +57,9 @@ This software contains a partial repackaging of javaxdelta, a BSD licensed progr
 binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
 authored by genman, heikok, pivot.
 The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
+
+This software includes the Monocraft font from https://github.com/IdreesInc/Monocraft/ for use in the early loading
+display.
 =========================================================================
 
 

buildSrc/build.gradle

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

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

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

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

@@ -1,23 +1,22 @@
 package net.minecraftforge.forge.tasks
 
 import groovy.json.JsonBuilder
+import groovy.transform.CompileStatic
 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
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
+@CompileStatic
 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") })
@@ -27,24 +26,13 @@ abstract class BytecodeFinder extends DefaultTask {
     protected void exec() {
         Util.init()
 
-        def outputFile = output.get().asFile
+        var outputFile = output.get().asFile
         if (outputFile.exists())
             outputFile.delete()
 
         pre()
 
-        jar.get().asFile.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
-                    if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(Opcodes.ASM9)
-                        new ClassReader(zin).accept(node, 0)
-                        process(node)
-                    }
-                }
-            }
-        }
+        Util.processClassNodes(jar.get().asFile, this.&process)
 
         post()
         outputFile.text = new JsonBuilder(getData()).toPrettyString()
@@ -52,8 +40,8 @@ abstract class BytecodeFinder extends DefaultTask {
 
 
     protected process(ClassNode node) {
-        if (node.fields != null) node.fields.each { process(node, it) }
-        if (node.methods != null) node.methods.each { process(node, it) }
+        if (node.fields !== null) node.fields.each { process(node, it) }
+        if (node.methods !== null) node.methods.each { process(node, it) }
     }
 
     protected pre() {}

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

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

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/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,107 +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, name, desc) = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
-				cls = cls.replaceAll('\\.', '/')
-
-				if (json[cls] == null) {
-					println('Invalid: ' + line)
-				} else if (name.isEmpty()) { //Class SAS
-                    def toAdd = []
-                    def clsSided = isSided(json[cls])
-                    def 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)
-                            }
-						}
-                    }
-                    */
-					if (json[cls]['methods'] != null) {
-                        for (entry in json[cls]['methods']) {
-                            if (isSided(entry.value)) {
-                                sided = true
-                                toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
-                                findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
-                                findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
-                            } else if (clsSided) {
-                                findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
-                                findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
-                            }
-						}
-                    }
-                    
-                    if (sided) {
-                        lines.add(cls + (comment == null ? '' : ' ' + comment))
-                        lines.addAll(toAdd.sort())
-                    } else
-                        println('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
-                    */
-                        println('Invalid: ' + line)
-                } else { // Methods
-                    if (json[cls]['methods'] == null || !isSided(json[cls]['methods'][name + ' ' + desc]))
-                        println('Invalid: ' + line)
-                    else {
-                        lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
-                        findChildMethods(json, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
-                        findChildMethods(json, cls, name + ' ' + desc).each { lines.add('\t' + it) }
-                    }
-                }
-			}
-			f.text = lines.join('\n')
-		}
-	}
-
-    protected static isSided(json) {
-        if (json == null || json['annotations'] == null)
-            return false
-        for (ann in json['annotations']) {
-            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;'.equals(ann.desc))
-                return true
-        }
-        return false
-    }
-    
-	protected static findChildMethods(json, cls, 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/CleanProperties.groovy

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

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

@@ -1,5 +1,7 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.stc.FirstParam
+
 import java.util.function.BiConsumer
 
 public class ClosureHelper {
@@ -22,7 +24,7 @@ public class ClosureHelper {
         }
     }
     
-    static <T> T apply(T obj, Closure cl) {
+    static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
         cl.delegate = obj
         cl.resolveStrategy = Closure.DELEGATE_FIRST
         cl()

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

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

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

@@ -27,7 +27,7 @@ abstract class DownloadLibraries extends DefaultTask {
     def run() {
 		Util.init()
 		File outputDir = output.get().asFile
-        def libraries = new ArrayList()
+        var libraries = new ArrayList<String>()
 
 		def json = input.get().asFile.json().libraries.each { lib ->
 		    //TODO: Thread?
@@ -35,7 +35,7 @@ abstract class DownloadLibraries extends DefaultTask {
 			artifacts.each{ art -> 
 				def target = new File(outputDir, art.path)
 				libraries.add(target.absolutePath)
-				if (!target.exists() || !art.sha1.equals(target.sha1())) {
+				if (!target.exists() || art.sha1 != target.sha1()) {
 					project.logger.lifecycle("Downloading ${art.url}")
 					if (!target.parentFile.exists()) {
 						target.parentFile.mkdirs()
@@ -43,7 +43,7 @@ abstract class DownloadLibraries extends DefaultTask {
 					new URL(art.url).withInputStream { i ->
 						target.withOutputStream { it << i }
 					}
-					if (!art.sha1.equals(target.sha1())) {
+					if (art.sha1 != target.sha1()) {
 						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
 					}
 				}

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

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

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

@@ -1,20 +1,11 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.CompileStatic
 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.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
 import static org.objectweb.asm.Opcodes.*
@@ -34,17 +25,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
     
     @Override
     protected process(ClassNode parent, MethodNode node) {
-        def last = null
+        AbstractInsnNode last = null
         def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
         for (int x = 0; x < node.instructions.size(); x++) {
             def current = node.instructions.get(x)
-            if (current.opcode == IF_ACMPEQ || current.opcode == IF_ACMPNE) {
-                if (last != null && (last.opcode == GETSTATIC || last.opcode == GETFIELD)) {
+            if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
+                if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
                     def target = new Search(cls: last.owner, name: last.name)
                     def wanted = fieldsReverse.get(target)
                     def original = fields.get(wanted)
                     def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
-                    if (wanted != null && (original.blacklist == null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
+                    if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
                         targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
                     }
                 }
@@ -68,9 +59,10 @@ abstract class FieldCompareFinder extends BytecodeFinder {
 		}
         return ret
     }
-    
+
+    @CompileStatic
     @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
-    public static class Search {
+    static class Search {
         @Input
         String cls
         
@@ -89,17 +81,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
             return cls + '.' + name
         }
         
-        def blacklist(def owner, def name, def desc) {
-            if (blacklist == null)
-                blacklist = new HashSet()
+        def blacklist(String owner, String name, String desc) {
+            if (blacklist === null)
+                blacklist = new HashSet<>()
             blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
         }
-        def blacklist(def owner) {
+        def blacklist(String owner) {
             blacklist(owner, '', '')
         }
     }
     
-    def fields(Closure cl) {
+    void fields(Closure cl) {
         new ClosureHelper(cl, {name, ccl ->
             def search = ClosureHelper.apply(new Search(), ccl)
             this.fields.put(name, search)

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

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

@@ -7,13 +7,13 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
 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()
@@ -23,29 +23,19 @@ abstract class InstallerJson extends DefaultTask {
     @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)
-        }
-
+        launcherJsonName.convention('/version.json')
+        logo.convention('/big_logo.png')
+        mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json')
+        welcome.convention("Welcome to the ${project.name.capitalize()} installer.")
+        output.convention(project.layout.buildDirectory.file('libs/install_profile.json'))
         
         project.afterEvaluate {
-            (packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]).forEach {
-                dependsOn(it)
-                input.from it.archiveFile
+            [
+                project.tasks.universalJar,
+                project.tasks.serverShimJar
+            ].forEach { packed ->
+                dependsOn(packed)
+                input.from packed.archiveFile
             }
         }
     }
@@ -53,17 +43,19 @@ abstract class InstallerJson extends DefaultTask {
     @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,
+        [
+            project.tasks.universalJar,
+            project.tasks.serverShimJar
+        ].forEach { AbstractArchiveTask packed ->
+            def info = Util.getMavenInfoFromTask(packed)
+            libs.put(info.name, [
+                name: info.name,
                 downloads: [
                     artifact: [
-                        path: path,
-                        url: "https://maven.minecraftforge.net/${path}",
-                        sha1: child.archiveFile.get().asFile.sha1(),
-                        size: child.archiveFile.get().asFile.length()
+                        path: info.path,
+                        url: "https://maven.minecraftforge.net/$info.path",
+                        sha1: packed.archiveFile.get().asFile.sha1(),
+                        size: packed.archiveFile.get().asFile.length()
                     ]
                 ]
             ])

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

@@ -6,6 +6,7 @@ import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
 import java.nio.file.Files
 
@@ -16,59 +17,78 @@ 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'))
+        output.convention(project.layout.buildDirectory.file('libs/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
+        dependsOn(project.tasks.universalJar)
+        input.from(project.tasks.universalJar.archiveFile)
+        input.from(project.configurations.installer)
+        configure {
+            def mc    = project.rootProject.ext.MC_VERSION
+            def forge = project.rootProject.ext.FORGE_VERSION
+            def timestamp = iso8601Now()
+            json.putAll([
+                _comment: [
+                    "Please do not automate the download and installation of Forge.",
+                    "Our efforts are supported by ads from the download page.",
+                    "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
+                ],
+                id: "$mc-$project.name-$forge",
+                time: timestamp,
+                releaseTime: timestamp,
+                inheritsFrom: mc,
+                type: 'release',
+                logging: [:],
+                mainClass: '',
+                libraries: []
+            ] as LinkedHashMap)
+            
+            [
+                project.tasks.universalJar
+            ].forEach { packed ->
+                dependsOn(packed)
+                input.from packed.archiveFile
             }
+            
+            def patched = project.tasks.applyClientBinPatches
+            dependsOn(patched)
+            input.from patched.output
         }
     }
 
     @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()
-                    ]
+        var packed = (AbstractArchiveTask) project.tasks.universalJar
+        def info = Util.getMavenInfoFromTask(packed)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "https://maven.minecraftforge.net/$info.path",
+                    sha1: packed.archiveFile.get().asFile.sha1(),
+                    size: packed.archiveFile.get().asFile.length()
                 ]
             ]
-        }
-        libs.each { key, lib -> json.libraries.add(lib) }
+        ])
+
+        var classifier = 'client'
+        var genned = project.tasks.applyClientBinPatches
+        info = Util.getMavenInfoFromTask(genned, classifier)
+        json.libraries.add([
+            name: info.name,
+            downloads: [
+                artifact: [
+                    path: info.path,
+                    url: "",
+                    sha1: genned.output.get().asFile.sha1(),
+                    size: genned.output.get().asFile.length()
+                ]
+            ]
+        ])
+
+        json.libraries.addAll(getArtifacts(project.configurations.installer).values())
         Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
     }
 }

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

@@ -1,5 +1,6 @@
 package net.minecraftforge.forge.tasks
 
+import groovy.transform.CompileStatic
 import org.apache.commons.io.IOUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
@@ -12,6 +13,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
+@CompileStatic
 abstract class MergeJars extends DefaultTask {
     MergeJars() {
         output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
@@ -24,8 +26,8 @@ abstract class MergeJars extends DefaultTask {
         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 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)

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

@@ -27,6 +27,6 @@ public class ObjectTarget implements Comparable<ObjectTarget> {
     
     @Override
     int compareTo(ObjectTarget o) {
-        return toString().compareTo(o.toString())
+        return toString() <=> o.toString()
     }
 }

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

@@ -16,8 +16,9 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
     SetupCheckJarCompatibility() {
         group = 'jar compatibility'
         onlyIf {
-            inputVersion.getOrNull() != null
+            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') })
     }
@@ -25,24 +26,6 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
     @TaskAction
     void run() {
         def inputVersion = inputVersion.get()
-        def fmlLibs = project.configurations.detachedConfiguration(project.PACKED_DEPS.collect {
-            def artifactId = it.split(':')[1]
-            return project.dependencies.create("net.minecraftforge:${artifactId}:${inputVersion}")
-        }.toArray(Dependency[]::new))
-
-        project.tasks.named('checkJarCompatibility') {
-            baseLibraries.from(project.tasks.createJoinedSRG.output)
-            baseLibraries.from(project.provider {
-                fmlLibs.resolvedConfiguration.lenientConfiguration.files
-            })
-
-            inputJar = project.tasks.reobfJar.output
-            concreteLibraries.from(project.PACKED_DEPS.collect { project.rootProject.tasks.getByPath(it).archiveFile })
-
-            commonLibraries.from(project.configurations.minecraftImplementation)
-            commonLibraries.from(project.configurations.installer)
-            commonLibraries.from(project.configurations.moduleonly)
-        }
 
         def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
         project.rootProject.extensions.download.run {

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

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

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

@@ -2,149 +2,229 @@ package net.minecraftforge.forge.tasks
 
 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
+import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.SimpleType
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ResolvedArtifact
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.tree.ClassNode
 
-import java.io.File
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Semaphore
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
 
-public class Util {
-	static void init() {
-		File.metaClass.sha1 = { ->
-			MessageDigest md = MessageDigest.getInstance('SHA-1')
-			delegate.eachByte 4096, {bytes, size ->
-				md.update(bytes, 0, size)
-			}
-			return md.digest().collect {String.format "%02x", it}.join()
-		}
+final class Util {
+    public static final int ASM_LEVEL = Opcodes.ASM9
+    private static final HttpClient HTTP = HttpClient.newBuilder().build()
+
+    static void init() {
+        File.metaClass.sha1 = { ->
+            MessageDigest md = MessageDigest.getInstance('SHA-1')
+            delegate.eachByte(4096) { byte[] bytes, int size ->
+                md.update(bytes, 0, size)
+            }
+            return md.digest().collect(this.&toHex).join('')
+        }
         File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
+        File.metaClass.sha256 = { ->
+            MessageDigest md = MessageDigest.getInstance('SHA-256')
+            delegate.eachByte(4096) { byte[] bytes, int size ->
+                md.update(bytes, 0, size)
+            }
+            return md.digest().collect(this.&toHex).join('')
+        }
+        File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
 
-		File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
+        File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
         File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
         File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
 
-		Date.metaClass.iso8601 = { ->
-			def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-			def result = format.format(delegate)
-			return result[0..21] + ':' + result[22..-1]
-		}
+        Date.metaClass.iso8601 = { ->
+            var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+            var result = format.format(delegate)
+            return result[0..21] + ':' + result[22..-1]
+        }
 
         String.metaClass.rsplit = { String del, int limit = -1 ->
-            def lst = new ArrayList()
-            def x = 0, idx
-            def tmp = delegate
-            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit == -1 || x++ < limit)) {
+            var lst = new ArrayList<String>()
+            int x = 0
+            int idx
+            String tmp = delegate
+            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
                 lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
                 tmp = tmp.substring(0, idx)
             }
             lst.add(0, tmp)
             return lst
         }
-	}
-
-	public static String[] getClasspath(project, libs, artifact) {
-		def ret = []
-		artifactTree(project, artifact).each { key, lib ->
-			libs[lib.name] = lib
-			if (lib.name != artifact)
-				ret.add(lib.name)
-		}
-		return ret
-	}
-
-	public static def getArtifacts(project, config, classifiers) {
-		def ret = [:]
-		config.resolvedConfiguration.resolvedArtifacts.each {
-			def art = [
-				group: it.moduleVersion.id.group,
-				name: it.moduleVersion.id.name,
-				version: it.moduleVersion.id.version,
-				classifier: it.classifier,
-				extension: it.extension,
-				file: it.file
-			]
-			def key = art.group + ':' + art.name
-			def folder = "${art.group.replace('.', '/')}/${art.name}/${art.version}/"
-			def filename = "${art.name}-${art.version}"
-			if (art.classifier != null)
-				filename += "-${art.classifier}"
-			filename += ".${art.extension}"
-			def path = "${folder}${filename}"
-			def url = "https://libraries.minecraft.net/${path}"
-			if (!checkExists(url)) {
-				url = "https://maven.minecraftforge.net/${path}"
-			}
-			//TODO remove when Mojang launcher is updated
-			if (!classifiers && art.classifier != null) {
-				//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
-				// However, keep the path normal so that our mirror system works.
-				art.version = "${art.version}-${art.classifier}"
-				art.classifier = null
-				art.extension = 'jar'
-			}
-			ret[key] = [
-				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
-				downloads: [
-					artifact: [
-						path: path,
-						url: url,
-						sha1: sha1(art.file),
-						size: art.file.length()
-					]
-				]
-			]
-		}
-		return ret
-	}
-
-    public static def getMavenPath(task) {
-        def classifier = task.archiveClassifier.get()
-        def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
-        return "${task.project.group.replace('.', '/')}/${task.project.name}/${task.project.version}/${task.project.name}-${task.project.version}".toString() + (classifier == '' ? '' : '-' + classifier) + '.jar'
     }
 
-    public static def getMavenDep(task) {
-        def classifier = task.archiveClassifier.get()
-        return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
+    static String[] getClasspath(Project project, Map libs, String artifact) {
+        def ret = []
+        artifactTree(project, artifact).each { key, lib ->
+            libs[lib.name] = lib
+            if (lib.name != artifact)
+                ret.add(lib.name)
+        }
+        return ret
     }
 
-	public static def iso8601Now() { new Date().iso8601() }
+    @CompileStatic
+    static Map getArtifacts(Configuration config) {
+        var ret = [:]
+        var semaphore = new Semaphore(1, true)
+        config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
+            var info = getMavenInfoFromDep(dep)
+            var domain = 'libraries.minecraft.net'
+            var url = "https://$domain/$info.path"
+            if (!checkExists(url))
+                url.values[0] = 'maven.minecraftforge.net'
 
-	public static def sha1(file) {
-		MessageDigest md = MessageDigest.getInstance('SHA-1')
-		file.eachByte 4096, {bytes, size ->
-			md.update(bytes, 0, size)
-		}
-		return md.digest().collect {String.format "%02x", it}.join()
-	}
+            var sha1 = sha1(dep.file)
 
-	private static def artifactTree(project, artifact) {
-		if (!project.ext.has('tree_resolver'))
-			project.ext.tree_resolver = 1
-		def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
-		def dep = project.dependencies.create(artifact)
-		cfg.dependencies.add(dep)
-		def files = cfg.resolve()
-		return getArtifacts(project, cfg, true)
-	}
-
-	private static boolean checkExists(url) {
-		try {
-			def code = new URL(url).openConnection().with {
-				requestMethod = 'HEAD'
-				connect()
-				responseCode
-			}
-			return code == 200
-		} catch (Exception e) {
-			if (e.toString().contains('unable to find valid certification path to requested target'))
-				throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
-			throw e
-		}
-	}
-
-    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"]
+            semaphore.acquire()
+            ret[info.key] = [
+                name: info.name,
+                downloads: [
+                    artifact: [
+                        path: info.path,
+                        url: url.toString(),
+                        sha1: sha1,
+                        size: dep.file.length()
+                    ]
+                ]
+            ]
+            semaphore.release()
+        })
+        return ret
     }
-}
+
+    @CompileStatic
+    static Map getMavenInfoFromDep(ResolvedArtifact dep) {
+        return getMavenInfoFromMap([
+            group: dep.moduleVersion.id.group,
+            name: dep.moduleVersion.id.name,
+            version: dep.moduleVersion.id.version,
+            classifier: dep.classifier,
+            extension: dep.extension
+        ])
+    }
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(AbstractArchiveTask task) {
+        return getMavenInfoFromMap([
+            group: task.project.group.toString(),
+            name: task.project.name,
+            version: task.project.version.toString(),
+            classifier: task.archiveClassifier.get(),
+            extension: task.archiveExtension.get()
+        ])
+    }
+
+    @CompileStatic
+    static Map getMavenInfoFromTask(Task task, String classifier) {
+        return getMavenInfoFromMap([
+            group: task.project.group.toString(),
+            name: task.project.name,
+            version: task.project.version.toString(),
+            classifier: classifier,
+            extension: 'jar'
+        ])
+    }
+
+    @CompileStatic
+    private static Map getMavenInfoFromMap(Map<String, String> art) {
+        var key = "$art.group:$art.name"
+        var name = "$art.group:$art.name:$art.version"
+        var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
+        if (art.classifier !== null) {
+            name += ":$art.classifier"
+            path += "-$art.classifier"
+        }
+        if ('jar' != art.extension) {
+            name += "@$art.extension"
+            path += ".$art.extension"
+        } else {
+            path += ".jar"
+        }
+        return [
+            key: key.toString(),
+            name: name.toString(),
+            path: path.toString(),
+            art: art
+        ]
+    }
+
+    static String iso8601Now() { new Date().iso8601() }
+
+    @CompileStatic
+    static String sha1(File file) {
+        MessageDigest md = MessageDigest.getInstance('SHA-1')
+        file.eachByte(4096) { byte[] bytes, int size ->
+            md.update(bytes, 0, size)
+        }
+        return md.digest().collect(this.&toHex).join('')
+    }
+
+    @CompileStatic
+    private static String toHex(byte bite) {
+        return String.format('%02x', bite)
+    }
+
+    private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
+        if (!project.ext.has('tree_resolver'))
+            project.ext.tree_resolver = 1
+        def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
+        cfg.transitive = transitive
+        def dep = project.dependencies.create(artifact)
+        cfg.dependencies.add(dep)
+        def files = cfg.resolve()
+        return getArtifacts(cfg)
+    }
+
+    @CompileStatic
+    static boolean checkExists(String url) {
+        try {
+            return HTTP.send(HttpRequest.newBuilder(new URI(url))
+                    .method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
+            ).statusCode() === 200
+        } catch (Exception e) {
+            if (e.toString().contains('unable to find valid certification path to requested target'))
+                throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
+            throw e
+        }
+    }
+
+    static String getLatestForgeVersion(String mcVersion) {
+        final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
+        final ver = json.promos["$mcVersion-latest"]
+        ver === null ? null : (mcVersion + '-' + ver)
+    }
+
+    @CompileStatic
+    static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
+        file.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                ZipEntry zein
+                while ((zein = zin.nextEntry) !== null) {
+                    if (zein.name.endsWith('.class')) {
+                        var node = new ClassNode(ASM_LEVEL)
+                        new ClassReader(zin).accept(node, 0)
+                        process(node)
+                    }
+                }
+            }
+        }
+    }
+}

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

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

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/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 data = [] as List<String>
+        final remapComment = { ATParser.Entry entry ->
+            if (!mappings || !entry || !entry.desc) return null
+            final comment = entry.comment?.substring(1)?.trim()
+            final jsonCls = inheritance.get(entry.cls.replaceAll('\\.', '/'))
+            final mappingsClass = mappings?.getClass(jsonCls.name)
+            if (mappingsClass === null) return entry.comment
+            final idx = entry.desc.indexOf('(')
+
+            String mappedName = idx == -1
+                    ? mappingsClass.remapField(entry.desc)
+                    : mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
+            if (!mappedName) return entry.comment
+            if (mappedName == '<init>')
+                mappedName = 'constructor'
+
+            if (comment?.startsWith(mappedName))
+                return '# ' + comment
+            if (comment && comment.indexOf(' ') !== -1) {
+                def split = comment.split(' - ').toList()
+                if (split[0].indexOf(' ') !== -1)
+                // The first string is more than one word, so append before it
+                    return "# ${mappedName} - ${comment}"
+                split.remove(0)
+                return "# ${mappedName} - ${String.join(' - ', split)}"
+            }
+            return '# ' + mappedName
+        }
+        lines.each { key, value ->
+            if (!value.group) {
+                def comment = 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,95 @@
+package net.minecraftforge.forge.tasks.checks
+
+import net.minecraftforge.forge.tasks.Util
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+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.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 ->
+                int 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)
+
+                return
+            }
+
+            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(Util.ASM_LEVEL) {
+                    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,11 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+enum CheckMode {
+    CHECK,
+    FIX
+
+    CheckMode() {}
+}

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

@@ -0,0 +1,182 @@
+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('\\', '/')))
+            }
+        }
+    }
+    
+    static boolean accessChange(String previous, String current) {
+        //return ACCESS_MAP[previous] < ACCESS_MAP[current]
+        return previous != current
+    }
+
+    void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
+        int 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
+                            (accessChange(pMatcher.group(2), 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
+                            (accessChange(pMatcher.group(2), 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
+                            (accessChange(pMatcher.group(2), 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 boolean 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,114 @@
+package net.minecraftforge.forge.tasks.checks
+
+import groovy.transform.CompileStatic
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.ThirdParam
+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()
+
+        boolean 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')
+                                                   @ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
+        taskName = taskName.capitalize()
+        tasks.register("check$taskName", clazz) { CheckTask task ->
+            def castedTask = task as T
+            configuration.setDelegate(castedTask)
+            configuration.call(castedTask)
+            castedTask.mode.set(CheckMode.CHECK)
+            castedTask.group = 'checks'
+        }
+        tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
+
+        tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
+            def castedTask = task as T
+            configuration.setDelegate(castedTask)
+            configuration.call(castedTask)
+            castedTask.mode.set(CheckMode.FIX)
+            castedTask.group = 'checks'
+        }
+        tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
+    }
+}

build_clean.gradle

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

build_shared.gradle

@@ -0,0 +1,76 @@
+import net.minecraftforge.forge.tasks.CleanProperties
+
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'net.minecraftforge.gradleutils'
+
+group = 'net.minecraftforge'
+version = VERSION
+println("Version: $version")
+
+repositories {
+    mavenCentral()
+    maven gradleutils.forgeMaven
+    maven gradleutils.minecraftLibsMaven
+    //mavenLocal()
+}
+
+tasks.withType(Javadoc).configureEach {
+    options.tags = [
+        'apiNote:a:<em>API Note:</em>',
+        'implSpec:a:<em>Implementation Requirements:</em>',
+        'implNote:a:<em>Implementation Note:</em>'
+    ]
+    options.addStringOption('Xdoclint:all,-missing', '-public')
+}
+
+// We need to write the manifest to the binary file so we have properly versioned packaged at dev time.
+tasks.register('writeManifest') {
+    doLast {
+        if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project
+            universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF'))
+        else
+            jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF'))
+    }
+}
+
+tasks.register('generateResources') {
+    dependsOn('writeManifest')
+}
+
+// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
+tasks.withType(JavaCompile).configureEach {
+    dependsOn 'generateResources'
+    dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+    options.warnings = false // Shutup deprecated for removal warnings
+}
+
+// Merge the resources and classes into the same directory. We'll need to split them at runtime because
+// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now..
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("classes/java/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
+tasks.register('copyEclipseSettings') {
+    doLast {
+        rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file ->
+            def target = project.file('.settings/' + file.name)
+            def temp = new CleanProperties().load(file)
+            def exst = new CleanProperties().load(target)
+            exst.put('eclipse.preferences.version', '1')
+            exst.putAll(temp)
+            exst.store(target)
+        }
+    }
+}
+
+// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import.
+eclipse {
+    // Run everytime eclipse builds the code
+    //autoBuildTasks writeManifest
+    // Run when importing the project
+    synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
+}

docs/CONTRIBUTING.md

@@ -7,7 +7,7 @@ Contributing to Forge
 
 3) Follow the code style of the class you're working in (braces on newlines & spaces instead of tabs in Forge classes, inline brackets in patches, etc).
 
-For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
+For more information, refer to [the wiki][Wiki].
 
 
 Contributor License Agreement
@@ -16,3 +16,5 @@ Contributor License Agreement
 - You assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the LGPLv2.1 license.
 
 "Forge" is Forge Development LLC, a legally incorporated entity in Oregon, USA.
+
+[Wiki]: https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge

docs/README.md

@@ -2,16 +2,16 @@
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19-&query=$.promos["1.19.2-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.19.2-&query=$.promos["1.19.2-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)
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.4-&query=$.promos["1.20.4-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.4-&query=$.promos["1.20.4-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+)][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon]
 
 Forge is a free, open-source modding API all of your favourite mods use!
 
 | Version |    Support    |
 |---------| ------------- |
-| 1.19.x  |    Active     |
-| 1.18.x  |    LTS        |
+| 1.20.x  |    Active     |
+| 1.19.x  |    Legacy     |
 
 * [Download]
 * [Forum]
@@ -20,7 +20,7 @@ Forge is a free, open-source modding API all of your favourite mods use!
 
 # Installing Forge
 
-Go to [the Forge website](https://files.minecraftforge.net)
+Go to [the Forge website][Download]
  and select the Minecraft version you wish to get Forge for from the list.
 
 You can download the installer for the *Recommended Build* or the
@@ -29,38 +29,48 @@ You can download the installer for the *Recommended Build* or the
  into your vanilla launcher environment, where you can then create a new
  profile using that version and play the game!
  
-For support and questions, visit [the Support Forum](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/) or [the Forge Discord server](https://discord.gg/forge).
-
-[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
+For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
 
 # Creating Mods
 
-[See the "Getting Started" section in the Forge Documentation](https://mcforge.readthedocs.io/en/latest/gettingstarted/).
+[See the "Getting Started" section in the Forge Documentation][Getting-Started].
 
 # Contribute to Forge
 
 If you wish to actually inspect Forge, submit PRs or otherwise work
  with Forge itself, you're in the right place!
 
- [See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
+ [See the guide to setting up a Forge workspace][ForgeDev].
 
 ### Pull requests
 
-[See the "Making Changes and Pull Requests" section in the Forge documentation](https://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
+[See the "Making Changes and Pull Requests" section in the Forge documentation][Pull-Requests].
 
-Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
+Please read the contributing guidelines found [here][Contributing] before making a pull request.
 
 ### Contributor License Agreement
-We require all contributors to acknowledge the [Forge Contributor License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). 
+We require all contributors to acknowledge the [Forge Contributor License Agreement][CLA]. 
 Please ensure you have a valid email address associated with your GitHub account to do this. If you have previously 
  signed it, you should be OK.
 
 #### Donate
 *Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free 
  to use and modify. However, it costs money to run such a large project as this, so please consider 
- [becoming a patron](https://www.patreon.com/LexManos).*
+ [becoming a patron][Patreon].*
+
+[Contributing]: ./CONTRIBUTING.md
+[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
 
 [Download]: https://files.minecraftforge.net/
-[Forum]: https://www.minecraftforge.net/forum/
-[Discord]: https://discord.gg/UvedJ9m
-[Documentation]: https://mcforge.readthedocs.io
+
+[Forum]: https://forums.minecraftforge.net/
+[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
+
+[Discord]: https://discord.minecraftforge.net/
+
+[Documentation]: https://docs.minecraftforge.net/
+[Getting-Started]: https://docs.minecraftforge.net/en/latest/gettingstarted/
+[ForgeDev]: https://docs.minecraftforge.net/en/latest/forgedev/
+[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
+
+[Patreon]: https://www.patreon.com/LexManos

docs/SUPPORT.md

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

fmlcore/build.gradle

@@ -1,73 +1,67 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
-    id 'org.cadixdev.licenser'
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
+import net.minecraftforge.gradleutils.PomUtils
 
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'net.minecraftforge.licenser'
+    id 'net.minecraftforge.gradleutils'
+}
+
+apply from: rootProject.file('build_shared.gradle')
 
 dependencies {
-    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
+    compileOnly(libs.nulls)
 
-    api("net.minecraftforge:eventbus:${EVENTBUS_VERSION}")
+    api(libs.eventbus)
 
     implementation(project(':fmlloader'))
-    implementation("commons-io:commons-io:${COMMONS_IO_VERSION}")
+    implementation(libs.commons.io)
 }
 
-task sourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
+    withSourcesJar()
 }
 
-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',
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+            'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
+            'FMLModType': 'LIBRARY'
+        ] as LinkedHashMap)
+        attributes([
+            'Specification-Title':      'FML',
             'Specification-Vendor':     'Forge Development LLC',
             'Specification-Version':    '1',
-            'Implementation-Title':     'FML Loader',
+            'Implementation-Title':     'FML',
             '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)
+            'Implementation-Vendor':    'Forge Development LLC'
+        ] as LinkedHashMap, 'net/minecraftforge/fml/')
     }
 }
 
-tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:unchecked'
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs << '-Xlint:-unchecked'
 }
 
 license {
     header = rootProject.file('LICENSE-header.txt')
-
-    include 'net/minecraftforge/'
 }
 
-artifacts {
-    archives jar
-    archives sourcesJar
+publishing {
+    publications.register('mavenJava', MavenPublication).configure {
+        from components.java
+        artifactId = 'fmlcore'
+        pom {
+            name = project.name
+            description = 'Modifactions to Minecraft to enable mod developers.'
+            url = 'https://github.com/MinecraftForge/MinecraftForge'
+            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
+            license PomUtils.Licenses.LGPLv2_1
+        }
+    }
+    
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
 }
-
-publishing.publications.mavenJava(MavenPublication) {
-    from components.java
-    artifact sourcesJar
-}

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

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

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

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

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

@@ -11,9 +11,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import com.google.common.base.Stopwatch;
@@ -53,17 +55,29 @@ public class DeferredWorkQueue
     public void runTasks() {
         if (tasks.isEmpty()) return;
         LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
+        RuntimeException aggregate = new RuntimeException();
         Stopwatch timer = Stopwatch.createStarted();
-        tasks.forEach(t->makeRunnable(t, Runnable::run));
+        tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
         timer.stop();
-        LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
+        if (aggregate.getSuppressed().length > 0) {
+            LOGGER.fatal(
+                    LOADING,
+                    "Synchronous work queue completed exceptionally in {}, see suppressed exceptions for details:",
+                    timer,
+                    aggregate
+            );
+            throw aggregate;
+        } else {
+            LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
+        }
     }
 
-    private static void makeRunnable(TaskInfo ti, Executor executor) {
+    private static void makeRunnable(TaskInfo ti, Executor executor, RuntimeException aggregate) {
         executor.execute(() -> {
             Stopwatch timer = Stopwatch.createStarted();
             ModLoadingContext.get().setActiveContainer(ti.owner);
             try {
+                ti.future.exceptionally(t -> captureException(ti.owner.getModId(), aggregate, t));
                 ti.task.run();
             } finally {
                 ModLoadingContext.get().setActiveContainer(null);
@@ -75,13 +89,38 @@ public class DeferredWorkQueue
         });
     }
 
+    private static <T> T captureException(String modId, RuntimeException aggregate, Throwable throwable) {
+        if (throwable instanceof CompletionException ce) {
+            throwable = ce.getCause();
+        }
+        aggregate.addSuppressed(throwable);
+        LOGGER.error("Mod '{}' encountered an error in a deferred task:", modId, throwable);
+        return null;
+    }
+
     public CompletableFuture<Void> enqueueWork(final ModContainer modInfo, final Runnable work) {
-        return CompletableFuture.runAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
+        return enqueueWork(modInfo, taskInfo -> CompletableFuture.runAsync(work, r -> taskInfo.task = r));
     }
 
     public <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, final Supplier<T> work) {
-        return CompletableFuture.supplyAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
+        return enqueueWork(modInfo, taskInfo -> CompletableFuture.supplyAsync(work, r -> taskInfo.task = r));
     }
 
-    record TaskInfo(ModContainer owner, Runnable task) {}
+    private <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, Function<TaskInfo, CompletableFuture<T>> futureGen) {
+        TaskInfo taskInfo = new TaskInfo(modInfo);
+        CompletableFuture<T> future = futureGen.apply(taskInfo);
+        taskInfo.future = future;
+        tasks.add(taskInfo);
+        return future;
+    }
+
+    private static class TaskInfo {
+        private final ModContainer owner;
+        private Runnable task;
+        private CompletableFuture<?> future;
+
+        private TaskInfo(ModContainer owner) {
+            this.owner = owner;
+        }
+    }
 }

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

@@ -25,6 +25,7 @@ import java.util.function.Supplier;
  * @param <T> the type of the record which is held by the extension point
  */
 @SuppressWarnings("unused") // Type parameter T
+// TODO: Complete re-write, this hasnt actually be used in a generic way by mods and we could make it a lot simpler.
 public interface IExtensionPoint<T extends Record>
 {
     /**
@@ -40,7 +41,7 @@ public interface IExtensionPoint<T extends Record>
      * where {@code true} means it is from the server and {@code false} means it is from the world save. The return
      * value of the predicate determines whether the remote version is "compatible" for the purposes of the display test.</p>
      *
-     * <p>The local compatibility version may be of the value {@link net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY},
+     * <p>The local compatibility version may be of the value {@link DisplayTest#IGNORESERVERONLY},
      * in which case clients will ignore the mod's presence if it is present on the server but not on the client.
      * However, the remote version test predicate must still accept this value as a remote version in order to display
      * as compatible if the mod is present on the client.</p>
@@ -94,6 +95,27 @@ public interface IExtensionPoint<T extends Record>
      */
     @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
     record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
-        public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
+        public static final String IGNORESERVERONLY = "SERVER_ONLY";
+
+        /**
+         * Ignores any version information coming from the server - use for server only mods
+         */
+        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
+
+        /**
+         * Ignores all information and provides no information
+         * <p>Note: If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or
+         * Open to LAN), consider setting {@code clientSideOnly=true} in the root of your mods.toml.</p>
+         */
+        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
+
+        /**
+         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
+         * instead of a {@link Supplier}.
+         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
+         */
+        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+            this(() -> version, remoteVersionTest);
+        }
     }
 }

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

@@ -7,12 +7,14 @@ package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 /**
  * A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
@@ -44,25 +46,33 @@ public interface IModLoadingState {
      */
     Function<ModList, String> message();
 
+    /**
+     * @return a function that computes the size of this transition based on the size of the modlist.
+     * Used to compute progress.
+     */
+    ToIntFunction<ModList> size();
+
     /**
      * {@return an optional runnable, which runs before starting the transition from this state to the next}
-     * @see #buildTransition(Executor, Executor, Function, Function)
+     * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
      */
     Optional<Consumer<ModList>> inlineRunnable();
 
     /**
      * Builds the transition task for this state with a blank pre-sync and post-sync task.
      *
-     * @param syncExecutor a synchronous executor
+     * @param <T>              a type of event fired on the mod-specific event bus
+     * @param syncExecutor     a synchronous executor
      * @param parallelExecutor a parallel executor
-     * @param <T> a type of event fired on the mod-specific event bus
+     * @param progressBar      a progress meter for tracking progress
      * @return a transition task for this state
-     * @see #buildTransition(Executor, Executor, Function, Function)
+     * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
      */
     default <T extends Event & IModBusEvent>
     Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor) {
-        return buildTransition(syncExecutor, parallelExecutor,
+                                                      final Executor parallelExecutor,
+                                                      final ProgressMeter progressBar) {
+        return buildTransition(syncExecutor, parallelExecutor, progressBar,
                 e -> CompletableFuture.runAsync(() -> {}, e),
                 e -> CompletableFuture.runAsync(() -> {}, e));
     }
@@ -71,16 +81,18 @@ public interface IModLoadingState {
      * Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
      * to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
      *
-     * @param syncExecutor a synchronous executor
+     * @param <T>              a type of event fired on the mod-specific event bus
+     * @param syncExecutor     a synchronous executor
      * @param parallelExecutor a parallel executor
-     * @param preSyncTask a function which returns a task to run before event pre-dispatch hook
-     * @param postSyncTask a function which returns a task to run after event post-dispatch hook
-     * @param <T> a type of event fired on the mod-specific event bus
+     * @param progressBar      a progress meter for tracking progress
+     * @param preSyncTask      a function which returns a task to run before event pre-dispatch hook
+     * @param postSyncTask     a function which returns a task to run after event post-dispatch hook
      * @return a transition task for this state
      */
     <T extends Event & IModBusEvent>
     Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
                                                       final Executor parallelExecutor,
+                                                      final ProgressMeter progressBar,
                                                       final Function<Executor, CompletableFuture<Void>> preSyncTask,
                                                       final Function<Executor, CompletableFuture<Void>> postSyncTask);
 }

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

@@ -7,6 +7,7 @@ package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,20 +25,26 @@ public interface IModStateTransition {
     }
 
     default <T extends Event & IModBusEvent>
-    CompletableFuture<Void> build(final Executor syncExecutor,
+    CompletableFuture<Void> build(final String name,
+                                  final Executor syncExecutor,
                                   final Executor parallelExecutor,
+                                  final ProgressMeter progressBar,
                                   final Function<Executor, CompletableFuture<Void>> preSyncTask,
                                   final Function<Executor, CompletableFuture<Void>> postSyncTask) {
         List<CompletableFuture<Void>> futures = new ArrayList<>();
 
         this.eventFunctionStream().get()
                 .map(f -> (EventGenerator<T>) f)
-                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, last, nextModLoadingStage(), null));
+                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
+                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
 
         final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
         final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
         final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
+                .thenApplyAsync(n -> {
+                    progressBar.label(progressBar.name() + ": dispatching "+name);
+                    return null;
+                }, parallelExecutor)
                 .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
                 .thenApply(r -> {
                     postSyncTask.apply(syncExecutor);
@@ -54,6 +61,7 @@ public interface IModStateTransition {
     EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
                                                              final Executor parallelExecutor,
                                                              final List<CompletableFuture<Void>> completableFutures,
+                                                             final ProgressMeter progressBar,
                                                              final EventGenerator<T> eventGenerator,
                                                              final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
                                                              final EventGenerator<T> nextGenerator) {
@@ -62,7 +70,7 @@ public interface IModStateTransition {
         var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
         completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
 
-        completableFutures.add(ModList.get().futureVisitor(eventGenerator, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
+        completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
 
         var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
         completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));

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

@@ -10,4 +10,9 @@ import java.util.function.Supplier;
 public interface ISystemReportExtender extends Supplier<String>
 {
     String getLabel();
+
+    default boolean isActive()
+    {
+        return true;
+    }
 }

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

@@ -9,6 +9,7 @@ import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModInfo;
 
 import java.util.EnumMap;
@@ -20,6 +21,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -57,15 +59,16 @@ public abstract class ModContainer
         this.modInfo = info;
         this.modLoadingStage = ModLoadingStage.CONSTRUCT;
 
-        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
+        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
+                .orElseGet(() -> info.getOwningFile().isClientSideOnly() ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
         Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
             case "MATCH_VERSION" -> // default displaytest checks for version string match
                     () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
                         (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
             case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
             case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    () -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
             case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
             default -> // any other value throws an exception
                     throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
@@ -113,6 +116,7 @@ public abstract class ModContainer
     public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
             final ModContainer target,
             final IModStateTransition.EventGenerator<T> eventGenerator,
+            final ProgressMeter progressBar,
             final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
             final Executor executor) {
         return CompletableFuture
@@ -123,6 +127,7 @@ public abstract class ModContainer
                 }, executor)
                 .whenComplete((mc, exception) -> {
                     target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
+                    progressBar.increment();
                     ModLoadingContext.get().setActiveContainer(null);
                 });
     }
@@ -142,6 +147,22 @@ public abstract class ModContainer
         extensionPoints.put(point, extension);
     }
 
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
+    }
+
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
+    }
+
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
     public void addConfig(final ModConfig modConfig) {
        configs.put(modConfig.getType(), modConfig);
     }

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

@@ -7,6 +7,7 @@ package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
@@ -46,7 +47,7 @@ import java.util.stream.Stream;
  */
 public class ModList
 {
-    private static Logger LOGGER = LogManager.getLogger();
+    //private static final Logger LOGGER = LogManager.getLogger();
     private static ModList INSTANCE;
     private final List<IModFileInfo> modFiles;
     private final List<IModInfo> sortedList;
@@ -114,18 +115,19 @@ public class ModList
 
     <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
             final IModStateTransition.EventGenerator<T> eventGenerator,
+            final ProgressMeter progressBar,
             final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
         return executor -> gather(
                 this.mods.stream()
-                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, stateChange, executor))
-                .collect(Collectors.toList()))
-            .thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
+                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
+                .toList()
+        ).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
     }
     static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
         if (t.stream().noneMatch(e->e.getValue()!=null)) {
             return CompletableFuture.completedFuture(null);
         } else {
-            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
+            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
             CompletableFuture<Void> cf = new CompletableFuture<>();
             final RuntimeException accumulator = new RuntimeException();
             cf.completeExceptionally(accumulator);

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

@@ -6,15 +6,18 @@
 package net.minecraftforge.fml;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Streams;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
 import net.minecraftforge.forgespi.locating.ForgeFeature;
@@ -22,13 +25,7 @@ import net.minecraftforge.forgespi.locating.IModFile;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;
@@ -36,6 +33,7 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static net.minecraftforge.fml.Logging.CORE;
 import static net.minecraftforge.fml.Logging.LOADING;
@@ -87,20 +85,21 @@ public class ModLoader
     private final ModStateManager stateManager;
     private boolean loadingStateValid;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
+    private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
+    private final Set<IModLoadingState> completedStates = new HashSet<>();
     private ModList modList;
 
     private ModLoader()
     {
         INSTANCE = this;
         this.loadingModList = FMLLoader.getLoadingModList();
-        this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream()
+        this.loadingExceptions = this.loadingModList.getErrors().stream()
                 .flatMap(ModLoadingException::fromEarlyException)
                 .collect(Collectors.toList());
-        this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
+        this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
                 .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
                 .collect(Collectors.toList());
-        FMLLoader.getLoadingModList().getModFiles().stream()
+        this.loadingModList.getModFiles().stream()
                 .filter(ModFileInfo::missingLicense)
                 .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
                 .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
@@ -138,20 +137,19 @@ public class ModLoader
      * @param periodicTask Optional periodic task to perform on the main thread while other activities run
      */
     public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        ForgeFeature.registerFeature("java_version", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.SERVER, System.getProperty("java.version")));
+        ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
+        ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
         loadingStateValid = true;
-        statusConsumer.ifPresent(c->c.accept("Waiting for scan to complete"));
         FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
-        statusConsumer.ifPresent(c->c.accept("Loading mods"));
         final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
                 loadingModList.getMods());
         if (!this.loadingExceptions.isEmpty()) {
             LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(loadingExceptions);
         }
-        statusConsumer.ifPresent(c->c.accept("Validating features"));
         List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
                 .map(ModInfo::getForgeFeatures)
                 .flatMap(Collection::stream)
@@ -159,15 +157,15 @@ public class ModLoader
                 .toList();
 
         if (!failedBounds.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods");
+            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(failedBounds.stream()
-                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb.featureName(), fb.featureBound(), ForgeFeature.featureValue(fb)))
+                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
                     .toList());
         }
 
-        statusConsumer.ifPresent(c->c.accept("Building Mod List"));
         final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
                 .map(ModFileInfo::getFile)
                 .map(this::buildMods)
@@ -175,49 +173,54 @@ public class ModLoader
                 .toList();
         if (!loadingExceptions.isEmpty()) {
             LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(loadingExceptions);
         }
         modList.setLoadedMods(modContainers);
         this.modList = modList;
-        statusConsumer.ifPresent(c->c.accept("Dispatching gathering events"));
-        stateManager.getStates(ModLoadingPhase.GATHER).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept("Gathering phase complete"));
+        var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
+        var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
+        stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
+        progress.complete();
     }
 
     public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        statusConsumer.ifPresent(c->c.accept("Performing load phase"));
-        stateManager.getStates(ModLoadingPhase.LOAD).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept("Mod setup complete"));
+        var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
+        var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
+        stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
+        progress.complete();
     }
 
     public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        statusConsumer.ifPresent(c->c.accept("Performing completion phase"));
-        stateManager.getStates(ModLoadingPhase.COMPLETE).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
+        var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
+        var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
+        stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
         statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
+        progress.complete();
     }
 
-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker) {
+    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
         if (!isLoadingStateValid()) {
             LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
             return;
         }
-        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
-        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
-        state.buildTransition(syncExecutor, parallelExecutor).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        progressBar.label(progressBar.name()+ " working");
+        syncExecutor.drive(ticker);
+        state.inlineRunnable().ifPresent(a->this.handleInlineTransition(a, state, syncExecutor, ticker));
+        state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        completedStates.add(state);
     }
 
-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        if (!isLoadingStateValid()) {
-            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
-            return;
-        }
-        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
-        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
-        state.buildTransition(syncExecutor, parallelExecutor, preSyncTask, postSyncTask).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+    private void handleInlineTransition(final Consumer<ModList> transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
+        var pb = StartupMessageManager.addProgressBar("State transition " +state.name()+" running", 0);
+        syncExecutor.drive(ticker);
+        transition.accept(this.modList);
+        syncExecutor.drive(ticker);
+        pb.complete();
+        syncExecutor.drive(ticker);
     }
-
     private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
         while (!transition.isDone()) {
             syncExecutor.drive(ticker);
@@ -227,11 +230,11 @@ public class ModLoader
         } catch (CompletionException e) {
             loadingStateValid = false;
             Throwable t = e.getCause();
-            final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed())
-                    .filter(obj -> !(obj instanceof ModLoadingException))
-                    .collect(Collectors.toList());
-            if (!notModLoading.isEmpty()) {
+            boolean hasNotModLoadingEx = Arrays.stream(t.getSuppressed())
+                    .anyMatch(obj -> !(obj instanceof ModLoadingException));
+            if (hasNotModLoadingEx) {
                 LOGGER.fatal("Encountered non-modloading exceptions!", e);
+                statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
                 throw e;
             }
 
@@ -240,6 +243,7 @@ public class ModLoader
                     .map(ModLoadingException.class::cast)
                     .collect(Collectors.toList());
             LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
+            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             throw new LoadingFailedException(modLoadingExceptions);
         }
     }
@@ -254,16 +258,28 @@ public class ModLoader
                 .stream()
                 .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .toList();
         if (containers.size() != modInfoMap.size()) {
+            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
+            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
+
             LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                     modFile.getFilePath(),
-                    containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList()),
-                    modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList()));
+                    containers.size(), containerIds,
+                    modInfoMap.size(), modIds);
+
+            var missingClasses = new ArrayList<>(modIds);
+            missingClasses.removeAll(containerIds);
+            LOGGER.fatal(LOADING, "The following classes are missing, but are reported in the mods.toml: {}", missingClasses);
+
+            var missingMods = new ArrayList<>(containerIds);
+            missingMods.removeAll(modIds);
+            LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
+
             loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
         }
         // remove errored mod containers
-        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
+        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
     }
 
     private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
@@ -290,6 +306,11 @@ public class ModLoader
         return get().loadingStateValid;
     }
 
+    public boolean hasCompletedState(final String stateName) {
+        IModLoadingState state = stateManager.findState(stateName);
+        return completedStates.contains(state);
+    }
+
     public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
@@ -305,6 +326,17 @@ public class ModLoader
         }
         ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
     }
+    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
+        if (!loadingStateValid) {
+            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
+            return e;
+        }
+        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
+        return e;
+    }
+    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
+        postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
+    }
     public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());

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

@@ -12,6 +12,7 @@ import net.minecraftforge.fml.loading.FMLLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
 public class ModLoadingContext
@@ -50,6 +51,44 @@ public class ModLoadingContext
         getActiveContainer().registerExtensionPoint(point, extension);
     }
 
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
+     */
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        getActiveContainer().registerDisplayTest(() -> displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
+     */
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        getActiveContainer().registerDisplayTest(displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
+     */
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
+     */
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
         if (spec.isEmpty())
         {

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

@@ -7,12 +7,14 @@ package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 /**
  * Implementation of the {@link IModLoadingState} interface.
@@ -26,6 +28,7 @@ import java.util.function.Function;
  */
 public record ModLoadingState(String name, String previous,
                               Function<ModList, String> message,
+                              ToIntFunction<ModList> size,
                               ModLoadingPhase phase,
                               Optional<Consumer<ModList>> inlineRunnable,
                               Optional<IModStateTransition> transition) implements IModLoadingState {
@@ -33,9 +36,10 @@ public record ModLoadingState(String name, String previous,
     public <T extends Event & IModBusEvent>
     Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
                                                       final Executor parallelExecutor,
+                                                      final ProgressMeter progressBar,
                                                       final Function<Executor, CompletableFuture<Void>> preSyncTask,
                                                       final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        return transition.map(t -> t.build(syncExecutor, parallelExecutor, preSyncTask, postSyncTask));
+        return transition.map(t -> t.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
     }
 
     /**
@@ -47,7 +51,7 @@ public record ModLoadingState(String name, String previous,
      * @param phase    the mod loading phase the state belongs to
      */
     public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, ml -> "", phase, Optional.empty(), Optional.empty());
+        return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
     }
 
     /**
@@ -62,7 +66,7 @@ public record ModLoadingState(String name, String previous,
      */
     public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
                                                  final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, phase, Optional.empty(), Optional.of(transition));
+        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
     }
 
     /**
@@ -78,7 +82,7 @@ public record ModLoadingState(String name, String previous,
     public static ModLoadingState withTransition(final String name, final String previous,
                                                  final Function<ModList, String> message, final ModLoadingPhase phase,
                                                  final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, message, phase, Optional.empty(), Optional.of(transition));
+        return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
     }
 
     /**
@@ -93,6 +97,6 @@ public record ModLoadingState(String name, String previous,
      */
     public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
                                              final Consumer<ModList> inline) {
-        return new ModLoadingState(name, previous, ml -> "Processing work " + name, phase, Optional.of(inline), Optional.empty());
+        return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
     }
 }

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

@@ -12,8 +12,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-public class ModLoadingWarning
-{
+public class ModLoadingWarning {
     /**
      * Mod Info for mod with warning
      */

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

@@ -39,4 +39,13 @@ public class ModStateManager {
         nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
         return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
     }
+
+    public IModLoadingState findState(final String stateName) {
+        return stateMap.values()
+                .stream()
+                .flatMap(Collection::stream)
+                .filter(mls -> mls.name().equals(stateName))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
+    }
 }

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

@@ -23,8 +23,9 @@ public class ModWorkManager {
 
         default void drive(Runnable ticker) {
             if (!selfDriven()) {
-                while (driveOne()) {
-                    ticker.run();
+                ticker.run();
+                while (true) {
+                    if (!driveOne()) break;
                 }
             } else {
                 // park for a bit so other threads can schedule
@@ -93,7 +94,7 @@ public class ModWorkManager {
     private static ForkJoinPool parallelThreadPool;
     public static Executor parallelExecutor() {
         if (parallelThreadPool == null) {
-            final int loadingThreadCount = FMLConfig.loadingThreadCount();
+            final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
             LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
             parallelThreadPool = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
         }

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

@@ -5,19 +5,30 @@
 
 package net.minecraftforge.fml;
 
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+
 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);
+        StartupNotificationManager.addModMessage(message);
     }
 
     public static Optional<Consumer<String>> modLoaderConsumer() {
-        return net.minecraftforge.fml.loading.progress.StartupMessageManager.modLoaderConsumer();
+        return StartupNotificationManager.modLoaderConsumer();
     }
 
     public static Optional<Consumer<String>> mcLoaderConsumer() {
-        return net.minecraftforge.fml.loading.progress.StartupMessageManager.mcLoaderConsumer();
+        return StartupNotificationManager.mcLoaderConsumer();
+    }
+
+    public static ProgressMeter addProgressBar(final String barName, final int count) {
+        return StartupNotificationManager.addProgressBar(barName, count);
+    }
+
+    public static ProgressMeter prependProgressBar(final String barName, final int count) {
+        return StartupNotificationManager.prependProgressBar(barName, count);
     }
 }

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

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

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

@@ -26,7 +26,7 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
 public class ConfigFileTypeHandler {
     private static final Logger LOGGER = LogUtils.getLogger();
     static ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
-    private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.defaultConfigPath());
+    private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
 
     public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
         return (c) -> {

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

@@ -66,8 +66,12 @@ public class ConfigTracker {
     private void closeConfig(final ModConfig config, final Path configBasePath) {
         if (config.getConfigData() != null) {
             LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
-            config.save();
+            // stop the filewatcher before we save the file and close it, so reload doesn't fire
             config.getHandler().unload(configBasePath, config);
+            var unloading = IConfigEvent.unloading(config);
+            if (unloading != null)
+                config.fireEvent(unloading);
+            config.save();
             config.setConfigData(null);
         }
     }

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

@@ -10,8 +10,11 @@ import net.minecraftforge.fml.Bindings;
 
 import java.util.function.Function;
 
+import org.jetbrains.annotations.Nullable;
+
 public interface IConfigEvent {
-    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading) {}
+    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
+
     ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
 
     static IConfigEvent reloading(ModConfig modConfig) {
@@ -20,6 +23,9 @@ public interface IConfigEvent {
     static IConfigEvent loading(ModConfig modConfig) {
         return CONFIGCONFIG.loading().apply(modConfig);
     }
+    @Nullable static IConfigEvent unloading(ModConfig modConfig) {
+        return CONFIGCONFIG.unloading() == null ? null : CONFIGCONFIG.unloading().apply(modConfig);
+    }
     ModConfig getConfig();
 
     @SuppressWarnings("unchecked")

fmlearlydisplay/build.gradle

@@ -0,0 +1,92 @@
+import net.minecraftforge.gradleutils.PomUtils
+
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'net.minecraftforge.licenser'
+    id 'net.minecraftforge.gradleutils'
+}
+
+apply from: rootProject.file('build_shared.gradle')
+
+import org.gradle.internal.os.OperatingSystem
+switch (OperatingSystem.current()) {
+	case OperatingSystem.LINUX:
+		project.ext.lwjglNatives = "natives-linux"
+		break
+	case OperatingSystem.MAC_OS:
+		project.ext.lwjglNatives = "natives-macos"
+		break
+	case OperatingSystem.WINDOWS:
+		project.ext.lwjglNatives = "natives-windows"
+		break
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
+    withSourcesJar()
+}
+
+dependencies {
+    compileOnly(libs.nulls)
+    implementation(project(':fmlloader'))
+    implementation(project(':fmlcore'))
+    implementation(libs.bundles.lwjgl)
+    implementation('org.slf4j:slf4j-api:1.8.0-beta4')
+    implementation(libs.jopt.simple)
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
+    testImplementation('org.powermock:powermock-core:2.0.9')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.8.2')
+    testRuntimeOnly('org.slf4j:slf4j-jdk14:1.8.0-beta4')
+    testRuntimeOnly("org.lwjgl:lwjgl::$lwjglNatives")
+    testRuntimeOnly("org.lwjgl:lwjgl-glfw::$lwjglNatives")
+    testRuntimeOnly("org.lwjgl:lwjgl-opengl::$lwjglNatives")
+    testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
+}
+
+tasks.named('test', Test).configure {
+    useJUnitPlatform()
+}
+
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+            'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
+            'Forge-Module-Layer':    'boot'
+        ] as LinkedHashMap)
+        attributes([
+            'Specification-Title':      'FML Early Display',
+            'Specification-Vendor':     'Forge Development LLC',
+            'Specification-Version':    '1',
+            'Implementation-Title':     'FML Early Display',
+            'Implementation-Vendor':    'Forge Development LLC',
+            'Implementation-Version':   '1.0'
+        ] as LinkedHashMap, 'net/minecraftforge/fml/earlydisplay/')
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs << '-Xlint:unchecked'
+}
+
+license {
+    header = rootProject.file('LICENSE-header.txt')
+}
+
+publishing {
+    publications.register('mavenJava', MavenPublication).configure {
+        from components.java
+        artifactId = 'fmlearlydisplay'
+        pom {
+            name = project.name
+            description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
+            url = 'https://github.com/MinecraftForge/MinecraftForge'
+            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
+            license PomUtils.Licenses.LGPLv2_1
+        }
+    }
+    
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+public enum ColourScheme {
+    RED(new Colour(239, 50, 61), new Colour(255, 255, 255)),
+    BLACK(new Colour(0, 0, 0), new Colour(255, 255, 255));
+
+    private final Colour background;
+    private final Colour foreground;
+
+    ColourScheme(final Colour background, final Colour foreground) {
+        this.background = background;
+        this.foreground = foreground;
+    }
+
+    public Colour background() {
+        return background;
+    }
+
+    public Colour foreground() {
+        return foreground;
+    }
+
+    public record Colour(int red, int green, int blue) {
+        public float redf() {
+            return ((float)red)/255f;
+        }
+        public float greenf() {
+            return ((float)green)/255f;
+        }
+        public float bluef() {
+            return ((float)blue)/255f;
+        }
+
+        public int packedint(int a) {
+            return ((a & 0xff) << 24) | ((blue & 0xff) << 16) | ((green & 0xff) << 8) | (red & 0xff);
+        }
+    }
+}

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

@@ -0,0 +1,647 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import joptsimple.OptionParser;
+import net.minecraftforge.fml.loading.FMLConfig;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.loading.ImmediateWindowHandler;
+import net.minecraftforge.fml.loading.ImmediateWindowProvider;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import org.jetbrains.annotations.Nullable;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFWVidMode;
+import org.lwjgl.system.MemoryStack;
+import org.lwjgl.system.MemoryUtil;
+import org.lwjgl.util.tinyfd.TinyFileDialogs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.Desktop;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+import static org.lwjgl.glfw.GLFW.*;
+import static org.lwjgl.opengl.GL.createCapabilities;
+import static org.lwjgl.opengl.GL32C.*;
+
+/**
+ * The Loading Window that is opened Immediately after Forge starts.
+ * It is called from the ModDirTransformerDiscoverer, the soonest method that ModLauncher calls into Forge code.
+ * In this way, we can be sure that this will not run before any transformer or injection.
+ *
+ * The window itself is spun off into a secondary thread, and is handed off to the main game by Forge.
+ *
+ * Because it is created so early, this thread will "absorb" the context from OpenGL.
+ * Therefore, it is of utmost importance that the Context is made Current for the main thread before handoff,
+ * otherwise OS X will crash out.
+ *
+ * Based on the prior ClientVisualization, with some personal touches.
+ */
+public class DisplayWindow implements ImmediateWindowProvider {
+    private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}, {3,2}};
+    private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
+    private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
+
+    private ColourScheme colourScheme = ColourScheme.RED;
+    private ElementShader elementShader;
+
+    private RenderElement.DisplayContext context;
+    private List<RenderElement> elements;
+    private int framecount;
+    private EarlyFramebuffer framebuffer;
+    private ScheduledFuture<?> windowTick;
+    private ScheduledFuture<?> initializationFuture;
+
+    private PerformanceInfo performanceInfo;
+    private ScheduledFuture<?> performanceTick;
+    // The GL ID of the window. Used for all operations
+    private long window;
+    // The thread that contains and ticks the window while Forge is loading mods
+    private ScheduledExecutorService renderScheduler;
+    private int fbWidth;
+    private int fbHeight;
+    private int fbScale;
+    private int winWidth;
+    private int winHeight;
+    private int winX;
+    private int winY;
+
+    private final Semaphore renderLock = new Semaphore(1);
+    private boolean maximized;
+    private String glVersion;
+    private SimpleFont font;
+    private Runnable repaintTick = ()->{};
+
+    @Override
+    public String name() {
+        return "fmlearlywindow";
+    }
+
+    @Override
+    public Runnable initialize(String[] arguments) {
+        String mcVersion = FMLLoader.versionInfo().mcVersion();
+        String forgeVersion = FMLLoader.versionInfo().forgeVersion();
+
+        final OptionParser parser = new OptionParser();
+        var widthopt = parser.accepts("width")
+                .withRequiredArg().ofType(Integer.class)
+                .defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH));
+        var heightopt = parser.accepts("height")
+                .withRequiredArg().ofType(Integer.class)
+                .defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT));
+        var maximizedopt = parser.accepts("earlywindow.maximized");
+        parser.allowsUnrecognizedOptions();
+        var parsed = parser.parse(arguments);
+        winWidth = parsed.valueOf(widthopt);
+        winHeight = parsed.valueOf(heightopt);
+        FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH, winWidth);
+        FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT, winHeight);
+        fbScale = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_FBSCALE);
+        if (System.getenv("FML_EARLY_WINDOW_DARK") != null) {
+            this.colourScheme = ColourScheme.BLACK;
+        } else {
+            try {
+                // check the options file for the colour scheme
+                var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
+                var keyName = "darkMojangStudiosBackground:";
+                for (String line : optionLines) {
+                    if (line.startsWith(keyName)) {
+                        this.colourScheme = line.startsWith("true", keyName.length()) ? ColourScheme.BLACK : ColourScheme.RED;
+                        break;
+                    }
+                }
+            } catch (IOException e) {
+                this.colourScheme = ColourScheme.RED; // fallback to red colourScheme
+            }
+        }
+        this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
+
+        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion));
+        performanceInfo = new PerformanceInfo();
+        return start(mcVersion, forgeVersion);
+    }
+
+    private static final long MINFRAMETIME = TimeUnit.MILLISECONDS.toNanos(10); // This is the FPS cap on the window - note animation is capped at 20FPS via the tickTimer
+    private long nextFrameTime = 0;
+    /**
+     * The main render loop.
+     * renderThread executes this.
+     *
+     * Performs initialization and then ticks the screen at 20 fps.
+     * When the thread is killed, context is destroyed.
+     */
+    private void renderThreadFunc() {
+        if (!renderLock.tryAcquire()) {
+            return;
+        }
+        try {
+            long nt;
+            if ((nt = System.nanoTime()) < nextFrameTime) {
+                return;
+            }
+            nextFrameTime = nt + MINFRAMETIME;
+            glfwMakeContextCurrent(window);
+            framebuffer.activate();
+            glViewport(0, 0, this.context.scaledWidth(), this.context.scaledHeight());
+            this.context.elementShader().activate();
+            this.context.elementShader().updateScreenSizeUniform(this.context.scaledWidth(), this.context.scaledHeight());
+            glClearColor(colourScheme.background().redf(), colourScheme.background().greenf(), colourScheme.background().bluef(), 1f);
+            paintFramebuffer();
+            this.context.elementShader().clear();
+            framebuffer.deactivate();
+            glViewport(0, 0, fbWidth, fbHeight);
+            framebuffer.draw(this.fbWidth, this.fbHeight);
+            // Swap buffers; we're done
+            glfwSwapBuffers(window);
+        } catch (Throwable t) {
+            LOGGER.error("BARF", t);
+        } finally {
+            if (this.windowTick != null) glfwMakeContextCurrent(0); // we release the gl context IF we're running off the main thread
+            renderLock.release();
+        }
+    }
+
+    /**
+     * Render initialization methods called by the Render Thread.
+     * It compiles the fragment and vertex shaders for rendering text with STB, and sets up basic render framework.
+     *
+     * Nothing fancy, we just want to draw and render text.
+     */
+    private void initRender(final @Nullable String mcVersion, final String forgeVersion) {
+        // This thread owns the GL render context now. We should make a note of that.
+        glfwMakeContextCurrent(window);
+        // Wait for one frame to be complete before swapping; enable vsync in other words.
+        glfwSwapInterval(1);
+        createCapabilities();
+        LOGGER.info("GL info: "+ glGetString(GL_RENDERER) + " GL version " + glGetString(GL_VERSION) + ", " + glGetString(GL_VENDOR));
+
+        elementShader = new ElementShader();
+        try {
+            elementShader.init();
+        } catch (Throwable t) {
+            LOGGER.error("Crash during shader initialization", t);
+            crashElegantly("An error occurred initializing shaders.");
+        }
+
+        // Set the clear color based on the colour scheme
+        glClearColor(colourScheme.background().redf(), colourScheme.background().greenf(), colourScheme.background().bluef(), 1f);
+
+        // we always render to an 854x480 texture and then fit that to the screen - with a scale factor
+        this.context = new RenderElement.DisplayContext(854, 480, fbScale, elementShader, colourScheme, performanceInfo);
+        framebuffer = new EarlyFramebuffer(this.context);
+        try {
+            this.font = new SimpleFont("Monocraft.ttf", fbScale, 200000, 1 + RenderElement.INDEX_TEXTURE_OFFSET);
+        } catch (Throwable t) {
+            LOGGER.error("Crash during font initialization", t);
+            crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
+        }
+        this.elements = new ArrayList<>(List.of(
+            RenderElement.anvil(font),
+            RenderElement.logMessageOverlay(font),
+            RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion),
+            RenderElement.performanceBar(font),
+            RenderElement.progressBars(font)
+        ));
+
+        var date = Calendar.getInstance();
+        if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
+            this.elements.add(0, RenderElement.squir());
+
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        glfwMakeContextCurrent(0);
+        this.windowTick = renderScheduler.scheduleAtFixedRate(this::renderThreadFunc, 50, 50, TimeUnit.MILLISECONDS);
+        this.performanceTick = renderScheduler.scheduleAtFixedRate(performanceInfo::update, 0, 500, TimeUnit.MILLISECONDS);
+        // schedule a 50 ms ticker to try and smooth out the rendering
+        renderScheduler.scheduleAtFixedRate(()-> animationTimerTrigger.set(true), 1, 50, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Called every frame by the Render Thread to draw to the screen.
+     */
+    void paintFramebuffer() {
+        // Clear the screen to our color
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+        this.elements.removeIf(element -> !element.render(context, framecount));
+        if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
+            framecount++;
+    }
+
+
+    public void render(int alpha) {
+        var currentVAO = glGetInteger(GL_VERTEX_ARRAY_BINDING);
+        var currentFB = glGetInteger(GL_READ_FRAMEBUFFER_BINDING);
+        glViewport(0, 0, this.context.scaledWidth(), this.context.scaledHeight());
+        RenderElement.globalAlpha = alpha;
+        framebuffer.activate();
+        glClearColor(colourScheme.background().redf(), colourScheme.background().greenf(), colourScheme.background().bluef(), alpha / 255f);
+        elementShader.activate();
+        elementShader.updateScreenSizeUniform(this.context.scaledWidth(), this.context.scaledHeight());
+        paintFramebuffer();
+        elementShader.clear();
+        framebuffer.deactivate();
+        glBindVertexArray(currentVAO);
+        glBindFramebuffer(GL_FRAMEBUFFER, currentFB);
+    }
+    /**
+     * Start the window and Render Thread; we're ready to go.
+     */
+    public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
+        renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+            final var thread = Executors.defaultThreadFactory().newThread(r);
+            thread.setName("EarlyDisplay");
+            thread.setDaemon(true);
+            return thread;
+        });
+        initWindow(mcVersion);
+        this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
+        return this::periodicTick;
+    }
+
+    private static final String ERROR_URL = "https://links.minecraftforge.net/early-display-errors";
+    @Override
+    public String getGLVersion() {
+        return this.glVersion;
+    }
+
+    private void crashElegantly(String errorDetails) {
+        String qrText;
+        try (var is = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/glfailure.txt")))) {
+            qrText = is.lines().collect(Collectors.joining("\n"));
+        } catch (IOException ioe) {
+            qrText = "";
+        }
+
+        StringBuilder msgBuilder = new StringBuilder(2000);
+        msgBuilder.append("Failed to initialize graphics window with current settings.\n");
+        msgBuilder.append("\n\n");
+        msgBuilder.append("Failure details:\n");
+        msgBuilder.append(errorDetails);
+        msgBuilder.append("\n\n");
+        msgBuilder.append("If you click yes, we will try and open " + ERROR_URL + " in your default browser");
+        LOGGER.error("ERROR DISPLAY\n"+msgBuilder);
+        // we show the display on a new dedicated thread
+        Executors.newSingleThreadExecutor().submit(()-> {
+            var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", false);
+            if (res) {
+                try {
+                    Desktop.getDesktop().browse(URI.create(ERROR_URL));
+                } catch (IOException ioe) {
+                    TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", false);
+                }
+            }
+            System.exit(1);
+        });
+    }
+    /**
+     * Called to initialize the window when preparing for the Render Thread.
+     *
+     * The act of calling glfwInit here creates a concurrency issue; GL doesn't know whether we're gonna call any
+     * GL functions from the secondary thread and the main thread at the same time.
+     *
+     * It's then our job to make sure this doesn't happen, only calling GL functions where the Context is Current.
+     * As long as we can verify that, then GL (and things like OS X) have no complaints with doing this.
+     *
+     * @param mcVersion Minecraft Version
+     * @return The selected GL profile as an integer pair
+     */
+    public void initWindow(@Nullable String mcVersion) {
+        // Initialize GLFW with a time guard, in case something goes wrong
+        long glfwInitBegin = System.nanoTime();
+        if (!glfwInit()) {
+            crashElegantly("We are unable to initialize the graphics system.\nglfwInit failed.\n");
+            throw new IllegalStateException("Unable to initialize GLFW");
+        }
+        long glfwInitEnd = System.nanoTime();
+
+        if (glfwInitEnd - glfwInitBegin > 1e9) {
+            LOGGER.error("WARNING : glfwInit took {} seconds to start.", (glfwInitEnd - glfwInitBegin) / 1.0e9);
+        }
+
+        // Clear the Last Exception (#7285 - Prevent Vanilla throwing an IllegalStateException due to invalid controller mappings)
+        handleLastGLFWError((error, description) -> LOGGER.error(String.format("Suppressing Last GLFW error: [0x%X]%s", error, description)));
+
+        // Set window hints for the new window we're gonna create.
+        glfwDefaultWindowHints();
+        glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
+        glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
+        glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
+        glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
+
+        String vanillaWindowTitle = "Minecraft* ";
+        if (mcVersion != null) vanillaWindowTitle += mcVersion;
+
+        // this emulates what we would get without early progress window
+        // as vanilla never sets these, so GLFW uses the first window title
+        // set them explicitly to avoid it using "FML early loading progress" as the class
+        glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
+        glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
+
+        long primaryMonitor = glfwGetPrimaryMonitor();
+        if (primaryMonitor == 0) {
+            LOGGER.error("Failed to find a primary monitor - this means LWJGL isn't working properly");
+            crashElegantly("Failed to locate a primary monitor.\nglfwGetPrimaryMonitor failed.\n");
+            throw new IllegalStateException("Can't find a primary monitor");
+        }
+        GLFWVidMode vidmode = glfwGetVideoMode(primaryMonitor);
+
+        if (vidmode == null) {
+            LOGGER.error("Failed to get the current display video mode.");
+            crashElegantly("Failed to get current display resolution.\nglfwGetVideoMode failed.\n");
+            throw new IllegalStateException("Can't get a resolution");
+        }
+        long window = 0;
+        var successfulWindow = new AtomicBoolean(false);
+        var windowFailFuture = renderScheduler.schedule(()->{
+            if (!successfulWindow.get()) crashElegantly("Timed out trying to setup the Game Window.");
+        }, 10, TimeUnit.SECONDS);
+        int versidx = 0;
+        var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
+        boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
+        final String[] lastGLError = new String[GL_VERSIONS.length];
+        do {
+            final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
+            if (skipVersions.contains(glVersionToTry)) {
+                LOGGER.info("Skipping GL version "+ glVersionToTry+" because of configuration");
+                versidx++;
+                continue;
+            }
+            LOGGER.info("Trying GL version " + glVersionToTry);
+            if (showHelpLog && versidx == 0) {
+                LOGGER.info("""
+                If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
+                
+                Possible solutions:
+                A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
+                B) Check for driver updates on the graphics brand's website
+                C) Try reinstalling your graphics drivers
+                D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
+                
+                You can safely ignore this message if the game starts up successfully.""");
+            }
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
+            glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+            glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+            window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
+            var erridx = versidx;
+            handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
+            if (lastGLError[versidx] != null) {
+                LOGGER.trace(lastGLError[versidx]);
+            }
+            versidx++;
+        } while (window == 0 && versidx < GL_VERSIONS.length);
+//        LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(12));
+        if (versidx== GL_VERSIONS.length && window == 0) {
+            LOGGER.error("Failed to find any valid GLFW profile. "+lastGLError[0]);
+
+            crashElegantly("Failed to find a valid GLFW profile.\nWe tried "+
+                    Arrays.stream(GL_VERSIONS).map(p->p[0]+"."+p[1]).filter(o -> !skipVersions.contains(o))
+                            .collect(Collector.of(()->new StringJoiner(", ").setEmptyValue("no versions"), StringJoiner::add, StringJoiner::merge, StringJoiner::toString))+
+                    " but none of them worked.\n"+ Arrays.stream(lastGLError).filter(Objects::nonNull).collect(Collectors.joining("\n")));
+            throw new IllegalStateException("Failed to create a GLFW window with any profile");
+        }
+        successfulWindow.set(true);
+        if (!windowFailFuture.cancel(true)) throw new IllegalStateException("We died but didn't somehow?");
+        var requestedVersion = GL_VERSIONS[versidx-1][0]+"."+GL_VERSIONS[versidx-1][1];
+        var maj = glfwGetWindowAttrib(window, GLFW_CONTEXT_VERSION_MAJOR);
+        var min = glfwGetWindowAttrib(window, GLFW_CONTEXT_VERSION_MINOR);
+        var gotVersion = maj+"."+min;
+        LOGGER.info("Requested GL version "+requestedVersion+" got version "+gotVersion);
+        this.glVersion = gotVersion;
+        this.window = window;
+
+        if (showHelpLog)
+            FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
+
+        int[] x = new int[1];
+        int[] y = new int[1];
+        glfwGetMonitorPos(primaryMonitor, x, y);
+        int monitorX = x[0];
+        int monitorY = y[0];
+//        glfwSetWindowSizeLimits(window, 854, 480, GLFW_DONT_CARE, GLFW_DONT_CARE);
+        if (this.maximized) {
+            glfwMaximizeWindow(window);
+        }
+
+        glfwGetWindowSize(window, x, y);
+        this.winWidth = x[0];
+        this.winHeight = y[0];
+
+        glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
+
+        // Attempt setting the icon
+//        int[] channels = new int[1];
+//        try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
+//            final ByteBuffer imgBuffer;
+//            try (GLFWImage glfwImages = GLFWImage.malloc()) {
+//                imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
+//                glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
+//                glfwSetWindowIcon(window, glfwImgBuffer);
+//                STBImage.stbi_image_free(imgBuffer);
+//            }
+//        } catch (NullPointerException e) {
+//            System.err.println("Failed to load forge logo");
+//        }
+//        handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
+
+        glfwSetFramebufferSizeCallback(window, this::fbResize);
+        glfwSetWindowPosCallback(window, this::winMove);
+        glfwSetWindowSizeCallback(window, this::winResize);
+
+        // Show the window
+        glfwShowWindow(window);
+        glfwGetWindowPos(window, x, y);
+        this.winX = x[0];
+        this.winY = y[0];
+        glfwGetFramebufferSize(window, x, y);
+        this.fbWidth = x[0];
+        this.fbHeight = y[0];
+        glfwPollEvents();
+    }
+
+    private void badWindowHandler(final int code, final long desc) {
+        LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
+    }
+
+    private void winResize(long window, int width, int height) {
+        if (window == this.window && width != 0 && height != 0) {
+            this.winWidth = width;
+            this.winHeight = height;
+        }
+    }
+    private void fbResize(long window, int width, int height) {
+        if (window == this.window && width != 0 && height != 0) {
+            this.fbWidth = width;
+            this.fbHeight = height;
+        }
+    }
+
+    private void winMove(long window, int x, int y) {
+        if (window == this.window) {
+            this.winX = x;
+            this.winY = y;
+        }
+    }
+    private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
+        try (MemoryStack memorystack = MemoryStack.stackPush()) {
+            PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
+            int error = glfwGetError(pointerbuffer);
+            if (error != GLFW_NO_ERROR) {
+                long pDescription = pointerbuffer.get();
+                String description = pDescription == 0L ? "" : MemoryUtil.memUTF8(pDescription);
+                handler.accept(error, description);
+            }
+        }
+    }
+
+    /**
+     * Hand-off the window to the vanilla game.
+     * Called on the main thread instead of the game's initialization.
+     *
+     * @return the Window we own.
+     */
+    public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
+        // wait for the window to actually be initialized
+        try {
+            this.initializationFuture.get(30, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        } catch (TimeoutException e) {
+            Thread.dumpStack();
+            crashElegantly("We seem to be having trouble initializing the window, waited for 30 seconds");
+        }
+
+        // we have to spin wait for the window ticker
+        ImmediateWindowHandler.updateProgress("Initializing Game Graphics");
+        while (!this.windowTick.isDone()) {
+            this.windowTick.cancel(false);
+        }
+        var tries = 0;
+        var renderlockticket = false;
+        do {
+            try {
+                    renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
+                    if (++tries > 9) {
+                        Thread.dumpStack();
+                        crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
+                    }
+            } catch (InterruptedException e) {
+                Thread.interrupted();
+            }
+        } while (!renderlockticket);
+        // we don't want the lock, just making sure it's back on the main thread
+        renderLock.release();
+
+        glfwMakeContextCurrent(window);
+        // Set the title to what the game wants
+        glfwSetWindowTitle(window, title.get());
+        glfwSwapInterval(0);
+        // Clean up our hooks
+        glfwSetFramebufferSizeCallback(window, null).free();
+        glfwSetWindowPosCallback(window, null).free();
+        glfwSetWindowSizeCallback(window, null).free();
+        this.repaintTick = this::renderThreadFunc; // the repaint will continue to be called until the overlay takes over
+        this.windowTick = null; // this tells the render thread that the async ticker is done
+        return window;
+    }
+
+    @Override
+    public boolean positionWindow(final Optional<Object> monitor, final IntConsumer widthSetter, final IntConsumer heightSetter, final IntConsumer xSetter, final IntConsumer ySetter) {
+        widthSetter.accept(this.winWidth);
+        heightSetter.accept(this.winHeight);
+        xSetter.accept(this.winX);
+        ySetter.accept(this.winY);
+        return true;
+    }
+
+    @Override
+    public void updateFramebufferSize(final IntConsumer width, final IntConsumer height) {
+        width.accept(this.fbWidth);
+        height.accept(this.fbHeight);
+    }
+
+    private Method loadingOverlay;
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> Supplier<T> loadingOverlay(final Supplier<?> mc, final Supplier<?> ri, final Consumer<Optional<Throwable>> ex, final boolean fade) {
+        try {
+            return (Supplier<T>)loadingOverlay.invoke(null, mc, ri, ex, this);
+        } catch (Throwable e) {
+            throw new IllegalStateException("How did you get here?", e);
+        }
+    }
+
+    @Override
+    public void updateModuleReads(final ModuleLayer layer) {
+        var fm = layer.findModule("forge").orElseThrow();
+        getClass().getModule().addReads(fm);
+        var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
+        loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
+    }
+
+    public int getFramebufferTextureId() {
+        return framebuffer.getTexture();
+    }
+
+    public RenderElement.DisplayContext context() {
+        return this.context;
+    }
+
+    @Override
+    public void periodicTick() {
+        glfwPollEvents();
+        repaintTick.run();
+    }
+
+    public void addMojangTexture(final int textureId) {
+        this.elements.add(0, RenderElement.mojang(textureId, framecount));
+//        this.elements.get(0).retire(framecount + 1);
+    }
+
+    public void close() {
+        // Close the Render Scheduler thread
+        renderScheduler.shutdown();
+        this.framebuffer.close();
+        this.context.elementShader().close();
+        SimpleBufferBuilder.destroy();
+    }
+}

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import java.nio.IntBuffer;
+
+import static net.minecraftforge.fml.earlydisplay.RenderElement.clamp;
+import static org.lwjgl.opengl.GL32C.*;
+
+public class EarlyFramebuffer {
+    private final int framebuffer;
+    private final int texture;
+
+    private final RenderElement.DisplayContext context;
+
+    EarlyFramebuffer(final RenderElement.DisplayContext context) {
+        this.context = context;
+        this.framebuffer = glGenFramebuffers();
+        this.texture = glGenTextures();
+        glBindFramebuffer(GL_FRAMEBUFFER, this.framebuffer);
+        glActiveTexture(GL_TEXTURE0);
+        glBindTexture(GL_TEXTURE_2D, this.texture);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, context.width() * context.scale(), context.height() * context.scale(), 0, GL_RGBA, GL_UNSIGNED_BYTE, (IntBuffer)null);
+        glTexParameterIi(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameterIi(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, this.texture, 0);
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    }
+
+    void activate() {
+        glBindFramebuffer(GL_FRAMEBUFFER, this.framebuffer);
+    }
+
+    void deactivate() {
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    }
+
+    void draw(int windowFBWidth, int windowFBHeight) {
+        var wscale = ((float)windowFBWidth / this.context.width());
+        var hscale = ((float)windowFBHeight / this.context.height());
+        var scale = this.context.scale() * Math.min(wscale, hscale) / 2f;
+        var wleft = (int)(windowFBWidth * 0.5f - scale * this.context.width());
+        var wtop = (int)(windowFBHeight * 0.5f - scale * this.context.height());
+        var wright = (int)(windowFBWidth * 0.5f + scale * this.context.width());
+        var wbottom = (int)(windowFBHeight * 0.5f + scale * this.context.height());
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+        glBindFramebuffer(GL_READ_FRAMEBUFFER, this.framebuffer);
+        final var colour = this.context.colourScheme().background();
+        glClearColor(colour.redf(), colour.greenf(), colour.bluef(), 1f);
+        glClear(GL_COLOR_BUFFER_BIT);
+        // src Y are flipped, since our FB is flipped
+        glBlitFramebuffer(0, this.context.height() * this.context.scale(), this.context.width() * this.context.scale(), 0, clamp(wleft, 0, windowFBWidth), clamp(wtop, 0, windowFBHeight), clamp(wright, 0, windowFBWidth), clamp(wbottom, 0, windowFBHeight), GL_COLOR_BUFFER_BIT, GL_NEAREST);
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    }
+
+    int getTexture() {
+        return this.texture;
+    }
+
+    public void close() {
+        glDeleteTextures(this.texture);
+        glDeleteFramebuffers(this.framebuffer);
+    }
+}

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

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+
+import static org.lwjgl.opengl.GL32C.*;
+
+public class ElementShader {
+    private int program;
+    private int textureUniform;
+    private int screenSizeUniform;
+    private int renderTypeUniform;
+
+    public void init() {
+        int vertexShader = glCreateShader(GL_VERTEX_SHADER);
+        int fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
+
+        // Bind the source of our shaders to the ones created above
+        glShaderSource(fragmentShader, """
+                 #version 150 core
+                 uniform sampler2D tex;
+                 uniform int rendertype;
+                 in vec2 fTex;
+                 in vec4 fColour;
+                 out vec4 fragColor;
+                 
+                 void main() {
+                     if (rendertype == 0)
+                            fragColor = vec4(1,1,1,texture(tex, fTex).r) * fColour;
+                     if (rendertype == 1)
+                            fragColor = texture(tex, fTex) * fColour;
+                     if (rendertype == 2)
+                            fragColor = fColour;
+                 }
+        """);
+        glShaderSource(vertexShader, """
+                 #version 150 core
+                 in vec2 position;
+                 in vec2 tex;
+                 in vec4 colour;
+                 uniform vec2 screenSize;
+                 out vec2 fTex;
+                 out vec4 fColour;
+                 void main() {
+                     fTex = tex;
+                     fColour = colour;
+                     gl_Position = vec4((position/screenSize) * 2 - 1, 0.0, 1.0);
+                 }
+        """);
+
+        // Compile the vertex and fragment elementShader so that we can use them
+        glCompileShader(vertexShader);
+        if (glGetShaderi(vertexShader, GL_COMPILE_STATUS) == GL_FALSE) {
+            throw new IllegalStateException("VertexShader linkage failure. \n" + glGetShaderInfoLog(vertexShader));
+        }
+        glCompileShader(fragmentShader);
+        if (glGetShaderi(fragmentShader, GL_COMPILE_STATUS) == GL_FALSE) {
+            throw new IllegalStateException("FragmentShader linkage failure. \n" + glGetShaderInfoLog(fragmentShader));
+        }
+
+        var program = glCreateProgram();
+        glBindAttribLocation(program, 0, "position");
+        glBindAttribLocation(program, 1, "tex");
+        glBindAttribLocation(program, 2, "colour");
+        glAttachShader(program, vertexShader);
+        glAttachShader(program, fragmentShader);
+        glLinkProgram(program);
+        if (glGetProgrami(program, GL_LINK_STATUS) == GL_FALSE) {
+            throw new RuntimeException("ShaderProgram linkage failure. \n" + glGetProgramInfoLog(program));
+        }
+        this.program = program;
+
+        glDetachShader(program, vertexShader);
+        glDetachShader(program, fragmentShader);
+        glDeleteShader(vertexShader);
+        glDeleteShader(fragmentShader);
+        textureUniform = glGetUniformLocation(program, "tex");
+        screenSizeUniform = glGetUniformLocation(program, "screenSize");
+        renderTypeUniform = glGetUniformLocation(program, "rendertype");
+
+        activate();
+    }
+
+    public void activate() {
+        glUseProgram(program);
+    }
+    public void updateTextureUniform(int textureNumber) {
+        glUniform1i(textureUniform, textureNumber);
+    }
+
+    public void updateScreenSizeUniform(int width, int height) {
+        glUniform2f(screenSizeUniform, width, height);
+    }
+
+    public void updateRenderTypeUniform(RenderType type) {
+        glUniform1i(renderTypeUniform, type.ordinal());
+    }
+
+    public void clear() {
+        glUseProgram(0);
+    }
+
+    public void close() {
+        glDeleteProgram(program);
+    }
+
+    public enum RenderType {
+        FONT, TEXTURE, BAR;
+    }
+
+    public int program() {
+        return program;
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import com.sun.management.OperatingSystemMXBean;
+import net.minecraftforge.fml.loading.FMLConfig;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+
+public class PerformanceInfo {
+
+    private final boolean showCPUUsage;
+    private final OperatingSystemMXBean osBean;
+    private final MemoryMXBean memoryBean;
+
+    private float memory;
+    private String text;
+
+    PerformanceInfo() {
+        showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
+        osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
+        memoryBean = ManagementFactory.getMemoryMXBean();
+    }
+
+    void update() {
+        final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
+        memory = (float) heapusage.getUsed() / heapusage.getMax();
+
+        if (!showCPUUsage) {
+            text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
+            return;
+        }
+
+        var cpuLoad = osBean.getProcessCpuLoad();
+        String cpuText;
+        if (cpuLoad == -1) {
+            cpuText = "*CPU: %.1f%%".formatted(osBean.getCpuLoad() * 100f);
+        } else {
+            cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
+        }
+
+        text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
+    }
+
+    String text() {
+        return text;
+    }
+
+    float memory() {
+        return memory;
+    }
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+public class QuadHelper {
+    public static void loadQuad(SimpleBufferBuilder bb, float x0, float x1, float y0, float y1, float u0, float u1, float v0, float v1, int colour) {
+        bb.pos(x0, y0).tex(u0, v0).colour(colour).endVertex();
+        bb.pos(x1, y0).tex(u1, v0).colour(colour).endVertex();
+        bb.pos(x0, y1).tex(u0, v1).colour(colour).endVertex();
+        bb.pos(x1, y1).tex(u1, v1).colour(colour).endVertex();
+    }
+
+    public static void loadQuad(SimpleBufferBuilder bb, float x0, float x1, float y0, float y1, float u0, float u1, float v0, float v1) {
+        bb.pos(x0, y0).tex(u0, v0).endVertex();
+        bb.pos(x1, y0).tex(u1, v0).endVertex();
+        bb.pos(x0, y1).tex(u0, v1).endVertex();
+        bb.pos(x1, y1).tex(u1, v1).endVertex();
+    }
+}

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

@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import net.minecraftforge.fml.loading.progress.Message;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
+import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.lwjgl.opengl.GL32C.*;
+
+public class RenderElement {
+    static final int INDEX_TEXTURE_OFFSET = 5;
+    private final SimpleBufferBuilder bb;
+    private final Renderer renderer;
+    static int globalAlpha = 255;
+    private int retireCount;
+
+    interface Renderer {
+
+        void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
+
+        default Renderer then(Renderer r) {
+            if (r == null) return this;
+            return (bb, ctx, frame) -> {
+                r.accept(bb, ctx, frame);
+                this.accept(bb, ctx, frame);
+            };
+        }
+    }
+    @FunctionalInterface
+    interface TextureRenderer {
+        void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
+    }
+    @FunctionalInterface
+    interface Initializer extends Supplier<Renderer> {}
+
+    @FunctionalInterface
+    interface TextGenerator {
+        void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx);
+    }
+
+    public record DisplayContext(int width, int height, int scale, ElementShader elementShader, ColourScheme colourScheme, PerformanceInfo performance) {
+        public int scaledWidth() {
+            return scale() * width();
+        }
+
+        public int scaledHeight() {
+            return scale() * height();
+        }
+    }
+
+    public RenderElement(final Initializer rendererInitializer) {
+        this.bb = new SimpleBufferBuilder(1);
+        this.renderer = rendererInitializer.get();
+    }
+
+    public boolean render(DisplayContext ctx, int count) {
+        this.renderer.accept(bb, ctx, count);
+        return this.retireCount == 0 || this.retireCount < count;
+    }
+
+    public void retire(final int frame) {
+        this.retireCount = frame;
+    }
+
+    private static void startupLogMessages(SimpleBufferBuilder bb, SimpleFont font, DisplayContext context) {
+        List<StartupNotificationManager.AgeMessage> messages = StartupNotificationManager.getMessages();
+        List<SimpleFont.DisplayText> texts = new ArrayList<>();
+        for (int i = messages.size() - 1; i >= 0; i--) {
+            final StartupNotificationManager.AgeMessage pair = messages.get(i);
+            final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
+            if (fade <0.01f) continue;
+            Message msg = pair.message();
+            int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
+            texts.add(new SimpleFont.DisplayText(msg.getText()+"\n", colour));
+        }
+
+        font.generateVerticesForTexts(10, context.scaledHeight() -  texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
+    }
+    public static RenderElement monag() {
+        return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
+            var size = 256;
+            var x0 = (ctx.width() - 2 * size) / 2;
+            var y0 = 64;
+            QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
+            QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
+        }));
+
+    }
+
+    public static RenderElement mojang(final int textureId, final int frameStart) {
+        return new RenderElement(()->(bb, ctx, frame) -> {
+            var size = 256 * ctx.scale();
+            var x0 = (ctx.scaledWidth() - 2 * size) / 2;
+            var y0 = 64 * ctx.scale() + 32;
+            ctx.elementShader().updateTextureUniform(0);
+            ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
+            var fade = Math.min((frame - frameStart) * 10, 255);
+            glBindTexture(GL_TEXTURE_2D, textureId);
+            bb.begin(SimpleBufferBuilder.Format.POS_TEX_COLOR, SimpleBufferBuilder.Mode.QUADS);
+            QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, (fade << 24) | 0xFFFFFF);
+            QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, (fade << 24) | 0xFFFFFF);
+            bb.draw();
+            glBindTexture(GL_TEXTURE_2D, 0);
+        });
+    }
+    public static RenderElement logMessageOverlay(SimpleFont font) {
+        return new RenderElement(RenderElement.initializeText(font, RenderElement::startupLogMessages));
+    }
+
+    public static RenderElement forgeVersionOverlay(SimpleFont font, String version) {
+        return new RenderElement(RenderElement.initializeText(font, (bb, fnt, ctx)->
+                font.generateVerticesForTexts(ctx.scaledWidth() - font.stringWidth(version) - 10,
+                        ctx.scaledHeight() - font.lineSpacing() + font.descent() - 10, bb,
+                        new SimpleFont.DisplayText(version, ctx.colourScheme.foreground().packedint(RenderElement.globalAlpha)))));
+    }
+    public static RenderElement squir() {
+        return new RenderElement(RenderElement.initializeTexture("squirrel.png", 45000, 3, (bb, context, size, frame) -> {
+            var inset = 5f;
+            var x0 = inset;
+            var x1 = inset + size[0] * context.scale();
+            var y0 = inset;
+            var y1 = inset + size[1] * context.scale();
+            int fade = (int) (Math.cos(frame * Math.PI / 16) * 16) + 16;
+//            int fade = 0xff;
+            var colour = (Math.min(fade, globalAlpha) & 0xff) << 24 | 0xffffff;
+            QuadHelper.loadQuad(bb, x0, x1, y0, y1, 0f, 1f, 0f, 1f, colour);
+        }));
+    }
+
+    public static RenderElement anvil(SimpleFont font) {
+        return new RenderElement(RenderElement.initializeTexture("forge_anvil.png", 20000, 2, (bb, context, size, frame) -> {
+            var x0 = context.scaledWidth() - size[0] * context.scale();
+            var x1 = context.scaledWidth();
+            var y0 = context.scaledHeight() - size[0] * context.scale() - font.descent() - font.lineSpacing();
+            var y1 = context.scaledHeight() - font.descent() - font.lineSpacing();
+            int frameidx = frame % 32;
+            float framepos = (frameidx * (float)size[0]) / size[1];
+            float framesize = size[0] / (float)size[1];
+            QuadHelper.loadQuad(bb, x0, x1, y0, y1, 0f, 1f, framepos, framepos+framesize, globalAlpha << 24 | 0xFFFFFF);
+        }));
+    }
+    public static RenderElement progressBars(SimpleFont font) {
+        return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
+    }
+
+    public static RenderElement performanceBar(SimpleFont font) {
+        return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
+    }
+
+    public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
+        Renderer acc = null;
+        var barCount = 2;
+        List<ProgressMeter> currentProgress = StartupNotificationManager.getCurrentProgress();
+        var size = currentProgress.size();
+        var alpha = 0xFF;
+        for (int i = 0; i < barCount && i < size; i++) {
+            final ProgressMeter pm = currentProgress.get(i);
+            Renderer barRenderer = barRenderer(i, alpha, font, pm, context);
+            acc = barRenderer.then(acc);
+            alpha >>= 1;
+        }
+        if (acc != null)
+            acc.accept(buffer, context, frameNumber);
+    }
+    private static final int BAR_HEIGHT = 20;
+    private static final int BAR_WIDTH = 400;
+    private static Renderer barRenderer(int cnt, int alpha, SimpleFont font, ProgressMeter pm, DisplayContext context) {
+        var barSpacing = font.lineSpacing() - font.descent() + BAR_HEIGHT;
+        var y = 250 * context.scale() + cnt * barSpacing;
+        var colour = (alpha << 24) | 0xFFFFFF;
+        Renderer bar;
+        if (pm.steps() == 0) {
+            bar = progressBar(ctx->new int[] {(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, f->colour, frame -> indeterminateBar(frame, cnt == 0));
+        } else {
+            bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, f -> colour, f -> new float[]{0f, pm.progress()});
+        }
+        Renderer label = (bb, ctx, frame) -> renderText(font, text((ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, pm.label().getText(), colour), bb, ctx);
+        return bar.then(label);
+    }
+    private static float[] indeterminateBar(int frame, boolean isActive) {
+        if (RenderElement.globalAlpha != 0xFF || !isActive) {
+            return new float[] {0f,1f};
+        } else {
+            var progress = frame % 100;
+            return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
+        }
+    }
+
+    private static void memoryInfo(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
+        var y = 10 * context.scale();
+        PerformanceInfo pi = context.performance();
+        final int colour = hsvToRGB((1.0f - (float)Math.pow(pi.memory(), 1.5f)) / 3f, 1.0f, 0.5f);
+        var bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, BAR_WIDTH * ctx.scale()}, f -> colour, f -> new float[]{0f, pi.memory()});
+        var width = font.stringWidth(pi.text());
+        Renderer label = (bb, ctx, frame) -> renderText(font, text(ctx.scaledWidth() / 2 - width / 2, y + 18, pi.text(), context.colourScheme.foreground().packedint(globalAlpha)), bb, ctx);
+        bar.then(label).accept(buffer, context, frameNumber);
+    }
+
+    @FunctionalInterface
+    interface ColourFunction {
+        int colour(int frame);
+    }
+
+    @FunctionalInterface
+    interface ProgressDisplay {
+        float[] progress(int frame);
+    }
+
+    @FunctionalInterface
+    interface BarPosition {
+        int[] location(DisplayContext context);
+    }
+    public static Renderer progressBar(BarPosition position, ColourFunction colourFunction, ProgressDisplay progressDisplay) {
+        return (bb, context, frame) -> {
+            var colour = colourFunction.colour(frame);
+            var alpha = (colour & 0xFF000000) >> 24;
+            context.elementShader().updateTextureUniform(0);
+            context.elementShader().updateRenderTypeUniform(ElementShader.RenderType.BAR);
+            var progress = progressDisplay.progress(frame);
+            bb.begin(SimpleBufferBuilder.Format.POS_TEX_COLOR, SimpleBufferBuilder.Mode.QUADS);
+            var inset = 2;
+            var pos = position.location(context);
+            var x0 = pos[0];
+            var x1 = pos[0] + pos[2] + 4 * inset;
+            var y0 = pos[1];
+            var y1 = y0 + BAR_HEIGHT;
+            QuadHelper.loadQuad(bb, x0, x1, y0, y1, 0f, 0f, 0f, 0f, context.colourScheme().foreground().packedint(alpha));
+
+            x0 += inset;
+            x1 -= inset;
+            y0 += inset;
+            y1 -= inset;
+            QuadHelper.loadQuad(bb, x0, x1, y0, y1, 0f, 0f, 0f, 0f, context.colourScheme().background().packedint(RenderElement.globalAlpha));
+
+            x1 = x0 + inset + (int)(progress[1] * pos[2]);
+            x0 += inset + progress[0] * pos[2];
+            y0 += inset;
+            y1 -= inset;
+            QuadHelper.loadQuad(bb, x0, x1, y0, y1, 0f, 0f, 0f, 0f, colour);
+            bb.draw();
+        };
+    }
+
+    private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
+        return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
+    }
+
+    private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
+        context.elementShader().updateTextureUniform(font.textureNumber());
+        context.elementShader().updateRenderTypeUniform(ElementShader.RenderType.FONT);
+        bb.begin(SimpleBufferBuilder.Format.POS_TEX_COLOR, SimpleBufferBuilder.Mode.QUADS);
+        textGenerator.accept(bb, font, context);
+        bb.draw();
+    }
+
+    private static TextGenerator text(int x, int y, String text, int colour) {
+        return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
+    }
+    private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
+        return ()->{
+            int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
+            return (bb, ctx, frame) -> {
+                ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
+                ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
+                renderTexture(bb, ctx, frame, imgSize, positionAndColour);
+            };
+        };
+    }
+
+    private static void renderTexture(SimpleBufferBuilder bb, DisplayContext context, int frame, int[] size, TextureRenderer positionAndColour) {
+        bb.begin(SimpleBufferBuilder.Format.POS_TEX_COLOR, SimpleBufferBuilder.Mode.QUADS);
+        positionAndColour.accept(bb, context, size, frame);
+        bb.draw();
+    }
+
+
+    public static float clamp(float num, float min, float max) {
+        if (num < min) {
+            return min;
+        } else {
+            return Math.min(num, max);
+        }
+    }
+
+    public static int clamp(int num, int min, int max) {
+        if (num < min) {
+            return min;
+        } else {
+            return Math.min(num, max);
+        }
+    }
+
+    public static int hsvToRGB(float hue, float saturation, float value) {
+        int i = (int)(hue * 6.0F) % 6;
+        float f = hue * 6.0F - (float)i;
+        float f1 = value * (1.0F - saturation);
+        float f2 = value * (1.0F - f * saturation);
+        float f3 = value * (1.0F - (1.0F - f) * saturation);
+        float f4;
+        float f5;
+        float f6;
+        switch(i) {
+            case 0:
+                f4 = value;
+                f5 = f3;
+                f6 = f1;
+                break;
+            case 1:
+                f4 = f2;
+                f5 = value;
+                f6 = f1;
+                break;
+            case 2:
+                f4 = f1;
+                f5 = value;
+                f6 = f3;
+                break;
+            case 3:
+                f4 = f1;
+                f5 = f2;
+                f6 = value;
+                break;
+            case 4:
+                f4 = f3;
+                f5 = f1;
+                f6 = value;
+                break;
+            case 5:
+                f4 = value;
+                f5 = f1;
+                f6 = f2;
+                break;
+            default:
+                throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + hue + ", " + saturation + ", " + value);
+        }
+
+        int j = clamp((int)(f4 * 255.0F), 0, 255);
+        int k = clamp((int)(f5 * 255.0F), 0, 255);
+        int l = clamp((int)(f6 * 255.0F), 0, 255);
+        return 0xFF << 24 | j << 16 | k << 8 | l;
+    }
+}

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.stb.STBImage;
+import org.lwjgl.system.MemoryUtil;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.util.Objects;
+
+import static org.lwjgl.opengl.GL32C.*;
+
+public class STBHelper {
+    public static ByteBuffer readFromClasspath(final String name, int initialCapacity) {
+        ByteBuffer buf;
+        try (var channel = Channels.newChannel(
+                Objects.requireNonNull(STBHelper.class.getClassLoader().getResourceAsStream(name), "The resource "+name+" cannot be found"))) {
+            buf = BufferUtils.createByteBuffer(initialCapacity);
+            while (true) {
+                var readbytes = channel.read(buf);
+                if (readbytes == -1) break;
+                if (buf.remaining() == 0) { // extend the buffer by 50%
+                    var newBuf = BufferUtils.createByteBuffer(buf.capacity() * 3 / 2);
+                    buf.flip();
+                    newBuf.put(buf);
+                    buf = newBuf;
+                }
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        buf.flip();
+        return MemoryUtil.memSlice(buf); // we trim the final buffer to the size of the content
+    }
+
+    public static int[] loadTextureFromClasspath(String file, int size, int textureNumber) {
+        int[] lw = new int[1];
+        int[] lh = new int[1];
+        int[] lc = new int[1];
+        var img = loadImageFromClasspath(file, size, lw, lh, lc);
+        var texid = glGenTextures();
+        glActiveTexture(textureNumber);
+        glBindTexture(GL_TEXTURE_2D, texid);
+//        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+//        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, lw[0], lh[0], 0, GL_RGBA, GL_UNSIGNED_BYTE, img);
+        glActiveTexture(GL_TEXTURE0);
+        MemoryUtil.memFree(img);
+        return new int[] {lw[0], lh[0]};
+    }
+
+    public static ByteBuffer loadImageFromClasspath(String file, int size, int[] width, int[] height, int[] channels) {
+        ByteBuffer buf = STBHelper.readFromClasspath(file, size);
+        return STBImage.stbi_load_from_memory(buf, width, height, channels, 4);
+    }
+}

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

@@ -0,0 +1,517 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import org.lwjgl.system.MemoryUtil;
+
+import java.io.Closeable;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+import static org.lwjgl.opengl.GL32C.*;
+
+/**
+ * A very simple, Mojang inspired BufferBuilder.
+ * <em>This has been customized for 2d rendering such as text and simple planar textures</em>
+ * <p>
+ * Not bound to any specific format, ideally should be held onto for re-use.
+ * <p>
+ * Can be used for 'immediate mode' style rendering using {@link #draw()}, or
+ * upload to external vertex arrays for proper instancing using {@link #finishAndUpload()}.
+ * <p>
+ * This is a Triangles only buffer, all data uploaded is in Triangles.
+ * Quads are converted to triangles using {@code 0, 1, 2, 0, 2, 3}.
+ * <p>
+ * Any given {@link Format} should have its individual {@link Element} components
+ * buffered in the order specified by the {@link Format},
+ * followed by an {@link #endVertex()} call to prepare for the next vertex.
+ * <p>
+ * It is illegal to buffer primitives in any format other than the one specified to
+ * {@link #begin(Format, Mode)}.
+ *
+ * @author covers1624
+ */
+public class SimpleBufferBuilder implements Closeable {
+    
+    private static final MemoryUtil.MemoryAllocator ALLOCATOR = MemoryUtil.getAllocator(false);
+    
+    private static final int[] VERTEX_ARRAYS = new int[Format.values().length];
+    private static final int[] VERTEX_BUFFERS = new int[Format.values().length];
+    private static final int[] VERTEX_BUFFER_LENGTHS = new int[Format.values().length];
+    private static int elementBuffer = 0;
+    private static int elementBufferVertexLength = 0;
+    
+    static {
+        Arrays.fill(VERTEX_ARRAYS, 0);
+        Arrays.fill(VERTEX_BUFFERS, 0);
+        Arrays.fill(VERTEX_BUFFER_LENGTHS, 0);
+    }
+    
+    private long bufferAddr;   // Pointer to the backing buffer.
+    private ByteBuffer buffer; // ByteBuffer view of the backing buffer.
+    
+    private Format format;     // The current format we are buffering.
+    private Mode mode;         // The current mode we are buffering.
+    private boolean building;  // If we are building the buffer.
+    private int elementIndex;  // The current element index we are buffering. if elementIndex == format.types.length, we expect 'endVertex'
+    private int index;         // The current index into the buffer we are writing to.
+    private int vertices;      // The number of complete vertices we have buffered.
+
+    /**
+     * Create a new SimpleBufferBuilder with an initial capacity.
+     * <p>
+     * The buffer will be doubled as required.
+     * <p>
+     * Generally picking a small number, around 128/256 should be a
+     * safe bet. Provided you cache your buffers, it should not mean much overall.
+     *
+     * @param capacity The initial capacity in bytes.
+     */
+    public SimpleBufferBuilder(int capacity) {
+        bufferAddr = ALLOCATOR.malloc(capacity);
+        buffer = MemoryUtil.memByteBuffer(bufferAddr, capacity);
+    }
+    
+    public static void destroy() {
+        glDeleteBuffers(VERTEX_BUFFERS);
+        glDeleteBuffers(elementBuffer);
+        glDeleteVertexArrays(VERTEX_ARRAYS);
+    }
+    
+    private static void ensureElementBufferLength(int vertices) {
+        if (elementBufferVertexLength >= vertices) {
+            return;
+        }
+        
+        // treating it as immutable storage, even though it's not
+        final var newElementBuffer = glGenBuffers();
+        var newElementBufferVertexLength = Math.max(1024, elementBufferVertexLength);
+        while (newElementBufferVertexLength < vertices) {
+            newElementBufferVertexLength *= 2;
+        }
+        
+        final var oldIndexCount = elementBufferVertexLength + elementBufferVertexLength / 2;
+        final var newIndexCount = newElementBufferVertexLength + newElementBufferVertexLength / 2;
+        
+        // allocate new buffer
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, newElementBuffer);
+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, newIndexCount * 4L, GL_STATIC_DRAW);
+        
+        // mapping avoids creating additional CPU copies of the data
+        // unsynchronized is fine because this is a brand-new buffer, and the old contents will be copied in afterward
+        // also can invalidate the whole buffer too, similarly because brand new, don't care what was there before
+        final var mappingOffset = oldIndexCount * 4;
+        final var mappingSize = (newIndexCount - oldIndexCount) * 4;
+        final var mappedBuffer = glMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, mappingOffset, mappingSize, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+
+        if(mappedBuffer == null){
+            throw new NullPointerException("OpenGL buffer mapping failed");
+        }
+        
+        final int quads = newElementBufferVertexLength / 4;
+        final int oldQuads = elementBufferVertexLength / 4;
+        // generate indices for the extension to the buffer
+        for (int i = oldQuads; i < quads; i++) {
+            // Quads are a bit different, we need to emit 2 triangles such that
+            // when combined they make up a single quad.
+            mappedBuffer.putInt(i * 4 + 0).putInt(i * 4 + 1).putInt(i * 4 + 2);
+            mappedBuffer.putInt(i * 4 + 1).putInt(i * 4 + 3).putInt(i * 4 + 2);
+        }
+
+        glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
+
+        if (elementBuffer != 0) {
+            // copy old data from previous element buffer
+            glBindBuffer(GL_COPY_READ_BUFFER, elementBuffer);
+            glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_ELEMENT_ARRAY_BUFFER, 0, 0, mappingOffset);
+            glBindBuffer(GL_COPY_READ_BUFFER, 0);
+        }
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+        
+        glDeleteBuffers(elementBuffer);
+        elementBuffer = newElementBuffer;
+        elementBufferVertexLength = newElementBufferVertexLength;
+    }
+    
+    /**
+     * Start building a new set of vertex data in the
+     * given format and mode.
+     *
+     * @param format The format to start building in.
+     * @param mode   The mode to start building in.
+     */
+    public SimpleBufferBuilder begin(Format format, Mode mode) {
+        if (bufferAddr == MemoryUtil.NULL) {
+            throw new IllegalStateException("Buffer has been freed."); // You already free'd the buffer
+        }
+        if (building) {
+            throw new IllegalStateException("Already building."); // Your already building verticies.
+        }
+        this.format = format;
+        this.mode = mode;
+        building = true;
+        elementIndex = 0;
+        ensureSpace(format.stride);
+        // Rewind ready for new data.
+        buffer.rewind();
+        buffer.limit(buffer.capacity());
+        return this;
+    }
+
+    /**
+     * Buffer a position element.
+     *
+     * @param x The x.
+     * @param y The y.
+     * @param z The z.
+     * @return The same builder.
+     */
+    public SimpleBufferBuilder pos(float x, float y) {
+        if (!building) throw new IllegalStateException("Not building."); // You did not call begin.
+
+        if (elementIndex == format.types.length) throw new IllegalStateException("Expected endVertex"); // we have reached the end of elements to buffer for this vertex, we expected an endVertex call.
+        if (format.types[elementIndex] != Element.POS) throw new IllegalArgumentException("Expected " + format.types[elementIndex]); // You called the wrong method for the format order.
+
+        // Assumes that our POS element specifies the FLOAT data type.
+        buffer.putFloat(index + 0, x);
+        buffer.putFloat(index + 4, y);
+
+        // Increment index for the number of bytes we wrote and increment the element index.
+        index += format.types[elementIndex].width;
+        elementIndex++;
+        return this;
+    }
+
+    /**
+     * Buffer a texture element.
+     *
+     * @param u The u.
+     * @param v The v.
+     * @return The same builder.
+     */
+    public SimpleBufferBuilder tex(float u, float v) {
+        if (!building) throw new IllegalStateException("Not building."); // You did not call begin.
+
+        if (elementIndex == format.types.length) throw new IllegalStateException("Expected endVertex"); // we have reached the end of elements to buffer for this vertex, we expected an endVertex call.
+        if (format.types[elementIndex] != Element.TEX) throw new IllegalArgumentException("Expected " + format.types[elementIndex]); // You called the wrong method for the format order.
+
+        // Assumes our TEX element specifies the FLOAT data type.
+        buffer.putFloat(index + 0, u);
+        buffer.putFloat(index + 4, v);
+
+        // Increment index for the number of bytes we wrote and increment the element index.
+        index += format.types[elementIndex].width;
+        elementIndex++;
+        return this;
+    }
+
+    /**
+     * Buffer a color element.
+     *
+     * @param r The red component. (0-1)
+     * @param g The green component. (0-1)
+     * @param b The blue component. (0-1)
+     * @param a The alpha component. (0-1)
+     * @return The same buffer.
+     */
+    public SimpleBufferBuilder colour(float r, float g, float b, float a) {
+        // Expand floats to 0-255 and forward.
+        return colour((byte) (r * 255F), (byte) (g * 255F), (byte) (b * 255F), (byte) (a * 255F));
+    }
+
+    /**
+     * @see ColourScheme.Colour#packedint(int)
+     * @param packedColor an ABGR packed int
+     * @return the same buffer.
+     */
+    public SimpleBufferBuilder colour(int packedColor) {
+        if (!building) throw new IllegalStateException("Not building."); // You did not call begin.
+
+        if (elementIndex == format.types.length) throw new IllegalStateException("Expected endVertex"); // we have reached the end of elements to buffer for this vertex, we expected an endVertex call.
+        if (format.types[elementIndex] != Element.COLOR) throw new IllegalArgumentException("Expected " + format.types[elementIndex]); // You called the wrong method for the format order.
+
+        // Assumes our COLOR element specifies the UNSIGNED_BYTE data type.
+        buffer.putInt(index + 0, packedColor);
+
+        // Increment index for the number of bytes we wrote and increment the element index.
+        index += format.types[elementIndex].width;
+        elementIndex++;
+        return this;
+    }
+    /**
+     * Buffer a color element.
+     *
+     * @param r The red component. (0-255)
+     * @param g The green component. (0-255)
+     * @param b The blue component. (0-255)
+     * @param a The alpha component. (0-255)
+     * @return The same buffer.
+     */
+    public SimpleBufferBuilder colour(byte r, byte g, byte b, byte a) {
+        if (!building) throw new IllegalStateException("Not building."); // You did not call begin.
+
+        if (elementIndex == format.types.length) throw new IllegalStateException("Expected endVertex"); // we have reached the end of elements to buffer for this vertex, we expected an endVertex call.
+        if (format.types[elementIndex] != Element.COLOR) throw new IllegalArgumentException("Expected " + format.types[elementIndex]); // You called the wrong method for the format order.
+
+        // Assumes our COLOR element specifies the UNSIGNED_BYTE data type.
+        buffer.put(index + 0, r);
+        buffer.put(index + 1, g);
+        buffer.put(index + 2, b);
+        buffer.put(index + 3, a);
+
+        // Increment index for the number of bytes we wrote and increment the element index.
+        index += format.types[elementIndex].width;
+        elementIndex++;
+        return this;
+    }
+
+    /**
+     * End building the current vertex and prepare for the next.
+     *
+     * @return The same builder.
+     */
+    public SimpleBufferBuilder endVertex() {
+        if (!building) throw new IllegalStateException("Not building."); // You did not call begin.
+
+        if (elementIndex != format.types.length) throw new IllegalStateException("Expected " + format.types[elementIndex]); // You did not finish building the vertex.
+
+        // Reset elementIndex
+        elementIndex = 0;
+        // Increment the number of vertices we have so far buffered.
+        vertices++;
+        // Make sure there is space for the next vertex.
+        ensureSpace(format.stride);
+        return this;
+    }
+
+    // Checks there is enough space in the buffer for specified number of bytes.
+    // If there is not enough space, the buffer is increased by 50%.
+    private void ensureSpace(int newBytes) {
+        int cap = buffer.capacity();
+        if (index + newBytes > cap) {
+            int newCap = Math.max(3 * cap / 2, 3 * newBytes / 2);
+            bufferAddr = ALLOCATOR.realloc(bufferAddr, newCap);
+            buffer = MemoryUtil.memByteBuffer(bufferAddr, newCap);
+            buffer.rewind();
+        }
+    }
+
+    /**
+     * Upload the current buffer.
+     * <p>
+     * This will bind a {@link org.lwjgl.opengl.GL32C#GL_ARRAY_BUFFER} and {@link org.lwjgl.opengl.GL32C#GL_ELEMENT_ARRAY_BUFFER}
+     * <p>
+     * The vertex data and index data is uploaded to their respective buffers.
+     * <p>
+     * Uploading the buffers finishes drawing and resets for the next buffer operation.
+     * <p>
+     * This should not be called in conjunction with {@link #draw()}
+     *
+     * @return The number of indexes that were uploaded.
+     */
+    public int finishAndUpload() {
+        if (!building) throw new IllegalStateException("Not building.");
+
+        int indices;
+        try {
+            if (elementIndex == format.types.length) throw new IllegalStateException("Expected endVertex"); // You didn't finish building your vertex.
+            if (elementIndex != 0) throw new IllegalStateException("Not finished building vertex, Expected: " + format.types[elementIndex]); // You didn't finish building your vertex data.
+            if (vertices == 0) return 0; // No vertices buffered, lets not do anything.
+            if (vertices % mode.vertices != 0) throw new IllegalStateException("Does not contain vertices aligned to " + mode); // You did not put in enough vertices to cleanly slice the data into TRIANGLES/QUADS
+
+            // Reset position to 0, limit the buffer to our index.
+            buffer.position(0);
+            buffer.limit(index);
+            
+            // Upload the raw vertex data in dynamic mode.
+            final int vbo = VERTEX_BUFFERS[format.ordinal()];
+            final int vboSize = VERTEX_BUFFER_LENGTHS[format.ordinal()];
+            glBindBuffer(GL_ARRAY_BUFFER, vbo);
+            if (vboSize < index) {
+                // expand buffer, it's not big enough
+                var newVBOSize = Math.max(1024, vboSize);
+                while (newVBOSize < index){
+                    newVBOSize *= 2;
+                }
+                // because everything is overwritten anyway, we can do an in-place reallocation
+                glBufferData(GL_ARRAY_BUFFER, newVBOSize, GL_DYNAMIC_DRAW);
+                VERTEX_BUFFER_LENGTHS[format.ordinal()] = newVBOSize;
+            }
+            glBufferSubData(GL_ARRAY_BUFFER, 0, buffer);
+            
+            // The number of indices for triangles is equal to our vertex count, as that is
+            // what we operate in. However, for Quads, we have exactly vertices + vertices / 2
+            // vertices once we convert the quads to triangles.
+            indices = mode == Mode.TRIANGLES ? vertices : vertices + vertices / 2;
+            
+            if (mode == Mode.QUADS) {
+                ensureElementBufferLength(vertices);
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementBuffer);
+            }
+            
+            return indices;
+        } finally {
+            // Reset builder state for next begin call.
+            building = false;
+            vertices = 0;
+            index = 0;
+        }
+    }
+
+    /**
+     * Upload and draw this buffer using one of a number of re-usable set of buffers.
+     * <p>
+     * This will immediately upload the buffer, resetting this builder for the next
+     * buffer operation, and draw the uploaded data.
+     * <p>
+     * You will need to bind shaders, textures, etc, before calling this function.
+     */
+    public void draw() {
+        if (!building) throw new IllegalStateException("Not building.");
+
+        int vao = VERTEX_ARRAYS[format.ordinal()];
+        int vbo = VERTEX_BUFFERS[format.ordinal()];
+
+        if (vao == 0) {
+            // These 3 buffers are paired, you can't allocate one without the others.
+            assert vbo == 0;
+
+            // Make new vertex array and buffers!
+            vao = glGenVertexArrays();
+            vbo = glGenBuffers();
+            
+            // Cache the vertex array and buffers for future re-use.
+            VERTEX_ARRAYS[format.ordinal()] = vao;
+            VERTEX_BUFFERS[format.ordinal()] = vbo;
+            
+            // Ask our Format to set up its data layout for the vertex array.
+            // but only once, the VAO saves this state
+            glBindVertexArray(vao);
+            glBindBuffer(GL_ARRAY_BUFFER, vbo);
+            format.bind();
+            format.enable();
+        }
+        // Bind the vertex array and buffers!
+        glBindVertexArray(vao);
+        
+        // Upload the data.
+        int indices = finishAndUpload();
+        
+        if (mode == Mode.QUADS) {
+            glDrawElements(GL_TRIANGLES, indices, GL_UNSIGNED_INT, 0);
+        } else {
+            glDrawArrays(GL_TRIANGLES, 0, indices);
+        }
+        
+        // Unbind the vertex array.
+        glBindVertexArray(0);
+    }
+
+    /**
+     * Clear this builder's cached buffer.
+     * <p>
+     * If you are completely done, call {@link #destroy()}
+     */
+    @Override
+    public void close() {
+        ALLOCATOR.free(bufferAddr);
+        bufferAddr = MemoryUtil.NULL;
+    }
+
+    /**
+     * Represents a primitive mode that this builder is capable of buffering in.
+     */
+    public enum Mode {
+        TRIANGLES(3),
+        QUADS(4),
+        ;
+
+        public final int vertices;
+
+        Mode(int vertices) {
+            this.vertices = vertices;
+        }
+    }
+
+    /**
+     * Specifies a vertex element with a specific data type, number of primitives and a size in bytes.
+     */
+    public enum Element {
+        POS(GL_FLOAT, 2, 2 * 4),
+        TEX(GL_FLOAT, 2, 2 * 4),
+        COLOR(GL_UNSIGNED_BYTE, 4, 4);
+
+        public final int glType;
+        public final int count;
+        public final int width;
+
+        Element(int glType, int count, int width) {
+            this.glType = glType;
+            this.count = count;
+            this.width = width;
+        }
+    }
+
+    /**
+     * Specifies a combination of vertex elements.
+     */
+    public enum Format {
+        POS(Element.POS),
+        POS_TEX(Element.POS, Element.TEX),
+        POS_COLOR(Element.POS, Element.COLOR),
+        POS_TEX_COLOR(Element.POS, Element.TEX, Element.COLOR);
+
+        private final Element[] types;
+        public final int stride;
+
+        Format(Element... types) {
+            this.types = types;
+
+            // Stride is the width of each vertex in bytes.
+            stride = Arrays.stream(types).mapToInt(e -> e.width).sum();
+        }
+
+        /**
+         * set up the attribute pointers for this format.
+         * <p>
+         * Assumes that an array buffer is already bound and ready to go.
+         */
+        public void bind() {
+            int offset = 0;
+
+            // Set up the pointers that tell GL where our interleaved
+            // vertex data is in the buffers.
+            for (int i = 0; i < types.length; i++) {
+                Element type = types[i];
+                switch (type.glType) {
+                    case GL_FLOAT -> glVertexAttribPointer(i, type.count, GL_FLOAT, false, stride, offset);
+                    case GL_UNSIGNED_BYTE -> glVertexAttribPointer(i, type.count, GL_UNSIGNED_BYTE, true, stride, offset);
+                    default -> throw new IllegalStateException("Unknown glType, I don't know how to bind this vertex element: " + type);
+                }
+                // add to the offset for the next element.
+                offset += type.width;
+            }
+        }
+
+        /**
+         * Enables the vertex attributes this format contains.
+         */
+        public void enable() {
+            for (int i = 0; i < types.length; i++) {
+                glEnableVertexAttribArray(i);
+            }
+        }
+
+        /**
+         * Disables the vertex attributes this format contains.
+         */
+        public void disable() {
+            for (int i = 0; i < types.length; i++) {
+                glDisableVertexAttribArray(i);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.earlydisplay;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.stb.STBTTAlignedQuad;
+import org.lwjgl.stb.STBTTFontinfo;
+import org.lwjgl.stb.STBTTPackContext;
+import org.lwjgl.stb.STBTTPackRange;
+import org.lwjgl.stb.STBTTPackedchar;
+import org.lwjgl.system.MemoryStack;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+import static org.lwjgl.opengl.GL32C.*;
+import static org.lwjgl.stb.STBTruetype.*;
+import static org.lwjgl.system.MemoryUtil.NULL;
+
+public class SimpleFont {
+    private final int textureNumber;
+    private final int lineSpacing;
+    private final int descent;
+    private final int GLYPH_COUNT = 127-32;
+    private Glyph[] glyphs;
+
+    private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
+        Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
+            final var x0 = pos.x() + pos()[0];
+            final var y0 = pos.y() + pos()[1];
+            final var x1 = pos.x() + pos()[2];
+            final var y1 = pos.y() + pos()[3];
+            bb.pos(x0, y0).tex(uv()[0], uv()[1]).colour(colour).endVertex();
+            bb.pos(x1, y0).tex(uv()[2], uv()[1]).colour(colour).endVertex();
+            bb.pos(x0, y1).tex(uv()[0], uv()[3]).colour(colour).endVertex();
+            bb.pos(x1, y1).tex(uv()[2], uv()[3]).colour(colour).endVertex();
+            return new Pos(pos.x()+charwidth(), pos.y(), pos.minx());
+        }
+    }
+
+    /**
+     * Build the font and store it in the textureNumber location
+     */
+    public SimpleFont(String fontName, int scale, int bufferSize, int textureNumber) {
+        ByteBuffer buf = STBHelper.readFromClasspath(fontName, bufferSize);
+        var info = STBTTFontinfo.create();
+        if (!stbtt_InitFont(info, buf)) {
+            throw new IllegalStateException("Bad font");
+        }
+
+        var ascent = new float[1];
+        var descent = new float[1];
+        var lineGap = new float[1];
+        int fontSize = 24;
+        stbtt_GetScaledFontVMetrics(buf, 0, fontSize, ascent, descent, lineGap);
+        this.lineSpacing = (int)(ascent[0] - descent[0] + lineGap[0]);
+        this.descent = (int)Math.floor(descent[0]);
+        int fontTextureId = glGenTextures();
+        glActiveTexture(GL_TEXTURE0+textureNumber);
+        this.textureNumber = textureNumber;
+        glBindTexture(GL_TEXTURE_2D, fontTextureId);
+        try (var packedchars = STBTTPackedchar.malloc(GLYPH_COUNT)) {
+            int texwidth = 256;
+            int texheight = 128;
+            try (STBTTPackRange.Buffer packRanges = STBTTPackRange.malloc(1)) {
+                var bitmap = BufferUtils.createByteBuffer(texwidth * texheight);
+                try (STBTTPackRange packRange = STBTTPackRange.malloc()) {
+                    packRanges.put(packRange.set(fontSize, 32, null, GLYPH_COUNT, packedchars, (byte) 1, (byte) 1));
+                    packRanges.flip();
+                }
+
+                try (STBTTPackContext pc = STBTTPackContext.malloc()) {
+                    stbtt_PackBegin(pc, bitmap, texwidth, texheight, 0, 1, NULL);
+                    stbtt_PackSetOversampling(pc, 1, 1);
+                    stbtt_PackSetSkipMissingCodepoints(pc, true);
+                    stbtt_PackFontRanges(pc, buf, 0, packRanges);
+                    stbtt_PackEnd(pc);
+                    glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, texwidth, texheight, 0, GL_RED, GL_UNSIGNED_BYTE, bitmap);
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                }
+            }
+            glActiveTexture(GL_TEXTURE0);
+            try (var q = STBTTAlignedQuad.malloc()) {
+                float[] x = new float[1];
+                float[] y = new float[1];
+                glyphs = new Glyph[GLYPH_COUNT];
+
+                for (int i = 0; i < GLYPH_COUNT; i++) {
+                    x[0] = 0f;
+                    y[0] = fontSize;
+                    stbtt_GetPackedQuad(packedchars, texwidth, texheight, i, x, y, q, true);
+                    glyphs[i] = new Glyph((char) (i + 32), (int) (x[0] - 0f), new int[]{(int) q.x0(), (int) q.y0(), (int) q.x1(), (int) q.y1()}, new float[]{q.s0(), q.t0(), q.s1(), q.t1()});
+                }
+            }
+        }
+    }
+
+    int lineSpacing() {
+        return lineSpacing;
+    }
+
+    int textureNumber() {
+        return textureNumber;
+    }
+
+    int descent() {
+        return descent;
+    }
+
+    public int stringWidth(String text) {
+        var bytes = text.getBytes(StandardCharsets.US_ASCII);
+        int len = 0;
+        for (int i = 0; i < bytes.length; i++) {
+            final byte c = bytes[i];
+            len += switch (c) {
+                case '\n', '\t' -> 0;
+                case ' ' -> glyphs[0].charwidth();
+                default -> {
+                    if (c - 32 < this.GLYPH_COUNT && c > 32) {
+                        yield this.glyphs[c - 32].charwidth();
+                    } else {
+                        yield 0;
+                    }
+                }
+            };
+        }
+        return len;
+    }
+    private record Pos(int x, int y, int minx) {}
+
+    /**
+     * A piece of text to display
+     *
+     * @param string The text
+     * @param colour The colour of the text as an RGBA packed int
+     */
+    public record DisplayText(String string, int colour) {
+        private byte[] asBytes() {
+            return string.getBytes(StandardCharsets.US_ASCII);
+        }
+
+        Pos generateStringArray(SimpleFont font, Pos pos, SimpleBufferBuilder bb) {
+            for (int i = 0; i < asBytes().length; i++) {
+                byte c = asBytes()[i];
+                pos = switch (c) {
+                    case '\n' -> new Pos(pos.minx(), pos.y()+font.lineSpacing(), pos.minx());
+                    case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
+                    case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
+                    default -> {
+                        if (c-32 < font.GLYPH_COUNT && c > 32) {
+                            pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
+                        }
+                        yield pos;
+                    }
+                };
+            }
+            return pos;
+        }
+    }
+
+    /**
+     * Generate vertices for a set of display texts
+     * @param x The starting screen x coordinate
+     * @param y The starting screen y coordinate
+     * @param texts Some {@link DisplayText} to display
+     * @return a {@link SimpleBufferBuilder} that can draw the texts
+     */
+    public SimpleBufferBuilder generateVerticesForTexts(int x, int y, SimpleBufferBuilder textBB, DisplayText... texts) {
+        var pos = new Pos(x, y, x);
+        for (DisplayText text : texts) {
+            pos = text.generateStringArray(this, pos, textBB);
+        }
+        return textBB;
+    }
+
+}

fmlearlydisplay/src/main/resources/META-INF/services/net.minecraftforge.fml.loading.ImmediateWindowProvider

@@ -0,0 +1 @@
+net.minecraftforge.fml.earlydisplay.DisplayWindow

fmlearlydisplay/src/main/resources/glfailure.txt

@@ -0,0 +1,13 @@
+█▀▀▀▀▀█ ▀▄▄▄▀█  █ █▀▀▀▀▀█
+█ ███ █ ███ ▀███▀ █ ███ █
+█ ▀▀▀ █ ▀ ▄ ███▀█ █ ▀▀▀ █
+▀▀▀▀▀▀▀ ▀ █ ▀ ▀▄█ ▀▀▀▀▀▀▀
+█▀█▀▄▄▀▄▀ █▄▀▄ ▀▀▀ ▄▀▀▀▄▀
+▄█▄▄  ▀▀███▀██▄  █▀ ▀▄▄
+▀█▄▀ ▀▀▄▄▀▀ █▀█▄▄████ ▀▀█
+▄▀▀▄▀ ▀▄▀▄█   ▀ ▀▀▀▄█ ▀▀▄
+   ▀ ▀▀ ▄ ▄██▀ ▄█▀▀▀█▀█▀█
+█▀▀▀▀▀█  ▄█▄▄▀▀▄█ ▀ █ ▀▀▀
+█ ███ █ ▄▄ ▄  █ ▀██▀██▄██
+█ ▀▀▀ █ ██▄███▀█  █ █ █▀
+▀▀▀▀▀▀▀ ▀▀  ▀▀▀  ▀▀▀▀▀▀▀▀

fmlloader/build.gradle

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

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

@@ -56,6 +56,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
         return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
     }
 
+    @SuppressWarnings("unused")
     private String getValue(List<AnnotationNode> lst)
     {
         AnnotationNode ann = lst.stream().filter(n -> n.desc.equals(OBJECT_HOLDER)).findFirst().get();

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

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

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

@@ -11,9 +11,10 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 public class BackgroundWaiter {
-    private static ExecutorService runner = Executors.newSingleThreadExecutor();
+    private static final ExecutorService runner = Executors.newSingleThreadExecutor();
 
     public static void runAndTick(Runnable r, Runnable tick) {
+        ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
         final Future<?> work = runner.submit(r);
         do {
             tick.run();

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

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

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

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

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

@@ -5,6 +5,7 @@
 
 package net.minecraftforge.fml.loading;
 
+import com.electronwill.nightconfig.core.CommentedConfig;
 import com.electronwill.nightconfig.core.ConfigSpec;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.electronwill.nightconfig.core.file.FileNotFoundAction;
@@ -15,21 +16,80 @@ import org.slf4j.Logger;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.Objects;
+import java.util.function.Function;
 
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 public class FMLConfig
 {
+    public enum ConfigValue {
+        EARLY_WINDOW_CONTROL("earlyWindowControl", Boolean.TRUE, "Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them."),
+        MAX_THREADS("maxThreads", -1, "Max threads for early initialization parallelism,  -1 is based on processor count", FMLConfig::maxThreads),
+        VERSION_CHECK("versionCheck", Boolean.TRUE, "Enable forge global version checking"),
+        DEFAULT_CONFIG_PATH("defaultConfigPath", "defaultconfigs", "Default config path for servers"),
+        DISABLE_OPTIMIZED_DFU("disableOptimizedDFU", Boolean.TRUE, "Disables Optimized DFU client-side - already disabled on servers"),
+        EARLY_WINDOW_PROVIDER("earlyWindowProvider", "fmlearlywindow", "Early window provider"),
+        EARLY_WINDOW_WIDTH("earlyWindowWidth", 854, "Early window width"),
+        EARLY_WINDOW_HEIGHT("earlyWindowHeight", 480, "Early window height"),
+        EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"),
+        EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized"),
+        EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
+        EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
+        EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
+        EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
+        DETECT_NON_FORGE_MODS_TOML("detectNonForgeModsToml", Boolean.TRUE, "Attempt to detect non-Forge mods from their mods.toml to show a friendlier error message. This is a best-effort feature - disable if it causes issues."),
+        ;
+
+        private final String entry;
+        private final Object defaultValue;
+        private final String comment;
+        private final Function<Object, Object> entryFunction;
+
+        ConfigValue(final String entry, final Object defaultValue, final String comment) {
+            this(entry, defaultValue, comment, Function.identity());
+        }
+        ConfigValue(final String entry, final Object defaultValue, final String comment, Function<Object, Object> entryFunction) {
+            this.entry = entry;
+            this.defaultValue = defaultValue;
+            this.comment = comment;
+            this.entryFunction = entryFunction;
+        }
+
+        void buildConfigEntry(ConfigSpec spec, CommentedConfig commentedConfig) {
+            if (this.defaultValue instanceof List<?> list) {
+                spec.defineList(this.entry, list, e -> e instanceof String);
+            } else {
+                spec.define(this.entry, this.defaultValue);
+            }
+            commentedConfig.add(this.entry, this.defaultValue);
+            commentedConfig.setComment(this.entry, this.comment);
+        }
+        @SuppressWarnings("unchecked")
+        private <T> T getConfigValue(CommentedFileConfig config) {
+            return (T) this.entryFunction.apply(config.get(this.entry));
+        }
+
+        public <T> void updateValue(final CommentedFileConfig configData, final T value) {
+            configData.set(this.entry, value);
+        }
+    }
+
+    private static Object maxThreads(final Object value) {
+        int val = (Integer)value;
+        if (val <= 0) return Runtime.getRuntime().availableProcessors();
+        else return val;
+    }
+
     private static final Logger LOGGER = LogUtils.getLogger();
-    private static FMLConfig INSTANCE = new FMLConfig();
-    private static ConfigSpec configSpec = new ConfigSpec();
+    private static final FMLConfig INSTANCE = new FMLConfig();
+    private static final ConfigSpec configSpec = new ConfigSpec();
+    private static final CommentedConfig configComments = CommentedConfig.inMemory();
     static {
-        configSpec.define("splashscreen", Boolean.TRUE);
-        configSpec.define("maxThreads", -1);
-        configSpec.define("versionCheck", Boolean.TRUE);
-        configSpec.define("defaultConfigPath",  "defaultconfigs");
-        configSpec.define("disableOptimizedDFU", Boolean.TRUE);
+        for (ConfigValue cv: ConfigValue.values()) {
+            cv.buildConfigEntry(configSpec, configComments);
+        }
     }
 
     private CommentedFileConfig configData;
@@ -38,7 +98,6 @@ public class FMLConfig
     {
         configData = CommentedFileConfig.builder(configFile).sync()
                 .onFileNotFound(FileNotFoundAction.copyData(Objects.requireNonNull(getClass().getResourceAsStream("/META-INF/defaultfmlconfig.toml"))))
-                .autosave().autoreload()
                 .writingMode(WritingMode.REPLACE)
                 .build();
         try
@@ -47,13 +106,14 @@ public class FMLConfig
         }
         catch (ParsingException e)
         {
-            throw new RuntimeException("Failed to load FML config from " + configFile.toString(), e);
+            throw new RuntimeException("Failed to load FML config from " + configFile, e);
         }
         if (!configSpec.isCorrect(configData)) {
             LOGGER.warn(CORE, "Configuration file {} is not correct. Correcting", configFile);
             configSpec.correct(configData, (action, path, incorrectValue, correctedValue) ->
-                    LOGGER.warn(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue));
+                    LOGGER.info(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue));
         }
+        configData.putAllComments(configComments);
         configData.save();
     }
 
@@ -64,33 +124,34 @@ public class FMLConfig
         if (LOGGER.isTraceEnabled(CORE))
         {
             LOGGER.trace(CORE, "Loaded FML config from {}", FMLPaths.FMLCONFIG.get());
-            LOGGER.trace(CORE, "Splash screen is {}", FMLConfig.splashScreenEnabled());
-            LOGGER.trace(CORE, "Max threads for mod loading computed at {}", FMLConfig.loadingThreadCount());
-            LOGGER.trace(CORE, "Version check is {}", FMLConfig.runVersionCheck());
-            LOGGER.trace(CORE, "Default config paths at {}", FMLConfig.defaultConfigPath());
+            for (ConfigValue cv: ConfigValue.values()) {
+                LOGGER.trace(CORE, "FMLConfig {} is {}", cv.entry, cv.getConfigValue(INSTANCE.configData));
+            }
         }
-        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.defaultConfigPath()), "default config directory");
+        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.getConfigValue(ConfigValue.DEFAULT_CONFIG_PATH)));
     }
 
-    public static boolean splashScreenEnabled() {
-        return INSTANCE.configData.<Boolean>getOptional("splashscreen").orElse(Boolean.FALSE);
+    public static String getConfigValue(ConfigValue v) {
+        return v.getConfigValue(INSTANCE.configData);
     }
 
-    public static int loadingThreadCount() {
-        int val = INSTANCE.configData.<Integer>getOptional("maxThreads").orElse(-1);
-        if (val <= 0) return Runtime.getRuntime().availableProcessors();
-        return val;
+    public static boolean getBoolConfigValue(ConfigValue v) {
+        return v.getConfigValue(INSTANCE.configData);
     }
 
-    public static boolean runVersionCheck() {
-        return INSTANCE.configData.<Boolean>getOptional("versionCheck").orElse(Boolean.TRUE);
+    public static int getIntConfigValue(ConfigValue v) {
+        return v.getConfigValue(INSTANCE.configData);
+    }
+
+    public static <A> List<A> getListConfigValue(ConfigValue v) {
+        return v.getConfigValue(INSTANCE.configData);
+    }
+    public static <T> void updateConfig(ConfigValue v, T value) {
+        v.updateValue(INSTANCE.configData, value);
+        INSTANCE.configData.save();
     }
 
     public static String defaultConfigPath() {
-        return INSTANCE.configData.<String>getOptional("defaultConfigPath").orElse("defaultconfigs");
-    }
-
-    public static boolean isOptimizedDFUDisabled() {
-        return INSTANCE.configData.<Boolean>getOptional("disableOptimizedDFU").orElse(Boolean.TRUE);
+        return getConfigValue(ConfigValue.DEFAULT_CONFIG_PATH);
     }
 }

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

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

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

@@ -9,6 +9,8 @@ import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.IEnvironment;
 import org.slf4j.Logger;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -57,9 +59,13 @@ public enum FMLPaths
         for (FMLPaths path : FMLPaths.values())
         {
             path.absolutePath = rootPath.resolve(path.relativePath).toAbsolutePath().normalize();
-            if (path.isDirectory)
+            if (path.isDirectory && !Files.isDirectory(path.absolutePath))
             {
-                FileUtils.getOrCreateDirectory(path.absolutePath, path.name());
+                try {
+                   Files.createDirectories(path.absolutePath);
+                } catch (IOException e) {
+                   throw new RuntimeException(e);
+                }
             }
             if (LOGGER.isDebugEnabled(CORE))
             {
@@ -68,8 +74,18 @@ public enum FMLPaths
         }
     }
 
-    public static Path getOrCreateGameRelativePath(Path path, String name) {
-        return FileUtils.getOrCreateDirectory(FMLPaths.GAMEDIR.get().resolve(path), name);
+    public static Path getOrCreateGameRelativePath(Path path) {
+        Path gameFolderPath = FMLPaths.GAMEDIR.get().resolve(path);
+
+        if (!Files.isDirectory(gameFolderPath)) {
+            try {
+                Files.createDirectories(gameFolderPath);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return gameFolderPath;
     }
 
     public Path relative() {