1.19.4 RB 4

https://forums.minecraftforge.net/topic/154386-forge-454-minecraft-1194/
Cache this.useItem before running item break logic, Fixes #10344 (#10381 )
2026-11-14 01:04:24 +00:00 · 2025-03-04 16:44:50 -05:00 · 2025-03-04 13:39:35 -08:00 · 2025-03-04 13:34:26 -08:00 · 2025-03-04 13:33:54 -08:00 · 2025-02-18 14:09:27 -08:00
756 changed files with 8180 additions and 12282 deletions
@@ -37,9 +37,9 @@ src/generated_test/resources/.cache/
 src/generated_mdk/resources/.cache/

 #Patch rejects
-#/patches-/
-#*.patch.rej
-#/projects/*/rejects/
+/patches-/
+*.patch.rej
+/projects/*/rejects/

 # FML changelog
 changelog.txt
@@ -57,9 +57,6 @@ 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.
 =========================================================================


@@ -5,7 +5,7 @@ import net.minecraftforge.forge.tasks.checks.CheckExcs
 import net.minecraftforge.forge.tasks.checks.CheckPatches
 import net.minecraftforge.forge.tasks.checks.CheckSAS
 import net.minecraftforge.forge.tasks.checks.CheckTask
-import net.minecraftforge.forge.tasks.FixPatchImports
+import net.minecraftforge.forge.tasks.checks.CheckMode

 import java.nio.file.Files
 import java.util.Date
@@ -29,8 +29,8 @@ plugins {
    id 'eclipse'
    id 'idea'
    id 'de.undercouch.download' version '5.4.0'
-    id 'net.minecraftforge.gradle.patcher' version '[6.0.11,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.11,6.2)' apply false
+    id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false
 }

 Util.init() //Init all our extension methods!
@@ -45,19 +45,16 @@ ext {
        ]
    }
    MAPPING_CHANNEL = 'official'
-    MAPPING_VERSION = '1.20.1'
-    MC_VERSION = '1.20.1'
-    MC_NEXT_VERSION = '1.21'
-    MCP_VERSION = '20230612.114412'
-    SNAPSHOT = false
-
-    SPI_VERSION = '7.0.1'
-    MERGETOOL_VERSION = '1.1.5'
+    MAPPING_VERSION = '1.19.4'
+    MC_VERSION = '1.19.4'
+    MC_NEXT_VERSION = '1.20'
+    MCP_VERSION = '20230314.122934'
+    SPI_VERSION = '6.0.0'
    ACCESSTRANSFORMERS_VERSION = '8.0.4'
    COREMODS_VERSION = '5.2.4'
-    EVENTBUS_VERSION = '6.0.5'
-    MODLAUNCHER_VERSION = '10.0.9'
-    SECUREJARHANDLER_VERSION = '2.1.10'
+    EVENTBUS_VERSION = '6.0.3'
+    MODLAUNCHER_VERSION = '10.0.8'
+    SECUREJARHANDLER_VERSION = '2.1.6'
    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
    ASM_VERSION = '9.7.1'
    INSTALLER_VERSION = '2.2.+'
@@ -107,7 +104,7 @@ def extraTxts = [
    rootProject.tasks.createChangelog.outputFile
 ]

-task downloadVersionManifest(type: Download) {
+tasks.register('downloadVersionManifest', Download) {
    src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'
    dest file('build/versions/version_manifest.json')
    useETag 'all'
@@ -211,11 +208,6 @@ subprojects {
            maven gradleutils.getPublishingForgeMaven()
        }
    }
-    
-    tasks.withType(JavaCompile).configureEach {
-        options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-        options.warnings = false // Shutup deprecated for removal warnings
-    }
 }

 project(':mcp') {
@@ -296,11 +288,10 @@ def sharedDeps = {
    installer "net.minecraftforge:coremods:${COREMODS_VERSION}"
    installer "cpw.mods:modlauncher:${MODLAUNCHER_VERSION}"
    installer 'net.minecraftforge:unsafe:0.2.+'
-    installer "net.minecraftforge:mergetool:${MERGETOOL_VERSION}:api"
    installer "com.electronwill.night-config:core:${NIGHTCONFIG_VERSION}"
    installer "com.electronwill.night-config:toml:${NIGHTCONFIG_VERSION}"
    installer "org.apache.maven:maven-artifact:${APACHE_MAVEN_ARTIFACT_VERSION}"
-    installer 'net.jodah:typetools:0.6.3'
+    installer 'net.jodah:typetools:0.8.3'
    installer "net.minecrell:terminalconsoleappender:${TERMINALCONSOLEAPPENDER_VERSION}"
    installer "org.jline:jline-reader:${JLINE_VERSION}"   // Dep of TerminalConsoleAppender
    installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
@@ -308,6 +299,8 @@ def sharedDeps = {
    installer 'org.openjdk.nashorn:nashorn-core:15.4'
    installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
    installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
+    installer 'net.java.dev.jna:jna:5.12.1'
+    installer 'net.java.dev.jna:jna-platform:5.12.1'

    /*
    installer 'org.lwjgl:lwjgl:3.2.2'
@@ -375,6 +368,9 @@ def sharedFmlonlyForge = { Project prj ->
                keyStore = jarsigner.keystore
                inputFile = t.archiveFile.get().asFile
                outputFile = t.archiveFile.get().asFile
+                doFirst {
+                    prj.logger.lifecycle('Signing: ' + inputFile)
+                }
            }
            t.finalizedBy(signTask)
        }
@@ -463,7 +459,7 @@ def sharedFmlonlyForge = { Project prj ->
        // SecureJarHandler bootstrap values.
        run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
        // FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
-        run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar'
+        run.property 'mergeModules', 'jna-5.12.1.jar,jna-platform-5.12.1.jar'
        if (userdevRuns.contains(run)) {
            run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
            run.jvmArgs '-p', '{modules}'
@@ -577,7 +573,7 @@ project(':fmlonly') {

    ext {
        MCP_ARTIFACT = project(':mcp').mcp.config.get()
-        PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':fmlearlydisplay:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar']
+        PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar']
        MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}"
    }

@@ -605,7 +601,6 @@ project(':fmlonly') {
    dependencies {
        implementation project(':fmlcore')
        implementation project(':fmlloader')
-        implementation project(':fmlearlydisplay')
        implementation project(':javafmllanguage')
        implementation project(':lowcodelanguage')
        implementation project(':mclanguage')
@@ -642,7 +637,7 @@ project(':fmlonly') {
    sharedFmlonlyForge.call(project)

    task launcherJson(type: LauncherJson) {
-        packedDependencies = [':fmlloader:jar',':fmlearlydisplay:jar']
+        packedDependencies = [':fmlloader:jar']
        doFirst {
            def fmlonly_client = project(':fmlonly').patcher.runs.fmlonly_client
            json = [
@@ -904,8 +899,7 @@ project(':forge') {
            java {
                srcDirs = [
                    "$rootDir/src/main/java",
-                    "$rootDir/src/fmlcommon/java",
-                    SNAPSHOT ? "$rootDir/src/snapshots/java" : "$rootDir/src/snapshots_disabled/java"
+                    "$rootDir/src/fmlcommon/java"
                ]
            }
            resources {
@@ -940,7 +934,7 @@ project(':forge') {
        // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
        MCP_ARTIFACT = project(':mcp').mcp.config.get()
        VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json')
-        PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':fmlearlydisplay:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar']
+        PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar']
        MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}"
    }

@@ -960,7 +954,6 @@ project(':forge') {
        testImplementation 'org.hamcrest:hamcrest-all:1.3' // needs advanced matching for list order
        implementation project(':fmlcore')
        implementation project(':fmlloader')
-        implementation project(':fmlearlydisplay')
        implementation project(':javafmllanguage')
        implementation project(':lowcodelanguage')
        implementation project(':mclanguage')
@@ -1202,7 +1195,7 @@ project(':forge') {
        output = rootProject.file('build/libraries/')
    }

-    task extractInheritance(type: ExtractInheritance, dependsOn: [downloadLibraries]) {
+    task extractInheritance(type: ExtractInheritance, dependsOn: [genJoinedBinPatches, downloadLibraries]) {
        tool = INSTALLER_TOOLS + ':fatjar'
        args.add '--annotations'
        input = genJoinedBinPatches.cleanJar
@@ -1284,11 +1277,6 @@ project(':forge') {
        ]
    }

-    tasks.register('fixPatchImports', FixPatchImports) {
-        clean.set(rootProject.file('projects/clean/src/main/java'))
-        patched.set(rootProject.file('projects/forge/src/main/java'))
-    }
-
    genPatches {
        finalizedBy checkAndFixPatches
        autoHeader true
@@ -1347,7 +1335,7 @@ project(':forge') {
    }

    task launcherJson(type: LauncherJson) {
-        packedDependencies = [':fmlloader:jar',':fmlearlydisplay:jar']
+        packedDependencies = [':fmlloader:jar']
        doFirst {
            def forge_client = project(':forge').patcher.runs.forge_client
            json = [
@@ -1687,8 +1675,9 @@ project(':forge') {
        }
    }

-    tasks.register('genAllData') {
-        dependsOn 'forge_data', 'forge_mdk_data', 'forge_test_data'
+    reobfJar {
+        tool = FART
+        args = ['--input', '{input}', '--output', '{output}', '--map', '{srg}']
    }

    tasks.eclipse.dependsOn('genEclipseRuns')
@@ -1795,10 +1784,10 @@ project(':forge') {
    }
    // Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
    afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) }
-    
-    // Make sure we run bin compat checking during local testing.
-    if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD)
-        publish.dependsOn(':forge:checkJarCompatibility')
+
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+    }
 }

 //evaluationDependsOnChildren()
@@ -1810,17 +1799,6 @@ task setup() {  //These must be strings so that we can do lazy resolution. Else
    dependsOn ':forge:extractMapped'
 }

-task doChecks {
-    dependsOn ':forge:checkJarCompatibility'
-    dependsOn ':forge:publish'
-}
-
-if (symlinkValid)
-    project.gradle.startParameter.excludedTaskNames.add(':fmlonly:genPatches')
-
-if (!System.env.TEAMCITY_VERSION)
-    project.gradle.startParameter.excludedTaskNames.add(':clean:genPatches')
-
 //Also output FMLOnly when building a version.
 if (System.env.TEAMCITY_VERSION) {
    //Only setup the CI environment if and only if the environment variables are set.
@@ -1,6 +1,6 @@
 repositories {
    maven { url = 'https://maven.minecraftforge.net/' }
-	 mavenCentral()
+	mavenCentral()
 }

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

    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance, IMappingFile mappings) {
-        final data = [] as List<String>
+        final List<String> data = []
        final remapComment = { ATParser.Entry entry ->
            if (!mappings || !entry || !entry.desc) return null
            final comment = entry.comment?.substring(1)?.trim()
@@ -36,7 +36,7 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
        final doFix = getMode().get() === CheckMode.FIX
        final Reporter reporter = new Reporter(doFix)
        check(reporter, doFix)
-
+        
        if (reporter.messages) {
            if (getMode().get() === CheckMode.CHECK) {
                logger.error("Check task '{}' found errors:\n{}", name, reporter.messages.join('\n'))
@@ -103,7 +103,7 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
            def castedTask = task as T
            configuration.setDelegate(castedTask)
            configuration.call(castedTask)
-            castedTask.mode.set(CheckMode.FIX)
+            castedTask.mode.set(CheckMode.CHECK)
            castedTask.group = 'checks'
        }
        tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
@@ -2,8 +2,8 @@

 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.1-&query=$.promos["1.20.1-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.1-&query=$.promos["1.20.1-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19.4-&query=$.promos["1.19.4-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.4-&query=$.promos["1.19.4-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
 )][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon]

 Forge is a free, open-source modding API all of your favourite mods use!
@@ -26,7 +26,7 @@ You can download the installer for the *Recommended Build* or the
 *Latest build* there. Latest builds may have newer features but may be
 more unstable as a result. The installer will attempt to install Forge
 into your vanilla launcher environment, where you can then create a new
- profile using that version and play the game! 
+ profile using that version and play the game!
 
 For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].

@@ -87,9 +87,9 @@ Please ensure you have a valid email address associated with your GitHub account

 [Discord]: https://discord.minecraftforge.net/

-[Documentation]: https://docs.minecraftforge.net/en/1.20.1/
-[Getting-Started]: https://docs.minecraftforge.net/en/1.20.1/gettingstarted/
-[ForgeDev]: https://docs.minecraftforge.net/en/1.20.1/forgedev/
-[Pull-Requests]: https://docs.minecraftforge.net/en/1.20.1/forgedev/#making-changes-and-pull-requests
+[Documentation]: https://docs.minecraftforge.net/en/1.19.x/
+[Getting-Started]: https://docs.minecraftforge.net/en/1.19.x/gettingstarted/
+[ForgeDev]: https://docs.minecraftforge.net/en/1.19.x/forgedev/
+[Pull-Requests]: https://docs.minecraftforge.net/en/1.19.x/forgedev/#making-changes-and-pull-requests

 [Patreon]: https://www.patreon.com/LexManos
@@ -44,7 +44,6 @@ ext {
 }

 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
    MANIFESTS.each { pkg, values ->
        if (pkg == '')
            manifest.attributes(values)
@@ -13,9 +13,6 @@ import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;

-/**
- * Used to allow access to certain things from the game layer
- */
 public class Bindings {
    private Bindings() {}

@@ -66,7 +66,7 @@ public class DeferredWorkQueue
                    timer,
                    aggregate
            );
-            throw aggregate;
+            //TODO 1.20: throw aggregate exception
        } else {
            LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
        }
@@ -7,14 +7,12 @@ 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,
@@ -46,33 +44,25 @@ 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, ProgressMeter, Function, Function)
+     * @see #buildTransition(Executor, Executor, Function, Function)
     */
    Optional<Consumer<ModList>> inlineRunnable();

    /**
     * Builds the transition task for this state with a blank pre-sync and post-sync task.
     *
-     * @param <T>              a type of event fired on the mod-specific event bus
-     * @param syncExecutor     a synchronous executor
+     * @param syncExecutor a synchronous executor
     * @param parallelExecutor a parallel executor
-     * @param progressBar      a progress meter for tracking progress
+     * @param <T> a type of event fired on the mod-specific event bus
     * @return a transition task for this state
-     * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
+     * @see #buildTransition(Executor, Executor, Function, Function)
     */
    default <T extends Event & IModBusEvent>
    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final ProgressMeter progressBar) {
-        return buildTransition(syncExecutor, parallelExecutor, progressBar,
+                                                      final Executor parallelExecutor) {
+        return buildTransition(syncExecutor, parallelExecutor,
                e -> CompletableFuture.runAsync(() -> {}, e),
                e -> CompletableFuture.runAsync(() -> {}, e));
    }
@@ -81,18 +71,16 @@ public interface IModLoadingState {
     * Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
     * to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
     *
-     * @param <T>              a type of event fired on the mod-specific event bus
-     * @param syncExecutor     a synchronous executor
+     * @param syncExecutor a synchronous executor
     * @param parallelExecutor a parallel executor
-     * @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
+     * @param preSyncTask a function which returns a task to run before event pre-dispatch hook
+     * @param postSyncTask a function which returns a task to run after event post-dispatch hook
+     * @param <T> a type of event fired on the mod-specific event bus
     * @return a transition task for this state
     */
    <T extends Event & IModBusEvent>
    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
                                                      final Executor parallelExecutor,
-                                                      final ProgressMeter progressBar,
                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask);
 }
@@ -7,7 +7,6 @@ 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;
@@ -25,26 +24,20 @@ public interface IModStateTransition {
    }

    default <T extends Event & IModBusEvent>
-    CompletableFuture<Void> build(final String name,
-                                  final Executor syncExecutor,
+    CompletableFuture<Void> build(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, progressBar, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
+                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, head, ModLoadingStage::currentState, tail))
+                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, last, nextModLoadingStage(), null));

        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
        final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
        final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
