Fix AT order, missed exec line and bump for RB.

Invalid enum constants are now properly thrown as a CommandSyntaxException

.gitignore

@@ -27,7 +27,6 @@
 /projects/**/run/
 /projects/**/*.launch
 /repo/
-/buildSrc
 src/generated/resources/.cache/
 
 #Patch rejects
@@ -43,3 +42,7 @@ changelog.txt
 gradle.properties
 !/mdk/gradle.properties
 /projects/forge/rejects/
+
+# Srg2Source causes import bugs on these patches. If you intentionnally change these, remove the ignore.
+/patches/minecraft/net/minecraft/client/renderer/ViewFrustum.java.patch
+/patches/minecraft/net/minecraft/data/BlockModelDefinition.java.patch

LICENSE-header.txt

@@ -1,5 +1,5 @@
 Minecraft Forge
-Copyright (c) 2016-2019.
+Copyright (c) 2016-${year}.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

buildSrc/.gitignore

@@ -0,0 +1,2 @@
+/.gradle/
+/build/

buildSrc/build.gradle

@@ -0,0 +1,8 @@
+repositories {
+	mavenCentral()
+}
+dependencies {
+	implementation 'org.ow2.asm:asm:9.0'
+	implementation 'org.ow2.asm:asm-tree:9.0'
+    implementation 'org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r'
+}

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

@@ -0,0 +1,61 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.json.JsonBuilder
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Type
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.FieldNode
+import org.objectweb.asm.tree.MethodNode
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
+public abstract class BytecodeFinder extends DefaultTask {
+    @InputFile File jar
+    @OutputFile output = project.file("build/${name}/output.json")
+    
+    @TaskAction
+    protected void exec() {
+        Util.init()
+        
+        if (output.exists())
+            output.delete()
+            
+        pre()
+        
+        jar.withInputStream { i -> 
+            new ZipInputStream(i).withCloseable { zin ->
+                ZipEntry zein
+                while ((zein = zin.nextEntry) != null) {
+                    if (zein.name.endsWith('.class')) {
+                        def node = new ClassNode(Opcodes.ASM7)
+                        new ClassReader(zin).accept(node, 0)
+                        process(node)
+                    }
+                }
+            }
+        }
+        
+        post()
+        output.text = new JsonBuilder(getData()).toPrettyString()
+    }
+    
+    
+    protected process(ClassNode node) {
+        if (node.fields != null) node.fields.each { process(node, it) }
+        if (node.methods != null) node.methods.each { process(node, it) }
+    }
+    
+    protected pre() {}
+    protected process(ClassNode parent, FieldNode node) {}
+    protected process(ClassNode parent, MethodNode node) {}
+    protected post() {}
+    protected abstract Object getData()
+}

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

@@ -0,0 +1,231 @@
+package net.minecraftforge.forge.tasks
+
+import java.util.ArrayList
+import java.util.TreeMap
+
+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.Opcodes
+
+public class CheckATs extends DefaultTask {
+	@InputFile File inheritance
+	@InputFiles File[] ats
+	
+    @TaskAction
+    protected void exec() {
+		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.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.equals('*') && !desc.equals('*()') && !desc.equals('<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 ('*'.equals(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 ('*()'.equals(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>'))
+									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>'.equals(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 = []
+			lines.each { key,value -> 
+				if (!value.group) {
+					data.add(value.modifier + ' ' + key + (value.comment == null ? '' : ' ' + value.comment))
+				} else {
+					data.add('#group ' + value.modifier + ' ' + key + (value.comment == null ? '' : ' ' + value.comment))
+					value.children.each{ data.add(value.modifier + ' ' + it) }
+					data.add('#endgroup')
+				}
+			}
+			f.text = data.join('\n')
+		}
+	}
+}

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

@@ -0,0 +1,95 @@
+package net.minecraftforge.forge.tasks
+
+import java.util.ArrayList
+import java.util.TreeMap
+
+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
+
+public class CheckExcs extends DefaultTask {
+	@InputFile File binary
+	@InputFiles File[] excs
+	
+    @TaskAction
+    protected void exec() {
+		Util.init()
+		def known = []
+		binary.withInputStream { i -> 
+			new ZipInputStream(i).withCloseable { zin ->
+				def visitor = new ClassVisitor(Opcodes.ASM7) {
+					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(key)
+					println('Invalid: ' + 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,218 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+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
+
+public class CheckPatches extends DefaultTask {
+    @InputDirectory File patchDir
+    @Input boolean autoFix = false
+
+    @TaskAction
+    protected void exec() {
+        def hasS2SArtifact = [
+            Paths.get("patches/minecraft/net/minecraft/client/renderer/ViewFrustum.java.patch"),
+            Paths.get("patches/minecraft/net/minecraft/data/BlockModelDefinition.java.patch")
+        ]
+
+        def verified = true;
+        project.fileTree(patchDir).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,64 @@
+package net.minecraftforge.forge.tasks
+
+import java.util.ArrayList
+import java.util.TreeMap
+
+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.Opcodes
+
+public class CheckSAS extends DefaultTask {
+	@InputFile File inheritance
+	@InputFiles File[] sass
+	
+    @TaskAction
+    protected void exec() {
+		Util.init()
+		def json = inheritance.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, desc) = (line.trim() + '    ').split(' ', -1)
+				cls = cls.replaceAll('\\.', '/')
+				desc = desc.replace('(', ' (')
+
+				if (json[cls] == null || (!desc.isEmpty() && (json[cls]['methods'] == null || json[cls]['methods'][desc] == null))) {
+					println('Invalid: ' + line)
+					return
+				}
+
+				//Class SAS
+				if (desc.isEmpty()) {
+					lines.add(cls + (comment == null ? '' : ' ' + comment))
+					if (json[cls]['methods'] != null)
+						(json[cls]['methods'] as TreeMap).each {
+							findChildMethods(json, cls, it.key).each { lines.add('\t' + it) }
+						}
+					return
+				}
+
+				//Method SAS
+				lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
+				findChildMethods(json, cls, desc).each { lines.add('\t' + it) }
+			}
+			f.text = lines.join('\n')
+		}
+	}
+
+	protected static findChildMethods(json, cls, desc)
+	{
+		return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
+				.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
+	}
+}

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

@@ -0,0 +1,31 @@
+package net.minecraftforge.forge.tasks
+
+import java.util.function.BiConsumer
+
+public class ClosureHelper {
+    BiConsumer<String, Closure> callback
+    
+    public ClosureHelper(Closure cl, BiConsumer<String, Closure> callback) {
+        this.callback = callback
+        apply(this, cl)
+    }
+    
+    
+    def methodMissing(String name, Object args) {
+        if (!args.class.isArray()) return
+        Object[] aargs = (Object[])args
+        
+        if (aargs.length == 1 && aargs[0] instanceof Closure) {
+            this.callback.accept(name, (Closure)aargs[0])
+        } else {
+            throw new IllegalArgumentException('Unknown method: "' + name + '" with arguments ' + args + ' for ' + this)
+        }
+    }
+    
+    static def apply(def obj, Closure cl) {
+        cl.delegate = obj
+        cl.resolveStrategy = Closure.DELEGATE_FIRST
+        cl()
+        return obj
+    }
+}

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

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

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

@@ -0,0 +1,43 @@
+package net.minecraftforge.forge.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.OutputDirectory
+
+import java.io.File
+import java.util.HashSet
+import java.util.Set
+import java.net.URL
+
+public class DownloadLibrariesTask extends DefaultTask {
+    @InputFile File input
+	@OutputDirectory File output = project.file("build/${name}/")
+	Set<File> libraries = new HashSet<>()
+
+    @TaskAction
+    def run() {
+		Util.init()
+		
+		def json = input.json().libraries.each { lib ->
+		    //TODO: Thread?
+			def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
+			artifacts.each{ art -> 
+				def target = new File(output, art.path)
+				libraries.add(target)
+				if (!target.exists() || !art.sha1.equals(target.sha1())) {
+					project.logger.lifecycle("Downloading ${art.url}")
+					if (!target.parentFile.exists()) {
+						target.parentFile.mkdirs()
+					}
+					new URL(art.url).withInputStream { i ->
+						target.withOutputStream { it << i }
+					}
+					if (!art.sha1.equals(target.sha1())) {
+						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
+					}
+				}
+			}
+		}
+    }
+}

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

@@ -0,0 +1,108 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.EqualsAndHashCode
+
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.TreeMap
+import java.util.TreeSet
+import java.util.function.BiConsumer
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
+import org.gradle.api.tasks.Optional
+
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Type
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.FieldNode
+import org.objectweb.asm.tree.MethodNode
+
+import static org.objectweb.asm.Opcodes.*
+
+public class FieldCompareFinder extends BytecodeFinder {
+    @Nested
+    Map<String, Search> fields = [:] as HashMap
+    Map<Search, String> fieldsReverse = [:] as HashMap
+    Map<String, Set<ObjectTarget>> targets = [:] as TreeMap
+    
+    @Override
+    protected pre() {
+        //fields.each{ k,v -> logger.lifecycle("Fields: " + k + ' ' + v) }
+    }
+    
+    @Override
+    protected process(ClassNode parent, MethodNode node) {
+        def last = null
+        def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
+        for (int x = 0; x < node.instructions.size(); x++) {
+            def current = node.instructions.get(x)
+            if (current.opcode == IF_ACMPEQ || current.opcode == IF_ACMPNE) {
+                if (last != null && (last.opcode == GETSTATIC || last.opcode == GETFIELD)) {
+                    def target = new Search(cls: last.owner, name: last.name)
+                    def wanted = fieldsReverse.get(target)
+                    def original = fields.get(wanted)
+                    def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
+                    if (wanted != null && (original.blacklist == null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
+                        targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
+                    }
+                }
+            }
+            last = current
+        }
+    }
+    
+    @Override
+    protected Object getData() {
+		def ret = [:] as HashMap
+		targets.forEach{ k, v -> 
+			def e = fields.get(k)
+			ret[k] = [
+				cls: e.cls, 
+				name: e.name, 
+				replacement: e.replacement, 
+				targets: v
+			]
+		}
+        return ret
+    }
+    
+    @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
+    public static class Search {
+        @Input
+        String cls
+        
+        @Input
+        String name
+		
+		@Input
+		String replacement
+    
+        @Nested
+        @Optional
+        Set<ObjectTarget> blacklist
+        
+        @Override
+        String toString() {
+            return cls + '.' + name
+        }
+        
+        def blacklist(def owner, def name, def desc) {
+            if (blacklist == null)
+                blacklist = new HashSet()
+            blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
+        }
+        def blacklist(def owner) {
+            blacklist(owner, '', '')
+        }
+    }
+    
+    def fields(Closure cl) {
+        new ClosureHelper(cl, {name, ccl ->
+            def search = ClosureHelper.apply(new Search(), ccl)
+            this.fields.put(name, search)
+            this.fieldsReverse.put(search, name)
+        })
+    }
+}

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

@@ -0,0 +1,32 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.transform.EqualsAndHashCode
+
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
+import org.gradle.api.tasks.Optional
+
+@EqualsAndHashCode
+public class ObjectTarget implements Comparable<ObjectTarget> {
+    @Input
+    String owner
+    
+    @Input
+    String name
+    
+    @Input
+    @Optional
+    String desc
+    
+    @Override
+    String toString() {
+        if (desc == null)
+            return owner + '.' + name
+        return owner + '.' + name + desc
+    }
+    
+    @Override
+    int compareTo(ObjectTarget o) {
+        return toString().compareTo(o.toString())
+    }
+}

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

@@ -0,0 +1,172 @@
+package net.minecraftforge.forge.tasks
+
+import groovy.json.JsonSlurper
+
+import java.io.File
+import java.security.MessageDigest
+import java.text.SimpleDateFormat
+import java.util.Date
+
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.lib.AbbreviatedObjectId
+import org.eclipse.jgit.lib.ObjectId
+
+public class Util {
+	static void init() {
+		File.metaClass.sha1 = { ->
+			MessageDigest md = MessageDigest.getInstance('SHA-1')
+			delegate.eachByte 4096, {bytes, size ->
+				md.update(bytes, 0, size)
+			}
+			return md.digest().collect {String.format "%02x", it}.join()
+		}
+	
+		File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
+		
+		Date.metaClass.iso8601 = { ->
+			def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+			def result = format.format(delegate)
+			return result[0..21] + ':' + result[22..-1]
+		}
+        
+        String.metaClass.rsplit = { String del, int limit = -1 ->
+            def lst = new ArrayList()
+            def x = 0, idx
+            def tmp = delegate
+            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit == -1 || x++ < limit)) {
+                lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
+                tmp = tmp.substring(0, idx)
+            }
+            lst.add(0, tmp)
+            return lst
+        }
+	}
+	
+	public static String[] getClasspath(project, libs, artifact) {
+		def ret = []
+		artifactTree(project, artifact).each { key, lib ->
+			libs[lib.name] = lib
+			if (lib.name != artifact)
+				ret.add(lib.name)
+		}
+		return ret
+	}
+	
+	public static def getArtifacts(project, config, classifiers) {
+		def ret = [:]
+		config.resolvedConfiguration.resolvedArtifacts.each {
+			def art = [
+				group: it.moduleVersion.id.group,
+				name: it.moduleVersion.id.name,
+				version: it.moduleVersion.id.version,
+				classifier: it.classifier,
+				extension: it.extension,
+				file: it.file
+			]
+			def key = art.group + ':' + art.name
+			def folder = "${art.group.replace('.', '/')}/${art.name}/${art.version}/"
+			def filename = "${art.name}-${art.version}"
+			if (art.classifier != null)
+				filename += "-${art.classifier}"
+			filename += ".${art.extension}"
+			def path = "${folder}${filename}"
+			def url = "https://libraries.minecraft.net/${path}"
+			if (!checkExists(url)) {
+				url = "https://files.minecraftforge.net/maven/${path}"
+			}
+			//TODO remove when Mojang launcher is updated
+			if (!classifiers && art.classifier != null) { 
+				//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
+				// However, keep the path normal so that our mirror system works.
+				art.version = "${art.version}-${art.classifier}"
+				art.classifier = null
+				art.extension = 'jar'
+			}
+			ret[key] = [
+				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
+				downloads: [
+					artifact: [
+						path: path,
+						url: url,
+						sha1: sha1(art.file),
+						size: art.file.length()
+					]
+				]
+			]
+		}
+		return ret
+	}
+
+	public static def iso8601Now() { new Date().iso8601() }
+
+	public static def sha1(file) {
+		MessageDigest md = MessageDigest.getInstance('SHA-1')
+		file.eachByte 4096, {bytes, size ->
+			md.update(bytes, 0, size)
+		}
+		return md.digest().collect {String.format "%02x", it}.join()
+	}
+
+	private static def artifactTree(project, artifact) {
+		if (!project.ext.has('tree_resolver'))
+			project.ext.tree_resolver = 1
+		def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
+		def dep = project.dependencies.create(artifact)
+		cfg.dependencies.add(dep)
+		def files = cfg.resolve()
+		return getArtifacts(project, cfg, true)
+	}
+	
+	private static boolean checkExists(url) {
+		try {
+			def code = new URL(url).openConnection().with {
+				requestMethod = 'HEAD'
+				connect()
+				responseCode
+			}
+			return code == 200
+		} catch (Exception e) {
+			if (e.toString().contains('unable to find valid certification path to requested target'))
+				throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
+			throw e
+		}
+	}
+    
+    public static def gitInfo(dir) {
+        init()
+        def git = null
+        try {
+            git = Git.open(dir)
+        } catch (org.eclipse.jgit.errors.RepositoryNotFoundException e) {
+            return [
+                tag: '0.0',
+                offset: '0',
+                hash: '00000000',
+                branch: 'master',
+                commit: '0000000000000000000000',
+                abbreviatedId: '00000000'
+            ]
+        }
+        def desc = git.describe().setLong(true).setTags(true).call().rsplit('-', 2)
+        def head = git.repository.resolve('HEAD')
+        
+        def ret = [:]
+        ret.tag = desc[0]
+        ret.offset = desc[1]
+        ret.hash = desc[2]
+        ret.branch = git.repository.branch
+        ret.commit = ObjectId.toString(head)
+        ret.abbreviatedId = head.abbreviate(8).name()
+        
+        return ret
+    }
+    
+    public static String getVersion(info, mc_version) {
+        def branch = info.branch
+        if (branch != null && branch.startsWith('pulls/'))
+            branch = 'pr' + branch.rsplit('/', 1)[1]
+        if (branch in [null, 'master', 'HEAD', mc_version, mc_version + '.0', mc_version.rsplit('.', 1)[0] + '.x'])
+            return "${mc_version}-${info.tag}.${info.offset}".toString()
+        return "${mc_version}-${info.tag}.${info.offset}-${branch}".toString()
+    }
+}

docs/README.md

@@ -1,17 +1,17 @@
-<img src="assets/Forge_logo.svg">
+![Forge Logo](assets/Forge_logo.svg)
 
 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.15.2-&query=$.promos["1.15.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/maven/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.15.2-&query=$.promos["1.15.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) [![Merch](https://img.shields.io/badge/Flocker-Merch-blueviolet.svg)](https://forgedev.flocker.tv/)
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.16.5-&query=$.promos["1.16.5-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/maven/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.16.5-&query=$.promos["1.16.5-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.15.x  | Active  |
-| 1.14.x  | LTS  |
+| 1.16.x  | Active  |
+| 1.15.x  | LTS  |
 
 * [Download]
 * [Forum]
@@ -60,7 +60,7 @@ We require all contributors to acknowledge the [Forge Contributor
  signed it, you should be OK.
 
 #### Donate
-*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free to use and modify. However, it costs money to run such a large project as this, so please consider [becoming a patron](https://www.patreon.com/LexManos) or buying some [cool merch](https://forgedev.flocker.tv/).*
+*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free to use and modify. However, it costs money to run such a large project as this, so please consider [becoming a patron](https://www.patreon.com/LexManos).*
 
 [Download]: https://files.minecraftforge.net/
 [Forum]: https://www.minecraftforge.net/forum/

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

mdk/README.txt

@@ -1,53 +1,46 @@
--------------------------------------------
+
 Source installation information for modders
 -------------------------------------------
 This code follows the Minecraft Forge installation methodology. It will apply
 some small patches to the vanilla MCP source code, giving you and it access 
 to some of the data and functions you need to build a successful mod.
 
-Note also that the patches are built against "unrenamed" MCP source code (aka
-srgnames) - this means that you will not be able to read them directly against
+Note also that the patches are built against "un-renamed" MCP source code (aka
+SRG Names) - this means that you will not be able to read them directly against
 normal code.
 
-Source pack installation information:
-
-Standalone source installation
+Setup Process:
 ==============================
 
-See the Forge Documentation online for more detailed instructions:
-http://mcforge.readthedocs.io/en/latest/gettingstarted/
-
 Step 1: Open your command-line and browse to the folder where you extracted the zip file.
 
 Step 2: You're left with a choice.
 If you prefer to use Eclipse:
-1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux)
+1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux)
 2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
-   or run "gradlew eclipse" to generate the project.
-(Current Issue)
-4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment
-5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4.
+   or run `gradlew eclipse` to generate the project.
 
 If you prefer to use IntelliJ:
 1. Open IDEA, and import project.
 2. Select your build.gradle file and have it import.
-3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
+3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux)
 4. Refresh the Gradle Project in IDEA if required.
 
-If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again.
+If at any point you are missing libraries in your IDE, or you've run into problems you can 
+run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything 
+{this does not affect your code} and then start the process again.
 
-Should it still not work, 
-Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
-or the Forge Project Discord discord.gg/UvedJ9m
+Mapping Names:
+=============================
+By default, the MDK is configured to use the official mapping names from Mojang for methods and fields 
+in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this
+license, if you do not agree with it you can change your mapping names to other crowdsourced names in your 
+build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here:
+https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
 
-Forge source installation
+Additional Resources: 
 =========================
-MinecraftForge ships with this code and installs it as part of the forge
-installation process, no further action is required on your part.
-
-LexManos' Install Video
-=======================
-https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be
-
-For more details update more often refer to the Forge Forums:
-http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
+Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/  
+LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0  
+Forge Forum: https://forums.minecraftforge.net/  
+Forge Discord: https://discord.gg/UvedJ9m  

mdk/build.gradle

@@ -1,11 +1,10 @@
 buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -17,12 +16,19 @@ version = '1.0'
 group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'modid'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
 
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
+    // Channel:   Version:
+    // snapshot   YYYYMMDD   Snapshot are built nightly.
+    // stable     #          Stables are built at the discretion of the MCP team.
+    // official   MCVersion  Official field/method names from Mojang mapping files
+    //
+    // You must be aware of the Mojang license when using the 'official' mappings.
+    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+    //
     // 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.
     mappings channel: '@MAPPING_CHANNEL@', version: '@MAPPING_VERSION@'
@@ -37,9 +43,15 @@ minecraft {
             workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // The markers can be changed as needed. 
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
             // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -53,9 +65,15 @@ minecraft {
             workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // The markers can be changed as needed. 
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
             // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -69,12 +87,19 @@ minecraft {
             workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // The markers can be changed as needed. 
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
             // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
+            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
+            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
                 examplemod {
@@ -85,6 +110,9 @@ minecraft {
     }
 }
 
+// Include resources generated by data generators.
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
@@ -143,4 +171,4 @@ publishing {
             url "file:///${project.projectDir}/mcmodsrepo"
         }
     }
-}
+}

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

@@ -48,7 +48,7 @@ public class ExampleMod
 
     private void doClientStuff(final FMLClientSetupEvent event) {
         // do something that can only be done on the client
-        LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings);
+        LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().options);
     }
 
     private void enqueueIMC(final InterModEnqueueEvent event)

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

@@ -6,21 +6,26 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[@FORGE_SPEC_VERSION@,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
+# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
+license="All rights reserved"
 # A URL to refer people to when problems occur with this mod
-issueTrackerURL="http://my.issue.tracker/" #optional
+#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
 modId="examplemod" #mandatory
 # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
+# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
+# see the associated build.gradle script for how to populate this completely automatically during a build
 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 <here>
-updateJSONURL="http://myurl.me/" #optional
+# 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="http://example.com/" #optional
+#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
 # A file name (in the root of the mod JAR) containing a logo for display
 logoFile="examplemod.png" #optional
 # A text field displayed in the mod UI
@@ -42,7 +47,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[31,)" #mandatory
+    versionRange="[@FORGE_SPEC_VERSION@,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -51,6 +56,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
 [[dependencies.examplemod]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.15.2]"
+# This version range declares a minimum of the current minecraft version up to but not including the next major version
+    versionRange="[@MC_VERSION@,@MC_NEXT_VERSION@)"
     ordering="NONE"
     side="BOTH"

mdk/src/main/resources/pack.mcmeta

@@ -1,7 +1,7 @@
 {
     "pack": {
         "description": "examplemod resources",
-        "pack_format": 5,
-        "_comment": "A pack_format of 5 requires json lang files and some texture changes from 1.15. Note: we require v5 pack meta for all mods."
+        "pack_format": 6,
+        "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods."
     }
 }

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

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -556,10 +556,17 @@
+@@ -572,10 +_,17 @@
        GL13.glClientActiveTexture(p_227747_0_);
     }
  

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

@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/IVertexBuilder.java
 +++ b/com/mojang/blaze3d/vertex/IVertexBuilder.java
-@@ -18,7 +18,7 @@
+@@ -18,7 +_,7 @@
  import org.lwjgl.system.MemoryStack;
  
  @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     Logger field_227884_f_ = LogManager.getLogger();
  
     IVertexBuilder func_225582_a_(double p_225582_1_, double p_225582_3_, double p_225582_5_);
-@@ -96,11 +96,12 @@
+@@ -96,11 +_,12 @@
                 f5 = p_227890_3_[k] * p_227890_6_;
              }
  

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

@@ -1,6 +1,6 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -63,6 +63,15 @@
+@@ -63,6 +_,15 @@
        }));
     }
  
