Update license headers to compact SPDX format.

License has not changed, this is just more compact and doesn't include years. Bump version for RB.
Remove - from allowed characters in mod ids.
2026-11-14 17:14:44 +00:00 · 2022-02-28 13:41:23 -08:00 · 2022-02-28 13:23:53 -08:00 · 2022-02-28 22:03:31 +01:00 · 2022-02-28 17:23:19 +00:00 · 2022-02-25 01:06:32 +00:00
1224 changed files with 12864 additions and 21711 deletions
@@ -24,7 +24,7 @@
 /projects/clean/
 /projects/forge/
 /projects/fmlonly/
-#/patches/
+#/patches/*

 #occupational hazards
 /projects/**/build/
@@ -36,7 +36,7 @@ src/generated/resources/.cache/

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

 # FML changelog
@@ -44,3 +44,4 @@ changelog.txt
 *.py
 *.7z
 /logs/
+
@@ -0,0 +1,104 @@
+<?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>
@@ -0,0 +1,136 @@
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
+
+/*
+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)
+
+    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.3", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("git_main_branch", "1.18.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()
+    }
+})
@@ -1,16 +1,2 @@
-Minecraft Forge
-Copyright (c) 2016-${year}.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation version 2.1
-of the License.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Minecraft Forge - Forge Development LLC
+SPDX-License-Identifier: LGPL-2.1-only
@@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:[5.1.26,)'
    }
 }

@@ -27,8 +27,9 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 plugins {
    id 'org.cadixdev.licenser' version '0.6.1'
    id 'com.github.ben-manes.versions' version '0.36.0'
-    id 'net.minecraftforge.gradleutils' version '1.+'
+    id 'net.minecraftforge.gradleutils' version '2.+'
    id 'eclipse'
+    id 'de.undercouch.download' version '4.1.2'
 }

 Util.init() //Init all our extension methods!
@@ -43,19 +44,19 @@ ext {
        ]
    }
    MAPPING_CHANNEL = 'official'
-    MAPPING_VERSION = '1.17.1'
-    MC_VERSION = '1.17.1'
-    MCP_VERSION = '20210706.113038'
+    MAPPING_VERSION = '1.18.1'
+    MC_VERSION = '1.18.1'
+    MCP_VERSION = '20211210.034407'
    SPI_VERSION = '4.0.10'
    ACCESSTRANSFORMERS_VERSION = '8.0.4'
    COREMODS_VERSION = '5.0.1'
    EVENTBUS_VERSION = '5.0.3'
-    MODLAUNCHER_VERSION = '9.0.7'
-    SECUREJARHANDLER_VERSION = '0.9.54'
-    BOOTSTRAPLAUNCHER_VERSION = '0.1.17'
-    ASM_VERSION = '9.1'
+    MODLAUNCHER_VERSION = '9.1.0'
+    SECUREJARHANDLER_VERSION = '1.0.1'
+    BOOTSTRAPLAUNCHER_VERSION = '1.0.0'
+    ASM_VERSION = '9.2'
    INSTALLER_VERSION = '2.1.+'
-    MIXIN_VERSION = '0.8.4'
+    MIXIN_VERSION = '0.8.5'

    GIT_INFO = gradleutils.gitInfo
    VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
@@ -63,10 +64,11 @@ ext {
    FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)

    SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.10.0'
-    VIGNETTE = 'net.minecraftforge.lex:vignette:0.2.0.16'
    BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
-    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.2.7'
+    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.2.10'
    JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
+    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.17:all'
+    MIN_TAG_FOR_CHANGELOG = "39.0"
 }

 println('Version: ' + VERSION +
@@ -76,12 +78,35 @@ println('Version: ' + VERSION +

 def extraTxts = [
    rootProject.file('CREDITS.txt'),
-    rootProject.file('LICENSE.txt')
+    rootProject.file('LICENSE.txt'),
+    rootProject.file('build/changelog.txt') //Now gets generated on build.
 ]

-def changelog = rootProject.file('build/changelog.txt')
-if (changelog.exists())
-    extraTxts += changelog
+task downloadVersionManifest(type: Download) {
+    src 'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json'
+    dest file('build/versions/version_manifest.json')
+    useETag 'all'
+    onlyIfModified true
+    quiet true
+}
+task downloadJson(type: Download, dependsOn: downloadVersionManifest) {
+    inputs.file downloadVersionManifest.dest
+    src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url }
+    dest file("build/versions/${MC_VERSION}/version.json")
+    useETag 'all'
+    onlyIfModified true
+    quiet true
+}
+['client', 'server'].each { id ->
+    task "download${id.capitalize()}Raw"(type: Download, dependsOn: downloadJson) {
+        inputs.file downloadJson.dest
+        src { downloadJson.dest.json.downloads.get(id).url }
+        dest file("build/versions/${MC_VERSION}/${id}.jar")
+        useETag 'all'
+        onlyIfModified true
+        quiet true
+    }
+}

 subprojects {
    apply plugin: 'maven-publish'
@@ -109,7 +134,7 @@ subprojects {
        }
    }

-    java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(17)

    tasks.withType(Javadoc).configureEach {
        options.tags = [
@@ -154,20 +179,7 @@ subprojects {
            }
        }
        repositories {
-            maven {
-                if (System.env.MAVEN_USER) {
-                    url 'https://maven.minecraftforge.net/releases/'
-                    authentication {
-                        basic(BasicAuthentication)
-                    }
-                    credentials {
-                        username = System.env.MAVEN_USER ?: 'not'
-                        password = System.env.MAVEN_PASSWORD ?: 'set'
-                    }
-                } else {
-                    url 'file://' + rootProject.file('repo').getAbsolutePath()
-                }
-            }
+            maven gradleutils.getPublishingForgeMaven()
        }
    }
 }
@@ -247,21 +259,22 @@ def sharedDeps = {
    installer "net.minecraftforge:coremods:${COREMODS_VERSION}"
    installer "cpw.mods:modlauncher:${MODLAUNCHER_VERSION}"
    installer 'net.minecraftforge:unsafe:0.2.+'
-    installer 'com.electronwill.night-config:core:3.6.3'
-    installer 'com.electronwill.night-config:toml:3.6.3'
+    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 'org.apache.commons:commons-lang3:3.8.1'
+    installer 'org.apache.commons:commons-lang3:3.12.0'
    installer 'net.jodah:typetools:0.8.3'
-    installer 'org.apache.logging.log4j:log4j-api:2.14.1'
-    installer 'org.apache.logging.log4j:log4j-core:2.14.1'
+    installer 'org.apache.logging.log4j:log4j-api:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
+    installer 'org.apache.logging.log4j:log4j-core:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
+    installer 'org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
    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 'net.sf.jopt-simple:jopt-simple:5.0.4'
    installer "org.spongepowered:mixin:${MIXIN_VERSION}"
    installer 'org.openjdk.nashorn:nashorn-core:15.3'
-    installer 'com.google.guava:guava:21.0'
-    installer 'com.google.code.gson:gson:2.8.0'
+    installer 'com.google.guava:guava:31.0.1-jre'
+    installer 'com.google.code.gson:gson:2.8.8'

    /*
    installer 'org.lwjgl:lwjgl:3.2.2'
@@ -285,18 +298,16 @@ def sharedFmlonlyForge = { Project prj ->
            }
        } else {
            prj.task([type: RenameJar, dependsOn: prj.tasks.createMcp2Srg], "create${side}SRG") {
-                tool = VIGNETTE
+                tool = FART
                args = [
-                        '--jar-in', '{input}',
-                        '--jar-out', '{output}',
-                        '--mapping-format', 'tsrg2',
-                        '--mappings', '{mappings}',
-                        // '--stable',
-                        '--create-inits', '--fix-param-annotations', '--fernflower-meta'
+                        '--input', '{input}',
+                        '--output', '{output}',
+                        '--names', '{mappings}',
+                        '--ann-fix', '--ids-fix', '--src-fix', '--record-fix'
                ]
                mappings = prj.tasks.createMcp2Srg.srg
                input = prj.tasks.getByName("download${side}Slim").output
-                output = file("build/create${side}SRG/output.jar")
+                output = prj.file("build/create${side}SRG/output.jar")
            }
        }

@@ -357,6 +368,9 @@ def sharedFmlonlyForge = { Project prj ->
                environment 'MCP_MAPPINGS', '{mcp_mappings}'

                property 'nativesDirectory', '{natives}'
+                if (prj.name == 'forge') {
+                    property 'forge.enableGameTest', 'true'
+                }

                args '--launchTarget', "${launchPrefix}clientuserdev"
                args '--version', 'MOD_DEV'
@@ -368,9 +382,22 @@ def sharedFmlonlyForge = { Project prj ->
                environment 'MOD_CLASSES', '{source_roots}'
                environment 'MCP_MAPPINGS', '{mcp_mappings}'

+                if (prj.name == 'forge') {
+                    property 'forge.enableGameTest', 'true'
+                }
+
                args '--launchTarget', "${launchPrefix}serveruserdev"
            }

+            if (prj.name == 'forge') {
+                gameTestServer {
+                    environment 'MOD_CLASSES', '{source_roots}'
+                    environment 'MCP_MAPPINGS', '{mcp_mappings}'
+
+                    args '--launchTarget', "${launchPrefix}gametestserveruserdev"
+                }
+            }
+
            data {
                environment 'MOD_CLASSES', '{source_roots}'
                environment 'MCP_MAPPINGS', '{mcp_mappings}'
@@ -450,11 +477,6 @@ def sharedFmlonlyForge = { Project prj ->
    }

    def MODULE_PATH = Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{"libraries/${it.downloads.artifact.path}"}
-    def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} +
-            [
-                    'libraries/' + Util.getMavenPath(rootProject.tasks.findByPath(':fmlloader:jar')),
-                    "libraries/net/minecraft/server/${MC_VERSION}-${MCP_VERSION}/server-${MC_VERSION}-${MCP_VERSION}-extra.jar"
-            ]
    def tokens = [
            TASK:          prj.name.equals('forge') ? 'forgeserver' : 'fmlserver',
            MAVEN_PATH:    prj.ext.MAVEN_PATH.toString(),
@@ -465,9 +487,37 @@ def sharedFmlonlyForge = { Project prj ->
            IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.join(','),
            MODULES: 'ALL-MODULE-PATH'
    ]
+    
+    prj.task([dependsOn: rootProject.downloadServerRaw], 'makeClasspathFiles') {
+        doLast {
+            def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} +
+            [
+                'libraries/' + Util.getMavenPath(rootProject.tasks.findByPath(':fmlloader:jar')),
+                "libraries/net/minecraft/server/${MC_VERSION}-${MCP_VERSION}/server-${MC_VERSION}-${MCP_VERSION}-extra.jar"
+            ]
+            def claimed = CLASS_PATH.collect{ it.rsplit('/', 2)[0] }.toSet() // Allow us to override versions
+            try (def zip = new java.util.zip.ZipFile(rootProject.downloadServerRaw.dest)) {
+                CLASS_PATH += zip.getInputStream(zip.getEntry('META-INF/classpath-joined')).text.split(';')
+                    .findAll{ it.startsWith('libraries/') && !claimed.contains(it.rsplit('/', 2)[0]) }
+            }
+
+            configure(prj.installerJar) {
+                from(rootProject.file('server_files/args.txt')) {
+                    filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(';'), CLASS_PATH: CLASS_PATH.join(';')])
+                    rename { 'data/win_args.txt' }
+                }
+
+                from(rootProject.file('server_files/args.txt')) {
+                    filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(':'), CLASS_PATH: CLASS_PATH.join(':')])
+                    rename { 'data/unix_args.txt' }
+                }
+            }
+        }
+    }

    prj.afterEvaluate {
        prj.installerJar {
+            dependsOn('makeClasspathFiles')
            from(rootProject.file('server_files/')) {
                exclude 'args.txt'
                filter(ReplaceTokens, tokens: tokens)
@@ -475,16 +525,6 @@ def sharedFmlonlyForge = { Project prj ->
                //rename 'run.sh',  "run_forge_${VERSION.replace('-', '_').sh"
                //rename 'run.bat', "run_forge_${VERSION.replace('-', '_').bat"
            }
-
-            from(rootProject.file('server_files/args.txt')) {
-                filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(';'), CLASS_PATH: CLASS_PATH.join(';')])
-                rename { 'data/win_args.txt' }
-            }
-
-            from(rootProject.file('server_files/args.txt')) {
-                filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(':'), CLASS_PATH: CLASS_PATH.join(':')])
-                rename { 'data/unix_args.txt' }
-            }
        }
    }
 }
@@ -624,6 +664,10 @@ project(':fmlonly') {
                        client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@txt]",
                        server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@txt]"
                    ],
+                    MC_UNPACKED: [
+                        client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:unpacked]",
+                        server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:unpacked]"
+                    ],
                    MC_SLIM: [
                        client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:slim]",
                        server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:slim]"
@@ -684,6 +728,26 @@ project(':fmlonly') {
                            '--from', 'data/unix_args.txt',
                            '--to',   "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt"
                        ]
+                    ], [
+                        sides: ['server'],
+                        jar: INSTALLER_TOOLS,
+                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
+                        args: [
+                            '--task', 'BUNDLER_EXTRACT',
+                            '--input', '{MINECRAFT_JAR}',
+                            '--output', '{ROOT}/libraries/',
+                            '--libraries'
+                        ]
+                    ], [
+                        sides: ['server'],
+                        jar: INSTALLER_TOOLS,
+                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
+                        args: [
+                            '--task', 'BUNDLER_EXTRACT',
+                            '--input', '{MINECRAFT_JAR}',
+                            '--output', '{MC_UNPACKED}',
+                            '--jar-only'
+                        ]
                    ], [
                        jar: INSTALLER_TOOLS,
                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
@@ -713,11 +777,12 @@ project(':fmlonly') {
                            '--classes', '--reverse-right'
                        ]
                    ], [
+                        sides: ['client'],
                        jar: JAR_SPLITTER,
                        classpath: getClasspath(project, libs, JAR_SPLITTER),
                        args: [
                            '--input', '{MINECRAFT_JAR}',
-                            '--slim', '{MC_SLIM}',
+                            '--slim',  '{MC_SLIM}',
                            '--extra', '{MC_EXTRA}',
                            '--srg', '{MERGED_MAPPINGS}'
                        ],
@@ -726,15 +791,27 @@ project(':fmlonly') {
                            '{MC_EXTRA}': '{MC_EXTRA_SHA}'
                        ]
                    ], [
-                        jar: VIGNETTE,
-                        classpath: getClasspath(project, libs, VIGNETTE),
+                        sides: ['server'],
+                        jar: JAR_SPLITTER,
+                        classpath: getClasspath(project, libs, JAR_SPLITTER),
                        args: [
-                            '--jar-in', '{MC_SLIM}',
-                            '--jar-out', '{MC_SRG}',
-                            '--mapping-format', 'tsrg2',
-                            '--mappings', '{MERGED_MAPPINGS}',
-                            // '--stable',
-                            '--create-inits', '--fix-param-annotations', '--fernflower-meta'
+                            '--input', '{MC_UNPACKED}',
+                            '--slim',  '{MC_SLIM}',
+                            '--extra', '{MC_EXTRA}',
+                            '--srg', '{MERGED_MAPPINGS}'
+                        ],
+                        outputs: [
+                            '{MC_SLIM}': '{MC_SLIM_SHA}',
+                            '{MC_EXTRA}': '{MC_EXTRA_SHA}'
+                        ]
+                    ], [
+                        jar: FART,
+                        classpath: getClasspath(project, libs, FART),
+                        args: [
+                            '--input', '{MC_SLIM}',
+                            '--output', '{MC_SRG}',
+                            '--names', '{MERGED_MAPPINGS}',
+                            '--ann-fix', '--ids-fix', '--src-fix', '--record-fix'
                        ]/*,
                        outputs: [
                            '{MC_SRG}': '{MC_SRG_SHA}'
@@ -865,6 +942,7 @@ project(':forge') {
                parent runs.forge_client
                taskName 'forge_test_client'

+                property 'forge.enableGameTest', 'true'
                environment 'MOD_CLASSES', 'dummy' // Needed to work around FG limitation, FG will replace this!

                ideaModule "${rootProject.name}.${project.name}.test"
@@ -887,6 +965,7 @@ project(':forge') {
                parent runs.forge_server
                taskName 'forge_test_server'

+                property 'forge.enableGameTest', 'true'
                environment 'MOD_CLASSES', 'dummy' // Needed to work around FG limitation, FG will replace this!

                ideaModule "${rootProject.name}.${project.name}.test"
@@ -896,6 +975,27 @@ project(':forge') {
                }
            }

+            forge_gameTestServer {
+                taskName 'forge_gameTestServer'
+                args '--launchTarget', 'forgegametestserverdev'
+                ideaModule "${rootProject.name}.${project.name}.main"
+
+                mods {
+                    minecraft { source sourceSets.main }
+                }
+            }
+
+            forge_test_gameTestServer {
+                parent runs.forge_gameTestServer
+                taskName 'forge_test_gameTestServer'
+
+                ideaModule "${rootProject.name}.${project.name}.test"
+
+                mods {
+                    tests { sources sourceSets.test }
+                }
+            }
+
            def forgeDataArgs = [
                    '--mod', 'forge',
                    '--all',
@@ -1140,6 +1240,10 @@ project(':forge') {
                        client: '/data/client.lzma',
                        server: '/data/server.lzma'
                    ],
+                    MC_UNPACKED: [
+                        client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:unpacked]",
+                        server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:unpacked]"
+                    ],
                    MC_SLIM: [
                        client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:slim]",
                        server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:slim]"
@@ -1208,6 +1312,26 @@ project(':forge') {
                            '--from', 'data/unix_args.txt',
                            '--to',   "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt"
                        ]
+                    ], [
+                        sides: ['server'],
+                        jar: INSTALLER_TOOLS,
+                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
+                        args: [
+                            '--task', 'BUNDLER_EXTRACT',
+                            '--input', '{MINECRAFT_JAR}',
+                            '--output', '{ROOT}/libraries/',
+                            '--libraries'
+                        ]
+                    ], [
+                        sides: ['server'],
+                        jar: INSTALLER_TOOLS,
+                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
+                        args: [
+                            '--task', 'BUNDLER_EXTRACT',
+                            '--input', '{MINECRAFT_JAR}',
+                            '--output', '{MC_UNPACKED}',
+                            '--jar-only'
+                        ]
                    ], [
                        jar: INSTALLER_TOOLS,
                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
@@ -1237,6 +1361,7 @@ project(':forge') {
                            '--classes', '--reverse-right'
                        ]
                    ], [
+                        sides: ['client'],
                        jar: JAR_SPLITTER,
                        classpath: getClasspath(project, libs, JAR_SPLITTER),
                        args: [
@@ -1250,15 +1375,27 @@ project(':forge') {
                            '{MC_EXTRA}': '{MC_EXTRA_SHA}'
                        ]
                    ], [
-                        jar: VIGNETTE,
-                        classpath: getClasspath(project, libs, VIGNETTE),
+                        sides: ['server'],
+                        jar: JAR_SPLITTER,
+                        classpath: getClasspath(project, libs, JAR_SPLITTER),
                        args: [
-                            '--jar-in', '{MC_SLIM}',
-                            '--jar-out', '{MC_SRG}',
-                            '--mapping-format', 'tsrg2',
-                            '--mappings', '{MERGED_MAPPINGS}',
-                            // '--stable',
-                            '--create-inits', '--fix-param-annotations', '--fernflower-meta'
+                            '--input', '{MC_UNPACKED}',
+                            '--slim',  '{MC_SLIM}',
+                            '--extra', '{MC_EXTRA}',
+                            '--srg', '{MERGED_MAPPINGS}'
+                        ],
+                        outputs: [
+                            '{MC_SLIM}': '{MC_SLIM_SHA}',
+                            '{MC_EXTRA}': '{MC_EXTRA_SHA}'
+                        ]
+                    ], [
+                        jar: FART,
+                        classpath: getClasspath(project, libs, FART),
+                        args: [
+                            '--input', '{MC_SLIM}',
+                            '--output', '{MC_SRG}',
+                            '--names', '{MERGED_MAPPINGS}',
+                            '--ann-fix', '--ids-fix', '--src-fix', '--record-fix'
                        ]/*,
                        outputs: [
                            '{MC_SRG}': '{MC_SRG_SHA}'
@@ -1341,7 +1478,7 @@ project(':forge') {
                MAPPING_CHANNEL: MAPPING_CHANNEL,
                MAPPING_VERSION: MAPPING_VERSION,
                FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0],
-                MC_NEXT_VERSION: "1."+((MC_VERSION.split("\\.")[1] as int)+1)
+                MC_NEXT_VERSION: "1."+((MC_VERSION.split("[\\.-]")[1] as int)+1)
            ])
            rename 'gitignore\\.txt', '.gitignore'
            rename 'gitattributes\\.txt', '.gitattributes'
@@ -1351,10 +1488,6 @@ project(':forge') {
    license {
        header = file("$rootDir/LICENSE-header.txt")

-        ext {
-            year = new Date().format("yyyy")
-        }
-
        include 'net/minecraftforge/'
        exclude 'net/minecraftforge/server/terminalconsole/'
        exclude 'net/minecraftforge/api/' // exclude API here because it's validated in the SPI build
@@ -1375,7 +1508,8 @@ project(':forge') {
    }

    reobfJar {
-        tool = SPECIAL_SOURCE + ':shaded'
+        tool = FART
+        args = ['--input', '{input}', '--output', '{output}', '--map', '{srg}']
    }

    tasks.eclipse.dependsOn('genEclipseRuns')
@@ -1395,11 +1529,6 @@ project(':forge') {
        publications {
            mavenJava(MavenPublication) {
                artifact universalJar
-                if (changelog.exists()) {
-                    artifact(changelog) {
-                        classifier = 'changelog'
-                    }
-                }
                artifact installerJar
                //TODO: installer-win
                artifact makeMdk
@@ -1419,3 +1548,19 @@ task setup() {  //These must be strings so that we can do lazy resolution. Else
        dependsOn ':fmlonly:extractMapped'
    dependsOn ':forge:extractMapped'
 }
+
+//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.
+    tasks.configureTeamCity {
+        doLast {
+            println "##teamcity[buildNumber '${project(':forge').version}']"
+            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
+            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
+        }
+    }
+}
+
+changelog {
+    fromTag MIN_TAG_FOR_CHANGELOG
+}
@@ -1,5 +1,6 @@
 package net.minecraftforge.forge.tasks

+import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper

 import java.io.File
@@ -16,8 +17,11 @@ public class Util {
 			}
 			return md.digest().collect {String.format "%02x", it}.join()
 		}
+        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
 	
 		File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
+        File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
+        File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
 		
 		Date.metaClass.iso8601 = { ->
 			def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
@@ -1,7 +1,6 @@
 package net.minecraftforge.fml;

 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.eventbus.api.BusBuilder;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
@@ -28,13 +28,13 @@ public interface IExtensionPoint<T extends Record>
     * Compatibility display test for the mod.
     * Used for displaying compatibility with remote servers with the same mod, and on disk saves.
     *
-     * The supplier provides my "local" version for sending across the network or writing to disk
-     * The predicate tests the version from a remote instance or save for acceptability (Boolean is true for network, false for local save)
+     * 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>Return {@code net.minecraftforge.fmllegacy.network.FMLNetworkConstants#IGNORESERVERONLY} in the supplier, if you wish to be ignored
+     * <p>Return {@code net.minecraftforge.impl.impl.FMLNetworkConstants#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 network boolean is true) if you are client side,
+     * <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>
@@ -1,6 +1,6 @@
 /*
 * Minecraft Forge
- * Copyright (c) 2016-2021.
+ * Copyright (c) 2016-2022.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -37,6 +37,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -85,7 +86,7 @@ public class ModList
    }

    private String fileToLine(IModFile mf) {
-        return String.format("%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
+        return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
                mf.getModInfos().get(0).getDisplayName(),
                mf.getModInfos().get(0).getModId(),
                mf.getModInfos().get(0).getVersion(),
@@ -34,7 +34,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -1,7 +1,6 @@
 package net.minecraftforge.fml;

 import com.google.common.graph.GraphBuilder;
-import com.google.common.graph.MutableGraph;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.toposort.TopologicalSort;
@@ -43,7 +43,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
@@ -81,6 +81,7 @@ public class ConfigFileTypeHandler {
    }

    private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
+        Files.createDirectories(file.getParent());
        Path p = defaultConfigPath.resolve(modConfig.getFileName());
        if (Files.exists(p)) {
            LOGGER.info(CONFIG, "Loading default config file from path {}", p);
@@ -1,6 +1,6 @@
 /*
 * Minecraft Forge
- * Copyright (c) 2016-2021.
+ * Copyright (c) 2016-2022.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -27,6 +27,7 @@ import net.minecraftforge.fml.loading.StringUtils;

 import java.io.ByteArrayInputStream;
 import java.nio.file.Path;
+import java.util.Locale;
 import java.util.concurrent.Callable;

 public class ModConfig
@@ -54,7 +55,7 @@ public class ModConfig

    private static String defaultConfigName(Type type, String modId) {
        // config file name would be "forge-client.toml" and "forge-server.toml"
-        return String.format("%s-%s.toml", modId, type.extension());
+        return String.format(Locale.ROOT, "%s-%s.toml", modId, type.extension());
    }
    public Type getType() {
        return type;
@@ -1,76 +0,0 @@
-/*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.minecraftforge.common.asm;
-
-import java.util.EnumSet;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AnnotationNode;
-import org.objectweb.asm.tree.ClassNode;
-import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
-
-/**
- * Removes the final modifier from fields with the @CapabilityInject annotation, prevents the JITer from in lining them so our runtime replacements can work.
- */
-@Deprecated(since = "1.18", forRemoval = true)
-public class CapabilityInjectDefinalize implements ILaunchPluginService {
-
-    private final String CAP        = "Lnet/minecraftforge/common/capabilities/Capability;";       //Don't directly reference this to prevent class loading.
-    private final String CAP_INJECT = "Lnet/minecraftforge/common/capabilities/CapabilityInject;"; //Don't directly reference this to prevent class loading.
-
-    @Override
-    public String name() {
-        return "capability_inject_definalize";
-    }
-
-    private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
-    private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
-
-    @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
-    }
-
-    private boolean hasHolder(List<AnnotationNode> lst)
-    {
-        return lst != null && lst.stream().anyMatch(n -> n.desc.equals(CAP_INJECT));
-    }
-
-    @Override
-    public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
-    {
-        final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
-        final AtomicBoolean changed = new AtomicBoolean();
-        classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.equals(CAP) && hasHolder(f.visibleAnnotations)).forEach(f ->
-        {
-            int prev = f.access;
-            f.access &= ~Opcodes.ACC_FINAL; //Strip final
-            f.access |= Opcodes.ACC_SYNTHETIC; //Add Synthetic so we can check in runtime.
-            changed.compareAndSet(false, prev != f.access);
-        });
-
-        return changed.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
-    }
-
-}
@@ -17,7 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-package net.minecraftforge.common.asm;
+package net.minecraftforge.fml.common.asm;

 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -17,9 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-package net.minecraftforge.common.asm;