-                .thenApplyAsync(n -> {
-                    progressBar.label(progressBar.name() + ": dispatching "+name);
-                    return null;
-                }, parallelExecutor)
                .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
                .thenApply(r -> {
                    postSyncTask.apply(syncExecutor);
@@ -61,7 +54,6 @@ 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) {
@@ -70,7 +62,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, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
+        completableFutures.add(ModList.get().futureVisitor(eventGenerator, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));

        var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
        completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
@@ -10,7 +10,6 @@ import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
 import net.minecraftforge.forgespi.language.IModInfo;

 import java.util.EnumMap;
@@ -117,7 +116,6 @@ 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
@@ -128,7 +126,6 @@ public abstract class ModContainer
                }, executor)
                .whenComplete((mc, exception) -> {
                    target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
-                    progressBar.increment();
                    ModLoadingContext.get().setActiveContainer(null);
                });
    }
@@ -7,7 +7,6 @@ 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;
@@ -115,11 +114,10 @@ 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, progressBar, stateChange, executor))
+                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, stateChange, executor))
                .collect(Collectors.toList()))
            .thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
    }
@@ -10,13 +10,11 @@ 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.ProgressMeter;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
 import net.minecraftforge.forgespi.locating.ForgeFeature;
@@ -83,7 +81,7 @@ public class ModLoader
    private final ModStateManager stateManager;
    private boolean loadingStateValid;
    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
+    private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
    private final Set<IModLoadingState> completedStates = new HashSet<>();
    private ModList modList;

@@ -135,19 +133,20 @@ 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("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
-        ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
+        ForgeFeature.registerFeature("java_version", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.SERVER, System.getProperty("java.version")));
        loadingStateValid = true;
+        statusConsumer.ifPresent(c->c.accept("Waiting for scan to complete"));
        FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
+        statusConsumer.ifPresent(c->c.accept("Loading mods"));
        final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
                loadingModList.getMods());
        if (!this.loadingExceptions.isEmpty()) {
            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
-            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)
@@ -155,15 +154,15 @@ public class ModLoader
                .toList();

        if (!failedBounds.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
+            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods");
            modList.setLoadedMods(Collections.emptyList());
            loadingStateValid = false;
            throw new LoadingFailedException(failedBounds.stream()
-                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
+                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb.featureName(), fb.featureBound(), ForgeFeature.featureValue(fb)))
                    .toList());
        }

+        statusConsumer.ifPresent(c->c.accept("Building Mod List"));
        final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
                .map(ModFileInfo::getFile)
                .map(this::buildMods)
@@ -171,54 +170,51 @@ 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;
-        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();
+        statusConsumer.ifPresent(c->c.accept("Dispatching gathering events"));
+        stateManager.getStates(ModLoadingPhase.GATHER).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
+        statusConsumer.ifPresent(c->c.accept("Gathering phase complete"));
    }

    public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        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();
+        statusConsumer.ifPresent(c->c.accept("Performing load phase"));
+        stateManager.getStates(ModLoadingPhase.LOAD).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
+        statusConsumer.ifPresent(c->c.accept("Mod setup complete"));
    }

    public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        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("Performing completion phase"));
+        stateManager.getStates(ModLoadingPhase.COMPLETE).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
        statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
-        progress.complete();
    }

-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
+    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker) {
        if (!isLoadingStateValid()) {
            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
            return;
        }
-        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));
+        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
+        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
+        state.buildTransition(syncExecutor, parallelExecutor).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
        completedStates.add(state);
    }

-    private void 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 dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
+        if (!isLoadingStateValid()) {
+            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
+            return;
+        }
+        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
+        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
+        state.buildTransition(syncExecutor, parallelExecutor, preSyncTask, postSyncTask).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        completedStates.add(state);
    }
+
    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
        while (!transition.isDone()) {
            syncExecutor.drive(ticker);
@@ -233,7 +229,6 @@ public class ModLoader
                    .collect(Collectors.toList());
            if (!notModLoading.isEmpty()) {
                LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
                throw e;
            }

@@ -242,7 +237,6 @@ 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);
        }
    }
@@ -7,14 +7,12 @@ 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.
@@ -28,7 +26,6 @@ import java.util.function.ToIntFunction;
 */
 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 {
@@ -36,10 +33,9 @@ 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(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
+        return transition.map(t -> t.build(syncExecutor, parallelExecutor, preSyncTask, postSyncTask));
    }

    /**
@@ -51,7 +47,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 -> "", f->0, phase, Optional.empty(), Optional.empty());
+        return new ModLoadingState(name, previous, ml -> "", phase, Optional.empty(), Optional.empty());
    }

    /**
@@ -66,7 +62,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, ModList::size, phase, Optional.empty(), Optional.of(transition));
+        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, phase, Optional.empty(), Optional.of(transition));
    }

    /**
@@ -82,7 +78,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, ModList::size, phase, Optional.empty(), Optional.of(transition));
+        return new ModLoadingState(name, previous, message, phase, Optional.empty(), Optional.of(transition));
    }

    /**
@@ -97,6 +93,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, ml->0, phase, Optional.of(inline), Optional.empty());
+        return new ModLoadingState(name, previous, ml -> "Processing work " + name, phase, Optional.of(inline), Optional.empty());
    }
 }
@@ -23,9 +23,8 @@ public class ModWorkManager {

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

 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) {
-        StartupNotificationManager.addModMessage(message);
+        net.minecraftforge.fml.loading.progress.StartupMessageManager.addModMessage(message);
    }

    public static Optional<Consumer<String>> modLoaderConsumer() {
-        return StartupNotificationManager.modLoaderConsumer();
+        return net.minecraftforge.fml.loading.progress.StartupMessageManager.modLoaderConsumer();
    }

    public static Optional<Consumer<String>> 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);
+        return net.minecraftforge.fml.loading.progress.StartupMessageManager.mcLoaderConsumer();
    }
 }
@@ -107,7 +107,7 @@ public class VersionChecker
            @Override
            public void run()
            {
-                if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK))
+                if (!FMLConfig.runVersionCheck())
                {
                    LOGGER.info("Global Forge version check system disabled, no further processing.");
                    return;
@@ -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.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
+    private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.defaultConfigPath());

    public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
        return (c) -> {
@@ -1,93 +0,0 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.7' apply false
-    id 'org.cadixdev.licenser'
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
-
-import org.gradle.internal.os.OperatingSystem
-
-switch (OperatingSystem.current()) {
-	case OperatingSystem.LINUX:
-		project.ext.lwjglNatives = "natives-linux"
-		break
-	case OperatingSystem.MAC_OS:
-		project.ext.lwjglNatives = "natives-macos"
-		break
-	case OperatingSystem.WINDOWS:
-		project.ext.lwjglNatives = "natives-windows"
-		break
-}
-
-
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
-
-java.withSourcesJar()
-
-dependencies {
-    compileOnly('org.jetbrains:annotations:23.0.0')
-    implementation(project(':fmlloader'))
-    implementation(project(':fmlcore'))
-    implementation('org.lwjgl:lwjgl:3.3.1')
-    implementation('org.lwjgl:lwjgl-glfw:3.3.1')
-    implementation('org.lwjgl:lwjgl-opengl:3.3.1')
-    implementation('org.lwjgl:lwjgl-stb:3.3.1')
-    implementation('org.lwjgl:lwjgl-tinyfd:3.3.1')
-    implementation('org.slf4j:slf4j-api:1.8.0-beta4')
-    implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
-    testImplementation('org.powermock:powermock-core:2.0.9')
-    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.8.2')
-    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")
-}
-
-test {
-    useJUnitPlatform()
-}
-
-ext {
-    MANIFESTS = [
-        '': [
-            'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-            'Git-Commit': GIT_INFO.abbreviatedId,
-            'Git-Branch': GIT_INFO.branch,
-            'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}",
-        ] as LinkedHashMap,
-        'net/minecraftforge/fml/earlydisplay/': [
-            'Specification-Title':      'FMLEarlyDisplay',
-            'Specification-Vendor':     'Forge Development LLC',
-            'Specification-Version':    '1',
-            'Implementation-Title':     'FML Early Display',
-            'Implementation-Version':   '1.0',
-            'Implementation-Vendor':    'Forge'
-        ] as LinkedHashMap
-    ]
-}
-
-jar.doFirst {
-    MANIFESTS.each { pkg, values ->
-        if (pkg == '')
-            manifest.attributes(values)
-        else
-            manifest.attributes(values, pkg)
-    }
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:unchecked'
-}
-
-license {
-    header = rootProject.file('LICENSE-header.txt')
-    include 'net/minecraftforge/'
-}
-
-publishing.publications.mavenJava(MavenPublication) {
-    from components.java
-}
@@ -1,43 +0,0 @@
-/*
- * 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);
-        }
-    }
-}
@@ -1,645 +0,0 @@
-/*
- * 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) {
-        final OptionParser parser = new OptionParser();
-        var mcversionopt = parser.accepts("fml.mcVersion").withRequiredArg().ofType(String.class);
-        var forgeversionopt = parser.accepts("fml.forgeVersion").withRequiredArg().ofType(String.class);
-        var widthopt = parser.accepts("width")
-                .withRequiredArg().ofType(Integer.class)
-                .defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH));
-        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);
-
-        var forgeVersion = parsed.valueOf(forgeversionopt);
-        StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading "+ forgeVersion));
-        performanceInfo = new PerformanceInfo();
-        return start(parsed.valueOf(mcversionopt), forgeVersion);
-    }
-
-    private static final long MINFRAMETIME = TimeUnit.MILLISECONDS.toNanos(10); // This is the FPS cap on the window - note animation is capped at 20FPS via the tickTimer
-    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.split("-")[0]),
-                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.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.getMethods()).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();
-    }
-}
@@ -1,67 +0,0 @@
-/*
- * 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);
-    }
-}
@@ -1,117 +0,0 @@
-/*
- * 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;
-    }
-}
@@ -1,56 +0,0 @@
-/*
- * 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 static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
-
-    private final boolean showCPUUsage;
-    private final OperatingSystemMXBean osBean;
-
-    float memory;
-    private String text;
-
-    PerformanceInfo() {
-        showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
-        osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
-    }
-
-    void update() {
-        final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
-        memory = (float) heapusage.getUsed() / heapusage.getMax();
-
-        if (!showCPUUsage) {
-            text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
-            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 = "Memory: %d/%dMB (%.1f%%)  %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
-    }
-
-    String text() {
-        return text;
-    }
-
-    float memory() {
-        return memory;
-    }
-}
@@ -1,22 +0,0 @@
-/*
- * 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();
-    }
-}
@@ -1,350 +0,0 @@
-/*
- * 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;
-    }
-}
@@ -1,65 +0,0 @@
-/*
- * 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);
-    }
-}
@@ -1,517 +0,0 @@
-/*
- * 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);
-            }
-        }
-    }
-}
@@ -1,182 +0,0 @@
-/*
- * 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;
-    }
-
-}
@@ -1 +0,0 @@
-net.minecraftforge.fml.earlydisplay.DisplayWindow
@@ -1,13 +0,0 @@
-█▀▀▀▀▀█ ▀▄▄▄▀█  █ █▀▀▀▀▀█
-█ ███ █ ███ ▀███▀ █ ███ █
-█ ▀▀▀ █ ▀ ▄ ███▀█ █ ▀▀▀ █
-▀▀▀▀▀▀▀ ▀ █ ▀ ▀▄█ ▀▀▀▀▀▀▀
-█▀█▀▄▄▀▄▀ █▄▀▄ ▀▀▀ ▄▀▀▀▄▀
-▄█▄▄  ▀▀███▀██▄  █▀ ▀▄▄
-▀█▄▀ ▀▀▄▄▀▀ █▀█▄▄████ ▀▀█
-▄▀▀▄▀ ▀▄▀▄█   ▀ ▀▀▀▄█ ▀▀▄
-   ▀ ▀▀ ▄ ▄██▀ ▄█▀▀▀█▀█▀█
-█▀▀▀▀▀█  ▄█▄▄▀▀▄█ ▀ █ ▀▀▀
-█ ███ █ ▄▄ ▄  █ ▀██▀██▄██
-█ ▀▀▀ █ ██▄███▀█  █ █ █▀
-▀▀▀▀▀▀▀ ▀▀  ▀▀▀  ▀▀▀▀▀▀▀▀
@@ -17,7 +17,6 @@ dependencies {
    api("org.ow2.asm:asm-tree:${ASM_VERSION}")
    api("org.ow2.asm:asm-commons:${ASM_VERSION}")
    api("net.minecraftforge:forgespi:${SPI_VERSION}")
-    api("net.minecraftforge:mergetool:${MERGETOOL_VERSION}:api")
    api("org.apache.logging.log4j:log4j-api:${LOG4J_VERSION}")
    api("org.slf4j:slf4j-api:${SLF4J_API_VERSION}")
    api("com.google.guava:guava:${GUAVA_VERSION}")
@@ -70,14 +69,13 @@ ext {
 }

 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
    MANIFESTS.each { pkg, values ->
        manifest.attributes(values, pkg)
    }
 }

 tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:-unchecked'
+    options.compilerArgs << '-Xlint:unchecked'
 }

 license {
@@ -36,9 +36,9 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 */
 public class CapabilityTokenSubclass implements ILaunchPluginService {

-    private static final String FUNC_NAME = "getType";
-    private static final String FUNC_DESC = "()Ljava/lang/String;";
-    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
+    private final String FUNC_NAME = "getType";
+    private final String FUNC_DESC = "()Ljava/lang/String;";
+    private final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.

    @Override
    public String name() {
@@ -51,14 +51,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
    @Override
    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
    {
-        if (isEmpty)
-            return NAY;
-
-        String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
-            return NAY;
-        
-        return YAY;
+        return isEmpty ? NAY : YAY;
    }

    @Override
@@ -82,7 +75,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
            SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
            reader.accept(new SignatureVisitor(Opcodes.ASM9)
            {
-                final Deque<String> stack = new ArrayDeque<>();
+                Deque<String> stack = new ArrayDeque<>();

                @Override
                public void visitClassType(final String name)
@@ -120,7 +113,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
        }
    }

-    private static final class Holder {
+    private static class Holder {
        String value;
    }

@@ -30,16 +30,15 @@ import org.slf4j.MarkerFactory;
 public class RuntimeEnumExtender implements ILaunchPluginService {

    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Type STRING = Type.getType(String.class);
-    private static final Type ENUM = Type.getType(Enum.class);
-    private static final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
-    private static final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
-    private static final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
-    private static final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
-    private static final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
-    private static final String NAME_DESC = Type.getMethodDescriptor(STRING);
-    private static final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
-    private static final int FLAGS = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
+    private final Type STRING = Type.getType(String.class);
+    private final Type ENUM = Type.getType(Enum.class);
+    private final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
+    private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
+    private final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
+    private final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
+    private final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
+    private final String NAME_DESC = Type.getMethodDescriptor(STRING);
+    private final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);

    @Override
    public String name() {
@@ -50,15 +49,9 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);

    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty)
-            return NAY;
-
-        String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
-            return NAY;
-
-        return YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
+    {
+        return isEmpty ? NAY : YAY;
    }

    @Override
@@ -67,24 +60,25 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
        if ((classNode.access & Opcodes.ACC_ENUM) == 0)
            return ComputeFlags.NO_REWRITE;

-        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
-            return ComputeFlags.NO_REWRITE;
-
        Type array = Type.getType("[" + classType.getDescriptor());
-        String arrayDesc = array.getDescriptor();
+        final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;

-        FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
+        FieldNode values = classNode.fields.stream().filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)).findFirst().orElse(null);
+
+        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
+            return ComputeFlags.NO_REWRITE;
+        }

        //Static methods named "create" with first argument as a string
        List<MethodNode> candidates = classNode.methods.stream()
                .filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