@@ -15,4 +15,4 @@
 +
     public void func_230430_a_(MatrixStack p_230430_1_, int p_230430_2_, int p_230430_3_, float p_230430_4_) {
        this.func_230446_a_(p_230430_1_);
-       this.func_238472_a_(p_230430_1_, this.field_230712_o_, this.field_224229_b, this.field_230708_k_ / 2, 80, 16777215);
+       func_238472_a_(p_230430_1_, this.field_230712_o_, this.field_224229_b, this.field_230708_k_ / 2, 80, 16777215);

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

@@ -1,10 +1,10 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -309,6 +309,7 @@
+@@ -309,6 +_,7 @@
        }
  
        public static Advancement.Builder func_241043_a_(JsonObject p_241043_0_, ConditionArrayParser p_241043_1_) {
-+         if (!net.minecraftforge.common.crafting.ConditionalAdvancement.processConditions(p_241043_0_)) return null;
++         if ((p_241043_0_ = net.minecraftforge.common.crafting.ConditionalAdvancement.processConditional(p_241043_0_)) == null) return null;
           ResourceLocation resourcelocation = p_241043_0_.has("parent") ? new ResourceLocation(JSONUtils.func_151200_h(p_241043_0_, "parent")) : null;
           DisplayInfo displayinfo = p_241043_0_.has("display") ? DisplayInfo.func_192294_a(JSONUtils.func_152754_s(p_241043_0_, "display")) : null;
           AdvancementRewards advancementrewards = p_241043_0_.has("rewards") ? AdvancementRewards.func_241096_a_(JSONUtils.func_152754_s(p_241043_0_, "rewards")) : AdvancementRewards.field_192114_a;

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementList.java
 +++ b/net/minecraft/advancements/AdvancementList.java
-@@ -96,6 +96,7 @@
+@@ -96,6 +_,7 @@
           }
        }
  

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementManager.java
 +++ b/net/minecraft/advancements/AdvancementManager.java
-@@ -36,6 +36,10 @@
+@@ -36,6 +_,10 @@
           try {
              JsonObject jsonobject = JSONUtils.func_151210_l(p_240923_3_, "advancement");
              Advancement.Builder advancement$builder = Advancement.Builder.func_241043_a_(jsonobject, new ConditionArrayParser(p_240923_2_, this.field_240922_d_));

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

@@ -1,11 +1,11 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -39,7 +39,7 @@
+@@ -39,7 +_,7 @@
  
     public void func_192113_a(ServerPlayerEntity p_192113_1_) {
        p_192113_1_.func_195068_e(this.field_192115_b);
--      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_216015_a(LootParameters.field_216281_a, p_192113_1_).func_216015_a(LootParameters.field_216286_f, p_192113_1_.func_233580_cy_()).func_216023_a(p_192113_1_.func_70681_au()).func_216022_a(LootParameterSets.field_216265_f);
-+      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_216015_a(LootParameters.field_216281_a, p_192113_1_).func_216015_a(LootParameters.field_216286_f, p_192113_1_.func_233580_cy_()).func_216023_a(p_192113_1_.func_70681_au()).func_186469_a(p_192113_1_.func_184817_da()).func_216022_a(LootParameterSets.field_216265_f); // FORGE: luck to LootContext
+-      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_216015_a(LootParameters.field_216281_a, p_192113_1_).func_216015_a(LootParameters.field_237457_g_, p_192113_1_.func_213303_ch()).func_216023_a(p_192113_1_.func_70681_au()).func_216022_a(LootParameterSets.field_216265_f);
++      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_216015_a(LootParameters.field_216281_a, p_192113_1_).func_216015_a(LootParameters.field_237457_g_, p_192113_1_.func_213303_ch()).func_216023_a(p_192113_1_.func_70681_au()).func_186469_a(p_192113_1_.func_184817_da()).func_216022_a(LootParameterSets.field_216265_f); // FORGE: luck to LootContext
        boolean flag = false;
  
        for(ResourceLocation resourcelocation : this.field_192116_c) {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/PlayerAdvancements.java
 +++ b/net/minecraft/advancements/PlayerAdvancements.java
-@@ -159,6 +159,10 @@
+@@ -159,6 +_,10 @@
        }
  
        this.func_240920_c_(p_240921_1_);
@@ -11,7 +11,7 @@
        this.func_192752_d();
        this.func_240919_b_(p_240921_1_);
     }
-@@ -192,6 +196,8 @@
+@@ -192,6 +_,8 @@
     }
  
     public boolean func_192750_a(Advancement p_192750_1_, String p_192750_2_) {
@@ -20,7 +20,7 @@
        boolean flag = false;
        AdvancementProgress advancementprogress = this.func_192747_a(p_192750_1_);
        boolean flag1 = advancementprogress.func_192105_a();
-@@ -204,6 +210,7 @@
+@@ -204,6 +_,7 @@
              if (p_192750_1_.func_192068_c() != null && p_192750_1_.func_192068_c().func_193220_i() && this.field_192762_j.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223620_w)) {
                 this.field_240917_e_.func_232641_a_(new TranslationTextComponent("chat.type.advancement." + p_192750_1_.func_192068_c().func_192291_d().func_192307_a(), this.field_192762_j.func_145748_c_(), p_192750_1_.func_193123_j()), ChatType.SYSTEM, Util.field_240973_b_);
              }

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/criterion/ItemPredicate.java
 +++ b/net/minecraft/advancements/criterion/ItemPredicate.java
-@@ -26,6 +26,8 @@
+@@ -26,6 +_,8 @@
  import net.minecraft.util.registry.Registry;
  
  public class ItemPredicate {
@@ -9,7 +9,7 @@
     public static final ItemPredicate field_192495_a = new ItemPredicate();
     @Nullable
     private final ITag<Item> field_200018_b;
-@@ -105,6 +107,11 @@
+@@ -105,6 +_,11 @@
     public static ItemPredicate func_192492_a(@Nullable JsonElement p_192492_0_) {
        if (p_192492_0_ != null && !p_192492_0_.isJsonNull()) {
           JsonObject jsonobject = JSONUtils.func_151210_l(p_192492_0_, "item");
@@ -21,18 +21,18 @@
           MinMaxBounds.IntBound minmaxbounds$intbound = MinMaxBounds.IntBound.func_211344_a(jsonobject.get("count"));
           MinMaxBounds.IntBound minmaxbounds$intbound1 = MinMaxBounds.IntBound.func_211344_a(jsonobject.get("durability"));
           if (jsonobject.has("data")) {
-@@ -204,6 +211,14 @@
+@@ -202,6 +_,14 @@
+       } else {
+          return new ItemPredicate[0];
        }
-    }
- 
++   }
++
 +   public static void register(ResourceLocation name, java.util.function.Function<JsonObject, ItemPredicate> deserializer) {
 +      custom_predicates.put(name, deserializer);
 +   }
 +
 +   public static Map<ResourceLocation, java.util.function.Function<JsonObject, ItemPredicate>> getPredicates() {
 +      return unmod_predicates;
-+   }
-+
+    }
+ 
     public static class Builder {
-       private final List<EnchantmentPredicate> field_200312_a = Lists.newArrayList();
-       private final List<EnchantmentPredicate> field_226657_b_ = Lists.newArrayList();

patches/minecraft/net/minecraft/block/AbstractBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/AbstractBlock.java
 +++ b/net/minecraft/block/AbstractBlock.java
-@@ -59,7 +59,8 @@
+@@ -60,7 +_,8 @@
  import net.minecraftforge.api.distmarker.Dist;
  import net.minecraftforge.api.distmarker.OnlyIn;
  
@@ -10,15 +10,7 @@
     protected static final Direction[] field_212556_a = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
     protected final Material field_149764_J;
     protected final boolean field_235688_at_;
-@@ -71,6 +72,7 @@
-    protected final float field_226887_g_;
-    protected final boolean field_208621_p;
-    protected final AbstractBlock.Properties field_235684_aB_;
-+
-    @Nullable
-    protected ResourceLocation field_220085_g;
- 
-@@ -86,6 +88,8 @@
+@@ -87,6 +_,8 @@
        this.field_226887_g_ = p_i241196_1_.field_226894_k_;
        this.field_208621_p = p_i241196_1_.field_208772_j;
        this.field_235684_aB_ = p_i241196_1_;
@@ -27,16 +19,16 @@
     }
  
     @Deprecated
-@@ -128,7 +132,7 @@
+@@ -129,7 +_,7 @@
  
     @Deprecated
     public void func_196243_a(BlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, BlockState p_196243_4_, boolean p_196243_5_) {
 -      if (this.func_235695_q_() && !p_196243_1_.func_203425_a(p_196243_4_.func_177230_c())) {
-+      if (p_196243_1_.hasTileEntity() && (p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c() || !p_196243_4_.hasTileEntity())) {
++      if (p_196243_1_.hasTileEntity() && (!p_196243_1_.func_203425_a(p_196243_4_.func_177230_c()) || !p_196243_4_.hasTileEntity())) {
           p_196243_2_.func_175713_t(p_196243_3_);
        }
  
-@@ -190,7 +194,7 @@
+@@ -191,7 +_,7 @@
  
     @Deprecated
     public boolean func_196253_a(BlockState p_196253_1_, BlockItemUseContext p_196253_2_) {
@@ -45,16 +37,18 @@
     }
  
     @Deprecated
-@@ -293,7 +297,7 @@
+@@ -294,8 +_,8 @@
        if (f == -1.0F) {
           return 0.0F;
        } else {
 -         int i = p_180647_2_.func_234569_d_(p_180647_1_) ? 30 : 100;
+-         return p_180647_2_.func_184813_a(p_180647_1_) / f / (float)i;
 +         int i = net.minecraftforge.common.ForgeHooks.canHarvestBlock(p_180647_1_, p_180647_2_, p_180647_3_, p_180647_4_) ? 30 : 100;
-          return p_180647_2_.func_184813_a(p_180647_1_) / f / (float)i;
++         return p_180647_2_.getDigSpeed(p_180647_1_, p_180647_4_) / f / (float)i;
        }
     }
-@@ -320,14 +324,14 @@
+ 
+@@ -321,14 +_,14 @@
        return 0;
     }
  
@@ -71,10 +65,14 @@
        }
  
        return this.field_220085_g;
-@@ -345,6 +349,10 @@
+@@ -346,6 +_,14 @@
        return this.field_235684_aB_.field_235800_b_.apply(this.func_230328_p_().func_176223_P());
     }
  
++   protected boolean isAir(BlockState state) {
++      return ((AbstractBlockState)state).field_235702_f_;
++   }
++
 +   /* ======================================== FORGE START ===================================== */
 +   private final java.util.function.Supplier<ResourceLocation> lootTableSupplier;
 +   /* ========================================= FORGE END ====================================== */
@@ -82,29 +80,93 @@
     public abstract static class AbstractBlockState extends StateHolder<Block, BlockState> {
        private final int field_215708_d;
        private final boolean field_215709_e;
-@@ -427,6 +435,8 @@
+@@ -424,18 +_,24 @@
+          return this.field_215709_e;
+       }
+ 
++      /** @deprecated use {@link BlockState#getLightValue(IBlockReader, BlockPos)} */
++      @Deprecated
+       public int func_185906_d() {
           return this.field_215708_d;
        }
  
-+      /** @deprecated use {@link BlockState#isAir(IBlockReader, BlockPos) */
++      /** @deprecated use {@link BlockState#isAir(IBlockReader, BlockPos)} until 1.17, at which point this method will be undreprecated. See https://github.com/MinecraftForge/MinecraftForge/issues/7409 for more details */
 +      @Deprecated
        public boolean func_196958_f() {
-          return this.field_235702_f_;
+-         return this.field_235702_f_;
++         return this.func_177230_c().isAir((BlockState)this);
        }
-@@ -435,6 +445,8 @@
+ 
+       public MaterialColor func_185909_g(IBlockReader p_185909_1_, BlockPos p_185909_2_) {
           return this.field_235704_h_;
        }
  
-+      /** @deprecated use {@link BlockState#rotate(IWorld, BlockPos, Rotation) */
++      /** @deprecated use {@link BlockState#rotate(IWorld, BlockPos, Rotation)} */
 +      @Deprecated
        public BlockState func_185907_a(Rotation p_185907_1_) {
           return this.func_177230_c().func_185499_a(this.func_230340_p_(), p_185907_1_);
        }
-@@ -786,6 +798,7 @@
+@@ -802,8 +_,11 @@
        private ResourceLocation field_222381_j;
        private boolean field_226895_m_ = true;
        private boolean field_235813_o_;
++      private int harvestLevel = -1;
++      private net.minecraftforge.common.ToolType harvestTool;
 +      private java.util.function.Supplier<ResourceLocation> lootTableSupplier;
        private AbstractBlock.IExtendedPositionPredicate<EntityType<?>> field_235814_p_ = (p_235832_0_, p_235832_1_, p_235832_2_, p_235832_3_) -> {
-          return p_235832_0_.func_224755_d(p_235832_1_, p_235832_2_, Direction.UP) && p_235832_0_.func_185906_d() < 14;
+-         return p_235832_0_.func_224755_d(p_235832_1_, p_235832_2_, Direction.UP) && p_235832_0_.func_185906_d() < 14;
++         return p_235832_0_.func_224755_d(p_235832_1_, p_235832_2_, Direction.UP) && p_235832_0_.getLightValue(p_235832_1_, p_235832_2_) < 14;
        };
