Update license header to SPDX format

Add ForgeSpawnEggItem to lazily handle EntityTypes (#10626 )
Update ForgeGradle version and re-add evaluationDependsOn
2026-11-14 17:14:44 +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
2374 changed files with 59403 additions and 69994 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
+
@@ -1,4 +0,0 @@
-<!-- Thank you for reporting! -->
-
-<!-- Please go to the forum first for support with crashes and issues. -->
-<!-- http://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
@@ -0,0 +1,13 @@
+---
+name: Feature request
+about: Want to request a feature?
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+<!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
+<!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
+<!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
+<!-- Discord: https://discord.gg/UvedJ9m -->
@@ -0,0 +1,26 @@
+---
+name: Issue report
+about: Visit the forum first for issues with crashes.
+title: ''
+labels: Triage
+assignees: ''
+
+---
+
+<!-- Thank you for reporting! -->
+
+<!-- For support with crashes and issues, please create a post on the forum instead: -->
+<!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
+
+**Minecraft Version:** {Minecraft version}
+
+**Forge Version:** {Forge version. *Version number, not latest/rb*}
+
+**Logs:** {Link(s) to GitHub Gist with full latest.log and/or crash report}
+
+**Steps to Reproduce:**
+ 1. Do this
+ 2. Then do that
+ 3. ...
+
+**Description of issue:**
@@ -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,13 +15,20 @@
 #gradle
 /build
 /.gradle
-/mdk/.gradle
-/mdk/build
+/**/.gradle
+/**/build

 #occupational hazards
-/projects/
+/projects/mcp/
+/projects/clean/
+/projects/forge/
+/projects/**/build/
+/projects/**/out/
+/projects/**/run/
+/projects/**/*.launch
 /repo/
 /buildSrc
+src/generated/resources/.cache/

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

 Step 1: Open your command-line and browse to the folder where you extracted the zip file.

-Step 2: Once you have a command window up in the folder that the downloaded material was placed, type:
+Step 2: You're left with a choice.
+If you prefer to use Eclipse:
+1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux)
+2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
+   or run "gradlew eclipse" to generate the project.
+(Current Issue)
+4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment
+5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4.

-Windows: "gradlew setupDecompWorkspace"
-Linux/Mac OS: "./gradlew setupDecompWorkspace"
-
-Step 3: After all that finished, you're left with a choice.
-For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux)
-
-If you prefer to use IntelliJ, steps are a little different.
+If you prefer to use IntelliJ:
 1. Open IDEA, and import project.
 2. Select your build.gradle file and have it import.
-3. Once it's finished you must close IntelliJ and run the following command:
-
-"gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
-
-Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project)
+3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
+4. Refresh the Gradle Project in IDEA if required.

 If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again.

 Should it still not work, 
 Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
-
-Tip:
-If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following:
-"setupDevWorkspace": Will patch, deobfuscate, and gather required assets to run minecraft, but will not generate human readable source code.
-"setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work.
-
-Tip:
-When using Decomp workspace, the Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes and usually can be accessed under the 'referenced libraries' section of your IDE.
+or the Forge Project Discord discord.gg/UvedJ9m

 Forge source installation
 =========================