+package net.minecraftforge.fml.common.asm;

-import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -17,9 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-package net.minecraftforge.common.asm;
+package net.minecraftforge.fml.common.asm;

-import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,15 +24,12 @@ 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 net.minecraftforge.api.distmarker.Dist;
 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.Arrays;
 import java.util.Objects;
-import java.util.stream.Collectors;

 import static net.minecraftforge.fml.loading.LogMarkers.CORE;

@@ -23,9 +23,12 @@ import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.*;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
+import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
+import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer;
+import net.minecraftforge.fml.loading.moddiscovery.ModFile;
+import net.minecraftforge.fml.loading.moddiscovery.ModValidator;
 import net.minecraftforge.accesstransformer.service.AccessTransformerService;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.loading.moddiscovery.*;
 import net.minecraftforge.fml.loading.progress.EarlyProgressVisualization;
 import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
@@ -78,7 +78,7 @@ public class FMLServiceProvider implements ITransformationService
        LOGGER.debug(CORE, "Loading configuration");
        FMLConfig.load();
        LOGGER.debug(CORE, "Preparing ModFile");
-        environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile.buildFactory());
+        environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
        arguments = new HashMap<>();
        arguments.put("modLists", modListsArgumentList);
        arguments.put("mods", modsArgumentList);
@@ -32,11 +32,7 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;

-import java.io.File;
-import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -22,14 +22,8 @@ package net.minecraftforge.fml.loading;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import static net.minecraftforge.fml.loading.LogMarkers.CORE;

 public class LibraryFinder {
    private static final Logger LOGGER = LogManager.getLogger();
@@ -44,39 +38,9 @@ public class LibraryFinder {
        return libsPath;
    }

-    // Not used anywhere in Forge's codebase, scheduled for deletion unless a good need is expressed.
-    @Deprecated(forRemoval = true, since = "1.17.1")
-    public static Path findJarPathFor(final String className, final String jarName) {
-        final URL resource = LibraryFinder.class.getClassLoader().getResource(className);
-        return findJarPathFor(className, jarName, resource);
-    }
-
-    /*
-     * Only used in ClasspathLocator now, so moved too a private method and depreciated this.
-     * Scheduled for deletion unless a good need is expressed.
-     */
-    @Deprecated(forRemoval = true, since = "1.17.1")
-    public static Path findJarPathFor(final String resourceName, final String jarName, final URL resource) {
-        try {
-            Path path;
-            final URI uri = resource.toURI();
-            if (uri.getScheme().equals("jar") && uri.getRawSchemeSpecificPart().contains("!/")) {
-                int lastExcl = uri.getRawSchemeSpecificPart().lastIndexOf("!/");
-                path = Paths.get(new URI(uri.getRawSchemeSpecificPart().substring(0, lastExcl)));
-            } else {
-                path = Paths.get(new URI("file://"+uri.getRawSchemeSpecificPart().substring(0, uri.getRawSchemeSpecificPart().length()-resourceName.length())));
-            }
-            LOGGER.debug(CORE, "Found JAR {} at path {}", jarName, path.toString());
-            return path;
-        } catch (NullPointerException | URISyntaxException e) {
-            LOGGER.fatal(CORE, "Failed to find JAR for class {} - {}", resourceName, jarName);
-            throw new RuntimeException("Unable to locate "+resourceName+" - "+jarName, e);
-        }
-    }
-
    static Path getForgeLibraryPath(final String mcVersion, final String forgeVersion, final String forgeGroup) {
        Path forgePath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", "universal", mcVersion+"-"+forgeVersion));
-        LOGGER.debug(CORE, "Found forge path {} is {}", forgePath, pathStatus(forgePath));
+        LOGGER.debug(LogMarkers.CORE, "Found forge path {} is {}", forgePath, pathStatus(forgePath));
        return forgePath;
    }

@@ -88,9 +52,9 @@ public class LibraryFinder {
        Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion));
        Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "extra", mcVersion+"-"+mcpVersion));
        Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion));
-        LOGGER.debug(CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath));
-        LOGGER.debug(CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath));
-        LOGGER.debug(CORE,"Forge patches at {} is {}", patchedBinariesPath.toString(), pathStatus(patchedBinariesPath));
+        LOGGER.debug(LogMarkers.CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath));
+        LOGGER.debug(LogMarkers.CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath));
+        LOGGER.debug(LogMarkers.CORE,"Forge patches at {} is {}", patchedBinariesPath.toString(), pathStatus(patchedBinariesPath));
        return new Path[] { patchedBinariesPath, mcExtrasPath, srgMcPath };
    }

@@ -14,8 +14,6 @@ import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;

-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-
 public class MCPNamingService implements INameMappingService {
    private static final Logger LOGGER = LogManager.getLogger();
    private HashMap<String, String> methods;
@@ -58,7 +56,7 @@ public class MCPNamingService implements INameMappingService {
            HashMap<String,String> tmpmethods = new HashMap<>(1000);
            loadMappings("methods.csv", tmpmethods::put);
            methods = tmpmethods;
-            LOGGER.debug(CORE, "Loaded {} method mappings from methods.csv", methods.size());
+            LOGGER.debug(LogMarkers.CORE, "Loaded {} method mappings from methods.csv", methods.size());
        }
        return methods.getOrDefault(origin, origin);
    }
@@ -68,7 +66,7 @@ public class MCPNamingService implements INameMappingService {
            HashMap<String,String> tmpfields = new HashMap<>(1000);
            loadMappings("fields.csv", tmpfields::put);
            fields = tmpfields;
-            LOGGER.debug(CORE, "Loaded {} field mappings from fields.csv", fields.size());
+            LOGGER.debug(LogMarkers.CORE, "Loaded {} field mappings from fields.csv", fields.size());
        }
        return fields.getOrDefault(origin, origin);
    }
@@ -81,7 +79,7 @@ public class MCPNamingService implements INameMappingService {
        try (BufferedReader reader = new BufferedReader(new InputStreamReader(path.openStream()))) {
            reader.lines().skip(1).map(e -> e.split(",")).forEach(e -> mapStore.accept(e[0], e[1]));
        } catch (IOException e1) {
-            LOGGER.error(CORE, "Error reading mappings", e1);
+            LOGGER.error(LogMarkers.CORE, "Error reading mappings", e1);
        }
    }
 }
@@ -30,7 +30,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Stream;
 import java.util.zip.ZipFile;

 public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
@@ -32,7 +32,6 @@ import net.minecraftforge.fml.loading.toposort.TopologicalSort;
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.util.StringBuilderFormattable;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;

@@ -235,6 +234,13 @@ public class ModSorter
        LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);

        if (!missingVersions.isEmpty()) {
+            if (mandatoryMissing > 0) {
+                LOGGER.error(LOADING, "Missing mandatory dependencies: {}", missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).map(IModInfo.ModVersion::getModId).collect(Collectors.joining(", ")));
+            }
+            if (missingVersions.size() - mandatoryMissing > 0) {
+                LOGGER.error(LOADING, "Unsupported installed optional dependencies: {}", missingVersions.stream().filter(ver -> !ver.isMandatory()).map(IModInfo.ModVersion::getModId).collect(Collectors.joining(", ")));
+            }
+
            return missingVersions.stream()
                    .map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
                            mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