+       private AbstractBlock.IPositionPredicate field_235815_q_ = (p_235853_0_, p_235853_1_, p_235853_2_) -> {
+          return p_235853_0_.func_185904_a().func_76218_k() && p_235853_0_.func_235785_r_(p_235853_1_, p_235853_2_);
+@@ -863,6 +_,8 @@
+          abstractblock$properties.field_226895_m_ = p_200950_0_.field_235684_aB_.field_226895_m_;
+          abstractblock$properties.field_235813_o_ = p_200950_0_.field_235684_aB_.field_235813_o_;
+          abstractblock$properties.field_235806_h_ = p_200950_0_.field_235684_aB_.field_235806_h_;
++         abstractblock$properties.harvestLevel = p_200950_0_.field_235684_aB_.harvestLevel;
++         abstractblock$properties.harvestTool = p_200950_0_.field_235684_aB_.harvestTool;
+          return abstractblock$properties;
+       }
+ 
+@@ -877,6 +_,24 @@
+          return this;
+       }
+ 
++      public AbstractBlock.Properties harvestLevel(int harvestLevel) {
++         this.harvestLevel = harvestLevel;
++         return this;
++      }
++
++      public AbstractBlock.Properties harvestTool(net.minecraftforge.common.ToolType harvestTool) {
++         this.harvestTool = harvestTool;
++         return this;
++      }
++
++      public int getHarvestLevel() {
++         return this.harvestLevel;
++      }
++
++      public net.minecraftforge.common.ToolType getHarvestTool() {
++         return this.harvestTool;
++      }
++
+       public AbstractBlock.Properties func_200941_a(float p_200941_1_) {
+          this.field_200961_i = p_200941_1_;
+          return this;
+@@ -932,9 +_,15 @@
+          return this;
+       }
+ 
++      @Deprecated // FORGE: Use the variant that takes a Supplier below
+       public AbstractBlock.Properties func_222379_b(Block p_222379_1_) {
+-         this.field_222381_j = p_222379_1_.func_220068_i();
++         this.lootTableSupplier = () -> p_222379_1_.delegate.get().func_220068_i();
+          return this;
++      }
++
++      public AbstractBlock.Properties lootFrom(java.util.function.Supplier<? extends Block> blockIn) {
++          this.lootTableSupplier = () -> blockIn.get().func_220068_i();
++          return this;
+       }
+ 
+       public AbstractBlock.Properties func_235859_g_() {

patches/minecraft/net/minecraft/block/AbstractFireBlock.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/block/AbstractFireBlock.java
++++ b/net/minecraft/block/AbstractFireBlock.java
+@@ -124,6 +_,7 @@
+       if (!p_220082_4_.func_203425_a(p_220082_1_.func_177230_c())) {
+          if (func_242649_a(p_220082_2_)) {
+             Optional<PortalSize> optional = PortalSize.func_242964_a(p_220082_2_, p_220082_3_, Direction.Axis.X);
++            optional =  net.minecraftforge.event.ForgeEventFactory.onTrySpawnPortal(p_220082_2_, p_220082_3_, optional);
+             if (optional.isPresent()) {
+                optional.get().func_150859_c();
+                return;

patches/minecraft/net/minecraft/block/AbstractRailBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/AbstractRailBlock.java
 +++ b/net/minecraft/block/AbstractRailBlock.java
-@@ -13,7 +13,7 @@
+@@ -13,7 +_,7 @@
  import net.minecraft.world.IWorldReader;
  import net.minecraft.world.World;
  
@@ -9,24 +9,24 @@
     protected static final VoxelShape field_185590_a = Block.func_208617_a(0.0D, 0.0D, 0.0D, 16.0D, 2.0D, 16.0D);
     protected static final VoxelShape field_190959_b = Block.func_208617_a(0.0D, 0.0D, 0.0D, 16.0D, 8.0D, 16.0D);
     private final boolean field_196277_c;
-@@ -37,6 +37,7 @@
+@@ -37,6 +_,7 @@
  
     public VoxelShape func_220053_a(BlockState p_220053_1_, IBlockReader p_220053_2_, BlockPos p_220053_3_, ISelectionContext p_220053_4_) {
        RailShape railshape = p_220053_1_.func_203425_a(this) ? p_220053_1_.func_177229_b(this.func_176560_l()) : null;
-+      RailShape railShape2 = p_220053_1_.func_177230_c() == this ? getRailDirection(p_220053_1_, p_220053_2_, p_220053_3_, null) : null;
++      RailShape railShape2 = p_220053_1_.func_203425_a(this) ? getRailDirection(p_220053_1_, p_220053_2_, p_220053_3_, null) : null;
        return railshape != null && railshape.func_208092_c() ? field_190959_b : field_185590_a;
     }
  
-@@ -61,7 +62,7 @@
+@@ -61,7 +_,7 @@
  
     public void func_220069_a(BlockState p_220069_1_, World p_220069_2_, BlockPos p_220069_3_, Block p_220069_4_, BlockPos p_220069_5_, boolean p_220069_6_) {
-       if (!p_220069_2_.field_72995_K) {
+       if (!p_220069_2_.field_72995_K && p_220069_2_.func_180495_p(p_220069_3_).func_203425_a(this)) {
 -         RailShape railshape = p_220069_1_.func_177229_b(this.func_176560_l());
 +         RailShape railshape = getRailDirection(p_220069_1_, p_220069_2_, p_220069_3_, null);
-          if (func_235328_a_(p_220069_3_, p_220069_2_, railshape) && !p_220069_2_.func_175623_d(p_220069_3_)) {
-             if (!p_220069_6_) {
-                func_220075_c(p_220069_1_, p_220069_2_, p_220069_3_);
-@@ -113,7 +114,7 @@
+          if (func_235328_a_(p_220069_3_, p_220069_2_, railshape)) {
+             func_220075_c(p_220069_1_, p_220069_2_, p_220069_3_);
+             p_220069_2_.func_217377_a(p_220069_3_, p_220069_6_);
+@@ -110,7 +_,7 @@
     public void func_196243_a(BlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, BlockState p_196243_4_, boolean p_196243_5_) {
        if (!p_196243_5_) {
           super.func_196243_a(p_196243_1_, p_196243_2_, p_196243_3_, p_196243_4_, p_196243_5_);
@@ -35,7 +35,7 @@
              p_196243_2_.func_195593_d(p_196243_3_.func_177984_a(), this);
           }
  
-@@ -132,5 +133,20 @@
+@@ -129,5 +_,20 @@
        return blockstate.func_206870_a(this.func_176560_l(), flag ? RailShape.EAST_WEST : RailShape.NORTH_SOUTH);
     }
  

patches/minecraft/net/minecraft/block/AbstractTopPlantBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/AbstractTopPlantBlock.java
 +++ b/net/minecraft/block/AbstractTopPlantBlock.java
-@@ -39,10 +39,11 @@
+@@ -32,10 +_,11 @@
     }
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {

patches/minecraft/net/minecraft/block/BambooBlock.java.patch

@@ -1,11 +1,14 @@
 --- a/net/minecraft/block/BambooBlock.java
 +++ b/net/minecraft/block/BambooBlock.java
-@@ -101,8 +101,9 @@
+@@ -100,10 +_,11 @@
+ 
+    public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
        if (p_225542_1_.func_177229_b(field_220266_f) == 0) {
-          if (p_225542_4_.nextInt(3) == 0 && p_225542_2_.func_175623_d(p_225542_3_.func_177984_a()) && p_225542_2_.func_226659_b_(p_225542_3_.func_177984_a(), 0) >= 9) {
+-         if (p_225542_4_.nextInt(3) == 0 && p_225542_2_.func_175623_d(p_225542_3_.func_177984_a()) && p_225542_2_.func_226659_b_(p_225542_3_.func_177984_a(), 0) >= 9) {
++         if (p_225542_2_.func_175623_d(p_225542_3_.func_177984_a()) && p_225542_2_.func_226659_b_(p_225542_3_.func_177984_a(), 0) >= 9) {
              int i = this.func_220260_b(p_225542_2_, p_225542_3_) + 1;
 -            if (i < 16) {
-+            if (i < 16 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_225542_2_, p_225542_3_, p_225542_1_, p_225542_4_.nextInt(3) == 0 && p_225542_2_.func_175623_d(p_225542_3_.func_177984_a()) && p_225542_2_.func_226659_b_(p_225542_3_.func_177984_a(), 0) >= 9)) {
++            if (i < 16 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_225542_2_, p_225542_3_, p_225542_1_, p_225542_4_.nextInt(3) == 0)) {
                 this.func_220258_a(p_225542_1_, p_225542_2_, p_225542_3_, p_225542_4_, i);
 +               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_225542_2_, p_225542_3_, p_225542_1_);
              }

patches/minecraft/net/minecraft/block/BeehiveBlock.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/block/BeehiveBlock.java
++++ b/net/minecraft/block/BeehiveBlock.java
+@@ -85,6 +_,7 @@
+       List<BeeEntity> list = p_226881_1_.func_217357_a(BeeEntity.class, (new AxisAlignedBB(p_226881_2_)).func_72314_b(8.0D, 6.0D, 8.0D));
+       if (!list.isEmpty()) {
+          List<PlayerEntity> list1 = p_226881_1_.func_217357_a(PlayerEntity.class, (new AxisAlignedBB(p_226881_2_)).func_72314_b(8.0D, 6.0D, 8.0D));
++         if (list1.isEmpty()) return; //Forge: Prevent Error when no players are around.
+          int i = list1.size();
+ 
+          for(BeeEntity beeentity : list) {

patches/minecraft/net/minecraft/block/Block.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/Block.java
 +++ b/net/minecraft/block/Block.java
-@@ -52,9 +52,10 @@
+@@ -54,9 +_,10 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -13,25 +13,34 @@
     private static final LoadingCache<VoxelShape, Boolean> field_223006_b = CacheBuilder.newBuilder().maximumSize(512L).weakKeys().build(new CacheLoader<VoxelShape, Boolean>() {
        public Boolean load(VoxelShape p_load_1_) {
           return !VoxelShapes.func_197879_c(VoxelShapes.func_197868_b(), p_load_1_, IBooleanFunction.field_223236_g_);
-@@ -270,7 +271,7 @@
+@@ -151,6 +_,8 @@
+       super(p_i48440_1_);
+       StateContainer.Builder<Block, BlockState> builder = new StateContainer.Builder<>(this);
+       this.func_206840_a(builder);
++      this.harvestLevel = p_i48440_1_.getHarvestLevel();
++      this.harvestTool = p_i48440_1_.getHarvestTool();
+       this.field_176227_L = builder.func_235882_a_(Block::func_176223_P, BlockState::new);
+       this.func_180632_j(this.field_176227_L.func_177621_b());
+    }
+@@ -261,7 +_,7 @@
     }
  
     public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_) {
 -      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_223586_b(GameRules.field_223603_f)) {
-+      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_223586_b(GameRules.field_223603_f) && p_180635_0_.restoringBlockSnapshots) {
++      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_223586_b(GameRules.field_223603_f) && !p_180635_0_.restoringBlockSnapshots) {
           float f = 0.5F;
           double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
           double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
-@@ -282,7 +283,7 @@
+@@ -273,7 +_,7 @@
     }
  
-    public void func_180637_b(World p_180637_1_, BlockPos p_180637_2_, int p_180637_3_) {
--      if (!p_180637_1_.field_72995_K && p_180637_1_.func_82736_K().func_223586_b(GameRules.field_223603_f)) {
-+      if (!p_180637_1_.field_72995_K && p_180637_1_.func_82736_K().func_223586_b(GameRules.field_223603_f) && p_180637_1_.restoringBlockSnapshots) {
+    public void func_180637_b(ServerWorld p_180637_1_, BlockPos p_180637_2_, int p_180637_3_) {
+-      if (p_180637_1_.func_82736_K().func_223586_b(GameRules.field_223603_f)) {
++      if (p_180637_1_.func_82736_K().func_223586_b(GameRules.field_223603_f) && !p_180637_1_.restoringBlockSnapshots) {
           while(p_180637_3_ > 0) {
              int i = ExperienceOrbEntity.func_70527_a(p_180637_3_);
              p_180637_3_ -= i;
-@@ -292,6 +293,7 @@
+@@ -283,6 +_,7 @@
  
     }
  
@@ -39,7 +48,7 @@
     public float func_149638_a() {
        return this.field_235689_au_;
     }
-@@ -341,6 +343,7 @@
+@@ -332,6 +_,7 @@
        p_176216_2_.func_213317_d(p_176216_2_.func_213322_ci().func_216372_d(1.0D, 0.0D, 1.0D));
     }
  
@@ -47,7 +56,7 @@
     public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, BlockState p_185473_3_) {
        return new ItemStack(this);
     }
-@@ -372,6 +375,7 @@
+@@ -363,6 +_,7 @@
     public void func_176224_k(World p_176224_1_, BlockPos p_176224_2_) {
     }
  
@@ -55,7 +64,7 @@
     public boolean func_149659_a(Explosion p_149659_1_) {
        return true;
     }
-@@ -391,6 +395,7 @@
+@@ -382,6 +_,7 @@
        return this.field_196275_y;
     }
  
@@ -63,7 +72,7 @@
     public SoundType func_220072_p(BlockState p_220072_1_) {
        return this.field_149762_H;
     }
-@@ -400,7 +405,7 @@
+@@ -391,7 +_,7 @@
           this.field_220086_i = Item.func_150898_a(this);
        }
  
@@ -72,7 +81,7 @@
     }
  
     public boolean func_208619_r() {
-@@ -408,7 +413,7 @@
+@@ -399,7 +_,7 @@
     }
  
     public String toString() {
@@ -81,21 +90,17 @@
     }
  
     @OnlyIn(Dist.CLIENT)
-@@ -419,6 +424,83 @@
+@@ -409,6 +_,78 @@
+    protected Block func_230328_p_() {
        return this;
     }
- 
++
 +   /* ======================================== FORGE START =====================================*/
 +   protected Random RANDOM = new Random();
 +   private net.minecraftforge.common.ToolType harvestTool;
 +   private int harvestLevel;
 +   private final net.minecraftforge.common.util.ReverseTagWrapper<Block> reverseTags = new net.minecraftforge.common.util.ReverseTagWrapper<>(this, BlockTags::func_199896_a);
 +
-+   @Override
-+   public float getSlipperiness(BlockState state, IWorldReader world, BlockPos pos, @Nullable Entity entity) {
-+      return this.field_149765_K;
-+   }
-+
 +   @Nullable
 +   @Override
 +   public net.minecraftforge.common.ToolType getHarvestTool(BlockState state) {
@@ -128,7 +133,7 @@
 +      } else if (net.minecraftforge.common.PlantType.CROP.equals(type)) {
 +         return state.func_203425_a(Blocks.field_150458_ak);
 +      } else if (net.minecraftforge.common.PlantType.CAVE.equals(type)) {
-+         return Block.func_220056_d(state, world, pos, Direction.UP);
++         return state.func_224755_d(world, pos, Direction.UP);
 +      } else if (net.minecraftforge.common.PlantType.PLAINS.equals(type)) {
 +         return this.getBlock() == Blocks.field_196658_i || net.minecraftforge.common.Tags.Blocks.DIRT.func_230235_a_(this) || this.getBlock() == Blocks.field_150458_ak;
 +      } else if (net.minecraftforge.common.PlantType.WATER.equals(type)) {
@@ -161,7 +166,6 @@
 +      });
 +  }
 +   /* ========================================= FORGE END ======================================*/
-+
+ 
     public static final class RenderSideCacheKey {
        private final BlockState field_212164_a;
-       private final BlockState field_212165_b;

patches/minecraft/net/minecraft/block/BlockState.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/BlockState.java
 +++ b/net/minecraft/block/BlockState.java
-@@ -6,7 +6,7 @@
+@@ -6,7 +_,7 @@
  import net.minecraft.state.Property;
  import net.minecraft.util.registry.Registry;
  

patches/minecraft/net/minecraft/block/Blocks.java.patch

@@ -1,14 +1,14 @@
 --- a/net/minecraft/block/Blocks.java
 +++ b/net/minecraft/block/Blocks.java
-@@ -26,6 +26,7 @@
- import net.minecraft.world.gen.feature.Feature;
- import net.minecraft.world.gen.feature.HugeFungusConfig;
+@@ -25,6 +_,7 @@
+ import net.minecraft.world.IBlockReader;
+ import net.minecraft.world.gen.feature.Features;
  
 [email protected]("minecraft")
  public class Blocks {
     public static final Block field_150350_a = func_222382_a("air", new AirBlock(AbstractBlock.Properties.func_200945_a(Material.field_151579_a).func_200942_a().func_222380_e().func_235859_g_()));
     public static final Block field_150348_b = func_222382_a("stone", new Block(AbstractBlock.Properties.func_200949_a(Material.field_151576_e, MaterialColor.field_151665_m).func_235861_h_().func_200948_a(1.5F, 6.0F)));
-@@ -120,7 +121,7 @@
+@@ -119,7 +_,7 @@
     public static final Block field_196601_az = func_222382_a("green_bed", func_235422_a_(DyeColor.GREEN));
     public static final Block field_196550_aA = func_222382_a("red_bed", func_235422_a_(DyeColor.RED));
     public static final Block field_196551_aB = func_222382_a("black_bed", func_235422_a_(DyeColor.BLACK));
@@ -17,10 +17,11 @@
     public static final Block field_150319_E = func_222382_a("detector_rail", new DetectorRailBlock(AbstractBlock.Properties.func_200945_a(Material.field_151594_q).func_200942_a().func_200943_b(0.7F).func_200947_a(SoundType.field_185852_e)));
     public static final Block field_150320_F = func_222382_a("sticky_piston", func_235432_a_(true));
     public static final Block field_196553_aF = func_222382_a("cobweb", new WebBlock(AbstractBlock.Properties.func_200945_a(Material.field_151569_G).func_200942_a().func_235861_h_().func_200943_b(4.0F)));
-@@ -938,15 +939,4 @@
+@@ -936,16 +_,5 @@
+ 
     public static void func_235419_a_() {
        Block.field_176229_d.forEach(AbstractBlock.AbstractBlockState::func_215692_c);
-    }
+-   }
 -
 -   static {
 -      for(Block block : Registry.field_212618_g) {
@@ -31,5 +32,5 @@
 -         block.func_220068_i();
 -      }
 -
--   }
+    }
  }

patches/minecraft/net/minecraft/block/BushBlock.java.patch

@@ -1,15 +1,15 @@
 --- a/net/minecraft/block/BushBlock.java
 +++ b/net/minecraft/block/BushBlock.java
-@@ -7,7 +7,7 @@
+@@ -7,7 +_,7 @@
  import net.minecraft.world.IWorld;
  import net.minecraft.world.IWorldReader;
  
 -public class BushBlock extends Block {
 +public class BushBlock extends Block implements net.minecraftforge.common.IPlantable {
-    protected BushBlock(AbstractBlock.Properties p_i48437_1_) {
+    public BushBlock(AbstractBlock.Properties p_i48437_1_) {
        super(p_i48437_1_);
     }
-@@ -22,6 +22,8 @@
+@@ -22,6 +_,8 @@
  
     public boolean func_196260_a(BlockState p_196260_1_, IWorldReader p_196260_2_, BlockPos p_196260_3_) {
        BlockPos blockpos = p_196260_3_.func_177977_b();
@@ -18,15 +18,16 @@
        return this.func_200014_a_(p_196260_2_.func_180495_p(blockpos), p_196260_2_, blockpos);
     }
  
-@@ -32,4 +34,11 @@
+@@ -31,5 +_,12 @@
+ 
     public boolean func_196266_a(BlockState p_196266_1_, IBlockReader p_196266_2_, BlockPos p_196266_3_, PathType p_196266_4_) {
        return p_196266_4_ == PathType.AIR && !this.field_235688_at_ ? true : super.func_196266_a(p_196266_1_, p_196266_2_, p_196266_3_, p_196266_4_);
-    }
++   }
 +
 +   @Override
 +   public BlockState getPlant(IBlockReader world, BlockPos pos) {
 +      BlockState state = world.func_180495_p(pos);
 +      if (state.func_177230_c() != this) return func_176223_P();
 +      return state;
-+   }
+    }
  }

patches/minecraft/net/minecraft/block/CactusBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/CactusBlock.java
 +++ b/net/minecraft/block/CactusBlock.java
-@@ -19,7 +19,7 @@
+@@ -19,7 +_,7 @@
  import net.minecraft.world.World;
  import net.minecraft.world.server.ServerWorld;
  
@@ -9,7 +9,7 @@
     public static final IntegerProperty field_176587_a = BlockStateProperties.field_208171_X;
     protected static final VoxelShape field_196400_b = Block.func_208617_a(1.0D, 0.0D, 1.0D, 15.0D, 15.0D, 15.0D);
     protected static final VoxelShape field_196401_c = Block.func_208617_a(1.0D, 0.0D, 1.0D, 15.0D, 16.0D, 15.0D);
-@@ -30,6 +30,7 @@
+@@ -30,6 +_,7 @@
     }
  
     public void func_225534_a_(BlockState p_225534_1_, ServerWorld p_225534_2_, BlockPos p_225534_3_, Random p_225534_4_) {
@@ -17,7 +17,7 @@
        if (!p_225534_1_.func_196955_c(p_225534_2_, p_225534_3_)) {
           p_225534_2_.func_175655_b(p_225534_3_, true);
        }
-@@ -45,6 +46,7 @@
+@@ -45,6 +_,7 @@
  
           if (i < 3) {
              int j = p_225542_1_.func_177229_b(field_176587_a);
@@ -25,7 +25,7 @@
              if (j == 15) {
                 p_225542_2_.func_175656_a(blockpos, this.func_176223_P());
                 BlockState blockstate = p_225542_1_.func_206870_a(field_176587_a, Integer.valueOf(0));
-@@ -53,7 +55,8 @@
+@@ -53,7 +_,8 @@
              } else {
                 p_225542_2_.func_180501_a(p_225542_3_, p_225542_1_.func_206870_a(field_176587_a, Integer.valueOf(j + 1)), 4);
              }
@@ -35,7 +35,7 @@
           }
        }
     }
-@@ -84,7 +87,7 @@
+@@ -84,7 +_,7 @@
        }
  
        BlockState blockstate1 = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
@@ -44,10 +44,11 @@
     }
  
     public void func_196262_a(BlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {
-@@ -98,4 +101,14 @@
+@@ -97,5 +_,15 @@
+ 
     public boolean func_196266_a(BlockState p_196266_1_, IBlockReader p_196266_2_, BlockPos p_196266_3_, PathType p_196266_4_) {
        return false;
-    }
++   }
 +
 +   @Override
 +   public net.minecraftforge.common.PlantType getPlantType(IBlockReader world, BlockPos pos) {
@@ -57,5 +58,5 @@
 +   @Override
 +   public BlockState getPlant(IBlockReader world, BlockPos pos) {
 +      return func_176223_P();
-+   }
+    }
  }

patches/minecraft/net/minecraft/block/CampfireBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/CampfireBlock.java
 +++ b/net/minecraft/block/CampfireBlock.java
-@@ -181,7 +181,7 @@
+@@ -181,7 +_,7 @@
     public void func_220066_a(World p_220066_1_, BlockState p_220066_2_, BlockRayTraceResult p_220066_3_, ProjectileEntity p_220066_4_) {
        if (!p_220066_1_.field_72995_K && p_220066_4_.func_70027_ad()) {
           Entity entity = p_220066_4_.func_234616_v_();
@@ -9,3 +9,12 @@
           if (flag && !p_220066_2_.func_177229_b(field_220101_b) && !p_220066_2_.func_177229_b(field_220103_d)) {
              BlockPos blockpos = p_220066_3_.func_216350_a();
              p_220066_1_.func_180501_a(blockpos, p_220066_2_.func_206870_a(BlockStateProperties.field_208190_q, Boolean.valueOf(true)), 11);
+@@ -208,7 +_,7 @@
+             return true;
+          }
+ 
+-         boolean flag = VoxelShapes.func_197879_c(field_226912_f_, blockstate.func_215685_b(p_235474_0_, p_235474_1_, ISelectionContext.func_216377_a()), IBooleanFunction.field_223238_i_);
++         boolean flag = VoxelShapes.func_197879_c(field_226912_f_, blockstate.func_215685_b(p_235474_0_, blockpos, ISelectionContext.func_216377_a()), IBooleanFunction.field_223238_i_);//Forge fix: MC-201374
+          if (flag) {
+             BlockState blockstate1 = p_235474_0_.func_180495_p(blockpos.func_177977_b());
+             return func_226915_i_(blockstate1);

patches/minecraft/net/minecraft/block/ChorusFlowerBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/ChorusFlowerBlock.java
 +++ b/net/minecraft/block/ChorusFlowerBlock.java
-@@ -40,7 +40,7 @@
+@@ -40,7 +_,7 @@
        BlockPos blockpos = p_225542_3_.func_177984_a();
        if (p_225542_2_.func_175623_d(blockpos) && blockpos.func_177956_o() < 256) {
           int i = p_225542_1_.func_177229_b(field_185607_a);
@@ -9,7 +9,7 @@
              boolean flag = false;
              boolean flag1 = false;
              BlockState blockstate = p_225542_2_.func_180495_p(p_225542_3_.func_177977_b());
-@@ -65,7 +65,7 @@
+@@ -65,7 +_,7 @@
                 if (j < 2 || j <= p_225542_4_.nextInt(flag1 ? 5 : 4)) {
                    flag = true;
                 }
@@ -18,7 +18,7 @@
                 flag = true;
              }
  
-@@ -97,7 +97,7 @@
+@@ -97,7 +_,7 @@
              } else {
                 this.func_185605_c(p_225542_2_, p_225542_3_);
              }
@@ -27,7 +27,7 @@
           }
        }
     }
-@@ -133,7 +133,7 @@
+@@ -133,7 +_,7 @@
     public boolean func_196260_a(BlockState p_196260_1_, IWorldReader p_196260_2_, BlockPos p_196260_3_) {
        BlockState blockstate = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
        if (blockstate.func_177230_c() != this.field_196405_b && !blockstate.func_203425_a(Blocks.field_150377_bs)) {
@@ -36,7 +36,7 @@
              return false;
           } else {
              boolean flag = false;
-@@ -146,7 +146,7 @@
+@@ -146,7 +_,7 @@
                    }
  
                    flag = true;

patches/minecraft/net/minecraft/block/CocoaBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/CocoaBlock.java
 +++ b/net/minecraft/block/CocoaBlock.java
-@@ -35,10 +35,11 @@
+@@ -35,10 +_,11 @@
     }
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {

patches/minecraft/net/minecraft/block/ComparatorBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/ComparatorBlock.java
 +++ b/net/minecraft/block/ComparatorBlock.java
-@@ -154,4 +154,16 @@
+@@ -154,4 +_,16 @@
     protected void func_206840_a(StateContainer.Builder<Block, BlockState> p_206840_1_) {
        p_206840_1_.func_206894_a(field_185512_D, field_176463_b, field_196348_c);
     }

patches/minecraft/net/minecraft/block/CropsBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/CropsBlock.java
 +++ b/net/minecraft/block/CropsBlock.java
-@@ -61,12 +61,14 @@
+@@ -61,12 +_,14 @@
     }
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
@@ -16,7 +16,7 @@
              }
           }
        }
-@@ -95,9 +97,9 @@
+@@ -95,9 +_,9 @@
           for(int j = -1; j <= 1; ++j) {
              float f1 = 0.0F;
              BlockState blockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
@@ -28,7 +28,7 @@
                    f1 = 3.0F;
                 }
              }
-@@ -133,7 +135,7 @@
+@@ -133,7 +_,7 @@
     }
  
     public void func_196262_a(BlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {

patches/minecraft/net/minecraft/block/DeadBushBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/DeadBushBlock.java
 +++ b/net/minecraft/block/DeadBushBlock.java
-@@ -5,7 +5,7 @@
+@@ -5,7 +_,7 @@
  import net.minecraft.util.math.shapes.VoxelShape;
  import net.minecraft.world.IBlockReader;
  
@@ -8,4 +8,4 @@
 +public class DeadBushBlock extends BushBlock implements net.minecraftforge.common.IForgeShearable {
     protected static final VoxelShape field_196397_a = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 13.0D, 14.0D);
  
-    protected DeadBushBlock(AbstractBlock.Properties p_i48418_1_) {
+    public DeadBushBlock(AbstractBlock.Properties p_i48418_1_) {

patches/minecraft/net/minecraft/block/DetectorRailBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/DetectorRailBlock.java
 +++ b/net/minecraft/block/DetectorRailBlock.java
-@@ -129,6 +129,8 @@
+@@ -131,6 +_,8 @@
           }
  
           List<AbstractMinecartEntity> list1 = this.func_200878_a(p_180641_2_, p_180641_3_, AbstractMinecartEntity.class, EntityPredicates.field_96566_b);

patches/minecraft/net/minecraft/block/DoublePlantBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/DoublePlantBlock.java
 +++ b/net/minecraft/block/DoublePlantBlock.java
-@@ -51,6 +51,7 @@
+@@ -51,6 +_,7 @@
           return super.func_196260_a(p_196260_1_, p_196260_2_, p_196260_3_);
        } else {
           BlockState blockstate = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());

patches/minecraft/net/minecraft/block/DropperBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/DropperBlock.java
 +++ b/net/minecraft/block/DropperBlock.java
-@@ -37,7 +37,7 @@
+@@ -37,7 +_,7 @@
           p_176439_1_.func_217379_c(1001, p_176439_2_, 0);
        } else {
           ItemStack itemstack = dispensertileentity.func_70301_a(i);

patches/minecraft/net/minecraft/block/EnchantingTableBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/EnchantingTableBlock.java
 +++ b/net/minecraft/block/EnchantingTableBlock.java
-@@ -54,7 +54,7 @@
+@@ -54,7 +_,7 @@
              if (p_180655_4_.nextInt(16) == 0) {
                 for(int k = 0; k <= 1; ++k) {
                    BlockPos blockpos = p_180655_3_.func_177982_a(i, k, j);

patches/minecraft/net/minecraft/block/FallingBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/FallingBlock.java
 +++ b/net/minecraft/block/FallingBlock.java
-@@ -30,7 +30,7 @@
+@@ -30,7 +_,7 @@
     }
  
     public void func_225534_a_(BlockState p_225534_1_, ServerWorld p_225534_2_, BlockPos p_225534_3_, Random p_225534_4_) {
@@ -9,7 +9,7 @@
           FallingBlockEntity fallingblockentity = new FallingBlockEntity(p_225534_2_, (double)p_225534_3_.func_177958_n() + 0.5D, (double)p_225534_3_.func_177956_o(), (double)p_225534_3_.func_177952_p() + 0.5D, p_225534_2_.func_180495_p(p_225534_3_));
           this.func_149829_a(fallingblockentity);
           p_225534_2_.func_217376_c(fallingblockentity);
-@@ -59,7 +59,7 @@
+@@ -59,7 +_,7 @@
     public void func_180655_c(BlockState p_180655_1_, World p_180655_2_, BlockPos p_180655_3_, Random p_180655_4_) {
        if (p_180655_4_.nextInt(16) == 0) {
           BlockPos blockpos = p_180655_3_.func_177977_b();

patches/minecraft/net/minecraft/block/FarmlandBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/FarmlandBlock.java
 +++ b/net/minecraft/block/FarmlandBlock.java
-@@ -77,7 +77,7 @@
+@@ -77,7 +_,7 @@
     }
  
     public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_) {
@@ -9,7 +9,7 @@
           func_199610_d(p_180658_1_.func_180495_p(p_180658_2_), p_180658_1_, p_180658_2_);
        }
  
-@@ -88,9 +88,9 @@
+@@ -88,9 +_,10 @@
        p_199610_1_.func_175656_a(p_199610_2_, func_199601_a(p_199610_0_, Blocks.field_150346_d.func_176223_P(), p_199610_1_, p_199610_2_));
     }
  
@@ -17,12 +17,13 @@
 -      Block block = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a()).func_177230_c();
 -      return block instanceof CropsBlock || block instanceof StemBlock || block instanceof AttachedStemBlock;
 +   private boolean func_176529_d(IBlockReader p_176529_0_, BlockPos p_176529_1_) {
-+      BlockState state = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a());
-+      return state.func_177230_c() instanceof net.minecraftforge.common.IPlantable && canSustainPlant(state, p_176529_0_, p_176529_1_, Direction.UP, (net.minecraftforge.common.IPlantable)state.func_177230_c());
++      BlockState plant = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a());
++      BlockState state = p_176529_0_.func_180495_p(p_176529_1_);
++      return plant.func_177230_c() instanceof net.minecraftforge.common.IPlantable && state.canSustainPlant(p_176529_0_, p_176529_1_, Direction.UP, (net.minecraftforge.common.IPlantable)plant.func_177230_c());
     }
  
     private static boolean func_176530_e(IWorldReader p_176530_0_, BlockPos p_176530_1_) {
-@@ -100,7 +100,7 @@
+@@ -100,7 +_,7 @@
           }
        }
  

patches/minecraft/net/minecraft/block/FireBlock.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/block/FireBlock.java
 +++ b/net/minecraft/block/FireBlock.java
-@@ -76,13 +76,13 @@
+@@ -92,13 +_,13 @@
     protected BlockState func_196448_a(IBlockReader p_196448_1_, BlockPos p_196448_2_) {
        BlockPos blockpos = p_196448_2_.func_177977_b();
        BlockState blockstate = p_196448_1_.func_180495_p(blockpos);
 -      if (!this.func_196446_i(blockstate) && !blockstate.func_224755_d(p_196448_1_, blockpos, Direction.UP)) {
-+      if (!this.canCatchFire(p_196448_1_, p_196448_2_, Direction.UP) && !Block.func_220056_d(blockstate, p_196448_1_, blockpos, Direction.UP)) {
++      if (!this.canCatchFire(p_196448_1_, p_196448_2_, Direction.UP) && !blockstate.func_224755_d(p_196448_1_, blockpos, Direction.UP)) {
           BlockState blockstate1 = this.func_176223_P();
  
           for(Direction direction : Direction.values()) {
@@ -16,7 +16,7 @@
              }
           }
  
-@@ -105,7 +105,7 @@
+@@ -121,7 +_,7 @@
           }
  
           BlockState blockstate = p_225534_2_.func_180495_p(p_225534_3_.func_177977_b());
@@ -25,7 +25,7 @@
           int i = p_225534_1_.func_177229_b(field_176543_a);
           if (!flag && p_225534_2_.func_72896_J() && this.func_176537_d(p_225534_2_, p_225534_3_) && p_225534_4_.nextFloat() < 0.2F + (float)i * 0.03F) {
              p_225534_2_.func_217377_a(p_225534_3_, false);
-@@ -126,7 +126,7 @@
+@@ -142,7 +_,7 @@
                    return;
                 }
  
@@ -34,7 +34,7 @@
                    p_225534_2_.func_217377_a(p_225534_3_, false);
                    return;
                 }
-@@ -134,12 +134,12 @@
+@@ -150,12 +_,12 @@
  
              boolean flag1 = p_225534_2_.func_180502_D(p_225534_3_);
              int k = flag1 ? -50 : 0;
@@ -53,7 +53,7 @@
              BlockPos.Mutable blockpos$mutable = new BlockPos.Mutable();
  
              for(int l = -1; l <= 1; ++l) {
-@@ -177,15 +177,17 @@
+@@ -193,16 +_,18 @@
        return p_176537_1_.func_175727_C(p_176537_2_) || p_176537_1_.func_175727_C(p_176537_2_.func_177976_e()) || p_176537_1_.func_175727_C(p_176537_2_.func_177974_f()) || p_176537_1_.func_175727_C(p_176537_2_.func_177978_c()) || p_176537_1_.func_175727_C(p_176537_2_.func_177968_d());
     }
  
@@ -68,14 +68,17 @@
     }
  
 -   private void func_176536_a(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_) {
+-      int i = this.func_220274_q(p_176536_1_.func_180495_p(p_176536_2_));
 +   private void tryCatchFire(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_, Direction face) {
-       int i = this.func_220274_q(p_176536_1_.func_180495_p(p_176536_2_));
++      int i = p_176536_1_.func_180495_p(p_176536_2_).getFlammability(p_176536_1_, p_176536_2_, face);
        if (p_176536_4_.nextInt(p_176536_3_) < i) {
           BlockState blockstate = p_176536_1_.func_180495_p(p_176536_2_);
-@@ -197,10 +199,7 @@
+          if (p_176536_4_.nextInt(p_176536_5_ + 10) < 5 && !p_176536_1_.func_175727_C(p_176536_2_)) {
+@@ -212,11 +_,7 @@
+             p_176536_1_.func_217377_a(p_176536_2_, false);
           }
  
-          Block block = blockstate.func_177230_c();
+-         Block block = blockstate.func_177230_c();
 -         if (block instanceof TNTBlock) {
 -            TNTBlock tntblock = (TNTBlock)block;
 -            TNTBlock.func_196534_a(p_176536_1_, p_176536_2_);
@@ -84,7 +87,7 @@
        }
  
     }
-@@ -212,7 +211,7 @@
+@@ -228,7 +_,7 @@
  
     private boolean func_196447_a(IBlockReader p_196447_1_, BlockPos p_196447_2_) {
        for(Direction direction : Direction.values()) {
@@ -93,7 +96,7 @@
              return true;
           }
        }
-@@ -228,13 +227,14 @@
+@@ -244,13 +_,14 @@
  
           for(Direction direction : Direction.values()) {
              BlockState blockstate = p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(direction));
@@ -109,15 +112,15 @@
     protected boolean func_196446_i(BlockState p_196446_1_) {
        return this.func_220275_r(p_196446_1_) > 0;
     }
-@@ -253,10 +253,23 @@
+@@ -269,8 +_,21 @@
     }
  
     private void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_) {
 +      if (p_180686_1_ == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
        this.field_149849_a.put(p_180686_1_, p_180686_2_);
        this.field_149848_b.put(p_180686_1_, p_180686_3_);
-    }
- 
++   }
++
 +   /**
 +    * Side sensitive version that calls the block function.
 +    *
@@ -128,8 +131,6 @@
 +    */
 +   public boolean canCatchFire(IBlockReader world, BlockPos pos, Direction face) {
 +      return world.func_180495_p(pos).isFlammable(world, pos, face);
-+   }
-+
+    }
+ 
     public static void func_149843_e() {
-       FireBlock fireblock = (FireBlock)Blocks.field_150480_ab;
-       fireblock.func_180686_a(Blocks.field_196662_n, 5, 20);

patches/minecraft/net/minecraft/block/FlowerPotBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/FlowerPotBlock.java
 +++ b/net/minecraft/block/FlowerPotBlock.java
-@@ -24,12 +24,35 @@
+@@ -24,10 +_,33 @@
     protected static final VoxelShape field_196450_a = Block.func_208617_a(5.0D, 0.0D, 5.0D, 11.0D, 6.0D, 11.0D);
     private final Block field_196452_c;
  
@@ -13,14 +13,14 @@
 +       if (Blocks.field_150457_bL != null) {
 +           ((FlowerPotBlock)Blocks.field_150457_bL).addPlant(p_i48395_1_.getRegistryName(), () -> this);
 +       }
-    }
- 
++   }
++
 +   /**
 +    * For mod use, eliminates the need to extend this class, and prevents modded
 +    * flower pots from altering vanilla behavior.
 +    *
 +    * @param emptyPot    The empty pot for this pot, or null for self.
-+    * @param p_i48395_1_ The flower block.
++    * @param block The flower block.
 +    * @param properties
 +    */
 +   public FlowerPotBlock(@javax.annotation.Nullable java.util.function.Supplier<FlowerPotBlock> emptyPot, java.util.function.Supplier<? extends Block> p_i48395_1_, AbstractBlock.Properties properties) {
@@ -34,12 +34,10 @@
 +         this.fullPots = java.util.Collections.emptyMap();
 +         this.emptyPot = emptyPot;
 +      }
