1.19.2 RB 3

Co-authored-by: dhyces <[email protected]>

.github/workflows/comments.yml

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

.github/workflows/issues.yml

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

.github/workflows/pull_request_review.yml

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

.github/workflows/pull_request_review_comment.yml

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

.github/workflows/pull_request_review_comment_run.yml

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

.github/workflows/pull_request_review_run.yml

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

.github/workflows/pull_requests.yml

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

.github/workflows/push.yml

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

.github/workflows/spam-label.yml

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

.github/workflows/support.yml

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

.teamcity/settings.kts

@@ -37,7 +37,7 @@ project {
 
     params {
         text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_gradle_version", "7.4", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("git_main_branch", "1.19.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("git_branch_spec", """
                 +:refs/heads/(main*)
@@ -155,7 +155,7 @@ object PullRequestChecks : BuildType({
             enableStacktrace = true
             dockerImage = "%docker_gradle_image%"
             dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
                 -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                 --network=host
                 -u 1000:1000
@@ -189,7 +189,7 @@ object PullRequestCompatibility : BuildType({
             enableStacktrace = true
             dockerImage = "%docker_gradle_image%"
             dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle"
+                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
                 -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
                 --network=host
                 -u 1000:1000

build.gradle

@@ -1,10 +1,4 @@
 import groovy.json.JsonBuilder
-import net.minecraftforge.forge.tasks.checks.CheckATs
-import net.minecraftforge.forge.tasks.checks.CheckExcs
-import net.minecraftforge.forge.tasks.checks.CheckPatches
-import net.minecraftforge.forge.tasks.checks.CheckSAS
-import net.minecraftforge.forge.tasks.checks.CheckTask
-import net.minecraftforge.forge.tasks.checks.CheckMode
 
 import java.nio.file.Files
 import java.util.Date
@@ -42,18 +36,18 @@ ext {
         ]
     }
     MAPPING_CHANNEL = 'official'
-    MAPPING_VERSION = '1.19.4'
-    MC_VERSION = '1.19.4'
+    MAPPING_VERSION = '1.19.2'
+    MC_VERSION = '1.19.2'
     MC_NEXT_VERSION = '1.20'
-    MCP_VERSION = '20230314.122934'
+    MCP_VERSION = '20220805.130853'
     SPI_VERSION = '6.0.0'
     ACCESSTRANSFORMERS_VERSION = '8.0.4'
     COREMODS_VERSION = '5.0.1'
     EVENTBUS_VERSION = '6.0.3'
     MODLAUNCHER_VERSION = '10.0.8'
-    SECUREJARHANDLER_VERSION = '2.1.6'
+    SECUREJARHANDLER_VERSION = '2.1.4'
     BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
-    ASM_VERSION = '9.3'
+    ASM_VERSION = '9.5'
     INSTALLER_VERSION = '2.1.+'
     MIXIN_VERSION = '0.8.5'
     TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
@@ -62,17 +56,17 @@ ext {
     JETBRAINS_ANNOTATIONS_VERSION = '23.0.0'
     SLF4J_API_VERSION = '1.8.0-beta4'
     APACHE_MAVEN_ARTIFACT_VERSION = '3.8.5'
-    JARJAR_VERSION = '0.3.19'
 
     // These versions should be kept in sync with the version manifest JSON
     // To use a version newer than the version manifest JSON, the dependency must be added to the installer configuration
-    MOJANG_LOGGING_VERSION = '1.1.1'
-    LOG4J_VERSION = '2.19.0'
-    GUAVA_VERSION = '31.1-jre'
-    GSON_VERSION = '2.10'
+    MOJANG_LOGGING_VERSION = '1.0.0'
+    LOG4J_VERSION = '2.17.0'
+    GUAVA_VERSION = '31.0.1-jre'
+    GSON_VERSION = '2.8.9'
     APACHE_COMMONS_LANG3_VERSION = '3.12.0'
     JOPT_SIMPLE_VERSION = '5.0.4'
     COMMONS_IO_VERSION = '2.11.0'
+    JARJAR_VERSION = '0.3.16'
 
     GIT_INFO = gradleutils.gitInfo
     VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
@@ -1174,45 +1168,34 @@ project(':forge') {
         }
     }
 
-    tasks.register('checkAll') {
-        dependsOn 'checkLicenses'
-        group = 'checks'
-    }
-    tasks.register('checkAllAndFix') {
-        dependsOn 'findFieldInstanceChecks', 'checkLicenses'
-        group = 'checks'
-    }
-
-    CheckTask.registerTask(tasks, 'ATs', CheckATs) {
-        dependsOn extractInheritance, createSrg2Mcp
-        ats.from patcher.accessTransformers
+    task checkATs(type: CheckATs, dependsOn: [extractInheritance, createSrg2Mcp]) {
         inheritance = extractInheritance.output
+        ats.from patcher.accessTransformers
         mappings = createSrg2Mcp.output
     }
 
-    CheckTask.registerTask(tasks, 'SAS', CheckSAS) {
-        dependsOn extractInheritance
-        sass.from patcher.sideAnnotationStrippers
+    task checkSAS(type: CheckSAS, dependsOn: extractInheritance) {
         inheritance = extractInheritance.output
+        sass.from patcher.sideAnnotationStrippers
     }
 
-    CheckTask.registerTask(tasks, 'Excs', CheckExcs) {
-        dependsOn jar
+    task checkExcs(type: CheckExcs, dependsOn: jar) {
         binary = jar.archiveFile.get().asFile
         excs.from patcher.excs
     }
 
-    CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
-        dependsOn genPatches
+    task checkPatchesAndFix(type: CheckPatches, dependsOn: genPatches) {
         patchDir = file("$rootDir/patches")
-        patchesWithS2SArtifact = [
-                'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
-                'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch',
-        ]
+        autoFix = true
+    }
+
+    task checkPatches(type: CheckPatches, dependsOn: genPatches) {
+        patchDir = file("$rootDir/patches")
+        autoFix = false
     }
 
     genPatches {
-        finalizedBy checkAndFixPatches
+        finalizedBy checkPatches
         autoHeader true
         lineEnding = '\n'
     }
@@ -1268,6 +1251,8 @@ project(':forge') {
         commonLibraries.from(project.configurations.moduleonly)
     }
 
+    task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks, checkPatches, checkLicenses]){}
+
     task launcherJson(type: LauncherJson) {
         packedDependencies = [':fmlloader:jar']
         doFirst {

buildSrc/build.gradle

@@ -4,9 +4,8 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.ow2.asm:asm:9.3'
-	implementation 'org.ow2.asm:asm-tree:9.3'
-    implementation 'net.minecraftforge:srgutils:0.4.+'
+    implementation 'org.ow2.asm:asm:9.5'
+    implementation 'org.ow2.asm:asm-tree:9.5'
+    implementation 'net.minecraftforge:srgutils:0.5.+'
     implementation 'commons-io:commons-io:2.8.0'
-    implementation 'com.google.code.gson:gson:2.10'
 }

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

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

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

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

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

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

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

@@ -0,0 +1,107 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.TaskAction
+
+abstract class CheckSAS extends DefaultTask {
+	@InputFile abstract RegularFileProperty getInheritance()
+	@InputFiles abstract ConfigurableFileCollection getSass()
+	
+    @TaskAction
+    protected void exec() {
+		Util.init()
+		def json = inheritance.get().asFile.json()
+		
+		sass.each { f -> 
+			def lines = []
+			f.eachLine { line ->
+				if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
+				def idx = line.indexOf('#')
+				if (idx == 0 || line.isEmpty()) {
+					lines.add(line)
+					return
+				}
+				def comment = idx == -1 ? null : line.substring(idx)
+				if (idx != -1) line = line.substring(0, idx - 1)
+				def (cls, name, desc) = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
+				cls = cls.replaceAll('\\.', '/')
+
+				if (json[cls] == null) {
+					println('Invalid: ' + line)
+				} else if (name.isEmpty()) { //Class SAS
+                    def toAdd = []
+                    def clsSided = isSided(json[cls])
+                    def sided = clsSided
+                    
+                    /* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null) {
+						for (entry in json[cls]['fields']) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key)
+                            }
+						}
+                    }
+                    */
+					if (json[cls]['methods'] != null) {
+                        for (entry in json[cls]['methods']) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
+                                findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
+                                findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
+                            } else if (clsSided) {
+                                findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
+                                findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
+                            }
+						}
+                    }
+                    
+                    if (sided) {
+                        lines.add(cls + (comment == null ? '' : ' ' + comment))
+                        lines.addAll(toAdd.sort())
+                    } else
+                        println('Invalid: ' + line)
+                    
+                } else if (desc.isEmpty()) { // Fields
+                    /* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
+                        lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
+                    else
+                    */
+                        println('Invalid: ' + line)
+                } else { // Methods
+                    if (json[cls]['methods'] == null || !isSided(json[cls]['methods'][name + ' ' + desc]))
+                        println('Invalid: ' + line)
+                    else {
+                        lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
+                        findChildMethods(json, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
+                        findChildMethods(json, cls, name + ' ' + desc).each { lines.add('\t' + it) }
+                    }
+                }
+			}
+			f.text = lines.join('\n')
+		}
+	}
+
+    protected static isSided(json) {
+        if (json == null || json['annotations'] == null)
+            return false
+        for (ann in json['annotations']) {
+            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;'.equals(ann.desc))
+                return true
+        }
+        return false
+    }
+    
+	protected static findChildMethods(json, cls, desc)
+	{
+		return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
+				.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

docs/README.md

@@ -2,16 +2,17 @@
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19.3-&query=$.promos["1.19.3-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.3-&query=$.promos["1.19.3-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19-&query=$.promos["1.19.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.2-&query=$.promos["1.19.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
 )](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)](https://discord.gg/UvedJ9m) [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos)
 
 Forge is a free, open-source modding API all of your favourite mods use!
 
 | Version |    Support    |
 |---------| ------------- |
-| 1.19.x  |    Active     |
-| 1.18.x  |    LTS        |
+| 1.20.x  |    Active     |
+| 1.19.4  |    Legacy     |
+| 1.19.2  |    Legacy     |
 
 * [Download]
 * [Forum]

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

@@ -22,7 +22,13 @@ import net.minecraftforge.forgespi.locating.IModFile;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;
@@ -250,22 +256,10 @@ public class ModLoader
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
         if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
-
             LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
                     modFile.getFilePath(),
-                    containers.size(), containerIds,
-                    modInfoMap.size(), modIds);
-
-            var missingClasses = new ArrayList<>(modIds);
-            missingClasses.removeAll(containerIds);
-            LOGGER.fatal(LOADING, "The following classes are missing, but are reported in the mods.toml: {}", missingClasses);
-
-            var missingMods = new ArrayList<>(containerIds);
-            missingMods.removeAll(modIds);
-            LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
-
+                    containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList()),
+                    modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList()));
             loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
         }
         // remove errored mod containers
@@ -311,14 +305,6 @@ public class ModLoader
         }
         ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
     }
-    public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return e;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-        return e;
-    }
     public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());

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

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

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

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

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

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

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

@@ -31,6 +31,7 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
         // The extra jar is on the classpath, so try and pull it out of the legacy classpath
         var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find client-extra").split(File.pathSeparator);
         var extra = findJarOnClasspath(legacyCP, "client-extra");
+        mcstream.add(extra);
 
         // The MC code/Patcher edits are in exploded directories
         final var modstream = Stream.<List<Path>>builder();
@@ -41,7 +42,6 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
         minecraft.stream().distinct().forEach(mcstream::add);
         mods.values().forEach(modstream::add);
 
-        mcstream.add(extra);
         var mcFilter = getMcFilter(extra, minecraft, modstream);
         return new LocatedPaths(mcstream.build().toList(), mcFilter, modstream.build().toList(), getFmlStuff(legacyCP));
     }

fmlloader/src/main/java/net/minecraftforge/fml/loading/toposort/CyclePresentException.java

@@ -19,7 +19,6 @@ public final class CyclePresentException extends IllegalArgumentException {
      * @param cycles the cycles present
      */
     CyclePresentException(Set<Set<?>> cycles) {
-        super("Cycles present in graph: " + cycles);
         this.cycles = cycles;
     }
 

fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyBindings.java

@@ -42,6 +42,6 @@ public class FMLOnlyBindings implements IBindingsProvider {
 
     @Override
     public Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return ()->new IConfigEvent.ConfigConfig(ModConfigEvent.Loading::new, ModConfigEvent.Reloading::new, ModConfigEvent.Unloading::new);
+        return ()->new IConfigEvent.ConfigConfig(ModConfigEvent.Loading::new, ModConfigEvent.Reloading::new);
     }
 }

mdk/build.gradle

@@ -22,7 +22,7 @@ minecraft {
     // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
     //
     // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
-    // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
+    // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
@@ -132,6 +132,8 @@ dependencies {
     minecraft '@FORGE_GROUP@:@FORGE_NAME@:@FORGE_VERSION@'
 
     // Real mod deobf dependency examples - these get remapped to your current mappings
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
+    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
     // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
 
     // Examples using mod jars from ./libs

mdk/src/main/java/com/example/examplemod/ExampleMod.java

@@ -3,7 +3,7 @@ package com.example.examplemod;
 import com.mojang.logging.LogUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -11,13 +11,15 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.Material;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.CreativeModeTabEvent;
-import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -40,7 +42,7 @@ public class ExampleMod
     // Creates a new Block with the id "examplemod:example_block", combining the namespace and path
     public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
     // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
-    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties()));
+    public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
 
     public ExampleMod()
     {
@@ -56,9 +58,6 @@ public class ExampleMod
 
         // Register ourselves for server and other game events we are interested in
         MinecraftForge.EVENT_BUS.register(this);
-
-        // Register the item to a creative tab
-        modEventBus.addListener(this::addCreative);
     }
 
     private void commonSetup(final FMLCommonSetupEvent event)
@@ -68,12 +67,6 @@ public class ExampleMod
         LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
     }
 
-    private void addCreative(CreativeModeTabEvent.BuildContents event)
-    {
-        if (event.getTab() == CreativeModeTabs.BUILDING_BLOCKS)
-            event.accept(EXAMPLE_BLOCK_ITEM);
-    }
-
     // You can use SubscribeEvent and let the Event Bus discover methods to call
     @SubscribeEvent
     public void onServerStarting(ServerStartingEvent event)

mdk/src/main/resources/META-INF/mods.toml

@@ -22,7 +22,7 @@ modId="examplemod" #mandatory
 version="${file.jarVersion}" #mandatory
  # A display name for the mod
 displayName="Example Mod" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
+# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 # A URL for the "homepage" for this mod, displayed in the mod UI
 #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional

mdk/src/main/resources/pack.mcmeta

@@ -1,8 +1,8 @@
 {
     "pack": {
         "description": "examplemod resources",
-        "pack_format": 12,
-        "forge:resource_pack_format": 12,
+        "pack_format": 9,
+        "forge:resource_pack_format": 9,
         "forge:data_pack_format": 10
     }
 }

patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch

@@ -1,7 +1,7 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -500,9 +_,16 @@
- 
+@@ -539,9 +_,16 @@
+       f_84077_[f_84076_].f_84800_ = false;
     }
  
 +   /* Stores the last values sent into glMultiTexCoord2f */

patches/minecraft/com/mojang/blaze3d/platform/Window.java.patch

@@ -9,7 +9,7 @@
        if (monitor != null) {
           VideoMode videomode = monitor.m_84948_(this.f_85355_ ? this.f_85354_ : Optional.empty());
           this.f_85350_ = this.f_85357_ = monitor.m_84951_() + videomode.m_85332_() / 2 - this.f_85359_ / 2;
-@@ -260,6 +_,7 @@
+@@ -303,6 +_,7 @@
        GLFW.glfwGetFramebufferSize(this.f_85349_, aint, aint1);
        this.f_85361_ = aint[0] > 0 ? aint[0] : 1;
        this.f_85362_ = aint1[0] > 0 ? aint1[0] : 1;

patches/minecraft/com/mojang/blaze3d/vertex/BufferBuilder.java.patch

@@ -1,7 +1,7 @@
 --- a/com/mojang/blaze3d/vertex/BufferBuilder.java
 +++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
 @@ -486,4 +_,14 @@
-          this.f_166822_ = p_254368_;
+          this.f_166822_ = p_166829_;
        }
     }
 +

patches/minecraft/com/mojang/blaze3d/vertex/PoseStack.java.patch

@@ -1,11 +1,11 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
 @@ -11,7 +_,7 @@
- import org.joml.Quaternionf;
+ import net.minecraftforge.api.distmarker.OnlyIn;
  
  @OnlyIn(Dist.CLIENT)
 -public class PoseStack {
 +public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
     private final Deque<PoseStack.Pose> f_85834_ = Util.m_137469_(Queues.newArrayDeque(), (p_85848_) -> {
        Matrix4f matrix4f = new Matrix4f();
-       Matrix3f matrix3f = new Matrix3f();
+       matrix4f.m_27624_();

patches/minecraft/com/mojang/blaze3d/vertex/VertexConsumer.java.patch

@@ -20,7 +20,7 @@
        float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
        int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
        int[] aint1 = p_85997_.m_111303_();
-@@ -99,11 +_,13 @@
+@@ -101,12 +_,14 @@
                 f5 = afloat[k] * p_86001_;
              }
  
@@ -28,11 +28,12 @@
 +            int l = applyBakedLighting(p_86002_[k], bytebuffer);
              float f9 = bytebuffer.getFloat(16);
              float f10 = bytebuffer.getFloat(20);
-             Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
--            this.m_5954_(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
-+            applyBakedNormals(vector3f, bytebuffer, p_85996_.m_252943_());
+             Vector4f vector4f = new Vector4f(f, f1, f2, 1.0F);
+             vector4f.m_123607_(matrix4f);
+-            this.m_5954_(vector4f.m_123601_(), vector4f.m_123615_(), vector4f.m_123616_(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.m_122239_(), vector3f.m_122260_(), vector3f.m_122269_());
++            applyBakedNormals(vector3f, bytebuffer, p_85996_.m_85864_());
 +            float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
-+            this.m_5954_(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
++            this.m_5954_(vector4f.m_123601_(), vector4f.m_123615_(), vector4f.m_123616_(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.m_122239_(), vector3f.m_122260_(), vector3f.m_122269_());
           }
-       }
- 
+       } catch (Throwable throwable1) {
+          if (memorystack != null) {

patches/minecraft/com/mojang/math/Matrix3f.java.patch

@@ -0,0 +1,13 @@
+--- a/com/mojang/math/Matrix3f.java
++++ b/com/mojang/math/Matrix3f.java
+@@ -588,4 +_,10 @@
+    public Matrix3f m_8183_() {
+       return new Matrix3f(this);
+    }
++
++    public void multiplyBackward(Matrix3f other) {
++        Matrix3f copy = other.m_8183_();
++        copy.m_8178_(this);
++        this.m_8169_(copy);
++    }
+ }

patches/minecraft/com/mojang/math/Matrix4f.java.patch

@@ -0,0 +1,43 @@
+--- a/com/mojang/math/Matrix4f.java
++++ b/com/mojang/math/Matrix4f.java
+@@ -559,4 +_,40 @@
+       matrix4f.f_27614_ = p_27656_;
+       return matrix4f;
+    }
++
++    // Forge start
++    public Matrix4f(float[] values) {
++        f_27603_ = values[0];
++        f_27604_ = values[1];
++        f_27605_ = values[2];
++        f_27606_ = values[3];
++        f_27607_ = values[4];
++        f_27608_ = values[5];
++        f_27609_ = values[6];
++        f_27610_ = values[7];
++        f_27611_ = values[8];
++        f_27612_ = values[9];
++        f_27613_ = values[10];
++        f_27614_ = values[11];
++        f_27615_ = values[12];
++        f_27616_ = values[13];
++        f_27617_ = values[14];
++        f_27618_ = values[15];
++    }
++
++    public void multiplyBackward(Matrix4f other) {
++        Matrix4f copy = other.m_27658_();
++        copy.m_27644_(this);
++        this.m_162210_(copy);
++    }
++
++    public void setTranslation(float x, float y, float z) {
++        this.f_27603_ = 1.0F;
++        this.f_27608_ = 1.0F;
++        this.f_27613_ = 1.0F;
++        this.f_27618_ = 1.0F;
++        this.f_27606_ = x;
++        this.f_27610_ = y;
++        this.f_27614_ = z;
++    }
+ }

patches/minecraft/com/mojang/math/Transformation.java.patch

@@ -1,15 +1,15 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
-@@ -14,7 +_,7 @@
- import org.joml.Vector3f;
- import org.joml.Vector3fc;
+@@ -6,7 +_,7 @@
+ import net.minecraft.Util;
+ import org.apache.commons.lang3.tuple.Triple;
  
 -public final class Transformation {
 +public final class Transformation implements net.minecraftforge.client.extensions.IForgeTransformation {
     private final Matrix4f f_121078_;
-    public static final Codec<Transformation> f_268453_ = RecordCodecBuilder.create((p_269604_) -> {
-       return p_269604_.group(ExtraCodecs.f_252432_.fieldOf("translation").forGetter((p_269599_) -> {
-@@ -163,6 +_,19 @@
+    private boolean f_121079_;
+    @Nullable
+@@ -145,6 +_,19 @@
     public int hashCode() {
        return Objects.hash(this.f_121078_);
     }
@@ -22,10 +22,10 @@
 +    private void checkNormalTransform() {
 +        if (normalTransform == null) {
 +            normalTransform = new Matrix3f(f_121078_);
-+            normalTransform.invert();
-+            normalTransform.transpose();
++            normalTransform.m_8187_();
++            normalTransform.m_8155_();
 +        }
 +    }
  
     public Transformation m_175937_(Transformation p_175938_, float p_175939_) {
-       Vector3f vector3f = this.m_252829_();
+       Vector3f vector3f = this.m_175940_();

patches/minecraft/com/mojang/math/Vector3f.java.patch

@@ -0,0 +1,28 @@
+--- a/com/mojang/math/Vector3f.java
++++ b/com/mojang/math/Vector3f.java
+@@ -138,7 +_,7 @@
+ 
+    public boolean m_122278_() {
+       float f = this.f_122228_ * this.f_122228_ + this.f_122229_ * this.f_122229_ + this.f_122230_ * this.f_122230_;
+-      if ((double)f < 1.0E-5D) {
++      if (f < Float.MIN_NORMAL) { //Forge: Fix MC-239212
+          return false;
+       } else {
+          float f1 = Mth.m_14195_(f);
+@@ -207,4 +_,16 @@
+    public String toString() {
+       return "[" + this.f_122228_ + ", " + this.f_122229_ + ", " + this.f_122230_ + "]";
+    }
++
++    public Vector3f(float[] values) {
++        set(values);
++    }
++    public void set(float[] values) {
++        this.f_122228_ = values[0];
++        this.f_122229_ = values[1];
++        this.f_122230_ = values[2];
++    }
++    public void setX(float x) { this.f_122228_ = x; }
++    public void setY(float y) { this.f_122229_ = y; }
++    public void setZ(float z) { this.f_122230_ = z; }
+ }

patches/minecraft/com/mojang/math/Vector4f.java.patch

@@ -0,0 +1,18 @@
+--- a/com/mojang/math/Vector4f.java
++++ b/com/mojang/math/Vector4f.java
+@@ -147,4 +_,15 @@
+    public String toString() {
+       return "[" + this.f_123589_ + ", " + this.f_123590_ + ", " + this.f_123591_ + ", " + this.f_123592_ + "]";
+    }
++
++    public void set(float[] values) {
++        this.f_123589_ = values[0];
++        this.f_123590_ = values[1];
++        this.f_123591_ = values[2];
++        this.f_123592_ = values[3];
++    }
++    public void setX(float x) { this.f_123589_ = x; }
++    public void setY(float y) { this.f_123590_ = y; }
++    public void setZ(float z) { this.f_123591_ = z; }
++    public void setW(float w) { this.f_123592_ = w; }
+ }

patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch

@@ -13,6 +13,6 @@
 +       return super.m_7933_(key, scanCode, modifiers);
 +    }
 +
-    public void m_86412_(PoseStack p_88679_, int p_88680_, int p_88681_, float p_88682_) {
+    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_200947_.getFirst(), this.f_96543_ / 2, 80, 16777215);

patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java.patch

@@ -1,15 +0,0 @@
---- a/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java
-+++ b/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java
-@@ -47,9 +_,9 @@
-       }
-    };
-    private final RealmsNotificationsScreen.DataFetcherConfiguration f_273849_ = new RealmsNotificationsScreen.DataFetcherConfiguration() {
--      public DataFetcher.Subscription m_274316_(RealmsDataFetcher p_275731_) {
--         DataFetcher.Subscription datafetcher$subscription = p_275731_.f_238549_.m_239139_();
--         RealmsNotificationsScreen.this.m_274585_(p_275731_, datafetcher$subscription);
-+      public DataFetcher.Subscription m_274316_(RealmsDataFetcher p_275318_) {
-+         DataFetcher.Subscription datafetcher$subscription = p_275318_.f_238549_.m_239139_();
-+         RealmsNotificationsScreen.this.m_274585_(p_275318_, datafetcher$subscription);
-          return datafetcher$subscription;
-       }
- 

patches/minecraft/net/minecraft/SharedConstants.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -205,6 +_,7 @@
+@@ -211,6 +_,7 @@
     }
  
     static {

patches/minecraft/net/minecraft/Util.java.patch

@@ -9,15 +9,25 @@
 +   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT1 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
 +   @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT2 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
 +
-    public static ExecutorService m_183991_() {
-       return f_137444_;
+    public static ExecutorService m_183988_() {
+       return f_137443_;
     }
-@@ -238,7 +_,7 @@
+@@ -248,7 +_,7 @@
        try {
-          type = DataFixers.m_14512_().getSchema(DataFixUtils.makeKey(SharedConstants.m_183709_().m_183476_().m_193006_())).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_);
           if (SharedConstants.f_136183_) {
              throw illegalargumentexception;
           }
+@@ -692,7 +_,8 @@
+ 
+    public static <T, R> Function<T, R> m_143827_(final Function<T, R> p_143828_) {
+       return new Function<T, R>() {
+-         private final Map<T, R> f_211548_ = Maps.newHashMap();
++         // FORGE: Allow using memoized functions from multiple threads.
++         private final Map<T, R> f_211548_ = Maps.newConcurrentMap();
+ 
+          public R apply(T p_214691_) {
+             return this.f_211548_.computeIfAbsent(p_214691_, p_143828_);

patches/minecraft/net/minecraft/advancements/Advancement.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -144,7 +_,7 @@
+@@ -127,7 +_,7 @@
        return this.f_138305_;
     }
  
@@ -9,7 +9,7 @@
        @Nullable
        private ResourceLocation f_138332_;
        @Nullable
-@@ -325,7 +_,14 @@
+@@ -308,7 +_,14 @@
           return "Task Advancement{parentId=" + this.f_138332_ + ", display=" + this.f_138334_ + ", rewards=" + this.f_138335_ + ", criteria=" + this.f_138336_ + ", requirements=" + Arrays.deepToString(this.f_138337_) + "}";
        }
  

patches/minecraft/net/minecraft/advancements/critereon/ItemPredicate.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/critereon/ItemPredicate.java
 +++ b/net/minecraft/advancements/critereon/ItemPredicate.java
-@@ -29,6 +_,8 @@
+@@ -28,6 +_,8 @@
  import net.minecraft.world.level.ItemLike;
  
  public class ItemPredicate {
@@ -9,7 +9,7 @@
     public static final ItemPredicate f_45028_ = new ItemPredicate();
     @Nullable
     private final TagKey<Item> f_45029_;
-@@ -81,7 +_,7 @@
+@@ -80,7 +_,7 @@
           return false;
        } else {
           if (this.f_45033_.length > 0) {
@@ -18,7 +18,7 @@
  
              for(EnchantmentPredicate enchantmentpredicate : this.f_45033_) {
                 if (!enchantmentpredicate.m_30476_(map)) {
-@@ -108,6 +_,11 @@
+@@ -107,6 +_,11 @@
     public static ItemPredicate m_45051_(@Nullable JsonElement p_45052_) {
        if (p_45052_ != null && !p_45052_.isJsonNull()) {
           JsonObject jsonobject = GsonHelper.m_13918_(p_45052_, "item");
@@ -30,7 +30,7 @@
           MinMaxBounds.Ints minmaxbounds$ints = MinMaxBounds.Ints.m_55373_(jsonobject.get("count"));
           MinMaxBounds.Ints minmaxbounds$ints1 = MinMaxBounds.Ints.m_55373_(jsonobject.get("durability"));
           if (jsonobject.has("data")) {
-@@ -215,6 +_,14 @@
+@@ -214,6 +_,14 @@
        } else {
           return new ItemPredicate[0];
        }

patches/minecraft/net/minecraft/client/Camera.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -206,6 +_,18 @@
+@@ -211,6 +_,18 @@
        this.f_90549_ = false;
     }
  

patches/minecraft/net/minecraft/client/ClientRecipeBook.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/ClientRecipeBook.java
 +++ b/net/minecraft/client/ClientRecipeBook.java
-@@ -54,7 +_,7 @@
+@@ -51,7 +_,7 @@
        for(Recipe<?> recipe : p_90643_) {
           if (!recipe.m_5598_() && !recipe.m_142505_()) {
              RecipeBookCategories recipebookcategories = m_90646_(recipe);
@@ -9,12 +9,12 @@
              if (s.isEmpty()) {
                 map.computeIfAbsent(recipebookcategories, (p_90645_) -> {
                    return Lists.newArrayList();
-@@ -141,6 +_,8 @@
-          } else if (recipetype == RecipeType.f_44113_) {
-             return RecipeBookCategories.SMITHING;
-          } else {
-+            RecipeBookCategories categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType) recipetype, p_90647_);
-+            if (categories != null) return categories;
-             f_90618_.warn("Unknown recipe category: {}/{}", LogUtils.defer(() -> {
-                return BuiltInRegistries.f_256990_.m_7981_(p_90647_.m_6671_());
-             }), LogUtils.defer(p_90647_::m_6423_));
+@@ -103,6 +_,8 @@
+       } else if (recipetype == RecipeType.f_44113_) {
+          return RecipeBookCategories.SMITHING;
+       } else {
++         RecipeBookCategories categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType) recipetype, p_90647_);
++         if (categories != null) return categories;
+          f_90618_.warn("Unknown recipe category: {}/{}", LogUtils.defer(() -> {
+             return Registry.f_122864_.m_7981_(p_90647_.m_6671_());
+          }), LogUtils.defer(p_90647_::m_6423_));

patches/minecraft/net/minecraft/client/KeyboardHandler.java.patch

@@ -1,9 +1,9 @@
 --- a/net/minecraft/client/KeyboardHandler.java
 +++ b/net/minecraft/client/KeyboardHandler.java
-@@ -328,7 +_,9 @@
-             }
+@@ -299,7 +_,9 @@
           }
  
+          Screen screen = this.f_90867_.f_91080_;
 -         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 KeyBindsScreen) || ((KeyBindsScreen)screen).f_193976_ <= Util.m_137550_() - 20L)) {
@@ -11,7 +11,7 @@
              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_.m_231829_().m_231514_(this.f_90867_.m_91268_().m_85440_());
-@@ -346,6 +_,8 @@
+@@ -317,6 +_,8 @@
                 });
                 return;
              }
@@ -20,9 +20,9 @@
           }
  
           if (this.f_90867_.m_240477_().m_93316_()) {
-@@ -368,11 +_,15 @@
+@@ -339,11 +_,15 @@
              Screen.m_96579_(() -> {
-                if (p_90897_ != 1 && p_90897_ != 2) {
+                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.onScreenKeyReleasedPre(screen, p_90895_, p_90896_, p_90898_);
@@ -38,7 +38,7 @@
                 }
  
              }, "keyPressed event handler", screen.getClass().getCanonicalName());
-@@ -425,22 +_,26 @@
+@@ -396,22 +_,26 @@
                 }
              }
           }

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -247,7 +_,7 @@
+@@ -244,7 +_,7 @@
  import org.slf4j.Logger;
  
  @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,16 @@
     static Minecraft f_90981_;
     private static final Logger f_90982_ = LogUtils.getLogger();
     public static final boolean f_91002_ = Util.m_137581_() == Util.OS.OSX;
-@@ -412,7 +_,6 @@
+@@ -398,7 +_,7 @@
+       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_());
+-      this.f_91038_ = new PackRepository(Minecraft::m_167933_, this.f_91037_, new FolderRepositorySource(this.f_90985_, PackSource.f_10527_));
++      this.f_91038_ = new PackRepository(Minecraft::createClientPackAdapter, this.f_91037_, new FolderRepositorySource(this.f_90985_, PackSource.f_10527_));
+       this.f_91030_ = p_91084_.f_101905_.f_101945_;
+       this.f_231338_ = new YggdrasilAuthenticationService(this.f_91030_);
+       this.f_91048_ = this.f_231338_.createMinecraftSessionService();
+@@ -406,7 +_,6 @@
        this.f_231339_ = SignatureValidator.m_216358_(this.f_231338_.getServicesKey());
        this.f_90998_ = p_91084_.f_101905_.f_101942_;
        f_90982_.info("Setting user: {}", (Object)this.f_90998_.m_92546_());
@@ -17,7 +26,7 @@
        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_;
-@@ -462,7 +_,7 @@
+@@ -458,7 +_,7 @@
  
        this.f_90990_.m_85380_(this.f_91066_.m_232035_().m_231551_());
        this.f_91067_ = new MouseHandler(this);
@@ -26,30 +35,28 @@
        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);
-@@ -470,6 +_,7 @@
+@@ -466,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 ReloadableResourceManager(PackType.CLIENT_RESOURCES);
-+      net.minecraftforge.client.loading.ClientModLoader.begin(this, this.f_91038_, this.f_91036_);
++      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_);
-@@ -514,10 +_,13 @@
+@@ -510,10 +_,12 @@
        this.f_91063_ = new GameRenderer(this, this.f_90994_.m_234586_(), this.f_91036_, this.f_90993_);
-       this.f_91036_.m_7217_(this.f_91063_.m_247116_());
+       this.f_91036_.m_7217_(this.f_91063_);
        this.f_91060_ = new LevelRenderer(this, this.f_90994_, this.f_167845_, this.f_90993_);
 +      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RenderLevelStageEvent.RegisterStageEvent());
        this.f_91036_.m_7217_(this.f_91060_);
--      this.m_91271_();
-+      // Forge: We delay this to allow registration of modded creative mode tabs
-+      // this.createSearchTrees();
+       this.m_91271_();
        this.f_91036_.m_7217_(this.f_90997_);
        this.f_91061_ = new ParticleEngine(this.f_91073_, this.f_90987_);
 +      net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(f_91061_);
        this.f_91036_.m_7217_(this.f_91061_);
        this.f_91053_ = new PaintingTextureManager(this.f_90987_);
        this.f_91036_.m_7217_(this.f_91053_);
-@@ -526,7 +_,9 @@
+@@ -522,7 +_,9 @@
        this.f_91047_ = new GpuWarnlistManager();
        this.f_91036_.m_7217_(this.f_91047_);
        this.f_91036_.m_7217_(this.f_205120_);
@@ -60,7 +67,7 @@
        this.f_91064_ = new DebugRenderer(this);
        this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this));
        RenderSystem.m_69900_(this::m_91113_);
-@@ -545,6 +_,21 @@
+@@ -541,6 +_,21 @@
           TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
        }
  
@@ -82,15 +89,14 @@
        this.f_90990_.m_85409_(this.f_91066_.m_231817_().m_231551_());
        this.f_90990_.m_85424_(this.f_91066_.m_232123_().m_231551_());
        this.f_90990_.m_85426_();
-@@ -568,26 +_,24 @@
+@@ -563,23 +_,23 @@
              }
  
              this.f_167847_.m_168556_();
 +            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.
 +            if (s != null) {
-+               ServerAddress serveraddress = new ServerAddress(s, i);
-+               ConnectScreen.m_169267_(new TitleScreen(), this, serveraddress, new ServerData(I18n.m_118938_("selectServer.defaultName"), serveraddress.toString(), false));
++               ConnectScreen.m_169267_(new TitleScreen(), this, new ServerAddress(s, i), (ServerData)null);
 +            } else if (this.m_239929_()) {
 +               this.m_91152_(BanNoticeScreen.m_239967_((p_238185_) -> {
 +                  if (p_238185_) {
@@ -105,9 +111,8 @@
           });
        }, false));
 -      if (s != null) {
--         ServerAddress serveraddress = new ServerAddress(s, i);
 -         reloadinstance.m_7237_().thenRunAsync(() -> {
--            ConnectScreen.m_169267_(new TitleScreen(), this, serveraddress, new ServerData(I18n.m_118938_("selectServer.defaultName"), serveraddress.toString(), false));
+-            ConnectScreen.m_169267_(new TitleScreen(), this, new ServerAddress(s, i), (ServerData)null);
 -         }, this);
 -      } else if (this.m_239929_()) {
 -         this.m_91152_(BanNoticeScreen.m_239967_((p_238185_) -> {
@@ -117,15 +122,13 @@
 -
 -            this.m_91152_(new TitleScreen(true));
 -         }, this.m_239210_()));
--      } else if (this.f_91066_.f_263744_) {
--         this.m_91152_(new AccessibilityOnboardingScreen(this.f_91066_));
 -      } else {
 -         this.m_91152_(new TitleScreen(true));
 -      }
  
     }
  
-@@ -639,6 +_,8 @@
+@@ -622,6 +_,8 @@
  
     private UserApiService m_193585_(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
        try {
@@ -134,7 +137,7 @@
           return p_193586_.createUserApiService(p_193587_.f_101905_.f_101942_.m_92547_());
        } catch (AuthenticationException authenticationexception) {
           f_90982_.error("Failed to verify authentication", (Throwable)authenticationexception);
-@@ -651,7 +_,7 @@
+@@ -634,7 +_,7 @@
     }
  
     private void m_91239_(Throwable p_91240_) {
@@ -143,45 +146,7 @@
           this.m_91241_(p_91240_, (Component)null);
        } else {
           Util.m_137559_(p_91240_);
-@@ -743,7 +_,10 @@
-    }
- 
-    public void m_91271_() {
--      this.f_90997_.m_235232_(SearchRegistry.f_119941_, (p_231451_) -> {
-+      var nameSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getNameSearchKeys();
-+      var tagSearchKeys = net.minecraftforge.client.CreativeModeTabSearchRegistry.getTagSearchKeys();
-+      for (var nameSearchKey : nameSearchKeys.values())
-+      this.f_90997_.m_235232_(nameSearchKey, (p_231451_) -> {
-          return new FullTextSearchTree<>((p_210797_) -> {
-             return p_210797_.m_41651_((Player)null, TooltipFlag.Default.f_256752_.m_257777_()).stream().map((p_210807_) -> {
-                return ChatFormatting.m_126649_(p_210807_.getString()).trim();
-@@ -754,7 +_,8 @@
-             return Stream.of(BuiltInRegistries.f_257033_.m_7981_(p_91317_.m_41720_()));
-          }, p_231451_);
-       });
--      this.f_90997_.m_235232_(SearchRegistry.f_119942_, (p_231430_) -> {
-+      for (var tagSearchKey : tagSearchKeys.values())
-+      this.f_90997_.m_235232_(tagSearchKey, (p_231430_) -> {
-          return new IdSearchTree<>((p_231353_) -> {
-             return p_231353_.m_204131_().map(TagKey::f_203868_);
-          }, p_231430_);
-@@ -774,9 +_,12 @@
-             });
-          }, p_231389_);
-       });
--      CreativeModeTabs.m_258007_().m_257882_((p_255439_) -> {
--         this.m_231374_(SearchRegistry.f_119941_, p_255439_);
--         this.m_231374_(SearchRegistry.f_119942_, p_255439_);
-+      nameSearchKeys.forEach((tab, nameSearchKey) -> {
-+         var tagSearchKey = tagSearchKeys.get(tab);
-+         tab.m_257882_(contents -> {
-+            this.m_231374_(nameSearchKey, contents);
-+            this.m_231374_(tagSearchKey, contents);
-+         });
-       });
-    }
- 
-@@ -828,13 +_,13 @@
+@@ -792,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_());
@@ -198,7 +163,7 @@
        }
  
     }
-@@ -959,10 +_,6 @@
+@@ -922,10 +_,6 @@
           f_90982_.error("setScreen called from non-game thread");
        }
  
@@ -209,7 +174,7 @@
        if (p_91153_ == null && this.f_91073_ == null) {
           p_91153_ = new TitleScreen();
        } else if (p_91153_ == null && this.f_91074_.m_21224_()) {
-@@ -973,6 +_,19 @@
+@@ -936,6 +_,19 @@
           }
        }
  
@@ -227,9 +192,9 @@
 +      }
 +
        this.f_91080_ = p_91153_;
-       if (this.f_91080_ != null) {
-          this.f_91080_.m_274333_();
-@@ -1118,9 +_,12 @@
+       BufferUploader.m_166835_();
+       if (p_91153_ != null) {
+@@ -1079,11 +_,14 @@
        RenderSystem.m_69481_();
        this.f_91026_.m_7238_();
        if (!this.f_91079_) {
@@ -237,12 +202,14 @@
 +         net.minecraftforge.event.ForgeEventFactory.onRenderTickStart(this.realPartialTick);
           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.event.ForgeEventFactory.onRenderTickEnd(this.realPartialTick);
        }
  
        if (this.f_91056_ != null) {
-@@ -1243,10 +_,12 @@
+@@ -1210,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_());
@@ -255,7 +222,7 @@
        this.f_91063_.m_109097_(this.f_90990_.m_85441_(), this.f_90990_.m_85442_());
        this.f_91067_.m_91599_();
     }
-@@ -1520,6 +_,7 @@
+@@ -1491,6 +_,7 @@
     }
  
     public void m_91395_() {
@@ -263,7 +230,7 @@
        this.f_91019_ = false;
     }
  
-@@ -1549,10 +_,18 @@
+@@ -1520,10 +_,18 @@
           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_();
@@ -285,41 +252,41 @@
                    this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
                 }
              }
-@@ -1581,14 +_,20 @@
-             return false;
-          } else {
-             boolean flag = false;
--            switch (this.f_91077_.m_6662_()) {
-+            var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.f_91066_.f_92096_, InteractionHand.MAIN_HAND);
-+            HitResult.Type hitType = this.f_91077_.m_6662_();
-+            if (this.f_91077_ instanceof EntityHitResult entityHit) { // Forge: Perform attack range checks here, instead of in GameRenderer#pick, so extended-reach interactions work.
-+               if (!f_91074_.canHit(entityHit.m_82443_(), 0)) hitType = HitResult.Type.MISS; // No padding in client code.
-+            }
-+            if (!inputEvent.isCanceled())
-+            switch(hitType) {
-                case ENTITY:
-                   this.f_91072_.m_105223_(this.f_91074_, ((EntityHitResult)this.f_91077_).m_82443_());
-                   break;
-                case BLOCK:
-                   BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
-                   BlockPos blockpos = blockhitresult.m_82425_();
--                  if (!this.f_91073_.m_8055_(blockpos).m_60795_()) {
-+                  if (!this.f_91073_.m_46859_(blockpos)) {
-                      this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
-                      if (this.f_91073_.m_8055_(blockpos).m_60795_()) {
-                         flag = true;
-@@ -1601,8 +_,10 @@
-                   }
+@@ -1548,14 +_,20 @@
+          return false;
+       } else {
+          boolean flag = false;
+-         switch (this.f_91077_.m_6662_()) {
++         var inputEvent = net.minecraftforge.client.ForgeHooksClient.onClickInput(0, this.f_91066_.f_92096_, InteractionHand.MAIN_HAND);
++         HitResult.Type hitType = this.f_91077_.m_6662_();
++         if(this.f_91077_ instanceof EntityHitResult entityHit) { // Forge: Perform attack range checks here, instead of in GameRenderer#pick, so extended-reach interactions work.
++             if(!f_91074_.canHit(entityHit.m_82443_(), 0)) hitType = HitResult.Type.MISS; // No padding in client code.
++         }
++         if (!inputEvent.isCanceled())
++         switch(hitType) {
+             case ENTITY:
+                this.f_91072_.m_105223_(this.f_91074_, ((EntityHitResult)this.f_91077_).m_82443_());
+                break;
+             case BLOCK:
+                BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
+                BlockPos blockpos = blockhitresult.m_82425_();
+-               if (!this.f_91073_.m_8055_(blockpos).m_60795_()) {
++               if (!this.f_91073_.m_46859_(blockpos)) {
+                   this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
+                   if (this.f_91073_.m_8055_(blockpos).m_60795_()) {
+                      flag = true;
+@@ -1568,8 +_,10 @@
+                }
  
-                   this.f_91074_.m_36334_();
-+                  net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
-             }
- 
-+            if (inputEvent.shouldSwingHand())
-             this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
-             return flag;
+                this.f_91074_.m_36334_();
++               net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
           }
-@@ -1618,6 +_,11 @@
+ 
++         if (inputEvent.shouldSwingHand())
+          this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
+          return flag;
+       }
+@@ -1584,6 +_,11 @@
              }
  
              for(InteractionHand interactionhand : InteractionHand.values()) {
@@ -329,9 +296,9 @@
 +                  return;
 +               }
                 ItemStack itemstack = this.f_91074_.m_21120_(interactionhand);
-                if (!itemstack.m_246617_(this.f_91073_.m_246046_())) {
-                   return;
-@@ -1632,13 +_,14 @@
+                if (this.f_91077_ != null) {
+                   switch (this.f_91077_.m_6662_()) {
+@@ -1594,13 +_,14 @@
                             return;
                          }
  
@@ -347,7 +314,7 @@
                                this.f_91074_.m_6674_(interactionhand);
                             }
  
-@@ -1650,7 +_,7 @@
+@@ -1612,7 +_,7 @@
                          int i = itemstack.m_41613_();
                          InteractionResult interactionresult1 = this.f_91072_.m_233732_(this.f_91074_, interactionhand, blockhitresult);
                          if (interactionresult1.m_19077_()) {
@@ -356,7 +323,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);
-@@ -1666,6 +_,9 @@
+@@ -1628,6 +_,9 @@
                    }
                 }
  
@@ -366,7 +333,7 @@
                 if (!itemstack.m_41619_()) {
                    InteractionResult interactionresult2 = this.f_91072_.m_233721_(this.f_91074_, interactionhand);
                    if (interactionresult2.m_19077_()) {
-@@ -1692,6 +_,8 @@
+@@ -1654,6 +_,8 @@
           --this.f_91011_;
        }
  
@@ -375,7 +342,7 @@
        this.f_91026_.m_6180_("gui");
        this.f_240378_.m_240688_();
        this.f_91065_.m_193832_(this.f_91012_);
-@@ -1787,6 +_,7 @@
+@@ -1749,6 +_,7 @@
  
              this.f_91005_.m_120596_();
  
@@ -383,7 +350,7 @@
              try {
                 this.f_91073_.m_104726_(() -> {
                    return true;
-@@ -1802,6 +_,7 @@
+@@ -1764,6 +_,7 @@
  
                 throw new ReportedException(crashreport);
              }
@@ -391,7 +358,7 @@
           }
  
           this.f_91026_.m_6182_("animateTick");
-@@ -1821,6 +_,8 @@
+@@ -1783,6 +_,8 @@
        this.f_91026_.m_6182_("keyboard");
        this.f_91068_.m_90931_();
        this.f_91026_.m_7238_();
@@ -400,7 +367,7 @@
     }
  
     private boolean m_91278_() {
-@@ -2017,6 +_,7 @@
+@@ -1978,6 +_,7 @@
     }
  
     public void m_91156_(ClientLevel p_91157_) {
@@ -408,7 +375,7 @@
        ProgressScreen progressscreen = new ProgressScreen(true);
        progressscreen.m_6309_(Component.m_237115_("connect.joining"));
        this.m_91362_(progressscreen);
-@@ -2050,10 +_,12 @@
+@@ -2011,10 +_,12 @@
        IntegratedServer integratedserver = this.f_91007_;
        this.f_91007_ = null;
        this.f_91063_.m_109150_();
@@ -421,15 +388,15 @@
           if (integratedserver != null) {
              this.f_91026_.m_6180_("waitForServer");
  
-@@ -2067,6 +_,7 @@
-          this.f_243981_.m_246151_();
+@@ -2029,6 +_,7 @@
           this.f_91065_.m_93089_();
+          this.f_91008_ = null;
           this.f_91010_ = false;
 +         net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(f_91073_);
+          this.f_91004_.m_90740_();
        }
  
-       this.f_91073_ = null;
-@@ -2173,6 +_,7 @@
+@@ -2124,6 +_,7 @@
  
     private void m_91280_() {
        if (this.f_91077_ != null && this.f_91077_.m_6662_() != HitResult.Type.MISS) {
@@ -437,7 +404,7 @@
           boolean flag = this.f_91074_.m_150110_().f_35937_;
           BlockEntity blockentity = null;
           HitResult.Type hitresult$type = this.f_91077_.m_6662_();
-@@ -2185,10 +_,7 @@
+@@ -2136,10 +_,7 @@
              }
  
              Block block = blockstate.m_60734_();
@@ -449,7 +416,7 @@
  
              if (flag && Screen.m_96637_() && blockstate.m_155947_()) {
                 blockentity = this.f_91073_.m_7702_(blockpos);
-@@ -2199,7 +_,7 @@
+@@ -2150,7 +_,7 @@
              }
  
              Entity entity = ((EntityHitResult)this.f_91077_).m_82443_();
@@ -458,7 +425,27 @@
              if (itemstack == null) {
                 return;
              }
-@@ -2737,6 +_,19 @@
+@@ -2688,8 +_,8 @@
+       return this.f_90993_;
+    }
+ 
+-   private static Pack m_167933_(String p_167934_, Component p_167935_, boolean p_167936_, Supplier<PackResources> p_167937_, PackMetadataSection p_167938_, Pack.Position p_167939_, PackSource p_167940_) {
+-      int i = p_167938_.m_10374_();
++   private static Pack createClientPackAdapter(String p_167934_, Component p_167935_, boolean p_167936_, Supplier<PackResources> p_167937_, PackMetadataSection p_167938_, Pack.Position p_167939_, PackSource p_167940_, boolean hidden) {
++      int i = p_167938_.getPackFormat(PackType.CLIENT_RESOURCES);
+       Supplier<PackResources> supplier = p_167937_;
+       if (i <= 3) {
+          supplier = m_91330_(p_167937_);
+@@ -2699,7 +_,7 @@
+          supplier = m_91352_(supplier);
+       }
+ 
+-      return new Pack(p_167934_, p_167935_, p_167936_, supplier, p_167938_, PackType.CLIENT_RESOURCES, p_167939_, p_167940_);
++      return new Pack(p_167934_, p_167935_, p_167936_, supplier, p_167938_, PackType.CLIENT_RESOURCES, p_167939_, p_167940_, hidden);
+    }
+ 
+    private static Supplier<PackResources> m_91330_(Supplier<PackResources> p_91331_) {
+@@ -2716,6 +_,19 @@
  
     public void m_91312_(int p_91313_) {
        this.f_91051_.m_119410_(p_91313_);

patches/minecraft/net/minecraft/client/MouseHandler.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/MouseHandler.java
 +++ b/net/minecraft/client/MouseHandler.java
-@@ -73,6 +_,7 @@
+@@ -69,6 +_,7 @@
              this.f_91510_ = -1;
           }
  
@@ -8,7 +8,7 @@
           boolean[] aboolean = new boolean[]{false};
           if (this.f_91503_.m_91265_() == null) {
              if (this.f_91503_.f_91080_ == null) {
-@@ -86,11 +_,19 @@
+@@ -82,11 +_,19 @@
                 if (flag) {
                    screen.m_169415_();
                    Screen.m_96579_(() -> {
@@ -30,7 +30,7 @@
                    }, "mouseReleased event handler", screen.getClass().getCanonicalName());
                 }
              }
-@@ -114,19 +_,26 @@
+@@ -110,19 +_,26 @@
                 }
              }
           }
@@ -60,7 +60,7 @@
              } 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;
-@@ -139,6 +_,7 @@
+@@ -135,6 +_,7 @@
                 }
  
                 this.f_91518_ -= (double)i;
@@ -68,7 +68,7 @@
                 if (this.f_91503_.f_91074_.m_5833_()) {
                    if (this.f_91503_.f_91065_.m_93085_().m_94768_()) {
                       this.f_91503_.f_91065_.m_93085_().m_205380_(-i);
-@@ -207,7 +_,9 @@
+@@ -203,7 +_,9 @@
                 double d2 = (p_91563_ - this.f_91507_) * (double)this.f_91503_.m_91268_().m_85445_() / (double)this.f_91503_.m_91268_().m_85443_();
                 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_(() -> {
@@ -79,7 +79,7 @@
                 }, "mouseDragged event handler", screen.getClass().getCanonicalName());
              }
  
-@@ -290,6 +_,14 @@
+@@ -286,6 +_,14 @@
  
     public double m_91594_() {
        return this.f_91508_;

patches/minecraft/net/minecraft/client/Options.java.patch

@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -544,7 +_,8 @@
+@@ -539,7 +_,8 @@
     }, new OptionInstance.LazyEnum<>(() -> {
        return Stream.concat(Stream.of(""), Minecraft.m_91087_().m_91106_().m_194525_().stream()).toList();
     }, (p_232011_) -> {
 -      return Minecraft.m_91087_().m_91396_() && p_232011_ != "" && !Minecraft.m_91087_().m_91106_().m_194525_().contains(p_232011_) ? Optional.empty() : Optional.of(p_232011_);
 +      // FORGE: fix incorrect string comparison - PR #8767
 +      return Minecraft.m_91087_().m_91396_() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.m_91087_().m_91106_().m_194525_().contains(p_232011_) ? Optional.empty() : Optional.of(p_232011_);
-    }, Codec.STRING), "", (p_275584_) -> {
+    }, Codec.STRING), "", (p_231994_) -> {
        SoundManager soundmanager = Minecraft.m_91087_().m_91106_();
        soundmanager.m_194526_();
-@@ -868,6 +_,7 @@
+@@ -796,6 +_,7 @@
     }
  
     public Options(Minecraft p_92138_, File p_92139_) {
@@ -18,9 +18,9 @@
        this.f_92060_ = p_92138_;
        this.f_92110_ = new File(p_92139_, "options.txt");
        boolean flag = p_92138_.m_91103_();
-@@ -989,11 +_,20 @@
-       p_168428_.m_213982_("telemetryOptInExtra", this.f_260461_);
-       this.f_263744_ = p_168428_.m_142682_("onboardAccessibility", this.f_263744_);
+@@ -910,11 +_,20 @@
+       p_168428_.m_213982_("chatPreview", this.f_231796_);
+       p_168428_.m_213982_("onlyShowSecureChat", this.f_231798_);
  
 +      processOptionsForge(p_168428_);
 +   }
@@ -41,7 +41,7 @@
           }
        }
  
-@@ -1012,6 +_,9 @@
+@@ -935,6 +_,9 @@
     }
  
     public void m_92140_() {
@@ -51,7 +51,7 @@
        try {
           if (!this.f_92110_.exists()) {
              return;
-@@ -1040,7 +_,8 @@
+@@ -979,7 +_,8 @@
              }
           }
  
@@ -61,15 +61,15 @@
              @Nullable
              private String m_168458_(String p_168459_) {
                 return compoundtag1.m_128441_(p_168459_) ? compoundtag1.m_128461_(p_168459_) : null;
-@@ -1203,6 +_,7 @@
+@@ -1082,6 +_,7 @@
     }
  
-    public void m_92172_() {
+    public void m_92169_() {
 +      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.
-       if (this.f_92060_.f_91074_ != null) {
-          int i = 0;
+       try {
+          final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.f_92110_), StandardCharsets.UTF_8));
  
-@@ -1267,6 +_,23 @@
+@@ -1229,6 +_,23 @@
        }
  
        p_92146_.m_10509_(set);

patches/minecraft/net/minecraft/client/RecipeBookCategories.java.patch

@@ -18,16 +18,14 @@
     private final List<ItemStack> f_92261_;
  
     private RecipeBookCategories(ItemStack... p_92267_) {
-@@ -59,7 +_,7 @@
-             list = f_92256_;
-             break;
+@@ -54,11 +_,15 @@
+          case SMOKER:
+             return f_92256_;
           default:
--            throw new IncompatibleClassChangeError();
+-            return ImmutableList.of();
 +            return net.minecraftforge.client.RecipeBookManager.getCustomCategoriesOrEmpty(p_92270_);
        }
- 
-       return list;
-@@ -67,5 +_,9 @@
+    }
  
     public List<ItemStack> m_92268_() {
        return this.f_92261_;

patches/minecraft/net/minecraft/client/Screenshot.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Screenshot.java
 +++ b/net/minecraft/client/Screenshot.java
-@@ -56,13 +_,23 @@
+@@ -55,13 +_,23 @@
           file2 = new File(file1, p_92307_);
        }
  

patches/minecraft/net/minecraft/client/color/block/BlockColors.java.patch

@@ -10,7 +10,7 @@
     private final Map<Block, Set<Property<?>>> f_92572_ = Maps.newHashMap();
  
     public static BlockColors m_92574_() {
-@@ -80,11 +_,12 @@
+@@ -73,11 +_,12 @@
        blockcolors.m_92589_((p_92596_, p_92597_, p_92598_, p_92599_) -> {
           return p_92597_ != null && p_92598_ != null ? 2129968 : 7455580;
        }, Blocks.f_50196_);
@@ -19,16 +19,16 @@
     }
  
     public int m_92582_(BlockState p_92583_, Level p_92584_, BlockPos p_92585_) {
--      BlockColor blockcolor = this.f_92571_.m_7942_(BuiltInRegistries.f_256975_.m_7447_(p_92583_.m_60734_()));
+-      BlockColor blockcolor = this.f_92571_.m_7942_(Registry.f_122824_.m_7447_(p_92583_.m_60734_()));
 +      BlockColor blockcolor = this.f_92571_.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92583_.m_60734_()));
        if (blockcolor != null) {
           return blockcolor.m_92566_(p_92583_, (BlockAndTintGetter)null, (BlockPos)null, 0);
        } else {
-@@ -94,13 +_,15 @@
+@@ -87,13 +_,15 @@
     }
  
     public int m_92577_(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
--      BlockColor blockcolor = this.f_92571_.m_7942_(BuiltInRegistries.f_256975_.m_7447_(p_92578_.m_60734_()));
+-      BlockColor blockcolor = this.f_92571_.m_7942_(Registry.f_122824_.m_7447_(p_92578_.m_60734_()));
 +      BlockColor blockcolor = this.f_92571_.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92578_.m_60734_()));
        return blockcolor == null ? -1 : blockcolor.m_92566_(p_92578_, p_92579_, p_92580_, p_92581_);
     }
@@ -37,7 +37,7 @@
 +   @Deprecated
     public void m_92589_(BlockColor p_92590_, Block... p_92591_) {
        for(Block block : p_92591_) {
--         this.f_92571_.m_122664_(p_92590_, BuiltInRegistries.f_256975_.m_7447_(block));
+-         this.f_92571_.m_122664_(p_92590_, Registry.f_122824_.m_7447_(block));
 +         this.f_92571_.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), p_92590_);
        }
  

patches/minecraft/net/minecraft/client/color/item/ItemColors.java.patch

@@ -19,7 +19,7 @@
     }
  
     public int m_92676_(ItemStack p_92677_, int p_92678_) {
--      ItemColor itemcolor = this.f_92674_.m_7942_(BuiltInRegistries.f_257033_.m_7447_(p_92677_.m_41720_()));
+-      ItemColor itemcolor = this.f_92674_.m_7942_(Registry.f_122827_.m_7447_(p_92677_.m_41720_()));
 +      ItemColor itemcolor = this.f_92674_.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.m_41720_()));
        return itemcolor == null ? -1 : itemcolor.m_92671_(p_92677_, p_92678_);
     }

patches/minecraft/net/minecraft/client/gui/Font.java.patch

@@ -1,20 +0,0 @@
---- a/net/minecraft/client/gui/Font.java
-+++ b/net/minecraft/client/gui/Font.java
-@@ -33,7 +_,7 @@
- import org.joml.Vector3f;
- 
- @OnlyIn(Dist.CLIENT)
--public class Font {
-+public class Font implements net.minecraftforge.client.extensions.IForgeFont {
-    private static final float f_168643_ = 0.01F;
-    private static final Vector3f f_92712_ = new Vector3f(0.0F, 0.0F, 0.03F);
-    public static final int f_193827_ = 8;
-@@ -260,6 +_,8 @@
-    public StringSplitter m_92865_() {
-       return this.f_92714_;
-    }
-+
-+   @Override public Font self() { return this; }
- 
-    @OnlyIn(Dist.CLIENT)
-    public static enum DisplayMode {

patches/minecraft/net/minecraft/client/gui/Gui.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/Gui.java
 +++ b/net/minecraft/client/gui/Gui.java
-@@ -374,6 +_,7 @@
+@@ -389,6 +_,7 @@
                    if (this.f_92986_.f_91076_ != null && this.f_92986_.f_91076_ instanceof LivingEntity && f >= 1.0F) {
                       flag = this.f_92986_.f_91074_.m_36333_() > 5.0F;
                       flag &= this.f_92986_.f_91076_.m_6084_();
@@ -8,7 +8,7 @@
                    }
  
                    int j = this.f_92978_ / 2 - 7 + 16;
-@@ -428,6 +_,10 @@
+@@ -441,6 +_,10 @@
  
           for(MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
              MobEffect mobeffect = mobeffectinstance.m_19544_();
@@ -19,15 +19,15 @@
              if (mobeffectinstance.m_19575_()) {
                 int i = this.f_92977_;
                 int j = 1;
-@@ -456,6 +_,7 @@
+@@ -469,6 +_,7 @@
                    }
                 }
  
-+               if (renderer.renderGuiIcon(mobeffectinstance, this, p_93029_, i, j, 0, f)) continue;
++               if (renderer.renderGuiIcon(mobeffectinstance, this, p_93029_, i, j, this.m_93252_(), f)) continue;
                 TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.m_118732_(mobeffect);
+                int l = i;
                 int i1 = j;
-                float f1 = f;
-@@ -583,12 +_,13 @@
+@@ -598,12 +_,13 @@
     public void m_93069_(PoseStack p_93070_) {
        this.f_92986_.m_91307_().m_6180_("selectedItemName");
        if (this.f_92993_ > 0 && !this.f_92994_.m_41619_()) {
@@ -43,9 +43,9 @@
           int j = (this.f_92977_ - i) / 2;
           int k = this.f_92978_ - 59;
           if (!this.f_92986_.f_91072_.m_105205_()) {
-@@ -602,7 +_,13 @@
- 
-          if (l > 0) {
+@@ -619,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));
 -            this.m_93082_().m_92763_(p_93070_, mutablecomponent, (float)j, (float)k, 16777215 + (l << 24));
 +            Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(f_92994_).getFont(f_92994_, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME);
@@ -55,19 +55,10 @@
 +               j = (this.f_92977_ - font.m_92852_(highlightTip)) / 2;
 +               font.m_92763_(p_93070_, highlightTip, (float)j, (float)k, 16777215 + (l << 24));
 +            }
+             RenderSystem.m_69461_();
           }
        }
- 
-@@ -924,7 +_,7 @@
-       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
-    }
- 
--   public void m_264541_(PoseStack p_265563_, float p_265127_) {
-+   protected void m_264541_(PoseStack p_265563_, float p_265127_) {
-       RenderSystem.m_69465_();
-       RenderSystem.m_69458_(false);
-       float f = (float)Math.min(this.f_92977_, this.f_92978_);
-@@ -1054,7 +_,7 @@
+@@ -1133,7 +_,7 @@
           ItemStack itemstack = this.f_92986_.f_91074_.m_150109_().m_36056_();
           if (itemstack.m_41619_()) {
              this.f_92993_ = 0;

patches/minecraft/net/minecraft/client/gui/MapRenderer.java.patch

@@ -6,5 +6,5 @@
              if (!p_93294_ || mapdecoration.m_77809_()) {
 +               if (mapdecoration.render(k)) { k++; continue; }
                 p_93292_.m_85836_();
-                p_93292_.m_252880_(0.0F + (float)mapdecoration.m_77804_() / 2.0F + 64.0F, 0.0F + (float)mapdecoration.m_77805_() / 2.0F + 64.0F, -0.02F);
-                p_93292_.m_252781_(Axis.f_252403_.m_252977_((float)(mapdecoration.m_77806_() * 360) / 16.0F));
+                p_93292_.m_85837_((double)(0.0F + (float)mapdecoration.m_77804_() / 2.0F + 64.0F), (double)(0.0F + (float)mapdecoration.m_77805_() / 2.0F + 64.0F), (double)-0.02F);
+                p_93292_.m_85845_(Vector3f.f_122227_.m_122240_((float)(mapdecoration.m_77806_() * 360) / 16.0F));

patches/minecraft/net/minecraft/client/gui/components/AbstractButton.java.patch

@@ -1,11 +0,0 @@
---- a/net/minecraft/client/gui/components/AbstractButton.java
-+++ b/net/minecraft/client/gui/components/AbstractButton.java
-@@ -32,7 +_,7 @@
-       RenderSystem.m_69482_();
-       m_275833_(p_275468_, this.m_252754_(), this.m_252907_(), this.m_5711_(), this.m_93694_(), 20, 4, 200, 20, 0, this.m_274533_());
-       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
--      int i = this.f_93623_ ? 16777215 : 10526880;
-+      int i = getFGColor();
-       this.m_274375_(p_275468_, minecraft.f_91062_, i | Mth.m_14167_(this.f_93625_ * 255.0F) << 24);
-    }
- 

patches/minecraft/net/minecraft/client/gui/components/AbstractSelectionList.java.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/client/gui/components/AbstractSelectionList.java
 +++ b/net/minecraft/client/gui/components/AbstractSelectionList.java
-@@ -515,6 +_,13 @@
-       return new ScreenRectangle(this.f_93393_, this.f_93390_, this.f_93392_ - this.f_93393_, this.f_93391_ - this.f_93390_);
+@@ -536,6 +_,13 @@
+ 
     }
  
 +   public int getWidth() { return this.f_93388_; }
@@ -12,5 +12,5 @@
 +   public int getRight() { return this.f_93392_; }
 +
     @OnlyIn(Dist.CLIENT)
-    protected abstract static class Entry<E extends AbstractSelectionList.Entry<E>> implements GuiEventListener {
+    public abstract static class Entry<E extends AbstractSelectionList.Entry<E>> implements GuiEventListener {
        /** @deprecated */

patches/minecraft/net/minecraft/client/gui/components/AbstractWidget.java.patch

@@ -1,6 +1,15 @@
 --- a/net/minecraft/client/gui/components/AbstractWidget.java
 +++ b/net/minecraft/client/gui/components/AbstractWidget.java
-@@ -231,6 +_,10 @@
+@@ -85,7 +_,7 @@
+       this.m_93228_(p_93676_, this.f_93620_, this.f_93621_, 0, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
+       this.m_93228_(p_93676_, this.f_93620_ + this.f_93618_ / 2, this.f_93621_, 200 - this.f_93618_ / 2, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
+       this.m_7906_(p_93676_, minecraft, p_93677_, p_93678_);
+-      int j = this.f_93623_ ? 16777215 : 10526880;
++      int j = getFGColor();
+       m_93215_(p_93676_, font, this.m_6035_(), this.f_93620_ + this.f_93618_ / 2, this.f_93621_ + (this.f_93619_ - 8) / 2, j | Mth.m_14167_(this.f_93625_ * 255.0F) << 24);
+    }
+ 
+@@ -180,6 +_,10 @@
        this.f_93618_ = p_93675_;
     }
  
@@ -11,9 +20,9 @@
     public void m_93650_(float p_93651_) {
        this.f_93625_ = p_93651_;
     }
-@@ -261,6 +_,19 @@
+@@ -202,6 +_,19 @@
  
-    public void m_93692_(boolean p_93693_) {
+    protected void m_93692_(boolean p_93693_) {
        this.f_93616_ = p_93693_;
 +   }
 +

patches/minecraft/net/minecraft/client/gui/components/BossHealthOverlay.java.patch

@@ -6,10 +6,10 @@
              int k = i / 2 - 91;
 +            var event = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(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_);
              this.m_93706_(p_93705_, k, j, lerpingbossevent);
-             Component component = lerpingbossevent.m_18861_();
-@@ -41,7 +_,8 @@
+@@ -42,7 +_,8 @@
              int i1 = i / 2 - l / 2;
              int j1 = j - 9;
              this.f_93698_.f_91062_.m_92763_(p_93705_, component, (float)i1, (float)j1, 16777215);

patches/minecraft/net/minecraft/client/gui/components/Button.java.patch

@@ -1,29 +0,0 @@
---- a/net/minecraft/client/gui/components/Button.java
-+++ b/net/minecraft/client/gui/components/Button.java
-@@ -29,6 +_,11 @@
-       this.f_252416_ = p_259552_;
-    }
- 
-+   protected Button(Builder builder) {
-+      this(builder.f_252538_, builder.f_252462_, builder.f_252510_, builder.f_252447_, builder.f_252401_, builder.f_252468_, builder.f_252431_);
-+      m_257544_(builder.f_256855_); // Forge: Make use of the Builder tooltip
-+   }
-+
-    public void m_5691_() {
-       this.f_93717_.m_93750_(this);
-    }
-@@ -92,9 +_,11 @@
-       }
- 
-       public Button m_253136_() {
--         Button button = new Button(this.f_252538_, this.f_252462_, this.f_252510_, this.f_252447_, this.f_252401_, this.f_252468_, this.f_252431_);
--         button.m_257544_(this.f_256855_);
--         return button;
-+         return build(Button::new);
-+      }
-+
-+      public Button build(java.util.function.Function<Builder, Button> builder) {
-+         return builder.apply(this);
-       }
-    }
- 

patches/minecraft/net/minecraft/client/gui/components/DebugScreenOverlay.java.patch

@@ -3,7 +3,7 @@
 @@ -409,6 +_,7 @@
              list.add("");
              list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
-             list.add(String.valueOf((Object)BuiltInRegistries.f_256780_.m_7981_(entity.m_6095_())));
+             list.add(String.valueOf((Object)Registry.f_122826_.m_7981_(entity.m_6095_())));
 +            entity.m_6095_().m_204041_().m_203616_().forEach(t -> list.add("#" + t.f_203868_()));
           }
  

patches/minecraft/net/minecraft/client/gui/components/toasts/ToastComponent.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/components/toasts/ToastComponent.java
 +++ b/net/minecraft/client/gui/components/toasts/ToastComponent.java
-@@ -102,6 +_,7 @@
+@@ -103,6 +_,7 @@
     }
  
     public void m_94922_(Toast p_94923_) {

patches/minecraft/net/minecraft/client/gui/screens/ConnectScreen.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/gui/screens/ConnectScreen.java
++++ b/net/minecraft/client/gui/screens/ConnectScreen.java
+@@ -73,6 +_,8 @@
+                }
+ 
+                if (!optional.isPresent()) {
++                  ConnectScreen.f_95683_.error("Couldn't connect to server: Unknown host \"{}\"", p_169266_.m_171863_());
++                  net.minecraftforge.network.DualStackUtils.logInitialPreferences();
+                   p_169265_.execute(() -> {
+                      p_169265_.m_91152_(new DisconnectedScreen(ConnectScreen.this.f_95686_, CommonComponents.f_130661_, ConnectScreen.f_169260_));
+                   });

patches/minecraft/net/minecraft/client/gui/screens/DeathScreen.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/screens/DeathScreen.java
++++ b/net/minecraft/client/gui/screens/DeathScreen.java
+@@ -36,6 +_,7 @@
+       })));
+       this.f_169295_.add(this.m_142416_(new Button(this.f_96543_ / 2 - 100, this.f_96544_ / 4 + 96, 200, 20, Component.m_237115_("deathScreen.titleScreen"), (p_95925_) -> {
+          if (this.f_95908_) {
++            m_95931_(true);
+             this.m_95934_();
+          } else {
+             ConfirmScreen confirmscreen = new ConfirmScreen(this::m_95931_, Component.m_237115_("deathScreen.quit.confirm"), CommonComponents.f_237098_, Component.m_237115_("deathScreen.titleScreen"), Component.m_237115_("deathScreen.respawn"));

patches/minecraft/net/minecraft/client/gui/screens/MenuScreens.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/MenuScreens.java
 +++ b/net/minecraft/client/gui/screens/MenuScreens.java
-@@ -41,6 +_,10 @@
+@@ -40,6 +_,10 @@
     private static final Map<MenuType<?>, MenuScreens.ScreenConstructor<?, ?>> f_96196_ = Maps.newHashMap();
  
     public static <T extends AbstractContainerMenu> void m_96201_(@Nullable MenuType<T> p_96202_, Minecraft p_96203_, int p_96204_, Component p_96205_) {
@@ -11,9 +11,9 @@
        if (p_96202_ == null) {
           f_96195_.warn("Trying to open invalid screen with name: {}", (Object)p_96205_.getString());
        } else {
-@@ -48,9 +_,10 @@
+@@ -47,9 +_,10 @@
           if (screenconstructor == null) {
-             f_96195_.warn("Failed to create screen for menu type: {}", (Object)BuiltInRegistries.f_256818_.m_7981_(p_96202_));
+             f_96195_.warn("Failed to create screen for menu type: {}", (Object)Registry.f_122863_.m_7981_(p_96202_));
           } else {
 -            screenconstructor.m_96209_(p_96205_, p_96202_, p_96203_, p_96204_);
 +            return java.util.Optional.of(screenconstructor);

patches/minecraft/net/minecraft/client/gui/screens/OptionsScreen.java.patch

@@ -1,9 +1,10 @@
 --- a/net/minecraft/client/gui/screens/OptionsScreen.java
 +++ b/net/minecraft/client/gui/screens/OptionsScreen.java
-@@ -151,6 +_,14 @@
-       super.m_86412_(p_96249_, p_96250_, p_96251_, p_96252_);
+@@ -140,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_);
     }
- 
++
 +    @Override
 +    public void m_7379_() {
 +        // We need to consider 2 potential parent screens here:
@@ -11,7 +12,4 @@
 +        // 2. From the pause menu, in which case exit back to game
 +        this.f_96541_.m_91152_(this.f_96235_ instanceof PauseScreen ? null : this.f_96235_);
 +    }
-+
-    private Button m_260993_(Component p_261565_, Supplier<Screen> p_262119_) {
-       return Button.m_253074_(p_261565_, (p_261361_) -> {
-          this.f_96541_.m_91152_(p_262119_.get());
+ }

patches/minecraft/net/minecraft/client/gui/screens/PauseScreen.java.patch

@@ -0,0 +1,14 @@
+--- a/net/minecraft/client/gui/screens/PauseScreen.java
++++ b/net/minecraft/client/gui/screens/PauseScreen.java
+@@ -77,9 +_,10 @@
+             this.f_96541_.m_91152_(new SocialInteractionsScreen());
+          }));
+       }
++      this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 120 - 16, 204, 20, Component.m_237115_("fml.menu.mods"), modButton -> this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this))));
+ 
+       Component component = this.f_96541_.m_91090_() ? Component.m_237115_("menu.returnToMenu") : Component.m_237115_("menu.disconnect");
+-      this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 120 + -16, 204, 20, component, (p_96315_) -> {
++      this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 144 + -16, 204, 20, component, (p_96315_) -> {
+          boolean flag = this.f_96541_.m_91090_();
+          boolean flag1 = this.f_96541_.m_91294_();
+          p_96315_.f_93623_ = false;

patches/minecraft/net/minecraft/client/gui/screens/Screen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/Screen.java
 +++ b/net/minecraft/client/gui/screens/Screen.java
-@@ -214,7 +_,7 @@
+@@ -126,7 +_,7 @@
     }
  
     public void m_7379_() {
@@ -8,8 +8,8 @@
 +      this.f_96541_.popGuiLayer();
     }
  
-    protected <T extends GuiEventListener & Renderable & NarratableEntry> T m_142416_(T p_169406_) {
-@@ -251,15 +_,29 @@
+    protected <T extends GuiEventListener & Widget & NarratableEntry> T m_142416_(T p_169406_) {
+@@ -163,15 +_,29 @@
        this.f_169368_.clear();
     }
  
@@ -40,16 +40,16 @@
 -         list.add(1, ClientTooltipComponent.m_169950_(p_169399_));
 -      });
 +      List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_169390_, p_169391_, p_169392_, f_96543_, f_96544_, this.tooltipFont, this.f_96547_);
-       this.m_262809_(p_169389_, list, p_169392_, p_169393_, DefaultTooltipPositioner.f_262752_);
+       this.m_169383_(p_169389_, list, p_169392_, p_169393_);
     }
  
-@@ -272,24 +_,48 @@
+@@ -184,20 +_,44 @@
     }
  
     public void m_96597_(PoseStack p_96598_, List<Component> p_96599_, int p_96600_, int p_96601_) {
 -      this.m_96617_(p_96598_, Lists.transform(p_96599_, Component::m_7532_), p_96600_, p_96601_);
 +      List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_96599_, p_96600_, f_96543_, f_96544_, this.tooltipFont, this.f_96547_);
-+      this.m_262809_(p_96598_, components, p_96600_, p_96601_, DefaultTooltipPositioner.f_262752_);
++      this.m_169383_(p_96598_, components, p_96600_, p_96601_);
 +   }
 +   public void renderComponentTooltip(PoseStack poseStack, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
 +      this.renderComponentTooltip(poseStack, tooltips, mouseX, mouseY, null, stack);
@@ -62,13 +62,13 @@
 +      this.tooltipFont = font;
 +      this.tooltipStack = stack;
 +      List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, f_96543_, f_96544_, this.tooltipFont, this.f_96547_);
-+      this.m_262809_(poseStack, components, mouseX, mouseY, DefaultTooltipPositioner.f_262752_);
++      this.m_169383_(poseStack, components, mouseX, mouseY);
 +      this.tooltipFont = null;
 +      this.tooltipStack = ItemStack.f_41583_;
     }
  
     public void m_96617_(PoseStack p_96618_, List<? extends FormattedCharSequence> p_96619_, int p_96620_, int p_96621_) {
-       this.m_262809_(p_96618_, p_96619_.stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_96620_, p_96621_, DefaultTooltipPositioner.f_262752_);
+       this.m_169383_(p_96618_, p_96619_.stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_96620_, p_96621_);
     }
  
 +   public void renderTooltip(PoseStack poseStack, List<? extends FormattedCharSequence> lines, int x, int y, Font font) {
@@ -77,71 +77,87 @@
 +      this.tooltipFont = null;
 +   }
 +
-    private void m_262835_(PoseStack p_263080_, Screen.DeferredTooltipRendering p_262968_, int p_263034_, int p_263076_) {
-       this.m_262809_(p_263080_, p_262968_.f_262736_().stream().map(ClientTooltipComponent::m_169948_).collect(Collectors.toList()), p_263034_, p_263076_, p_262968_.f_262758_());
-    }
- 
-    private void m_262809_(PoseStack p_263064_, List<ClientTooltipComponent> p_262990_, int p_263065_, int p_262996_, ClientTooltipPositioner p_262920_) {
-       if (!p_262990_.isEmpty()) {
-+         net.minecraftforge.client.event.RenderTooltipEvent.Pre preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, p_263064_, p_263065_, p_262996_, f_96543_, f_96544_, p_262990_, this.tooltipFont, this.f_96547_);
+    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.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_262990_.size() == 1 ? -2 : 0;
+          int j = p_169385_.size() == 1 ? -2 : 0;
  
-          for(ClientTooltipComponent clienttooltipcomponent : p_262990_) {
+          for(ClientTooltipComponent clienttooltipcomponent : p_169385_) {
 -            int k = clienttooltipcomponent.m_142069_(this.f_96547_);
 +            int k = clienttooltipcomponent.m_142069_(preEvent.getFont());
              if (k > i) {
                 i = k;
              }
-@@ -297,7 +_,7 @@
+@@ -205,8 +_,8 @@
              j += clienttooltipcomponent.m_142103_();
           }
  
--         Vector2ic vector2ic = p_262920_.m_262814_(this, p_263065_, p_262996_, i, j);
-+         Vector2ic vector2ic = p_262920_.m_262814_(this, preEvent.getX(), preEvent.getY(), i, j);
-          int l = vector2ic.x();
-          int i1 = vector2ic.y();
-          p_263064_.m_85836_();
-@@ -307,6 +_,8 @@
+-         int j2 = p_169386_ + 12;
+-         int k2 = p_169387_ - 12;
++         int j2 = preEvent.getX() + 12;
++         int k2 = preEvent.getY() - 12;
+          if (j2 + i > this.f_96543_) {
+             j2 -= 28 + i;
+          }
+@@ -227,15 +_,16 @@
           RenderSystem.m_157427_(GameRenderer::m_172811_);
           bufferbuilder.m_166779_(VertexFormat.Mode.QUADS, DefaultVertexFormat.f_85815_);
-          Matrix4f matrix4f = p_263064_.m_85850_().m_252922_();
-+         // TODO 1.19.3: Tooltip rendering changed, rethink the color event.
-+         // net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_263064_, k1, l1, preEvent.getFont(), p_262990_);
-          TooltipRenderUtil.m_262796_((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> {
-             GuiComponent.m_93123_(p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_);
-          }, matrix4f, bufferbuilder, l, i1, i, j, 400);
-@@ -320,7 +_,7 @@
+          Matrix4f matrix4f = p_169384_.m_85850_().m_85861_();
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 4, j2 + i + 3, k2 - 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 3, j2 + i + 3, k2 + j + 4, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 + j + 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 4, k2 - 3, j2 - 3, k2 + j + 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 + i + 3, k2 - 3, j2 + i + 4, k2 + j + 3, 400, -267386864, -267386864);
+-         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3 + 1, j2 - 3 + 1, k2 + j + 3 - 1, 400, 1347420415, 1344798847);
+-         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.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());
++         m_93123_(matrix4f, bufferbuilder, j2 - 4, k2 - 3, j2 - 3, k2 + j + 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd());
++         m_93123_(matrix4f, bufferbuilder, j2 + i + 3, k2 - 3, j2 + i + 4, k2 + j + 3, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd());
++         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3 + 1, j2 - 3 + 1, k2 + j + 3 - 1, 400, colorEvent.getBorderStart(), colorEvent.getBorderEnd());
++         m_93123_(matrix4f, bufferbuilder, j2 + i + 2, k2 - 3 + 1, j2 + i + 3, k2 + j + 3 - 1, 400, colorEvent.getBorderStart(), colorEvent.getBorderEnd());
++         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 - 3, j2 + i + 3, k2 - 3 + 1, 400, colorEvent.getBorderStart(), colorEvent.getBorderStart());
++         m_93123_(matrix4f, bufferbuilder, j2 - 3, k2 + j + 2, j2 + i + 3, k2 + j + 3, 400, colorEvent.getBorderEnd(), colorEvent.getBorderEnd());
+          RenderSystem.m_69482_();
+          RenderSystem.m_69472_();
+          RenderSystem.m_69478_();
+@@ -249,7 +_,7 @@
  
-          for(int l1 = 0; l1 < p_262990_.size(); ++l1) {
-             ClientTooltipComponent clienttooltipcomponent1 = p_262990_.get(l1);
--            clienttooltipcomponent1.m_142440_(this.f_96547_, l, k1, matrix4f, multibuffersource$buffersource);
-+            clienttooltipcomponent1.m_142440_(preEvent.getFont(), l, k1, matrix4f, multibuffersource$buffersource);
-             k1 += clienttooltipcomponent1.m_142103_() + (l1 == 0 ? 2 : 0);
+          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.getFont(), j2, l1, matrix4f, multibuffersource$buffersource);
+             l1 += clienttooltipcomponent1.m_142103_() + (i2 == 0 ? 2 : 0);
           }
  
-@@ -329,7 +_,7 @@
+@@ -259,7 +_,7 @@
  
-          for(int i2 = 0; i2 < p_262990_.size(); ++i2) {
-             ClientTooltipComponent clienttooltipcomponent2 = p_262990_.get(i2);
--            clienttooltipcomponent2.m_183452_(this.f_96547_, l, k1, p_263064_, this.f_96542_);
-+            clienttooltipcomponent2.m_183452_(preEvent.getFont(), k1, i1, p_263064_, this.f_96542_);
-             k1 += clienttooltipcomponent2.m_142103_() + (i2 == 0 ? 2 : 0);
+          for(int l2 = 0; l2 < p_169385_.size(); ++l2) {
+             ClientTooltipComponent clienttooltipcomponent2 = p_169385_.get(l2);
+-            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);
           }
  
-@@ -438,8 +_,18 @@
-       }
- 
-       this.f_267454_ = true;
+@@ -361,9 +_,19 @@
+       this.f_96547_ = p_96607_.f_91062_;
+       this.f_96543_ = p_96608_;
+       this.f_96544_ = p_96609_;
 +      java.util.function.Consumer<GuiEventListener> add = (b) -> {
-+         if (b instanceof Renderable r)
-+            this.f_169369_.add(r);
++         if (b instanceof Widget w)
++            this.f_169369_.add(w);
 +         if (b instanceof NarratableEntry ne)
 +            this.f_169368_.add(ne);
 +         f_96540_.add(b);
 +      };
 +      if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.Init.Pre(this, this.f_96540_, add, this::m_169411_))) {
+       this.m_232761_();
        this.m_169407_(false);
        this.m_169378_(f_169370_);
 +      }
@@ -149,23 +165,23 @@
     }
  
     protected void m_232761_() {
-@@ -467,6 +_,7 @@
-    public void m_7333_(PoseStack p_96557_) {
+@@ -392,6 +_,7 @@
+    public void m_96558_(PoseStack p_96559_, int p_96560_) {
        if (this.f_96541_.f_91073_ != null) {
-          m_93179_(p_96557_, 0, 0, this.f_96543_, this.f_96544_, -1072689136, -804253680);
-+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.BackgroundRendered(this, p_96557_));
+          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.ScreenEvent.BackgroundRendered(this, p_96559_));
        } else {
-          this.m_264065_(p_96557_);
+          this.m_96626_(p_96560_);
        }
-@@ -479,6 +_,7 @@
-       int i = 32;
-       m_93143_(p_265092_, 0, 0, 0, 0.0F, 0.0F, this.f_96543_, this.f_96544_, 32, 32);
-       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
-+      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.ScreenEvent.BackgroundRendered(this, p_265092_));
+@@ -411,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.ScreenEvent.BackgroundRendered(this, new PoseStack()));
     }
  
     public boolean m_7043_() {
-@@ -570,6 +_,10 @@
+@@ -496,6 +_,10 @@
     }
  
     public void m_7400_(List<Path> p_96591_) {

patches/minecraft/net/minecraft/client/gui/screens/TitleScreen.java.patch

@@ -1,14 +1,14 @@
 --- a/net/minecraft/client/gui/screens/TitleScreen.java
 +++ b/net/minecraft/client/gui/screens/TitleScreen.java
-@@ -63,6 +_,7 @@
+@@ -68,6 +_,7 @@
+    private long f_96715_;
     @Nullable
     private TitleScreen.WarningLabel f_232768_;
-    private final LogoRenderer f_263781_;
 +   private net.minecraftforge.client.gui.TitleScreenModUpdateIndicator modUpdateNotification;
  
     public TitleScreen() {
        this(false);
-@@ -113,11 +_,15 @@
+@@ -112,11 +_,16 @@
        int j = this.f_96543_ - i - 2;
        int k = 24;
        int l = this.f_96544_ / 4 + 48;
@@ -17,51 +17,52 @@
           this.m_96772_(l, 24);
        } else {
           this.m_96763_(l, 24);
-+         modButton = this.m_142416_(Button.m_253074_(Component.m_237115_("fml.menu.mods"), button -> this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this)))
-+            .m_252794_(this.f_96543_ / 2 - 100, l + 24 * 2).m_253046_(98, 20).m_253136_());
++         modButton = this.m_142416_(new Button(this.f_96543_ / 2 - 100, l + 24 * 2, 98, 20, Component.m_237115_("fml.menu.mods"), button -> {
++            this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this));
++         }));
        }
 +      modUpdateNotification = net.minecraftforge.client.gui.TitleScreenModUpdateIndicator.init(this, modButton);
  
        this.m_142416_(new ImageButton(this.f_96543_ / 2 - 124, l + 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_()));
-@@ -162,7 +_,7 @@
-       }).m_252987_(this.f_96543_ / 2 - 100, p_96764_ + p_96765_ * 1, 200, 20).m_257505_(tooltip).m_253136_())).f_93623_ = flag;
-       (this.m_142416_(Button.m_253074_(Component.m_237115_("menu.online"), (p_210872_) -> {
+@@ -167,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;
+-      (this.m_142416_(new Button(this.f_96543_ / 2 - 100, p_96764_ + p_96765_ * 2, 200, 20, Component.m_237115_("menu.online"), (p_210872_) -> {
++      (this.m_142416_(new Button(this.f_96543_ / 2 + 2, p_96764_ + p_96765_ * 2, 98, 20, Component.m_237115_("menu.online"), (p_96771_) -> {
           this.m_96793_();
--      }).m_252987_(this.f_96543_ / 2 - 100, p_96764_ + p_96765_ * 2, 200, 20).m_257505_(tooltip).m_253136_())).f_93623_ = flag;
-+      }).m_252987_(this.f_96543_ / 2 + 2, p_96764_ + p_96765_ * 2, 98, 20).m_257505_(tooltip).m_253136_())).f_93623_ = flag;
+       }, button$ontooltip))).f_93623_ = flag;
     }
- 
-    @Nullable
-@@ -245,6 +_,7 @@
-             this.f_232768_.m_232790_(p_96739_, i);
+@@ -310,6 +_,7 @@
+             this.f_232768_.m_232790_(p_96739_, l);
           }
  
-+         net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, p_96739_, this.f_96547_, this.f_96543_, this.f_96544_, i);
++         net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, p_96739_, this.f_96547_, this.f_96543_, this.f_96544_, l);
           if (this.f_96721_ != null) {
              p_96739_.m_85836_();
-             p_96739_.m_252880_((float)(this.f_96543_ / 2 + 90), 70.0F, 0.0F);
-@@ -267,7 +_,14 @@
+             p_96739_.m_85837_((double)(this.f_96543_ / 2 + 90), 70.0D, 0.0D);
+@@ -332,7 +_,14 @@
              s = s + I18n.m_118938_("menu.modded");
           }
  
--         m_93236_(p_96739_, this.f_96547_, s, 2, this.f_96544_ - 10, 16777215 | i);
+-         m_93236_(p_96739_, this.f_96547_, s, 2, this.f_96544_ - 10, 16777215 | l);
 +         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 | i)
++            m_93236_(p_96739_, this.f_96547_, brd, 2, this.f_96544_ - ( 10 + brdline * (this.f_96547_.f_92710_ + 1)), 16777215 | l)
 +         );
 +
 +         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 | i)
++            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)
 +         );
 +
  
           for(GuiEventListener guieventlistener : this.m_6702_()) {
              if (guieventlistener instanceof AbstractWidget) {
-@@ -280,6 +_,7 @@
+@@ -345,6 +_,7 @@
              RenderSystem.m_69482_();
-             this.f_96726_.m_86412_(p_96739_, p_96740_, p_96741_, p_96742_);
+             this.f_96726_.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
           }
-+         if (f1 >= 1.0f) modUpdateNotification.m_86412_(p_96739_, p_96740_, p_96741_, p_96742_);
++         if (f1 >= 1.0f) modUpdateNotification.m_6305_(p_96739_, p_96740_, p_96741_, p_96742_);
  
        }
     }

patches/minecraft/net/minecraft/client/gui/screens/advancements/AdvancementTab.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
 +++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
-@@ -38,6 +_,7 @@
+@@ -39,6 +_,7 @@
     private int f_97141_ = Integer.MIN_VALUE;
     private float f_97142_;
     private boolean f_97143_;
@@ -8,7 +8,7 @@
  
     public AdvancementTab(Minecraft p_97145_, AdvancementsScreen p_97146_, AdvancementTabType p_97147_, int p_97148_, Advancement p_97149_, DisplayInfo p_97150_) {
        this.f_97126_ = p_97145_;
-@@ -52,6 +_,15 @@
+@@ -53,6 +_,15 @@
        this.m_97175_(this.f_97134_, p_97149_);
     }
  
@@ -24,7 +24,7 @@
     public AdvancementTabType m_169538_() {
        return this.f_97128_;
     }
-@@ -151,8 +_,8 @@
+@@ -165,8 +_,8 @@
           return null;
        } else {
           for(AdvancementTabType advancementtabtype : AdvancementTabType.values()) {

patches/minecraft/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
 +++ b/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
-@@ -41,6 +_,7 @@
+@@ -42,6 +_,7 @@
     @Nullable
     private AdvancementTab f_97336_;
     private boolean f_97337_;
@@ -8,7 +8,7 @@
  
     public AdvancementsScreen(ClientAdvancements p_97340_) {
        super(GameNarrator.f_93310_);
-@@ -56,7 +_,15 @@
+@@ -57,7 +_,13 @@
        } else {
           this.f_97334_.m_104401_(this.f_97336_ == null ? null : this.f_97336_.m_97182_(), true);
        }
@@ -16,16 +16,14 @@
 +      if (this.f_97335_.size() > AdvancementTabType.MAX_TABS) {
 +          int guiLeft = (this.f_96543_ - 252) / 2;
 +          int guiTop = (this.f_96544_ - 140) / 2;
-+          m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_("<"), b -> tabPage = Math.max(tabPage - 1, 0       ))
-+              .m_252794_(guiLeft, guiTop - 50).m_253046_(20, 20).m_253136_());
-+          m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages))
-+              .m_252794_(guiLeft + f_169556_ - 20, guiTop - 50).m_253046_(20, 20).m_253136_());
++          m_142416_(new net.minecraft.client.gui.components.Button(guiLeft,            guiTop - 50, 20, 20, Component.m_237113_("<"), b -> tabPage = Math.max(tabPage - 1, 0       )));
++          m_142416_(new net.minecraft.client.gui.components.Button(guiLeft + 252 - 20, guiTop - 50, 20, 20, Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages)));
 +          maxPages = this.f_97335_.size() / AdvancementTabType.MAX_TABS;
 +      }
     }
  
     public void m_7861_() {
-@@ -74,7 +_,7 @@
+@@ -75,7 +_,7 @@
           int j = (this.f_96544_ - 140) / 2;
  
           for(AdvancementTab advancementtab : this.f_97335_.values()) {
@@ -34,7 +32,7 @@
                 this.f_97334_.m_104401_(advancementtab.m_97182_(), true);
                 break;
              }
-@@ -98,6 +_,11 @@
+@@ -99,6 +_,11 @@
        int i = (this.f_96543_ - 252) / 2;
        int j = (this.f_96544_ - 140) / 2;
        this.m_7333_(p_97361_);
@@ -46,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);
-@@ -138,10 +_,12 @@
+@@ -149,12 +_,14 @@
           RenderSystem.m_157456_(0, f_97330_);
  
           for(AdvancementTab advancementtab : this.f_97335_.values()) {
@@ -54,12 +52,14 @@
              advancementtab.m_97165_(p_97357_, p_97358_, p_97359_, advancementtab == this.f_97336_);
           }
  
+          RenderSystem.m_69453_();
+ 
           for(AdvancementTab advancementtab1 : this.f_97335_.values()) {
 +            if (advancementtab1.getPage() == tabPage)
-             advancementtab1.m_274613_(p_97357_, p_97358_, p_97359_, this.f_96542_);
+             advancementtab1.m_97159_(p_97358_, p_97359_, this.f_96542_);
           }
-       }
-@@ -161,7 +_,7 @@
+ 
+@@ -180,7 +_,7 @@
  
        if (this.f_97335_.size() > 1) {
           for(AdvancementTab advancementtab : this.f_97335_.values()) {

patches/minecraft/net/minecraft/client/gui/screens/controls/KeyBindsList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/controls/KeyBindsList.java
 +++ b/net/minecraft/client/gui/screens/controls/KeyBindsList.java
-@@ -65,7 +_,7 @@
+@@ -51,7 +_,7 @@
     }
  
     protected int m_5756_() {
@@ -9,34 +9,52 @@
     }
  
     public int m_5759_() {
-@@ -130,10 +_,11 @@
-          this.f_193912_ = Button.m_253074_(p_193917_, (p_269618_) -> {
+@@ -107,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_;
-             KeyBindsList.this.m_269130_();
--         }).m_252987_(0, 0, 75, 20).m_252778_((p_253311_) -> {
-+         }).m_252987_(0, 0, 75 + 20 /* Forge: Add space */, 20).m_252778_((p_253311_) -> {
-             return p_193916_.m_90862_() ? Component.m_237110_("narrator.controls.unbound", p_193917_) : Component.m_237110_("narrator.controls.bound", p_193917_, p_253311_.get());
-          }).m_253136_();
-          this.f_193913_ = Button.m_253074_(Component.m_237115_("controls.reset"), (p_269616_) -> {
+          }) {
+             protected MutableComponent m_5646_() {
+@@ -115,6 +_,7 @@
+             }
+          };
+          this.f_193913_ = new Button(0, 0, 50, 20, Component.m_237115_("controls.reset"), (p_193935_) -> {
 +            this.f_193910_.setToDefault();
              KeyBindsList.this.f_93386_.f_91066_.m_92159_(p_193916_, p_193916_.m_90861_());
-             KeyBindsList.this.m_269130_();
-          }).m_252987_(0, 0, 50, 20).m_252778_((p_253313_) -> {
-@@ -145,7 +_,7 @@
-       public void m_6311_(PoseStack p_193923_, int p_193924_, int p_193925_, int p_193926_, int p_193927_, int p_193928_, int p_193929_, int p_193930_, boolean p_193931_, float p_193932_) {
+             KeyMapping.m_90854_();
+          }) {
+@@ -128,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_.m_252865_(p_193926_ + 190);
-+         this.f_193913_.m_252865_(p_193926_ + 190 + 20);
-          this.f_193913_.m_253211_(p_193925_);
-          this.f_193913_.m_86412_(p_193923_, p_193929_, p_193930_, p_193932_);
-          this.f_193912_.m_252865_(p_193926_ + 105);
-@@ -174,7 +_,7 @@
-          MutableComponent mutablecomponent = Component.m_237119_();
+-         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_);
+@@ -136,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)) {
-+               if ((keymapping != this.f_193910_ && this.f_193910_.m_90850_(keymapping)) || keymapping.hasKeyModifierConflict(this.f_193910_)) { // FORGE: gracefully handle conflicts like SHIFT vs SHIFT+G
-                   if (this.f_268447_) {
-                      mutablecomponent.m_130946_(", ");
-                   }
+                if (keymapping != this.f_193910_ && this.f_193910_.m_90850_(keymapping)) {
+                   flag1 = true;
+-                  break;
++                  keyCodeModifierConflict &= keymapping.hasKeyModifierConflict(this.f_193910_);
+                }
+             }
+          }
+@@ -148,7 +_,7 @@
+          if (flag) {
+             this.f_193912_.m_93666_(Component.m_237113_("> ").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_);

patches/minecraft/net/minecraft/client/gui/screens/controls/KeyBindsScreen.java.patch

@@ -2,13 +2,13 @@
 +++ b/net/minecraft/client/gui/screens/controls/KeyBindsScreen.java
 @@ -31,7 +_,7 @@
        this.m_7787_(this.f_193977_);
-       this.f_193978_ = this.m_142416_(Button.m_253074_(Component.m_237115_("controls.resetAll"), (p_269619_) -> {
+       this.f_193978_ = this.m_142416_(new Button(this.f_96543_ / 2 - 155, this.f_96544_ - 29, 150, 20, Component.m_237115_("controls.resetAll"), (p_193999_) -> {
           for(KeyMapping keymapping : this.f_96282_.f_92059_) {
 -            keymapping.m_90848_(keymapping.m_90861_());
 +            keymapping.setToDefault();
           }
  
-          this.f_193977_.m_269130_();
+          KeyMapping.m_90854_();
 @@ -55,11 +_,14 @@
     public boolean m_7933_(int p_193987_, int p_193988_, int p_193989_) {
        if (this.f_193975_ != null) {
@@ -23,4 +23,4 @@
 +         if(!net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.f_193975_.getKey()))
           this.f_193975_ = null;
           this.f_193976_ = Util.m_137550_();
-          this.f_193977_.m_269130_();
+          KeyMapping.m_90854_();

patches/minecraft/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java.patch

@@ -1,19 +1,19 @@
 --- a/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
-@@ -88,6 +_,7 @@
+@@ -90,6 +_,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.ContainerScreenEvent.Render.Background(this, p_97795_, p_97796_, p_97797_));
        RenderSystem.m_69465_();
-       super.m_86412_(p_97795_, p_97796_, p_97797_, p_97798_);
-       p_97795_.m_85836_();
-@@ -104,11 +_,12 @@
+       super.m_6305_(p_97795_, p_97796_, p_97797_, p_97798_);
+       PoseStack posestack = RenderSystem.m_157191_();
+@@ -111,11 +_,12 @@
              this.f_97734_ = slot;
              int l = slot.f_40220_;
              int i1 = slot.f_40221_;
--            m_169606_(p_97795_, l, i1, 0);
-+            renderSlotHighlight(p_97795_, l, i1, 0, this.getSlotColor(k));
+-            m_169606_(p_97795_, l, i1, this.m_93252_());
++            renderSlotHighlight(p_97795_, l, i1, this.m_93252_(), this.getSlotColor(k));
           }
        }
  
@@ -22,7 +22,7 @@
        ItemStack itemstack = this.f_97711_.m_41619_() ? this.f_97732_.m_142621_() : this.f_97711_;
        if (!itemstack.m_41619_()) {
           int l1 = 8;
-@@ -147,9 +_,13 @@
+@@ -155,9 +_,13 @@
     }
  
     public static void m_169606_(PoseStack p_169607_, int p_169608_, int p_169609_, int p_169610_) {
@@ -37,17 +37,19 @@
        RenderSystem.m_69444_(true, true, true, true);
        RenderSystem.m_69482_();
     }
-@@ -165,7 +_,8 @@
-       p_275498_.m_85836_();
-       p_275498_.m_252880_(0.0F, 0.0F, 232.0F);
-       this.f_96542_.m_274369_(p_275498_, p_275341_, p_275289_, p_275690_);
--      this.f_96542_.m_274364_(p_275498_, this.f_96547_, p_275341_, p_275289_, p_275690_ - (this.f_97711_.m_41619_() ? 0 : 8), p_275201_);
-+      var font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_275341_).getFont(p_275341_, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.ITEM_COUNT);
-+      this.f_96542_.m_274364_(p_275498_, font == null ? this.f_96547_ : font, p_275341_, p_275289_, p_275690_ - (this.f_97711_.m_41619_() ? 0 : 8), p_275201_);
-       p_275498_.m_85849_();
+@@ -175,8 +_,10 @@
+       RenderSystem.m_157182_();
+       this.m_93250_(200);
+       this.f_96542_.f_115093_ = 200.0F;
++      var font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_97783_).getFont(p_97783_, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.ITEM_COUNT);
++      if (font == null) font = this.f_96547_;
+       this.f_96542_.m_115203_(p_97783_, p_97784_, p_97785_);
+-      this.f_96542_.m_115174_(this.f_96547_, p_97783_, p_97784_, p_97785_ - (this.f_97711_.m_41619_() ? 0 : 8), p_97786_);
++      this.f_96542_.m_115174_(font, p_97783_, p_97784_, p_97785_ - (this.f_97711_.m_41619_() ? 0 : 8), p_97786_);
+       this.m_93250_(0);
+       this.f_96542_.f_115093_ = 0.0F;
     }
- 
-@@ -272,7 +_,8 @@
+@@ -286,7 +_,8 @@
        if (super.m_6375_(p_97748_, p_97749_, p_97750_)) {
           return true;
        } else {
@@ -57,7 +59,7 @@
           Slot slot = this.m_97744_(p_97748_, p_97749_);
           long i = Util.m_137550_();
           this.f_97723_ = this.f_97709_ == slot && i - this.f_97721_ < 250L && this.f_97722_ == p_97750_;
-@@ -283,6 +_,7 @@
+@@ -297,6 +_,7 @@
              int j = this.f_97735_;
              int k = this.f_97736_;
              boolean flag1 = this.m_7467_(p_97748_, p_97749_, j, k, p_97750_);
@@ -65,7 +67,7 @@
              int l = -1;
              if (slot != null) {
                 l = slot.f_40219_;
-@@ -308,7 +_,7 @@
+@@ -322,7 +_,7 @@
                    }
                 } else if (!this.f_97738_) {
                    if (this.f_97732_.m_142621_().m_41619_()) {
@@ -74,7 +76,7 @@
                          this.m_6597_(slot, l, p_97750_, ClickType.CLONE);
                       } else {
                          boolean flag2 = l != -999 && (InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 340) || InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 344));
-@@ -332,7 +_,7 @@
+@@ -346,7 +_,7 @@
                          this.f_97717_ = 0;
                       } else if (p_97750_ == 1) {
                          this.f_97717_ = 1;
@@ -83,7 +85,7 @@
                          this.f_97717_ = 2;
                       }
                    }
-@@ -401,10 +_,13 @@
+@@ -415,10 +_,13 @@
     }
  
     public boolean m_6348_(double p_97812_, double p_97813_, int p_97814_) {
@@ -97,7 +99,7 @@
        int k = -1;
        if (slot != null) {
           k = slot.f_40219_;
-@@ -418,7 +_,7 @@
+@@ -432,7 +_,7 @@
           if (m_96638_()) {
              if (!this.f_97724_.m_41619_()) {
                 for(Slot slot2 : this.f_97732_.f_38839_) {
@@ -106,7 +108,7 @@
                       this.m_6597_(slot2, slot2.f_40219_, p_97814_, ClickType.QUICK_MOVE);
                    }
                 }
-@@ -481,7 +_,7 @@
+@@ -495,7 +_,7 @@
  
              this.m_6597_((Slot)null, -999, AbstractContainerMenu.m_38930_(2, this.f_97717_), ClickType.QUICK_CRAFT);
           } else if (!this.f_97732_.m_142621_().m_41619_()) {
@@ -115,7 +117,7 @@
                 this.m_6597_(slot, k, p_97814_, ClickType.CLONE);
              } else {
                 boolean flag1 = k != -999 && (InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 340) || InputConstants.m_84830_(Minecraft.m_91087_().m_91268_().m_85439_(), 344));
-@@ -528,34 +_,39 @@
+@@ -542,34 +_,39 @@
     }
  
     public boolean m_7933_(int p_97765_, int p_97766_, int p_97767_) {
@@ -162,7 +164,7 @@
                 this.m_6597_(this.f_97734_, this.f_97734_.f_40219_, i, ClickType.SWAP);
                 return true;
              }
-@@ -590,6 +_,18 @@
+@@ -604,6 +_,18 @@
  
     public T m_6262_() {
        return this.f_97732_;

patches/minecraft/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java.patch

@@ -1,279 +1,257 @@
 --- a/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
-@@ -75,6 +_,8 @@
+@@ -72,6 +_,8 @@
+    private Slot f_98512_;
+    private CreativeInventoryListener f_98513_;
+    private boolean f_98514_;
++   private static int tabPage = 0;
++   private int maxPages = 0;
     private boolean f_98515_;
     private final Set<TagKey<Item>> f_98516_ = new HashSet<>();
-    private final boolean f_256872_;
-+   private final List<net.minecraftforge.client.gui.CreativeTabsScreenPage> pages = new java.util.ArrayList<>();
-+   private net.minecraftforge.client.gui.CreativeTabsScreenPage currentPage = new net.minecraftforge.client.gui.CreativeTabsScreenPage(new java.util.ArrayList<>());
  
-    public CreativeModeInventoryScreen(Player p_259788_, FeatureFlagSet p_260074_, boolean p_259569_) {
-       super(new CreativeModeInventoryScreen.ItemPickerMenu(p_259788_), p_259788_.m_150109_(), CommonComponents.f_237098_);
-@@ -109,7 +_,7 @@
-    private void m_257687_(Collection<ItemStack> p_261591_) {
-       int i = this.f_97732_.m_257485_(this.f_98508_);
-       (this.f_97732_).f_98639_.clear();
--      if (f_98507_.m_257962_() == CreativeModeTab.Type.SEARCH) {
-+      if (f_98507_.hasSearchBar()) {
-          this.m_98630_();
-       } else {
-          (this.f_97732_).f_98639_.addAll(p_261591_);
-@@ -273,6 +_,34 @@
+@@ -231,6 +_,12 @@
     protected void m_7856_() {
        if (this.f_96541_.f_91072_.m_105290_()) {
           super.m_7856_();
-+         this.pages.clear();
-+         int tabIndex = 0;
-+         List<CreativeModeTab> currentPage = new java.util.ArrayList<>();
-+         for (CreativeModeTab sortedCreativeModeTab : net.minecraftforge.common.CreativeModeTabRegistry.getSortedCreativeModeTabs()) {
-+            currentPage.add(sortedCreativeModeTab);
-+            tabIndex++;
-+            if (tabIndex == 10) {
-+               this.pages.add(new net.minecraftforge.client.gui.CreativeTabsScreenPage(currentPage));
-+               currentPage = new java.util.ArrayList<>();
-+               tabIndex = 0;
-+            }
-+         }
-+         if (tabIndex != 0) {
-+            this.pages.add(new net.minecraftforge.client.gui.CreativeTabsScreenPage(currentPage));
-+         }
-+         if (this.pages.isEmpty()) {
-+            this.currentPage = new net.minecraftforge.client.gui.CreativeTabsScreenPage(new java.util.ArrayList<>());
-+         } else {
-+            this.currentPage = this.pages.get(0);
-+         }
-+         if (this.pages.size() > 1) {
-+            m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_("<"), b -> setCurrentPage(this.pages.get(Math.max(this.pages.indexOf(this.currentPage) - 1, 0)))).m_252794_(f_97735_,  f_97736_ - 50).m_253046_(20, 20).m_253136_());
-+            m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_(">"), b -> setCurrentPage(this.pages.get(Math.min(this.pages.indexOf(this.currentPage) + 1, this.pages.size() - 1)))).m_252794_(f_97735_ + f_97726_ - 20, f_97736_ - 50).m_253046_(20, 20).m_253136_());
-+         }
-+         this.currentPage = this.pages.stream().filter(page -> page.getVisibleTabs().contains(f_98507_)).findFirst().orElse(this.currentPage);
-+         if (!this.currentPage.getVisibleTabs().contains(f_98507_)) {
-+            f_98507_ = this.currentPage.getVisibleTabs().get(0);
++         int tabCount = CreativeModeTab.f_40748_.length;
++         if (tabCount > 12) {
++            m_142416_(new net.minecraft.client.gui.components.Button(f_97735_,              f_97736_ - 50, 20, 20, Component.m_237113_("<"), b -> tabPage = Math.max(tabPage - 1, 0       )));
++            m_142416_(new net.minecraft.client.gui.components.Button(f_97735_ + f_97726_ - 20, f_97736_ - 50, 20, 20, Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages)));
++            maxPages = (int) Math.ceil((tabCount - 12) / 10D);
 +         }
+          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, Component.m_237115_("itemGroup.search"));
           this.f_98510_.m_94199_(50);
-          this.f_98510_.m_94182_(false);
-@@ -318,7 +_,7 @@
+@@ -272,7 +_,7 @@
     public boolean m_5534_(char p_98521_, int p_98522_) {
        if (this.f_98514_) {
           return false;
--      } else if (f_98507_.m_257962_() != CreativeModeTab.Type.SEARCH) {
-+      } else if (!f_98507_.hasSearchBar()) {
+-      } else if (f_98507_ != CreativeModeTab.f_40754_.m_40775_()) {
++      } else if (!CreativeModeTab.f_40748_[f_98507_].hasSearchBar()) {
           return false;
        } else {
           String s = this.f_98510_.m_94155_();
-@@ -336,7 +_,7 @@
+@@ -290,7 +_,7 @@
  
     public boolean m_7933_(int p_98547_, int p_98548_, int p_98549_) {
        this.f_98514_ = false;
--      if (f_98507_.m_257962_() != CreativeModeTab.Type.SEARCH) {
-+      if (!f_98507_.hasSearchBar()) {
+-      if (f_98507_ != CreativeModeTab.f_40754_.m_40775_()) {
++      if (!CreativeModeTab.f_40748_[f_98507_].hasSearchBar()) {
           if (this.f_96541_.f_91066_.f_92098_.m_90832_(p_98547_, p_98548_)) {
              this.f_98514_ = true;
-             this.m_98560_(CreativeModeTabs.m_258007_());
-@@ -371,6 +_,7 @@
-    }
- 
+             this.m_98560_(CreativeModeTab.f_40754_);
+@@ -327,6 +_,32 @@
     private void m_98630_() {
-+      if (!f_98507_.hasSearchBar()) return;
        (this.f_97732_).f_98639_.clear();
        this.f_98516_.clear();
++
++      CreativeModeTab tab = CreativeModeTab.f_40748_[f_98507_];
++      if (tab.hasSearchBar() && tab != CreativeModeTab.f_40754_) {
++         tab.m_6151_(f_97732_.f_98639_);
++         if (!this.f_98510_.m_94155_().isEmpty()) {
++            //TODO: Make this a SearchTree not a manual search
++            String search = this.f_98510_.m_94155_().toLowerCase(Locale.ROOT);
++            java.util.Iterator<ItemStack> itr = f_97732_.f_98639_.iterator();
++            while (itr.hasNext()) {
++               ItemStack stack = itr.next();
++               boolean matches = false;
++               for (Component line : stack.m_41651_(this.f_96541_.f_91074_, this.f_96541_.f_91066_.f_92125_ ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL)) {
++                  if (ChatFormatting.m_126649_(line.getString()).toLowerCase(Locale.ROOT).contains(search)) {
++                     matches = true;
++                     break;
++                  }
++               }
++               if (!matches)
++                  itr.remove();
++            }
++         }
++         this.f_98508_ = 0.0F;
++         f_97732_.m_98642_(0.0F);
++         return;
++      }
++
        String s = this.f_98510_.m_94155_();
-@@ -380,10 +_,10 @@
-          SearchTree<ItemStack> searchtree;
-          if (s.startsWith("#")) {
-             s = s.substring(1);
--            searchtree = this.f_96541_.m_231372_(SearchRegistry.f_119942_);
-+            searchtree = this.f_96541_.m_231372_(net.minecraftforge.client.CreativeModeTabSearchRegistry.getTagSearchKey(f_98507_));
-             this.m_98619_(s);
-          } else {
--            searchtree = this.f_96541_.m_231372_(SearchRegistry.f_119941_);
-+            searchtree = this.f_96541_.m_231372_(net.minecraftforge.client.CreativeModeTabSearchRegistry.getNameSearchKey(f_98507_));
-          }
- 
-          (this.f_97732_).f_98639_.addAll(searchtree.m_6293_(s.toLowerCase(Locale.ROOT)));
-@@ -415,7 +_,8 @@
+       if (s.isEmpty()) {
+          for(Item item : Registry.f_122827_) {
+@@ -371,9 +_,9 @@
  
     protected void m_7027_(PoseStack p_98616_, int p_98617_, int p_98618_) {
-       if (f_98507_.m_40789_()) {
--         this.f_96547_.m_92889_(p_98616_, f_98507_.m_40786_(), 8.0F, 6.0F, 4210752);
-+         RenderSystem.m_69461_();
-+         this.f_96547_.m_92889_(p_98616_, f_98507_.m_40786_(), 8.0F, 6.0F, f_98507_.getLabelColor());
+       CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[f_98507_];
+-      if (creativemodetab.m_40789_()) {
++      if (creativemodetab != null && creativemodetab.m_40789_()) {
+          RenderSystem.m_69461_();
+-         this.f_96547_.m_92889_(p_98616_, creativemodetab.m_40786_(), 8.0F, 6.0F, 4210752);
++         this.f_96547_.m_92889_(p_98616_, creativemodetab.m_40786_(), 8.0F, 6.0F, creativemodetab.getLabelColor());
        }
  
     }
-@@ -425,7 +_,7 @@
-          double d0 = p_98531_ - (double)this.f_97735_;
+@@ -384,7 +_,7 @@
           double d1 = p_98532_ - (double)this.f_97736_;
  
--         for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+         for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-             if (this.m_98562_(creativemodetab, d0, d1)) {
+          for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
+-            if (this.m_98562_(creativemodetab, d0, d1)) {
++            if (creativemodetab != null && this.m_98562_(creativemodetab, d0, d1)) {
                 return true;
              }
-@@ -446,7 +_,7 @@
-          double d1 = p_98623_ - (double)this.f_97736_;
+          }
+@@ -405,7 +_,7 @@
           this.f_98509_ = false;
  
--         for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+         for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-             if (this.m_98562_(creativemodetab, d0, d1)) {
+          for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
+-            if (this.m_98562_(creativemodetab, d0, d1)) {
++            if (creativemodetab != null && this.m_98562_(creativemodetab, d0, d1)) {
                 this.m_98560_(creativemodetab);
                 return true;
-@@ -464,6 +_,7 @@
+             }
+@@ -416,12 +_,15 @@
+    }
+ 
+    private boolean m_98631_() {
++      if (CreativeModeTab.f_40748_[f_98507_] == null) return false;
+       return f_98507_ != CreativeModeTab.f_40761_.m_40775_() && CreativeModeTab.f_40748_[f_98507_].m_40791_() && this.f_97732_.m_98654_();
+    }
+ 
     private void m_98560_(CreativeModeTab p_98561_) {
-       CreativeModeTab creativemodetab = f_98507_;
-       f_98507_ = p_98561_;
++      if (p_98561_ == null) return;
+       int i = f_98507_;
+       f_98507_ = p_98561_.m_40775_();
 +      slotColor = p_98561_.getSlotColor();
        this.f_97737_.clear();
        (this.f_97732_).f_98639_.clear();
        this.m_238391_();
-@@ -540,13 +_,15 @@
-          this.f_98511_ = null;
+@@ -499,13 +_,15 @@
        }
  
--      if (f_98507_.m_257962_() == CreativeModeTab.Type.SEARCH) {
-+      if (f_98507_.hasSearchBar()) {
-          this.f_98510_.m_94194_(true);
-          this.f_98510_.m_94190_(false);
-          this.f_98510_.m_93692_(true);
-          if (creativemodetab != p_98561_) {
-             this.f_98510_.m_94144_("");
-          }
-+         this.f_98510_.m_93674_(f_98507_.getSearchBarWidth());
-+         this.f_98510_.m_252865_(this.f_97735_ + (82 /*default left*/ + 89 /*default width*/) - this.f_98510_.m_5711_());
+       if (this.f_98510_ != null) {
+-         if (p_98561_ == CreativeModeTab.f_40754_) {
++         if (p_98561_.hasSearchBar()) {
+             this.f_98510_.m_94194_(true);
+             this.f_98510_.m_94190_(false);
+             this.f_98510_.m_94178_(true);
+             if (i != p_98561_.m_40775_()) {
+                this.f_98510_.m_94144_("");
+             }
++            this.f_98510_.m_93674_(p_98561_.getSearchbarWidth());
++            this.f_98510_.f_93620_ = this.f_97735_ + (82 /*default left*/ + 89 /*default width*/) - this.f_98510_.m_5711_();
  
-          this.m_98630_();
-       } else {
-@@ -603,7 +_,7 @@
+             this.m_98630_();
+          } else {
+@@ -565,16 +_,34 @@
        this.m_7333_(p_98577_);
-       super.m_86412_(p_98577_, p_98578_, p_98579_, p_98580_);
+       super.m_6305_(p_98577_, p_98578_, p_98579_, p_98580_);
  
--      for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+      for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-          if (this.m_98584_(p_98577_, creativemodetab, p_98578_, p_98579_)) {
+-      for(CreativeModeTab creativemodetab : CreativeModeTab.f_40748_) {
+-         if (this.m_98584_(p_98577_, creativemodetab, p_98578_, p_98579_)) {
++      int start = tabPage * 10;
++      int end = Math.min(CreativeModeTab.f_40748_.length, ((tabPage + 1) * 10) + 2);
++      if (tabPage != 0) start += 2;
++      boolean rendered = false;
++
++      for (int x = start; x < end; x++) {
++         CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[x];
++         if (creativemodetab != null && this.m_98584_(p_98577_, creativemodetab, p_98578_, p_98579_)) {
++            rendered = true;
              break;
           }
-@@ -613,13 +_,22 @@
+       }
++      if (!rendered && !this.m_98584_(p_98577_, CreativeModeTab.f_40754_, p_98578_, p_98579_))
++         this.m_98584_(p_98577_, CreativeModeTab.f_40761_, p_98578_, p_98579_);
+ 
+       if (this.f_98512_ != null && f_98507_ == CreativeModeTab.f_40761_.m_40775_() && this.m_6774_(this.f_98512_.f_40220_, this.f_98512_.f_40221_, 16, 16, (double)p_98578_, (double)p_98579_)) {
           this.m_96602_(p_98577_, f_98506_, p_98578_, p_98579_);
        }
  
-+      if (this.pages.size() != 1) {
-+         Component page = Component.m_237113_(String.format("%d / %d", this.pages.indexOf(this.currentPage) + 1, this.pages.size()));
-+         p_98577_.m_85836_();
-+         p_98577_.m_252880_(0F, 0F, 300F);
-+         f_96547_.m_92744_(p_98577_, page.m_7532_(), f_97735_ + (f_97726_ / 2f) - (f_96547_.m_92852_(page) / 2f), f_97736_ - 44, -1);
-+         p_98577_.m_85849_();
++      if (maxPages != 0) {
++          Component page = Component.m_237113_(String.format("%d / %d", tabPage + 1, maxPages + 1));
++          this.m_93250_(300);
++          this.f_96542_.f_115093_ = 300.0F;
++          f_96547_.m_92744_(p_98577_, page.m_7532_(), f_97735_ + (f_97726_ / 2) - (f_96547_.m_92852_(page) / 2), f_97736_ - 44, -1);
++          this.m_93250_(0);
++          this.f_96542_.f_115093_ = 0.0F;
 +      }
 +
-+      RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
+       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
        this.m_7025_(p_98577_, p_98578_, p_98579_);
     }
- 
-    protected void m_6057_(PoseStack p_98590_, ItemStack p_98591_, int p_98592_, int p_98593_) {
-       boolean flag = this.f_97734_ != null && this.f_97734_ instanceof CreativeModeInventoryScreen.CustomCreativeSlot;
-       boolean flag1 = f_98507_.m_257962_() == CreativeModeTab.Type.CATEGORY;
--      boolean flag2 = f_98507_.m_257962_() == CreativeModeTab.Type.SEARCH;
-+      boolean flag2 = f_98507_.hasSearchBar();
-       TooltipFlag.Default tooltipflag$default = this.f_96541_.f_91066_.f_92125_ ? TooltipFlag.Default.f_256730_ : TooltipFlag.Default.f_256752_;
-       TooltipFlag tooltipflag = flag ? tooltipflag$default.m_257777_() : tooltipflag$default;
-       List<Component> list = p_98591_.m_41651_(this.f_96541_.f_91074_, tooltipflag);
-@@ -639,35 +_,36 @@
- 
-          int i = 1;
- 
--         for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
--            if (creativemodetab.m_257962_() != CreativeModeTab.Type.SEARCH && creativemodetab.m_257694_(p_98591_)) {
-+         for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-+            if (!creativemodetab.hasSearchBar() && creativemodetab.m_257694_(p_98591_)) {
-                list1.add(i++, creativemodetab.m_40786_().m_6881_().m_130940_(ChatFormatting.BLUE));
-             }
+@@ -609,7 +_,7 @@
+             list1.add(1, creativemodetab.m_40786_().m_6881_().m_130940_(ChatFormatting.BLUE));
           }
-       }
  
--      this.m_169388_(p_98590_, list1, p_98591_.m_150921_(), p_98592_, p_98593_);
-+      this.renderTooltip(p_98590_, list1, p_98591_.m_150921_(), p_98592_, p_98593_, null, p_98591_);
-    }
- 
-    protected void m_7286_(PoseStack p_98572_, float p_98573_, int p_98574_, int p_98575_) {
--      for(CreativeModeTab creativemodetab : CreativeModeTabs.m_257388_()) {
-+      for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-          RenderSystem.m_157456_(0, f_98504_);
-          if (creativemodetab != f_98507_) {
-             this.m_98581_(p_98572_, creativemodetab);
-          }
-       }
- 
--      RenderSystem.m_157456_(0, new ResourceLocation("textures/gui/container/creative_inventory/tab_" + f_98507_.m_40788_()));
-+      RenderSystem.m_157456_(0, f_98507_.getBackgroundLocation());
-       m_93228_(p_98572_, this.f_97735_, this.f_97736_, 0, 0, this.f_97726_, this.f_97727_);
-       this.f_98510_.m_86412_(p_98572_, p_98574_, p_98575_, p_98573_);
-       int j = this.f_97735_ + 175;
-       int k = this.f_97736_ + 18;
-       int i = k + 112;
--      RenderSystem.m_157456_(0, f_98504_);
-+      RenderSystem.m_157456_(0, f_98507_.getTabsImage());
-       if (f_98507_.m_40791_()) {
-          m_93228_(p_98572_, j, k + (int)((float)(i - k - 17) * this.f_98508_), 232 + (this.m_98631_() ? 0 : 12), 0, 12, 15);
-       }
- 
-+      if (currentPage.getVisibleTabs().contains(f_98507_)) //Forge: only display tab selection when the selected tab is on the current page
-       this.m_98581_(p_98572_, f_98507_);
-       if (f_98507_.m_257962_() == CreativeModeTab.Type.INVENTORY) {
-          InventoryScreen.m_274545_(p_98572_, 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_);
-@@ -676,7 +_,7 @@
-    }
- 
-    private int m_258094_(CreativeModeTab p_260136_) {
--      int i = p_260136_.m_257903_();
-+      int i = currentPage.getColumn(p_260136_);
-       int j = 27;
-       int k = 27 * i;
-       if (p_260136_.m_6563_()) {
-@@ -688,7 +_,7 @@
- 
-    private int m_257995_(CreativeModeTab p_260181_) {
-       int i = 0;
--      if (p_260181_.m_258064_() == CreativeModeTab.Row.TOP) {
-+      if (currentPage.isTop(p_260181_)) {
-          i -= 32;
+-         this.m_169388_(p_98590_, list1, p_98591_.m_150921_(), p_98592_, p_98593_);
++         this.renderTooltip(p_98590_, list1, p_98591_.m_150921_(), p_98592_, p_98593_, p_98591_);
        } else {
-          i += this.f_97727_;
-@@ -716,8 +_,8 @@
+          super.m_6057_(p_98590_, p_98591_, p_98592_, p_98593_);
+       }
+@@ -620,16 +_,32 @@
+       RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
+       CreativeModeTab creativemodetab = CreativeModeTab.f_40748_[f_98507_];
  
-    protected void m_98581_(PoseStack p_98582_, CreativeModeTab p_98583_) {
-       boolean flag = p_98583_ == f_98507_;
--      boolean flag1 = p_98583_.m_258064_() == CreativeModeTab.Row.TOP;
--      int i = p_98583_.m_257903_();
-+      boolean flag1 = currentPage.isTop(p_98583_);
-+      int i = currentPage.getColumn(p_98583_);
-       int j = i * 26;
+-      for(CreativeModeTab creativemodetab1 : CreativeModeTab.f_40748_) {
++      int start = tabPage * 10;
++      int end = Math.min(CreativeModeTab.f_40748_.length, ((tabPage + 1) * 10 + 2));
++      if (tabPage != 0) start += 2;
++
++      for (int idx = start; idx < end; idx++) {
+          RenderSystem.m_157427_(GameRenderer::m_172817_);
+-         RenderSystem.m_157456_(0, f_98504_);
+-         if (creativemodetab1.m_40775_() != f_98507_) {
++         CreativeModeTab creativemodetab1 = CreativeModeTab.f_40748_[idx];
++         if (creativemodetab1 != null && creativemodetab1.m_40775_() != f_98507_) {
++            RenderSystem.m_157456_(0, creativemodetab1.getTabsImage());
+             this.m_98581_(p_98572_, creativemodetab1);
+          }
+       }
+ 
+       RenderSystem.m_157427_(GameRenderer::m_172817_);
+-      RenderSystem.m_157456_(0, new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativemodetab.m_40788_()));
++      if (tabPage != 0) {
++         if (creativemodetab != CreativeModeTab.f_40754_) {
++            RenderSystem.m_157456_(0, CreativeModeTab.f_40754_.getTabsImage());
++            m_98581_(p_98572_, CreativeModeTab.f_40754_);
++         }
++         if (creativemodetab != CreativeModeTab.f_40761_) {
++            RenderSystem.m_157456_(0, CreativeModeTab.f_40761_.getTabsImage());
++            m_98581_(p_98572_, CreativeModeTab.f_40761_);
++         }
++      }
++
++      RenderSystem.m_157456_(0, creativemodetab.getBackgroundImage());
+       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);
+@@ -637,11 +_,14 @@
+       int j = this.f_97736_ + 18;
+       int k = j + 112;
+       RenderSystem.m_157427_(GameRenderer::m_172817_);
+-      RenderSystem.m_157456_(0, f_98504_);
++      RenderSystem.m_157456_(0, creativemodetab.getTabsImage());
+       if (creativemodetab.m_40791_()) {
+          this.m_93228_(p_98572_, i, j + (int)((float)(k - j - 17) * this.f_98508_), 232 + (this.m_98631_() ? 0 : 12), 0, 12, 15);
+       }
+ 
++      if ((creativemodetab == null || creativemodetab.getTabPage() != tabPage) && (creativemodetab != CreativeModeTab.f_40754_ && creativemodetab != CreativeModeTab.f_40761_))
++         return;
++
+       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_);
+@@ -650,6 +_,7 @@
+    }
+ 
+    protected boolean m_98562_(CreativeModeTab p_98563_, double p_98564_, double p_98565_) {
++      if (p_98563_.getTabPage() != tabPage && p_98563_ != CreativeModeTab.f_40754_ && p_98563_ != CreativeModeTab.f_40761_) return false;
+       int i = p_98563_.m_40793_();
+       int j = 28 * i;
        int k = 0;
-       int l = this.f_97735_ + this.m_258094_(p_98583_);
-@@ -734,6 +_,7 @@
+@@ -718,6 +_,7 @@
           i1 += this.f_97727_ - 4;
        }
  
 +      RenderSystem.m_69478_(); //Forge: Make sure blend is enabled else tabs show a white border.
-       m_93228_(p_98582_, l, i1, j, k, 26, 32);
-       p_98582_.m_85836_();
-       p_98582_.m_252880_(0.0F, 0.0F, 100.0F);
-@@ -777,6 +_,14 @@
- 
-    }
- 
-+   public net.minecraftforge.client.gui.CreativeTabsScreenPage getCurrentPage() {
-+      return currentPage;
-+   }
-+
-+   public void setCurrentPage(net.minecraftforge.client.gui.CreativeTabsScreenPage currentPage) {
-+      this.currentPage = currentPage;
-+   }
-+
-    @OnlyIn(Dist.CLIENT)
-    static class CustomCreativeSlot extends Slot {
-       public CustomCreativeSlot(Container p_98633_, int p_98634_, int p_98635_, int p_98636_) {
-@@ -944,6 +_,22 @@
+       this.m_93228_(p_98582_, l, i1, j, k, 28, 32);
+       this.f_96542_.f_115093_ = 100.0F;
+       l += 6;
+@@ -909,6 +_,22 @@
  
        public boolean m_8010_(Player p_98665_) {
           return this.f_98655_.m_8010_(p_98665_);

patches/minecraft/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
 @@ -42,12 +_,17 @@
-       Collection<MobEffectInstance> collection = this.f_96541_.f_91074_.m_21220_();
        if (!collection.isEmpty() && j >= 32) {
+          RenderSystem.m_157429_(1.0F, 1.0F, 1.0F, 1.0F);
           boolean flag = j >= 120;
 +         var event = net.minecraftforge.client.ForgeHooksClient.onScreenPotionSize(this, j, !flag, i);
 +         if (event.isCanceled()) return;
@@ -19,27 +19,27 @@
           this.m_194002_(p_194015_, i, k, iterable, flag);
           this.m_194008_(p_194015_, i, k, iterable, flag);
           if (flag) {
-@@ -94,6 +_,11 @@
+@@ -95,6 +_,11 @@
        int i = this.f_97736_;
  
        for(MobEffectInstance mobeffectinstance : p_194012_) {
 +         var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
-+         if (renderer.renderInventoryIcon(mobeffectinstance, this, p_194009_, p_194010_ + (p_194013_ ? 6 : 7), i, 0)) {
++         if (renderer.renderInventoryIcon(mobeffectinstance, this, p_194009_, p_194010_ + (p_194013_ ? 6 : 7), i, this.m_93252_())) {
 +            i += p_194011_;
 +            continue;
 +         }
           MobEffect mobeffect = mobeffectinstance.m_19544_();
           TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.m_118732_(mobeffect);
-          RenderSystem.m_157456_(0, textureatlassprite.m_247685_());
-@@ -107,6 +_,11 @@
+          RenderSystem.m_157456_(0, textureatlassprite.m_118414_().m_118330_());
+@@ -108,6 +_,11 @@
        int i = this.f_97736_;
  
        for(MobEffectInstance mobeffectinstance : p_98726_) {
 +         var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
-+         if (renderer.renderInventoryText(mobeffectinstance, this, p_98723_, p_98724_, i, 0)) {
++         if (renderer.renderInventoryText(mobeffectinstance, this, p_98723_, p_98724_, i, this.m_93252_())) {
 +            i += p_98725_;
 +            continue;
 +         }
           Component component = this.m_194000_(mobeffectinstance);
           this.f_96547_.m_92763_(p_98723_, component, (float)(p_98724_ + 10 + 18), (float)(i + 6), 16777215);
-          Component component1 = MobEffectUtil.m_267641_(mobeffectinstance, 1.0F);
+          String s = MobEffectUtil.m_19581_(mobeffectinstance, 1.0F);

patches/minecraft/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java.patch

@@ -1,15 +1,15 @@
 --- a/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
-@@ -140,7 +_,7 @@
+@@ -150,7 +_,7 @@
              int i2 = 86 - this.f_96547_.m_92895_(s);
              FormattedText formattedtext = EnchantmentNames.m_98734_().m_98737_(this.f_96547_, i2);
              int j2 = 6839882;
 -            if ((l < i1 + 1 || this.f_96541_.f_91074_.f_36078_ < l1) && !this.f_96541_.f_91074_.m_150110_().f_35937_) {
 +            if (((l < i1 + 1 || this.f_96541_.f_91074_.f_36078_ < l1) && !this.f_96541_.f_91074_.m_150110_().f_35937_) || this.f_97732_.f_39447_[i1] == -1) { // Forge: render buttons as disabled when enchantable but enchantability not met on lower levels
-                m_93228_(p_98762_, j1, j + 14 + 19 * i1, 0, 185, 108, 19);
-                m_93228_(p_98762_, j1 + 1, j + 15 + 19 * i1, 16 * i1, 239, 16, 16);
-                this.f_96547_.m_274535_(p_98762_, formattedtext, k1, j + 16 + 19 * i1, i2, (j2 & 16711422) >> 1);
-@@ -179,10 +_,13 @@
+                this.m_93228_(p_98762_, j1, j + 14 + 19 * i1, 0, 185, 108, 19);
+                this.m_93228_(p_98762_, j1 + 1, j + 15 + 19 * i1, 16 * i1, 239, 16, 16);
+                this.f_96547_.m_92857_(formattedtext, k1, j + 16 + 19 * i1, i2, (j2 & 16711422) >> 1);
+@@ -189,10 +_,13 @@
           Enchantment enchantment = Enchantment.m_44697_((this.f_97732_).f_39447_[j]);
           int l = (this.f_97732_).f_39448_[j];
           int i1 = j + 1;

patches/minecraft/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java.patch

@@ -1,11 +0,0 @@
---- a/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java
-+++ b/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java
-@@ -17,7 +_,7 @@
-    private static final Vector3f f_243728_ = new Vector3f(1.0F, 1.0F, 1.0F);
-    private static final int f_244604_ = 16;
-    private static final int f_244207_ = 16;
--   private final ResourceLocation f_243720_ = new ResourceLocation("textures/gui/hanging_signs/" + this.f_244069_.f_61839_() + ".png");
-+   private final ResourceLocation f_243720_ = new ResourceLocation(this.f_244069_.f_61839_() + ".png").m_246208_("textures/gui/hanging_signs/");
- 
-    public HangingSignEditScreen(SignBlockEntity p_249425_, boolean p_250356_) {
-       super(p_249425_, p_250356_, Component.m_237115_("hanging_sign.edit"));

patches/minecraft/net/minecraft/client/gui/screens/inventory/InventoryScreen.java.patch

@@ -1,16 +1,14 @@
 --- a/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
-@@ -98,6 +_,13 @@
-    public static void m_274545_(PoseStack p_275396_, int p_275688_, int p_275245_, int p_275535_, float p_275604_, float p_275546_, LivingEntity p_275689_) {
-       float f = (float)Math.atan((double)(p_275604_ / 40.0F));
-       float f1 = (float)Math.atan((double)(p_275546_ / 40.0F));
-+      // Forge: Allow passing in direct angle components instead of mouse position
-+      renderEntityInInventoryFollowsAngle(p_275396_, p_275688_, p_275245_, p_275535_, f, f1, p_275689_);
+@@ -100,6 +_,11 @@
+    public static void m_98850_(int p_98851_, int p_98852_, int p_98853_, float p_98854_, float p_98855_, LivingEntity p_98856_) {
+       float f = (float)Math.atan((double)(p_98854_ / 40.0F));
+       float f1 = (float)Math.atan((double)(p_98855_ / 40.0F));
++      renderEntityInInventoryRaw(p_98851_, p_98852_, p_98853_, f, f1, p_98856_);
 +   }
-+
-+   public static void renderEntityInInventoryFollowsAngle(PoseStack p_275396_, int p_275688_, int p_275245_, int p_275535_, float angleXComponent, float angleYComponent, LivingEntity p_275689_) {
++   public static void renderEntityInInventoryRaw(int p_98851_, int p_98852_, int p_98853_, float angleXComponent, float angleYComponent, LivingEntity p_98856_) {
 +      float f = angleXComponent;
 +      float f1 = angleYComponent;
-       Quaternionf quaternionf = (new Quaternionf()).rotateZ((float)Math.PI);
-       Quaternionf quaternionf1 = (new Quaternionf()).rotateX(f1 * 20.0F * ((float)Math.PI / 180F));
-       quaternionf.mul(quaternionf1);
+       PoseStack posestack = RenderSystem.m_157191_();
+       posestack.m_85836_();
+       posestack.m_85837_((double)p_98851_, (double)p_98852_, 1050.0D);

patches/minecraft/net/minecraft/client/gui/screens/inventory/MerchantScreen.java.patch

@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
 +++ b/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
-@@ -234,7 +_,12 @@
-          this.f_96542_.m_274412_(p_99163_, this.f_96547_, p_99164_, p_99166_, p_99167_);
+@@ -240,7 +_,12 @@
+          this.f_96542_.m_115169_(this.f_96547_, p_99164_, p_99166_, p_99167_);
        } else {
-          this.f_96542_.m_274364_(p_99163_, this.f_96547_, p_99165_, p_99166_, p_99167_, p_99165_.m_41613_() == 1 ? "1" : null);
--         this.f_96542_.m_274364_(p_99163_, this.f_96547_, p_99164_, p_99166_ + 14, p_99167_, p_99164_.m_41613_() == 1 ? "1" : null);
+          this.f_96542_.m_115174_(this.f_96547_, p_99165_, p_99166_, p_99167_, p_99165_.m_41613_() == 1 ? "1" : null);
+-         this.f_96542_.m_115174_(this.f_96547_, p_99164_, p_99166_ + 14, p_99167_, p_99164_.m_41613_() == 1 ? "1" : null);
 +         // Forge: fixes Forge-8806, code for count rendering taken from ItemRenderer#renderGuiItemDecorations
 +         PoseStack posestack = new PoseStack();
-+         posestack.m_85837_(0.0D, 0.0D, 200F);
++         posestack.m_85837_(0.0D, 0.0D, (f_96542_.f_115093_ + 200.0F));
 +         net.minecraft.client.renderer.MultiBufferSource.BufferSource bufferSource = net.minecraft.client.renderer.MultiBufferSource.m_109898_(com.mojang.blaze3d.vertex.Tesselator.m_85913_().m_85915_());
-+         f_96547_.m_272078_(String.valueOf(p_99164_.m_41613_()), (float) (p_99166_ + 14) + 19 - 2 - f_96547_.m_92895_(String.valueOf(p_99164_.m_41613_())), (float)p_99167_ + 6 + 3, 0xFFFFFF, true, posestack.m_85850_().m_252922_(), bufferSource, net.minecraft.client.gui.Font.DisplayMode.NORMAL, 0, 15728880, false);
++         f_96547_.m_92811_(String.valueOf(p_99164_.m_41613_()), (p_99166_ + 14) + 19 - 2 - f_96547_.m_92895_(String.valueOf(p_99164_.m_41613_())), p_99167_ + 6 + 3, 0xFFFFFF, true, posestack.m_85850_().m_85861_(), bufferSource, false, 0, 15728880);
 +         bufferSource.m_109911_();
+          RenderSystem.m_157427_(GameRenderer::m_172817_);
           RenderSystem.m_157456_(0, f_99113_);
-          p_99163_.m_85836_();
-          p_99163_.m_252880_(0.0F, 0.0F, 300.0F);
+          this.m_93250_(this.m_93252_() + 300);

patches/minecraft/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
-@@ -281,6 +_,11 @@
+@@ -263,6 +_,11 @@
  
     }
  

patches/minecraft/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
 +++ b/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
-@@ -330,6 +_,8 @@
+@@ -321,6 +_,8 @@
              this.f_99855_.m_99707_(list1);
           }
  

patches/minecraft/net/minecraft/client/gui/screens/packs/PackSelectionModel.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/packs/PackSelectionModel.java
 +++ b/net/minecraft/client/gui/screens/packs/PackSelectionModel.java
-@@ -110,6 +_,8 @@
+@@ -102,6 +_,8 @@
        boolean m_7802_();
  
        boolean m_7803_();
@@ -9,7 +9,7 @@
     }
  
     @OnlyIn(Dist.CLIENT)
-@@ -198,6 +_,11 @@
+@@ -176,6 +_,11 @@
  
        public void m_7845_() {
           this.m_99938_(1);

patches/minecraft/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
 +++ b/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
-@@ -130,7 +_,7 @@
-       TransferableSelectionList.PackEntry transferableselectionlist$packentry = p_100014_.m_93511_();
-       String s = transferableselectionlist$packentry == null ? "" : transferableselectionlist$packentry.m_264411_();
-       p_100014_.m_6987_((TransferableSelectionList.PackEntry)null);
--      p_100015_.forEach((p_264692_) -> {
-+      p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach((p_264692_) -> {
-          TransferableSelectionList.PackEntry transferableselectionlist$packentry1 = new TransferableSelectionList.PackEntry(this.f_96541_, p_100014_, p_264692_);
-          p_100014_.m_6702_().add(transferableselectionlist$packentry1);
-          if (p_264692_.m_264249_().equals(s)) {
+@@ -137,7 +_,7 @@
+ 
+    private void m_100013_(TransferableSelectionList p_100014_, Stream<PackSelectionModel.Entry> p_100015_) {
+       p_100014_.m_6702_().clear();
+-      p_100015_.forEach((p_170000_) -> {
++      p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach((p_170000_) -> {
+          p_100014_.m_6702_().add(new TransferableSelectionList.PackEntry(this.f_96541_, p_100014_, this, p_170000_));
+       });
+    }

patches/minecraft/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java.patch

@@ -9,7 +9,7 @@
           this.f_100279_.add(new RecipeBookTabButton(recipebookcategories));
        }
  
-@@ -297,7 +_,7 @@
+@@ -318,7 +_,7 @@
        }
  
        if (itemstack != null && this.f_100272_.f_91080_ != null) {

patches/minecraft/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.java.patch

@@ -5,7 +5,7 @@
     public void m_100417_(PoseStack p_100418_, int p_100419_, int p_100420_) {
        if (this.f_100397_.f_91080_ != null && this.f_100395_ != null && !this.f_100396_.m_100212_()) {
 -         this.f_100397_.f_91080_.m_96597_(p_100418_, this.f_100395_.m_100477_(this.f_100397_.f_91080_), p_100419_, p_100420_);
-+         this.f_100397_.f_91080_.renderComponentTooltip(p_100418_, this.f_100395_.m_100477_(this.f_100397_.f_91080_), p_100419_, p_100420_, this.f_100395_.m_100488_().m_8043_(f_100397_.f_91073_.m_9598_()));
++         this.f_100397_.f_91080_.renderComponentTooltip(p_100418_, this.f_100395_.m_100477_(this.f_100397_.f_91080_), p_100419_, p_100420_, this.f_100395_.m_100488_().m_8043_());
        }
  
     }

patches/minecraft/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java.patch

@@ -1,40 +1,39 @@
 --- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
 +++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
-@@ -119,7 +_,8 @@
+@@ -112,7 +_,7 @@
     public static void m_232896_(Minecraft p_232897_, @Nullable Screen p_232898_) {
        m_232899_(p_232897_, f_232866_);
-       PackRepository packrepository = new PackRepository(new ServerPacksSource());
--      WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, WorldDataConfiguration.f_244649_);
-+      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.event.AddPackFindersEvent(net.minecraft.server.packs.PackType.SERVER_DATA, packrepository::addPackFinder));
-+      WorldLoader.InitConfig worldloader$initconfig = m_245574_(packrepository, new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_)); // FORGE: Load vanilla fallback with vanilla datapacks.
-       CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.m_214362_(worldloader$initconfig, (p_247792_) -> {
-          return new WorldLoader.DataLoadOutput<>(new CreateWorldScreen.DataPackReloadCookie(new WorldGenSettings(WorldOptions.m_247394_(), WorldPresets.m_246552_(p_247792_.f_244104_())), p_247792_.f_244127_()), p_247792_.f_243759_());
-       }, (p_247798_, p_247799_, p_247800_, p_247801_) -> {
-@@ -127,7 +_,10 @@
-          return new WorldCreationContext(p_247801_.f_243966_(), p_247800_, p_247799_, p_247801_.f_243979_());
+       PackRepository packrepository = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
+-      WorldLoader.InitConfig worldloader$initconfig = m_232872_(packrepository, DataPackConfig.f_45842_);
++      WorldLoader.InitConfig worldloader$initconfig = m_232872_(packrepository, new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of())); // FORGE: Load vanilla fallback with vanilla datapacks.
+       CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.m_214362_(worldloader$initconfig, (p_232935_, p_232936_) -> {
+          RegistryAccess.Frozen registryaccess$frozen = RegistryAccess.m_206197_().m_203557_();
+          WorldGenSettings worldgensettings = WorldPresets.m_226449_(registryaccess$frozen);
+@@ -122,7 +_,10 @@
+          return new WorldCreationContext(p_232884_, Lifecycle.stable(), p_232883_, p_232882_);
        }, Util.m_183991_(), p_232897_);
        p_232897_.m_18701_(completablefuture::isDone);
--      p_232897_.m_91152_(new CreateWorldScreen(p_232897_, p_232898_, completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty()));
+-      p_232897_.m_91152_(new CreateWorldScreen(p_232898_, DataPackConfig.f_45842_, new WorldGenSettingsComponent(completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty())));
 +      // FORGE: Force load mods' datapacks after setting screen and ensure datapack selection reverts to vanilla if invalid.
-+      CreateWorldScreen createWorldScreen = new CreateWorldScreen(p_232897_, p_232898_, completablefuture.join().withDataConfiguration(new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_)), Optional.of(WorldPresets.f_226437_), OptionalLong.empty());
++      CreateWorldScreen createWorldScreen = new CreateWorldScreen(p_232898_, new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), new WorldGenSettingsComponent(completablefuture.join(), Optional.of(WorldPresets.f_226437_), OptionalLong.empty()));
 +      p_232897_.m_91152_(createWorldScreen);
-+      createWorldScreen.m_269443_(packrepository, true, createWorldScreen::m_267734_);
++      createWorldScreen.m_100878_(packrepository);
     }
  
-    public static CreateWorldScreen m_275847_(Minecraft p_276017_, @Nullable Screen p_276029_, LevelSettings p_276055_, WorldCreationContext p_276028_, @Nullable Path p_276040_) {
-@@ -368,7 +_,7 @@
-                if (p_269627_) {
-                   p_270552_.accept(this.f_267389_.m_267573_().f_243842_());
-                } else {
--                  p_270552_.accept(WorldDataConfiguration.f_244649_);
-+                  p_270552_.accept(new WorldDataConfiguration(new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()), FeatureFlags.f_244332_)); // FORGE: Revert to *actual* vanilla data
-                }
+    public static CreateWorldScreen m_205426_(@Nullable Screen p_205427_, WorldStem p_205428_, @Nullable Path p_205429_) {
+@@ -478,7 +_,7 @@
+                      if (p_232949_) {
+                         this.m_100975_();
+                      } else {
+-                        this.f_100846_ = DataPackConfig.f_45842_;
++                        this.f_100846_ = new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()); // FORGE: Revert to *actual* vanilla data
+                         this.f_96541_.m_91152_(this);
+                      }
  
-             }, Component.m_237115_("dataPack.validation.failed"), CommonComponents.f_237098_, Component.m_237115_("dataPack.validation.back"), Component.m_237115_("dataPack.validation.reset")));
-@@ -482,6 +_,7 @@
-       if (path != null) {
+@@ -653,6 +_,7 @@
+          File file1 = path.toFile();
           if (this.f_100832_ == null) {
-             this.f_100832_ = ServerPacksSource.m_245786_(path);
+             this.f_100832_ = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource(), new FolderRepositorySource(file1, PackSource.f_10527_));
 +            net.minecraftforge.resource.ResourcePackLoader.loadResourcePacks(this.f_100832_, net.minecraftforge.server.ServerLifecycleHooks::buildPackFinder);
              this.f_100832_.m_10506_();
           }

patches/minecraft/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java.patch

@@ -1,13 +0,0 @@
---- a/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java
-+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java
-@@ -38,6 +_,10 @@
-       return new WorldCreationContext(this.f_244272_, this.f_244375_, p_250676_.apply(this.m_246480_(), this.f_243796_), this.f_243708_, this.f_232990_, this.f_243842_);
-    }
- 
-+   public WorldCreationContext withDataConfiguration(WorldDataConfiguration dataConfiguration) {
-+      return new WorldCreationContext(this.f_244272_, this.f_244375_, this.f_243796_, this.f_243708_, this.f_232990_, dataConfiguration);
-+   }
-+
-    public RegistryAccess.Frozen m_246480_() {
-       return this.f_243708_.m_247579_();
-    }

patches/minecraft/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
-@@ -159,13 +_,23 @@
+@@ -132,13 +_,23 @@
     }
  
     private void m_233145_(Screen p_233146_, String p_233147_, boolean p_233148_, boolean p_233149_) {
@@ -12,7 +12,7 @@
 +   private void doLoadLevel(Screen p_233146_, String p_233147_, boolean p_233148_, boolean p_233149_, boolean confirmExperimentalWarning) {
        LevelStorageSource.LevelStorageAccess levelstoragesource$levelstorageaccess = this.m_233155_(p_233147_);
        if (levelstoragesource$levelstorageaccess != null) {
-          PackRepository packrepository = ServerPacksSource.m_247728_(levelstoragesource$levelstorageaccess);
+          PackRepository packrepository = m_233105_(levelstoragesource$levelstorageaccess);
  
           WorldStem worldstem;
           try {
@@ -22,20 +22,20 @@
 +               pld.withConfirmedWarning(true);
 +            }
           } catch (Exception exception) {
-             f_233088_.warn("Failed to load level data or datapacks, can't proceed with server load", (Throwable)exception);
-             if (!p_233148_) {
-@@ -185,7 +_,9 @@
+             f_233088_.warn("Failed to load datapacks, can't proceed with server load", (Throwable)exception);
+             this.f_233089_.m_91152_(new DatapackLoadFailureScreen(() -> {
+@@ -151,7 +_,9 @@
           WorldData worlddata = worldstem.f_206895_();
-          boolean flag = worlddata.m_246337_().m_247070_();
+          boolean flag = worlddata.m_5961_().m_64670_();
           boolean flag1 = worlddata.m_5754_() != Lifecycle.stable();
 -         if (!p_233149_ || !flag && !flag1) {
 +         // Forge: Skip confirmation if it has been done already for this world
 +         boolean skipConfirmation = worlddata instanceof PrimaryLevelData pld && pld.hasConfirmedExperimentalWarning();
 +         if (skipConfirmation || !p_233149_ || !flag && !flag1) {
-             this.f_233089_.m_247489_().m_247400_(levelstoragesource$levelstorageaccess).thenApply((p_233177_) -> {
+             this.f_233089_.m_91100_().m_235003_(levelstoragesource$levelstorageaccess).thenApply((p_233177_) -> {
                 return true;
              }).exceptionallyComposeAsync((p_233183_) -> {
-@@ -207,9 +_,11 @@
+@@ -173,9 +_,11 @@
                 return null;
              });
           } else {

patches/minecraft/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
-@@ -63,6 +_,7 @@
+@@ -65,6 +_,7 @@
     static final DateFormat f_101646_ = new SimpleDateFormat();
     static final ResourceLocation f_101647_ = new ResourceLocation("textures/misc/unknown_server.png");
     static final ResourceLocation f_101648_ = new ResourceLocation("textures/gui/world_selection.png");
@@ -8,7 +8,7 @@
     static final Component f_101649_ = Component.m_237115_("selectWorld.tooltip.fromNewerVersion1").m_130940_(ChatFormatting.RED);
     static final Component f_101650_ = Component.m_237115_("selectWorld.tooltip.fromNewerVersion2").m_130940_(ChatFormatting.RED);
     static final Component f_101651_ = Component.m_237115_("selectWorld.tooltip.snapshot1").m_130940_(ChatFormatting.GOLD);
-@@ -313,6 +_,7 @@
+@@ -325,6 +_,7 @@
           RenderSystem.m_69478_();
           GuiComponent.m_93133_(p_101721_, p_101724_, p_101723_, 0.0F, 0.0F, 32, 32, 32, 32);
           RenderSystem.m_69461_();
@@ -16,7 +16,7 @@
           if (this.f_101693_.f_91066_.m_231828_().m_231551_() || p_101729_) {
              RenderSystem.m_157456_(0, WorldSelectionList.f_101648_);
              GuiComponent.m_93172_(p_101721_, p_101724_, p_101723_, p_101724_ + 32, p_101723_ + 32, -1601138544);
-@@ -545,6 +_,21 @@
+@@ -646,6 +_,21 @@
  
        public boolean m_214209_() {
           return !this.f_101695_.m_164916_();
@@ -24,7 +24,7 @@
 +
 +      // FORGE: Patch in experimental warning icon for worlds in the world selection screen
 +      private void renderExperimentalWarning(PoseStack stack, int mouseX, int mouseY, int top, int left) {
-+         if (this.f_101695_.isLifecycleExperimental()) {
++         if (this.f_101695_.isExperimental()) {
 +            int leftStart = left + WorldSelectionList.this.m_5759_();
 +            RenderSystem.m_157456_(0, WorldSelectionList.FORGE_EXPERIMENTAL_WARNING_ICON);
 +            GuiComponent.m_93133_(stack, leftStart - 36, top, 0.0F, 0.0F, 32, 32, 32, 32);