-                .toList();
+                .collect(Collectors.toList());

        if (candidates.isEmpty()) {
            throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
        }

-        for (var mtd : candidates)
+        candidates.forEach(mtd ->
        {
            Type[] args = Type.getArgumentTypes(mtd.desc);
            if (args.length == 0 || !args[0].equals(STRING)) {
@@ -116,7 +110,8 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
            Type[] ctrArgs = new Type[args.length + 1];
            ctrArgs[0] = STRING;
            ctrArgs[1] = Type.INT_TYPE;
-            System.arraycopy(args, 1, ctrArgs, 2, args.length - 1);
+            for (int x = 1; x < args.length; x++)
+                ctrArgs[1 + x] = args[x];

            String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);

@@ -238,7 +233,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
                ins.load(vars, classType);
                ins.areturn(classType);
            }
-        }
+        });
        return ComputeFlags.COMPUTE_FRAMES;
    }

@@ -5,8 +5,6 @@

 package net.minecraftforge.fml.loading;

-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
-
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -16,7 +14,6 @@ public class BackgroundWaiter {
    private static 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();
@@ -5,7 +5,6 @@

 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;
@@ -16,81 +15,21 @@ 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"),
-        ;
-
-        private final String entry;
-        private final Object defaultValue;
-        private final String comment;
-        private final Class<?> valueType;
-        private final Function<Object, Object> entryFunction;
-
-        ConfigValue(final String entry, final Object defaultValue, final String comment) {
-            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.valueType = defaultValue.getClass();
-            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 final FMLConfig INSTANCE = new FMLConfig();
-    private static final ConfigSpec configSpec = new ConfigSpec();
-    private static final CommentedConfig configComments = CommentedConfig.inMemory();
+    private static FMLConfig INSTANCE = new FMLConfig();
+    private static ConfigSpec configSpec = new ConfigSpec();
    static {
-        for (ConfigValue cv: ConfigValue.values()) {
-            cv.buildConfigEntry(configSpec, configComments);
-        }
+        configSpec.define("splashscreen", Boolean.TRUE);
+        configSpec.define("maxThreads", -1);
+        configSpec.define("versionCheck", Boolean.TRUE);
+        configSpec.define("defaultConfigPath",  "defaultconfigs");
+        configSpec.define("disableOptimizedDFU", Boolean.TRUE);
    }

    private CommentedFileConfig configData;
@@ -99,6 +38,7 @@ 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
@@ -107,14 +47,13 @@ public class FMLConfig
        }
        catch (ParsingException e)
        {
-            throw new RuntimeException("Failed to load FML config from " + configFile, e);
+            throw new RuntimeException("Failed to load FML config from " + configFile.toString(), e);
        }
        if (!configSpec.isCorrect(configData)) {
            LOGGER.warn(CORE, "Configuration file {} is not correct. Correcting", configFile);
            configSpec.correct(configData, (action, path, incorrectValue, correctedValue) ->
-                    LOGGER.info(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue));
+                    LOGGER.warn(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue));
        }
-        configData.putAllComments(configComments);
        configData.save();
    }

@@ -125,34 +64,33 @@ public class FMLConfig
        if (LOGGER.isTraceEnabled(CORE))
        {
            LOGGER.trace(CORE, "Loaded FML config from {}", FMLPaths.FMLCONFIG.get());
-            for (ConfigValue cv: ConfigValue.values()) {
-                LOGGER.trace(CORE, "FMLConfig {} is {}", cv.entry, cv.getConfigValue(INSTANCE.configData));
-            }
+            LOGGER.trace(CORE, "Splash screen is {}", FMLConfig.splashScreenEnabled());
+            LOGGER.trace(CORE, "Max threads for mod loading computed at {}", FMLConfig.loadingThreadCount());
+            LOGGER.trace(CORE, "Version check is {}", FMLConfig.runVersionCheck());
+            LOGGER.trace(CORE, "Default config paths at {}", FMLConfig.defaultConfigPath());
        }
-        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.getConfigValue(ConfigValue.DEFAULT_CONFIG_PATH)));
+        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.defaultConfigPath()));
    }

-    public static String getConfigValue(ConfigValue v) {
-        return v.getConfigValue(INSTANCE.configData);
+    public static boolean splashScreenEnabled() {
+        return INSTANCE.configData.<Boolean>getOptional("splashscreen").orElse(Boolean.FALSE);
    }

-    public static boolean getBoolConfigValue(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 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 boolean runVersionCheck() {
+        return INSTANCE.configData.<Boolean>getOptional("versionCheck").orElse(Boolean.TRUE);
    }

    public static String defaultConfigPath() {
-        return getConfigValue(ConfigValue.DEFAULT_CONFIG_PATH);
+        return INSTANCE.configData.<String>getOptional("defaultConfigPath").orElse("defaultconfigs");
+    }
+
+    public static boolean isOptimizedDFUDisabled() {
+        return INSTANCE.configData.<Boolean>getOptional("disableOptimizedDFU").orElse(Boolean.TRUE);
    }
 }
@@ -16,7 +16,8 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModValidator;
 import net.minecraftforge.accesstransformer.service.AccessTransformerService;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import net.minecraftforge.fml.loading.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;
@@ -160,6 +161,7 @@ public class FMLLoader

        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);
@@ -176,6 +178,7 @@ 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();
@@ -211,10 +214,9 @@ public class FMLLoader
        return dist;
    }

-    public static void beforeStart(ModuleLayer gameLayer)
+    public static void beforeStart(ClassLoader launchClassLoader)
    {
-        ImmediateWindowHandler.acceptGameLayer(gameLayer);
-        ImmediateWindowHandler.updateProgress("Launching minecraft");
+        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Launching minecraft"));
        progressWindowTick.run();
    }

@@ -74,6 +74,14 @@ public enum FMLPaths
        }
    }

+    /**
+     * @deprecated Use {@link #getOrCreateGameRelativePath(Path)} instead.
+     */
+    @Deprecated(forRemoval = true, since = "1.19.4")
+    public static Path getOrCreateGameRelativePath(Path path, String name) {
+        return getOrCreateGameRelativePath(path);
+    }
+
    public static Path getOrCreateGameRelativePath(Path path) {
        Path gameFolderPath = FMLPaths.GAMEDIR.get().resolve(path);

@@ -5,11 +5,35 @@

 package net.minecraftforge.fml.loading;

+import com.mojang.logging.LogUtils;
+import org.slf4j.Logger;
+
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;

 public class FileUtils
 {
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+   /**
+    * @deprecated Use normal Java NIO methods instead
+    */
+    @Deprecated(forRemoval = true, since = "1.19.4")
+    public static Path getOrCreateDirectory(Path dirPath, String dirLabel) {
+        if (!Files.isDirectory(dirPath))
+        {
+            try {
+                Files.createDirectories(dirPath);
+            } catch (IOException e) {
+                throw new RuntimeException("Problem creating directory", e);
+            }
+        }
+
+        return dirPath;
+    }
+

    public static String fileExtension(final Path path) {
        String fileName = path.getFileName().toString();
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.function.*;
-import java.util.stream.Collectors;
-
-public class ImmediateWindowHandler {
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    private static ImmediateWindowProvider provider;
-
-    private static ProgressMeter earlyProgress;
-    public static void load(final String launchTarget, final String[] arguments) {
-        if (!List.of("forgeclient", "forgeclientuserdev", "forgeclientdev").contains(launchTarget)) {
-            provider = new DummyProvider();
-            LOGGER.info("ImmediateWindowProvider not loading because launch target is {}", launchTarget);
-        } else if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_CONTROL)) {
-            provider = new DummyProvider();
-            LOGGER.info("ImmediateWindowProvider not loading because splash screen is disabled");
-        } else {
-            final var providername = FMLConfig.getConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER);
-            LOGGER.info("Loading ImmediateWindowProvider {}", providername);
-            final var maybeProvider = ServiceLoader.load(ImmediateWindowProvider.class)
-                    .stream()
-                    .map(ServiceLoader.Provider::get)
-                    .filter(p -> Objects.equals(p.name(), providername))
-                    .findFirst();
-            provider = maybeProvider.or(() -> {
-                LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
-                return Optional.of(new DummyProvider());
-            }).orElseThrow();
-        }
-        // Only update config if the provider isn't the dummy provider
-        if (!Objects.equals(provider.name(), "dummyprovider"))
-            FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER, provider.name());
-        FMLLoader.progressWindowTick = provider.initialize(arguments);
-        earlyProgress = StartupNotificationManager.addProgressBar("EARLY", 0);
-        earlyProgress.label("Bootstrapping Minecraft");
-    }
-
-    public static long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
-        return provider.setupMinecraftWindow(width, height, title, monitor);
-    }
-
-    public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
-        return provider.positionWindow(monitor, widthSetter, heightSetter, xSetter, ySetter);
-    }
-
-    public static void updateFBSize(IntConsumer width, IntConsumer height) {
-        provider.updateFramebufferSize(width, height);
-    }
-
-    public static <T> Supplier<T> loadingOverlay(Supplier<?> mc, Supplier<?> ri, Consumer<Optional<Throwable>> ex, boolean fade) {
-        earlyProgress.complete();
-        return provider.loadingOverlay(mc, ri, ex, fade);
-    }
-
-    public static void acceptGameLayer(final ModuleLayer layer) {
-        provider.updateModuleReads(layer);
-    }
-
-    public static void renderTick() {
-        provider.periodicTick();
-    }
-
-    public static String getGLVersion() {
-        return provider.getGLVersion();
-    }
-    public static void updateProgress(final String message) {
-        earlyProgress.label(message);
-    }
-
-    private record DummyProvider() implements ImmediateWindowProvider {
-        private static Method NV_HANDOFF;
-        private static Method NV_POSITION;
-        private static Method NV_OVERLAY;
-        private static Method NV_VERSION;
-
-        @Override
-        public String name() {
-            return "dummyprovider";
-        }
-
-        @Override
-        public Runnable initialize(String[] args) {
-            return () -> {};
-        }
-
-        @Override
-        public void updateFramebufferSize(final IntConsumer width, final IntConsumer height) {
-        }
-
-        @Override
-        public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
-            try {
-                var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor);
-                return longsupplier.getAsLong();
-            } catch (Throwable e) {
-                throw new IllegalStateException("How did you get here?", e);
-            }
-        }
-
-        public boolean positionWindow(Optional<Object> monitor, IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
-            try {
-                return (boolean)NV_POSITION.invoke(null, monitor, widthSetter, heightSetter, xSetter, ySetter);
-            } catch (Throwable e) {
-                throw new IllegalStateException("How did you get here?", e);
-            }
-        }
-        @SuppressWarnings("unchecked")
-        public <T> Supplier<T> loadingOverlay(Supplier<?> mc, Supplier<?> ri, Consumer<Optional<Throwable>> ex, boolean fade) {
-            try {
-                return (Supplier<T>) NV_OVERLAY.invoke(null, mc, ri, ex, fade);
-            } catch (Throwable e) {
-                throw new IllegalStateException("How did you get here?", e);
-            }
-        }
-
-        @Override
-        public String getGLVersion() {
-            try {
-                return (String) NV_VERSION.invoke(null);
-            } catch (Throwable e) {
-                return "3.2"; // Vanilla sets 3.2 in com.mojang.blaze3d.platform.Window
-            }
-        }
-
-        @Override
-        public void updateModuleReads(final ModuleLayer layer) {
-            var fm = layer.findModule("forge");
-            if (fm.isPresent()) {
-                getClass().getModule().addReads(fm.get());
-                var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
-                var methods = Arrays.stream(clz.getMethods()).filter(m -> Modifier.isStatic(m.getModifiers())).collect(Collectors.toMap(Method::getName, Function.identity()));
-                NV_HANDOFF = methods.get("windowHandoff");
-                NV_OVERLAY = methods.get("loadingOverlay");
-                NV_POSITION = methods.get("windowPositioning");
-                NV_VERSION = methods.get("glVersion");
-            }
-        }
-
-        @Override
-        public void periodicTick() {
-            // NOOP
-        }
-    }
-}
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.IntConsumer;
-import java.util.function.IntSupplier;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-/**
- * This is for allowing the plugging in of alternative early display implementations.
- *
- * They can be selected through the config value "earlyWindowProvider" which defaults to "fmlearlywindow" implemented by {@link net.minecraftforge.fml.earlydisplay.DisplayWindow}
- *
- * There are a few key things to keep in mind if following through on implementation. You cannot access the game state as it
- * literally DOES NOT EXIST at the time this object is constructed. You have to be very careful about managing the handoff
- * to mojang, be sure that if you're trying to tick your window in a background thread (a nice idea!) that you properly
- * transition to the main thread before handoff is complete. Do note that in general, you should construct your GL objects
- * on the MAIN thread before starting your ticker, to ensure MacOS compatibility.
- *
- * No doubt many more things can be said here.
- */
-public interface ImmediateWindowProvider {
-    /**
-     * @return The name of this window provider. Do NOT use fmlearlywindow.
-     */
-    String name();
-
-    /**
-     * This is called very early on to initialize ourselves. Use this to initialize the window and other GL core resources.
-     *
-     * One thing we want to ensure is that we try and create the highest GL_PROFILE we can accomplish.
-     * GLFW_CONTEXT_VERSION_MAJOR,GLFW_CONTEXT_VERSION_MINOR should be as high as possible on the created window,
-     * and it should have all the typical profile settings.
-     *
-     * @param arguments The arguments provided to the Java process. This is the entire command line, so you can process
-     *                  stuff from it.
-     * @return A runnable that will be periodically ticked by FML during startup ON THE MAIN THREAD. This is usually
-     * a good place to put glfwPollEvents() tests.
-     */
-    Runnable initialize(String[] arguments);
-
-    /**
-     * This will be called during the handoff to minecraft to update minecraft with the size of the framebuffer we have.
-     * Generally won't be called because Minecraft figures it out for itself.
-     * @param width Consumer of the framebuffer width
-     * @param height Consumer of the framebuffer height
-     */
-    void updateFramebufferSize(IntConsumer width, IntConsumer height);
-
-    /**
-     * This is called to setup the minecraft window, as if Mojang had done it themselves in their Window class. This
-     * handoff is difficult to get right - you have to make sure that any activities you're doing to the window are finished
-     * prior to returning. You should try and setup the width and height as Mojang expects - the suppliers give you all that
-     * information. Alternatively, you can force Mojang to update from the current position of the window in {@link #positionWindow(Optional, IntConsumer, IntConsumer, IntConsumer, IntConsumer)}
-     * instead. This might give a more seamless experience.
-     *
-     * @param width This is the width of the window Mojang expects
-     * @param height This is the height of the Window Mojang expects.
-     * @param title This is the title for the window.
-     * @param monitor This is the monitor it should appear on.
-     * @return The window id
-     */
-    long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor);
-
-    /**
-     * This is called after window handoff to allow us to tell Mojang about our window's position. This might give a
-     * preferrable user experience to users, because we just tell Mojang our truth, rather than accept theirs.
-     * @param monitor This is the monitor we're rendering on. Note that this is the Mojang monitor object. You might have trouble unwrapping it.
-     * @param widthSetter This sets the width on the Mojang side
-     * @param heightSetter This sets the height on the Mojang side
-     * @param xSetter This sets the x coordinate on the Mojang side
-     * @param ySetter This sets the y coordinate on the Mojang side
-     * @return true if you've handled the window positioning - this skips the "forced fullscreen" code until a later stage
-     */
-    boolean positionWindow(Optional<Object> monitor, IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter);
-
-    /**
-     * Return a Supplier of an object extending the LoadingOverlay class from Mojang. This is what will be used once
-     * the Mojang window code has taken over rendering of the window, to render the later stages of the loading process.
-     *
-     * @param mc This supplies the Minecraft object
-     * @param ri This supplies the ReloadInstance object that tells us when the loading is finished
-     * @param ex This Consumes the final state of the loading - if it's an error you pass it the Throwable, otherwise you
-     *           pass Optional.empty()
-     * @param fade This is the fade flag passed to LoadingOverlay. You probably want to ignore it.
-     * @param <T> This is the type LoadingOverlay to allow type binding on the Mojang side
-     * @return A supplier of your later LoadingOverlay screen.
-     */
-    <T> Supplier<T> loadingOverlay(Supplier<?> mc, Supplier<?> ri, Consumer<Optional<Throwable>> ex, boolean fade);
-
-    /**
-     * This is called during the module loading process to allow us to find objects inside the GAME layer, such as a
-     * later loading screen.
-     * @param layer This is the GAME layer from ModLauncher
-     */
-    void updateModuleReads(ModuleLayer layer);
-
-    /**
-     * This is called periodically during the loading process to "tick" the window. It is typically the same as the Runnable
-     * from {@link #initialize(String[])}
-     */
-    void periodicTick();
-
-    /**
-     * This is called to construct a {@link net.minecraftforge.forgespi.locating.ForgeFeature} for the GL_VERSION we
-     * managed to create for the window. Should be a string of the format {MAJOR}.{MINOR}, such as 4.6, 4.5 or such.
-     *
-     * @return the GL profile we created
-     */
-    String getGLVersion();
-}
@@ -9,7 +9,7 @@ import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
 import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