@@ -19,7 +19,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;
@@ -1,6 +1,6 @@
 /*
 * Minecraft Forge
- * Copyright (c) 2016-2021.
+ * Copyright (c) 2016-2022.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@ package net.minecraftforge.fml.loading.moddiscovery;

 import cpw.mods.jarhandling.SecureJar;
 import cpw.mods.jarhandling.JarMetadata;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
@@ -42,23 +43,19 @@ import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
-
-public abstract class AbstractJarFileLocator implements IModLocator {
+public abstract class AbstractJarFileLocator extends AbstractModLocator {
    private static final Logger LOGGER = LogManager.getLogger();
-    protected static final String MODS_TOML = "META-INF/mods.toml";
-    protected static final String MANIFEST = "META-INF/MANIFEST.MF";

    @Override
    public void scanFile(final IModFile file, final Consumer<Path> pathConsumer) {
-        LOGGER.debug(SCAN,"Scan started: {}", file);
+        LOGGER.debug(LogMarkers.SCAN,"Scan started: {}", file);
        final Function<Path, SecureJar.Status> status = p->file.getSecureJar().verifyPath(p);
        try (Stream<Path> files = Files.find(file.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
            file.setSecurityStatus(files.peek(pathConsumer).map(status).reduce((s1, s2)-> SecureJar.Status.values()[Math.min(s1.ordinal(), s2.ordinal())]).orElse(SecureJar.Status.INVALID));
        } catch (IOException e) {
            e.printStackTrace();
        }
-        LOGGER.debug(SCAN,"Scan finished: {}", file);
+        LOGGER.debug(LogMarkers.SCAN,"Scan finished: {}", file);
    }

    @Override
@@ -71,69 +68,4 @@ public abstract class AbstractJarFileLocator implements IModLocator {
    }

    public abstract Stream<Path> scanCandidates();
-
-    @Override
-    public boolean isValid(final IModFile modFile) {
-        return true;
-    }
-
-    private Optional<IModFile> createMod(Path path) {
-        var mjm = new ModJarMetadata();
-        var sj = SecureJar.from(
-            Manifest::new,
-            jar -> jar.findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-            (root, p) -> true,
-            path
-        );
-
-        IModFile mod = null;
-        var type = sj.getManifest().getMainAttributes().getValue(ModFile.TYPE);
-        if (sj.findFile(MODS_TOML).isPresent()) {
-            LOGGER.debug(SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
-            mod = ModFile.newFMLInstance(this, sj);
-        } else if (type != null) {
-            LOGGER.debug(SCAN, "Found {} mod of type {}: {}", MANIFEST, type, path);
-            mod = new ModFile(sj, this, this::manifestParser);
-        } else {
-            return Optional.empty();
-        }
-
-        mjm.setModFile(mod);
-        return Optional.ofNullable(mod);
-    }
-
-    private IModFileInfo manifestParser(final IModFile mod) {
-        Function<String, Optional<String>> cfg = name -> Optional.ofNullable(mod.getSecureJar().getManifest().getMainAttributes().getValue(name));
-        var license = cfg.apply("LICENSE").orElse("");
-        var dummy = new IConfigurable() {
-            @Override
-            public <T> Optional<T> getConfigElement(String... key) {
-                return Optional.empty();
-            }
-            @Override
-            public List<? extends IConfigurable> getConfigList(String... key) {
-                return Collections.emptyList();
-            }
-        };
-
-        return new IModFileInfo() {
-            @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
-            @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
-            @Override public boolean showAsResourcePack() { return false; }
-            @Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); }
-            @Override public String getLicense() { return license; }
-            @Override public IModFile getFile() { return mod; }
-            @Override public IConfigurable getConfig() { return dummy; }
-
-            // These Should never be called as it's only called from ModJarMetadata.version and we bypass that
-            @Override public String moduleName() { return mod.getSecureJar().name(); }
-            @Override public String versionString() { return null; }
-            @Override public List<String> usesServices() { return null; }
-
-            @Override
-            public String toString() {
-                return "IModFileInfo(" + mod.getFilePath() + ")";
-            }
-        };
-    }
 }
@@ -0,0 +1,110 @@
+/*
+ * Minecraft Forge
+ * Copyright (c) 2016-2022.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.minecraftforge.fml.loading.moddiscovery;
+
+import cpw.mods.jarhandling.JarMetadata;
+import cpw.mods.jarhandling.SecureJar;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.forgespi.language.IConfigurable;
+import net.minecraftforge.forgespi.language.IModFileInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
+import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.forgespi.locating.IModLocator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.jar.Manifest;
+
+public abstract class AbstractModLocator implements IModLocator {
+    private static final Logger LOGGER = LogManager.getLogger();
+    protected static final String MODS_TOML = "META-INF/mods.toml";
+    protected static final String MANIFEST = "META-INF/MANIFEST.MF";
+
+    protected Optional<IModFile> createMod(Path... path) {
+        var mjm = new ModJarMetadata();
+        var sj = SecureJar.from(
+                Manifest::new,
+                jar -> jar.findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
+                (root, p) -> true,
+                path
+        );
+
+        IModFile mod;
+        var type = sj.getManifest().getMainAttributes().getValue(ModFile.TYPE);
+        if (sj.findFile(MODS_TOML).isPresent()) {
+            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
+            mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
+        } else if (type != null) {
+            LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MANIFEST, type, path);
+            mod = new ModFile(sj, this, this::manifestParser);
+        } else {
+            return Optional.empty();
+        }
+
+        mjm.setModFile(mod);
+        return Optional.of(mod);
+    }
+
+    protected IModFileInfo manifestParser(final IModFile mod) {
+        Function<String, Optional<String>> cfg = name -> Optional.ofNullable(mod.getSecureJar().getManifest().getMainAttributes().getValue(name));
+        var license = cfg.apply("LICENSE").orElse("");
+        var dummy = new IConfigurable() {
+            @Override
+            public <T> Optional<T> getConfigElement(String... key) {
+                return Optional.empty();
+            }
+            @Override
+            public List<? extends IConfigurable> getConfigList(String... key) {
+                return Collections.emptyList();
+            }
+        };
+
+        return new IModFileInfo() {
+            @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
+            @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
+            @Override public boolean showAsResourcePack() { return false; }
+            @Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); }
+            @Override public String getLicense() { return license; }
+            @Override public IModFile getFile() { return mod; }
+            @Override public IConfigurable getConfig() { return dummy; }
+
+            // These Should never be called as it's only called from ModJarMetadata.version and we bypass that
+            @Override public String moduleName() { return mod.getSecureJar().name(); }
+            @Override public String versionString() { return null; }
+            @Override public List<String> usesServices() { return null; }
+
+            @Override
+            public String toString() {
+                return "IModFileInfo(" + mod.getFilePath() + ")";
+            }
+        };
+    }
+
+    @Override
+    public boolean isValid(final IModFile modFile) {
+        return true;
+    }
+}
@@ -19,8 +19,9 @@

 package net.minecraftforge.fml.loading.moddiscovery;

-import net.minecraftforge.forgespi.language.ModFileScanData;
 import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

@@ -30,8 +31,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.*;

-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
-
 public class BackgroundScanHandler
 {
    private enum ScanStatus {
@@ -87,7 +86,7 @@ public class BackgroundScanHandler
    private void addCompletedFile(final ModFile file, final ModFileScanData modFileScanData, final Throwable throwable) {
        if (throwable != null) {
            status = ScanStatus.ERRORED;
-            LOGGER.error(SCAN,"An error occurred scanning file {}", file, throwable);
+            LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable);
        }
        pendingFiles.remove(file);
        scannedFiles.add(file);
@@ -19,6 +19,7 @@

 package net.minecraftforge.fml.loading.moddiscovery;

+import net.minecraftforge.fml.loading.LogMarkers;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

@@ -36,7 +37,6 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;

 public class ClasspathLocator extends AbstractJarFileLocator {
    private static final Logger LOGGER = LogManager.getLogger();
@@ -62,7 +62,7 @@ public class ClasspathLocator extends AbstractJarFileLocator {

            return paths.build();
        } catch (IOException e) {
-            LOGGER.fatal(SCAN, "Error trying to find resources", e);
+            LOGGER.fatal(LogMarkers.SCAN, "Error trying to find resources", e);
            throw new RuntimeException(e);
        }
    }
@@ -99,7 +99,7 @@ public class ClasspathLocator extends AbstractJarFileLocator {
            //LOGGER.debug(CORE, "Found JAR {} at path {}", jarName, path.toString());
            return path;
        } catch (NullPointerException | URISyntaxException e) {
-            LOGGER.fatal(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);
        }
    }
@@ -19,6 +19,7 @@

 package net.minecraftforge.fml.loading.moddiscovery;

+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
 import org.apache.logging.log4j.LogManager;
@@ -34,9 +35,6 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Stream;

-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
-
 public class ExplodedDirectoryLocator implements IModLocator {
    private static final Logger LOGGER = LogManager.getLogger();

@@ -47,8 +45,12 @@ public class ExplodedDirectoryLocator implements IModLocator {

    @Override
    public List<IModFile> scanMods() {
-        explodedMods.forEach(explodedMod -> ModJarMetadata.buildFile(this, jar ->jar.findFile("/META-INF/mods.toml").isPresent(), explodedMod.paths().toArray(Path[]::new))
-                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
+        explodedMods.forEach(explodedMod ->
+                ModJarMetadata.buildFile(this,
+                        jar->jar.findFile("/META-INF/mods.toml").isPresent(),
+                        (a,b) -> true,
+                        explodedMod.paths().toArray(Path[]::new))
+                .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
        return List.copyOf(mods.values());
    }

@@ -59,13 +61,13 @@ public class ExplodedDirectoryLocator implements IModLocator {

    @Override
    public void scanFile(final IModFile file, final Consumer<Path> pathConsumer) {
-        LOGGER.debug(SCAN,"Scanning exploded directory {}", file.getFilePath().toString());
+        LOGGER.debug(LogMarkers.SCAN,"Scanning exploded directory {}", file.getFilePath().toString());
        try (Stream<Path> files = Files.find(file.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
            files.forEach(pathConsumer);
        } catch (IOException e) {
            e.printStackTrace();
        }
-        LOGGER.debug(SCAN,"Exploded directory scan complete {}", file.getFilePath().toString());
+        LOGGER.debug(LogMarkers.SCAN,"Exploded directory scan complete {}", file.getFilePath().toString());
    }

    @Override
@@ -1,6 +1,6 @@
 /*
 * Minecraft Forge
- * Copyright (c) 2016-2021.
+ * Copyright (c) 2016-2022.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -21,13 +21,15 @@ package net.minecraftforge.fml.loading.moddiscovery;

 import net.minecraftforge.forgespi.language.IModFileInfo;

+import java.util.Locale;
+
 public class InvalidModFileException extends RuntimeException
 {
    private final IModFileInfo modFileInfo;

    public InvalidModFileException(String message, IModFileInfo modFileInfo)
    {
-        super(String.format("%s (%s)", message, ((ModFileInfo)modFileInfo).getFile().getFileName()));
+        super(String.format(Locale.ENGLISH, "%s (%s)", message, ((ModFileInfo)modFileInfo).getFile().getFileName()));
        this.modFileInfo = modFileInfo;
    }
 }
@@ -1,11 +1,29 @@
+/*
+ * Minecraft Forge
+ * Copyright (c) 2016-2022.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 package net.minecraftforge.fml.loading.moddiscovery;

 import com.electronwill.nightconfig.core.Config;
-import com.electronwill.nightconfig.core.file.FileConfig;
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.MavenVersionAdapter;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.IModLocator;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
@@ -18,10 +36,8 @@ import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;

-public class MinecraftLocator implements IModLocator {
+public class MinecraftLocator extends AbstractModLocator {
    private static final Logger LOGGER = LogManager.getLogger();

    @Override
@@ -29,8 +45,14 @@ public class MinecraftLocator implements IModLocator {
        final var launchHandler = FMLLoader.getLaunchHandler();
        var baseMC = launchHandler.getMinecraftPaths();
        var mcjar = ModJarMetadata.buildFile(j->ModFileFactory.FACTORY.build(j, this, this::buildMinecraftTOML), j->true, baseMC.minecraftFilter(), baseMC.minecraftPaths().toArray(Path[]::new)).orElseThrow();
-        var artifacts = baseMC.otherArtifacts().stream().map(SecureJar::from).map(sj->ModFile.newFMLInstance(this, sj)).collect(Collectors.<IModFile>toList());
-        var othermods = baseMC.otherModPaths().stream().map(p->ModJarMetadata.buildFile(this, p.toArray(Path[]::new))).toList();
+        var artifacts = baseMC.otherArtifacts().stream()
+                .map(SecureJar::from)
+                .map(sj -> new ModFile(sj, this, ModFileParser::modsTomlParser))
+                .collect(Collectors.<IModFile>toList());
+        var othermods = baseMC.otherModPaths().stream()
+                .map(p -> createMod(p.toArray(Path[]::new)).orElse(null))
+                .filter(Objects::nonNull)
+                .toList();
        artifacts.add(mcjar);
        artifacts.addAll(othermods);
        return artifacts;
@@ -97,22 +119,17 @@ public class MinecraftLocator implements IModLocator {

    @Override
    public void scanFile(final IModFile modFile, final Consumer<Path> pathConsumer) {
-        LOGGER.debug(SCAN, "Scan started: {}", modFile);
+        LOGGER.debug(LogMarkers.SCAN, "Scan started: {}", modFile);
        try (Stream<Path> files = Files.find(modFile.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
            files.forEach(pathConsumer);
        } catch (IOException e) {
            e.printStackTrace();
        }
-        LOGGER.debug(SCAN, "Scan finished: {}", modFile);
+        LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", modFile);
    }

    @Override
    public void initArguments(final Map<String, ?> arguments) {
        // no op
    }
-
-    @Override
-    public boolean isValid(final IModFile modFile) {
-        return true;
-    }
 }
@@ -22,6 +22,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import cpw.mods.modlauncher.Launcher;
 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.Environment;
 import net.minecraftforge.forgespi.locating.IModFile;
@@ -35,9 +36,6 @@ import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.stream.Collectors;

-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
-
 public class ModDiscoverer {
    private static final Logger LOGGER = LogManager.getLogger();
    private final ServiceLoader<IModLocator> locators;
@@ -45,12 +43,12 @@ public class ModDiscoverer {

    public ModDiscoverer(Map<String, ?> arguments) {
        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), v->ModsFolderLocator::new);
-        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v->StartupMessageManager.locatorConsumer().orElseGet(()->s->{}));
+        Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v-> StartupMessageManager.locatorConsumer().orElseGet(()-> s->{}));
        final var moduleLayerManager = Launcher.INSTANCE.environment().findModuleLayerManager().orElseThrow();
        locators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
        locatorList = ServiceLoaderUtils.streamServiceLoader(()->locators, sce->LOGGER.error("Failed to load locator list", sce)).collect(Collectors.toList());
        locatorList.forEach(l->l.initArguments(arguments));
-        LOGGER.debug(CORE,"Found Mod Locators : {}", ()->locatorList.stream().map(iModLocator -> "("+iModLocator.name() + ":" + iModLocator.getClass().getPackage().getImplementationVersion()+")").collect(Collectors.joining(",")));
+        LOGGER.debug(LogMarkers.CORE,"Found Mod Locators : {}", ()->locatorList.stream().map(iModLocator -> "("+iModLocator.name() + ":" + iModLocator.getClass().getPackage().getImplementationVersion()+")").collect(Collectors.joining(",")));
    }

    ModDiscoverer(List<IModLocator> locatorList) {
@@ -59,13 +57,13 @@ public class ModDiscoverer {
    }

    public ModValidator discoverMods() {
-        LOGGER.debug(SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", locatorList.size());
+        LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", locatorList.size());
        var loadedFiles = new ArrayList<>();
        for (IModLocator locator : locatorList) {
-            LOGGER.debug(SCAN,"Trying locator {}", locator);
+            LOGGER.debug(LogMarkers.SCAN,"Trying locator {}", locator);
            var modFiles = locator.scanMods();
            for (IModFile mf : modFiles) {
-                LOGGER.info(SCAN, "Found mod file {} of type {} with locator {}", mf.getFileName(), mf.getType(), mf.getLocator());
+                LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with locator {}", mf.getFileName(), mf.getType(), mf.getLocator());
                StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found mod file "+mf.getFileName()+" of type "+mf.getType()));
            }
            loadedFiles.addAll(modFiles);
@@ -21,8 +21,9 @@ package net.minecraftforge.fml.loading.moddiscovery;

 import com.google.common.collect.ImmutableMap;
 import cpw.mods.jarhandling.SecureJar;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
@@ -46,11 +47,9 @@ import java.util.function.Supplier;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;

-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-
 public class ModFile implements IModFile {
    // Mods either must have a mods.toml or a manifest. We can no longer just put any jar on the classpath.
-    @Deprecated(forRemoval = true, since = "1.17.1")
+    @Deprecated(forRemoval = true, since = "1.18")
    public static final Manifest DEFAULTMANIFEST;
    private static final Logger LOGGER = LogManager.getLogger();

@@ -74,8 +73,7 @@ public class ModFile implements IModFile {
    private List<CoreModFile> coreMods;
    private Path accessTransformer;

-    //TODO: Make package private in 1.18+
-    public static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
+    static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
    private SecureJar.Status securityStatus;

    public ModFile(final SecureJar jar, final IModLocator locator, final ModFileFactory.ModFileInfoParser parser) {
@@ -120,9 +118,9 @@ public class ModFile implements IModFile {
    public boolean identifyMods() {
        this.modFileInfo = ModFileParser.readModList(this, this.parser);
        if (this.modFileInfo == null) return this.getType() != Type.MOD;
-        LOGGER.debug(LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
+        LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders());
        this.coreMods = ModFileParser.getCoreMods(this);
-        this.coreMods.forEach(mi-> LOGGER.debug(LOADING,"Found coremod {}", mi.getPath()));
+        this.coreMods.forEach(mi-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {}", mi.getPath()));
        this.accessTransformer = findResource("META-INF", "accesstransformer.cfg");
        return true;
    }
@@ -189,7 +187,7 @@ public class ModFile implements IModFile {

    public void identifyLanguage() {
        this.loaders = this.modFileInfo.requiredLanguageLoaders().stream()
-                .map(spec->FMLLoader.getLanguageLoadingProvider().findLanguage(this, spec.languageName(), spec.acceptedVersions()))
+                .map(spec-> FMLLoader.getLanguageLoadingProvider().findLanguage(this, spec.languageName(), spec.acceptedVersions()))
                .toList();
    }

@@ -213,24 +211,6 @@ public class ModFile implements IModFile {
        return modFileInfo;
    }

-    // TODO: Remove concept of factory from forgeapi.. Why expose this?
-    @Deprecated(forRemoval = true, since="1.17.1")
-    public static ModFileFactory buildFactory() {
-        return ModFile::new;
-    }
-
-    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.17.1")
-    public static ModFile newFMLInstance(final IModLocator locator, final SecureJar jar) {
-        return (ModFile) ModFileFactory.FACTORY.build(jar, locator, ModFileParser::modsTomlParser);
-    }
-
-    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.17.1")
-    public static ModFile newFMLInstance(final IModLocator locator, final Path... paths) {
-        return (ModFile) ModJarMetadata.buildFile(locator, paths);
-    }
-
    @Override
    public void setSecurityStatus(final SecureJar.Status status) {
        this.securityStatus = status;
@@ -21,6 +21,7 @@ package net.minecraftforge.fml.loading.moddiscovery;

 import com.google.common.base.Strings;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.StringUtils;
 import net.minecraftforge.forgespi.language.IConfigurable;
 import net.minecraftforge.forgespi.language.IModFileInfo;
@@ -43,8 +44,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-
 public class ModFileInfo implements IModFileInfo, IConfigurable
 {
    private static final Logger LOGGER = LogManager.getLogger();
@@ -83,7 +82,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
        this.mods = modConfigs.stream()
                .map(mi-> new ModInfo(this, mi))
                .collect(Collectors.toList());
-        LOGGER.debug(LOADING, "Found valid mod file {} with {} mods - versions {}",
+        LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
                this.modFile::getFileName,
                () -> this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
                () -> this.mods.stream().map(IModInfo::getVersion).map(Objects::toString).collect(Collectors.joining(",", "{", "}")));
@@ -22,6 +22,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
 import com.electronwill.nightconfig.core.file.FileConfig;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
@@ -37,8 +38,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-
 public class ModFileParser {
    private static final Logger LOGGER = LogManager.getLogger();

@@ -48,10 +47,10 @@ public class ModFileParser {

    public static IModFileInfo modsTomlParser(final IModFile imodFile) {
        ModFile modFile = (ModFile) imodFile;
-        LOGGER.debug(LOADING,"Considering mod file candidate {}", modFile.getFilePath());
+        LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
        final Path modsjson = modFile.findResource("META-INF", "mods.toml");
        if (!Files.exists(modsjson)) {
-            LOGGER.warn(LOADING, "Mod file {} is missing mods.toml file", modFile.getFilePath());
+            LOGGER.warn(LogMarkers.LOADING, "Mod file {} is missing mods.toml file", modFile.getFilePath());
            return null;
        }

@@ -75,12 +74,12 @@ public class ModFileParser {
            final Gson gson = new Gson();
            coreModPaths = gson.fromJson(Files.newBufferedReader(coremodsjson), type);
        } catch (IOException e) {
-            LOGGER.debug(LOADING,"Failed to read coremod list coremods.json", e);
+            LOGGER.debug(LogMarkers.LOADING,"Failed to read coremod list coremods.json", e);
            return Collections.emptyList();
        }

        return coreModPaths.entrySet().stream()
-                .peek(e-> LOGGER.debug(LOADING,"Found coremod {} with Javascript path {}", e.getKey(), e.getValue()))
+                .peek(e-> LOGGER.debug(LogMarkers.LOADING,"Found coremod {} with Javascript path {}", e.getKey(), e.getValue()))
                .map(e -> new CoreModFile(e.getKey(), modFile.findResource(e.getValue()),modFile))
                .collect(Collectors.toList());
    }
@@ -42,7 +42,8 @@ public class ModInfo implements IModInfo, IConfigurable
 {
    private static final Logger LOGGER = LogManager.getLogger();
    private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1");
-    private static final Pattern VALID_LABEL = Pattern.compile("^[a-z][a-z0-9_-]{1,63}$");
+    private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$");
+    private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$");

    private final ModFileInfo owningFile;
    private final String modId;
@@ -64,13 +65,13 @@ public class ModInfo implements IModInfo, IConfigurable
        this.config = config;
        this.modId = config.<String>getConfigElement("modId")
                .orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile));
-        if (!VALID_LABEL.matcher(this.modId).matches()) {
-            LOGGER.fatal("Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_LABEL.pattern());
+        if (!VALID_MODID.matcher(this.modId).matches()) {
+            LOGGER.fatal("Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern());
            throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile);
        }
        this.namespace = config.<String>getConfigElement("namespace").orElse(this.modId);
-        if (!VALID_LABEL.matcher(this.namespace).matches()) {
-            LOGGER.fatal("Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_LABEL.pattern());
+        if (!VALID_NAMESPACE.matcher(this.namespace).matches()) {
+            LOGGER.fatal("Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern());
            throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile);
        }
        this.version = config.<String>getConfigElement("version")
@@ -18,25 +18,19 @@ public final class ModJarMetadata implements JarMetadata {
    private ModuleDescriptor descriptor;

    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.17.1")
-    static Optional<IModFile> buildFile(IModLocator locator, Predicate<SecureJar> jarTest, Path... files) {
-        return buildFile(locator, jarTest, (a,b) -> true, files);
-    }
-
-    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.17.1")
+    @Deprecated(forRemoval = true, since="1.18")
    static Optional<IModFile> buildFile(IModLocator locator, Predicate<SecureJar> jarTest, BiPredicate<String, String> filter, Path... files) {
-        return buildFile(j->ModFile.newFMLInstance(locator, j), jarTest, filter, files);
+        return buildFile(j->new ModFile(j, locator, ModFileParser::modsTomlParser), jarTest, filter, files);
    }

    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.17.1")
+    @Deprecated(forRemoval = true, since="1.18")
    static IModFile buildFile(IModLocator locator, Path... files) {
-        return buildFile(locator, j->true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
+        return buildFile(locator, j->true, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
    }

    // TODO: Remove helper functions to cleanup api
-    @Deprecated(forRemoval = true, since="1.17.1")
+    @Deprecated(forRemoval = true, since="1.18")
    static Optional<IModFile> buildFile(Function<SecureJar, IModFile> mfConstructor, Predicate<SecureJar> jarTest, BiPredicate<String, String> filter, Path... files) {
        var mjm = new ModJarMetadata();
        var sj = SecureJar.from(()->ModFile.DEFAULTMANIFEST, j->mjm, filter, files);
@@ -21,6 +21,7 @@ package net.minecraftforge.fml.loading.moddiscovery;

 import net.minecraftforge.fml.loading.FMLPaths;
 import net.minecraftforge.fml.loading.FileUtils;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.MavenCoordinateResolver;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.LogManager;
@@ -35,8 +36,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;

-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-
 public class ModListHandler {
    private static final Logger LOGGER = LogManager.getLogger();
    /**
@@ -59,22 +58,22 @@ public class ModListHandler {
                        filter(path -> Files.exists(path.getLeft())).
                        findFirst().
                        orElseGet(()->{
-                            LOGGER.warn(CORE, "Failed to find coordinate {}", mc);
+                            LOGGER.warn(LogMarkers.CORE, "Failed to find coordinate {}", mc);
                            return null;
                })).
                filter(Objects::nonNull).
                collect(Collectors.toList());

        final List<String> found = foundCoordinates.stream().map(Pair::getRight).collect(Collectors.toList());
-        LOGGER.debug(CORE, "Found mod coordinates from lists: {}", found);
+        LOGGER.debug(LogMarkers.CORE, "Found mod coordinates from lists: {}", found);
        return found;
    }

    private static List<String> transformPathToList(final String path) {
-        LOGGER.debug(CORE, "Reading mod list {}", path);
+        LOGGER.debug(LogMarkers.CORE, "Reading mod list {}", path);
        Path filePath = FMLPaths.GAMEDIR.get().resolve(path);
        if (!Files.exists(filePath)) {
-            LOGGER.warn(CORE, "Failed to find modlist file at {}", filePath);
+            LOGGER.warn(LogMarkers.CORE, "Failed to find modlist file at {}", filePath);
            return Collections.emptyList();
        }

@@ -82,7 +81,7 @@ public class ModListHandler {
        if (Objects.equals("list",extension)) {
            return readListFile(filePath).stream().filter(s -> !s.isEmpty()).collect(Collectors.toList());
        } else {
-            LOGGER.warn(CORE, "Failed to read unknown file list type {} for file {}", extension, filePath);
+            LOGGER.warn(LogMarkers.CORE, "Failed to read unknown file list type {} for file {}", extension, filePath);
        }
        return Collections.emptyList();
    }
@@ -96,7 +95,7 @@ public class ModListHandler {
        try {
            return Files.readAllLines(filePath);
        } catch (IOException e) {
-            LOGGER.warn(CORE, "Failed to read file list {}", filePath, e);
+            LOGGER.warn(LogMarkers.CORE, "Failed to read file list {}", filePath, e);
            return Collections.emptyList();
        }
    }
@@ -2,7 +2,10 @@ package net.minecraftforge.fml.loading.moddiscovery;

 import cpw.mods.modlauncher.api.IModuleLayerManager;
 import cpw.mods.modlauncher.api.ITransformationService;
-import net.minecraftforge.fml.loading.*;
+import net.minecraftforge.fml.loading.EarlyLoadingException;
+import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.LogMarkers;
+import net.minecraftforge.fml.loading.ModSorter;
 import net.minecraftforge.fml.loading.progress.StartupMessageManager;
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.apache.logging.log4j.LogManager;
@@ -10,7 +13,6 @@ import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;

 import java.util.*;
-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;

 public class ModValidator {
    private static final Logger LOGGER = LogManager.getLogger();
@@ -34,7 +36,7 @@ public class ModValidator {

    public void stage1Validation() {
        brokenFiles = validateFiles(candidateMods);
-        LOGGER.debug(SCAN,"Found {} mod files with {} mods", candidateMods::size, ()-> candidateMods.stream().mapToInt(mf -> mf.getModInfos().size()).sum());
+        LOGGER.debug(LogMarkers.SCAN,"Found {} mod files with {} mods", candidateMods::size, ()-> candidateMods.stream().mapToInt(mf -> mf.getModInfos().size()).sum());
        StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found "+ candidateMods.size()+" modfiles to load"));
    }

@@ -45,7 +47,7 @@ public class ModValidator {
        {
            ModFile mod = iterator.next();
            if (!mod.getLocator().isValid(mod) || !mod.identifyMods()) {
-                LOGGER.warn(SCAN, "File {} has been ignored - it is invalid", mod.getFilePath());
+                LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", mod.getFilePath());
                iterator.remove();
                brokenFiles.add(mod);
            }
@@ -20,6 +20,7 @@
 package net.minecraftforge.fml.loading.moddiscovery;

 import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
 import net.minecraftforge.fml.loading.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -32,7 +33,6 @@ import java.util.Map;
 import java.util.stream.Stream;

 import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck;
-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;

 /**
 * Support loading mods located in JAR files in the mods folder
@@ -58,7 +58,7 @@ public class ModsFolderLocator extends AbstractJarFileLocator {

    @Override
    public Stream<Path> scanCandidates() {
-        LOGGER.debug(SCAN,"Scanning mods dir {} for mods", this.modFolder);
+        LOGGER.debug(LogMarkers.SCAN,"Scanning mods dir {} for mods", this.modFolder);
        var excluded = ModDirTransformerDiscoverer.allExcluded();

        return uncheck(()-> Files.list(this.modFolder))
@@ -19,6 +19,7 @@

 package net.minecraftforge.fml.loading.moddiscovery;

+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.forgespi.language.IModLanguageProvider;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
@@ -31,8 +32,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;

-import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
-
 public class Scanner {
    private static final Logger LOGGER = LogManager.getLogger();
    private final ModFile fileToScan;
@@ -48,7 +47,7 @@ public class Scanner {
        final List<IModLanguageProvider> loaders = fileToScan.getLoaders();
        if (loaders != null) {
            loaders.forEach(loader -> {
-                LOGGER.debug(SCAN, "Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
+                LOGGER.debug(LogMarkers.SCAN, "Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
                loader.getFileVisitor().accept(result);
            });
        }
@@ -56,7 +55,7 @@ public class Scanner {
    }

    private void fileVisitor(final Path path, final ModFileScanData result) {
-        LOGGER.debug(SCAN,"Scanning {} path {}", fileToScan, path);
+        LOGGER.debug(LogMarkers.SCAN,"Scanning {} path {}", fileToScan, path);
        try (InputStream in = Files.newInputStream(path)){
            ModClassVisitor mcv = new ModClassVisitor();
            ClassReader cr = new ClassReader(in);
@@ -20,8 +20,8 @@
 package net.minecraftforge.fml.loading.progress;

 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.api.distmarker.Dist;
 import org.jetbrains.annotations.Nullable;

 import java.util.function.IntConsumer;
@@ -58,7 +58,7 @@ public enum EarlyProgressVisualization {

        default long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, LongSupplier monitorSupplier) {
            return FMLLoader.getGameLayer().findModule("forge")
-                    .map(l->Class.forName(l, "net.minecraftforge.fmllegacy.NoVizFallback"))
+                    .map(l->Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback"))
                    .map(LamdbaExceptionUtils.rethrowFunction(c->c.getMethod("fallback", IntSupplier.class, IntSupplier.class, Supplier.class, LongSupplier.class)))
                    .map(LamdbaExceptionUtils.rethrowFunction(m->(LongSupplier)m.invoke(null, width, height, title, monitorSupplier)))
                    .map(LongSupplier::getAsLong)
@@ -19,10 +19,10 @@

 package net.minecraftforge.fml.loading.targets;

-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LibraryFinder;
 import net.minecraftforge.fml.loading.VersionInfo;
+import net.minecraftforge.api.distmarker.Dist;

 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -21,6 +21,7 @@ package net.minecraftforge.fml.loading.targets;

 import cpw.mods.modlauncher.api.ILaunchHandlerService;
 import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
+import net.minecraftforge.fml.loading.LogMarkers;
 import net.minecraftforge.api.distmarker.Dist;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -35,8 +36,6 @@ import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.stream.Collectors;

-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
-
 public abstract class CommonLaunchHandler implements ILaunchHandlerService {
    public record LocatedPaths(List<Path> minecraftPaths, BiPredicate<String, String> minecraftFilter, List<List<Path>> otherModPaths, List<Path> otherArtifacts) {}

@@ -63,7 +62,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {

    protected final Map<String, List<Path>> getModClasses() {
        final String modClasses = Optional.ofNullable(System.getenv("MOD_CLASSES")).orElse("");
-        LOGGER.debug(CORE, "Got mod coordinates {} from env", modClasses);
+        LOGGER.debug(LogMarkers.CORE, "Got mod coordinates {} from env", modClasses);

        record ExplodedModPath(String modid, Path path) {}
        // "a/b/;c/d/;" -> "modid%%c:\fish\pepper;modid%%c:\fish2\pepper2\;modid2%%c:\fishy\bums;modid2%%c:\hmm"
@@ -72,7 +71,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
                .map(splitString -> new ExplodedModPath(splitString.length == 1 ? "defaultmodid" : splitString[0], Paths.get(splitString[splitString.length - 1])))
                .collect(Collectors.groupingBy(ExplodedModPath::modid, Collectors.mapping(ExplodedModPath::path, Collectors.toList())));

-        LOGGER.debug(CORE, "Found supplied mod coordinates [{}]", modClassPaths);
+        LOGGER.debug(LogMarkers.CORE, "Found supplied mod coordinates [{}]", modClassPaths);

        //final var explodedTargets = ((Map<String, List<ExplodedDirectoryLocator.ExplodedMod>>)arguments).computeIfAbsent("explodedTargets", a -> new ArrayList<>());
        //modClassPaths.forEach((modlabel,paths) -> explodedTargets.add(new ExplodedDirectoryLocator.ExplodedMod(modlabel, paths)));
@@ -20,10 +20,10 @@
 package net.minecraftforge.fml.loading.targets;

 import cpw.mods.jarhandling.SecureJar;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LibraryFinder;
 import net.minecraftforge.fml.loading.VersionInfo;
+import net.minecraftforge.api.distmarker.Dist;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

@@ -17,33 +17,23 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-package net.minecraftforge.server.permission.context;
+package net.minecraftforge.fml.loading.targets;

-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
+import net.minecraftforge.api.distmarker.Dist;

-import javax.annotation.Nullable;
+import java.util.concurrent.Callable;

-public class TargetContext extends PlayerContext
-{
-    private final Entity target;
-
-    public TargetContext(Player ep, @Nullable Entity entity)
-    {
-        super(ep);
-        target = entity;
-    }
+public class ForgeGametestDevLaunchHandler extends CommonDevLaunchHandler {
+    @Override public String name() { return "forgegametestserverdev"; }
+    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    @Nullable
-    public <T> T get(ContextKey<T> key)
-    {
-        return key.equals(ContextKeys.TARGET) ? (T) target : super.get(key);
-    }
+    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);

-    @Override
-    protected boolean covers(ContextKey<?> key)
-    {
-        return target != null && key.equals(ContextKeys.TARGET);
+            Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args);
+            return null;
+        };
    }
-}
+}
@@ -17,33 +17,23 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-package net.minecraftforge.server.permission.context;
+package net.minecraftforge.fml.loading.targets;

-import com.google.common.base.Preconditions;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
+import net.minecraftforge.api.distmarker.Dist;

-import javax.annotation.Nullable;
+import java.util.concurrent.Callable;

-public class WorldContext extends Context
-{
-    private final Level world;
-
-    public WorldContext(Level w)
-    {
-        world = Preconditions.checkNotNull(w, "World can't be null in WorldContext!");
-    }
+public class ForgeGametestUserdevLaunchHandler extends ForgeUserdevLaunchHandler {
+    @Override public String name() { return "forgegametestserveruserdev"; }
+    @Override public Dist getDist() { return Dist.DEDICATED_SERVER; }

    @Override
-    public Level getWorld()
-    {
-        return world;
-    }
+    public Callable<Void> launchService(String[] arguments, ModuleLayer layer) {
+        return () -> {
+            var args = preLaunch(arguments, layer);

-    @Override
-    @Nullable
-    public Player getPlayer()
-    {
-        return null;
+            Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args);
+            return null;
+        };
    }
-}
+}
@@ -17,7 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

-package net.minecraftforge.server;
+package net.minecraftforge.fml.server;

 import cpw.mods.modlauncher.InvalidLauncherSetupException;
 import cpw.mods.modlauncher.Launcher;
@@ -14,3 +14,5 @@ net.minecraftforge.fml.loading.targets.ForgeServerDevLaunchHandler
 net.minecraftforge.fml.loading.targets.ForgeServerUserdevLaunchHandler
 net.minecraftforge.fml.loading.targets.ForgeDataDevLaunchHandler
 net.minecraftforge.fml.loading.targets.ForgeDataUserdevLaunchHandler
+net.minecraftforge.fml.loading.targets.ForgeGametestDevLaunchHandler
+net.minecraftforge.fml.loading.targets.ForgeGametestUserdevLaunchHandler
@@ -1,5 +1,4 @@
 net.minecraftforge.fml.loading.RuntimeDistCleaner
-net.minecraftforge.common.asm.RuntimeEnumExtender
-net.minecraftforge.common.asm.ObjectHolderDefinalize
-net.minecraftforge.common.asm.CapabilityInjectDefinalize
-net.minecraftforge.common.asm.CapabilityTokenSubclass
+net.minecraftforge.fml.common.asm.RuntimeEnumExtender
+net.minecraftforge.fml.common.asm.ObjectHolderDefinalize
+net.minecraftforge.fml.common.asm.CapabilityTokenSubclass
@@ -20,24 +20,24 @@
    <Appenders>
        <TerminalConsole name="Console">
            <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="%highlightForge{[%d{HH:mm:ss}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}%n%tEx}">
+                <LoggerNamePatternSelector defaultPattern="%highlightForge{[%d{HH:mm:ss}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg{nolookup}}%n%tEx}">
                    <!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
-                    <PatternMatch key="net.minecraft." pattern="%highlightForge{[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
-                    <PatternMatch key="com.mojang." pattern="%highlightForge{[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
+                    <PatternMatch key="net.minecraft." pattern="%highlightForge{[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg{nolookup}}%n%tEx}"/>
+                    <PatternMatch key="com.mojang." pattern="%highlightForge{[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg{nolookup}}%n%tEx}"/>
                </LoggerNamePatternSelector>
            </PatternLayout>
        </TerminalConsole>
        <Queue name="ServerGuiConsole" ignoreExceptions="true">
            <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n">
+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg{nolookup}}{strip}%n">
                    <!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
-                    <PatternMatch key="net.minecraft." pattern="[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}{strip}%n"/>
-                    <PatternMatch key="com.mojang." pattern="[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}{strip}%n"/>
+                    <PatternMatch key="net.minecraft." pattern="[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg{nolookup}}{strip}%n"/>
+                    <PatternMatch key="com.mojang." pattern="[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg{nolookup}}{strip}%n"/>
                </LoggerNamePatternSelector>
            </PatternLayout>
        </Queue>
        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/>
+            <PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg{nolookup}}{strip}%n%xEx"/>
            <Policies>
                <TimeBasedTriggeringPolicy/>
                <OnStartupTriggeringPolicy/>
@@ -45,7 +45,7 @@
            <DefaultRolloverStrategy max="99" fileIndex="min"/>
        </RollingRandomAccessFile>
        <RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz">
-            <PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/>
+            <PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg{nolookup}}{strip}%n%xEx"/>
            <Policies>
                <OnStartupTriggeringPolicy/>
                <SizeBasedTriggeringPolicy size="200MB"/>
@@ -31,7 +31,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.LoadingFailedException;
 import net.minecraftforge.fml.ModLoader;
 import net.minecraftforge.fml.ModWorkManager;
-import net.minecraftforge.fml.VersionChecker;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

@@ -39,8 +38,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;

-import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
-
@OnlyIn(Dist.CLIENT)
 public class ClientModLoader
 {
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -17,8 +17,8 @@ version = '1.0'
 group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'modid'

-// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)

 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
@@ -55,6 +55,9 @@ minecraft {
            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
            property 'forge.logging.console.level', 'debug'

+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'examplemod'
+
            mods {
                examplemod {
                    source sourceSets.main
@@ -77,6 +80,37 @@ minecraft {
            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
            property 'forge.logging.console.level', 'debug'

+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'examplemod'
+
+            mods {
+                examplemod {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        // This run config launches GameTestServer and runs all registered gametests, then exits.
+        // By default, the server will crash when no gametests are provided.
+        // The gametest system is also enabled by default for other run configs under the /test command.
+        gameTestServer {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            // The markers can be added/remove as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            property 'forge.logging.console.level', 'debug'
+
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'examplemod'
+
            mods {
                examplemod {
                    source sourceSets.main
@@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -58,7 +58,7 @@ public class ExampleMod
    }
    // You can use SubscribeEvent and let the Event Bus discover methods to call
    @SubscribeEvent
-    public void onServerStarting(FMLServerStartingEvent event) {
+    public void onServerStarting(ServerStartingEvent event) {
        // do something when the server starts
        LOGGER.info("HELLO from server starting");
    }
@@ -1,6 +1,6 @@
 {
    "pack": {
        "description": "examplemod resources",
-        "pack_format": 7
+        "pack_format": 8
    }
 }
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -530,9 +_,16 @@
+@@ -539,9 +_,16 @@
       f_84077_[f_84076_].f_84800_ = false;
    }
 
@@ -8,7 +8,7 @@
 +   public static float lastBrightnessX = 0.0f;
 +   public static float lastBrightnessY = 0.0f;
    public static void m_84160_(int p_84161_, int p_84162_, float p_84163_) {
-       RenderSystem.m_69393_(RenderSystem::m_69587_);
+       RenderSystem.m_187555_();
       GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
 +      if (p_84161_ == GL13.GL_TEXTURE1) {
 +          lastBrightnessX = p_84162_;
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -15,7 +_,7 @@
+@@ -16,7 +_,7 @@
 import org.lwjgl.system.MemoryStack;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
    Logger f_85943_ = LogManager.getLogger();
 
    VertexConsumer m_5483_(double p_85945_, double p_85946_, double p_85947_);
-@@ -100,11 +_,12 @@
+@@ -105,11 +_,12 @@
                f5 = afloat[k] * p_86001_;
             }
 
@@ -1,7 +1,7 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -69,6 +_,15 @@
-       return (new TextComponent("")).m_7220_(this.f_88666_).m_130946_(": ").m_7220_(this.f_88667_);
+@@ -67,6 +_,15 @@
+       return (new TextComponent("")).m_7220_(this.f_200947_.getFirst()).m_130946_(": ").m_7220_(this.f_200947_.getSecond());
    }
 
 +    @Override
@@ -15,4 +15,4 @@
 +
    public void m_6305_(PoseStack p_88679_, int p_88680_, int p_88681_, float p_88682_) {
       this.m_7333_(p_88679_);
-       m_93215_(p_88679_, this.f_96547_, this.f_88666_, this.f_96543_ / 2, 80, 16777215);
+       m_93215_(p_88679_, this.f_96547_, this.f_200947_.getFirst(), this.f_96543_ / 2, 80, 16777215);
@@ -13,7 +13,7 @@
 -
 -         p_127520_.append("\n");
 +         p_127520_.append("Stacktrace:");
-+         p_127520_.append(net.minecraftforge.fmllegacy.CrashReportExtender.generateEnhancedStackTrace(this.f_127506_));
+         p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.f_127506_));
       }
 
       for(CrashReportCategory crashreportcategory : this.f_127503_) {
@@ -21,7 +21,7 @@
          p_127520_.append("\n\n");
       }
 
-+      net.minecraftforge.fmllegacy.CrashReportExtender.extendSystemReport(f_178624_);
+      net.minecraftforge.logging.CrashReportExtender.extendSystemReport(f_178624_);
       this.f_178624_.m_143525_(p_127520_);
    }
 
@@ -41,13 +41,13 @@
 -      }
 -
 -      return s;
-+      return net.minecraftforge.fmllegacy.CrashReportExtender.generateEnhancedStackTrace(throwable);
+      return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
    }
 
    public String m_127526_() {
       StringBuilder stringbuilder = new StringBuilder();
       stringbuilder.append("---- Minecraft Crash Report ----\n");
-+      net.minecraftforge.fmllegacy.CrashReportExtender.addCrashReportHeader(stringbuilder, this);
+      net.minecraftforge.logging.CrashReportExtender.addCrashReportHeader(stringbuilder, this);
       stringbuilder.append("// ");
       stringbuilder.append(m_127531_());
       stringbuilder.append("\n\n");
@@ -22,7 +22,7 @@
 -            p_128169_.append("\n\tat ");
 -            p_128169_.append((Object)stacktraceelement);
 -         }
-+         p_128169_.append(net.minecraftforge.fmllegacy.CrashReportExtender.generateEnhancedStackTrace(this.f_128139_));
+         p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.f_128139_));
       }
 
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -160,6 +_,7 @@
+@@ -184,6 +_,7 @@
    }
 
    static {
@@ -1,18 +1,18 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -127,6 +_,9 @@
-       return executorservice;
+@@ -158,6 +_,9 @@
+       return 255;
    }
 
 +   // We add this inner class to compensate for Mojang's missing inner class and allow us to obf subsequent anon inner classes correctly.
 +   @SuppressWarnings("unused") private static LongSupplier INNER_CLASS_SHIFT = new LongSupplier() { public long getAsLong() { return 0; } };
 +
-    public static Executor m_137577_() {
+    public static ExecutorService m_183988_() {
       return f_137443_;
    }
-@@ -205,7 +_,7 @@
+@@ -236,7 +_,7 @@
       try {
-          type = DataFixers.m_14512_().getSchema(DataFixUtils.makeKey(SharedConstants.m_136187_().getWorldVersion())).getChoiceType(p_137552_, p_137553_);
+          type = DataFixers.m_14512_().getSchema(DataFixUtils.makeKey(SharedConstants.m_183709_().getWorldVersion())).getChoiceType(p_137552_, p_137553_);
       } catch (IllegalArgumentException illegalargumentexception) {
 -         f_137446_.error("No data fixer registered for {}", (Object)p_137553_);
 +         f_137446_.debug("No data fixer registered for {}", (Object)p_137553_);
@@ -1,15 +1,16 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -127,7 +_,7 @@
+@@ -129,8 +_,8 @@
       return this.f_138305_;
    }
 
 -   public static class Builder {
+       @Nullable
 +   public static class Builder implements net.minecraftforge.common.extensions.IForgeAdvancementBuilder {
       private ResourceLocation f_138332_;
+       @Nullable
       private Advancement f_138333_;
-       private DisplayInfo f_138334_;
-@@ -311,6 +_,7 @@
+@@ -321,6 +_,7 @@
       }
 
       public static Advancement.Builder m_138380_(JsonObject p_138381_, DeserializationContext p_138382_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementList.java
 +++ b/net/minecraft/advancements/AdvancementList.java
-@@ -90,6 +_,7 @@
+@@ -91,6 +_,7 @@
          }
       }
 
@@ -4,8 +4,8 @@
 
    public void m_9989_(ServerPlayer p_9990_) {
       p_9990_.m_6756_(this.f_9979_);
-      LootContext lootcontext = (new LootContext.Builder(p_9990_.m_9236_())).m_78972_(LootContextParams.f_81455_, p_9990_).m_78972_(LootContextParams.f_81460_, p_9990_.m_20182_()).m_78977_(p_9990_.m_21187_()).m_78975_(LootContextParamSets.f_81418_);
-+      LootContext lootcontext = (new LootContext.Builder(p_9990_.m_9236_())).m_78972_(LootContextParams.f_81455_, p_9990_).m_78972_(LootContextParams.f_81460_, p_9990_.m_20182_()).m_78977_(p_9990_.m_21187_()).m_78963_(p_9990_.m_36336_()).m_78975_(LootContextParamSets.f_81418_); // FORGE: luck to LootContext
+-      LootContext lootcontext = (new LootContext.Builder(p_9990_.m_183503_())).m_78972_(LootContextParams.f_81455_, p_9990_).m_78972_(LootContextParams.f_81460_, p_9990_.m_20182_()).m_78977_(p_9990_.m_21187_()).m_78975_(LootContextParamSets.f_81418_);
+      LootContext lootcontext = (new LootContext.Builder(p_9990_.m_183503_())).m_78972_(LootContextParams.f_81455_, p_9990_).m_78972_(LootContextParams.f_81460_, p_9990_.m_20182_()).m_78977_(p_9990_.m_21187_()).m_78963_(p_9990_.m_36336_()).m_78975_(LootContextParamSets.f_81418_); // FORGE: luck to LootContext
       boolean flag = false;
 
       for(ResourceLocation resourcelocation : this.f_9980_) {
@@ -5,6 +5,6 @@
    @DontObfuscate
    public static String m_129629_() {
 -      return "vanilla";
-+      return net.minecraftforge.fmllegacy.BrandingControl.getClientBranding();
+      return net.minecraftforge.internal.BrandingControl.getClientBranding();
    }
 }
@@ -105,7 +105,7 @@
 
    public boolean m_90864_() {
 -      return this.f_90816_.equals(this.f_90814_);
-+      return this.f_90816_.equals(this.f_90814_) && getKeyModifier() == getKeyModifierDefault();
+      return this.f_90816_.equals(this.f_90814_) && getKeyModifier() == getDefaultKeyModifier();
    }
 
    public String m_90865_() {
@@ -174,7 +174,7 @@
 +   }
 +
 +   @Override
-+   public net.minecraftforge.client.settings.KeyModifier getKeyModifierDefault() {
+   public net.minecraftforge.client.settings.KeyModifier getDefaultKeyModifier() {
 +       return keyModifierDefault;
 +   }
 +
@@ -1,44 +1,44 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -312,7 +_,9 @@
+@@ -307,7 +_,9 @@
          }
 
          Screen screen = this.f_90867_.f_91080_;
-         if (p_90897_ == 1 && (!(this.f_90867_.f_91080_ instanceof ControlsScreen) || ((ControlsScreen)screen).f_97515_ <= Util.m_137550_() - 20L)) {
+-         if (p_90897_ == 1 && (!(this.f_90867_.f_91080_ instanceof KeyBindsScreen) || ((KeyBindsScreen)screen).f_193976_ <= Util.m_137550_() - 20L)) {
 +
-+         if ((!(this.f_90867_.f_91080_ instanceof ControlsScreen) || ((ControlsScreen)screen).f_97515_ <= Util.m_137550_() - 20L)) {
+         if ((!(this.f_90867_.f_91080_ instanceof KeyBindsScreen) || ((KeyBindsScreen)screen).f_193976_ <= Util.m_137550_() - 20L)) {
 +            if (p_90897_ == 1) {
             if (this.f_90867_.f_91066_.f_92105_.m_90832_(p_90895_, p_90896_)) {
                this.f_90867_.m_91268_().m_85438_();
                this.f_90867_.f_91066_.f_92052_ = this.f_90867_.m_91268_().m_85440_();
-@@ -331,6 +_,8 @@
+@@ -326,6 +_,8 @@
                });
                return;
             }
-+            } else if (p_90897_ == 0 /*GLFW_RELEASE*/ && this.f_90867_.f_91080_ instanceof ControlsScreen)
-+               ((ControlsScreen)this.f_90867_.f_91080_).f_97514_ = null; //Forge: Unset pure modifiers.
+            } else if (p_90897_ == 0 /*GLFW_RELEASE*/ && this.f_90867_.f_91080_ instanceof KeyBindsScreen)
+               ((KeyBindsScreen)this.f_90867_.f_91080_).f_193975_ = null; //Forge: Unset pure modifiers.
          }
 
          if (NarratorChatListener.f_93311_.m_93316_()) {
-@@ -354,11 +_,15 @@
+@@ -349,11 +_,15 @@
             Screen.m_96579_(() -> {
                if (p_90897_ != 1 && (p_90897_ != 2 || !this.f_90868_)) {
                   if (p_90897_ == 0) {
 -                     aboolean[0] = screen.m_7920_(p_90895_, p_90896_, p_90898_);
-+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiKeyReleasedPre(this.f_90867_.f_91080_, p_90895_, p_90896_, p_90898_);
+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPre(screen, p_90895_, p_90896_, p_90898_);
 +                     if (!aboolean[0]) aboolean[0] = screen.m_7920_(p_90895_, p_90896_, p_90898_);
-+                     if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiKeyReleasedPost(this.f_90867_.f_91080_, p_90895_, p_90896_, p_90898_);
+                     if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleasedPost(screen, p_90895_, p_90896_, p_90898_);
                   }
                } else {
                   screen.m_169416_();
 -                  aboolean[0] = screen.m_7933_(p_90895_, p_90896_, p_90898_);
-+                  aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiKeyPressedPre(this.f_90867_.f_91080_, p_90895_, p_90896_, p_90898_);
+                  aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressedPre(screen, p_90895_, p_90896_, p_90898_);
 +                  if (!aboolean[0]) aboolean[0] = screen.m_7933_(p_90895_, p_90896_, p_90898_);
-+                  if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiKeyPressedPost(this.f_90867_.f_91080_, p_90895_, p_90896_, p_90898_);
+                  if (!aboolean[0]) aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressedPost(screen, p_90895_, p_90896_, p_90898_);
                }
 
             }, "keyPressed event handler", screen.getClass().getCanonicalName());
-@@ -411,7 +_,7 @@
+@@ -406,22 +_,26 @@
                }
             }
          }
