Migrate to Github Actions

Co-authored-by: Marc Hermans <[email protected]>

.github/support.yml

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

.github/workflows/comments.yml

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

.github/workflows/issues.yml

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

.github/workflows/publish.yml

@@ -0,0 +1,28 @@
+name: Publish
+
+on:
+  push:
+    branches: [ '1.18.x' ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
+    with:
+      java: 17
+      gradle_setup: './gradlew setup'
+      gradle_tasks: 'build publish'
+      artifact_name: 'forge'
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
+      SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
+      SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
+      SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}

.github/workflows/pull_request_review.yml

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

.github/workflows/pull_request_review_comment.yml

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

.github/workflows/pull_request_review_comment_run.yml

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

.github/workflows/pull_request_review_run.yml

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

.github/workflows/pull_requests.yml

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

.github/workflows/push.yml

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

.gitignore

@@ -33,13 +33,11 @@
 /projects/**/*.launch
 /repo/
 src/generated/resources/.cache/
-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

.teamcity/pom.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>MinecraftForge_Forge Config DSL Script</name>
-  <groupId>MinecraftForge_Forge</groupId>
-  <artifactId>MinecraftForge_Forge_dsl</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.jetbrains.teamcity</groupId>
-    <artifactId>configs-dsl-kotlin-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>teamcity-server</id>
-      <url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>JetBrains</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>${basedir}</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-
-        <configuration/>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.teamcity</groupId>
-        <artifactId>teamcity-configs-maven-plugin</artifactId>
-        <version>${teamcity.dsl.version}</version>
-        <configuration>
-          <format>kotlin</format>
-          <dstDir>target/generated-configs</dstDir>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
-      <version>${teamcity.dsl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-script-runtime</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

.teamcity/settings.kts

@@ -1,208 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
-import jetbrains.buildServer.configs.kotlin.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-
-/*
-The settings script is an entry point for defining a TeamCity
-project hierarchy. The script should contain a single call to the
-project() function with a Project instance or an init function as
-an argument.
-
-VcsRoots, BuildTypes, Templates, and subprojects can be
-registered inside the project using the vcsRoot(), buildType(),
-template(), and subProject() methods respectively.
-
-To debug settings scripts in command-line, run the
-
-    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
-
-command and attach your debugger to the port 8000.
-
-To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
--> Tool Windows -> Maven Projects), find the generate task node
-(Plugins -> teamcity-configs -> teamcity-configs:generate), the
-'Debug' option is available in the context menu for the task.
-*/
-
-version = "2021.2"
-
-project {
-
-    buildType(Build)
-    buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-    buildType(PullRequestChecks)
-    buildType(PullRequestCompatibility)
-
-    params {
-        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_branch_spec", """
-                +:refs/heads/(main*)
-                +:refs/heads/(master*)
-                +:refs/heads/(develop|release|staging|main|master)
-                +:refs/heads/(1.*)
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-        text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
-        //These are references and not actually keys
-        password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN)
-        text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-
-        checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        checkbox("should_execute_test", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-    }
-
-    features {
-        githubIssues {
-            id = "MinecraftForge_MinecraftForge__IssueTracker"
-            displayName = "MinecraftForge/MinecraftForge"
-            repositoryURL = "https://github.com/MinecraftForge/MinecraftForge"
-        }
-    }
-}
-
-object Build : BuildType({
-    templates(AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"), AbsoluteId("MinecraftForge_PublishProjectUsingGradle"), AbsoluteId("MinecraftForge_TriggersStaticFilesWebpageGenerator"))
-    id("MinecraftForge_MinecraftForge__Build")
-    name = "Build"
-    description = "Builds and Publishes the main branches of the project."
-
-    features {
-        feature {
-            id = "trigger_fml_only_files_generator"
-            type = "triggerBuildFeature"
-            param("triggers", "MinecraftForge_FilesGenerator_GeneratePages")
-            param("parameters", """
-                env.PUBLISHED_JAVA_FML_ARTIFACT_ID~env.PUBLISHED_JAVA_ARTIFACT_ID
-                env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION~env.PUBLISHED_JAVA_ARTIFACT_VERSION
-                env.PUBLISHED_JAVA_GROUP
-            """.trimIndent())
-        }
-    }
-})
-
-object BuildSecondaryBranches : BuildType({
-    templates(AbsoluteId("MinecraftForge_ExcludesBuildingDefaultBranch"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__BuildSecondaryBranches")
-    name = "Build - Secondary Branches"
-    description = "Builds and Publishes the secondary branches of the project."
-    params {
-        text("git_branch_spec", """
-                +:refs/heads/(*)
-                -:refs/heads/noci*
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-    }
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequests : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequests")
-    name = "Pull Requests"
-    description = "Builds pull requests for the project"
-
-    params {
-        checkbox("should_execute_build", "true", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        text(
-            "gradle_build_task",
-            "assemble",
-            label = "Gradle build task to execute during build",
-            description = "Determines the build task that is executed to build the project.",
-            display = ParameterDisplay.HIDDEN,
-            allowEmpty = false
-        )
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestChecks : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestChecks")
-    name = "Pull Requests (Checks)"
-    description = "Checks pull requests for the project"
-
-    steps {
-        gradle {
-            name = "Check"
-            id = "RUNNER_10_Check"
-
-            tasks = "checkAll"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestCompatibility : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
-    name = "Pull Requests (Compatibility)"
-    description = "Validates binary compatibility for pull requests made to the project"
-
-    steps {
-        gradle {
-            name = "Validate"
-            id = "RUNNER_10_Compatibility"
-
-            tasks = "checkJarCompatibility"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})

Jenkinsfile

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

LICENSE.txt

@@ -57,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.
 =========================================================================
 
 

build.gradle

@@ -1,10 +1,11 @@
+import de.undercouch.gradle.tasks.download.Download
 import groovy.json.JsonBuilder
 import net.minecraftforge.forge.tasks.checks.CheckATs
 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
@@ -19,75 +20,51 @@ import net.minecraftforge.gradle.common.tasks.SignJar
 import net.minecraftforge.gradle.userdev.tasks.RenameJar
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
-import org.objectweb.asm.Opcodes
 
 plugins {
     id 'org.cadixdev.licenser' version '0.6.1'
-    id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'net.minecraftforge.gradleutils' version '2.+'
+    id 'com.github.ben-manes.versions' version '0.36.0'
+    id 'net.minecraftforge.gradleutils' version '[2.2,2.3)'
     id 'eclipse'
-    id 'de.undercouch.download' version '5.4.0'
-    id 'net.minecraftforge.gradle.patcher' version '[6.0.6,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.6,6.2)' apply false
+    id 'idea'
+    id 'de.undercouch.download' version '5.1.3'
+    id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false
+    id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false
+    id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
 }
 
 Util.init() //Init all our extension methods!
 
+jarSigner.autoDetect('forge')
+
 ext {
-    JAR_SIGNER = null
-    if (project.hasProperty('keystore')) {
-        JAR_SIGNER = [
-            storepass: project.properties.keystoreStorePass,
-            keypass: project.properties.keystoreKeyPass,
-            keystore: project.properties.keystore
-        ]
-    }
     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.18.2'
+    MC_VERSION = '1.18.2'
+    MCP_VERSION = '20220404.173914'
+    SPI_VERSION = '4.0.15-4.x'
     ACCESSTRANSFORMERS_VERSION = '8.0.4'
-    COREMODS_VERSION = '5.0.1'
-    EVENTBUS_VERSION = '6.0.5'
-    MODLAUNCHER_VERSION = '10.0.9'
-    SECUREJARHANDLER_VERSION = '2.1.10'
-    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
-    ASM_VERSION = '9.5'
-    INSTALLER_VERSION = '2.1.+'
+    COREMODS_VERSION = '5.2.5'
+    EVENTBUS_VERSION = '5.0.3'
+    MODLAUNCHER_VERSION = '9.1.3'
+    SECUREJARHANDLER_VERSION = '1.0.8'
+    BOOTSTRAPLAUNCHER_VERSION = '1.0.0'
+    ASM_VERSION = '9.7.1'
+    INSTALLER_VERSION = '2.2.+'
     MIXIN_VERSION = '0.8.5'
-    TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
-    JLINE_VERSION = '3.12.+'
-    NIGHTCONFIG_VERSION = '3.6.4'
-    JETBRAINS_ANNOTATIONS_VERSION = '23.0.0'
-    SLF4J_API_VERSION = '1.8.0-beta4'
-    APACHE_MAVEN_ARTIFACT_VERSION = '3.8.5'
     JARJAR_VERSION = '0.3.19'
 
-    // These versions should be kept in sync with the version manifest JSON
-    // To use a version newer than the version manifest JSON, the dependency must be added to the installer configuration
-    MOJANG_LOGGING_VERSION = '1.1.1'
-    LOG4J_VERSION = '2.19.0'
-    GUAVA_VERSION = '31.1-jre'
-    GSON_VERSION = '2.10'
-    APACHE_COMMONS_LANG3_VERSION = '3.12.0'
-    JOPT_SIMPLE_VERSION = '5.0.4'
-    COMMONS_IO_VERSION = '2.11.0'
-
     GIT_INFO = gradleutils.gitInfo
     VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
     // FML_VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, 'FML', MC_VERSION)
     FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
 
-    BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.1.1:fatjar'
-    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
+    BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
+    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.1'
     JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
-    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
-    MIN_TAG_FOR_CHANGELOG = '41.0'
+    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.25:all'
+    MIN_TAG_FOR_CHANGELOG = "39.0"
+    LAST_RB = GIT_INFO.tag.rsplit('.', 1)[1] as int >= 1 ? GIT_INFO.tag + '.0' : null
 }
 
 println('Version: ' + VERSION +
@@ -106,7 +83,7 @@ def extraTxts = [
 ]
 
 task downloadVersionManifest(type: Download) {
-    src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'
+    src 'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json'
     dest file('build/versions/version_manifest.json')
     useETag 'all'
     onlyIfModified true
@@ -220,46 +197,53 @@ project(':mcp') {
     }
 }
 
-project(':clean') {
-    evaluationDependsOn(':mcp')
-    apply plugin: 'net.minecraftforge.gradle.patcher'
-    tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
+if (!System.env.TEAMCITY_VERSION) {
+    project(':clean') {
+        evaluationDependsOn(':mcp')
+        apply plugin: 'net.minecraftforge.gradle.patcher'
+        tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
 
-    dependencies {
-        implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
-    }
+        dependencies {
+            implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
+        }
 
-    patcher {
-        parent = project(':mcp')
-        mcVersion = MC_VERSION
-        patchedSrc = file('src/main/java')
+        patcher {
+            parent = project(':mcp')
+            mcVersion = MC_VERSION
+            patchedSrc = file('src/main/java')
 
-        mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
+            mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
 
-        runs {
-            clean_client {
-                client true
-                taskName 'clean_client'
-                ideaModule "${rootProject.name}.${project.name}.main"
+            runs {
+                clean_client {
+                    client true
+                    taskName 'clean_client'
+                    ideaModule "${rootProject.name}.${project.name}.main"
 
-                main 'net.minecraft.client.main.Main'
-                workingDirectory project.file('run')
+                    main 'net.minecraft.client.main.Main'
+                    workingDirectory project.file('run')
 
-                args '--gameDir', '.'
-                args '--version', MC_VERSION
-                args '--assetsDir', downloadAssets.output
-                args '--assetIndex', '{asset_index}'
-                args '--accessToken', '0'
+                    args '--gameDir', '.'
+                    args '--version', MC_VERSION
+                    args '--assetsDir', downloadAssets.output
+                    args '--assetIndex', '{asset_index}'
+                    args '--accessToken', '0'
+                }
+
+                clean_server {
+                    client false
+                    taskName 'clean_server'
+                    ideaModule "${rootProject.name}.${project.name}.main"
+
+                    main 'net.minecraft.server.Main'
+                    workingDirectory project.file('run')
+                }
             }
+        }
 
-            clean_server {
-                client false
-                taskName 'clean_server'
-                ideaModule "${rootProject.name}.${project.name}.main"
-
-                main 'net.minecraft.server.Main'
-                workingDirectory project.file('run')
-            }
+        // Disabling clean with CI causes an error if we don't have this...
+        compileJava {
+            dependsOn 'extractMapped'
         }
     }
 }
@@ -281,24 +265,25 @@ def sharedDeps = {
     installer "org.ow2.asm:asm-util:${ASM_VERSION}"
     installer "org.ow2.asm:asm-analysis:${ASM_VERSION}"
     installer "net.minecraftforge:accesstransformers:${ACCESSTRANSFORMERS_VERSION}"
-    installer 'org.antlr:antlr4-runtime:4.9.1' // Dep of AccessTransformer
+    installer 'org.antlr:antlr4-runtime:4.9.1' //Dep of AccessTransformer
     installer "net.minecraftforge:eventbus:${EVENTBUS_VERSION}"
     installer "net.minecraftforge:forgespi:${SPI_VERSION}"
-    installer "net.minecraftforge:coremods:${COREMODS_VERSION}"
+    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.minecrell:terminalconsoleappender:${TERMINALCONSOLEAPPENDER_VERSION}"
-    installer "org.jline:jline-reader:${JLINE_VERSION}"   // Dep of TerminalConsoleAppender
-    installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
+    installer 'com.electronwill.night-config:core:3.6.4'
+    installer 'com.electronwill.night-config:toml:3.6.4'
+    installer 'org.apache.maven:maven-artifact:3.6.3'
+    installer 'net.jodah:typetools:0.8.3'
+    installer 'net.minecrell:terminalconsoleappender:1.2.0'
+    installer 'org.jline:jline-reader:3.12.+'   //Dep of TerminaalConsoleeAppender
+    installer 'org.jline:jline-terminal:3.12.+' //Dep of TerminaalConsoleeAppender
     installer "org.spongepowered:mixin:${MIXIN_VERSION}"
-    installer 'org.openjdk.nashorn:nashorn-core:15.3'
+    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'
@@ -349,28 +334,10 @@ def sharedFmlonlyForge = { Project prj ->
     }
 
     prj.task([type: DownloadMavenArtifact], 'downloadInstaller') {
-        artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:shrunk"
+        artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:fatjar"
         changing = true
     }
 
-    prj.afterEvaluate {
-        [prj.tasks.universalJar, prj.tasks.installerJar].each { t ->
-            def signTask = prj.task([type: SignJar, dependsOn: t], "sign${t.name.capitalize()}") {
-                onlyIf {
-                    JAR_SIGNER != null && t.state.failure == null
-                }
-                def jarsigner = JAR_SIGNER == null ? [:] : JAR_SIGNER
-                alias = 'forge'
-                storePass = jarsigner.storepass
-                keyPass = jarsigner.keypass
-                keyStore = jarsigner.keystore
-                inputFile = t.archiveFile.get().asFile
-                outputFile = t.archiveFile.get().asFile
-            }
-            t.finalizedBy(signTask)
-        }
-    }
-
     prj.tasks.userdevConfig {
         def launchPrefix = prj.name == "forge" ? "forge" : "fml"
         getArtifacts(prj, prj.configurations.installer, true).each { key, lib -> libraries.add(lib.name) }
@@ -388,8 +355,7 @@ def sharedFmlonlyForge = { Project prj ->
                 environment 'MOD_CLASSES', '{source_roots}'
                 environment 'MCP_MAPPINGS', '{mcp_mappings}'
 
-                // Natives are loaded from the classpath now in all cases
-                // property 'nativesDirectory', '{natives}'
+                property 'nativesDirectory', '{natives}'
                 if (prj.name == 'forge') {
                     property 'forge.enableGameTest', 'true'
                 }
@@ -454,7 +420,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,java-objc-bridge-1.0.0.jar'
         if (userdevRuns.contains(run)) {
             run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
             run.jvmArgs '-p', '{modules}'
@@ -474,8 +440,7 @@ def sharedFmlonlyForge = { Project prj ->
         run.workingDirectory prj.file('run')
 
         if (run.name.contains('client') || run.name.contains('data')) {
-            // Natives are loaded from the classpath now in all cases
-            // run.property 'nativesDirectory', prj.extractNatives.output.get().asFile
+            run.property 'nativesDirectory', prj.extractNatives.output.get().asFile
             run.args '--assetsDir', prj.downloadAssets.output
             run.args '--assetIndex', "{asset_index}"
         }
@@ -553,6 +518,7 @@ def sharedFmlonlyForge = { Project prj ->
                 //rename 'run.sh',  "run_forge_${VERSION.replace('-', '_').sh"
                 //rename 'run.bat', "run_forge_${VERSION.replace('-', '_').bat"
             }
+            jarSigner.sign(it)
         }
     }
 }
@@ -568,7 +534,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}"
     }
 
@@ -596,7 +562,6 @@ project(':fmlonly') {
     dependencies {
         implementation project(':fmlcore')
         implementation project(':fmlloader')
-        implementation project(':fmlearlydisplay')
         implementation project(':javafmllanguage')
         implementation project(':lowcodelanguage')
         implementation project(':mclanguage')
@@ -633,7 +598,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 = [
@@ -668,7 +633,7 @@ project(':fmlonly') {
         }
     }
 
-    task installerJson(type: InstallerJson, dependsOn: 'signUniversalJar') {
+    task installerJson(type: InstallerJson, dependsOn: universalJar) {
         icon = rootProject.file('icon.ico')
         packedDependencies = PACKED_DEPS
 
@@ -878,26 +843,25 @@ project(':fmlonly') {
 
     // 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) }
+
+    // Disabling clean with CI causes an error if we don't have this...
+    compileJava {
+        dependsOn 'extractMapped'
+    }
 }
 
 project(':forge') {
-    evaluationDependsOn(':clean')
+    evaluationDependsOn(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
     apply plugin: 'java-library'
     apply plugin: 'net.minecraftforge.gradle.patcher'
     apply plugin: 'org.cadixdev.licenser'
 
-    applyPatches { 
-		verbose = true 
-		//failOnError = false
-	}
-
     sourceSets {
         main {
             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 {
@@ -932,7 +896,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}"
     }
 
@@ -952,7 +916,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')
@@ -962,13 +925,19 @@ project(':forge') {
 
     patcher {
         excs.from file("$rootDir/src/main/resources/forge.exc")
-        parent = project(':clean')
+        parent = project(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
         patches = file("$rootDir/patches/minecraft")
         patchedSrc = file('src/main/java')
         srgPatches = true
         accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
         sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")
 
+        // the clean project provides these. if we're not using it, we need to provide them ourselves
+        if (System.env.TEAMCITY_VERSION) {
+            mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
+            mcVersion = MC_VERSION
+        }
+
         runs {
             forge_client {
                 property 'eventbus.checkTypesOnDispatch', 'true'
@@ -1085,40 +1054,11 @@ project(':forge') {
                             '--mod', 'tag_based_tool_types',
                             '--mod', 'custom_transformtype_test',
                             '--mod', 'data_pack_registries_test',
-                            '--mod', 'biome_modifiers_test',
-                            '--mod', 'structure_modifiers_test',
-                            '--mod', 'custom_preset_editor_test',
                             '--output', rootProject.file('src/generated_test/resources/'),
                             '--existing', sourceSets.main.resources.srcDirs[0],
                             '--existing', sourceSets.test.resources.srcDirs[0]
                 }
             }
-
-            forge_mdk_data {
-                parent runs.forge_data
-                taskName 'forge_mdk_data'
-
-                environment 'MOD_CLASSES', 'dummy' // Needed to work around FG limitation, FG will replace this!
-
-                ideaModule "${rootProject.name}.${project.name}.test"
-
-                mods {
-                    tests { sources sourceSets.test }
-                }
-
-                afterEvaluate {
-                    // Clear forge's main datagen args
-                    args.removeAll {
-                        forgeDataArgs.contains(it instanceof File ? (it as File).absolutePath : it.toString())
-                    }
-
-                    args '--flat', '--all', '--validate',
-                            '--mod', 'mdk_datagen',
-                            '--output', rootProject.file('src/generated_mdk/resources/'),
-                            '--existing', sourceSets.main.resources.srcDirs[0],
-                            '--existing', sourceSets.test.resources.srcDirs[0]
-                }
-            }
         }
     }
 
@@ -1173,9 +1113,12 @@ project(':forge') {
         ]
     }
 
-    task crowdin(type: Crowdin) {
-        key = project.hasProperty('crowdinKey') ? project.crowdinKey : null
-        //TODO: Merge our english.json?
+    tasks.register('downloadCrowdin', Download) {
+        src 'https://files.minecraftforge.net/crowdin.zip'
+        dest file('build/crowdin.zip')
+        useETag 'all'
+        onlyIfModified true
+        quiet true
     }
 
     sharedFmlonlyForge.call(project)
@@ -1185,7 +1128,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
@@ -1211,31 +1154,12 @@ project(':forge') {
         }
     }
 
-    task findFinalizeSpawnTargets(type: BytecodePredicateFinder, dependsOn: ['createJoinedSRG']) {
-        jar = createJoinedSRG.output
-        output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
-        predicate = {
-            parent, node, insn ->
-                'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
-                && insn.getOpcode() == Opcodes.INVOKEVIRTUAL
-                && insn.name.equals('m_6518_')
-                && insn.desc.equals('(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;')
-        }
-    }
-
-    tasks.register('validateDeprecations', ValidateDeprecations) {
-        input = tasks.jar.archiveFile
-        mcVersion = MC_VERSION
-    }
-
-    tasks.jar.finalizedBy 'validateDeprecations'
-
     tasks.register('checkAll') {
         dependsOn 'checkLicenses'
         group = 'checks'
     }
     tasks.register('checkAllAndFix') {
-        dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses'
+        dependsOn 'findFieldInstanceChecks', 'checkLicenses'
         group = 'checks'
     }
 
@@ -1267,11 +1191,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
@@ -1330,7 +1249,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 = [
@@ -1366,7 +1285,7 @@ project(':forge') {
         }
     }
 
-    task installerJson(type: InstallerJson, dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches, 'signUniversalJar']) {
+    task installerJson(type: InstallerJson, dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches, universalJar]) {
         ext {
             // remove :fatjar
             BIN_PATCHER = BINPATCH_TOOL.substring(0, BINPATCH_TOOL.length() - 1 - BINPATCH_TOOL.split(':')[3].length())
@@ -1586,9 +1505,12 @@ project(':forge') {
         from extraTxts
 
         // add crowdin locales
-        from { crowdin.output.present && crowdin.output.get().asFile.exists() ? zipTree(crowdin.output) : null}
-        dependsOn crowdin
-        duplicatesStrategy = 'exclude'
+        from zipTree(downloadCrowdin.dest).matching {
+            include 'assets/forge/lang/*.json'
+        }
+
+        dependsOn downloadCrowdin
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
         doFirst {
             MANIFESTS.each{ pkg, values ->
@@ -1599,9 +1521,10 @@ project(':forge') {
                 }
             }
         }
+        jarSigner.sign(it)
     }
 
-    task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, 'signUniversalJar', launcherJson]) {
+    task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, universalJar, launcherJson]) {
         packedDependencies = PACKED_DEPS
         from(extraTxts)
         from(rootProject.file('/forge_installer_logo.png')) {
@@ -1640,15 +1563,11 @@ project(':forge') {
                 MAPPING_CHANNEL: MAPPING_CHANNEL,
                 MAPPING_VERSION: MAPPING_VERSION,
                 FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0],
-                MC_NEXT_VERSION: MC_NEXT_VERSION
+                MC_NEXT_VERSION: "1."+((MC_VERSION.split("[\\.-]")[1] as int)+1)
             ])
             rename 'gitignore\\.txt', '.gitignore'
             rename 'gitattributes\\.txt', '.gitattributes'
         }
-        from(rootProject.file('src/generated_mdk/resources/')) {
-            into('src/main/resources/')
-            exclude '**/.cache/'
-        }
     }
 
     license {
@@ -1666,9 +1585,14 @@ project(':forge') {
             }
         }
     }
+    
+    tasks.named('checkLicenseMain') {
+        mustRunAfter 'extractMapped'
+    }
 
-    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')
@@ -1684,83 +1608,6 @@ project(':forge') {
         sourceSets.test.java.srcDirs.each { extractMappedNew.addTarget it }
     }
 
-    tasks.named('javadoc', Javadoc).configure {
-        description 'Generates the combined javadocs for the FML projects and the main Forge project'
-        var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage' ]
-        source includedProjects.collect { project(it).sourceSets.main.allJava }
-        classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath })
-
-        var docsDir = rootProject.file('src/docs/')
-        inputs.dir(docsDir)
-            .withPropertyName('docs resources directory')
-            .withPathSensitivity(PathSensitivity.RELATIVE)
-            .optional()
-
-        failOnError = false
-
-        // Exclude the Minecraft classes if not enabled
-        if (!project.hasProperty('generateAllDocumentation')) {
-            exclude 'net/minecraft/**'
-            exclude 'com/mojang/**'
-        }
-        exclude 'mcp/**'
-
-        options.addStringOption('Xdoclint:all,-missing', '-public')
-        options {
-            stylesheetFile = new File(docsDir, 'stylesheet.css')
-
-            tags = [
-                'apiNote:a:<em>API Note:</em>',
-                'implSpec:a:<em>Implementation Requirements:</em>',
-                'implNote:a:<em>Implementation Note:</em>'
-            ]
-
-            groups = [
-                'Forge Mod Loader': [
-                    'net.minecraftforge.fml.common.asm*',
-                    'net.minecraftforge.fml.loading*',
-                    'net.minecraftforge.fml.server*'
-                ],
-                'FML Core':  [
-                    'net.minecraftforge.fml',
-                    'net.minecraftforge.fml.config*',
-                    'net.minecraftforge.fml.event*',
-                    'net.minecraftforge.fml.util*'
-                ],
-                'FML Common': [
-                    'net.minecraftforge.fml.core',
-                    'net.minecraftforge.fml.event.config',
-                    'net.minecraftforge.fml.event.lifecycle'
-                ],
-                'FML Java/MC Language Providers': [
-                    'net.minecraftforge.fml.common',
-                    'net.minecraftforge.fml.javafmlmod',
-                    'net.minecraftforge.fml.mclanguageprovider'
-                ],
-                'Minecraft Forge API': [
-                    'net.minecraftforge*'
-                ]
-            ]
-
-            author = false
-            noSince = true
-            noHelp = true
-
-            bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1."
-            windowTitle = "Minecraft Forge API ${VERSION}"
-            docTitle = "Minecraft Forge API - ${FORGE_VERSION} for Minecraft ${MC_VERSION}"
-            header = "<div style=\"margin-top: 9px;padding: 5px 6px;\"><strong>${FORGE_VERSION} for Minecraft ${MC_VERSION}</strong></div>"
-        }
-
-        doLast {
-            project.copy {
-                from docsDir
-                exclude '/stylesheet.css'
-                into destinationDir
-            }
-        }
-    }
-
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -1779,20 +1626,22 @@ project(':forge') {
     tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
     }
+
+    // Disabling clean with CI causes an error if we don't have this...
+    compileJava {
+        dependsOn 'extractMapped'
+    }
 }
 
 //evaluationDependsOnChildren()
 task setup() {  //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
-    dependsOn ':clean:extractMapped'
+    if (!System.env.TEAMCITY_VERSION)
+        dependsOn ':clean:extractMapped'
     if (symlinkValid)
         dependsOn ':fmlonly:extractMapped'
     dependsOn ':forge:extractMapped'
 }
 
-if (symlinkValid)
-    project.gradle.startParameter.excludedTaskNames.add(':fmlonly:genPatches')
-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.
@@ -1804,3 +1653,11 @@ if (System.env.TEAMCITY_VERSION) {
         }
     }
 }
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}

buildSrc/build.gradle

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

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

@@ -4,17 +4,20 @@ import groovy.json.JsonBuilder
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
 
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
 abstract class BytecodeFinder extends DefaultTask {
     @InputFile abstract RegularFileProperty getJar()
-    // It should be fine to mark the output as internal as we want to control when we run it anyways.
-    // This also shuts Gradle 8 up about implicit task dependencies.
-    @Internal abstract RegularFileProperty getOutput()
+    @OutputFile abstract RegularFileProperty getOutput()
 
     BytecodeFinder() {
         output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
@@ -30,7 +33,18 @@ abstract class BytecodeFinder extends DefaultTask {
 
         pre()
 
-        Util.processClassNodes(jar.get().asFile, this::process)
+        jar.get().asFile.withInputStream { i ->
+            new ZipInputStream(i).withCloseable { zin ->
+                ZipEntry zein
+                while ((zein = zin.nextEntry) != null) {
+                    if (zein.name.endsWith('.class')) {
+                        def node = new ClassNode(Opcodes.ASM9)
+                        new ClassReader(zin).accept(node, 0)
+                        process(node)
+                    }
+                }
+            }
+        }
 
         post()
         outputFile.text = new JsonBuilder(getData()).toPrettyString()

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

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

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

@@ -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)
-                }
-            }
-        }
-    }
-}

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

@@ -6,7 +6,7 @@ import org.gradle.api.provider.SetProperty
 
 abstract class InstallerJar extends Zip {
     @Input @Optional abstract SetProperty<String> getPackedDependencies()
-
+    
     InstallerJar() {
         archiveClassifier.set('installer')
         archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
@@ -15,7 +15,7 @@ abstract class InstallerJar extends Zip {
         def installerJson = project.tasks.installerJson
         def launcherJson = project.tasks.launcherJson
         def downloadInstaller = project.tasks.downloadInstaller
-
+        
         dependsOn(installerJson, launcherJson, downloadInstaller)
         from(installerJson, launcherJson)
 
@@ -24,13 +24,13 @@ abstract class InstallerJar extends Zip {
             from(project.zipTree(downloadInstaller.output)) {
                 duplicatesStrategy = 'exclude'
             }
-
-            if (!System.env.TEAMCITY_VERSION) {
+            
+            if (!System.env.MAVEN_USER) {
                 dependsOn(project.universalJar)
                 from(project.universalJar) {
                     into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/'
                 }
-
+    
                 packedDependencies.get().forEach {
                     def jarTask = project.rootProject.getTasks().findByPath(it)
                     dependsOn(jarTask)

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

@@ -32,7 +32,7 @@ class TeamcityRequests {
     @Nullable
     static Map<String, Build> buildsByCommit() throws IOException {
         final Map<String, Build> builds = [:]
-        jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
+        jsonRequest(new TypeToken<Builds>() {}, "https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),count:300,status:SUCCESS")
                 ?.build?.forEach {
             it.revisions.revision.each { rev -> builds[rev.version] = it }
         }

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

@@ -2,20 +2,13 @@ package net.minecraftforge.forge.tasks
 
 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.tree.ClassNode
 
 import java.io.File
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.Date
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
 
 public class Util {
-    static final ASM_LEVEL = Opcodes.ASM9
-
 	static void init() {
 		File.metaClass.sha1 = { ->
 			MessageDigest md = MessageDigest.getInstance('SHA-1')
@@ -81,6 +74,14 @@ public class Util {
 			if (!checkExists(url)) {
 				url = "https://maven.minecraftforge.net/${path}"
 			}
+			//TODO remove when Mojang launcher is updated
+			if (!classifiers && art.classifier != null) {
+				//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
+				// However, keep the path normal so that our mirror system works.
+				art.version = "${art.version}-${art.classifier}"
+				art.classifier = null
+				art.extension = 'jar'
+			}
 			ret[key] = [
 				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
 				downloads: [
@@ -147,19 +148,4 @@ public class Util {
         final ver = json.promos["$mcVersion-latest"]
         ver === null ? null : (mcVersion + '-' + ver)
     }
-
-    static void processClassNodes(File file, Closure process) {
-        file.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
-                    if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(ASM_LEVEL)
-                        new ClassReader(zin).accept(node, 0)
-                        process(node)
-                    }
-                }
-            }
-        }
-    }
 }

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

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

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

@@ -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()

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

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

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

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

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

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

docs/CONTRIBUTING.md

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

docs/README.md

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

docs/SUPPORT.md

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

fmlcore/build.gradle

@@ -10,12 +10,10 @@ apply plugin: 'org.javamodularity.moduleplugin'
 dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
 
 dependencies {
-    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
-
-    api("net.minecraftforge:eventbus:${EVENTBUS_VERSION}")
-
+    compileOnly('org.jetbrains:annotations:21.0.1')
     implementation(project(':fmlloader'))
-    implementation("commons-io:commons-io:${COMMONS_IO_VERSION}")
+    api('net.minecraftforge:eventbus:5.0.+')
+    implementation('commons-io:commons-io:2.5')
 }
 
 task sourcesJar(type: Jar) {
@@ -44,7 +42,6 @@ ext {
 }
 
 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
     MANIFESTS.each { pkg, values ->
         if (pkg == '')
             manifest.attributes(values)

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

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

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

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

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

@@ -8,92 +8,62 @@ package net.minecraftforge.fml;
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
-/**
- * An extension point for a mod container.
- *
- * <p>An extension point can be registered for a mod container using {@link ModContainer#registerExtensionPoint(Class, Supplier)}
- * and retrieved (if present) using {@link ModContainer#getCustomExtension(Class)}. An extension point allows a mod to
- * supply an arbitrary value as a record class to another mod or framework through their mod container class, avoiding
- * the use of {@link InterModComms} or other external frameworks to pass around these values.</p>
- *
- * <p>The usual way to declare an extension point is to implement this interface on a record class, with the type
- * parameter being a reference to the class itself. For example, {@code record MyExtension(...) extends
- * IExtensionPoint<MyExtension>} would declare an extension point which supplies a {@code MyExtension} object. However,
- * there is no hard requirement that an extension point's type parameter must be in reference to itself; the type
- * parameter may reference another record class instead.</p>
- *
- * @param <T> the type of the record which is held by the extension point
- */
-@SuppressWarnings("unused") // Type parameter T
 public interface IExtensionPoint<T extends Record>
 {
     /**
-     * Extension point for the compatibility display test used on the server selection screen.
+     * Compatibility display test for the mod.
+     * Used for displaying compatibility with remote servers with the same mod, and on disk saves.
      *
-     * <em>Note: "server" and "client" refers to the {@linkplain net.minecraftforge.api.distmarker.Dist#DEDICATED_SERVER dedicated server}
-     * and {@linkplain net.minecraftforge.api.distmarker.Dist#CLIENT game client} physical distributions, rather than the
-     * {@linkplain LogicalSide logical server and client}.</em>
+     * The supplier provides my "local" version for sending across the impl or writing to disk
+     * The predicate tests the version from a remote instance or save for acceptability (Boolean is true for impl, false for local save)
+     * and returns true if the version is compatible.
      *
-     * <p>The {@link Supplier} provides the local compatibility version, which is sent from the server to the client
-     * for multiplayer connections or stored to disk for the world save. The {@link BiPredicate} accepts the remote
-     * compatibility version and a boolean indicating whether the remote version is from the server or a world save,
-     * where {@code true} means it is from the server and {@code false} means it is from the world save. The return
-     * value of the predicate determines whether the remote version is "compatible" for the purposes of the display test.</p>
+     * <p>Return {@code net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY} in the supplier, if you wish to be ignored
+     * as a server side only mod.</p>
+     * <p>Return true in the predicate for all values of the input string (when impl boolean is true) if you are client side,
+     * and don't care about matching any potential server version.</p>
      *
-     * <p>The local compatibility version may be of the value {@link net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY},
-     * in which case clients will ignore the mod's presence if it is present on the server but not on the client.
-     * However, the remote version test predicate must still accept this value as a remote version in order to display
-     * as compatible if the mod is present on the client.</p>
-     *
-     * <p><strong>The compatibility display test does not necessarily indicate the success or failure of an actual
-     * connection attempt.</strong> Factors such as display test extension misconfiguration, truncation of ping data,
-     * difference of registry data or network channels between server and client, and others may cause the result of the
-     * compatibility test to not reflect the actual likelihood of a connection successfully being established between
-     * the server and the client.</p>
-     *
-     * <p>An example declaration of a display test extension registration for a regular mod (requires to be present on
-     * server and client) is as follows:</p>
+     * <p>
+     * Examples: A server only mod
+     * </p>
      * <pre>{@code
-     * String compatibilityVersion = "1"; // Could be linked with a network channel version or mod version
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 () -> compatibilityVersion,
-     *                 (remoteVersion, isFromServer) -> remoteVersion.equals(compatibilityVersion)
-     *         )
-     * );
+     *     registerExtensionPoint(DisplayTest.class, ()->new DisplayTest(
+     *      ()->NetworkConstants.IGNORESERVERONLY, // ignore me, I'm a server only mod
+     *      (s,b)->true // i accept anything from the server or the save, if I'm asked
+     *     )
      * }</pre>
      *
-     * <p>An example declaration of a display test extension registration for a <em>server-side-only</em> mod (does not
-     * require to be present on the client) is as follows:</p>
+     * <p>
+     * Examples: A client only mod
+     * </p>
      * <pre>{@code
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 // Ignore this mod if not present on the client
-     *                 () -> NetworkConstants.IGNORESERVERONLY,
-     *                 // If present on the client, accept any version if from a server
-     *                 (remoteVersion, isFromServer) -> isFromServer
-     *         )
-     * );
+     *     registerExtensionPoint(DisplayTest.class, ()->new DisplayTest(
+     *      ()->"anything. i don't care", // if i'm actually on the server, this string is sent but i'm a client only mod, so it won't be
+     *      (remoteversionstring,networkbool)->networkbool // i accept anything from the server, by returning true if it's asking about the server
+     *     )
      * }</pre>
      *
-     * <p>An example declaration of a display test extension registration for a <em>client-side-only</em> mod (does not
-     * require to be present on the server) is as follows:</p>
-     * <pre>{@code
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 // Send any version from server to client, since we will be accepting any version as well
-     *                 () -> "dQw4w9WgXcQ",
-     *                 // Accept any version on the client, from server or from save
-     *                 (remoteVersion, isFromServer) -> true
-     *         )
-     * );
-     * }</pre>
-     *
-     * @see net.minecraftforge.network.ServerStatusPing
-     * @see net.minecraftforge.client.ForgeHooksClient#processForgeListPingData(net.minecraft.network.protocol.status.ServerStatus, net.minecraft.client.multiplayer.ServerData)
      */
-    @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
     record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
         public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
+
+        /**
+         * Ignores any version information coming from the server - use for server only mods
+         */
+        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
+
+        /**
+         * Ignores all information and provides no information
+         */
+        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
+
+        /**
+         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
+         * instead of a {@link Supplier}.
+         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
+         */
+        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+            this(() -> version, remoteVersionTest);
+        }
     }
-}
+}

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

@@ -7,92 +7,24 @@ 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.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 import java.util.function.Function;
-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,
- * grouped into various {@link ModLoadingPhase phases}.
- *
- * @see IModStateProvider
- */
 public interface IModLoadingState {
-    /**
-     * {@return the name of this state}
-     */
     String name();
-
-    /**
-     * {@return the name of the state immediately previous to this state} This may be a blank name, which indicates this
-     * is either the first mod loading state or an exceptional mod loading state (such as a situation where errors
-     * prevent the loading process from continuing normally).
-     */
     String previous();
-
-    /**
-     * {@return the mod loading phase this state belongs to} For exceptional mod loading states, this should be
-     * {@link ModLoadingPhase#ERROR}.
-     */
     ModLoadingPhase phase();
-
-    /**
-     * {@return a function returning a human-friendly message for this state}
-     */
     Function<ModList, String> message();
-
-    /**
-     * @return 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)
-     */
     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 parallelExecutor a parallel executor
-     * @param progressBar      a progress meter for tracking progress
-     * @return a transition task for this state
-     * @see #buildTransition(Executor, Executor, ProgressMeter, 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,
-                e -> CompletableFuture.runAsync(() -> {}, e),
-                e -> CompletableFuture.runAsync(() -> {}, e));
+    default <T extends Event & IModBusEvent> Optional<CompletableFuture<List<Throwable>>> buildTransition(final Executor syncExecutor, final Executor parallelExecutor) {
+        return buildTransition(syncExecutor, parallelExecutor, e->CompletableFuture.runAsync(()->{}, e), e->CompletableFuture.runAsync(()->{}, e));
     }
 
-    /**
-     * 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 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
-     * @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);
+    <T extends Event & IModBusEvent> Optional<CompletableFuture<List<Throwable>>> buildTransition(Executor syncExecutor, Executor parallelExecutor, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask);
 }

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

@@ -7,15 +7,6 @@ package net.minecraftforge.fml;
 
 import java.util.List;
 
-/**
- * Provides a list of mod loading states which the mod loader may transition between.
- *
- * <p>There may be multiple mod state providers in a single application, where all states from each provider is
- * combined into a single list and ordered.</p>
- */
 public interface IModStateProvider {
-    /**
-     * {@return the list of mod loading states known to this provider}
-     */
     List<IModLoadingState> getAllStates();
 }

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

@@ -7,9 +7,9 @@ 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.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -24,32 +24,18 @@ public interface IModStateTransition {
         return new NoopTransition();
     }
 
-    default <T extends Event & IModBusEvent>
-    CompletableFuture<Void> build(final String name,
-                                  final Executor syncExecutor,
-                                  final Executor parallelExecutor,
-                                  final ProgressMeter progressBar,
-                                  final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                  final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-
+    default <T extends Event & IModBusEvent> CompletableFuture<List<Throwable>> build(Executor syncExecutor, Executor parallelExecutor, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
+        List<CompletableFuture<List<Throwable>>> cfs = new ArrayList<>();
         this.eventFunctionStream().get()
-                .map(f -> (EventGenerator<T>) f)
-                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
-
+                .map(f->(EventGenerator<T>)f)
+                .reduce((head, tail)-> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, cfs, head, ModLoadingStage::currentState, tail))
+                .ifPresent(last-> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, cfs, last, nextModLoadingStage(), null));
         final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        final CompletableFuture<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);
-                    return null;
-                });
+        final CompletableFuture<List<Throwable>> eventDispatchCF = ModList.gather(cfs).thenCompose(ModList::completableFutureFromExceptionList);
+        final CompletableFuture<List<Throwable>> postEventDispatchCF = preSyncTaskCF.thenComposeAsync(n -> eventDispatchCF, parallelExecutor).thenApply(r -> {
+            postSyncTask.apply(syncExecutor);
+            return r;
+        });
         return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
     }
 
@@ -57,32 +43,18 @@ public interface IModStateTransition {
         return ModLoadingStage::nextState;
     }
 
-    private <T extends Event & IModBusEvent>
-    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) {
-        final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
-
-        var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
-        completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
-
-        var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
-        completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
-
+    private <T extends Event & IModBusEvent> EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor, final Executor parallelExecutor, final List<CompletableFuture<List<Throwable>>> completeableFutures, final EventGenerator<T> eventGenerator, BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState, final EventGenerator<T> nextGenerator) {
+        completeableFutures.add(((BiFunction<Executor, EventGenerator<T>, CompletableFuture<List<Throwable>>>)preDispatchHook()).apply(threadSelector().apply(syncExecutor, parallelExecutor), eventGenerator));
+        completeableFutures.add(ModList.get().futureVisitor(eventGenerator, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
+        completeableFutures.add(((BiFunction<Executor, EventGenerator<T>, CompletableFuture<List<Throwable>>>)postDispatchHook()).apply(threadSelector().apply(syncExecutor, parallelExecutor), eventGenerator));
         return nextGenerator;
     }
 
     Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
     ThreadSelector threadSelector();
-    BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
+    BiFunction<Executor, CompletableFuture<List<Throwable>>, CompletableFuture<List<Throwable>>> finalActivityGenerator();
+    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> preDispatchHook();
+    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> postDispatchHook();
 
     interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
         static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
@@ -104,17 +76,17 @@ record NoopTransition() implements IModStateTransition {
     }
 
     @Override
-    public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
+    public BiFunction<Executor, CompletableFuture<List<Throwable>>, CompletableFuture<List<Throwable>>> finalActivityGenerator() {
         return (e, t) -> t.thenApplyAsync(Function.identity(), e);
     }
 
     @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
+    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> preDispatchHook() {
+        return (t, f)-> CompletableFuture.completedFuture(Collections.emptyList());
     }
 
     @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
+    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<List<Throwable>>> postDispatchHook() {
+        return (t, f)-> CompletableFuture.completedFuture(Collections.emptyList());
     }
 }

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

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

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

@@ -5,41 +5,12 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.api.distmarker.Dist;
-
-/**
- * A logical side of the Minecraft game.
- * <p>
- * The {@linkplain Dist#CLIENT client distribution} has a copy of the logical client and the logical server, while the
- * {@linkplain Dist#DEDICATED_SERVER dedicated server distribution} only holds
- * the logical server.
- *
- * @see Dist
- */
 public enum LogicalSide
 {
-    /**
-     * The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
-     * viewpoint.
-     * <p>
-     * The logical client is only shipped with the client distribution of the game.
-     *
-     * @see Dist#CLIENT
-     */
-    CLIENT,
-    /**
-     * The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
-     * on the level.
-     * <p>
-     * The logical server is shipped with both client and dedicated server distributions. The client distribution runs
-     * the logical server for singleplayer mode and LAN play.
-     *
-     * @see Dist#DEDICATED_SERVER
-     */
-    SERVER;
+    CLIENT, SERVER;
 
     /**
-     * {@return if this logical side is the server}
+     * @return if the logical side is a server.
      */
     public boolean isServer()
     {
@@ -47,7 +18,7 @@ public enum LogicalSide
     }
 
     /**
-     * {@return if the logical side is the client}
+     * @return if the logical side is a client.
      */
     public boolean isClient()
     {

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

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

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

@@ -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;
@@ -22,7 +21,7 @@ import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -55,7 +54,6 @@ public class ModList
     private List<ModContainer> mods;
     private Map<String, ModContainer> indexedMods;
     private List<ModFileScanData> modFileScanData;
-    private List<ModContainer> sortedContainers;
 
     private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
     {
@@ -113,22 +111,21 @@ public class ModList
         return this.fileById.get(modid);
     }
 
-    <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
+    <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<List<Throwable>>> 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);
     }
-    static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
+    static CompletionStage<List<Throwable>> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
         if (t.stream().noneMatch(e->e.getValue()!=null)) {
-            return CompletableFuture.completedFuture(null);
+            return CompletableFuture.completedFuture(Collections.emptyList());
         } else {
             final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
-            CompletableFuture<Void> cf = new CompletableFuture<>();
+            CompletableFuture<List<Throwable>> cf = new CompletableFuture<>();
             final RuntimeException accumulator = new RuntimeException();
             cf.completeExceptionally(accumulator);
             throwables.forEach(exception -> {
@@ -159,7 +156,6 @@ public class ModList
     void setLoadedMods(final List<ModContainer> modContainers)
     {
         this.mods = modContainers;
-        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
         this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
     }
 
@@ -223,10 +219,6 @@ public class ModList
         indexedMods.forEach(modContainerConsumer);
     }
 
-    public void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
-        this.sortedContainers.forEach(containerConsumer);
-    }
-
     public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
         return indexedMods.values().stream().map(function);
     }

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

@@ -8,23 +8,23 @@ package net.minecraftforge.fml;
 import com.google.common.collect.ImmutableList;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.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;
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;
@@ -83,8 +83,7 @@ public class ModLoader
     private final ModStateManager stateManager;
     private boolean loadingStateValid;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
-    private final Set<IModLoadingState> completedStates = new HashSet<>();
+    private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
     private ModList modList;
 
     private ModLoader()
@@ -98,7 +97,7 @@ public class ModLoader
                 .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
                 .collect(Collectors.toList());
         FMLLoader.getLoadingModList().getModFiles().stream()
-                .filter(ModFileInfo::missingLicense)
+                .filter(ModFileInfo::missingLicense) //Search for files with missing licenses
                 .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
                 .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
                 .forEach(this.loadingExceptions::add);
@@ -135,35 +134,19 @@ public class ModLoader
      * @param periodicTask Optional periodic task to perform on the main thread while other activities run
      */
     public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
-        ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
         loadingStateValid = true;
+        statusConsumer.ifPresent(c->c.accept("Waiting for scan to complete"));
         FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
+        statusConsumer.ifPresent(c->c.accept("Loading mods"));
         final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
                 loadingModList.getMods());
         if (!this.loadingExceptions.isEmpty()) {
             LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
             modList.setLoadedMods(Collections.emptyList());
             loadingStateValid = false;
             throw new LoadingFailedException(loadingExceptions);
         }
-        List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
-                .map(ModInfo::getForgeFeatures)
-                .flatMap(Collection::stream)
-                .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
-                .toList();
-
-        if (!failedBounds.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
-            statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(failedBounds.stream()
-                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, 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,55 +154,50 @@ 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));
-        completedStates.add(state);
+        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));
     }
 
-    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));
     }
-    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
+
+    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<List<Throwable>> transition) {
         while (!transition.isDone()) {
             syncExecutor.drive(ticker);
         }
@@ -233,7 +211,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 +219,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);
         }
     }
@@ -259,22 +235,10 @@ public class ModLoader
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
         if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
-
             LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                     modFile.getFilePath(),
-                    containers.size(), containerIds,
-                    modInfoMap.size(), modIds);
-
-            var missingClasses = new ArrayList<>(modIds);
-            missingClasses.removeAll(containerIds);
-            LOGGER.fatal(LOADING, "The following classes are missing, but are reported in the mods.toml: {}", missingClasses);
-
-            var missingMods = new ArrayList<>(containerIds);
-            missingMods.removeAll(modIds);
-            LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
-
+                    containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList()),
+                    modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList()));
             loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
         }
         // remove errored mod containers
@@ -305,17 +269,12 @@ public class ModLoader
         return get().loadingStateValid;
     }
 
-    public boolean hasCompletedState(final String stateName) {
-        IModLoadingState state = stateManager.findState(stateName);
-        return completedStates.contains(state);
-    }
-
     public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
             return;
         }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
+        ModList.get().forEachModContainer((id, mc) -> mc.acceptEvent(generator.apply(mc)));
     }
 
     public <T extends Event & IModBusEvent> void postEvent(T e) {
@@ -323,29 +282,7 @@ public class ModLoader
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
             return;
         }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-    }
-    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return e;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-        return e;
-    }
-    public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
-        postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
-    }
-    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> {
-            pre.accept(mc, e);
-            mc.acceptEvent(e);
-            post.accept(mc, e);
-        });
+        ModList.get().forEachModContainer((id, mc) -> mc.acceptEvent(e));
     }
 
     public List<ModLoadingWarning> getWarnings()

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

@@ -5,18 +5,14 @@
 
 package net.minecraftforge.fml;
 
-import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.config.IConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.loading.FMLLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
 public class ModLoadingContext
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
     private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
     private Object languageExtension;
     private ModLoadingStage stage;
@@ -50,25 +46,49 @@ public class ModLoadingContext
         getActiveContainer().registerExtensionPoint(point, extension);
     }
 
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        if (spec.isEmpty())
-        {
-            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
-            return;
-        }
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
+     */
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        getActiveContainer().registerDisplayTest(() -> displayTest);
+    }
 
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
+     */
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        getActiveContainer().registerDisplayTest(displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
+     */
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
+     */
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
+    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
         getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        if (spec.isEmpty())
-        {
-            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
-            return;
-        }
-
         getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
     }
 

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

@@ -5,34 +5,10 @@
 
 package net.minecraftforge.fml;
 
-/**
- * Phases of mod loading, for grouping mod loading states.
- */
 public enum ModLoadingPhase {
-    /**
-     * Special phase for exceptional situations and error handling, where mod loading cannot continue normally.
-     *
-     * <p>There is conventionally only one state with this phase.</p>
-     */
     ERROR, // Special state for error handling
-    /**
-     * Phase for discovering and gathering mods for loading.
-     */
     GATHER,
-    /**
-     * Phase for the loading of mods found from mod discovery.
-     *
-     * @see #GATHER
-     */
     LOAD,
-    /**
-     * Phase after mod loading has completed, for post-loading tasks.
-     *
-     * @see #LOAD
-     */
     COMPLETE,
-    /**
-     * Marker phase for the last state in the full mod loading process.
-     */
-    DONE
+    DONE;
 }

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

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

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

@@ -7,96 +7,32 @@ 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.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.ToIntFunction;
 
-/**
- * Implementation of the {@link IModLoadingState} interface.
- *
- * @param name           the name of this state
- * @param previous       the name of the state immediately previous to this state
- * @param message        a function returning a human-friendly message for this state
- * @param phase          the mod loading phase this state belongs to
- * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
- * @param transition     optional state transition information
- */
-public record ModLoadingState(String name, String previous,
-                              Function<ModList, String> message,
-                              ToIntFunction<ModList> size,
-                              ModLoadingPhase phase,
-                              Optional<Consumer<ModList>> inlineRunnable,
-                              Optional<IModStateTransition> transition) implements IModLoadingState {
+public record ModLoadingState(String name, String previous, Function<ModList, String> message, ModLoadingPhase phase, Optional<Consumer<ModList>> inlineRunnable, Optional<IModStateTransition> transition) implements IModLoadingState {
     @Override
-    public <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final 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));
+    public <T extends Event & IModBusEvent> Optional<CompletableFuture<List<Throwable>>> buildTransition(final Executor syncExecutor, final Executor parallelExecutor, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
+        return transition.map(t->t.build(syncExecutor, parallelExecutor, preSyncTask, postSyncTask));
     }
 
-    /**
-     * {@return an empty mod loading state} The mod loading state has a blank human-readable message, no inline runnable,
-     * and no state transition information.
-     *
-     * @param name     the name of the state
-     * @param previous the name of the immediately previous state to this state
-     * @param phase    the mod loading phase the state belongs to
-     */
     public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
+        return new ModLoadingState(name, previous, ml->"", phase, Optional.empty(), Optional.empty());
     }
 
-    /**
-     * Returns a mod loading state with state transition information and a default human-friendly message of
-     * {@code Processing transition [name]}.
-     *
-     * @param name       the name of the state
-     * @param previous   the name of the immediately previous state to this state
-     * @param phase      the mod loading phase the state belongs to
-     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a default message
-     */
-    public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
-                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
+    public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase, IModStateTransition transition) {
+        return new ModLoadingState(name, previous, ml->"Processing transition "+name, phase, Optional.empty(), Optional.of(transition));
     }
 
-    /**
-     * Returns a mod loading state with state transition information and a custom human-friendly message function.
-     *
-     * @param name       the name of the state
-     * @param previous   the name of the immediately previous state to this state
-     * @param message    a function returning a human-friendly message for this state
-     * @param phase      the mod loading phase the state belongs to
-     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a custom message
-     */
-    public static ModLoadingState withTransition(final String name, final String previous,
-                                                 final Function<ModList, String> message, final ModLoadingPhase phase,
-                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
+    public static ModLoadingState withTransition(final String name, final String previous, final Function<ModList, String> message, final ModLoadingPhase phase, IModStateTransition transition) {
+        return new ModLoadingState(name, previous, message, phase, Optional.empty(), Optional.of(transition));
     }
-
-    /**
-     * Returns a mod loading state with an inline runnable and a default human-friendly message of {@code Processing
-     * work [name]}.
-     *
-     * @param name     the name of the state
-     * @param previous the name of the immediately previous state to this state
-     * @param phase    the mod loading phase the state belongs to
-     * @param inline   an optional runnable, which runs before starting the transition from this state to the next
-     * @return a mod loading state with an inline runnable and default message
-     */
-    public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
-                                             final Consumer<ModList> inline) {
-        return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
+    public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase, Consumer<ModList> inline) {
+        return new ModLoadingState(name, previous, ml->"Processing work "+name, phase, Optional.of(inline), Optional.empty());
     }
 }

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

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

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

@@ -23,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);
         }

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

@@ -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();
     }
 }

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

@@ -104,7 +104,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;

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

@@ -10,11 +10,11 @@ import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.electronwill.nightconfig.core.file.FileWatcher;
 import com.electronwill.nightconfig.core.io.ParsingException;
 import com.electronwill.nightconfig.core.io.WritingMode;
-import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.FMLConfig;
 import net.minecraftforge.fml.loading.FMLPaths;
 import org.apache.commons.io.FilenameUtils;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -24,9 +24,9 @@ import java.util.function.Function;
 import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
 
 public class ConfigFileTypeHandler {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.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) -> {

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

@@ -7,18 +7,18 @@ package net.minecraftforge.fml.config;
 
 import com.electronwill.nightconfig.core.CommentedConfig;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
 
 import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ConfigTracker {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
+    private static final Logger LOGGER = LogManager.getLogger();
+    static final Marker CONFIG = MarkerManager.getMarker("CONFIG");
     public static final ConfigTracker INSTANCE = new ConfigTracker();
     private final ConcurrentHashMap<String, ModConfig> fileMap;
     private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets;
@@ -66,12 +66,8 @@ public class ConfigTracker {
     private void closeConfig(final ModConfig config, final Path configBasePath) {
         if (config.getConfigData() != null) {
             LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
-            // stop the filewatcher before we save the file and close it, so reload doesn't fire
-            config.getHandler().unload(configBasePath, config);
-            var unloading = IConfigEvent.unloading(config);
-            if (unloading != null)
-                config.fireEvent(unloading);
             config.save();
+            config.getHandler().unload(configBasePath, config);
             config.setConfigData(null);
         }
     }

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

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

fmlearlydisplay/build.gradle

@@ -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
-}

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/ColourScheme.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);
-        }
-    }
-}

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

@@ -1,617 +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.GLFWImage;
-import org.lwjgl.glfw.GLFWVidMode;
-import org.lwjgl.stb.STBImage;
-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.ByteBuffer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-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.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.atomic.AtomicBoolean;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-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;
-    private ElementShader elementShader;
-
-    private RenderElement.DisplayContext context;
-    private List<RenderElement> elements;
-    private int framecount;
-    private EarlyFramebuffer framebuffer;
-    private ScheduledFuture<?> windowTick;
-
-    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 {
-                var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Paths.get("options.txt")));
-                var options = optionLines.stream().map(l -> l.split(":")).filter(a -> a.length == 2).collect(Collectors.toMap(a -> a[0], a -> a[1]));
-                var colourScheme = Boolean.parseBoolean(options.getOrDefault("darkMojangStudiosBackground", "false"));
-                this.colourScheme = colourScheme ? ColourScheme.BLACK : ColourScheme.RED;
-            } catch (IOException ioe) {
-                // No options
-                this.colourScheme = ColourScheme.RED; // default 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<>(Arrays.asList(
-                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);
-        glfwSwapInterval(0);
-        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);
-        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);
-        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);
-        }
-
-        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);
-        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);
-            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, "Minecraft: Forge Loading...", 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;
-
-        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) {
-        // 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();
-        var methods = Arrays.stream(clz.getMethods()).filter(m-> Modifier.isStatic(m.getModifiers())).collect(Collectors.toMap(Method::getName, Function.identity()));
-        loadingOverlay = methods.get("newInstance");
-    }
-
-    public int getFramebufferTextureId() {
-        return framebuffer.getTexture();
-    }
-
-    public RenderElement.DisplayContext context() {
-        return this.context;
-    }
-
-    @Override
-    public void periodicTick() {
-        glfwPollEvents();
-        repaintTick.run();
-    }
-
-    public void addMojangTexture(final int textureId) {
-        this.elements.add(0, RenderElement.mojang(textureId, framecount));
-//        this.elements.get(0).retire(framecount + 1);
-    }
-
-    public void close() {
-        // Close the Render Scheduler thread
-        renderScheduler.shutdown();
-        this.framebuffer.close();
-        this.context.elementShader().close();
-        SimpleBufferBuilder.destroy();
-    }
-}

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

@@ -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);
-    }
-}

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

@@ -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;
-    }
-}

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

@@ -1,47 +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 java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryUsage;
-
-public class PerformanceInfo {
-
-    private final OperatingSystemMXBean osBean;
-    private final MemoryMXBean memoryBean;
-    float memory;
-    private String text;
-
-    PerformanceInfo() {
-        osBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class);
-        memoryBean = ManagementFactory.getMemoryMXBean();
-    }
-
-    void update() {
-        final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
-        memory = (float) heapusage.getUsed() / heapusage.getMax();
-        var cpuLoad = osBean.getProcessCpuLoad();
-        String cpuText;
-        if (cpuLoad == -1) {
-            cpuText = String.format("*CPU: %.1f%%", osBean.getCpuLoad() * 100f);
-        } else {
-            cpuText = String.format("CPU: %.1f%%", cpuLoad * 100f);
-        }
-
-        text = String.format("Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s", heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
-    }
-
-    String text() {
-        return text;
-    }
-
-    float memory() {
-        return memory;
-    }
-}

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

@@ -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();
-    }
-}

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

@@ -1,344 +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);
-            };
-        }
-    }
-    interface TextureRenderer {
-        void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
-    }
-    interface Initializer extends Supplier<Renderer> {}
-
-    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);
-    }
-
-    interface ColourFunction {
-        int colour(int frame);
-    }
-
-    interface ProgressDisplay {
-        float[] progress(int frame);
-    }
-
-    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 num > max ? max : num;
-        }
-    }
-
-    public static int clamp(int num, int min, int max) {
-        if (num < min) {
-            return min;
-        } else {
-            return num > max ? max : num;
-        }
-    }
-
-    public static int hsvToRGB(float hue, float saturation, float value) {
-        int i = (int)(hue * 6.0F) % 6;
-        float f = hue * 6.0F - (float)i;
-        float f1 = value * (1.0F - saturation);
-        float f2 = value * (1.0F - f * saturation);
-        float f3 = value * (1.0F - (1.0F - f) * saturation);
-        float f4;
-        float f5;
-        float f6;
-        switch(i) {
-            case 0:
-                f4 = value;
-                f5 = f3;
-                f6 = f1;
-                break;
-            case 1:
-                f4 = f2;
-                f5 = value;
-                f6 = f1;
-                break;
-            case 2:
-                f4 = f1;
-                f5 = value;
-                f6 = f3;
-                break;
-            case 3:
-                f4 = f1;
-                f5 = f2;
-                f6 = value;
-                break;
-            case 4:
-                f4 = f3;
-                f5 = f1;
-                f6 = value;
-                break;
-            case 5:
-                f4 = value;
-                f5 = f1;
-                f6 = f2;
-                break;
-            default:
-                throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + hue + ", " + saturation + ", " + value);
-        }
-
-        int j = clamp((int)(f4 * 255.0F), 0, 255);
-        int k = clamp((int)(f5 * 255.0F), 0, 255);
-        int l = clamp((int)(f6 * 255.0F), 0, 255);
-        return 0xFF << 24 | j << 16 | k << 8 | l;
-    }
-}

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

@@ -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);
-    }
-}

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

@@ -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);
-            }
-        }
-    }
-}

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

@@ -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;
-    }
-
-}

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

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

fmlearlydisplay/src/main/resources/glfailure.txt

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

fmlloader/build.gradle

@@ -11,37 +11,32 @@ dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
 configurations.forEach{ it.transitive = false }
 
 dependencies {
-    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
-
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4')
+    compileOnly('org.jetbrains:annotations:23.0.0')
     api("org.ow2.asm:asm:${ASM_VERSION}")
     api("org.ow2.asm:asm-tree:${ASM_VERSION}")
     api("org.ow2.asm:asm-commons:${ASM_VERSION}")
     api("net.minecraftforge:forgespi:${SPI_VERSION}")
-    api("net.minecraftforge:mergetool:${MERGETOOL_VERSION}:api")
-    api("org.apache.logging.log4j:log4j-api:${LOG4J_VERSION}")
-    api("org.slf4j:slf4j-api:${SLF4J_API_VERSION}")
-    api("com.google.guava:guava:${GUAVA_VERSION}")
-    api("com.google.code.gson:gson:${GSON_VERSION}")
-    api("org.apache.maven:maven-artifact:${APACHE_MAVEN_ARTIFACT_VERSION}")
-    api("org.apache.commons:commons-lang3:${APACHE_COMMONS_LANG3_VERSION}")
-    api("com.electronwill.night-config:core:${NIGHTCONFIG_VERSION}")
-    api("com.electronwill.night-config:toml:${NIGHTCONFIG_VERSION}")
-    api("cpw.mods:modlauncher:${MODLAUNCHER_VERSION}")
-    api("net.minecraftforge:coremods:${COREMODS_VERSION}")
-    api("com.mojang:logging:${MOJANG_LOGGING_VERSION}")
+    api('org.apache.logging.log4j:log4j-api:2.17.0')
+    api('org.slf4j:slf4j-api:1.8.0-beta4')
+    api('com.google.guava:guava:21.0')
+    api('com.google.code.gson:gson:2.8.9')
+    api('org.apache.maven:maven-artifact:3.8.1')
+    api('org.apache.commons:commons-lang3:3.12.0')
+    api('com.electronwill.night-config:core:3.6.4')
+    api('com.electronwill.night-config:toml:3.6.4')
+    api('cpw.mods:modlauncher:9.0.+')
+    api('net.minecraftforge:coremods:5.0.+')
     api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
     api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
 
-    implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
     implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
-    implementation("net.minecraftforge:accesstransformers:${ACCESSTRANSFORMERS_VERSION}")
-    implementation("net.minecrell:terminalconsoleappender:${TERMINALCONSOLEAPPENDER_VERSION}")
-    // implementation("org.jline:jline:${JLINE_VERSION}")
-
-    implementation("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
-    annotationProcessor("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
-
-    testCompileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
+    implementation('org.apache.logging.log4j:log4j-core:2.17.0')
+    annotationProcessor('org.apache.logging.log4j:log4j-core:2.17.0')
+    implementation('net.minecraftforge:accesstransformers:8.0.4')
+    implementation('net.minecrell:terminalconsoleappender:1.2.0')
+//    implementation('org.jline:jline:3.12.+')
+    testCompileOnly('org.jetbrains:annotations:21.0.0')
     testRuntimeOnly("cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}")
 }
 
@@ -70,7 +65,6 @@ ext {
 }
 
 jar.doFirst {
-    manifest.attributes['Automatic-Module-Name'] = project.name
     MANIFESTS.each { pkg, values ->
         manifest.attributes(values, pkg)
     }

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

@@ -7,11 +7,7 @@ package net.minecraftforge.fml.common.asm;
 
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -24,17 +20,7 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
  * Will also de-finalize all fields in on class level annotations.
  */
 public class ObjectHolderDefinalize implements ILaunchPluginService {
-    // Hardcoded map of vanilla classes that should have object holders for each field of the given registry type.
-    // IMPORTANT: Updates to this collection must be reflected in ObjectHolderRegistry. Duplicated cuz classloaders, yay!
-    // Classnames are validated in ObjectHolderRegistry.
-    private static final Map<String, VanillaObjectHolderData> VANILLA_OBJECT_HOLDERS = Stream.of(
-            new VanillaObjectHolderData("net.minecraft.world.level.block.Blocks", "block", "net.minecraft.world.level.block.Block"),
-            new VanillaObjectHolderData("net.minecraft.world.item.Items", "item", "net.minecraft.world.item.Item"),
-            new VanillaObjectHolderData("net.minecraft.world.item.enchantment.Enchantments", "enchantment", "net.minecraft.world.item.enchantment.Enchantment"),
-            new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
-            new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
-            new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
-    ).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
+
     private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
 
     @Override
@@ -42,6 +28,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
         return "object_holder_definalize";
     }
 
+
     private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
@@ -86,8 +73,10 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
             changes.compareAndSet(false, prev != f.access);
         });
 
-        if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
+        if (hasHolder(classNode.visibleAnnotations)) //Class level, de-finalize all fields and add @ObjectHolder to them!
         {
+            @SuppressWarnings("unused")
+            String value = getValue(classNode.visibleAnnotations);
             classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f ->
             {
                 int prev = f.access;
@@ -106,5 +95,4 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
         return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
     }
 
-    private record VanillaObjectHolderData(String holderClass, String registryName, String registryType) {}
 }

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

@@ -9,7 +9,9 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.mojang.logging.LogUtils;
+import net.minecraftforge.fml.loading.AdvancedLogMessageAdapter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -19,9 +21,6 @@ import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
 
 /**
  * Modifies specified enums to allow runtime extension by making the $VALUES field non-final and
@@ -29,7 +28,7 @@ import org.slf4j.MarkerFactory;
  */
 public class RuntimeEnumExtender implements ILaunchPluginService {
 
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     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;");
@@ -64,49 +63,43 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
         final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
 
         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"))
                 .collect(Collectors.toList());
-
+        
         if (candidates.isEmpty()) {
             throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
         }
-
+        
         candidates.forEach(mtd ->
         {
             Type[] args = Type.getArgumentTypes(mtd.desc);
             if (args.length == 0 || !args[0].equals(STRING)) {
-                if (LOGGER.isErrorEnabled(LogUtils.FATAL_MARKER))
-                {
-                    StringBuilder sb = new StringBuilder();
+                LOGGER.fatal(()->new AdvancedLogMessageAdapter(sb-> {
                     sb.append("Enum has create method without String as first parameter:\n");
                     sb.append("  Enum: ").append(classType.getDescriptor()).append("\n");
                     sb.append("  Target: ").append(mtd.name).append(mtd.desc).append("\n");
-                    LOGGER.error(LogUtils.FATAL_MARKER, sb.toString());
-                }
+                }));
                 throw new IllegalStateException("Enum has create method without String as first parameter: " + mtd.name + mtd.desc);
             }
 
             Type ret = Type.getReturnType(mtd.desc);
             if (!ret.equals(classType)) {
-                if (LOGGER.isErrorEnabled(LogUtils.FATAL_MARKER))
-                {
-                    StringBuilder sb = new StringBuilder();
+                LOGGER.fatal(()->new AdvancedLogMessageAdapter(sb-> {
                     sb.append("Enum has create method with incorrect return type:\n");
                     sb.append("  Enum: ").append(classType.getDescriptor()).append("\n");
                     sb.append("  Target: ").append(mtd.name).append(mtd.desc).append("\n");
                     sb.append("  Found: ").append(ret.getClassName()).append(", Expected: ").append(classType.getClassName());
-                    LOGGER.error(LogUtils.FATAL_MARKER, sb.toString());
-                }
+                }));
                 throw new IllegalStateException("Enum has create method with incorrect return type: " + mtd.name + mtd.desc);
             }
-
+            
             Type[] ctrArgs = new Type[args.length + 1];
             ctrArgs[0] = STRING;
             ctrArgs[1] = Type.INT_TYPE;
@@ -118,29 +111,23 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
             MethodNode ctr = classNode.methods.stream().filter(m -> m.name.equals("<init>") && m.desc.equals(desc)).findFirst().orElse(null);
             if (ctr == null)
             {
-                if (LOGGER.isErrorEnabled(LogUtils.FATAL_MARKER))
-                {
-                    StringBuilder sb = new StringBuilder();
+                LOGGER.fatal(()->new AdvancedLogMessageAdapter(sb-> {
                     sb.append("Enum has create method with no matching constructor:\n");
                     sb.append("  Enum: ").append(classType.getDescriptor()).append("\n");
                     sb.append("  Candidate: ").append(mtd.desc).append("\n");
                     sb.append("  Target: ").append(desc).append("\n");
                     classNode.methods.stream().filter(m -> m.name.equals("<init>")).forEach(m -> sb.append("        : ").append(m.desc).append("\n"));
-                    LOGGER.error(LogUtils.FATAL_MARKER, sb.toString());
-                }
+                }));
                 throw new IllegalStateException("Enum has create method with no matching constructor: " + desc);
             }
 
             if (values == null)
             {
-                if (LOGGER.isErrorEnabled(LogUtils.FATAL_MARKER))
-                {
-                    StringBuilder sb = new StringBuilder();
+                LOGGER.fatal(()->new AdvancedLogMessageAdapter(sb-> {
                     sb.append("Enum has create method but we could not find $VALUES. Found:\n");
                     classNode.fields.stream().filter(f -> (f.access & Opcodes.ACC_STATIC) != 0).
                             forEach(m -> sb.append("  ").append(m.name).append(" ").append(m.desc).append("\n"));
-                    LOGGER.error(LogUtils.FATAL_MARKER, sb.toString());
-                }
+                }));
                 throw new IllegalStateException("Enum has create method but we could not find $VALUES");
             }
 

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.fml.loading;
+
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.util.StringBuilderFormattable;
+
+import java.util.function.Consumer;
+
+public class AdvancedLogMessageAdapter implements Message, StringBuilderFormattable {
+    private static final long serialVersionUID = -8291754833965087436L;
+
+    private static final Object[] EMPTY = new Object[0];
+
+    private final Consumer<StringBuilder> logMessageBuilder;
+
+    public AdvancedLogMessageAdapter(final Consumer<StringBuilder> logMessageBuilder) {
+        this.logMessageBuilder = logMessageBuilder;
+    }
+
+    @Override
+    public String getFormattedMessage() {
+        return "";
+    }
+
+    @Override
+    public String getFormat() {
+        return "";
+    }
+
+    @Override
+    public Object[] getParameters() {
+        return EMPTY;
+    }
+
+    @Override
+    public Throwable getThrowable() {
+        return null;
+    }
+
+    @Override
+    public void formatTo(final StringBuilder buffer) {
+        logMessageBuilder.accept(buffer);
+    }
+}

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

@@ -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();

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

@@ -5,8 +5,8 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -16,7 +16,7 @@ import java.nio.file.Paths;
 
 public class ClasspathLocatorUtils {
     
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     public static Path findJarPathFor(final String resourceName, final String jarName, final URL resource) {
         try {
@@ -31,7 +31,7 @@ public class ClasspathLocatorUtils {
             //LOGGER.debug(CORE, "Found JAR {} at path {}", jarName, path.toString());
             return path;
         } catch (NullPointerException | URISyntaxException e) {
-            LOGGER.error(LogMarkers.SCAN, "Failed to find JAR for class {} - {}", resourceName, jarName);
+            LOGGER.fatal(LogMarkers.SCAN, "Failed to find JAR for class {} - {}", resourceName, jarName);
             throw new RuntimeException("Unable to locate "+resourceName+" - "+jarName, e);
         }
     }

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

@@ -5,90 +5,30 @@
 
 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;
 import com.electronwill.nightconfig.core.io.ParsingException;
 import com.electronwill.nightconfig.core.io.WritingMode;
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.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?")
-        ;
-
-        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 final Logger LOGGER = LogManager.getLogger();
+    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");
     }
 
     private CommentedFileConfig configData;
@@ -97,6 +37,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
@@ -105,14 +46,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();
     }
 
@@ -120,37 +60,29 @@ public class FMLConfig
     {
         final Path configFile = FMLPaths.FMLCONFIG.get();
         INSTANCE.loadFrom(configFile);
-        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));
-            }
-        }
-        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.getConfigValue(ConfigValue.DEFAULT_CONFIG_PATH)));
+        LOGGER.trace(CORE, "Loaded FML config from {}", FMLPaths.FMLCONFIG.get());
+        LOGGER.trace(CORE, "Splash screen is {}", FMLConfig::splashScreenEnabled);
+        LOGGER.trace(CORE, "Max threads for mod loading computed at {}", FMLConfig::loadingThreadCount);
+        LOGGER.trace(CORE, "Version check is {}", FMLConfig::runVersionCheck);
+        LOGGER.trace(CORE, "Default config paths at {}", FMLConfig::defaultConfigPath);
+        FMLPaths.getOrCreateGameRelativePath(Paths.get(FMLConfig.defaultConfigPath()), "default config directory");
     }
 
-    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");
     }
 }

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

@@ -5,7 +5,6 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.*;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
@@ -16,12 +15,14 @@ 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;
 import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -34,7 +35,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
 
 public class FMLLoader
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private static AccessTransformerService accessTransformer;
     private static ModDiscoverer modDiscoverer;
     private static ICoreModProvider coreModProvider;
@@ -61,47 +62,50 @@ public class FMLLoader
         final Package modLauncherPackage = ITransformationService.class.getPackage();
         LOGGER.debug(CORE,"FML found ModLauncher version : {}", modLauncherPackage.getImplementationVersion());
         if (!modLauncherPackage.isCompatibleWith("4.0")) {
-            LOGGER.error(CORE, "Found incompatible ModLauncher specification : {}, version {} from {}", modLauncherPackage.getSpecificationVersion(), modLauncherPackage.getImplementationVersion(), modLauncherPackage.getImplementationVendor());
+            LOGGER.fatal(CORE,"Found incompatible ModLauncher specification : {}, version {} from {}", modLauncherPackage.getSpecificationVersion(), modLauncherPackage.getImplementationVersion(), modLauncherPackage.getImplementationVendor());
             throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
         }
 
+        // Allows us to communicate properties with other services through ModLauncher
+        setupBlackboardKeys();
+
         accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
-            LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
+            LOGGER.fatal(CORE,"Access Transformer library is missing, we need this to run");
             return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
         });
 
         final Package atPackage = accessTransformer.getClass().getPackage();
         LOGGER.debug(CORE,"FML found AccessTransformer version : {}", atPackage.getImplementationVersion());
         if (!atPackage.isCompatibleWith("1.0")) {
-            LOGGER.error(CORE, "Found incompatible AccessTransformer specification : {}, version {} from {}", atPackage.getSpecificationVersion(), atPackage.getImplementationVersion(), atPackage.getImplementationVendor());
+            LOGGER.fatal(CORE,"Found incompatible AccessTransformer specification : {}, version {} from {}", atPackage.getSpecificationVersion(), atPackage.getImplementationVersion(), atPackage.getImplementationVendor());
             throw new IncompatibleEnvironmentException("Incompatible accesstransformer found "+atPackage.getSpecificationVersion());
         }
 
         eventBus = environment.findLaunchPlugin("eventbus").orElseThrow(()-> {
-            LOGGER.error(CORE, "Event Bus library is missing, we need this to run");
+            LOGGER.fatal(CORE,"Event Bus library is missing, we need this to run");
             return new IncompatibleEnvironmentException("Missing EventBus, cannot run");
         });
 
         final Package eventBusPackage = eventBus.getClass().getPackage();
         LOGGER.debug(CORE,"FML found EventBus version : {}", eventBusPackage.getImplementationVersion());
         if (!eventBusPackage.isCompatibleWith("1.0")) {
-            LOGGER.error(CORE, "Found incompatible EventBus specification : {}, version {} from {}", eventBusPackage.getSpecificationVersion(), eventBusPackage.getImplementationVersion(), eventBusPackage.getImplementationVendor());
+            LOGGER.fatal(CORE,"Found incompatible EventBus specification : {}, version {} from {}", eventBusPackage.getSpecificationVersion(), eventBusPackage.getImplementationVersion(), eventBusPackage.getImplementationVendor());
             throw new IncompatibleEnvironmentException("Incompatible eventbus found "+eventBusPackage.getSpecificationVersion());
         }
 
         runtimeDistCleaner = (RuntimeDistCleaner)environment.findLaunchPlugin("runtimedistcleaner").orElseThrow(()-> {
-            LOGGER.error(CORE, "Dist Cleaner is missing, we need this to run");
+            LOGGER.fatal(CORE,"Dist Cleaner is missing, we need this to run");
             return new IncompatibleEnvironmentException("Missing DistCleaner, cannot run!");
         });
         LOGGER.debug(CORE, "Found Runtime Dist Cleaner");
 
-        var coreModProviders = ServiceLoaderUtils.streamWithErrorHandling(ServiceLoader.load(FMLLoader.class.getModule().getLayer(), ICoreModProvider.class), sce -> LOGGER.error(CORE, "Failed to load a coremod library, expect problems", sce)).toList();
+        var coreModProviders = ServiceLoaderUtils.streamWithErrorHandling(ServiceLoader.load(FMLLoader.class.getModule().getLayer(), ICoreModProvider.class), sce -> LOGGER.fatal(CORE, "Failed to load a coremod library, expect problems", sce)).toList();
 
         if (coreModProviders.isEmpty()) {
-            LOGGER.error(CORE, "Found no coremod provider. Cannot run");
+            LOGGER.fatal(CORE, "Found no coremod provider. Cannot run");
             throw new IncompatibleEnvironmentException("No coremod library found");
         } else if (coreModProviders.size() > 1) {
-            LOGGER.error(CORE, "Found multiple coremod providers : {}. Cannot run", coreModProviders.stream().map(p -> p.getClass().getName()).collect(Collectors.toList()));
+            LOGGER.fatal(CORE, "Found multiple coremod providers : {}. Cannot run", coreModProviders.stream().map(p -> p.getClass().getName()).collect(Collectors.toList()));
             throw new IncompatibleEnvironmentException("Multiple coremod libraries found");
         }
 
@@ -113,7 +117,7 @@ public class FMLLoader
         LOGGER.debug(CORE, "Found ForgeSPI package implementation version {}", Environment.class.getPackage().getImplementationVersion());
         LOGGER.debug(CORE, "Found ForgeSPI package specification {}", Environment.class.getPackage().getSpecificationVersion());
         if (Integer.parseInt(Environment.class.getPackage().getSpecificationVersion()) < 2) {
-            LOGGER.error(CORE, "Found an out of date ForgeSPI implementation: {}, loading cannot continue", Environment.class.getPackage().getSpecificationVersion());
+            LOGGER.fatal(CORE, "Found an out of date ForgeSPI implementation: {}, loading cannot continue", Environment.class.getPackage().getSpecificationVersion());
             throw new IncompatibleEnvironmentException("ForgeSPI is out of date, we cannot continue");
         }
 
@@ -121,11 +125,17 @@ public class FMLLoader
             Class.forName("com.electronwill.nightconfig.core.Config", false, environment.getClass().getClassLoader());
             Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, environment.getClass().getClassLoader());
         } catch (ClassNotFoundException e) {
-            LOGGER.error(CORE, "Failed to load NightConfig");
+            LOGGER.fatal(CORE, "Failed to load NightConfig");
             throw new IncompatibleEnvironmentException("Missing NightConfig");
         }
     }
 
+    private static void setupBlackboardKeys() {
+        LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
+        var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
+        Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
+    }
+
     static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
     {
         final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
@@ -133,12 +143,12 @@ public class FMLLoader
         final Optional<ILaunchHandlerService> launchHandler = environment.findLaunchHandler(launchTarget);
         LOGGER.debug(CORE, "Using {} as launch service", launchTarget);
         if (launchHandler.isEmpty()) {
-            LOGGER.error(CORE, "Missing LaunchHandler {}, cannot continue", launchTarget);
+            LOGGER.fatal(CORE,"Missing LaunchHandler {}, cannot continue", launchTarget);
             throw new RuntimeException("Missing launch handler: " + launchTarget);
         }
 
         if (!(launchHandler.get() instanceof CommonLaunchHandler)) {
-            LOGGER.error(CORE, "Incompatible Launch handler found - type {}, cannot continue", launchHandler.get().getClass().getName());
+            LOGGER.fatal(CORE, "Incompatible Launch handler found - type {}, cannot continue", launchHandler.get().getClass().getName());
             throw new RuntimeException("Incompatible launch handler found");
         }
         commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
@@ -151,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);
@@ -167,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();
@@ -202,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();
     }
 

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

@@ -5,12 +5,10 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.IEnvironment;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -24,7 +22,7 @@ public enum FMLPaths
     CONFIGDIR("config"),
     FMLCONFIG(false, CONFIGDIR, "fml.toml");
 
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private final Path relativePath;
     private final boolean isDirectory;
     private Path absolutePath;
@@ -59,33 +57,16 @@ public enum FMLPaths
         for (FMLPaths path : FMLPaths.values())
         {
             path.absolutePath = rootPath.resolve(path.relativePath).toAbsolutePath().normalize();
-            if (path.isDirectory && !Files.isDirectory(path.absolutePath))
+            if (path.isDirectory)
             {
-                try {
-                   Files.createDirectories(path.absolutePath);
-                } catch (IOException e) {
-                   throw new RuntimeException(e);
-                }
-            }
-            if (LOGGER.isDebugEnabled(CORE))
-            {
-                LOGGER.debug(CORE, "Path {} is {}", path, path.absolutePath);
+                FileUtils.getOrCreateDirectory(path.absolutePath, path.name());
             }
+            LOGGER.debug(CORE,"Path {} is {}", ()-> path, ()-> path.absolutePath);
         }
     }
 
-    public static Path getOrCreateGameRelativePath(Path path) {
-        Path gameFolderPath = FMLPaths.GAMEDIR.get().resolve(path);
-
-        if (!Files.isDirectory(gameFolderPath)) {
-            try {
-                Files.createDirectories(gameFolderPath);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return gameFolderPath;
+    public static Path getOrCreateGameRelativePath(Path path, String name) {
+        return FileUtils.getOrCreateDirectory(FMLPaths.GAMEDIR.get().resolve(path), name);
     }
 
     public Path relative() {

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

@@ -5,14 +5,14 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.*;
 import joptsimple.ArgumentAcceptingOptionSpec;
 import joptsimple.OptionSpecBuilder;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.Environment;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,7 +26,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 public class FMLServiceProvider implements ITransformationService
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private ArgumentAcceptingOptionSpec<String> modsOption;
     private ArgumentAcceptingOptionSpec<String> modListsOption;
     private ArgumentAcceptingOptionSpec<String> mavenRootsOption;

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

@@ -5,11 +5,44 @@
 
 package net.minecraftforge.fml.loading;
 
-import java.io.File;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
+import static net.minecraftforge.fml.loading.LogMarkers.CORE;
+
 public class FileUtils
 {
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    public static Path getOrCreateDirectory(Path dirPath, String dirLabel) {
+        if (!Files.isDirectory(dirPath.getParent())) {
+            getOrCreateDirectory(dirPath.getParent(), "parent of "+dirLabel);
+        }
+        if (!Files.isDirectory(dirPath))
+        {
+            LOGGER.debug(CORE,"Making {} directory : {}", dirLabel, dirPath);
+            try {
+                Files.createDirectory(dirPath);
+            } catch (IOException e) {
+                if (e instanceof FileAlreadyExistsException) {
+                    LOGGER.fatal(CORE,"Failed to create {} directory - there is a file in the way", dirLabel);
+                } else {
+                    LOGGER.fatal(CORE,"Problem with creating {} directory (Permissions?)", dirLabel, e);
+                }
+                throw new RuntimeException("Problem creating directory", e);
+            }
+            LOGGER.debug(CORE,"Created {} directory : {}", dirLabel, dirPath);
+        } else {
+            LOGGER.debug(CORE,"Found existing {} directory : {}", dirLabel, dirPath);
+        }
+        return dirPath;
+    }
+
 
     public static String fileExtension(final Path path) {
         String fileName = path.getFileName().toString();
@@ -20,16 +53,4 @@ public class FileUtils
             return "";
         }
     }
-
-    public static boolean matchFileName(String path, String... matches) {
-        // Extract file name from path
-        String name = path.substring(Math.min(path.lastIndexOf(File.separatorChar) + 1, path.length()));
-        // Check if it contains any of the desired keywords
-        for (String match : matches) {
-            if (name.contains(match)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

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

@@ -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
-        }
-    }
-}

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

@@ -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();
-}

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

@@ -5,18 +5,18 @@
 
 package net.minecraftforge.fml.loading;
 
-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;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.slf4j.Logger;
 
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -38,7 +38,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
 public class LanguageLoadingProvider
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private final List<IModLanguageProvider> languageProviders = new ArrayList<>();
     private final ServiceLoader<IModLanguageProvider> serviceLoader;
     private final Map<String, ModLanguageWrapper> languageProviderMap = new HashMap<>();
@@ -81,9 +81,9 @@ public class LanguageLoadingProvider
         loadLanguageProviders();
     }
     private void loadLanguageProviders() {
-        LOGGER.debug(CORE, "Found {} language providers", ServiceLoaderUtils.streamServiceLoader(()->serviceLoader, sce->LOGGER.error("Problem with language loaders")).count());
+        LOGGER.debug(CORE, "Found {} language providers", ServiceLoaderUtils.streamServiceLoader(()->serviceLoader, sce->LOGGER.fatal("Problem with language loaders")).count());
         serviceLoader.forEach(languageProviders::add);
-        ImmediateWindowHandler.updateProgress("Loading language providers");
+
         languageProviders.forEach(lp -> {
             final Path lpPath;
             try {
@@ -94,11 +94,11 @@ public class LanguageLoadingProvider
             Optional<String> implementationVersion = JarVersionLookupHandler.getImplementationVersion(lp.getClass());
             String impl = implementationVersion.orElse(Files.isDirectory(lpPath) ? FMLLoader.versionInfo().forgeVersion().split("\\.")[0] : null);
             if (impl == null) {
-                LOGGER.error(CORE, "Found unversioned language provider {}", lp.name());
+                LOGGER.fatal(CORE, "Found unversioned language provider {}", lp.name());
                 throw new RuntimeException("Failed to find implementation version for language provider "+ lp.name());
             }
             LOGGER.debug(CORE, "Found language provider {}, version {}", lp.name(), impl);
-            ImmediateWindowHandler.updateProgress("Loaded language provider "+lp.name()+ " " + impl);
+            StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Loaded language provider "+lp.name()+ " " + impl));
             languageProviderMap.put(lp.name(), new ModLanguageWrapper(lp, new DefaultArtifactVersion(impl)));
         });
     }
@@ -134,7 +134,7 @@ public class LanguageLoadingProvider
     }
 
     public IModLanguageProvider findLanguage(ModFile mf, String modLoader, VersionRange modLoaderVersion) {
-        final String languageFileName = mf.getProvider() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName();
+        final String languageFileName = mf.getLocator() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName();
         final ModLanguageWrapper mlw = languageProviderMap.get(modLoader);
         if (mlw == null) {
             LOGGER.error(LOADING,"Missing language {} version {} wanted by {}", modLoader, modLoaderVersion, languageFileName);

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

@@ -5,13 +5,13 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 public class LauncherVersion {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private static final String launcherVersion;
 
     static {

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

@@ -5,14 +5,14 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 public class LibraryFinder {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private static Path libsPath;
     static Path findLibsPath() {
         if (libsPath == null) {

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

@@ -10,18 +10,11 @@ import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.forgespi.locating.IModFile;
 
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -35,7 +28,7 @@ public class LoadingModList
     private final List<ModInfo> sortedList;
     private final Map<String, ModFileInfo> fileById;
     private final List<EarlyLoadingException> preLoadErrors;
-    private List<IModFile> brokenFiles;
+    private List<ModFile> brokenFiles;
 
     private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
     {
@@ -161,11 +154,11 @@ public class LoadingModList
         return preLoadErrors;
     }
 
-    public void setBrokenFiles(final List<IModFile> brokenFiles) {
+    public void setBrokenFiles(final List<ModFile> brokenFiles) {
         this.brokenFiles = brokenFiles;
     }
 
-    public List<IModFile> getBrokenFiles() {
+    public List<ModFile> getBrokenFiles() {
         return this.brokenFiles;
     }
 }

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

@@ -5,12 +5,12 @@
 
 package net.minecraftforge.fml.loading;
 
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
 
 public class LogMarkers {
-    public static final Marker CORE = MarkerFactory.getMarker("CORE");
-    public static final Marker LOADING = MarkerFactory.getMarker("LOADING");
-    public static final Marker SCAN = MarkerFactory.getMarker("SCAN");
-    public static final Marker SPLASH = MarkerFactory.getMarker("SPLASH");
+    public static final Marker CORE = MarkerManager.getMarker("CORE");
+    public static final Marker LOADING = MarkerManager.getMarker("LOADING");
+    public static final Marker SCAN = MarkerManager.getMarker("SCAN");
+    public static final Marker SPLASH = MarkerManager.getMarker("SPLASH");
 }

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

@@ -5,10 +5,10 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.INameMappingService;
 import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -20,7 +20,7 @@ import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 
 public class MCPNamingService implements INameMappingService {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private HashMap<String, String> methods;
     private HashMap<String, String> fields;
 

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

@@ -5,44 +5,20 @@
 
 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;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
+import java.io.File;
 import java.io.IOException;
-import java.lang.module.ModuleDescriptor;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ServiceLoader;
 import java.util.zip.ZipFile;
-import java.util.Set;
 
 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Set<String> SERVICES = Set.of(
-        "cpw.mods.modlauncher.api.ITransformationService",
-        "net.minecraftforge.forgespi.locating.IModLocator",
-        "net.minecraftforge.forgespi.locating.IDependencyLocator"
-    );
-
-    @Override
-    public List<NamedPath> candidates(final Path gameDirectory, 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);
@@ -64,7 +40,7 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
         try (var walk = Files.walk(modsDir, 1)){
             walk.forEach(ModDirTransformerDiscoverer::visitFile);
         } catch (IOException | IllegalStateException ioe) {
-            LOGGER.error("Error during early discovery", ioe);
+            LogManager.getLogger().error("Error during early discovery", ioe);
         }
     }
 
@@ -72,11 +48,14 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
         if (!Files.isRegularFile(path)) return;
         if (!path.toString().endsWith(".jar")) return;
         if (LamdbaExceptionUtils.uncheck(() -> Files.size(path)) == 0) return;
-
-        SecureJar jar = SecureJar.from(path);
-        jar.moduleDataProvider().descriptor().provides().stream()
-            .map(ModuleDescriptor.Provides::service)
-            .filter(SERVICES::contains)
-            .forEach(s -> found.add(new NamedPath(s, path)));
+        try (ZipFile zf = new ZipFile(new File(path.toUri()))) {
+            if (zf.getEntry("META-INF/services/cpw.mods.modlauncher.api.ITransformationService") != null) {
+                found.add(new NamedPath(zf.getName(), path));
+            } else if (zf.getEntry("META-INF/services/net.minecraftforge.forgespi.locating.IModLocator") != null) {
+                found.add(new NamedPath(zf.getName(), path));
+            }
+        } catch (IOException ioe) {
+            LogManager.getLogger().error("Zip Error when loading jar file {}", path, ioe);
+        }
     }
 }

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

@@ -5,9 +5,9 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,7 +24,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 public class ModJarURLHandler extends URLStreamHandler
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     // modjar://modid/path/to/file
     @Override
     protected URLConnection openConnection(URL url) {

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

@@ -7,10 +7,8 @@ package net.minecraftforge.fml.loading;
 
 import com.google.common.graph.GraphBuilder;
 import com.google.common.graph.MutableGraph;
-import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator;
-import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
@@ -18,9 +16,10 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.fml.loading.toposort.CyclePresentException;
 import net.minecraftforge.fml.loading.toposort.TopologicalSort;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.slf4j.Logger;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -34,7 +33,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
 
 public class ModSorter
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
     private final UniqueModListBuilder uniqueModListBuilder;
     private List<ModFile> modFiles;
     private List<ModInfo> sortedList;
@@ -99,10 +98,11 @@ public class ModSorter
         catch (CyclePresentException e)
         {
             Set<Set<ModFileInfo>> cycles = e.getCycles();
-            if (LOGGER.isErrorEnabled(LOADING))
-            {
-                LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
-            }
+            LOGGER.error(LOADING, () -> new AdvancedLogMessageAdapter(buffer ->
+                    buffer.append("Mod Sorting failed.\n")
+                    .append("Detected Cycles: ")
+                    .append(cycles)
+                    .append('\n')));
             var dataList = cycles.stream()
                     .<ModFileInfo>mapMulti(Iterable::forEach)
                     .<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
@@ -160,10 +160,9 @@ public class ModSorter
         systemMods.add("minecraft");
         // Find mod file from MinecraftLocator to define the system mods
         modFiles.stream()
-                .filter(modFile -> modFile.getProvider().getClass() == MinecraftLocator.class)
+                .filter(modFile -> modFile.getLocator().getClass() == MinecraftLocator.class)
                 .map(ModFile::getSecureJar)
-                .map(SecureJar::moduleDataProvider)
-                .map(SecureJar.ModuleDataProvider::getManifest)
+                .map(SecureJar::getManifest)
                 .map(Manifest::getMainAttributes)
                 .map(mf -> mf.getValue("FML-System-Mods"))
                 .filter(Objects::nonNull)

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

@@ -16,11 +16,14 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import com.google.common.collect.Streams;
-import com.mojang.logging.LogUtils;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.api.distmarker.OnlyIns;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -30,14 +33,11 @@ import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
 
 public class RuntimeDistCleaner implements ILaunchPluginService
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
+    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Marker DISTXFORM = MarkerManager.getMarker("DISTXFORM");
     private static String DIST;
     private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
     private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
@@ -53,7 +53,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService
         AtomicBoolean changes = new AtomicBoolean();
         if (remove(classNode.visibleAnnotations, DIST))
         {
-            LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
+            LOGGER.fatal(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
             throw new RuntimeException("Attempted to load class "+ classNode.name  + " for invalid dist "+ DIST);
         }
 

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

@@ -5,7 +5,8 @@
 
 package net.minecraftforge.fml.loading;
 
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
+
 import java.io.PrintStream;
 
 /**

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

@@ -5,27 +5,21 @@
 
 package net.minecraftforge.fml.loading;
 
-import com.mojang.logging.LogUtils;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.forgespi.language.IModInfo;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.slf4j.Logger;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.joining;
-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
+import static java.util.stream.Collectors.*;
 
 public class UniqueModListBuilder
 {
-    private final static Logger LOGGER = LogUtils.getLogger();
+    private final static Logger LOGGER = LogManager.getLogger();
 
     private final List<ModFile> modFiles;
 
@@ -72,35 +66,28 @@ public class UniqueModListBuilder
 
         // Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
         // We can't handle this
-        final List<String> dupedModErrors = modIds.values().stream()
+        final List<IModInfo> dupedMods = modIds.values().stream()
                 .filter(modInfos -> modInfos.size() > 1)
-                .map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
-                        mods.get(0).getModId(),
-                        mods.stream()
-                                .map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
-                )).toList();
+                .map(modInfos -> modInfos.get(0))
+                .toList();
 
-        if (!dupedModErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
-            throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
-                    .map(s -> new EarlyLoadingException.ExceptionData(s))
-                    .toList());
+        if (!dupedMods.isEmpty()) {
+            final List<EarlyLoadingException.ExceptionData> duplicateModErrors = dupedMods.stream()
+                                                                                   .map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedmod", dm, Objects.toString(dm)))
+                                                                                   .toList();
+            throw new EarlyLoadingException("Duplicate mods found", null,  duplicateModErrors);
         }
 
-
-        final List<String> dupedLibErrors = versionedLibIds.values().stream()
+        final List<ModFile> dupedLibs = versionedLibIds.values().stream()
                 .filter(modFiles -> modFiles.size() > 1)
-                .map(mods -> String.format("\tLibrary: '%s' from files: %s",
-                        getModId(mods.get(0)),
-                        mods.stream()
-                                .map(modFile -> modFile.getFileName()).collect(joining(", "))
-                )).toList();
+                .map(modFiles -> modFiles.get(0))
+                .toList();
 
-        if (!dupedLibErrors.isEmpty()) {
-            LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
-            throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
-                    .map(s -> new EarlyLoadingException.ExceptionData(s))
-                    .toList());
+        if (!dupedLibs.isEmpty()) {
+            final List<EarlyLoadingException.ExceptionData> duplicateLibErrors = dupedLibs.stream()
+                .map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedlib.versioned", dm, Objects.toString(dm)))
+                .toList();
+            throw new EarlyLoadingException("Duplicate plugins or libraries found", null,  duplicateLibErrors);
         }
 
         // Collect unique mod files by module name. This will be used for deduping purposes

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

@@ -5,7 +5,6 @@
 
 package net.minecraftforge.fml.loading;
 
-import net.minecraftforge.forgespi.language.MavenVersionAdapter;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
@@ -19,12 +18,16 @@ 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 (MavenVersionAdapter.createFromVersionSpec("[1.16.4,1.16.5]").containsVersion(version)) {
+        //     // 1.16.4 is Compatible with 1.16.3
+        //     add("languageloader.javafml", "34");
+        //     add("mod.minecraft",          "1.16.3");
+        //     add("mod.forge",              "34.1.42");
+        //     // 1.16.5 is Compatible with 1.16.4, and thus 1.16.3
+        //     add("languageloader.javafml", "35");
+        //     add("mod.minecraft",          "1.16.4");
+        //     add("mod.forge",              "35.1.37");
+        // }
     }
     private static void add(String key, String value) {
         overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));

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

@@ -5,11 +5,9 @@
 
 package net.minecraftforge.fml.loading.moddiscovery;
 
-import com.mojang.logging.LogUtils;
-import net.minecraftforge.forgespi.locating.IDependencyLocator;
 import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.forgespi.locating.ModFileLoadingException;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -17,9 +15,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
 
-public abstract class AbstractJarFileDependencyLocator extends AbstractJarFileModProvider implements IDependencyLocator
+public abstract class AbstractJarFileDependencyLocator extends AbstractJarFileLocator
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     protected Optional<InputStream> loadResourceFromModFile(final IModFile modFile, final Path path) {
         try {
@@ -38,11 +36,11 @@ public abstract class AbstractJarFileDependencyLocator extends AbstractJarFileMo
     protected Optional<IModFile> loadModFileFrom(final IModFile file, final Path path) {
         try {
             final Path pathInModFile = file.findResource(path.toString());
-            return Optional.of(createMod(pathInModFile).file());
+            return createMod(pathInModFile);
         }
         catch (Exception e) {
             LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
-            throw new ModFileLoadingException("Failed to load mod file "+file.getFileName());
+            return Optional.empty();
         }
     }
 

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

@@ -5,11 +5,11 @@
 
 package net.minecraftforge.fml.loading.moddiscovery;
 
-import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.locating.IModFile;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -18,9 +18,9 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-public abstract class AbstractJarFileModProvider extends AbstractModProvider
+public abstract class AbstractJarFileLocator extends AbstractModLocator
 {
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     @Override
     public void scanFile(final IModFile file, final Consumer<Path> pathConsumer) {