Update license header to SPDX format

Add ForgeSpawnEggItem to lazily handle EntityTypes (#10626 )
Update ForgeGradle version and re-add evaluationDependsOn
2026-11-14 09:05:17 +00:00 · 2026-07-09 11:42:57 -07:00 · 2026-07-09 11:27:52 -07:00 · 2025-08-12 12:03:29 -07:00 · 2025-08-12 11:45:53 -07:00 · 2025-08-11 15:16:48 -07:00
996 changed files with 9085 additions and 28577 deletions
@@ -14,3 +14,10 @@
 *.cfg text eol=lf
 *.py text eol=lf
 *.jks binary
+
+# Disable autocrlf on generated files, they always generate with LF
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf
+src/generated_test/**/.cache/cache text eol=lf
+src/generated_test/**/*.json text eol=lf
+
@@ -0,0 +1,28 @@
+name: Publish
+
+on:
+  push:
+    branches: [ '1.15.x' ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
+    with:
+      java: 8
+      gradle_tasks: 'setup build publish'
+      artifact_name: 'forge'
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      # Unused for now until we upgrade gradle
+      # SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
+      # SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
+      # SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
+      # SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}
@@ -15,8 +15,8 @@
 #gradle
 /build
 /.gradle
-/mdk/.gradle
-/mdk/build
+/**/.gradle
+/**/build

 #occupational hazards
 /projects/mcp/
@@ -1,39 +0,0 @@
-sudo: required
-dist: trusty
-
-language: java
-jdk: oraclejdk8
-
-env:
-  - BUILD_NUMBER=9999
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $TRAVIS_BUILD_DIR/build/localCache/Forge/
-
-before_install: chmod +x gradlew
-install:
-  - ./gradlew --refresh-dependencies
-  - ./gradlew ciWriteBuildNumber
-script:
-  - travis_wait ./gradlew build -x createExe -S
-  - ./gradlew -p projects/Forge test -S -i
-
-notifications:
-  email: false
-
-# skip building travis on 1.13+ - it doesn't work there
-branches:
-  except:
-    - 1.13-pre
-    - 1.13.x
-    - 1.14.x
-    - 1.15.x
-    - /^noci-.*$/
@@ -1,110 +0,0 @@
-@Library('forge-shared-library')_
-
-pipeline {
-    options {
-        disableConcurrentBuilds()
-    }
-    agent {
-        docker {
-            image 'gradlewrapper:latest'
-            args '-v gradlecache:/gradlecache'
-        }
-    }
-    environment {
-        GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
-        DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook')
-        DISCORD_PREFIX = "Job: Forge Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}"
-        JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
-    }
-
-    stages {
-        stage('fetch') {
-            steps {
-                checkout scm
-            }
-        }
-        stage('notify_start') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                discordSend(
-                    title: "${DISCORD_PREFIX} Started",
-                    successful: true,
-                    result: 'ABORTED', //White border
-                    thumbnail: JENKINS_HEAD,
-                    webhookURL: DISCORD_WEBHOOK
-                )
-            }
-        }
-        stage('setup') {
-            steps {
-                sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
-                script {
-                    env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim()
-                }
-            }
-        }
-        stage('changelog') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                writeChangelog(currentBuild, 'build/changelog.txt')
-            }
-        }
-        stage('publish') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            environment {
-                FORGE_MAVEN = credentials('forge-maven-forge-user')
-                CROWDIN = credentials('forge-crowdin')
-                KEYSTORE = credentials('forge-jenkins-keystore-old')
-                KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
-                KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
-            }
-            steps {
-                sh './gradlew ${GRADLE_ARGS} :forge:publish -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW} -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
-                sh 'curl --user ${FORGE_MAVEN} http://files.minecraftforge.net/maven/manage/promote/latest/net.minecraftforge.forge/${MYVERSION}'
-            }
-        }
-        stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
-            when {
-                changeRequest()
-            }
-            environment {
-                CROWDIN = credentials('forge-crowdin')
-            }
-            steps {
-                sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}'
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
-                //junit 'build/test-results/*/*.xml'
-                //jacoco sourcePattern: '**/src/*/java'
-                
-                if (env.CHANGE_ID == null) { // This is unset for non-PRs
-                    discordSend(
-                        title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
-                        description: '```\n' + getChanges(currentBuild) + '\n```',
-                        successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"),
-                        result: currentBuild.currentResult,
-                        thumbnail: JENKINS_HEAD,
-                        webhookURL: DISCORD_WEBHOOK
-                    )
-                }
-            }
-        }
-    }
-}
@@ -1,16 +1,2 @@
-Minecraft Forge
-Copyright (c) 2016-2019.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation version 2.1
-of the License.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Copyright (c) Forge Development LLC and contributors
+SPDX-License-Identifier: LGPL-2.1-only
@@ -1,8 +1,7 @@
 buildscript {
    repositories {
        mavenLocal()
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
+        maven { url = 'https://maven.minecraftforge.net/' }
        //mavenCentral() //TODO: Update Gradle to use HTTPS by default
        maven {
            name 'maven_central'
@@ -10,7 +9,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.197'
        classpath 'org.ow2.asm:asm:7.2'
        classpath 'org.ow2.asm:asm-tree:7.2'
    }
@@ -46,25 +45,21 @@ import org.objectweb.asm.ClassReader

 plugins {
    id 'net.minecrell.licenser' version '0.4'
-    id 'org.ajoberstar.grgit' version '3.1.1'
+    id 'org.ajoberstar.grgit' version '4.1.1'
    id 'de.undercouch.download' version '3.3.0'
    id 'com.github.ben-manes.versions' version '0.22.0'
+    // Does not support this old of gradle
+    //id 'net.minecraftforge.gradlejarsigner' version '1.0.5'
 }
 apply plugin: 'eclipse'

+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version'))
+
 ext {
-    JAR_SIGNER = null
-    if (project.hasProperty('keystore')) {
-        JAR_SIGNER = [
-            storepass: project.properties.keystoreStorePass,
-            keypass: project.properties.keystoreKeyPass,
-            keystore: project.properties.keystore
-        ]
-    }
    MAPPING_CHANNEL = 'snapshot'
-    MAPPING_VERSION = '20190719-1.14.3'
+    MAPPING_VERSION = '20200514-1.15.1'
    MC_VERSION = '1.15.2'
-    MCP_VERSION = '20200122.131323'
+    MCP_VERSION = '20200515.085601'
 }

 project(':mcp') {
@@ -75,6 +70,7 @@ project(':mcp') {
    }
 }

+if (findProject(':clean') != null) {
 project(':clean') {
    evaluationDependsOn(':mcp')
    apply plugin: 'eclipse'
@@ -122,9 +118,10 @@ project(':clean') {
        }
    }
 }
+}

-project(':forge') {    
-    evaluationDependsOn(':clean')
+project(':forge') {
+    evaluationDependsOn(findProject(':clean') != null ? ':clean' : ':mcp')
    apply plugin: 'java-library'
    apply plugin: 'maven-publish'
    apply plugin: 'eclipse'
@@ -203,7 +200,7 @@ project(':forge') {
    }

    ext {
-        SPEC_VERSION = '30.0' // This is overwritten by git tag, but here so dev time doesnt explode
+        SPEC_VERSION = '31.2' // 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.
@@ -230,10 +227,13 @@ project(':forge') {
    }

    version = getVersion()
+    println('Forge Version: ' + version)

    patcher {
        exc = file("$rootDir/src/main/resources/forge.exc")
-        parent = project(':clean')
+        parent = project(':mcp')
+        mcVersion = MC_VERSION
+        mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
        patches = file("$rootDir/patches/minecraft")
        patchedSrc = file('src/main/java')
        srgPatches = true
@@ -349,8 +349,11 @@ project(':forge') {
                    tests { sources  sourceSets.test }
                }
                
-                args '--mod', 'data_gen_test', '--all', '--output', rootProject.file('src/generated_test/resources/'), '--validate',
-                        '--existing', sourceSets.main.resources.srcDirs[0]
+                args '--flat', '--all', '--validate',
+                    '--mod', 'data_gen_test', 
+                    '--mod', 'piston_event_test', 
+                    '--output', rootProject.file('src/generated_test/resources/'),
+                    '--existing', sourceSets.main.resources.srcDirs[0]
            }
        }
    }
@@ -429,20 +432,24 @@ project(':forge') {
        installer 'org.ow2.asm:asm:7.2'
        installer 'org.ow2.asm:asm-commons:7.2'
        installer 'org.ow2.asm:asm-tree:7.2'
-        installer 'cpw.mods:modlauncher:5.0.+'
-        installer 'cpw.mods:grossjava9hacks:1.1.+'
-        installer 'net.minecraftforge:accesstransformers:2.0.+:shadowed'
-        installer 'net.minecraftforge:eventbus:2.0.+:service'
-        installer 'net.minecraftforge:forgespi:2.0.+'
+        installer 'org.ow2.asm:asm-util:7.2'
+        installer 'org.ow2.asm:asm-analysis:7.2'
+        installer 'cpw.mods:modlauncher:5.1.+'
+        installer 'cpw.mods:grossjava9hacks:1.3.+'
+        installer 'net.minecraftforge:accesstransformers:2.1.+:shadowed'
+        installer 'net.minecraftforge:eventbus:2.2.+:service'
+        installer 'net.minecraftforge:forgespi:3.0.+'
        installer 'net.minecraftforge:coremods:2.0.+'
        installer 'net.minecraftforge:unsafe:0.2.+'
+        installer 'org.spongepowered:mixin:0.8.2'
        installer 'com.electronwill.night-config:core:3.6.2'
        installer 'com.electronwill.night-config:toml:3.6.2'
        installer 'org.jline:jline:3.12.+'
        installer 'org.apache.maven:maven-artifact:3.6.0'
-        installer 'net.jodah:typetools:0.6.1'
-        installer 'org.apache.logging.log4j:log4j-api:2.11.2'
-        installer 'org.apache.logging.log4j:log4j-core:2.11.2'
+        installer 'net.jodah:typetools:0.8.3'
+        installer 'org.apache.logging.log4j:log4j-api:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
+        installer 'org.apache.logging.log4j:log4j-core:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
+        installer 'org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
        installer 'net.minecrell:terminalconsoleappender:1.2.+'
        installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
        fmllauncherImplementation 'com.google.guava:guava:21.0'
@@ -466,48 +473,21 @@ project(':forge') {
    if (changelog.exists())
        extraTxts += changelog
    
-    task downloadCrowdin() {
-        ext {
-            output = file('build/crowdin_raw.zip')
-            update = file('build/crowdin.json')
-            id = 'minecraft-forge'
-        }
-        onlyIf {
-            project.hasProperty('crowdinKey') && !project.gradle.startParameter.isOffline()
-        }
-        doLast {
-            download {
-                src "https://api.crowdin.com/api/project/${id}/export?key=${project.crowdinKey}&json"
-                dest update
-                overwrite true
-            }
-            if (!update.text.contains('success')) {
-                throw new RuntimeException("Crowdin export failed, see ${update} for more info")
-            }
-            download {
-                src "https://api.crowdin.com/api/project/${id}/download/all.zip?key=${project.crowdinKey}"
-                dest output
-                overwrite true
-            }
-        }
+
+    tasks.register('downloadCrowdin', Download) {
+        src 'https://files.minecraftforge.net/crowdin.zip'
+        dest file('build/crowdin.zip')
+        onlyIfModified true
+        quiet true
    }
    
    task crowdin(type: Zip) {
        dependsOn downloadCrowdin
-        onlyIf {
-            !downloadCrowdin.state.skipped
-        }
        baseName = project.name
        version = project.version
        classifier = 'crowdin'
        destinationDir = file('build/distributions')
-        from(zipTree(downloadCrowdin.output)){
-            eachFile { //Tired of waiting for crowdin API, rename things myself. Remove once crowdin stops being dumb
-                    if (it.name.equals('en_us.json') && !it.path.startsWith('assets/')) {
-                        it.name = it.path.split('/')[0] + '.json'
-                        it.path = 'assets/forge/lang/' + it.name
-                    }
-                }
+        from(zipTree(downloadCrowdin.dest)){
                exclude { it.isDirectory() }
                rename { it.toLowerCase() }//Minecraft needs it lowercase.
                exclude '**/*.lang' //Pre-1.13 format
@@ -710,7 +690,7 @@ project(':forge') {
        }
    }

-    task launcherJson(dependsOn: ['signUniversalJar', 'signLauncherJar']) {
+    task launcherJson(dependsOn: ['universalJar', 'launcherJar']) {
        inputs.file universalJar.archivePath
        inputs.file { launcherJar.archivePath }
        ext {
@@ -946,7 +926,7 @@ project(':forge') {
        */
        
        // add crowdin locales
-        from { !crowdin.state.skipped ? zipTree(crowdin.archivePath) : null}
+        from zipTree(crowdin.archivePath)
        dependsOn crowdin

        doFirst {
@@ -993,11 +973,11 @@ project(':forge') {
    }
    
    task downloadInstaller(type: DownloadMavenArtifact) {
-        artifact = 'net.minecraftforge:installer:2.0.+:shrunk'
+        artifact = 'net.minecraftforge:installer:2.2.9:fatjar'
        changing = true
    }
    
-    task installerJar(type: Zip, dependsOn: [downloadInstaller, installerJson, launcherJson, genClientBinPatches, genServerBinPatches, 'signUniversalJar', 'signLauncherJar']) {
+    task installerJar(type: Zip, dependsOn: [downloadInstaller, installerJson, launcherJson, genClientBinPatches, genServerBinPatches, universalJar, launcherJar]) {
        classifier = 'installer'
        extension = 'jar' //Needs to be Zip task to not override Manifest, so set extension
        destinationDir = file('build/libs')
@@ -1026,24 +1006,12 @@ project(':forge') {
        }
    }
    
-    [universalJar, launcherJar, installerJar].each { t -> 
-        task "sign${t.name.capitalize()}"(type: SignJar, dependsOn: t) {
-            onlyIf {
-                JAR_SIGNER != null && t.state.failure == null
-            }
-            def jarsigner = JAR_SIGNER == null ? [:] : JAR_SIGNER
-            alias = 'forge'
-            storePass = jarsigner.storepass
-            keyPass = jarsigner.keypass
-            keyStore = jarsigner.keystore
-            inputFile = t.archivePath
-            outputFile = t.archivePath
-            doFirst {
-                project.logger.lifecycle('Signing: ' + inputFile)
-            }
-        }
-        t.finalizedBy(tasks.getByName("sign${t.name.capitalize()}"))
-    }
+    /*
+    jarSigner.autoDetect()
+    jarSigner.sign(universalJar)
+    jarSigner.sign(launcherJar)
+    jarSigner.sign(installerJar)
+    */
    
    task makeMdk(type: Zip) {
        baseName = project.name
@@ -1071,6 +1039,7 @@ project(':forge') {
                MAPPING_VERSION: MAPPING_VERSION
            ])
            rename 'gitignore\\.txt', '.gitignore'
+            rename 'gitattributes\\.txt', '.gitattributes'
        }
    }
    
@@ -1233,12 +1202,15 @@ project(':forge') {
        }
        repositories {
            maven {
-                if (project.hasProperty('forgeMavenPassword')) {
-                    credentials {
-                        username project.properties.forgeMavenUser
-                        password project.properties.forgeMavenPassword
+                if (System.env.MAVEN_USER) {
+                    url "https://maven.minecraftforge.net/releases/"
+                    authentication {
+                        basic(BasicAuthentication)
+                    }
+                    credentials {
+                        username = System.env.MAVEN_USER ?: 'not'
+                        password = System.env.MAVEN_PASSWORD ?: 'set'
                    }
-                    url 'https://files.minecraftforge.net/maven/manage/upload'
                } else {
                    url 'file://' + rootProject.file('repo').getAbsolutePath()
                }
@@ -1291,7 +1263,7 @@ def getArtifacts(project, config, classifiers) {
        def path = "${folder}${filename}"
        def url = "https://libraries.minecraft.net/${path}"
        if (!checkExists(url)) {
-            url = "https://files.minecraftforge.net/maven/${path}"
+            url = "https://maven.minecraftforge.net/${path}"
        }
        //TODO remove when Mojang launcher is updated
        if (!classifiers && art.classifier != null) { //Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
@@ -1316,12 +1288,18 @@ def getArtifacts(project, config, classifiers) {
 }

 def checkExists(url) {
-    def code = new URL(url).openConnection().with {
-        requestMethod = 'HEAD'
-        connect()
-        responseCode
+    try {
+        def code = new URL(url).openConnection().with {
+            requestMethod = 'HEAD'
+            connect()
+            responseCode
+        }
+        return code == 200
+    } catch (Exception e) {
+        if (e.toString().contains('unable to find valid certification path to requested target'))
+            throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
+        throw e
    }
-    return code == 200
 }

 def getClasspath(project, libs, artifact) {
@@ -1336,6 +1314,7 @@ def getClasspath(project, libs, artifact) {

 //evaluationDependsOnChildren()
 task setup() {
+    if (findProject(':clean') != null)
    dependsOn ':clean:extractMapped'
    dependsOn ':forge:extractMapped' //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
 }
@@ -2,16 +2,16 @@

 MinecraftForge
 =============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.14.4-&query=$.promos["1.14.4-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.14.4-&query=$.promos["1.14.4-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
+[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.15.2-&query=$.promos["1.15.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
+[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.15.2-&query=$.promos["1.15.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
 )](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)](https://discord.gg/UvedJ9m) [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos) [![Merch](https://img.shields.io/badge/Flocker-Merch-blueviolet.svg)](https://forgedev.flocker.tv/)

 Forge is a free, open-source modding API all of your favourite mods use!

 | Version  | Support |
 | ------------- | ------------- |
-| 1.14.x  | Active  |
-| 1.12.x  | Legacy  |
+| 1.15.x  | Active  |
+| 1.14.x  | LTS  |

 * [Download]
 * [Forum]
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
@@ -1,7 +1,6 @@
 buildscript {
    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
+        maven { url = 'https://maven.minecraftforge.net/' }
        mavenCentral()
    }
    dependencies {
@@ -18,6 +17,8 @@ group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming
 archivesBaseName = 'modid'

 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+//Print out JVM information so that we know what version is running. Extreamly useful for people to know when helping you.
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))

 minecraft {
    // The mappings can be changed at any time, and must be in the following format.
@@ -127,18 +128,15 @@ jar {
 }

 // Example configuration to allow publishing using the maven-publish task
-// we define a custom artifact that is sourced from the reobfJar output task
-// and then declare that to be published
-// Note you'll need to add a repository here
-def reobfFile = file("$buildDir/reobfJar/output.jar")
-def reobfArtifact = artifacts.add('default', reobfFile) {
-    type 'jar'
-    builtBy 'reobfJar'
-}
+// This is the preferred method to reobfuscate your jar file
+jar.finalizedBy('reobfJar') 
+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
+//publish.dependsOn('reobfJar')
+
 publishing {
    publications {
        mavenJava(MavenPublication) {
-            artifact reobfArtifact
+            artifact jar
        }
    }
    repositories {
@@ -146,4 +144,4 @@ publishing {
            url "file:///${project.projectDir}/mcmodsrepo"
        }
    }
-}
+}
@@ -0,0 +1,5 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -578,10 +578,17 @@
+@@ -579,10 +579,17 @@
       GL13.glClientActiveTexture(p_227747_0_);
    }
 
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/IVertexBuilder.java
 +++ b/com/mojang/blaze3d/vertex/IVertexBuilder.java
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
 import org.lwjgl.system.MemoryStack;
 
 @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
    Logger field_227884_f_ = LogManager.getLogger();
 
    IVertexBuilder func_225582_a_(double p_225582_1_, double p_225582_3_, double p_225582_5_);
-@@ -95,11 +95,12 @@
+@@ -96,11 +96,12 @@
                f5 = p_227890_3_[k] * p_227890_6_;
             }
 
@@ -0,0 +1,18 @@
+--- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
+++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
+@@ -64,6 +64,15 @@
+       super.tick();
+    }
+ 
+   @Override
+   public boolean keyPressed(int key, int scanCode, int modifiers) {
+      if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
+         Realms.setScreen(this.field_224228_a);
+         return true;
+      }
+      return super.keyPressed(key, scanCode, modifiers);
+   }
+
+    public void render(int p_render_1_, int p_render_2_, float p_render_3_) {
+       this.renderBackground();
+       this.drawCenteredString(this.field_224229_b, this.width() / 2, 80, 16777215);
@@ -0,0 +1,10 @@
+--- a/net/minecraft/advancements/AdvancementList.java
+++ b/net/minecraft/advancements/AdvancementList.java
+@@ -96,6 +96,7 @@
+          }
+       }
+ 
+      net.minecraftforge.common.AdvancementLoadFix.buildSortedTrees(this.field_192093_c);
+       field_192091_a.info("Loaded {} advancements", (int)this.field_192092_b.size());
+    }
+ 
@@ -1,6 +1,14 @@
 --- a/net/minecraft/advancements/PlayerAdvancements.java
 +++ b/net/minecraft/advancements/PlayerAdvancements.java
-@@ -187,6 +187,8 @@
+@@ -154,6 +154,7 @@
+       }
+ 
+       this.func_192748_e();
+      if (net.minecraftforge.common.ForgeConfig.SERVER.fixAdvancementLoading.get()) net.minecraftforge.common.AdvancementLoadFix.loadVisibility(this, this.field_192759_g, this.field_192760_h, this.field_192758_f, this.field_192761_i, this::func_192738_c); else
+       this.func_192752_d();
+       this.func_192751_c();
+    }
+@@ -187,6 +188,8 @@
    }
 
    public boolean func_192750_a(Advancement p_192750_1_, String p_192750_2_) {
@@ -9,7 +17,7 @@
       boolean flag = false;
       AdvancementProgress advancementprogress = this.func_192747_a(p_192750_1_);
       boolean flag1 = advancementprogress.func_192105_a();
-@@ -199,6 +201,7 @@
+@@ -199,6 +202,7 @@
             if (p_192750_1_.func_192068_c() != null && p_192750_1_.func_192068_c().func_193220_i() && this.field_192762_j.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223620_w)) {
                this.field_192756_d.func_184103_al().func_148539_a(new TranslationTextComponent("chat.type.advancement." + p_192750_1_.func_192068_c().func_192291_d().func_192307_a(), this.field_192762_j.func_145748_c_(), p_192750_1_.func_193123_j()));
             }
@@ -0,0 +1,16 @@
+--- a/net/minecraft/block/BambooBlock.java
+++ b/net/minecraft/block/BambooBlock.java
+@@ -91,10 +91,11 @@
+       if (!p_225534_1_.func_196955_c(p_225534_2_, p_225534_3_)) {
+          p_225534_2_.func_175655_b(p_225534_3_, true);
+       } else if (p_225534_1_.func_177229_b(field_220266_f) == 0) {
+-         if (p_225534_4_.nextInt(3) == 0 && p_225534_2_.func_175623_d(p_225534_3_.func_177984_a()) && p_225534_2_.func_226659_b_(p_225534_3_.func_177984_a(), 0) >= 9) {
+         if (true) {
+             int i = this.func_220260_b(p_225534_2_, p_225534_3_) + 1;
+-            if (i < 16) {
+            if (i < 16 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_225534_2_, p_225534_3_, p_225534_1_, p_225534_4_.nextInt(3) == 0 && p_225534_2_.func_175623_d(p_225534_3_.func_177984_a()) && p_225534_2_.func_226659_b_(p_225534_3_.func_177984_a(), 0) >= 9)) {
+                this.func_220258_a(p_225534_1_, p_225534_2_, p_225534_3_, p_225534_4_, i);
+               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_225534_2_, p_225534_3_, p_225534_1_);
+             }
+          }
+ 
@@ -58,7 +58,7 @@
    @Deprecated
    public void func_196243_a(BlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, BlockState p_196243_4_, boolean p_196243_5_) {
 -      if (this.func_149716_u() && p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c()) {
-+      if (p_196243_1_.hasTileEntity() && p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c()) {
+      if (p_196243_1_.hasTileEntity() && (p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c() || !p_196243_4_.hasTileEntity())) {
          p_196243_2_.func_175713_t(p_196243_3_);
       }
 -
@@ -9,7 +9,7 @@
          func_199610_d(p_180658_1_.func_180495_p(p_180658_2_), p_180658_1_, p_180658_2_);
       }
 
-@@ -87,9 +87,9 @@
+@@ -87,9 +87,10 @@
       p_199610_1_.func_175656_a(p_199610_2_, func_199601_a(p_199610_0_, Blocks.field_150346_d.func_176223_P(), p_199610_1_, p_199610_2_));
    }
 
@@ -17,12 +17,13 @@
 -      Block block = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a()).func_177230_c();
 -      return block instanceof CropsBlock || block instanceof StemBlock || block instanceof AttachedStemBlock;
 +   private boolean func_176529_d(IBlockReader p_176529_0_, BlockPos p_176529_1_) {
-+      BlockState state = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a());
-+      return state.func_177230_c() instanceof net.minecraftforge.common.IPlantable && canSustainPlant(state, p_176529_0_, p_176529_1_, Direction.UP, (net.minecraftforge.common.IPlantable)state.func_177230_c());
+      BlockState plant = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a());
+      BlockState state = p_176529_0_.func_180495_p(p_176529_1_);
+      return plant.func_177230_c() instanceof net.minecraftforge.common.IPlantable && state.canSustainPlant(p_176529_0_, p_176529_1_, Direction.UP, (net.minecraftforge.common.IPlantable)plant.func_177230_c());
    }
 
    private static boolean func_176530_e(IWorldReader p_176530_0_, BlockPos p_176530_1_) {
-@@ -99,7 +99,7 @@
+@@ -99,7 +100,7 @@
          }
       }
 
@@ -109,7 +109,7 @@
          for(Direction direction : Direction.values()) {
             BlockState blockstate = p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(direction));
 -            i = Math.max(this.func_220275_r(blockstate), i);
-+            i = Math.max(blockstate.getFlammability(p_176538_1_, p_176538_2_.func_177972_a(direction), direction.func_176734_d()), i);
+            i = Math.max(blockstate.getFireSpreadSpeed(p_176538_1_, p_176538_2_.func_177972_a(direction), direction.func_176734_d()), i);
          }
 
          return i;
@@ -22,7 +22,7 @@
 +    *
 +    * @param emptyPot    The empty pot for this pot, or null for self.
 +    * @param p_i48395_1_ The flower block.
-+    * @param p_i48395_2_
+    * @param properties
 +    */
 +   public FlowerPotBlock(@javax.annotation.Nullable java.util.function.Supplier<FlowerPotBlock> emptyPot, java.util.function.Supplier<? extends Block> p_i48395_1_, Block.Properties p_i48395_2_) {
       super(p_i48395_2_);
@@ -9,17 +9,18 @@
          p_196482_1_.func_175641_c(p_196482_2_, this, 0, 0);
       }
 
-@@ -60,6 +60,9 @@
+@@ -60,7 +60,9 @@
       if (p_225533_2_.field_72995_K) {
          return ActionResultType.SUCCESS;
       } else {
+-         p_225533_1_ = p_225533_1_.func_177231_a(field_196485_c);
 +         int _new = net.minecraftforge.common.ForgeHooks.onNoteChange(p_225533_2_, p_225533_3_, p_225533_1_, p_225533_1_.func_177229_b(field_196485_c), p_225533_1_.func_177231_a(field_196485_c).func_177229_b(field_196485_c));
 +         if (_new == -1) return ActionResultType.FAIL;
 +         p_225533_1_ = (BlockState)p_225533_1_.func_206870_a(field_196485_c, _new);
-          p_225533_1_ = p_225533_1_.func_177231_a(field_196485_c);
          p_225533_2_.func_180501_a(p_225533_3_, p_225533_1_, 3);
          this.func_196482_a(p_225533_2_, p_225533_3_);
-@@ -76,6 +79,9 @@
+          p_225533_4_.func_195066_a(Stats.field_188087_U);
+@@ -76,6 +78,9 @@
    }
 
    public boolean func_189539_a(BlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_) {
@@ -35,7 +35,18 @@
                   return p_208071_1_.func_175640_z(p_208071_2_) ? true : this.func_176566_a(p_208071_1_, p_208071_2_, blockstate, p_208071_3_, p_208071_4_ + 1);
                } else {
                   return false;
-@@ -255,4 +261,8 @@
+@@ -156,6 +162,10 @@
+             return p_185499_1_.func_206870_a(field_176568_b, RailShape.SOUTH_EAST);
+          case NORTH_EAST:
+             return p_185499_1_.func_206870_a(field_176568_b, RailShape.SOUTH_WEST);
+             //Forge fix: MC-196102
+         case NORTH_SOUTH:
+         case EAST_WEST:
+            return p_185499_1_;
+          }
+       case COUNTERCLOCKWISE_90:
+          switch((RailShape)p_185499_1_.func_177229_b(field_176568_b)) {
+@@ -255,4 +265,8 @@
    protected void func_206840_a(StateContainer.Builder<Block, BlockState> p_206840_1_) {
       p_206840_1_.func_206894_a(field_176568_b, field_176569_M);
    }
@@ -0,0 +1,13 @@
+--- a/net/minecraft/block/RailBlock.java
+++ b/net/minecraft/block/RailBlock.java
+@@ -49,6 +49,10 @@
+             return p_185499_1_.func_206870_a(field_176565_b, RailShape.SOUTH_EAST);
+          case NORTH_EAST:
+             return p_185499_1_.func_206870_a(field_176565_b, RailShape.SOUTH_WEST);
+             //Forge fix: MC-196102
+         case NORTH_SOUTH:
+         case EAST_WEST:
+            return p_185499_1_;
+          }
+       case COUNTERCLOCKWISE_90:
+          switch((RailShape)p_185499_1_.func_177229_b(field_176565_b)) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/StemBlock.java
 +++ b/net/minecraft/block/StemBlock.java
-@@ -40,22 +40,24 @@
+@@ -38,22 +38,24 @@
 
    public void func_225534_a_(BlockState p_225534_1_, ServerWorld p_225534_2_, BlockPos p_225534_3_, Random p_225534_4_) {
       super.func_225534_a_(p_225534_1_, p_225534_2_, p_225534_3_, p_225534_4_);
@@ -30,7 +30,7 @@
          }
 
       }
-@@ -101,4 +103,10 @@
+@@ -98,4 +100,10 @@
    public StemGrownBlock func_208486_d() {
       return this.field_149877_a;
    }
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/MainWindow.java
+++ b/net/minecraft/client/MainWindow.java
+@@ -86,7 +86,7 @@
+       GLFW.glfwWindowHint(139266, 2);
+       GLFW.glfwWindowHint(139267, 0);
+       GLFW.glfwWindowHint(139272, 0);
+-      this.field_198119_f = GLFW.glfwCreateWindow(this.field_198129_p, this.field_198130_q, p_i51170_5_, this.field_198125_l && monitor != null ? monitor.func_197995_f() : 0L, 0L);
+      this.field_198119_f = net.minecraftforge.fml.loading.progress.EarlyProgressVisualization.INSTANCE.handOffWindow(()->this.field_198129_p, ()->this.field_198130_q, ()->p_i51170_5_, ()->this.field_198125_l && monitor != null ? monitor.func_197995_f() : 0L);
+       if (monitor != null) {
+          VideoMode videomode = monitor.func_197992_a(this.field_198125_l ? this.field_198124_k : Optional.empty());
+          this.field_198120_g = this.field_198127_n = monitor.func_197989_c() + videomode.func_198064_a() / 2 - this.field_198129_p / 2;
@@ -16,15 +16,16 @@
       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;
-@@ -368,6 +368,7 @@
-          screensize = p_i45547_1_.field_178743_b;
+@@ -350,7 +350,7 @@
+          i = 0;
       }
 
-+      net.minecraftforge.fml.loading.progress.EarlyProgressVisualization.INSTANCE.join();
-       Util.field_211180_a = RenderSystem.initBackendSystem();
-       this.field_195557_T = new VirtualScreen(this);
-       this.field_195558_d = this.field_195557_T.func_217626_a(screensize, this.field_71474_y.field_198019_u, this.func_230149_ax_());
-@@ -383,13 +384,13 @@
+-      Bootstrap.func_151354_b();
+      net.minecraftforge.fml.loading.BackgroundWaiter.runAndTick(()->Bootstrap.func_151354_b(), net.minecraftforge.fml.loading.FMLLoader.progressWindowTick);
+       Bootstrap.func_218821_c();
+       KeybindTextComponent.field_193637_b = KeyBinding::func_193626_b;
+       this.field_184131_U = DataFixesManager.func_210901_a();
+@@ -383,13 +383,13 @@
 
       this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
       this.field_71417_B = new MouseHelper(this);
@@ -39,7 +40,7 @@
       this.field_71474_y.func_198017_a(this.field_110448_aq);
       this.field_110448_aq.func_198983_a();
       this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab);
-@@ -434,12 +435,14 @@
+@@ -434,12 +434,14 @@
          this.func_193986_ar();
          this.field_110451_am.func_219534_a(this.field_193995_ae);
          this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
@@ -55,7 +56,7 @@
          this.field_184132_p = new DebugRenderer(this);
          RenderSystem.setErrorCallback(this::func_195545_a);
          if (this.field_71474_y.field_74353_u && !this.field_195558_d.func_198113_j()) {
-@@ -451,12 +454,11 @@
+@@ -451,12 +453,11 @@
          this.field_195558_d.func_224798_d(this.field_71474_y.field_225307_E);
          this.field_195558_d.func_227801_c_();
          this.func_213226_a();
@@ -72,7 +73,7 @@
          ResourceLoadProgressGui.func_212970_a(this);
          List<IResourcePack> list = this.field_110448_aq.func_198980_d().stream().map(ResourcePackInfo::func_195796_e).collect(Collectors.toList());
          this.func_213268_a(new ResourceLoadProgressGui(this, this.field_110451_am.func_219537_a(Util.func_215072_e(), this, field_223714_G, list), (p_229990_2_) -> {
-@@ -466,6 +468,14 @@
+@@ -466,6 +467,14 @@
                   this.func_213256_aB();
                }
 
@@ -87,7 +88,16 @@
             });
          }, false));
       }
-@@ -579,7 +589,7 @@
+@@ -505,7 +514,7 @@
+    }
+ 
+    private void func_229988_a_(Throwable p_229988_1_) {
+-      if (this.field_110448_aq.func_198980_d().size() > 1) {
+      if (this.field_110448_aq.func_198980_d().stream().anyMatch(e -> !e.func_195797_g())) { //Forge: This caused infinite loop if any resource packs are forced. Such as mod resources. So check if we can disable any.
+          ITextComponent itextcomponent;
+          if (p_229988_1_ instanceof SimpleReloadableResourceManager.FailedPackException) {
+             itextcomponent = new StringTextComponent(((SimpleReloadableResourceManager.FailedPackException)p_229988_1_).func_230028_a().func_195762_a());
+@@ -579,7 +588,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_) -> {
@@ -96,7 +106,7 @@
       });
       NonNullList<ItemStack> nonnulllist = NonNullList.func_191196_a();
 
-@@ -667,13 +677,13 @@
+@@ -667,13 +676,13 @@
       Bootstrap.func_179870_a(p_71377_0_.func_71502_e());
       if (p_71377_0_.func_71497_f() != null) {
          Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_0_.func_71497_f());
@@ -113,7 +123,7 @@
       }
 
    }
-@@ -682,6 +692,7 @@
+@@ -682,6 +691,7 @@
       return this.field_71474_y.field_211842_aO;
    }
 
@@ -121,7 +131,7 @@
    public CompletableFuture<Void> func_213237_g() {
       if (this.field_213276_aV != null) {
          return this.field_213276_aV;
-@@ -760,10 +771,6 @@
+@@ -760,10 +770,6 @@
    }
 
    public void func_147108_a(@Nullable Screen p_147108_1_) {
@@ -132,7 +142,7 @@
       if (p_147108_1_ == null && this.field_71441_e == null) {
          p_147108_1_ = new MainMenuScreen();
       } else if (p_147108_1_ == null && this.field_71439_g.func_110143_aJ() <= 0.0F) {
-@@ -774,6 +781,14 @@
+@@ -774,6 +780,14 @@
          }
       }
 
@@ -147,7 +157,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);
-@@ -905,11 +920,13 @@
+@@ -905,11 +919,13 @@
       RenderSystem.enableTexture();
       this.field_71424_I.func_76319_b();
       if (!this.field_71454_w) {
@@ -161,7 +171,16 @@
       }
 
       this.field_71424_I.func_219897_b();
-@@ -1164,11 +1181,21 @@
+@@ -976,7 +992,7 @@
+ 
+       Framebuffer framebuffer = this.func_147110_a();
+       framebuffer.func_216491_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l(), field_142025_a);
+-      this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
+      if (this.field_71460_t!=null) this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
+       this.field_71417_B.func_198021_g();
+    }
+ 
+@@ -1164,11 +1180,21 @@
          if (p_147115_1_ && this.field_71476_x != null && this.field_71476_x.func_216346_c() == RayTraceResult.Type.BLOCK) {
             BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
             BlockPos blockpos = blockraytraceresult.func_216350_a();
@@ -185,7 +204,7 @@
                }
             }
 