-+   }
-+
-    public VoxelShape func_220053_a(BlockState p_220053_1_, IBlockReader p_220053_2_, BlockPos p_220053_3_, ISelectionContext p_220053_4_) {
-       return field_196450_a;
     }
-@@ -41,7 +64,7 @@
+ 
+    public VoxelShape func_220053_a(BlockState p_220053_1_, IBlockReader p_220053_2_, BlockPos p_220053_3_, ISelectionContext p_220053_4_) {
+@@ -41,7 +_,7 @@
     public ActionResultType func_225533_a_(BlockState p_225533_1_, World p_225533_2_, BlockPos p_225533_3_, PlayerEntity p_225533_4_, Hand p_225533_5_, BlockRayTraceResult p_225533_6_) {
        ItemStack itemstack = p_225533_4_.func_184586_b(p_225533_5_);
        Item item = itemstack.func_77973_b();
@@ -48,7 +46,7 @@
        boolean flag = block == Blocks.field_150350_a;
        boolean flag1 = this.field_196452_c == Blocks.field_150350_a;
        if (flag != flag1) {
-@@ -59,7 +82,7 @@
+@@ -59,7 +_,7 @@
                 p_225533_4_.func_71019_a(itemstack1, false);
              }
  
@@ -57,7 +55,7 @@
           }
  
           return ActionResultType.func_233537_a_(p_225533_2_.field_72995_K);
-@@ -77,10 +100,27 @@
+@@ -77,10 +_,27 @@
     }
  
     public Block func_220276_d() {

patches/minecraft/net/minecraft/block/FlowingFluidBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/FlowingFluidBlock.java
 +++ b/net/minecraft/block/FlowingFluidBlock.java
-@@ -31,10 +31,11 @@
+@@ -29,10 +_,11 @@
  
  public class FlowingFluidBlock extends Block implements IBucketPickupHandler {
     public static final IntegerProperty field_176367_b = BlockStateProperties.field_208132_ag;
@@ -10,17 +10,17 @@
     public static final VoxelShape field_235510_c_ = Block.func_208617_a(0.0D, 0.0D, 0.0D, 16.0D, 8.0D, 16.0D);
  
 +   @Deprecated  // Forge: Use the constructor that takes a supplier
-    protected FlowingFluidBlock(FlowingFluid p_i49014_1_, AbstractBlock.Properties p_i49014_2_) {
+    public FlowingFluidBlock(FlowingFluid p_i49014_1_, AbstractBlock.Properties p_i49014_2_) {
        super(p_i49014_2_);
        this.field_204517_c = p_i49014_1_;
-@@ -47,8 +48,21 @@
+@@ -45,6 +_,19 @@
  
        this.field_212565_c.add(p_i49014_1_.func_207207_a(8, true));
        this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176367_b, Integer.valueOf(0)));
 +      fluidStateCacheInitialized = true;
 +      supplier = p_i49014_1_.delegate;
-    }
- 
++   }
++
 +   /**
 +    * @param supplier A fluid supplier such as {@link net.minecraftforge.fml.RegistryObject<Fluid>}
 +    */
