Fix Entity.getPersistentData function name. Closes #6131

Bump spec version for first 1.14.4 RB.
Fix ParticleFactoryRegisterEvent not firing (#6126 )
2026-11-14 09:05:17 +00:00 · 2019-09-12 09:12:30 -07:00 · 2019-09-12 09:01:43 -07:00 · 2019-09-12 17:33:19 +02:00 · 2019-09-11 16:00:32 +02:00 · 2019-09-10 16:02:07 -07:00
806 changed files with 14649 additions and 9330 deletions
@@ -1,4 +0,0 @@
-<!-- Thank you for reporting! -->
-
-<!-- Please go to the forum first for support with crashes and issues. -->
-<!-- http://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
@@ -0,0 +1,13 @@
+---
+name: Feature request
+about: Want to request a feature?
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+<!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
+<!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
+<!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
+<!-- Discord: https://discord.gg/UvedJ9m -->
@@ -0,0 +1,26 @@
+---
+name: Issue report
+about: Visit the forum first for issues with crashes.
+title: ''
+labels: Triage
+assignees: ''
+
+---
+
+<!-- Thank you for reporting! -->
+
+<!-- For support with crashes and issues, please create a post on the forum instead: -->
+<!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
+
+**Minecraft Version:** {Minecraft version}
+
+**Forge Version:** {Forge version. *Version number, not latest/rb*}
+
+**Logs:** {Link(s) to GitHub Gist with full latest.log and/or crash report}
+
+**Steps to Reproduce:**
+ 1. Do this
+ 2. Then do that
+ 3. ...
+
+**Description of issue:**
@@ -1,37 +0,0 @@
-# How to install Forge: For Players
-
-Go to [the Forge website](http://files.minecraftforge.net)
- and select the minecraft version you wish to get forge for from the list.
-
-You can download the installer for the *Recommended Build* or the
- *Latest build* there. Latest builds may have newer features but may be
- more unstable as a result. The installer will attempt to install forge
- into your vanilla launcher environment, where you can then create a new
- profile using that version and play the game!
- 
-For support and questions, visit [the Support Forum](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
-
-Here is a short video from Rorax showing how to install and setup Forge:
-
-[![HOWTO Install Forge](https://img.youtube.com/vi/lB3ArN_-3Oc/0.jpg)](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
-
-# How to install Forge: For Modders
-
-[See the "Getting Started" section in the Forge Documentation](http://mcforge.readthedocs.io/en/latest/gettingstarted/).
-
-# How to install Forge: For those wishing to work on Forge itself
-
-If you wish to actually inspect Forge, submit PRs or otherwise work
- with Forge itself, you're in the right place!
- 
- [See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
-
-## Pull requests
-
-[See the "Making Changes and Pull Requests" section in the Forge documentation](http://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
-
-### Contributor License Agreement
-We require all contributors to acknowledge the [Forge Contributor
- License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). Please ensure you have a valid email address
- associated with your github account to do this. If you have previously
- signed it, you should be OK.
@@ -7,6 +7,8 @@ buildscript {
    }
    dependencies {
        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
+        classpath 'org.ow2.asm:asm:7.1'
+        classpath 'org.ow2.asm:asm-tree:7.1'
    }
 }
 import groovy.json.JsonSlurper
@@ -14,24 +16,33 @@ import groovy.json.JsonBuilder
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.LinkedHashMap
+import java.util.TreeSet
+import java.util.stream.Collectors
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
 import java.security.MessageDigest
 import java.net.URL
 import net.minecraftforge.gradle.common.task.ArchiveChecksum
 import net.minecraftforge.gradle.common.task.DownloadMavenArtifact
+import net.minecraftforge.gradle.common.task.ExtractInheritance
 import net.minecraftforge.gradle.common.task.SignJar
+import net.minecraftforge.gradle.common.util.HashStore
+import net.minecraftforge.gradle.mcp.function.MCPFunction
+import net.minecraftforge.gradle.mcp.util.MCPEnvironment
 import net.minecraftforge.gradle.patcher.task.ApplyBinPatches
+import net.minecraftforge.gradle.patcher.task.TaskReobfuscateJar
+import net.minecraftforge.gradle.userdev.tasks.RenameJar
 import org.apache.tools.ant.filters.ReplaceTokens
 import de.undercouch.gradle.tasks.download.Download
-import net.minecraftforge.gradle.patcher.task.TaskReobfuscateJar
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
-
-import java.util.stream.Collectors
+import org.objectweb.asm.ClassReader

 plugins {
    id 'net.minecrell.licenser' version '0.4'
-    id 'org.ajoberstar.grgit' version '2.3.0'
+    id 'org.ajoberstar.grgit' version '3.1.1'
    id 'de.undercouch.download' version '3.3.0'
-    id 'com.github.ben-manes.versions' version '0.20.0'
+    id 'com.github.ben-manes.versions' version '0.22.0'
 }
 apply plugin: 'eclipse'

@@ -45,9 +56,9 @@ ext {
        ]
    }
    MAPPING_CHANNEL = 'snapshot'
-    MAPPING_VERSION = '20190621-1.14.2'
-    MC_VERSION = '1.14.3'
-    MCP_VERSION = '20190624.152911'
+    MAPPING_VERSION = '20190719-1.14.3'
+    MC_VERSION = '1.14.4'
+    MCP_VERSION = '20190829.143755'
 }

 project(':mcp') {
@@ -69,7 +80,7 @@ project(':clean') {
    }
    
    dependencies {
-        implementation 'net.minecraftforge:forgespi:0.13.+'
+        implementation 'net.minecraftforge:forgespi:1.1.+'
    }
    patcher {
        parent = project(':mcp')
@@ -169,17 +180,19 @@ project(':forge') {
    }

    ext {
-        SPEC_VERSION = '27.0' // This is overwritten by git tag, but here so dev time doesnt explode
+        SPEC_VERSION = '28.1' // This is overwritten by git tag, but here so dev time doesnt explode
        // The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
        // ForgeMC is a unique identifier for every MC version we have supported.
        // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
        MCP_ARTIFACT = project(':mcp').mcp.config
+        SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.8.5'
+        VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json')
    }

    def getVersion = {
        //TAG-offset-hash
-        def raw = grgit.describe(longDescr: true)
-        def desc = (raw == null ? '0.0-0-unknown' : grgit.describe(longDescr: true)).split('-') as List
+        def raw = grgit.describe(longDescr: true, tags:true)
+        def desc = (raw == null ? '0.0-0-unknown' : grgit.describe(longDescr: true, tags:true)).split('-') as List
        def hash = desc.remove(desc.size() - 1)
        def offset = desc.remove(desc.size() - 1)
        def tag = desc.join('-')
@@ -201,6 +214,7 @@ project(':forge') {
        patchedSrc = file('src/main/java')
        srgPatches = true
        accessTransformer = file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
+        sideAnnotationStripper = file("$rootDir/src/main/resources/forge.sas")

        runs {
            forge_client {
@@ -229,6 +243,12 @@ project(':forge') {
                source sourceSets.userdev
            }

+            cpw_forge_client {
+                parent runs.forge_client
+                taskName 'cpw_forge_client'
+                property 'forge.logging.noansi', 'false'
+            }
+
            forge_test_client {
                parent runs.forge_client
                taskName 'forge_test_client'
@@ -294,6 +314,19 @@ project(':forge') {
                
                args '--mod', 'forge', '--all', '--output', rootProject.file('src/generated/resources/')
            }
+
+            forge_test_data {
+                parent runs.forge_data
+                taskName 'forge_test_data'
+
+                environment 'MOD_CLASSES', 'dummy' // Needed to work around FG limitation, FG will replace this!
+
+                mods {
+                    tests { sources  sourceSets.test }
+                }
+                
+                args '--mod', 'data_gen_test', '--all', '--output', rootProject.file('src/generated_test/resources/')
+            }
        }
    }
    
@@ -328,6 +361,14 @@ project(':forge') {
                'Implementation-Version':   SPEC_VERSION,
                'Implementation-Vendor':    'Forge'
            ] as LinkedHashMap,
+            'net/minecraftforge/fml/mclanguageprovider/': [
+                'Specification-Title':      'Mod Language Provider',
+                'Specification-Vendor':     'Forge Development LLC',
+                'Specification-Version':    '1',
+                'Implementation-Title':     'Minecraft Language Mod Provider',
+                'Implementation-Version':   '1',
+                'Implementation-Vendor':    'Forge'
+            ] as LinkedHashMap,
            'net/minecraftforge/fml/loading/': [
                'Specification-Title':      'Launcher',
                'Specification-Vendor':     'Forge Development LLC',
@@ -335,6 +376,14 @@ project(':forge') {
                'Implementation-Title':     'FML Launcher',
                'Implementation-Version':   SPEC_VERSION,
                'Implementation-Vendor':    'Forge'
+            ] as LinkedHashMap,
+            'net/minecraftforge/fml/userdev/': [
+                'Specification-Title':      'Forge User Development',
+                'Specification-Vendor':     'Forge Development LLC',
+                'Specification-Version':    SPEC_VERSION,
+                'Implementation-Title':     project.group,
+                'Implementation-Version':   project.version.substring(MC_VERSION.length() + 1),
+                'Implementation-Vendor':    'Forge Development LLC'
            ] as LinkedHashMap
        ]
    }
@@ -355,26 +404,27 @@ project(':forge') {
        installer 'org.ow2.asm:asm:6.2'
        installer 'org.ow2.asm:asm-commons:6.2'
        installer 'org.ow2.asm:asm-tree:6.2'
-        installer 'cpw.mods:modlauncher:2.1.+'
+        installer 'cpw.mods:modlauncher:3.2.+'
        installer 'cpw.mods:grossjava9hacks:1.1.+'
-        installer 'net.minecraftforge:accesstransformers:0.16.+:shadowed'
-        installer 'net.minecraftforge:eventbus:0.10.+:service'
-        installer 'net.minecraftforge:forgespi:0.13.+'
-        installer 'net.minecraftforge:coremods:0.5.+'
+        installer 'net.minecraftforge:accesstransformers:1.0.+:shadowed'
+        installer 'net.minecraftforge:eventbus:1.0.+:service'
+        installer 'net.minecraftforge:forgespi:1.3.+'
+        installer 'net.minecraftforge:coremods:1.0.+'
        installer 'net.minecraftforge:unsafe:0.2.+'
        installer 'com.electronwill.night-config:core:3.6.0'
        installer 'com.electronwill.night-config:toml:3.6.0'
-        installer 'org.jline:jline:3.9.0'
+        installer 'org.jline:jline:3.12.+'
        installer 'org.apache.maven:maven-artifact:3.6.0'
        installer 'net.jodah:typetools:0.6.0'
        installer 'java3d:vecmath:1.5.2'
        installer 'org.apache.logging.log4j:log4j-api:2.11.2'
        installer 'org.apache.logging.log4j:log4j-core:2.11.2'
-        installer 'net.minecrell:terminalconsoleappender:1.1.+'
+        installer 'net.minecrell:terminalconsoleappender:1.2.+'
        installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
        fmllauncherImplementation 'com.google.guava:guava:21.0'
        fmllauncherImplementation 'com.google.code.gson:gson:2.8.0'
        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.0'
+        testImplementation 'org.junit.vintage:junit-vintage-engine:5.+'
        testImplementation 'org.opentest4j:opentest4j:1.0.0' // needed for junit 5
        testImplementation 'org.hamcrest:hamcrest-all:1.3' // needs advanced matching for list order
    }
@@ -449,6 +499,21 @@ project(':forge') {
        clean = { genJoinedBinPatches.cleanJar }
        input = genJoinedBinPatches.output
    }
+    // Create SRG named Vanilla jars, using the SpecialSource we have in the installer
+    task createClientSRG(type: RenameJar, dependsOn: genClientBinPatches) {
+        tool = SPECIAL_SOURCE + ':shaded'
+        args = ['--stable', '--in-jar', '{input}', '--out-jar', '{output}', '--srg-in', '{mappings}']
+        mappings = { genClientBinPatches.srg }
+        input = { genClientBinPatches.cleanJar }
+        output = file('build/createClientSRG/output.jar')
+    }
+    task createServerSRG(type: RenameJar, dependsOn: genServerBinPatches) {
+        tool = SPECIAL_SOURCE + ':shaded'
+        args = ['--stable', '--in-jar', '{input}', '--out-jar', '{output}', '--srg-in', '{mappings}']
+        mappings = { genServerBinPatches.srg }
+        input = { genServerBinPatches.cleanJar }
+        output = file('build/createServerSRG/output.jar')
+    }
    // Checksum tasks so that we can know if the vanilla classes are what we expect them to do!
    task clientBaseChecksum(type: ArchiveChecksum, dependsOn: genClientBinPatches) {
        input = { genClientBinPatches.cleanJar} //Lazy because Patcher Plugin sets the value afterEvaluate
@@ -492,8 +557,128 @@ project(':forge') {
        }
    }
    
+    task downloadLibraries(dependsOn: ':mcp:setupMCP') {
+        inputs.file VERSION_JSON
+        doLast {
+            def json = new JsonSlurper().parseText(VERSION_JSON.text)
+            json.libraries.each {lib ->
+                def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
+                artifacts.each{ art -> 
+                    def target = file('build/libraries/' + art.path)
+                    if (!target.exists()) {
+                        download {
+                            src art.url
+                            dest target
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    task extractInheritance(type: ExtractInheritance, dependsOn: [genJoinedBinPatches, downloadLibraries]) {
+        input { genJoinedBinPatches.cleanJar }
+        doFirst {
+            def json = new JsonSlurper().parseText(VERSION_JSON.text)
+            json.libraries.each {lib ->
+                def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
+                artifacts.each{ art -> 
+                    def target = file('build/libraries/' + art.path)
+                    if (target.exists())
+                        addLibrary(target)
+                }
+            }
+        }
+    }
+    task checkATs(dependsOn: genJoinedBinPatches) {
+        inputs.file { genJoinedBinPatches.cleanJar }
+        inputs.files patcher.accessTransformers
+        doLast {
+            def vanilla = [:]
+            def zip = new java.util.zip.ZipFile(genJoinedBinPatches.cleanJar)
+            zip.entries().findAll { !it.directory && it.name.endsWith('.class') }.each { entry ->
+                new ClassReader(zip.getInputStream(entry)).accept(new org.objectweb.asm.ClassVisitor(org.objectweb.asm.Opcodes.ASM7) {
+                    String name
+                    void visit(int version, int access, String name, String sig, String superName, String[] interfaces) {
+                        this.name = name
+                        vanilla[name] = access
+                    }
+                    org.objectweb.asm.FieldVisitor visitField(int access, String name, String desc, String sig, Object value) {
+                        vanilla[this.name + ' ' + name] = access
+                        return null
+                    }
+                    org.objectweb.asm.MethodVisitor visitMethod(int access, String name, String desc, String sig, String[] excs) {
+                        vanilla[this.name + ' ' + name + desc] = access
+                        return null
+                    }
+                }, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)   
+            }
+            patcher.accessTransformers.each { f -> 
+                TreeMap 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)
+                    def (modifier, cls, desc) = (line.trim() + '     ').split(' ', -1)
+                    def key = cls + (desc.isEmpty() ? '' : ' ' + desc)
+                    def access = vanilla[key.replace('.', '/')]
+                    if (access == null) {
+                        if ((desc.equals('*') || desc.equals('*()')) && vanilla[cls.replace('.', '/')] != null)
+                            println('Warning: ' + line)
+                        else {
+                            println('Invalid: ' + line)
+                            return
+                        }
+                    }
+                    //TODO: Check access actually changes, and expand inheretence?
+                    lines[key] = [modifier: modifier, comment: comment]
+                }
+                f.text = lines.collect{ it.value.modifier + ' ' + it.key + (it.value.comment == null ? '' : ' ' + it.value.comment) }.join('\n')
+            }
+        }
+    }
+    task checkSAS(dependsOn: extractInheritance) {
+        inputs.file { extractInheritance.output }
+        inputs.files patcher.sideAnnotationStrippers
+        doLast {
+            def json = new JsonSlurper().parseText(extractInheritance.output.text)
+            
+            patcher.sideAnnotationStrippers.each { f -> 
+                def lines = []
+                f.eachLine { line ->
+                    if (line[0] == '\t') return //Skip any tabed 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 (desc.isEmpty() || json[cls] == null || json[cls]['methods'] == null || json[cls]['methods'][desc] == null) {
+                        println('Invalid: ' + line)
+                        return
+                    }
+                    
+                    def mtd = json[cls]['methods'][desc]
+                    lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
+                    def children = json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
+                    .collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
+                    children.each { lines.add('\t' + it) }
+                }
+                f.text = lines.join('\n')
+            }
+        }
+    }
+
    task launcherJson(dependsOn: ['signUniversalJar', 'signLauncherJar']) {
        inputs.file universalJar.archivePath
+        inputs.file { launcherJar.archivePath }
        ext {
            output = file('build/version.json')
            vanilla = project(':mcp').file('build/mcp/downloadJson/version.json')
@@ -546,11 +731,11 @@ project(':forge') {
            output.text = new JsonBuilder(json).toPrettyString()
        }
    }
-      
-    task installerJson(dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches]) {
+
+    task installerJson(dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches/*, createClientSRG, createServerSRG*/]) {
        ext {
            output = file('build/install_profile.json')
-            INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.0.3'
+            INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.1.4'
            JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.0'
        }
        doFirst {
@@ -560,6 +745,10 @@ project(':forge') {
        inputs.file applyServerBinPatches.output
        inputs.file genClientBinPatches.toolJar
        inputs.file launcherJson.output
+        /*
+        inputs.file createClientSRG.output
+        inputs.file createServerSRG.output
+        */
        outputs.file output
        doLast {
            def libs = [
@@ -614,6 +803,10 @@ project(':forge') {
                        client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]",
                        server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]"
                    ],
+                    /*MC_SRG_SHA: [
+                        client: "'${sha1(createClientSRG.output)}'",
+                        server: "'${sha1(createServerSRG.output)}'"
+                    ],*/
                    PATCHED: [
                        client: "[${project.group}:${project.name}:${project.version}:client]",
                        server: "[${project.group}:${project.name}:${project.version}:server]"
@@ -621,6 +814,10 @@ project(':forge') {
                    PATCHED_SHA: [
                        client: "'${sha1(applyClientBinPatches.output)}'",
                        server: "'${sha1(applyServerBinPatches.output)}'"
+                    ],
+                    MCP_VERSION: [
+                        client: "'${MCP_VERSION}'",
+                        server: "'${MCP_VERSION}'"
                    ]
                ],
                processors: [
@@ -646,21 +843,19 @@ project(':forge') {
                            '{MC_SLIM}': '{MC_SLIM_SHA}',
                            '{MC_EXTRA}': '{MC_EXTRA_SHA}'
                        ]
-                    ], [ // SpecialSource has a bug where it won't create the nessasary directories, remove when they fix that.
-                        jar: INSTALLER_TOOLS,
-                        classpath: getClasspath(project, libs, INSTALLER_TOOLS),
-                        args: [
-                            '--task', 'CREATE_PARENTS',
-                            '--target', '{MC_SRG}'
-                        ]
                    ], [
-                        jar: 'net.md-5:SpecialSource:1.8.3',
-                        classpath: getClasspath(project, libs, 'net.md-5:SpecialSource:1.8.3'),
+                        jar: SPECIAL_SOURCE,
+                        classpath: getClasspath(project, libs, SPECIAL_SOURCE),
                        args: [
+                            //'--stable', Java 9 Is borked, https://bugs.openjdk.java.net/browse/JDK-8184940 TODO: find a fix.
                            '--in-jar', '{MC_SLIM}',
                            '--out-jar', '{MC_SRG}',
                            '--srg-in', '{MAPPINGS}'
+                        ]/*,
+                        outputs: [
+                            '{MC_SRG}': '{MC_SRG_SHA}'
                        ]
+                        */
                    ], [
                        jar: BIN_PATCHER,
                        classpath: getClasspath(project, libs, BIN_PATCHER),
@@ -703,6 +898,7 @@ project(':forge') {
        dependsOn fixAnnotationsJson
        */
        
+        /* We do not actually check this anywhere, so it's 400KB of uselless data
        // Add checksum files of clean and patched vanilla classes.
        ['client', 'server'].each { side ->
            ['Base', 'Patched'].each { type -> 
@@ -712,6 +908,7 @@ project(':forge') {
            }
        }
        dependsOn checksums
+        */
        
        // add crowdin locales
        from { !crowdin.state.skipped ? zipTree(crowdin.archivePath) : null}
@@ -881,7 +1078,7 @@ project(':forge') {
            data {
                main 'net.minecraftforge.userdev.LaunchTesting'

-                environment 'target', 'fmldevdata'
+                environment 'target', 'fmluserdevdata'

                environment 'MC_VERSION', "${MC_VERSION}"
                environment 'FORGE_GROUP', "${project.group}"
@@ -947,6 +1144,16 @@ project(':forge') {
    
    tasks.eclipse.dependsOn('genEclipseRuns')
    
+    if (project.hasProperty('UPDATE_MAPPINGS')) {
+        extractRangeMap {
+            sources sourceSets.test.java.srcDirs
+        }
+        applyRangeMap {
+            sources sourceSets.test.java.srcDirs
+        }
+        sourceSets.test.java.srcDirs.each { extractMappedNew.addTarget it }
+    }
+    
    publishing {
        publications {
            mavenJava(MavenPublication) {
@@ -0,0 +1,65 @@
+<img src="assets/Forge_logo.svg">
+
+MinecraftForge [![Latest Release](https://img.shields.io/maven-metadata/v/https/files.minecraftforge.net/maven/net/minecraftforge/forge/maven-metadata.xml.svg?label=latest)](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)](https://www.patreon.com/LexManos) [![Merch](https://img.shields.io/badge/flocker-merch-blueviolet.svg)](https://forgedev.flocker.tv/)
+=============
+
+Forge is a free, open-source modding API all of your favourite mods use!
+
+| Version  | Support |
+| ------------- | ------------- |
+| 1.14.x  | Active (latest)  |
+| 1.12.x  | Active (stable)  |
+
+* [Download]
+* [Forum]
+* [Discord]
+* [Documentation]
+
+#### Notes:
+- Introduced in 1.13 was a new FML, information found [here](NewFML.md).
+
+# Installing Forge
+
+Go to [the Forge website](https://files.minecraftforge.net)
+ and select the Minecraft version you wish to get Forge for from the list.
+
+You can download the installer for the *Recommended Build* or the
+ *Latest build* there. Latest builds may have newer features but may be
+ more unstable as a result. The installer will attempt to install Forge
+ into your vanilla launcher environment, where you can then create a new
+ profile using that version and play the game!
+ 
+For support and questions, visit [the Support Forum](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
+
+[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
+
+# Creating Mods
+
+[See the "Getting Started" section in the Forge Documentation](https://mcforge.readthedocs.io/en/latest/gettingstarted/).
+
+# Contribute to Forge
+
+If you wish to actually inspect Forge, submit PRs or otherwise work
+ with Forge itself, you're in the right place!
+ 
+ [See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
+
+### Pull requests
+
+[See the "Making Changes and Pull Requests" section in the Forge documentation](https://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
+
+Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
+
+### Contributor License Agreement
+We require all contributors to acknowledge the [Forge Contributor
+ License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). Please ensure you have a valid email address
+ associated with your GitHub account to do this. If you have previously
+ signed it, you should be OK.
+
+#### Donate
+*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free to use and modify. However, it costs money to run such a large project as this, so please consider [becoming a patron](https://www.patreon.com/LexManos) or buying some [cool merch](https://forgedev.flocker.tv/).*
+
+[Download]: https://files.minecraftforge.net/
+[Forum]: https://www.minecraftforge.net/forum/
+[Discord]: https://discord.gg/UvedJ9m
+[Documentation]: https://mcforge.readthedocs.io
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg enable-background="new 164.072 372.466 294.41 46.56" version="1.1" viewBox="164.072 372.466 294.41 46.56" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#DFA86A">
+		<polygon points="266.16 417.99 277.12 417.99 277.12 401.05 295.09 401.05 295.09 390.78 277.12 390.78 277.12 383.77 296.18 383.77 296.18 373.5 266.16 373.5"/>
+		<path d="m337.33 378.7c-2.103-2.057-4.629-3.64-7.51-4.704-2.743-1.015-5.786-1.528-9.041-1.528l-0.356 2e-3c-3.362 0-6.503 0.556-9.338 1.651-2.857 1.106-5.357 2.707-7.434 4.761-2.073 2.052-3.714 4.559-4.877 7.45-1.158 2.876-1.748 6.104-1.748 9.59 0 3.417 0.59 6.582 1.753 9.403 1.163 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.834 1.096 5.975 1.651 9.339 1.651h0.023c3.402-0.043 6.57-0.639 9.42-1.772 2.863-1.142 5.375-2.757 7.465-4.804 2.091-2.051 3.742-4.524 4.91-7.358 1.162-2.823 1.75-5.987 1.75-9.402 0-3.487-0.588-6.705-1.748-9.568-1.168-2.874-2.82-5.371-4.913-7.425zm-4.644 16.762c0 1.96-0.302 3.782-0.896 5.413-0.587 1.607-1.42 3.011-2.479 4.167-1.05 1.147-2.335 2.065-3.821 2.728-1.479 0.656-3.164 0.99-5.008 0.99-1.84 0-3.514-0.333-4.973-0.988-1.47-0.662-2.747-1.578-3.799-2.729-1.062-1.156-1.895-2.559-2.479-4.167-0.595-1.63-0.896-3.451-0.896-5.413 0-1.801 0.298-3.497 0.887-5.044 0.584-1.536 1.419-2.894 2.479-4.037 1.048-1.132 2.323-2.03 3.792-2.674 1.465-0.642 3.145-0.968 4.988-0.968 1.848 0 3.539 0.326 5.025 0.971 1.481 0.643 2.766 1.541 3.812 2.671 1.062 1.143 1.896 2.501 2.479 4.036 0.589 1.548 0.889 3.245 0.889 5.044z"/>
+		<path d="m376.27 395.65c1.902-2.327 2.867-5.221 2.867-8.603 0-2.614-0.508-4.84-1.506-6.613-0.997-1.762-2.354-3.188-4.035-4.234-1.603-0.995-3.445-1.705-5.482-2.114-1.938-0.388-3.969-0.583-6.037-0.583h-16.021v44.487h10.961v-17.282h2.35l9.447 17.282h13.127l-11.199-18.646c2.262-0.728 4.116-1.964 5.528-3.694zm-19.254-12.223h4.426c0.844 0 1.73 0.054 2.636 0.16 0.784 0.094 1.503 0.283 2.132 0.568 0.496 0.225 0.888 0.553 1.193 0.998 0.283 0.415 0.428 1.031 0.428 1.836 0 0.931-0.16 1.643-0.459 2.06-0.34 0.472-0.771 0.813-1.32 1.046-0.686 0.289-1.459 0.477-2.301 0.554-0.975 0.089-1.963 0.136-2.938 0.136h-3.795l-2e-3 -7.358z"/>
+		<path d="m394.82 386.38c1.05-1.132 2.325-2.03 3.793-2.674 1.464-0.642 3.144-0.968 4.988-0.968 1.843 0 3.611 0.311 5.26 0.921 1.609 0.599 2.992 1.449 4.107 2.531l1.314 1.278 8.019-8.105-1.454-1.298c-2.355-2.103-5.066-3.586-8.058-4.407-2.879-0.789-5.987-1.189-9.247-1.189-3.361 0-6.503 0.556-9.339 1.651-2.856 1.106-5.355 2.707-7.431 4.761-2.074 2.052-3.716 4.559-4.88 7.45-1.158 2.876-1.746 6.104-1.746 9.59 0 3.417 0.59 6.582 1.752 9.403 1.164 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.832 1.096 5.975 1.651 9.339 1.651 6.501 0 12.475-1.432 17.751-4.25l0.979-0.522v-23.814h-19.313v10.27h8.354v6.639c-0.871 0.397-1.834 0.709-2.881 0.933-1.5 0.314-3.127 0.478-4.83 0.478-1.841 0-3.514-0.333-4.973-0.988-1.472-0.662-2.748-1.578-3.801-2.729-1.06-1.156-1.893-2.559-2.478-4.167-0.595-1.63-0.896-3.451-0.896-5.413 0-1.801 0.299-3.497 0.887-5.044 0.586-1.54 1.421-2.897 2.479-4.041z"/>
+		<polygon points="437.69 407.72 437.69 400.36 456.41 400.36 456.41 390.09 437.69 390.09 437.69 383.77 457.44 383.77 457.44 373.5 426.72 373.5 426.72 417.99 458.48 417.99 458.48 407.72"/>
+	</g>
+	<path d="m243.63 379.09l-37.842-1.852 46.229-0.034v-3.727h-52.125l-1e-3 7.798v6.201c0 0.115-1.52-9.144-1.87-11.734h-4.098v13.029c0 0.123-1.753-10.888-1.939-12.264h-27.914c1.902 1.648 12.401 10.598 19.865 14.28 3.741 1.846 8.33 1.86 12.414 1.974 2.075 0.06 4.25 0.217 5.803 1.754 2.255 2.236 2.758 5.704 0.814 8.33-1.922 2.594-7.335 3.156-7.335 3.156l-4.509 5.531v6.424h10.251l0.319-6.348 8.863-6.285c-0.946 0.757-3.058 2.783-6.229 7.666-0.717 1.102-1.275 2.306-1.711 3.49 2.238-1.896 6.84-3.194 12.153-3.194 5.307 0 9.903 1.295 12.146 3.188-0.437-1.185-0.994-2.385-1.709-3.483-3.172-4.883-5.284-6.909-6.229-7.666l8.863 6.285 0.32 6.348h9.565v-6.424l-4.507-5.531s-6.675-0.425-8.423-3.156c-5.032-7.869 2.115-20.082 18.836-23.756z" fill="#1E2D41"/>
+</svg>
@@ -28,7 +28,7 @@ minecraft {
    mappings channel: '@MAPPING_CHANNEL@', version: '@MAPPING_VERSION@'
    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
    
-    // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg')
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

    // Default run configurations.
    // These can be tweaked, removed, or duplicated as needed.
@@ -64,6 +64,24 @@ minecraft {
                }
            }
        }
+
+        data {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
+
+            mods {
+                examplemod {
+                    source sourceSets.main
+                }
+            }
+        }
    }
 }

@@ -6,7 +6,7 @@
 # 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="[26,)" #mandatory (26 is current forge version)
+loaderVersion="[28,)" #mandatory (28 is current forge version)
 # A URL to refer people to when problems occur with this mod
 issueTrackerURL="http://my.issue.tracker/" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
@@ -42,7 +42,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="[26,)" #mandatory
+    versionRange="[28,)" #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 +51,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
 [[dependencies.examplemod]]
    modId="minecraft"
    mandatory=true
-    versionRange="[1.14.2]"
+    versionRange="[1.14.4]"
    ordering="NONE"
-    side="BOTH"
+    side="BOTH"
@@ -1,14 +0,0 @@
--- a/com/mojang/blaze3d/platform/TextureUtil.java
-+++ b/com/mojang/blaze3d/platform/TextureUtil.java
-@@ -44,7 +44,10 @@
-    }
- 
-    public static void prepareImage(NativeImage.PixelFormatGLCode p_prepareImage_0_, int p_prepareImage_1_, int p_prepareImage_2_, int p_prepareImage_3_, int p_prepareImage_4_) {
-      bind(p_prepareImage_1_);
-+      synchronized (net.minecraftforge.fml.client.SplashProgress.class)
-+      {
-+         bind(p_prepareImage_1_);
-+      }
-       if (p_prepareImage_2_ >= 0) {
-          GlStateManager.texParameter(3553, 33085, p_prepareImage_2_);
-          GlStateManager.texParameter(3553, 33082, 0);
@@ -0,0 +1,15 @@
+--- a/net/minecraft/advancements/AdvancementManager.java
+++ b/net/minecraft/advancements/AdvancementManager.java
+@@ -36,7 +36,11 @@
+       Map<ResourceLocation, Advancement.Builder> map = Maps.newHashMap();
+       p_212853_1_.forEach((p_223387_1_, p_223387_2_) -> {
+          try {
+-            Advancement.Builder advancement$builder = field_192783_b.fromJson(p_223387_2_, Advancement.Builder.class);
+            Advancement.Builder advancement$builder = net.minecraftforge.common.crafting.ConditionalAdvancement.read(field_192783_b, p_223387_1_, p_223387_2_);
+            if (advancement$builder == null) {
+               field_192782_a.info("Skipping loading advancement {} as it's conditions were not met", p_223387_1_);
+               return;
+            }
+             map.put(p_223387_1_, advancement$builder);
+          } catch (IllegalArgumentException | JsonParseException jsonparseexception) {
+             field_192782_a.error("Parsing error loading custom advancement {}: {}", p_223387_1_, jsonparseexception.getMessage());
@@ -13,7 +13,18 @@
    private static final Direction[] field_212556_a = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
    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_) {
-@@ -291,7 +292,7 @@
+@@ -246,6 +247,10 @@
+       this.field_149765_K = p_i48440_1_.field_200961_i;
+       this.field_208621_p = p_i48440_1_.field_208772_j;
+       this.field_220085_g = p_i48440_1_.field_222381_j;
+      this.harvestLevel = p_i48440_1_.harvestLevel;
+      this.harvestTool = p_i48440_1_.harvestTool;
+      final ResourceLocation lootTableCache = p_i48440_1_.field_222381_j;
+      this.lootTableSupplier = lootTableCache != null ? () -> lootTableCache : p_i48440_1_.lootTableSupplier != null ? p_i48440_1_.lootTableSupplier : () -> new ResourceLocation(this.getRegistryName().func_110624_b(), "blocks/" + this.getRegistryName().func_110623_a());
+       this.field_176227_L = builder.func_206893_a(BlockState::new);
+       this.func_180632_j(this.field_176227_L.func_177621_b());
+    }
+@@ -291,7 +296,7 @@
 
    @Deprecated
    public boolean func_196253_a(BlockState p_196253_1_, BlockItemUseContext p_196253_2_) {
@@ -22,7 +33,7 @@
    }
 
    @Deprecated
-@@ -303,8 +304,9 @@
+@@ -303,8 +308,9 @@
       return this.field_149789_z;
    }
 
@@ -33,7 +44,7 @@
    }
 
    @Deprecated
-@@ -315,7 +317,7 @@
+@@ -315,7 +321,7 @@
    @Deprecated
    @OnlyIn(Dist.CLIENT)
    public int func_220058_a(BlockState p_220058_1_, IEnviromentBlockReader p_220058_2_, BlockPos p_220058_3_) {
@@ -42,7 +53,7 @@
    }
 
    @OnlyIn(Dist.CLIENT)
-@@ -460,10 +462,9 @@
+@@ -460,10 +466,9 @@
 
    @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_) {
@@ -54,7 +65,7 @@
    }
 
    @Deprecated
-@@ -472,8 +473,8 @@
+@@ -472,8 +477,8 @@
       if (f == -1.0F) {
          return 0.0F;
       } else {
@@ -65,7 +76,17 @@
       }
    }
 
-@@ -553,7 +554,7 @@
+@@ -483,8 +488,7 @@
+ 
+    public ResourceLocation func_220068_i() {
+       if (this.field_220085_g == null) {
+-         ResourceLocation resourcelocation = Registry.field_212618_g.func_177774_c(this);
+-         this.field_220085_g = new ResourceLocation(resourcelocation.func_110624_b(), "blocks/" + resourcelocation.func_110623_a());
+         this.field_220085_g = this.lootTableSupplier.get();
+       }
+ 
+       return this.field_220085_g;
+@@ -553,7 +557,7 @@
    }
 
    public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_) {
@@ -74,7 +95,7 @@
          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;
-@@ -565,7 +566,7 @@
+@@ -565,7 +569,7 @@
    }
 
    public void func_180637_b(World p_180637_1_, BlockPos p_180637_2_, int p_180637_3_) {
@@ -83,7 +104,7 @@
          while(p_180637_3_ > 0) {
             int i = ExperienceOrbEntity.func_70527_a(p_180637_3_);
             p_180637_3_ -= i;
-@@ -575,6 +576,7 @@
+@@ -575,6 +579,7 @@
 
    }
 
@@ -91,15 +112,15 @@
    public float func_149638_a() {
       return this.field_149781_w;
    }
-@@ -677,6 +679,7 @@
+@@ -677,6 +682,7 @@
       p_176216_2_.func_213317_d(p_176216_2_.func_213322_ci().func_216372_d(1.0D, 0.0D, 1.0D));
    }
 
 +   @Deprecated // Forge: Use more sensitive version below: getPickBlock
-    @OnlyIn(Dist.CLIENT)
    public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, BlockState p_185473_3_) {
       return new ItemStack(this);
-@@ -691,6 +694,7 @@
+    }
+@@ -690,6 +696,7 @@
       return Fluids.field_204541_a.func_207188_f();
    }
 
@@ -107,7 +128,7 @@
    public float func_208618_m() {
       return this.field_149765_K;
    }
-@@ -711,6 +715,7 @@
+@@ -710,6 +717,7 @@
    public void func_176224_k(World p_176224_1_, BlockPos p_176224_2_) {
    }
 
@@ -115,7 +136,7 @@
    public boolean func_149659_a(Explosion p_149659_1_) {
       return true;
    }
-@@ -755,6 +760,7 @@
+@@ -754,6 +762,7 @@
       }
    }
 
@@ -123,7 +144,25 @@
    public SoundType func_220072_p(BlockState p_220072_1_) {
       return this.field_149762_H;
    }
-@@ -780,13 +786,80 @@
+@@ -763,7 +772,7 @@
+          this.field_220086_i = Item.func_150898_a(this);
+       }
+ 
+-      return this.field_220086_i;
+      return this.field_220086_i.delegate.get(); //Forge: Vanilla caches the items, update with registry replacements.
+    }
+ 
+    public boolean func_208619_r() {
+@@ -771,7 +780,7 @@
+    }
+ 
+    public String toString() {
+-      return "Block{" + Registry.field_212618_g.func_177774_c(this) + "}";
+      return "Block{" + getRegistryName() + "}";
+    }
+ 
+    @OnlyIn(Dist.CLIENT)
+@@ -779,13 +788,81 @@
    }
 
    public static boolean func_196252_e(Block p_196252_0_) {
@@ -141,6 +180,7 @@
 +   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::getGeneration, BlockTags::func_199896_a);
+   private final java.util.function.Supplier<ResourceLocation> lootTableSupplier;
 +
 +   @Override
 +   public float getSlipperiness(BlockState state, IWorldReader world, BlockPos pos, @Nullable Entity entity) {
@@ -206,3 +246,47 @@
    public static enum OffsetType {
       NONE,
       XZ,
+@@ -804,6 +881,9 @@
+       private float field_200961_i = 0.6F;
+       private ResourceLocation field_222381_j;
+       private boolean field_208772_j;
+      private int harvestLevel = -1;
+      private net.minecraftforge.common.ToolType harvestTool;
+      private java.util.function.Supplier<ResourceLocation> lootTableSupplier;
+ 
+       private Properties(Material p_i48616_1_, MaterialColor p_i48616_2_) {
+          this.field_200953_a = p_i48616_1_;
+@@ -834,6 +914,8 @@
+          block$properties.field_200956_d = p_200950_0_.field_149762_H;
+          block$properties.field_200961_i = p_200950_0_.func_208618_m();
+          block$properties.field_208772_j = p_200950_0_.field_208621_p;
+         block$properties.harvestLevel = p_200950_0_.harvestLevel;
+         block$properties.harvestTool = p_200950_0_.harvestTool;
+          return block$properties;
+       }
+ 
+@@ -882,13 +964,23 @@
+          return this;
+       }
+ 
+      public Block.Properties harvestLevel(int harvestLevel) {
+          this.harvestLevel = harvestLevel;
+          return this;
+      }
+
+      public Block.Properties harvestTool(net.minecraftforge.common.ToolType harvestTool) {
+          this.harvestTool = harvestTool;
+          return this;
+      }
+
+       public Block.Properties func_222380_e() {
+          this.field_222381_j = LootTables.field_186419_a;
+          return this;
+       }
+ 
+       public Block.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;
+       }
+    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/CropsBlock.java
 +++ b/net/minecraft/block/CropsBlock.java
-@@ -59,12 +59,14 @@
+@@ -57,12 +57,14 @@
 
    public void func_196267_b(BlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
@@ -16,7 +16,7 @@
             }
          }
       }
-@@ -93,9 +95,9 @@
+@@ -91,9 +93,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;
                }
             }
-@@ -131,7 +133,7 @@
+@@ -129,7 +131,7 @@
    }
 
    public void func_196262_a(BlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/DetectorRailBlock.java
 +++ b/net/minecraft/block/DetectorRailBlock.java
-@@ -126,6 +126,8 @@
+@@ -128,6 +128,8 @@
 
    public int func_180641_l(BlockState p_180641_1_, World p_180641_2_, BlockPos p_180641_3_) {
       if (p_180641_1_.func_177229_b(field_176574_M)) {
@@ -4,7 +4,7 @@
    public 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) && !Block.func_220056_d(blockstate, p_196448_1_, blockpos, Direction.UP)) {
+-      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)) {
          BlockState blockstate1 = this.func_176223_P();
 
@@ -112,7 +112,7 @@
 
       BlockPos blockpos = p_180655_3_.func_177977_b();
       BlockState blockstate = p_180655_2_.func_180495_p(blockpos);
-      if (!this.func_196446_i(blockstate) && !Block.func_220056_d(blockstate, p_180655_2_, blockpos, Direction.UP)) {
+-      if (!this.func_196446_i(blockstate) && !blockstate.func_224755_d(p_180655_2_, blockpos, Direction.UP)) {
 -         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177976_e()))) {
 +      if (!this.canCatchFire(p_180655_2_, blockpos, Direction.UP) && !Block.func_220056_d(blockstate, p_180655_2_, blockpos, Direction.UP)) {
 +         if (this.canCatchFire(p_180655_2_, blockpos.func_177976_e(), Direction.EAST)) {
@@ -1,7 +1,7 @@
 --- a/net/minecraft/block/FlowerPotBlock.java
 +++ b/net/minecraft/block/FlowerPotBlock.java
-@@ -21,7 +21,7 @@
- import net.minecraftforge.api.distmarker.OnlyIn;
+@@ -19,7 +19,7 @@
+ import net.minecraft.world.World;
 
 public class FlowerPotBlock extends Block {
 -   private static final Map<Block, Block> field_196451_b = Maps.newHashMap();
@@ -0,0 +1,84 @@
+--- a/net/minecraft/block/FlowingFluidBlock.java
+++ b/net/minecraft/block/FlowingFluidBlock.java
+@@ -30,9 +30,11 @@
+ 
+ public class FlowingFluidBlock extends Block implements IBucketPickupHandler {
+    public static final IntegerProperty field_176367_b = BlockStateProperties.field_208132_ag;
+-   protected final FlowingFluid field_204517_c;
+   private final FlowingFluid field_204517_c;
+    private final List<IFluidState> field_212565_c;
+ 
+   // Forge: Use the constructor that takes a supplier
+   @Deprecated
+    protected FlowingFluidBlock(FlowingFluid p_i49014_1_, Block.Properties p_i49014_2_) {
+       super(p_i49014_2_);
+       this.field_204517_c = p_i49014_1_;
+@@ -45,8 +47,21 @@
+ 
+       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>}
+    */
+   public FlowingFluidBlock(java.util.function.Supplier<? extends FlowingFluid> supplier, Block.Properties p_i48368_1_) {
+      super(p_i48368_1_);
+      this.field_204517_c = null;
+      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 void func_196265_a(BlockState p_196265_1_, World p_196265_2_, BlockPos p_196265_3_, Random p_196265_4_) {
+       p_196265_2_.func_204610_c(p_196265_3_).func_206891_b(p_196265_2_, p_196265_3_, p_196265_4_);
+    }
+@@ -61,6 +76,7 @@
+ 
+    public IFluidState func_204507_t(BlockState p_204507_1_) {
+       int i = p_204507_1_.func_177229_b(field_176367_b);
+      if (!fluidStateCacheInitialized) initFluidStateCache();
+       return this.field_212565_c.get(Math.min(i, 8));
+    }
+ 
+@@ -121,13 +137,13 @@
+          if (flag) {
+             IFluidState ifluidstate = p_204515_1_.func_204610_c(p_204515_2_);
+             if (ifluidstate.func_206889_d()) {
+-               p_204515_1_.func_175656_a(p_204515_2_, Blocks.field_150343_Z.func_176223_P());
+               p_204515_1_.func_175656_a(p_204515_2_, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_204515_1_, p_204515_2_, p_204515_2_, Blocks.field_150343_Z.func_176223_P()));
+                this.func_180688_d(p_204515_1_, p_204515_2_);
+                return false;
+             }
+ 
+             if (ifluidstate.func_215679_a(p_204515_1_, p_204515_2_) >= 0.44444445F) {
+-               p_204515_1_.func_175656_a(p_204515_2_, Blocks.field_150347_e.func_176223_P());
+               p_204515_1_.func_175656_a(p_204515_2_, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_204515_1_, p_204515_2_, p_204515_2_, Blocks.field_150347_e.func_176223_P()));
+                this.func_180688_d(p_204515_1_, p_204515_2_);
+                return false;
+             }
+@@ -160,4 +176,22 @@
+       }
+ 
+    }
+
+   // Forge start
+   private final java.util.function.Supplier<? extends Fluid> supplier;
+   public FlowingFluid getFluid() {
+      return (FlowingFluid)supplier.get();
+   }
+
+   private boolean fluidStateCacheInitialized;
+   protected void initFluidStateCache() {
+      this.field_212565_c.add(getFluid().func_207204_a(false));
+
+      for(int i = 1; i < 8; ++i) {
+         this.field_212565_c.add(getFluid().func_207207_a(8 - i, false));
+      }
+
+      this.field_212565_c.add(getFluid().func_207207_a(8, true));
+      fluidStateCacheInitialized = true;
+   }
+ }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/NetherWartBlock.java
 +++ b/net/minecraft/block/NetherWartBlock.java
-@@ -33,9 +33,10 @@
+@@ -31,9 +31,10 @@
 
    public void func_196267_b(BlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
       int i = p_196267_1_.func_177229_b(field_176486_a);
@@ -1,6 +1,22 @@
 --- a/net/minecraft/block/PistonBlock.java
 +++ b/net/minecraft/block/PistonBlock.java
-@@ -197,7 +197,7 @@
+@@ -166,6 +166,7 @@
+       }
+ 
+       if (p_189539_4_ == 0) {
+         if(net.minecraftforge.event.ForgeEventFactory.onPistonMovePre(p_189539_2_, p_189539_3_, direction, true)) return false;
+          if (!this.func_176319_a(p_189539_2_, p_189539_3_, direction, true)) {
+             return false;
+          }
+@@ -173,6 +174,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) {
+          if(net.minecraftforge.event.ForgeEventFactory.onPistonMovePre(p_189539_2_, p_189539_3_, direction, false)) return false;
+          TileEntity tileentity1 = p_189539_2_.func_175625_s(p_189539_3_.func_177972_a(direction));
+          if (tileentity1 instanceof PistonTileEntity) {
+             ((PistonTileEntity)tileentity1).func_145866_f();
+@@ -197,7 +199,7 @@
             }
 
             if (!flag1) {
@@ -9,7 +25,15 @@
                   p_189539_2_.func_217377_a(p_189539_3_.func_177972_a(direction), false);
                } else {
                   this.func_176319_a(p_189539_2_, p_189539_3_, direction, false);
-@@ -238,7 +238,7 @@
+@@ -210,6 +212,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);
+       }
+ 
+      net.minecraftforge.event.ForgeEventFactory.onPistonMovePost(p_189539_2_, p_189539_3_, direction, (p_189539_4_ == 0));
+       return true;
+    }
+ 
+@@ -238,7 +241,7 @@
                return false;
             }
 
@@ -18,7 +42,7 @@
          } else {
             return false;
          }
-@@ -274,7 +274,7 @@
+@@ -274,7 +277,7 @@
          for(int j = list2.size() - 1; j >= 0; --j) {
             BlockPos blockpos2 = list2.get(j);
             BlockState blockstate = p_176319_1_.func_180495_p(blockpos2);
@@ -27,7 +51,7 @@
             func_220059_a(blockstate, p_176319_1_, blockpos2, tileentity);
             p_176319_1_.func_180501_a(blockpos2, Blocks.field_150350_a.func_176223_P(), 18);
             --k;
-@@ -328,6 +328,10 @@
+@@ -328,6 +331,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)));
    }
 
@@ -18,12 +18,20 @@
    }
 
    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_) {
-@@ -105,7 +111,7 @@
-          RailShape railshape = blockstate.func_177229_b(field_176568_b);
+@@ -99,13 +105,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_);
+-      if (blockstate.func_177230_c() != this) {
+      if (!(blockstate.func_177230_c() instanceof PoweredRailBlock)) {
+          return false;
+       } else {
+-         RailShape railshape = blockstate.func_177229_b(field_176568_b);
+         RailShape railshape = getRailDirection(blockstate, p_208071_1_, p_208071_2_, null);
          if (p_208071_5_ != RailShape.EAST_WEST || railshape != RailShape.NORTH_SOUTH && railshape != RailShape.ASCENDING_NORTH && railshape != RailShape.ASCENDING_SOUTH) {
             if (p_208071_5_ != RailShape.NORTH_SOUTH || railshape != RailShape.EAST_WEST && railshape != RailShape.ASCENDING_EAST && railshape != RailShape.ASCENDING_WEST) {
 -               if (blockstate.func_177229_b(field_176569_M)) {
-+               if (!(blockstate.func_177230_c() instanceof PoweredRailBlock) || isActivator != ((PoweredRailBlock)blockstate.func_177230_c()).isActivator) {
+               if (isActivator == ((PoweredRailBlock)blockstate.func_177230_c()).isActivator) {
                   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;
@@ -3,10 +3,10 @@
@@ -124,7 +124,7 @@
       BlockState blockstate1 = p_208074_1_.func_180495_p(blockpos1);
       if (!blockstate1.func_215686_e(p_208074_1_, blockpos1)) {
-          boolean flag = Block.func_220056_d(blockstate, p_208074_1_, blockpos, Direction.UP) || blockstate.func_177230_c() == Blocks.field_150438_bZ;
+          boolean flag = blockstate.func_224755_d(p_208074_1_, blockpos, Direction.UP) || blockstate.func_177230_c() == Blocks.field_150438_bZ;
 -         if (flag && func_176346_d(p_208074_1_.func_180495_p(blockpos.func_177984_a()))) {
 +         if (flag && canConnectTo(p_208074_1_.func_180495_p(blockpos.func_177984_a()), p_208074_1_, blockpos.func_177984_a(), null)) {
-             if (func_208062_a(blockstate.func_196952_d(p_208074_1_, blockpos))) {
+             if (blockstate.func_224756_o(p_208074_1_, blockpos)) {
                return RedstoneSide.UP;
             }
@@ -133,7 +133,7 @@
@@ -0,0 +1,11 @@
+--- a/net/minecraft/block/ScaffoldingBlock.java
+++ b/net/minecraft/block/ScaffoldingBlock.java
+@@ -142,6 +142,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);
@@ -1,18 +0,0 @@
--- a/net/minecraft/block/SoundType.java
-+++ b/net/minecraft/block/SoundType.java
-@@ -54,7 +54,6 @@
-       return this.field_185861_n;
-    }
- 
-   @OnlyIn(Dist.CLIENT)
-    public SoundEvent func_185845_c() {
-       return this.field_185862_o;
-    }
-@@ -67,7 +66,6 @@
-       return this.field_185864_q;
-    }
- 
-   @OnlyIn(Dist.CLIENT)
-    public SoundEvent func_185846_f() {
-       return this.field_185865_r;
-    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/SpawnerBlock.java
 +++ b/net/minecraft/block/SpawnerBlock.java
-@@ -21,10 +21,13 @@
+@@ -19,10 +19,13 @@
 
    public void func_220062_a(BlockState p_220062_1_, World 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_);
@@ -7,4 +7,4 @@
 +         if (!p_196267_2_.isAreaLoaded(p_196267_3_, 3)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light and spreading
          if (!func_220257_b(p_196267_1_, p_196267_2_, p_196267_3_)) {
             p_196267_2_.func_175656_a(p_196267_3_, Blocks.field_150346_d.func_176223_P());
-          } else if (p_196267_2_.func_201696_r(p_196267_3_.func_177984_a()) >= 4) {
+          } else {
@@ -30,3 +30,14 @@
          }
 
       }
+@@ -100,4 +102,10 @@
+    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;
+   }
+ }
@@ -18,3 +18,10 @@
             Direction direction = Direction.func_176741_a(p_196267_4_);
             BlockPos blockpos = p_196267_3_.func_177984_a();
             if (direction.func_176740_k().func_176722_c() && !p_196267_1_.func_177229_b(func_176267_a(direction))) {
+@@ -329,4 +329,6 @@
+    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; }
+ }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/GameSettings.java
 +++ b/net/minecraft/client/GameSettings.java
-@@ -142,7 +142,7 @@
+@@ -143,7 +143,7 @@
    public final KeyBinding[] field_151456_ac = new KeyBinding[]{new KeyBinding("key.hotbar.1", 49, "key.categories.inventory"), new KeyBinding("key.hotbar.2", 50, "key.categories.inventory"), new KeyBinding("key.hotbar.3", 51, "key.categories.inventory"), new KeyBinding("key.hotbar.4", 52, "key.categories.inventory"), new KeyBinding("key.hotbar.5", 53, "key.categories.inventory"), new KeyBinding("key.hotbar.6", 54, "key.categories.inventory"), new KeyBinding("key.hotbar.7", 55, "key.categories.inventory"), new KeyBinding("key.hotbar.8", 56, "key.categories.inventory"), new KeyBinding("key.hotbar.9", 57, "key.categories.inventory")};
    public final KeyBinding field_193629_ap = new KeyBinding("key.saveToolbarActivator", 67, "key.categories.creative");
    public final KeyBinding field_193630_aq = new KeyBinding("key.loadToolbarActivator", 88, "key.categories.creative");
@@ -9,7 +9,7 @@
    protected Minecraft field_74317_L;
    private final File field_74354_ai;
    public Difficulty field_74318_M = Difficulty.NORMAL;
-@@ -161,6 +161,7 @@
+@@ -162,6 +162,7 @@
    public String field_74363_ab = "en_us";
 
    public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_) {
@@ -17,7 +17,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) {
-@@ -462,7 +463,11 @@
+@@ -467,7 +468,11 @@
 
                for(KeyBinding keybinding : this.field_74324_K) {
                   if (s1.equals("key_" + keybinding.func_151464_g())) {
@@ -30,7 +30,7 @@
                   }
                }
 
-@@ -510,6 +515,7 @@
+@@ -515,6 +520,7 @@
    }
 
    public void func_74303_b() {
@@ -38,7 +38,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));
-@@ -583,7 +589,7 @@
+@@ -589,7 +595,7 @@
          printwriter.println("glDebugVerbosity:" + this.field_209231_W);
 
          for(KeyBinding keybinding : this.field_74324_K) {
@@ -47,7 +47,7 @@
          }
 
          for(SoundCategory soundcategory : SoundCategory.values()) {
-@@ -680,6 +686,25 @@
+@@ -686,6 +692,25 @@
          }
       }
 
@@ -25,7 +25,15 @@
       this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
       this.field_147129_ai = func_147122_X();
       this.field_71437_Z = null;
-@@ -451,6 +451,7 @@
+@@ -442,7 +442,6 @@
+ 
+       this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
+       this.field_71417_B = new MouseHelper(this);
+-      this.field_71417_B.func_198029_a(this.field_195558_d.func_198092_i());
+       this.field_195559_v = new KeyboardListener(this);
+       this.field_195559_v.func_197968_a(this.field_195558_d.func_198092_i());
+       GLX.init();
+@@ -451,6 +450,7 @@
       this.field_147124_at.func_147604_a(0.0F, 0.0F, 0.0F, 0.0F);
       this.field_110451_am = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES, this.field_152352_aC);
       this.field_71474_y.func_198017_a(this.field_110448_aq);
@@ -33,16 +41,23 @@
       this.field_110448_aq.func_198983_a();
       List<IResourcePack> list = this.field_110448_aq.func_198980_d().stream().map(ResourcePackInfo::func_195796_e).collect(Collectors.toList());
 
-@@ -521,7 +522,7 @@
+@@ -516,12 +516,14 @@
+       this.field_110451_am.func_219534_a(this.field_193995_ae);
+       GlStateManager.viewport(0, 0, this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
+       this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
+      net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.ParticleFactoryRegisterEvent());
+       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);
       this.field_213273_aM = new PotionSpriteUploader(this.field_71446_o);
       this.field_110451_am.func_219534_a(this.field_213273_aM);
 -      this.field_71456_v = new IngameGui(this);
 +      this.field_71456_v = new net.minecraftforge.client.ForgeIngameGui(this);
+      this.field_71417_B.func_198029_a(this.field_195558_d.func_198092_i()); //Forge: Moved below ingameGUI setting to prevent NPEs in handeler.
       this.field_184132_p = new DebugRenderer(this);
       GLX.setGlfwErrorCallback(this::func_195545_a);
       if (this.field_71474_y.field_74353_u && !this.field_195558_d.func_198113_j()) {
-@@ -542,7 +543,7 @@
+@@ -543,7 +545,7 @@
          if (SharedConstants.field_206244_b) {
             this.func_213256_aB();
          }
@@ -51,7 +66,7 @@
       }, false));
    }
 
-@@ -557,7 +558,7 @@
+@@ -558,7 +560,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_) -> {
@@ -60,7 +75,7 @@
       });
       NonNullList<ItemStack> nonnulllist = NonNullList.func_191196_a();
 
-@@ -646,7 +647,7 @@
+@@ -647,7 +649,7 @@
       Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
       if (p_71377_1_.func_71497_f() != null) {
          Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f());
@@ -69,7 +84,7 @@
       } else if (p_71377_1_.func_147149_a(file2)) {
          Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
          System.exit(-1);
-@@ -661,6 +662,7 @@
+@@ -662,6 +664,7 @@
       return this.field_71474_y.field_211842_aO;
    }
 
@@ -77,7 +92,7 @@
    public CompletableFuture<Void> func_213237_g() {
       if (this.field_213276_aV != null) {
          return this.field_213276_aV;
-@@ -740,16 +742,20 @@
+@@ -741,16 +744,20 @@
    }
 
    public void func_147108_a(@Nullable Screen p_147108_1_) {
@@ -102,7 +117,7 @@
       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);
-@@ -874,11 +880,13 @@
+@@ -875,11 +882,13 @@
       GlStateManager.enableTexture();
       this.field_71424_I.func_76319_b();
       if (!this.field_71454_w) {
@@ -116,7 +131,7 @@
       }
 
       this.field_71424_I.func_219897_b();
-@@ -1146,10 +1154,10 @@
+@@ -1147,10 +1156,10 @@
          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();
@@ -129,7 +144,7 @@
                   this.field_71439_g.func_184609_a(Hand.MAIN_HAND);
                }
             }
-@@ -1176,7 +1184,7 @@
+@@ -1177,7 +1186,7 @@
             case BLOCK:
                BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
                BlockPos blockpos = blockraytraceresult.func_216350_a();
@@ -138,7 +153,7 @@
                   this.field_71442_b.func_180511_b(blockpos, blockraytraceresult.func_216354_b());
                   break;
                }
-@@ -1186,6 +1194,7 @@
+@@ -1187,6 +1196,7 @@
                }
 
                this.field_71439_g.func_184821_cY();
@@ -146,7 +161,7 @@
             }
 
             this.field_71439_g.func_184609_a(Hand.MAIN_HAND);
-@@ -1235,6 +1244,9 @@
+@@ -1236,6 +1246,9 @@
                   }
                }
 