@@ -83,7 +83,7 @@ public class LanguageLoadingProvider
    private void loadLanguageProviders() {
        LOGGER.debug(CORE, "Found {} language providers", ServiceLoaderUtils.streamServiceLoader(()->serviceLoader, sce->LOGGER.error("Problem with language loaders")).count());
        serviceLoader.forEach(languageProviders::add);
-        ImmediateWindowHandler.updateProgress("Loading language providers");
+
        languageProviders.forEach(lp -> {
            final Path lpPath;
            try {
@@ -98,7 +98,7 @@ public class LanguageLoadingProvider
                throw new RuntimeException("Failed to find implementation version for language provider "+ lp.name());
            }
            LOGGER.debug(CORE, "Found language provider {}, version {}", lp.name(), impl);
-            ImmediateWindowHandler.updateProgress("Loaded language provider "+lp.name()+ " " + impl);
+            StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Loaded language provider "+lp.name()+ " " + impl));
            languageProviderMap.put(lp.name(), new ModLanguageWrapper(lp, new DefaultArtifactVersion(impl)));
        });
    }
@@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading;

 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
-import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
 import cpw.mods.modlauncher.api.NamedPath;
 import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
@@ -19,8 +18,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ServiceLoader;
-import java.util.zip.ZipFile;
 import java.util.Set;

 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
@@ -31,18 +28,6 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
        "net.minecraftforge.forgespi.locating.IDependencyLocator"
    );

-    @Override
-    public List<NamedPath> candidates(final Path gameDirectory, final String launchTarget) {
-        FMLPaths.loadAbsolutePaths(gameDirectory);
-        FMLConfig.load();
-        return candidates(gameDirectory);
-    }
-
-    @Override
-    public void earlyInitialization(final String launchTarget, final String[] arguments) {
-        ImmediateWindowHandler.load(launchTarget, arguments);
-    }
-
    @Override
    public List<NamedPath> candidates(final Path gameDirectory) {
        ModDirTransformerDiscoverer.scan(gameDirectory);
@@ -147,7 +147,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService
        return ret;
    }

-    private static boolean remove(final List<AnnotationNode> anns, final String side)
+    private boolean remove(final List<AnnotationNode> anns, final String side)
    {
        return unpack(anns).stream().
                filter(ann->Objects.equals(ann.desc, ONLYIN)).
@@ -169,15 +169,9 @@ public class RuntimeDistCleaner implements ILaunchPluginService
    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);

    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
-        if (isEmpty)
-            return NAY;
-
-        String internalName = classType.getInternalName();
-        if (internalName.startsWith("net/minecraftforge/"))
-            return NAY;
-
-        return YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
+    {
+        return isEmpty ? NAY : YAY;
    }

    private static class LambdaGatherer extends MethodVisitor {
@@ -18,15 +18,12 @@ import java.util.function.BiPredicate;
 public class VersionSupportMatrix {
    private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
    static {
-//        final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
-//        if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
-//            // 1.19.2 is Compatible with 1.19.1
-//            add("languageloader.javafml", "42");
-//            add("mod.minecraft",          "1.19.1");
-//            add("mod.forge",              "42.0.9");
-//        }
-        if (FMLLoader.versionInfo().mcVersion().equals("1.20.1")) {
-            add("mod.forge",              "47.1.79");
+        final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
+         if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
+             // 1.19.2 is Compatible with 1.19.1
+             add("languageloader.javafml", "42");
+             add("mod.minecraft",          "1.19.1");
+             add("mod.forge",              "42.0.9");
        }
    }
    private static void add(String key, String value) {
@@ -43,7 +43,7 @@ public abstract class AbstractModProvider implements IModProvider
        var sj = SecureJar.from(
                Manifest::new,
                jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-                (root, p) -> true,
+                null,
                path
        );

@@ -6,10 +6,8 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.slf4j.Logger;

@@ -62,7 +60,6 @@ public class BackgroundScanHandler
            throw new IllegalStateException("Scanner has shutdown");
        }
        status = ScanStatus.RUNNING;
-        ImmediateWindowHandler.updateProgress("Scanning mod candidates");
        allFiles.add(file);
        pendingFiles.add(file);
        final CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
@@ -34,7 +34,7 @@ public class ExplodedDirectoryLocator implements IModLocator {
        explodedMods.forEach(explodedMod ->
                ModJarMetadata.buildFile(this,
                        jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(),
-                        (a,b) -> true,
+                        null,
                        explodedMod.paths().toArray(Path[]::new))
                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
        return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();
@@ -96,7 +96,9 @@ public class MinecraftLocator extends AbstractModProvider implements IModLocator

        final NightConfigWrapper configWrapper = new NightConfigWrapper(conf);
        //final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper, extralangs.build().toList());
-        return new ModFileInfo(modFile, configWrapper, configWrapper::setFile, List.of());
+        final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper, List.of());
+        configWrapper.setFile(modFileInfo);
+        return modFileInfo;
    }

    @Override
@@ -13,10 +13,9 @@ import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.ImmediateWindowHandler;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.UniqueModListBuilder;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.Environment;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IDependencyLocator;
@@ -41,7 +40,7 @@ public class ModDiscoverer {

    public ModDiscoverer(Map<String, ?> arguments) {
        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), v->ModsFolderLocator::new);
-        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v-> StartupNotificationManager.locatorConsumer().orElseGet(()-> s->{}));
+        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v-> StartupMessageManager.locatorConsumer().orElseGet(()-> s->{}));
        final var moduleLayerManager = Launcher.INSTANCE.environment().findModuleLayerManager().orElseThrow();
        modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
        dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
@@ -69,8 +68,8 @@ public class ModDiscoverer {
        List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>();
        boolean successfullyLoadedMods = true;
        List<IModFileInfo> brokenFiles = new ArrayList<>();
+
        boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
-        ImmediateWindowHandler.updateProgress("Discovering mod files");
        //Loop all mod locators to get the prime mods to load from.
        for (IModLocator locator : modLocatorList) {
            try {
@@ -188,6 +187,7 @@ public class ModDiscoverer {
        var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
        for (IModFile mf : locatedModFiles) {
            LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
+            StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found mod file "+mf.getFileName()+" of type "+mf.getType()));
        }
        loadedFiles.addAll(locatedModFiles);
    }
@@ -10,7 +10,7 @@ import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
@@ -157,6 +157,7 @@ public class ModFile implements IModFile {
        if (throwable != null) {
            this.scanError = throwable;
        }
+        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Completed deep scan of "+this.getFileName()));
    }

    public void setFileProperties(Map<String, Object> fileProperties) {
@@ -26,15 +26,7 @@ import java.security.SignatureException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Consumer;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

@@ -55,28 +47,21 @@ public class ModFileInfo implements IModFileInfo, IConfigurable

    private static final Map<String, Object> CLIENT_SIDE_ONLY_MAP = Map.of(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);

-    ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer)
+    ModFileInfo(final ModFile modFile, final IConfigurable config)
    {
        this.modFile = modFile;
        this.config = config;
-        configFileConsumer.accept(this);
-        // modloader is essential
        var modLoader = config.<String>getConfigElement("modLoader")
                .orElseThrow(()->new InvalidModFileException("Missing ModLoader in file", this));
-        // as is modloader version
        var modLoaderVersion = config.<String>getConfigElement("loaderVersion")
                .map(MavenVersionAdapter::createFromVersionSpec)
                .orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this));
        this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
-        // the remaining properties are optional with sensible defaults
        this.license = config.<String>getConfigElement("license")
-                .orElse("");
-        this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack")
-                .orElse(false);
-        boolean clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly")
-                .orElse(false);
-        this.usesServices = config.<List<String>>getConfigElement("services")
-                .orElse(List.of());
+            .orElse("");
+        this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false);
+        boolean clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly").orElse(false);
+        this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of());

        var maybeProps = config.<Map<String, Object>>getConfigElement("properties");
        if (clientSideOnly) {
@@ -91,17 +76,15 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
        }

        this.modFile.setFileProperties(this.properties);
-        this.issueURL = config.<String>getConfigElement("issueTrackerURL")
-                .map(StringUtils::toURL)
-                .orElse(null);
+        this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null);
        final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
        if (modConfigs.isEmpty())
        {
            throw new InvalidModFileException("Missing mods list", this);
        }
        this.mods = modConfigs.stream()
-                .map(mi-> (IModInfo)new ModInfo(this, mi))
-                .toList();
+                .map(mi-> new ModInfo(this, mi))
+                .collect(Collectors.toList());
        if (LOGGER.isDebugEnabled(LogMarkers.LOADING))
        {
            LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
@@ -111,8 +94,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
        }
    }

-    public ModFileInfo(final ModFile file, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer, final List<LanguageSpec> languageSpecs) {
-        this(file, config, configFileConsumer);
+    public ModFileInfo(final ModFile file, final IConfigurable config, final List<LanguageSpec> languageSpecs) {
+        this(file, config);
        this.languageSpecs.addAll(languageSpecs);
    }

@@ -44,7 +44,9 @@ public class ModFileParser {
        fileConfig.load();
        fileConfig.close();
        final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
-        return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
+        final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper);
+        configWrapper.setFile(modFileInfo);
+        return modFileInfo;
    }

    protected static List<CoreModFile> getCoreMods(final ModFile modFile) {
@@ -65,6 +67,6 @@ public class ModFileParser {
        return coreModPaths.entrySet().stream()
                .peek(e-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {} with Javascript path {}", e.getKey(), e.getValue()))
                .map(e -> new CoreModFile(e.getKey(), modFile.findResource(e.getValue()),modFile))
-                .toList();
+                .collect(Collectors.toList());
    }
 }
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;

 public class ModInfo implements IModInfo, IConfigurable
 {
@@ -53,58 +54,57 @@ public class ModInfo implements IModInfo, IConfigurable
        Optional<ModFileInfo> ownFile = Optional.ofNullable(owningFile);
        this.owningFile = owningFile;
        this.config = config;
-        // These are sourced from the mod specific [[mod]] entry
        this.modId = config.<String>getConfigElement("modId")
                .orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile));
-        // verify we have a valid modid
        if (!VALID_MODID.matcher(this.modId).matches()) {
            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern());
            throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile);
        }
-        this.namespace = config.<String>getConfigElement("namespace")
-                .orElse(this.modId);
-        // verify our namespace is valid
+        this.namespace = config.<String>getConfigElement("namespace").orElse(this.modId);
        if (!VALID_NAMESPACE.matcher(this.namespace).matches()) {
            LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern());
            throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile);
        }
        this.version = config.<String>getConfigElement("version")
                .map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
-                .map(DefaultArtifactVersion::new)
-                .orElse(DEFAULT_VERSION);
-        // verify we have a valid mod version
-        if (!VALID_VERSION.matcher(this.version.toString()).matches()) {
-            throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile());
-        }
-        // The remaining properties all default to sensible values and are not essential
-        this.displayName = config.<String>getConfigElement("displayName")
-                .orElse(this.modId);
+                .map(DefaultArtifactVersion::new).orElse(DEFAULT_VERSION);
+        this.displayName = config.<String>getConfigElement("displayName").orElse(this.modId);
        this.description = config.<String>getConfigElement("description")
                .orElse("MISSING DESCRIPTION")
                .replace("\r\n", "\n").stripIndent();
+
        this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
-                .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile"))
-                        .orElse(null)));
+                .orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile")).orElse(null)));
        this.logoBlur = config.<Boolean>getConfigElement("logoBlur")
                .orElseGet(() -> ownFile.flatMap(f -> f.<Boolean>getConfigElement("logoBlur"))
                        .orElse(true));
+
        this.updateJSONURL = config.<String>getConfigElement("updateJSONURL")
                .map(StringUtils::toURL);
-        this.modUrl = config.<String>getConfigElement("modUrl")
-                .map(StringUtils::toURL);
-        // These are sourced from the file rather than the mod-specific block, but with a modid tag
-        this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId))
-                .orElse(Collections.emptyList())
+
+        this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId)
                .stream()
                .map(dep -> new ModVersion(this, dep))
-                .toList();
-        this.features = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("features", this.modId))
+                .collect(Collectors.toList()))
+                .orElse(Collections.emptyList());
+
+        this.features = ownFile.map(mfi -> mfi.<Map<String, String>>getConfigElement("features", this.modId)
                .stream()
                .flatMap(m->m.entrySet().stream())
-                .map(this::makeBound)
-                .toList();
-        this.properties = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId))
+                .map(e->new ForgeFeature.Bound(e.getKey(), e.getValue(), this))
+                .collect(Collectors.toList())).orElse(Collections.emptyList());
+
+        this.properties = ownFile.map(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId)
+                .orElse(Collections.emptyMap()))
                .orElse(Collections.emptyMap());
+
+        this.modUrl = config.<String>getConfigElement("modUrl")
+                .map(StringUtils::toURL);
+
+        // verify we have a valid mod version otherwise throw an exception
+        if (!VALID_VERSION.matcher(this.version.toString()).matches()) {
+            throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile());
+        }
    }

    @Override
@@ -191,14 +191,6 @@ public class ModInfo implements IModInfo, IConfigurable
        return modUrl;
    }