@@ -30,12 +30,10 @@
 +      this.field_212565_c = Lists.newArrayList();
 +      this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176367_b, Integer.valueOf(0)));
 +      this.supplier = supplier;
-+   }
-+
-    public VoxelShape func_220071_b(BlockState p_220071_1_, IBlockReader p_220071_2_, BlockPos p_220071_3_, ISelectionContext p_220071_4_) {
-       return p_220071_4_.func_216378_a(field_235510_c_, p_220071_3_, true) && p_220071_1_.func_177229_b(field_176367_b) == 0 && p_220071_4_.func_230426_a_(p_220071_2_.func_204610_c(p_220071_3_.func_177984_a()), this.field_204517_c) ? field_235510_c_ : VoxelShapes.func_197880_a();
     }
-@@ -71,6 +85,7 @@
+ 
+    public VoxelShape func_220071_b(BlockState p_220071_1_, IBlockReader p_220071_2_, BlockPos p_220071_3_, ISelectionContext p_220071_4_) {
+@@ -69,6 +_,7 @@
  
     public FluidState func_204507_t(BlockState p_204507_1_) {
        int i = p_204507_1_.func_177229_b(field_176367_b);
@@ -43,7 +41,7 @@
        return this.field_212565_c.get(Math.min(i, 8));
     }
  
-@@ -122,13 +137,13 @@
+@@ -120,13 +_,13 @@
                 BlockPos blockpos = p_204515_2_.func_177972_a(direction);
                 if (p_204515_1_.func_204610_c(blockpos).func_206884_a(FluidTags.field_206959_a)) {
                    Block block = p_204515_1_.func_204610_c(p_204515_2_).func_206889_d() ? Blocks.field_150343_Z : Blocks.field_150347_e;
@@ -59,10 +57,12 @@
                    this.func_180688_d(p_204515_1_, p_204515_2_);
                    return false;
                 }
-@@ -166,4 +181,23 @@
-       }
- 
-    }
+@@ -151,6 +_,25 @@
+          return this.field_204517_c;
+       } else {
+          return Fluids.field_204541_a;
++      }
++   }
 +
 +   // Forge start
 +   private final java.util.function.Supplier<? extends Fluid> supplier;
@@ -80,6 +80,6 @@
 +
 +         this.field_212565_c.add(getFluid().func_207207_a(8, true));
 +         fluidStateCacheInitialized = true;
-+      }
-+   }
+       }
+    }
  }

patches/minecraft/net/minecraft/block/ITileEntityProvider.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/ITileEntityProvider.java
 +++ b/net/minecraft/block/ITileEntityProvider.java
-@@ -4,6 +4,7 @@
+@@ -4,6 +_,7 @@
  import net.minecraft.tileentity.TileEntity;
  import net.minecraft.world.IBlockReader;
  

patches/minecraft/net/minecraft/block/LadderBlock.java.patch

@@ -1,14 +0,0 @@
---- a/net/minecraft/block/LadderBlock.java
-+++ b/net/minecraft/block/LadderBlock.java
-@@ -93,6 +93,11 @@
-       return null;
-    }
- 
-+   @Override
-+   public boolean isLadder(BlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.LivingEntity entity) {
-+      return true;
-+   }
-+
-    public BlockState func_185499_a(BlockState p_185499_1_, Rotation p_185499_2_) {
-       return p_185499_1_.func_206870_a(field_176382_a, p_185499_2_.func_185831_a(p_185499_1_.func_177229_b(field_176382_a)));
-    }

patches/minecraft/net/minecraft/block/LeavesBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/LeavesBlock.java
 +++ b/net/minecraft/block/LeavesBlock.java
-@@ -19,7 +19,7 @@
+@@ -19,7 +_,7 @@
  import net.minecraftforge.api.distmarker.Dist;
  import net.minecraftforge.api.distmarker.OnlyIn;
  

patches/minecraft/net/minecraft/block/MushroomBlock.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/block/MushroomBlock.java
 +++ b/net/minecraft/block/MushroomBlock.java
-@@ -63,7 +63,7 @@
-       BlockPos blockpos = p_196260_3_.func_177977_b();
-       BlockState blockstate = p_196260_2_.func_180495_p(blockpos);
-       if (!blockstate.func_203425_a(Blocks.field_150391_bh) && !blockstate.func_203425_a(Blocks.field_196661_l)) {
+@@ -64,7 +_,7 @@
+       if (blockstate.func_235714_a_(BlockTags.field_242171_aD)) {
+          return true;
+       } else {
 -         return p_196260_2_.func_226659_b_(p_196260_3_, 0) < 13 && this.func_200014_a_(blockstate, p_196260_2_, blockpos);
 +         return p_196260_2_.func_226659_b_(p_196260_3_, 0) < 13 && blockstate.canSustainPlant(p_196260_2_, blockpos, net.minecraft.util.Direction.UP, this);
-       } else {
-          return true;
        }
+    }
+ 

patches/minecraft/net/minecraft/block/NetherPortalBlock.java.patch

@@ -1,47 +0,0 @@
---- a/net/minecraft/block/NetherPortalBlock.java
-+++ b/net/minecraft/block/NetherPortalBlock.java
-@@ -70,7 +70,7 @@
- 
-    public static boolean func_176548_d(IWorld p_176548_0_, BlockPos p_176548_1_) {
-       NetherPortalBlock.Size netherportalblock$size = func_201816_b(p_176548_0_, p_176548_1_);
--      if (netherportalblock$size != null) {
-+      if (netherportalblock$size != null && !net.minecraftforge.event.ForgeEventFactory.onTrySpawnPortal(p_176548_0_, p_176548_1_, netherportalblock$size)) {
-          netherportalblock$size.func_150859_c();
-          return true;
-       } else {
-@@ -241,12 +241,12 @@
-          int i;
-          for(i = 0; i < 22; ++i) {
-             BlockPos blockpos = p_180120_1_.func_177967_a(p_180120_2_, i);
--            if (!this.func_196900_a(this.field_150867_a.func_180495_p(blockpos)) || !this.field_150867_a.func_180495_p(blockpos.func_177977_b()).func_203425_a(Blocks.field_150343_Z)) {
-+            if (!this.func_196900_a(this.field_150867_a.func_180495_p(blockpos)) || !this.field_150867_a.func_180495_p(blockpos.func_177977_b()).isPortalFrame(field_150867_a, blockpos.func_177977_b())) {
-                break;
-             }
-          }
- 
--         return this.field_150867_a.func_180495_p(p_180120_1_.func_177967_a(p_180120_2_, i)).func_203425_a(Blocks.field_150343_Z) ? i : 0;
-+         return this.field_150867_a.func_180495_p(p_180120_1_.func_177967_a(p_180120_2_, i)).isPortalFrame(field_150867_a, p_180120_1_.func_177967_a(p_180120_2_, i)) ? i : 0;
-       }
- 
-       public int func_181100_a() {
-@@ -272,17 +272,17 @@
-                }
- 
-                if (i == 0) {
--                  if (!this.field_150867_a.func_180495_p(blockpos.func_177972_a(this.field_150863_d)).func_203425_a(Blocks.field_150343_Z)) {
-+                  if (!this.field_150867_a.func_180495_p(blockpos.func_177972_a(this.field_150863_d)).isPortalFrame(field_150867_a, blockpos.func_177972_a(this.field_150863_d))) {
-                      break label56;
-                   }
--               } else if (i == this.field_150868_h - 1 && !this.field_150867_a.func_180495_p(blockpos.func_177972_a(this.field_150866_c)).func_203425_a(Blocks.field_150343_Z)) {
-+               } else if (i == this.field_150868_h - 1 && !this.field_150867_a.func_180495_p(blockpos.func_177972_a(this.field_150866_c)).isPortalFrame(field_150867_a, blockpos.func_177972_a(this.field_150866_c))) {
-                   break label56;
-                }
-             }
-          }
- 
-          for(int j = 0; j < this.field_150868_h; ++j) {
--            if (!this.field_150867_a.func_180495_p(this.field_150861_f.func_177967_a(this.field_150866_c, j).func_177981_b(this.field_150862_g)).func_203425_a(Blocks.field_150343_Z)) {
-+            if (!this.field_150867_a.func_180495_p(this.field_150861_f.func_177967_a(this.field_150866_c, j).func_177981_b(this.field_150862_g)).isPortalFrame(field_150867_a, this.field_150861_f.func_177967_a(this.field_150866_c, j).func_177981_b(this.field_150862_g))) {
-                this.field_150862_g = 0;
-                break;
-             }

patches/minecraft/net/minecraft/block/NetherWartBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/NetherWartBlock.java
 +++ b/net/minecraft/block/NetherWartBlock.java
-@@ -35,9 +35,10 @@
+@@ -35,9 +_,10 @@
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
        int i = p_225542_1_.func_177229_b(field_176486_a);

patches/minecraft/net/minecraft/block/NoteBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/NoteBlock.java
 +++ b/net/minecraft/block/NoteBlock.java
-@@ -50,7 +50,7 @@
+@@ -50,7 +_,7 @@
     }
  
     private void func_196482_a(World p_196482_1_, BlockPos p_196482_2_) {
@@ -9,7 +9,7 @@
           p_196482_1_.func_175641_c(p_196482_2_, this, 0, 0);
        }
  
-@@ -60,7 +60,9 @@
+@@ -60,7 +_,9 @@
        if (p_225533_2_.field_72995_K) {
           return ActionResultType.SUCCESS;
        } else {
@@ -20,7 +20,7 @@
           p_225533_2_.func_180501_a(p_225533_3_, p_225533_1_, 3);
           this.func_196482_a(p_225533_2_, p_225533_3_);
           p_225533_4_.func_195066_a(Stats.field_188087_U);
-@@ -76,6 +78,9 @@
+@@ -76,6 +_,9 @@
     }
  
     public boolean func_189539_a(BlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_) {

patches/minecraft/net/minecraft/block/OreBlock.java.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/block/OreBlock.java
 +++ b/net/minecraft/block/OreBlock.java
-@@ -31,12 +31,10 @@
+@@ -31,12 +_,10 @@
  
-    public void func_220062_a(BlockState p_220062_1_, World p_220062_2_, BlockPos p_220062_3_, ItemStack p_220062_4_) {
+    public void func_220062_a(BlockState p_220062_1_, ServerWorld p_220062_2_, BlockPos p_220062_3_, ItemStack p_220062_4_) {
        super.func_220062_a(p_220062_1_, p_220062_2_, p_220062_3_, p_220062_4_);
 -      if (EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_220062_4_) == 0) {
 -         int i = this.func_220281_a(p_220062_2_.field_73012_v);

patches/minecraft/net/minecraft/block/PistonBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/PistonBlock.java
 +++ b/net/minecraft/block/PistonBlock.java
-@@ -158,6 +158,7 @@
+@@ -158,6 +_,7 @@
        }
  
        if (p_189539_4_ == 0) {
@@ -8,7 +8,7 @@
           if (!this.func_176319_a(p_189539_2_, p_189539_3_, direction, true)) {
              return false;
           }
-@@ -165,6 +166,7 @@
+@@ -165,6 +_,7 @@
           p_189539_2_.func_180501_a(p_189539_3_, p_189539_1_.func_206870_a(field_176320_b, Boolean.valueOf(true)), 67);
           p_189539_2_.func_184133_a((PlayerEntity)null, p_189539_3_, SoundEvents.field_187715_dR, SoundCategory.BLOCKS, 0.5F, p_189539_2_.field_73012_v.nextFloat() * 0.25F + 0.6F);
        } else if (p_189539_4_ == 1 || p_189539_4_ == 2) {
@@ -16,7 +16,7 @@
           TileEntity tileentity1 = p_189539_2_.func_175625_s(p_189539_3_.func_177972_a(direction));
           if (tileentity1 instanceof PistonTileEntity) {
              ((PistonTileEntity)tileentity1).func_145866_f();
-@@ -204,6 +206,7 @@
+@@ -204,6 +_,7 @@
           p_189539_2_.func_184133_a((PlayerEntity)null, p_189539_3_, SoundEvents.field_187712_dQ, SoundCategory.BLOCKS, 0.5F, p_189539_2_.field_73012_v.nextFloat() * 0.15F + 0.6F);
        }
  
@@ -24,16 +24,16 @@
        return true;
     }
  
-@@ -230,7 +233,7 @@
+@@ -234,7 +_,7 @@
                    return false;
                 }
  
 -               return !p_185646_0_.func_177230_c().func_235695_q_();
 +               return !p_185646_0_.hasTileEntity();
-             } else {
-                return false;
              }
-@@ -271,7 +274,7 @@
+          } else {
+             return false;
+@@ -273,7 +_,7 @@
           for(int k = list2.size() - 1; k >= 0; --k) {
              BlockPos blockpos2 = list2.get(k);
              BlockState blockstate1 = p_176319_1_.func_180495_p(blockpos2);
@@ -42,14 +42,14 @@
              func_220059_a(blockstate1, p_176319_1_, blockpos2, tileentity);
              p_176319_1_.func_180501_a(blockpos2, Blocks.field_150350_a.func_176223_P(), 18);
              ablockstate[j++] = blockstate1;
-@@ -335,6 +338,10 @@
-       return p_185499_1_.func_206870_a(field_176387_N, p_185499_2_.func_185831_a(p_185499_1_.func_177229_b(field_176387_N)));
-    }
+@@ -335,6 +_,10 @@
  
-+   public BlockState rotate(BlockState state, net.minecraft.world.IWorld world, BlockPos pos, Rotation direction) {
-+       return state.func_177229_b(field_176320_b) ? state : super.rotate(state, world, pos, direction);
+    public BlockState func_185499_a(BlockState p_185499_1_, Rotation p_185499_2_) {
+       return p_185499_1_.func_206870_a(field_176387_N, p_185499_2_.func_185831_a(p_185499_1_.func_177229_b(field_176387_N)));
 +   }
 +
-    public BlockState func_185471_a(BlockState p_185471_1_, Mirror p_185471_2_) {
-       return p_185471_1_.func_185907_a(p_185471_2_.func_185800_a(p_185471_1_.func_177229_b(field_176387_N)));
++   public BlockState rotate(BlockState state, net.minecraft.world.IWorld world, BlockPos pos, Rotation direction) {
++       return state.func_177229_b(field_176320_b) ? state : super.rotate(state, world, pos, direction);
     }
+ 
+    public BlockState func_185471_a(BlockState p_185471_1_, Mirror p_185471_2_) {

patches/minecraft/net/minecraft/block/PistonBlockStructureHelper.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/PistonBlockStructureHelper.java
 +++ b/net/minecraft/block/PistonBlockStructureHelper.java
-@@ -48,7 +48,7 @@
+@@ -48,7 +_,7 @@
        } else {
           for(int i = 0; i < this.field_177258_e.size(); ++i) {
              BlockPos blockpos = this.field_177258_e.get(i);
@@ -9,7 +9,7 @@
                 return false;
              }
           }
-@@ -57,24 +57,9 @@
+@@ -57,24 +_,9 @@
        }
     }
  
@@ -35,7 +35,7 @@
           return true;
        } else if (!PistonBlock.func_185646_a(blockstate, this.field_177261_a, p_177251_1_, this.field_177257_d, false, p_177251_2_)) {
           return true;
-@@ -87,12 +72,12 @@
+@@ -87,12 +_,12 @@
           if (i + this.field_177258_e.size() > 12) {
              return false;
           } else {
@@ -52,7 +52,7 @@
                    break;
                 }
  
-@@ -119,7 +104,7 @@
+@@ -119,7 +_,7 @@
  
                    for(int k = 0; k <= j + l; ++k) {
                       BlockPos blockpos2 = this.field_177258_e.get(k);
@@ -61,7 +61,7 @@
                          return false;
                       }
                    }
-@@ -128,7 +113,7 @@
+@@ -128,7 +_,7 @@
                 }
  
                 blockstate = this.field_177261_a.func_180495_p(blockpos1);
@@ -70,7 +70,7 @@
                    return true;
                 }
  