-@@ -1187,6 +1214,8 @@
+@@ -1187,6 +1213,8 @@
             }
 
          } else if (!this.field_71439_g.func_184838_M()) {
@@ -194,7 +213,7 @@
             switch(this.field_71476_x.func_216346_c()) {
             case ENTITY:
                this.field_71442_b.func_78764_a(this.field_71439_g, ((EntityRayTraceResult)this.field_71476_x).func_216348_a());
-@@ -1194,7 +1223,7 @@
+@@ -1194,7 +1222,7 @@
             case BLOCK:
                BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
                BlockPos blockpos = blockraytraceresult.func_216350_a();
@@ -203,7 +222,7 @@
                   this.field_71442_b.func_180511_b(blockpos, blockraytraceresult.func_216354_b());
                   break;
                }
-@@ -1204,8 +1233,10 @@
+@@ -1204,8 +1232,10 @@
                }
 
                this.field_71439_g.func_184821_cY();
@@ -214,7 +233,7 @@
             this.field_71439_g.func_184609_a(Hand.MAIN_HAND);
          }
       }
-@@ -1220,6 +1251,11 @@
+@@ -1220,6 +1250,11 @@
             }
 
             for(Hand hand : Hand.values()) {
@@ -226,7 +245,7 @@
                ItemStack itemstack = this.field_71439_g.func_184586_b(hand);
                if (this.field_71476_x != null) {
                   switch(this.field_71476_x.func_216346_c()) {
-@@ -1233,6 +1269,7 @@
+@@ -1233,6 +1268,7 @@
 
                      if (actionresulttype.func_226246_a_()) {
                         if (actionresulttype.func_226247_b_()) {
@@ -234,7 +253,7 @@
                            this.field_71439_g.func_184609_a(hand);
                         }
 
-@@ -1245,6 +1282,7 @@
+@@ -1245,6 +1281,7 @@
                      ActionResultType actionresulttype1 = this.field_71442_b.func_217292_a(this.field_71439_g, this.field_71441_e, hand, blockraytraceresult);
                      if (actionresulttype1.func_226246_a_()) {
                         if (actionresulttype1.func_226247_b_()) {
@@ -242,7 +261,7 @@
                            this.field_71439_g.func_184609_a(hand);
                            if (!itemstack.func_190926_b() && (itemstack.func_190916_E() != i || this.field_71442_b.func_78758_h())) {
                               this.field_71460_t.field_78516_c.func_187460_a(hand);
-@@ -1260,6 +1298,9 @@
+@@ -1260,6 +1297,9 @@
                   }
                }
 
@@ -252,7 +271,7 @@
                if (!itemstack.func_190926_b()) {
                   ActionResultType actionresulttype2 = this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, hand);
                   if (actionresulttype2.func_226246_a_()) {
-@@ -1286,6 +1327,8 @@
+@@ -1286,6 +1326,8 @@
          --this.field_71467_ac;
       }
 
@@ -261,7 +280,7 @@
       this.field_71424_I.func_76320_a("gui");
       if (!this.field_71445_n) {
          this.field_71456_v.func_73831_a();
-@@ -1403,6 +1446,8 @@
+@@ -1403,6 +1445,8 @@
       this.field_71424_I.func_219895_b("keyboard");
       this.field_195559_v.func_204870_b();
       this.field_71424_I.func_76319_b();
@@ -270,7 +289,7 @@
    }
 
    private void func_184117_aA() {
-@@ -1557,6 +1602,12 @@
+@@ -1557,6 +1601,12 @@
       this.func_147108_a(worldloadprogressscreen);
 
       while(!this.field_71437_Z.func_71200_ad()) {
@@ -283,7 +302,7 @@
          worldloadprogressscreen.tick();
          this.func_195542_b(false);
 
-@@ -1577,11 +1628,17 @@
+@@ -1577,11 +1627,17 @@
       networkmanager.func_150719_a(new ClientLoginNetHandler(networkmanager, this, (Screen)null, (p_229998_0_) -> {
       }));
       networkmanager.func_179290_a(new CHandshakePacket(socketaddress.toString(), 0, ProtocolType.LOGIN));
@@ -302,7 +321,7 @@
       WorkingScreen workingscreen = new WorkingScreen();
       workingscreen.func_200210_a(new TranslationTextComponent("connect.joining"));
       this.func_213241_c(workingscreen);
-@@ -1613,10 +1670,12 @@
+@@ -1613,10 +1669,12 @@
       IntegratedServer integratedserver = this.field_71437_Z;
       this.field_71437_Z = null;
       this.field_71460_t.func_190564_k();
@@ -315,7 +334,7 @@
          if (integratedserver != null) {
             while(!integratedserver.func_213201_w()) {
                this.func_195542_b(false);
-@@ -1627,6 +1686,7 @@
+@@ -1627,6 +1685,7 @@
          this.field_71456_v.func_181029_i();
          this.field_71422_O = null;
          this.field_71455_al = false;
@@ -323,7 +342,7 @@
          this.field_213274_aO.func_216815_b();
       }
 
-@@ -1649,6 +1709,7 @@
+@@ -1649,6 +1708,7 @@
       this.field_71452_i.func_78870_a(p_213257_1_);
       TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_213257_1_);
       this.func_230150_b_();
@@ -331,7 +350,7 @@
    }
 
    public final boolean func_71355_q() {
-@@ -1674,112 +1735,9 @@
+@@ -1674,112 +1734,9 @@
 
    private void func_147112_ai() {
       if (this.field_71476_x != null && this.field_71476_x.func_216346_c() != RayTraceResult.Type.MISS) {
@@ -447,7 +466,7 @@
       }
    }
 
-@@ -1861,6 +1819,7 @@
+@@ -1861,6 +1818,7 @@
       return field_71432_P;
    }
 
@@ -455,7 +474,7 @@
    public CompletableFuture<Void> func_213245_w() {
       return this.func_213169_a(this::func_213237_g).thenCompose((p_229993_0_) -> {
          return p_229993_0_;
-@@ -1988,6 +1947,8 @@
+@@ -1988,6 +1946,8 @@
    }
 
    public MusicTicker.MusicType func_147109_W() {
@@ -464,7 +483,7 @@
       if (this.field_71462_r instanceof WinGameScreen) {
          return MusicTicker.MusicType.CREDITS;
       } else if (this.field_71439_g == null) {
-@@ -2164,7 +2125,7 @@
+@@ -2164,7 +2124,7 @@
          supplier = func_228022_c_(supplier);
       }
 
@@ -473,7 +492,7 @@
    }
 
    private static Supplier<IResourcePack> func_228021_b_(Supplier<IResourcePack> p_228021_0_) {
-@@ -2182,4 +2143,12 @@
+@@ -2182,4 +2142,12 @@
    public void func_228020_b_(int p_228020_1_) {
       this.field_175617_aL.func_229355_a_(p_228020_1_);
    }
@@ -46,6 +46,15 @@
       }
 
       boolean flag4 = (float)this.func_71024_bL().func_75116_a() > 6.0F || this.field_71075_bZ.field_75101_c;
+@@ -667,7 +675,7 @@
+ 
+       if (this.field_71158_b.field_78901_c && !flag7 && !flag && !this.field_71075_bZ.field_75100_b && !this.func_184218_aH() && !this.func_70617_f_()) {
+          ItemStack itemstack = this.func_184582_a(EquipmentSlotType.CHEST);
+-         if (itemstack.func_77973_b() == Items.field_185160_cR && ElytraItem.func_185069_d(itemstack) && this.func_226566_ei_()) {
+         if (itemstack.canElytraFly(this) && this.func_226566_ei_()) {
+             this.field_71174_a.func_147297_a(new CEntityActionPacket(this, CEntityActionPacket.Action.START_FALL_FLYING));
+          }
+       }
@@ -961,4 +969,16 @@
          return this.field_204230_bP;
       }
@@ -40,3 +40,12 @@
             RenderSystem.disableBlend();
             RenderSystem.popMatrix();
          }
+@@ -1045,7 +1056,7 @@
+          ItemStack itemstack = this.field_73839_d.field_71439_g.field_71071_by.func_70448_g();
+          if (itemstack.func_190926_b()) {
+             this.field_92017_k = 0;
+-         } else if (!this.field_92016_l.func_190926_b() && itemstack.func_77973_b() == this.field_92016_l.func_77973_b() && itemstack.func_200301_q().equals(this.field_92016_l.func_200301_q())) {
+         } else if (!this.field_92016_l.func_190926_b() && itemstack.func_77973_b() == this.field_92016_l.func_77973_b() && (itemstack.func_200301_q().equals(this.field_92016_l.func_200301_q()) && itemstack.getHighlightTip(itemstack.func_200301_q().func_150261_e()).equals(field_92016_l.getHighlightTip(field_92016_l.func_200301_q().func_150261_e())))) {
+             if (this.field_92017_k > 0) {
+                --this.field_92017_k;
+             }
@@ -8,3 +8,19 @@
       if (f < 1.0F) {
          this.func_228181_a_(i / 2 - 150, j / 4 * 3, i / 2 + 150, j / 4 * 3 + 10, 1.0F - MathHelper.func_76131_a(f, 0.0F, 1.0F));
       }
+@@ -90,6 +91,7 @@
+       }
+ 
+       if (this.field_212979_g == -1L && this.field_212975_c.func_219554_d() && (!this.field_212977_e || f1 >= 2.0F)) {
+         this.field_212979_g = Util.func_211177_b(); // Moved up to guard against inf loops caused by callback
+          try {
+             this.field_212975_c.func_219556_e();
+             this.field_212976_d.accept(Optional.empty());
+@@ -97,7 +99,6 @@
+             this.field_212976_d.accept(Optional.of(throwable));
+          }
+ 
+-         this.field_212979_g = Util.func_211177_b();
+          if (this.field_212974_b.field_71462_r != null) {
+             this.field_212974_b.field_71462_r.init(this.field_212974_b, this.field_212974_b.func_228018_at_().func_198107_o(), this.field_212974_b.func_228018_at_().func_198087_p());
+          }
@@ -0,0 +1,14 @@
+--- a/net/minecraft/client/gui/screen/MultiplayerScreen.java
+++ b/net/minecraft/client/gui/screen/MultiplayerScreen.java
+@@ -241,6 +241,11 @@
+ 
+    }
+ 
+   @Override
+   public void onClose() {
+      this.minecraft.func_147108_a(this.field_146798_g);
+   }
+
+    public ServerPinger func_146789_i() {
+       return this.field_146797_f;
+    }
@@ -0,0 +1,15 @@
+--- a/net/minecraft/client/gui/screen/OptionsScreen.java
+++ b/net/minecraft/client/gui/screen/OptionsScreen.java
+@@ -118,4 +118,12 @@
+       this.drawCenteredString(this.font, this.title.func_150254_d(), this.width / 2, 15, 16777215);
+       super.render(p_render_1_, p_render_2_, p_render_3_);
+    }
+
+   @Override
+   public void onClose() {
+      // We need to consider 2 potential parent screens here:
+      // 1. From the main menu, in which case display the main menu
+      // 2. From the pause menu, in which case exit back to game
+      this.minecraft.func_147108_a(this.field_146441_g instanceof IngameMenuScreen ? null : this.field_146441_g);
+   }
+ }
@@ -8,7 +8,7 @@
       if (this.field_78776_a.field_71439_g.func_223729_a(this.field_78776_a.field_71441_e, p_187103_1_, this.field_78779_k)) {
          return false;
       } else {
-@@ -103,7 +104,7 @@
+@@ -103,12 +104,11 @@
             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;
@@ -16,8 +16,14 @@
 +            } 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);
-@@ -129,21 +130,25 @@
+-               block.func_176208_a(world, p_187103_1_, blockstate, this.field_78776_a.field_71439_g);
+                IFluidState ifluidstate = world.func_204610_c(p_187103_1_);
+-               boolean flag = world.func_180501_a(p_187103_1_, ifluidstate.func_206883_i(), 11);
+               boolean flag = blockstate.removedByPlayer(world, p_187103_1_, field_78776_a.field_71439_g, false, ifluidstate);
+                if (flag) {
+                   block.func_176206_d(world, p_187103_1_, blockstate);
+                }
+@@ -129,21 +129,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_);
@@ -44,7 +50,7 @@
             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 {
-@@ -183,22 +188,24 @@
+@@ -183,22 +187,24 @@
          BlockState blockstate1 = this.field_78776_a.field_71441_e.func_180495_p(p_180512_1_);
          this.field_78776_a.func_193032_ao().func_193294_a(this.field_78776_a.field_71441_e, p_180512_1_, blockstate1, 1.0F);
          this.func_225324_a(CPlayerDiggingPacket.Action.START_DESTROY_BLOCK, p_180512_1_, p_180512_2_);
@@ -71,7 +77,7 @@
             if (this.field_78770_f >= 1.0F) {
                this.field_78778_j = false;
                this.func_225324_a(CPlayerDiggingPacket.Action.STOP_DESTROY_BLOCK, p_180512_1_, p_180512_2_);
-@@ -217,7 +224,8 @@
+@@ -217,7 +223,8 @@
    }
 
    public float func_78757_d() {
@@ -81,7 +87,7 @@
    }
 
    public void func_78765_e() {
-@@ -234,7 +242,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()) {
@@ -90,7 +96,7 @@
       }
 
       return p_178893_1_.equals(this.field_178895_c) && flag;
-@@ -256,13 +264,24 @@
+@@ -256,13 +263,27 @@
          return ActionResultType.FAIL;
       } else {
          ItemStack itemstack = p_217292_1_.func_184586_b(p_217292_3_);
@@ -108,7 +114,10 @@
 +            ItemUseContext itemusecontext = new ItemUseContext(p_217292_1_, p_217292_3_, p_217292_4_);
 +            if (event.getUseItem() != net.minecraftforge.eventbus.api.Event.Result.DENY) {
 +               ActionResultType result = itemstack.onItemUseFirst(itemusecontext);
-+               if (result != ActionResultType.PASS) return result;
+               if (result != ActionResultType.PASS) {
+                  this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
+                  return result;
+               }
 +            }
 +            boolean flag = !p_217292_1_.func_184614_ca().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_) || !p_217292_1_.func_184592_cb().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_);
             boolean flag1 = p_217292_1_.func_226563_dT_() && flag;
@@ -117,7 +126,7 @@
                ActionResultType actionresulttype = p_217292_2_.func_180495_p(blockpos).func_227031_a_(p_217292_2_, p_217292_1_, p_217292_3_, p_217292_4_);
                if (actionresulttype.func_226246_a_()) {
                   this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
-@@ -271,8 +290,8 @@
+@@ -271,8 +292,8 @@
             }
 
             this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
@@ -127,7 +136,7 @@
                ActionResultType actionresulttype1;
                if (this.field_78779_k.func_77145_d()) {
                   int i = itemstack.func_190916_E();
-@@ -300,11 +319,14 @@
+@@ -300,11 +321,14 @@
          if (p_187101_1_.func_184811_cZ().func_185141_a(itemstack.func_77973_b())) {
             return ActionResultType.PASS;
          } else {
@@ -142,7 +151,7 @@
             }
 
             return actionresult.func_188397_a();
-@@ -329,6 +351,9 @@
+@@ -329,6 +353,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_));
@@ -152,7 +161,7 @@
       return this.field_78779_k == GameType.SPECTATOR ? ActionResultType.PASS : p_187097_1_.func_190775_a(p_187097_2_, p_187097_3_);
    }
 