@@ -47,22 +47,25 @@
       }
    }
 
-@@ -421,12 +_,16 @@
+    private void m_90889_(long p_90890_, int p_90891_, int p_90892_) {
+       if (p_90890_ == this.f_90867_.m_91268_().m_85439_()) {
+-         GuiEventListener guieventlistener = this.f_90867_.f_91080_;
+         Screen guieventlistener = this.f_90867_.f_91080_;
          if (guieventlistener != null && this.f_90867_.m_91265_() == null) {
             if (Character.charCount(p_90891_) == 1) {
                Screen.m_96579_(() -> {
 -                  guieventlistener.m_5534_((char)p_90891_, p_90892_);
-+                  if (net.minecraftforge.client.ForgeHooksClient.onGuiCharTypedPre(this.f_90867_.f_91080_, (char)p_90891_, p_90892_)) return;
+                  if (net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPre(guieventlistener, (char)p_90891_, p_90892_)) return;
 +                  if (guieventlistener.m_5534_((char)p_90891_, p_90892_)) return;
-+                  net.minecraftforge.client.ForgeHooksClient.onGuiCharTypedPost(this.f_90867_.f_91080_, (char)p_90891_, p_90892_);
+                  net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPost(guieventlistener, (char)p_90891_, p_90892_);
                }, "charTyped event handler", guieventlistener.getClass().getCanonicalName());
             } else {
                for(char c0 : Character.toChars(p_90891_)) {
                   Screen.m_96579_(() -> {
 -                     guieventlistener.m_5534_(c0, p_90892_);
-+                     if (net.minecraftforge.client.ForgeHooksClient.onGuiCharTypedPre(this.f_90867_.f_91080_, c0, p_90892_)) return;
+                     if (net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPre(guieventlistener, c0, p_90892_)) return;
 +                     if (guieventlistener.m_5534_(c0, p_90892_)) return;
-+                     net.minecraftforge.client.ForgeHooksClient.onGuiCharTypedPost(this.f_90867_.f_91080_, c0, p_90892_);
+                     net.minecraftforge.client.ForgeHooksClient.onScreenCharTypedPost(guieventlistener, c0, p_90892_);
                   }, "charTyped event handler", guieventlistener.getClass().getCanonicalName());
                }
             }
@@ -1,15 +1,15 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -257,7 +_,7 @@
+@@ -254,7 +_,7 @@
 import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 @OnlyIn(Dist.CLIENT)
-public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements SnooperPopulator, WindowEventHandler {
-+public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements SnooperPopulator, WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft {
+-public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler {
+public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft {
    private static Minecraft f_90981_;
    private static final Logger f_90982_ = LogManager.getLogger();
    public static final boolean f_91002_ = Util.m_137581_() == Util.OS.OSX;
-@@ -397,14 +_,13 @@
+@@ -394,14 +_,13 @@
       this.f_91029_ = p_91084_.f_101908_.f_101928_;
       this.f_90986_ = p_91084_.f_101905_.f_101944_;
       this.f_91037_ = new ClientPackSource(new File(this.f_91069_, "server-resource-packs"), p_91084_.f_101907_.m_101925_());
@@ -18,14 +18,14 @@
       this.f_91030_ = p_91084_.f_101905_.f_101945_;
       YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(this.f_91030_);
       this.f_91048_ = yggdrasilauthenticationservice.createMinecraftSessionService();
-       this.f_91049_ = this.m_91130_(yggdrasilauthenticationservice, p_91084_);
+       this.f_193584_ = this.m_193585_(yggdrasilauthenticationservice, p_91084_);
       this.f_90998_ = p_91084_.f_101905_.f_101942_;
       f_90982_.info("Setting user: {}", (Object)this.f_90998_.m_92546_());
 -      f_90982_.debug("(Session ID is {})", (Object)this.f_90998_.m_92544_());
       this.f_91033_ = p_91084_.f_101908_.f_101926_;
       this.f_91034_ = !p_91084_.f_101908_.f_101929_;
       this.f_91035_ = !p_91084_.f_101908_.f_101930_;
-@@ -436,6 +_,7 @@
+@@ -433,6 +_,7 @@
       }
 
       Util.f_137440_ = RenderSystem.m_69576_();
@@ -33,7 +33,7 @@
       this.f_90989_ = new VirtualScreen(this);
       this.f_90990_ = this.f_90989_.m_110872_(displaydata, this.f_91066_.f_92123_, this.m_91270_());
       this.m_7440_(true);
-@@ -450,7 +_,6 @@
+@@ -448,7 +_,6 @@
 
       this.f_90990_.m_85380_(this.f_91066_.f_92113_);
       this.f_91067_ = new MouseHandler(this);
@@ -41,15 +41,15 @@
       this.f_91068_ = new KeyboardHandler(this);
       this.f_91068_.m_90887_(this.f_90990_.m_85439_());
       RenderSystem.m_69580_(this.f_91066_.f_92035_, false);
-@@ -458,6 +_,7 @@
+@@ -456,6 +_,7 @@
       this.f_91042_.m_83931_(0.0F, 0.0F, 0.0F, 0.0F);
       this.f_91042_.m_83954_(f_91002_);
       this.f_91036_ = new SimpleReloadableResourceManager(PackType.CLIENT_RESOURCES);
-+      net.minecraftforge.fmlclient.ClientModLoader.begin(this, this.f_91038_, this.f_91036_, this.f_91037_);
+      net.minecraftforge.client.loading.ClientModLoader.begin(this, this.f_91038_, this.f_91036_, this.f_91037_);
       this.f_91038_.m_10506_();
       this.f_91066_.m_92145_(this.f_91038_);
       this.f_91039_ = new LanguageManager(this.f_91066_.f_92075_);
-@@ -506,6 +_,7 @@
+@@ -504,6 +_,7 @@
       this.m_91271_();
       this.f_91036_.m_7217_(this.f_90997_);
       this.f_91061_ = new ParticleEngine(this.f_91073_, this.f_90987_);
@@ -57,7 +57,7 @@
       this.f_91036_.m_7217_(this.f_91061_);
       this.f_91053_ = new PaintingTextureManager(this.f_90987_);
       this.f_91036_.m_7217_(this.f_91053_);
-@@ -513,7 +_,8 @@
+@@ -511,7 +_,8 @@
       this.f_91036_.m_7217_(this.f_91054_);
       this.f_91047_ = new GpuWarnlistManager();
       this.f_91036_.m_7217_(this.f_91047_);
@@ -67,10 +67,11 @@
       this.f_91064_ = new DebugRenderer(this);
       RenderSystem.m_69900_(this::m_91113_);
       if (this.f_91042_.f_83915_ == this.f_90990_.m_85441_() && this.f_91042_.f_83916_ == this.f_90990_.m_85442_()) {
-@@ -531,6 +_,10 @@
+@@ -529,6 +_,11 @@
          TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
       }
 
+      net.minecraftforge.gametest.ForgeGameTestHooks.registerGametests();
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RegisterClientReloadListenersEvent(this.f_91036_));
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.RegisterLayerDefinitions());
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.RegisterRenderers());
@@ -78,11 +79,11 @@
       this.f_90990_.m_85409_(this.f_91066_.f_92041_);
       this.f_90990_.m_85424_(this.f_91066_.f_92034_);
       this.f_90990_.m_85426_();
-@@ -546,13 +_,16 @@
+@@ -544,13 +_,16 @@
             }
 
             this.f_167847_.m_168556_();
-+            if (net.minecraftforge.fmlclient.ClientModLoader.completeModLoading()) return; // Do not overwrite the error screen
+            if (net.minecraftforge.client.loading.ClientModLoader.completeModLoading()) return; // Do not overwrite the error screen
 +            // FORGE: Move opening initial screen to after startup and events are enabled.
 +            // Also Fixes MC-145102
 +            if (s != null) {
@@ -100,16 +101,16 @@
 
    }
 
-@@ -587,6 +_,8 @@
+@@ -585,6 +_,8 @@
 
-    private SocialInteractionsService m_91130_(YggdrasilAuthenticationService p_91131_, GameConfig p_91132_) {
+    private UserApiService m_193585_(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
       try {
-+         if ("0".equals(p_91132_.f_101905_.f_101942_.m_92547_())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
-+            return new OfflineSocialInteractions();
-          return p_91131_.createSocialInteractionsService(p_91132_.f_101905_.f_101942_.m_92547_());
+         if ("0".equals(p_193587_.f_101905_.f_101942_.m_92547_())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
+            return UserApiService.OFFLINE;
+          return p_193586_.createUserApiService(p_193587_.f_101905_.f_101942_.m_92547_());
       } catch (AuthenticationException authenticationexception) {
          f_90982_.error("Failed to verify authentication", (Throwable)authenticationexception);
-@@ -599,7 +_,7 @@
+@@ -597,7 +_,7 @@
    }
 
    private void m_91239_(Throwable p_91240_) {
@@ -118,7 +119,7 @@
          Component component;
          if (p_91240_ instanceof SimpleReloadableResourceManager.ResourcePackLoadingFailure) {
             component = new TextComponent(((SimpleReloadableResourceManager.ResourcePackLoadingFailure)p_91240_).m_10921_().m_8017_());
-@@ -690,7 +_,7 @@
+@@ -691,7 +_,7 @@
          return Stream.of(Registry.f_122827_.m_7981_(p_91317_.m_41720_()));
       });
       ReloadableIdSearchTree<ItemStack> reloadableidsearchtree = new ReloadableIdSearchTree<>((p_91121_) -> {
@@ -127,24 +128,24 @@
       });
       NonNullList<ItemStack> nonnulllist = NonNullList.m_122779_();
 
-@@ -760,13 +_,13 @@
+@@ -761,13 +_,13 @@
       Bootstrap.m_135875_(p_91333_.m_127526_());
       if (p_91333_.m_127527_() != null) {
          Bootstrap.m_135875_("#@!@# Game crashed! Crash report saved to: #@!@# " + p_91333_.m_127527_());
 -         System.exit(-1);
-+         net.minecraftforge.fmllegacy.server.ServerLifecycleHooks.handleExit(-1);
+         net.minecraftforge.server.ServerLifecycleHooks.handleExit(-1);
       } else if (p_91333_.m_127512_(file2)) {
          Bootstrap.m_135875_("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
 -         System.exit(-1);
-+         net.minecraftforge.fmllegacy.server.ServerLifecycleHooks.handleExit(-1);
+         net.minecraftforge.server.ServerLifecycleHooks.handleExit(-1);
       } else {
          Bootstrap.m_135875_("#@?@# Game crashed! Crash report could not be saved. #@?@#");
 -         System.exit(-2);
-+         net.minecraftforge.fmllegacy.server.ServerLifecycleHooks.handleExit(-2);
+         net.minecraftforge.server.ServerLifecycleHooks.handleExit(-2);
       }
 
    }
-@@ -876,10 +_,6 @@
+@@ -877,10 +_,6 @@
          f_90982_.error("setScreen called from non-game thread");
       }
 
@@ -155,37 +156,37 @@
       if (p_91153_ == null && this.f_91073_ == null) {
          p_91153_ = new TitleScreen();
       } else if (p_91153_ == null && this.f_91074_.m_21224_()) {
-@@ -890,6 +_,15 @@
+@@ -891,6 +_,15 @@
          }
       }
 
 +      net.minecraftforge.client.ForgeHooksClient.clearGuiLayers(this);
 +      Screen old = this.f_91080_;
-+      net.minecraftforge.client.event.GuiOpenEvent event = new net.minecraftforge.client.event.GuiOpenEvent(p_91153_);
+      net.minecraftforge.client.event.ScreenOpenEvent event = new net.minecraftforge.client.event.ScreenOpenEvent(p_91153_);
 +      if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) return;
 +
-+      p_91153_ = event.getGui();
+      p_91153_ = event.getScreen();
 +      if (old != null && p_91153_ != old)
 +         old.m_7861_();
 +
       this.f_91080_ = p_91153_;
       BufferUploader.m_166835_();
       if (p_91153_ != null) {
-@@ -1018,11 +_,13 @@
+@@ -1019,11 +_,13 @@
       RenderSystem.m_69481_();
       this.f_91026_.m_7238_();
       if (!this.f_91079_) {
-+         net.minecraftforge.fmllegacy.hooks.BasicEventHooks.onRenderTickStart(this.f_91012_ ? this.f_91013_ : this.f_90991_.f_92518_);
+         net.minecraftforge.event.ForgeEventFactory.onRenderTickStart(this.f_91012_ ? this.f_91013_ : this.f_90991_.f_92518_);
          this.f_91026_.m_6182_("gameRenderer");
          this.f_91063_.m_109093_(this.f_91012_ ? this.f_91013_ : this.f_90991_.f_92518_, i, p_91384_);
          this.f_91026_.m_6182_("toasts");
          this.f_91003_.m_94920_(new PoseStack());
          this.f_91026_.m_7238_();
-+         net.minecraftforge.fmllegacy.hooks.BasicEventHooks.onRenderTickEnd(this.f_91012_ ? this.f_91013_ : this.f_90991_.f_92518_);
+         net.minecraftforge.event.ForgeEventFactory.onRenderTickEnd(this.f_91012_ ? this.f_91013_ : this.f_90991_.f_92518_);
       }
 
       if (this.f_91056_ != null) {
-@@ -1132,10 +_,12 @@
+@@ -1129,10 +_,12 @@
       this.f_90990_.m_85378_((double)i);
       if (this.f_91080_ != null) {
          this.f_91080_.m_6574_(this, this.f_90990_.m_85445_(), this.f_90990_.m_85446_());
@@ -198,7 +199,7 @@
       this.f_91063_.m_109097_(this.f_90990_.m_85441_(), this.f_90990_.m_85442_());
       this.f_91067_.m_91599_();
    }
-@@ -1432,11 +_,21 @@
+@@ -1429,11 +_,21 @@
          if (p_91387_ && this.f_91077_ != null && this.f_91077_.m_6662_() == HitResult.Type.BLOCK) {
             BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
             BlockPos blockpos = blockhitresult.m_82425_();
@@ -222,7 +223,7 @@
                }
             }
 
-@@ -1455,6 +_,8 @@
+@@ -1452,6 +_,8 @@
             }
 
          } else if (!this.f_91074_.m_108637_()) {
@@ -231,7 +232,7 @@
             switch(this.f_91077_.m_6662_()) {
             case ENTITY:
                this.f_91072_.m_105223_(this.f_91074_, ((EntityHitResult)this.f_91077_).m_82443_());
-@@ -1462,7 +_,7 @@
+@@ -1459,7 +_,7 @@
             case BLOCK:
                BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
                BlockPos blockpos = blockhitresult.m_82425_();
@@ -240,7 +241,7 @@
                   this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
                   break;
                }
-@@ -1472,8 +_,10 @@
+@@ -1469,8 +_,10 @@
                }
 
                this.f_91074_.m_36334_();
@@ -251,7 +252,7 @@
             this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
          }
       }