-@@ -173,7 +158,7 @@
+@@ -173,7 +_,7 @@
           if (direction.func_176740_k() != this.field_177257_d.func_176740_k()) {
              BlockPos blockpos = p_177250_1_.func_177972_a(direction);
              BlockState blockstate1 = this.field_177261_a.func_180495_p(blockpos);

patches/minecraft/net/minecraft/block/PortalSize.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/block/PortalSize.java
++++ b/net/minecraft/block/PortalSize.java
+@@ -16,7 +_,7 @@
+ 
+ public class PortalSize {
+    private static final AbstractBlock.IPositionPredicate field_242962_a = (p_242966_0_, p_242966_1_, p_242966_2_) -> {
+-      return p_242966_0_.func_203425_a(Blocks.field_150343_Z);
++      return p_242966_0_.isPortalFrame(p_242966_1_, p_242966_2_);
+    };
+    private final IWorld field_150867_a;
+    private final Direction.Axis field_150865_b;

patches/minecraft/net/minecraft/block/PoweredRailBlock.java.patch

@@ -1,12 +1,12 @@
 --- a/net/minecraft/block/PoweredRailBlock.java
 +++ b/net/minecraft/block/PoweredRailBlock.java
-@@ -14,10 +14,16 @@
+@@ -14,10 +_,16 @@
  public class PoweredRailBlock extends AbstractRailBlock {
     public static final EnumProperty<RailShape> field_176568_b = BlockStateProperties.field_208166_S;
     public static final BooleanProperty field_176569_M = BlockStateProperties.field_208194_u;
 +   private final boolean isActivator;  // TRUE for an Activator Rail, FALSE for Powered Rail
  
-    protected PoweredRailBlock(AbstractBlock.Properties p_i48349_1_) {
+    public PoweredRailBlock(AbstractBlock.Properties p_i48349_1_) {
 -      super(true, p_i48349_1_);
 +      this(p_i48349_1_, false);
 +   }
@@ -18,7 +18,7 @@
     }
  
     protected boolean func_176566_a(World p_176566_1_, BlockPos p_176566_2_, BlockState p_176566_3_, boolean p_176566_4_, int p_176566_5_) {
-@@ -99,13 +105,13 @@
+@@ -99,13 +_,13 @@
  
     protected boolean func_208071_a(World p_208071_1_, BlockPos p_208071_2_, boolean p_208071_3_, int p_208071_4_, RailShape p_208071_5_) {
        BlockState blockstate = p_208071_1_.func_180495_p(p_208071_2_);
@@ -35,12 +35,23 @@
                    return p_208071_1_.func_175640_z(p_208071_2_) ? true : this.func_176566_a(p_208071_1_, p_208071_2_, blockstate, p_208071_3_, p_208071_4_ + 1);
                 } else {
                    return false;
-@@ -255,4 +261,8 @@
+@@ -156,6 +_,9 @@
+             return p_185499_1_.func_206870_a(field_176568_b, RailShape.SOUTH_EAST);
+          case NORTH_EAST:
+             return p_185499_1_.func_206870_a(field_176568_b, RailShape.SOUTH_WEST);
++         case NORTH_SOUTH: //Forge fix: MC-196102
++         case EAST_WEST:
++            return p_185499_1_;
+          }
+       case COUNTERCLOCKWISE_90:
+          switch((RailShape)p_185499_1_.func_177229_b(field_176568_b)) {
+@@ -254,5 +_,9 @@
+ 
     protected void func_206840_a(StateContainer.Builder<Block, BlockState> p_206840_1_) {
        p_206840_1_.func_206894_a(field_176568_b, field_176569_M);
-    }
++   }
 +
 +   public boolean isActivatorRail() {
 +      return isActivator;
-+   }
+    }
  }

patches/minecraft/net/minecraft/block/RailBlock.java.patch

@@ -0,0 +1,12 @@
+--- a/net/minecraft/block/RailBlock.java
++++ b/net/minecraft/block/RailBlock.java
+@@ -49,6 +_,9 @@
+             return p_185499_1_.func_206870_a(field_176565_b, RailShape.SOUTH_EAST);
+          case NORTH_EAST:
+             return p_185499_1_.func_206870_a(field_176565_b, RailShape.SOUTH_WEST);
++         case NORTH_SOUTH: //Forge fix: MC-196102
++         case EAST_WEST:
++            return p_185499_1_;
+          }
+       case COUNTERCLOCKWISE_90:
+          switch((RailShape)p_185499_1_.func_177229_b(field_176565_b)) {

patches/minecraft/net/minecraft/block/RailState.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/RailState.java
 +++ b/net/minecraft/block/RailState.java
-@@ -15,14 +15,16 @@
+@@ -15,14 +_,16 @@
     private BlockState field_196923_d;
     private final boolean field_208513_e;
     private final List<BlockPos> field_196924_e = Lists.newArrayList();
@@ -19,7 +19,7 @@
        this.func_208509_a(railshape);
     }
  
-@@ -178,7 +180,7 @@
+@@ -178,7 +_,7 @@
           }
        }
  
@@ -28,7 +28,7 @@
           if (AbstractRailBlock.func_208488_a(this.field_196920_a, blockpos.func_177984_a())) {
              railshape = RailShape.ASCENDING_NORTH;
           }
-@@ -188,7 +190,7 @@
+@@ -188,7 +_,7 @@
           }
        }
  
@@ -37,7 +37,7 @@
           if (AbstractRailBlock.func_208488_a(this.field_196920_a, blockpos3.func_177984_a())) {
              railshape = RailShape.ASCENDING_EAST;
           }
-@@ -304,7 +306,7 @@
+@@ -304,7 +_,7 @@
           }
        }
  
@@ -46,7 +46,7 @@
           if (AbstractRailBlock.func_208488_a(this.field_196920_a, blockpos.func_177984_a())) {
              railshape = RailShape.ASCENDING_NORTH;
           }
-@@ -314,7 +316,7 @@
+@@ -314,7 +_,7 @@
           }
        }
  

patches/minecraft/net/minecraft/block/RedstoneDiodeBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/RedstoneDiodeBlock.java
 +++ b/net/minecraft/block/RedstoneDiodeBlock.java
-@@ -65,7 +65,7 @@
+@@ -65,7 +_,7 @@
        if (p_220069_1_.func_196955_c(p_220069_2_, p_220069_3_)) {
           this.func_176398_g(p_220069_2_, p_220069_3_, p_220069_1_);
        } else {
@@ -9,7 +9,7 @@
           func_220059_a(p_220069_1_, p_220069_2_, p_220069_3_, tileentity);
           p_220069_2_.func_217377_a(p_220069_3_, false);
  
-@@ -163,6 +163,8 @@
+@@ -163,6 +_,8 @@
     protected void func_176400_h(World p_176400_1_, BlockPos p_176400_2_, BlockState p_176400_3_) {
        Direction direction = p_176400_3_.func_177229_b(field_185512_D);
        BlockPos blockpos = p_176400_2_.func_177972_a(direction.func_176734_d());

patches/minecraft/net/minecraft/block/RedstoneOreBlock.java.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/block/RedstoneOreBlock.java
 +++ b/net/minecraft/block/RedstoneOreBlock.java
-@@ -71,11 +71,11 @@
+@@ -71,11 +_,11 @@
  
-    public void func_220062_a(BlockState p_220062_1_, World p_220062_2_, BlockPos p_220062_3_, ItemStack p_220062_4_) {
+    public void func_220062_a(BlockState p_220062_1_, ServerWorld p_220062_2_, BlockPos p_220062_3_, ItemStack p_220062_4_) {
        super.func_220062_a(p_220062_1_, p_220062_2_, p_220062_3_, p_220062_4_);
 -      if (EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_220062_4_) == 0) {
 -         int i = 1 + p_220062_2_.field_73012_v.nextInt(5);

patches/minecraft/net/minecraft/block/RedstoneWireBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/RedstoneWireBlock.java
 +++ b/net/minecraft/block/RedstoneWireBlock.java
-@@ -184,7 +184,7 @@
+@@ -184,7 +_,7 @@
        BlockState blockstate = p_235545_1_.func_180495_p(blockpos);
        if (p_235545_4_) {
           boolean flag = this.func_235552_b_(p_235545_1_, blockpos, blockstate);
@@ -9,7 +9,7 @@
              if (blockstate.func_224755_d(p_235545_1_, blockpos, p_235545_3_.func_176734_d())) {
                 return RedstoneSide.UP;
              }
-@@ -193,7 +193,7 @@
+@@ -193,7 +_,7 @@
           }
        }
  
@@ -18,7 +18,7 @@
     }
  
     public boolean func_196260_a(BlockState p_196260_1_, IWorldReader p_196260_2_, BlockPos p_196260_3_) {
-@@ -335,11 +335,7 @@
+@@ -335,11 +_,7 @@
        }
     }
  
@@ -31,7 +31,7 @@
        if (p_176343_0_.func_203425_a(Blocks.field_150488_af)) {
           return true;
        } else if (p_176343_0_.func_203425_a(Blocks.field_196633_cV)) {
-@@ -348,7 +344,7 @@
+@@ -348,7 +_,7 @@
        } else if (p_176343_0_.func_203425_a(Blocks.field_190976_dk)) {
           return p_176343_1_ == p_176343_0_.func_177229_b(ObserverBlock.field_176387_N);
        } else {

patches/minecraft/net/minecraft/block/SaplingBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SaplingBlock.java
 +++ b/net/minecraft/block/SaplingBlock.java
-@@ -29,6 +29,7 @@
+@@ -29,6 +_,7 @@
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
        if (p_225542_2_.func_201696_r(p_225542_3_.func_177984_a()) >= 9 && p_225542_4_.nextInt(7) == 0) {
@@ -8,7 +8,7 @@
           this.func_226942_a_(p_225542_2_, p_225542_3_, p_225542_1_, p_225542_4_);
        }
  
-@@ -38,6 +39,7 @@
+@@ -38,6 +_,7 @@
        if (p_226942_3_.func_177229_b(field_176479_b) == 0) {
           p_226942_1_.func_180501_a(p_226942_2_, p_226942_3_.func_235896_a_(field_176479_b), 4);
        } else {

patches/minecraft/net/minecraft/block/ScaffoldingBlock.java.patch

@@ -1,11 +0,0 @@
---- a/net/minecraft/block/ScaffoldingBlock.java
-+++ b/net/minecraft/block/ScaffoldingBlock.java
-@@ -138,6 +138,8 @@
-       return i;
-    }
- 
-+   @Override public boolean isLadder(BlockState state, IWorldReader world, BlockPos pos, net.minecraft.entity.LivingEntity entity) { return true; }
-+
-    static {
-       VoxelShape voxelshape = Block.func_208617_a(0.0D, 14.0D, 0.0D, 16.0D, 16.0D, 16.0D);
-       VoxelShape voxelshape1 = Block.func_208617_a(0.0D, 0.0D, 0.0D, 2.0D, 16.0D, 2.0D);

patches/minecraft/net/minecraft/block/SeaGrassBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SeaGrassBlock.java
 +++ b/net/minecraft/block/SeaGrassBlock.java
-@@ -17,7 +17,7 @@
+@@ -17,7 +_,7 @@
  import net.minecraft.world.World;
  import net.minecraft.world.server.ServerWorld;
  
@@ -8,4 +8,4 @@
 +public class SeaGrassBlock extends BushBlock implements IGrowable, ILiquidContainer, net.minecraftforge.common.IForgeShearable {
     protected static final VoxelShape field_207798_a = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 12.0D, 14.0D);
  
-    protected SeaGrassBlock(AbstractBlock.Properties p_i48780_1_) {
+    public SeaGrassBlock(AbstractBlock.Properties p_i48780_1_) {

patches/minecraft/net/minecraft/block/SoundType.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/block/SoundType.java
++++ b/net/minecraft/block/SoundType.java
+@@ -59,6 +_,7 @@
+    private final SoundEvent field_185865_r;
+    private final SoundEvent field_185866_s;
+ 
++   @Deprecated // Forge: Use {@link net.minecraftforge.common.util.ForgeSoundType} instead for suppliers
+    public SoundType(float p_i46679_1_, float p_i46679_2_, SoundEvent p_i46679_3_, SoundEvent p_i46679_4_, SoundEvent p_i46679_5_, SoundEvent p_i46679_6_, SoundEvent p_i46679_7_) {
+       this.field_185860_m = p_i46679_1_;
+       this.field_185861_n = p_i46679_2_;

patches/minecraft/net/minecraft/block/SpawnerBlock.java.patch

@@ -1,18 +1,16 @@
 --- a/net/minecraft/block/SpawnerBlock.java
 +++ b/net/minecraft/block/SpawnerBlock.java
-@@ -18,10 +18,13 @@
+@@ -18,8 +_,11 @@
  
-    public void func_220062_a(BlockState p_220062_1_, World p_220062_2_, BlockPos p_220062_3_, ItemStack p_220062_4_) {
+    public void func_220062_a(BlockState p_220062_1_, ServerWorld p_220062_2_, BlockPos p_220062_3_, ItemStack p_220062_4_) {
        super.func_220062_a(p_220062_1_, p_220062_2_, p_220062_3_, p_220062_4_);
 -      int i = 15 + p_220062_2_.field_73012_v.nextInt(15) + p_220062_2_.field_73012_v.nextInt(15);
 -      this.func_180637_b(p_220062_2_, p_220062_3_, i);
-    }
- 
++   }
++
 +   @Override
 +   public int getExpDrop(BlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune, int silktouch) {
 +      return 15 + RANDOM.nextInt(15) + RANDOM.nextInt(15);
-+   }
-+
-    public BlockRenderType func_149645_b(BlockState p_149645_1_) {
-       return BlockRenderType.MODEL;
     }
+ 
+    public BlockRenderType func_149645_b(BlockState p_149645_1_) {

patches/minecraft/net/minecraft/block/SpongeBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SpongeBlock.java
 +++ b/net/minecraft/block/SpongeBlock.java
-@@ -64,7 +64,7 @@
+@@ -64,7 +_,7 @@
                       queue.add(new Tuple<>(blockpos1, j + 1));
                    }
                 } else if (material == Material.field_203243_f || material == Material.field_204868_h) {

patches/minecraft/net/minecraft/block/SpreadableSnowyDirtBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SpreadableSnowyDirtBlock.java
 +++ b/net/minecraft/block/SpreadableSnowyDirtBlock.java
-@@ -33,6 +33,7 @@
+@@ -33,6 +_,7 @@
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
        if (!func_220257_b(p_225542_1_, p_225542_2_, p_225542_3_)) {

patches/minecraft/net/minecraft/block/StairsBlock.java.patch

@@ -1,30 +1,28 @@
 --- a/net/minecraft/block/StairsBlock.java
 +++ b/net/minecraft/block/StairsBlock.java
-@@ -83,13 +83,23 @@
+@@ -83,11 +_,21 @@
        return voxelshape;
     }
  
 +   @Deprecated // Forge: Use the other constructor that takes a Supplier
-    protected StairsBlock(BlockState p_i48321_1_, AbstractBlock.Properties p_i48321_2_) {
+    public StairsBlock(BlockState p_i48321_1_, AbstractBlock.Properties p_i48321_2_) {
        super(p_i48321_2_);
        this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176309_a, Direction.NORTH).func_206870_a(field_176308_b, Half.BOTTOM).func_206870_a(field_176310_M, StairsShape.STRAIGHT).func_206870_a(field_204513_t, Boolean.valueOf(false)));
        this.field_150149_b = p_i48321_1_.func_177230_c();
        this.field_150151_M = p_i48321_1_;
 +      this.stateSupplier = () -> p_i48321_1_;
-    }
- 
++   }
++
 +   public StairsBlock(java.util.function.Supplier<BlockState> state, AbstractBlock.Properties properties) {
 +      super(properties);
 +      this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176309_a, Direction.NORTH).func_206870_a(field_176308_b, Half.BOTTOM).func_206870_a(field_176310_M, StairsShape.STRAIGHT).func_206870_a(field_204513_t, Boolean.valueOf(false)));
 +      this.field_150149_b = Blocks.field_150350_a; // These are unused, fields are redirected
 +      this.field_150151_M = Blocks.field_150350_a.func_176223_P();
 +      this.stateSupplier = state;
-+   }
-+
-    public boolean func_220074_n(BlockState p_220074_1_) {
-       return true;
     }
-@@ -265,4 +275,14 @@
+ 
+    public boolean func_220074_n(BlockState p_220074_1_) {
+@@ -265,4 +_,14 @@
     public boolean func_196266_a(BlockState p_196266_1_, IBlockReader p_196266_2_, BlockPos p_196266_3_, PathType p_196266_4_) {
        return false;
     }

patches/minecraft/net/minecraft/block/StemBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/StemBlock.java
 +++ b/net/minecraft/block/StemBlock.java
-@@ -37,22 +37,24 @@
+@@ -37,22 +_,24 @@
     }
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
@@ -29,14 +29,15 @@
           }
  
        }
-@@ -97,4 +99,10 @@
+@@ -96,5 +_,11 @@
+ 
     public StemGrownBlock func_208486_d() {
        return this.field_149877_a;
-    }
++   }
 +
 +   //FORGE START
 +   @Override
 +   public net.minecraftforge.common.PlantType getPlantType(IBlockReader world, BlockPos pos) {
 +      return net.minecraftforge.common.PlantType.CROP;
-+   }
+    }
  }

patches/minecraft/net/minecraft/block/SugarCaneBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SugarCaneBlock.java
 +++ b/net/minecraft/block/SugarCaneBlock.java
-@@ -15,7 +15,7 @@
+@@ -15,7 +_,7 @@
  import net.minecraft.world.IWorldReader;
  import net.minecraft.world.server.ServerWorld;
  
@@ -9,7 +9,7 @@
     public static final IntegerProperty field_176355_a = BlockStateProperties.field_208171_X;
     protected static final VoxelShape field_196503_b = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 16.0D, 14.0D);
  
-@@ -43,12 +43,14 @@
+@@ -43,12 +_,14 @@
  
           if (i < 3) {
              int j = p_225542_1_.func_177229_b(field_176355_a);
@@ -24,7 +24,7 @@
           }
        }
  
-@@ -63,6 +65,8 @@
+@@ -63,6 +_,8 @@
     }
  
     public boolean func_196260_a(BlockState p_196260_1_, IWorldReader p_196260_2_, BlockPos p_196260_3_) {
@@ -33,10 +33,11 @@
        BlockState blockstate = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
        if (blockstate.func_177230_c() == this) {
           return true;
-@@ -86,4 +90,14 @@
+@@ -85,5 +_,15 @@
+ 
     protected void func_206840_a(StateContainer.Builder<Block, BlockState> p_206840_1_) {
        p_206840_1_.func_206894_a(field_176355_a);
-    }
++   }
 +
 +   @Override
 +   public net.minecraftforge.common.PlantType getPlantType(IBlockReader world, BlockPos pos) {
@@ -46,5 +47,5 @@
 +   @Override
 +   public BlockState getPlant(IBlockReader world, BlockPos pos) {
 +      return func_176223_P();
-+   }
+    }
  }

patches/minecraft/net/minecraft/block/SweetBerryBushBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SweetBerryBushBlock.java
 +++ b/net/minecraft/block/SweetBerryBushBlock.java
-@@ -52,8 +52,9 @@
+@@ -52,8 +_,9 @@
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
        int i = p_225542_1_.func_177229_b(field_220125_a);

patches/minecraft/net/minecraft/block/TNTBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/TNTBlock.java
 +++ b/net/minecraft/block/TNTBlock.java
-@@ -29,10 +29,14 @@
+@@ -29,10 +_,14 @@
        this.func_180632_j(this.func_176223_P().func_206870_a(field_212569_a, Boolean.valueOf(false)));
     }
  
@@ -16,7 +16,7 @@
              p_220082_2_.func_217377_a(p_220082_3_, false);
           }
  