-@@ -336,6 +361,9 @@
+@@ -336,6 +363,9 @@
       this.func_78750_j();
       Vec3d vec3d = p_187102_3_.func_216347_e().func_178786_a(p_187102_2_.func_226277_ct_(), p_187102_2_.func_226278_cu_(), p_187102_2_.func_226281_cx_());
       this.field_78774_b.func_147297_a(new CUseEntityPacket(p_187102_2_, p_187102_4_, vec3d));
@@ -95,7 +95,7 @@
 
       p_228800_4_.func_227890_a_(p_228800_5_, p_228800_6_, new float[]{p_228800_7_, p_228800_8_, p_228800_9_, p_228800_10_}, f, f1, f2, new int[]{p_228800_11_, p_228800_12_, p_228800_13_, p_228800_14_}, p_228800_15_, true);
    }
-@@ -208,7 +230,11 @@
+@@ -208,17 +230,21 @@
 
    }
 
@@ -107,3 +107,15 @@
       Random random = new Random();
       long i = 42L;
 
+       for(Direction direction : Direction.values()) {
+          random.setSeed(42L);
+-         func_228803_a_(p_228804_1_, p_228804_2_, p_228804_5_, p_228804_6_, p_228804_7_, p_228804_4_.func_200117_a(p_228804_3_, direction, random), p_228804_8_, p_228804_9_);
+         func_228803_a_(p_228804_1_, p_228804_2_, p_228804_5_, p_228804_6_, p_228804_7_, p_228804_4_.getQuads(p_228804_3_, direction, random, modelData), p_228804_8_, p_228804_9_);
+       }
+ 
+       random.setSeed(42L);
+-      func_228803_a_(p_228804_1_, p_228804_2_, p_228804_5_, p_228804_6_, p_228804_7_, p_228804_4_.func_200117_a(p_228804_3_, (Direction)null, random), p_228804_8_, p_228804_9_);
+      func_228803_a_(p_228804_1_, p_228804_2_, p_228804_5_, p_228804_6_, p_228804_7_, p_228804_4_.getQuads(p_228804_3_, (Direction)null, random, modelData), p_228804_8_, p_228804_9_);
+    }
+ 
+    private static void func_228803_a_(MatrixStack.Entry p_228803_0_, IVertexBuilder p_228803_1_, float p_228803_2_, float p_228803_3_, float p_228803_4_, List<BakedQuad> p_228803_5_, int p_228803_6_, int p_228803_7_) {
@@ -1,5 +1,14 @@
 --- a/net/minecraft/client/renderer/BlockRendererDispatcher.java
 +++ b/net/minecraft/client/renderer/BlockRendererDispatcher.java
+@@ -32,7 +32,7 @@
+    public BlockRendererDispatcher(BlockModelShapes p_i46577_1_, BlockColors p_i46577_2_) {
+       this.field_175028_a = p_i46577_1_;
+       this.field_228790_e_ = p_i46577_2_;
+-      this.field_175027_c = new BlockModelRenderer(this.field_228790_e_);
+      this.field_175027_c = new net.minecraftforge.client.model.pipeline.ForgeBlockModelRenderer(this.field_228790_e_);
+       this.field_175025_e = new FluidBlockRenderer();
+    }
+ 
@@ -40,18 +40,26 @@
       return this.field_175028_a;
    }
@@ -41,7 +50,7 @@
       BlockRenderType blockrendertype = p_228791_1_.func_185901_i();
       if (blockrendertype != BlockRenderType.INVISIBLE) {
          switch(blockrendertype) {
-@@ -89,7 +101,7 @@
+@@ -89,10 +101,11 @@
             float f = (float)(i >> 16 & 255) / 255.0F;
             float f1 = (float)(i >> 8 & 255) / 255.0F;
             float f2 = (float)(i & 255) / 255.0F;
@@ -49,8 +58,13 @@
 +            this.field_175027_c.renderModel(p_228791_2_.func_227866_c_(), p_228791_3_.getBuffer(RenderTypeLookup.func_228394_b_(p_228791_1_)), p_228791_1_, ibakedmodel, f, f1, f2, p_228791_4_, p_228791_5_, modelData);
             break;
          case ENTITYBLOCK_ANIMATED:
-             ItemStackTileEntityRenderer.field_147719_a.func_228364_a_(new ItemStack(p_228791_1_.func_177230_c()), p_228791_2_, p_228791_3_, p_228791_4_, p_228791_5_);
-@@ -101,4 +113,9 @@
+-            ItemStackTileEntityRenderer.field_147719_a.func_228364_a_(new ItemStack(p_228791_1_.func_177230_c()), p_228791_2_, p_228791_3_, p_228791_4_, p_228791_5_);
+            ItemStack stack = new ItemStack(p_228791_1_.func_177230_c());
+            stack.func_77973_b().getItemStackTileEntityRenderer().func_228364_a_(stack, p_228791_2_, p_228791_3_, p_228791_4_, p_228791_5_);
+          }
+ 
+       }
+@@ -101,4 +114,9 @@
    public void func_195410_a(IResourceManager p_195410_1_) {
       this.field_175025_e.func_178268_a();
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/BufferBuilder.java
 +++ b/net/minecraft/client/renderer/BufferBuilder.java
-@@ -121,7 +121,6 @@
+@@ -122,7 +122,6 @@
 
          bitset.set(l);
       }
@@ -8,16 +8,25 @@
    }
 
    private void func_227829_a_(FloatBuffer p_227829_1_, int p_227829_2_) {
-@@ -364,4 +363,14 @@
+@@ -298,6 +297,7 @@
+       }
+ 
+       ByteBuffer bytebuffer = this.field_179001_a.slice();
+      bytebuffer.order(this.field_179001_a.order()); // FORGE: Fix incorrect byte order
+       ((Buffer)this.field_179001_a).clear();
+       return Pair.of(bufferbuilder$drawstate, bytebuffer);
+    }
+@@ -365,4 +365,15 @@
          this.field_179018_e = p_i225907_2_;
       }
    }
 +
 +   public void putBulkData(ByteBuffer buffer) {
 +      func_181670_b(buffer.limit() + this.field_179011_q.func_177338_f());
-+      this.field_179001_a.position(this.field_178997_d * this.field_179011_q.func_177338_f());
+      ((Buffer)this.field_179001_a).position(this.field_178997_d * this.field_179011_q.func_177338_f());
 +      this.field_179001_a.put(buffer);
 +      this.field_178997_d += buffer.limit() / this.field_179011_q.func_177338_f();
+      this.field_227824_l_ += buffer.limit();
 +   }
 +
 +   // Forge start
@@ -35,14 +35,14 @@
       if (flag) {
          float f5 = hand == Hand.MAIN_HAND ? f : 0.0F;
          float f2 = 1.0F - MathHelper.func_219799_g(p_228396_1_, this.field_187470_g, this.field_187469_f);
-+         if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(Hand.MAIN_HAND, p_228396_2_, p_228396_3_, p_228396_5_, p_228396_1_, f1, f3, f5, this.field_187467_d))
+         if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(Hand.MAIN_HAND, p_228396_2_, p_228396_3_, p_228396_5_, p_228396_1_, f1, f5, f2, this.field_187467_d))
          this.func_228405_a_(p_228396_4_, p_228396_1_, f1, Hand.MAIN_HAND, f5, this.field_187467_d, f2, p_228396_2_, p_228396_3_, p_228396_5_);
       }
 
       if (flag1) {
          float f6 = hand == Hand.OFF_HAND ? f : 0.0F;
          float f7 = 1.0F - MathHelper.func_219799_g(p_228396_1_, this.field_187472_i, this.field_187471_h);
-+         if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(Hand.OFF_HAND, p_228396_2_, p_228396_3_, p_228396_5_, p_228396_1_, f1, f4, f6, this.field_187468_e))
+         if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(Hand.OFF_HAND, p_228396_2_, p_228396_3_, p_228396_5_, p_228396_1_, f1, f6, f7, this.field_187468_e))
          this.func_228405_a_(p_228396_4_, p_228396_1_, f1, Hand.OFF_HAND, f6, this.field_187468_e, f7, p_228396_2_, p_228396_3_, p_228396_5_);
       }
 
@@ -20,19 +20,19 @@
 -            this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, f14, f18, j);
 -            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, f15, f19, j);
 -            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, f16, f20, j);
-+            this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j);
-+            this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j);
-+            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j);
-+            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j);
+            this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j);
+            this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j);
+            this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j);
+            this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j);
             if (p_228796_4_.func_205586_a(p_228796_1_, p_228796_2_.func_177984_a())) {
 -               this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, f13, f17, j);
 -               this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, f16, f20, j);
 -               this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, f15, f19, j);
 -               this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, f14, f18, j);
-+               this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j);
-+               this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j);
-+               this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j);
-+               this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j);
+               this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j);
+               this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j);
+               this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j);
+               this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j);
             }
          }
 
@@ -44,27 +44,28 @@
 -            this.func_228797_a_(p_228796_3_, d0, d1 + (double)f12, d2, f40, f41, f42, f34, f37, i1);
 -            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2, f40, f41, f42, f35, f37, i1);
 -            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, f35, f39, i1);
-+            this.func_228797_a_(p_228796_3_, d0, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f34, f39, i1);
-+            this.func_228797_a_(p_228796_3_, d0, d1 + (double)f12, d2, f40, f41, f42, alpha, f34, f37, i1);
-+            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2, f40, f41, f42, alpha, f35, f37, i1);
-+            this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f35, f39, i1);
+            this.vertex(p_228796_3_, d0, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f34, f39, i1);
+            this.vertex(p_228796_3_, d0, d1 + (double)f12, d2, f40, f41, f42, alpha, f34, f37, i1);
+            this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2, f40, f41, f42, alpha, f35, f37, i1);
+            this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f35, f39, i1);
             flag7 = true;
          }
 
-@@ -222,10 +223,10 @@
+@@ -222,10 +223,9 @@
                flag7 = true;
                BlockPos blockpos = p_228796_2_.func_177972_a(direction);
                TextureAtlasSprite textureatlassprite2 = atextureatlassprite[1];
 -               if (!flag) {
-+               if (atextureatlassprite[2] != null) {
-                   Block block = p_228796_1_.func_180495_p(blockpos).func_177230_c();
-                   if (block == Blocks.field_150359_w || block instanceof StainedGlassBlock) {
+-                  Block block = p_228796_1_.func_180495_p(blockpos).func_177230_c();
+-                  if (block == Blocks.field_150359_w || block instanceof StainedGlassBlock) {
 -                     textureatlassprite2 = this.field_187501_d;
+               if (atextureatlassprite[2] != null) {
+                  if (p_228796_1_.func_180495_p(blockpos).shouldDisplayFluidOverlay(p_228796_1_, blockpos, p_228796_4_)) {
 +                     textureatlassprite2 = atextureatlassprite[2];
                   }
                }
 
-@@ -239,15 +240,15 @@
+@@ -239,15 +239,15 @@
                float f31 = 1.0F * f30 * f;
                float f32 = 1.0F * f30 * f1;
                float f33 = 1.0F * f30 * f2;
@@ -77,29 +78,29 @@
 -                  this.func_228797_a_(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, f49, f29, k);
 -                  this.func_228797_a_(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, f49, f28, k);
 -                  this.func_228797_a_(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, f48, f50, k);
-+               this.func_228797_a_(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k);
-+               this.func_228797_a_(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k);
-+               this.func_228797_a_(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k);
-+               this.func_228797_a_(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k);
+               this.vertex(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k);
+               this.vertex(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k);
+               this.vertex(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k);
+               this.vertex(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k);
 +               if (textureatlassprite2 != atextureatlassprite[2]) {
-+                  this.func_228797_a_(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k);
-+                  this.func_228797_a_(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k);
-+                  this.func_228797_a_(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k);
-+                  this.func_228797_a_(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k);
+                  this.vertex(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k);
+                  this.vertex(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k);
+                  this.vertex(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k);
+                  this.vertex(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k);
                }
             }
          }
-@@ -256,10 +257,15 @@
+@@ -256,10 +256,15 @@
       }
    }
 
 +   @Deprecated
    private void func_228797_a_(IVertexBuilder p_228797_1_, double p_228797_2_, double p_228797_4_, double p_228797_6_, float p_228797_8_, float p_228797_9_, float p_228797_10_, float p_228797_11_, float p_228797_12_, int p_228797_13_) {
 -      p_228797_1_.func_225582_a_(p_228797_2_, p_228797_4_, p_228797_6_).func_227885_a_(p_228797_8_, p_228797_9_, p_228797_10_, 1.0F).func_225583_a_(p_228797_11_, p_228797_12_).func_227886_a_(p_228797_13_).func_225584_a_(0.0F, 1.0F, 0.0F).func_181675_d();
-+      func_228797_a_(p_228797_1_, p_228797_2_, p_228797_4_, p_228797_6_, p_228797_8_, p_228797_9_, p_228797_10_, 1.0F, p_228797_11_, p_228797_12_, p_228797_13_);
+      vertex(p_228797_1_, p_228797_2_, p_228797_4_, p_228797_6_, p_228797_8_, p_228797_9_, p_228797_10_, 1.0F, p_228797_11_, p_228797_12_, p_228797_13_);
    }
 