-    private ForgeFeature.Bound makeBound(Map.Entry<String, Object> e) {
-        if (e.getValue() instanceof String val) {
-            return new ForgeFeature.Bound(e.getKey(), val, this);
-        } else {
-            throw new InvalidModFileException("Invalid feature bound {" + e.getValue() + "} for key {" + e.getKey() + "} only strings are accepted", this.owningFile);
-        }
-    }
-
    class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion {
        private IModInfo owner;
        private final String modId;
@@ -31,7 +31,7 @@ public final class ModJarMetadata implements JarMetadata {
    // TODO: Remove helper functions to cleanup api
    @Deprecated(forRemoval = true, since="1.18")
    static IModFile buildFile(IModLocator locator, Path... files) {
-        return buildFile(locator, j->true, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
+        return buildFile(locator, j->true, null, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
    }

    // TODO: Remove helper functions to cleanup api
@@ -6,11 +6,13 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.mojang.logging.LogUtils;
-import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.api.ITransformationService;
-import net.minecraftforge.fml.loading.*;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
+import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.ModSorter;
+import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.jetbrains.annotations.NotNull;
@@ -27,17 +29,14 @@ public class ModValidator {
    private final Map<IModFile.Type, List<ModFile>> modFiles;
    private final List<ModFile> candidatePlugins;
    private final List<ModFile> candidateMods;
-    private final List<ModFile> gameLibraries;
    private LoadingModList loadingModList;
-    private final List<IModFile> brokenFiles;
+    private List<IModFile> brokenFiles;
    private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;

    public ModValidator(final Map<IModFile.Type, List<ModFile>> modFiles, final List<IModFileInfo> brokenFiles, final List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
        this.modFiles = modFiles;
        this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
        this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY)));
-        this.gameLibraries = lst(modFiles.get(IModFile.Type.GAMELIBRARY));
-        this.candidateMods.addAll(this.gameLibraries);
        this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));
        this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
        this.discoveryErrorData = discoveryErrorData;
@@ -53,13 +52,14 @@ public class ModValidator {
        if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
            LOGGER.debug(LogMarkers.SCAN, "Found {} mod files with {} mods", candidateMods.size(), candidateMods.stream().mapToInt(mf -> mf.getModInfos().size()).sum());
        }
-        ImmediateWindowHandler.updateProgress("Found "+candidateMods.size()+" mod candidates");
+        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found "+ candidateMods.size()+" modfiles to load"));
    }

    @NotNull
    private List<ModFile> validateFiles(final List<ModFile> mods) {
        final List<ModFile> brokenFiles = new ArrayList<>();
-        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
+        for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext(); )
+        {
            ModFile modFile = iterator.next();
            if (!modFile.getProvider().isValid(modFile) || !modFile.identifyMods()) {
                LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", modFile.getFilePath());
@@ -75,26 +75,7 @@ public class ModValidator {
    }

    public ITransformationService.Resource getModResources() {
-        var mods = new ArrayList<SecureJar>();
-        // Add only the valid mods that we will be attempting to load.
-        // If any detectable error happens during the sorting process {missing deps, duplicates,
-        // This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display.
-        // This won't fix them all as they are still loaded and will still apply but it might help
-        for (var info : this.loadingModList.getModFiles())
-            mods.add(info.getFile().getSecureJar());
-
-        // Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing
-        // that clusterfuck of a system, have this simple de-duplication. Order of resource is important, but i'm unsure if duplication is
-        // so might as well waste a few cycles on checking. Still faster then converting from a set to a list.
-        // Ideally we would explicitly list out which mods to load {forge and MC being the only ones} but some coremods could require extra things.
-        // So try game libraries as well
-        for (var lib : this.gameLibraries) {
-            var jar = lib.getSecureJar();
-            if (!mods.contains(jar))
-                mods.add(jar);
-        }
-
-        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, mods);
+        return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, this.candidateMods.stream().map(IModFile::getSecureJar).toList());
    }

    private List<EarlyLoadingException.ExceptionData> validateLanguages() {
@@ -33,12 +33,9 @@ public class NightConfigWrapper implements IConfigurable {
    @Override
    @SuppressWarnings("unchecked")
    public <T> Optional<T> getConfigElement(final String... key) {
-        var path = asList(key);
-        return this.config.getOptional(path).map(value -> {
+        return this.config.getOptional(asList(key)).map(value -> {
            if (value instanceof UnmodifiableConfig) {
                return (T) ((UnmodifiableConfig) value).valueMap();
-            } else if (value instanceof ArrayList<?> al && al.size() > 0 && al.get(0) instanceof UnmodifiableConfig) {
-                throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
            }
            return (T) value;
        });
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+/*
+
+
+package net.minecraftforge.fml.loading.progress;
+
+import com.google.common.io.ByteStreams;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.logging.log4j.LogManager;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.*;
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL14;
+import org.lwjgl.stb.STBEasyFont;
+import org.lwjgl.stb.STBImage;
+import org.lwjgl.system.MemoryStack;
+import org.lwjgl.system.MemoryUtil;
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryUsage;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+
+import static org.lwjgl.glfw.GLFW.*;
+import static org.lwjgl.glfw.GLFW.glfwCreateWindow;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.system.MemoryStack.stackPush;
+import static org.lwjgl.system.MemoryUtil.NULL;
+
+
+class ClientVisualization implements EarlyProgressVisualization.Visualization {
+    private final int screenWidth = 854;
+    private final int screenHeight = 480;
+    private long window;
+    private Thread renderThread = new Thread(this::renderThreadFunc);
+
+    private boolean running = true;
+    private GLFWFramebufferSizeCallback framebufferSizeCallback;
+    private int[] fbSize;
+
+    private void initWindow(@Nullable String mcVersion) {
+        GLFWErrorCallback.createPrint(System.err).set();
+
+        long glfwInitBegin = System.nanoTime();
+        if (!glfwInit()) {
+            throw new IllegalStateException("Unable to initialize GLFW");
+        }
+        long glfwInitEnd = System.nanoTime();
+
+        if (glfwInitEnd - glfwInitBegin > 1e9) {
+            LogManager.getLogger().fatal("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) -> LogManager.getLogger().error(String.format("Suppressing Last GLFW error: [0x%X]%s", error, description)));
+
+        glfwDefaultWindowHints();
+        glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
+        glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+        glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+        glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
+        glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
+
+        if (mcVersion != null)
+        {
+            // 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
+            String vanillaWindowTitle = "Minecraft* " + mcVersion;
+            glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
+            glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
+        }
+
+        window = glfwCreateWindow(screenWidth, screenHeight, "FML early loading progress", NULL, NULL);
+        if (window == NULL) {
+            throw new RuntimeException("Failed to create the GLFW window"); // ignore it and make the GUI optional?
+        }
+        framebufferSizeCallback = GLFWFramebufferSizeCallback.create(this::fbResize);
+
+        try (MemoryStack stack = stackPush()) {
+            IntBuffer pWidth = stack.mallocInt(1);
+            IntBuffer pHeight = stack.mallocInt(1);
+            IntBuffer monPosLeft = stack.mallocInt(1);
+            IntBuffer monPosTop = stack.mallocInt(1);
+            glfwGetWindowSize(window, pWidth, pHeight);
+
+            // try to center the window, this is a best-effort as there may not be
+            // a primary monitor and we might not even be on the primary monitor...
+            long primaryMonitor = glfwGetPrimaryMonitor();
+            if (primaryMonitor != NULL)
+            {
+                GLFWVidMode vidmode = glfwGetVideoMode(primaryMonitor);
+                glfwGetMonitorPos(primaryMonitor, monPosLeft, monPosTop);
+                glfwSetWindowPos(
+                        window,
+                        (vidmode.width() - pWidth.get(0)) / 2 + monPosLeft.get(0),
+                        (vidmode.height() - pHeight.get(0)) / 2 + monPosTop.get(0)
+                );
+            }
+            IntBuffer iconWidth = stack.mallocInt(1);
+            IntBuffer iconHeight = stack.mallocInt(1);
+            IntBuffer iconChannels = stack.mallocInt(1);
+            final GLFWImage.Buffer glfwImages = GLFWImage.mallocStack(1, stack);
+            byte[] icon;
+            try {
+                icon = ByteStreams.toByteArray(getClass().getClassLoader().getResourceAsStream("forge_icon.png"));
+                final ByteBuffer iconBuf = stack.malloc(icon.length);
+                iconBuf.put(icon);
+                ((Buffer)iconBuf).position(0);
+                final ByteBuffer imgBuffer = STBImage.stbi_load_from_memory(iconBuf, iconWidth, iconHeight, iconChannels, 4);
+                if (imgBuffer == null) {
+                    throw new NullPointerException("Failed to load window icon"); // fall down to catch block
+                }
+                glfwImages.position(0);
+                glfwImages.width(iconWidth.get(0));
+                glfwImages.height(iconHeight.get(0));
+                ((Buffer)imgBuffer).position(0);
+                glfwImages.pixels(imgBuffer);
+                glfwImages.position(0);
+                glfwSetWindowIcon(window, glfwImages);
+                STBImage.stbi_image_free(imgBuffer);
+            } catch (NullPointerException | IOException e) {
+                System.err.println("Failed to load forge logo");
+            }
+        }
+        int[] w = new int[1];
+        int[] h = new int[1];
+        glfwGetFramebufferSize(window, w, h);
+        fbSize = new int[] {w[0], h[0]};
+        glfwSetFramebufferSizeCallback(window, framebufferSizeCallback);
+        glfwShowWindow(window);
+        glfwPollEvents();
+    }
+
+    private void renderProgress() {
+        // glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        // glMatrixMode(GL_PROJECTION);
+        // glLoadIdentity();
+        // glOrtho(0.0D, screenWidth, screenHeight, 0.0D, -1000.0D, 1000.0D);
+        // glMatrixMode(GL_MODELVIEW);
+        // glLoadIdentity();
+        //
+        // glEnableClientState(GL11.GL_VERTEX_ARRAY);
+        // glEnable(GL_BLEND);
+        // renderBackground();
+        // renderMessages();
+        // glfwSwapBuffers(window);
+    }
+
+    private static float clamp(float num, float min, float max) {
+        if (num < min) {
+            return min;
+        } else {
+            return num > max ? max : num;
+        }
+    }
+
+    private static int clamp(int num, int min, int max) {
+        if (num < min) {
+            return min;
+        } else {
+            return num > max ? max : num;
+        }
+    }
+
+    private 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 j << 16 | k << 8 | l;
+    }
+
+    private void renderBackground() {
+        glBegin(GL_QUADS);
+        glColor4f(239F / 255F, 50F / 255F, 61F / 255F, 255F / 255F); //Color from ResourceLoadProgressGui
+        glVertex2f(0, 0);
+        glVertex2f(0, screenHeight);
+        glVertex2f(screenWidth, screenHeight);
+        glVertex2f(screenWidth, 0);
+        glEnd();
+    }
+
+    private void fbResize(long window, int width, int height) {
+        if (window == this.window && width != 0 && height != 0) {
+            fbSize = new int[] {width, height};
+        }
+    }
+
+    private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
+        try (MemoryStack memorystack = MemoryStack.stackPush()) {
+            PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
+            int error = GLFW.glfwGetError(pointerbuffer);
+            if (error != GLFW_NO_ERROR) {
+                long pDescription = pointerbuffer.get();
+                String description = pDescription == 0L ? "" : MemoryUtil.memUTF8(pDescription);
+                handler.accept(error, description);
+            }
+        }
+    }
+
+    private void renderMessages() {
+        List<Pair<Integer, StartupMessageManager.Message>> messages = StartupMessageManager.getMessages();
+        for (int i = 0; i < messages.size(); i++) {
+            final Pair<Integer, StartupMessageManager.Message> pair = messages.get(i);
+            final float fade = clamp((4000.0f - (float) pair.getLeft() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
+            if (fade <0.01f) continue;
+            StartupMessageManager.Message msg = pair.getRight();
+            renderMessage(msg.getText(), msg.getTypeColour(), ((screenHeight - 15) / 20) - i, fade);
+        }
+        renderMemoryInfo();
+    }
+
+    @Override
+    public void updateFBSize(final IntConsumer width, final IntConsumer height) {
+        width.accept(this.fbSize[0]);
+        height.accept(this.fbSize[1]);
+    }
+
+    private static final float[] memorycolour = new float[] { 0.0f, 0.0f, 0.0f};
+
+    private void renderMemoryInfo() {
+        final MemoryUsage heapusage = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
+        final MemoryUsage offheapusage = ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage();
+        final float pctmemory = (float) heapusage.getUsed() / heapusage.getMax();
+        String memory = String.format("Memory Heap: %d / %d MB (%.1f%%)  OffHeap: %d MB", heapusage.getUsed() >> 20, heapusage.getMax() >> 20, pctmemory * 100.0, offheapusage.getUsed() >> 20);
+
+        final int i = hsvToRGB((1.0f - (float)Math.pow(pctmemory, 1.5f)) / 3f, 1.0f, 0.5f);
+        memorycolour[2] = ((i) & 0xFF) / 255.0f;
+        memorycolour[1] = ((i >> 8 ) & 0xFF) / 255.0f;
+        memorycolour[0] = ((i >> 16 ) & 0xFF) / 255.0f;
+        renderMessage(memory, memorycolour, 1, 1.0f);
+    }
+
+    private void renderMessage(final String message, final float[] colour, int row, float alpha) {
+        ByteBuffer charBuffer = MemoryUtil.memAlloc(message.length() * 270);
+        int quads = STBEasyFont.stb_easy_font_print(0, 0, message, null, charBuffer);
+
+        glVertexPointer(3, GL11.GL_FLOAT, 16, charBuffer);
+        glEnable(GL_BLEND);
+        GL14.glBlendColor(0,0,0, alpha);
+        glBlendFunc(GL14.GL_CONSTANT_ALPHA, GL14.GL_ONE_MINUS_CONSTANT_ALPHA);
+        glColor3f(colour[0], colour[1], colour[2]);
+        glPushMatrix();
+        glTranslatef(10, row * 20, 0);
+        glScalef(2, 2, 1);
+        glDrawArrays(GL11.GL_QUADS, 0, quads * 4);
+        glPopMatrix();
+        MemoryUtil.memFree(charBuffer);
+    }
+
+    private void renderThreadFunc() {
+        glfwMakeContextCurrent(window);
+        glfwSwapInterval(1);
+        GL.createCapabilities();
+        glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+        while (running) {
+            renderProgress();
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException ignored) {
+                break;
+            }
+        }
+        glfwMakeContextCurrent(0);
+    }
+
+    @Override
+    public Runnable start(@Nullable String mcVersion) {
+        initWindow(mcVersion);
+        renderThread.setDaemon(true); // Don't hang the game if it terminates before handoff (i.e. datagen)
+        renderThread.start();
+        return org.lwjgl.glfw.GLFW::glfwPollEvents;
+    }
+
+    @Override
+    public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
+        running = false;
+        try {
+            renderThread.join();
+        } catch (InterruptedException ignored) {
+        }
+        glfwSetWindowTitle(window, title.get());
+        glfwSetWindowSize(window, width.getAsInt(), height.getAsInt());
+        if (monitorSupplier.getAsLong() != 0L)
+            glfwSetWindowMonitor(window, monitorSupplier.getAsLong(), 0, 0, width.getAsInt(), height.getAsInt(), GLFW_DONT_CARE);
+        glfwMakeContextCurrent(window);
+        GL.createCapabilities();
+        glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+        renderProgress();
+        glfwSwapInterval(0);
+        glfwSwapBuffers(window);
+        glfwSwapInterval(1);
+        final GLFWFramebufferSizeCallback previous = glfwSetFramebufferSizeCallback(window, null);
+        previous.free();
+        return window;
+    }
+}
+*/
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.progress;
+
+import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.api.distmarker.Dist;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+
+public enum EarlyProgressVisualization {
+    INSTANCE;
+
+    private Visualization visualization;
+
+    public Runnable accept(Dist dist, boolean isData)
+    {
+        return accept(dist, isData, null);
+    }
+
+    public Runnable accept(final Dist dist, final boolean isData, @Nullable String mcVersion) {
+//        visualization = !isData && dist.isClient() && Boolean.parseBoolean(System.getProperty("fml.earlyprogresswindow", "true")) ? new ClientVisualization() : new NoVisualization();
+        visualization = new NoVisualization();
+        return visualization.start(mcVersion);
+    }
+
+    public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
+        return visualization.handOffWindow(width, height, title, monitor);
+    }
+
+    public void updateFBSize(IntConsumer width, IntConsumer height) {
+        visualization.updateFBSize(width, height);
+    }
+
+    interface Visualization {
+        Runnable start(@Nullable String mcVersion);
+
+        default long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, LongSupplier monitorSupplier) {
+            return FMLLoader.getGameLayer().findModule("forge")
+                    .map(l->Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback"))
+                    .map(LamdbaExceptionUtils.rethrowFunction(c->c.getMethod("fallback", IntSupplier.class, IntSupplier.class, Supplier.class, LongSupplier.class)))
+                    .map(LamdbaExceptionUtils.rethrowFunction(m->(LongSupplier)m.invoke(null, width, height, title, monitorSupplier)))
+                    .map(LongSupplier::getAsLong)
+                    .orElseThrow(()->new IllegalStateException("Why are you here?"));
+        }
+
+        default void updateFBSize(IntConsumer width, IntConsumer height) {
+        }
+    }
+
+    private static class NoVisualization implements Visualization {
+        @Override
+        public Runnable start(@Nullable String mcVersion) {
+            return () -> {};
+        }
+    }
+
+}
+
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.progress;
-
-public class Message {
-    private final String text;
-    private final MessageType type;
-    private final long timestamp;
-
-    public Message(final String text, final MessageType type) {
-        this.text = text;
-        this.type = type;
-        this.timestamp = System.nanoTime();
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    MessageType getType() {
-        return type;
-    }
-
-    long timestamp() {
-        return timestamp;
-    }
-
-    public float[] getTypeColour() {
-        return type.colour();
-    }
-
-    enum MessageType {
-        MC(1.0f, 1.0f, 1.0f),
-        ML(0.0f, 0.0f, 0.5f),
-        LOC(0.0f, 0.5f, 0.0f),
-        MOD(0.5f, 0.0f, 0.0f);
-
-        private final float[] colour;
-
-        MessageType(final float r, final float g, final float b) {
-            colour = new float[] {r,g,b};
-        }
-
-        public float[] colour() {
-            return colour;
-        }
-    }
-}
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.progress;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-public final class ProgressMeter {
-    private final String name;
-    private final int steps;
-    private final AtomicInteger current;
-    private Message label;
-
-    public ProgressMeter(String name, int steps, int current, Message label) {
-        this.name = name;
-        this.steps = steps;
-        this.current = new AtomicInteger(current);
-        this.label = label;
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public int steps() {
-        return steps;
-    }
-
-    public int current() {
-        return current.get();
-    }
-
-    public Message label() {
-        return label;
-    }
-
-    public void increment() {
-        this.current.incrementAndGet();
-    }
-
-    public void complete() {
-        StartupNotificationManager.popBar(this);
-    }
-
-    public float progress() {
-        return current.get()/(float)steps;
-    }
-
-    public void setAbsolute(final int absolute) {
-        this.current.set(absolute);
-    }
-
-    public void label(final String message) {
-        this.label = new Message(message, Message.MessageType.ML);
-    }
-}
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading.progress;
+
+import com.google.common.base.Ascii;
+import com.google.common.base.CharMatcher;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+public class StartupMessageManager {
+
+    private static volatile EnumMap<MessageType, List<Message>> messages = new EnumMap<>(MessageType.class);
+
+    public static List<Pair<Integer,Message>> getMessages() {
+        final long ts = System.nanoTime();
+        return messages.values().stream().flatMap(Collection::stream).
+                sorted(Comparator.comparingLong(Message::getTimestamp).thenComparing(Message::getText).reversed()).
+                map(m -> Pair.of((int) ((ts - m.timestamp) / 1e6), m)).
+                limit(5).
+                collect(Collectors.toList());
+    }
+
+    public static class Message {
+        private final String text;
+        private final MessageType type;
+        private final long timestamp;
+
+        public Message(final String text, final MessageType type) {
+            this.text = text;
+            this.type = type;
+            this.timestamp = System.nanoTime();
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        MessageType getType() {
+            return type;
+        }
+
+        long getTimestamp() {
+            return timestamp;
+        }
+
+        public float[] getTypeColour() {
+            return type.colour();
+        }
+    }
+
+    enum MessageType {
+        MC(1.0f, 1.0f, 1.0f),
+        ML(0.0f, 0.0f, 0.5f),
+        LOC(0.0f, 0.5f, 0.0f),
+        MOD(0.5f, 0.0f, 0.0f);
+
+        private final float[] colour;
+
+        MessageType(final float r, final float g, final float b) {
+            colour = new float[] {r,g,b};
+        }
+
+        public float[] colour() {
+            return colour;
+        }
+    }
+
+    private synchronized static void addMessage(MessageType type, String message, int maxSize)
+    {
+        EnumMap<MessageType, List<Message>> newMessages = new EnumMap<>(messages);
+        newMessages.compute(type, (key, existingList) -> {
+            List<Message> newList = new ArrayList<>();
+            if (existingList != null)
+            {
+                if (maxSize < 0)
+                {
+                    newList.addAll(existingList);
+                }
+                else
+                {
+                    newList.addAll(existingList.subList(0, Math.min(existingList.size(), maxSize)));
+                }
+            }
+            newList.add(new Message(message, type));
+            return newList;
+        });
+        messages = newMessages;
+    }
+
+    public static void addModMessage(final String message) {
+        final String safeMessage = Ascii.truncate(CharMatcher.ascii().retainFrom(message),80,"~");
+        addMessage(MessageType.MOD, safeMessage, 20);
+    }
+
+    public static Optional<Consumer<String>> modLoaderConsumer() {
+        return Optional.of(s-> addMessage(MessageType.ML, s, -1));
+    }
+
+    public static Optional<Consumer<String>> locatorConsumer() {
+        return Optional.of(s -> addMessage(MessageType.LOC, s, -1));
+    }
+
+    public static Optional<Consumer<String>> mcLoaderConsumer() {
+        return Optional.of(s-> addMessage(MessageType.MC, s, -1));
+    }
+}
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.loading.progress;
-
-import com.google.common.base.Ascii;
-import com.google.common.base.CharMatcher;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public class StartupNotificationManager {
-    private static volatile EnumMap<Message.MessageType, List<Message>> messages = new EnumMap<>(Message.MessageType.class);
-
-    private static final Deque<ProgressMeter> progressMeters = new ArrayDeque<>();
-
-    public static List<ProgressMeter> getCurrentProgress() {
-        synchronized (progressMeters) {
-            return progressMeters.stream().toList();
-        }
-    }
-
-    public static ProgressMeter prependProgressBar(final String barName, final int count) {
-        var pm = new ProgressMeter(barName, count, 0, new Message(barName, Message.MessageType.ML));
-        synchronized (progressMeters) {
-            progressMeters.addLast(pm);
-        }
-        return pm;
-    }
-    public static ProgressMeter addProgressBar(final String barName, final int count) {
-        var pm = new ProgressMeter(barName, count, 0, new Message(barName, Message.MessageType.ML));
-        synchronized (progressMeters) {
-            progressMeters.push(pm);
-        }
-        return pm;
-    }
-
-    public static void popBar(final ProgressMeter progressMeter) {
-        synchronized (progressMeters) {
-            progressMeters.remove(progressMeter);
-        }
-    }
-
-    public record AgeMessage(int age, Message message) {}
-    public static List<AgeMessage> getMessages() {
-        final long ts = System.nanoTime();
-        return messages.values().stream().flatMap(Collection::stream)
-                .sorted(Comparator.comparingLong(Message::timestamp).thenComparing(Message::getText).reversed())
-                .map(m -> new AgeMessage((int) ((ts - m.timestamp()) / 1000000), m))
-                .limit(2)
-                .toList();
-    }
-
-    private synchronized static void addMessage(Message.MessageType type, String message, int maxSize)
-    {
-        EnumMap<Message.MessageType, List<Message>> newMessages = new EnumMap<>(messages);
-        newMessages.compute(type, (key, existingList) -> {
-            List<Message> newList = new ArrayList<>();
-            if (existingList != null)
-            {
-                if (maxSize < 0)
-                {
-                    newList.addAll(existingList);
-                }
-                else
-                {
-                    newList.addAll(existingList.subList(0, Math.min(existingList.size(), maxSize)));
-                }
-            }
-            newList.add(new Message(message, type));
-            return newList;
-        });
-        messages = newMessages;
-    }
-
-    public static void addModMessage(final String message) {
-        final String safeMessage = Ascii.truncate(CharMatcher.ascii().retainFrom(message),80,"~");
-        addMessage(Message.MessageType.MOD, safeMessage, 20);
-    }
-
-    public static Optional<Consumer<String>> modLoaderConsumer() {
-        return Optional.of(s-> addMessage(Message.MessageType.ML, s, -1));
-    }
-
-    public static Optional<Consumer<String>> locatorConsumer() {
-        return Optional.of(s -> addMessage(Message.MessageType.LOC, s, -1));
-    }
-
-    public static Optional<Consumer<String>> mcLoaderConsumer() {
-        return Optional.of(s-> addMessage(Message.MessageType.MC, s, -1));
-    }
-}
@@ -13,6 +13,7 @@ import net.minecraftforge.api.distmarker.Dist;

 import java.nio.file.Path;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.stream.Stream;

 public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
@@ -21,8 +22,10 @@ public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
    @Override public boolean isProduction() { return true; }

    @Override
-    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
-        return ()->clientService(arguments, gameLayer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object)arguments);
+        };
    }

    @Override
@@ -40,7 +43,7 @@ public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
        var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
        var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());

-        return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
+        return new LocatedPaths(mcstream.build().toList(), null, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
    }

    protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
@@ -6,7 +6,6 @@
 package net.minecraftforge.fml.loading.targets;

 import cpw.mods.jarhandling.SecureJar;
-import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.fml.loading.FileUtils;

 import java.io.File;
@@ -47,10 +46,7 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
        return new LocatedPaths(mcstream.build().toList(), mcFilter, modstream.build().toList(), getFmlStuff(legacyCP));
    }

-    @Override
    protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
-        super.preLaunch(arguments, layer);
-
        if (getDist().isDedicatedServer())
            return arguments;

@@ -128,12 +124,4 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
        // Generate a time-based random number, to mimic how n.m.client.Main works
        return Long.toString(System.nanoTime() % (int) Math.pow(10, length));
    }
-
-    @Override
-    protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
-        var args = preLaunch(arguments, gameLayer);
-        return ()->devService(args, gameLayer);
-    }
-
-    abstract void devService(final String[] arguments, final ModuleLayer gameLayer) throws Throwable;
 }