@@ -156,7 +171,7 @@
                if (!itemstack.func_190926_b() && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, hand) == ActionResultType.SUCCESS) {
                   this.field_71460_t.field_78516_c.func_187460_a(hand);
                   return;
-@@ -1254,6 +1266,8 @@
+@@ -1255,6 +1268,8 @@
          --this.field_71467_ac;
       }
 
@@ -165,7 +180,7 @@
       this.field_71424_I.func_76320_a("gui");
       if (!this.field_71445_n) {
          this.field_71456_v.func_73831_a();
-@@ -1372,6 +1386,8 @@
+@@ -1373,6 +1388,8 @@
       this.field_71424_I.func_219895_b("keyboard");
       this.field_195559_v.func_204870_b();
       this.field_71424_I.func_76319_b();
@@ -174,15 +189,7 @@
    }
 
    private void func_184117_aA() {
-@@ -1430,6 +1446,7 @@
-             this.field_71439_g.func_71040_bB(Screen.hasControlDown());
-          }
-       }
-+      if (field_71441_e != null) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(field_71441_e));
- 
-       boolean flag2 = this.field_71474_y.field_74343_n != ChatVisibility.HIDDEN;
-       if (flag2) {
-@@ -1526,6 +1543,12 @@
+@@ -1527,6 +1544,12 @@
       this.func_147108_a(worldloadprogressscreen);
 
       while(!this.field_71437_Z.func_71200_ad()) {
@@ -195,7 +202,7 @@
          worldloadprogressscreen.tick();
          this.func_195542_b(false);
 
-@@ -1546,11 +1569,17 @@
+@@ -1547,11 +1570,17 @@
       networkmanager.func_150719_a(new ClientLoginNetHandler(networkmanager, this, (Screen)null, (p_213261_0_) -> {
       }));
       networkmanager.func_179290_a(new CHandshakePacket(socketaddress.toString(), 0, ProtocolType.LOGIN));
@@ -214,7 +221,20 @@
       WorkingScreen workingscreen = new WorkingScreen();
       workingscreen.func_200210_a(new TranslationTextComponent("connect.joining"));
       this.func_213241_c(workingscreen);
-@@ -1623,6 +1652,7 @@
+@@ -1583,10 +1612,12 @@
+       IntegratedServer integratedserver = this.field_71437_Z;
+       this.field_71437_Z = null;
+       this.field_71460_t.func_190564_k();
+      net.minecraftforge.fml.client.ClientHooks.firePlayerLogout(this.field_71442_b, this.field_71439_g);
+       this.field_71442_b = null;
+       NarratorChatListener.field_193643_a.func_193642_b();
+       this.func_213241_c(p_213231_1_);
+       if (this.field_71441_e != null) {
+         net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(field_71441_e));
+          if (integratedserver != null) {
+             while(!integratedserver.func_213201_w()) {
+                this.func_195542_b(false);
+@@ -1624,6 +1655,7 @@
       }
 
       TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_213257_1_);
@@ -222,7 +242,7 @@
    }
 
    public final boolean func_71355_q() {
-@@ -1648,112 +1678,8 @@
+@@ -1649,112 +1681,8 @@
 
    private void func_147112_ai() {
       if (this.field_71476_x != null && this.field_71476_x.func_216346_c() != RayTraceResult.Type.MISS) {
@@ -337,7 +357,7 @@
       }
    }
 
-@@ -1825,6 +1751,7 @@
+@@ -1826,6 +1754,7 @@
       return field_71432_P;
    }
 
@@ -345,7 +365,7 @@
    public CompletableFuture<Void> func_213245_w() {
       return this.func_213169_a(this::func_213237_g).thenCompose((p_213240_0_) -> {
          return p_213240_0_;
-@@ -1968,6 +1895,8 @@
+@@ -1972,6 +1901,8 @@
    }
 
    public MusicTicker.MusicType func_147109_W() {
@@ -354,7 +374,7 @@
       if (this.field_71462_r instanceof WinGameScreen) {
          return MusicTicker.MusicType.CREDITS;
       } else if (this.field_71439_g == null) {
-@@ -2124,4 +2053,12 @@
+@@ -2128,4 +2059,12 @@
    public LoadingGui func_213250_au() {
       return this.field_213279_p;
    }
@@ -38,7 +38,15 @@
             } 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;
-@@ -168,7 +174,9 @@
+@@ -129,6 +135,7 @@
+                }
+ 
+                this.field_200542_o -= (double)f1;
+               if (net.minecraftforge.client.ForgeHooksClient.onMouseScroll(this, d0)) return;
+                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));
+@@ -168,7 +175,9 @@
                double d2 = (p_198022_3_ - this.field_198040_e) * (double)this.field_198036_a.field_195558_d.func_198107_o() / (double)this.field_198036_a.field_195558_d.func_198105_m();
                double d3 = (p_198022_5_ - this.field_198041_f) * (double)this.field_198036_a.field_195558_d.func_198087_p() / (double)this.field_198036_a.field_195558_d.func_198083_n();
                Screen.wrapScreenError(() -> {
@@ -49,3 +57,29 @@
                }, "mouseDragged event handler", iguieventlistener.getClass().getCanonicalName());
             }
          }