-+   private void func_228797_a_(IVertexBuilder p_228797_1_, double p_228797_2_, double p_228797_4_, double p_228797_6_, float p_228797_8_, float p_228797_9_, float p_228797_10_, float alpha, float p_228797_11_, float p_228797_12_, int p_228797_13_) {
+   private void vertex(IVertexBuilder p_228797_1_, double p_228797_2_, double p_228797_4_, double p_228797_6_, float p_228797_8_, float p_228797_9_, float p_228797_10_, float alpha, float p_228797_11_, float p_228797_12_, int p_228797_13_) {
 +      p_228797_1_.func_225582_a_(p_228797_2_, p_228797_4_, p_228797_6_).func_227885_a_(p_228797_8_, p_228797_9_, p_228797_10_, alpha).func_225583_a_(p_228797_11_, p_228797_12_).func_227886_a_(p_228797_13_).func_225584_a_(0.0F, 1.0F, 0.0F).func_181675_d();
 +   }
 +
@@ -40,7 +40,7 @@
       p_228378_4_.func_227863_a_(Vector3f.field_229181_d_.func_229187_a_(activerenderinfo.func_216778_f() + 180.0F));
       this.field_78531_r.field_71438_f.func_228426_a_(p_228378_4_, p_228378_1_, p_228378_2_, flag, activerenderinfo, this, this.field_78513_d, matrix4f);
 +      this.field_78531_r.func_213239_aq().func_219895_b("forge_render_last");
-+      net.minecraftforge.client.ForgeHooksClient.dispatchRenderLast(this.field_78531_r.field_71438_f, p_228378_4_, p_228378_2_);
+      net.minecraftforge.client.ForgeHooksClient.dispatchRenderLast(this.field_78531_r.field_71438_f, p_228378_4_, p_228378_1_, matrix4f, p_228378_2_);
       this.field_78531_r.func_213239_aq().func_219895_b("hand");
       if (this.field_175074_C) {
          RenderSystem.clear(256, Minecraft.field_142025_a);
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/RenderState.java
+++ b/net/minecraft/client/renderer/RenderState.java
+@@ -360,7 +360,7 @@
+       private final OptionalDouble field_228587_Q_;
+ 
+       public LineState(OptionalDouble p_i225982_1_) {
+-         super("alpha", () -> {
+         super("line_width", () -> { // FORGE: fix MC-167447
+             if (!Objects.equals(p_i225982_1_, OptionalDouble.of(1.0D))) {
+                if (p_i225982_1_.isPresent()) {
+                   RenderSystem.lineWidth((float)p_i225982_1_.getAsDouble());
@@ -73,19 +73,79 @@
             IVertexBuilder ivertexbuilder2 = irendertypebuffer$impl.getBuffer(RenderType.func_228659_m_());
             this.func_228429_a_(p_228426_1_, ivertexbuilder2, p_228426_6_.func_216773_g(), d0, d1, d2, blockpos, blockstate);
          }
-@@ -1380,6 +1390,11 @@
+@@ -1380,6 +1390,15 @@
    }
 
    public void func_228424_a_(MatrixStack p_228424_1_, float p_228424_2_) {
 +      net.minecraftforge.client.IRenderHandler renderer = this.field_72769_h.func_201675_m().getSkyRenderer();
 +      if (renderer != null) {
-+         renderer.render(this.field_72773_u, p_228424_2_, this.field_72769_h, this.field_72777_q);
+         if (renderer instanceof net.minecraftforge.client.SkyRenderHandler) {
+            ((net.minecraftforge.client.SkyRenderHandler) renderer).render(this.field_72773_u, p_228424_2_, p_228424_1_, this.field_72769_h, this.field_72777_q);
+         } else {
+            renderer.render(this.field_72773_u, p_228424_2_, 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_228444_b_(p_228424_1_);
       } else if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d()) {
-@@ -2283,8 +2298,8 @@
+@@ -1508,6 +1527,15 @@
+    }
+ 
+    public void func_228425_a_(MatrixStack p_228425_1_, float p_228425_2_, double p_228425_3_, double p_228425_5_, double p_228425_7_) {
+      net.minecraftforge.client.IRenderHandler renderer = this.field_72769_h.func_201675_m().getCloudRenderer();
+      if (renderer != null) {
+         if (renderer instanceof net.minecraftforge.client.CloudRenderHandler) {
+            ((net.minecraftforge.client.CloudRenderHandler) renderer).render(this.field_72773_u, p_228425_2_, p_228425_1_, this.field_72769_h, this.field_72777_q);
+         } else {
+            renderer.render(this.field_72773_u, p_228425_2_, this.field_72769_h, this.field_72777_q);
+         }
+         return;
+      }
+       if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d()) {
+          RenderSystem.disableCull();
+          RenderSystem.enableBlend();
+@@ -1689,7 +1717,7 @@
+ 
+          while(iterator.hasNext()) {
+             ChunkRenderDispatcher.ChunkRender chunkrenderdispatcher$chunkrender = iterator.next();
+-            if (chunkrenderdispatcher$chunkrender.func_188281_o()) {
+            if (!net.minecraftforge.common.ForgeConfig.CLIENT.alwaysSetupTerrainOffThread.get() && chunkrenderdispatcher$chunkrender.func_188281_o()) {
+                this.field_174995_M.func_228902_a_(chunkrenderdispatcher$chunkrender);
+             } else {
+                chunkrenderdispatcher$chunkrender.func_228929_a_(this.field_174995_M);
+@@ -1977,7 +2005,12 @@
+       this.field_175008_n.func_217628_a(p_215319_1_, p_215319_2_, p_215319_3_, p_215319_4_);
+    }
+ 
+   @Deprecated // Forge: use item aware function below
+    public void func_184377_a(@Nullable SoundEvent p_184377_1_, BlockPos p_184377_2_) {
+      this.playRecord(p_184377_1_, p_184377_2_, p_184377_1_ == null? null : MusicDiscItem.func_185074_a(p_184377_1_));
+   }
+
+   public void playRecord(@Nullable SoundEvent p_184377_1_, BlockPos p_184377_2_, @Nullable MusicDiscItem musicDiscItem) {
+       ISound isound = this.field_147593_P.get(p_184377_2_);
+       if (isound != null) {
+          this.field_72777_q.func_147118_V().func_147683_b(isound);
+@@ -1985,7 +2018,7 @@
+       }
+ 
+       if (p_184377_1_ != null) {
+-         MusicDiscItem musicdiscitem = MusicDiscItem.func_185074_a(p_184377_1_);
+         MusicDiscItem musicdiscitem = musicDiscItem;
+          if (musicdiscitem != null) {
+             this.field_72777_q.field_71456_v.func_73833_a(musicdiscitem.func_200299_h().func_150254_d());
+          }
+@@ -2133,7 +2166,7 @@
+          break;
+       case 1010:
+          if (Item.func_150899_d(p_180439_4_) instanceof MusicDiscItem) {
+-            this.func_184377_a(((MusicDiscItem)Item.func_150899_d(p_180439_4_)).func_185075_h(), p_180439_3_);
+            this.playRecord(((MusicDiscItem)Item.func_150899_d(p_180439_4_)).func_185075_h(), p_180439_3_, (MusicDiscItem) Item.func_150899_d(p_180439_4_));
+          } else {
+             this.func_184377_a((SoundEvent)null, p_180439_3_);
+          }
+@@ -2283,8 +2316,8 @@
          break;
       case 2001:
          BlockState blockstate = Block.func_196257_b(p_180439_4_);
@@ -96,7 +156,7 @@
             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);
          }
 
-@@ -2432,7 +2447,7 @@
+@@ -2432,7 +2465,7 @@
       } else {
          int i = p_228420_0_.func_226658_a_(LightType.SKY, p_228420_2_);
          int j = p_228420_0_.func_226658_a_(LightType.BLOCK, p_228420_2_);
@@ -105,7 +165,7 @@
          if (j < k) {
             j = k;
          }
-@@ -2445,6 +2460,11 @@
+@@ -2445,6 +2478,11 @@
       return this.field_175015_z;
    }
 
@@ -6,7 +6,7 @@
    public void func_225623_a_(T p_225623_1_, float p_225623_2_, float p_225623_3_, MatrixStack p_225623_4_, IRenderTypeBuffer p_225623_5_, int p_225623_6_) {
 -      if (this.func_177070_b(p_225623_1_)) {
 -         this.func_225629_a_(p_225623_1_, p_225623_1_.func_145748_c_().func_150254_d(), p_225623_4_, p_225623_5_, p_225623_6_);
-+      net.minecraftforge.client.event.RenderNameplateEvent renderNameplateEvent = new net.minecraftforge.client.event.RenderNameplateEvent(p_225623_1_,p_225623_1_.func_145748_c_().func_150254_d(), p_225623_4_, p_225623_5_);
+      net.minecraftforge.client.event.RenderNameplateEvent renderNameplateEvent = new net.minecraftforge.client.event.RenderNameplateEvent(p_225623_1_, p_225623_1_.func_145748_c_().func_150254_d(), this, p_225623_4_, p_225623_5_, p_225623_6_);
 +      net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(renderNameplateEvent);
 +      if (renderNameplateEvent.getResult() != net.minecraftforge.eventbus.api.Event.Result.DENY && (renderNameplateEvent.getResult() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || this.func_177070_b(p_225623_1_))) {
 +         this.func_225629_a_(p_225623_1_, renderNameplateEvent.getContent(), p_225623_4_, p_225623_5_, p_225623_6_);
@@ -0,0 +1,54 @@
+--- a/net/minecraft/client/renderer/entity/layers/ElytraLayer.java
+++ b/net/minecraft/client/renderer/entity/layers/ElytraLayer.java
+@@ -29,7 +29,7 @@
+ 
+    public void func_225628_a_(MatrixStack p_225628_1_, IRenderTypeBuffer p_225628_2_, int p_225628_3_, T p_225628_4_, float p_225628_5_, float p_225628_6_, float p_225628_7_, float p_225628_8_, float p_225628_9_, float p_225628_10_) {
+       ItemStack itemstack = p_225628_4_.func_184582_a(EquipmentSlotType.CHEST);
+-      if (itemstack.func_77973_b() == Items.field_185160_cR) {
+      if (shouldRender(itemstack, p_225628_4_)) {
+          ResourceLocation resourcelocation;
+          if (p_225628_4_ instanceof AbstractClientPlayerEntity) {
+             AbstractClientPlayerEntity abstractclientplayerentity = (AbstractClientPlayerEntity)p_225628_4_;
+@@ -38,10 +38,10 @@
+             } else if (abstractclientplayerentity.func_152122_n() && abstractclientplayerentity.func_110303_q() != null && abstractclientplayerentity.func_175148_a(PlayerModelPart.CAPE)) {
+                resourcelocation = abstractclientplayerentity.func_110303_q();
+             } else {
+-               resourcelocation = field_188355_a;
+               resourcelocation = getElytraTexture(itemstack, p_225628_4_);
+             }
+          } else {
+-            resourcelocation = field_188355_a;
+            resourcelocation = getElytraTexture(itemstack, p_225628_4_);
+          }
+ 
+          p_225628_1_.func_227860_a_();
+@@ -53,4 +53,29 @@
+          p_225628_1_.func_227865_b_();
+       }
+    }
+
+   /**
+    * Determines if the ElytraLayer should render.
+    * ItemStack and Entity are provided for modder convenience,
+    * For example, using the same ElytraLayer for multiple custom Elytra.
+    *
+    * @param stack  The Elytra ItemStack
+    * @param entity The entity being rendered.
+    * @return If the ElytraLayer should render.
+    */
+   public boolean shouldRender(ItemStack stack, T entity) {
+      return stack.func_77973_b() == Items.field_185160_cR;
+   }
+
+   /**
+    * Gets the texture to use with this ElytraLayer.
+    * This assumes the vanilla Elytra model.
+    *
+    * @param stack  The Elytra ItemStack.
+    * @param entity The entity being rendered.
+    * @return The texture.
+    */
+   public ResourceLocation getElytraTexture(ItemStack stack, T entity) {
+      return field_188355_a;
+   }
+ }
@@ -78,3 +78,11 @@
    public boolean func_178300_b(String p_178300_1_) {
       return !MissingTextureSprite.func_195675_b().equals(this.func_228816_c_(p_178300_1_).func_229313_b_());
    }
+@@ -373,5 +396,7 @@
+       public boolean func_230178_a_() {
+          return this == SIDE;
+       }
+      
+      public String getSerializedName() { return field_230177_c_; }
+    }
+ }
@@ -11,7 +11,7 @@
    List<BakedQuad> func_200117_a(@Nullable BlockState p_200117_1_, @Nullable Direction p_200117_2_, Random p_200117_3_);
 
    boolean func_177555_b();
-@@ -21,9 +23,12 @@
+@@ -21,9 +23,13 @@
 
    boolean func_188618_c();
 
@@ -20,6 +20,7 @@
    TextureAtlasSprite func_177554_e();
 
 -   ItemCameraTransforms func_177552_f();
+   /**@deprecated Forge: Use {@link net.minecraftforge.client.extensions.IForgeBakedModel#handlePerspective(net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType, com.mojang.blaze3d.matrix.MatrixStack)} instead */
 +   @Deprecated
 +   default ItemCameraTransforms func_177552_f() { return ItemCameraTransforms.field_178357_a; }
 
@@ -1,17 +1,6 @@
 --- a/net/minecraft/client/renderer/model/ItemCameraTransforms.java
 +++ b/net/minecraft/client/renderer/model/ItemCameraTransforms.java
-@@ -9,6 +9,10 @@
- import net.minecraftforge.api.distmarker.Dist;
- import net.minecraftforge.api.distmarker.OnlyIn;
- 
-+/**
-+ * @deprecated use {@link net.minecraft.client.renderer.model.IBakedModel#handlePerspective(TransformType)} instead
-+ */
-+@Deprecated
- @OnlyIn(Dist.CLIENT)
- public class ItemCameraTransforms {
-    public static final ItemCameraTransforms field_178357_a = new ItemCameraTransforms();
-@@ -25,6 +29,7 @@
+@@ -25,6 +25,7 @@
       this(ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a);
    }
 
@@ -19,7 +8,7 @@
    public ItemCameraTransforms(ItemCameraTransforms p_i46443_1_) {
       this.field_188036_k = p_i46443_1_.field_188036_k;
       this.field_188037_l = p_i46443_1_.field_188037_l;
-@@ -36,6 +41,7 @@
+@@ -36,6 +37,7 @@
       this.field_181700_p = p_i46443_1_.field_181700_p;
    }
 
@@ -27,7 +16,7 @@
    public ItemCameraTransforms(ItemTransformVec3f p_i46569_1_, ItemTransformVec3f p_i46569_2_, ItemTransformVec3f p_i46569_3_, ItemTransformVec3f p_i46569_4_, ItemTransformVec3f p_i46569_5_, ItemTransformVec3f p_i46569_6_, ItemTransformVec3f p_i46569_7_, ItemTransformVec3f p_i46569_8_) {
       this.field_188036_k = p_i46569_1_;
       this.field_188037_l = p_i46569_2_;
-@@ -47,6 +53,7 @@
+@@ -47,6 +49,7 @@
       this.field_181700_p = p_i46569_8_;
    }
 
@@ -50,7 +50,7 @@
       this.field_217848_D.addAll(p_209593_2_.func_187965_e());
    }
 
-+   // Same as func_217843_a but without restricting to MRL's
+   // Same as loadTopModel but without restricting to MRL's
 +   private void addModelToCache(ResourceLocation p_217843_1_) {
 +      IUnbakedModel iunbakedmodel = this.func_209597_a(p_217843_1_);
 +      this.field_217849_F.put(p_217843_1_, iunbakedmodel);
@@ -41,7 +41,7 @@
    }
 
    public AtlasTexture func_229356_a_(ResourceLocation p_229356_1_) {
-+      if (this.field_229352_b_ == null) throw new RuntimeException("func_229356_a_ called too early!");
+      if (this.field_229352_b_ == null) throw new RuntimeException("getAtlasTexture called too early!");
       return this.field_229352_b_.func_229152_a_(p_229356_1_);
    }
 
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/renderer/model/VariantList.java
+++ b/net/minecraft/client/renderer/model/VariantList.java
+@@ -64,7 +64,7 @@
+          WeightedBakedModel.Builder weightedbakedmodel$builder = new WeightedBakedModel.Builder();
+ 
+          for(Variant variant : this.func_188114_a()) {
+-            IBakedModel ibakedmodel = p_225613_1_.func_217845_a(variant.func_188046_a(), variant);
+            IBakedModel ibakedmodel = p_225613_1_.getBakedModel(variant.func_188046_a(), variant, p_225613_2_);
+             weightedbakedmodel$builder.func_177677_a(ibakedmodel, variant.func_188047_d());
+          }
+ 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/texture/NativeImage.java
 +++ b/net/minecraft/client/renderer/texture/NativeImage.java
-@@ -179,7 +179,7 @@
+@@ -180,7 +180,7 @@
    public int func_195709_a(int p_195709_1_, int p_195709_2_) {
       if (this.field_211680_b != NativeImage.PixelFormat.RGBA) {
          throw new IllegalArgumentException(String.format("getPixelRGBA only works on RGBA images; have %s", this.field_211680_b));
@@ -9,7 +9,7 @@
          this.func_195696_g();
          long i = (long)((p_195709_1_ + p_195709_2_ * this.field_195719_a) * 4);
          return MemoryUtil.memGetInt(this.field_195722_d + i);
-@@ -191,7 +191,7 @@
+@@ -192,7 +192,7 @@
    public void func_195700_a(int p_195700_1_, int p_195700_2_, int p_195700_3_) {
       if (this.field_211680_b != NativeImage.PixelFormat.RGBA) {
          throw new IllegalArgumentException(String.format("getPixelRGBA only works on RGBA images; have %s", this.field_211680_b));
@@ -18,7 +18,7 @@
          this.func_195696_g();
          long i = (long)((p_195700_1_ + p_195700_2_ * this.field_195719_a) * 4);
          MemoryUtil.memPutInt(this.field_195722_d + i, p_195700_3_);
-@@ -203,7 +203,7 @@
+@@ -204,7 +204,7 @@
    public byte func_211675_e(int p_211675_1_, int p_211675_2_) {
       if (!this.field_211680_b.func_211653_r()) {
          throw new IllegalArgumentException(String.format("no luminance or alpha in %s", this.field_211680_b));
@@ -4,7 +4,7 @@
       this.field_135037_b = p_i1303_2_;
       this.field_135038_c = p_i1303_3_;
       this.field_135036_d = p_i1303_4_;
-+      String[] splitLangCode = field_135038_c.split("_", 2);
+      String[] splitLangCode = field_135039_a.split("_", 2);
 +      if (splitLangCode.length == 1) { // Vanilla has some languages without underscores
 +          this.javaLocale = new java.util.Locale(field_135039_a);
 +      } else {
@@ -0,0 +1,47 @@
+--- a/net/minecraft/client/shader/Framebuffer.java
+++ b/net/minecraft/client/shader/Framebuffer.java
+@@ -100,8 +100,14 @@
+       GlStateManager.func_227645_a_(FramebufferConstants.field_227592_a_, FramebufferConstants.field_227594_c_, 3553, this.field_147617_g, 0);
+       if (this.field_147619_e) {
+          GlStateManager.func_227730_i_(FramebufferConstants.field_227593_b_, this.field_147624_h);
+         if (!stencilEnabled) {
+          GlStateManager.func_227678_b_(FramebufferConstants.field_227593_b_, 33190, this.field_147622_a, this.field_147620_b);
+          GlStateManager.func_227693_c_(FramebufferConstants.field_227592_a_, FramebufferConstants.field_227595_d_, FramebufferConstants.field_227593_b_, this.field_147624_h);
+         } else {
+         GlStateManager.func_227678_b_(FramebufferConstants.field_227593_b_, org.lwjgl.opengl.EXTPackedDepthStencil.GL_DEPTH24_STENCIL8_EXT, this.field_147622_a, this.field_147620_b);
+         GlStateManager.func_227693_c_(FramebufferConstants.field_227592_a_, org.lwjgl.opengl.EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, FramebufferConstants.field_227593_b_, this.field_147624_h);
+         GlStateManager.func_227693_c_(FramebufferConstants.field_227592_a_, org.lwjgl.opengl.EXTFramebufferObject.GL_STENCIL_ATTACHMENT_EXT, FramebufferConstants.field_227593_b_, this.field_147624_h);
+         }
+       }
+ 
+       this.func_147611_b();
+@@ -254,4 +260,29 @@
+       GlStateManager.func_227658_a_(i, p_216493_1_);
+       this.func_147609_e();
+    }
+
+    /*================================ FORGE START ================================================*/
+    private boolean stencilEnabled = false;
+    /**
+     * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
+     * Modders must call this directly to set things up.
+     * This is to prevent the default cause where graphics cards do not support stencil bits.
+     * <b>Make sure to call this on the main render thread!</b>
+     */
+    public void enableStencil()
+    {
+        if(stencilEnabled) return;
+        stencilEnabled = true;
+        this.func_216491_a(field_147621_c, field_147618_d, net.minecraft.client.Minecraft.field_142025_a);
+    }
+
+    /**
+     * Returns wither or not this FBO has been successfully initialized with stencil bits.
+     * If not, and a modder wishes it to be, they must call enableStencil.
+     */
+    public boolean isStencilEnabled()
+    {
+        return this.stencilEnabled;
+    }
+    /*================================ FORGE END   ================================================*/
+ }
@@ -69,3 +69,12 @@
       if (p_217384_1_ == this.field_73037_M.field_71439_g) {
          this.field_73037_M.func_147118_V().func_147682_a(new EntityTickableSound(p_217384_3_, p_217384_4_, p_217384_2_));
       }
+@@ -689,7 +706,7 @@
+    }
+ 
+    public double func_228331_m_() {
+-      return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
+      return this.field_73011_w.getHorizonHeight();
+    }
+ 
+    public int func_228332_n_() {
@@ -1,6 +1,10 @@
 --- a/net/minecraft/data/DataGenerator.java
 +++ b/net/minecraft/data/DataGenerator.java
-@@ -19,7 +19,7 @@
+@@ -16,10 +16,11 @@
+    private final Collection<Path> field_200394_b;
+    private final Path field_200395_c;
+    private final List<IDataProvider> field_200396_d = Lists.newArrayList();
+   private final List<IDataProvider> providerView = java.util.Collections.unmodifiableList(field_200396_d);
 
    public DataGenerator(Path p_i48266_1_, Collection<Path> p_i48266_2_) {
       this.field_200395_c = p_i48266_1_;
@@ -9,10 +13,22 @@
    }
 
    public Collection<Path> func_200389_a() {
-@@ -53,6 +53,10 @@
+@@ -38,6 +39,7 @@
+ 
+       for(IDataProvider idataprovider : this.field_200396_d) {
+          field_200393_a.info("Starting provider: {}", (Object)idataprovider.func_200397_b());
+         net.minecraftforge.fml.StartupMessageManager.addModMessage("Generating: " + idataprovider.func_200397_b());
+          stopwatch1.start();
+          idataprovider.func_200398_a(directorycache);
+          stopwatch1.stop();
+@@ -53,6 +55,14 @@
       this.field_200396_d.add(p_200390_1_);
    }
 
+   public List<IDataProvider> getProviders() {
+       return this.providerView;
+   }
+
 +   public void addInput(Path value) {
 +      this.field_200394_b.add(value);
 +   }
@@ -1,11 +1,13 @@
 --- a/net/minecraft/data/DirectoryCache.java
 +++ b/net/minecraft/data/DirectoryCache.java
-@@ -23,7 +23,7 @@
-    private final Path field_208326_c;
-    private int field_208327_d;
-    private final Map<Path, String> field_208328_e = Maps.newHashMap();
-   private final Map<Path, String> field_208329_f = Maps.newHashMap();
-+   private final Map<Path, String> field_208329_f = Maps.newTreeMap(); //Forge: TreeMap, makes the file output predictable/sorted.
-    private final Set<Path> field_218457_g = Sets.newHashSet();
+@@ -55,8 +55,8 @@
+       }
 
-    public DirectoryCache(Path p_i49352_1_, String p_i49352_2_) throws IOException {
+       IOUtils.writeLines(this.field_208329_f.entrySet().stream().map((p_208319_1_) -> {
+-         return (String)p_208319_1_.getValue() + ' ' + this.field_208325_b.relativize(p_208319_1_.getKey());
+-      }).collect(Collectors.toList()), System.lineSeparator(), writer);
+         return (String)p_208319_1_.getValue() + ' ' + this.field_208325_b.relativize(p_208319_1_.getKey()).toString().replace('\\', '/'); //Forge: Standardize file paths.
+      }).sorted(java.util.Comparator.comparing(a -> a.split(" ")[1])).collect(Collectors.toList()), System.lineSeparator(), writer);
+       writer.close();
+       field_208324_a.debug("Caching: cache hits: {}, created: {} removed: {}", this.field_208327_d, this.field_208329_f.size() - this.field_208327_d, this.field_208328_e.size());
+    }
@@ -1,19 +1,20 @@
 --- a/net/minecraft/data/Main.java
 +++ b/net/minecraft/data/Main.java
-@@ -21,8 +21,11 @@
+@@ -21,8 +21,12 @@
       OptionSpec<Void> optionspec6 = optionparser.accepts("all", "Include all generators");
       OptionSpec<String> optionspec7 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
       OptionSpec<String> optionspec8 = optionparser.accepts("input", "Input folder").withRequiredArg();
 +      OptionSpec<String> existing = optionparser.accepts("existing", "Existing resource packs that generated resources can reference").withRequiredArg();
 +      OptionSpec<java.io.File> gameDir = optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
 +      OptionSpec<String> mod = optionparser.accepts("mod", "A modid to dump").withRequiredArg().withValuesSeparatedBy(",");
+      OptionSpec<Void> flat = optionparser.accepts("flat", "Do not append modid prefix to output directory when generating for multiple mods");
       OptionSet optionset = optionparser.parse(p_main_0_);
 -      if (!optionset.has(optionspec) && optionset.hasOptions()) {
 +      if (!optionset.has(optionspec) && optionset.hasOptions() && !(optionset.specs().size() == 1 && optionset.has(gameDir))) {
          Path path = Paths.get(optionspec7.value(optionset));
          boolean flag = optionset.has(optionspec6);
          boolean flag1 = flag || optionset.has(optionspec2);
-@@ -30,10 +33,12 @@
+@@ -30,10 +34,13 @@
          boolean flag3 = flag || optionset.has(optionspec3);
          boolean flag4 = flag || optionset.has(optionspec4);
          boolean flag5 = flag || optionset.has(optionspec5);
@@ -24,9 +25,10 @@
 +         Collection<Path> inputs = optionset.valuesOf(optionspec8).stream().map(Paths::get).collect(Collectors.toList());
 +         Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).collect(Collectors.toList());
 +         java.util.Set<String> mods = new java.util.HashSet<>(optionset.valuesOf(mod));
-+         net.minecraftforge.fml.ModLoader.get().runDataGenerator(mods, path, inputs, existingPacks, flag2, flag1, flag3, flag4, flag5);
+         boolean isFlat = mods.isEmpty() || optionset.has(flat);
+         net.minecraftforge.fml.ModLoader.get().runDataGenerator(mods, path, inputs, existingPacks, flag2, flag1, flag3, flag4, flag5, isFlat);
 +         if (mods.contains("minecraft") || mods.isEmpty())
-+            func_200264_a(mods.isEmpty() ? path : path.resolve("minecraft"), inputs, flag1, flag2, flag3, flag4, flag5).func_200392_c();
+            func_200264_a(isFlat ? path : path.resolve("minecraft"), inputs, flag1, flag2, flag3, flag4, flag5).func_200392_c();
       } else {
          optionparser.printHelpOn(System.out);
       }
@@ -1,6 +1,28 @@
 --- a/net/minecraft/dispenser/IDispenseItemBehavior.java
 +++ b/net/minecraft/dispenser/IDispenseItemBehavior.java
-@@ -295,8 +295,9 @@
+@@ -62,6 +62,7 @@
+ import net.minecraft.world.World;
+ 
+ public interface IDispenseItemBehavior {
+   org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger();
+    IDispenseItemBehavior field_223216_a_ = (p_210297_0_, p_210297_1_) -> {
+       return p_210297_1_;
+    };
+@@ -162,7 +163,12 @@
+          public ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_) {
+             Direction direction = p_82487_1_.func_189992_e().func_177229_b(DispenserBlock.field_176441_a);
+             EntityType<?> entitytype = ((SpawnEggItem)p_82487_2_.func_77973_b()).func_208076_b(p_82487_2_.func_77978_p());
+-            entitytype.func_220331_a(p_82487_1_.func_197524_h(), p_82487_2_, (PlayerEntity)null, p_82487_1_.func_180699_d().func_177972_a(direction), SpawnReason.DISPENSER, direction != Direction.UP, false);
+            try { // FORGE: fix potential crash
+               entitytype.func_220331_a(p_82487_1_.func_197524_h(), p_82487_2_, (PlayerEntity) null, p_82487_1_.func_180699_d().func_177972_a(direction), SpawnReason.DISPENSER, direction != Direction.UP, false);
+            } catch (Exception e) {
+               LOGGER.error("Error while dispensing spawn egg from dispenser at {}", p_82487_1_.func_180699_d(), e);
+               return ItemStack.field_190927_a;
+            }
+             p_82487_2_.func_190918_g(1);
+             return p_82487_2_;
+          }
+@@ -295,8 +301,9 @@
                world.func_175656_a(blockpos, Blocks.field_150480_ab.func_176223_P());
             } else if (FlintAndSteelItem.func_219997_a(blockstate)) {
                world.func_175656_a(blockpos, blockstate.func_206870_a(BlockStateProperties.field_208190_q, Boolean.valueOf(true)));
@@ -12,7 +34,7 @@
                world.func_217377_a(blockpos, false);
             } else {
                this.field_218407_b = false;
-@@ -426,15 +427,23 @@
+@@ -426,15 +433,23 @@
          }
       });
       DispenserBlock.func_199774_a(Items.field_151097_aZ.func_199767_j(), new OptionalDispenseBehavior() {
@@ -205,7 +205,17 @@
    }
 
    protected void func_213333_a(DamageSource p_213333_1_, int p_213333_2_, boolean p_213333_3_) {
-@@ -1161,6 +1186,9 @@
+@@ -1148,7 +1173,8 @@
+       ResourceLocation resourcelocation = this.func_213346_cF();
+       LootTable loottable = this.field_70170_p.func_73046_m().func_200249_aQ().func_186521_a(resourcelocation);
+       LootContext.Builder lootcontext$builder = this.func_213363_a(p_213354_2_, p_213354_1_);
+-      loottable.func_216120_b(lootcontext$builder.func_216022_a(LootParameterSets.field_216263_d), this::func_199701_a_);
+      LootContext ctx = lootcontext$builder.func_216022_a(LootParameterSets.field_216263_d);
+      loottable.func_216113_a(ctx).forEach(this::func_199701_a_);
+    }
+ 
+    protected LootContext.Builder func_213363_a(boolean p_213363_1_, DamageSource p_213363_2_) {
+@@ -1161,6 +1187,9 @@
    }
 
    public void func_70653_a(Entity p_70653_1_, float p_70653_2_, double p_70653_3_, double p_70653_5_) {
@@ -215,7 +225,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();
-@@ -1196,12 +1224,7 @@
+@@ -1196,12 +1225,7 @@
          return false;
       } else {
          BlockState blockstate = this.func_213339_cH();
@@ -229,7 +239,7 @@
       }
    }
 
-@@ -1225,6 +1248,11 @@
+@@ -1225,6 +1249,11 @@
    }
 
    public boolean func_225503_b_(float p_225503_1_, float p_225503_2_) {
@@ -241,7 +251,7 @@
       boolean flag = super.func_225503_b_(p_225503_1_, p_225503_2_);
       int i = this.func_225508_e_(p_225503_1_, p_225503_2_);
       if (i > 0) {
-@@ -1248,9 +1276,10 @@
+@@ -1248,9 +1277,10 @@
          int i = MathHelper.func_76128_c(this.func_226277_ct_());
          int j = MathHelper.func_76128_c(this.func_226278_cu_() - (double)0.2F);
          int k = MathHelper.func_76128_c(this.func_226281_cx_());
@@ -255,7 +265,7 @@
             this.func_184185_a(soundtype.func_185842_g(), soundtype.func_185843_a() * 0.5F, soundtype.func_185847_b() * 0.75F);
          }
 
-@@ -1319,6 +1348,8 @@
+@@ -1319,6 +1349,8 @@
 
    protected void func_70665_d(DamageSource p_70665_1_, float p_70665_2_) {
       if (!this.func_180431_b(p_70665_1_)) {
@@ -264,7 +274,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 f2 = Math.max(p_70665_2_ - this.func_110139_bj(), 0.0F);
-@@ -1328,10 +1359,11 @@
+@@ -1328,10 +1360,11 @@
             ((ServerPlayerEntity)p_70665_1_.func_76346_g()).func_195067_a(Stats.field_212735_F, Math.round(f * 10.0F));
          }
 
@@ -277,7 +287,7 @@
             this.func_110149_m(this.func_110139_bj() - f2);
          }
       }
-@@ -1385,6 +1417,8 @@
+@@ -1385,6 +1418,8 @@
    }
 
    public void func_226292_a_(Hand p_226292_1_, boolean p_226292_2_) {
@@ -286,7 +296,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;
-@@ -1771,15 +1805,16 @@
+@@ -1771,15 +1806,16 @@
       }
 
       this.field_70160_al = true;
@@ -305,7 +315,7 @@
    }
 
    protected float func_189749_co() {
-@@ -1789,11 +1824,15 @@
+@@ -1789,11 +1825,15 @@
    public void func_213352_e(Vec3d p_213352_1_) {
       if (this.func_70613_aW() || this.func_184186_bw()) {
          double d0 = 0.08D;
@@ -322,7 +332,7 @@
 
          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) {
-@@ -1842,7 +1881,7 @@
+@@ -1842,7 +1882,7 @@
                   }
                } else {
                   BlockPos blockpos = this.func_226270_aj_();
@@ -331,7 +341,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()));
-@@ -1904,6 +1943,7 @@
+@@ -1904,6 +1944,7 @@
                f = 0.96F;
             }
 
@@ -339,7 +349,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();
-@@ -1979,6 +2019,7 @@
+@@ -1979,6 +2020,7 @@
    }
 
    public void func_70071_h_() {
@@ -347,7 +357,7 @@
       super.func_70071_h_();
       this.func_184608_ct();
       this.func_205014_p();
-@@ -2022,7 +2063,9 @@
+@@ -2022,7 +2064,9 @@
 
             ItemStack itemstack1 = this.func_184582_a(equipmentslottype);
             if (!ItemStack.func_77989_b(itemstack1, itemstack)) {
@@ -357,7 +367,16 @@
                if (!itemstack.func_190926_b()) {
                   this.func_110140_aT().func_111148_a(itemstack.func_111283_C(equipmentslottype));
                }
-@@ -2474,13 +2517,22 @@
+@@ -2258,6 +2302,8 @@
+       boolean flag = this.func_70083_f(7);
+       if (flag && !this.field_70122_E && !this.func_184218_aH()) {
+          ItemStack itemstack = this.func_184582_a(EquipmentSlotType.CHEST);
+         flag = itemstack.canElytraFly(this) && itemstack.elytraFlightTick(this, this.field_184629_bo);
+         if (false) //Forge: Moved to ElytraItem
+          if (itemstack.func_77973_b() == Items.field_185160_cR && ElytraItem.func_185069_d(itemstack)) {
+             flag = true;
+             if (!this.field_70170_p.field_72995_K && (this.field_184629_bo + 1) % 20 == 0) {
+@@ -2474,13 +2520,22 @@
 
    private void func_184608_ct() {
       if (this.func_184587_cr()) {
@@ -382,7 +401,7 @@
                this.func_71036_o();
             }
          } else {
-@@ -2522,8 +2574,10 @@
+@@ -2522,8 +2577,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()) {
@@ -394,7 +413,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);
-@@ -2583,6 +2637,9 @@
+@@ -2583,6 +2640,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.func_226277_ct_(), this.func_226280_cw_(), this.func_226281_cx_());
@@ -404,7 +423,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);
       }
 
-@@ -2594,7 +2651,9 @@
+@@ -2594,7 +2654,9 @@
       } else {
          if (!this.field_184627_bm.func_190926_b() && this.func_184587_cr()) {
             this.func_226293_b_(this.field_184627_bm, 16);
@@ -415,7 +434,7 @@
             this.func_184602_cy();
          }
 
-@@ -2615,7 +2674,11 @@
+@@ -2615,7 +2677,11 @@
 
    public void func_184597_cx() {
       if (!this.field_184627_bm.func_190926_b()) {
@@ -427,7 +446,7 @@
          if (this.field_184627_bm.func_222122_m()) {
             this.func_184608_ct();
          }
-@@ -2772,16 +2835,16 @@
+@@ -2772,16 +2838,16 @@
 
    private boolean func_213359_p() {
       return this.func_213374_dv().map((p_213347_1_) -> {
@@ -448,7 +467,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);
             });
-@@ -2797,7 +2860,9 @@
+@@ -2797,7 +2863,9 @@
    @OnlyIn(Dist.CLIENT)
    public Direction func_213376_dz() {
       BlockPos blockpos = this.func_213374_dv().orElse((BlockPos)null);
@@ -459,7 +478,7 @@
    }
 
    public boolean func_70094_T() {
-@@ -2866,4 +2931,58 @@
+@@ -2866,4 +2934,58 @@
    public void func_213334_d(Hand p_213334_1_) {
       this.func_213361_c(p_213334_1_ == Hand.MAIN_HAND ? EquipmentSlotType.MAINHAND : EquipmentSlotType.OFFHAND);
    }
@@ -1,6 +1,29 @@
 --- a/net/minecraft/entity/effect/LightningBoltEntity.java
 +++ b/net/minecraft/entity/effect/LightningBoltEntity.java
-@@ -80,6 +80,7 @@
+@@ -38,11 +38,6 @@
+       this.field_70264_a = this.field_70146_Z.nextLong();
+       this.field_70263_c = this.field_70146_Z.nextInt(3) + 1;
+       this.field_184529_d = p_i46780_8_;
+-      Difficulty difficulty = p_i46780_1_.func_175659_aa();
+-      if (difficulty == Difficulty.NORMAL || difficulty == Difficulty.HARD) {
+-         this.func_195053_a(4);
+-      }
+-
+    }
+ 
+    public SoundCategory func_184176_by() {
+@@ -58,6 +53,10 @@
+       if (this.field_70262_b == 2) {
+          this.field_70170_p.func_184148_a((PlayerEntity)null, this.func_226277_ct_(), this.func_226278_cu_(), this.func_226281_cx_(), SoundEvents.field_187754_de, SoundCategory.WEATHER, 10000.0F, 0.8F + this.field_70146_Z.nextFloat() * 0.2F);
+          this.field_70170_p.func_184148_a((PlayerEntity)null, this.func_226277_ct_(), this.func_226278_cu_(), this.func_226281_cx_(), SoundEvents.field_187752_dd, SoundCategory.WEATHER, 2.0F, 0.5F + this.field_70146_Z.nextFloat() * 0.2F);
+         Difficulty difficulty = this.field_70170_p.func_175659_aa();
+         if (difficulty == Difficulty.NORMAL || difficulty == Difficulty.HARD) {
+            this.func_195053_a(4);
+         }
+       }
+ 
+       --this.field_70262_b;
+@@ -80,6 +79,7 @@
             List<Entity> list = this.field_70170_p.func_175674_a(this, new AxisAlignedBB(this.func_226277_ct_() - 3.0D, this.func_226278_cu_() - 3.0D, this.func_226281_cx_() - 3.0D, this.func_226277_ct_() + 3.0D, this.func_226278_cu_() + 6.0D + 3.0D, this.func_226281_cx_() + 3.0D), Entity::func_70089_S);
 
             for(Entity entity : list) {
@@ -0,0 +1,10 @@
+--- a/net/minecraft/entity/item/FireworkRocketEntity.java
+++ b/net/minecraft/entity/item/FireworkRocketEntity.java
+@@ -187,6 +187,7 @@
+    }
+ 
+    protected void func_213892_a(RayTraceResult p_213892_1_) {
+      if(p_213892_1_.func_216346_c() != RayTraceResult.Type.MISS && net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, p_213892_1_)) return;
+       if (p_213892_1_.func_216346_c() == RayTraceResult.Type.ENTITY && !this.field_70170_p.field_72995_K) {
+          this.func_213893_k();
+       } else if (this.field_70132_H) {
@@ -0,0 +1,11 @@
+--- a/net/minecraft/entity/passive/BeeEntity.java
+++ b/net/minecraft/entity/passive/BeeEntity.java
+@@ -438,7 +438,7 @@
+          return false;
+       } else {
+          TileEntity tileentity = this.field_70170_p.func_175625_s(this.field_226369_bI_);
+-         return tileentity != null && tileentity.func_200662_C() == TileEntityType.field_226985_G_;
+         return tileentity instanceof BeehiveTileEntity;
+       }
+    }
+ 
@@ -0,0 +1,11 @@
+--- a/net/minecraft/entity/passive/CatEntity.java
+++ b/net/minecraft/entity/passive/CatEntity.java
+@@ -402,7 +402,7 @@
+             }
+          } else if (this.func_70877_b(itemstack)) {
+             this.func_175505_a(p_184645_1_, itemstack);
+-            if (this.field_70146_Z.nextInt(3) == 0) {
+            if (this.field_70146_Z.nextInt(3) == 0  && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, p_184645_1_)) {
+                this.func_193101_c(p_184645_1_);
+                this.field_70911_d.func_75270_a(true);
+                this.field_70170_p.func_72960_a(this, (byte)7);
@@ -20,7 +20,15 @@
          }
 
          if (this.func_184207_aI() && this.field_190688_bE) {
-@@ -947,4 +948,22 @@
+@@ -672,6 +673,7 @@
+                this.func_213293_j(vec3d.field_72450_a, d1, vec3d.field_72449_c);
+                this.func_110255_k(true);
+                this.field_70160_al = true;
+               net.minecraftforge.common.ForgeHooks.onLivingJump(this);
+                if (f1 > 0.0F) {
+                   float f2 = MathHelper.func_76126_a(this.field_70177_z * ((float)Math.PI / 180F));
+                   float f3 = MathHelper.func_76134_b(this.field_70177_z * ((float)Math.PI / 180F));
+@@ -947,4 +949,22 @@
 
       return super.func_213386_a(p_213386_1_, p_213386_2_, p_213386_3_, p_213386_4_, p_213386_5_);
    }
@@ -88,7 +88,7 @@
    @Nullable
    public ItemEntity func_71019_a(ItemStack p_71019_1_, boolean p_71019_2_) {
 -      return this.func_146097_a(p_71019_1_, false, p_71019_2_);
-+      return net.minecraftforge.common.ForgeHooks.onPlayerTossEvent(this, p_71019_1_, false);
+      return net.minecraftforge.common.ForgeHooks.onPlayerTossEvent(this, p_71019_1_, p_71019_2_);
    }
 
    @Nullable
@@ -415,6 +415,15 @@
          return false;
       } else {
          if (p_225503_1_ >= 2.0F) {
+@@ -1519,7 +1636,7 @@
+    public boolean func_226566_ei_() {
+       if (!this.field_70122_E && !this.func_184613_cA() && !this.func_70090_H()) {
+          ItemStack itemstack = this.func_184582_a(EquipmentSlotType.CHEST);
+-         if (itemstack.func_77973_b() == Items.field_185160_cR && ElytraItem.func_185069_d(itemstack)) {
+         if (itemstack.canElytraFly(this)) {
+             this.func_226567_ej_();
+             return true;
+          }
@@ -1560,6 +1677,10 @@
    }
 
@@ -426,6 +435,15 @@
       this.func_85039_t(p_195068_1_);
       this.field_71106_cc += (float)p_195068_1_ / (float)this.func_71050_bK();
       this.field_71067_cb = MathHelper.func_76125_a(this.field_71067_cb + p_195068_1_, 0, Integer.MAX_VALUE);
+@@ -1588,7 +1709,7 @@
+    }
+ 
+    public void func_192024_a(ItemStack p_192024_1_, int p_192024_2_) {
+-      this.field_71068_ca -= p_192024_2_;
+      func_82242_a(-p_192024_2_);
+       if (this.field_71068_ca < 0) {
+          this.field_71068_ca = 0;
+          this.field_71106_cc = 0.0F;
@@ -1599,6 +1720,10 @@
    }
 
@@ -437,19 +455,20 @@
       this.field_71068_ca += p_82242_1_;
       if (this.field_71068_ca < 0) {
          this.field_71068_ca = 0;
-@@ -1789,7 +1914,10 @@
+@@ -1789,7 +1914,11 @@
    }
 
    public ITextComponent func_145748_c_() {
 -      ITextComponent itextcomponent = ScorePlayerTeam.func_200541_a(this.func_96124_cp(), this.func_200200_C_());
+      if (this.displayname == null) this.displayname = net.minecraftforge.event.ForgeEventFactory.getPlayerDisplayName(this, this.func_200200_C_());
 +      ITextComponent itextcomponent = new StringTextComponent("");
 +      prefixes.forEach(e -> itextcomponent.func_150257_a(e));
-+      itextcomponent.func_150257_a(ScorePlayerTeam.func_200541_a(this.func_96124_cp(), this.func_200200_C_()));
+      itextcomponent.func_150257_a(ScorePlayerTeam.func_200541_a(this.func_96124_cp(), this.displayname));
 +      suffixes.forEach(e -> itextcomponent.func_150257_a(e));
       return this.func_208016_c(itextcomponent);
    }
 
-@@ -2029,4 +2157,45 @@
+@@ -2029,4 +2158,53 @@
          return this.field_221260_g;
       }
    }
@@ -470,7 +489,15 @@
 +   public Collection<ITextComponent> getSuffixes() {
 +       return this.suffixes;
 +   }
-+
+   
+   private ITextComponent displayname = null;
+   /**
+    * Force the displayed name to refresh, by firing {@link net.minecraftforge.event.entity.player.PlayerEvent.NameFormat}, using the real player name as event parameter.
+    */
+   public void refreshDisplayName() {
+      this.displayname = net.minecraftforge.event.ForgeEventFactory.getPlayerDisplayName(this, this.func_200200_C_());
+   }
+   
 +   private final net.minecraftforge.common.util.LazyOptional<net.minecraftforge.items.IItemHandler>
 +         playerMainHandler = net.minecraftforge.common.util.LazyOptional.of(
 +               () -> new net.minecraftforge.items.wrapper.PlayerMainInvWrapper(field_71071_by));
@@ -19,7 +19,8 @@
 +      if (!net.minecraftforge.common.ForgeHooks.onTravelToDimension(this, p_212321_1_)) return null;
       this.field_184851_cj = true;
       DimensionType dimensiontype = this.field_71093_bK;
-       if (dimensiontype == DimensionType.field_223229_c_ && p_212321_1_ == DimensionType.field_223227_a_) {
+-      if (dimensiontype == DimensionType.field_223229_c_ && p_212321_1_ == DimensionType.field_223227_a_) {
+      if (dimensiontype == DimensionType.field_223229_c_ && p_212321_1_ == DimensionType.field_223227_a_ && teleporter instanceof net.minecraft.world.Teleporter) { //Forge: Fix non-vanilla teleporters triggering end credits
          this.func_213319_R();
 -         this.func_71121_q().func_217434_e(this);
 +         this.func_71121_q().removePlayer(this, true); //Forge: The player entity is cloned so keep the data until after cloning calls copyFrom
@@ -1,11 +0,0 @@
--- 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
-       }
- 
-    }
@@ -35,13 +35,41 @@
                      p_77659_2_.func_71029_a(Stats.field_75929_E.func_199076_b(this));
 -                     p_77659_2_.func_184185_a(fluid.func_207185_a(FluidTags.field_206960_b) ? SoundEvents.field_187633_N : SoundEvents.field_187630_M, 1.0F, 1.0F);
 +
-+                     SoundEvent soundevent = this.field_77876_a.getAttributes().getEmptySound();
+                     SoundEvent soundevent = this.field_77876_a.getAttributes().getFillSound();
 +                     if (soundevent == null) soundevent = fluid.func_207185_a(FluidTags.field_206960_b) ? SoundEvents.field_187633_N : SoundEvents.field_187630_M;
 +                     p_77659_2_.func_184185_a(soundevent, 1.0F, 1.0F);
                      ItemStack itemstack1 = this.func_150910_a(itemstack, p_77659_2_, fluid.func_204524_b());
                      if (!p_77659_1_.field_72995_K) {
                         CriteriaTriggers.field_204813_j.func_204817_a((ServerPlayerEntity)p_77659_2_, new ItemStack(fluid.func_204524_b()));
-@@ -148,7 +165,19 @@
+@@ -67,7 +84,7 @@
+                return ActionResult.func_226251_d_(itemstack);
+             } else {
+                BlockState blockstate = p_77659_1_.func_180495_p(blockpos);
+-               BlockPos blockpos2 = blockstate.func_177230_c() instanceof ILiquidContainer && this.field_77876_a == Fluids.field_204546_a ? blockpos : blockpos1;
+               BlockPos blockpos2 = canBlockContainFluid(p_77659_1_, blockpos, blockstate) ? blockpos : blockpos1;
+                if (this.func_180616_a(p_77659_2_, p_77659_1_, blockpos2, blockraytraceresult)) {
+                   this.func_203792_a(p_77659_1_, itemstack, blockpos2);
+                   if (p_77659_2_ instanceof ServerPlayerEntity) {
+@@ -117,7 +134,8 @@
+          BlockState blockstate = p_180616_2_.func_180495_p(p_180616_3_);
+          Material material = blockstate.func_185904_a();
+          boolean flag = blockstate.func_227032_a_(this.field_77876_a);
+-         if (blockstate.func_196958_f() || flag || blockstate.func_177230_c() instanceof ILiquidContainer && ((ILiquidContainer)blockstate.func_177230_c()).func_204510_a(p_180616_2_, p_180616_3_, blockstate, this.field_77876_a)) {
+         boolean canContainFluid = canBlockContainFluid(p_180616_2_, p_180616_3_, blockstate);
+         if (blockstate.func_196958_f() || flag || canContainFluid) {
+             if (p_180616_2_.field_73011_w.func_177500_n() && this.field_77876_a.func_207185_a(FluidTags.field_206959_a)) {
+                int i = p_180616_3_.func_177958_n();
+                int j = p_180616_3_.func_177956_o();
+@@ -127,7 +145,7 @@
+                for(int l = 0; l < 8; ++l) {
+                   p_180616_2_.func_195594_a(ParticleTypes.field_197594_E, (double)i + Math.random(), (double)j + Math.random(), (double)k + Math.random(), 0.0D, 0.0D, 0.0D);
+                }
+-            } else if (blockstate.func_177230_c() instanceof ILiquidContainer && this.field_77876_a == Fluids.field_204546_a) {
+            } else if (canContainFluid) {
+                if (((ILiquidContainer)blockstate.func_177230_c()).func_204509_a(p_180616_2_, p_180616_3_, blockstate, ((FlowingFluid)this.field_77876_a).func_207204_a(false))) {
+                   this.func_203791_b(p_180616_1_, p_180616_2_, p_180616_3_);
+                }
+@@ -148,7 +166,24 @@
    }
 
    protected void func_203791_b(@Nullable PlayerEntity p_203791_1_, IWorld p_203791_2_, BlockPos p_203791_3_) {
@@ -61,4 +89,9 @@
 +
 +   private final java.util.function.Supplier<? extends Fluid> fluidSupplier;
 +   public Fluid getFluid() { return fluidSupplier.get(); }
+
+   private boolean canBlockContainFluid(World worldIn, BlockPos posIn, BlockState blockstate)
+   {
+      return blockstate.func_177230_c() instanceof ILiquidContainer && ((ILiquidContainer)blockstate.func_177230_c()).func_204510_a(worldIn, posIn, blockstate, this.field_77876_a);
+   }
 }
@@ -0,0 +1,20 @@
+--- a/net/minecraft/item/ElytraItem.java
+++ b/net/minecraft/item/ElytraItem.java
+@@ -38,4 +38,17 @@
+          return ActionResult.func_226251_d_(itemstack);
+       }
+    }
+
+   @Override
+   public boolean canElytraFly(ItemStack stack, net.minecraft.entity.LivingEntity entity) {
+      return ElytraItem.func_185069_d(stack);
+   }
+
+   @Override
+   public boolean elytraFlightTick(ItemStack stack, net.minecraft.entity.LivingEntity entity, int flightTicks) {
+      if (!entity.field_70170_p.field_72995_K && (flightTicks + 1) % 20 == 0) {
+         stack.func_222118_a(1, entity, e -> e.func_213361_c(net.minecraft.inventory.EquipmentSlotType.CHEST));
+      }
+      return true;
+   }
+ }
@@ -0,0 +1,73 @@
+--- a/net/minecraft/item/Food.java
+++ b/net/minecraft/item/Food.java
+@@ -11,15 +11,26 @@
+    private final boolean field_221472_c;
+    private final boolean field_221473_d;
+    private final boolean field_221474_e;
+-   private final List<Pair<EffectInstance, Float>> field_221475_f;
+   private final List<Pair<java.util.function.Supplier<EffectInstance>, Float>> field_221475_f;
+   
+   private Food(Food.Builder builder) {
+	   this.field_221470_a = builder.field_221458_a;
+	   this.field_221471_b = builder.field_221459_b;
+	   this.field_221472_c = builder.field_221460_c;
+	   this.field_221473_d = builder.field_221461_d;
+	   this.field_221474_e = builder.field_221462_e;
+	   this.field_221475_f = builder.field_221463_f;
+   }
+ 
+   // Forge: Use builder method instead
+   @Deprecated
+    private Food(int p_i50106_1_, float p_i50106_2_, boolean p_i50106_3_, boolean p_i50106_4_, boolean p_i50106_5_, List<Pair<EffectInstance, Float>> p_i50106_6_) {
+       this.field_221470_a = p_i50106_1_;
+       this.field_221471_b = p_i50106_2_;
+       this.field_221472_c = p_i50106_3_;
+       this.field_221473_d = p_i50106_4_;
+       this.field_221474_e = p_i50106_5_;
+-      this.field_221475_f = p_i50106_6_;
+      this.field_221475_f = p_i50106_6_.stream().map(pair -> Pair.<java.util.function.Supplier<EffectInstance>, Float>of(pair::getLeft, pair.getRight())).collect(java.util.stream.Collectors.toList());
+    }
+ 
+    public int func_221466_a() {
+@@ -43,7 +54,7 @@
+    }
+ 
+    public List<Pair<EffectInstance, Float>> func_221464_f() {
+-      return this.field_221475_f;
+      return this.field_221475_f.stream().map(pair -> Pair.of(pair.getLeft() != null ? pair.getLeft().get() : null, pair.getRight())).collect(java.util.stream.Collectors.toList());
+    }
+ 
+    public static class Builder {
+@@ -52,7 +63,7 @@
+       private boolean field_221460_c;
+       private boolean field_221461_d;
+       private boolean field_221462_e;
+-      private final List<Pair<EffectInstance, Float>> field_221463_f = Lists.newArrayList();
+      private final List<Pair<java.util.function.Supplier<EffectInstance>, Float>> field_221463_f = Lists.newArrayList();
+ 
+       public Food.Builder func_221456_a(int p_221456_1_) {
+          this.field_221458_a = p_221456_1_;
+@@ -78,14 +89,21 @@
+          this.field_221462_e = true;
+          return this;
+       }
+      
+      public Food.Builder effect(java.util.function.Supplier<EffectInstance> effectIn, float probability) {
+          this.field_221463_f.add(Pair.of(effectIn, probability));
+          return this;
+       }
+ 
+      // Forge: Use supplier method instead
+      @Deprecated
+       public Food.Builder func_221452_a(EffectInstance p_221452_1_, float p_221452_2_) {
+-         this.field_221463_f.add(Pair.of(p_221452_1_, p_221452_2_));
+         this.field_221463_f.add(Pair.of(() -> p_221452_1_, p_221452_2_));
+          return this;
+       }
+ 
+       public Food func_221453_d() {
+-         return new Food(this.field_221458_a, this.field_221459_b, this.field_221460_c, this.field_221461_d, this.field_221462_e, this.field_221463_f);
+         return new Food(this);
+       }
+    }
+ }
@@ -177,7 +177,7 @@
             return false;
          } else {
 -            return p_77970_0_.field_77990_d == null || p_77970_0_.field_77990_d.equals(p_77970_1_.field_77990_d);
-+            return p_77970_0_.field_77990_d == null || p_77970_0_.field_77990_d.equals(p_77970_1_.field_77990_d) && p_77970_0_.areCapsCompatible(p_77970_1_);
+            return (p_77970_0_.field_77990_d == null || p_77970_0_.field_77990_d.equals(p_77970_1_.field_77990_d)) && p_77970_0_.areCapsCompatible(p_77970_1_);
          }
       } else {
          return false;
@@ -186,7 +186,7 @@
          return false;
       } else {
 -         return this.field_77990_d == null || this.field_77990_d.equals(p_77959_1_.field_77990_d);
-+         return this.field_77990_d == null || this.field_77990_d.equals(p_77959_1_.field_77990_d) && this.areCapsCompatible(p_77959_1_);
+         return (this.field_77990_d == null || this.field_77990_d.equals(p_77959_1_.field_77990_d)) && this.areCapsCompatible(p_77959_1_);
       }
    }
 
@@ -9,7 +9,18 @@
       if (p_77654_3_ instanceof ServerPlayerEntity) {
          ServerPlayerEntity serverplayerentity = (ServerPlayerEntity)p_77654_3_;
          CriteriaTriggers.field_193138_y.func_193148_a(serverplayerentity, p_77654_1_);
-@@ -44,4 +46,9 @@
+@@ -25,10 +27,6 @@
+          p_77654_1_.func_190918_g(1);
+       }
+ 
+-      if (!p_77654_2_.field_72995_K) {
+-         p_77654_3_.func_195061_cb();
+-      }
+-
+       return p_77654_1_.func_190926_b() ? new ItemStack(Items.field_151133_ar) : p_77654_1_;
+    }
+ 
+@@ -44,4 +42,9 @@
       p_77659_2_.func_184598_c(p_77659_3_);
       return ActionResult.func_226248_a_(p_77659_2_.func_184586_b(p_77659_3_));
    }
@@ -0,0 +1,51 @@
+--- a/net/minecraft/item/MusicDiscItem.java
+++ b/net/minecraft/item/MusicDiscItem.java
+@@ -21,17 +21,40 @@
+ import net.minecraftforge.api.distmarker.OnlyIn;
+ 
+ public class MusicDiscItem extends Item {
+   @Deprecated // Forge: refer to WorldRender#playRecord. Modders: there's no need to reflectively modify this map!
+    private static final Map<SoundEvent, MusicDiscItem> field_150928_b = Maps.newHashMap();
+    private final int field_195977_c;
+   @Deprecated // Forge: refer to soundSupplier
+    private final SoundEvent field_185076_b;
+   private final java.util.function.Supplier<SoundEvent> soundSupplier;
+ 
+   @Deprecated // Forge: Use the constructor that takes a supplier instead
+    protected MusicDiscItem(int p_i48475_1_, SoundEvent p_i48475_2_, Item.Properties p_i48475_3_) {
+       super(p_i48475_3_);
+       this.field_195977_c = p_i48475_1_;
+       this.field_185076_b = p_i48475_2_;
+       field_150928_b.put(this.field_185076_b, this);
+      this.soundSupplier = this.field_185076_b.delegate;
+    }
+ 
+   /**
+    * For mod use, allows to create a music disc without having to create a new
+    * SoundEvent before their registry event is fired.
+    *
+    * @param comparatorValue The value this music disc should output on the comparator. Must be between 0 and 15.
+    * @param soundSupplier A supplier that provides the sound that should be played. Use a
+    *                      {@link net.minecraftforge.fml.RegistryObject}{@code <SoundEvent>} or a
+    *                      {@link net.minecraftforge.registries.IRegistryDelegate} for this parameter.
+    * @param builder A set of {@link Item.Properties} that describe this item.
+    */
+   public MusicDiscItem(int comparatorValue, java.util.function.Supplier<SoundEvent> soundSupplier, Item.Properties builder)
+   {
+      super(builder);
+      this.field_195977_c = comparatorValue;
+      this.field_185076_b = null;
+      this.soundSupplier = soundSupplier;
+   }
+
+    public ActionResultType func_195939_a(ItemUseContext p_195939_1_) {
+       World world = p_195939_1_.func_195991_k();
+       BlockPos blockpos = p_195939_1_.func_195995_a();
+@@ -76,6 +99,6 @@
+ 
+    @OnlyIn(Dist.CLIENT)
+    public SoundEvent func_185075_h() {
+-      return this.field_185076_b;
+      return this.soundSupplier.get();
+    }
+ }
@@ -0,0 +1,26 @@
+--- a/net/minecraft/item/SpawnEggItem.java
+++ b/net/minecraft/item/SpawnEggItem.java
+@@ -35,11 +35,14 @@
+    private final int field_195989_d;
+    private final EntityType<?> field_200890_d;
+ 
+   /** @deprecated Forge: Use {@link net.minecraftforge.common.ForgeSpawnEggItem} instead for suppliers */
+   @Deprecated
+    public SpawnEggItem(EntityType<?> p_i48465_1_, int p_i48465_2_, int p_i48465_3_, Item.Properties p_i48465_4_) {
+       super(p_i48465_4_);
+       this.field_200890_d = p_i48465_1_;
+       this.field_195988_c = p_i48465_2_;
+       this.field_195989_d = p_i48465_3_;
+      if (p_i48465_1_ != null)
+       field_195987_b.put(p_i48465_1_, this);
+    }
+ 
+@@ -121,6 +124,8 @@
+       return p_195983_1_ == 0 ? this.field_195988_c : this.field_195989_d;
+    }
+ 
+   /** @deprecated Forge: call {@link net.minecraftforge.common.ForgeSpawnEggItem#fromEntityType(EntityType)} instead */
+   @Deprecated
+    @Nullable
+    public static SpawnEggItem func_200889_b(@Nullable EntityType<?> p_200889_0_) {
+       return field_195987_b.get(p_200889_0_);
@@ -8,7 +8,7 @@
 
          try {
 +            if (!net.minecraftforge.common.crafting.CraftingHelper.processConditions(entry.getValue(), "conditions")) {
-+               field_199521_c.info("Skipping loading recipe {} as it's conditions were not met", resourcelocation);
+               field_199521_c.debug("Skipping loading recipe {} as it's conditions were not met", resourcelocation);
 +               continue;
 +            }
             IRecipe<?> irecipe = func_215377_a(resourcelocation, entry.getValue());
@@ -0,0 +1,16 @@
+--- a/net/minecraft/pathfinding/PathNodeType.java
+++ b/net/minecraft/pathfinding/PathNodeType.java
+@@ -33,4 +33,13 @@
+    public float func_186289_a() {
+       return this.field_186307_r;
+    }
+
+   @javax.annotation.Nullable
+   public PathNodeType getDanger() {
+     return (this == DAMAGE_FIRE   || this == DANGER_FIRE  ) ? DANGER_FIRE   :
+            (this == DAMAGE_CACTUS || this == DANGER_CACTUS) ? DANGER_CACTUS :
+            (this == DAMAGE_OTHER  || this == DANGER_OTHER ) ? DANGER_OTHER  :
+            (this == LAVA) ? DAMAGE_FIRE :
+            null;
+   }
+ }
@@ -14,8 +14,8 @@
 -                     } else {
 -                        p_193578_4_ = PathNodeType.DANGER_FIRE;
 -                     }
-+                     PathNodeType type = func_189553_b(p_193578_0_, p_193578_1_, p_193578_2_, p_193578_3_);
-+                     if (type == PathNodeType.DANGER_CACTUS || type == PathNodeType.DANGER_FIRE || type == PathNodeType.DANGER_OTHER)
+                     PathNodeType type = func_189553_b(p_193578_0_, p_193578_1_ + i, p_193578_2_ + j, p_193578_3_ + k).getDanger();
+                     if (type != null)
 +                        p_193578_4_ = type;
                   }
                }
@@ -0,0 +1,11 @@
+--- a/net/minecraft/resources/ResourcePackList.java
+++ b/net/minecraft/resources/ResourcePackList.java
+@@ -48,7 +48,7 @@
+    private void func_198986_e() {
+       List<Entry<String, T>> list = Lists.newArrayList(this.field_198988_b.entrySet());
+       this.field_198988_b.clear();
+-      list.stream().sorted(Entry.comparingByKey()).forEachOrdered((p_198984_1_) -> {
+      list.stream().sorted(net.minecraftforge.fml.packs.ResourcePackLoader.getSorter()).forEachOrdered((p_198984_1_) -> {
+          ResourcePackInfo resourcepackinfo = (ResourcePackInfo)this.field_198988_b.put(p_198984_1_.getKey(), p_198984_1_.getValue());
+       });
+    }
@@ -9,7 +9,23 @@
       p_213187_0_.setUncaughtExceptionHandler((p_213206_0_, p_213206_1_) -> {
          field_147145_h.error(p_213206_1_);
       });
-@@ -336,6 +336,8 @@
+@@ -221,6 +221,7 @@
+    private final LootTableManager field_200256_aj = new LootTableManager(this.field_229734_an_);
+    private final AdvancementManager field_200257_ak = new AdvancementManager();
+    private final FunctionManager field_200258_al = new FunctionManager(this);
+   private final net.minecraftforge.common.loot.LootModifierManager lootManager = new net.minecraftforge.common.loot.LootModifierManager();
+    private final FrameTimer field_213215_ap = new FrameTimer();
+    private boolean field_205745_an;
+    private boolean field_212205_ao;
+@@ -249,6 +250,7 @@
+       this.field_195576_ac.func_219534_a(this.field_200256_aj);
+       this.field_195576_ac.func_219534_a(this.field_200258_al);
+       this.field_195576_ac.func_219534_a(this.field_200257_ak);
+      field_195576_ac.func_219534_a(lootManager);
+       this.field_213217_au = Util.func_215072_e();
+       this.field_71294_K = p_i50590_10_;
+    }
+@@ -336,6 +338,8 @@
       this.func_200245_b(new TranslationTextComponent("menu.loadingLevel"));
       SaveHandler savehandler = this.func_71254_M().func_197715_a(p_71247_1_, this);
       this.func_175584_a(this.func_71270_I(), savehandler);
@@ -18,7 +34,7 @@
       WorldInfo worldinfo = savehandler.func_75757_d();
       WorldSettings worldsettings;
       if (worldinfo == null) {
-@@ -357,13 +359,13 @@
+@@ -357,13 +361,13 @@
 
       worldinfo.func_230145_a_(this.getServerModName(), this.func_230045_q_().isPresent());
       this.func_195560_a(savehandler.func_75765_b(), worldinfo);
@@ -33,7 +49,7 @@
       if (this.func_71242_L()) {
          p_213194_2_.func_176127_a(field_213219_c);
       }
-@@ -407,6 +409,7 @@
+@@ -407,6 +411,7 @@
          if (dimensiontype != DimensionType.field_223227_a_) {
             this.field_71305_c.put(dimensiontype, new ServerMultiWorld(serverworld1, this, this.field_213217_au, p_213194_1_, dimensiontype, this.field_71304_b, p_213194_4_));
          }
@@ -41,7 +57,7 @@
       }
 
    }
-@@ -565,6 +568,7 @@
+@@ -565,6 +570,7 @@
       for(ServerWorld serverworld1 : this.func_212370_w()) {
          if (serverworld1 != null) {
             try {
@@ -49,7 +65,7 @@
                serverworld1.close();
             } catch (IOException ioexception) {
                field_147145_h.error("Exception closing the level", (Throwable)ioexception);
-@@ -605,6 +609,7 @@
+@@ -605,6 +611,7 @@
    public void run() {
       try {
          if (this.func_71197_b()) {
@@ -57,7 +73,7 @@
             this.field_211151_aa = Util.func_211177_b();
             this.field_147147_p.func_151315_a(new StringTextComponent(this.field_71286_C));
             this.field_147147_p.func_151321_a(new ServerStatusResponse.Version(SharedConstants.func_215069_a().getName(), SharedConstants.func_215069_a().getProtocolVersion()));
-@@ -636,9 +641,15 @@
+@@ -636,9 +643,15 @@
                this.field_71304_b.func_219897_b();
                this.field_71296_Q = true;
             }
@@ -73,7 +89,7 @@
       } catch (Throwable throwable1) {
          field_147145_h.error("Encountered an unexpected exception", throwable1);
          CrashReport crashreport;
-@@ -655,6 +666,7 @@
+@@ -655,6 +668,7 @@
             field_147145_h.error("We were unable to save this crash report to disk.");
          }
 
@@ -81,7 +97,7 @@
          this.func_71228_a(crashreport);
       } finally {
          try {
-@@ -663,6 +675,7 @@
+@@ -663,6 +677,7 @@
          } catch (Throwable throwable) {
             field_147145_h.error("Exception stopping the server", throwable);
          } finally {
@@ -89,7 +105,7 @@
             this.func_71240_o();
          }
 
-@@ -764,6 +777,7 @@
+@@ -764,6 +779,7 @@
 
    protected void func_71217_p(BooleanSupplier p_71217_1_) {
       long i = Util.func_211178_c();
@@ -97,7 +113,7 @@
       ++this.field_71315_w;
       this.func_71190_q(p_71217_1_);
       if (i - this.field_147142_T >= 5000000000L) {
-@@ -778,6 +792,7 @@
+@@ -778,6 +794,7 @@
 
          Collections.shuffle(Arrays.asList(agameprofile));
          this.field_147147_p.func_151318_b().func_151330_a(agameprofile);
@@ -105,7 +121,7 @@
       }
 
       if (this.field_71315_w % 6000 == 0) {
-@@ -805,6 +820,7 @@
+@@ -805,6 +822,7 @@
       long i1 = Util.func_211178_c();
       this.field_213215_ap.func_181747_a(i1 - i);
       this.field_71304_b.func_76319_b();
@@ -113,7 +129,7 @@
    }
 
    protected void func_71190_q(BooleanSupplier p_71190_1_) {
-@@ -812,7 +828,8 @@
+@@ -812,7 +830,8 @@
       this.func_193030_aL().func_73660_a();
       this.field_71304_b.func_219895_b("levels");
 
@@ -123,7 +139,7 @@
          if (serverworld.field_73011_w.func_186058_p() == DimensionType.field_223227_a_ || this.func_71255_r()) {
             this.field_71304_b.func_194340_a(() -> {
                return serverworld.func_72912_H().func_76065_j() + " " + Registry.field_212622_k.func_177774_c(serverworld.field_73011_w.func_186058_p());
-@@ -824,6 +841,7 @@
+@@ -824,6 +843,7 @@
             }
 
             this.field_71304_b.func_76320_a("tick");
@@ -131,7 +147,7 @@
 
             try {
                serverworld.func_72835_b(p_71190_1_);
-@@ -832,12 +850,16 @@
+@@ -832,12 +852,16 @@
                serverworld.func_72914_a(crashreport);
                throw new ReportedException(crashreport);
             }
@@ -148,7 +164,7 @@
       this.field_71304_b.func_219895_b("connection");
       this.func_147137_ag().func_151269_c();
       this.field_71304_b.func_219895_b("players");
-@@ -878,6 +900,7 @@
+@@ -878,6 +902,7 @@
       OptionSpec<Integer> optionspec10 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1);
       OptionSpec<String> optionspec11 = optionparser.accepts("serverId").withRequiredArg();
       OptionSpec<String> optionspec12 = optionparser.nonOptions();
@@ -156,7 +172,16 @@
 
       try {
          OptionSet optionset = optionparser.parse(p_main_0_);
-@@ -910,6 +933,10 @@
+@@ -888,7 +913,7 @@
+ 
+          Path path = Paths.get("server.properties");
+          ServerPropertiesProvider serverpropertiesprovider = new ServerPropertiesProvider(path);
+-         serverpropertiesprovider.func_219035_b();
+         if (optionset.has(optionspec1) || !Files.exists(path)) serverpropertiesprovider.func_219035_b();
+          Path path1 = Paths.get("eula.txt");
+          ServerEula servereula = new ServerEula(path1);
+          if (optionset.has(optionspec1)) {
+@@ -910,6 +935,10 @@
          GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
          PlayerProfileCache playerprofilecache = new PlayerProfileCache(gameprofilerepository, new File(s, field_152367_a.getName()));
          String s1 = Optional.ofNullable(optionset.valueOf(optionspec9)).orElse(serverpropertiesprovider.func_219034_a().field_219021_o);
@@ -167,7 +192,7 @@
          final DedicatedServer dedicatedserver = new DedicatedServer(new File(s), serverpropertiesprovider, DataFixesManager.func_210901_a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, playerprofilecache, LoggingChunkStatusListener::new, s1);
          dedicatedserver.func_71224_l(optionset.valueOf(optionspec7));
          dedicatedserver.func_71208_b(optionset.valueOf(optionspec10));
-@@ -927,6 +954,7 @@
+@@ -927,6 +956,7 @@
          Thread thread = new Thread("Server Shutdown Thread") {
             public void run() {
                dedicatedserver.func_71263_m(true);
@@ -175,7 +200,7 @@
             }
          };
          thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(field_147145_h));
-@@ -971,7 +999,7 @@
+@@ -971,7 +1001,7 @@
    }
 
    public ServerWorld func_71218_a(DimensionType p_71218_1_) {
@@ -184,7 +209,7 @@
    }
 
    public Iterable<ServerWorld> func_212370_w() {
-@@ -1010,7 +1038,7 @@
+@@ -1010,7 +1040,7 @@
    }
 
    public String getServerModName() {
@@ -193,7 +218,18 @@
    }
 
    public CrashReport func_71230_b(CrashReport p_71230_1_) {
-@@ -1567,6 +1595,31 @@
+@@ -1396,6 +1426,10 @@
+    public FunctionManager func_193030_aL() {
+       return this.field_200258_al;
+    }
+   
+   public net.minecraftforge.common.loot.LootModifierManager getLootModifierManager() {
+	   return lootManager;
+   }
+ 
+    public void func_193031_aM() {
+       if (!this.func_213162_bc()) {
+@@ -1567,6 +1601,31 @@
 
    public abstract boolean func_213199_b(GameProfile p_213199_1_);
 
@@ -8,15 +8,17 @@
             BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
 
             String s3;
-@@ -118,6 +119,7 @@
+@@ -118,7 +119,9 @@
          field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
       }
 
 +      net.minecraftforge.fml.server.ServerModLoader.begin(this);
       field_155771_h.info("Loading properties");
+      this.field_71340_o.func_219033_a(properties -> ServerProperties.func_218985_a(java.nio.file.Paths.get("server.properties")));
       ServerProperties serverproperties = this.field_71340_o.func_219034_a();
       if (this.func_71264_H()) {
-@@ -175,6 +177,7 @@
+          this.func_71189_e("127.0.0.1");
+@@ -175,6 +178,7 @@
       if (!PreYggdrasilConverter.func_219587_e(this)) {
          return false;
       } else {
@@ -24,7 +26,7 @@
          this.func_184105_a(new DedicatedPlayerList(this));
          long i = Util.func_211178_c();
          String s = serverproperties.field_219022_p;
-@@ -196,6 +199,7 @@
+@@ -196,6 +200,7 @@
          SkullTileEntity.func_184293_a(this.func_152358_ax());
          SkullTileEntity.func_184294_a(this.func_147130_as());
          PlayerProfileCache.func_187320_a(this.func_71266_T());
@@ -32,7 +34,7 @@
          field_155771_h.info("Preparing level \"{}\"", (Object)this.func_71270_I());
          JsonObject jsonobject = new JsonObject();
          if (worldtype == WorldType.field_77138_c) {
-@@ -208,6 +212,7 @@
+@@ -208,6 +213,7 @@
          long l = Util.func_211178_c() - i;
          String s2 = String.format(Locale.ROOT, "%.3fs", (double)l / 1.0E9D);
          field_155771_h.info("Done ({})! For help, type \"help\"", (Object)s2);
@@ -40,7 +42,7 @@
          if (serverproperties.field_219027_u != null) {
             this.func_200252_aR().func_223585_a(GameRules.field_223620_w).func_223570_a(serverproperties.field_219027_u, this);
          }
-@@ -233,7 +238,8 @@
+@@ -233,7 +239,8 @@
          }
 
          Items.field_190931_a.func_150895_a(ItemGroup.field_78027_g, NonNullList.func_191196_a());
@@ -50,7 +52,7 @@
       }
    }
 
-@@ -547,4 +553,9 @@
+@@ -547,4 +554,9 @@
    public boolean func_213199_b(GameProfile p_213199_1_) {
       return false;
    }
@@ -8,12 +8,14 @@
 
    public PlayerList(MinecraftServer p_i50688_1_, int p_i50688_2_) {
       this.field_72400_f = p_i50688_1_;
-@@ -110,6 +111,14 @@
+@@ -109,7 +110,15 @@
+       String s = gameprofile1 == null ? gameprofile.getName() : gameprofile1.getName();
       playerprofilecache.func_152649_a(gameprofile);
       CompoundNBT compoundnbt = this.func_72380_a(p_72355_2_);
-       ServerWorld serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
+-      ServerWorld serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
 +
 +      //Forge: Make sure the dimension hasn't been deleted, if so stick them in the overworld.
+      ServerWorld serverworld = p_72355_2_.field_71093_bK != null ? this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK) : null ;
 +      if (serverworld == null) {
 +         p_72355_2_.field_71093_bK = DimensionType.field_223227_a_;
 +         serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
@@ -155,7 +157,20 @@
       return serverplayerentity;
    }
 
-@@ -739,7 +767,7 @@
+@@ -698,12 +726,6 @@
+       if (serverstatisticsmanager == null) {
+          File file1 = new File(this.field_72400_f.func_71218_a(DimensionType.field_223227_a_).func_217485_w().func_75765_b(), "stats");
+          File file2 = new File(file1, uuid + ".json");
+-         if (!file2.exists()) {
+-            File file3 = new File(file1, p_152602_1_.func_200200_C_().getString() + ".json");
+-            if (file3.exists() && file3.isFile()) {
+-               file3.renameTo(file2);
+-            }
+-         }
+ 
+          serverstatisticsmanager = new ServerStatisticsManager(this.field_72400_f, file2);
+          this.field_148547_k.put(uuid, serverstatisticsmanager);
+@@ -739,7 +761,7 @@
    }
 
    public List<ServerPlayerEntity> func_181057_v() {
@@ -164,7 +179,7 @@
    }
 
    @Nullable
-@@ -769,4 +797,12 @@
+@@ -769,4 +791,12 @@
    public boolean func_206257_x() {
       return this.field_72407_n;
    }
@@ -18,24 +18,39 @@
       this.field_199888_a = p_i48224_1_;
       this.field_199889_b = (Set<T>)(p_i48224_3_ ? Sets.newLinkedHashSet() : Sets.newHashSet());
       this.field_200150_c = p_i48224_2_;
-@@ -48,7 +52,7 @@
+@@ -45,11 +49,18 @@
+       JsonArray jsonarray = new JsonArray();
+ 
+       for(Tag.ITagEntry<T> itagentry : this.field_200150_c) {
+         if (!(itagentry instanceof net.minecraftforge.common.data.IOptionalTagEntry))
          itagentry.func_200576_a(jsonarray, p_200571_1_);
       }
+      JsonArray optional = new JsonArray();
+      for(Tag.ITagEntry<T> itagentry : this.field_200150_c) {
+         if (itagentry instanceof net.minecraftforge.common.data.IOptionalTagEntry)
+            itagentry.func_200576_a(optional, p_200571_1_);
+      }
 
 -      jsonobject.addProperty("replace", false);
 +      jsonobject.addProperty("replace", replace);
       jsonobject.add("values", jsonarray);
+      if (optional.size() > 0) jsonobject.add("optional", optional);
       return jsonobject;
    }
-@@ -77,6 +81,7 @@
-    public static class Builder<T> {
+ 
+@@ -74,9 +85,10 @@
+       return this.field_199888_a;
+    }
+ 
+-   public static class Builder<T> {
+   public static class Builder<T> implements net.minecraftforge.common.extensions.IForgeTagBuilder<T> {
       private final Set<Tag.ITagEntry<T>> field_200052_a = Sets.newLinkedHashSet();
       private boolean field_200053_b;
 +      private boolean replace = false;
 
       public static <T> Tag.Builder<T> func_200047_a() {
          return new Tag.Builder<>();
-@@ -103,6 +108,22 @@
+@@ -103,6 +115,22 @@
          return this;
       }
 
@@ -58,7 +73,7 @@
       public Tag.Builder<T> func_200045_a(boolean p_200045_1_) {
          this.field_200053_b = p_200045_1_;
          return this;
-@@ -119,7 +140,7 @@
+@@ -119,7 +147,7 @@
       }
 
       public Tag<T> func_200051_a(ResourceLocation p_200051_1_) {
@@ -67,7 +82,7 @@
       }
 
       public Tag.Builder<T> func_219783_a(Function<ResourceLocation, Optional<T>> p_219783_1_, JsonObject p_219783_2_) {
-@@ -143,8 +164,10 @@
+@@ -143,8 +171,10 @@
          }
 
          this.field_200052_a.addAll(list);
@@ -78,7 +93,7 @@
    }
 
    public interface ITagEntry<T> {
-@@ -183,6 +206,8 @@
+@@ -183,6 +213,8 @@
       public Collection<T> func_200578_a() {
          return this.field_200165_a;
       }
@@ -87,7 +102,7 @@
    }
 
    public static class TagEntry<T> implements Tag.ITagEntry<T> {
-@@ -229,5 +254,7 @@
+@@ -229,5 +261,7 @@
       public void func_200576_a(JsonArray p_200576_1_, Function<T, ResourceLocation> p_200576_2_) {
          p_200576_1_.add("#" + this.func_200577_a());
       }
@@ -0,0 +1,11 @@
+--- a/net/minecraft/tags/TagCollection.java
+++ b/net/minecraft/tags/TagCollection.java
+@@ -154,4 +154,8 @@
+    public Map<ResourceLocation, Tag<T>> func_200039_c() {
+       return this.field_199921_d;
+    }
+
+   public Function<ResourceLocation, Optional<T>> getEntryLookup() {
+       return this.field_200040_e;
+   }
+ }
@@ -17,7 +17,7 @@
          TileEntity tileentity = p_195481_0_.func_175625_s(p_195481_1_);
          if (tileentity instanceof ChestTileEntity) {
             return ((ChestTileEntity)tileentity).field_145987_o;
-@@ -221,4 +222,56 @@
+@@ -221,4 +222,39 @@
    protected Container func_213906_a(int p_213906_1_, PlayerInventory p_213906_2_) {
       return ChestContainer.func_216992_a(p_213906_1_, p_213906_2_, this);
    }
@@ -46,25 +46,8 @@
 +      if (!(state.func_177230_c() instanceof ChestBlock)) {
 +         return new net.minecraftforge.items.wrapper.InvWrapper(this);
 +      }
-+      ChestType type = state.func_177229_b(ChestBlock.field_196314_b);
-+      if (type != ChestType.SINGLE) {
-+         BlockPos opos = this.func_174877_v().func_177972_a(ChestBlock.func_196311_i(state));
-+         BlockState ostate = this.func_145831_w().func_180495_p(opos);
-+         if (state.func_177230_c() == ostate.func_177230_c()) {
-+            ChestType otype = ostate.func_177229_b(ChestBlock.field_196314_b);
-+            if (otype != ChestType.SINGLE && type != otype && state.func_177229_b(ChestBlock.field_176459_a) == ostate.func_177229_b(ChestBlock.field_176459_a)) {
-+               TileEntity ote = this.func_145831_w().func_175625_s(opos);
-+               if (ote instanceof ChestTileEntity) {
-+                  IInventory top    = type == ChestType.RIGHT ? this : (IInventory)ote;
-+                  IInventory bottom = type == ChestType.RIGHT ? (IInventory)ote : this;
-+                  return new net.minecraftforge.items.wrapper.CombinedInvWrapper(
-+                     new net.minecraftforge.items.wrapper.InvWrapper(top),
-+                     new net.minecraftforge.items.wrapper.InvWrapper(bottom));
-+               }
-+            }
-+         }
-+      }
-+      return new net.minecraftforge.items.wrapper.InvWrapper(this);
+      IInventory inv = ChestBlock.func_226916_a_((ChestBlock) state.func_177230_c(), state, func_145831_w(), func_174877_v(), true);
+      return new net.minecraftforge.items.wrapper.InvWrapper(inv == null ? this : inv);
 +   }
 +
 +   @Override
@@ -1,11 +1,14 @@
 --- a/net/minecraft/tileentity/ConduitTileEntity.java
 +++ b/net/minecraft/tileentity/ConduitTileEntity.java
-@@ -131,7 +131,7 @@
+@@ -131,10 +131,8 @@
                   BlockPos blockpos1 = this.field_174879_c.func_177982_a(j1, k1, l1);
                   BlockState blockstate = this.field_145850_b.func_180495_p(blockpos1);
 
 -                  for(Block block : field_205042_e) {
-+                  for(Block block : net.minecraftforge.common.Tags.Blocks.SUPPORTS_CONDUIT.func_199885_a()) {
-                      if (blockstate.func_177230_c() == block) {
+-                     if (blockstate.func_177230_c() == block) {
+                      if (blockstate.isConduitFrame(this.field_145850_b, blockpos1, func_174877_v())) {
                         this.field_205046_i.add(blockpos1);
-                      }
+-                     }
+                   }
+                }
+             }
@@ -0,0 +1,17 @@
+--- a/net/minecraft/util/math/RayTraceContext.java
+++ b/net/minecraft/util/math/RayTraceContext.java
+@@ -16,12 +16,12 @@
+    private final RayTraceContext.FluidMode field_222257_d;
+    private final ISelectionContext field_222258_e;
+ 
+-   public RayTraceContext(Vec3d p_i50009_1_, Vec3d p_i50009_2_, RayTraceContext.BlockMode p_i50009_3_, RayTraceContext.FluidMode p_i50009_4_, Entity p_i50009_5_) {
+   public RayTraceContext(Vec3d p_i50009_1_, Vec3d p_i50009_2_, RayTraceContext.BlockMode p_i50009_3_, RayTraceContext.FluidMode p_i50009_4_, @javax.annotation.Nullable Entity p_i50009_5_) {
+       this.field_222254_a = p_i50009_1_;
+       this.field_222255_b = p_i50009_2_;
+       this.field_222256_c = p_i50009_3_;
+       this.field_222257_d = p_i50009_4_;
+-      this.field_222258_e = ISelectionContext.func_216374_a(p_i50009_5_);
+      this.field_222258_e = p_i50009_5_ == null ? ISelectionContext.func_216377_a() : ISelectionContext.func_216374_a(p_i50009_5_);
+    }
+ 
+    public Vec3d func_222250_a() {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/registry/Registry.java
 +++ b/net/minecraft/util/registry/Registry.java
-@@ -70,47 +70,51 @@
+@@ -70,88 +70,90 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -64,9 +64,20 @@
 +   @Deprecated public static final Registry<Biome> field_212624_m = forge("biome", Biome.class, () -> {
       return Biomes.field_180279_ad;
    });
-    public static final Registry<BlockStateProviderType<?>> field_229387_t_ = func_222935_a("block_state_provider_type", () -> {
-@@ -125,33 +129,31 @@
-    public static final Registry<TreeDecoratorType<?>> field_229390_w_ = func_222935_a("tree_decorator_type", () -> {
+-   public static final Registry<BlockStateProviderType<?>> field_229387_t_ = func_222935_a("block_state_provider_type", () -> {
+   @Deprecated public static final Registry<BlockStateProviderType<?>> field_229387_t_ = forge("block_state_provider_type", BlockStateProviderType.class, () -> {
+       return BlockStateProviderType.field_227394_a_;
+    });
+-   public static final Registry<BlockPlacerType<?>> field_229388_u_ = func_222935_a("block_placer_type", () -> {
+   @Deprecated public static final Registry<BlockPlacerType<?>> field_229388_u_ = forge("block_placer_type", BlockPlacerType.class, () -> {
+       return BlockPlacerType.field_227259_a_;
+    });
+-   public static final Registry<FoliagePlacerType<?>> field_229389_v_ = func_222935_a("foliage_placer_type", () -> {
+   @Deprecated public static final Registry<FoliagePlacerType<?>> field_229389_v_ = forge("foliage_placer_type", FoliagePlacerType.class, () -> {
+       return FoliagePlacerType.field_227386_a_;
+    });
+-   public static final Registry<TreeDecoratorType<?>> field_229390_w_ = func_222935_a("tree_decorator_type", () -> {
+   @Deprecated public static final Registry<TreeDecoratorType<?>> field_229390_w_ = forge("tree_decorator_type", TreeDecoratorType.class, () -> {
       return TreeDecoratorType.field_227426_b_;
    });
 -   public static final Registry<ParticleType<? extends IParticleData>> field_212632_u = func_222935_a("particle_type", () -> {
@@ -41,7 +41,7 @@
                return true;
             }
          }
-@@ -375,6 +375,12 @@
+@@ -375,6 +375,22 @@
       return this.field_185364_H;
    }
 
@@ -50,11 +50,21 @@
 +      if (this == Biomes.field_76789_p || this == Biomes.field_76788_q) return Biomes.field_76788_q;
 +      return Biomes.field_76781_i;
 +   }
+
+   @Nullable
+   public Biome getHill(net.minecraft.world.gen.INoiseRandom rand) {
+      return null;
+   }
+
+   @Nullable
+   public Biome getEdge(net.minecraft.world.gen.INoiseRandom rand, Biome northBiome, Biome westBiome, Biome southBiome, Biome eastBiome) {
+      return null;
+   }
 +
    public static class Builder {
       @Nullable
       private ConfiguredSurfaceBuilder<?> field_205422_a;
-@@ -526,6 +532,18 @@
+@@ -526,6 +542,18 @@
       }
    }
 
@@ -31,7 +31,7 @@
          if (!this.field_76637_e.field_72995_K) {
             blockstate.func_196947_b(this.field_76637_e, p_177436_1_, p_177436_2_, p_177436_3_);
 -         } else if (block1 != block && block1 instanceof ITileEntityProvider) {
-+         } else if (block1 != block && blockstate.hasTileEntity()) {
+         } else if ((block1 != block || !p_177436_2_.hasTileEntity()) && blockstate.hasTileEntity()) {
             this.field_76637_e.func_175713_t(p_177436_1_);
          }
 
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/chunk/storage/RegionFile.java
 +++ b/net/minecraft/world/chunk/storage/RegionFile.java
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
    private final IntBuffer field_76716_d;
    private final IntBuffer field_227127_h_;
    private final RegionBitmap field_227128_i_ = new RegionBitmap();
@@ -8,7 +8,7 @@
 
    public RegionFile(File p_i225784_1_, File p_i225784_2_) throws IOException {
       this(p_i225784_1_.toPath(), p_i225784_2_.toPath(), RegionFileVersion.field_227159_b_);
-@@ -39,6 +40,7 @@
+@@ -40,6 +41,7 @@
 
    public RegionFile(Path p_i225785_1_, Path p_i225785_2_, RegionFileVersion p_i225785_3_) throws IOException {
       this.field_227125_e_ = p_i225785_3_;
@@ -16,7 +16,7 @@
       if (!Files.isDirectory(p_i225785_2_)) {
          throw new IllegalArgumentException("Expected directory, got " + p_i225785_2_.toAbsolutePath());
       } else {
-@@ -61,6 +63,8 @@
+@@ -62,6 +64,8 @@
                if (k != 0) {
                   int l = func_227142_b_(k);
                   int i1 = func_227131_a_(k);
@@ -25,7 +25,7 @@
                   this.field_227128_i_.func_227120_a_(l, i1);
                }
             }
-@@ -69,6 +73,66 @@
+@@ -70,6 +74,66 @@
       }
    }
 
@@ -35,7 +35,7 @@
 +
 +       ByteBuffer header = ByteBuffer.allocate(5);
 +       this.field_76719_c.read(header, offset * 4096);
-+       header.flip();
+       ((Buffer)header).flip();
 +
 +       if (header.remaining() < 5) {
 +          field_227122_a_.error("Chunk {},{} in {} header is truncated: expected 5 but read {}", chunkX, chunkZ, this.filePath.getFileName(), header.remaining());
@@ -63,7 +63,7 @@
 +
 +          ByteBuffer header = ByteBuffer.allocate(5);
 +          this.field_76719_c.read(header, offset * 4096);
-+          header.flip();
+          ((Buffer)header).flip();
 +
 +          if (header.remaining() < 5) {
 +             field_227122_a_.error("Chunk {} in {} header is truncated: expected 5 but read {}", chunk, this.filePath.getFileName(), header.remaining());
@@ -78,7 +78,7 @@
 +
 +          ByteBuffer data = ByteBuffer.allocate(length + 4);
 +          this.field_76719_c.read(data, offset * 4096);
-+          data.flip();
+          ((Buffer)data).flip();
 +
 +          if (data.remaining() < length + 4) {
 +              field_227122_a_.error("Chunk {} in {} is truncated: expected {} but read {}", chunk, this.filePath.getFileName(), length + 4, data.remaining());
@@ -92,7 +92,7 @@
    private Path func_227145_e_(ChunkPos p_227145_1_) {
       String s = "c." + p_227145_1_.field_77276_a + "." + p_227145_1_.field_77275_b + ".mcc";
       return this.field_227124_d_.resolve(s);
-@@ -224,6 +288,7 @@
+@@ -225,6 +289,7 @@
       int j = this.field_76716_d.get(i);
       int k = func_227142_b_(j);
       int l = func_227131_a_(j);
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/gen/blockplacer/BlockPlacerType.java
+++ b/net/minecraft/world/gen/blockplacer/BlockPlacerType.java
+@@ -4,7 +4,7 @@
+ import java.util.function.Function;
+ import net.minecraft.util.registry.Registry;
+ 
+-public class BlockPlacerType<P extends BlockPlacer> {
+public class BlockPlacerType<P extends BlockPlacer> extends net.minecraftforge.registries.ForgeRegistryEntry<BlockPlacerType<?>> {
+    public static final BlockPlacerType<SimpleBlockPlacer> field_227259_a_ = func_227264_a_("simple_block_placer", SimpleBlockPlacer::new);
+    public static final BlockPlacerType<DoublePlantBlockPlacer> field_227260_b_ = func_227264_a_("double_plant_placer", DoublePlantBlockPlacer::new);
+    public static final BlockPlacerType<ColumnBlockPlacer> field_227261_c_ = func_227264_a_("column_placer", ColumnBlockPlacer::new);
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/gen/blockstateprovider/BlockStateProviderType.java
+++ b/net/minecraft/world/gen/blockstateprovider/BlockStateProviderType.java
+@@ -4,7 +4,7 @@
+ import java.util.function.Function;
+ import net.minecraft.util.registry.Registry;
+ 
+-public class BlockStateProviderType<P extends BlockStateProvider> {
+public class BlockStateProviderType<P extends BlockStateProvider> extends net.minecraftforge.registries.ForgeRegistryEntry<BlockStateProviderType<?>> {
+    public static final BlockStateProviderType<SimpleBlockStateProvider> field_227394_a_ = func_227400_a_("simple_state_provider", SimpleBlockStateProvider::new);
+    public static final BlockStateProviderType<WeightedBlockStateProvider> field_227395_b_ = func_227400_a_("weighted_state_provider", WeightedBlockStateProvider::new);
+    public static final BlockStateProviderType<PlainFlowerBlockStateProvider> field_227396_c_ = func_227400_a_("plain_flower_provider", PlainFlowerBlockStateProvider::new);
@@ -13,11 +13,11 @@
 +   /**
 +    * FORGE: Add template parameter
 +    * 
-+    * @param p_215194_1_
-+    * @param p_215194_2_
+    * @param worldReaderIn
+    * @param pos
 +    * @param p_215194_3_
-+    * @param p_215194_4_
-+    * @param p_215194_5_
+    * @param blockInfo
+    * @param placementSettingsIn
 +    * @param template The template being placed, can be null due to deprecated
 +    *                 method calls.
 +    * @see #process(IWorldReader, BlockPos,
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/gen/foliageplacer/FoliagePlacerType.java
+++ b/net/minecraft/world/gen/foliageplacer/FoliagePlacerType.java
+@@ -4,7 +4,7 @@
+ import java.util.function.Function;
+ import net.minecraft.util.registry.Registry;
+ 
+-public class FoliagePlacerType<P extends FoliagePlacer> {
+public class FoliagePlacerType<P extends FoliagePlacer> extends net.minecraftforge.registries.ForgeRegistryEntry<FoliagePlacerType<?>> {
+    public static final FoliagePlacerType<BlobFoliagePlacer> field_227386_a_ = func_227392_a_("blob_foliage_placer", BlobFoliagePlacer::new);
+    public static final FoliagePlacerType<SpruceFoliagePlacer> field_227387_b_ = func_227392_a_("spruce_foliage_placer", SpruceFoliagePlacer::new);
+    public static final FoliagePlacerType<PineFoliagePlacer> field_227388_c_ = func_227392_a_("pine_foliage_placer", PineFoliagePlacer::new);
@@ -0,0 +1,14 @@
+--- a/net/minecraft/world/gen/layer/HillsLayer.java
+++ b/net/minecraft/world/gen/layer/HillsLayer.java
+@@ -59,7 +59,10 @@
+ 
+       if (p_215723_1_.func_202696_a(3) == 0 || k == 0) {
+          int l = i;
+-         if (i == field_202799_f) {
+         Biome biome = Registry.field_212624_m.func_148745_a(i);
+         Biome hill = biome == null ? null : biome.getHill(p_215723_1_);
+         if (hill != null) l = Registry.field_212624_m.func_148757_b(hill);
+         else if (i == field_202799_f) {
+             l = field_202800_g;
+          } else if (i == field_202803_j) {
+             l = field_202804_k;
@@ -0,0 +1,12 @@
+--- a/net/minecraft/world/gen/layer/ShoreLayer.java
+++ b/net/minecraft/world/gen/layer/ShoreLayer.java
+@@ -34,6 +34,9 @@
+ 
+    public int func_202748_a(INoiseRandom p_202748_1_, int p_202748_2_, int p_202748_3_, int p_202748_4_, int p_202748_5_, int p_202748_6_) {
+       Biome biome = Registry.field_212624_m.func_148745_a(p_202748_6_);
+      Biome edgeBiome = biome.getEdge(p_202748_1_, Registry.field_212624_m.func_148745_a(p_202748_2_), Registry.field_212624_m.func_148745_a(p_202748_3_), Registry.field_212624_m.func_148745_a(p_202748_4_), Registry.field_212624_m.func_148745_a(p_202748_5_));
+      if (edgeBiome != null) return Registry.field_212624_m.func_148757_b(edgeBiome);
+
+       if (p_202748_6_ == field_202784_r) {
+          if (LayerUtil.func_203631_b(p_202748_2_) || LayerUtil.func_203631_b(p_202748_3_) || LayerUtil.func_203631_b(p_202748_4_) || LayerUtil.func_203631_b(p_202748_5_)) {
+             return field_202785_s;
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/gen/treedecorator/TreeDecoratorType.java
+++ b/net/minecraft/world/gen/treedecorator/TreeDecoratorType.java
+@@ -4,7 +4,7 @@
+ import java.util.function.Function;
+ import net.minecraft.util.registry.Registry;
+ 
+-public class TreeDecoratorType<P extends TreeDecorator> {
+public class TreeDecoratorType<P extends TreeDecorator> extends net.minecraftforge.registries.ForgeRegistryEntry<TreeDecoratorType<?>> {
+    public static final TreeDecoratorType<TrunkVineTreeDecorator> field_227425_a_ = func_227432_a_("trunk_vine", TrunkVineTreeDecorator::new);
+    public static final TreeDecoratorType<LeaveVineTreeDecorator> field_227426_b_ = func_227432_a_("leave_vine", LeaveVineTreeDecorator::new);
+    public static final TreeDecoratorType<CocoaTreeDecorator> field_227427_c_ = func_227432_a_("cocoa", CocoaTreeDecorator::new);
@@ -16,15 +16,7 @@
                }
 
                this.func_219229_a(p_219185_5_);
-@@ -482,6 +484,7 @@
-                if (flag) {
-                   IChunk ichunk = ChunkSerializer.func_222656_a(this.field_219255_i, this.field_219269_w, this.field_219260_n, p_223172_1_, compoundnbt);
-                   ichunk.func_177432_b(this.field_219255_i.func_82737_E());
-+                  net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkEvent.Load(ichunk));
-                   return Either.left(ichunk);
-                }
- 
-@@ -594,6 +597,7 @@
+@@ -594,6 +596,7 @@
                if (list != null) {
                   list.forEach(chunk::func_76622_b);
                }
@@ -32,19 +24,19 @@
             }
 
             return chunk;
-@@ -679,6 +683,7 @@
+@@ -679,6 +682,7 @@
 
             this.field_219255_i.func_217381_Z().func_230035_c_("chunkSave");
             CompoundNBT compoundnbt1 = ChunkSerializer.func_222645_a(this.field_219255_i, p_219229_1_);
-+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkDataEvent.Save(p_219229_1_, compoundnbt1));
+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkDataEvent.Save(p_219229_1_, p_219229_1_.getWorldForge() != null ? p_219229_1_.getWorldForge() : this.field_219255_i, compoundnbt1));
             this.func_219100_a(chunkpos, compoundnbt1);
             return true;
          } catch (Exception exception) {
-@@ -815,6 +820,7 @@
-       for(int l = i - this.field_219247_A; l <= i + this.field_219247_A; ++l) {
-          for(int k = j - this.field_219247_A; k <= j + this.field_219247_A; ++k) {
-             ChunkPos chunkpos = new ChunkPos(l, k);
-+            net.minecraftforge.event.ForgeEventFactory.fireChunkWatch(p_219234_2_, p_219234_1_, chunkpos, field_219255_i);
-             this.func_219199_a(p_219234_1_, chunkpos, new IPacket[2], !p_219234_2_, p_219234_2_);
-          }
-       }
+@@ -711,6 +715,7 @@
+ 
+    protected void func_219199_a(ServerPlayerEntity p_219199_1_, ChunkPos p_219199_2_, IPacket<?>[] p_219199_3_, boolean p_219199_4_, boolean p_219199_5_) {
+       if (p_219199_1_.field_70170_p == this.field_219255_i) {
+         net.minecraftforge.event.ForgeEventFactory.fireChunkWatch(p_219199_4_, p_219199_5_, p_219199_1_, p_219199_2_, this.field_219255_i);
+          if (p_219199_5_ && !p_219199_4_) {
+             ChunkHolder chunkholder = this.func_219219_b(p_219199_2_.func_201841_a());
+             if (chunkholder != null) {
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/server/ServerMultiWorld.java
 +++ b/net/minecraft/world/server/ServerMultiWorld.java
-@@ -10,11 +10,19 @@
+@@ -10,11 +10,22 @@
 import net.minecraft.world.storage.SaveHandler;
 
 public class ServerMultiWorld extends ServerWorld {
@@ -15,10 +15,12 @@
 +      p_i50708_1_.func_175723_af().func_177737_a(this.borderListener);
    }
 
-   protected void func_217389_a() {
+    protected void func_217389_a() {
+    }
+
 +   @Override
 +   public void close() throws java.io.IOException {
 +      super.close();
 +      this.delegate.func_175723_af().removeListener(this.borderListener); // Unlink ourselves, to prevent world leak.
-    }
+   }
 }
@@ -143,17 +143,18 @@
          i += this.field_73012_v.nextInt(8) - this.field_73012_v.nextInt(8);
          j += this.field_73012_v.nextInt(8) - this.field_73012_v.nextInt(8);
          ++k;
-@@ -584,8 +593,9 @@
+@@ -584,9 +593,10 @@
             ++p_217479_1_.field_70173_aa;
             IProfiler iprofiler = this.func_217381_Z();
             iprofiler.func_194340_a(() -> {
 -               return Registry.field_212629_r.func_177774_c(p_217479_1_.func_200600_R()).toString();
 +               return p_217479_1_.func_200600_R().getRegistryName() == null ? p_217479_1_.func_200600_R().toString() : p_217479_1_.func_200600_R().getRegistryName().toString();
             });
-+            if (p_217479_1_.canUpdate())
             iprofiler.func_230035_c_("tickNonPassenger");
+            if (p_217479_1_.canUpdate())
             p_217479_1_.func_70071_h_();
             iprofiler.func_76319_b();
+          }
@@ -652,6 +662,11 @@
    }
 
@@ -263,7 +264,7 @@
       }
    }
 
-@@ -985,8 +1015,11 @@
+@@ -985,12 +1015,16 @@
    }
 
    public void func_217434_e(ServerPlayerEntity p_217434_1_) {
@@ -277,7 +278,12 @@
       this.func_72854_c();
    }
 
-@@ -1010,10 +1043,20 @@
+    public void func_217468_a(LightningBoltEntity p_217468_1_) {
+      if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityJoinWorldEvent(p_217468_1_, this))) return;
+       this.field_217497_w.add(p_217468_1_);
+       this.field_73061_a.func_184103_al().func_148543_a((PlayerEntity)null, p_217468_1_.func_226277_ct_(), p_217468_1_.func_226278_cu_(), p_217468_1_.func_226281_cx_(), 512.0D, this.field_73011_w.func_186058_p(), new SSpawnGlobalEntityPacket(p_217468_1_));
+    }
+@@ -1010,10 +1044,20 @@
    }
 
    public void func_184148_a(@Nullable PlayerEntity p_184148_1_, double p_184148_2_, double p_184148_4_, double p_184148_6_, SoundEvent p_184148_8_, SoundCategory p_184148_9_, float p_184148_10_, float p_184148_11_) {
@@ -298,7 +304,7 @@
       this.field_73061_a.func_184103_al().func_148543_a(p_217384_1_, p_217384_2_.func_226277_ct_(), p_217384_2_.func_226278_cu_(), p_217384_2_.func_226281_cx_(), p_217384_5_ > 1.0F ? (double)(16.0F * p_217384_5_) : 16.0D, this.field_73011_w.func_186058_p(), new SSpawnMovingSoundEffectPacket(p_217384_3_, p_217384_4_, p_217384_2_, p_217384_5_, p_217384_6_));
    }
 
-@@ -1049,6 +1092,7 @@
+@@ -1049,6 +1093,7 @@
 
    public Explosion func_217401_a(@Nullable Entity p_217401_1_, @Nullable DamageSource p_217401_2_, double p_217401_3_, double p_217401_5_, double p_217401_7_, float p_217401_9_, boolean p_217401_10_, Explosion.Mode p_217401_11_) {
       Explosion explosion = new Explosion(this, p_217401_1_, p_217401_3_, p_217401_5_, p_217401_7_, p_217401_9_, p_217401_10_, p_217401_11_);
@@ -306,7 +312,7 @@
       if (p_217401_2_ != null) {
          explosion.func_199592_a(p_217401_2_);
       }
-@@ -1377,4 +1421,15 @@
+@@ -1377,4 +1422,15 @@
          return p_229854_1_.func_175898_b(p_229855_1_.func_180328_a());
       });
    }
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/spawner/AbstractSpawner.java
 +++ b/net/minecraft/world/spawner/AbstractSpawner.java
-@@ -128,7 +128,7 @@
+@@ -128,11 +128,12 @@
                   entity.func_70012_b(entity.func_226277_ct_(), entity.func_226278_cu_(), entity.func_226281_cx_(), world.field_73012_v.nextFloat() * 360.0F, 0.0F);
                   if (entity instanceof MobEntity) {
                      MobEntity mobentity = (MobEntity)entity;
@@ -9,7 +9,12 @@
                         continue;
                      }
 
-@@ -285,4 +285,9 @@
+                      if (this.field_98282_f.func_185277_b().func_186856_d() == 1 && this.field_98282_f.func_185277_b().func_150297_b("id", 8)) {
+                        if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mobentity, world, (float)entity.func_226277_ct_(), (float)entity.func_226278_cu_(), (float)entity.func_226281_cx_(), this, SpawnReason.SPAWNER))
+                         ((MobEntity)entity).func_213386_a(world, world.func_175649_E(new BlockPos(entity)), SpawnReason.SPAWNER, (ILivingEntityData)null, (CompoundNBT)null);
+                      }
+                   }
+@@ -285,4 +286,9 @@
    public double func_177223_e() {
       return this.field_98284_d;
    }