-@@ -41,7 +45,7 @@
+@@ -41,7 +_,7 @@
  
     public void func_220069_a(BlockState p_220069_1_, World p_220069_2_, BlockPos p_220069_3_, Block p_220069_4_, BlockPos p_220069_5_, boolean p_220069_6_) {
        if (p_220069_2_.func_175640_z(p_220069_3_)) {
@@ -25,7 +25,7 @@
           p_220069_2_.func_217377_a(p_220069_3_, false);
        }
  
-@@ -49,7 +53,7 @@
+@@ -49,7 +_,7 @@
  
     public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, BlockState p_176208_3_, PlayerEntity p_176208_4_) {
        if (!p_176208_1_.func_201670_d() && !p_176208_4_.func_184812_l_() && p_176208_3_.func_177229_b(field_212569_a)) {
@@ -34,7 +34,7 @@
        }
  
        super.func_176208_a(p_176208_1_, p_176208_2_, p_176208_3_, p_176208_4_);
-@@ -63,10 +67,12 @@
+@@ -63,10 +_,12 @@
        }
     }
  
@@ -47,7 +47,7 @@
     private static void func_196535_a(World p_196535_0_, BlockPos p_196535_1_, @Nullable LivingEntity p_196535_2_) {
        if (!p_196535_0_.field_72995_K) {
           TNTEntity tntentity = new TNTEntity(p_196535_0_, (double)p_196535_1_.func_177958_n() + 0.5D, (double)p_196535_1_.func_177956_o(), (double)p_196535_1_.func_177952_p() + 0.5D, p_196535_2_);
-@@ -81,7 +87,7 @@
+@@ -81,7 +_,7 @@
        if (item != Items.field_151033_d && item != Items.field_151059_bz) {
           return super.func_225533_a_(p_225533_1_, p_225533_2_, p_225533_3_, p_225533_4_, p_225533_5_, p_225533_6_);
        } else {
@@ -56,7 +56,7 @@
           p_225533_2_.func_180501_a(p_225533_3_, Blocks.field_150350_a.func_176223_P(), 11);
           if (!p_225533_4_.func_184812_l_()) {
              if (item == Items.field_151033_d) {
-@@ -102,7 +108,7 @@
+@@ -102,7 +_,7 @@
           Entity entity = p_220066_4_.func_234616_v_();
           if (p_220066_4_.func_70027_ad()) {
              BlockPos blockpos = p_220066_3_.func_216350_a();

patches/minecraft/net/minecraft/block/TallGrassBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/TallGrassBlock.java
 +++ b/net/minecraft/block/TallGrassBlock.java
-@@ -8,7 +8,7 @@
+@@ -8,7 +_,7 @@
  import net.minecraft.world.World;
  import net.minecraft.world.server.ServerWorld;
  
@@ -8,4 +8,4 @@
 +public class TallGrassBlock extends BushBlock implements IGrowable, net.minecraftforge.common.IForgeShearable {
     protected static final VoxelShape field_196389_a = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 13.0D, 14.0D);
  
-    protected TallGrassBlock(AbstractBlock.Properties p_i48310_1_) {
+    public TallGrassBlock(AbstractBlock.Properties p_i48310_1_) {

patches/minecraft/net/minecraft/block/TrapDoorBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/TrapDoorBlock.java
 +++ b/net/minecraft/block/TrapDoorBlock.java
-@@ -147,4 +147,17 @@
+@@ -147,4 +_,17 @@
  
        return super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
     }
@@ -10,7 +10,7 @@
 +   public boolean isLadder(BlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.LivingEntity entity) {
 +      if (state.func_177229_b(field_176283_b)) {
 +         BlockState down = world.func_180495_p(pos.func_177977_b());
-+         if (down.func_177230_c() == net.minecraft.block.Blocks.field_150468_ap)
++         if (down.func_203425_a(net.minecraft.block.Blocks.field_150468_ap))
 +            return down.func_177229_b(LadderBlock.field_176382_a) == state.func_177229_b(field_185512_D);
 +      }
 +      return false;

patches/minecraft/net/minecraft/block/TurtleEggBlock.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/block/TurtleEggBlock.java
 +++ b/net/minecraft/block/TurtleEggBlock.java
-@@ -149,7 +149,7 @@
+@@ -149,7 +_,7 @@
           if (!(p_212570_2_ instanceof LivingEntity)) {
              return false;
           } else {
 -            return p_212570_2_ instanceof PlayerEntity || p_212570_1_.func_82736_K().func_223586_b(GameRules.field_223599_b);
-+            return p_212570_2_ instanceof LivingEntity && !(p_212570_2_ instanceof PlayerEntity) ? net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(p_212570_1_, p_212570_2_) : true;
++            return p_212570_2_ instanceof PlayerEntity || net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(p_212570_1_, p_212570_2_);
           }
        } else {
           return false;

patches/minecraft/net/minecraft/block/VineBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/VineBlock.java
 +++ b/net/minecraft/block/VineBlock.java
-@@ -19,7 +19,7 @@
+@@ -22,7 +_,7 @@
  import net.minecraft.world.IWorldReader;
  import net.minecraft.world.server.ServerWorld;
  
@@ -9,7 +9,7 @@
     public static final BooleanProperty field_176277_a = SixWayBlock.field_196496_z;
     public static final BooleanProperty field_176273_b = SixWayBlock.field_196488_a;
     public static final BooleanProperty field_176278_M = SixWayBlock.field_196490_b;
-@@ -143,14 +143,14 @@
+@@ -152,14 +_,14 @@
     }
  
     public void func_225542_b_(BlockState p_225542_1_, ServerWorld p_225542_2_, BlockPos p_225542_3_, Random p_225542_4_) {
@@ -26,20 +26,15 @@
                    Direction direction3 = direction.func_176746_e();
                    Direction direction4 = direction.func_176735_f();
                    boolean flag = p_225542_1_.func_177229_b(func_176267_a(direction3));
-@@ -207,7 +207,7 @@
+@@ -216,8 +_,9 @@
              if (p_225542_3_.func_177956_o() > 0) {
                 BlockPos blockpos1 = p_225542_3_.func_177977_b();
                 BlockState blockstate = p_225542_2_.func_180495_p(blockpos1);
 -               if (blockstate.func_196958_f() || blockstate.func_203425_a(this)) {
-+               if (blockstate.isAir(p_225542_2_, blockpos) || blockstate.func_203425_a(this)) {
-                   BlockState blockstate1 = blockstate.func_196958_f() ? this.func_176223_P() : blockstate;
+-                  BlockState blockstate1 = blockstate.func_196958_f() ? this.func_176223_P() : blockstate;
++               boolean isAir = blockstate.isAir(p_225542_2_, blockpos1);
++               if (isAir || blockstate.func_203425_a(this)) {
++                  BlockState blockstate1 = isAir ? this.func_176223_P() : blockstate;
                    BlockState blockstate2 = this.func_196544_a(p_225542_1_, blockstate1, p_225542_4_);
                    if (blockstate1 != blockstate2 && this.func_196540_x(blockstate2)) {
-@@ -313,4 +313,7 @@
-    public static BooleanProperty func_176267_a(Direction p_176267_0_) {
-       return field_196546_A.get(p_176267_0_);
-    }
-+
-+   @Override
-+   public boolean isLadder(BlockState state, IWorldReader world, BlockPos pos, net.minecraft.entity.LivingEntity entity) { return true; }
- }
+                      p_225542_2_.func_180501_a(blockpos1, blockstate2, 2);

patches/minecraft/net/minecraft/block/WebBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/WebBlock.java
 +++ b/net/minecraft/block/WebBlock.java
-@@ -5,7 +5,7 @@
+@@ -5,7 +_,7 @@
  import net.minecraft.util.math.vector.Vector3d;
  import net.minecraft.world.World;
  

patches/minecraft/net/minecraft/block/WoodType.java.patch

@@ -0,0 +1,14 @@
+--- a/net/minecraft/block/WoodType.java
++++ b/net/minecraft/block/WoodType.java
+@@ -32,4 +_,11 @@
+    public String func_227048_b_() {
+       return this.field_227045_h_;
+    }
++
++   /**
++    * Use this to create a new {@link WoodType}. Make sure to register its rendering by enqueuing Atlases.addWoodType(...) during client setup..
++    */
++   public static WoodType create(String name) {
++      return new WoodType(name);
++   }
+ }

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/ClientBrandRetriever.java
 +++ b/net/minecraft/client/ClientBrandRetriever.java
-@@ -6,6 +6,6 @@
+@@ -6,6 +_,6 @@
  @OnlyIn(Dist.CLIENT)
  public class ClientBrandRetriever {
     public static String getClientModName() {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/GameSettings.java
 +++ b/net/minecraft/client/GameSettings.java
-@@ -164,6 +164,7 @@
+@@ -170,6 +_,7 @@
     public boolean field_241568_aS_;
  
     public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_) {
@@ -8,7 +8,7 @@
        this.field_74317_L = p_i46326_1_;
        this.field_74354_ai = new File(p_i46326_2_, "options.txt");
        if (p_i46326_1_.func_147111_S() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
-@@ -507,7 +508,11 @@
+@@ -529,7 +_,11 @@
  
                 for(KeyBinding keybinding : this.field_74324_K) {
                    if (s.equals("key_" + keybinding.func_151464_g())) {
@@ -21,7 +21,7 @@
                    }
                 }
  
-@@ -554,6 +559,7 @@
+@@ -576,6 +_,7 @@
     }
  
     public void func_74303_b() {
@@ -29,7 +29,7 @@
        try (PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.field_74354_ai), StandardCharsets.UTF_8))) {
           printwriter.println("version:" + SharedConstants.func_215069_a().getWorldVersion());
           printwriter.println("autoJump:" + AbstractOption.field_216719_z.func_216741_b(this));
-@@ -635,7 +641,7 @@
+@@ -661,7 +_,7 @@
           printwriter.println("syncChunkWrites:" + this.field_241568_aS_);
  
           for(KeyBinding keybinding : this.field_74324_K) {
@@ -38,10 +38,11 @@
           }
  
           for(SoundCategory soundcategory : SoundCategory.values()) {
-@@ -733,4 +739,22 @@
+@@ -758,6 +_,23 @@
+       }
  
        p_198017_1_.func_198985_a(set);
-    }
++   }
 +
 +   private void setForgeKeybindProperties() {
 +      net.minecraftforge.client.settings.KeyConflictContext inGame = net.minecraftforge.client.settings.KeyConflictContext.IN_GAME;
@@ -58,6 +59,6 @@
 +      field_74323_J.setKeyConflictContext(inGame);
 +      field_151457_aa.setKeyConflictContext(inGame);
 +      field_151458_ab.setKeyConflictContext(inGame);
-+      field_186718_X.setKeyConflictContext(inGame);
-+   }
- }
+    }
+ 
+    public PointOfView func_243230_g() {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyboardListener.java
 +++ b/net/minecraft/client/KeyboardListener.java
-@@ -256,7 +256,9 @@
+@@ -255,7 +_,9 @@
           }
  
           INestedGuiEventHandler inestedguieventhandler = this.field_197972_a.field_71462_r;
@@ -11,7 +11,7 @@
              if (this.field_197972_a.field_71474_y.field_152395_am.func_197976_a(p_197961_3_, p_197961_4_)) {
                 this.field_197972_a.func_228018_at_().func_198077_g();
                 this.field_197972_a.field_71474_y.field_74353_u = this.field_197972_a.func_228018_at_().func_198113_j();
-@@ -275,6 +277,8 @@
+@@ -274,6 +_,8 @@
                 });
                 return;
              }
@@ -20,7 +20,7 @@
           }
  
           boolean flag = inestedguieventhandler == null || !(inestedguieventhandler.func_241217_q_() instanceof TextFieldWidget) || !((TextFieldWidget)inestedguieventhandler.func_241217_q_()).func_212955_f();
-@@ -294,10 +298,14 @@
+@@ -289,10 +_,14 @@
              Screen.func_231153_a_(() -> {
                 if (p_197961_5_ != 1 && (p_197961_5_ != 2 || !this.field_197973_b)) {
                    if (p_197961_5_ == 0) {
@@ -37,7 +37,7 @@
                 }
  
              }, "keyPressed event handler", inestedguieventhandler.getClass().getCanonicalName());
-@@ -350,7 +358,7 @@
+@@ -345,7 +_,7 @@
                 }
              }
           }
@@ -46,7 +46,7 @@
        }
     }
  
-@@ -360,12 +368,16 @@
+@@ -355,12 +_,16 @@
           if (iguieventlistener != null && this.field_197972_a.func_213250_au() == null) {
              if (Character.charCount(p_197963_3_) == 1) {
                 Screen.func_231153_a_(() -> {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/MainWindow.java
 +++ b/net/minecraft/client/MainWindow.java
-@@ -86,7 +86,7 @@
+@@ -86,7 +_,7 @@
        GLFW.glfwWindowHint(139266, 2);
        GLFW.glfwWindowHint(139267, 0);
        GLFW.glfwWindowHint(139272, 0);
@@ -9,3 +9,11 @@
        if (monitor != null) {
           VideoMode videomode = monitor.func_197992_a(this.field_198125_l ? this.field_198124_k : Optional.empty());
           this.field_198120_g = this.field_198127_n = monitor.func_197989_c() + videomode.func_198064_a() / 2 - this.field_198129_p / 2;
+@@ -271,6 +_,7 @@
+       GLFW.glfwGetFramebufferSize(this.field_198119_f, aint, aint1);
+       this.field_198131_r = aint[0];
+       this.field_198132_s = aint1[0];
++      if (this.field_198132_s == 0 || this.field_198131_r==0) net.minecraftforge.fml.loading.progress.EarlyProgressVisualization.INSTANCE.updateFBSize(w->this.field_198131_r=w, h->this.field_198132_s=h);
+    }
+ 
+    private void func_198089_c(long p_198089_1_, int p_198089_3_, int p_198089_4_) {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -358,6 +358,7 @@
+@@ -368,6 +_,7 @@
     public Minecraft(GameConfiguration p_i45547_1_) {
        super("Client");
        field_71432_P = this;
@@ -8,15 +8,15 @@
        this.field_71412_D = p_i45547_1_.field_178744_c.field_178760_a;
        File file1 = p_i45547_1_.field_178744_c.field_178759_c;
        this.field_130070_K = p_i45547_1_.field_178744_c.field_178758_b;
-@@ -370,7 +371,6 @@
-       this.field_152355_az = (new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString())).createMinecraftSessionService();
+@@ -382,7 +_,6 @@
+       this.field_244734_au = this.func_244735_a(yggdrasilauthenticationservice, p_i45547_1_);
        this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a;
        field_147123_G.info("Setting user: {}", (Object)this.field_71449_j.func_111285_a());
 -      field_147123_G.debug("(Session ID is {})", (Object)this.field_71449_j.func_111286_b());
        this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
        this.field_238175_ae_ = !p_i45547_1_.field_178741_d.field_239099_d_;
        this.field_238176_af_ = !p_i45547_1_.field_178741_d.field_239100_e_;
-@@ -416,13 +416,13 @@
+@@ -428,13 +_,13 @@
  
        this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
        this.field_71417_B = new MouseHelper(this);
@@ -31,7 +31,7 @@
        this.field_110448_aq.func_198983_a();
        this.field_71474_y.func_198017_a(this.field_110448_aq);
        this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab);
-@@ -463,6 +463,7 @@
+@@ -476,6 +_,7 @@
        this.func_193986_ar();
        this.field_110451_am.func_219534_a(this.field_193995_ae);
        this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
@@ -39,7 +39,7 @@
        this.field_110451_am.func_219534_a(this.field_71452_i);
        this.field_213272_aL = new PaintingSpriteUploader(this.field_71446_o);
        this.field_110451_am.func_219534_a(this.field_213272_aL);
-@@ -470,7 +471,8 @@
+@@ -483,7 +_,8 @@
        this.field_110451_am.func_219534_a(this.field_213273_aM);
        this.field_241557_ar_ = new GPUWarning();
        this.field_110451_am.func_219534_a(this.field_241557_ar_);
@@ -49,7 +49,7 @@
        this.field_184132_p = new DebugRenderer(this);
        RenderSystem.setErrorCallback(this::func_195545_a);
        if (this.field_71474_y.field_74353_u && !this.field_195558_d.func_198113_j()) {
-@@ -482,11 +484,6 @@
+@@ -495,11 +_,6 @@
        this.field_195558_d.func_224798_d(this.field_71474_y.field_225307_E);
        this.field_195558_d.func_227801_c_();
        this.func_213226_a();
@@ -61,7 +61,7 @@
  
        ResourceLoadProgressGui.func_212970_a(this);
        List<IResourcePack> list = this.field_110448_aq.func_232623_f_();
-@@ -495,7 +492,14 @@
+@@ -508,7 +_,14 @@
              if (SharedConstants.field_206244_b) {
                 this.func_213256_aB();
              }
@@ -77,7 +77,7 @@
           });
        }, false));
     }
-@@ -534,7 +538,7 @@
+@@ -556,7 +_,7 @@
     }
  
     private void func_229988_a_(Throwable p_229988_1_) {
@@ -86,7 +86,7 @@
           ITextComponent itextcomponent;
           if (p_229988_1_ instanceof SimpleReloadableResourceManager.FailedPackException) {
              itextcomponent = new StringTextComponent(((SimpleReloadableResourceManager.FailedPackException)p_229988_1_).func_241203_a().func_195762_a());
-@@ -618,7 +622,7 @@
+@@ -644,7 +_,7 @@
           return Stream.of(Registry.field_212630_s.func_177774_c(p_213251_0_.func_77973_b()));
        });
        SearchTreeReloadable<ItemStack> searchtreereloadable = new SearchTreeReloadable<>((p_213235_0_) -> {
@@ -95,7 +95,7 @@
        });
        NonNullList<ItemStack> nonnulllist = NonNullList.func_191196_a();
  
-@@ -688,13 +692,13 @@
+@@ -714,13 +_,13 @@
        Bootstrap.func_179870_a(p_71377_0_.func_71502_e());
        if (p_71377_0_.func_71497_f() != null) {
           Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_0_.func_71497_f());
@@ -112,7 +112,7 @@
        }
  
     }
-@@ -703,6 +707,7 @@
+@@ -729,6 +_,7 @@
        return this.field_71474_y.field_211842_aO;
     }
  
@@ -120,7 +120,7 @@
     public CompletableFuture<Void> func_213237_g() {
        if (this.field_213276_aV != null) {
           return this.field_213276_aV;
-@@ -791,10 +796,6 @@
+@@ -817,10 +_,6 @@
     }
  
     public void func_147108_a(@Nullable Screen p_147108_1_) {
@@ -131,7 +131,7 @@
        if (p_147108_1_ == null && this.field_71441_e == null) {
           p_147108_1_ = new MainMenuScreen();
        } else if (p_147108_1_ == null && this.field_71439_g.func_233643_dh_()) {
-@@ -805,6 +806,14 @@
+@@ -831,6 +_,14 @@
           }
        }
  
@@ -146,30 +146,29 @@
        if (p_147108_1_ instanceof MainMenuScreen || p_147108_1_ instanceof MultiplayerScreen) {
           this.field_71474_y.field_74330_P = false;
           this.field_71456_v.func_146158_b().func_146231_a(true);
-@@ -936,11 +945,13 @@
+@@ -962,11 +_,13 @@
        RenderSystem.enableCull();
        this.field_71424_I.func_76319_b();
        if (!this.field_71454_w) {
-+         net.minecraftforge.fml.hooks.BasicEventHooks.onRenderTickStart(this.field_71428_T.field_194147_b);
++         net.minecraftforge.fml.hooks.BasicEventHooks.onRenderTickStart(this.field_71445_n ? this.field_193996_ah : this.field_71428_T.field_194147_b);
           this.field_71424_I.func_219895_b("gameRenderer");
           this.field_71460_t.func_195458_a(this.field_71445_n ? this.field_193996_ah : this.field_71428_T.field_194147_b, i, p_195542_1_);
           this.field_71424_I.func_219895_b("toasts");
           this.field_193034_aS.func_238541_a_(new MatrixStack());
           this.field_71424_I.func_76319_b();
-+         net.minecraftforge.fml.hooks.BasicEventHooks.onRenderTickEnd(this.field_71428_T.field_194147_b);
++         net.minecraftforge.fml.hooks.BasicEventHooks.onRenderTickEnd(this.field_71445_n ? this.field_193996_ah : this.field_71428_T.field_194147_b);
        }
  
        if (this.field_238174_aV_ != null) {
-@@ -1039,7 +1050,7 @@
+@@ -1065,6 +_,7 @@
  
        Framebuffer framebuffer = this.func_147110_a();
        framebuffer.func_216491_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l(), field_142025_a);
--      this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
-+      if (this.field_71460_t!=null) this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
++      if (this.field_71460_t != null)
+       this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
        this.field_71417_B.func_198021_g();
     }
- 
-@@ -1227,11 +1238,21 @@
+@@ -1253,11 +_,21 @@
           if (p_147115_1_ && this.field_71476_x != null && this.field_71476_x.func_216346_c() == RayTraceResult.Type.BLOCK) {
              BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
              BlockPos blockpos = blockraytraceresult.func_216350_a();
@@ -193,7 +192,7 @@
                 }
              }
  