+@@ -233,6 +242,10 @@
+       return this.field_198039_d;
+    }
+ 
+   public boolean isMiddleDown() {
+      return this.field_198038_c;
+   }
+
+    public double func_198024_e() {
+       return this.field_198040_e;
+    }
+@@ -241,6 +254,14 @@
+       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;
+    }
@@ -1,42 +1,6 @@
 --- a/net/minecraft/client/audio/SoundHandler.java
 +++ b/net/minecraft/client/audio/SoundHandler.java
-@@ -61,6 +61,7 @@
-       SoundHandler.Loader soundhandler$loader = new SoundHandler.Loader();
-       p_212854_2_.func_219894_a();
- 
-+      java.util.List<net.minecraft.util.Tuple<ResourceLocation, Runnable>> resources = new java.util.LinkedList<>();
-       for(String s : p_212854_1_.func_199001_a()) {
-          p_212854_2_.func_76320_a(s);
- 
-@@ -74,7 +75,9 @@
-                   p_212854_2_.func_219895_b("register");
- 
-                   for(Entry<String, SoundList> entry : map.entrySet()) {
-+                     resources.add(new net.minecraft.util.Tuple<>(new ResourceLocation(s, entry.getKey()), () -> {
-                      soundhandler$loader.func_217944_a(new ResourceLocation(s, entry.getKey()), entry.getValue(), p_212854_1_);
-+                     }));
-                   }
- 
-                   p_212854_2_.func_76319_b();
-@@ -91,6 +94,17 @@
-          p_212854_2_.func_76319_b();
-       }
- 
-+      net.minecraftforge.fml.common.progress.StartupProgressManager.start("Loading sounds", resources.size(), bar -> {
-+         resources.forEach(entry -> {
-+            bar.step(entry.func_76341_a().toString());
-+            try {
-+                entry.func_76340_b().run();
-+            } catch (RuntimeException e) {
-+                field_147698_b.warn("Invalid sounds.json", e);
-+            }
-+         });
-+      });
-+
-       p_212854_2_.func_219897_b();
-       return soundhandler$loader;
-    }
-@@ -210,6 +224,11 @@
+@@ -210,6 +210,11 @@
       this.field_147694_f.func_195855_a(p_195478_1_, p_195478_2_);
    }
 
@@ -1,6 +1,14 @@
 --- a/net/minecraft/client/gui/DisplayEffectsScreen.java
 +++ b/net/minecraft/client/gui/DisplayEffectsScreen.java
-@@ -84,6 +84,7 @@
+@@ -34,6 +34,7 @@
+          this.field_147003_i = (this.width - this.field_146999_f) / 2;
+          this.field_147045_u = false;
+       } else {
+         if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.PotionShiftEvent(this))) this.field_147003_i = (this.width - this.field_146999_f) / 2; else
+          this.field_147003_i = 160 + (this.width - this.field_146999_f - 200) / 2;
+          this.field_147045_u = true;
+       }
+@@ -84,6 +85,7 @@
       int i = this.field_147009_r;
 
       for(EffectInstance effectinstance : p_214077_3_) {
@@ -8,7 +16,7 @@
          Effect effect = effectinstance.func_188419_a();
          blit(p_214077_1_ + 6, i + 7, this.blitOffset, 18, 18, potionspriteuploader.func_215288_a(effect));
          i += p_214077_2_;
-@@ -95,6 +96,9 @@
+@@ -95,6 +97,9 @@
       int i = this.field_147009_r;
 
       for(EffectInstance effectinstance : p_214078_3_) {
@@ -24,7 +24,15 @@
             }
          }
 