@@ -1,7 +1,6 @@
 buildscript {
    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
+        maven { url = 'https://maven.minecraftforge.net/' }
        mavenCentral()
    }
    dependencies {
@@ -9,44 +8,80 @@ buildscript {
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 apply plugin: 'eclipse'
+apply plugin: 'maven-publish'

 version = '1.0'
 group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'modid'

 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+//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.
-    // snapshot_YYYYMMDD   snapshot are built nightly.
-    // stable_#            stables are built at the discretion of the MCP team.
+    // The mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   Snapshot are built nightly.
+    // stable_#            Stables are built at the discretion of the MCP team.
    // Use non-default mappings at your own risk. they may not always work.
-    // simply re-run your setup task after changing the mappings to update your workspace.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
    mappings channel: '@MAPPING_CHANNEL@', version: '@MAPPING_VERSION@'
    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
    
-    //accessTransformer = file('my_at.cfg')
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

-    // default run configurations.
-    // these can be tweaked, removed, or duplicated as needed.
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
    runs {
-        client = {
-            // recommended logging data for a userdev environment
-            properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP'
-            // recommended logging level for the console
-            properties 'forge.logging.console.level': 'debug'
-            workingDirectory project.file('run').canonicalPath
-            source sourceSets.main
+        client {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                examplemod {
+                    source sourceSets.main
+                }
+            }
        }
-        server = {
-            // recommended logging data for a userdev environment
-            properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP'
-            // recommended logging level for the console
-            properties 'forge.logging.console.level': 'debug'
-            workingDirectory project.file('run').canonicalPath
-            source sourceSets.main
+
+        server {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                examplemod {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        data {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
+
+            mods {
+                examplemod {
+                    source sourceSets.main
+                }
+            }
        }
    }
 }
@@ -57,22 +92,21 @@ dependencies {
    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
    minecraft '@FORGE_GROUP@:@FORGE_NAME@:@FORGE_VERSION@'

-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
+    // You may put jars on which you depend on in ./libs or you may define them like so..
+    // compile "some.group:artifact:version:classifier"
+    // compile "some.group:artifact:version"

-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+    // Real examples
+    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env

-    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'

    // These dependencies get remapped to your current MCP mappings
-    //deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'

-    // for more info...
+    // For more info...
    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
    // http://www.gradle.org/docs/current/userguide/dependency_management.html

@@ -81,12 +115,33 @@ dependencies {
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
    manifest {
-        attributes(["Specification-Title": "examplemod",
-                    "Specification-Vendor": "examplemodsareus",
-                    "Specification-Version": "24.0", // We are version 1 of the modlauncher specification
-                    "Implementation-Title": project.name,
-                    "Implementation-Version": "${version}",
-                    "Implementation-Vendor" :"examplemodsareus",
-                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],)
+        attributes([
+            "Specification-Title": "examplemod",
+            "Specification-Vendor": "examplemodsareus",
+            "Specification-Version": "1", // We are version 1 of ourselves
+            "Implementation-Title": project.name,
+            "Implementation-Version": "${version}",
+            "Implementation-Vendor" :"examplemodsareus",
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
    }
-}
+}
+
+// Example configuration to allow publishing using the maven-publish task
+// 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 jar
+        }
+    }
+    repositories {
+        maven {
+            url "file:///${project.projectDir}/mcmodsrepo"
+        }
+    }
+}
@@ -1,4 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-version=1
-eclipse.preferences.version=1
-refresh.enabled=true
@@ -1,7 +0,0 @@
-#Sun Jun 05 19:03:53 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.debug.ui.UseContextualLaunch=false
-Console.highWaterMark=88000
-org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<launchPerspectives/>\r\n
-org.eclipse.debug.ui.user_view_bindings=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<viewBindings>\r\n<view id\="org.eclipse.ui.console.ConsoleView">\r\n<perspective id\="org.eclipse.jdt.ui.JavaPerspective" userAction\="opened"/>\r\n</view>\r\n</viewBindings>\r\n
-StringVariablePreferencePage=130,107,107,86,
@@ -1,3 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.epp.usagedata.gathering.enabled=false
@@ -1,14 +0,0 @@
-#Sun Sep 18 16:44:39 NZST 2011
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.source=1.6
@@ -1,4 +0,0 @@
-#Sun Jun 05 18:58:05 CEST 2011
-spacesForTabs=true
-eclipse.preferences.version=1
-overviewRuler_migration=migrated_3.1
@@ -1,9 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-IMPORT_FILES_AND_FOLDERS_MODE=prompt
-IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
-SAVE_ALL_BEFORE_BUILD=true
-eclipse.preferences.version=1
-tipsAndTricks=true
-platformState=1287081747687
-quickStart=false
-PROBLEMS_FILTERS_MIGRATE=true
@@ -1,3 +0,0 @@
-#Sun Jun 05 18:50:08 CEST 2011
-eclipse.preferences.version=1
-showIntro=false
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MDKExample"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MDKExample"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
-</launchConfiguration>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MDKExample"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MDKExample"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
-</launchConfiguration>
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchHistory>
-<launchGroup id="org.eclipse.ui.externaltools.launchGroup">
-<mruHistory/>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.profile">
-<mruHistory/>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.debug">
-<mruHistory>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
-</mruHistory>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.run">
-<mruHistory>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
-</mruHistory>
-<favorites/>
-</launchGroup>
-</launchHistory>
@@ -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,7 +1,7 @@
 package com.example.examplemod;

 import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
+import net.minecraft.block.Blocks;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -35,7 +35,7 @@ public class ExampleMod
        // Register the doClientStuff method for modloading
        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);

-        // Register ourselves for server, registry and other game events we are interested in
+        // Register ourselves for server and other game events we are interested in
        MinecraftForge.EVENT_BUS.register(this);
    }

@@ -54,28 +54,29 @@ public class ExampleMod
    private void enqueueIMC(final InterModEnqueueEvent event)
    {
        // some example code to dispatch IMC to another mod
-        InterModComms.sendTo("forge", "helloworld", () -> { LOGGER.info("Hello world"); return "Hello world";});
+        InterModComms.sendTo("examplemod", "helloworld", () -> { LOGGER.info("Hello world from the MDK"); return "Hello world";});
    }

    private void processIMC(final InterModProcessEvent event)
    {
        // some example code to receive and process InterModComms from other mods
-        LOGGER.info("Got IMC", event.getIMCStream().
+        LOGGER.info("Got IMC {}", event.getIMCStream().
                map(m->m.getMessageSupplier().get()).
                collect(Collectors.toList()));
    }
    // You can use SubscribeEvent and let the Event Bus discover methods to call
    @SubscribeEvent
-    public static void onServerStarting(FMLServerStartingEvent event) {
+    public void onServerStarting(FMLServerStartingEvent event) {
        // do something when the server starts
        LOGGER.info("HELLO from server starting");
    }

-    // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD event bus
+    // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD
+    // Event bus for receiving Registry Events)
    @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
    public static class RegistryEvents {
        @SubscribeEvent
-        public void onBlocksRegistry(final RegistryEvent.Register<Block> blockRegistryEvent) {
+        public static void onBlocksRegistry(final RegistryEvent.Register<Block> blockRegistryEvent) {
            // register a new block here
            LOGGER.info("HELLO from Register Block");
        }
@@ -6,17 +6,9 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[24,)" #mandatory (24 is current forge version)
+loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 # A URL to refer people to when problems occur with this mod
 issueTrackerURL="http://my.issue.tracker/" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="http://example.com/" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-credits="Thanks for this example mod goes to Java" #optional
-# A text field displayed in the mod UI
-authors="Love, Cheese and small house plants" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
@@ -27,6 +19,14 @@ version="${file.jarVersion}" #mandatory
 displayName="Example Mod" #mandatory
 # A URL to query for updates for this mod. See the JSON update specification <here>
 updateJSONURL="http://myurl.me/" #optional
+# A URL for the "homepage" for this mod, displayed in the mod UI
+displayURL="http://example.com/" #optional
+# A file name (in the root of the mod JAR) containing a logo for display
+logoFile="examplemod.png" #optional
+# A text field displayed in the mod UI
+credits="Thanks for this example mod goes to Java" #optional
+# A text field displayed in the mod UI
+authors="Love, Cheese and small house plants" #optional
 # The description text for the mod (multi line!) (#mandatory)
 description='''
 This is a long form description of the mod. You can write whatever you want here
@@ -42,7 +42,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
    # Does this dependency have to exist - if not, ordering below must be specified
    mandatory=true #mandatory
    # The version range of the dependency
-    versionRange="[24,)" #mandatory
+    versionRange="[31,)" #mandatory
    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
    ordering="NONE"
    # Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -51,6 +51,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
 [[dependencies.examplemod]]
    modId="minecraft"
    mandatory=true
-    versionRange="[1.13]"
+    versionRange="[1.15.2]"
    ordering="NONE"
-    side="BOTH"
+    side="BOTH"
@@ -1,7 +1,7 @@
 {
    "pack": {
        "description": "examplemod resources",
-        "pack_format": 4,
-        "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods."
+        "pack_format": 5,
+        "_comment": "A pack_format of 5 requires json lang files and some texture changes from 1.15. Note: we require v5 pack meta for all mods."
    }
 }
@@ -0,0 +1,20 @@
+--- a/com/mojang/blaze3d/platform/GlStateManager.java
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
+@@ -579,10 +579,17 @@
+       GL13.glClientActiveTexture(p_227747_0_);
+    }
+ 
+   /* Stores the last values sent into glMultiTexCoord2f */
+   public static float lastBrightnessX = 0.0f;
+   public static float lastBrightnessY = 0.0f;
+    @Deprecated
+    public static void func_227640_a_(int p_227640_0_, float p_227640_1_, float p_227640_2_) {
+       RenderSystem.assertThread(RenderSystem::isOnRenderThread);
+       GL13.glMultiTexCoord2f(p_227640_0_, p_227640_1_, p_227640_2_);
+      if (p_227640_0_ == GL13.GL_TEXTURE1) {
+          lastBrightnessX = p_227640_1_;
+          lastBrightnessY = p_227640_2_;
+       }
+    }
+ 
+    public static void func_227706_d_(int p_227706_0_, int p_227706_1_, int p_227706_2_, int p_227706_3_) {
@@ -0,0 +1,25 @@
+--- a/com/mojang/blaze3d/vertex/IVertexBuilder.java
+++ b/com/mojang/blaze3d/vertex/IVertexBuilder.java
+@@ -18,7 +18,7 @@
+ import org.lwjgl.system.MemoryStack;
+ 
+ @OnlyIn(Dist.CLIENT)
+-public interface IVertexBuilder {
+public interface IVertexBuilder extends net.minecraftforge.client.extensions.IForgeVertexBuilder {
+    Logger field_227884_f_ = LogManager.getLogger();
+ 
+    IVertexBuilder func_225582_a_(double p_225582_1_, double p_225582_3_, double p_225582_5_);
+@@ -96,11 +96,12 @@
+                f5 = p_227890_3_[k] * p_227890_6_;
+             }
+ 
+-            int l = p_227890_7_[k];
+            int l = applyBakedLighting(p_227890_7_[k], bytebuffer);
+             float f9 = bytebuffer.getFloat(16);
+             float f10 = bytebuffer.getFloat(20);
+             Vector4f vector4f = new Vector4f(f, f1, f2, 1.0F);
+             vector4f.func_229372_a_(matrix4f);
+            applyBakedNormals(vector3f, bytebuffer, p_227890_1_.func_227872_b_());
+             this.func_225588_a_(vector4f.func_195910_a(), vector4f.func_195913_b(), vector4f.func_195914_c(), f3, f4, f5, 1.0F, f9, f10, p_227890_8_, l, vector3f.func_195899_a(), vector3f.func_195900_b(), vector3f.func_195902_c());
+          }
+       }
@@ -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());
+    }
+ 
@@ -0,0 +1,15 @@
+--- a/net/minecraft/advancements/AdvancementManager.java
+++ b/net/minecraft/advancements/AdvancementManager.java
+@@ -36,7 +36,11 @@
+       Map<ResourceLocation, Advancement.Builder> map = Maps.newHashMap();
+       p_212853_1_.forEach((p_223387_1_, p_223387_2_) -> {
+          try {
+-            Advancement.Builder advancement$builder = field_192783_b.fromJson(p_223387_2_, Advancement.Builder.class);
+            Advancement.Builder advancement$builder = net.minecraftforge.common.crafting.ConditionalAdvancement.read(field_192783_b, p_223387_1_, p_223387_2_);
+            if (advancement$builder == null) {
+               field_192782_a.info("Skipping loading advancement {} as it's conditions were not met", p_223387_1_);
+               return;
+            }
+             map.put(p_223387_1_, advancement$builder);
+          } catch (IllegalArgumentException | JsonParseException jsonparseexception) {
+             field_192782_a.error("Parsing error loading custom advancement {}: {}", p_223387_1_, jsonparseexception.getMessage());
@@ -1,11 +1,11 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@
 
-    public void func_192113_a(EntityPlayerMP p_192113_1_) {
+    public void func_192113_a(ServerPlayerEntity p_192113_1_) {
       p_192113_1_.func_195068_e(this.field_192115_b);
-      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_186472_a(p_192113_1_).func_204313_a(new BlockPos(p_192113_1_)).func_186471_a();
-+      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_186472_a(p_192113_1_).func_204313_a(new BlockPos(p_192113_1_)).func_186470_a(p_192113_1_).func_186469_a(p_192113_1_.func_184817_da()).func_186471_a(); // FORGE: add player & luck to LootContext
+-      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_216015_a(LootParameters.field_216281_a, p_192113_1_).func_216015_a(LootParameters.field_216286_f, new BlockPos(p_192113_1_)).func_216023_a(p_192113_1_.func_70681_au()).func_216022_a(LootParameterSets.field_216265_f);
+      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_216015_a(LootParameters.field_216281_a, p_192113_1_).func_216015_a(LootParameters.field_216286_f, new BlockPos(p_192113_1_)).func_216023_a(p_192113_1_.func_70681_au()).func_186469_a(p_192113_1_.func_184817_da()).func_216022_a(LootParameterSets.field_216265_f); // FORGE: luck to LootContext
       boolean flag = false;
 
       for(ResourceLocation resourcelocation : this.field_192116_c) {
@@ -1,6 +1,14 @@
 --- a/net/minecraft/advancements/PlayerAdvancements.java
 +++ b/net/minecraft/advancements/PlayerAdvancements.java
-@@ -174,6 +174,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,9 +17,9 @@
       boolean flag = false;
       AdvancementProgress advancementprogress = this.func_192747_a(p_192750_1_);
       boolean flag1 = advancementprogress.func_192105_a();
-@@ -186,6 +188,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_82766_b("announceAdvancements")) {
-                this.field_192756_d.func_184103_al().func_148539_a(new TextComponentTranslation("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()));
+@@ -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()));
             }
 +            net.minecraftforge.common.ForgeHooks.onAdvancement(this.field_192762_j, p_192750_1_);
          }
@@ -1,7 +1,7 @@
 --- a/net/minecraft/advancements/criterion/ItemPredicate.java
 +++ b/net/minecraft/advancements/criterion/ItemPredicate.java
-@@ -24,6 +24,8 @@
- import net.minecraft.util.registry.IRegistry;
+@@ -26,6 +26,8 @@
+ import net.minecraft.util.registry.Registry;
 
 public class ItemPredicate {
 +   private static final Map<ResourceLocation, java.util.function.Function<JsonObject, ItemPredicate>> custom_predicates = new java.util.HashMap<>();
@@ -9,19 +9,19 @@
    public static final ItemPredicate field_192495_a = new ItemPredicate();
    @Nullable
    private final Tag<Item> field_200018_b;
-@@ -90,6 +92,11 @@
+@@ -105,6 +107,11 @@
    public static ItemPredicate func_192492_a(@Nullable JsonElement p_192492_0_) {
       if (p_192492_0_ != null && !p_192492_0_.isJsonNull()) {
-          JsonObject jsonobject = JsonUtils.func_151210_l(p_192492_0_, "item");
+          JsonObject jsonobject = JSONUtils.func_151210_l(p_192492_0_, "item");
 +         if (jsonobject.has("type")) {
-+              final ResourceLocation rl = new ResourceLocation(JsonUtils.func_151200_h(jsonobject, "type"));
-+              if (custom_predicates.containsKey(rl)) return custom_predicates.get(rl).apply(jsonobject);
-+              else throw new JsonSyntaxException("There is no ItemPredicate of type "+rl);
+            final ResourceLocation rl = new ResourceLocation(JSONUtils.func_151200_h(jsonobject, "type"));
+            if (custom_predicates.containsKey(rl)) return custom_predicates.get(rl).apply(jsonobject);
+            else throw new JsonSyntaxException("There is no ItemPredicate of type "+rl);
 +         }
          MinMaxBounds.IntBound minmaxbounds$intbound = MinMaxBounds.IntBound.func_211344_a(jsonobject.get("count"));
          MinMaxBounds.IntBound minmaxbounds$intbound1 = MinMaxBounds.IntBound.func_211344_a(jsonobject.get("durability"));
          if (jsonobject.has("data")) {
-@@ -181,6 +188,14 @@
+@@ -204,6 +211,14 @@
       }
    }
 
@@ -30,9 +30,9 @@
 +   }
 +
 +   public static Map<ResourceLocation, java.util.function.Function<JsonObject, ItemPredicate>> getPredicates() {
-+       return unmod_predicates;
+      return unmod_predicates;
 +   }
 +
    public static class Builder {
       private final List<EnchantmentPredicate> field_200312_a = Lists.newArrayList();
-       @Nullable
+       private final List<EnchantmentPredicate> field_226657_b_ = Lists.newArrayList();
@@ -0,0 +1,96 @@
+--- a/net/minecraft/block/AbstractRailBlock.java
+++ b/net/minecraft/block/AbstractRailBlock.java
+@@ -36,7 +36,7 @@
+    }
+ 
+    public VoxelShape func_220053_a(BlockState p_220053_1_, IBlockReader p_220053_2_, BlockPos p_220053_3_, ISelectionContext p_220053_4_) {
+-      RailShape railshape = p_220053_1_.func_177230_c() == this ? p_220053_1_.func_177229_b(this.func_176560_l()) : null;
+      RailShape railshape = p_220053_1_.func_177230_c() == this ? getRailDirection(p_220053_1_, p_220053_2_, p_220053_3_, null) : null;
+       return railshape != null && railshape.func_208092_c() ? field_190959_b : field_185590_a;
+    }
+ 
+@@ -56,7 +56,7 @@
+ 
+    public void func_220069_a(BlockState p_220069_1_, World p_220069_2_, BlockPos p_220069_3_, Block p_220069_4_, BlockPos p_220069_5_, boolean p_220069_6_) {
+       if (!p_220069_2_.field_72995_K) {
+-         RailShape railshape = p_220069_1_.func_177229_b(this.func_176560_l());
+         RailShape railshape = getRailDirection(p_220069_1_, p_220069_2_, p_220069_3_, null);
+          boolean flag = false;
+          BlockPos blockpos = p_220069_3_.func_177977_b();
+          if (!func_220064_c(p_220069_2_, blockpos)) {
+@@ -115,7 +115,7 @@
+    public void func_196243_a(BlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, BlockState p_196243_4_, boolean p_196243_5_) {
+       if (!p_196243_5_) {
+          super.func_196243_a(p_196243_1_, p_196243_2_, p_196243_3_, p_196243_4_, p_196243_5_);
+-         if (p_196243_1_.func_177229_b(this.func_176560_l()).func_208092_c()) {
+         if (getRailDirection(p_196243_1_, p_196243_2_, p_196243_3_, null).func_208092_c()) {
+             p_196243_2_.func_195593_d(p_196243_3_.func_177984_a(), this);
+          }
+ 
+@@ -134,5 +134,66 @@
+       return blockstate.func_206870_a(this.func_176560_l(), flag ? RailShape.EAST_WEST : RailShape.NORTH_SOUTH);
+    }
+ 
+   //Forge: Use getRailDirection(IBlockAccess, BlockPos, IBlockState, EntityMinecart) for enhanced ability
+    public abstract IProperty<RailShape> func_176560_l();
+
+   /* ======================================== FORGE START =====================================*/
+   /**
+    * Return true if the rail can make corners.
+    * Used by placement logic.
+    * @param world The world.
+    * @param pos Block's position in world
+    * @return True if the rail can make corners.
+    */
+   public boolean isFlexibleRail(BlockState state, IBlockReader world, BlockPos pos)
+   {
+       return !this.field_196277_c;
+   }
+
+   /**
+    * Returns true if the rail can make up and down slopes.
+    * Used by placement logic.
+    * @param world The world.
+    * @param pos Block's position in world
+    * @return True if the rail can make slopes.
+    */
+   public boolean canMakeSlopes(BlockState state, IBlockReader world, BlockPos pos) {
+       return true;
+   }
+
+   /**
+    * Return the rail's direction.
+    * Can be used to make the cart think the rail is a different shape,
+    * for example when making diamond junctions or switches.
+    * The cart parameter will often be null unless it it called from EntityMinecart.
+    *
+    * @param world The world.
+    * @param pos Block's position in world
+    * @param state The BlockState
+    * @param cart The cart asking for the metadata, null if it is not called by EntityMinecart.
+    * @return The direction.
+    */
+   public RailShape getRailDirection(BlockState state, IBlockReader world, BlockPos pos, @javax.annotation.Nullable net.minecraft.entity.item.minecart.AbstractMinecartEntity cart) {
+       return state.func_177229_b(func_176560_l());
+   }
+
+   /**
+    * Returns the max speed of the rail at the specified position.
+    * @param world The world.
+    * @param cart The cart on the rail, may be null.
+    * @param pos Block's position in world
+    * @return The max speed of the current rail.
+    */
+   public float getRailMaxSpeed(BlockState state, World world, BlockPos pos, net.minecraft.entity.item.minecart.AbstractMinecartEntity cart) {
+       return 0.4f;
+   }
+
+   /**
+    * This function is called by any minecart that passes over this rail.
+    * It is called once per update tick that the minecart is on the rail.
+    * @param world The world.
+    * @param cart The cart on the rail.
+    * @param pos Block's position in world
+    */
+   public void onMinecartPass(BlockState state, World world, BlockPos pos, net.minecraft.entity.item.minecart.AbstractMinecartEntity cart) { }
+ }
@@ -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_);
+             }
+          }
+ 
@@ -0,0 +1,13 @@
+--- a/net/minecraft/block/BedBlock.java
+++ b/net/minecraft/block/BedBlock.java
+@@ -88,7 +88,9 @@
+             }
+          }
+ 
+-         if (p_225533_2_.field_73011_w.func_76567_e() && p_225533_2_.func_226691_t_(p_225533_3_) != Biomes.field_76778_j) {
+         net.minecraftforge.common.extensions.IForgeDimension.SleepResult sleepResult = p_225533_2_.field_73011_w.canSleepAt(p_225533_4_, p_225533_3_);
+         if (sleepResult != net.minecraftforge.common.extensions.IForgeDimension.SleepResult.BED_EXPLODES) {
+            if (sleepResult == net.minecraftforge.common.extensions.IForgeDimension.SleepResult.DENY) return ActionResultType.SUCCESS;
+             if (p_225533_1_.func_177229_b(field_176471_b)) {
+                if (!this.func_226861_a_(p_225533_2_, p_225533_3_)) {
+                   p_225533_4_.func_146105_b(new TranslationTextComponent("block.minecraft.bed.occupied"), true);
@@ -7,22 +7,42 @@
 -public class Block implements IItemProvider {
 +public class Block extends net.minecraftforge.registries.ForgeRegistryEntry<Block> implements IItemProvider, net.minecraftforge.common.extensions.IForgeBlock {
    protected static final Logger field_196273_d = LogManager.getLogger();
-   public static final ObjectIntIdentityMap<IBlockState> field_176229_d = new ObjectIntIdentityMap<>();
+-   public static final ObjectIntIdentityMap<BlockState> field_176229_d = new ObjectIntIdentityMap<>();
 +   @Deprecated //Forge: Do not use, use GameRegistry
-+   public static final ObjectIntIdentityMap<IBlockState> field_176229_d = net.minecraftforge.registries.GameData.getBlockStateIDMap();
-    private static final EnumFacing[] field_212556_a = new EnumFacing[]{EnumFacing.WEST, EnumFacing.EAST, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.DOWN, EnumFacing.UP};
-    protected final int field_149784_t;
-    protected final float field_149782_v;
-@@ -298,7 +299,7 @@
+   public static final ObjectIntIdentityMap<BlockState> field_176229_d = net.minecraftforge.registries.GameData.getBlockStateIDMap();
+    private static final Direction[] field_212556_a = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
+    private static final LoadingCache<VoxelShape, Boolean> field_223006_b = CacheBuilder.newBuilder().maximumSize(512L).weakKeys().build(new CacheLoader<VoxelShape, Boolean>() {
+       public Boolean load(VoxelShape p_load_1_) {
+@@ -151,7 +152,7 @@
 
    @Deprecated
-    public boolean func_196253_a(IBlockState p_196253_1_, BlockItemUseContext p_196253_2_) {
-      return this.field_149764_J.func_76222_j() && p_196253_2_.func_195996_i().func_77973_b() != this.func_199767_j();
-+      return p_196253_1_.func_185904_a().func_76222_j() && p_196253_2_.func_195996_i().func_77973_b() != this.func_199767_j();
+    public boolean func_220067_a(BlockState p_220067_1_, IBlockReader p_220067_2_, BlockPos p_220067_3_, EntityType<?> p_220067_4_) {
+-      return p_220067_1_.func_224755_d(p_220067_2_, p_220067_3_, Direction.UP) && this.field_149784_t < 14;
+      return p_220067_1_.func_224755_d(p_220067_2_, p_220067_3_, Direction.UP) && p_220067_1_.getLightValue(p_220067_2_, p_220067_3_) < 14;
    }
 
    @Deprecated
-@@ -310,8 +311,9 @@
+@@ -246,6 +247,10 @@
+       this.field_149781_w = p_i48440_1_.field_200958_f;
+       this.field_149782_v = p_i48440_1_.field_200959_g;
+       this.field_149789_z = p_i48440_1_.field_200960_h;
+      this.harvestLevel = p_i48440_1_.harvestLevel;
+      this.harvestTool = p_i48440_1_.harvestTool;
+      final ResourceLocation lootTableCache = p_i48440_1_.field_222381_j;
+      this.lootTableSupplier = lootTableCache != null ? () -> lootTableCache : p_i48440_1_.lootTableSupplier != null ? p_i48440_1_.lootTableSupplier : () -> new ResourceLocation(this.getRegistryName().func_110624_b(), "blocks/" + this.getRegistryName().func_110623_a());
+       this.field_149765_K = p_i48440_1_.field_200961_i;
+       this.field_226886_f_ = p_i48440_1_.field_226893_j_;
+       this.field_226887_g_ = p_i48440_1_.field_226894_k_;
+@@ -297,7 +302,7 @@
+ 
+    @Deprecated
+    public boolean func_196253_a(BlockState p_196253_1_, BlockItemUseContext p_196253_2_) {
+-      return this.field_149764_J.func_76222_j() && (p_196253_2_.func_195996_i().func_190926_b() || p_196253_2_.func_195996_i().func_77973_b() != this.func_199767_j());
+      return p_196253_1_.func_185904_a().func_76222_j() && (p_196253_2_.func_195996_i().func_190926_b() || p_196253_2_.func_195996_i().func_77973_b() != this.func_199767_j());
+    }
+ 
+    @Deprecated
+@@ -314,8 +319,9 @@
       return this.field_149789_z;
    }
 
@@ -33,34 +53,19 @@
    }
 
    @Deprecated
-@@ -322,11 +324,11 @@
+@@ -471,10 +477,9 @@
+ 
    @Deprecated
-    @OnlyIn(Dist.CLIENT)
-    public int func_185484_c(IBlockState p_185484_1_, IWorldReader p_185484_2_, BlockPos p_185484_3_) {
-      int i = p_185484_2_.func_175626_b(p_185484_3_, p_185484_1_.func_185906_d());
-+      int i = p_185484_2_.func_175626_b(p_185484_3_, p_185484_1_.getLightValue(p_185484_2_, p_185484_3_));
-       if (i == 0 && p_185484_1_.func_177230_c() instanceof BlockSlab) {
-          p_185484_3_ = p_185484_3_.func_177977_b();
-          p_185484_1_ = p_185484_2_.func_180495_p(p_185484_3_);
-         return p_185484_2_.func_175626_b(p_185484_3_, p_185484_1_.func_185906_d());
-+         return p_185484_2_.func_175626_b(p_185484_3_, p_185484_1_.getLightValue(p_185484_2_, p_185484_3_));
-       } else {
-          return i;
+    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() || !p_196243_4_.hasTileEntity())) {
+          p_196243_2_.func_175713_t(p_196243_3_);
       }
-@@ -468,8 +470,12 @@
+-
+    }
 
    @Deprecated
-    public void func_196243_a(IBlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, IBlockState p_196243_4_, boolean p_196243_5_) {
-+       if (hasTileEntity(p_196243_1_) && !(this instanceof BlockContainer)) {
-+           p_196243_2_.func_175713_t(p_196243_3_);
-+       }
-    }
- 
-+   @Deprecated //Forge: Use fortune/location sensitive version
-    public int func_196264_a(IBlockState p_196264_1_, Random p_196264_2_) {
-       return 1;
-    }
-@@ -484,30 +490,30 @@
+@@ -483,8 +488,8 @@
       if (f == -1.0F) {
          return 0.0F;
       } else {
@@ -71,41 +76,35 @@
       }
    }
 
-    @Deprecated
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      if (!p_196255_2_.field_72995_K) {
-         int i = this.func_196251_a(p_196255_1_, p_196255_5_, p_196255_2_, p_196255_3_, p_196255_2_.field_73012_v);
-
-         for(int j = 0; j < i; ++j) {
-            if (!(p_196255_4_ < 1.0F) || !(p_196255_2_.field_73012_v.nextFloat() > p_196255_4_)) {
-               Item item = this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_).func_199767_j();
-               if (item != Items.field_190931_a) {
-                  func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(item));
-               }
-            }
-+      if (!p_196255_2_.field_72995_K && !p_196255_2_.restoringBlockSnapshots) { // do not drop items while restoring blockstates, prevents item dupe
-+         NonNullList<ItemStack> drops = NonNullList.func_191196_a();
-+         getDrops(p_196255_1_, drops, p_196255_2_, p_196255_3_, p_196255_5_);
-+         p_196255_4_ = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(drops, p_196255_2_, p_196255_3_, p_196255_1_, p_196255_5_, p_196255_4_, false, harvesters.get());
-+         for (ItemStack stack : drops) {
-+            if (p_196255_2_.field_73012_v.nextFloat() <= p_196255_4_)
-+               func_180635_a(p_196255_2_, p_196255_3_, stack);
-          }
-
+@@ -494,8 +499,7 @@
+ 
+    public ResourceLocation func_220068_i() {
+       if (this.field_220085_g == null) {
+-         ResourceLocation resourcelocation = Registry.field_212618_g.func_177774_c(this);
+-         this.field_220085_g = new ResourceLocation(resourcelocation.func_110624_b(), "blocks/" + resourcelocation.func_110623_a());
+         this.field_220085_g = this.lootTableSupplier.get();
       }
+ 
+       return this.field_220085_g;
+@@ -555,7 +559,7 @@
    }
 
    public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_) {
-      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_82766_b("doTileDrops")) {
-+      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_82766_b("doTileDrops") && !p_180635_0_.restoringBlockSnapshots) {// do not drop items while restoring blockstates, prevents item dupe
-+         if (captureDrops.get()) {
-+            capturedDrops.get().add(p_180635_2_);
-+            return;
-+         }
+-      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_223586_b(GameRules.field_223603_f)) {
+      if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_223586_b(GameRules.field_223603_f) && !p_180635_0_.restoringBlockSnapshots) { // do not drop items while restoring blockstates, prevents item dupe
          float f = 0.5F;
          double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
          double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
-@@ -529,6 +535,7 @@
+@@ -567,7 +571,7 @@
+    }
+ 
+    public void func_180637_b(World p_180637_1_, BlockPos p_180637_2_, int p_180637_3_) {
+-      if (!p_180637_1_.field_72995_K && p_180637_1_.func_82736_K().func_223586_b(GameRules.field_223603_f)) {
+      if (!p_180637_1_.field_72995_K && p_180637_1_.func_82736_K().func_223586_b(GameRules.field_223603_f) && !p_180637_1_.restoringBlockSnapshots) { // do not drop items while restoring blockstates, prevents item dupe
+          while(p_180637_3_ > 0) {
+             int i = ExperienceOrbEntity.func_70527_a(p_180637_3_);
+             p_180637_3_ -= i;
+@@ -577,6 +581,7 @@
 
    }
 
@@ -113,135 +112,86 @@
    public float func_149638_a() {
       return this.field_149781_w;
    }
-@@ -543,7 +550,7 @@
-          }
-       }
- 
-      return raytraceresult;
-+      return p_180636_0_.func_177230_c().getRayTraceResult(p_180636_0_, p_180636_1_, p_180636_2_, p_180636_3_, p_180636_4_, raytraceresult);
-    }
- 
-    public void func_180652_a(World p_180652_1_, BlockPos p_180652_2_, Explosion p_180652_3_) {
-@@ -597,16 +604,22 @@
-    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
-       p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this));
-       p_180657_2_.func_71020_j(0.005F);
-      if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
-+      if (this.canSilkHarvest(p_180657_4_, p_180657_1_, p_180657_3_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
-+         NonNullList<ItemStack> items = NonNullList.func_191196_a();
-          ItemStack itemstack = this.func_180643_i(p_180657_4_);
-         func_180635_a(p_180657_1_, p_180657_3_, itemstack);
-+         if (!itemstack.func_190926_b()) items.add(itemstack);
-+         net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
-+         items.forEach(e -> func_180635_a(p_180657_1_, p_180657_3_, e));
-       } else {
-+         harvesters.set(p_180657_2_);
-          int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
-          p_180657_4_.func_196949_c(p_180657_1_, p_180657_3_, i);
-+         harvesters.set(null);
-       }
- 
-    }
- 
-+   @Deprecated //Use state sensitive version
-    protected boolean func_149700_E() {
-       return this.func_176223_P().func_185917_h() && !this.func_149716_u();
-    }
-@@ -663,6 +676,7 @@
-       p_176216_2_.field_70181_x = 0.0D;
+@@ -675,6 +680,7 @@
+       p_176216_2_.func_213317_d(p_176216_2_.func_213322_ci().func_216372_d(1.0D, 0.0D, 1.0D));
    }
 
 +   @Deprecated // Forge: Use more sensitive version below: getPickBlock
-    public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_) {
+    public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, BlockState p_185473_3_) {
       return new ItemStack(this);
    }
-@@ -737,6 +751,7 @@
+@@ -688,6 +694,7 @@
+       return Fluids.field_204541_a.func_207188_f();
+    }
+ 
+   @Deprecated //Forge: Use more sensitive version
+    public float func_208618_m() {
+       return this.field_149765_K;
+    }
+@@ -716,6 +723,7 @@
+    public void func_176224_k(World p_176224_1_, BlockPos p_176224_2_) {
+    }
+ 
+   @Deprecated //Forge: Use more sensitive version
+    public boolean func_149659_a(Explosion p_149659_1_) {
+       return true;
+    }
+@@ -760,6 +768,7 @@
       }
    }
 
 +   @Deprecated //Forge: Use more sensitive version {@link IForgeBlockState#getSoundType(IWorldReader, BlockPos, Entity) }
-    public SoundType func_185467_w() {
+    public SoundType func_220072_p(BlockState p_220072_1_) {
       return this.field_149762_H;
    }
-@@ -758,11 +773,11 @@
-    }
- 
-    public static boolean func_196252_e(Block p_196252_0_) {
-      return p_196252_0_ == Blocks.field_150348_b || p_196252_0_ == Blocks.field_196650_c || p_196252_0_ == Blocks.field_196654_e || p_196252_0_ == Blocks.field_196656_g;
-+      return net.minecraftforge.common.Tags.Blocks.STONE.func_199685_a_(p_196252_0_);
-    }
- 
-    public static boolean func_196245_f(Block p_196245_0_) {
-      return p_196245_0_ == Blocks.field_150346_d || p_196245_0_ == Blocks.field_196660_k || p_196245_0_ == Blocks.field_196661_l;
-+      return net.minecraftforge.common.Tags.Blocks.DIRT.func_199685_a_(p_196245_0_);
-    }
- 
-    public static void func_149671_p() {
-@@ -1129,7 +1144,7 @@
-       func_196254_a("chiseled_quartz_block", new Block(Block.Properties.func_200949_a(Material.field_151576_e, MaterialColor.field_151677_p).func_200943_b(0.8F)));
-       func_196254_a("quartz_pillar", new BlockRotatedPillar(Block.Properties.func_200949_a(Material.field_151576_e, MaterialColor.field_151677_p).func_200943_b(0.8F)));
-       func_196254_a("quartz_stairs", new BlockStairs(block42.func_176223_P(), Block.Properties.func_200950_a(block42)));
-      func_196254_a("activator_rail", new BlockRailPowered(Block.Properties.func_200945_a(Material.field_151594_q).func_200942_a().func_200943_b(0.7F).func_200947_a(SoundType.field_185852_e)));
-+      func_196254_a("activator_rail", new BlockRailPowered(Block.Properties.func_200945_a(Material.field_151594_q).func_200942_a().func_200943_b(0.7F).func_200947_a(SoundType.field_185852_e), true));
-       func_196254_a("dropper", new BlockDropper(Block.Properties.func_200945_a(Material.field_151576_e).func_200943_b(3.5F)));
-       func_196254_a("white_terracotta", new Block(Block.Properties.func_200949_a(Material.field_151576_e, MaterialColor.field_193561_M).func_200948_a(1.25F, 4.2F)));
-       func_196254_a("orange_terracotta", new Block(Block.Properties.func_200949_a(Material.field_151576_e, MaterialColor.field_193562_N).func_200948_a(1.25F, 4.2F)));
-@@ -1455,6 +1470,7 @@
-       func_196254_a("bubble_column", new BlockBubbleColumn(Block.Properties.func_200945_a(Material.field_203244_i).func_200942_a()));
-       func_196254_a("structure_block", new BlockStructure(Block.Properties.func_200949_a(Material.field_151573_f, MaterialColor.field_197656_x).func_200948_a(-1.0F, 3600000.0F)));
- 
-+      if(false) // Processed in GameData.BlockCallbacks#onBake
-       for(Block block85 : IRegistry.field_212618_g) {
-          for(IBlockState iblockstate : block85.func_176194_O().func_177619_a()) {
-             field_176229_d.func_195867_b(iblockstate);
-@@ -1594,4 +1610,83 @@
-          return Objects.hash(this.field_212164_a, this.field_212165_b, this.field_212166_c);
+@@ -769,7 +778,7 @@
+          this.field_220086_i = Item.func_150898_a(this);
       }
+ 
+-      return this.field_220086_i;
+      return this.field_220086_i.delegate.get(); //Forge: Vanilla caches the items, update with registry replacements.
    }
+ 
+    public boolean func_208619_r() {
+@@ -777,13 +786,81 @@
+    }
+ 
+    public String toString() {
+-      return "Block{" + Registry.field_212618_g.func_177774_c(this) + "}";
+      return "Block{" + getRegistryName() + "}";
+    }
+ 
+    @OnlyIn(Dist.CLIENT)
+    public void func_190948_a(ItemStack p_190948_1_, @Nullable IBlockReader p_190948_2_, List<ITextComponent> p_190948_3_, ITooltipFlag p_190948_4_) {
+    }
+ 
 +   /* ======================================== FORGE START =====================================*/
 +   protected Random RANDOM = new Random();
-+   protected ThreadLocal<EntityPlayer> harvesters = new ThreadLocal<>();
 +   private net.minecraftforge.common.ToolType harvestTool;
 +   private int harvestLevel;
-+   protected static ThreadLocal<Boolean> captureDrops = ThreadLocal.withInitial(() -> false);
-+   protected static ThreadLocal<NonNullList<ItemStack>> capturedDrops = ThreadLocal.withInitial(NonNullList::func_191196_a);
-+   protected NonNullList<ItemStack> captureDrops(boolean start)
-+   {
-+      if (start) {
-+         captureDrops.set(true);
-+         capturedDrops.get().clear();
-+         return NonNullList.func_191196_a();
-+      } else {
-+         captureDrops.set(false);
-+         return capturedDrops.get();
-+      }
-+   }
+   private final net.minecraftforge.common.util.ReverseTagWrapper<Block> reverseTags = new net.minecraftforge.common.util.ReverseTagWrapper<>(this, BlockTags::getGeneration, BlockTags::func_199896_a);
+   private final java.util.function.Supplier<ResourceLocation> lootTableSupplier;
 +
 +   @Override
-+   public float getSlipperiness(IBlockState state, IWorldReader world, BlockPos pos, @Nullable Entity entity) {
+   public float getSlipperiness(BlockState state, IWorldReader world, BlockPos pos, @Nullable Entity entity) {
 +      return this.field_149765_K;
 +   }
 +
-+   @Override
-+   public boolean canSilkHarvest(IBlockState state, IWorldReader world, BlockPos pos, EntityPlayer player) {
-+      return this.func_149700_E() && !state.hasTileEntity();
-+   }
-+
 +   @Nullable
 +   @Override
-+   public net.minecraftforge.common.ToolType getHarvestTool(IBlockState state) {
+   public net.minecraftforge.common.ToolType getHarvestTool(BlockState state) {
 +      return harvestTool; //TODO: RE-Evaluate
 +   }
 +
 +   @Override
-+   public int getHarvestLevel(IBlockState state) {
+   public int getHarvestLevel(BlockState state) {
 +      return harvestLevel; //TODO: RE-Evaluate
 +   }
 +
 +   @Override
-+   public boolean canSustainPlant(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing, net.minecraftforge.common.IPlantable plantable) {
-+       IBlockState plant = plantable.getPlant(world, pos.func_177972_a(facing));
-+       net.minecraftforge.common.EnumPlantType type = plantable.getPlantType(world, pos.func_177972_a(facing));
+   public boolean canSustainPlant(BlockState state, IBlockReader world, BlockPos pos, Direction facing, net.minecraftforge.common.IPlantable plantable) {
+       BlockState plant = plantable.getPlant(world, pos.func_177972_a(facing));
+       net.minecraftforge.common.PlantType type = plantable.getPlantType(world, pos.func_177972_a(facing));
 +
 +       if (plant.func_177230_c() == Blocks.field_150434_aF)
 +           return this.getBlock() == Blocks.field_150434_aF || this.getBlock() == Blocks.field_150354_m || this.getBlock() == Blocks.field_196611_F;
@@ -249,18 +199,18 @@
 +       if (plant.func_177230_c() == Blocks.field_196608_cF && this == Blocks.field_196608_cF)
 +           return true;
 +
-+       if (plantable instanceof BlockBush && ((BlockBush)plantable).func_200014_a_(state, world, pos))
+       if (plantable instanceof BushBlock && ((BushBlock)plantable).func_200014_a_(state, world, pos))
 +           return true;
 +
 +       switch (type) {
-+           case Desert: return this.getBlock() == Blocks.field_150354_m || this.getBlock() == Blocks.field_150405_ch || this.getBlock() instanceof BlockGlazedTerracotta;
+           case Desert: return this.getBlock() == Blocks.field_150354_m || this.getBlock() == Blocks.field_150405_ch || this.getBlock() instanceof GlazedTerracottaBlock;
 +           case Nether: return this.getBlock() == Blocks.field_150425_aM;
-+           case Crop: return this.getBlock() == Blocks.field_150458_ak;
-+           case Cave: return state.func_185896_q();
-+           case Plains: return this.getBlock() == Blocks.field_196658_i || Block.func_196245_f(this) || this.getBlock() == Blocks.field_150458_ak;
-+           case Water: return state.func_185904_a() == Material.field_151586_h; //&& state.getValue(BlockLiquidWrapper)
+           case Crop:   return this.getBlock() == Blocks.field_150458_ak;
+           case Cave:   return Block.func_220056_d(state, world, pos, Direction.UP);
+           case Plains: return this.getBlock() == Blocks.field_196658_i || net.minecraftforge.common.Tags.Blocks.DIRT.func_199685_a_(this) || this.getBlock() == Blocks.field_150458_ak;
+           case Water:  return state.func_185904_a() == Material.field_151586_h; //&& state.getValue(BlockLiquidWrapper)
 +           case Beach:
-+               boolean isBeach = this.getBlock() == Blocks.field_196658_i || Block.func_196245_f(this) || this.getBlock() == Blocks.field_150354_m;
+               boolean isBeach = this.getBlock() == Blocks.field_196658_i || net.minecraftforge.common.Tags.Blocks.DIRT.func_199685_a_(this) || this.getBlock() == Blocks.field_150354_m;
 +               boolean hasWater = (world.func_180495_p(pos.func_177974_f()).func_185904_a() == Material.field_151586_h ||
 +                       world.func_180495_p(pos.func_177976_e()).func_185904_a() == Material.field_151586_h ||
 +                       world.func_180495_p(pos.func_177978_c()).func_185904_a() == Material.field_151586_h ||
@@ -270,6 +220,11 @@
 +       return false;
 +   }
 +
+   @Override
+   public final java.util.Set<ResourceLocation> getTags() {
+      return reverseTags.getTagNames();
+   }
+
 +   static {
 +      net.minecraftforge.common.ForgeHooks.setBlockToolSetter((block, tool, level) -> {
 +         block.harvestTool = tool;
@@ -277,4 +232,51 @@
 +      });
 +   }
 +   /* ========================================= FORGE END ======================================*/
- }
+
+    public static enum OffsetType {
+       NONE,
+       XZ,
+@@ -805,6 +882,9 @@
+       private ResourceLocation field_222381_j;
+       private boolean field_226895_m_ = true;
+       private boolean field_208772_j;
+      private int harvestLevel = -1;
+      private net.minecraftforge.common.ToolType harvestTool;
+      private java.util.function.Supplier<ResourceLocation> lootTableSupplier;
+ 
+       private Properties(Material p_i48616_1_, MaterialColor p_i48616_2_) {
+          this.field_200953_a = p_i48616_1_;
+@@ -837,6 +917,8 @@
+          block$properties.field_226893_j_ = p_200950_0_.func_226891_m_();
+          block$properties.field_208772_j = p_200950_0_.field_208621_p;
+          block$properties.field_226895_m_ = p_200950_0_.field_226888_j_;
+         block$properties.harvestLevel = p_200950_0_.harvestLevel;
+         block$properties.harvestTool = p_200950_0_.harvestTool;
+          return block$properties;
+       }
+ 
+@@ -901,13 +983,23 @@
+          return this;
+       }
+ 
+      public Block.Properties harvestLevel(int harvestLevel) {
+          this.harvestLevel = harvestLevel;
+          return this;
+      }
+
+      public Block.Properties harvestTool(net.minecraftforge.common.ToolType harvestTool) {
+          this.harvestTool = harvestTool;
+          return this;
+      }
+
+       public Block.Properties func_222380_e() {
+          this.field_222381_j = LootTables.field_186419_a;
+          return this;
+       }
+ 
+       public Block.Properties func_222379_b(Block p_222379_1_) {
+-         this.field_222381_j = p_222379_1_.func_220068_i();
+         this.lootTableSupplier = () -> p_222379_1_.delegate.get().func_220068_i();
+          return this;
+       }
+    }
@@ -1,22 +0,0 @@
--- a/net/minecraft/block/BlockAbstractBanner.java
-+++ b/net/minecraft/block/BlockAbstractBanner.java
-@@ -51,7 +51,7 @@
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      func_180635_a(p_196255_2_, p_196255_3_, this.func_185473_a(p_196255_2_, p_196255_3_, p_196255_1_));
-+      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-    }
- 
-    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
-@@ -75,4 +75,10 @@
-    public EnumDyeColor func_196285_M_() {
-       return this.field_196286_a;
-    }
-+
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      TileEntity te = world.func_175625_s(pos);
-+      drops.add((te instanceof TileEntityBanner) ? ((TileEntityBanner)te).func_190615_l(state) : func_185473_a(world, pos, state));
-+   }
- }
@@ -1,52 +0,0 @@
--- a/net/minecraft/block/BlockAbstractSkull.java
-+++ b/net/minecraft/block/BlockAbstractSkull.java
-@@ -38,6 +38,7 @@
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-    }
- 
-    public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_) {
-@@ -45,6 +46,7 @@
-          TileEntitySkull.func_195486_a(p_176208_1_, p_176208_2_);
-       }
- 
-+      this.func_196255_a(p_176208_3_, p_176208_1_, p_176208_2_, 1.0f, 0);
-       super.func_176208_a(p_176208_1_, p_176208_2_, p_176208_3_, p_176208_4_);
-    }
- 
-@@ -55,7 +57,7 @@
-    public void func_196243_a(IBlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, IBlockState p_196243_4_, boolean p_196243_5_) {
-       if (p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c() && !p_196243_2_.field_72995_K) {
-          TileEntity tileentity = p_196243_2_.func_175625_s(p_196243_3_);
-         if (tileentity instanceof TileEntitySkull) {
-+         if (false && tileentity instanceof TileEntitySkull) { //Forge: Moved to getDrops
-             TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
-             if (tileentityskull.func_195487_d()) {
-                ItemStack itemstack = this.func_185473_a(p_196243_2_, p_196243_3_, p_196243_1_);
-@@ -74,6 +76,24 @@
-       }
-    }
- 
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      TileEntity te = world.func_175625_s(pos);
-+      if (te instanceof TileEntitySkull) {
-+         TileEntitySkull skull = (TileEntitySkull)te;
-+         if (skull.func_195487_d()) {
-+            ItemStack ret = func_185473_a(world, pos, state);
-+            Block block = skull.func_195044_w().func_177230_c();
-+            if ((block == Blocks.field_196710_eS || block == Blocks.field_196709_eR) && skull.func_152108_a() != null) {
-+               NBTTagCompound nbt = new NBTTagCompound();
-+               NBTUtil.func_180708_a(nbt, skull.func_152108_a());
-+               ret.func_196082_o().func_74782_a("SkullOwner", nbt);
-+            }
-+            drops.add(ret);
-+         }
-+      }
-+   }
-+
-    @OnlyIn(Dist.CLIENT)
-    public BlockSkull.ISkullType func_196292_N_() {
-       return this.field_196293_a;
@@ -1,13 +0,0 @@
--- a/net/minecraft/block/BlockBed.java
-+++ b/net/minecraft/block/BlockBed.java
-@@ -67,7 +67,9 @@
-             }
-          }
- 
-         if (p_196250_2_.field_73011_w.func_76567_e() && p_196250_2_.func_180494_b(p_196250_3_) != Biomes.field_76778_j) {
-+         net.minecraftforge.common.extensions.IForgeDimension.SleepResult sleepResult = p_196250_2_.field_73011_w.canSleepAt(p_196250_4_, p_196250_3_);
-+         if (sleepResult != net.minecraftforge.common.extensions.IForgeDimension.SleepResult.BED_EXPLODES) {
-+            if (sleepResult == net.minecraftforge.common.extensions.IForgeDimension.SleepResult.DENY) return true;
-             if (p_196250_1_.func_177229_b(field_176471_b)) {
-                EntityPlayer entityplayer = this.func_176470_e(p_196250_2_, p_196250_3_);
-                if (entityplayer != null) {
@@ -1,32 +0,0 @@
--- a/net/minecraft/block/BlockBush.java
-+++ b/net/minecraft/block/BlockBush.java
-@@ -10,7 +10,7 @@
- import net.minecraft.world.IWorld;
- import net.minecraft.world.IWorldReaderBase;
- 
-public class BlockBush extends Block {
-+public class BlockBush extends Block implements net.minecraftforge.common.IPlantable {
-    protected BlockBush(Block.Properties p_i48437_1_) {
-       super(p_i48437_1_);
-    }
-@@ -26,6 +26,8 @@
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-       BlockPos blockpos = p_196260_3_.func_177977_b();
-+      if (p_196260_1_.func_177230_c() == this) //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-+         return p_196260_2_.func_180495_p(blockpos).canSustainPlant(p_196260_2_, blockpos, EnumFacing.UP, this);
-       return this.func_200014_a_(p_196260_2_.func_180495_p(blockpos), p_196260_2_, blockpos);
-    }
- 
-@@ -44,4 +46,11 @@
-    public int func_200011_d(IBlockState p_200011_1_, IBlockReader p_200011_2_, BlockPos p_200011_3_) {
-       return 0;
-    }
-+
-+   @Override
-+   public IBlockState getPlant(IBlockReader world, BlockPos pos) {
-+       IBlockState state = world.func_180495_p(pos);
-+       if (state.func_177230_c() != this) return func_176223_P();
-+       return state;
-+   }
- }
@@ -1,63 +0,0 @@
--- a/net/minecraft/block/BlockCactus.java
-+++ b/net/minecraft/block/BlockCactus.java
-@@ -21,7 +21,7 @@
- import net.minecraft.world.IWorldReaderBase;
- import net.minecraft.world.World;
- 
-public class BlockCactus extends Block {
-+public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable {
-    public static final IntegerProperty field_176587_a = BlockStateProperties.field_208171_X;
-    protected static final VoxelShape field_196400_b = Block.func_208617_a(1.0D, 0.0D, 1.0D, 15.0D, 15.0D, 15.0D);
-    protected static final VoxelShape field_196401_c = Block.func_208617_a(1.0D, 0.0D, 1.0D, 15.0D, 16.0D, 15.0D);
-@@ -32,6 +32,7 @@
-    }
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-+      if (!p_196267_2_.func_205050_e(p_196267_3_, 1)) return; // Forge: prevent growing cactus from loading unloaded chunks with block update
-       if (!p_196267_1_.func_196955_c(p_196267_2_, p_196267_3_)) {
-          p_196267_2_.func_175655_b(p_196267_3_, true);
-       } else {
-@@ -44,6 +45,7 @@
- 
-             if (i < 3) {
-                int j = p_196267_1_.func_177229_b(field_176587_a);
-+               if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, blockpos, p_196267_1_, true)) {
-                if (j == 15) {
-                   p_196267_2_.func_175656_a(blockpos, this.func_176223_P());
-                   IBlockState iblockstate = p_196267_1_.func_206870_a(field_176587_a, Integer.valueOf(0));
-@@ -52,7 +54,8 @@
-                } else {
-                   p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176587_a, Integer.valueOf(j + 1)), 4);
-                }
-
-+               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-+               }
-             }
-          }
-       }
-@@ -91,8 +94,8 @@
-          }
-       }
- 
-      Block block = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_177230_c();
-      return (block == Blocks.field_150434_aF || block == Blocks.field_150354_m || block == Blocks.field_196611_F) && !p_196260_2_.func_180495_p(p_196260_3_.func_177984_a()).func_185904_a().func_76224_d();
-+      IBlockState soil = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
-+      return soil.canSustainPlant(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP, this) && !p_196260_2_.func_180495_p(p_196260_3_.func_177984_a()).func_185904_a().func_76224_d();
-    }
- 
-    public void func_196262_a(IBlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {
-@@ -114,4 +117,14 @@
-    public boolean func_196266_a(IBlockState p_196266_1_, IBlockReader p_196266_2_, BlockPos p_196266_3_, PathType p_196266_4_) {
-       return false;
-    }
-+
-+   @Override
-+   public net.minecraftforge.common.EnumPlantType getPlantType(IBlockReader world, BlockPos pos) {
-+       return net.minecraftforge.common.EnumPlantType.Desert;
-+   }
-+
-+   @Override
-+   public IBlockState getPlant(IBlockReader world, BlockPos pos) {
-+       return func_176223_P();
-+   }
- }
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockChest.java
-+++ b/net/minecraft/block/BlockChest.java
-@@ -258,7 +258,7 @@
-    }
- 
-    private boolean func_176456_n(IBlockReader p_176456_1_, BlockPos p_176456_2_) {
-      return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).func_185915_l();
-+       return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).doesSideBlockChestOpening(p_176456_1_, p_176456_2_.func_177984_a(), EnumFacing.DOWN);
-    }
- 
-    private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_) {
@@ -1,20 +0,0 @@
--- a/net/minecraft/block/BlockChorusFlower.java
-+++ b/net/minecraft/block/BlockChorusFlower.java
-@@ -42,7 +42,7 @@
-          BlockPos blockpos = p_196267_3_.func_177984_a();
-          if (p_196267_2_.func_175623_d(blockpos) && blockpos.func_177956_o() < 256) {
-             int i = p_196267_1_.func_177229_b(field_185607_a);
-            if (i < 5) {
-+            if (i < 5 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, blockpos, p_196267_1_, true)) {
-                boolean flag = false;
-                boolean flag1 = false;
-                IBlockState iblockstate = p_196267_2_.func_180495_p(p_196267_3_.func_177977_b());
-@@ -99,7 +99,7 @@
-                } else {
-                   this.func_185605_c(p_196267_2_, p_196267_3_);
-                }
-
-+               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-             }
-          }
-       }
@@ -1,39 +0,0 @@
--- a/net/minecraft/block/BlockCocoa.java
-+++ b/net/minecraft/block/BlockCocoa.java
-@@ -34,10 +34,11 @@
-    }
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-      if (p_196267_2_.field_73012_v.nextInt(5) == 0) {
-+      if (true) {
-          int i = p_196267_1_.func_177229_b(field_176501_a);
-         if (i < 2) {
-+         if (i < 2 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_2_.field_73012_v.nextInt(5) == 0)) {
-             p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176501_a, Integer.valueOf(i + 1)), 2);
-+            net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-          }
-       }
- 
-@@ -90,14 +91,20 @@
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      int i = p_196255_1_.func_177229_b(field_176501_a);
-+      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-+   }
-+
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      super.getDrops(state, drops, world, pos, fortune);
-+      int i = state.func_177229_b(field_176501_a);
-       int j = 1;
-       if (i >= 2) {
-          j = 3;
-       }
- 
-       for(int k = 0; k < j; ++k) {
-         func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(Items.field_196130_bo));
-+         drops.add(new ItemStack(Items.field_196130_bo));
-       }
- 
-    }
@@ -1,56 +0,0 @@
--- a/net/minecraft/block/BlockCrops.java
-+++ b/net/minecraft/block/BlockCrops.java
-@@ -55,12 +55,14 @@
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
-+      if (!p_196267_2_.func_205050_e(p_196267_3_, 1)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light
-       if (p_196267_2_.func_201669_a(p_196267_3_.func_177984_a(), 0) >= 9) {
-          int i = this.func_185527_x(p_196267_1_);
-          if (i < this.func_185526_g()) {
-             float f = func_180672_a(this, p_196267_2_, p_196267_3_);
-            if (p_196267_4_.nextInt((int)(25.0F / f) + 1) == 0) {
-+            if (net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_4_.nextInt((int)(25.0F / f) + 1) == 0)) {
-                p_196267_2_.func_180501_a(p_196267_3_, this.func_185528_e(i + 1), 2);
-+               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-             }
-          }
-       }
-@@ -89,9 +91,9 @@
-          for(int j = -1; j <= 1; ++j) {
-             float f1 = 0.0F;
-             IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
-            if (iblockstate.func_177230_c() == Blocks.field_150458_ak) {
-+            if (iblockstate.canSustainPlant(p_180672_1_, blockpos.func_177982_a(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)p_180672_0_)) {
-                f1 = 1.0F;
-               if (iblockstate.func_177229_b(BlockFarmland.field_176531_a) > 0) {
-+               if (iblockstate.isFertile(p_180672_1_, blockpos.func_177982_a(i, 0, j))) {
-                   f1 = 3.0F;
-                }
-             }
-@@ -135,15 +137,19 @@
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, 0);
-      if (!p_196255_2_.field_72995_K) {
-         int i = this.func_185527_x(p_196255_1_);
-+      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-+   }
-+
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      {
-+         int i = this.func_185527_x(state);
-          if (i >= this.func_185526_g()) {
-            int j = 3 + p_196255_5_;
-+            int j = 3 + fortune;
- 
-             for(int k = 0; k < j; ++k) {
-               if (p_196255_2_.field_73012_v.nextInt(2 * this.func_185526_g()) <= i) {
-                  func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(this.func_199772_f()));
-+               if (world.field_73012_v.nextInt(2 * this.func_185526_g()) <= i) {
-+                  drops.add(new ItemStack(this.func_199772_f()));
-                }
-             }
-          }
@@ -1,22 +0,0 @@
--- a/net/minecraft/block/BlockDeadBush.java
-+++ b/net/minecraft/block/BlockDeadBush.java
-@@ -14,7 +14,7 @@
- import net.minecraft.world.IBlockReader;
- import net.minecraft.world.World;
- 
-public class BlockDeadBush extends BlockBush {
-+public class BlockDeadBush extends BlockBush implements net.minecraftforge.common.IShearable {
-    protected static final VoxelShape field_196397_a = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 13.0D, 14.0D);
- 
-    protected BlockDeadBush(Block.Properties p_i48418_1_) {
-@@ -46,4 +46,10 @@
- 
-       super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, flag ? Blocks.field_150350_a.func_176223_P() : p_180657_4_, p_180657_5_, p_180657_6_);
-    }
-+
-+   @Override
-+   public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
-+      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
-+      return java.util.Arrays.asList(new ItemStack(Blocks.field_196555_aI));
-+   }
- }
@@ -1,10 +0,0 @@
--- a/net/minecraft/block/BlockDirtSnowySpreadable.java
-+++ b/net/minecraft/block/BlockDirtSnowySpreadable.java
-@@ -25,6 +25,7 @@
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       if (!p_196267_2_.field_72995_K) {
-+         if (!p_196267_2_.func_205050_e(p_196267_3_, 3)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light and spreading
-          if (!func_196383_a(p_196267_2_, p_196267_3_)) {
-             p_196267_2_.func_175656_a(p_196267_3_, Blocks.field_150346_d.func_176223_P());
-          } else {
@@ -1,19 +0,0 @@
--- a/net/minecraft/block/BlockDoublePlant.java
-+++ b/net/minecraft/block/BlockDoublePlant.java
-@@ -43,7 +43,7 @@
-    @Nullable
-    public IBlockState func_196258_a(BlockItemUseContext p_196258_1_) {
-       BlockPos blockpos = p_196258_1_.func_195995_a();
-      return blockpos.func_177956_o() < 255 && p_196258_1_.func_195991_k().func_180495_p(blockpos.func_177984_a()).func_196953_a(p_196258_1_) ? super.func_196258_a(p_196258_1_) : null;
-+      return blockpos.func_177956_o() < p_196258_1_.func_195991_k().func_72800_K() - 1 && p_196258_1_.func_195991_k().func_180495_p(blockpos.func_177984_a()).func_196953_a(p_196258_1_) ? super.func_196258_a(p_196258_1_) : null;
-    }
- 
-    public void func_180633_a(World p_180633_1_, BlockPos p_180633_2_, IBlockState p_180633_3_, EntityLivingBase p_180633_4_, ItemStack p_180633_5_) {
-@@ -51,6 +51,7 @@
-    }
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-+      if (p_196260_1_.func_177230_c() != this) return super.func_196260_a(p_196260_1_, p_196260_2_, p_196260_3_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-       if (p_196260_1_.func_177229_b(field_176492_b) != DoubleBlockHalf.UPPER) {
-          return super.func_196260_a(p_196260_1_, p_196260_2_, p_196260_3_);
-       } else {
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockDropper.java
-+++ b/net/minecraft/block/BlockDropper.java
-@@ -37,7 +37,7 @@
-          p_176439_1_.func_175718_b(1001, p_176439_2_, 0);
-       } else {
-          ItemStack itemstack = tileentitydispenser.func_70301_a(i);
-         if (!itemstack.func_190926_b()) {
-+         if (!itemstack.func_190926_b() && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(p_176439_1_, p_176439_2_, tileentitydispenser, i, itemstack)) {
-             EnumFacing enumfacing = p_176439_1_.func_180495_p(p_176439_2_).func_177229_b(field_176441_a);
-             IInventory iinventory = TileEntityHopper.func_195484_a(p_176439_1_, p_176439_2_.func_177972_a(enumfacing));
-             ItemStack itemstack1;
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockEnderChest.java
-+++ b/net/minecraft/block/BlockEnderChest.java
-@@ -81,7 +81,7 @@
-       InventoryEnderChest inventoryenderchest = p_196250_4_.func_71005_bN();
-       TileEntity tileentity = p_196250_2_.func_175625_s(p_196250_3_);
-       if (inventoryenderchest != null && tileentity instanceof TileEntityEnderChest) {
-         if (p_196250_2_.func_180495_p(p_196250_3_.func_177984_a()).func_185915_l()) {
-+         if (p_196250_2_.func_180495_p(p_196250_3_.func_177984_a()).doesSideBlockChestOpening(p_196250_2_, p_196250_3_.func_177984_a(), EnumFacing.DOWN)) {
-             return true;
-          } else if (p_196250_2_.field_72995_K) {
-             return true;
@@ -1,21 +0,0 @@
--- a/net/minecraft/block/BlockFalling.java
-+++ b/net/minecraft/block/BlockFalling.java
-@@ -48,7 +48,9 @@
-                p_176503_1_.func_72838_d(entityfallingblock);
-             }
-          } else {
-+            IBlockState state = func_176223_P();
-             if (p_176503_1_.func_180495_p(p_176503_2_).func_177230_c() == this) {
-+               state = p_176503_1_.func_180495_p(p_176503_2_);
-                p_176503_1_.func_175698_g(p_176503_2_);
-             }
- 
-@@ -58,7 +60,7 @@
-             }
- 
-             if (blockpos.func_177956_o() > 0) {
-               p_176503_1_.func_175656_a(blockpos.func_177984_a(), this.func_176223_P());
-+               p_176503_1_.func_175656_a(blockpos.func_177984_a(), state); //Forge: Fix loss of state information during world gen.
-             }
-          }
- 
@@ -1,24 +0,0 @@
--- a/net/minecraft/block/BlockFarmland.java
-+++ b/net/minecraft/block/BlockFarmland.java
-@@ -79,7 +79,7 @@
-    }
- 
-    public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_) {
-      if (!p_180658_1_.field_72995_K && p_180658_1_.field_73012_v.nextFloat() < p_180658_4_ - 0.5F && p_180658_3_ instanceof EntityLivingBase && (p_180658_3_ instanceof EntityPlayer || p_180658_1_.func_82736_K().func_82766_b("mobGriefing")) && p_180658_3_.field_70130_N * p_180658_3_.field_70130_N * p_180658_3_.field_70131_O > 0.512F) {
-+      if (!p_180658_1_.field_72995_K && net.minecraftforge.common.ForgeHooks.onFarmlandTrample(p_180658_1_, p_180658_2_, Blocks.field_150346_d.func_176223_P(), p_180658_4_, p_180658_3_)) { // Forge: Move logic to Entity#canTrample
-          func_199610_d(p_180658_1_.func_180495_p(p_180658_2_), p_180658_1_, p_180658_2_);
-       }
- 
-@@ -90,9 +90,9 @@
-       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_));
-    }
- 
-   private static boolean func_176529_d(IBlockReader p_176529_0_, BlockPos p_176529_1_) {
-      Block block = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a()).func_177230_c();
-      return block instanceof BlockCrops || block instanceof BlockStem || block instanceof BlockAttachedStem;
-+   private boolean func_176529_d(IBlockReader p_176529_0_, BlockPos p_176529_1_) {
-+      IBlockState 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_, EnumFacing.UP, (net.minecraftforge.common.IPlantable)state.func_177230_c());
-    }
- 
-    private static boolean func_176530_e(IWorldReaderBase p_176530_0_, BlockPos p_176530_1_) {
@@ -1,50 +0,0 @@
--- a/net/minecraft/block/BlockFence.java
-+++ b/net/minecraft/block/BlockFence.java
-@@ -64,15 +64,12 @@
-       IBlockReader iblockreader = p_196258_1_.func_195991_k();
-       BlockPos blockpos = p_196258_1_.func_195995_a();
-       IFluidState ifluidstate = p_196258_1_.func_195991_k().func_204610_c(p_196258_1_.func_195995_a());
-      BlockPos blockpos1 = blockpos.func_177978_c();
-      BlockPos blockpos2 = blockpos.func_177974_f();
-      BlockPos blockpos3 = blockpos.func_177968_d();
-      BlockPos blockpos4 = blockpos.func_177976_e();
-      IBlockState iblockstate = iblockreader.func_180495_p(blockpos1);
-      IBlockState iblockstate1 = iblockreader.func_180495_p(blockpos2);
-      IBlockState iblockstate2 = iblockreader.func_180495_p(blockpos3);
-      IBlockState iblockstate3 = iblockreader.func_180495_p(blockpos4);
-      return super.func_196258_a(p_196258_1_).func_206870_a(field_196409_a, Boolean.valueOf(this.func_196416_a(iblockstate, iblockstate.func_193401_d(iblockreader, blockpos1, EnumFacing.SOUTH)))).func_206870_a(field_196411_b, Boolean.valueOf(this.func_196416_a(iblockstate1, iblockstate1.func_193401_d(iblockreader, blockpos2, EnumFacing.WEST)))).func_206870_a(field_196413_c, Boolean.valueOf(this.func_196416_a(iblockstate2, iblockstate2.func_193401_d(iblockreader, blockpos3, EnumFacing.NORTH)))).func_206870_a(field_196414_y, Boolean.valueOf(this.func_196416_a(iblockstate3, iblockstate3.func_193401_d(iblockreader, blockpos4, EnumFacing.EAST)))).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
-+      return super.func_196258_a(p_196258_1_)
-+              .func_206870_a(field_196409_a, canFenceConnectTo(iblockreader, blockpos, EnumFacing.NORTH))
-+              .func_206870_a(field_196411_b, canFenceConnectTo(iblockreader, blockpos, EnumFacing.EAST))
-+              .func_206870_a(field_196413_c, canFenceConnectTo(iblockreader, blockpos, EnumFacing.SOUTH))
-+              .func_206870_a(field_196414_y, canFenceConnectTo(iblockreader, blockpos, EnumFacing.WEST))
-+              .func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
-    }
- 
-    public IBlockState func_196271_a(IBlockState p_196271_1_, EnumFacing p_196271_2_, IBlockState p_196271_3_, IWorld p_196271_4_, BlockPos p_196271_5_, BlockPos p_196271_6_) {
-@@ -80,7 +77,7 @@
-          p_196271_4_.func_205219_F_().func_205360_a(p_196271_5_, Fluids.field_204546_a, Fluids.field_204546_a.func_205569_a(p_196271_4_));
-       }
- 
-      return p_196271_2_.func_176740_k().func_176716_d() == EnumFacing.Plane.HORIZONTAL ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.func_196416_a(p_196271_3_, p_196271_3_.func_193401_d(p_196271_4_, p_196271_6_, p_196271_2_.func_176734_d())))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
-+      return p_196271_2_.func_176740_k().func_176716_d() == EnumFacing.Plane.HORIZONTAL ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.canFenceConnectTo(p_196271_4_, p_196271_5_, p_196271_2_))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
-    }
- 
-    protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
-@@ -90,4 +87,16 @@
-    public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
-       return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE : BlockFaceShape.CENTER;
-    }
-+
-+   @Override
-+   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      IBlockState other = world.func_180495_p(pos.func_177972_a(facing));
-+      return func_196416_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
-+   }
-+
-+   private boolean canFenceConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      BlockPos offset = pos.func_177972_a(facing);
-+      IBlockState other = world.func_180495_p(offset);
-+      return other.canBeConnectedTo(world, offset, facing.func_176734_d()) || func_176223_P().canBeConnectedTo(world, pos, facing);
-+   }
- }
@@ -1,26 +0,0 @@
--- a/net/minecraft/block/BlockFenceGate.java
-+++ b/net/minecraft/block/BlockFenceGate.java
-@@ -100,7 +100,7 @@
-    }
- 
-    private boolean func_196380_i(IBlockState p_196380_1_) {
-      return p_196380_1_.func_177230_c() == Blocks.field_150463_bK || p_196380_1_.func_177230_c() == Blocks.field_196723_eg;
-+      return p_196380_1_.func_177230_c() == Blocks.field_150463_bK || p_196380_1_.func_177230_c() == Blocks.field_196723_eg || p_196380_1_.func_177230_c() instanceof BlockWall;
-    }
- 
-    public boolean func_196250_a(IBlockState p_196250_1_, World p_196250_2_, BlockPos p_196250_3_, EntityPlayer p_196250_4_, EnumHand p_196250_5_, EnumFacing p_196250_6_, float p_196250_7_, float p_196250_8_, float p_196250_9_) {
-@@ -145,4 +145,14 @@
-          return BlockFaceShape.UNDEFINED;
-       }
-    }
-+
-+   @Override
-+   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      if (state.func_193401_d(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) {
-+         Block other = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+         return other instanceof BlockFence || other instanceof BlockWall;
-+      }
-+      return false;
-+   }
-+
- }
@@ -1,188 +0,0 @@
--- a/net/minecraft/block/BlockFire.java
-+++ b/net/minecraft/block/BlockFire.java
-@@ -64,13 +64,13 @@
- 
-    public IBlockState func_196448_a(IBlockReader p_196448_1_, BlockPos p_196448_2_) {
-       IBlockState iblockstate = p_196448_1_.func_180495_p(p_196448_2_.func_177977_b());
-      if (!iblockstate.func_185896_q() && !this.func_196446_i(iblockstate)) {
-+      if (!iblockstate.func_185896_q() && !this.canCatchFire(p_196448_1_, p_196448_2_, EnumFacing.UP)) {
-          IBlockState iblockstate1 = this.func_176223_P();
- 
-          for(EnumFacing enumfacing : EnumFacing.values()) {
-             BooleanProperty booleanproperty = field_196449_B.get(enumfacing);
-             if (booleanproperty != null) {
-               iblockstate1 = iblockstate1.func_206870_a(booleanproperty, Boolean.valueOf(this.func_196446_i(p_196448_1_.func_180495_p(p_196448_2_.func_177972_a(enumfacing)))));
-+               iblockstate1 = iblockstate1.func_206870_a(booleanproperty, Boolean.valueOf(this.canCatchFire(p_196448_1_, p_196448_2_.func_177972_a(enumfacing), enumfacing.func_176734_d())));
-             }
-          }
- 
-@@ -98,12 +98,13 @@
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       if (p_196267_2_.func_82736_K().func_82766_b("doFireTick")) {
-+         if (!p_196267_2_.func_205050_e(p_196267_3_, 2)) return; // Forge: prevent loading unloaded chunks when spreading fire
-          if (!p_196267_1_.func_196955_c(p_196267_2_, p_196267_3_)) {
-             p_196267_2_.func_175698_g(p_196267_3_);
-          }
- 
-         Block block = p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()).func_177230_c();
-         boolean flag = p_196267_2_.field_73011_w instanceof EndDimension && block == Blocks.field_150357_h || block == Blocks.field_150424_aL || block == Blocks.field_196814_hQ;
-+         IBlockState other = p_196267_2_.func_180495_p(p_196267_3_.func_177977_b());
-+         boolean flag = other.isFireSource(p_196267_2_, p_196267_3_.func_177977_b(), EnumFacing.UP);
-          int i = p_196267_1_.func_177229_b(field_176543_a);
-          if (!flag && p_196267_2_.func_72896_J() && this.func_176537_d(p_196267_2_, p_196267_3_) && p_196267_4_.nextFloat() < 0.2F + (float)i * 0.03F) {
-             p_196267_2_.func_175698_g(p_196267_3_);
-@@ -117,14 +118,14 @@
-             if (!flag) {
-                p_196267_2_.func_205220_G_().func_205360_a(p_196267_3_, this, this.func_149738_a(p_196267_2_) + p_196267_4_.nextInt(10));
-                if (!this.func_196447_a(p_196267_2_, p_196267_3_)) {
-                  if (!p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()).func_185896_q() || i > 3) {
-+                  if (p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()).func_193401_d(p_196267_2_, p_196267_3_.func_177977_b(), EnumFacing.UP) != BlockFaceShape.SOLID || i > 3) {
-                      p_196267_2_.func_175698_g(p_196267_3_);
-                   }
- 
-                   return;
-                }
- 
-               if (i == 15 && p_196267_4_.nextInt(4) == 0 && !this.func_196446_i(p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()))) {
-+               if (i == 15 && p_196267_4_.nextInt(4) == 0 && !this.canCatchFire(p_196267_2_, p_196267_3_.func_177977_b(), EnumFacing.UP)) {
-                   p_196267_2_.func_175698_g(p_196267_3_);
-                   return;
-                }
-@@ -132,12 +133,12 @@
- 
-             boolean flag1 = p_196267_2_.func_180502_D(p_196267_3_);
-             int k = flag1 ? -50 : 0;
-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177974_f(), 300 + k, p_196267_4_, i);
-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177976_e(), 300 + k, p_196267_4_, i);
-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177977_b(), 250 + k, p_196267_4_, i);
-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177984_a(), 250 + k, p_196267_4_, i);
-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177978_c(), 300 + k, p_196267_4_, i);
-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177968_d(), 300 + k, p_196267_4_, i);
-+            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177974_f(), 300 + k, p_196267_4_, i, EnumFacing.WEST);
-+            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177976_e(), 300 + k, p_196267_4_, i, EnumFacing.EAST);
-+            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177977_b(), 250 + k, p_196267_4_, i, EnumFacing.UP);
-+            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177984_a(), 250 + k, p_196267_4_, i, EnumFacing.DOWN);
-+            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177978_c(), 300 + k, p_196267_4_, i, EnumFacing.SOUTH);
-+            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177968_d(), 300 + k, p_196267_4_, i, EnumFacing.NORTH);
-             BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
- 
-             for(int l = -1; l <= 1; ++l) {
-@@ -175,16 +176,18 @@
-       return p_176537_1_.func_175727_C(p_176537_2_) || p_176537_1_.func_175727_C(p_176537_2_.func_177976_e()) || p_176537_1_.func_175727_C(p_176537_2_.func_177974_f()) || p_176537_1_.func_175727_C(p_176537_2_.func_177978_c()) || p_176537_1_.func_175727_C(p_176537_2_.func_177968_d());
-    }
- 
-+   @Deprecated //Forge: Use IForgeBlockState.getFlammability
-    public int func_176532_c(Block p_176532_1_) {
-       return this.field_149848_b.getInt(p_176532_1_);
-    }
- 
-+   @Deprecated //Forge: Use IForgeBlockState.getFireSpreadSpeed
-    public int func_176534_d(Block p_176534_1_) {
-       return this.field_149849_a.getInt(p_176534_1_);
-    }
- 
-   private void func_176536_a(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_) {
-      int i = this.func_176532_c(p_176536_1_.func_180495_p(p_176536_2_).func_177230_c());
-+   private void tryCatchFire(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_, EnumFacing face) {
-+      int i = p_176536_1_.func_180495_p(p_176536_2_).getFlammability(p_176536_1_, p_176536_2_, face);
-       if (p_176536_4_.nextInt(p_176536_3_) < i) {
-          IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
-          if (p_176536_4_.nextInt(p_176536_5_ + 10) < 5 && !p_176536_1_.func_175727_C(p_176536_2_)) {
-@@ -204,7 +207,7 @@
- 
-    private boolean func_196447_a(IBlockReader p_196447_1_, BlockPos p_196447_2_) {
-       for(EnumFacing enumfacing : EnumFacing.values()) {
-         if (this.func_196446_i(p_196447_1_.func_180495_p(p_196447_2_.func_177972_a(enumfacing)))) {
-+         if (this.canCatchFire(p_196447_1_, p_196447_2_.func_177972_a(enumfacing), enumfacing.func_176734_d())) {
-             return true;
-          }
-       }
-@@ -219,7 +222,7 @@
-          int i = 0;
- 
-          for(EnumFacing enumfacing : EnumFacing.values()) {
-            i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
-+            i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).getFlammability(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
-          }
- 
-          return i;
-@@ -230,6 +233,7 @@
-       return false;
-    }
- 
-+   @Deprecated //Forge: Use canCatchFire with more context
-    public boolean func_196446_i(IBlockState p_196446_1_) {
-       return this.func_176534_d(p_196446_1_.func_177230_c()) > 0;
-    }
-@@ -252,8 +256,8 @@
-          p_180655_2_.func_184134_a((double)((float)p_180655_3_.func_177958_n() + 0.5F), (double)((float)p_180655_3_.func_177956_o() + 0.5F), (double)((float)p_180655_3_.func_177952_p() + 0.5F), SoundEvents.field_187643_bs, SoundCategory.BLOCKS, 1.0F + p_180655_4_.nextFloat(), p_180655_4_.nextFloat() * 0.7F + 0.3F, false);
-       }
- 
-      if (!p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()).func_185896_q() && !this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()))) {
-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177976_e()))) {
-+      if (p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()).func_193401_d(p_180655_2_, p_180655_3_.func_177977_b(), EnumFacing.UP) != BlockFaceShape.SOLID && !this.canCatchFire(p_180655_2_, p_180655_3_.func_177977_b(), EnumFacing.UP)) {
-+         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177976_e(), EnumFacing.EAST)) {
-             for(int j = 0; j < 2; ++j) {
-                double d3 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble() * (double)0.1F;
-                double d8 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
-@@ -262,7 +266,7 @@
-             }
-          }
- 
-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177974_f()))) {
-+         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177974_f(), EnumFacing.WEST)) {
-             for(int k = 0; k < 2; ++k) {
-                double d4 = (double)(p_180655_3_.func_177958_n() + 1) - p_180655_4_.nextDouble() * (double)0.1F;
-                double d9 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
-@@ -271,7 +275,7 @@
-             }
-          }
- 
-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177978_c()))) {
-+         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177978_c(), EnumFacing.SOUTH)) {
-             for(int l = 0; l < 2; ++l) {
-                double d5 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
-                double d10 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
-@@ -280,7 +284,7 @@
-             }
-          }
- 
-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177968_d()))) {
-+         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177968_d(), EnumFacing.NORTH)) {
-             for(int i1 = 0; i1 < 2; ++i1) {
-                double d6 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
-                double d11 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
-@@ -289,7 +293,7 @@
-             }
-          }
- 
-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177984_a()))) {
-+         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177984_a(), EnumFacing.DOWN)) {
-             for(int j1 = 0; j1 < 2; ++j1) {
-                double d7 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
-                double d12 = (double)(p_180655_3_.func_177956_o() + 1) - p_180655_4_.nextDouble() * (double)0.1F;
-@@ -321,10 +325,23 @@
-    }
- 
-    public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_) {
-+      if (p_180686_1_ == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
-       this.field_149849_a.put(p_180686_1_, p_180686_2_);
-       this.field_149848_b.put(p_180686_1_, p_180686_3_);
-    }
- 
-+   /**
-+    * Side sensitive version that calls the block function.
-+    *
-+    * @param world The current world
-+    * @param pos Block position
-+    * @param face The side the fire is coming from
-+    * @return True if the face can catch fire.
-+    */
-+   public boolean canCatchFire(IBlockReader world, BlockPos pos, EnumFacing face) {
-+      return world.func_180495_p(pos).isFlammable(world, pos, face);
-+   }
-+
-    public static void func_149843_e() {
-       BlockFire blockfire = (BlockFire)Blocks.field_150480_ab;
-       blockfire.func_180686_a(Blocks.field_196662_n, 5, 20);
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockFlowerPot.java
-+++ b/net/minecraft/block/BlockFlowerPot.java
-@@ -22,7 +22,7 @@
- import net.minecraft.world.World;
- 
- public class BlockFlowerPot extends Block {
-   private static final Map<Block, Block> field_196451_b = Maps.newHashMap();
-+   private static final Map<Block, Block> field_196451_b = Maps.newHashMap();  //TODO: Delegates
-    protected static final VoxelShape field_196450_a = Block.func_208617_a(5.0D, 0.0D, 5.0D, 11.0D, 6.0D, 11.0D);
-    private final Block field_196452_c;
- 
@@ -1,25 +0,0 @@
--- a/net/minecraft/block/BlockIce.java
-+++ b/net/minecraft/block/BlockIce.java
-@@ -34,8 +34,10 @@
-    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
-       p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this));
-       p_180657_2_.func_71020_j(0.005F);
-      if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
-         func_180635_a(p_180657_1_, p_180657_3_, this.func_180643_i(p_180657_4_));
-+      if (this.canSilkHarvest(p_180657_4_, p_180657_1_, p_180657_3_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
-+         net.minecraft.util.NonNullList<ItemStack> items = net.minecraft.util.NonNullList.func_193580_a(ItemStack.field_190927_a, func_180643_i(p_180657_4_));
-+         net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
-+         items.stream().filter(e -> !e.func_190926_b()).forEach(e -> func_180635_a(p_180657_1_, p_180657_3_, e));
-       } else {
-          if (p_180657_1_.field_73011_w.func_177500_n()) {
-             p_180657_1_.func_175698_g(p_180657_3_);
-@@ -43,7 +45,9 @@
-          }
- 
-          int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
-+         harvesters.set(p_180657_2_);
-          p_180657_4_.func_196949_c(p_180657_1_, p_180657_3_, i);
-+         harvesters.set(null);
-          Material material = p_180657_1_.func_180495_p(p_180657_3_.func_177977_b()).func_185904_a();
-          if (material.func_76230_c() || material.func_76224_d()) {
-             p_180657_1_.func_175656_a(p_180657_3_, Blocks.field_150355_j.func_176223_P());
@@ -1,12 +0,0 @@
--- a/net/minecraft/block/BlockLadder.java
-+++ b/net/minecraft/block/BlockLadder.java
-@@ -151,4 +151,9 @@
-          return false;
-       }
-    }
-+
-+   @Override
-+   public boolean isLadder(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.EntityLivingBase entity) {
-+      return true;
-+   }
- }
@@ -1,83 +0,0 @@
--- a/net/minecraft/block/BlockLeaves.java
-+++ b/net/minecraft/block/BlockLeaves.java
-@@ -26,7 +26,7 @@
- import net.minecraftforge.api.distmarker.Dist;
- import net.minecraftforge.api.distmarker.OnlyIn;
- 
-public class BlockLeaves extends Block {
-+public class BlockLeaves extends Block implements net.minecraftforge.common.IShearable {
-    public static final IntegerProperty field_208494_a = BlockStateProperties.field_208514_aa;
-    public static final BooleanProperty field_208495_b = BlockStateProperties.field_208515_s;
-    protected static boolean field_196478_c;
-@@ -122,28 +122,37 @@
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      if (!p_196255_2_.field_72995_K) {
-         int i = this.func_196472_i(p_196255_1_);
-         if (p_196255_5_ > 0) {
-            i -= 2 << p_196255_5_;
-+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-+   }
-+
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World worldIn, BlockPos pos, int fortune) {
-+      {
-+         int i = this.func_196472_i(state);
-+         if (fortune > 0) {
-+            i -= 2 << fortune;
-             if (i < 10) {
-                i = 10;
-             }
-          }
- 
-         if (p_196255_2_.field_73012_v.nextInt(i) == 0) {
-            func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_)));
-+         if (worldIn.field_73012_v.nextInt(i) == 0) {
-+            ItemStack drop = new ItemStack(this.func_199769_a(state, worldIn, pos, fortune));
-+            if (!drop.func_190926_b())
-+                drops.add(drop);
-          }
- 
-          i = 200;
-         if (p_196255_5_ > 0) {
-            i -= 10 << p_196255_5_;
-+         if (fortune > 0) {
-+            i -= 10 << fortune;
-             if (i < 40) {
-                i = 40;
-             }
-          }
- 
-         this.func_196474_a(p_196255_2_, p_196255_3_, p_196255_1_, i);
-+         captureDrops(true);
-+         this.func_196474_a(worldIn, pos, state, i);
-+         drops.addAll(captureDrops(false));
-       }
- 
-    }
-@@ -173,13 +182,7 @@
-    }
- 
-    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
-      if (!p_180657_1_.field_72995_K && p_180657_6_.func_77973_b() == Items.field_151097_aZ) {
-         p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this));
-         p_180657_2_.func_71020_j(0.005F);
-         func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(this));
-      } else {
-          super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
-      }
-    }
- 
-    protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
-@@ -189,4 +192,10 @@
-    public IBlockState func_196258_a(BlockItemUseContext p_196258_1_) {
-       return func_208493_b(this.func_176223_P().func_206870_a(field_208495_b, Boolean.valueOf(true)), p_196258_1_.func_195991_k(), p_196258_1_.func_195995_a());
-    }
-+
-+   @Override
-+   public java.util.List<ItemStack> onSheared(@javax.annotation.Nonnull ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
-+      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
-+      return java.util.Arrays.asList(new ItemStack(this));
-+   }
- }
@@ -1,27 +0,0 @@
--- a/net/minecraft/block/BlockMobSpawner.java
-+++ b/net/minecraft/block/BlockMobSpawner.java
-@@ -13,6 +13,8 @@
- import net.minecraft.world.World;
- 
- public class BlockMobSpawner extends BlockContainer {
-+   private static final java.util.Random RAND = new java.util.Random();
-+
-    protected BlockMobSpawner(Block.Properties p_i48364_1_) {
-       super(p_i48364_1_);
-    }
-@@ -27,10 +29,13 @@
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-      int i = 15 + p_196255_2_.field_73012_v.nextInt(15) + p_196255_2_.field_73012_v.nextInt(15);
-      this.func_180637_b(p_196255_2_, p_196255_3_, i);
-    }
- 
-+   @Override
-+   public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) {
-+      return 15 + RAND.nextInt(15) + RAND.nextInt(15);
-+   }
-+
-    public EnumBlockRenderType func_149645_b(IBlockState p_149645_1_) {
-       return EnumBlockRenderType.MODEL;
-    }
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockMushroom.java
-+++ b/net/minecraft/block/BlockMushroom.java
-@@ -64,7 +64,7 @@
-       IBlockState iblockstate = p_196260_2_.func_180495_p(blockpos);
-       Block block = iblockstate.func_177230_c();
-       if (block != Blocks.field_150391_bh && block != Blocks.field_196661_l) {
-         return p_196260_2_.func_201669_a(p_196260_3_, 0) < 13 && this.func_200014_a_(iblockstate, p_196260_2_, blockpos);
-+         return p_196260_2_.func_201669_a(p_196260_3_, 0) < 13 && iblockstate.canSustainPlant(p_196260_2_, blockpos, net.minecraft.util.EnumFacing.UP, this);
-       } else {
-          return true;
-       }
@@ -1,36 +0,0 @@
--- a/net/minecraft/block/BlockNetherWart.java
-+++ b/net/minecraft/block/BlockNetherWart.java
-@@ -33,16 +33,22 @@
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       int i = p_196267_1_.func_177229_b(field_176486_a);
-      if (i < 3 && p_196267_4_.nextInt(10) == 0) {
-+      if (i < 3 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_4_.nextInt(10) == 0)) {
-          p_196267_1_ = p_196267_1_.func_206870_a(field_176486_a, Integer.valueOf(i + 1));
-          p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_, 2);
-+         net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-       }
- 
-       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      if (!p_196255_2_.field_72995_K) {
-+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-+    }
-+
-+   @Override
-+   public void getDrops(IBlockState p_196255_1_, net.minecraft.util.NonNullList<ItemStack> drops, World p_196255_2_, BlockPos p_196255_3_, int p_196255_5_) {
-+      {
-          int i = 1;
-          if (p_196255_1_.func_177229_b(field_176486_a) >= 3) {
-             i = 2 + p_196255_2_.field_73012_v.nextInt(3);
-@@ -52,7 +58,7 @@
-          }
- 
-          for(int j = 0; j < i; ++j) {
-            func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(Items.field_151075_bm));
-+            drops.add(new ItemStack(Items.field_151075_bm));
-          }
- 
-       }
@@ -1,39 +0,0 @@
--- a/net/minecraft/block/BlockOre.java
-+++ b/net/minecraft/block/BlockOre.java
-@@ -49,23 +49,27 @@
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-      if (this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_) != this) {
-+   }
-+
-+   @Override
-+   public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader reader, BlockPos pos, int fortune) {
-+      World world = reader instanceof World ? (World)reader : null;
-+      if (world == null || this.func_199769_a(state, world, pos, fortune) != this) {
-          int i = 0;
-          if (this == Blocks.field_150365_q) {
-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 0, 2);
-+            i = MathHelper.func_76136_a(RANDOM, 0, 2);
-          } else if (this == Blocks.field_150482_ag) {
-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 3, 7);
-+            i = MathHelper.func_76136_a(RANDOM, 3, 7);
-          } else if (this == Blocks.field_150412_bA) {
-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 3, 7);
-+            i = MathHelper.func_76136_a(RANDOM, 3, 7);
-          } else if (this == Blocks.field_150369_x) {
-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 2, 5);
-+            i = MathHelper.func_76136_a(RANDOM, 2, 5);
-          } else if (this == Blocks.field_196766_fg) {
-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 2, 5);
-+            i = MathHelper.func_76136_a(RANDOM, 2, 5);
-          }
-
-         this.func_180637_b(p_196255_2_, p_196255_3_, i);
-+         return i;
-       }
-
-+      return 0;
-    }
- 
-    public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_) {
@@ -1,50 +0,0 @@
--- a/net/minecraft/block/BlockPane.java
-+++ b/net/minecraft/block/BlockPane.java
-@@ -25,15 +25,12 @@
-       IBlockReader iblockreader = p_196258_1_.func_195991_k();
-       BlockPos blockpos = p_196258_1_.func_195995_a();
-       IFluidState ifluidstate = p_196258_1_.func_195991_k().func_204610_c(p_196258_1_.func_195995_a());
-      BlockPos blockpos1 = blockpos.func_177978_c();
-      BlockPos blockpos2 = blockpos.func_177968_d();
-      BlockPos blockpos3 = blockpos.func_177976_e();
-      BlockPos blockpos4 = blockpos.func_177974_f();
-      IBlockState iblockstate = iblockreader.func_180495_p(blockpos1);
-      IBlockState iblockstate1 = iblockreader.func_180495_p(blockpos2);
-      IBlockState iblockstate2 = iblockreader.func_180495_p(blockpos3);
-      IBlockState iblockstate3 = iblockreader.func_180495_p(blockpos4);
-      return this.func_176223_P().func_206870_a(field_196409_a, Boolean.valueOf(this.func_196417_a(iblockstate, iblockstate.func_193401_d(iblockreader, blockpos1, EnumFacing.SOUTH)))).func_206870_a(field_196413_c, Boolean.valueOf(this.func_196417_a(iblockstate1, iblockstate1.func_193401_d(iblockreader, blockpos2, EnumFacing.NORTH)))).func_206870_a(field_196414_y, Boolean.valueOf(this.func_196417_a(iblockstate2, iblockstate2.func_193401_d(iblockreader, blockpos3, EnumFacing.EAST)))).func_206870_a(field_196411_b, Boolean.valueOf(this.func_196417_a(iblockstate3, iblockstate3.func_193401_d(iblockreader, blockpos4, EnumFacing.WEST)))).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
-+      return this.func_176223_P()
-+          .func_206870_a(field_196409_a, canPaneConnectTo(iblockreader, blockpos, EnumFacing.NORTH))
-+          .func_206870_a(field_196413_c, canPaneConnectTo(iblockreader, blockpos, EnumFacing.SOUTH))
-+          .func_206870_a(field_196414_y, canPaneConnectTo(iblockreader, blockpos, EnumFacing.WEST))
-+          .func_206870_a(field_196411_b, canPaneConnectTo(iblockreader, blockpos, EnumFacing.EAST))
-+          .func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
-    }
- 
-    public IBlockState func_196271_a(IBlockState p_196271_1_, EnumFacing p_196271_2_, IBlockState p_196271_3_, IWorld p_196271_4_, BlockPos p_196271_5_, BlockPos p_196271_6_) {
-@@ -41,7 +38,7 @@
-          p_196271_4_.func_205219_F_().func_205360_a(p_196271_5_, Fluids.field_204546_a, Fluids.field_204546_a.func_205569_a(p_196271_4_));
-       }
- 
-      return p_196271_2_.func_176740_k().func_176722_c() ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.func_196417_a(p_196271_3_, p_196271_3_.func_193401_d(p_196271_4_, p_196271_6_, p_196271_2_.func_176734_d())))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
-+      return p_196271_2_.func_176740_k().func_176722_c() ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.canPaneConnectTo(p_196271_4_, p_196271_5_, p_196271_2_))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
-    }
- 
-    public boolean func_149686_d(IBlockState p_149686_1_) {
-@@ -87,4 +84,16 @@
-    public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
-       return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE_THIN : BlockFaceShape.CENTER_SMALL;
-    }
-+
-+   @Override
-+   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      IBlockState other = world.func_180495_p(pos.func_177972_a(facing));
-+      return func_196417_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
-+   }
-+
-+   private boolean canPaneConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      BlockPos offset = pos.func_177972_a(facing);
-+      IBlockState other = world.func_180495_p(offset);
-+      return other.canBeConnectedTo(world, offset, facing.func_176734_d()) || func_176223_P().canBeConnectedTo(world, pos, facing);
-+   }
- }
@@ -1,33 +0,0 @@
--- a/net/minecraft/block/BlockPistonBase.java
-+++ b/net/minecraft/block/BlockPistonBase.java
-@@ -244,7 +244,7 @@
-                return false;
-             }
- 
-            return !block.func_149716_u();
-+            return !p_185646_0_.hasTileEntity();
-          } else {
-             return false;
-          }
-@@ -280,7 +280,9 @@
-          for(int j = list2.size() - 1; j >= 0; --j) {
-             BlockPos blockpos2 = list2.get(j);
-             IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos2);
-            iblockstate.func_196949_c(p_176319_1_, blockpos2, 0);
-+            // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
-+            float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
-+            iblockstate.func_196941_a(p_176319_1_, blockpos2, chance, 0);
-             p_176319_1_.func_180501_a(blockpos2, Blocks.field_150350_a.func_176223_P(), 18);
-             --k;
-             aiblockstate[k] = iblockstate;
-@@ -333,6 +335,10 @@
-       return p_185499_1_.func_206870_a(field_176387_N, p_185499_2_.func_185831_a(p_185499_1_.func_177229_b(field_176387_N)));
-    }
- 
-+   public IBlockState rotate(IBlockState state, net.minecraft.world.IWorld world, BlockPos pos, Rotation direction) {
-+       return state.func_177229_b(field_176320_b) ? state : super.rotate(state, world, pos, direction);
-+   }
-+
-    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
-       return p_185471_1_.func_185907_a(p_185471_2_.func_185800_a(p_185471_1_.func_177229_b(field_176387_N)));
-    }
@@ -1,26 +0,0 @@
--- a/net/minecraft/block/BlockPistonMoving.java
-+++ b/net/minecraft/block/BlockPistonMoving.java
-@@ -86,14 +86,22 @@
-    }
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-      if (!p_196255_2_.field_72995_K) {
-+      if (false && !p_196255_2_.field_72995_K) { //Forge: Noop this out
-          TileEntityPiston tileentitypiston = this.func_196342_a(p_196255_2_, p_196255_3_);
-          if (tileentitypiston != null) {
-             tileentitypiston.func_200230_i().func_196949_c(p_196255_2_, p_196255_3_, 0);
-          }
-       }
-+      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, 1, p_196255_5_); // mimic vanilla behavior from above and ignore chance
-    }
- 
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      TileEntityPiston te = this.func_196342_a(world, pos);
-+      if (te != null)
-+         te.func_200230_i().getDrops(drops, world, pos, fortune);
-+   }
-+
-    public VoxelShape func_196244_b(IBlockState p_196244_1_, IBlockReader p_196244_2_, BlockPos p_196244_3_) {
-       return VoxelShapes.func_197880_a();
-    }
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockPortal.java
-+++ b/net/minecraft/block/BlockPortal.java
-@@ -76,7 +76,7 @@
- 
-    public boolean func_176548_d(IWorld p_176548_1_, BlockPos p_176548_2_) {
-       BlockPortal.Size blockportal$size = this.func_201816_b(p_176548_1_, p_176548_2_);
-      if (blockportal$size != null) {
-+      if (blockportal$size != null && !net.minecraftforge.event.ForgeEventFactory.onTrySpawnPortal(p_176548_1_, p_176548_2_, blockportal$size)) {
-          blockportal$size.func_150859_c();
-          return true;
-       } else {
@@ -1,25 +0,0 @@
--- a/net/minecraft/block/BlockPotato.java
-+++ b/net/minecraft/block/BlockPotato.java
-@@ -26,7 +26,7 @@
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-      if (!p_196255_2_.field_72995_K) {
-+      if (false && !p_196255_2_.field_72995_K) { //Forge: Moved to getDrops
-          if (this.func_185525_y(p_196255_1_) && p_196255_2_.field_73012_v.nextInt(50) == 0) {
-             func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(Items.field_151170_bI));
-          }
-@@ -34,6 +34,13 @@
-       }
-    }
- 
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      super.getDrops(state, drops, world, pos, fortune);
-+      if (this.func_185525_y(state) && world.field_73012_v.nextInt(50) == 0)
-+          drops.add(new ItemStack(Items.field_151170_bI));
-+   }
-+
-    public VoxelShape func_196244_b(IBlockState p_196244_1_, IBlockReader p_196244_2_, BlockPos p_196244_3_) {
-       return field_196396_a[p_196244_1_.func_177229_b(this.func_185524_e())];
-    }
@@ -1,122 +0,0 @@
--- a/net/minecraft/block/BlockRailBase.java
-+++ b/net/minecraft/block/BlockRailBase.java
-@@ -37,7 +37,7 @@
-    }
- 
-    public VoxelShape func_196244_b(IBlockState p_196244_1_, IBlockReader p_196244_2_, BlockPos p_196244_3_) {
-      RailShape railshape = p_196244_1_.func_177230_c() == this ? p_196244_1_.func_177229_b(this.func_176560_l()) : null;
-+      RailShape railshape = p_196244_1_.func_177230_c() == this ? getRailDirection(p_196244_1_, p_196244_2_, p_196244_3_, null) : null;
-       return railshape != null && railshape.func_208092_c() ? field_190959_b : field_185590_a;
-    }
- 
-@@ -50,7 +50,7 @@
-    }
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_185896_q();
-+      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_193401_d(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID;
-    }
- 
-    public void func_196259_b(IBlockState p_196259_1_, World p_196259_2_, BlockPos p_196259_3_, IBlockState p_196259_4_) {
-@@ -67,19 +67,19 @@
- 
-    public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_) {
-       if (!p_189540_2_.field_72995_K) {
-         RailShape railshape = p_189540_1_.func_177229_b(this.func_176560_l());
-+         RailShape railshape = getRailDirection(p_189540_1_, p_189540_2_, p_189540_3_, null);
-          boolean flag = false;
-         if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_185896_q()) {
-+         if (p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_193401_d(p_189540_2_, p_189540_3_.func_177977_b(), EnumFacing.UP) != BlockFaceShape.SOLID) {
-             flag = true;
-          }
- 
-         if (railshape == RailShape.ASCENDING_EAST && !p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).func_185896_q()) {
-+         if (railshape == RailShape.ASCENDING_EAST && p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).func_193401_d(p_189540_2_, p_189540_3_.func_177974_f(), EnumFacing.UP) != BlockFaceShape.SOLID) {
-             flag = true;
-         } else if (railshape == RailShape.ASCENDING_WEST && !p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).func_185896_q()) {
-+         } else if (railshape == RailShape.ASCENDING_WEST && p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).func_193401_d(p_189540_2_, p_189540_3_.func_177976_e(), EnumFacing.UP) != BlockFaceShape.SOLID) {
-             flag = true;
-         } else if (railshape == RailShape.ASCENDING_NORTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).func_185896_q()) {
-+         } else if (railshape == RailShape.ASCENDING_NORTH && p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).func_193401_d(p_189540_2_, p_189540_3_.func_177978_c(), EnumFacing.UP) != BlockFaceShape.SOLID) {
-             flag = true;
-         } else if (railshape == RailShape.ASCENDING_SOUTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).func_185896_q()) {
-+         } else if (railshape == RailShape.ASCENDING_SOUTH && p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).func_193401_d(p_189540_2_, p_189540_3_.func_177968_d(), EnumFacing.UP) != BlockFaceShape.SOLID) {
-             flag = true;
-          }
- 
-@@ -111,7 +111,7 @@
-    public void func_196243_a(IBlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, IBlockState p_196243_4_, boolean p_196243_5_) {
-       if (!p_196243_5_) {
-          super.func_196243_a(p_196243_1_, p_196243_2_, p_196243_3_, p_196243_4_, p_196243_5_);
-         if (p_196243_1_.func_177229_b(this.func_176560_l()).func_208092_c()) {
-+         if (getRailDirection(p_196243_1_, p_196243_2_, p_196243_3_, null).func_208092_c()) {
-             p_196243_2_.func_195593_d(p_196243_3_.func_177984_a(), this);
-          }
- 
-@@ -123,5 +123,66 @@
-       }
-    }
- 
-+   //Forge: Use getRailDirection(IBlockAccess, BlockPos, IBlockState, EntityMinecart) for enhanced ability
-    public abstract IProperty<RailShape> func_176560_l();
-+
-+   /* ======================================== FORGE START =====================================*/
-+   /**
-+    * Return true if the rail can make corners.
-+    * Used by placement logic.
-+    * @param world The world.
-+    * @param pos Block's position in world
-+    * @return True if the rail can make corners.
-+    */
-+   public boolean isFlexibleRail(IBlockState state, IBlockReader world, BlockPos pos)
-+   {
-+       return !this.field_196277_c;
-+   }
-+
-+   /**
-+    * Returns true if the rail can make up and down slopes.
-+    * Used by placement logic.
-+    * @param world The world.
-+    * @param pos Block's position in world
-+    * @return True if the rail can make slopes.
-+    */
-+   public boolean canMakeSlopes(IBlockState state, IBlockReader world, BlockPos pos) {
-+       return true;
-+   }
-+
-+   /**
-+    * Return the rail's direction.
-+    * Can be used to make the cart think the rail is a different shape,
-+    * for example when making diamond junctions or switches.
-+    * The cart parameter will often be null unless it it called from EntityMinecart.
-+    *
-+    * @param world The world.
-+    * @param pos Block's position in world
-+    * @param state The BlockState
-+    * @param cart The cart asking for the metadata, null if it is not called by EntityMinecart.
-+    * @return The direction.
-+    */
-+   public RailShape getRailDirection(IBlockState state, IBlockReader world, BlockPos pos, @javax.annotation.Nullable net.minecraft.entity.item.EntityMinecart cart) {
-+       return state.func_177229_b(func_176560_l());
-+   }
-+
-+   /**
-+    * Returns the max speed of the rail at the specified position.
-+    * @param world The world.
-+    * @param cart The cart on the rail, may be null.
-+    * @param pos Block's position in world
-+    * @return The max speed of the current rail.
-+    */
-+   public float getRailMaxSpeed(IBlockState state, World world, BlockPos pos, net.minecraft.entity.item.EntityMinecart cart) {
-+       return 0.4f;
-+   }
-+
-+   /**
-+    * This function is called by any minecart that passes over this rail.
-+    * It is called once per update tick that the minecart is on the rail.
-+    * @param world The world.
-+    * @param cart The cart on the rail.
-+    * @param pos Block's position in world
-+    */
-+   public void onMinecartPass(IBlockState state, World world, BlockPos pos, net.minecraft.entity.item.EntityMinecart cart) { }
- }
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockRailDetector.java
-+++ b/net/minecraft/block/BlockRailDetector.java
-@@ -127,6 +127,8 @@
- 
-    public int func_180641_l(IBlockState p_180641_1_, World p_180641_2_, BlockPos p_180641_3_) {
-       if (p_180641_1_.func_177229_b(field_176574_M)) {
-+         List<EntityMinecart> carts = this.func_200878_a(p_180641_2_, p_180641_3_, EntityMinecart.class, null);
-+         if (!carts.isEmpty() && carts.get(0).getComparatorLevel() > -1) return carts.get(0).getComparatorLevel();
-          List<EntityMinecartCommandBlock> list = this.func_200878_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class, (Predicate<Entity>)null);
-          if (!list.isEmpty()) {
-             return list.get(0).func_145822_e().func_145760_g();
@@ -1,29 +0,0 @@
--- a/net/minecraft/block/BlockRailPowered.java
-+++ b/net/minecraft/block/BlockRailPowered.java
-@@ -15,10 +15,16 @@
- public class BlockRailPowered extends BlockRailBase {
-    public static final EnumProperty<RailShape> field_176568_b = BlockStateProperties.field_208166_S;
-    public static final BooleanProperty field_176569_M = BlockStateProperties.field_208194_u;
-+   private final boolean isActivator;
- 
-    protected BlockRailPowered(Block.Properties p_i48349_1_) {
-      super(true, p_i48349_1_);
-+      this(p_i48349_1_, false);
-+   }
-+
-+   protected BlockRailPowered(Block.Properties builder, boolean isActivator) {
-+      super(true, builder);
-       this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176568_b, RailShape.NORTH_SOUTH).func_206870_a(field_176569_M, Boolean.valueOf(false)));
-+      this.isActivator = isActivator;
-    }
- 
-    protected boolean func_176566_a(World p_176566_1_, BlockPos p_176566_2_, IBlockState p_176566_3_, boolean p_176566_4_, int p_176566_5_) {
-@@ -100,7 +106,7 @@
- 
-    protected boolean func_208071_a(World p_208071_1_, BlockPos p_208071_2_, boolean p_208071_3_, int p_208071_4_, RailShape p_208071_5_) {
-       IBlockState iblockstate = p_208071_1_.func_180495_p(p_208071_2_);
-      if (iblockstate.func_177230_c() != this) {
-+      if (!(iblockstate.func_177230_c() instanceof BlockRailPowered) || isActivator != ((BlockRailPowered)iblockstate.func_177230_c()).isActivator) {
-          return false;
-       } else {
-          RailShape railshape = iblockstate.func_177229_b(field_176568_b);
@@ -1,19 +0,0 @@
--- a/net/minecraft/block/BlockRedstoneComparator.java
-+++ b/net/minecraft/block/BlockRedstoneComparator.java
-@@ -156,4 +156,16 @@
-    protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
-       p_206840_1_.func_206894_a(field_185512_D, field_176463_b, field_196348_c);
-    }
-+
-+   @Override
-+   public boolean getWeakChanges(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos) {
-+      return true;
-+   }
-+
-+   @Override
-+   public void onNeighborChange(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, BlockPos neighbor) {
-+      if (pos.func_177956_o() == neighbor.func_177956_o() && world instanceof World && !((World)world).func_201670_d()) {
-+         func_189540_a(state, (World)world, pos, world.func_180495_p(neighbor).func_177230_c(), neighbor);
-+      }
-+   }
- }
@@ -1,20 +0,0 @@
--- a/net/minecraft/block/BlockRedstoneDiode.java
-+++ b/net/minecraft/block/BlockRedstoneDiode.java
-@@ -35,7 +35,7 @@
-    }
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_185896_q();
-+      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_185896_q() || p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_193401_d(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID;
-    }
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-@@ -172,6 +172,8 @@
-    protected void func_176400_h(World p_176400_1_, BlockPos p_176400_2_, IBlockState p_176400_3_) {
-       EnumFacing enumfacing = p_176400_3_.func_177229_b(field_185512_D);
-       BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
-+      if (net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(enumfacing.func_176734_d()), false).isCanceled())
-+         return;
-       p_176400_1_.func_190524_a(blockpos, this, p_176400_2_);
-       p_176400_1_.func_175695_a(blockpos, this, enumfacing);
-    }
@@ -1,21 +0,0 @@
--- a/net/minecraft/block/BlockRedstoneOre.java
-+++ b/net/minecraft/block/BlockRedstoneOre.java
-@@ -72,11 +72,17 @@
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-      if (this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_) != this) {
-+      if (false && this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_) != this) {
-          int i = 1 + p_196255_2_.field_73012_v.nextInt(5);
-          this.func_180637_b(p_196255_2_, p_196255_3_, i);
-       }
-+   }
- 
-+   @Override
-+   public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) {
-+      if (!(world instanceof World) || func_199769_a(state, (World)world, pos, fortune) != this)
-+         return 1 + RANDOM.nextInt(5);
-+      return 0;
-    }
- 
-    @OnlyIn(Dist.CLIENT)
@@ -1,11 +0,0 @@
--- a/net/minecraft/block/BlockRedstoneTorch.java
-+++ b/net/minecraft/block/BlockRedstoneTorch.java
-@@ -24,7 +24,7 @@
- 
- public class BlockRedstoneTorch extends BlockTorch {
-    public static final BooleanProperty field_196528_a = BlockStateProperties.field_208190_q;
-   private static final Map<IBlockReader, List<BlockRedstoneTorch.Toggle>> field_196529_b = Maps.newHashMap();
-+   private static final Map<IBlockReader, List<BlockRedstoneTorch.Toggle>> field_196529_b = new java.util.WeakHashMap<IBlockReader, List<BlockRedstoneTorch.Toggle>>(); // FORGE - fix vanilla MC-101233
- 
-    protected BlockRedstoneTorch(Block.Properties p_i48342_1_) {
-       super(p_i48342_1_);
@@ -1,71 +0,0 @@
--- a/net/minecraft/block/BlockRedstoneWire.java
-+++ b/net/minecraft/block/BlockRedstoneWire.java
-@@ -124,8 +124,8 @@
-       IBlockState iblockstate = p_208074_1_.func_180495_p(p_208074_2_.func_177972_a(p_208074_3_));
-       IBlockState iblockstate1 = p_208074_1_.func_180495_p(p_208074_2_.func_177984_a());
-       if (!iblockstate1.func_185915_l()) {
-         boolean flag = p_208074_1_.func_180495_p(blockpos).func_185896_q() || p_208074_1_.func_180495_p(blockpos).func_177230_c() == Blocks.field_150426_aN;
-         if (flag && func_176346_d(p_208074_1_.func_180495_p(blockpos.func_177984_a()))) {
-+         boolean flag = iblockstate.func_193401_d(p_208074_1_, blockpos, EnumFacing.UP) == BlockFaceShape.SOLID || iblockstate.func_177230_c() == Blocks.field_150426_aN;
-+         if (flag && canConnectTo(p_208074_1_.func_180495_p(blockpos.func_177984_a()), p_208074_1_, blockpos.func_177984_a(), null)) {
-             if (iblockstate.func_185898_k()) {
-                return RedstoneSide.UP;
-             }
-@@ -134,7 +134,7 @@
-          }
-       }
- 
-      return !func_176343_a(p_208074_1_.func_180495_p(blockpos), p_208074_3_) && (iblockstate.func_185915_l() || !func_176346_d(p_208074_1_.func_180495_p(blockpos.func_177977_b()))) ? RedstoneSide.NONE : RedstoneSide.SIDE;
-+      return !canConnectTo(p_208074_1_.func_180495_p(blockpos), p_208074_1_, blockpos, p_208074_3_) && (iblockstate.func_185915_l() || !canConnectTo(p_208074_1_.func_180495_p(blockpos.func_177977_b()), p_208074_1_, blockpos.func_177977_b(), null)) ? RedstoneSide.NONE : RedstoneSide.SIDE;
-    }
- 
-    public boolean func_149686_d(IBlockState p_149686_1_) {
-@@ -143,7 +143,7 @@
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-       IBlockState iblockstate = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
-      return iblockstate.func_185896_q() || iblockstate.func_177230_c() == Blocks.field_150426_aN;
-+      return iblockstate.func_185896_q() || iblockstate.func_177230_c() == Blocks.field_150426_aN || iblockstate.func_193401_d(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID;
-    }
- 
-    private IBlockState func_176338_e(World p_176338_1_, BlockPos p_176338_2_, IBlockState p_176338_3_) {
-@@ -338,26 +338,18 @@
-       IBlockState iblockstate = p_176339_1_.func_180495_p(blockpos);
-       boolean flag = iblockstate.func_185915_l();
-       boolean flag1 = p_176339_1_.func_180495_p(p_176339_2_.func_177984_a()).func_185915_l();
-      if (!flag1 && flag && func_176340_e(p_176339_1_, blockpos.func_177984_a())) {
-+      if (!flag1 && flag && canConnectTo(p_176339_1_.func_180495_p(blockpos.func_177984_a()), p_176339_1_, blockpos.func_177984_a(), null)) {
-          return true;
-      } else if (func_176343_a(iblockstate, p_176339_3_)) {
-+      } else if (canConnectTo(iblockstate, p_176339_1_, blockpos, p_176339_3_)) {
-          return true;
-       } else if (iblockstate.func_177230_c() == Blocks.field_196633_cV && iblockstate.func_177229_b(BlockRedstoneDiode.field_196348_c) && iblockstate.func_177229_b(BlockRedstoneDiode.field_185512_D) == p_176339_3_) {
-          return true;
-       } else {
-         return !flag && func_176340_e(p_176339_1_, blockpos.func_177977_b());
-+         return !flag && canConnectTo(p_176339_1_.func_180495_p(blockpos.func_177977_b()), p_176339_1_, blockpos.func_177977_b(), null);
-       }
-    }
- 
-   protected static boolean func_176340_e(IBlockReader p_176340_0_, BlockPos p_176340_1_) {
-      return func_176346_d(p_176340_0_.func_180495_p(p_176340_1_));
-   }
-
-   protected static boolean func_176346_d(IBlockState p_176346_0_) {
-      return func_176343_a(p_176346_0_, (EnumFacing)null);
-   }
-
-   protected static boolean func_176343_a(IBlockState p_176343_0_, @Nullable EnumFacing p_176343_1_) {
-+   protected boolean canConnectTo(IBlockState p_176343_0_, IBlockReader world, BlockPos pos, @Nullable EnumFacing p_176343_1_) {
-       Block block = p_176343_0_.func_177230_c();
-       if (block == Blocks.field_150488_af) {
-          return true;
-@@ -367,7 +359,7 @@
-       } else if (Blocks.field_190976_dk == p_176343_0_.func_177230_c()) {
-          return p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N);
-       } else {
-         return p_176343_0_.func_185897_m() && p_176343_1_ != null;
-+         return p_176343_0_.canConnectRedstone(world, pos, p_176343_1_) && p_176343_1_ != null;
-       }
-    }
- 
@@ -1,52 +0,0 @@
--- a/net/minecraft/block/BlockReed.java
-+++ b/net/minecraft/block/BlockReed.java
-@@ -18,7 +18,7 @@
- import net.minecraft.world.IWorldReaderBase;
- import net.minecraft.world.World;
- 
-public class BlockReed extends Block {
-+public class BlockReed extends Block implements net.minecraftforge.common.IPlantable {
-    public static final IntegerProperty field_176355_a = BlockStateProperties.field_208171_X;
-    protected static final VoxelShape field_196503_b = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 16.0D, 14.0D);
- 
-@@ -40,12 +40,15 @@
- 
-          if (i < 3) {
-             int j = p_196267_1_.func_177229_b(field_176355_a);
-+            if (net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, true)) {
-             if (j == 15) {
-                p_196267_2_.func_175656_a(p_196267_3_.func_177984_a(), this.func_176223_P());
-                p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176355_a, Integer.valueOf(0)), 4);
-             } else {
-                p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176355_a, Integer.valueOf(j + 1)), 4);
-             }
-+            net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-+            }
-          }
-       }
- 
-@@ -56,6 +59,9 @@
-    }
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-+      IBlockState soil = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
-+      if (soil.canSustainPlant(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP, this)) return true;
-+
-       Block block = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_177230_c();
-       if (block == this) {
-          return true;
-@@ -91,4 +97,14 @@
-    public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
-       return BlockFaceShape.UNDEFINED;
-    }
-+
-+   @Override
-+   public net.minecraftforge.common.EnumPlantType getPlantType(IBlockReader world, BlockPos pos) {
-+       return net.minecraftforge.common.EnumPlantType.Beach;
-+   }
-+
-+   @Override
-+   public IBlockState getPlant(IBlockReader world, BlockPos pos) {
-+      return func_176223_P();
-+   }
- }
@@ -1,18 +0,0 @@
--- a/net/minecraft/block/BlockSapling.java
-+++ b/net/minecraft/block/BlockSapling.java
-@@ -29,6 +29,7 @@
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
-+      if (!p_196267_2_.func_205050_e(p_196267_3_, 1)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light
-       if (p_196267_2_.func_201696_r(p_196267_3_.func_177984_a()) >= 9 && p_196267_4_.nextInt(7) == 0) {
-          this.func_176478_d(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_4_);
-       }
-@@ -39,6 +40,7 @@
-       if (p_176478_3_.func_177229_b(field_176479_b) == 0) {
-          p_176478_1_.func_180501_a(p_176478_2_, p_176478_3_.func_177231_a(field_176479_b), 4);
-       } else {
-+         if (!net.minecraftforge.event.ForgeEventFactory.saplingGrowTree(p_176478_1_, p_176478_4_, p_176478_2_)) return;
-          this.field_196387_c.func_196935_a(p_176478_1_, p_176478_2_, p_176478_3_, p_176478_4_);
-       }
- 
@@ -1,38 +0,0 @@
--- a/net/minecraft/block/BlockShearableDoublePlant.java
-+++ b/net/minecraft/block/BlockShearableDoublePlant.java
-@@ -11,7 +11,7 @@
- import net.minecraft.util.math.BlockPos;
- import net.minecraft.world.World;
- 
-public class BlockShearableDoublePlant extends BlockDoublePlant {
-+public class BlockShearableDoublePlant extends BlockDoublePlant implements net.minecraftforge.common.IShearable {
-    public static final EnumProperty<DoubleBlockHalf> field_208063_b = BlockDoublePlant.field_176492_b;
-    private final Block field_196392_b;
- 
-@@ -26,9 +26,7 @@
-    }
- 
-    protected void func_196391_a(IBlockState p_196391_1_, World p_196391_2_, BlockPos p_196391_3_, ItemStack p_196391_4_) {
-      if (p_196391_4_.func_77973_b() == Items.field_151097_aZ) {
-         func_180635_a(p_196391_2_, p_196391_3_, new ItemStack(this.field_196392_b, 2));
-      } else {
-+      {
-          super.func_196391_a(p_196391_1_, p_196391_2_, p_196391_3_, p_196391_4_);
-       }
- 
-@@ -37,4 +35,15 @@
-    public IItemProvider func_199769_a(IBlockState p_199769_1_, World p_199769_2_, BlockPos p_199769_3_, int p_199769_4_) {
-       return p_199769_1_.func_177229_b(field_208063_b) == DoubleBlockHalf.LOWER && this == Blocks.field_196804_gh && p_199769_2_.field_73012_v.nextInt(8) == 0 ? Items.field_151014_N : Items.field_190931_a;
-    }
-+
-+   @Override
-+   public boolean isShearable(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos) {
-+      return false;
-+   }
-+
-+   @Override
-+   public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
-+      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
-+      return java.util.Arrays.asList(new ItemStack(this.field_196392_b, 2));
-+   }
- }
@@ -1,54 +0,0 @@
--- a/net/minecraft/block/BlockSnowLayer.java
-+++ b/net/minecraft/block/BlockSnowLayer.java
-@@ -84,30 +84,45 @@
- 
-    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
-       Integer integer = p_180657_4_.func_177229_b(field_176315_a);
-      if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
-+      net.minecraft.util.NonNullList<ItemStack> items = net.minecraft.util.NonNullList.func_191196_a();
-+      int fortune = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
-+      float chance = 1.0f;
-+
-+      if (this.canSilkHarvest(p_180657_4_, p_180657_1_, p_180657_3_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
-          if (integer == 8) {
-            func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_196604_cC));
-+            items.add(new ItemStack(Blocks.field_196604_cC));
-          } else {
-             for(int i = 0; i < integer; ++i) {
-               func_180635_a(p_180657_1_, p_180657_3_, this.func_180643_i(p_180657_4_));
-+               items.add(this.func_180643_i(p_180657_4_));
-             }
-          }
-+         chance = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
-       } else {
-         func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Items.field_151126_ay, integer));
-+         getDrops(p_180657_4_, items, p_180657_1_, p_180657_3_, fortune);
-+         chance = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, fortune, 1.0f, false, p_180657_2_);
-       }
- 
-+      for (ItemStack item : items) {
-+         if (p_180657_1_.field_73012_v.nextFloat() <= chance)
-+            func_180635_a(p_180657_1_, p_180657_3_, item);
-+      }
-+
-       p_180657_1_.func_175698_g(p_180657_3_);
-       p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this));
-       p_180657_2_.func_71020_j(0.005F);
-    }
- 
-    public IItemProvider func_199769_a(IBlockState p_199769_1_, World p_199769_2_, BlockPos p_199769_3_, int p_199769_4_) {
-      return Items.field_190931_a;
-+      return Items.field_151126_ay;
-    }
- 
-+   @Override
-+   public int func_196264_a(IBlockState state, Random random) {
-+      return state.func_177229_b(field_176315_a) + 1;
-+   }
-+
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       if (p_196267_2_.func_175642_b(EnumLightType.BLOCK, p_196267_3_) > 11) {
-         p_196267_1_.func_196949_c(p_196267_2_, p_196267_3_, 0);
-          p_196267_2_.func_175698_g(p_196267_3_);
-       }
- 
@@ -0,0 +1,26 @@
+--- a/net/minecraft/block/BlockState.java
+++ b/net/minecraft/block/BlockState.java
+@@ -51,7 +51,7 @@
+ import net.minecraftforge.api.distmarker.Dist;
+ import net.minecraftforge.api.distmarker.OnlyIn;
+ 
+-public class BlockState extends StateHolder<Block, BlockState> implements IStateHolder<BlockState> {
+public class BlockState extends StateHolder<Block, BlockState> implements IStateHolder<BlockState>, net.minecraftforge.common.extensions.IForgeBlockState {
+    @Nullable
+    private BlockState.Cache field_215707_c;
+    private final int field_215708_d;
+@@ -106,10 +106,14 @@
+       return this.field_215708_d;
+    }
+ 
+   /** @deprecated use {@link BlockState#isAir(IBlockReader, BlockPos) */
+   @Deprecated
+    public boolean func_196958_f() {
+       return this.func_177230_c().func_196261_e(this);
+    }
+ 
+   /** @deprecated use {@link BlockState#rotate(IWorld, BlockPos, Rotation) */
+   @Deprecated
+    public MaterialColor func_185909_g(IBlockReader p_185909_1_, BlockPos p_185909_2_) {
+       return this.func_177230_c().func_180659_g(this, p_185909_1_, p_185909_2_);
+    }
@@ -1,55 +0,0 @@
--- a/net/minecraft/block/BlockStem.java
-+++ b/net/minecraft/block/BlockStem.java
-@@ -39,22 +39,24 @@
- 
-    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
-       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
-+      if (!p_196267_2_.func_205050_e(p_196267_3_, 1)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light
-       if (p_196267_2_.func_201669_a(p_196267_3_.func_177984_a(), 0) >= 9) {
-          float f = BlockCrops.func_180672_a(this, p_196267_2_, p_196267_3_);
-         if (p_196267_4_.nextInt((int)(25.0F / f) + 1) == 0) {
-+         if (net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_4_.nextInt((int)(25.0F / f) + 1) == 0)) {
-             int i = p_196267_1_.func_177229_b(field_176484_a);
-             if (i < 7) {
-               p_196267_1_ = p_196267_1_.func_206870_a(field_176484_a, Integer.valueOf(i + 1));
-               p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_, 2);
-+               p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176484_a, i + 1), 2);
-             } else {
-                EnumFacing enumfacing = EnumFacing.Plane.HORIZONTAL.func_179518_a(p_196267_4_);
-                BlockPos blockpos = p_196267_3_.func_177972_a(enumfacing);
-               Block block = p_196267_2_.func_180495_p(blockpos.func_177977_b()).func_177230_c();
-               if (p_196267_2_.func_180495_p(blockpos).func_196958_f() && (block == Blocks.field_150458_ak || block == Blocks.field_150346_d || block == Blocks.field_196660_k || block == Blocks.field_196661_l || block == Blocks.field_196658_i)) {
-+               IBlockState soil = p_196267_2_.func_180495_p(blockpos.func_177977_b());
-+               Block block = soil.func_177230_c();
-+               if (p_196267_2_.func_180495_p(blockpos).isAir(p_196267_2_, blockpos) && (soil.canSustainPlant(p_196267_2_, blockpos.func_177977_b(), EnumFacing.UP, this) || block == Blocks.field_150346_d || block == Blocks.field_196660_k || block == Blocks.field_196661_l || block == Blocks.field_196658_i)) {
-                   p_196267_2_.func_175656_a(blockpos, this.field_149877_a.func_176223_P());
-                   p_196267_2_.func_175656_a(p_196267_3_, this.field_149877_a.func_196523_e().func_176223_P().func_206870_a(BlockHorizontal.field_185512_D, enumfacing));
-                }
-             }
-+            net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
-          }
- 
-       }
-@@ -62,14 +64,18 @@
- 
-    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
-       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
-      if (!p_196255_2_.field_72995_K) {
-+   }
-+
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      {
-          Item item = this.func_176481_j();
-          if (item != null) {
-            int i = p_196255_1_.func_177229_b(field_176484_a);
-+            int i = state.func_177229_b(field_176484_a);
- 
-             for(int j = 0; j < 3; ++j) {
-               if (p_196255_2_.field_73012_v.nextInt(15) <= i) {
-                  func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(item));
-+               if (world.field_73012_v.nextInt(15) <= i) {
-+                  drops.add(new ItemStack(item));
-                }
-             }
- 
@@ -1,39 +0,0 @@
--- a/net/minecraft/block/BlockTallGrass.java
-+++ b/net/minecraft/block/BlockTallGrass.java
-@@ -15,7 +15,7 @@
- import net.minecraft.world.IBlockReader;
- import net.minecraft.world.World;
- 
-public class BlockTallGrass extends BlockBush implements IGrowable {
-+public class BlockTallGrass extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable {
-    protected static final VoxelShape field_196389_a = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 13.0D, 14.0D);
- 
-    protected BlockTallGrass(Block.Properties p_i48310_1_) {
-@@ -27,7 +27,7 @@
-    }
- 
-    public IItemProvider func_199769_a(IBlockState p_199769_1_, World p_199769_2_, BlockPos p_199769_3_, int p_199769_4_) {
-      return p_199769_2_.field_73012_v.nextInt(8) == 0 ? Items.field_151014_N : Items.field_190931_a;
-+      return Items.field_190931_a;
-    }
- 
-    public int func_196251_a(IBlockState p_196251_1_, int p_196251_2_, World p_196251_3_, BlockPos p_196251_4_, Random p_196251_5_) {
-@@ -64,4 +64,18 @@
-    public Block.EnumOffsetType func_176218_Q() {
-       return Block.EnumOffsetType.XYZ;
-    }
-+
-+   @Override
-+   public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
-+      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
-+      return java.util.Arrays.asList(new ItemStack(this));
-+   }
-+
-+   @Override
-+   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
-+      if (world.field_73012_v.nextInt(8) != 0) return;
-+      ItemStack seed = net.minecraftforge.common.ForgeHooks.getGrassSeed(world.field_73012_v, fortune);
-+      if (!seed.func_190926_b())
-+         drops.add(seed);
-+   }
- }
@@ -1,13 +0,0 @@
--- a/net/minecraft/block/BlockTorch.java
-+++ b/net/minecraft/block/BlockTorch.java
-@@ -37,9 +37,7 @@
- 
-    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
-       IBlockState iblockstate = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
-      Block block = iblockstate.func_177230_c();
-      boolean flag = block instanceof BlockFence || block instanceof BlockStainedGlass || block == Blocks.field_150359_w || block == Blocks.field_150463_bK || block == Blocks.field_196723_eg || iblockstate.func_185896_q();
-      return flag && block != Blocks.field_185775_db;
-+      return iblockstate.canPlaceTorchOnTop(p_196260_2_, p_196260_3_);
-    }
- 
-    @OnlyIn(Dist.CLIENT)
@@ -1,17 +0,0 @@
--- a/net/minecraft/block/BlockTrapDoor.java
-+++ b/net/minecraft/block/BlockTrapDoor.java
-@@ -186,4 +186,14 @@
- 
-       return super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
-    }
-+
-+   @Override
-+   public boolean isLadder(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.EntityLivingBase entity) {
-+      if (state.func_177229_b(field_176283_b)) {
-+         IBlockState down = world.func_180495_p(pos.func_177977_b());
-+         if (down.func_177230_c() == net.minecraft.init.Blocks.field_150468_ap)
-+            return down.func_177229_b(BlockLadder.field_176382_a) == state.func_177229_b(field_185512_D);
-+      }
-+      return false;
-+   }
- }
@@ -1,36 +0,0 @@
--- a/net/minecraft/block/BlockVine.java
-+++ b/net/minecraft/block/BlockVine.java
-@@ -29,7 +29,7 @@
- import net.minecraft.world.IWorldReaderBase;
- import net.minecraft.world.World;
- 
-public class BlockVine extends Block {
-+public class BlockVine extends Block implements net.minecraftforge.common.IShearable {
-    public static final BooleanProperty field_176277_a = BlockSixWay.field_196496_z;
-    public static final BooleanProperty field_176273_b = BlockSixWay.field_196488_a;
-    public static final BooleanProperty field_176278_M = BlockSixWay.field_196490_b;
-@@ -171,7 +171,7 @@
-                p_196267_2_.func_175698_g(p_196267_3_);
-             }
- 
-         } else if (p_196267_2_.field_73012_v.nextInt(4) == 0) {
-+         } else if (p_196267_2_.field_73012_v.nextInt(4) == 0 && p_196267_2_.func_205050_e(p_196267_3_, 4)) { // Forge: check area to prevent loading unloaded chunks
-             EnumFacing enumfacing = EnumFacing.func_176741_a(p_196267_4_);
-             BlockPos blockpos = p_196267_3_.func_177984_a();
-             if (enumfacing.func_176740_k().func_176722_c() && !p_196267_1_.func_177229_b(func_176267_a(enumfacing))) {
-@@ -365,4 +365,15 @@
-    public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
-       return BlockFaceShape.UNDEFINED;
-    }
-+
-+   @Override
-+   public boolean isLadder(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.EntityLivingBase entity) {
-+      return true;
-+   }
-+
-+   @Override
-+   public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
-+      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
-+      return java.util.Arrays.asList(new ItemStack(this));
-+   }
- }
@@ -1,44 +0,0 @@
--- a/net/minecraft/block/BlockWall.java
-+++ b/net/minecraft/block/BlockWall.java
-@@ -51,6 +51,18 @@
-       return !func_194143_e(block) && p_196421_2_ == BlockFaceShape.SOLID || flag;
-    }
- 
-+   @Override
-+   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      IBlockState other = world.func_180495_p(pos.func_177972_a(facing));
-+      return func_196421_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
-+   }
-+
-+   private boolean canWallConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
-+      BlockPos off = pos.func_177972_a(facing);
-+      IBlockState other = world.func_180495_p(off);
-+      return other.canBeConnectedTo(world, off, facing.func_176734_d()) || func_196421_a(other, other.func_193401_d(world, off, facing.func_176734_d()));
-+   }
-+
-    public static boolean func_194143_e(Block p_194143_0_) {
-       return Block.func_193382_c(p_194143_0_) || p_194143_0_ == Blocks.field_180401_cv || p_194143_0_ == Blocks.field_150440_ba || p_194143_0_ == Blocks.field_150423_aK || p_194143_0_ == Blocks.field_196625_cS || p_194143_0_ == Blocks.field_196628_cT || p_194143_0_ == Blocks.field_185778_de || p_194143_0_ == Blocks.field_150335_W;
-    }
-@@ -59,18 +71,10 @@
-       IWorldReaderBase iworldreaderbase = p_196258_1_.func_195991_k();
-       BlockPos blockpos = p_196258_1_.func_195995_a();
-       IFluidState ifluidstate = p_196258_1_.func_195991_k().func_204610_c(p_196258_1_.func_195995_a());
-      BlockPos blockpos1 = blockpos.func_177978_c();
-      BlockPos blockpos2 = blockpos.func_177974_f();
-      BlockPos blockpos3 = blockpos.func_177968_d();
-      BlockPos blockpos4 = blockpos.func_177976_e();
-      IBlockState iblockstate = iworldreaderbase.func_180495_p(blockpos1);
-      IBlockState iblockstate1 = iworldreaderbase.func_180495_p(blockpos2);
-      IBlockState iblockstate2 = iworldreaderbase.func_180495_p(blockpos3);
-      IBlockState iblockstate3 = iworldreaderbase.func_180495_p(blockpos4);
-      boolean flag = this.func_196421_a(iblockstate, iblockstate.func_193401_d(iworldreaderbase, blockpos1, EnumFacing.SOUTH));
-      boolean flag1 = this.func_196421_a(iblockstate1, iblockstate1.func_193401_d(iworldreaderbase, blockpos2, EnumFacing.WEST));
-      boolean flag2 = this.func_196421_a(iblockstate2, iblockstate2.func_193401_d(iworldreaderbase, blockpos3, EnumFacing.NORTH));
-      boolean flag3 = this.func_196421_a(iblockstate3, iblockstate3.func_193401_d(iworldreaderbase, blockpos4, EnumFacing.EAST));
-+      boolean flag = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.NORTH);
-+      boolean flag1 = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.EAST);
-+      boolean flag2 = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.SOUTH);
-+      boolean flag3 = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.WEST);
-       boolean flag4 = (!flag || flag1 || !flag2 || flag3) && (flag || !flag1 || flag2 || !flag3);
-       return this.func_176223_P().func_206870_a(field_176256_a, Boolean.valueOf(flag4 || !iworldreaderbase.func_175623_d(blockpos.func_177984_a()))).func_206870_a(field_196409_a, Boolean.valueOf(flag)).func_206870_a(field_196411_b, Boolean.valueOf(flag1)).func_206870_a(field_196413_c, Boolean.valueOf(flag2)).func_206870_a(field_196414_y, Boolean.valueOf(flag3)).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
-    }