-@@ -1250,6 +1271,8 @@
+@@ -1276,6 +_,8 @@
              }
  
           } else if (!this.field_71439_g.func_184838_M()) {
@@ -202,7 +201,7 @@
              switch(this.field_71476_x.func_216346_c()) {
              case ENTITY:
                 this.field_71442_b.func_78764_a(this.field_71439_g, ((EntityRayTraceResult)this.field_71476_x).func_216348_a());
-@@ -1257,7 +1280,7 @@
+@@ -1283,7 +_,7 @@
              case BLOCK:
                 BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
                 BlockPos blockpos = blockraytraceresult.func_216350_a();
@@ -211,7 +210,7 @@
                    this.field_71442_b.func_180511_b(blockpos, blockraytraceresult.func_216354_b());
                    break;
                 }
-@@ -1267,8 +1290,10 @@
+@@ -1293,8 +_,10 @@
                 }
  
                 this.field_71439_g.func_184821_cY();
@@ -222,7 +221,7 @@
              this.field_71439_g.func_184609_a(Hand.MAIN_HAND);
           }
        }
-@@ -1283,6 +1308,11 @@
+@@ -1309,6 +_,11 @@
              }
  
              for(Hand hand : Hand.values()) {
@@ -234,7 +233,7 @@
                 ItemStack itemstack = this.field_71439_g.func_184586_b(hand);
                 if (this.field_71476_x != null) {
                    switch(this.field_71476_x.func_216346_c()) {
-@@ -1296,6 +1326,7 @@
+@@ -1322,6 +_,7 @@
  
                       if (actionresulttype.func_226246_a_()) {
                          if (actionresulttype.func_226247_b_()) {
@@ -242,7 +241,7 @@
                             this.field_71439_g.func_184609_a(hand);
                          }
  
-@@ -1308,6 +1339,7 @@
+@@ -1334,6 +_,7 @@
                       ActionResultType actionresulttype1 = this.field_71442_b.func_217292_a(this.field_71439_g, this.field_71441_e, hand, blockraytraceresult);
                       if (actionresulttype1.func_226246_a_()) {
                          if (actionresulttype1.func_226247_b_()) {
@@ -250,7 +249,7 @@
                             this.field_71439_g.func_184609_a(hand);
                             if (!itemstack.func_190926_b() && (itemstack.func_190916_E() != i || this.field_71442_b.func_78758_h())) {
                                this.field_71460_t.field_78516_c.func_187460_a(hand);
-@@ -1323,6 +1355,9 @@
+@@ -1349,6 +_,9 @@
                    }
                 }
  
@@ -260,7 +259,7 @@
                 if (!itemstack.func_190926_b()) {
                    ActionResultType actionresulttype2 = this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, hand);
                    if (actionresulttype2.func_226246_a_()) {
-@@ -1349,6 +1384,8 @@
+@@ -1375,6 +_,8 @@
           --this.field_71467_ac;
        }
  
@@ -269,7 +268,7 @@
        this.field_71424_I.func_76320_a("gui");
        if (!this.field_71445_n) {
           this.field_71456_v.func_73831_a();
-@@ -1465,6 +1502,8 @@
+@@ -1500,6 +_,8 @@
        this.field_71424_I.func_219895_b("keyboard");
        this.field_195559_v.func_204870_b();
        this.field_71424_I.func_76319_b();
@@ -277,19 +276,73 @@
 +      net.minecraftforge.fml.hooks.BasicEventHooks.onPostClientTick();
     }
  
-    private void func_184117_aA() {
-@@ -1676,6 +1715,10 @@
-          this.field_71424_I.func_76320_a("waitForServer");
+    private boolean func_244600_aM() {
+@@ -1638,11 +_,11 @@
+    }
  
-          while(!this.field_71437_Z.func_71200_ad()) {
-+            if (!net.minecraftforge.fml.StartupQuery.check() || this.field_71437_Z.func_71241_aa()) {
-+               this.func_147108_a(null);
-+               return;
-+            } else if (this.field_71462_r == null) // if we're showing nothing, put the working screen back again
-             worldloadprogressscreen.func_231023_e_();
-             this.func_195542_b(false);
+    public void func_238191_a_(String p_238191_1_) {
+-      this.func_238195_a_(p_238191_1_, DynamicRegistries.func_239770_b_(), Minecraft::func_238180_a_, Minecraft::func_238181_a_, false, Minecraft.WorldSelectionType.BACKUP);
++      this.loadWorld(p_238191_1_, DynamicRegistries.func_239770_b_(), Minecraft::func_238180_a_, Minecraft::func_238181_a_, false, Minecraft.WorldSelectionType.BACKUP, false);
+    }
  
-@@ -1696,7 +1739,12 @@
+    public void func_238192_a_(String p_238192_1_, WorldSettings p_238192_2_, DynamicRegistries.Impl p_238192_3_, DimensionGeneratorSettings p_238192_4_) {
+-      this.func_238195_a_(p_238192_1_, p_238192_3_, (p_238179_1_) -> {
++      this.loadWorld(p_238192_1_, p_238192_3_, (p_238179_1_) -> {
+          return p_238192_2_.func_234958_g_();
+       }, (p_238187_3_, p_238187_4_, p_238187_5_, p_238187_6_) -> {
+          WorldGenSettingsExport<JsonElement> worldgensettingsexport = WorldGenSettingsExport.func_240896_a_(JsonOps.INSTANCE, p_238192_3_);
+@@ -1652,10 +_,10 @@
+          });
+          DimensionGeneratorSettings dimensiongeneratorsettings = dataresult.resultOrPartial(Util.func_240982_a_("Error reading worldgen settings after loading data packs: ", field_147123_G::error)).orElse(p_238192_4_);
+          return new ServerWorldInfo(p_238192_2_, dimensiongeneratorsettings, dataresult.lifecycle());
+-      }, false, Minecraft.WorldSelectionType.CREATE);
++      }, false, Minecraft.WorldSelectionType.CREATE, true);
+    }
+ 
+-   private void func_238195_a_(String p_238195_1_, DynamicRegistries.Impl p_238195_2_, Function<SaveFormat.LevelSave, DatapackCodec> p_238195_3_, Function4<SaveFormat.LevelSave, DynamicRegistries.Impl, IResourceManager, DatapackCodec, IServerConfiguration> p_238195_4_, boolean p_238195_5_, Minecraft.WorldSelectionType p_238195_6_) {
++   private void loadWorld(String p_238195_1_, DynamicRegistries.Impl p_238195_2_, Function<SaveFormat.LevelSave, DatapackCodec> p_238195_3_, Function4<SaveFormat.LevelSave, DynamicRegistries.Impl, IResourceManager, DatapackCodec, IServerConfiguration> p_238195_4_, boolean p_238195_5_, Minecraft.WorldSelectionType p_238195_6_, boolean creating) {
+       SaveFormat.LevelSave saveformat$levelsave;
+       try {
+          saveformat$levelsave = this.field_71469_aa.func_237274_c_(p_238195_1_);
+@@ -1667,12 +_,17 @@
+       }
+ 
+       Minecraft.PackManager minecraft$packmanager;
++      final DynamicRegistries.Impl dyn_f;
+       try {
+-         minecraft$packmanager = this.func_238189_a_(p_238195_2_, p_238195_3_, p_238195_4_, p_238195_5_, saveformat$levelsave);
++         Minecraft.PackManager mgr = this.func_238189_a_(p_238195_2_, p_238195_3_, p_238195_4_, p_238195_5_, saveformat$levelsave);
++         // We need to rebuild this if we're loading world, so that it gets all the information from AFTER we inject our mappings from the save.
++         dyn_f = creating ? p_238195_2_ : DynamicRegistries.func_239770_b_();
++         minecraft$packmanager = creating ? mgr : this.func_238189_a_(dyn_f, p_238195_3_, p_238195_4_, p_238195_5_, saveformat$levelsave); //Note this runs the injection again... which isn't good.. but hey.. we need a better spot to hook in.
++
+       } catch (Exception exception) {
+          field_147123_G.warn("Failed to load datapacks, can't proceed with server load", (Throwable)exception);
+          this.func_147108_a(new DatapackFailureScreen(() -> {
+-            this.func_238195_a_(p_238195_1_, p_238195_2_, p_238195_3_, p_238195_4_, true, p_238195_6_);
++            this.loadWorld(p_238195_1_, p_238195_2_, p_238195_3_, p_238195_4_, true, p_238195_6_, creating);
+          }));
+ 
+          try {
+@@ -1692,7 +_,7 @@
+          this.field_213277_ad.set((TrackingChunkStatusListener)null);
+ 
+          try {
+-            saveformat$levelsave.func_237287_a_(p_238195_2_, iserverconfiguration);
++            saveformat$levelsave.func_237287_a_(dyn_f, iserverconfiguration);
+             minecraft$packmanager.func_238225_b_().func_240971_i_();
+             YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa);
+             MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
+@@ -1702,7 +_,7 @@
+             SkullTileEntity.func_184294_a(minecraftsessionservice);
+             PlayerProfileCache.func_187320_a(false);
+             this.field_71437_Z = MinecraftServer.func_240784_a_((p_238188_8_) -> {
+-               return new IntegratedServer(p_238188_8_, this, p_238195_2_, saveformat$levelsave, minecraft$packmanager.func_238224_a_(), minecraft$packmanager.func_238225_b_(), iserverconfiguration, minecraftsessionservice, gameprofilerepository, playerprofilecache, (p_238211_1_) -> {
++               return new IntegratedServer(p_238188_8_, this, dyn_f, saveformat$levelsave, minecraft$packmanager.func_238224_a_(), minecraft$packmanager.func_238225_b_(), iserverconfiguration, minecraftsessionservice, gameprofilerepository, playerprofilecache, (p_238211_1_) -> {
+                   TrackingChunkStatusListener trackingchunkstatuslistener = new TrackingChunkStatusListener(p_238211_1_ + 0);
+                   trackingchunkstatuslistener.func_219521_a();
+                   this.field_213277_ad.set(trackingchunkstatuslistener);
+@@ -1747,11 +_,16 @@
           networkmanager.func_150719_a(new ClientLoginNetHandler(networkmanager, this, (Screen)null, (p_229998_0_) -> {
           }));
           networkmanager.func_179290_a(new CHandshakePacket(socketaddress.toString(), 0, ProtocolType.LOGIN));
@@ -303,7 +356,12 @@
           this.field_71453_ak = networkmanager;
        } else {
           this.func_241559_a_(p_238195_6_, p_238195_1_, flag, () -> {
-@@ -1770,6 +1818,7 @@
+-            this.func_238195_a_(p_238195_1_, p_238195_2_, p_238195_3_, p_238195_4_, p_238195_5_, Minecraft.WorldSelectionType.NONE);
++            this.loadWorld(p_238195_1_, dyn_f, p_238195_3_, p_238195_4_, p_238195_5_, Minecraft.WorldSelectionType.NONE, creating);
+          });
+          minecraft$packmanager.close();
+ 
+@@ -1821,6 +_,7 @@
     }
  
     public void func_71403_a(ClientWorld p_71403_1_) {
@@ -311,7 +369,7 @@
        WorkingScreen workingscreen = new WorkingScreen();
        workingscreen.func_200210_a(new TranslationTextComponent("connect.joining"));
        this.func_213241_c(workingscreen);
-@@ -1801,10 +1850,12 @@
+@@ -1852,10 +_,12 @@
        IntegratedServer integratedserver = this.field_71437_Z;
        this.field_71437_Z = null;
        this.field_71460_t.func_190564_k();
@@ -324,7 +382,7 @@
           if (integratedserver != null) {
              this.field_71424_I.func_76320_a("waitForServer");
  
-@@ -1819,6 +1870,7 @@
+@@ -1870,6 +_,7 @@
           this.field_71456_v.func_181029_i();
           this.field_71422_O = null;
           this.field_71455_al = false;
@@ -332,7 +390,7 @@
           this.field_213274_aO.func_216815_b();
        }
  
-@@ -1849,6 +1901,7 @@
+@@ -1900,6 +_,7 @@
        this.field_71452_i.func_78870_a(p_213257_1_);
        TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_213257_1_);
        this.func_230150_b_();
@@ -340,7 +398,7 @@
     }
  
     public boolean func_238216_r_() {
-@@ -1894,112 +1947,9 @@
+@@ -1945,112 +_,9 @@
  
     private void func_147112_ai() {
        if (this.field_71476_x != null && this.field_71476_x.func_216346_c() != RayTraceResult.Type.MISS) {
@@ -456,7 +514,7 @@
        }
     }
  
-@@ -2081,6 +2031,7 @@
+@@ -2140,6 +_,7 @@
        return field_71432_P;
     }
  
@@ -464,27 +522,27 @@
     public CompletableFuture<Void> func_213245_w() {
        return this.func_213169_a(this::func_213237_g).thenCompose((p_229993_0_) -> {
           return p_229993_0_;
-@@ -2388,7 +2339,7 @@
+@@ -2451,7 +_,7 @@
           supplier = func_228022_c_(supplier);
        }
  
--      return new ClientResourcePackInfo(p_228011_0_, p_228011_1_, supplier, p_228011_3_, p_228011_4_, p_228011_5_, p_228011_6_);
-+      return new ClientResourcePackInfo(p_228011_0_, p_228011_1_, supplier, p_228011_3_, p_228011_4_, p_228011_5_, p_228011_6_, p_228011_3_.isHidden());
+-      return new ResourcePackInfo(p_228011_0_, p_228011_1_, supplier, p_228011_3_, p_228011_4_, p_228011_5_, p_228011_6_);
++      return new ResourcePackInfo(p_228011_0_, p_228011_1_, supplier, p_228011_3_, p_228011_4_, p_228011_5_, p_228011_6_, p_228011_3_.isHidden());
     }
  
     private static Supplier<IResourcePack> func_228021_b_(Supplier<IResourcePack> p_228021_0_) {
-@@ -2407,6 +2358,14 @@
-       this.field_175617_aL.func_229355_a_(p_228020_1_);
-    }
+@@ -2468,6 +_,14 @@
  
+    public void func_228020_b_(int p_228020_1_) {
+       this.field_175617_aL.func_229355_a_(p_228020_1_);
++   }
++
 +   public ItemColors getItemColors() {
 +      return this.field_184128_aI;
 +   }
 +
 +   public SearchTreeManager getSearchTreeManager() {
 +      return this.field_193995_ae;
-+   }
-+
+    }
+ 
     @OnlyIn(Dist.CLIENT)
-    public static final class PackManager implements AutoCloseable {
-       private final ResourcePackList<ResourcePackInfo> field_238221_a_;

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/MouseHelper.java
 +++ b/net/minecraft/client/MouseHelper.java
-@@ -71,6 +71,7 @@
+@@ -71,6 +_,7 @@
              this.field_198042_g = -1;
           }
  
@@ -8,7 +8,7 @@
           boolean[] aboolean = new boolean[]{false};
           if (this.field_198036_a.field_213279_p == null) {
              if (this.field_198036_a.field_71462_r == null) {
-@@ -82,11 +83,15 @@
+@@ -82,11 +_,15 @@
                 double d1 = this.field_198041_f * (double)this.field_198036_a.func_228018_at_().func_198087_p() / (double)this.field_198036_a.func_228018_at_().func_198083_n();
                 if (flag) {
                    Screen.func_231153_a_(() -> {
@@ -26,7 +26,7 @@
                    }, "mouseReleased event handler", this.field_198036_a.field_71462_r.getClass().getCanonicalName());
                 }
              }
-@@ -110,7 +115,7 @@
+@@ -110,7 +_,7 @@
                 }
              }
           }
@@ -35,7 +35,7 @@
        }
     }
  
-@@ -121,7 +126,9 @@
+@@ -121,7 +_,9 @@
              if (this.field_198036_a.field_71462_r != null) {
                 double d1 = this.field_198040_e * (double)this.field_198036_a.func_228018_at_().func_198107_o() / (double)this.field_198036_a.func_228018_at_().func_198105_m();
                 double d2 = this.field_198041_f * (double)this.field_198036_a.func_228018_at_().func_198087_p() / (double)this.field_198036_a.func_228018_at_().func_198083_n();
@@ -46,7 +46,7 @@
              } else if (this.field_198036_a.field_71439_g != null) {
                 if (this.field_200542_o != 0.0D && Math.signum(d0) != Math.signum(this.field_200542_o)) {
                    this.field_200542_o = 0.0D;
-@@ -134,6 +141,7 @@
+@@ -134,6 +_,7 @@
                 }
  
                 this.field_200542_o -= (double)f1;
@@ -54,7 +54,7 @@
                 if (this.field_198036_a.field_71439_g.func_175149_v()) {
                    if (this.field_198036_a.field_71456_v.func_175187_g().func_175262_a()) {
                       this.field_198036_a.field_71456_v.func_175187_g().func_195621_a((double)(-f1));
-@@ -202,7 +210,9 @@
+@@ -202,7 +_,9 @@
                 double d2 = (p_198022_3_ - this.field_198040_e) * (double)this.field_198036_a.func_228018_at_().func_198107_o() / (double)this.field_198036_a.func_228018_at_().func_198105_m();
                 double d3 = (p_198022_5_ - this.field_198041_f) * (double)this.field_198036_a.func_228018_at_().func_198087_p() / (double)this.field_198036_a.func_228018_at_().func_198083_n();
                 Screen.func_231153_a_(() -> {
@@ -65,7 +65,7 @@
                 }, "mouseDragged event handler", iguieventlistener.getClass().getCanonicalName());
              }
           }
-@@ -267,6 +277,10 @@
+@@ -267,12 +_,24 @@
        return this.field_198039_d;
     }
  
@@ -76,18 +76,17 @@
     public double func_198024_e() {
        return this.field_198040_e;
     }
-@@ -275,6 +289,14 @@
-       return this.field_198041_f;
-    }
  
+    public double func_198026_f() {
+       return this.field_198041_f;
++   }
++
 +   public double getXVelocity() {
 +      return this.field_198048_m;
 +   }
 +
 +   public double getYVelocity() {
 +      return this.field_198049_n;
-+   }
-+
-    public void func_198021_g() {
-       this.field_198043_h = true;
     }
+ 
+    public void func_198021_g() {