-@@ -588,7 +593,13 @@
+@@ -572,6 +577,7 @@
+          }
+ 
+          String s = itextcomponent.func_150254_d();
+         s = this.field_92016_l.func_77973_b().getHighlightTip(this.field_92016_l, s);
+          int i = (this.field_194811_H - this.func_175179_f().func_78256_a(s)) / 2;
+          int j = this.field_194812_I - 59;
+          if (!this.field_73839_d.field_71442_b.func_78755_b()) {
+@@ -588,7 +594,13 @@
             GlStateManager.enableBlend();
             GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
             fill(i - 2, j - 2, i + this.func_175179_f().func_78256_a(s) + 2, j + 9 + 2, this.field_73839_d.field_71474_y.func_216839_a(0));
@@ -1,10 +1,10 @@
 --- a/net/minecraft/client/gui/ResourceLoadProgressGui.java
 +++ b/net/minecraft/client/gui/ResourceLoadProgressGui.java
-@@ -83,6 +83,7 @@
+@@ -79,6 +79,7 @@
+       this.blit(k1, i1, 0, 0, 256, 256);
+       float f3 = this.field_212975_c.func_219555_b();
+       this.field_212978_f = this.field_212978_f * 0.95F + f3 * 0.050000012F;
+      net.minecraftforge.fml.client.ClientModLoader.renderProgressText();
+       if (f < 1.0F) {
          this.func_212972_a(i / 2 - 150, j / 4 * 3, i / 2 + 150, j / 4 * 3 + 10, this.field_212978_f, 1.0F - MathHelper.func_76131_a(f, 0.0F, 1.0F));
       }
- 
-+      net.minecraftforge.fml.client.ClientModLoader.renderProgressText();
-       if (f >= 2.0F) {
-          this.field_212974_b.func_213268_a((LoadingGui)null);
-       }
@@ -1,5 +1,14 @@
 --- a/net/minecraft/client/gui/recipebook/RecipeBookGui.java
 +++ b/net/minecraft/client/gui/recipebook/RecipeBookGui.java
+@@ -89,7 +89,7 @@
+       this.func_205702_a();
+       this.field_193018_j.clear();
+ 
+-      for(RecipeBookCategories recipebookcategories : ClientRecipeBook.func_216769_b(this.field_201522_g)) {
+      for(RecipeBookCategories recipebookcategories : this.field_201522_g.getRecipeBookCategories()) {
+          this.field_193018_j.add(new RecipeTabToggleWidget(recipebookcategories));
+       }
+ 
@@ -421,7 +421,7 @@
 
          languagemanager.func_135045_a(language);
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/gui/screen/DeathScreen.java
+++ b/net/minecraft/client/gui/screen/DeathScreen.java
+@@ -44,6 +44,7 @@
+       }));
+       Button button = this.addButton(new Button(this.width / 2 - 100, this.height / 4 + 96, 200, 20, s1, (p_213020_1_) -> {
+          if (this.field_213023_c) {
+            func_213022_a(true);
+             this.minecraft.func_147108_a(new MainMenuScreen());
+          } else {
+             ConfirmScreen confirmscreen = new ConfirmScreen(this::func_213022_a, new TranslationTextComponent("deathScreen.quit.confirm"), new StringTextComponent(""), I18n.func_135052_a("deathScreen.titleScreen"), I18n.func_135052_a("deathScreen.respawn"));
@@ -1,24 +1,43 @@
 --- a/net/minecraft/client/multiplayer/PlayerController.java
 +++ b/net/minecraft/client/multiplayer/PlayerController.java
-@@ -104,6 +104,8 @@
-          }
-       }
- 
+@@ -103,7 +103,9 @@
+             Block block = blockstate.func_177230_c();
+             if ((block instanceof CommandBlockBlock || block instanceof StructureBlock || block instanceof JigsawBlock) && !this.field_78776_a.field_71439_g.func_195070_dx()) {
+                return false;
+-            } else if (blockstate.func_196958_f()) {
+            } else if (blockstate.isAir(world, p_187103_1_)) {
 +      if (field_78776_a.field_71439_g.func_184614_ca().onBlockStartBreak(p_187103_1_, field_78776_a.field_71439_g)) return false;
 +
-       World world = this.field_78776_a.field_71441_e;
-       BlockState blockstate = world.func_180495_p(p_187103_1_);
-       if (!this.field_78776_a.field_71439_g.func_184614_ca().func_77973_b().func_195938_a(blockstate, world, p_187103_1_, this.field_78776_a.field_71439_g)) {
-@@ -112,7 +114,7 @@
-          Block block = blockstate.func_177230_c();
-          if ((block instanceof CommandBlockBlock || block instanceof StructureBlock || block instanceof JigsawBlock) && !this.field_78776_a.field_71439_g.func_195070_dx()) {
-             return false;
-         } else if (blockstate.func_196958_f()) {
-+         } else if (blockstate.isAir(world, p_187103_1_)) {
-             return false;
-          } else {
-             block.func_176208_a(world, p_187103_1_, blockstate, this.field_78776_a.field_71439_g);
-@@ -209,13 +211,13 @@
+                return false;
+             } else {
+                block.func_176208_a(world, p_187103_1_, blockstate, this.field_78776_a.field_71439_g);
+@@ -129,21 +131,25 @@
+             BlockState blockstate = this.field_78776_a.field_71441_e.func_180495_p(p_180511_1_);
+             this.field_78776_a.func_193032_ao().func_193294_a(this.field_78776_a.field_71441_e, p_180511_1_, blockstate, 1.0F);
+             this.func_225324_a(CPlayerDiggingPacket.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_);
+            if (!net.minecraftforge.common.ForgeHooks.onLeftClickBlock(this.field_78776_a.field_71439_g, p_180511_1_, p_180511_2_).isCanceled())
+             func_178891_a(this.field_78776_a, this, p_180511_1_, p_180511_2_);
+             this.field_78781_i = 5;
+          } else if (!this.field_78778_j || !this.func_178893_a(p_180511_1_)) {
+             if (this.field_78778_j) {
+                this.func_225324_a(CPlayerDiggingPacket.Action.ABORT_DESTROY_BLOCK, this.field_178895_c, p_180511_2_);
+             }
+            net.minecraftforge.event.entity.player.PlayerInteractEvent.LeftClickBlock event = net.minecraftforge.common.ForgeHooks.onLeftClickBlock(this.field_78776_a.field_71439_g, p_180511_1_, p_180511_2_);
+ 
+             BlockState blockstate1 = this.field_78776_a.field_71441_e.func_180495_p(p_180511_1_);
+             this.field_78776_a.func_193032_ao().func_193294_a(this.field_78776_a.field_71441_e, p_180511_1_, blockstate1, 0.0F);
+             this.func_225324_a(CPlayerDiggingPacket.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_);
+             boolean flag = !blockstate1.func_196958_f();
+             if (flag && this.field_78770_f == 0.0F) {
+               if (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY)
+                blockstate1.func_196942_a(this.field_78776_a.field_71441_e, p_180511_1_, this.field_78776_a.field_71439_g);
+             }
+ 
+            if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.DENY) return true;
+             if (flag && blockstate1.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180511_1_) >= 1.0F) {
+                this.func_187103_a(p_180511_1_);
+             } else {
+@@ -187,13 +193,13 @@
          return true;
       } else if (this.func_178893_a(p_180512_1_)) {
          BlockState blockstate = this.field_78776_a.field_71441_e.func_180495_p(p_180512_1_);
@@ -34,7 +53,7 @@
                this.field_78776_a.func_147118_V().func_147682_a(new SimpleSound(soundtype.func_185846_f(), SoundCategory.NEUTRAL, (soundtype.func_185843_a() + 1.0F) / 8.0F, soundtype.func_185847_b() * 0.5F, p_180512_1_));
             }
 
-@@ -239,7 +241,8 @@
+@@ -217,7 +223,8 @@
    }
 
    public float func_78757_d() {
@@ -44,7 +63,7 @@
    }
 
    public void func_78765_e() {
-@@ -256,7 +259,7 @@
+@@ -234,7 +241,7 @@
       ItemStack itemstack = this.field_78776_a.field_71439_g.func_184614_ca();
       boolean flag = this.field_85183_f.func_190926_b() && itemstack.func_190926_b();
       if (!this.field_85183_f.func_190926_b() && !itemstack.func_190926_b()) {
@@ -53,7 +72,20 @@
       }
 
       return p_178893_1_.equals(this.field_178895_c) && flag;
-@@ -320,11 +323,14 @@
+@@ -257,6 +264,12 @@
+          return ActionResultType.FAIL;
+       } else {
+          ItemStack itemstack = p_217292_1_.func_184586_b(p_217292_3_);
+         net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks
+                 .onRightClickBlock(p_217292_1_, p_217292_3_, blockpos, p_217292_4_.func_216354_b());
+         if (event.isCanceled()) {
+            this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
+            return event.getCancellationResult();
+         }
+          if (this.field_78779_k == GameType.SPECTATOR) {
+             this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
+             return ActionResultType.SUCCESS;
+@@ -298,11 +311,14 @@
          if (p_187101_1_.func_184811_cZ().func_185141_a(itemstack.func_77973_b())) {
             return ActionResultType.PASS;
          } else {
@@ -68,7 +100,7 @@
             }
 
             return actionresult.func_188397_a();
-@@ -349,6 +355,9 @@
+@@ -327,6 +343,9 @@
    public ActionResultType func_187097_a(PlayerEntity p_187097_1_, Entity p_187097_2_, Hand p_187097_3_) {
       this.func_78750_j();
       this.field_78774_b.func_147297_a(new CUseEntityPacket(p_187097_2_, p_187097_3_));
@@ -78,7 +110,7 @@
       return this.field_78779_k == GameType.SPECTATOR ? ActionResultType.PASS : p_187097_1_.func_190775_a(p_187097_2_, p_187097_3_);
    }
 
-@@ -356,6 +365,9 @@
+@@ -334,6 +353,9 @@
       this.func_78750_j();
       Vec3d vec3d = p_187102_3_.func_216347_e().func_178786_a(p_187102_2_.field_70165_t, p_187102_2_.field_70163_u, p_187102_2_.field_70161_v);
       this.field_78774_b.func_147297_a(new CUseEntityPacket(p_187102_2_, p_187102_4_, vec3d));
@@ -8,7 +8,7 @@
       this.field_147393_d.func_150719_a(new ClientPlayNetHandler(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e));
    }
 
-@@ -122,6 +123,7 @@
+@@ -126,6 +127,7 @@
    }
 
    public void func_209521_a(SCustomPayloadLoginPacket p_209521_1_) {
@@ -1,6 +1,22 @@
 --- a/net/minecraft/client/network/play/ClientPlayNetHandler.java
 +++ b/net/minecraft/client/network/play/ClientPlayNetHandler.java
-@@ -711,7 +711,7 @@
+@@ -356,6 +356,7 @@
+ 
+       this.field_147299_f.field_184132_p.func_217737_a();
+       this.field_147299_f.field_71439_g.func_70065_x();
+      net.minecraftforge.fml.client.ClientHooks.firePlayerLogin(this.field_147299_f.field_71442_b, this.field_147299_f.field_71439_g, this.field_147299_f.func_147114_u().func_147298_b());
+       int i = p_147282_1_.func_149197_c();
+       this.field_147300_g.func_217408_a(i, this.field_147299_f.field_71439_g);
+       this.field_147299_f.field_71439_g.field_71158_b = new MovementInputFromOptions(this.field_147299_f.field_71474_y);
+@@ -366,6 +367,7 @@
+       this.field_147299_f.field_71439_g.func_145769_d(i);
+       this.field_147299_f.field_71439_g.func_175150_k(p_147282_1_.func_179744_h());
+       this.field_147299_f.field_71442_b.func_78746_a(p_147282_1_.func_149198_e());
+      net.minecraftforge.fml.network.NetworkHooks.sendMCRegistryPackets(field_147302_e, "PLAY_TO_SERVER");
+       this.field_147299_f.field_71474_y.func_82879_c();
+       this.field_147302_e.func_179290_a(new CCustomPayloadPacket(CCustomPayloadPacket.field_210344_a, (new PacketBuffer(Unpooled.buffer())).func_180714_a(ClientBrandRetriever.getClientModName())));
+       this.field_147299_f.func_213229_ar().func_216814_a();
+@@ -714,7 +716,7 @@
          BlockPos blockpos = new BlockPos(compoundnbt.func_74762_e("x"), compoundnbt.func_74762_e("y"), compoundnbt.func_74762_e("z"));
          TileEntity tileentity = this.field_147300_g.func_175625_s(blockpos);
          if (tileentity != null) {
@@ -9,7 +25,7 @@
          }
       }
 
-@@ -783,7 +783,9 @@
+@@ -790,7 +792,9 @@
 
    public void func_147251_a(SChatPacket p_147251_1_) {
       PacketThreadUtil.func_218797_a(p_147251_1_, this, this.field_147299_f);
@@ -20,15 +36,18 @@
    }
 
    public void func_147279_a(SAnimateHandPacket p_147279_1_) {
-@@ -955,6 +957,7 @@
+@@ -962,8 +966,10 @@
       this.field_147299_f.field_71439_g = clientplayerentity1;
       this.field_147299_f.field_175622_Z = clientplayerentity1;
       clientplayerentity1.func_184212_Q().func_187218_a(clientplayerentity.func_184212_Q().func_187231_c());
 +      clientplayerentity1.updateSyncFields(clientplayerentity); // Forge: fix MC-10657
       clientplayerentity1.func_70065_x();
       clientplayerentity1.func_175158_f(s);
+      net.minecraftforge.fml.client.ClientHooks.firePlayerRespawn(this.field_147299_f.field_71442_b, clientplayerentity, clientplayerentity1, clientplayerentity1.field_71174_a.func_147298_b());
       this.field_147300_g.func_217408_a(i, clientplayerentity1);
-@@ -1077,6 +1080,12 @@
+       clientplayerentity1.field_70177_z = -180.0F;
+       clientplayerentity1.field_71158_b = new MovementInputFromOptions(this.field_147299_f.field_71474_y);
+@@ -1084,6 +1090,12 @@
          boolean flag = i == 2 && tileentity instanceof CommandBlockTileEntity;
          if (i == 1 && tileentity instanceof MobSpawnerTileEntity || flag || i == 3 && tileentity instanceof BeaconTileEntity || i == 4 && tileentity instanceof SkullTileEntity || i == 6 && tileentity instanceof BannerTileEntity || i == 7 && tileentity instanceof StructureBlockTileEntity || i == 8 && tileentity instanceof EndGatewayTileEntity || i == 9 && tileentity instanceof SignTileEntity || i == 11 && tileentity instanceof BedTileEntity || i == 5 && tileentity instanceof ConduitTileEntity || i == 12 && tileentity instanceof JigsawTileEntity || i == 13 && tileentity instanceof CampfireTileEntity) {
             tileentity.func_145839_a(p_147273_1_.func_148857_g());
@@ -41,7 +60,7 @@
          }
 
          if (flag && this.field_147299_f.field_71462_r instanceof CommandBlockScreen) {
-@@ -1246,6 +1255,7 @@
+@@ -1253,6 +1265,7 @@
       clientrecipebook.func_199644_c();
       clientrecipebook.func_199642_d().forEach(imutablesearchtree::func_217872_a);
       imutablesearchtree.func_194040_a();
@@ -49,7 +68,7 @@
    }
 
    public void func_200232_a(SPlayerLookPacket p_200232_1_) {
-@@ -1326,7 +1336,7 @@
+@@ -1333,7 +1346,7 @@
       PacketThreadUtil.func_218797_a(p_147260_1_, this, this.field_147299_f);
       Entity entity = this.field_147300_g.func_73045_a(p_147260_1_.func_149426_d());
       if (entity instanceof LivingEntity) {
@@ -58,12 +77,13 @@
          if (effect != null) {
             EffectInstance effectinstance = new EffectInstance(effect, p_147260_1_.func_180755_e(), p_147260_1_.func_149428_f(), p_147260_1_.func_186984_g(), p_147260_1_.func_179707_f(), p_147260_1_.func_205527_h());
             effectinstance.func_100012_b(p_147260_1_.func_149429_c());
-@@ -1759,10 +1769,12 @@
+@@ -1766,10 +1779,12 @@
 
             this.field_147299_f.field_184132_p.field_217741_m.func_217692_a(pointofinterestdebugrenderer$braininfo);
          } else {
+-            field_147301_d.warn("Unknown custom packed identifier: {}", (Object)resourcelocation);
 +            if (!net.minecraftforge.fml.network.NetworkHooks.onCustomPayload(p_147240_1_, this.field_147302_e))
-             field_147301_d.warn("Unknown custom packed identifier: {}", (Object)resourcelocation);
+            field_147301_d.warn("Unknown custom packet identifier: {}", (Object)resourcelocation);
          }
       } finally {
          if (packetbuffer != null) {
@@ -71,3 +91,12 @@
             packetbuffer.release();
          }
 
+@@ -1909,7 +1924,7 @@
+             for(SEntityPropertiesPacket.Snapshot sentitypropertiespacket$snapshot : p_147290_1_.func_149441_d()) {
+                IAttributeInstance iattributeinstance = abstractattributemap.func_111152_a(sentitypropertiespacket$snapshot.func_151409_a());
+                if (iattributeinstance == null) {
+-                  iattributeinstance = abstractattributemap.func_111150_b(new RangedAttribute((IAttribute)null, sentitypropertiespacket$snapshot.func_151409_a(), 0.0D, Double.MIN_NORMAL, Double.MAX_VALUE));
+                  iattributeinstance = abstractattributemap.func_111150_b(new RangedAttribute((IAttribute)null, sentitypropertiespacket$snapshot.func_151409_a(), 0.0D, -Double.MAX_VALUE, Double.MAX_VALUE)); // FORGE: fix invalid value range (MC-150405)
+                }
+ 
+                iattributeinstance.func_111128_a(sentitypropertiespacket$snapshot.func_151410_b());
@@ -0,0 +1,25 @@
+--- a/net/minecraft/client/particle/DiggingParticle.java
+++ b/net/minecraft/client/particle/DiggingParticle.java
+@@ -36,6 +36,7 @@
+    }
+ 
+    public DiggingParticle func_174846_a(BlockPos p_174846_1_) {
+      updateSprite(p_174846_1_);
+       this.field_181019_az = p_174846_1_;
+       if (this.field_174847_a.func_177230_c() == Blocks.field_196658_i) {
+          return this;
+@@ -93,7 +94,13 @@
+    public static class Factory implements IParticleFactory<BlockParticleData> {
+       public Particle func_199234_a(BlockParticleData p_199234_1_, World p_199234_2_, double p_199234_3_, double p_199234_5_, double p_199234_7_, double p_199234_9_, double p_199234_11_, double p_199234_13_) {
+          BlockState blockstate = p_199234_1_.func_197584_c();
+-         return !blockstate.func_196958_f() && blockstate.func_177230_c() != Blocks.field_196603_bb ? (new DiggingParticle(p_199234_2_, p_199234_3_, p_199234_5_, p_199234_7_, p_199234_9_, p_199234_11_, p_199234_13_, blockstate)).func_174845_l() : null;
+         return !blockstate.func_196958_f() && blockstate.func_177230_c() != Blocks.field_196603_bb ? (new DiggingParticle(p_199234_2_, p_199234_3_, p_199234_5_, p_199234_7_, p_199234_9_, p_199234_11_, p_199234_13_, blockstate)).func_174845_l().updateSprite(p_199234_1_.getPos()) : null;
+       }
+    }
+
+   private Particle updateSprite(BlockPos pos) { //FORGE: we cannot assume that the x y z of the particles match the block pos of the block.
+      if (pos != null) // There are cases where we are not able to obtain the correct source pos, and need to fallback to the non-model data version
+         this.func_217567_a(Minecraft.func_71410_x().func_175602_ab().func_175023_a().getTexture(field_174847_a, field_187122_b, pos));
+      return this;
+   }
+ }
@@ -1,6 +1,37 @@
 --- a/net/minecraft/client/particle/ParticleManager.java
 +++ b/net/minecraft/client/particle/ParticleManager.java
-@@ -235,6 +235,7 @@
+@@ -63,7 +63,7 @@
+    private final Queue<EmitterParticle> field_178933_d = Queues.newArrayDeque();
+    private final TextureManager field_78877_c;
+    private final Random field_78875_d = new Random();
+-   private final Int2ObjectMap<IParticleFactory<?>> field_178932_g = new Int2ObjectOpenHashMap<>();
+   private final Map<ResourceLocation, IParticleFactory<?>> field_178932_g = new java.util.HashMap<>();
+    private final Queue<Particle> field_187241_h = Queues.newArrayDeque();
+    private final Map<ResourceLocation, ParticleManager.AnimatedSpriteImpl> field_215242_i = Maps.newHashMap();
+    private final AtlasTexture field_215243_j = new AtlasTexture("textures/particle");
+@@ -137,13 +137,13 @@
+    }
+ 
+    public <T extends IParticleData> void func_199283_a(ParticleType<T> p_199283_1_, IParticleFactory<T> p_199283_2_) {
+-      this.field_178932_g.put(Registry.field_212632_u.func_148757_b(p_199283_1_), p_199283_2_);
+      this.field_178932_g.put(Registry.field_212632_u.func_177774_c(p_199283_1_), p_199283_2_);
+    }
+ 
+    public <T extends IParticleData> void func_215234_a(ParticleType<T> p_215234_1_, ParticleManager.IParticleMetaFactory<T> p_215234_2_) {
+       ParticleManager.AnimatedSpriteImpl particlemanager$animatedspriteimpl = new ParticleManager.AnimatedSpriteImpl();
+       this.field_215242_i.put(Registry.field_212632_u.func_177774_c(p_215234_1_), particlemanager$animatedspriteimpl);
+-      this.field_178932_g.put(Registry.field_212632_u.func_148757_b(p_215234_1_), p_215234_2_.create(particlemanager$animatedspriteimpl));
+      this.field_178932_g.put(Registry.field_212632_u.func_177774_c(p_215234_1_), p_215234_2_.create(particlemanager$animatedspriteimpl));
+    }
+ 
+    public CompletableFuture<Void> func_215226_a(IFutureReloadListener.IStage p_215226_1_, IResourceManager p_215226_2_, IProfiler p_215226_3_, IProfiler p_215226_4_, Executor p_215226_5_, Executor p_215226_6_) {
+@@ -230,11 +230,12 @@
+ 
+    @Nullable
+    private <T extends IParticleData> Particle func_199927_b(T p_199927_1_, double p_199927_2_, double p_199927_4_, double p_199927_6_, double p_199927_8_, double p_199927_10_, double p_199927_12_) {
+-      IParticleFactory<T> iparticlefactory = (IParticleFactory<T>) this.field_178932_g.get(Registry.field_212632_u.func_148757_b(p_199927_1_.func_197554_b()));
+      IParticleFactory<T> iparticlefactory = (IParticleFactory<T>) this.field_178932_g.get(Registry.field_212632_u.func_177774_c(p_199927_1_.func_197554_b()));
+       return iparticlefactory == null ? null : iparticlefactory.func_199234_a(p_199927_1_, this.field_78878_a, p_199927_2_, p_199927_4_, p_199927_6_, p_199927_8_, p_199927_10_, p_199927_12_);
    }
 
    public void func_78873_a(Particle p_78873_1_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/ActiveRenderInfo.java
 +++ b/net/minecraft/client/renderer/ActiveRenderInfo.java
-@@ -174,4 +174,11 @@
+@@ -172,4 +172,11 @@
       this.field_216791_c = null;
       this.field_216789_a = false;
    }
@@ -0,0 +1,19 @@
+--- a/net/minecraft/client/renderer/BlockModelShapes.java
+++ b/net/minecraft/client/renderer/BlockModelShapes.java
+@@ -24,10 +24,16 @@
+       this.field_178128_c = p_i46245_1_;
+    }
+ 
+   @Deprecated
+    public TextureAtlasSprite func_178122_a(BlockState p_178122_1_) {
+       return this.func_178125_b(p_178122_1_).func_177554_e();
+    }
+ 
+   public TextureAtlasSprite getTexture(BlockState state, net.minecraft.world.World world, net.minecraft.util.math.BlockPos pos) {
+      net.minecraftforge.client.model.data.IModelData data = net.minecraftforge.client.model.ModelDataManager.getModelData(world, pos);
+      return this.func_178125_b(state).getParticleTexture(data == null ? net.minecraftforge.client.model.data.EmptyModelData.INSTANCE : data);
+   }
+
+    public IBakedModel func_178125_b(BlockState p_178125_1_) {
+       IBakedModel ibakedmodel = this.field_178129_a.get(p_178125_1_);
+       if (ibakedmodel == null) {
@@ -42,7 +42,7 @@
       if (flag1) {
          float f4 = hand == Hand.OFF_HAND ? f : 0.0F;
          float f6 = 1.0F - MathHelper.func_219799_g(p_78440_1_, this.field_187472_i, this.field_187471_h);
-+         if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(Hand.OFF_HAND, p_78440_1_, f1, f4, f6, this.field_187467_d))
+         if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(Hand.OFF_HAND, p_78440_1_, f1, f4, f6, this.field_187468_e))
          this.func_187457_a(abstractclientplayerentity, p_78440_1_, f1, Hand.OFF_HAND, f4, this.field_187468_e, f6);
       }
 
@@ -72,8 +72,9 @@
          }
 
          if (blockstate.func_185901_i() != BlockRenderType.INVISIBLE) {
+-            this.func_178108_a(this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(blockstate));
 +            if (!net.minecraftforge.event.ForgeEventFactory.renderBlockOverlay(field_78455_a.field_71439_g, p_78447_1_, net.minecraftforge.client.event.RenderBlockOverlayEvent.OverlayType.BLOCK, blockstate, overlayPos))
-             this.func_178108_a(this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(blockstate));
+            this.func_178108_a(this.field_78455_a.func_175602_ab().func_175023_a().getTexture(blockstate, field_78455_a.field_71441_e, overlayPos));
          }
       }
 
@@ -0,0 +1,77 @@
+--- a/net/minecraft/client/renderer/FluidBlockRenderer.java
+++ b/net/minecraft/client/renderer/FluidBlockRenderer.java
+@@ -58,8 +58,9 @@
+ 
+    public boolean func_217638_a(IEnviromentBlockReader p_217638_1_, BlockPos p_217638_2_, BufferBuilder p_217638_3_, IFluidState p_217638_4_) {
+       boolean flag = p_217638_4_.func_206884_a(FluidTags.field_206960_b);
+-      TextureAtlasSprite[] atextureatlassprite = flag ? this.field_178272_a : this.field_178271_b;
+-      int i = flag ? 16777215 : BiomeColors.func_217612_c(p_217638_1_, p_217638_2_);
+      TextureAtlasSprite[] atextureatlassprite = net.minecraftforge.client.ForgeHooksClient.getFluidSprites(p_217638_1_, p_217638_2_, p_217638_4_);
+      int i = p_217638_4_.func_206886_c().getAttributes().getColor(p_217638_1_, p_217638_2_);
+      float alpha = (float)(i >> 24 & 255) / 255.0F;
+       float f = (float)(i >> 16 & 255) / 255.0F;
+       float f1 = (float)(i >> 8 & 255) / 255.0F;
+       float f2 = (float)(i & 255) / 255.0F;
+@@ -145,15 +146,15 @@
+             float f24 = 1.0F * f;
+             float f25 = 1.0F * f1;
+             float f26 = 1.0F * f2;
+-            p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f7, d2 + 0.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f12, (double)f16).func_187314_a(k, l).func_181675_d();
+-            p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f8, d2 + 1.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f13, (double)f17).func_187314_a(k, l).func_181675_d();
+-            p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f9, d2 + 1.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f14, (double)f18).func_187314_a(k, l).func_181675_d();
+-            p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f10, d2 + 0.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f15, (double)f19).func_187314_a(k, l).func_181675_d();
+            p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f7, d2 + 0.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f12, (double)f16).func_187314_a(k, l).func_181675_d();
+            p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f8, d2 + 1.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f13, (double)f17).func_187314_a(k, l).func_181675_d();
+            p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f9, d2 + 1.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f14, (double)f18).func_187314_a(k, l).func_181675_d();
+            p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f10, d2 + 0.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f15, (double)f19).func_187314_a(k, l).func_181675_d();
+             if (p_217638_4_.func_205586_a(p_217638_1_, p_217638_2_.func_177984_a())) {
+-               p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f7, d2 + 0.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f12, (double)f16).func_187314_a(k, l).func_181675_d();
+-               p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f10, d2 + 0.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f15, (double)f19).func_187314_a(k, l).func_181675_d();
+-               p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f9, d2 + 1.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f14, (double)f18).func_187314_a(k, l).func_181675_d();
+-               p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f8, d2 + 1.0D).func_181666_a(f24, f25, f26, 1.0F).func_187315_a((double)f13, (double)f17).func_187314_a(k, l).func_181675_d();
+               p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f7, d2 + 0.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f12, (double)f16).func_187314_a(k, l).func_181675_d();
+               p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f10, d2 + 0.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f15, (double)f19).func_187314_a(k, l).func_181675_d();
+               p_217638_3_.func_181662_b(d0 + 1.0D, d1 + (double)f9, d2 + 1.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f14, (double)f18).func_187314_a(k, l).func_181675_d();
+               p_217638_3_.func_181662_b(d0 + 0.0D, d1 + (double)f8, d2 + 1.0D).func_181666_a(f24, f25, f26, alpha).func_187315_a((double)f13, (double)f17).func_187314_a(k, l).func_181675_d();
+             }
+          }
+ 
+@@ -168,10 +169,10 @@
+             float f37 = 0.5F * f;
+             float f38 = 0.5F * f1;
+             float f40 = 0.5F * f2;
+-            p_217638_3_.func_181662_b(d0, d1, d2 + 1.0D).func_181666_a(f37, f38, f40, 1.0F).func_187315_a((double)f31, (double)f36).func_187314_a(j2, k2).func_181675_d();
+-            p_217638_3_.func_181662_b(d0, d1, d2).func_181666_a(f37, f38, f40, 1.0F).func_187315_a((double)f31, (double)f34).func_187314_a(j2, k2).func_181675_d();
+-            p_217638_3_.func_181662_b(d0 + 1.0D, d1, d2).func_181666_a(f37, f38, f40, 1.0F).func_187315_a((double)f32, (double)f34).func_187314_a(j2, k2).func_181675_d();
+-            p_217638_3_.func_181662_b(d0 + 1.0D, d1, d2 + 1.0D).func_181666_a(f37, f38, f40, 1.0F).func_187315_a((double)f32, (double)f36).func_187314_a(j2, k2).func_181675_d();
+            p_217638_3_.func_181662_b(d0, d1, d2 + 1.0D).func_181666_a(f37, f38, f40, alpha).func_187315_a((double)f31, (double)f36).func_187314_a(j2, k2).func_181675_d();
+            p_217638_3_.func_181662_b(d0, d1, d2).func_181666_a(f37, f38, f40, alpha).func_187315_a((double)f31, (double)f34).func_187314_a(j2, k2).func_181675_d();
+            p_217638_3_.func_181662_b(d0 + 1.0D, d1, d2).func_181666_a(f37, f38, f40, alpha).func_187315_a((double)f32, (double)f34).func_187314_a(j2, k2).func_181675_d();
+            p_217638_3_.func_181662_b(d0 + 1.0D, d1, d2 + 1.0D).func_181666_a(f37, f38, f40, alpha).func_187315_a((double)f32, (double)f36).func_187314_a(j2, k2).func_181675_d();
+             flag7 = true;
+          }
+ 
+@@ -245,15 +246,15 @@
+                float f28 = 1.0F * f27 * f;
+                float f29 = 1.0F * f27 * f1;
+                float f30 = 1.0F * f27 * f2;
+-               p_217638_3_.func_181662_b(d3, d1 + (double)f33, d4).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f45, (double)f47).func_187314_a(j1, k1).func_181675_d();
+-               p_217638_3_.func_181662_b(d5, d1 + (double)f35, d6).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f46, (double)f48).func_187314_a(j1, k1).func_181675_d();
+-               p_217638_3_.func_181662_b(d5, d1 + 0.0D, d6).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f46, (double)f49).func_187314_a(j1, k1).func_181675_d();
+-               p_217638_3_.func_181662_b(d3, d1 + 0.0D, d4).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f45, (double)f49).func_187314_a(j1, k1).func_181675_d();
+               p_217638_3_.func_181662_b(d3, d1 + (double)f33, d4).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f45, (double)f47).func_187314_a(j1, k1).func_181675_d();
+               p_217638_3_.func_181662_b(d5, d1 + (double)f35, d6).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f46, (double)f48).func_187314_a(j1, k1).func_181675_d();
+               p_217638_3_.func_181662_b(d5, d1 + 0.0D, d6).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f46, (double)f49).func_187314_a(j1, k1).func_181675_d();
+               p_217638_3_.func_181662_b(d3, d1 + 0.0D, d4).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f45, (double)f49).func_187314_a(j1, k1).func_181675_d();
+                if (textureatlassprite2 != this.field_187501_d) {
+-                  p_217638_3_.func_181662_b(d3, d1 + 0.0D, d4).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f45, (double)f49).func_187314_a(j1, k1).func_181675_d();
+-                  p_217638_3_.func_181662_b(d5, d1 + 0.0D, d6).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f46, (double)f49).func_187314_a(j1, k1).func_181675_d();
+-                  p_217638_3_.func_181662_b(d5, d1 + (double)f35, d6).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f46, (double)f48).func_187314_a(j1, k1).func_181675_d();
+-                  p_217638_3_.func_181662_b(d3, d1 + (double)f33, d4).func_181666_a(f28, f29, f30, 1.0F).func_187315_a((double)f45, (double)f47).func_187314_a(j1, k1).func_181675_d();
+                  p_217638_3_.func_181662_b(d3, d1 + 0.0D, d4).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f45, (double)f49).func_187314_a(j1, k1).func_181675_d();
+                  p_217638_3_.func_181662_b(d5, d1 + 0.0D, d6).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f46, (double)f49).func_187314_a(j1, k1).func_181675_d();
+                  p_217638_3_.func_181662_b(d5, d1 + (double)f35, d6).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f46, (double)f48).func_187314_a(j1, k1).func_181675_d();
+                  p_217638_3_.func_181662_b(d3, d1 + (double)f33, d4).func_181666_a(f28, f29, f30, alpha).func_187315_a((double)f45, (double)f47).func_187314_a(j1, k1).func_181675_d();
+                }
+             }
+          }
@@ -46,7 +46,7 @@
             } catch (Throwable throwable) {
                CrashReport crashreport1 = CrashReport.func_85055_a(throwable, "Rendering screen");
                CrashReportCategory crashreportcategory1 = crashreport1.func_85058_a("Screen render details");
-@@ -655,7 +662,7 @@
+@@ -656,7 +663,7 @@
       double d2 = activerenderinfo.func_216785_c().field_72449_c;
       icamera.func_78547_a(d0, d1, d2);
       if (this.field_78531_r.field_71474_y.field_151451_c >= 4) {
@@ -55,7 +55,7 @@
          this.field_78531_r.func_213239_aq().func_219895_b("sky");
          GlStateManager.matrixMode(5889);
          GlStateManager.loadIdentity();
-@@ -668,14 +675,14 @@
+@@ -669,14 +676,14 @@
          GlStateManager.matrixMode(5888);
       }
 
@@ -72,7 +72,7 @@
       this.field_78531_r.func_110434_K().func_110577_a(AtlasTexture.field_110575_b);
       RenderHelper.func_74518_a();
       this.field_78531_r.func_213239_aq().func_219895_b("terrain_setup");
-@@ -689,7 +696,9 @@
+@@ -690,7 +697,9 @@
       GlStateManager.disableAlphaTest();
       worldrenderer.func_215323_a(BlockRenderLayer.SOLID, activerenderinfo);
       GlStateManager.enableAlphaTest();
@@ -82,7 +82,7 @@
       this.field_78531_r.func_110434_K().func_110581_b(AtlasTexture.field_110575_b).func_174936_b(false, false);
       worldrenderer.func_215323_a(BlockRenderLayer.CUTOUT, activerenderinfo);
       this.field_78531_r.func_110434_K().func_110581_b(AtlasTexture.field_110575_b).func_174935_a();
-@@ -708,6 +717,7 @@
+@@ -709,6 +718,7 @@
       if (flag && this.field_78531_r.field_71476_x != null) {
          GlStateManager.disableAlphaTest();
          this.field_78531_r.func_213239_aq().func_219895_b("outline");
@@ -90,7 +90,7 @@
          worldrenderer.func_215325_a(activerenderinfo, this.field_78531_r.field_71476_x, 0);
          GlStateManager.enableAlphaTest();
       }
-@@ -724,7 +734,7 @@
+@@ -725,7 +735,7 @@
       this.field_78531_r.func_110434_K().func_110581_b(AtlasTexture.field_110575_b).func_174935_a();
       GlStateManager.disableBlend();
       this.func_180436_i();
@@ -99,7 +99,7 @@
       this.field_78531_r.func_213239_aq().func_219895_b("particles");
       particlemanager.func_215233_a(activerenderinfo, p_181560_1_);
       this.func_175072_h();
-@@ -738,7 +748,7 @@
+@@ -739,7 +749,7 @@
       GlStateManager.enableCull();
       GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
       GlStateManager.alphaFunc(516, 0.1F);
@@ -108,7 +108,7 @@
       GlStateManager.enableBlend();
       GlStateManager.depthMask(false);
       this.field_78531_r.func_110434_K().func_110577_a(AtlasTexture.field_110575_b);
-@@ -755,6 +765,9 @@
+@@ -756,6 +766,9 @@
          this.func_215313_a(activerenderinfo, worldrenderer, p_181560_1_, d0, d1, d2);
       }
 
@@ -118,7 +118,7 @@
       this.field_78531_r.func_213239_aq().func_219895_b("hand");
       if (this.field_175074_C) {
          GlStateManager.clear(256, Minecraft.field_142025_a);
-@@ -771,7 +784,7 @@
+@@ -772,7 +785,7 @@
          GlStateManager.multMatrix(Matrix4f.func_195876_a(this.func_215311_a(p_215313_1_, p_215313_3_, true), (float)this.field_78531_r.field_195558_d.func_198109_k() / (float)this.field_78531_r.field_195558_d.func_198091_l(), 0.05F, this.field_78530_s * 4.0F));
          GlStateManager.matrixMode(5888);
          GlStateManager.pushMatrix();
@@ -127,19 +127,19 @@
          p_215313_2_.func_195466_a(p_215313_3_, p_215313_4_, p_215313_6_, p_215313_8_);
          GlStateManager.disableFog();
          GlStateManager.popMatrix();
-@@ -857,6 +870,11 @@
+@@ -858,6 +871,11 @@
    }
 
    protected void func_78474_d(float p_78474_1_) {
 +      net.minecraftforge.client.IRenderHandler renderer = this.field_78531_r.field_71441_e.func_201675_m().getWeatherRenderer();
 +      if (renderer != null) {
-+         renderer.render(p_78474_1_, this.field_78531_r.field_71441_e, field_78531_r);
+         renderer.render(this.field_78529_t, p_78474_1_, this.field_78531_r.field_71441_e, this.field_78531_r);
 +         return;
 +      }
       float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_);
       if (!(f <= 0.0F)) {
          this.func_180436_i();
-@@ -1089,4 +1107,9 @@
+@@ -1090,4 +1108,9 @@
    public ActiveRenderInfo func_215316_n() {
       return this.field_215317_L;
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/ItemRenderer.java
 +++ b/net/minecraft/client/renderer/ItemRenderer.java
-@@ -51,13 +51,14 @@
+@@ -51,7 +51,7 @@
 
    public ItemRenderer(TextureManager p_i46552_1_, ModelManager p_i46552_2_, ItemColors p_i46552_3_) {
       this.field_175057_n = p_i46552_1_;
@@ -9,14 +9,7 @@
 
       for(Item item : Registry.field_212630_s) {
          if (!field_195411_c.contains(item)) {
-             this.field_175059_m.func_199311_a(item, new ModelResourceLocation(Registry.field_212630_s.func_177774_c(item), "inventory"));
-          }
-       }
-+      net.minecraftforge.client.model.ModelLoader.onRegisterItems(this.field_175059_m);
- 
-       this.field_184395_f = p_i46552_3_;
-    }
-@@ -75,6 +76,10 @@
+@@ -75,6 +75,10 @@
    }
 
    private void func_191967_a(IBakedModel p_191967_1_, int p_191967_2_, ItemStack p_191967_3_) {
@@ -27,7 +20,7 @@
       Tessellator tessellator = Tessellator.func_178181_a();
       BufferBuilder bufferbuilder = tessellator.func_178180_c();
       bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_176599_b);
-@@ -98,7 +103,7 @@
+@@ -98,7 +102,7 @@
          if (p_180454_2_.func_188618_c()) {
             GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
             GlStateManager.enableRescaleNormal();
@@ -36,7 +29,7 @@
          } else {
             this.func_191961_a(p_180454_2_, p_180454_1_);
             if (p_180454_1_.func_77962_s()) {
-@@ -164,7 +169,7 @@
+@@ -164,7 +168,7 @@
             k = k | -16777216;
          }
 
@@ -45,7 +38,7 @@
       }
 
    }
-@@ -225,11 +230,8 @@
+@@ -225,11 +229,8 @@
          GlStateManager.enableBlend();
          GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
          GlStateManager.pushMatrix();
@@ -59,7 +52,7 @@
 
          this.func_180454_a(p_184394_1_, p_184394_2_);
          GlStateManager.cullFace(GlStateManager.CullFace.BACK);
-@@ -260,7 +262,7 @@
+@@ -260,7 +261,7 @@
       GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
       GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
       this.func_180452_a(p_191962_2_, p_191962_3_, p_191962_4_.func_177556_c());
@@ -68,7 +61,7 @@
       this.func_180454_a(p_191962_1_, p_191962_4_);
       GlStateManager.disableAlphaTest();
       GlStateManager.disableRescaleNormal();
-@@ -299,6 +301,7 @@
+@@ -299,6 +300,7 @@
             crashreportcategory.func_189529_a("Item Type", () -> {
                return String.valueOf((Object)p_184391_2_.func_77973_b());
             });
@@ -76,7 +69,7 @@
             crashreportcategory.func_189529_a("Item Damage", () -> {
                return String.valueOf(p_184391_2_.func_77952_i());
             });
-@@ -330,9 +333,12 @@
+@@ -330,9 +332,12 @@
             GlStateManager.enableBlend();
             GlStateManager.enableLighting();
             GlStateManager.enableDepthTest();
@@ -90,7 +83,7 @@
             GlStateManager.disableLighting();
             GlStateManager.disableDepthTest();
             GlStateManager.disableTexture();
-@@ -340,11 +346,9 @@
+@@ -340,11 +345,9 @@
             GlStateManager.disableBlend();
             Tessellator tessellator = Tessellator.func_178181_a();
             BufferBuilder bufferbuilder = tessellator.func_178180_c();
@@ -105,7 +98,7 @@
             this.func_181565_a(bufferbuilder, p_180453_3_ + 2, p_180453_4_ + 13, 13, 2, 0, 0, 0, 255);
             this.func_181565_a(bufferbuilder, p_180453_3_ + 2, p_180453_4_ + 13, i, 1, j >> 16 & 255, j >> 8 & 255, j & 255, 255);
             GlStateManager.enableBlend();
-@@ -383,4 +387,9 @@
+@@ -383,4 +386,9 @@
    public void func_195410_a(IResourceManager p_195410_1_) {
       this.field_175059_m.func_178085_b();
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/WorldRenderer.java
 +++ b/net/minecraft/client/renderer/WorldRenderer.java
-@@ -589,10 +589,12 @@
+@@ -592,10 +592,12 @@
          this.field_72769_h.func_217381_Z().func_219895_b("blockentities");
          RenderHelper.func_74519_b();
 
@@ -13,7 +13,7 @@
                   TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity, p_215326_3_, -1);
                }
             }