-@@ -1488,6 +_,11 @@
+@@ -1485,6 +_,11 @@
             }
 
             for(InteractionHand interactionhand : InteractionHand.values()) {
@@ -263,7 +264,7 @@
                ItemStack itemstack = this.f_91074_.m_21120_(interactionhand);
                if (this.f_91077_ != null) {
                   switch(this.f_91077_.m_6662_()) {
-@@ -1501,6 +_,7 @@
+@@ -1502,6 +_,7 @@
 
                      if (interactionresult.m_19077_()) {
                         if (interactionresult.m_19080_()) {
@@ -271,7 +272,7 @@
                            this.f_91074_.m_6674_(interactionhand);
                         }
 
-@@ -1513,6 +_,7 @@
+@@ -1514,6 +_,7 @@
                      InteractionResult interactionresult1 = this.f_91072_.m_105262_(this.f_91074_, this.f_91073_, interactionhand, blockhitresult);
                      if (interactionresult1.m_19077_()) {
                         if (interactionresult1.m_19080_()) {
@@ -279,7 +280,7 @@
                            this.f_91074_.m_6674_(interactionhand);
                            if (!itemstack.m_41619_() && (itemstack.m_41613_() != i || this.f_91072_.m_105290_())) {
                               this.f_91063_.f_109055_.m_109320_(interactionhand);
-@@ -1528,6 +_,9 @@
+@@ -1529,6 +_,9 @@
                   }
                }
 
@@ -289,30 +290,31 @@
                if (!itemstack.m_41619_()) {
                   InteractionResult interactionresult2 = this.f_91072_.m_105235_(this.f_91074_, this.f_91073_, interactionhand);
                   if (interactionresult2.m_19077_()) {
-@@ -1554,6 +_,8 @@
+@@ -1555,6 +_,8 @@
          --this.f_91011_;
       }
 
-+      net.minecraftforge.fmllegacy.hooks.BasicEventHooks.onPreClientTick();
+      net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
 +
       this.f_91026_.m_6180_("gui");
-       if (!this.f_91012_) {
-          this.f_91065_.m_93066_();
-@@ -1679,6 +_,8 @@
+       this.f_91065_.m_193832_(this.f_91012_);
+       this.f_91026_.m_7238_();
+@@ -1683,6 +_,8 @@
       this.f_91026_.m_6182_("keyboard");
       this.f_91068_.m_90931_();
       this.f_91026_.m_7238_();
 +
-+      net.minecraftforge.fmllegacy.hooks.BasicEventHooks.onPostClientTick();
+      net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
    }
 
    private boolean m_91278_() {
-@@ -1814,11 +_,11 @@
+@@ -1821,11 +_,12 @@
    }
 
    public void m_91200_(String p_91201_) {
 -      this.m_91219_(p_91201_, RegistryAccess.m_123086_(), Minecraft::m_91133_, Minecraft::m_91135_, false, Minecraft.ExperimentalDialogType.BACKUP);
-+      this.doLoadLevel(p_91201_, RegistryAccess.m_123086_(), Minecraft::m_91133_, Minecraft::m_91135_, false, Minecraft.ExperimentalDialogType.BACKUP, false);
+      // We need to delay the call to RegistryAccess.builtin() as long as possible, in order to allow our world persistence hooks to run. So we pass in null here, and fix it later, only in the case where creating = false
+      this.doLoadLevel(p_91201_, null, Minecraft::m_91133_, Minecraft::m_91135_, false, Minecraft.ExperimentalDialogType.BACKUP, false);
    }
 
    public void m_91202_(String p_91203_, LevelSettings p_91204_, RegistryAccess.RegistryHolder p_91205_, WorldGenSettings p_91206_) {
@@ -321,7 +323,7 @@
          return p_91204_.m_46934_();
       }, (p_167886_, p_167887_, p_167888_, p_167889_) -> {
          RegistryWriteOps<JsonElement> registrywriteops = RegistryWriteOps.m_135767_(JsonOps.INSTANCE, p_91205_);
-@@ -1828,10 +_,10 @@
+@@ -1835,10 +_,10 @@
          });
          WorldGenSettings worldgensettings = dataresult.resultOrPartial(Util.m_137489_("Error reading worldgen settings after loading data packs: ", f_90982_::error)).orElse(p_91206_);
          return new PrimaryLevelData(p_91204_, worldgensettings, dataresult.lifecycle());
@@ -334,18 +336,16 @@
       LevelStorageSource.LevelStorageAccess levelstoragesource$levelstorageaccess;
       try {
          levelstoragesource$levelstorageaccess = this.f_91031_.m_78260_(p_91220_);
-@@ -1843,12 +_,17 @@
+@@ -1850,12 +_,15 @@
       }
 
       Minecraft.ServerStem minecraft$serverstem;
-+      final RegistryAccess.RegistryHolder dyn_f;
+      final RegistryAccess.RegistryHolder registryHolder;
       try {
 -         minecraft$serverstem = this.m_91190_(p_91221_, p_91222_, p_91223_, p_91224_, levelstoragesource$levelstorageaccess);
-+         Minecraft.ServerStem mgr = this.m_91190_(p_91221_, p_91222_, p_91223_, p_91224_, levelstoragesource$levelstorageaccess);
-+         // We need to rebuild this if we're loading world, so that it gets all the information from AFTER we inject our mappings from the save.
-+         dyn_f = creating ? p_91221_ : RegistryAccess.m_123086_();
-+         minecraft$serverstem = creating ? mgr : this.m_91190_(dyn_f, p_91222_, p_91223_, p_91224_, levelstoragesource$levelstorageaccess); //Note this runs the injection again... which isn't good.. but hey.. we need a better spot to hook in.
-+
+          if (!creating) levelstoragesource$levelstorageaccess.readAdditionalLevelSaveData();
+          registryHolder = creating ? p_91221_ : RegistryAccess.m_123086_();
+          minecraft$serverstem = this.m_91190_(registryHolder, p_91222_, p_91223_, p_91224_, levelstoragesource$levelstorageaccess);
       } catch (Exception exception) {
          f_90982_.warn("Failed to load datapacks, can't proceed with server load", (Throwable)exception);
          this.m_91152_(new DatapackLoadFailureScreen(() -> {
@@ -354,25 +354,25 @@
          }));
 
          try {
-@@ -1868,7 +_,7 @@
+@@ -1875,7 +_,7 @@
          this.f_90999_.set((StoringChunkProgressListener)null);
 
          try {
 -            levelstoragesource$levelstorageaccess.m_78287_(p_91221_, worlddata);
-+            levelstoragesource$levelstorageaccess.m_78287_(dyn_f, worlddata);
+            levelstoragesource$levelstorageaccess.m_78287_(registryHolder, worlddata);
             minecraft$serverstem.m_91433_().m_136179_();
             YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(this.f_91030_);
             MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
-@@ -1880,7 +_,7 @@
-             SkullBlockEntity.m_182462_(this);
+@@ -1885,7 +_,7 @@
+             SkullBlockEntity.m_196700_(gameprofilecache, minecraftsessionservice, this);
             GameProfileCache.m_11004_(false);
             this.f_91007_ = MinecraftServer.m_129872_((p_167898_) -> {
 -               return new IntegratedServer(p_167898_, this, p_91221_, levelstoragesource$levelstorageaccess, minecraft$serverstem.m_91432_(), minecraft$serverstem.m_91433_(), worlddata, minecraftsessionservice, gameprofilerepository, gameprofilecache, (p_168000_) -> {
-+               return new IntegratedServer(p_167898_, this, dyn_f, levelstoragesource$levelstorageaccess, minecraft$serverstem.m_91432_(), minecraft$serverstem.m_91433_(), worlddata, minecraftsessionservice, gameprofilerepository, gameprofilecache, (p_168000_) -> {
+               return new IntegratedServer(p_167898_, this, registryHolder, levelstoragesource$levelstorageaccess, minecraft$serverstem.m_91432_(), minecraft$serverstem.m_91433_(), worlddata, minecraftsessionservice, gameprofilerepository, gameprofilecache, (p_168000_) -> {
                   StoringChunkProgressListener storingchunkprogresslistener = new StoringChunkProgressListener(p_168000_ + 0);
                   this.f_90999_.set(storingchunkprogresslistener);
                   return ProcessorChunkProgressListener.m_143583_(storingchunkprogresslistener, this.f_91023_::add);
-@@ -1924,11 +_,16 @@
+@@ -1929,11 +_,16 @@
          connection.m_129505_(new ClientHandshakePacketListenerImpl(connection, this, (Screen)null, (p_167998_) -> {
          }));
          connection.m_129512_(new ClientIntentionPacket(socketaddress.toString(), 0, ConnectionProtocol.LOGIN));
@@ -387,11 +387,11 @@
       } else {
          this.m_91143_(p_91225_, p_91220_, flag, () -> {
 -            this.m_91219_(p_91220_, p_91221_, p_91222_, p_91223_, p_91224_, Minecraft.ExperimentalDialogType.NONE);
-+            this.doLoadLevel(p_91220_, dyn_f, p_91222_, p_91223_, p_91224_, Minecraft.ExperimentalDialogType.NONE, creating);
+            this.doLoadLevel(p_91220_, registryHolder, p_91222_, p_91223_, p_91224_, Minecraft.ExperimentalDialogType.NONE, creating);
          });
          minecraft$serverstem.close();
 
-@@ -2016,6 +_,7 @@
+@@ -2021,6 +_,7 @@
    }
 
    public void m_91156_(ClientLevel p_91157_) {
@@ -399,7 +399,7 @@
       ProgressScreen progressscreen = new ProgressScreen(true);
       progressscreen.m_6309_(new TranslatableComponent("connect.joining"));
       this.m_91362_(progressscreen);
-@@ -2049,10 +_,12 @@
+@@ -2053,10 +_,12 @@
       IntegratedServer integratedserver = this.f_91007_;
       this.f_91007_ = null;
       this.f_91063_.m_109150_();
@@ -412,23 +412,15 @@
          if (integratedserver != null) {
             this.f_91026_.m_6180_("waitForServer");
 
-@@ -2067,6 +_,7 @@
+@@ -2071,6 +_,7 @@
          this.f_91065_.m_93089_();
          this.f_91008_ = null;
          this.f_91010_ = false;
-+         net.minecraftforge.client.ForgeHooksClient.handleClientWorldClosing(f_91073_);
+         net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(f_91073_);
          this.f_91004_.m_90740_();
       }
 
-@@ -2097,6 +_,7 @@
-       this.f_91061_.m_107342_(p_91325_);
-       this.f_167845_.m_112257_(p_91325_);
-       this.m_91341_();
-+      net.minecraftforge.client.MinecraftForgeClient.clearRenderCache();
-    }
- 
-    public boolean m_91400_() {
-@@ -2152,66 +_,9 @@
+@@ -2157,66 +_,9 @@
 
    private void m_91280_() {
       if (this.f_91077_ != null && this.f_91077_.m_6662_() != HitResult.Type.MISS) {
@@ -498,7 +490,7 @@
       }
    }
 
-@@ -2768,7 +_,7 @@
+@@ -2707,7 +_,7 @@
       return this.f_90993_;
    }
 
@@ -507,7 +499,7 @@
       int i = p_167938_.m_10374_();
       Supplier<PackResources> supplier = p_167937_;
       if (i <= 3) {
-@@ -2779,7 +_,7 @@
+@@ -2718,7 +_,7 @@
          supplier = m_91352_(supplier);
       }
 
@@ -516,7 +508,7 @@
    }
 
    private static Supplier<PackResources> m_91330_(Supplier<PackResources> p_91331_) {
-@@ -2796,6 +_,14 @@
+@@ -2735,6 +_,14 @@
 
    public void m_91312_(int p_91313_) {
       this.f_91051_.m_119410_(p_91313_);
@@ -13,19 +13,19 @@
                   screen.m_169415_();
                   Screen.m_96579_(() -> {
 -                     aboolean[0] = screen.m_6375_(d0, d1, i);
-+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiMouseClickedPre(this.f_91503_.f_91080_, d0, d1, i);
+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenMouseClickedPre(screen, d0, d1, i);
 +                     if (!aboolean[0]) {
 +                        aboolean[0] = this.f_91503_.f_91080_.m_6375_(d0, d1, i);
-+                        aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiMouseClickedPost(this.f_91503_.f_91080_, d0, d1, i, aboolean[0]);
+                        aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenMouseClickedPost(screen, d0, d1, i, aboolean[0]);
 +                     }
                   }, "mouseClicked event handler", screen.getClass().getCanonicalName());
                } else {
                   Screen.m_96579_(() -> {
 -                     aboolean[0] = screen.m_6348_(d0, d1, i);
-+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiMouseReleasedPre(this.f_91503_.f_91080_, d0, d1, i);
+                     aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenMouseReleasedPre(screen, d0, d1, i);
 +                     if (!aboolean[0]) {
 +                        aboolean[0] = this.f_91503_.f_91080_.m_6348_(d0, d1, i);
-+                        aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onGuiMouseReleasedPost(this.f_91503_.f_91080_, d0, d1, i, aboolean[0]);
+                        aboolean[0] = net.minecraftforge.client.ForgeHooksClient.onScreenMouseReleasedPost(screen, d0, d1, i, aboolean[0]);
 +                     }
                   }, "mouseReleased event handler", screen.getClass().getCanonicalName());
                }
@@ -54,9 +54,9 @@
                double d2 = this.f_91508_ * (double)this.f_91503_.m_91268_().m_85446_() / (double)this.f_91503_.m_91268_().m_85444_();
 -               this.f_91503_.f_91080_.m_6050_(d1, d2, d0);
                this.f_91503_.f_91080_.m_169415_();
-+               if (net.minecraftforge.client.ForgeHooksClient.onGuiMouseScrollPre(this, this.f_91503_.f_91080_, d0)) return;
+               if (net.minecraftforge.client.ForgeHooksClient.onScreenMouseScrollPre(this, this.f_91503_.f_91080_, d0)) return;
 +               if (this.f_91503_.f_91080_.m_6050_(d1, d2, d0)) return;
-+               net.minecraftforge.client.ForgeHooksClient.onGuiMouseScrollPost(this, this.f_91503_.f_91080_, d0);
+               net.minecraftforge.client.ForgeHooksClient.onScreenMouseScrollPost(this, this.f_91503_.f_91080_, d0);
             } else if (this.f_91503_.f_91074_ != null) {
                if (this.f_91518_ != 0.0D && Math.signum(d0) != Math.signum(this.f_91518_)) {
                   this.f_91518_ = 0.0D;
@@ -73,9 +73,9 @@
                double d3 = (p_91564_ - this.f_91508_) * (double)this.f_91503_.m_91268_().m_85446_() / (double)this.f_91503_.m_91268_().m_85444_();
                Screen.m_96579_(() -> {
 -                  screen.m_7979_(d0, d1, this.f_91510_, d2, d3);
-+                  if (net.minecraftforge.client.ForgeHooksClient.onGuiMouseDragPre(this.f_91503_.f_91080_, d0, d1, this.f_91510_, d2, d3)) return;
+                  if (net.minecraftforge.client.ForgeHooksClient.onScreenMouseDragPre(screen, d0, d1, this.f_91510_, d2, d3)) return;
 +                  if (screen.m_7979_(d0, d1, this.f_91510_, d2, d3)) return;
-+                  net.minecraftforge.client.ForgeHooksClient.onGuiMouseDragPost(this.f_91503_.f_91080_, d0, d1, this.f_91510_, d2, d3);
+                  net.minecraftforge.client.ForgeHooksClient.onScreenMouseDragPost(screen, d0, d1, this.f_91510_, d2, d3);
                }, "mouseDragged event handler", screen.getClass().getCanonicalName());
             }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -179,6 +_,7 @@
+@@ -187,6 +_,7 @@
    public boolean f_92076_;
 
    public Options(Minecraft p_92138_, File p_92139_) {
@@ -8,8 +8,8 @@
       this.f_92060_ = p_92138_;
       this.f_92110_ = new File(p_92139_, "options.txt");
       if (p_92138_.m_91103_() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
-@@ -283,10 +_,14 @@
-       this.f_92076_ = p_168428_.m_142682_("syncChunkWrites", this.f_92076_);
+@@ -300,10 +_,14 @@
+       this.f_193762_ = p_168428_.m_142682_("allowServerListing", this.f_193762_);
 
       for(KeyMapping keymapping : this.f_92059_) {
 -         String s = keymapping.m_90865_();
@@ -25,15 +25,15 @@
          }
       }
 
-@@ -474,6 +_,7 @@
+@@ -491,6 +_,7 @@
    }
 
    public void m_92169_() {
-+      if (net.minecraftforge.fmlclient.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
+      if (net.minecraftforge.client.loading.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
       try {
          final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.f_92110_), StandardCharsets.UTF_8));
 
-@@ -622,6 +_,23 @@
+@@ -639,6 +_,23 @@
       }
 
       p_92146_.m_10509_(set);
@@ -11,7 +11,7 @@
 +      }
 +      final File target = event.getScreenshotFile();
 +
-       Util.m_137579_().execute(() -> {
+       Util.m_183992_().execute(() -> {
          try {
 -            nativeimage.m_85056_(file2);
 +            nativeimage.m_85056_(target);
@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/User.java
 +++ b/net/minecraft/client/User.java
-@@ -18,8 +_,22 @@
-    private final String f_92536_;
-    private final String f_92537_;
+@@ -21,8 +_,22 @@
+    private final Optional<String> f_193796_;
+    private final Optional<String> f_193797_;
    private final User.Type f_92538_;
 +   /** Forge: Cache of the local session's GameProfile properties. */
 +   private com.mojang.authlib.properties.PropertyMap properties;
 
-    public User(String p_92540_, String p_92541_, String p_92542_, String p_92543_) {
-+      if (p_92540_ == null || p_92540_.isEmpty()) {
-+         p_92540_ = "MissingName";
-+         p_92541_ = p_92542_ = "NotValid";
+    public User(String p_193799_, String p_193800_, String p_193801_, Optional<String> p_193802_, Optional<String> p_193803_, User.Type p_193804_) {
+      if (p_193799_ == null || p_193799_.isEmpty()) {
+         p_193799_ = "MissingName";
+         p_193800_ = p_193801_ = "NotValid";
 +         org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger(getClass().getName());
 +         logger.warn("=========================================================");
 +         logger.warn("WARNING!! the username was not set for this session, typically");
@@ -20,10 +20,10 @@
 +         logger.warn("when asking for help!");
 +         logger.warn("=========================================================");
 +      }
-       this.f_92535_ = p_92540_;
-       this.f_92536_ = p_92541_;
-       this.f_92537_ = p_92542_;
-@@ -45,10 +_,22 @@
+       this.f_92535_ = p_193799_;
+       this.f_92536_ = p_193800_;
+       this.f_92537_ = p_193801_;
+@@ -58,10 +_,22 @@
    public GameProfile m_92548_() {
       try {
          UUID uuid = UUIDTypeAdapter.fromString(this.m_92545_());
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -446,6 +_,10 @@
+@@ -463,6 +_,10 @@
 
          for(MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
             MobEffect mobeffect = mobeffectinstance.m_19544_();
@@ -9,17 +9,17 @@
 +            // Rebind in case previous renderHUDEffect changed texture
 +            RenderSystem.m_157456_(0, AbstractContainerScreen.f_97725_);
             if (mobeffectinstance.m_19575_()) {
-                int k = this.f_92977_;
-                int l = 1;
-@@ -483,6 +_,7 @@
+                int i = this.f_92977_;
+                int j = 1;
+@@ -500,6 +_,7 @@
                   RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, f1);
-                   m_93200_(p_93029_, j1 + 3, k1 + 3, this.m_93252_(), 18, 18, textureatlassprite);
+                   m_93200_(p_93029_, l + 3, i1 + 3, this.m_93252_(), 18, 18, textureatlassprite);
                });
-+               renderer.renderHUDEffect(mobeffectinstance,this, p_93029_, k, l, this.m_93252_(), f);
+               renderer.renderHUDEffect(mobeffectinstance,this, p_93029_, i, j, this.m_93252_(), f);
             }
          }
 
-@@ -608,7 +_,8 @@
+@@ -625,7 +_,8 @@
             mutablecomponent.m_130940_(ChatFormatting.ITALIC);
          }
 
@@ -29,7 +29,7 @@
          int j = (this.f_92977_ - i) / 2;
          int k = this.f_92978_ - 59;
          if (!this.f_92986_.f_91072_.m_105205_()) {
-@@ -624,7 +_,13 @@
+@@ -641,7 +_,13 @@
             RenderSystem.m_69478_();
             RenderSystem.m_69453_();
             m_93172_(p_93070_, j - 2, k - 2, j + i + 2, k + 9 + 2, this.f_92986_.f_91066_.m_92143_(0));
@@ -44,7 +44,7 @@
             RenderSystem.m_69461_();
          }
       }
-@@ -1128,7 +_,7 @@
+@@ -1153,7 +_,7 @@
          ItemStack itemstack = this.f_92986_.f_91074_.m_150109_().m_36056_();
          if (itemstack.m_41619_()) {
             this.f_92993_ = 0;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/MapRenderer.java
 +++ b/net/minecraft/client/gui/MapRenderer.java
-@@ -123,6 +_,7 @@
+@@ -118,6 +_,7 @@
 
          for(MapDecoration mapdecoration : this.f_93280_.m_164811_()) {
             if (!p_93294_ || mapdecoration.m_77809_()) {
@@ -13,4 +13,4 @@
 +
    @OnlyIn(Dist.CLIENT)
    public abstract static class Entry<E extends AbstractSelectionList.Entry<E>> implements GuiEventListener {
-       @Deprecated
+       /** @deprecated */
@@ -5,7 +5,7 @@
          for(LerpingBossEvent lerpingbossevent : this.f_93699_.values()) {
             int k = i / 2 - 91;
 +            net.minecraftforge.client.event.RenderGameOverlayEvent.BossInfo event =
-+               net.minecraftforge.client.ForgeHooksClient.bossBarRenderPre(p_93705_, this.f_93698_.m_91268_(), lerpingbossevent, k, j, 10 + this.f_93698_.f_91062_.f_92710_);
+               net.minecraftforge.client.ForgeHooksClient.renderBossEventPre(p_93705_, this.f_93698_.m_91268_(), lerpingbossevent, k, j, 10 + this.f_93698_.f_91062_.f_92710_);
 +            if (!event.isCanceled()) {
             RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
             RenderSystem.m_157456_(0, f_93697_);
@@ -17,7 +17,7 @@
 -            j += 10 + 9;
 +            }
 +            j += event.getIncrement();
-+            net.minecraftforge.client.ForgeHooksClient.bossBarRenderPost(p_93705_, this.f_93698_.m_91268_());
+            net.minecraftforge.client.ForgeHooksClient.renderBossEventPost(p_93705_, this.f_93698_.m_91268_());
             if (j >= this.f_93698_.m_91268_().m_85446_() / 3) {
                break;
             }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
 +++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
-@@ -354,7 +_,7 @@
+@@ -363,7 +_,7 @@
                list.add(this.m_94071_(entry));
             }
 
@@ -9,7 +9,7 @@
                list.add("#" + resourcelocation);
             }
          }
-@@ -370,7 +_,7 @@
+@@ -379,7 +_,7 @@
                list.add(this.m_94071_(entry1));
             }
 
@@ -18,7 +18,7 @@
                list.add("#" + resourcelocation1);
             }
          }
-@@ -380,6 +_,7 @@
+@@ -389,6 +_,7 @@
             list.add("");
             list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
             list.add(String.valueOf((Object)Registry.f_122826_.m_7981_(entity.m_6095_())));
@@ -4,7 +4,7 @@
       int k1 = (int)((double)this.f_96163_.m_91268_().m_85446_() * 0.8325D);
       float f6 = this.f_96164_.m_7750_();
       this.f_96167_ = Mth.m_14036_(this.f_96167_ * 0.95F + f6 * 0.050000012F, 0.0F, 1.0F);
-+      net.minecraftforge.fmlclient.ClientModLoader.renderProgressText();
+      net.minecraftforge.client.loading.ClientModLoader.renderProgressText();
       if (f < 1.0F) {
          this.m_96182_(p_96178_, i / 2 - j1, k1 - 5, i / 2 + j1, k1 + 5, 1.0F - Mth.m_14036_(f, 0.0F, 1.0F));
       }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/OptionsScreen.java
 +++ b/net/minecraft/client/gui/screens/OptionsScreen.java
-@@ -134,4 +_,12 @@
+@@ -141,4 +_,12 @@
       m_93215_(p_96249_, this.f_96547_, this.f_96539_, this.f_96543_ / 2, 15, 16777215);
       super.m_6305_(p_96249_, p_96250_, p_96251_, p_96252_);
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/Screen.java
 +++ b/net/minecraft/client/gui/screens/Screen.java
-@@ -125,7 +_,7 @@
+@@ -126,7 +_,7 @@
    }
 
    public void m_7379_() {
@@ -9,7 +9,7 @@
    }
 
    protected <T extends GuiEventListener & Widget & NarratableEntry> T m_142416_(T p_169406_) {
-@@ -162,15 +_,29 @@
+@@ -163,15 +_,29 @@
       this.f_169368_.clear();
    }
 
@@ -43,7 +43,7 @@
       this.m_169383_(p_169389_, list, p_169392_, p_169393_);
    }
 
-@@ -183,20 +_,48 @@
+@@ -184,20 +_,44 @@
    }
 
    public void m_96597_(PoseStack p_96598_, List<Component> p_96599_, int p_96600_, int p_96601_) {
@@ -57,9 +57,7 @@
 +   public void renderComponentTooltip(PoseStack poseStack, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, @Nullable Font font) {
 +      this.renderComponentTooltip(poseStack, tooltips, mouseX, mouseY, font, ItemStack.f_41583_);
 +   }
-+   @Deprecated(forRemoval = true, since = "1.17.1") public void renderComponentToolTip(PoseStack poseStack, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, @Nullable Font font) {
-+      renderComponentTooltip(poseStack, tooltips, mouseX, mouseY, font);
-+   }
+
 +   public void renderComponentTooltip(PoseStack poseStack, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, @Nullable Font font, ItemStack stack) {
 +      this.tooltipFont = font;
 +      this.tooltipStack = stack;
@@ -72,29 +70,27 @@
    public void m_96617_(PoseStack p_96618_, List<? extends FormattedCharSequence> p_96619_, int p_96620_, int p_96621_) {
       this.m_169383_(p_96618_, p_96619_.stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_96620_, p_96621_);
    }
-+   @Deprecated(forRemoval = true, since = "1.17.1") public void renderToolTip(PoseStack p_96618_, List<? extends FormattedCharSequence> p_96619_, int p_96620_, int p_96621_, Font font) {
-+      renderTooltip(p_96618_, p_96619_, p_96620_, p_96621_, font);
-+   }
+ 
 +   public void renderTooltip(PoseStack poseStack, List<? extends FormattedCharSequence> lines, int x, int y, Font font) {
 +      this.tooltipFont = font;
 +      this.m_96617_(poseStack, lines, x, y);
 +      this.tooltipFont = null;
 +   }
- 
+
    private void m_169383_(PoseStack p_169384_, List<ClientTooltipComponent> p_169385_, int p_169386_, int p_169387_) {
       if (!p_169385_.isEmpty()) {
-+         net.minecraftforge.client.event.RenderTooltipEvent.Pre preEvent = net.minecraftforge.client.ForgeHooksClient.preTooltipEvent(this.tooltipStack, p_169384_, p_169386_, p_169387_, f_96543_, f_96544_, p_169385_, this.tooltipFont, this.f_96547_);
+         net.minecraftforge.client.event.RenderTooltipEvent.Pre preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, p_169384_, p_169386_, p_169387_, f_96543_, f_96544_, p_169385_, this.tooltipFont, this.f_96547_);
 +         if (preEvent.isCanceled()) return;
          int i = 0;
          int j = p_169385_.size() == 1 ? -2 : 0;
 
          for(ClientTooltipComponent clienttooltipcomponent : p_169385_) {
 -            int k = clienttooltipcomponent.m_142069_(this.f_96547_);
-+            int k = clienttooltipcomponent.m_142069_(preEvent.getFontRenderer());
+            int k = clienttooltipcomponent.m_142069_(preEvent.getFont());
             if (k > i) {
                i = k;
             }
-@@ -204,8 +_,8 @@
+@@ -205,8 +_,8 @@
             j += clienttooltipcomponent.m_142103_();
          }
 
@@ -105,7 +101,7 @@
          if (j2 + i > this.f_96543_) {
             j2 -= 28 + i;
          }
-@@ -226,15 +_,16 @@
+@@ -227,15 +_,16 @@
          RenderSystem.m_157427_(GameRenderer::m_172811_);
          bufferbuilder.m_166779_(VertexFormat.Mode.QUADS, DefaultVertexFormat.f_85815_);
          Matrix4f matrix4f = p_169384_.m_85850_().m_85861_();
@@ -118,7 +114,7 @@
 -         m_93123_(matrix4f, bufferbuilder, j2 + i + 2, k2 - 3 + 1, j2 + i + 3, k2 + j + 3 - 1, 400, 1347420415, 1344798847);
 -         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 - 3 + 1, 400, 1347420415, 1347420415);
 -         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 2, j2 + i + 3, k2 + j + 3, 400, 1344798847, 1344798847);
-+         net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.colorTooltipEvent(this.tooltipStack, p_169384_, j2, k2, preEvent.getFontRenderer(), p_169385_);
+         net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_169384_, j2, k2, preEvent.getFont(), p_169385_);
 +         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 4, j2 + i + 3, k2 - 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundStart());
 +         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 3, j2 + i + 3, k2 + j + 4, 400, colorEvent.getBackgroundEnd(), colorEvent.getBackgroundEnd());
 +         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 + j + 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd());
@@ -131,25 +127,25 @@
          RenderSystem.m_69482_();
          RenderSystem.m_69472_();
          RenderSystem.m_69478_();
-@@ -249,7 +_,7 @@
+@@ -250,7 +_,7 @@
 
          for(int i2 = 0; i2 < p_169385_.size(); ++i2) {
             ClientTooltipComponent clienttooltipcomponent1 = p_169385_.get(i2);
 -            clienttooltipcomponent1.m_142440_(this.f_96547_, j2, l1, matrix4f, multibuffersource$buffersource);
-+            clienttooltipcomponent1.m_142440_(preEvent.getFontRenderer(), j2, l1, matrix4f, multibuffersource$buffersource);
+            clienttooltipcomponent1.m_142440_(preEvent.getFont(), j2, l1, matrix4f, multibuffersource$buffersource);
             l1 += clienttooltipcomponent1.m_142103_() + (i2 == 0 ? 2 : 0);
          }
 
-@@ -259,7 +_,7 @@
+@@ -260,7 +_,7 @@
 
          for(int l2 = 0; l2 < p_169385_.size(); ++l2) {
             ClientTooltipComponent clienttooltipcomponent2 = p_169385_.get(l2);
-            clienttooltipcomponent2.m_142162_(this.f_96547_, j2, l1, p_169384_, this.f_96542_, 400, this.f_96541_.m_91097_());
-+            clienttooltipcomponent2.m_142162_(preEvent.getFontRenderer(), j2, l1, p_169384_, this.f_96542_, 400, this.f_96541_.m_91097_());
+-            clienttooltipcomponent2.m_183452_(this.f_96547_, j2, l1, p_169384_, this.f_96542_, 400);
+            clienttooltipcomponent2.m_183452_(preEvent.getFont(), j2, l1, p_169384_, this.f_96542_, 400);
             l1 += clienttooltipcomponent2.m_142103_() + (l2 == 0 ? 2 : 0);
          }
 
-@@ -353,9 +_,12 @@
+@@ -354,9 +_,12 @@
    }
 
    public void m_96612_(String p_96613_, boolean p_96614_) {
@@ -158,11 +154,11 @@
       if (p_96614_) {
          this.f_96541_.f_91065_.m_93076_().m_93783_(p_96613_);
       }
-+      //if (net.minecraftforge.client.ClientCommandHandler.instance.executeCommand(mc.player, msg) != 0) return; //Forge: TODO Client command re-write
+      if (net.minecraftforge.client.ClientCommandHandler.sendMessage(p_96613_)) return;
 
       this.f_96541_.f_91074_.m_108739_(p_96613_);
    }
-@@ -366,11 +_,21 @@
+@@ -367,11 +_,21 @@
       this.f_96547_ = p_96607_.f_91062_;
       this.f_96543_ = p_96608_;
       this.f_96544_ = p_96609_;
@@ -173,34 +169,34 @@
 +            this.f_169368_.add(ne);
 +         f_96540_.add(b);
 +      };
-+      if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Pre(this, this.f_96540_, add, this::m_169411_))) {
+      if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.InitScreenEvent.Pre(this, this.f_96540_, add, this::m_169411_))) {
       this.m_169413_();
       this.m_7522_((GuiEventListener)null);
       this.m_7856_();
       this.m_169407_(false);
       this.m_169378_(f_169370_);
 +      }
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Post(this, this.f_96540_, add, this::m_169411_));
+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.InitScreenEvent.Post(this, this.f_96540_, add, this::m_169411_));
    }
 
    public List<? extends GuiEventListener> m_6702_() {
-@@ -393,6 +_,7 @@
+@@ -394,6 +_,7 @@
    public void m_96558_(PoseStack p_96559_, int p_96560_) {
       if (this.f_96541_.f_91073_ != null) {
          this.m_93179_(p_96559_, 0, 0, this.f_96543_, this.f_96544_, -1072689136, -804253680);
-+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.BackgroundDrawnEvent(this, p_96559_));
+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.BackgroundDrawnEvent(this, p_96559_));
       } else {
          this.m_96626_(p_96560_);
       }
-@@ -412,6 +_,7 @@
+@@ -413,6 +_,7 @@
       bufferbuilder.m_5483_((double)this.f_96543_, 0.0D, 0.0D).m_7421_((float)this.f_96543_ / 32.0F, (float)p_96627_).m_6122_(64, 64, 64, 255).m_5752_();
       bufferbuilder.m_5483_(0.0D, 0.0D, 0.0D).m_7421_(0.0F, (float)p_96627_).m_6122_(64, 64, 64, 255).m_5752_();
       tesselator.m_85914_();
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.BackgroundDrawnEvent(this, new PoseStack()));
+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.BackgroundDrawnEvent(this, new PoseStack()));
    }
 
    public boolean m_7043_() {
-@@ -497,6 +_,10 @@
+@@ -498,6 +_,10 @@
    }
 
    public void m_7400_(List<Path> p_96591_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/TitleScreen.java
 +++ b/net/minecraft/client/gui/screens/TitleScreen.java
-@@ -63,6 +_,7 @@
+@@ -64,6 +_,7 @@
    private final PanoramaRenderer f_96729_ = new PanoramaRenderer(f_96716_);
    private final boolean f_96714_;
    private long f_96715_;
@@ -8,7 +8,7 @@
 
    public TitleScreen() {
       this(false);
-@@ -106,11 +_,16 @@
+@@ -107,11 +_,16 @@
       this.f_96728_ = this.f_96543_ - this.f_96727_ - 2;
       int i = 24;
       int j = this.f_96544_ / 4 + 48;
@@ -18,14 +18,14 @@
       } else {
          this.m_96763_(j, 24);
 +         modButton = this.m_142416_(new Button(this.f_96543_ / 2 - 100, j + 24 * 2, 98, 20, new TranslatableComponent("fml.menu.mods"), button -> {
-+            this.f_96541_.m_91152_(new net.minecraftforge.fmlclient.gui.screen.ModListScreen(this));
+            this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this));
 +         }));
       }
 +      modUpdateNotification = net.minecraftforge.client.gui.NotificationModUpdateScreen.init(this, modButton);
 
       this.m_142416_(new ImageButton(this.f_96543_ / 2 - 124, j + 72 + 12, 20, 20, 0, 106, 20, Button.f_93617_, 256, 256, (p_96791_) -> {
          this.f_96541_.m_91152_(new LanguageSelectScreen(this, this.f_96541_.f_91066_, this.f_96541_.m_91102_()));
-@@ -158,7 +_,7 @@
+@@ -159,7 +_,7 @@
          Screen screen = (Screen)(this.f_96541_.f_91066_.f_92083_ ? new JoinMultiplayerScreen(this) : new SafetyScreen(this));
          this.f_96541_.m_91152_(screen);
       }, button$ontooltip))).f_93623_ = flag;