@@ -8,20 +8,11 @@ package net.minecraftforge.fml.loading.targets;
 import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.ILaunchHandlerService;
 import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
-import cpw.mods.modlauncher.api.ServiceRunner;
-import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.api.distmarker.Dist;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.Configurator;
 import org.slf4j.Logger;
-import sun.misc.Unsafe;

 import java.io.File;
-import java.io.IOException;
-import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -55,20 +46,6 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {

    }

-    protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
-        URI uri;
-        try (var reader = layer.configuration().findModule("fmlloader").orElseThrow().reference().open()) {
-            uri = reader.find("log4j2.xml").orElseThrow();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        // Force the log4j2 configuration to be loaded from fmlloader
-        Configurator.reconfigure(ConfigurationFactory.getInstance().getConfiguration(LoggerContext.getContext(), ConfigurationSource.fromUri(uri)));
-
-        return arguments;
-    }
-
    protected final Map<String, List<Path>> getModClasses() {
        final String modClasses = Optional.ofNullable(System.getenv("MOD_CLASSES")).orElse("");
        LOGGER.debug(LogMarkers.CORE, "Got mod coordinates {} from env", modClasses);
@@ -86,28 +63,4 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
        //modClassPaths.forEach((modlabel,paths) -> explodedTargets.add(new ExplodedDirectoryLocator.ExplodedMod(modlabel, paths)));
        return modClassPaths;
    }
-
-    @Override
-    public ServiceRunner launchService(final String[] arguments, final ModuleLayer gameLayer) {
-        FMLLoader.beforeStart(gameLayer);
-        return makeService(arguments, gameLayer);
-    }
-
-    protected abstract ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer);
-
-    protected void clientService(final String[] arguments, final ModuleLayer layer) throws Throwable {
-        runTarget("net.minecraft.client.main.Main", arguments, layer);
-    }
-
-    protected void serverService(final String[] arguments, final ModuleLayer layer) throws Throwable {
-        runTarget("net.minecraft.server.Main", arguments, layer);
-    }
-
-    protected void dataService(final String[] arguments, final ModuleLayer layer) throws Throwable {
-        runTarget("net.minecraft.data.Main", arguments, layer);
-    }
-
-    protected void runTarget(final String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
-        Class.forName(layer.findModule("minecraft").orElseThrow(),target).getMethod("main", String[].class).invoke(null, (Object)arguments);
-    }
 }
@@ -14,6 +14,7 @@ import net.minecraftforge.api.distmarker.Dist;

 import java.nio.file.Path;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.function.BiPredicate;
 import java.util.stream.Stream;

@@ -23,8 +24,10 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
    @Override public boolean isProduction() { return true; }

    @Override
-    protected ServiceRunner makeService(String[] arguments, ModuleLayer layer) {
-        return () -> serverService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)arguments);
+        };
    }

    @Override
@@ -39,13 +42,21 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
                      !path.startsWith("META-INF/"));
            }, mcextra
        );
+
+        // Todo in 1.20.2: Change the default filter to null instead of always true.
        BiPredicate<String, String> filter = (path, base) -> true;
+        final BiPredicate<String, String> alwaysTrueFilter = filter;

        var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
        var modstream = Stream.<List<Path>>builder();

        filter = processMCStream(vers, mcstream, filter, modstream);

+        // Ensure backwards compatibility if anything overrides processMCStream()
+        // and expects the default always true filter by only changing it to null afterwards if left unchanged.
+        if (filter == alwaysTrueFilter)
+            filter = null;
+
        var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
        var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
        var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
@@ -5,14 +5,20 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;
+import java.util.concurrent.Callable;

 public class FMLClientDevLaunchHandler extends CommonDevLaunchHandler {
    @Override public String name() { return "fmlclientdev"; }
    @Override public Dist getDist() { return Dist.CLIENT; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        clientService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,8 +5,11 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class FMLClientUserdevLaunchHandler extends FMLUserdevLaunchHandler {
    @Override
    public String name() { return "fmlclientuserdev"; }
@@ -15,7 +18,11 @@ public class FMLClientUserdevLaunchHandler extends FMLUserdevLaunchHandler {
    public Dist getDist() { return Dist.CLIENT; }

    @Override
-    protected void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        clientService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,8 +5,11 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class FMLDataUserdevLaunchHandler extends FMLUserdevLaunchHandler {
    @Override
    public String name() { return "fmldatauserdev"; }
@@ -18,7 +21,11 @@ public class FMLDataUserdevLaunchHandler extends FMLUserdevLaunchHandler {
    public boolean isData() { return true; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        dataService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,14 +5,20 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;
+import java.util.concurrent.Callable;

 public class FMLServerDevLaunchHandler extends CommonDevLaunchHandler {
    @Override public String name() { return "fmlserverdev"; }
    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        serverService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
+        };
    }
 }
@@ -5,14 +5,21 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class FMLServerUserdevLaunchHandler extends FMLUserdevLaunchHandler {
    @Override public String name() { return "fmlserveruserdev"; }
    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        serverService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
+        };
    }
 }
@@ -5,14 +5,20 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;
+import java.util.concurrent.Callable;

 public class ForgeClientDevLaunchHandler extends CommonDevLaunchHandler {
    @Override public String name() { return "forgeclientdev"; }
    @Override public Dist getDist() { return Dist.CLIENT; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        clientService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,8 +5,11 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class ForgeClientUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
    @Override
    public String name() { return "forgeclientuserdev"; }
@@ -15,7 +18,11 @@ public class ForgeClientUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
    public Dist getDist() { return Dist.CLIENT; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        clientService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,15 +5,22 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class ForgeDataDevLaunchHandler extends CommonDevLaunchHandler {
    @Override public String name() { return "forgedatadev"; }
    @Override public Dist getDist() { return Dist.CLIENT; }
    @Override public boolean isData() { return true; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) arguments);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,8 +5,11 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class ForgeDataUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
    @Override
    public String name() { return "forgedatauserdev"; }
@@ -18,7 +21,11 @@ public class ForgeDataUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
    public boolean isData() { return true; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        dataService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args);
+        };
    }
 }
@@ -5,14 +5,21 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class ForgeGametestDevLaunchHandler extends CommonDevLaunchHandler {
    @Override public String name() { return "forgegametestserverdev"; }
    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args);
+        };
    }
 }