-@@ -600,16 +602,18 @@
+@@ -603,16 +605,18 @@
 
          synchronized(this.field_181024_n) {
             for(TileEntity tileentity1 : this.field_181024_n) {
@@ -33,7 +33,7 @@
                TileEntity tileentity2 = this.field_72769_h.func_175625_s(blockpos);
                if (tileentity2 instanceof ChestTileEntity && blockstate.func_177229_b(ChestBlock.field_196314_b) == ChestType.LEFT) {
                   blockpos = blockpos.func_177972_a(blockstate.func_177229_b(ChestBlock.field_176459_a).func_176746_e());
-@@ -730,7 +734,7 @@
+@@ -733,7 +737,7 @@
             for(int j = -this.field_72739_F; j <= this.field_72739_F; ++j) {
                for(int k = -this.field_72739_F; k <= this.field_72739_F; ++k) {
                   ChunkRender chunkrender1 = this.field_175008_n.func_178161_a(new BlockPos((j << 4) + 8, i, (k << 4) + 8));
@@ -42,7 +42,7 @@
                      chunkrender1.func_178577_a(p_215320_3_);
                      queue.add(new WorldRenderer.LocalRenderInformationContainer(chunkrender1, (Direction)null, 0));
                   }
-@@ -775,7 +779,7 @@
+@@ -778,7 +782,7 @@
             this.field_147595_R = true;
             BlockPos blockpos2 = chunkrender4.func_178568_j().func_177982_a(8, 8, 8);
             boolean flag3 = blockpos2.func_177951_i(blockpos1) < 768.0D;
@@ -51,19 +51,19 @@
                this.field_175009_l.add(chunkrender4);
             } else {
                this.field_72777_q.func_213239_aq().func_76320_a("build near");
-@@ -969,6 +973,11 @@
+@@ -972,6 +976,11 @@
    }
 
    public void func_195465_a(float p_195465_1_) {
 +      net.minecraftforge.client.IRenderHandler renderer = this.field_72769_h.func_201675_m().getSkyRenderer();
 +      if (renderer != null) {
-+         renderer.render(p_195465_1_, field_72769_h, field_72777_q);
+         renderer.render(this.field_72773_u, p_195465_1_, this.field_72769_h, this.field_72777_q);
 +         return;
 +      }
       if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p() == DimensionType.field_223229_c_) {
          this.func_180448_r();
       } else if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d()) {
-@@ -1113,6 +1122,7 @@
+@@ -1116,6 +1125,7 @@
    }
 
    public void func_195466_a(float p_195466_1_, double p_195466_2_, double p_195466_4_, double p_195466_6_) {
@@ -71,7 +71,7 @@
       if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d()) {
          float f = 12.0F;
          float f1 = 4.0F;
-@@ -1488,7 +1498,11 @@
+@@ -1491,7 +1501,11 @@
             DestroyBlockProgress destroyblockprogress = iterator.next();
             BlockPos blockpos = destroyblockprogress.func_180246_b();
             Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c();
@@ -84,7 +84,7 @@
                double d3 = (double)blockpos.func_177958_n() - d0;
                double d4 = (double)blockpos.func_177956_o() - d1;
                double d5 = (double)blockpos.func_177952_p() - d2;
-@@ -1496,7 +1510,7 @@
+@@ -1499,7 +1513,7 @@
                   iterator.remove();
                } else {
                   BlockState blockstate = this.field_72769_h.func_180495_p(blockpos);
@@ -93,7 +93,7 @@
                      int i = destroyblockprogress.func_73106_e();
                      TextureAtlasSprite textureatlassprite = this.field_94141_F[i];
                      BlockRendererDispatcher blockrendererdispatcher = this.field_72777_q.func_175602_ab();
-@@ -1517,7 +1531,7 @@
+@@ -1520,7 +1534,7 @@
       if (p_215325_3_ == 0 && p_215325_2_.func_216346_c() == RayTraceResult.Type.BLOCK) {
          BlockPos blockpos = ((BlockRayTraceResult)p_215325_2_).func_216350_a();
          BlockState blockstate = this.field_72769_h.func_180495_p(blockpos);
@@ -102,7 +102,7 @@
             GlStateManager.enableBlend();
             GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
             GlStateManager.lineWidth(Math.max(2.5F, (float)this.field_72777_q.field_195558_d.func_198109_k() / 1920.0F * 2.5F));
-@@ -1984,7 +1998,7 @@
+@@ -1994,7 +2008,7 @@
          break;
       case 2001:
          BlockState blockstate = Block.func_196257_b(p_180439_4_);
@@ -111,7 +111,7 @@
             SoundType soundtype = blockstate.func_215695_r();
             this.field_72769_h.func_184156_a(p_180439_3_, soundtype.func_185845_c(), SoundCategory.BLOCKS, (soundtype.func_185843_a() + 1.0F) / 2.0F, soundtype.func_185847_b() * 0.8F, false);
          }
-@@ -2108,6 +2122,11 @@
+@@ -2118,6 +2132,11 @@
       }
    }
 
@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/renderer/color/BlockColors.java
 +++ b/net/minecraft/client/renderer/color/BlockColors.java
-@@ -22,7 +22,8 @@
+@@ -27,7 +27,8 @@
 
 @OnlyIn(Dist.CLIENT)
 public class BlockColors {
 -   private final ObjectIntIdentityMap<IBlockColor> field_186725_a = new ObjectIntIdentityMap<>(32);
 +   // FORGE: Use RegistryDelegates as non-Vanilla block ids are not constant
 +   private final java.util.Map<net.minecraftforge.registries.IRegistryDelegate<Block>, IBlockColor> field_186725_a = new java.util.HashMap<>();
+    private final Map<Block, Set<IProperty<?>>> field_225311_b = Maps.newHashMap();
 
    public static BlockColors func_186723_a() {
-       BlockColors blockcolors = new BlockColors();
-@@ -63,11 +64,12 @@
+@@ -72,11 +73,12 @@
       blockcolors.func_186722_a((p_210228_0_, p_210228_1_, p_210228_2_, p_210228_3_) -> {
          return p_210228_1_ != null && p_210228_2_ != null ? 2129968 : 7455580;
       }, Blocks.field_196651_dG);
@@ -24,7 +24,7 @@
       if (iblockcolor != null) {
          return iblockcolor.getColor(p_189991_1_, (IEnviromentBlockReader)null, (BlockPos)null, 0);
       } else {
-@@ -77,13 +79,13 @@
+@@ -86,13 +88,13 @@
    }
 
    public int func_216860_a(BlockState p_216860_1_, @Nullable IEnviromentBlockReader p_216860_2_, @Nullable BlockPos p_216860_3_, int p_216860_4_) {
@@ -2,7 +2,7 @@
 +++ b/net/minecraft/client/renderer/entity/PlayerRenderer.java
@@ -52,6 +52,7 @@
    public void func_76986_a(AbstractClientPlayerEntity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
-       if (!p_76986_1_.func_175144_cb() || this.field_76990_c.field_217783_c != null && this.field_76990_c.field_217783_c.func_216773_g() == p_76986_1_) {
+       if (!p_76986_1_.func_175144_cb() || this.field_76990_c.field_217783_c.func_216773_g() == p_76986_1_) {
          double d0 = p_76986_4_;
 +      if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderPlayerEvent.Pre(p_76986_1_, this, p_76986_9_, p_76986_2_, p_76986_4_, p_76986_6_))) return;
          if (p_76986_1_.func_213287_bg()) {
@@ -11,9 +11,10 @@
             boolean flag = this.func_188363_b(p_188361_9_);
 -            this.func_215333_a(this.func_177181_a(armoritem, flag));
 -            if (armoritem instanceof DyeableArmorItem) {
+-               int i = ((DyeableArmorItem)armoritem).func_200886_f(itemstack);
 +            this.func_215333_a(this.getArmorResource(p_188361_1_, itemstack, p_188361_9_, null));
 +            if (armoritem instanceof net.minecraft.item.IDyeableArmorItem) { // Allow this for anything, not only cloth
-                int i = ((DyeableArmorItem)armoritem).func_200886_f(itemstack);
+               int i = ((net.minecraft.item.IDyeableArmorItem)armoritem).func_200886_f(itemstack);
                float f = (float)(i >> 16 & 255) / 255.0F;
                float f1 = (float)(i >> 8 & 255) / 255.0F;
                float f2 = (float)(i & 255) / 255.0F;
@@ -10,17 +10,17 @@
    public boolean func_178309_b() {
       return this.field_178315_d != null ? this.field_178315_d.func_178309_b() : this.field_178322_i;
    }
-@@ -90,6 +93,10 @@
-    private ItemOverrideList func_217646_a(ModelBakery p_217646_1_, BlockModel p_217646_2_) {
+@@ -91,6 +94,10 @@
       return this.field_187968_k.isEmpty() ? ItemOverrideList.field_188022_a : new ItemOverrideList(p_217646_1_, p_217646_2_, p_217646_1_::func_209597_a, this.field_187968_k);
    }
-+   
+ 
 +   public ItemOverrideList getOverrides(ModelBakery p_217646_1_, BlockModel p_217646_2_, Function<ResourceLocation, TextureAtlasSprite> textureGetter, net.minecraft.client.renderer.vertex.VertexFormat format) {
 +      return this.field_187968_k.isEmpty() ? ItemOverrideList.field_188022_a : new ItemOverrideList(p_217646_1_, p_217646_2_, p_217646_1_::func_209597_a, textureGetter, this.field_187968_k, format);
 +   }
- 
+
    public Collection<ResourceLocation> func_187965_e() {
       Set<ResourceLocation> set = Sets.newHashSet();
+ 
@@ -160,25 +167,33 @@
       return set1;
    }
@@ -38,7 +38,7 @@
    public IBakedModel func_217644_a(ModelBakery p_217644_1_, BlockModel p_217644_2_, Function<ResourceLocation, TextureAtlasSprite> p_217644_3_, ISprite p_217644_4_) {
 +       return bake(p_217644_1_, p_217644_2_, p_217644_3_, p_217644_4_, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176599_b);
 +   }
-+   
+
 +   public IBakedModel bake(ModelBakery p_217644_1_, BlockModel p_217644_2_, Function<ResourceLocation, TextureAtlasSprite> p_217644_3_, ISprite p_217644_4_, net.minecraft.client.renderer.vertex.VertexFormat format) {
       TextureAtlasSprite textureatlassprite = p_217644_3_.apply(new ResourceLocation(this.func_178308_c("particle")));
       if (this.func_178310_f() == ModelBakery.field_177616_r) {
@@ -57,7 +57,7 @@
 +                  simplebakedmodel$builder.func_177648_a(makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, p_217644_4_));
                } else {
 -                  simplebakedmodel$builder.func_177650_a(p_217644_4_.func_188048_b().func_177523_a(blockpartface.field_178244_b), func_217645_a(blockpart, blockpartface, textureatlassprite1, direction, p_217644_4_));
-+                  simplebakedmodel$builder.func_177650_a(p_217644_4_.getState().apply(java.util.Optional.empty()).map(trsr -> trsr.rotate(blockpartface.field_178244_b)).orElse(blockpartface.field_178244_b), makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, p_217644_4_));
+                  simplebakedmodel$builder.func_177650_a(p_217644_4_.getState().apply(java.util.Optional.empty()).map(trsr -> trsr.rotateTransform(blockpartface.field_178244_b)).orElse(blockpartface.field_178244_b), makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, p_217644_4_));
                }
             }
          }
@@ -60,7 +60,7 @@
 +   }
 +
 +   private void fillVertexData(int[] p_188015_1_, int p_188015_2_, Direction p_188015_3_, BlockFaceUV p_188015_4_, float[] p_188015_5_, TextureAtlasSprite p_188015_6_, net.minecraftforge.common.model.ITransformation p_188015_7_, @Nullable BlockPartRotation p_188015_8_, boolean p_188015_9_) {
-+      Direction direction = p_188015_7_.rotate(p_188015_3_);
+      Direction direction = p_188015_7_.rotateTransform(p_188015_3_);
       int i = p_188015_9_ ? this.func_178413_a(direction) : -1;
       FaceDirection.VertexInformation facedirection$vertexinformation = FaceDirection.func_179027_a(p_188015_3_).func_179025_a(p_188015_2_);
       Vector3f vector3f = new Vector3f(p_188015_5_[facedirection$vertexinformation.field_179184_a], p_188015_5_[facedirection$vertexinformation.field_179182_b], p_188015_5_[facedirection$vertexinformation.field_179183_c]);
@@ -6,13 +6,17 @@
 @OnlyIn(Dist.CLIENT)
 -public interface IBakedModel {
 +public interface IBakedModel extends net.minecraftforge.client.extensions.IForgeBakedModel {
-+    
+   /**@deprecated Forge: Use {@link net.minecraftforge.client.extensions.IForgeBakedModel#getQuads(IBlockState, EnumFacing, Random, net.minecraftforge.client.model.data.IModelData)}*/
 +   @Deprecated
    List<BakedQuad> func_200117_a(@Nullable BlockState p_200117_1_, @Nullable Direction p_200117_2_, Random p_200117_3_);
 
    boolean func_177555_b();
-@@ -21,7 +23,8 @@
+@@ -19,9 +21,12 @@
 
+    boolean func_188618_c();
+ 
+   /**@deprecated Forge: Use {@link net.minecraftforge.client.extensions.IForgeBakedModel#getParticleTexture(net.minecraftforge.client.model.data.IModelData)}*/
+   @Deprecated
    TextureAtlasSprite func_177554_e();
 
 -   ItemCameraTransforms func_177552_f();
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/model/ModelBakery.java
 +++ b/net/minecraft/client/renderer/model/ModelBakery.java
-@@ -87,7 +87,7 @@
+@@ -97,7 +97,7 @@
    private final Set<ResourceLocation> field_217848_D = Sets.newHashSet();
    private final BlockModelDefinition.ContainerHolder field_209610_F = new BlockModelDefinition.ContainerHolder();
    private final Map<ResourceLocation, IUnbakedModel> field_217849_F = Maps.newHashMap();
@@ -9,30 +9,50 @@
    private final Map<ResourceLocation, IUnbakedModel> field_217851_H = Maps.newHashMap();
    private final Map<ResourceLocation, IBakedModel> field_217852_I = Maps.newHashMap();
    private final AtlasTexture.SheetData field_217853_J;
-@@ -269,7 +269,7 @@
-                         flag = true;
-                         lvt_9_4_ = this.field_177598_f.func_199004_b(resourcelocation1).stream().map((p_217839_1_) -> {
+@@ -142,12 +142,19 @@
+ 
+       p_i51735_4_.func_219895_b("special");
+       this.func_217843_a(new ModelResourceLocation("minecraft:trident_in_hand#inventory"));
+      for (ResourceLocation rl : getSpecialModels()) {
+          // Same as func_217843_a but without restricting to MRL's
+          IUnbakedModel iunbakedmodel = this.func_209597_a(rl);
+          this.field_217849_F.put(rl, iunbakedmodel);
+          this.field_217851_H.put(rl, iunbakedmodel);
+      }
+       p_i51735_4_.func_219895_b("textures");
+       Set<String> set = Sets.newLinkedHashSet();
+       Set<ResourceLocation> set1 = this.field_217851_H.values().stream().flatMap((p_217838_2_) -> {
+          return p_217838_2_.func_209559_a(this::func_209597_a, set).stream();
+       }).collect(Collectors.toSet());
+       set1.addAll(field_177602_b);
+      net.minecraftforge.client.ForgeHooksClient.gatherFluidTextures(set1);
+       set.forEach((p_217833_0_) -> {
+          field_177603_c.warn("Unable to resolve texture reference: {}", (Object)p_217833_0_);
+       });
+@@ -288,7 +295,7 @@
+                      {
+                         lvt_13_5_ = this.field_177598_f.func_199004_b(resourcelocation1).stream().map((p_217839_1_) -> {
                            try (InputStream inputstream = p_217839_1_.func_199027_b()) {
-                              Pair pair1 = Pair.of(p_217839_1_.func_199026_d(), BlockModelDefinition.func_209577_a(this.field_209610_F, new InputStreamReader(inputstream, StandardCharsets.UTF_8)));
-+                              Pair pair1 = Pair.of(p_217839_1_.func_199026_d(), BlockModelDefinition.fromJson(this.field_209610_F, new InputStreamReader(inputstream, StandardCharsets.UTF_8), p_209598_1_));
-                               return pair1;
+-                              Pair<String, BlockModelDefinition> pair2 = Pair.of(p_217839_1_.func_199026_d(), BlockModelDefinition.func_209577_a(this.field_209610_F, new InputStreamReader(inputstream, StandardCharsets.UTF_8)));
+                              Pair<String, BlockModelDefinition> pair2 = Pair.of(p_217839_1_.func_199026_d(), BlockModelDefinition.fromJson(this.field_209610_F, new InputStreamReader(inputstream, StandardCharsets.UTF_8), p_209598_1_));
+                               return pair2;
                            } catch (Exception exception1) {
                               throw new ModelBakery.BlockStateDefinitionException(String.format("Exception loading blockstate definition: '%s' in resourcepack: '%s': %s", p_217839_1_.func_199029_a(), p_217839_1_.func_199026_d(), exception1.getMessage()));
-@@ -381,7 +381,12 @@
+@@ -404,7 +411,12 @@
 
    @Nullable
    public IBakedModel func_217845_a(ResourceLocation p_217845_1_, ISprite p_217845_2_) {
 -      Triple<ResourceLocation, ModelRotation, Boolean> triple = Triple.of(p_217845_1_, p_217845_2_.func_188048_b(), p_217845_2_.func_188049_c());
 +      return getBakedModel(p_217845_1_, p_217845_2_, this.field_177609_j::func_195424_a, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176599_b);
 +   }
-+   
+
 +   @Nullable
 +   public IBakedModel getBakedModel(ResourceLocation p_217845_1_, ISprite p_217845_2_, java.util.function.Function<ResourceLocation, net.minecraft.client.renderer.texture.TextureAtlasSprite> textureGetter, net.minecraft.client.renderer.vertex.VertexFormat format) {
 +      Triple<ResourceLocation, net.minecraftforge.common.model.IModelState, Boolean> triple = Triple.of(p_217845_1_, p_217845_2_.getState(), p_217845_2_.func_188049_c());
       if (this.field_217850_G.containsKey(triple)) {
          return this.field_217850_G.get(triple);
       } else {
-@@ -389,11 +394,11 @@
+@@ -412,11 +424,11 @@
          if (iunbakedmodel instanceof BlockModel) {
             BlockModel blockmodel = (BlockModel)iunbakedmodel;
             if (blockmodel.func_178310_f() == field_177606_o) {
@@ -46,3 +66,14 @@
          this.field_217850_G.put(triple, ibakedmodel);
          return ibakedmodel;
       }
+@@ -471,6 +483,10 @@
+       return this.field_225367_M;
+    }
+ 
+   public Set<ResourceLocation> getSpecialModels() {
+      return java.util.Collections.emptySet();
+   }
+
+    @OnlyIn(Dist.CLIENT)
+    static class BlockStateDefinitionException extends RuntimeException {
+       public BlockStateDefinitionException(String p_i49526_1_) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/model/ModelManager.java
 +++ b/net/minecraft/client/renderer/model/ModelManager.java
-@@ -12,7 +12,7 @@
+@@ -16,7 +16,7 @@
 
 @OnlyIn(Dist.CLIENT)
 public class ModelManager extends ReloadListener<ModelBakery> {
@@ -8,29 +8,32 @@
 +   private Map<ResourceLocation, IBakedModel> field_174958_a = new java.util.HashMap<>();
    private final AtlasTexture field_174956_b;
    private final BlockModelShapes field_174957_c;
-    private IBakedModel field_174955_d;
-@@ -34,9 +34,15 @@
-       return this.field_174957_c;
-    }
+    private final BlockColors field_224743_d;
+@@ -43,7 +43,7 @@
 
-+   // TODO
-+   //@Override
-+   public net.minecraftforge.resource.IResourceType getResourceType() {
-+      return net.minecraftforge.resource.VanillaResourceType.MODELS;
-+   }
-+
    protected ModelBakery func_212854_a_(IResourceManager p_212854_1_, IProfiler p_212854_2_) {
       p_212854_2_.func_219894_a();
-      ModelBakery modelbakery = new ModelBakery(p_212854_1_, this.field_174956_b, p_212854_2_);
-+      net.minecraftforge.client.model.ModelLoader modelbakery = new net.minecraftforge.client.model.ModelLoader(p_212854_1_, this.field_174956_b, p_212854_2_);
+-      ModelBakery modelbakery = new ModelBakery(p_212854_1_, this.field_174956_b, this.field_224743_d, p_212854_2_);
+      net.minecraftforge.client.model.ModelLoader modelbakery = new net.minecraftforge.client.model.ModelLoader(p_212854_1_, this.field_174956_b, this.field_224743_d, p_212854_2_);
       p_212854_2_.func_219897_b();
       return modelbakery;
    }
-@@ -47,6 +53,7 @@
-       p_212853_1_.func_217844_a(p_212853_3_);
+@@ -55,6 +55,7 @@
       this.field_174958_a = p_212853_1_.func_217846_a();
+       this.field_224744_f = p_212853_1_.func_225354_b();
       this.field_174955_d = this.field_174958_a.get(ModelBakery.field_177604_a);
 +      net.minecraftforge.client.ForgeHooksClient.onModelBake(this, this.field_174958_a, (net.minecraftforge.client.model.ModelLoader) p_212853_1_);
       p_212853_3_.func_219895_b("cache");
       this.field_174957_c.func_178124_c();
       p_212853_3_.func_76319_b();
+@@ -78,4 +79,10 @@
+          return true;
+       }
+    }
+
+   // TODO
+   //@Override
+   public net.minecraftforge.resource.IResourceType getResourceType() {
+      return net.minecraftforge.resource.VanillaResourceType.MODELS;
+   }
+ }
@@ -16,6 +16,6 @@
 +
 +   public java.util.Optional<net.minecraftforge.common.model.TRSRTransformation> apply(java.util.Optional<? extends net.minecraftforge.common.model.IModelPart> part) { return net.minecraftforge.client.ForgeHooksClient.applyTransform(this, part); }
 +   public javax.vecmath.Matrix4f getMatrixVec() { return net.minecraftforge.common.model.TRSRTransformation.from(this).getMatrixVec(); }
-+   public Direction rotate(Direction facing) { return func_177523_a(facing); }
+   public Direction rotateTransform(Direction facing) { return func_177523_a(facing); }
 +   public int rotate(Direction facing, int vertexIndex) { return func_177520_a(facing, vertexIndex); }
 }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/texture/AtlasTexture.java
 +++ b/net/minecraft/client/renderer/texture/AtlasTexture.java
-@@ -79,10 +79,12 @@
+@@ -80,6 +80,7 @@
          }
       }
 
@@ -8,12 +8,15 @@
    }
 
    public AtlasTexture.SheetData func_215254_a(IResourceManager p_215254_1_, Iterable<ResourceLocation> p_215254_2_, IProfiler p_215254_3_) {
-       Set<ResourceLocation> set = Sets.newHashSet();
-+      net.minecraftforge.client.ForgeHooksClient.onTextureStitchedPre(this);
-       p_215254_3_.func_76320_a("preparing");
-       p_215254_2_.forEach((p_215253_1_) -> {
-          if (p_215253_1_ == null) {
-@@ -110,6 +112,7 @@
+@@ -92,6 +93,7 @@
+             set.add(p_215253_1_);
+          }
+       });
+      net.minecraftforge.client.ForgeHooksClient.onTextureStitchedPre(this, set);
+       int i = this.field_215265_o;
+       Stitcher stitcher = new Stitcher(i, i, this.field_147636_j);
+       int j = Integer.MAX_VALUE;
+@@ -111,6 +113,7 @@
 
       int i1 = Math.min(j, k);
       int j1 = MathHelper.func_151239_c(i1);
@@ -21,7 +24,7 @@
       if (j1 < this.field_147636_j) {
          field_147635_d.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.field_94254_c, this.field_147636_j, j1, i1);
          this.field_147636_j = j1;
-@@ -191,6 +194,7 @@
+@@ -198,6 +201,7 @@
 
       label62: {
          boolean flag;
@@ -29,15 +32,14 @@
          try {
             iresource = p_195422_1_.func_199002_a(resourcelocation);
             p_195422_2_.func_195664_a(iresource, this.field_147636_j + 1);
-@@ -267,7 +271,94 @@
-       this.field_94252_e.clear();
+@@ -275,6 +279,93 @@
       this.field_94258_i.clear();
    }
-+   
+ 
 +   //===================================================================================================
 +   //                                           Forge Start
 +   //===================================================================================================
- 
+
 +   private final java.util.Deque<ResourceLocation> loadingSprites = new java.util.ArrayDeque<>();
 +   private final java.util.Set<ResourceLocation> loadedSprites = new java.util.HashSet<>();
 +
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/texture/Stitcher.java
 +++ b/net/minecraft/client/renderer/texture/Stitcher.java
-@@ -13,6 +13,8 @@
+@@ -14,6 +14,8 @@
 
 @OnlyIn(Dist.CLIENT)
 public class Stitcher {
@@ -9,29 +9,20 @@
    private static final Comparator<Stitcher.Holder> field_217797_a = Comparator.<Stitcher.Holder, Integer>comparing((p_217793_0_) -> {
       return -p_217793_0_.field_94201_d;
    }).thenComparing((p_217795_0_) -> {
-@@ -50,15 +52,21 @@
-    public void func_94305_f() {
-       List<Stitcher.Holder> list = Lists.newArrayList(this.field_94319_a);
-       list.sort(field_217797_a);
-+      try(net.minecraftforge.fml.common.progress.ProgressBar bar = net.minecraftforge.fml.common.progress.StartupProgressManager.start("Texture stitching", list.size())) {
+@@ -54,6 +56,12 @@
 
       for(Stitcher.Holder stitcher$holder : list) {
-+         bar.step(stitcher$holder.field_98151_a.func_195668_m().toString());
          if (!this.func_94310_b(stitcher$holder)) {
-+            LOGGER.info(String.format("Unable to fit: %s - size: %dx%d - Maybe try a lower resolution resourcepack?", stitcher$holder.field_98151_a.func_195668_m(), stitcher$holder.field_98151_a.func_94211_a(), stitcher$holder.field_98151_a.func_94216_b()));
-+            for (Stitcher.Holder h : list)
-+                LOGGER.info("  {}", h);
-             throw new StitcherException(stitcher$holder.field_98151_a);
-          }
-       }
- 
-       this.field_94318_c = MathHelper.func_151236_b(this.field_94318_c);
-       this.field_94315_d = MathHelper.func_151236_b(this.field_94315_d);
-+      }; // Forge: end progress bar
-    }
- 
-    public List<TextureAtlasSprite> func_94309_g() {
-@@ -104,7 +112,7 @@
+            LOGGER.info(new net.minecraftforge.fml.loading.AdvancedLogMessageAdapter(sb->{
+               sb.append("Unable to fit: ").append(stitcher$holder.field_98151_a.func_195668_m());
+               sb.append(" - size: ").append(stitcher$holder.field_98151_a.func_94211_a()).append("x").append(stitcher$holder.field_98151_a.func_94216_b());
+               sb.append(" - Maybe try a lower resolution resourcepack?\n");
+               list.forEach(h-> sb.append("\t").append(h).append("\n"));
+            }));
+             throw new StitcherException(stitcher$holder.field_98151_a, list.stream().map((p_225334_0_) -> {
+                return p_225334_0_.field_98151_a;
+             }).collect(ImmutableList.toImmutableList()));
+@@ -107,7 +115,7 @@
          boolean flag4 = flag2 && j != l;
          boolean flag;
          if (flag3 ^ flag4) {
@@ -40,7 +31,7 @@
          } else {
             flag = flag1 && i <= j;
          }
-@@ -141,7 +149,7 @@
+@@ -144,7 +152,7 @@
       }
 
       public String toString() {
@@ -9,7 +9,7 @@
    private final ResourceLocation field_110984_i;
    protected final int field_130223_c;
    protected final int field_130224_d;
-@@ -104,7 +104,10 @@
+@@ -103,7 +103,10 @@
                anativeimage[k1] = this.field_195670_c[k1];
             } else {
                NativeImage nativeimage1 = anativeimage[k1 - 1];
@@ -21,7 +21,7 @@
                int k = nativeimage.func_195702_a();
                int l = nativeimage.func_195714_b();
 
-@@ -113,8 +116,11 @@
+@@ -112,8 +115,11 @@
                      nativeimage.func_195700_a(i1, j1, func_195661_b(nativeimage1.func_195709_a(i1 * 2 + 0, j1 * 2 + 0), nativeimage1.func_195709_a(i1 * 2 + 1, j1 * 2 + 0), nativeimage1.func_195709_a(i1 * 2 + 0, j1 * 2 + 1), nativeimage1.func_195709_a(i1 * 2 + 1, j1 * 2 + 1), flag));
                   }
                }
@@ -34,7 +34,7 @@
             }
          }
 
-@@ -196,6 +202,7 @@
+@@ -209,6 +215,7 @@
 
    private void func_195667_a(int p_195667_1_, int p_195667_2_, NativeImage[] p_195667_3_) {
       for(int i = 0; i < this.field_195670_c.length; ++i) {
@@ -42,7 +42,7 @@
          p_195667_3_[i].func_195706_a(i, this.field_110975_c >> i, this.field_110974_d >> i, p_195667_1_ >> i, p_195667_2_ >> i, this.field_130223_c >> i, this.field_130224_d >> i, this.field_195670_c.length > 1);
       }
 
-@@ -451,4 +458,10 @@
+@@ -464,4 +471,10 @@
    public void func_195663_q() {
       this.func_195659_d(0);
    }
@@ -1,5 +1,14 @@
 --- a/net/minecraft/client/renderer/texture/TextureManager.java
 +++ b/net/minecraft/client/renderer/texture/TextureManager.java
+@@ -49,7 +49,7 @@
+    }
+ 
+    public boolean func_110580_a(ResourceLocation p_110580_1_, ITickableTextureObject p_110580_2_) {
+-      if (this.func_110579_a(p_110580_1_, p_110580_2_)) {
+      if (this.func_110579_a(p_110580_1_, (ITextureObject)p_110580_2_)) { //TODO: Move to MCPConfig
+          this.field_110583_b.add(p_110580_2_);
+          return true;
+       } else {
@@ -125,6 +125,7 @@
    public void func_147645_c(ResourceLocation p_147645_1_) {
       ITextureObject itextureobject = this.func_110581_b(p_147645_1_);
@@ -0,0 +1,17 @@
+--- a/net/minecraft/command/impl/LocateCommand.java
+++ b/net/minecraft/command/impl/LocateCommand.java
+@@ -50,7 +50,13 @@
+          return func_198534_a(p_204758_0_.getSource(), "Shipwreck");
+       })).then(Commands.func_197057_a("Village").executes((p_218858_0_) -> {
+          return func_198534_a(p_218858_0_.getSource(), "Village");
+-      })));
+      // FORGE: Support modded structures via registry name
+      })).then(Commands.func_197056_a("structure_type", net.minecraft.command.arguments.ResourceLocationArgument.func_197197_a())
+              .suggests((ctx, sb) -> net.minecraft.command.ISuggestionProvider.func_197013_a(
+                      net.minecraftforge.registries.GameData.getStructureFeatures().func_148742_b().stream()
+                          .map(net.minecraft.util.ResourceLocation::toString), sb))
+              .executes(ctx -> func_198534_a(ctx.getSource(), ctx.getArgument("structure_type", net.minecraft.util.ResourceLocation.class).toString().replace("minecraft:", ""))
+      )));
+    }
+ 
+    private static int func_198534_a(CommandSource p_198534_0_, String p_198534_1_) throws CommandSyntaxException {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/crash/CrashReport.java
 +++ b/net/minecraft/crash/CrashReport.java
-@@ -65,6 +65,7 @@
+@@ -69,6 +69,7 @@
          List<String> list = Util.func_211565_f().collect(Collectors.toList());
          return String.format("%d total; %s", list.size(), list.stream().collect(Collectors.joining(" ")));
       });
@@ -8,7 +8,7 @@
    }
 
    public String func_71501_a() {
-@@ -117,23 +118,13 @@
+@@ -121,23 +122,13 @@
          throwable.setStackTrace(this.field_71511_b.getStackTrace());
       }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/crash/CrashReportCategory.java
 +++ b/net/minecraft/crash/CrashReportCategory.java
-@@ -98,8 +98,10 @@
+@@ -100,8 +100,10 @@
       if (astacktraceelement.length <= 0) {
          return 0;
       } else {
@@ -0,0 +1,10 @@
+--- a/net/minecraft/data/RecipeProvider.java
+++ b/net/minecraft/data/RecipeProvider.java
+@@ -58,6 +58,7 @@
+ 
+          }
+       });
+      if (this.getClass() == RecipeProvider.class) //Forge: Subclasses don't need this.
+       this.func_208310_b(p_200398_1_, Advancement.Builder.func_200278_a().func_200275_a("impossible", new ImpossibleTrigger.Instance()).func_200273_b(), path.resolve("data/minecraft/advancements/recipes/root.json"));
+    }
+ 
@@ -0,0 +1,10 @@
+--- a/net/minecraft/data/TagsProvider.java
+++ b/net/minecraft/data/TagsProvider.java
+@@ -48,6 +48,7 @@
+       tagcollection.func_200039_c().forEach((p_223474_2_, p_223474_3_) -> {
+          JsonObject jsonobject = p_223474_3_.func_200571_a(this.field_200435_c::func_177774_c);
+          Path path = this.func_200431_a(p_223474_2_);
+         if (path == null) return; //Forge: Allow running this data provider without writing it. Recipe provider needs valid tags.
+ 
+          try {
+             String s = field_200437_e.toJson((JsonElement)jsonobject);
@@ -14,14 +14,14 @@
 -               for(SheepEntity sheepentity : world.func_217357_a(SheepEntity.class, new AxisAlignedBB(blockpos))) {
 -                  if (sheepentity.func_70089_S() && !sheepentity.func_70892_o() && !sheepentity.func_70631_g_()) {
 -                     sheepentity.func_213612_dV();
-+               for(net.minecraft.entity.Entity entity : world.func_175674_a(null, new AxisAlignedBB(blockpos), e -> !e.func_175149_v() && e instanceof net.minecraftforge.common.IShearable)) {
+               for(net.minecraft.entity.Entity entity : world.func_175674_a((net.minecraft.entity.Entity)null, new AxisAlignedBB(blockpos), e -> !e.func_175149_v() && e instanceof net.minecraftforge.common.IShearable)) {
 +                  net.minecraftforge.common.IShearable target = (net.minecraftforge.common.IShearable)entity;
 +                  if (target.isShearable(p_82487_2_, world, blockpos)) {
 +                     java.util.List<ItemStack> drops = target.onSheared(p_82487_2_, entity.field_70170_p, blockpos,
 +                             net.minecraft.enchantment.EnchantmentHelper.func_77506_a(net.minecraft.enchantment.Enchantments.field_185308_t, p_82487_2_));
 +                     java.util.Random rand = new java.util.Random();
 +                     drops.forEach(d -> {
-+                        net.minecraft.entity.item.ItemEntity ent = entity.func_70099_a(p_82487_2_, 1.0F);
+                        net.minecraft.entity.item.ItemEntity ent = entity.func_70099_a(d, 1.0F);
 +                        ent.func_213317_d(ent.func_213322_ci().func_72441_c((double)((rand.nextFloat() - rand.nextFloat()) * 0.1F), (double)(rand.nextFloat() * 0.05F), (double)((rand.nextFloat() - rand.nextFloat()) * 0.1F)));
 +                     });
                      if (p_82487_2_.func_96631_a(1, world.field_73012_v, (ServerPlayerEntity)null)) {
@@ -64,7 +64,7 @@
       float f = this.field_213325_aI.field_220315_a / 2.0F;
       float f1 = this.field_213325_aI.field_220316_b;
       this.func_174826_a(new AxisAlignedBB(p_70107_1_ - (double)f, p_70107_3_, p_70107_5_ - (double)f, p_70107_1_ + (double)f, p_70107_3_ + (double)f1, p_70107_5_ + (double)f));
-@@ -496,7 +508,7 @@
+@@ -496,11 +508,11 @@
          int k = MathHelper.func_76128_c(this.field_70161_v);
          BlockPos blockpos = new BlockPos(i, j, k);
          BlockState blockstate = this.field_70170_p.func_180495_p(blockpos);
@@ -73,6 +73,11 @@
             BlockPos blockpos1 = blockpos.func_177977_b();
             BlockState blockstate1 = this.field_70170_p.func_180495_p(blockpos1);
             Block block = blockstate1.func_177230_c();
+-            if (block.func_203417_a(BlockTags.field_219748_G) || block.func_203417_a(BlockTags.field_219757_z) || block instanceof FenceGateBlock) {
+            if (blockstate.collisionExtendsVertically(this.field_70170_p, blockpos, this)) {
+                blockstate = blockstate1;
+                blockpos = blockpos1;
+             }
@@ -535,7 +547,7 @@
 
             this.field_70140_Q = (float)((double)this.field_70140_Q + (double)MathHelper.func_76133_a(func_213296_b(vec3d)) * 0.6D);
@@ -108,14 +113,18 @@
          this.func_184185_a(soundtype.func_185844_d(), soundtype.func_185843_a() * 0.15F, soundtype.func_185847_b());
       }
    }
-@@ -1040,6 +1053,7 @@
+@@ -1040,9 +1053,10 @@
       int k = MathHelper.func_76128_c(this.field_70161_v);
       BlockPos blockpos = new BlockPos(i, j, k);
       BlockState blockstate = this.field_70170_p.func_180495_p(blockpos);
 +      if (!blockstate.addRunningEffects(field_70170_p, blockpos, this))
       if (blockstate.func_185901_i() != BlockRenderType.INVISIBLE) {
          Vec3d vec3d = this.func_213322_ci();
-          this.field_70170_p.func_195594_a(new BlockParticleData(ParticleTypes.field_197611_d, blockstate), this.field_70165_t + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.field_213325_aI.field_220315_a, this.field_70163_u + 0.1D, this.field_70161_v + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.field_213325_aI.field_220315_a, vec3d.field_72450_a * -4.0D, 1.5D, vec3d.field_72449_c * -4.0D);
+-         this.field_70170_p.func_195594_a(new BlockParticleData(ParticleTypes.field_197611_d, blockstate), this.field_70165_t + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.field_213325_aI.field_220315_a, this.field_70163_u + 0.1D, this.field_70161_v + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.field_213325_aI.field_220315_a, vec3d.field_72450_a * -4.0D, 1.5D, vec3d.field_72449_c * -4.0D);
+         this.field_70170_p.func_195594_a(new BlockParticleData(ParticleTypes.field_197611_d, blockstate).setPos(blockpos), this.field_70165_t + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.field_213325_aI.field_220315_a, this.field_70163_u + 0.1D, this.field_70161_v + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.field_213325_aI.field_220315_a, vec3d.field_72450_a * -4.0D, 1.5D, vec3d.field_72449_c * -4.0D);
+       }
+ 
+    }
@@ -1061,7 +1075,7 @@
             return false;
          } else {
@@ -129,7 +138,7 @@
          this.field_70126_B -= 360.0F;
       }
 
-+      if (!this.field_70170_p.field_72995_K) this.field_70170_p.func_212866_a_((int) Math.floor(this.field_70165_t) >> 4, (int) Math.floor(this.field_70161_v) >> 4); // Forge - ensure target chunk is loaded.
+      if (!this.field_70170_p.field_72995_K && this.func_70089_S()) this.field_70170_p.func_212866_a_((int) Math.floor(this.field_70165_t) >> 4, (int) Math.floor(this.field_70161_v) >> 4); // Forge - ensure target chunk is loaded.
       this.func_70107_b(this.field_70165_t, this.field_70163_u, this.field_70161_v);
       this.func_70101_b(p_70080_7_, p_70080_8_);
    }
@@ -147,7 +156,7 @@
 
 +         CompoundNBT caps = serializeCaps();
 +         if (caps != null) p_189511_1_.func_218657_a("ForgeCaps", caps);
-+         if (entityData != null) p_189511_1_.func_218657_a("ForgeData", entityData);
+         if (persistentData != null) p_189511_1_.func_218657_a("ForgeData", persistentData);
 +
          this.func_213281_b(p_189511_1_);
          if (this.func_184207_aI()) {
@@ -156,7 +165,7 @@
                this.func_174810_b(p_70020_1_.func_74767_n("Silent"));
                this.func_189654_d(p_70020_1_.func_74767_n("NoGravity"));
                this.func_184195_f(p_70020_1_.func_74767_n("Glowing"));
-+               if (p_70020_1_.func_150297_b("ForgeData", 10)) entityData = p_70020_1_.func_74775_l("ForgeData");
+               if (p_70020_1_.func_150297_b("ForgeData", 10)) persistentData = p_70020_1_.func_74775_l("ForgeData");
 +               if (p_70020_1_.func_150297_b("CanUpdate", 99)) this.canUpdate(p_70020_1_.func_74767_n("CanUpdate"));
 +               if (p_70020_1_.func_150297_b("ForgeCaps", 10)) deserializeCaps(p_70020_1_.func_74775_l("ForgeCaps"));
                if (p_70020_1_.func_150297_b("Tags", 9)) {
@@ -240,15 +249,29 @@
 
             double d3 = Math.min(-2.9999872E7D, serverworld1.func_175723_af().func_177726_b() + 16.0D);
             double d4 = Math.min(-2.9999872E7D, serverworld1.func_175723_af().func_177736_c() + 16.0D);
-@@ -2118,7 +2141,6 @@
+@@ -2118,7 +2141,7 @@
             serverworld1.func_217460_e(entity);
          }
 
 -         this.field_70128_L = true;
+         this.remove(false);
          this.field_70170_p.func_217381_Z().func_76319_b();
          serverworld.func_82742_i();
          serverworld1.func_82742_i();
-@@ -2274,7 +2296,7 @@
+@@ -2146,10 +2169,12 @@
+    }
+ 
+    public Vec3d func_181014_aG() {
+      if (this.field_181017_ao == null) return Vec3d.field_186680_a;
+       return this.field_181017_ao;
+    }
+ 
+    public Direction func_181012_aH() {
+      if (this.field_181018_ap == null) return Direction.NORTH;
+       return this.field_181018_ap;
+    }
+ 
+@@ -2274,7 +2299,7 @@
       Pose pose = this.func_213283_Z();
       EntitySize entitysize1 = this.func_213305_a(pose);
       this.field_213325_aI = entitysize1;
@@ -257,7 +280,7 @@
       if (entitysize1.field_220315_a < entitysize.field_220315_a) {
          double d0 = (double)entitysize1.field_220315_a / 2.0D;
          this.func_174826_a(new AxisAlignedBB(this.field_70165_t - d0, this.field_70163_u, this.field_70161_v - d0, this.field_70165_t + d0, this.field_70163_u + (double)entitysize1.field_220316_b, this.field_70161_v + d0));
-@@ -2641,6 +2663,7 @@
+@@ -2641,6 +2666,7 @@
       return this.field_211517_W;
    }
 
@@ -265,7 +288,7 @@
    public final float func_213311_cf() {
       return this.field_213325_aI.field_220315_a;
    }
-@@ -2670,4 +2693,69 @@
+@@ -2670,4 +2696,69 @@
    public void func_213293_j(double p_213293_1_, double p_213293_3_, double p_213293_5_) {
       this.func_213317_d(new Vec3d(p_213293_1_, p_213293_3_, p_213293_5_));
    }
@@ -292,12 +315,12 @@
 +      this.captureDrops = value;
 +      return ret;
 +   }
-+   private CompoundNBT entityData;
+   private CompoundNBT persistentData;
 +   @Override
-+   public CompoundNBT getEntityData() {
-+      if (entityData == null)
-+         entityData = new CompoundNBT();
-+      return entityData;
+   public CompoundNBT getPersistentData() {
+      if (persistentData == null)
+         persistentData = new CompoundNBT();
+      return persistentData;
 +   }
 +   @Override
 +   public boolean canTrample(BlockState state, BlockPos pos, float fallDistance) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/EntityType.java
 +++ b/net/minecraft/entity/EntityType.java
-@@ -135,7 +135,7 @@
+@@ -134,7 +134,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -9,8 +9,8 @@
    private static final Logger field_200731_aJ = LogManager.getLogger();
    public static final EntityType<AreaEffectCloudEntity> field_200788_b = func_200712_a("area_effect_cloud", EntityType.Builder.<AreaEffectCloudEntity>func_220322_a(AreaEffectCloudEntity::new, EntityClassification.MISC).func_220320_c().func_220321_a(6.0F, 0.5F));
    public static final EntityType<ArmorStandEntity> field_200789_c = func_200712_a("armor_stand", EntityType.Builder.<ArmorStandEntity>func_220322_a(ArmorStandEntity::new, EntityClassification.MISC).func_220321_a(0.5F, 1.975F));
-@@ -254,6 +254,12 @@
-    private final Type<?> field_206832_aX;
+@@ -252,6 +252,12 @@
+    private ResourceLocation field_220358_bg;
    private final EntitySize field_220359_bi;
 
 +   private final java.util.function.Predicate<EntityType<?>> velocityUpdateSupplier;
@@ -22,19 +22,19 @@
    private static <T extends Entity> EntityType<T> func_200712_a(String p_200712_0_, EntityType.Builder<T> p_200712_1_) {
       return Registry.func_218325_a(Registry.field_212629_r, p_200712_0_, p_200712_1_.func_206830_a(p_200712_0_));
    }
-@@ -266,7 +272,7 @@
+@@ -264,7 +270,7 @@
       return Registry.field_212629_r.func_218349_b(ResourceLocation.func_208304_a(p_220327_0_));
    }
 
-   public EntityType(EntityType.IFactory<T> p_i50385_1_, EntityClassification p_i50385_2_, boolean p_i50385_3_, boolean p_i50385_4_, boolean p_i50385_5_, @Nullable Type<?> p_i50385_6_, EntitySize p_i50385_7_) {
-+   public EntityType(IFactory<T> p_i50385_1_, EntityClassification p_i50385_2_, boolean p_i50385_3_, boolean p_i50385_4_, boolean p_i50385_5_, @Nullable Type<?> p_i50385_6_, EntitySize p_i50385_7_, final java.util.function.Predicate<EntityType<?>> velocityUpdateSupplier, final java.util.function.ToIntFunction<EntityType<?>> trackingRangeSupplier, final java.util.function.ToIntFunction<EntityType<?>> updateIntervalSupplier, final java.util.function.BiFunction<net.minecraftforge.fml.network.FMLPlayMessages.SpawnEntity, World, T> customClientFactory) {
-       this.field_200732_aK = p_i50385_1_;
-       this.field_220355_ba = p_i50385_2_;
-       this.field_200733_aL = p_i50385_3_;
-@@ -274,6 +280,10 @@
-       this.field_220357_bd = p_i50385_5_;
-       this.field_206832_aX = p_i50385_6_;
-       this.field_220359_bi = p_i50385_7_;
+-   public EntityType(EntityType.IFactory<T> p_i51559_1_, EntityClassification p_i51559_2_, boolean p_i51559_3_, boolean p_i51559_4_, boolean p_i51559_5_, boolean p_i51559_6_, EntitySize p_i51559_7_) {
+   public EntityType(EntityType.IFactory<T> p_i51559_1_, EntityClassification p_i51559_2_, boolean p_i51559_3_, boolean p_i51559_4_, boolean p_i51559_5_, boolean p_i51559_6_, EntitySize p_i51559_7_, final java.util.function.Predicate<EntityType<?>> velocityUpdateSupplier, final java.util.function.ToIntFunction<EntityType<?>> trackingRangeSupplier, final java.util.function.ToIntFunction<EntityType<?>> updateIntervalSupplier, final java.util.function.BiFunction<net.minecraftforge.fml.network.FMLPlayMessages.SpawnEntity, World, T> customClientFactory) {
+       this.field_200732_aK = p_i51559_1_;
+       this.field_220355_ba = p_i51559_2_;
+       this.field_225438_be = p_i51559_6_;
+@@ -272,6 +278,10 @@
+       this.field_200734_aM = p_i51559_4_;
+       this.field_220357_bd = p_i51559_5_;
+       this.field_220359_bi = p_i51559_7_;
 +      this.velocityUpdateSupplier = velocityUpdateSupplier;
 +      this.trackingRangeSupplier = trackingRangeSupplier;
 +      this.updateIntervalSupplier = updateIntervalSupplier;
@@ -42,15 +42,15 @@
    }
 
    @Nullable
-@@ -284,6 +294,7 @@
+@@ -282,6 +292,7 @@
    @Nullable
    public T func_220342_a(World p_220342_1_, @Nullable CompoundNBT p_220342_2_, @Nullable ITextComponent p_220342_3_, @Nullable PlayerEntity p_220342_4_, BlockPos p_220342_5_, SpawnReason p_220342_6_, boolean p_220342_7_, boolean p_220342_8_) {
       T t = this.func_220349_b(p_220342_1_, p_220342_2_, p_220342_3_, p_220342_4_, p_220342_5_, p_220342_6_, p_220342_7_, p_220342_8_);
-+      if (t instanceof net.minecraft.entity.MobEntity && net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn((net.minecraft.entity.MobEntity) t, p_220342_1_, p_220342_5_.func_177958_n(), p_220342_5_.func_177956_o(), p_220342_5_.func_177952_p(), null)) return null;
+      if (t instanceof net.minecraft.entity.MobEntity && net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn((net.minecraft.entity.MobEntity) t, p_220342_1_, p_220342_5_.func_177958_n(), p_220342_5_.func_177956_o(), p_220342_5_.func_177952_p(), null, p_220342_6_)) return null;
       p_220342_1_.func_217376_c(t);
       return t;
    }
-@@ -462,6 +473,9 @@
+@@ -464,6 +475,9 @@
    }
 
    public int func_220345_k() {
@@ -60,7 +60,7 @@
       if (this == field_200729_aH) {
          return 32;
       } else if (this == field_200801_o) {
-@@ -474,6 +488,9 @@
+@@ -476,6 +490,9 @@
    }
 
    public int func_220332_l() {
@@ -70,7 +70,7 @@
       if (this != field_200729_aH && this != field_200805_s) {
          if (this == field_200808_v) {
             return 4;
-@@ -494,6 +511,9 @@
+@@ -496,6 +513,9 @@
    }
 
    public boolean func_220340_m() {
@@ -80,7 +80,7 @@
       return this != field_200729_aH && this != field_200770_J && this != field_200760_az && this != field_200791_e && this != field_200766_F && this != field_200768_H && this != field_200782_V && this != field_200801_o && this != field_200805_s;
    }
 
-@@ -501,12 +521,30 @@
+@@ -503,12 +523,30 @@
       return p_220341_1_.func_199685_a_(this);
    }
 
@@ -108,10 +108,10 @@
 +      private java.util.function.ToIntFunction<EntityType<?>> updateIntervalSupplier = EntityType::defaultUpdateIntervalSupplier;
 +      private java.util.function.BiFunction<net.minecraftforge.fml.network.FMLPlayMessages.SpawnEntity, World, T> customClientFactory;
 +
+       private boolean field_225436_f;
       private EntitySize field_220326_f = EntitySize.func_220314_b(0.6F, 1.8F);
 
-       private Builder(EntityType.IFactory<T> p_i50479_1_, EntityClassification p_i50479_2_) {
-@@ -544,12 +582,32 @@
+@@ -553,11 +591,31 @@
          return this;
       }
 
@@ -136,21 +136,20 @@
 +      }
 +
       public EntityType<T> func_206830_a(String p_206830_1_) {
-          Type<?> type = null;
          if (this.field_200710_b) {
             try {
-                type = DataFixesManager.func_210901_a().getSchema(DataFixUtils.makeKey(SharedConstants.func_215069_a().getWorldVersion())).getChoiceType(TypeReferences.field_211298_n, p_206830_1_);
+                DataFixesManager.func_210901_a().getSchema(DataFixUtils.makeKey(SharedConstants.func_215069_a().getWorldVersion())).getChoiceType(TypeReferences.field_211298_n, p_206830_1_);
 -            } catch (IllegalStateException illegalstateexception) {
-+            } catch (IllegalArgumentException illegalstateexception) {
+            } catch (IllegalArgumentException illegalstateexception) { // Forge: fix catching wrong exception
                if (SharedConstants.field_206244_b) {
                   throw illegalstateexception;
                }
-@@ -558,7 +616,7 @@
+@@ -566,7 +624,7 @@
             }
          }
 
-         return new EntityType<>(this.field_200709_a, this.field_220324_b, this.field_200710_b, this.field_200711_c, this.field_220325_e, type, this.field_220326_f);
-+         return new EntityType<>(this.field_200709_a, this.field_220324_b, this.field_200710_b, this.field_200711_c, this.field_220325_e, type, this.field_220326_f, velocityUpdateSupplier, trackingRangeSupplier, updateIntervalSupplier, customClientFactory);
+-         return new EntityType<>(this.field_200709_a, this.field_220324_b, this.field_200710_b, this.field_200711_c, this.field_220325_e, this.field_225436_f, this.field_220326_f);
+         return new EntityType<>(this.field_200709_a, this.field_220324_b, this.field_200710_b, this.field_200711_c, this.field_220325_e, this.field_225436_f, this.field_220326_f, velocityUpdateSupplier, trackingRangeSupplier, updateIntervalSupplier, customClientFactory);
       }
    }
 
@@ -1,24 +1,29 @@
 --- a/net/minecraft/entity/LivingEntity.java
 +++ b/net/minecraft/entity/LivingEntity.java
-@@ -105,6 +105,8 @@
+@@ -104,7 +104,12 @@
+ 
 public abstract class LivingEntity extends Entity {
    private static final UUID field_110156_b = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
+   private static final UUID SLOW_FALLING_ID = UUID.fromString("A5B6CF2A-2F7C-31EF-9022-7C3E7D5E6ABA");
    private static final AttributeModifier field_110157_c = (new AttributeModifier(field_110156_b, "Sprinting speed boost", (double)0.3F, AttributeModifier.Operation.MULTIPLY_TOTAL)).func_111168_a(false);
+   private static final AttributeModifier SLOW_FALLING = new AttributeModifier(SLOW_FALLING_ID, "Slow falling acceleration reduction", -0.07, AttributeModifier.Operation.ADDITION).func_111168_a(false); // Add -0.07 to 0.08 so we get the vanilla default of 0.01
 +   public static final net.minecraft.entity.ai.attributes.IAttribute SWIM_SPEED = new net.minecraft.entity.ai.attributes.RangedAttribute(null, "forge.swimSpeed", 1.0D, 0.0D, 1024.0D).func_111112_a(true);
 +   public static final net.minecraft.entity.ai.attributes.IAttribute NAMETAG_DISTANCE = new net.minecraft.entity.ai.attributes.RangedAttribute(null, "forge.nameTagDistance", 64.0D, 0.0D, Float.MAX_VALUE).func_111112_a(true);
+   public static final net.minecraft.entity.ai.attributes.IAttribute ENTITY_GRAVITY = new net.minecraft.entity.ai.attributes.RangedAttribute(null, "forge.entity_gravity", 0.08D, -8.0D, 8.0D).func_111112_a(true);
    protected static final DataParameter<Byte> field_184621_as = EntityDataManager.func_187226_a(LivingEntity.class, DataSerializers.field_187191_a);
    private static final DataParameter<Float> field_184632_c = EntityDataManager.func_187226_a(LivingEntity.class, DataSerializers.field_187193_c);
    private static final DataParameter<Integer> field_184633_f = EntityDataManager.func_187226_a(LivingEntity.class, DataSerializers.field_187192_b);
-@@ -228,6 +230,8 @@
+@@ -228,6 +233,9 @@
       this.func_110140_aT().func_111150_b(SharedMonsterAttributes.field_111263_d);
       this.func_110140_aT().func_111150_b(SharedMonsterAttributes.field_188791_g);
       this.func_110140_aT().func_111150_b(SharedMonsterAttributes.field_189429_h);
 +      this.func_110140_aT().func_111150_b(SWIM_SPEED);
 +      this.func_110140_aT().func_111150_b(NAMETAG_DISTANCE);
+      this.func_110140_aT().func_111150_b(ENTITY_GRAVITY);
    }
 
    protected void func_184231_a(double p_184231_1_, boolean p_184231_3_, BlockState p_184231_4_, BlockPos p_184231_5_) {
-@@ -237,9 +241,10 @@
+@@ -237,9 +245,10 @@
 
       if (!this.field_70170_p.field_72995_K && this.field_70143_R > 3.0F && p_184231_3_) {
          float f = (float)MathHelper.func_76123_f(this.field_70143_R - 3.0F);
@@ -30,7 +35,7 @@
             ((ServerWorld)this.field_70170_p).func_195598_a(new BlockParticleData(ParticleTypes.field_197611_d, p_184231_4_), this.field_70165_t, this.field_70163_u, this.field_70161_v, i, 0.0D, 0.0D, 0.0D, (double)0.15F);
          }
       }
-@@ -303,7 +308,7 @@
+@@ -303,7 +312,7 @@
                }
             }
 
@@ -39,7 +44,7 @@
                this.func_184210_p();
             }
          } else if (this.func_70086_ai() < this.func_205010_bg()) {
-@@ -388,6 +393,7 @@
+@@ -388,6 +397,7 @@
          if (!this.field_70170_p.field_72995_K && (this.func_70684_aJ() || this.field_70718_bc > 0 && this.func_146066_aG() && this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223602_e))) {
             int i = this.func_70693_a(this.field_70717_bb);
 
@@ -47,7 +52,16 @@
             while(i > 0) {
                int j = ExperienceOrbEntity.func_70527_a(i);
                i -= j;
-@@ -590,7 +596,7 @@
+@@ -395,7 +405,7 @@
+             }
+          }
+ 
+-         this.func_70106_y();
+         this.remove(this instanceof net.minecraft.entity.player.ServerPlayerEntity); //Forge keep data until we revive player
+ 
+          for(int k = 0; k < 20; ++k) {
+             double d2 = this.field_70146_Z.nextGaussian() * 0.02D;
+@@ -590,7 +600,7 @@
             Effect effect = iterator.next();
             EffectInstance effectinstance = this.field_70713_bf.get(effect);
             if (!effectinstance.func_76455_a(this)) {
@@ -56,7 +70,7 @@
                   iterator.remove();
                   this.func_70688_c(effectinstance);
                }
-@@ -640,8 +646,10 @@
+@@ -640,8 +650,10 @@
          this.func_82142_c(false);
       } else {
          Collection<EffectInstance> collection = this.field_70713_bf.values();
@@ -69,7 +83,7 @@
          this.func_82142_c(this.func_70644_a(Effects.field_76441_p));
       }
 
-@@ -705,7 +713,10 @@
+@@ -705,7 +717,10 @@
 
          boolean flag;
          for(flag = false; iterator.hasNext(); flag = true) {
@@ -81,7 +95,7 @@
             iterator.remove();
          }
 
-@@ -735,6 +746,7 @@
+@@ -735,6 +750,7 @@
          return false;
       } else {
          EffectInstance effectinstance = this.field_70713_bf.get(p_195064_1_.func_188419_a());
@@ -89,7 +103,7 @@
          if (effectinstance == null) {
             this.field_70713_bf.put(p_195064_1_.func_188419_a(), p_195064_1_);
             this.func_70670_a(p_195064_1_);
-@@ -749,6 +761,9 @@
+@@ -749,6 +765,9 @@
    }
 
    public boolean func_70687_e(EffectInstance p_70687_1_) {
@@ -99,7 +113,7 @@
       if (this.func_70668_bt() == CreatureAttribute.field_223223_b_) {
          Effect effect = p_70687_1_.func_188419_a();
          if (effect == Effects.field_76428_l || effect == Effects.field_76436_u) {
-@@ -769,6 +784,7 @@
+@@ -769,6 +788,7 @@
    }
 
    public boolean func_195063_d(Effect p_195063_1_) {
@@ -107,7 +121,7 @@
       EffectInstance effectinstance = this.func_184596_c(p_195063_1_);
       if (effectinstance != null) {
          this.func_70688_c(effectinstance);
-@@ -805,6 +821,8 @@
+@@ -805,6 +825,8 @@
    }
 
    public void func_70691_i(float p_70691_1_) {
@@ -116,7 +130,7 @@
       float f = this.func_110143_aJ();
       if (f > 0.0F) {
          this.func_70606_j(f + p_70691_1_);
-@@ -821,6 +839,7 @@
+@@ -821,6 +843,7 @@
    }
 
    public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) {
@@ -124,7 +138,7 @@
       if (this.func_180431_b(p_70097_1_)) {
          return false;
       } else if (this.field_70170_p.field_72995_K) {
-@@ -887,8 +906,8 @@
+@@ -887,8 +910,8 @@
             if (entity1 instanceof PlayerEntity) {
                this.field_70718_bc = 100;
                this.field_70717_bb = (PlayerEntity)entity1;
@@ -135,7 +149,7 @@
                if (wolfentity.func_70909_n()) {
                   this.field_70718_bc = 100;
                   LivingEntity livingentity = wolfentity.func_70902_q();
-@@ -1070,6 +1089,7 @@
+@@ -1070,6 +1093,7 @@
    }
 
    public void func_70645_a(DamageSource p_70645_1_) {
@@ -143,7 +157,7 @@
       if (!this.field_70729_aU) {
          Entity entity = p_70645_1_.func_76346_g();
          LivingEntity livingentity = this.func_94060_bK();
-@@ -1091,7 +1111,7 @@
+@@ -1091,7 +1115,7 @@
             this.func_213345_d(p_70645_1_);
             boolean flag = false;
             if (livingentity instanceof WitherEntity) {
@@ -152,7 +166,7 @@
                   BlockPos blockpos = new BlockPos(this.field_70165_t, this.field_70163_u, this.field_70161_v);
                   BlockState blockstate = Blocks.field_222388_bz.func_176223_P();
                   if (this.field_70170_p.func_180495_p(blockpos).func_196958_f() && blockstate.func_196955_c(this.field_70170_p, blockpos)) {
-@@ -1114,13 +1134,10 @@
+@@ -1114,13 +1138,10 @@
 
    protected void func_213345_d(DamageSource p_213345_1_) {
       Entity entity = p_213345_1_.func_76346_g();
@@ -169,7 +183,7 @@
       boolean flag = this.field_70718_bc > 0;
       if (this.func_146066_aG() && this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223602_e)) {
          this.func_213354_a(p_213345_1_, flag);
-@@ -1128,6 +1145,10 @@
+@@ -1128,6 +1149,10 @@
       }
 
       this.func_213337_cE();
@@ -180,7 +194,7 @@
    }
 
    protected void func_213337_cE() {
-@@ -1157,6 +1178,9 @@
+@@ -1157,6 +1182,9 @@
    }
 
    public void func_70653_a(Entity p_70653_1_, float p_70653_2_, double p_70653_3_, double p_70653_5_) {
@@ -190,7 +204,7 @@
       if (!(this.field_70146_Z.nextDouble() < this.func_110148_a(SharedMonsterAttributes.field_111266_c).func_111126_e())) {
          this.field_70160_al = true;
          Vec3d vec3d = this.func_213322_ci();
-@@ -1192,12 +1216,7 @@
+@@ -1192,12 +1220,7 @@
          return false;
       } else {
          BlockState blockstate = this.func_213339_cH();
@@ -204,7 +218,7 @@
       }
    }
 
-@@ -1221,6 +1240,9 @@
+@@ -1221,6 +1244,9 @@
    }
 
    public void func_180430_e(float p_180430_1_, float p_180430_2_) {
@@ -214,7 +228,7 @@
       super.func_180430_e(p_180430_1_, p_180430_2_);
       EffectInstance effectinstance = this.func_70660_b(Effects.field_76430_j);
       float f = effectinstance == null ? 0.0F : (float)(effectinstance.func_76458_c() + 1);
-@@ -1233,7 +1255,7 @@
+@@ -1233,7 +1259,7 @@
          int l = MathHelper.func_76128_c(this.field_70161_v);
          BlockState blockstate = this.field_70170_p.func_180495_p(new BlockPos(j, k, l));
          if (!blockstate.func_196958_f()) {
@@ -223,7 +237,7 @@
             this.func_184185_a(soundtype.func_185842_g(), soundtype.func_185843_a() * 0.5F, soundtype.func_185847_b() * 0.75F);
          }
       }
-@@ -1302,6 +1324,8 @@
+@@ -1302,6 +1328,8 @@
 
    protected void func_70665_d(DamageSource p_70665_1_, float p_70665_2_) {
       if (!this.func_180431_b(p_70665_1_)) {
@@ -232,7 +246,7 @@
          p_70665_2_ = this.func_70655_b(p_70665_1_, p_70665_2_);
          p_70665_2_ = this.func_70672_c(p_70665_1_, p_70665_2_);
          float f = p_70665_2_;
-@@ -1312,10 +1336,11 @@
+@@ -1312,10 +1340,11 @@
             ((ServerPlayerEntity)p_70665_1_.func_76346_g()).func_195067_a(Stats.field_212735_F, Math.round(f1 * 10.0F));
          }
 
@@ -245,7 +259,7 @@
             this.func_110149_m(this.func_110139_bj() - p_70665_2_);
          }
       }
-@@ -1357,6 +1382,8 @@
+@@ -1357,6 +1386,8 @@
    }
 
    public void func_184609_a(Hand p_184609_1_) {
@@ -254,7 +268,7 @@
       if (!this.field_82175_bq || this.field_110158_av >= this.func_82166_i() / 2 || this.field_110158_av < 0) {
          this.field_110158_av = -1;
          this.field_82175_bq = true;
-@@ -1715,15 +1742,16 @@
+@@ -1715,15 +1746,16 @@
       }
 
       this.field_70160_al = true;
@@ -273,7 +287,24 @@
    }
 
    protected float func_189749_co() {
-@@ -1786,7 +1814,7 @@
+@@ -1733,11 +1765,15 @@
+    public void func_213352_e(Vec3d p_213352_1_) {
+       if (this.func_70613_aW() || this.func_184186_bw()) {
+          double d0 = 0.08D;
+         IAttributeInstance gravity = this.func_110148_a(ENTITY_GRAVITY);
+          boolean flag = this.func_213322_ci().field_72448_b <= 0.0D;
+          if (flag && this.func_70644_a(Effects.field_204839_B)) {
+-            d0 = 0.01D;
+            if (!gravity.func_180374_a(SLOW_FALLING)) gravity.func_111121_a(SLOW_FALLING);
+             this.field_70143_R = 0.0F;
+         } else if (gravity.func_180374_a(SLOW_FALLING)) {
+            gravity.func_111124_b(SLOW_FALLING);
+          }
+         d0 = gravity.func_111126_e();
+ 
+          if (!this.func_70090_H() || this instanceof PlayerEntity && ((PlayerEntity)this).field_71075_bZ.field_75100_b) {
+             if (!this.func_180799_ab() || this instanceof PlayerEntity && ((PlayerEntity)this).field_71075_bZ.field_75100_b) {
+@@ -1786,7 +1822,7 @@
                   }
                } else {
                   BlockPos blockpos = new BlockPos(this.field_70165_t, this.func_174813_aQ().field_72338_b - 1.0D, this.field_70161_v);
@@ -282,7 +313,7 @@
                   float f7 = this.field_70122_E ? f5 * 0.91F : 0.91F;
                   this.func_213309_a(this.func_213335_r(f5), p_213352_1_);
                   this.func_213317_d(this.func_213362_f(this.func_213322_ci()));
-@@ -1848,6 +1876,7 @@
+@@ -1848,6 +1884,7 @@
                f = 0.96F;
             }
 
@@ -290,7 +321,7 @@
             this.func_213309_a(f1, p_213352_1_);
             this.func_213315_a(MoverType.SELF, this.func_213322_ci());
             Vec3d vec3d1 = this.func_213322_ci();
-@@ -1923,6 +1952,7 @@
+@@ -1923,6 +1960,7 @@
    }
 
    public void func_70071_h_() {
@@ -298,7 +329,7 @@
       super.func_70071_h_();
       this.func_184608_ct();
       this.func_205014_p();
-@@ -1954,7 +1984,9 @@
+@@ -1954,7 +1992,9 @@
 
             ItemStack itemstack1 = this.func_184582_a(equipmentslottype);
             if (!ItemStack.func_77989_b(itemstack1, itemstack)) {
@@ -308,11 +339,11 @@
                if (!itemstack.func_190926_b()) {
                   this.func_110140_aT().func_111148_a(itemstack.func_111283_C(equipmentslottype));
                }
-@@ -2403,13 +2435,22 @@
+@@ -2403,13 +2443,22 @@
 
-    protected void func_184608_ct() {
+    private void func_184608_ct() {
       if (this.func_184587_cr()) {
-         if (this.func_184586_b(this.func_184600_cs()) == this.field_184627_bm) {
+-         if (ItemStack.func_185132_d(this.func_184586_b(this.func_184600_cs()), this.field_184627_bm)) {
 +         ItemStack itemstack = this.func_184586_b(this.func_184600_cs());
 +         if (net.minecraftforge.common.ForgeHooks.canContinueUsing(this.field_184627_bm, itemstack)) this.field_184627_bm = itemstack;
 +         if (itemstack == this.field_184627_bm) {
@@ -333,7 +364,7 @@
                this.func_71036_o();
             }
          } else {
-@@ -2443,8 +2484,10 @@
+@@ -2443,8 +2492,10 @@
    public void func_184598_c(Hand p_184598_1_) {
       ItemStack itemstack = this.func_184586_b(p_184598_1_);
       if (!itemstack.func_190926_b() && !this.func_184587_cr()) {
@@ -345,7 +376,7 @@
          if (!this.field_70170_p.field_72995_K) {
             this.func_204802_c(1, true);
             this.func_204802_c(2, p_184598_1_ == Hand.OFF_HAND);
-@@ -2504,6 +2547,9 @@
+@@ -2504,6 +2555,9 @@
          vec3d1 = vec3d1.func_178789_a(-this.field_70125_A * ((float)Math.PI / 180F));
          vec3d1 = vec3d1.func_178785_b(-this.field_70177_z * ((float)Math.PI / 180F));
          vec3d1 = vec3d1.func_72441_c(this.field_70165_t, this.field_70163_u + (double)this.func_70047_e(), this.field_70161_v);
@@ -355,7 +386,7 @@
          this.field_70170_p.func_195594_a(new ItemParticleData(ParticleTypes.field_197591_B, p_195062_1_), vec3d1.field_72450_a, vec3d1.field_72448_b, vec3d1.field_72449_c, vec3d.field_72450_a, vec3d.field_72448_b + 0.05D, vec3d.field_72449_c);
       }
 
-@@ -2512,7 +2558,9 @@
+@@ -2512,7 +2566,9 @@
    protected void func_71036_o() {
       if (!this.field_184627_bm.func_190926_b() && this.func_184587_cr()) {
          this.func_184584_a(this.field_184627_bm, 16);
@@ -366,15 +397,19 @@
          this.func_184602_cy();
       }
 
-@@ -2532,6 +2580,7 @@
+@@ -2532,7 +2588,11 @@
 
    public void func_184597_cx() {
       if (!this.field_184627_bm.func_190926_b()) {
-+         if (!net.minecraftforge.event.ForgeEventFactory.onUseItemStop(this, field_184627_bm, this.func_184605_cv()))
+         if (!net.minecraftforge.event.ForgeEventFactory.onUseItemStop(this, field_184627_bm, this.func_184605_cv())) {
+            ItemStack copy = this instanceof PlayerEntity ? field_184627_bm.func_77946_l() : null;
          this.field_184627_bm.func_77974_b(this.field_70170_p, this, this.func_184605_cv());
+           if (copy != null && field_184627_bm.func_190926_b()) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem((PlayerEntity)this, copy, func_184600_cs());
+         }
          if (this.field_184627_bm.func_222122_m()) {
             this.func_184608_ct();
-@@ -2687,16 +2736,16 @@
+          }
+@@ -2687,16 +2747,16 @@
 
    private boolean func_213359_p() {
       return this.func_213374_dv().map((p_213347_1_) -> {
@@ -395,7 +430,7 @@
                BlockPos blockpos = p_213368_1_.func_177984_a();
                return new Vec3d((double)blockpos.func_177958_n() + 0.5D, (double)blockpos.func_177956_o() + 0.1D, (double)blockpos.func_177952_p() + 0.5D);
             });
-@@ -2711,8 +2760,13 @@
+@@ -2711,8 +2771,13 @@
    @Nullable
    @OnlyIn(Dist.CLIENT)
    public Direction func_213376_dz() {
@@ -410,7 +445,7 @@
    }
 
    public boolean func_70094_T() {
-@@ -2779,4 +2833,58 @@
+@@ -2779,4 +2844,58 @@
    public void func_213334_d(Hand p_213334_1_) {
       this.func_213361_c(p_213334_1_ == Hand.MAIN_HAND ? EquipmentSlotType.MAINHAND : EquipmentSlotType.OFFHAND);
    }
@@ -8,15 +8,7 @@
    }
 
    public boolean func_213358_a(EntityType<?> p_213358_1_) {
-@@ -259,7 +260,6 @@
- 
-    }
- 
-   @OnlyIn(Dist.CLIENT)
-    public void func_70103_a(byte p_70103_1_) {
-       if (p_70103_1_ == 20) {
-          this.func_70656_aK();
-@@ -458,7 +458,7 @@
+@@ -458,7 +459,7 @@
    public void func_70636_d() {
       super.func_70636_d();
       this.field_70170_p.func_217381_Z().func_76320_a("looting");
@@ -25,7 +17,7 @@
          for(ItemEntity itementity : this.field_70170_p.func_217357_a(ItemEntity.class, this.func_174813_aQ().func_72314_b(1.0D, 0.0D, 1.0D))) {
             if (!itementity.field_70128_L && !itementity.func_92059_d().func_190926_b() && !itementity.func_174874_s()) {
                this.func_175445_a(itementity);
-@@ -548,6 +548,14 @@
+@@ -548,6 +549,14 @@
    protected void func_70623_bb() {
       if (!this.func_104002_bU() && !this.func_213392_I()) {
          Entity entity = this.field_70170_p.func_217362_a(this, -1.0D);
@@ -40,7 +32,7 @@
          if (entity != null) {
             double d0 = entity.func_70068_e(this);
             if (d0 > 16384.0D && this.func_213397_c(d0)) {
-@@ -786,6 +794,8 @@
+@@ -786,6 +795,8 @@
    }
 
    public static EquipmentSlotType func_184640_d(ItemStack p_184640_0_) {
@@ -49,7 +41,7 @@
       Item item = p_184640_0_.func_77973_b();
       if (item != Blocks.field_196625_cS.func_199767_j() && (!(item instanceof BlockItem) || !(((BlockItem)item).func_179223_d() instanceof AbstractSkullBlock))) {
          if (item instanceof ArmorItem) {
-@@ -793,7 +803,7 @@
+@@ -793,7 +804,7 @@
          } else if (item == Items.field_185160_cR) {
             return EquipmentSlotType.CHEST;
          } else {
@@ -58,7 +50,7 @@
          }
       } else {
          return EquipmentSlotType.HEAD;
-@@ -1173,10 +1183,10 @@
+@@ -1173,10 +1184,10 @@
             PlayerEntity playerentity = (PlayerEntity)p_70652_1_;
             ItemStack itemstack = this.func_184614_ca();
             ItemStack itemstack1 = playerentity.func_184587_cr() ? playerentity.func_184607_cu() : ItemStack.field_190927_a;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/ai/brain/memory/MemoryModuleType.java
 +++ b/net/minecraft/entity/ai/brain/memory/MemoryModuleType.java
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
 import net.minecraft.util.math.IPosWrapper;
 import net.minecraft.util.registry.Registry;
 
@@ -9,7 +9,7 @@
          return false;
       } else if (p_212832_2_.func_213700_eh().func_221130_b() != VillagerProfession.field_221156_f) {
          return false;
-@@ -130,6 +130,11 @@
+@@ -136,6 +136,11 @@
                   } else if (itemstack.func_77973_b() == Items.field_185163_cU) {
                      p_212833_1_.func_180501_a(this.field_220422_a, Blocks.field_185773_cZ.func_176223_P(), 3);
                      flag = true;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/ai/goal/BreakBlockGoal.java
 +++ b/net/minecraft/entity/ai/goal/BreakBlockGoal.java
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
    }
 
    public boolean func_75250_a() {
@@ -15,14 +15,14 @@
          } else {
 +           if (canPenalize) {
 +               if (--this.field_75445_i <= 0) {
-+                  this.field_75438_g = this.field_75441_b.func_70661_as().func_75494_a(livingentity);
+                  this.field_75438_g = this.field_75441_b.func_70661_as().func_75494_a(livingentity, 0);
 +                  this.field_75445_i = 4 + this.field_75441_b.func_70681_au().nextInt(7);
 +                  return this.field_75438_g != null;
 +               } else {
 +                  return true;
 +               }
 +            }
-             this.field_75438_g = this.field_75441_b.func_70661_as().func_75494_a(livingentity);
+             this.field_75438_g = this.field_75441_b.func_70661_as().func_75494_a(livingentity, 0);
             if (this.field_75438_g != null) {
                return true;
@@ -92,6 +103,18 @@
@@ -6,7 +6,7 @@
             ServerPlayerEntity serverplayerentity = (ServerPlayerEntity)livingentity;
 +               net.minecraftforge.event.entity.living.EnderTeleportEvent event = new net.minecraftforge.event.entity.living.EnderTeleportEvent(serverplayerentity, this.field_70165_t, this.field_70163_u, this.field_70161_v, 5.0F);
 +               if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) { // Don't indent to lower patch size
-             if (serverplayerentity.field_71135_a.func_147362_b().func_150724_d() && serverplayerentity.field_70170_p == this.field_70170_p && !serverplayerentity.func_70608_bn()) {
+             if (serverplayerentity.field_71135_a.func_147298_b().func_150724_d() && serverplayerentity.field_70170_p == this.field_70170_p && !serverplayerentity.func_70608_bn()) {
                if (this.field_70146_Z.nextFloat() < 0.05F && this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223601_d)) {
                   EndermiteEntity endermiteentity = EntityType.field_200804_r.func_200721_a(this.field_70170_p);
@@ -96,9 +98,10 @@
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/item/FallingBlockEntity.java
 +++ b/net/minecraft/entity/item/FallingBlockEntity.java
-@@ -153,7 +153,7 @@
+@@ -155,7 +155,7 @@
                               ((FallingBlock)block).func_176502_a_(this.field_70170_p, blockpos1, this.field_175132_d, blockstate);
                            }
 
@@ -4,7 +4,7 @@
       this.field_70165_t = (double)this.field_174861_a.func_177958_n() + 0.5D;
       this.field_70163_u = (double)this.field_174861_a.func_177956_o() + 0.5D;
       this.field_70161_v = (double)this.field_174861_a.func_177952_p() + 0.5D;
-+      if (this.isAddedToWorld() && this.field_70170_p instanceof net.minecraft.world.ServerWorld) ((net.minecraft.world.ServerWorld)this.field_70170_p).func_217464_b(this); // Forge - Process chunk registration after moving.
+      if (this.isAddedToWorld() && this.field_70170_p instanceof net.minecraft.world.server.ServerWorld) ((net.minecraft.world.server.ServerWorld)this.field_70170_p).func_217464_b(this); // Forge - Process chunk registration after moving.
    }
 
    public void func_174859_a(Direction p_174859_1_) {
@@ -226,7 +226,7 @@
 +   @Override public double getDragAir() { return dragAir; }
 +   @Override public void setDragAir(double value) { dragAir = value; }
 +   @Override
-+   public double getMaxSpeed() { //Non-default because getMaximumSpeed is protected
+   public double getMaxSpeedWithRail() { //Non-default because getMaximumSpeed is protected
 +      if (!canUseRail()) return func_174898_m();
 +      BlockPos pos = this.getCurrentRailPosition();
 +      BlockState state = getMinecart().field_70170_p.func_180495_p(pos);
@@ -1,12 +1,10 @@
 --- a/net/minecraft/entity/item/minecart/ContainerMinecartEntity.java
 +++ b/net/minecraft/entity/item/minecart/ContainerMinecartEntity.java
-@@ -116,11 +116,17 @@
+@@ -115,12 +115,14 @@
+       return super.func_212321_a(p_212321_1_);
    }
 
-    public void func_70106_y() {
-+      super.func_70106_y();
-+   }
-+
+-   public void func_70106_y() {
 +   @Override
 +   public void remove(boolean keepData) {
       if (!this.field_70170_p.field_72995_K && this.field_94112_b) {
@@ -19,7 +17,7 @@
    }
 
    protected void func_213281_b(CompoundNBT p_213281_1_) {
-@@ -149,6 +155,7 @@
+@@ -149,6 +151,7 @@
    }
 
    public boolean func_184230_a(PlayerEntity p_184230_1_, Hand p_184230_2_) {
@@ -27,7 +25,7 @@
       p_184230_1_.func_213829_a(this);
       return true;
    }
-@@ -168,6 +175,8 @@
+@@ -168,6 +171,8 @@
          LootTable loottable = this.field_70170_p.func_73046_m().func_200249_aQ().func_186521_a(this.field_184290_c);
          this.field_184290_c = null;
          LootContext.Builder lootcontext$builder = (new LootContext.Builder((ServerWorld)this.field_70170_p)).func_216015_a(LootParameters.field_216286_f, new BlockPos(this)).func_216016_a(this.field_184291_d);
@@ -36,7 +34,7 @@
          if (p_184288_1_ != null) {
             lootcontext$builder.func_186469_a(p_184288_1_.func_184817_da()).func_216015_a(LootParameters.field_216281_a, p_184288_1_);
          }
-@@ -198,4 +207,17 @@
+@@ -198,4 +203,17 @@
    }
 
    protected abstract Container func_213968_a(int p_213968_1_, PlayerInventory p_213968_2_);
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/merchant/villager/VillagerEntity.java
 +++ b/net/minecraft/entity/merchant/villager/VillagerEntity.java
-@@ -227,7 +227,7 @@
+@@ -230,7 +230,7 @@
       if (flag) {
          itemstack.func_111282_a(p_184645_1_, this, p_184645_2_);
          return true;
@@ -9,3 +9,12 @@
          if (this.func_70631_g_()) {
             this.func_213756_es();
             return super.func_184645_a(p_184645_1_, p_184645_2_);
+@@ -611,7 +611,7 @@
+          });
+       } else {
+          VillagerProfession villagerprofession = this.func_213700_eh().func_221130_b();
+-         ITextComponent itextcomponent1 = (new TranslationTextComponent(this.func_200600_R().func_210760_d() + '.' + Registry.field_218370_L.func_177774_c(villagerprofession).func_110623_a())).func_211710_a((p_213773_1_) -> {
+         ITextComponent itextcomponent1 = (new TranslationTextComponent(this.func_200600_R().func_210760_d() + '.' + (!"minecraft".equals(villagerprofession.getRegistryName().func_110624_b()) ? villagerprofession.getRegistryName().func_110624_b() + '.' : "") + villagerprofession.getRegistryName().func_110623_a())).func_211710_a((p_213773_1_) -> {
+             p_213773_1_.func_150209_a(this.func_174823_aP()).func_179989_a(this.func_189512_bd());
+          });
+          if (team != null) {
@@ -1,5 +1,21 @@
 --- a/net/minecraft/entity/monster/EndermanEntity.java
 +++ b/net/minecraft/entity/monster/EndermanEntity.java
+@@ -92,7 +92,6 @@
+    }
+ 
+    public void func_70624_b(@Nullable LivingEntity p_70624_1_) {
+-      super.func_70624_b(p_70624_1_);
+       IAttributeInstance iattributeinstance = this.func_110148_a(SharedMonsterAttributes.field_111263_d);
+       if (p_70624_1_ == null) {
+          this.field_184721_by = 0;
+@@ -106,6 +105,7 @@
+          }
+       }
+ 
+      super.func_70624_b(p_70624_1_); //Forge: Moved down to allow event handlers to write data manager values.
+    }
+ 
+    protected void func_70088_a() {
@@ -226,7 +226,9 @@
       if (!this.field_70170_p.func_180495_p(blockpos$mutableblockpos).func_185904_a().func_76230_c()) {
          return false;
@@ -33,8 +49,8 @@
       }
 
       private boolean func_220836_a(IWorldReader p_220836_1_, BlockPos p_220836_2_, BlockState p_220836_3_, BlockState p_220836_4_, BlockState p_220836_5_, BlockPos p_220836_6_) {
-         return p_220836_4_.func_196958_f() && !p_220836_5_.func_196958_f() && Block.func_208062_a(p_220836_5_.func_196952_d(p_220836_1_, p_220836_6_)) && p_220836_3_.func_196955_c(p_220836_1_, p_220836_2_);
-+         return p_220836_4_.isAir(p_220836_1_, p_220836_2_) && !p_220836_5_.isAir(p_220836_1_, p_220836_6_) && Block.func_208062_a(p_220836_5_.func_196952_d(p_220836_1_, p_220836_6_)) && p_220836_3_.func_196955_c(p_220836_1_, p_220836_2_);
+-         return p_220836_4_.func_196958_f() && !p_220836_5_.func_196958_f() && p_220836_5_.func_224756_o(p_220836_1_, p_220836_6_) && p_220836_3_.func_196955_c(p_220836_1_, p_220836_2_);
+         return p_220836_4_.isAir(p_220836_1_, p_220836_2_) && !p_220836_5_.isAir(p_220836_1_, p_220836_6_) && p_220836_5_.func_224756_o(p_220836_1_, p_220836_6_) && p_220836_3_.func_196955_c(p_220836_1_, p_220836_2_);
       }
    }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/monster/EvokerEntity.java
 +++ b/net/minecraft/entity/monster/EvokerEntity.java
-@@ -287,7 +287,7 @@
+@@ -286,7 +286,7 @@
             return false;
          } else if (EvokerEntity.this.field_70173_aa < this.field_193322_d) {
             return false;
@@ -4,7 +4,7 @@
          this.field_70165_t = (double)blockpos.func_177958_n() + 0.5D;
          this.field_70163_u = (double)blockpos.func_177956_o();
          this.field_70161_v = (double)blockpos.func_177952_p() + 0.5D;
-+         if (this.isAddedToWorld() && this.field_70170_p instanceof net.minecraft.world.ServerWorld) ((net.minecraft.world.ServerWorld)this.field_70170_p).func_217464_b(this); // Forge - Process chunk registration after moving.
+         if (this.isAddedToWorld() && this.field_70170_p instanceof net.minecraft.world.server.ServerWorld) ((net.minecraft.world.server.ServerWorld)this.field_70170_p).func_217464_b(this); // Forge - Process chunk registration after moving.
          this.field_70169_q = this.field_70165_t;
          this.field_70167_r = this.field_70163_u;
          this.field_70166_s = this.field_70161_v;
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/monster/SilverfishEntity.java
 +++ b/net/minecraft/entity/monster/SilverfishEntity.java
-@@ -138,7 +138,7 @@
+@@ -136,7 +136,7 @@
             return false;
          } else {
             Random random = this.field_75457_a.func_70681_au();
@@ -9,7 +9,7 @@
                this.field_179483_b = Direction.func_176741_a(random);
                BlockPos blockpos = (new BlockPos(this.field_75457_a.field_70165_t, this.field_75457_a.field_70163_u + 0.5D, this.field_75457_a.field_70161_v)).func_177972_a(this.field_179483_b);
                BlockState blockstate = this.field_75457_a.field_70170_p.func_180495_p(blockpos);
-@@ -207,7 +207,7 @@
+@@ -205,7 +205,7 @@
                      BlockState blockstate = world.func_180495_p(blockpos1);
                      Block block = blockstate.func_177230_c();
                      if (block instanceof SilverfishBlock) {
@@ -17,7 +17,29 @@
          for(int j = 0; j < i * 8; ++j) {
             float f = this.field_70146_Z.nextFloat() * ((float)Math.PI * 2F);
             float f1 = this.field_70146_Z.nextFloat() * 0.5F + 0.5F;
-@@ -251,7 +252,7 @@
+@@ -170,9 +171,10 @@
+       return (EntityType<? extends SlimeEntity>) super.func_200600_R();
+    }
+ 
+-   public void func_70106_y() {
+   @Override
+   public void remove(boolean keepData) {
+       int i = this.func_70809_q();
+-      if (!this.field_70170_p.field_72995_K && i > 1 && this.func_110143_aJ() <= 0.0F) {
+      if (!this.field_70170_p.field_72995_K && i > 1 && this.func_110143_aJ() <= 0.0F && !this.field_70128_L) {
+          int j = 2 + this.field_70146_Z.nextInt(3);
+ 
+          for(int k = 0; k < j; ++k) {
+@@ -193,7 +195,7 @@
+          }
+       }
+ 
+-      super.func_70106_y();
+      super.remove(keepData);
+    }
+ 
+    public void func_70108_f(Entity p_70108_1_) {
+@@ -251,7 +253,7 @@
    }
 
    public static boolean func_223366_c(EntityType<SlimeEntity> p_223366_0_, IWorld p_223366_1_, SpawnReason p_223366_2_, BlockPos p_223366_3_, Random p_223366_4_) {
@@ -26,7 +48,7 @@
          return false;
       } else {
          if (p_223366_1_.func_175659_aa() != Difficulty.PEACEFUL) {
-@@ -309,6 +310,12 @@
+@@ -309,6 +311,12 @@
       return super.func_213305_a(p_213305_1_).func_220313_a(0.255F * (float)this.func_70809_q());
    }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/monster/ZombieEntity.java
 +++ b/net/minecraft/entity/monster/ZombieEntity.java
-@@ -106,7 +106,7 @@
+@@ -107,7 +107,7 @@
       this.func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a((double)0.23F);
       this.func_110148_a(SharedMonsterAttributes.field_111264_e).func_111128_a(3.0D);
       this.func_110148_a(SharedMonsterAttributes.field_188791_g).func_111128_a(2.0D);
@@ -9,7 +9,7 @@
    }
 
    protected void func_70088_a() {
-@@ -279,12 +279,16 @@
+@@ -281,12 +281,16 @@
             livingentity = (LivingEntity)p_70097_1_.func_76346_g();
          }
 
@@ -28,7 +28,7 @@
             for(int l = 0; l < 50; ++l) {
                int i1 = i + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
                int j1 = j + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
-@@ -294,6 +298,7 @@
+@@ -296,6 +300,7 @@
                   zombieentity.func_70107_b((double)i1, (double)j1, (double)k1);
                   if (!this.field_70170_p.func_217358_a((double)i1, (double)j1, (double)k1, 7.0D) && this.field_70170_p.func_217346_i(zombieentity) && this.field_70170_p.func_217345_j(zombieentity) && !this.field_70170_p.func_72953_d(zombieentity.func_174813_aQ())) {
                      this.field_70170_p.func_217376_c(zombieentity);
@@ -36,7 +36,7 @@
                      zombieentity.func_70624_b(livingentity);
                      zombieentity.func_213386_a(this.field_70170_p, this.field_70170_p.func_175649_E(new BlockPos(zombieentity)), SpawnReason.REINFORCEMENT, (ILivingEntityData)null, (CompoundNBT)null);
                      this.func_110148_a(field_110186_bp).func_111121_a(new AttributeModifier("Zombie reinforcement caller charge", (double)-0.05F, AttributeModifier.Operation.ADDITION));
-@@ -426,7 +431,7 @@
+@@ -429,7 +434,7 @@
       float f = p_213386_2_.func_180170_c();
       this.func_98053_h(this.field_70146_Z.nextFloat() < 0.55F * f);
       if (p_213386_4_ == null) {
@@ -0,0 +1,11 @@
+--- a/net/minecraft/entity/passive/IronGolemEntity.java
+++ b/net/minecraft/entity/passive/IronGolemEntity.java
+@@ -106,7 +106,7 @@
+          int k = MathHelper.func_76128_c(this.field_70161_v);
+          BlockState blockstate = this.field_70170_p.func_180495_p(new BlockPos(i, j, k));
+          if (!blockstate.func_196958_f()) {
+-            this.field_70170_p.func_195594_a(new BlockParticleData(ParticleTypes.field_197611_d, blockstate), this.field_70165_t + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.func_213311_cf(), this.func_174813_aQ().field_72338_b + 0.1D, this.field_70161_v + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.func_213311_cf(), 4.0D * ((double)this.field_70146_Z.nextFloat() - 0.5D), 0.5D, ((double)this.field_70146_Z.nextFloat() - 0.5D) * 4.0D);
+            this.field_70170_p.func_195594_a(new BlockParticleData(ParticleTypes.field_197611_d, blockstate).setPos(new BlockPos(i, j, k)), this.field_70165_t + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.func_213311_cf(), this.func_174813_aQ().field_72338_b + 0.1D, this.field_70161_v + ((double)this.field_70146_Z.nextFloat() - 0.5D) * (double)this.func_213311_cf(), 4.0D * ((double)this.field_70146_Z.nextFloat() - 0.5D), 0.5D, ((double)this.field_70146_Z.nextFloat() - 0.5D) * 4.0D);
+          }
+       }
+ 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/entity/passive/RabbitEntity.java
 +++ b/net/minecraft/entity/passive/RabbitEntity.java
-@@ -502,7 +502,7 @@
+@@ -498,7 +498,7 @@
 
       public boolean func_75250_a() {
          if (this.field_179496_a <= 0) {
@@ -22,8 +22,8 @@
             j = MathHelper.func_76128_c(this.field_70163_u);
             k = MathHelper.func_76128_c(this.field_70161_v + (double)((float)(l / 2 % 2 * 2 - 1) * 0.25F));
             BlockPos blockpos = new BlockPos(i, j, k);
-            if (this.field_70170_p.func_180495_p(blockpos).func_196958_f() && this.field_70170_p.func_180494_b(blockpos).func_180626_a(blockpos) < 0.8F && blockstate.func_196955_c(this.field_70170_p, blockpos)) {
-+            if (this.field_70170_p.func_175623_d(blockpos) && this.field_70170_p.func_180494_b(blockpos).func_180626_a(blockpos) < 0.8F && blockstate.func_196955_c(this.field_70170_p, blockpos)) {
+-            if (this.field_70170_p.func_180495_p(blockpos).func_196958_f() && this.field_70170_p.func_180494_b(blockpos).func_225486_c(blockpos) < 0.8F && blockstate.func_196955_c(this.field_70170_p, blockpos)) {
+            if (this.field_70170_p.func_175623_d(blockpos) && this.field_70170_p.func_180494_b(blockpos).func_225486_c(blockpos) < 0.8F && blockstate.func_196955_c(this.field_70170_p, blockpos)) {
                this.field_70170_p.func_175656_a(blockpos, blockstate);
             }
          }
@@ -11,7 +11,7 @@
    public static final EntitySize field_213835_bs = EntitySize.func_220314_b(0.6F, 1.8F);
    private static final Map<Pose, EntitySize> field_213836_b = ImmutableMap.<Pose, EntitySize>builder().put(Pose.STANDING, field_213835_bs).put(Pose.SLEEPING, field_213377_as).put(Pose.FALL_FLYING, EntitySize.func_220314_b(0.6F, 0.6F)).put(Pose.SWIMMING, EntitySize.func_220314_b(0.6F, 0.6F)).put(Pose.SPIN_ATTACK, EntitySize.func_220314_b(0.6F, 0.6F)).put(Pose.SNEAKING, EntitySize.func_220314_b(0.6F, 1.5F)).put(Pose.DYING, EntitySize.func_220311_c(0.2F, 0.2F)).build();
    private static final DataParameter<Float> field_184829_a = EntityDataManager.func_187226_a(PlayerEntity.class, DataSerializers.field_187193_c);
-@@ -149,6 +153,9 @@
+@@ -150,6 +154,9 @@
    private final CooldownTracker field_184832_bU = this.func_184815_l();
    @Nullable
    public FishingBobberEntity field_71104_cf;
@@ -21,7 +21,7 @@
 
    public PlayerEntity(World p_i45324_1_, GameProfile p_i45324_2_) {
       super(EntityType.field_200729_aH, p_i45324_1_);
-@@ -167,6 +174,7 @@
+@@ -181,6 +188,7 @@
       this.func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a((double)0.1F);
       this.func_110140_aT().func_111150_b(SharedMonsterAttributes.field_188790_f);
       this.func_110140_aT().func_111150_b(SharedMonsterAttributes.field_188792_h);
@@ -29,7 +29,7 @@
    }
 
    protected void func_70088_a() {
-@@ -180,6 +188,7 @@
+@@ -194,6 +202,7 @@
    }
 
    public void func_70071_h_() {
@@ -37,7 +37,7 @@
       this.field_70145_X = this.func_175149_v();
       if (this.func_175149_v()) {
          this.field_70122_E = false;
-@@ -195,7 +204,7 @@
+@@ -209,7 +218,7 @@
             this.field_71076_b = 100;
          }
 
@@ -46,7 +46,7 @@
             this.func_70999_a(false, true, true);
          }
       } else if (this.field_71076_b > 0) {
-@@ -253,6 +262,7 @@
+@@ -267,6 +276,7 @@
       this.func_203041_m();
       this.field_184832_bU.func_185144_a();
       this.func_213832_dB();
@@ -54,15 +54,7 @@
    }
 
    protected boolean func_204229_de() {
-@@ -261,6 +271,7 @@
-    }
- 
-    private void func_203041_m() {
-+      net.minecraftforge.fml.hooks.BasicEventHooks.onPlayerPostTick(this);
-       ItemStack itemstack = this.func_184582_a(EquipmentSlotType.HEAD);
-       if (itemstack.func_77973_b() == Items.field_203179_ao && !this.func_208600_a(FluidTags.field_206959_a)) {
-          this.func_195064_c(new EffectInstance(Effects.field_76427_o, 200, 0, false, false, true));
-@@ -427,10 +438,10 @@
+@@ -441,10 +451,10 @@
          this.field_71107_bF = this.field_71109_bG;
          this.field_71109_bG = 0.0F;
          this.func_71015_k(this.field_70165_t - d0, this.field_70163_u - d1, this.field_70161_v - d2);
@@ -75,7 +67,7 @@
          }
 
       }
-@@ -543,6 +554,7 @@
+@@ -557,6 +567,7 @@
    }
 
    public void func_70645_a(DamageSource p_70645_1_) {
@@ -83,7 +75,7 @@
       super.func_70645_a(p_70645_1_);
       this.func_70107_b(this.field_70165_t, this.field_70163_u, this.field_70161_v);
       if (!this.func_175149_v()) {
-@@ -597,12 +609,14 @@
+@@ -611,12 +622,14 @@
 
    @Nullable
    public ItemEntity func_71040_bB(boolean p_71040_1_) {
@@ -100,7 +92,7 @@
    }
 
    @Nullable
-@@ -636,7 +650,12 @@
+@@ -650,7 +663,12 @@
       }
    }
 
@@ -113,7 +105,7 @@
       float f = this.field_71071_by.func_184438_a(p_184813_1_);
       if (f > 1.0F) {
          int i = EnchantmentHelper.func_185293_e(this);
-@@ -678,11 +697,12 @@
+@@ -692,11 +710,12 @@
          f /= 5.0F;
       }
 
@@ -127,7 +119,7 @@
    }
 
    public void func_70037_a(CompoundNBT p_70037_1_) {
-@@ -706,6 +726,17 @@
+@@ -720,6 +739,17 @@
          this.field_82248_d = p_70037_1_.func_74767_n("SpawnForced");
       }
 
@@ -145,7 +137,7 @@
       this.field_71100_bB.func_75112_a(p_70037_1_);
       this.field_71075_bZ.func_75095_b(p_70037_1_);
       if (p_70037_1_.func_150297_b("EnderItems", 9)) {
-@@ -751,9 +782,26 @@
+@@ -765,9 +795,26 @@
          p_213281_1_.func_218657_a("ShoulderEntityRight", this.func_192025_dl());
       }
 
@@ -172,7 +164,7 @@
       if (this.func_180431_b(p_70097_1_)) {
          return false;
       } else if (this.field_71075_bZ.field_75102_a && !p_70097_1_.func_76357_e()) {
-@@ -785,7 +833,7 @@
+@@ -799,7 +846,7 @@
 
    protected void func_190629_c(LivingEntity p_190629_1_) {
       super.func_190629_c(p_190629_1_);
@@ -181,24 +173,21 @@
          this.func_190777_m(true);
       }
 
-@@ -806,13 +854,15 @@
+@@ -820,11 +867,12 @@
    }
 
    protected void func_184590_k(float p_184590_1_) {
 -      if (p_184590_1_ >= 3.0F && this.field_184627_bm.func_77973_b() == Items.field_185159_cQ) {
 +      if (p_184590_1_ >= 3.0F && this.field_184627_bm.isShield(this)) {
-+         ItemStack copy = this.field_184627_bm.func_77946_l();
          int i = 1 + MathHelper.func_76141_d(p_184590_1_);
          Hand hand = this.func_184600_cs();
          this.field_184627_bm.func_222118_a(i, this, (p_213833_1_) -> {
             p_213833_1_.func_213334_d(hand);
+            net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.field_184627_bm, hand);
          });
          if (this.field_184627_bm.func_190926_b()) {
-+            net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, copy, hand);
             if (hand == Hand.MAIN_HAND) {
-                this.func_184201_a(EquipmentSlotType.MAINHAND, ItemStack.field_190927_a);
-             } else {
-@@ -828,11 +878,14 @@
+@@ -842,11 +890,14 @@
 
    protected void func_70665_d(DamageSource p_70665_1_, float p_70665_2_) {
       if (!this.func_180431_b(p_70665_1_)) {
@@ -213,7 +202,7 @@
          float f1 = f - p_70665_2_;
          if (f1 > 0.0F && f1 < 3.4028235E37F) {
             this.func_195067_a(Stats.field_212738_J, Math.round(f1 * 10.0F));
-@@ -887,6 +940,8 @@
+@@ -901,6 +952,8 @@
 
          return ActionResultType.PASS;
       } else {
@@ -222,7 +211,7 @@
          ItemStack itemstack = this.func_184586_b(p_190775_2_);
          ItemStack itemstack1 = itemstack.func_190926_b() ? ItemStack.field_190927_a : itemstack.func_77946_l();
          if (p_190775_1_.func_184230_a(this, p_190775_2_)) {
-@@ -894,6 +949,9 @@
+@@ -908,6 +961,9 @@
                itemstack.func_190920_e(itemstack1.func_190916_E());
             }
 
@@ -232,7 +221,7 @@
             return ActionResultType.SUCCESS;
          } else {
             if (!itemstack.func_190926_b() && p_190775_1_ instanceof LivingEntity) {
-@@ -903,6 +961,7 @@
+@@ -917,6 +973,7 @@
 
                if (itemstack.func_111282_a(this, (LivingEntity)p_190775_1_, p_190775_2_)) {
                   if (itemstack.func_190926_b() && !this.field_71075_bZ.field_75098_d) {
@@ -240,7 +229,7 @@
                      this.func_184611_a(p_190775_2_, ItemStack.field_190927_a);
                   }
 
-@@ -929,6 +988,7 @@
+@@ -943,6 +1000,7 @@
    }
 
    public void func_71059_n(Entity p_71059_1_) {
@@ -248,7 +237,7 @@
       if (p_71059_1_.func_70075_an()) {
          if (!p_71059_1_.func_85031_j(this)) {
             float f = (float)this.func_110148_a(SharedMonsterAttributes.field_111264_e).func_111126_e();
-@@ -956,8 +1016,10 @@
+@@ -970,8 +1028,10 @@
 
                boolean flag2 = flag && this.field_70143_R > 0.0F && !this.field_70122_E && !this.func_70617_f_() && !this.func_70090_H() && !this.func_70644_a(Effects.field_76440_q) && !this.func_184218_aH() && p_71059_1_ instanceof LivingEntity;
                flag2 = flag2 && !this.func_70051_ag();
@@ -260,7 +249,7 @@
                }
 
                f = f + f1;
-@@ -1045,8 +1107,10 @@
+@@ -1059,8 +1119,10 @@
                   }
 
                   if (!this.field_70170_p.field_72995_K && !itemstack1.func_190926_b() && entity instanceof LivingEntity) {
@@ -271,7 +260,7 @@
                         this.func_184611_a(Hand.MAIN_HAND, ItemStack.field_190927_a);
                      }
                   }
-@@ -1088,7 +1152,7 @@
+@@ -1102,7 +1164,7 @@
       }
 
       if (this.field_70146_Z.nextFloat() < f) {
@@ -280,25 +269,38 @@
          this.func_184602_cy();
          this.field_70170_p.func_72960_a(this, (byte)30);
       }
-@@ -1132,6 +1196,8 @@
+@@ -1128,8 +1190,9 @@
+    public void func_71004_bE() {
+    }
+ 
+-   public void func_70106_y() {
+-      super.func_70106_y();
+   @Override
+   public void remove(boolean keepData) {
+      super.remove(keepData);
+       this.field_71069_bz.func_75134_a(this);
+       if (this.field_71070_bA != null) {
+          this.field_71070_bA.func_75134_a(this);
+@@ -1146,6 +1209,9 @@
    }
 
    public Either<PlayerEntity.SleepResult, Unit> func_213819_a(BlockPos p_213819_1_) {
-+      PlayerEntity.SleepResult ret = net.minecraftforge.event.ForgeEventFactory.onPlayerSleepInBed(this, func_213374_dv());
+      Optional<BlockPos> optAt = Optional.of(p_213819_1_);
+      PlayerEntity.SleepResult ret = net.minecraftforge.event.ForgeEventFactory.onPlayerSleepInBed(this, optAt);
 +      if (ret != null) return Either.left(ret);
       Direction direction = this.field_70170_p.func_180495_p(p_213819_1_).func_177229_b(HorizontalBlock.field_185512_D);
       if (!this.field_70170_p.field_72995_K) {
          if (this.func_70608_bn() || !this.func_70089_S()) {
-@@ -1142,7 +1208,7 @@
+@@ -1156,7 +1222,7 @@
             return Either.left(PlayerEntity.SleepResult.NOT_POSSIBLE_HERE);
          }
 
 -         if (this.field_70170_p.func_72935_r()) {
-+         if (!net.minecraftforge.event.ForgeEventFactory.fireSleepingTimeCheck(this, func_213374_dv())) {
+         if (!net.minecraftforge.event.ForgeEventFactory.fireSleepingTimeCheck(this, optAt)) {
             return Either.left(PlayerEntity.SleepResult.NOT_POSSIBLE_NOW);
          }
 
-@@ -1184,6 +1250,8 @@
+@@ -1197,6 +1263,8 @@
    private boolean func_190774_a(BlockPos p_190774_1_, Direction p_190774_2_) {
       if (Math.abs(this.field_70165_t - (double)p_190774_1_.func_177958_n()) <= 3.0D && Math.abs(this.field_70163_u - (double)p_190774_1_.func_177956_o()) <= 2.0D && Math.abs(this.field_70161_v - (double)p_190774_1_.func_177952_p()) <= 3.0D) {
          return true;
@@ -307,7 +309,7 @@
       } else {
          BlockPos blockpos = p_190774_1_.func_177972_a(p_190774_2_.func_176734_d());
          return Math.abs(this.field_70165_t - (double)blockpos.func_177958_n()) <= 3.0D && Math.abs(this.field_70163_u - (double)blockpos.func_177956_o()) <= 2.0D && Math.abs(this.field_70161_v - (double)blockpos.func_177952_p()) <= 3.0D;
-@@ -1196,6 +1264,7 @@
+@@ -1209,6 +1277,7 @@
    }
 
    public void func_70999_a(boolean p_70999_1_, boolean p_70999_2_, boolean p_70999_3_) {
@@ -315,7 +317,7 @@
       Optional<BlockPos> optional = this.func_213374_dv();
       super.func_213366_dy();
       if (this.field_70170_p instanceof ServerWorld && p_70999_2_) {
-@@ -1216,17 +1285,17 @@
+@@ -1229,17 +1298,17 @@
    }
 
    public static Optional<Vec3d> func_213822_a(IWorldReader p_213822_0_, BlockPos p_213822_1_, boolean p_213822_2_) {
@@ -337,7 +339,7 @@
       }
    }
 
-@@ -1241,23 +1310,67 @@
+@@ -1254,23 +1323,67 @@
    public void func_146105_b(ITextComponent p_146105_1_, boolean p_146105_2_) {
    }
 
@@ -414,7 +416,7 @@
    }
 
    public void func_195066_a(ResourceLocation p_195066_1_) {
-@@ -1423,6 +1536,8 @@
+@@ -1436,6 +1549,8 @@
          }
 
          super.func_180430_e(p_180430_1_, p_180430_2_);
@@ -423,7 +425,7 @@
       }
    }
 
-@@ -1685,7 +1800,10 @@
+@@ -1703,7 +1818,10 @@
    }
 
    public ITextComponent func_145748_c_() {
@@ -435,7 +437,7 @@
       return this.func_208016_c(itextcomponent);
    }
 
-@@ -1921,4 +2039,44 @@
+@@ -1939,4 +2057,44 @@
          return this.field_221260_g;
       }
    }
@@ -64,7 +64,7 @@
          return this;
       }
    }
-@@ -776,7 +778,7 @@
+@@ -776,11 +778,11 @@
       BlockPos blockpos = new BlockPos(i, j, k);
       if (this.field_70170_p.func_175667_e(blockpos)) {
          BlockState blockstate = this.field_70170_p.func_180495_p(blockpos);
@@ -73,6 +73,11 @@
             BlockPos blockpos1 = blockpos.func_177977_b();
             BlockState blockstate1 = this.field_70170_p.func_180495_p(blockpos1);
             Block block = blockstate1.func_177230_c();
+-            if (block.func_203417_a(BlockTags.field_219748_G) || block.func_203417_a(BlockTags.field_219757_z) || block instanceof FenceGateBlock) {
+            if (blockstate.collisionExtendsVertically(this.field_70170_p, blockpos, this)) {
+                blockpos = blockpos1;
+                blockstate = blockstate1;
+             }
@@ -819,6 +821,7 @@
             this.field_71135_a.func_147359_a(new SOpenWindowPacket(container.field_75152_c, container.func_216957_a(), p_213829_1_.func_145748_c_()));
             container.func_75132_a(this);
@@ -111,9 +116,9 @@
 +
 +      //Copy over a section of the Entity Data from the old player.
 +      //Allows mods to specify data that persists after players respawn.
-+      CompoundNBT old = p_193104_1_.getEntityData();
+      CompoundNBT old = p_193104_1_.getPersistentData();
 +      if (old.func_74764_b(PERSISTED_NBT_TAG))
-+          getEntityData().func_218657_a(PERSISTED_NBT_TAG, old.func_74781_a(PERSISTED_NBT_TAG));
+          getPersistentData().func_218657_a(PERSISTED_NBT_TAG, old.func_74781_a(PERSISTED_NBT_TAG));
 +      net.minecraftforge.event.ForgeEventFactory.onPlayerClone(this, p_193104_1_, !p_193104_2_);
    }
 
@@ -0,0 +1,11 @@
+--- a/net/minecraft/entity/projectile/ArrowEntity.java
+++ b/net/minecraft/entity/projectile/ArrowEntity.java
+@@ -59,7 +59,7 @@
+       } else if (p_184555_1_.func_77973_b() == Items.field_151032_g) {
+          this.field_184560_g = Potions.field_185229_a;
+          this.field_184561_h.clear();
+-         this.field_70180_af.func_187227_b(field_184559_f, -1);
+         this.func_191507_d(-1); // Forge: fix MC-107941
+       }
+ 
+    }
@@ -62,3 +62,15 @@
       } else {
          return 0;
       }
+@@ -416,8 +424,9 @@
+       return false;
+    }
+ 
+-   public void func_70106_y() {
+-      super.func_70106_y();
+   @Override
+   public void remove(boolean keepData) {
+      super.remove(keepData);
+       if (this.field_146042_b != null) {
+          this.field_146042_b.field_71104_cf = null;
+       }
@@ -9,7 +9,7 @@
    public static final ObjectIntIdentityMap<IFluidState> field_207201_d = new ObjectIntIdentityMap<>();
    protected final StateContainer<Fluid, IFluidState> field_207202_e;
    private IFluidState field_207200_b;
-@@ -102,4 +102,10 @@
+@@ -102,4 +102,26 @@
    }
 
    public abstract VoxelShape func_215664_b(IFluidState p_215664_1_, IBlockReader p_215664_2_, BlockPos p_215664_3_);
@@ -18,5 +18,21 @@
 +   @Override
 +   public java.util.Set<net.minecraft.util.ResourceLocation> getTags() {
 +      return reverseTags.getTagNames();
+   }
+
+   /**
+    * Creates the fluid attributes object, which will contain all the extended values for the fluid that aren't part of the vanilla system.
+    * Do not call this from outside. To retrieve the values use {@link Fluid#getAttributes()}
+    */
+   protected net.minecraftforge.fluids.FluidAttributes createAttributes()
+   {
+      return net.minecraftforge.common.ForgeHooks.createVanillaFluidAttributes(this);
+   }
+
+   private net.minecraftforge.fluids.FluidAttributes forgeFluidAttributes;
+   public final net.minecraftforge.fluids.FluidAttributes getAttributes() {
+      if (forgeFluidAttributes == null)
+         forgeFluidAttributes = createAttributes();
+      return forgeFluidAttributes;
 +   }
 }
@@ -0,0 +1,29 @@
+--- a/net/minecraft/fluid/LavaFluid.java
+++ b/net/minecraft/fluid/LavaFluid.java
+@@ -76,7 +76,7 @@
+                BlockState blockstate = p_207186_1_.func_180495_p(blockpos);
+                if (blockstate.func_196958_f()) {
+                   if (this.func_176369_e(p_207186_1_, blockpos)) {
+-                     p_207186_1_.func_175656_a(blockpos, Blocks.field_150480_ab.func_176223_P());
+                     p_207186_1_.func_175656_a(blockpos, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_207186_1_, blockpos, p_207186_2_, Blocks.field_150480_ab.func_176223_P()));
+                      return;
+                   }
+                } else if (blockstate.func_185904_a().func_76230_c()) {
+@@ -91,7 +91,7 @@
+                }
+ 
+                if (p_207186_1_.func_175623_d(blockpos1.func_177984_a()) && this.func_176368_m(p_207186_1_, blockpos1)) {
+-                  p_207186_1_.func_175656_a(blockpos1.func_177984_a(), Blocks.field_150480_ab.func_176223_P());
+                  p_207186_1_.func_175656_a(blockpos1.func_177984_a(), net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_207186_1_, blockpos1.func_177984_a(), p_207186_2_, Blocks.field_150480_ab.func_176223_P()));
+                }
+             }
+          }
+@@ -169,7 +169,7 @@
+          IFluidState ifluidstate = p_205574_1_.func_204610_c(p_205574_2_);
+          if (this.func_207185_a(FluidTags.field_206960_b) && ifluidstate.func_206884_a(FluidTags.field_206959_a)) {
+             if (p_205574_3_.func_177230_c() instanceof FlowingFluidBlock) {
+-               p_205574_1_.func_180501_a(p_205574_2_, Blocks.field_150348_b.func_176223_P(), 3);
+               p_205574_1_.func_180501_a(p_205574_2_, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_205574_1_, p_205574_2_, p_205574_2_, Blocks.field_150348_b.func_176223_P()), 3);
+             }
+ 
+             this.func_205581_a(p_205574_1_, p_205574_2_);