@@ -34,7 +34,7 @@
          this.m_96793_();
       }, button$ontooltip))).f_93623_ = flag;
    }
-@@ -283,6 +_,7 @@
+@@ -284,6 +_,7 @@
 
          RenderSystem.m_157456_(0, f_96724_);
          m_93133_(p_96739_, j + 88, 67, 0.0F, 0.0F, 98, 14, 128, 16);
@@ -42,27 +42,27 @@
          if (this.f_96721_ != null) {
             p_96739_.m_85836_();
             p_96739_.m_85837_((double)(this.f_96543_ / 2 + 90), 70.0D, 0.0D);
-@@ -305,7 +_,14 @@
+@@ -306,7 +_,14 @@
             s = s + I18n.m_118938_("menu.modded");
          }
 
 -         m_93236_(p_96739_, this.f_96547_, s, 2, this.f_96544_ - 10, 16777215 | l);
-+         net.minecraftforge.fmllegacy.BrandingControl.forEachLine(true, true, (brdline, brd) ->
+         net.minecraftforge.internal.BrandingControl.forEachLine(true, true, (brdline, brd) ->
 +            m_93236_(p_96739_, this.f_96547_, brd, 2, this.f_96544_ - ( 10 + brdline * (this.f_96547_.f_92710_ + 1)), 16777215 | l)
 +         );
 +
-+         net.minecraftforge.fmllegacy.BrandingControl.forEachAboveCopyrightLine((brdline, brd) ->
+         net.minecraftforge.internal.BrandingControl.forEachAboveCopyrightLine((brdline, brd) ->
 +            m_93236_(p_96739_, this.f_96547_, brd, this.f_96543_ - f_96547_.m_92895_(brd), this.f_96544_ - (10 + (brdline + 1) * ( this.f_96547_.f_92710_ + 1)), 16777215 | l)
 +         );
 +
          m_93236_(p_96739_, this.f_96547_, "Copyright Mojang AB. Do not distribute!", this.f_96728_, this.f_96544_ - 10, 16777215 | l);
          if (p_96740_ > this.f_96728_ && p_96740_ < this.f_96728_ + this.f_96727_ && p_96741_ > this.f_96544_ - 10 && p_96741_ < this.f_96544_) {
             m_93172_(p_96739_, this.f_96728_, this.f_96544_ - 1, this.f_96728_ + this.f_96727_, this.f_96544_, 16777215 | l);
-@@ -321,6 +_,7 @@
+@@ -322,6 +_,7 @@
          if (this.m_96789_() && f1 >= 1.0F) {
             this.f_96726_.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
          }
-+         modUpdateNotification.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
+         if (f1 >= 1.0f) modUpdateNotification.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
 
       }
    }
@@ -1,14 +1,14 @@
 --- a/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
 +++ b/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
-@@ -42,6 +_,7 @@
-    private final Map<Advancement, AdvancementTab> f_97335_ = Maps.newLinkedHashMap();
+@@ -43,6 +_,7 @@
+    @Nullable
    private AdvancementTab f_97336_;
    private boolean f_97337_;
 +   private static int tabPage, maxPages;
 
    public AdvancementsScreen(ClientAdvancements p_97340_) {
       super(NarratorChatListener.f_93310_);
-@@ -57,7 +_,13 @@
+@@ -58,7 +_,13 @@
       } else {
          this.f_97334_.m_104401_(this.f_97336_ == null ? null : this.f_97336_.m_97182_(), true);
       }
@@ -23,7 +23,7 @@
    }
 
    public void m_7861_() {
-@@ -75,7 +_,7 @@
+@@ -76,7 +_,7 @@
          int j = (this.f_96544_ - 140) / 2;
 
          for(AdvancementTab advancementtab : this.f_97335_.values()) {
@@ -32,7 +32,7 @@
                this.f_97334_.m_104401_(advancementtab.m_97182_(), true);
                break;
             }
-@@ -99,6 +_,11 @@
+@@ -100,6 +_,11 @@
       int i = (this.f_96543_ - 252) / 2;
       int j = (this.f_96544_ - 140) / 2;
       this.m_7333_(p_97361_);
@@ -44,7 +44,7 @@
       this.m_97373_(p_97361_, p_97362_, p_97363_, i, j);
       this.m_97356_(p_97361_, i, j);
       this.m_97381_(p_97361_, p_97362_, p_97363_, i, j);
-@@ -149,12 +_,14 @@
+@@ -150,12 +_,14 @@
          RenderSystem.m_157456_(0, f_97330_);
 
          for(AdvancementTab advancementtab : this.f_97335_.values()) {
@@ -59,7 +59,7 @@
             advancementtab1.m_97159_(p_97358_, p_97359_, this.f_96542_);
          }
 
-@@ -180,7 +_,7 @@
+@@ -181,7 +_,7 @@
 
       if (this.f_97335_.size() > 1) {
          for(AdvancementTab advancementtab : this.f_97335_.values()) {
@@ -1,60 +0,0 @@
--- a/net/minecraft/client/gui/screens/controls/ControlList.java
-+++ b/net/minecraft/client/gui/screens/controls/ControlList.java
-@@ -53,7 +_,7 @@
-    }
- 
-    protected int m_5756_() {
-      return super.m_5756_() + 15;
-+      return super.m_5756_() + 15 + 20;
-    }
- 
-    public int m_5759_() {
-@@ -109,7 +_,7 @@
-       KeyEntry(final KeyMapping p_97451_, final Component p_97452_) {
-          this.f_97445_ = p_97451_;
-          this.f_97446_ = p_97452_;
-         this.f_97447_ = new Button(0, 0, 75, 20, p_97452_, (p_97479_) -> {
-+         this.f_97447_ = new Button(0, 0, 75 + 20 /*Forge: add space*/, 20, p_97452_, (p_97479_) -> {
-             ControlList.this.f_97396_.f_97514_ = p_97451_;
-          }) {
-             protected MutableComponent m_5646_() {
-@@ -117,6 +_,7 @@
-             }
-          };
-          this.f_97448_ = new Button(0, 0, 50, 20, new TranslatableComponent("controls.reset"), (p_97475_) -> {
-+            f_97445_.setToDefault();
-             ControlList.this.f_93386_.f_91066_.m_92159_(p_97451_, p_97451_.m_90861_());
-             KeyMapping.m_90854_();
-          }) {
-@@ -130,7 +_,7 @@
-          boolean flag = ControlList.this.f_97396_.f_97514_ == this.f_97445_;
-          float f = (float)(p_97466_ + 90 - ControlList.this.f_97397_);
-          ControlList.this.f_93386_.f_91062_.m_92889_(p_97463_, this.f_97446_, f, (float)(p_97465_ + p_97468_ / 2 - 9 / 2), 16777215);
-         this.f_97448_.f_93620_ = p_97466_ + 190;
-+         this.f_97448_.f_93620_ = p_97466_ + 190 + 20;
-          this.f_97448_.f_93621_ = p_97465_;
-          this.f_97448_.f_93623_ = !this.f_97445_.m_90864_();
-          this.f_97448_.m_6305_(p_97463_, p_97469_, p_97470_, p_97472_);
-@@ -138,11 +_,12 @@
-          this.f_97447_.f_93621_ = p_97465_;
-          this.f_97447_.m_93666_(this.f_97445_.m_90863_());
-          boolean flag1 = false;
-+         boolean keyCodeModifierConflict = true; // less severe form of conflict, like SHIFT conflicting with SHIFT+G
-          if (!this.f_97445_.m_90862_()) {
-             for(KeyMapping keymapping : ControlList.this.f_93386_.f_91066_.f_92059_) {
-                if (keymapping != this.f_97445_ && this.f_97445_.m_90850_(keymapping)) {
-                   flag1 = true;
-                  break;
-+                  keyCodeModifierConflict &= keymapping.hasKeyCodeModifierConflict(keymapping);
-                }
-             }
-          }
-@@ -150,7 +_,7 @@
-          if (flag) {
-             this.f_97447_.m_93666_((new TextComponent("> ")).m_7220_(this.f_97447_.m_6035_().m_6881_().m_130940_(ChatFormatting.YELLOW)).m_130946_(" <").m_130940_(ChatFormatting.YELLOW));
-          } else if (flag1) {
-            this.f_97447_.m_93666_(this.f_97447_.m_6035_().m_6881_().m_130940_(ChatFormatting.RED));
-+            this.f_97447_.m_93666_(this.f_97447_.m_6035_().m_6881_().m_130940_(keyCodeModifierConflict ? ChatFormatting.GOLD : ChatFormatting.RED));
-          }
- 
-          this.f_97447_.m_6305_(p_97463_, p_97469_, p_97470_, p_97472_);
@@ -1,26 +0,0 @@
--- a/net/minecraft/client/gui/screens/controls/ControlsScreen.java
-+++ b/net/minecraft/client/gui/screens/controls/ControlsScreen.java
-@@ -35,7 +_,7 @@
-       this.m_7787_(this.f_97516_);
-       this.f_97517_ = this.m_142416_(new Button(this.f_96543_ / 2 - 155, this.f_96544_ - 29, 150, 20, new TranslatableComponent("controls.resetAll"), (p_97538_) -> {
-          for(KeyMapping keymapping : this.f_96282_.f_92059_) {
-            keymapping.m_90848_(keymapping.m_90861_());
-+            keymapping.setToDefault();
-          }
- 
-          KeyMapping.m_90854_();
-@@ -59,11 +_,14 @@
-    public boolean m_7933_(int p_97526_, int p_97527_, int p_97528_) {
-       if (this.f_97514_ != null) {
-          if (p_97526_ == 256) {
-+            this.f_97514_.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputConstants.f_84822_);
-             this.f_96282_.m_92159_(this.f_97514_, InputConstants.f_84822_);
-          } else {
-+            this.f_97514_.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputConstants.m_84827_(p_97526_, p_97527_));
-             this.f_96282_.m_92159_(this.f_97514_, InputConstants.m_84827_(p_97526_, p_97527_));
-          }
- 
-+         if (!net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.f_97514_.getKey()))
-          this.f_97514_ = null;
-          this.f_97515_ = Util.m_137550_();
-          KeyMapping.m_90854_();
@@ -0,0 +1,60 @@
+--- a/net/minecraft/client/gui/screens/controls/KeyBindsList.java
+++ b/net/minecraft/client/gui/screens/controls/KeyBindsList.java
+@@ -53,7 +_,7 @@
+    }
+ 
+    protected int m_5756_() {
+-      return super.m_5756_() + 15;
+      return super.m_5756_() + 15 + 20;
+    }
+ 
+    public int m_5759_() {
+@@ -109,7 +_,7 @@
+       KeyEntry(final KeyMapping p_193916_, final Component p_193917_) {
+          this.f_193910_ = p_193916_;
+          this.f_193911_ = p_193917_;
+-         this.f_193912_ = new Button(0, 0, 75, 20, p_193917_, (p_193939_) -> {
+         this.f_193912_ = new Button(0, 0, 75 + 20 /* Forge: Add space */, 20, p_193917_, (p_193939_) -> {
+             KeyBindsList.this.f_193858_.f_193975_ = p_193916_;
+          }) {
+             protected MutableComponent m_5646_() {
+@@ -117,6 +_,7 @@
+             }
+          };
+          this.f_193913_ = new Button(0, 0, 50, 20, new TranslatableComponent("controls.reset"), (p_193935_) -> {
+            this.f_193910_.setToDefault();
+             KeyBindsList.this.f_93386_.f_91066_.m_92159_(p_193916_, p_193916_.m_90861_());
+             KeyMapping.m_90854_();
+          }) {
+@@ -130,7 +_,7 @@
+          boolean flag = KeyBindsList.this.f_193858_.f_193975_ == this.f_193910_;
+          float f = (float)(p_193926_ + 90 - KeyBindsList.this.f_193859_);
+          KeyBindsList.this.f_93386_.f_91062_.m_92889_(p_193923_, this.f_193911_, f, (float)(p_193925_ + p_193928_ / 2 - 9 / 2), 16777215);
+-         this.f_193913_.f_93620_ = p_193926_ + 190;
+         this.f_193913_.f_93620_ = p_193926_ + 190 + 20;
+          this.f_193913_.f_93621_ = p_193925_;
+          this.f_193913_.f_93623_ = !this.f_193910_.m_90864_();
+          this.f_193913_.m_6305_(p_193923_, p_193929_, p_193930_, p_193932_);
+@@ -138,11 +_,12 @@
+          this.f_193912_.f_93621_ = p_193925_;
+          this.f_193912_.m_93666_(this.f_193910_.m_90863_());
+          boolean flag1 = false;
+         boolean keyCodeModifierConflict = true; // gracefully handle conflicts like SHIFT vs SHIFT+G
+          if (!this.f_193910_.m_90862_()) {
+             for(KeyMapping keymapping : KeyBindsList.this.f_93386_.f_91066_.f_92059_) {
+                if (keymapping != this.f_193910_ && this.f_193910_.m_90850_(keymapping)) {
+                   flag1 = true;
+-                  break;
+                  keyCodeModifierConflict &= keymapping.hasKeyModifierConflict(this.f_193910_);
+                }
+             }
+          }
+@@ -150,7 +_,7 @@
+          if (flag) {
+             this.f_193912_.m_93666_((new TextComponent("> ")).m_7220_(this.f_193912_.m_6035_().m_6881_().m_130940_(ChatFormatting.YELLOW)).m_130946_(" <").m_130940_(ChatFormatting.YELLOW));
+          } else if (flag1) {
+-            this.f_193912_.m_93666_(this.f_193912_.m_6035_().m_6881_().m_130940_(ChatFormatting.RED));
+            this.f_193912_.m_93666_(this.f_193912_.m_6035_().m_6881_().m_130940_(keyCodeModifierConflict ? ChatFormatting.GOLD : ChatFormatting.RED));
+          }
+ 
+          this.f_193912_.m_6305_(p_193923_, p_193929_, p_193930_, p_193932_);
@@ -0,0 +1,26 @@
+--- a/net/minecraft/client/gui/screens/controls/KeyBindsScreen.java
+++ b/net/minecraft/client/gui/screens/controls/KeyBindsScreen.java
+@@ -31,7 +_,7 @@
+       this.m_7787_(this.f_193977_);
+       this.f_193978_ = this.m_142416_(new Button(this.f_96543_ / 2 - 155, this.f_96544_ - 29, 150, 20, new TranslatableComponent("controls.resetAll"), (p_193999_) -> {
+          for(KeyMapping keymapping : this.f_96282_.f_92059_) {
+-            keymapping.m_90848_(keymapping.m_90861_());
+            keymapping.setToDefault();
+          }
+ 
+          KeyMapping.m_90854_();
+@@ -55,11 +_,14 @@
+    public boolean m_7933_(int p_193987_, int p_193988_, int p_193989_) {
+       if (this.f_193975_ != null) {
+          if (p_193987_ == 256) {
+            this.f_193975_.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputConstants.f_84822_);
+             this.f_96282_.m_92159_(this.f_193975_, InputConstants.f_84822_);
+          } else {
+            this.f_193975_.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputConstants.m_84827_(p_193987_, p_193988_));
+             this.f_96282_.m_92159_(this.f_193975_, InputConstants.m_84827_(p_193987_, p_193988_));
+          }
+ 
+         if(!net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.f_193975_.getKey()))
+          this.f_193975_ = null;
+          this.f_193976_ = Util.m_137550_();
+          KeyMapping.m_90854_();
@@ -4,7 +4,7 @@
       int i = this.f_97735_;
       int j = this.f_97736_;
       this.m_7286_(p_97795_, p_97798_, p_97796_, p_97797_);
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiContainerEvent.DrawBackground(this, p_97795_, p_97796_, p_97797_));
+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ContainerScreenEvent.DrawBackground(this, p_97795_, p_97796_, p_97797_));
       RenderSystem.m_69465_();
       super.m_6305_(p_97795_, p_97796_, p_97797_, p_97798_);
       PoseStack posestack = RenderSystem.m_157191_();
@@ -18,7 +18,7 @@
       }
 
       this.m_7027_(p_97795_, p_97796_, p_97797_);
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiContainerEvent.DrawForeground(this, p_97795_, p_97796_, p_97797_));
+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ContainerScreenEvent.DrawForeground(this, p_97795_, p_97796_, p_97797_));
       ItemStack itemstack = this.f_97711_.m_41619_() ? this.f_97732_.m_142621_() : this.f_97711_;
       if (!itemstack.m_41619_()) {
          int l1 = 8;
@@ -53,7 +53,7 @@
       if (super.m_6375_(p_97748_, p_97749_, p_97750_)) {
          return true;
       } else {
-         boolean flag = this.f_96541_.f_91066_.f_92097_.m_90830_(p_97750_);
+-         boolean flag = this.f_96541_.f_91066_.f_92097_.m_90830_(p_97750_) && this.f_96541_.f_91072_.m_105290_();
 +         InputConstants.Key mouseKey = InputConstants.Type.MOUSE.m_84895_(p_97750_);
 +         boolean flag = this.f_96541_.f_91066_.f_92097_.isActiveAndMatches(mouseKey);
          Slot slot = this.m_97744_(p_97748_, p_97749_);
@@ -71,7 +71,7 @@
                   }
                } else if (!this.f_97738_) {
                   if (this.f_97732_.m_142621_().m_41619_()) {
-                     if (this.f_96541_.f_91066_.f_92097_.m_90830_(p_97750_)) {
+-                     if (flag) {
 +                     if (this.f_96541_.f_91066_.f_92097_.isActiveAndMatches(mouseKey)) {
                         this.m_6597_(slot, l, p_97750_, ClickType.CLONE);
                      } else {
@@ -80,7 +80,7 @@
                         this.f_97717_ = 0;
                      } else if (p_97750_ == 1) {
                         this.f_97717_ = 1;
-                     } else if (this.f_96541_.f_91066_.f_92097_.m_90830_(p_97750_)) {
+-                     } else if (flag) {
 +                     } else if (this.f_96541_.f_91066_.f_92097_.isActiveAndMatches(mouseKey)) {
                         this.f_97717_ = 2;
                      }
@@ -9,7 +9,7 @@
    private boolean f_98515_;
    private final Map<ResourceLocation, Tag<Item>> f_98516_ = Maps.newTreeMap();
 
-@@ -242,6 +_,12 @@
+@@ -233,6 +_,12 @@
    protected void m_7856_() {
       if (this.f_96541_.f_91072_.m_105290_()) {
          super.m_7856_();
@@ -22,7 +22,7 @@
          this.f_96541_.f_91068_.m_90926_(true);
          this.f_98510_ = new EditBox(this.f_96547_, this.f_97735_ + 82, this.f_97736_ + 6, 80, 9, new TranslatableComponent("itemGroup.search"));
          this.f_98510_.m_94199_(50);
-@@ -283,7 +_,7 @@
+@@ -274,7 +_,7 @@
    public boolean m_5534_(char p_98521_, int p_98522_) {
       if (this.f_98514_) {
          return false;
@@ -31,7 +31,7 @@
          return false;
       } else {
          String s = this.f_98510_.m_94155_();
-@@ -301,7 +_,7 @@
+@@ -292,7 +_,7 @@
 
    public boolean m_7933_(int p_98547_, int p_98548_, int p_98549_) {
       this.f_98514_ = false;
@@ -40,7 +40,7 @@
          if (this.f_96541_.f_91066_.f_92098_.m_90832_(p_98547_, p_98548_)) {
             this.f_98514_ = true;
             this.m_98560_(CreativeModeTab.f_40754_);
-@@ -338,6 +_,32 @@
+@@ -329,6 +_,32 @@
    private void m_98630_() {
       (this.f_97732_).f_98639_.clear();
       this.f_98516_.clear();
@@ -73,7 +73,7 @@
       String s = this.f_98510_.m_94155_();
       if (s.isEmpty()) {
          for(Item item : Registry.f_122827_) {
-@@ -383,9 +_,9 @@
+@@ -374,9 +_,9 @@
 
    protected void m_7027_(PoseStack p_98616_, int p_98617_, int p_98618_) {
       CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[f_98507_];
@@ -85,7 +85,7 @@
       }
 
    }
-@@ -396,7 +_,7 @@
+@@ -387,7 +_,7 @@
          double d1 = p_98532_ - (double)this.f_97736_;
 
          for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
@@ -94,7 +94,7 @@
                return true;
             }
          }
-@@ -417,7 +_,7 @@
+@@ -408,7 +_,7 @@
          this.f_98509_ = false;
 
          for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
@@ -103,7 +103,7 @@
                this.m_98560_(creativemodetab);
                return true;
             }
-@@ -428,12 +_,15 @@
+@@ -419,12 +_,15 @@
    }
 
    private boolean m_98631_() {
@@ -119,7 +119,7 @@
       this.f_97737_.clear();
       (this.f_97732_).f_98639_.clear();
       if (p_98561_ == CreativeModeTab.f_40760_) {
-@@ -510,13 +_,15 @@
+@@ -501,13 +_,15 @@
       }
 
       if (this.f_98510_ != null) {
@@ -136,7 +136,7 @@
 
             this.m_98630_();
          } else {
-@@ -576,16 +_,34 @@
+@@ -567,16 +_,34 @@
       this.m_7333_(p_98577_);
       super.m_6305_(p_98577_, p_98578_, p_98579_, p_98580_);
 
@@ -173,7 +173,7 @@
       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
       this.m_7025_(p_98577_, p_98578_, p_98579_);
    }
-@@ -620,7 +_,7 @@
+@@ -611,7 +_,7 @@
             list1.add(1, creativemodetab.m_40786_().m_6881_().m_130940_(ChatFormatting.BLUE));
          }
 
@@ -182,7 +182,7 @@
       } else {
          super.m_6057_(p_98590_, p_98591_, p_98592_, p_98593_);
       }
-@@ -631,16 +_,32 @@
+@@ -622,16 +_,32 @@
       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
       CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[f_98507_];
 
@@ -219,7 +219,7 @@
       this.m_93228_(p_98572_, this.f_97735_, this.f_97736_, 0, 0, this.f_97726_, this.f_97727_);
       this.f_98510_.m_6305_(p_98572_, p_98574_, p_98575_, p_98573_);
       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
-@@ -648,11 +_,14 @@
+@@ -639,11 +_,14 @@
       int j = this.f_97736_ + 18;
       int k = j + 112;
       RenderSystem.m_157427_(GameRenderer::m_172817_);
@@ -235,7 +235,7 @@
       this.m_98581_(p_98572_, creativemodetab);
       if (creativemodetab == CreativeModeTab.f_40761_) {
          InventoryScreen.m_98850_(this.f_97735_ + 88, this.f_97736_ + 45, 20, (float)(this.f_97735_ + 88 - p_98574_), (float)(this.f_97736_ + 45 - 30 - p_98575_), this.f_96541_.f_91074_);
-@@ -661,6 +_,7 @@
+@@ -652,6 +_,7 @@
    }
 
    protected boolean m_98562_(CreativeModeTab p_98563_, double p_98564_, double p_98565_) {
@@ -243,15 +243,15 @@
       int i = p_98563_.m_40793_();
       int j = 28 * i;
       int k = 0;
-@@ -729,6 +_,7 @@
-          i1 = i1 + (this.f_97727_ - 4);
+@@ -720,6 +_,7 @@
+          i1 += this.f_97727_ - 4;
       }
 
 +      RenderSystem.m_69478_(); //Forge: Make sure blend is enabled else tabs show a white border.
       this.m_93228_(p_98582_, l, i1, j, k, 28, 32);
       this.f_96542_.f_115093_ = 100.0F;
-       l = l + 6;
-@@ -918,6 +_,22 @@
+       l += 6;
+@@ -909,6 +_,22 @@
 
       public boolean m_8010_(Player p_98665_) {
          return this.f_98655_.m_8010_(p_98665_);
@@ -1,25 +1,40 @@
 --- a/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
-@@ -34,6 +_,9 @@
-          this.f_97735_ = (this.f_96543_ - this.f_97726_) / 2;
-          this.f_98699_ = false;
-       } else {
-+         if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.PotionShiftEvent(this)))
-+            this.f_97735_ = (this.f_96543_ - this.f_97726_) / 2;
-+         else
-          this.f_97735_ = 160 + (this.f_96543_ - this.f_97726_ - 200) / 2;
-          this.f_98699_ = true;
-       }
-@@ -58,7 +_,7 @@
-             j = 132 / (collection.size() - 1);
+@@ -32,13 +_,21 @@
+    }
+ 
+    public boolean m_194018_() {
+-      int i = this.f_97735_ + this.f_97726_ + 2;
+      int i;
+      if(cancelShift)
+         i = (this.f_96543_ - this.f_97726_) / 2;
+      else
+         i = this.f_97735_ + this.f_97726_ + 2;
+       int j = this.f_96543_ - i;
+       return j >= 32;
+    }
+ 
+    private void m_194014_(PoseStack p_194015_, int p_194016_, int p_194017_) {
+-      int i = this.f_97735_ + this.f_97726_ + 2;
+      int i;
+      if(cancelShift)
+         i = (this.f_96543_ - this.f_97726_) / 2;
+      else
+         i = this.f_97735_ + this.f_97726_ + 2;
+       int j = this.f_96543_ - i;
+       Collection<MobEffectInstance> collection = this.f_96541_.f_91074_.m_21220_();
+       if (!collection.isEmpty() && j >= 32) {
+@@ -49,7 +_,8 @@
+             k = 132 / (collection.size() - 1);
          }
 
 -         Iterable<MobEffectInstance> iterable = Ordering.natural().sortedCopy(collection);
-+         Iterable<MobEffectInstance> iterable = collection.stream().filter(net.minecraftforge.client.ForgeHooksClient::shouldRender).sorted().collect(java.util.stream.Collectors.toList());
-          this.m_98709_(p_98716_, i, j, iterable);
-          this.m_98717_(p_98716_, i, j, iterable);
-          this.m_98722_(p_98716_, i, j, iterable);
-@@ -95,6 +_,12 @@
+
+         Iterable<MobEffectInstance> iterable = collection.stream().filter(net.minecraftforge.client.ForgeHooksClient::shouldRenderEffect).sorted().collect(java.util.stream.Collectors.toList());
+          this.m_194002_(p_194015_, i, k, iterable, flag);
+          this.m_194008_(p_194015_, i, k, iterable, flag);
+          if (flag) {
+@@ -110,6 +_,12 @@
       int i = this.f_97736_;
 
       for(MobEffectInstance mobeffectinstance : p_98726_) {
@@ -29,6 +44,20 @@
 +            i += p_98725_;
 +            continue;
 +         }
-          String s = I18n.m_118938_(mobeffectinstance.m_19544_().m_19481_());
-          if (mobeffectinstance.m_19564_() >= 1 && mobeffectinstance.m_19564_() <= 9) {
-             s = s + " " + I18n.m_118938_("enchantment.level." + (mobeffectinstance.m_19564_() + 1));
+          Component component = this.m_194000_(mobeffectinstance);
+          this.f_96547_.m_92763_(p_98723_, component, (float)(p_98724_ + 10 + 18), (float)(i + 6), 16777215);
+          String s = MobEffectUtil.m_19581_(mobeffectinstance, 1.0F);
+@@ -126,5 +_,13 @@
+       }
+ 
+       return mutablecomponent;
+   }
+
+   // FORGE START
+   boolean cancelShift = false;
+   @Override
+   protected void m_7856_() {
+      super.m_7856_();
+      cancelShift = net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.PotionShiftEvent(this));
+    }
+ }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.java
 +++ b/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.java
-@@ -22,6 +_,8 @@
+@@ -21,6 +_,8 @@
       if (p_169951_ instanceof BundleTooltip) {
          return new ClientBundleTooltip((BundleTooltip)p_169951_);
       } else {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
-@@ -247,6 +_,11 @@
+@@ -250,6 +_,11 @@
 
    }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
-@@ -333,6 +_,8 @@
+@@ -334,6 +_,8 @@
             this.f_99855_.m_99707_(list1);
          }
 
@@ -1,19 +1,19 @@
 --- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
 +++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
-@@ -117,7 +_,7 @@
+@@ -116,7 +_,7 @@
 
    public static CreateWorldScreen m_100898_(@Nullable Screen p_100899_) {
       RegistryAccess.RegistryHolder registryaccess$registryholder = RegistryAccess.m_123086_();
-      return new CreateWorldScreen(p_100899_, DataPackConfig.f_45842_, new WorldGenSettingsComponent(registryaccess$registryholder, WorldGenSettings.m_64641_(registryaccess$registryholder.m_175515_(Registry.f_122818_), registryaccess$registryholder.m_175515_(Registry.f_122885_), registryaccess$registryholder.m_175515_(Registry.f_122878_)), Optional.of(WorldPreset.f_101506_), OptionalLong.empty()));
-+      return new CreateWorldScreen(p_100899_, DataPackConfig.f_45842_, new WorldGenSettingsComponent(registryaccess$registryholder, net.minecraftforge.client.ForgeHooksClient.getDefaultWorldType().map(type -> type.m_7012_(registryaccess$registryholder, new java.util.Random().nextLong(), true, false)).orElseGet(() -> WorldGenSettings.m_64641_(registryaccess$registryholder.m_175512_(Registry.f_122818_), registryaccess$registryholder.m_175512_(Registry.f_122885_), registryaccess$registryholder.m_175512_(Registry.f_122878_))), net.minecraftforge.client.ForgeHooksClient.getDefaultWorldType(), OptionalLong.empty()));
+-      return new CreateWorldScreen(p_100899_, DataPackConfig.f_45842_, new WorldGenSettingsComponent(registryaccess$registryholder, WorldGenSettings.m_190050_(registryaccess$registryholder), Optional.of(WorldPreset.f_101506_), OptionalLong.empty()));
+      return new CreateWorldScreen(p_100899_, DataPackConfig.f_45842_, new WorldGenSettingsComponent(registryaccess$registryholder, net.minecraftforge.client.ForgeHooksClient.getDefaultWorldPreset().map(type -> type.m_7012_(registryaccess$registryholder, new java.util.Random().nextLong(), true, false)).orElseGet(() -> WorldGenSettings.m_190050_(registryaccess$registryholder)), net.minecraftforge.client.ForgeHooksClient.getDefaultWorldPreset(), OptionalLong.empty()));
    }
 
    private CreateWorldScreen(@Nullable Screen p_100861_, DataPackConfig p_100862_, WorldGenSettingsComponent p_100863_) {
-@@ -596,6 +_,7 @@
+@@ -595,6 +_,7 @@
          File file1 = path.toFile();
          if (this.f_100832_ == null) {
             this.f_100832_ = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource(), new FolderRepositorySource(file1, PackSource.f_10527_));
-+            net.minecraftforge.fmllegacy.packs.ResourcePackLoader.loadResourcePacks(this.f_100832_, net.minecraftforge.fmllegacy.server.ServerLifecycleHooks::buildPackFinderNew);
+            net.minecraftforge.resource.ResourcePackLoader.loadResourcePacks(this.f_100832_, net.minecraftforge.server.ServerLifecycleHooks::buildPackFinder);
             this.f_100832_.m_10506_();
          }
 
@@ -4,7 +4,7 @@
       this.f_170244_.f_93624_ = false;
       this.f_101391_ = p_101430_.m_142416_(new Button(j, 120, 150, 20, new TranslatableComponent("selectWorld.customizeType"), (p_170248_) -> {
          WorldPreset.PresetEditor worldpreset$preseteditor = WorldPreset.f_101509_.get(this.f_101395_);
-+         worldpreset$preseteditor = net.minecraftforge.client.ForgeHooksClient.getBiomeGeneratorTypeScreenFactory(this.f_101395_, worldpreset$preseteditor);
+         worldpreset$preseteditor = net.minecraftforge.client.ForgeHooksClient.getPresetEditor(this.f_101395_, worldpreset$preseteditor);
          if (worldpreset$preseteditor != null) {
             p_101431_.m_91152_(worldpreset$preseteditor.m_101642_(p_101430_, this.f_101394_));
          }
@@ -13,7 +13,7 @@
          this.f_101389_.f_93624_ = p_170288_;
          this.f_101380_.f_93624_ = p_170288_;
 -         this.f_101391_.f_93624_ = p_170288_ && WorldPreset.f_101509_.containsKey(this.f_101395_);
-+         this.f_101391_.f_93624_ = p_170288_ && (WorldPreset.f_101509_.containsKey(this.f_101395_) || net.minecraftforge.client.ForgeHooksClient.hasBiomeGeneratorSettingsOptionsScreen(this.f_101395_));
+         this.f_101391_.f_93624_ = p_170288_ && (WorldPreset.f_101509_.containsKey(this.f_101395_) || net.minecraftforge.client.ForgeHooksClient.hasPresetEditor(this.f_101395_));
          this.f_101392_.f_93624_ = p_170288_;
       }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldPreset.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldPreset.java
-@@ -116,6 +_,9 @@
+@@ -83,6 +_,9 @@
    WorldPreset(String p_101519_) {
       this.f_101516_ = new TranslatableComponent("generator." + p_101519_);
    }
@@ -10,7 +10,7 @@
 
    private static WorldGenSettings m_101549_(RegistryAccess p_101550_, WorldGenSettings p_101551_, WorldPreset p_101552_, Biome p_101553_) {
       BiomeSource biomesource = new FixedBiomeSource(p_101553_);
-@@ -173,4 +_,8 @@
+@@ -125,4 +_,8 @@
    public interface PresetEditor {
       Screen m_101642_(CreateWorldScreen p_101643_, WorldGenSettings p_101644_);
    }
Author	SHA1	Message	Date
LexManos	104daf8ef0	Update license headers to compact SPDX format. License has not changed, this is just more compact and doesn't include years. Bump version for RB.	2022-02-28 13:41:23 -08:00
LexManos	d9a04b881a	Remove - from allowed characters in mod ids. The Java Module System does not allow them in module ids. Closes #8488	2022-02-28 13:23:53 -08:00
gigaherz	ae62362d49	Fix static initializer crash when loading BakedRenderable.	2022-02-28 22:03:31 +01:00
sciwhiz12	2f8c3ea738	Fix regressions for onAddedTo/RemovedFromWorld and related events (#8434 )	2022-02-28 17:23:19 +00:00
SizableShrimp	f0c2554b1c	[1.18] Integrate the gametest framework with Forge (#8225 ) Signed-off-by: SizableShrimp <[email protected]>	2022-02-25 01:06:32 +00:00
sciwhiz12	bb547a5748	Re-add missing Shulker patch for EntityTeleportEvent (#8481 )	2022-02-25 00:51:00 +00:00
sciwhiz12	5dd3842b77	Fix entity type in conversion event to Drowned (#8479 )	2022-02-25 00:49:48 +00:00
Sara Freimer	2ab4685149	Add VanillaGameEvent to allow for globally listening to vanilla's GameEvents (#8472 )	2022-02-22 15:12:06 -08:00
Sara Freimer	edbc07ed22	Provide damage source context to Item#onDestroyed(ItemEntity) (#8473 )	2022-02-22 14:38:53 -08:00
Sara Freimer	e225dbc8d1	Add missing shear and elytra game events (#8471 )	2022-02-22 14:24:14 -08:00
sciwhiz12	117be913da	Fix comment for permission handler config setting (#8466 )	2022-02-22 14:21:47 -08:00
Brennan Ward	512d4d7271	Apply nullable annotations to LootingLevelEvent (#8422 )	2022-02-22 14:20:29 -08:00
LexManos	a9237cff75	Fix Mob Spawner logic with CustomSpawnRules. Closes #8398	2022-02-22 14:18:52 -08:00
Take Weiland	bc24487d0e	Fix LivingDropsEvent not having all drops for foxes (#8387 )	2022-02-15 09:41:06 -08:00
Take Weiland	c3e0b071a2	Add missing Locale parameter to String.format calls, Fixes getArmorResource functionality on some locaales. (#8463 )	2022-02-15 09:27:10 -08:00
Take Weiland	21787234f4	Allow items to hide parts of their tooltips by default (#8358 )	2022-02-15 09:23:18 -08:00
Marc Hermans	a9958b19db	Prevent 1.x Branches being treated as Pull Requests. (#8443 )	2022-02-12 09:28:14 -08:00
Take Weiland	b25d9562f2	Fix RegistryObject not working if created after registry events (#8383 )	2022-02-08 13:05:38 -08:00
Marc Hermans	2765c0d8d9	Add support for tagging StructureFeatures (#8408 )	2022-02-08 12:48:57 -08:00
Take Weiland	82a20911cb	Re-added the patch for LivingExperienceDropEvent and enable it for dragons (#8388 )	2022-02-08 12:39:01 -08:00
Sara Freimer	f19f7e4670	Implement getPickupSound on ForgeFlowingFluid (#8374 )	2022-02-08 12:24:47 -08:00
Frinn38	e10f5c637e	Add getCodec method in ForgeRegistry (#8333 )	2022-02-08 12:12:28 -08:00
eerussianguy	4bfe562f14	Fix #8298 (MobBucketItem) and add test mod (#8313 )	2022-02-08 11:55:25 -08:00
Joseph Tarbit	5e64ef9ecb	Deprecate IForgeAbstractMinecart::getCartItem (#8283 )	2022-02-08 11:38:25 -08:00
Take Weiland	dda1be91ea	Fix HoeItem patch incorrectly applied during migration. (#8384 )	2022-02-08 11:28:22 -08:00
Take Weiland	4f4849b60c	Fix issues with client only commands in combination with server only commands not using MC's command system. (#8452 )	2022-02-08 11:24:55 -08:00
Dipo	3b754fef5e	Fix FoliagePlacerType and TreeDecoratorType registry (#8394 )	2022-02-04 01:28:55 +00:00
Take Weiland	5e295f2485	Fix PlayerChangeGameModeEvent (#8441 )	2022-02-04 00:08:41 +00:00
Dennis C	5c9258491f	Fix comparison of custom ParticleRenderTypes leading to broken particle effects. (#8385 )	2022-01-30 14:26:03 +00:00
LexManos	af87677516	Fix cases where null is potentially sent to Screen events. Closes #8432	2022-01-27 23:38:08 -08:00
mezz	a68c886ea2	Ensure ScreenEvent doesn't accept null screens (#8296 )	2022-01-27 19:47:58 -08:00
Bagel	b129e385cc	Update cobblestone tags (#8292 )	2022-01-27 19:39:44 -08:00
Marc Hermans	fdc921923c	Prevent release of custom payload packet buffer on the server side. (#8181 )	2022-01-27 19:33:45 -08:00
SizableShrimp	476e20ae96	Make `MinecraftLocator` respect non-`MOD` FML Mod Types Fixes #8344 (#8346 )	2022-01-22 10:26:14 -08:00
Joseph B	d63516f2ac	Fix vanilla worlds being marked experimental (#8415 )	2022-01-22 03:46:44 +00:00
KnightMiner	fd522d38b0	Simplify usage of IItemRenderProperties::getArmorModel (#8349 )	2022-01-22 00:37:55 +01:00
Take Weiland	5f0d4abf23	Hide mod update notification while screen is still fading in (#8386 )	2022-01-21 22:38:46 +01:00
LexManos	8e3e8b2120	Revert "Hooks to allow registering and managing custom DFU schemes and types. (#8242 )"	2022-01-20 15:39:47 -08:00
Marc Hermans	72fd6808d8	Provide NPE protection against out of order init of the TYPES and REF (#8410 )	2022-01-20 14:58:48 -08:00
Brennan Ward	2c35d04495	Add ShieldBlockEvent (#8261 )	2022-01-20 13:43:22 -08:00
gigaherz	f704d65d5a	Add renderable API to allow easier rendering of OBJ and other custom models, from Entity and BlockEntity renderers. (#8259 ) This is a redesign of a discarded section of my initial model system rewrite, back in 1.14. In order to use it with the OBJ loader, you can use OBJLoader.INSTANCE.loadModel to get the OBJModel, and then call OBJModel#bakeRenderable() to get a SimpleRenderable object to render with. The SimpleRenderable support animation, by providing different transformation matrices for each part in the MultipartTransforms. Additionally, a BakedRenderable helper exists to turn an arbitrary BakedModel into a renderable. After trying to get the B3D loader to work, I decided it wasn't worth the trouble and marked it for removal instead.	2022-01-20 13:30:39 -08:00
sciwhiz12	6c6a4817e7	Merge values of defaulted optional tags, Fixes issue where multiple mods declare the same optional tag. (#8250 )	2022-01-20 12:26:54 -08:00
Girafi	ef3408c1eb	Added new 1.18 biomes to the BiomeDictionary (#8246 )	2022-01-20 12:21:45 -08:00
Marc Hermans	0ea593c50e	Hooks to allow registering and managing custom DFU schemes and types. (#8242 )	2022-01-20 12:20:39 -08:00
Take Weiland	643b972e97	Ping data compression (#8169 )	2022-01-20 11:51:40 -08:00
Joseph B	93ce9e72f7	Expand the LevelStem codec to allow dimension jsons to specify that the dimension's chunk generator should use the overworld/server's seed (#7955 )	2022-01-20 11:46:08 -08:00
coehlrich	f1bafce275	Add Client Commands (#7754 )	2022-01-20 11:32:55 -08:00
SuperMartijn642	75408c1a70	Remove references to the now-broken `BlockEntity#save(CompoundTag)` method (#8235 )	2022-01-19 19:27:34 +00:00
cpw	00fafb07ce	update McModLauncher libraries to newer versions... Signed-off-by: cpw <[email protected]>	2022-01-17 21:46:45 -05:00
cpw	e49a347aea	add extra keystore properties Signed-off-by: cpw <[email protected]>	2022-01-16 18:29:05 -05:00
cpw	2c8ca313a0	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-16 23:26:56 +00:00
cpw	fe7dcdf637	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-16 23:26:35 +00:00
cpw	15daa2955d	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-16 23:05:42 +00:00
cpw	03af8a53a2	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-16 23:05:18 +00:00
cpw	c7e4e4b5b4	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-16 23:03:39 +00:00
cpw	d477425f70	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-16 23:02:55 +00:00
cpw	a3449f2866	fix crowdin key Signed-off-by: cpw <[email protected]>	2022-01-15 14:46:27 -05:00
cpw	2a1f98aec2	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-15 19:43:05 +00:00
cpw	bc9bd40d03	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-15 19:42:19 +00:00
cpw	58344b0b15	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-15 19:42:08 +00:00
cpw	edcc8b3c97	fix secondary branches builds Signed-off-by: cpw <[email protected]>	2022-01-15 14:21:01 -05:00
OrionDevelopment	d494ba9be4	TeamCity change in 'MinecraftForge / MinecraftForge' project: parameters of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:58:23 +00:00
OrionDevelopment	b92f56503e	TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:57:37 +00:00
OrionDevelopment	5a9be79785	TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:56:12 +00:00
OrionDevelopment	225c2125c6	TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:55:02 +00:00
OrionDevelopment	e2a932108e	TeamCity change in 'MinecraftForge / MinecraftForge' project: parameters of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:54:11 +00:00
OrionDevelopment	ec38717702	TeamCity change in 'MinecraftForge / MinecraftForge' project: parameters of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:50:32 +00:00
OrionDevelopment	3009f5350c	TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated	2022-01-15 18:48:59 +00:00
Marc Hermansandcpw	a24dd3c8ee	Remove primary branches from building on secondary branch configuration and publish crowdin data. (#8397 ) * Remove the normalized branch names also from the filter. * Add the additional publishing arguments to get the crowdin information. * TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed * Fix the configuration. * Remove the required patch and use the base script. * Make a note about the reference. Co-authored-by: cpw <[email protected]>	2022-01-15 12:45:09 -05:00
cpw	3fae26a470	TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed	2022-01-15 17:20:24 +00:00
Marc Hermans	a44ac01aee	Correct the build configuration to support a setup. (#8395 ) * Add a setup task and publish the correct versions. * Reconfigure build task and disable the normal build and test cycle on everything but pull requests, run an assemble there. * Fix the derp in the build configuration.	2022-01-15 11:44:42 -05:00
Marc Hermans	b09f8d0fc8	Enable the TeamCity CI pipeline (#8368 ) * Setup the build.gradle * Setup the teamcity toolchain. * Revert the usage of the local build of GU. * Automatically add it now, it will always exist and is added to maven automatically by GU. * Implement the branch filter and move the constant for the minimal changelog tag to a constant in the extension. * Adding the JDK and Gradle version to the build script.	2022-01-15 10:39:09 -05:00
Take Weiland	57a916bf09	Fix and improve Ingredient invalidation (#8361 )	2022-01-14 15:05:57 +00:00
Alex O'Neill	15d3df2818	Rework world persistence hooks to fix the double registry injection when loading single player worlds. (#8234 )	2022-01-11 18:00:04 -08:00
SuperMartijn642	63a42bad98	Update tags for new 1.17 and 1.18 content (#7891 )	2022-01-10 16:15:50 -08:00
Dennis C	28d3c491a0	Fix TerrainParticle rendering black under certain conditions (#8378 )	2022-01-10 00:55:57 +00:00
cech12	551296813e	Allow modded tools to work on glow lichen (#8371 )	2022-01-09 21:23:03 +00:00
sciwhiz12	62b99be117	Fix custom climbable blocks not sending a death message (#8372 ) Fixes #8370	2022-01-09 21:18:27 +00:00
Sara Freimer	6683e9e660	Provide access to the blockstate in BucketPickup#getPickupSound for multiply-logged blocks (#8357 )	2022-01-08 21:20:09 +00:00
Sara Freimer	3b9df7df1b	Fix clients being unable to deserialize tags for custom registries (#8352 )	2022-01-08 20:47:28 +00:00
Bagel	a9a8d7ed8c	Fix particles going fullbright for a few frames when first spawning (#8291 )	2022-01-08 20:28:22 +00:00
Take Weiland	80770898c6	Also create parent directories when creating config files (#8364 )	2022-01-08 18:44:11 +00:00
JTK222	335cb5edc4	Fix crash with PermissionsAPI (#8330 ) Fixes a crash in singleplayer, when the internal server didn't shut down correctly between world loads.	2022-01-02 18:43:07 +00:00
sciwhiz12	7259887176	Re-add missing default spawn lists in features (#8285 ) Fixes #8265 Fixes #8301	2021-12-27 16:23:43 +00:00
JTK222	0320c185b5	Fixed incorrect generic in PermissionAPI (#8317 )	2021-12-22 13:22:16 +00:00
JTK222andLexManos	2f5f696b68	Redo of the whole PermissionAPI (#7780 ) Co-authored-by: LexManos <[email protected]>	2021-12-20 18:34:57 +00:00
JTK222	d33e9c8251	Fix misplaced patch in SpreadingSnowyDirtBlock. Fixes #8308.	2021-12-19 18:28:24 +00:00
Sara Freimer	21c50da8ec	Add RenderArmEvent to make overriding just the arm rendering not require copying nearly as much vanilla code (#8254 )	2021-12-13 13:58:16 -08:00
Bagel	e2a205d2e7	Add MobEffect tags (#8231 )	2021-12-13 13:32:04 -08:00
Dennis C	950e7b032a	Log missing or unsupported dependencies (#8218 )	2021-12-13 11:48:43 -08:00
sciwhiz12	d1a55a147e	Fix datagen test for sounds definitions provider (#8249 )	2021-12-13 11:32:53 -08:00
Vincent Lee	1fd8b1a4b8	Fix wrong stage being declared in transition to common (#8267 )	2021-12-13 11:14:02 -08:00
Curle	41ea5b195b	Update to 1.18.1 Co-Authored by: - Curle _ Orion	2021-12-10 20:00:29 +01:00
Marc Hermans	14e152579b	[CVE-2021-44228]: Update Log4J to fix the security issue inside it. (#8268 )	2021-12-10 01:23:30 -08:00
Jared	dcf7bb1af2	Fix KeyMappings only checking if they conflict with themselves. (#8256 )	2021-12-08 00:09:25 +00:00
Dennis C	456a48b12a	Fix ChunkWatchEvent not being fired (#8253 )	2021-12-05 19:39:59 +00:00
Jonathan Coates	aceb878a64	Call handleUpdateTag for BlockEntities again (#8237 )	2021-12-04 01:30:13 +00:00
Joseph B	f451e21f39	Fix test worldgen data (#8248 )	2021-12-03 22:10:09 +00:00
LexManos	c6ac740d31	Allow Forge Registries to return key information for overridden objects. Fixes #8230	2021-12-02 12:15:19 -08:00
Curle	dbf98d3888	Save Chunk capabilities to the chunk, rather than recursively to the capabilities.	2021-12-02 19:16:47 +00:00
gigaherz	1b7bdc3ec6	Fix LevelChunk capability attach crash. Fix client chunks not having capability providers attached. Add capability attach tests.	2021-12-02 16:24:23 +01:00
gigaherz	d414e31f08	Make HandshakeConsumer public again. Fixes #8241	2021-12-02 15:15:20 +01:00
Curle	b2036e9d23	Complete TODO in ShapedRecipe patch causing logspam related to minecraft:air	2021-12-02 00:43:25 +00:00
Curle	abe4afe152	Add missing biomes back to the BiomeDictionary	2021-12-02 00:43:00 +00:00
Curle	e7ad43c993	Readd Mixin 0.8.5 to fix modules issues.	2021-12-01 22:11:42 +00:00
Curle	7631600b53	Readd PoseStack field to RenderTooltipEvent.	2021-12-01 16:55:29 +00:00
Curle	530a1e8eb0	Fix custom loot serializers using wrong registry names	2021-12-01 01:21:21 +00:00
LexManos	54b2c18fcf	Fix DungeonHooks not returning correct values. Fixes dungeons in world spawning pigs.	2021-11-30 17:14:56 -08:00
LexManos	eb1a9b57c6	Fix dedicated server install. Closes #8226 Fix example mod Fix obf issue with records. Closes #8228 Fix dependencies beingg out of sync from vanilla. Closes #8227 Disable mixin due to module incompatibility.	2021-11-30 16:22:58 -08:00
gigaherz	5b6d54555e	Fix mod resources not loading. Add BreakingItemParticle.java.patch which I forgot to commit during the porting.	2021-11-30 21:44:35 +01:00
Curle David Quintana SizableShrimp	40a174310d	Initial port to 1.18 Co-authored-by: David Quintana <[email protected]> Co-authored-by: SizableShrimp <[email protected]>	2021-11-30 17:42:18 +00:00