@@ -5,14 +5,21 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class ForgeGametestUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
    @Override public String name() { return "forgegametestserveruserdev"; }
    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args);
+        };
    }
 }
@@ -5,14 +5,20 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;
+import java.util.concurrent.Callable;

 public class ForgeServerDevLaunchHandler extends CommonDevLaunchHandler {
    @Override public String name() { return "forgeserverdev"; }
    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        serverService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
+        };
    }
 }
@@ -5,14 +5,21 @@

 package net.minecraftforge.fml.loading.targets;

+import cpw.mods.modlauncher.api.ServiceRunner;
 import net.minecraftforge.api.distmarker.Dist;

+import java.util.concurrent.Callable;
+
 public class ForgeServerUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
    @Override public String name() { return "forgeserveruserdev"; }
    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public void devService(String[] arguments, ModuleLayer layer) throws Throwable {
-        serverService(arguments, layer);
+    public ServiceRunner launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);
+
+            Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args);
+        };
    }
 }
@@ -1,21 +1,8 @@
-#Early window height
-earlyWindowHeight = 480
-#Early window framebuffer scale
-earlyWindowFBScale = 1
-#Enable forge global version checking
-versionCheck = true
-#Early window provider
-earlyWindowProvider = "fmlearlywindow"
-#Early window width
-earlyWindowWidth = 854
-#Early window starts maximized
-earlyWindowMaximized = false
-#Default config path for servers
-defaultConfigPath = "defaultconfigs"
-#Disables Optimized DFU client-side - already disabled on servers
-disableOptimizedDFU = true
-#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
-earlyWindowControl = true
-#Max threads for early initialization parallelism,  -1 is based on processor count
+# does the splashscreen run
+splashscreen = true
+# max threads for parallel loading : -1 uses Runtime#availableProcessors
 maxThreads = -1
-
+# Enable forge global version checking
+versionCheck = true
+# Disables Optimized DFU client-side.
+disableOptimizedDFU = true
@@ -27,19 +27,48 @@ import java.util.concurrent.TimeUnit;
@OnlyIn(Dist.CLIENT)
 public class ClientModLoader
 {
+    private static final Logger LOGGER = LogManager.getLogger();
    private static boolean loading;
    private static Minecraft mc;
    private static boolean loadingComplete;
    private static LoadingFailedException error;
+//    private static EarlyLoaderGUI earlyLoaderGUI;

+    private static class SpacedRunnable implements Runnable {
+        static final long NANO_SLEEP_TIME = TimeUnit.MILLISECONDS.toNanos(50);
+        private final Runnable wrapped;
+        private long lastRun;
+
+        private SpacedRunnable(final Runnable wrapped) {
+            this.wrapped = wrapped;
+            this.lastRun = System.nanoTime() - NANO_SLEEP_TIME;
+        }
+
+        @Override
+        public void run() {
+            if (System.nanoTime() - this.lastRun > NANO_SLEEP_TIME) {
+                wrapped.run();
+                this.lastRun = System.nanoTime();
+            }
+        }
+    }
    public static void begin(final Minecraft minecraft, final PackRepository defaultResourcePacks, final ReloadableResourceManager mcResourceManager)
    {
        // force log4j to shutdown logging in a shutdown hook. This is because we disable default shutdown hook so the server properly logs it's shutdown
        Runtime.getRuntime().addShutdownHook(new Thread(LogManager::shutdown));
        loading = true;
        ClientModLoader.mc = minecraft;
+//        LogicalSidedProvider.setClient(()->minecraft);
+//        LanguageHook.loadForgeAndMCLangs();
+//        earlyLoaderGUI = new EarlyLoaderGUI(minecraft.getWindow());
        createRunnableWithCatch(()->ModLoader.get().gatherAndInitializeMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), ()->{})).run();
        mcResourceManager.registerReloadListener(ClientModLoader::onResourceReload);
+//        if (error == null) {
+////            ResourcePackLoader.loadResourcePacks(defaultResourcePacks, ClientModLoader::buildPackFinder);
+////            DatapackCodec.DEFAULT.addModPacks(ResourcePackLoader.getPackNames());
+////            mcResourceManager.registerReloadListener(BrandingControl.resourceManagerReloadListener());
+////            ModelLoaderRegistry.init();
+//        }
    }

    private static CompletableFuture<Void> onResourceReload(final PreparableReloadListener.PreparationBarrier stage, final ResourceManager resourceManager, final ProfilerFiller prepareProfiler, final ProfilerFiller executeProfiler, final Executor asyncExecutor, final Executor syncExecutor) {
@@ -61,9 +90,15 @@ public class ClientModLoader

    private static void startModLoading(ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor) {
        if (error!=null) throw error;
+//        earlyLoaderGUI.handleElsewhere();
        createRunnableWithCatch(() -> ModLoader.get().loadMods(syncExecutor, parallelExecutor, ()->{})).run();
    }

+    private static void postSidedRunnable() {
+//        LOGGER.debug(LOADING, "Running post client event work");
+//        RenderingRegistry.loadEntityRenderers(mc.getEntityRenderDispatcher());
+    }
+
    private static void finishModLoading(ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor)
    {
        if (error!=null) throw error;
@@ -74,8 +109,80 @@ public class ClientModLoader
        syncExecutor.execute(()->mc.options.load());
    }

+    public static boolean completeModLoading()
+    {
+//        RenderSystem.disableTexture();
+//        RenderSystem.enableTexture();
+//        List<ModLoadingWarning> warnings = ModLoader.get().getWarnings();
+//        boolean showWarnings = true;
+//        try {
+//            showWarnings = ForgeConfig.CLIENT.showLoadWarnings.get();
+//        } catch (NullPointerException e) {
+//            // We're in an early error state, config is not available. Assume true.
+//        }
+//        if (!showWarnings) {
+//            //User disabled warning screen, as least log them
+//            if (!warnings.isEmpty()) {
+//                LOGGER.warn(LOADING, "Mods loaded with {} warning(s)", warnings.size());
+//                warnings.forEach(warning -> LOGGER.warn(LOADING, warning.formatToString()));
+//            }
+//            warnings = Collections.emptyList(); //Clear warnings, as the user does not want to see them
+//        }
+//        File dumpedLocation = null;
+//        if (error == null) {
+//            // We can finally start the forge eventbus up
+//            MinecraftForge.EVENT_BUS.start();
+//        } else {
+//            // Double check we have the langs loaded for forge
+//            LanguageHook.loadForgeAndMCLangs();
+//            dumpedLocation = CrashReportExtender.dumpModLoadingCrashReport(LOGGER, error, mc.gameDirectory);
+//        }
+//        if (error != null || !warnings.isEmpty()) {
+//            mc.setScreen(new LoadingErrorScreen(error, warnings, dumpedLocation));
+//            return true;
+//        } else {
+//            ClientHooks.logMissingTextureErrors();
+//            return false;
+//        }
+        return true;
+    }
+
+    public static void renderProgressText() {
+//        earlyLoaderGUI.renderFromGUI();
+    }
    public static boolean isLoading()
    {
        return loading;
    }
+
+//    private static ResourcePackLoader.IPackInfoFinder buildPackFinder(Map<ModFile, ? extends ModFileResourcePack> modResourcePacks, BiConsumer<? super ModFileResourcePack, ResourcePackInfo> packSetter) {
+//        return (packList, factory) -> clientPackFinder(modResourcePacks, packSetter, packList, factory);
+//    }
+//
+//    private static void clientPackFinder(Map<ModFile, ? extends ModFileResourcePack> modResourcePacks, BiConsumer<? super ModFileResourcePack, ResourcePackInfo> packSetter, Consumer<ResourcePackInfo> consumer, ResourcePackInfo.IFactory factory) {
+//        List<ModFileResourcePack> hiddenPacks = new ArrayList<>();
+//        for (Entry<ModFile, ? extends ModFileResourcePack> e : modResourcePacks.entrySet())
+//        {
+//            IModInfo mod = e.getKey().getModInfos().get(0);
+//            if (Objects.equals(mod.getModId(), "minecraft")) continue; // skip the minecraft "mod"
+//            final String name = "mod:" + mod.getModId();
+//            final ResourcePackInfo packInfo = ResourcePackInfo.create(name, false, e::getValue, factory, ResourcePackInfo.Priority.BOTTOM, IPackNameDecorator.DEFAULT);
+//            if (packInfo == null) {
+//                // Vanilla only logs an error, instead of propagating, so handle null and warn that something went wrong
+//                ModLoader.get().addWarning(new ModLoadingWarning(mod, ModLoadingStage.ERROR, "fml.modloading.brokenresources", e.getKey()));
+//                continue;
+//            }
+//            packSetter.accept(e.getValue(), packInfo);
+//            LOGGER.debug(CORE, "Generating PackInfo named {} for mod file {}", name, e.getKey().getFilePath());
+//            if (mod.getOwningFile().showAsResourcePack()) {
+//                consumer.accept(packInfo);
+//            } else {
+//                hiddenPacks.add(e.getValue());
+//            }
+//        }
+//        final ResourcePackInfo packInfo = ResourcePackInfo.create("mod_resources", true, () -> new DelegatingResourcePack("mod_resources", "Mod Resources",
+//                new PackMetadataSection(new TranslationTextComponent("fml.resources.modresources", hiddenPacks.size()), 6),
+//                hiddenPacks), factory, ResourcePackInfo.Priority.BOTTOM, IPackNameDecorator.DEFAULT);
+//        consumer.accept(packInfo);
+//    }
 }
@@ -41,7 +41,6 @@ ext {
 }

 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
    MANIFESTS.each { pkg, values ->
        if (pkg == '')
            manifest.attributes(values)
@@ -39,7 +39,6 @@ ext {
 }

 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
    MANIFESTS.each { pkg, values ->
        if (pkg == '')
            manifest.attributes(values)
@@ -41,7 +41,6 @@ ext {
 }

 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
    MANIFESTS.each { pkg, values ->
        if (pkg == '')
            manifest.attributes(values)
@@ -16,8 +16,8 @@ Step 1: Open your command-line and browse to the folder where you extracted the

 Step 2: You're left with a choice.
 If you prefer to use Eclipse:
-1. Run the following command: `./gradlew genEclipseRuns`
 2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
+1. Run the following command: `./gradlew genEclipseRuns`
   or run `gradlew eclipse` to generate the project.

 If you prefer to use IntelliJ:
@@ -28,7 +28,7 @@ If you prefer to use IntelliJ:

 If at any point you are missing libraries in your IDE, or you've run into problems you can 
 run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything 
-(this does not affect your code) and then start the process again.
+{this does not affect your code} and then start the process again.

 Mapping Names:
 =============================
@@ -40,7 +40,7 @@ https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md

 Additional Resources: 
 =========================
-Community Documentation: https://docs.minecraftforge.net/en/1.20.1/gettingstarted/
+Community Documentation: https://docs.minecraftforge.net/en/1.19.x/gettingstarted/
 LexManos' Install Video: https://youtu.be/8VEdtQLuLO0
 Forge Forums: https://forums.minecraftforge.net/
 Forge Discord: https://discord.minecraftforge.net/
@@ -74,6 +74,9 @@ minecraft {
            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
            property 'forge.logging.console.level', 'debug'

+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', mod_id
+
            mods {
                "${mod_id}" {
                    source sourceSets.main
@@ -35,7 +35,7 @@ public class Config
    // a list of strings that are treated as resource locations for items
    private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER
            .comment("A list of items to log on common setup.")
-            .defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName);
+            .defineListAllowEmpty(Collections.singletonList("items"), () -> List.of("minecraft:iron_ingot"), Config::validateItemName);

    static final ForgeConfigSpec SPEC = BUILDER.build();

@@ -2,19 +2,16 @@ package com.example.examplemod;

 import com.mojang.logging.LogUtils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.MapColor;
+import net.minecraft.world.level.material.Material;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
+import net.minecraftforge.event.CreativeModeTabEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -40,26 +37,12 @@ public class ExampleMod
    public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
    // Create a Deferred Register to hold Items which will all be registered under the "examplemod" namespace
    public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
-    // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "examplemod" namespace
-    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);

    // Creates a new Block with the id "examplemod:example_block", combining the namespace and path
-    public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE)));
+    public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
    // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties()));

-    // Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
-    public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
-            .alwaysEat().nutrition(1).saturationMod(2f).build())));
-
-    // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
-    public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()
-            .withTabsBefore(CreativeModeTabs.COMBAT)
-            .icon(() -> EXAMPLE_ITEM.get().getDefaultInstance())
-            .displayItems((parameters, output) -> {
-                output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
-            }).build());
-
    public ExampleMod(FMLJavaModLoadingContext context)
    {
        IEventBus modEventBus = context.getModEventBus();
@@ -71,8 +54,6 @@ public class ExampleMod
        BLOCKS.register(modEventBus);
        // Register the Deferred Register to the mod event bus so items get registered
        ITEMS.register(modEventBus);
-        // Register the Deferred Register to the mod event bus so tabs get registered
-        CREATIVE_MODE_TABS.register(modEventBus);

        // Register ourselves for server and other game events we are interested in
        MinecraftForge.EVENT_BUS.register(this);
@@ -97,10 +78,9 @@ public class ExampleMod
        Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString()));
    }

-    // Add the example block item to the building blocks tab
-    private void addCreative(BuildCreativeModeTabContentsEvent event)
+    private void addCreative(CreativeModeTabEvent.BuildContents event)
    {
-        if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS)
+        if (event.getTab() == CreativeModeTabs.BUILDING_BLOCKS)
            event.accept(EXAMPLE_BLOCK_ITEM);
    }

@@ -45,29 +45,23 @@ authors="${mod_authors}" #optional
 description='''${mod_description}'''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
 [[dependencies.${mod_id}]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="${forge_version_range}" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
-    # BEFORE - This mod is loaded BEFORE the dependency
-    # AFTER - This mod is loaded AFTER the dependency
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT, or SERVER
-    side="BOTH"
+# the modid of the dependency
+modId="forge" #mandatory
+# Does this dependency have to exist - if not, ordering below must be specified
+mandatory=true #mandatory
+# The version range of the dependency
+versionRange="${forge_version_range}" #mandatory
+# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
+# BEFORE - This mod is loaded BEFORE the dependency
+# AFTER - This mod is loaded AFTER the dependency
+ordering="NONE"
+# Side this dependency is applied on - BOTH, CLIENT, or SERVER
+side="BOTH"
 # Here's another dependency
 [[dependencies.${mod_id}]]
-    modId="minecraft"
-    mandatory=true
-    # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="${minecraft_version_range}"
-    ordering="NONE"
-    side="BOTH"
-
-# Features are specific properties of the game environment, that you may want to declare you require. This example declares
-# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
-# stop your mod loading on the server for example.
-#[features.${mod_id}]
-#openGLVersion="[3.2,)"
+modId="minecraft"
+mandatory=true
+# This version range declares a minimum of the current minecraft version up to but not including the next major version
+versionRange="${minecraft_version_range}"
+ordering="NONE"
+side="BOTH"
@@ -1,32 +1,32 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -113,7 +_,10 @@
-             GlStateManager._texParameter(3553, 34892, 0);
-             GlStateManager._texParameter(3553, 10242, 33071);
-             GlStateManager._texParameter(3553, 10243, 33071);
+@@ -112,7 +_,10 @@
+             GlStateManager.m_84331_(3553, 34892, 0);
+             GlStateManager.m_84331_(3553, 10242, 33071);
+             GlStateManager.m_84331_(3553, 10243, 33071);
 +         if (!stencilEnabled)
-             GlStateManager._texImage2D(3553, 0, 6402, this.f_83915_, this.f_83916_, 0, 6402, 5126, (IntBuffer)null);
+             GlStateManager.m_84209_(3553, 0, 6402, this.f_83915_, this.f_83916_, 0, 6402, 5126, (IntBuffer)null);
 +         else
-+            GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.f_83915_, this.f_83916_, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
+            GlStateManager.m_84209_(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.f_83915_, this.f_83916_, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
          }
 
          this.m_83936_(9728);
-@@ -124,7 +_,14 @@
-          GlStateManager._glBindFramebuffer(36160, this.f_83920_);
-          GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.f_83923_, 0);
+@@ -123,7 +_,14 @@
+          GlStateManager.m_84486_(36160, this.f_83920_);
+          GlStateManager.m_84173_(36160, 36064, 3553, this.f_83923_, 0);
          if (this.f_83919_) {
 +         if(!stencilEnabled)
-             GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.f_83924_, 0);
+             GlStateManager.m_84173_(36160, 36096, 3553, this.f_83924_, 0);
 +         else if(net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.f_83924_, 0);
+            GlStateManager.m_84173_(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.f_83924_, 0);
 +         } else {
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.f_83924_, 0);
-+            GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.f_83924_, 0);
+            GlStateManager.m_84173_(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.f_83924_, 0);
+            GlStateManager.m_84173_(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.f_83924_, 0);
 +         }
          }
 
          this.m_83949_();
-@@ -292,4 +_,27 @@
+@@ -291,4 +_,27 @@
    public int m_83980_() {
       return this.f_83924_;
    }
@@ -1,14 +1,14 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -501,9 +_,16 @@
+@@ -500,9 +_,16 @@
 
    }
 
 +   /* Stores the last values sent into glMultiTexCoord2f */
 +   public static float lastBrightnessX = 0.0f;
 +   public static float lastBrightnessY = 0.0f;
-    public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
-       RenderSystem.assertOnRenderThreadOrInit();
+    public static void m_84160_(int p_84161_, int p_84162_, float p_84163_) {
+       RenderSystem.m_187555_();
       GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
 +      if (p_84161_ == GL13.GL_TEXTURE1) {
 +          lastBrightnessX = p_84162_;
@@ -16,4 +16,4 @@
 +       }
    }
 
-    public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
+    public static void m_84331_(int p_84332_, int p_84333_, int p_84334_) {
@@ -1,28 +1,19 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -83,7 +_,8 @@
+@@ -82,7 +_,7 @@
       GLFW.glfwWindowHint(139267, 2);
       GLFW.glfwWindowHint(139272, 204801);
       GLFW.glfwWindowHint(139270, 1);
 -      this.f_85349_ = GLFW.glfwCreateWindow(this.f_85359_, this.f_85360_, p_85376_, this.f_85355_ && monitor != null ? monitor.m_84954_() : 0L, 0L);
-+      this.f_85349_ = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.f_85359_, ()->this.f_85360_, ()->p_85376_, ()->this.f_85355_ && monitor != null ? monitor.m_84954_() : 0L);
-+      if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.f_85359_ = this.f_85352_ = w, h->this.f_85360_ = this.f_85353_ = h, x->this.f_85357_ = this.f_85350_ = x, y->this.f_85358_ = this.f_85351_ = y)) {
+      this.f_85349_ = net.minecraftforge.fml.loading.progress.EarlyProgressVisualization.INSTANCE.handOffWindow(()->this.f_85359_, ()->this.f_85360_, ()->p_85376_, ()->this.f_85355_ && monitor != null ? monitor.m_84954_() : 0L);
       if (monitor != null) {
          VideoMode videomode = monitor.m_84948_(this.f_85355_ ? this.f_85354_ : Optional.empty());
          this.f_85350_ = this.f_85357_ = monitor.m_84951_() + videomode.m_85332_() / 2 - this.f_85359_ / 2;
-@@ -95,6 +_,7 @@
-          this.f_85350_ = this.f_85357_ = aint1[0];
-          this.f_85351_ = this.f_85358_ = aint[0];
-       }
-+      }
- 
-       GLFW.glfwMakeContextCurrent(this.f_85349_);
-       Locale locale = Locale.getDefault(Category.FORMAT);
-@@ -238,6 +_,7 @@
+@@ -260,6 +_,7 @@
       GLFW.glfwGetFramebufferSize(this.f_85349_, aint, aint1);
       this.f_85361_ = aint[0] > 0 ? aint[0] : 1;
       this.f_85362_ = aint1[0] > 0 ? aint1[0] : 1;
-+      if (this.f_85362_ == 0 || this.f_85361_==0) net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w->this.f_85361_=w, h->this.f_85362_=h);
+      if (this.f_85362_ == 0 || this.f_85361_==0) net.minecraftforge.fml.loading.progress.EarlyProgressVisualization.INSTANCE.updateFBSize(w->this.f_85361_=w, h->this.f_85362_=h);
    }
 
    private void m_85427_(long p_85428_, int p_85429_, int p_85430_) {
Author	SHA1	Message	Date
Jonathing	4952622785	1.19.4 RB 4 https://forums.minecraftforge.net/topic/154386-forge-454-minecraft-1194/	2025-03-04 16:44:50 -05:00
Jonathing	ae82ec12d2	Cache this.useItem before running item break logic, Fixes #10344 (#10381 )	2025-03-04 13:39:35 -08:00
Jonathing	99818c4fdd	Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10463 )	2025-03-04 13:34:26 -08:00
JonathingandLexManos	0e9ba58f19	Speed up mod annotation scanning by ~30% (#10471 ) Co-authored-by: LexManos <[email protected]>	2025-03-04 13:33:54 -08:00
Jonathing	5f5a9a8d2a	Add fast graphics render type to block model jsons (#10399 ) Make modded leaves behave like vanilla leaves by default (Fixes #10389)	2025-02-18 14:09:27 -08:00
Jonathing	3bba5bf4ec	Backport even more future ResourceLocation methods (#10429 )	2025-02-18 13:51:24 -08:00
Jonathing	8090d1d099	Ensure NetworkConstants is loaded before mod construction (#10447 )	2025-02-18 13:51:08 -08:00
JonathingandPaint_Ninja	09cb6bd11e	Add `clientSideOnly` feature to mods.toml (#10085 ) (backport of #9804 to 1.20.1) (#10366 ) Co-authored-by: Paint_Ninja <[email protected]>	2025-02-18 13:50:42 -08:00
Jonathing	d744f0b254	Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10359 ) Add VillagerType#registerBiomeType Co-authored-by: Joseph T. McQuigg <[email protected]>	2025-01-27 20:25:22 -08:00
Jonathing	15c989bd77	Fix incorrect method reference in TntBlock.explode() (#10332 )	2025-01-27 20:24:53 -08:00
Jonathing	b022b84756	Fix issue with shields being disabled by an attacker (#10322 )	2025-01-27 20:24:44 -08:00
Jonathing	5122b0bc3c	Fix non-passengers being tickable without checking canUpdate() (#10305 )	2025-01-22 13:54:20 -08:00
Jonathing	9b47c8647f	Fix finalizeSpawn's return value not being used correctly (#10308 )	2025-01-22 13:54:12 -08:00
Jonathing	5f47cf52fa	Bump CoreMods to 5.2.4 (#10270 )	2024-12-23 20:40:36 -08:00
Jonathing	550925b9c9	Allow mipmap lowering to be disabled (#10251 )	2024-12-23 20:40:21 -08:00
Jonathing	8448cda699	Add optional fix of use item duration, disabled by default (#10245 )	2024-12-23 20:22:56 -08:00
JonathingandPaint_Ninja	f2887142bd	Backport some Vanilla 1.21 `ResourceLocation` methods (#10240 ) Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 20:05:07 -08:00
JonathingandPaint_Ninja	b54d77bffb	Deprecate `@ObjectHolder`, add a couple of fast-paths (#10227 ) ConditionalRecipe still uses an ObjectHolder Co-authored-by: Paint_Ninja <[email protected]>	2024-12-23 20:04:31 -08:00
Jonathing	4a90846be3	Disable clean on TeamCity (#10259 )	2024-12-23 19:48:13 -08:00
Jonathing	0b9573a91f	Bump JNA to 5.12.1 (#10187 )	2024-11-26 12:29:04 -08:00
Jonathing	621d3f8494	[1.19.4] Bump CoreMods to 5.2 (#10131 ) Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 The key features are: - ES6 language support - Thoroughly updated ASMAPI, with full documentation - Bug fixes (some optional for backwards-compatibility) - Partial internal code cleanup - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default - Updated ASM to 9.7.1 - Updated Nashorn to 15.4	2024-11-08 18:19:04 -08:00
Paint_Ninja	fb7e448ff1	Remove unneeded boat patch (backport of #10061 to 1.19.4) (#10102 )	2024-10-06 18:06:48 -07:00
Paint_Ninja	23db859f86	Minor cleanup to ModListScreen and VersionChecker (backport of #9988 to 1.19.4) (#10104 )	2024-09-12 14:09:33 +01:00
Paint_Ninja	ffcf183f3f	Cleanup FML Bindings (backport of #10004 to 1.19.4) (#10101 )	2024-09-12 14:09:21 +01:00
Paint_NinjaandRealMangoRage	05fc73aa8d	Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.19.4) (#10103 ) Co-authored-by: RealMangoRage <[email protected]>	2024-09-12 14:09:11 +01:00
Jonathingandthedarkcolour	6d94dd5306	Choose default JarJar mod file type based on parent JAR (#10024 ) Co-authored-by: thedarkcolour <[email protected]>	2024-07-02 12:23:06 -07:00
JonathingandVen	bfd3ed64a4	Fixed falling block entities not rendering as moving blocks (#10006 ) (#10019 ) Co-authored-by: Ven <[email protected]>	2024-07-02 11:45:48 -07:00
Edouard127andLexManos	cc5a9a43b9	Unlock wrapped registries when firing register events. (#10034 ) Co-authored-by: LexManos <[email protected]>	2024-07-02 11:26:20 -07:00
LexManos	a855b83de8	1.19.4 RB 3 https://forums.minecraftforge.net/topic/149473-forge-453-minecraft-1194/	2024-06-03 14:16:14 -07:00
LexManos	1c2de0cc72	Bump gradle to 8.8	2024-06-03 13:59:53 -07:00
Paint_NinjaandJ-RAP	388976f288	Fix NPE when acceptableValues in defineInList() does not allow nulls, backport of #9903 (#9908 ) Co-authored-by: J-RAP <[email protected]>	2024-04-18 21:32:03 +01:00
Paint_Ninja	2b67a9f36d	Optimise capabilities a tad, backport of #9886 (#9917 )	2024-04-18 21:09:30 +01:00
Paint_Ninja	9305aff10f	Make common config screen registration tasks easier, backport of #9884 (#9913 )	2024-04-18 21:09:04 +01:00
Paint_Ninja	dbd0dba883	Fix crowdin (#9924 )	2024-04-15 22:34:03 +01:00
Paint_Ninja	959a2db3e0	Fix userdev by reverting CoreMods upgrades (#9923 ) Was an obscure transitive dep issue	2024-04-15 21:25:00 +01:00
Paint_Ninja	ae0c1fb4c1	[1.19.4] Bump CoreMods and ASM (#9898 ) - CoreMods 5.1.2 -> 5.1.6 - ASM 9.6 -> 9.7	2024-04-04 14:01:57 +01:00
J-RAP	6b166f3f40	Bump some deps (#9879 ) - CoreMods 5.0.1 -> 5.1.2 - ASM 9.5 -> 9.6 - Installer 2.1 -> 2.2 - Installer tools 1.3.0 -> 1.4.1	2024-03-10 21:24:22 +00:00
Paint_Ninja	b1c0cc77bb	Make common DisplayTest registration tasks easier (#9837 ) Backport of #9822 to 1.19.4	2023-12-31 15:36:57 +00:00
Paint_Ninja	c369f8186b	Optimise ForgeConfigSpec and make Range public (#9826 ) Backport of #9810 to 1.19.4	2023-12-30 21:13:33 +00:00
Paint_Ninja	de4946a1ae	Backport CrashReportAnalyser to 1.19.4 (#9756 )	2023-11-02 13:19:07 -07:00
Paint_NinjaandSu5eD	76e3afd528	Improve mod description formatting in mods screen (#9770 ) Co-authored-by: Su5eD <[email protected]>	2023-11-02 13:18:57 -07:00
Paint_Ninja	4a62c9ed87	Update to FG6 and Gradle 8, backport 1.20 MDK (#9753 )	2023-10-18 13:39:53 -07:00
BigBigZhe	cc75529ec4	Fix Melon/Pumpkin stems having wrong plant type causing them to remain after trampling farmland.	2023-10-11 22:55:40 -07:00
Paint_Ninja	bbd8c2e07e	Optimise path filter in mod loading (#9711 )	2023-09-28 14:56:42 -07:00
Paint_NinjaandJab125	dfef5101f1	Improve mod loading error message for errors inside mod constructors (#9708 ) Co-authored-by: Jab125 <[email protected]>	2023-09-28 14:56:12 -07:00
LexManos	664a2c06ad	1.19.4 RB 2	2023-09-21 11:52:10 -07:00
Paint_Ninjaandmalte0811	e85295a837	Fix `Level` leak in debug HUD (#9700 ) Co-authored-by: malte0811 <[email protected]>	2023-09-02 17:02:03 -07:00
Paint_Ninjaanddhyces	21582ef641	Keep order of sources in PackRepository (#9703 ) Co-authored-by: dhyces <[email protected]>	2023-09-02 16:21:21 -07:00
Paint_Ninja	020ec3d51b	Fix DelegatingPackResources searching resource path twice (#9698 )	2023-08-30 14:10:38 -07:00
Jonathan Colmenares	774b79e609	Fix parameter names in IForgeDimensionSpecialEffects.adjustLightmapColors to better describe what they are. (#9657 )	2023-07-17 09:45:29 -07:00
Jonathan Colmenares	ee6022b006	Add mods button to pause menu (#9654 )	2023-07-17 08:41:11 -07:00
brandon3055	37efd2b8ae	Fixed FluidUtil#tryFillContainer returning invalid result when simulating #9358	2023-07-15 10:52:26 -07:00
Random832	cf3d42ef38	Fix conflicting keybindings not having the correct click count set. #9360	2023-07-15 10:44:29 -07:00
RealMangoRage	03a505a3f2	Fixed AdvancementsScreen.java to render next/previous page buttons now. (#9650 )	2023-07-14 19:22:33 -07:00
ChampionAsh5357	bdc856edf5	Properly Handle Fluid Updates while in a Boat Fix #9256 (#9428 )	2023-07-14 19:06:07 -07:00
Silver_David	6eebea0896	New hook in IClientBlockExtensions to handle enabling tinting on breaking particles. #9446	2023-07-14 16:08:51 -07:00
Technici4n	9218e08955	Add `EmptyEnergyStorage` (#9487 )	2023-07-14 11:34:12 -07:00
Paint_Ninja	7006fe4f29	Support IPv6 address compression for logged IPs	2023-07-14 11:30:57 -07:00
Paint_Ninja	301e7252b0	Add option to advertise dedicated servers to LAN. (#9502 )	2023-07-14 07:07:36 -07:00
ChampionAsh5357	2b5852072c	Add particle description data provider (#9510 )	2023-07-13 19:35:07 -07:00
bconlon	0b38373a45	AlterGroundEvent for modifying block placement performed by AlterGroundDecorator (#9636 )	2023-07-13 17:30:45 -07:00
Paint_Ninja	07e538f3dd	Improve logging for server connections (#9622 )	2023-07-11 11:04:45 -07:00
cech12	b39e300c1b	Fix placing fluids into waterlogged blocks with FluidUtil::tryPlaceFluid. To behave more like vanilla MC-127110 (#9519 )	2023-07-11 11:04:26 -07:00
LexManos	50db51a366	Add proper duplicate mod error message that includes the mod id(s) and mod files. (#9474 )	2023-06-20 14:18:14 -07:00
LexManos	df80acc49d	Make 1.20.x the main TC branch.	2023-06-20 14:07:42 -07:00
				`@@ -1 +0,0 @@`
				`net.minecraftforge.fml.earlydisplay.DisplayWindow`