Merge branch '1.9.4'

2016-05-31 00:14:49 -04:00 · 2016-05-31 00:14:49 -04:00 · caa61e1be9
commit caa61e1be9
parent 86baf7462f ce481da1d1
332 changed files with 3806 additions and 3131 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,6 +22,7 @@

 #Patch rejects
 /patches-/
+*.patch.rej

 # FML changelog
 changelog.txt
--- a/build.gradle
+++ b/build.gradle
@ -11,7 +11,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
    }
 }

@ -26,11 +26,10 @@ apply plugin: "net.minecraftforge.gradle.patcher"
 apply plugin: "net.minecraftforge.gradle.launch4j"

 minecraft {
-    version = "1.9"
-    mappings = 'snapshot_nodoc_20160312'
-    //mappings = "snapshot_nodoc_20151122"
+    version = "1.9.4"
+    mappings = 'snapshot_nodoc_20160518'
    workspaceDir = "projects"
-    versionJson = "jsons/1.9-dev.json"
+    versionJson = "jsons/1.9.4-dev.json"
    buildUserdev = true
    buildInstaller = true
    installerVersion = "1.4"
@ -52,6 +51,7 @@ minecraft {
            genPatchesFrom "clean"
            genMcpPatches = false
            applyMcpPatches = false
+            s2sKeepImports = true
            with common
        }
    }
@ -66,7 +66,7 @@ extractForgeResources { exclude "**/log4j2.xml" }
 genGradleProjects { addTestCompileDep "junit:junit:4.12" }

 processJson {
-    releaseJson = "jsons/1.9-rel.json"
+    releaseJson = "jsons/1.9.4-rel.json"
    addReplacements([
        "@minecraft_version@": project.minecraft.version,
        "@version@": project.version,
@ -89,7 +89,7 @@ task changelog(type: JenkinsChangelog) {
    outputs.upToDateWhen { false } // never up to date
    serverRoot = "http://ci.jenkins.minecraftforge.net/"
    jobName = "minecraftforge"
-    targetBuild = System.env['BUILD_NUMBER'] ?: 0;
+    targetBuild = System.env['BUILD_NUMBER'] ?: project.ext.properties.buildNumber ?:0;
    authName = "console_script"
    authPassword = project.hasProperty('forgeJenkinsPass') ? project.getProperty('forgeJenkinsPass') : "";
    output = "build/distributions/${project.name}-${project.version}-changelog.txt"
@ -218,14 +218,13 @@ artifacts {

 task ciWriteBuildNumber << {
    def file = file("src/main/java/net/minecraftforge/common/ForgeVersion.java");
-    def bn = System.getenv("BUILD_NUMBER")?:0;
+    def bn = System.getenv("BUILD_NUMBER")?:project.ext.properties.buildNumber?:0;
    def outfile = "";
    def ln = System.getProperty('line.separator')

    file.eachLine{ String s ->
-        if (s.contains("buildVersion") && s.contains("= 0;")) {
+        if (s.matches("^    public static final int buildVersion    = [\\d]+;\$"))
            s = "    public static final int buildVersion    = ${bn};";
-        }
        outfile += (s+ln);
    }
    file.write(outfile);
@ -345,10 +344,8 @@ String getVersionFromJava(File file)
        }
    }

-    if (System.getenv().containsKey("BUILD_NUMBER"))
-    {
-        build = System.getenv("BUILD_NUMBER");
-    }
+    build = System.getenv("BUILD_NUMBER") ?: project.ext.properties.buildNumber ?: 0
+

    String branch = null;
    if (!System.getenv().containsKey("GIT_BRANCH"))
@ -370,18 +367,24 @@ String getVersionFromJava(File file)
    return out;
 }

+task resetBuildNumber << {
+    project.ext.properties.buildNumber = 0;
+    ciWriteBuildNumber.execute()
+}
 // re-add old tasks for jenkins compat
 // should be remvoed, and the jenkisn fixed when no longer building with FG 1.2
 task setupForge { dependsOn 'setup' }
 task buildPackages { dependsOn 'build' }

 //Temporary hack to fix compile errors caused by mappings shading in Bootstrap
+/*
 task fixParams << {
    logger.lifecycle('Fixing param names!')
    def params = new File(extractMcpMappings.destinationDir, 'params.csv')
    def text = params.text
-    text = text.replaceAll('p_82499_3_,stack,', 'p_82499_3_,stackIn,')
+    text = text.replaceAll('p_180276_1_,biome,', 'p_180276_1_,biomeIn,')
    params.write(text)
 }
 fixParams.dependsOn('extractMcpMappings')
 extractMcpMappings.finalizedBy('fixParams')
+*/
--- a/jsons/1.9.4-dev.json
+++ b/jsons/1.9.4-dev.json
@ -0,0 +1,92 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "inheritsFrom": "1.9.4",
+  "minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
+  "libraries": [
+    {
+      "name": "net.minecraft:launchwrapper:1.12"
+    },
+    {
+      "name": "jline:jline:2.13",
+      "children": ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.google.code.findbugs:jsr305:1.3.9",
+      "children": ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.ow2.asm:asm-debug-all:5.0.3",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.typesafe:config:1.2.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.11.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.11.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-reflect:2.11.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "lzma:lzma:0.0.1"
+    },
+    {
+      "name": "java3d:vecmath:1.5.2"
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3"
+    }
+  ]
+}
--- a/jsons/1.9.4-rel.json
+++ b/jsons/1.9.4-rel.json
@ -0,0 +1,139 @@
+{
+"install": {
+  "profileName": "@project@",
+  "target":"@minecraft_version@-@project@@version@",
+  "path":"@artifact@",
+  "version":"@project@ @version@",
+  "filePath":"@universal_jar@",
+  "welcome":"Welcome to the simple @project@ installer.",
+  "minecraft":"@minecraft_version@",
+  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
+  "logo":"/big_logo.png"
+},
+"versionInfo": {
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "inheritsFrom": "1.9.4",
+  "jar": "1.9.4",
+  "libraries": [
+    {
+      "name": "@artifact@",
+      "url": "http://files.minecraftforge.net/maven/"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12",
+      "serverreq":true
+    },
+    {
+      "name": "org.ow2.asm:asm-all:5.0.3",
+      "serverreq":true
+    },
+    {
+      "name": "jline:jline:2.13",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
+      "serverreq":true,
+      "clientreq":false
+    },
+    {
+      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "com.typesafe:config:1.2.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-reflect:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-swing_2.11:1.0.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-xml_2.11:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "lzma:lzma:0.0.1",
+      "serverreq":true
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.6",
+      "serverreq":true
+    },
+    {
+      "name": "java3d:vecmath:1.5.2",
+      "clientreq":true,
+      "serverreq":true
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3",
+      "clientreq":true,
+      "serverreq":true
+    }
+  ]
+}
+}
--- a/jsons/1.9.4.json
+++ b/jsons/1.9.4.json
@ -0,0 +1,551 @@
+{
+    "assetIndex": {
+        "id": "1.9",
+        "sha1": "8549e8aca91ee8b8d1620e9e8252d477f16a56d5",
+        "size": 137552,
+        "url": "https://launchermeta.mojang.com/mc-staging/assets/1.9/8549e8aca91ee8b8d1620e9e8252d477f16a56d5/1.9.json",
+        "totalSize": 120896362
+    },
+    "assets": "1.9",
+    "downloads": {
+        "client": {
+            "sha1": "4a61c873be90bb1196d68dac7b29870408c56969",
+            "size": 8736083,
+            "url": "https://launcher.mojang.com/mc/game/1.9.4/client/4a61c873be90bb1196d68dac7b29870408c56969/client.jar"
+        },
+        "server": {
+            "sha1": "edbb7b1758af33d365bf835eb9d13de005b1e274",
+            "size": 9399053,
+            "url": "https://launcher.mojang.com/mc/game/1.9.4/server/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar"
+        }
+    },
+    "id": "1.9.4",
+    "libraries": [
+        {
+            "name": "com.mojang:netty:1.6",
+            "downloads": {
+                "artifact": {
+                    "size": 7877,
+                    "sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4",
+                    "path": "com/mojang/netty/1.6/netty-1.6.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.jar"
+                }
+            }
+        },
+        {
+            "name": "oshi-project:oshi-core:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 30973,
+                    "sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
+                    "path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
+                    "url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:jna:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1008730,
+                    "sha1": "803ff252fedbd395baffd43b37341dc4a150a554",
+                    "path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:platform:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 913436,
+                    "sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
+                    "path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.ibm.icu:icu4j-core-mojang:51.2",
+            "downloads": {
+                "artifact": {
+                    "size": 1634692,
+                    "sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
+                    "path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
+                    "url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
+                }
+            }
+        },
+        {
+            "name": "net.sf.jopt-simple:jopt-simple:4.6",
+            "downloads": {
+                "artifact": {
+                    "size": 62477,
+                    "sha1": "306816fb57cf94f108a43c95731b08934dcae15c",
+                    "path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecjorbis:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 103871,
+                    "sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
+                    "path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecwav:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 5618,
+                    "sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
+                    "path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:libraryjavasound:20101123",
+            "downloads": {
+                "artifact": {
+                    "size": 21679,
+                    "sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
+                    "path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:librarylwjglopenal:20100824",
+            "downloads": {
+                "artifact": {
+                    "size": 18981,
+                    "sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
+                    "path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:soundsystem:20120107",
+            "downloads": {
+                "artifact": {
+                    "size": 65020,
+                    "sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
+                    "path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
+                }
+            }
+        },
+        {
+            "name": "io.netty:netty-all:4.0.23.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 1779991,
+                    "sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45",
+                    "path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:17.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2243036,
+                    "sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445",
+                    "path": "com/google/guava/guava/17.0/guava-17.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 412739,
+                    "sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
+                    "path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.4",
+            "downloads": {
+                "artifact": {
+                    "size": 185140,
+                    "sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad",
+                    "path": "commons-io/commons-io/2.4/commons-io-2.4.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.9",
+            "downloads": {
+                "artifact": {
+                    "size": 263965,
+                    "sha1": "9ce04e34240f674bc72680f8b843b1457383161a",
+                    "path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jinput:jinput:2.0.5",
+            "downloads": {
+                "artifact": {
+                    "size": 208338,
+                    "sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
+                    "path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jutils:jutils:1.0.0",
+            "downloads": {
+                "artifact": {
+                    "size": 7508,
+                    "sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
+                    "path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.code.gson:gson:2.2.4",
+            "downloads": {
+                "artifact": {
+                    "size": 190432,
+                    "sha1": "a60a5e993c98c864010053cb901b7eab25306568",
+                    "path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.22",
+            "downloads": {
+                "artifact": {
+                    "size": 64539,
+                    "sha1": "afaa8f6df976fcb5520e76ef1d5798c9e6b5c0b2",
+                    "path": "com/mojang/authlib/1.5.22/authlib-1.5.22.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.22/authlib-1.5.22.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.8.19",
+            "downloads": {
+                "artifact": {
+                    "size": 1575795,
+                    "sha1": "f7469a9307b962d1097e44713eb1baa087c06e43",
+                    "path": "com/mojang/realms/1.8.19/realms-1.8.19.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.8.19/realms-1.8.19.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-compress:1.8.1",
+            "downloads": {
+                "artifact": {
+                    "size": 365552,
+                    "sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
+                    "path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpclient:4.3.3",
+            "downloads": {
+                "artifact": {
+                    "size": 589512,
+                    "sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
+                    "path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-logging:commons-logging:1.1.3",
+            "downloads": {
+                "artifact": {
+                    "size": 62050,
+                    "sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
+                    "path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
+                    "url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpcore:4.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 282269,
+                    "sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
+                    "path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "it.unimi.dsi:fastutil:7.0.12_mojang",
+            "downloads": {
+                "artifact": {
+                    "size": 522306,
+                    "sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa",
+                    "path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.0-beta9",
+            "downloads": {
+                "artifact": {
+                    "size": 108161,
+                    "sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785",
+                    "path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.0-beta9",
+            "downloads": {
+                "artifact": {
+                    "size": 681134,
+                    "sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695",
+                    "path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1047168,
+                    "sha1": "697517568c68e78ae0b4544145af031c81082dfe",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578680,
+                        "sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 426822,
+                        "sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613748,
+                        "sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 22,
+                    "sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
+                    "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1045632,
+                    "sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578539,
+                        "sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 468116,
+                        "sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613680,
+                        "sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "net.java.jinput:jinput-platform:2.0.5",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 10362,
+                        "sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 12186,
+                        "sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 155179,
+                        "sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
+                    }
+                }
+            }
+        }
+    ],
+    "mainClass": "net.minecraft.client.main.Main",
+    "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
+    "minimumLauncherVersion": 18,
+    "releaseTime": "2016-05-10T10:17:16+00:00",
+    "time": "2016-05-10T14:45:26+00:00",
+    "type": "release"
+}
--- a/mdk/build.gradle
+++ b/mdk/build.gradle
@ -9,7 +9,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
    }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
--- a/mdk/src/main/java/com/example/examplemod/ExampleMod.java
+++ b/mdk/src/main/java/com/example/examplemod/ExampleMod.java
@ -14,7 +14,7 @@ public class ExampleMod
    @EventHandler
    public void init(FMLInitializationEvent event)
    {
-		// some example code
-        System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
+        // some example code
+        System.out.println("DIRT BLOCK >> "+Blocks.DIRT.getUnlocalizedName());
    }
 }
--- a/patches/minecraft/net/minecraft/block/Block.java.patch
+++ b/patches/minecraft/net/minecraft/block/Block.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/Block.java
 +++ ../src-work/minecraft/net/minecraft/block/Block.java
-@@ -43,11 +43,12 @@
+@@ -44,11 +44,12 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -16,7 +16,7 @@
     public static final AxisAlignedBB field_185505_j = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
     public static final AxisAlignedBB field_185506_k = null;
     private CreativeTabs field_149772_a;
-@@ -83,7 +84,8 @@
+@@ -84,7 +85,8 @@
 
     public static Block func_149729_e(int p_149729_0_)
     {
@ -26,7 +26,7 @@
     }
 
     public static IBlockState func_176220_d(int p_176220_0_)
-@@ -268,7 +270,7 @@
+@@ -286,7 +288,7 @@
 
     public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
     {
@ -35,7 +35,7 @@
     }
 
     public Block func_149711_c(float p_149711_1_)
-@@ -305,9 +307,10 @@
+@@ -324,9 +326,10 @@
         return this.field_149789_z;
     }
 
@ -46,8 +46,8 @@
 +        return hasTileEntity(func_176223_P());
     }
 
-     public AxisAlignedBB func_185496_a(IBlockState p_185496_1_, IBlockAccess p_185496_2_, BlockPos p_185496_3_)
-@@ -346,13 +349,13 @@
+     @Deprecated
+@@ -370,13 +373,13 @@
     @SideOnly(Side.CLIENT)
     public int func_185484_c(IBlockState p_185484_1_, IBlockAccess p_185484_2_, BlockPos p_185484_3_)
     {
@ -63,7 +63,7 @@
         }
         else
         {
-@@ -415,7 +418,7 @@
+@@ -440,7 +443,7 @@
                 }
         }
 
@ -71,8 +71,8 @@
 +        return !p_176225_2_.func_180495_p(p_176225_3_.func_177972_a(p_176225_4_)).doesSideBlockRendering(p_176225_2_, p_176225_3_.func_177972_a(p_176225_4_), p_176225_4_.func_176734_d());
     }
 
-     @SideOnly(Side.CLIENT)
-@@ -472,6 +475,10 @@
+     @Deprecated
+@@ -500,6 +503,10 @@
 
     public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
     {
@ -83,8 +83,8 @@
     }
 
     public int func_149745_a(Random p_149745_1_)
-@@ -486,8 +493,7 @@
- 
+@@ -516,8 +523,7 @@
+     @Deprecated
     public float func_180647_a(IBlockState p_180647_1_, EntityPlayer p_180647_2_, World p_180647_3_, BlockPos p_180647_4_)
     {
 -        float f = p_180647_1_.func_185887_b(p_180647_3_, p_180647_4_);
@ -93,7 +93,7 @@
     }
 
     public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_)
-@@ -497,20 +503,16 @@
+@@ -527,20 +533,16 @@
 
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
@ -119,7 +119,7 @@
                 }
             }
         }
-@@ -518,8 +520,13 @@
+@@ -548,8 +550,13 @@
 
     public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_)
     {
@ -134,7 +134,7 @@
             float f = 0.5F;
             double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
             double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-@@ -588,7 +595,7 @@
+@@ -621,7 +628,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -142,8 +142,8 @@
 +        return p_176196_1_.func_180495_p(p_176196_2_).func_177230_c().func_176200_f(p_176196_1_, p_176196_2_);
     }
 
-     public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumHand p_180639_5_, ItemStack p_180639_6_, EnumFacing p_180639_7_, float p_180639_8_, float p_180639_9_, float p_180639_10_)
-@@ -638,25 +645,35 @@
+     public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumHand p_180639_5_, @Nullable ItemStack p_180639_6_, EnumFacing p_180639_7_, float p_180639_8_, float p_180639_9_, float p_180639_10_)
+@@ -674,25 +681,35 @@
         p_180657_2_.func_71029_a(StatList.func_188055_a(this));
         p_180657_2_.func_71020_j(0.025F);
 
@ -181,11 +181,11 @@
 +        return this.func_176223_P().func_185917_h() && !this.hasTileEntity(silk_check_state.get());
     }
 
-     protected ItemStack func_180643_i(IBlockState p_180643_1_)
-@@ -747,9 +764,11 @@
-         p_176216_2_.field_70181_x = 0.0D;
+     @Nullable
+@@ -788,9 +805,11 @@
     }
 
+     @Nullable
 +    @Deprecated // Forge: Use more sensitive version below: getPickBlock
     public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
     {
@ -195,7 +195,7 @@
     }
 
     @SideOnly(Side.CLIENT)
-@@ -844,6 +863,1141 @@
+@@ -887,6 +906,1141 @@
         return "Block{" + field_149771_c.func_177774_c(this) + "}";
     }
 
@ -842,11 +842,11 @@
 +     * @param state The current state
 +     * @param world The current world
 +     * @param target The target the player is looking at {x/y/z/side/sub}
-+     * @param effectRenderer A reference to the current effect renderer.
+     * @param manager A reference to the current particle manager.
 +     * @return True to prevent vanilla digging particles form spawning.
 +     */
 +    @SideOnly(Side.CLIENT)
-+    public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, net.minecraft.client.particle.EffectRenderer effectRenderer)
+    public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, net.minecraft.client.particle.ParticleManager manager)
 +    {
 +        return false;
 +    }
@ -859,11 +859,11 @@
 +     *
 +     * @param world The current world
 +     * @param pos Position to spawn the particle
-+     * @param effectRenderer A reference to the current effect renderer.
+     * @param manager A reference to the current particle manager.
 +     * @return True to prevent vanilla break particles from spawning.
 +     */
 +    @SideOnly(Side.CLIENT)
-+    public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer)
+    public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.ParticleManager manager)
 +    {
 +        return false;
 +    }
--- a/patches/minecraft/net/minecraft/block/BlockBanner.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockBanner.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockBanner.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockBanner.java
-@@ -104,14 +104,7 @@
+@@ -107,14 +107,7 @@
 
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
@ -15,7 +15,7 @@
             super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
         }
     }
-@@ -138,6 +131,28 @@
+@@ -141,6 +134,28 @@
         }
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockBush.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockBush.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockBush.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -9,7 +9,7 @@
 {
     protected static final AxisAlignedBB field_185515_b = new AxisAlignedBB(0.30000001192092896D, 0.0D, 0.30000001192092896D, 0.699999988079071D, 0.6000000238418579D, 0.699999988079071D);
 
-@@ -37,7 +37,8 @@
+@@ -38,7 +38,8 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -19,7 +19,7 @@
     }
 
     protected boolean func_185514_i(IBlockState p_185514_1_)
-@@ -67,6 +68,11 @@
+@@ -68,6 +69,11 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -31,7 +31,7 @@
         return this.func_185514_i(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()));
     }
 
-@@ -90,6 +96,35 @@
+@@ -92,6 +98,35 @@
         return false;
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockButton.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockButton.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockButton.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
     protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
     {
         BlockPos blockpos = p_181088_1_.func_177972_a(p_181088_2_);
--- a/patches/minecraft/net/minecraft/block/BlockChest.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockChest.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockChest.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
-@@ -506,7 +506,7 @@
+@@ -514,7 +514,7 @@
 
     private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -116,11 +116,11 @@
+@@ -117,11 +117,11 @@
                 float f1 = 0.0F;
                 IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
 
@ -14,7 +14,7 @@
                     {
                         f1 = 3.0F;
                     }
-@@ -161,7 +161,8 @@
+@@ -162,7 +162,8 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -24,7 +24,7 @@
     }
 
     protected Item func_149866_i()
-@@ -174,11 +175,33 @@
+@@ -175,11 +176,33 @@
         return Items.field_151015_O;
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
@ -9,16 +9,16 @@
 {
     protected static final AxisAlignedBB field_185516_a = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
 
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_, ItemStack p_180657_6_)
+     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_, @Nullable ItemStack p_180657_6_)
     {
 -        if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
 +        if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) // Forge: Noop
         {
             p_180657_2_.func_71029_a(StatList.func_188055_a(this));
             func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150330_I, 1, 0));
-@@ -67,4 +67,11 @@
+@@ -69,4 +69,11 @@
             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
         }
     }
--- a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
-@@ -107,7 +107,7 @@
+@@ -108,7 +108,7 @@
     {
         if (this.field_149764_J == Material.field_151573_f)
         {
@ -9,7 +9,7 @@
         }
         else
         {
-@@ -219,7 +219,7 @@
+@@ -221,7 +221,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -9,7 +9,7 @@
 {
     public static final PropertyEnum<BlockDoublePlant.EnumPlantType> field_176493_a = PropertyEnum.<BlockDoublePlant.EnumPlantType>func_177709_a("variant", BlockDoublePlant.EnumPlantType.class);
     public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> field_176492_b = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>func_177709_a("half", BlockDoublePlant.EnumBlockHalf.class);
-@@ -88,6 +88,8 @@
+@@ -89,6 +89,8 @@
             Block block = (Block)(flag ? this : p_176475_1_.func_180495_p(blockpos).func_177230_c());
             Block block1 = (Block)(flag ? p_176475_1_.func_180495_p(blockpos1).func_177230_c() : this);
 
@ -18,7 +18,7 @@
             if (block == this)
             {
                 p_176475_1_.func_180501_a(blockpos, Blocks.field_150350_a.func_176223_P(), 2);
-@@ -96,17 +98,13 @@
+@@ -97,17 +99,13 @@
             if (block1 == this)
             {
                 p_176475_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 3);
@ -37,15 +37,15 @@
         if (p_180671_3_.func_177229_b(field_176492_b) == BlockDoublePlant.EnumBlockHalf.UPPER)
         {
             return p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c() == this;
-@@ -149,7 +147,6 @@
+@@ -151,7 +149,6 @@
 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_, ItemStack p_180657_6_)
+     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_, @Nullable ItemStack p_180657_6_)
     {
 -        if (p_180657_1_.field_72995_K || p_180657_6_ == null || p_180657_6_.func_77973_b() != Items.field_151097_aZ || p_180657_4_.func_177229_b(field_176492_b) != BlockDoublePlant.EnumBlockHalf.LOWER || !this.func_176489_b(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_))
         {
             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
         }
-@@ -212,8 +209,6 @@
+@@ -214,8 +211,6 @@
         else
         {
             p_176489_4_.func_71029_a(StatList.func_188055_a(this));
@ -54,7 +54,7 @@
             return true;
         }
     }
-@@ -284,6 +279,33 @@
+@@ -286,6 +281,33 @@
         return Block.EnumOffsetType.XZ;
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockDragonEgg.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDragonEgg.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDragonEgg.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDragonEgg.java
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
 
     private void func_180683_d(World p_180683_1_, BlockPos p_180683_2_)
     {
@ -9,7 +9,7 @@
         {
             int i = 32;
 
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
                 p_180683_1_.func_175698_g(p_180683_2_);
                 BlockPos blockpos;
 
--- a/patches/minecraft/net/minecraft/block/BlockDropper.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDropper.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
             {
                 ItemStack itemstack = tileentitydispenser.func_70301_a(i);
 
--- a/patches/minecraft/net/minecraft/block/BlockFarmland.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFarmland.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
-@@ -87,7 +87,7 @@
+@@ -89,7 +89,7 @@
     private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
     {
         Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();
--- a/patches/minecraft/net/minecraft/block/BlockFire.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFire.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFire.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
-@@ -37,7 +37,15 @@
+@@ -38,7 +38,15 @@
 
     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
     {
@ -17,7 +17,7 @@
     }
 
     protected BlockFire()
-@@ -90,6 +98,7 @@
+@@ -91,6 +99,7 @@
 
     public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_)
     {
@ -25,7 +25,7 @@
         this.field_149849_a.put(p_180686_1_, Integer.valueOf(p_180686_2_));
         this.field_149848_b.put(p_180686_1_, Integer.valueOf(p_180686_3_));
     }
-@@ -129,13 +138,8 @@
+@@ -131,13 +140,8 @@
             }
 
             Block block = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_177230_c();
@ -40,7 +40,7 @@
             int i = ((Integer)p_180650_3_.func_177229_b(field_176543_a)).intValue();
 
             if (!flag && p_180650_1_.func_72896_J() && this.func_176537_d(p_180650_1_, p_180650_2_) && p_180650_4_.nextFloat() < 0.2F + (float)i * 0.03F)
-@@ -156,7 +160,7 @@
+@@ -158,7 +162,7 @@
                 {
                     if (!this.func_176533_e(p_180650_1_, p_180650_2_))
                     {
@ -49,7 +49,7 @@
                         {
                             p_180650_1_.func_175698_g(p_180650_2_);
                         }
-@@ -164,7 +168,7 @@
+@@ -166,7 +170,7 @@
                         return;
                     }
 
@ -58,7 +58,7 @@
                     {
                         p_180650_1_.func_175698_g(p_180650_2_);
                         return;
-@@ -179,12 +183,12 @@
+@@ -181,12 +185,12 @@
                     j = -50;
                 }
 
@ -77,7 +77,7 @@
 
                 for (int k = -1; k <= 1; ++k)
                 {
-@@ -243,45 +247,53 @@
+@@ -245,22 +249,30 @@
         return false;
     }
 
@ -102,44 +102,14 @@
 +        this.tryCatchFire(p_176536_1_, p_176536_2_, p_176536_3_, p_176536_4_, p_176536_5_, EnumFacing.UP);
 +    }
 
-        if (p_176536_4_.nextInt(p_176536_3_) < i)
-+    private void tryCatchFire(World worldIn, BlockPos pos, int chance, Random random, int age, EnumFacing face)
+    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 = worldIn.func_180495_p(pos).func_177230_c().getFlammability(worldIn, pos, face);
+        int i = p_176536_1_.func_180495_p(p_176536_2_).func_177230_c().getFlammability(p_176536_1_, p_176536_2_, face);
 +
-+        if (random.nextInt(chance) < i)
+         if (p_176536_4_.nextInt(p_176536_3_) < i)
         {
-            IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
-+            IBlockState iblockstate = worldIn.func_180495_p(pos);
- 
-            if (p_176536_4_.nextInt(p_176536_5_ + 10) < 5 && !p_176536_1_.func_175727_C(p_176536_2_))
-+            if (random.nextInt(age + 10) < 5 && !worldIn.func_175727_C(pos))
-             {
-                int j = p_176536_5_ + p_176536_4_.nextInt(5) / 4;
-+                int j = age + random.nextInt(5) / 4;
- 
-                 if (j > 15)
-                 {
-                     j = 15;
-                 }
- 
-                p_176536_1_.func_180501_a(p_176536_2_, this.func_176223_P().func_177226_a(field_176543_a, Integer.valueOf(j)), 3);
-+                worldIn.func_180501_a(pos, this.func_176223_P().func_177226_a(field_176543_a, Integer.valueOf(j)), 3);
-             }
-             else
-             {
-                p_176536_1_.func_175698_g(p_176536_2_);
-+                worldIn.func_175698_g(pos);
-             }
- 
-             if (iblockstate.func_177230_c() == Blocks.field_150335_W)
-             {
-                Blocks.field_150335_W.func_176206_d(p_176536_1_, p_176536_2_, iblockstate.func_177226_a(BlockTNT.field_176246_a, Boolean.valueOf(true)));
-+                Blocks.field_150335_W.func_176206_d(worldIn, pos, iblockstate.func_177226_a(BlockTNT.field_176246_a, Boolean.valueOf(true)));
-             }
-         }
-     }
-@@ -290,7 +302,7 @@
+             IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
+@@ -292,7 +304,7 @@
     {
         for (EnumFacing enumfacing : EnumFacing.values())
         {
@ -148,7 +118,7 @@
             {
                 return true;
             }
-@@ -311,7 +323,7 @@
+@@ -313,7 +325,7 @@
 
             for (EnumFacing enumfacing : EnumFacing.values())
             {
@ -157,7 +127,7 @@
             }
 
             return i;
-@@ -323,9 +335,10 @@
+@@ -325,9 +337,10 @@
         return false;
     }
 
@ -169,7 +139,7 @@
     }
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -364,9 +377,9 @@
+@@ -366,9 +379,9 @@
             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);
         }
 
@ -181,7 +151,7 @@
             {
                 for (int j = 0; j < 2; ++j)
                 {
-@@ -377,7 +390,7 @@
+@@ -379,7 +392,7 @@
                 }
             }
 
@ -190,7 +160,7 @@
             {
                 for (int k = 0; k < 2; ++k)
                 {
-@@ -388,7 +401,7 @@
+@@ -390,7 +403,7 @@
                 }
             }
 
@ -199,7 +169,7 @@
             {
                 for (int l = 0; l < 2; ++l)
                 {
-@@ -399,7 +412,7 @@
+@@ -401,7 +414,7 @@
                 }
             }
 
@ -208,7 +178,7 @@
             {
                 for (int i1 = 0; i1 < 2; ++i1)
                 {
-@@ -410,7 +423,7 @@
+@@ -412,7 +425,7 @@
                 }
             }
 
@ -217,7 +187,7 @@
             {
                 for (int j1 = 0; j1 < 2; ++j1)
                 {
-@@ -458,4 +471,19 @@
+@@ -460,4 +473,19 @@
     {
         return new BlockStateContainer(this, new IProperty[] {field_176543_a, field_176545_N, field_176546_O, field_176541_P, field_176539_Q, field_176542_R});
     }
--- a/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -148,13 +148,6 @@
+@@ -149,13 +149,6 @@
 
     public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
     {
@ -14,7 +14,7 @@
         super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
     }
 
-@@ -374,6 +367,31 @@
+@@ -377,6 +370,31 @@
         return BlockRenderLayer.CUTOUT;
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
     {
         if (!p_180650_1_.field_72995_K)
         {
@ -9,7 +9,7 @@
             {
                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
             }
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos.func_177984_a());
                         IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos);
 
@ -18,7 +18,7 @@
                         {
                             p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
                         }
-@@ -96,7 +96,7 @@
+@@ -98,7 +98,7 @@
             {
                 if (j >= i / 16)
                 {
--- a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
-@@ -221,6 +221,20 @@
+@@ -223,6 +223,20 @@
         return new BlockStateContainer(this, new IProperty[] {field_176380_a});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockIce.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockIce.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockIce.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
-@@ -40,14 +40,19 @@
+@@ -41,14 +41,19 @@
         p_180657_2_.func_71029_a(StatList.func_188055_a(this));
         p_180657_2_.func_71020_j(0.025F);
 
@ -22,7 +22,7 @@
         }
         else
         {
-@@ -58,7 +63,9 @@
+@@ -59,7 +64,9 @@
             }
 
             int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
--- a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -9,7 +9,7 @@
 {
     public static final PropertyBool field_176237_a = PropertyBool.func_177716_a("decayable");
     public static final PropertyBool field_176236_b = PropertyBool.func_177716_a("check_decay");
-@@ -53,9 +53,9 @@
+@@ -54,9 +54,9 @@
                         BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
                         IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
 
@ -21,7 +21,7 @@
                         }
                     }
                 }
-@@ -96,9 +96,9 @@
+@@ -97,9 +97,9 @@
                                 IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2));
                                 Block block = iblockstate.func_177230_c();
 
@ -33,7 +33,7 @@
                                     {
                                         this.field_150128_a[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2;
                                     }
-@@ -205,40 +205,7 @@
+@@ -207,40 +207,7 @@
 
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
@ -75,7 +75,7 @@
     }
 
     protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
-@@ -274,6 +241,49 @@
+@@ -276,6 +243,49 @@
 
     public abstract BlockPlanks.EnumType func_176233_b(int p_176233_1_);
 
--- a/patches/minecraft/net/minecraft/block/BlockLever.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLever.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLever.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
-@@ -295,6 +295,12 @@
+@@ -297,6 +297,12 @@
         return new BlockStateContainer(this, new IProperty[] {field_176360_a, field_176359_b});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
-@@ -39,10 +39,14 @@
+@@ -41,10 +41,14 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--- a/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
     {
         if (!p_180650_1_.field_72995_K)
         {
@ -9,7 +9,7 @@
             {
                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
             }
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,7 @@
                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
                         IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos.func_177984_a());
 
--- a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -9,7 +9,7 @@
     }
 
     public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
-@@ -58,9 +58,11 @@
+@@ -59,9 +59,11 @@
         super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
     }
 
@ -22,7 +22,7 @@
         {
             int i = 1;
 
-@@ -106,6 +108,26 @@
+@@ -108,6 +110,26 @@
         return ((Integer)p_176201_1_.func_177229_b(field_176486_a)).intValue();
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,7 @@
 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_, ItemStack p_180657_6_)
+     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_, @Nullable ItemStack p_180657_6_)
     {
 -        if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
 +        if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) //Forge: Noop this
         {
             p_180657_2_.func_71029_a(StatList.func_188055_a(this));
             func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176240_P)).func_176839_a() - 4));
-@@ -108,4 +108,10 @@
+@@ -109,4 +109,10 @@
             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
         }
     }
--- a/patches/minecraft/net/minecraft/block/BlockNote.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNote.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNote.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
-@@ -64,7 +64,9 @@
+@@ -65,7 +65,9 @@
             if (tileentity instanceof TileEntityNote)
             {
                 TileEntityNote tileentitynote = (TileEntityNote)tileentity;
@ -10,14 +10,14 @@
                 tileentitynote.func_175108_a(p_180639_1_, p_180639_2_);
                 p_180639_4_.func_71029_a(StatList.field_188087_U);
             }
-@@ -104,6 +106,10 @@
+@@ -105,6 +107,10 @@
 
-     public boolean func_180648_a(World p_180648_1_, BlockPos p_180648_2_, IBlockState p_180648_3_, int p_180648_4_, int p_180648_5_)
+     public boolean func_189539_a(IBlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_)
     {
-+        net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(p_180648_1_, p_180648_2_, p_180648_3_, p_180648_5_, p_180648_4_);
+        net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(p_189539_2_, p_189539_3_, p_189539_1_, p_189539_5_, p_189539_4_);
 +        if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(e)) return false;
-+        p_180648_4_ = e.getInstrument().ordinal();
-+        p_180648_5_ = e.getVanillaNoteId();
-         float f = (float)Math.pow(2.0D, (double)(p_180648_5_ - 12) / 12.0D);
-         p_180648_1_.func_184133_a((EntityPlayer)null, p_180648_2_, this.func_185576_e(p_180648_4_), SoundCategory.BLOCKS, 3.0F, f);
-         p_180648_1_.func_175688_a(EnumParticleTypes.NOTE, (double)p_180648_2_.func_177958_n() + 0.5D, (double)p_180648_2_.func_177956_o() + 1.2D, (double)p_180648_2_.func_177952_p() + 0.5D, (double)p_180648_5_ / 24.0D, 0.0D, 0.0D, new int[0]);
+        p_189539_4_ = e.getInstrument().ordinal();
+        p_189539_5_ = e.getVanillaNoteId();
+         float f = (float)Math.pow(2.0D, (double)(p_189539_5_ - 12) / 12.0D);
+         p_189539_2_.func_184133_a((EntityPlayer)null, p_189539_3_, this.func_185576_e(p_189539_4_), SoundCategory.BLOCKS, 3.0F, f);
+         p_189539_2_.func_175688_a(EnumParticleTypes.NOTE, (double)p_189539_3_.func_177958_n() + 0.5D, (double)p_189539_3_.func_177956_o() + 1.2D, (double)p_189539_3_.func_177952_p() + 0.5D, (double)p_189539_5_ / 24.0D, 0.0D, 0.0D, new int[0]);
--- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
-@@ -103,11 +103,16 @@
+@@ -104,11 +104,16 @@
         if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
         {
             p_180657_2_.func_71029_a(StatList.func_188055_a(this));
--- a/patches/minecraft/net/minecraft/block/BlockOre.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockOre.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockOre.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
-@@ -59,34 +59,39 @@
+@@ -61,34 +61,39 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--- a/patches/minecraft/net/minecraft/block/BlockPane.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPane.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPane.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
-@@ -105,7 +105,10 @@
+@@ -106,7 +106,10 @@
 
     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
     {
@ -11,8 +11,8 @@
 +                .func_177226_a(field_176242_M, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST));
     }
 
-     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -182,4 +185,11 @@
+     @Nullable
+@@ -184,4 +187,11 @@
     {
         return new BlockStateContainer(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
     }
--- a/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
-@@ -235,7 +235,7 @@
+@@ -236,7 +236,7 @@
                     }
                 }
 
-                if (!flag1 && iblockstate.func_185904_a() != Material.field_151579_a && func_185646_a(iblockstate, p_180648_1_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
-+                if (!flag1 && !iblockstate.func_177230_c().isAir(iblockstate, p_180648_1_, blockpos) && func_185646_a(iblockstate, p_180648_1_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
+-                if (!flag1 && iblockstate.func_185904_a() != Material.field_151579_a && func_185646_a(iblockstate, p_189539_2_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
+                if (!flag1 && !iblockstate.func_177230_c().isAir(iblockstate, p_189539_2_, p_189539_3_) && func_185646_a(iblockstate, p_189539_2_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
                 {
-                     this.func_176319_a(p_180648_1_, p_180648_2_, enumfacing, false);
+                     this.func_176319_a(p_189539_2_, p_189539_3_, enumfacing, false);
                 }
-@@ -320,7 +320,7 @@
+@@ -322,7 +322,7 @@
                     return false;
                 }
 
@ -18,7 +18,7 @@
             }
             else
             {
-@@ -366,7 +366,9 @@
+@@ -368,7 +368,9 @@
             {
                 BlockPos blockpos1 = (BlockPos)list2.get(j);
                 IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
--- a/patches/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,7 @@
 
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
@ -9,7 +9,7 @@
         {
             TileEntityPiston tileentitypiston = this.func_185589_c(p_180653_1_, p_180653_2_);
 
-@@ -120,6 +120,7 @@
+@@ -122,6 +122,7 @@
                 iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
             }
         }
@ -17,7 +17,7 @@
     }
 
     public RayTraceResult func_180636_a(IBlockState p_180636_1_, World p_180636_2_, BlockPos p_180636_3_, Vec3d p_180636_4_, Vec3d p_180636_5_)
-@@ -190,4 +191,16 @@
+@@ -195,4 +196,16 @@
     {
         return new BlockStateContainer(this, new IProperty[] {field_176426_a, field_176425_b});
     }
--- a/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
-@@ -117,7 +117,7 @@
+@@ -118,7 +118,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
     public static boolean func_176563_d(IBlockState p_176563_0_)
     {
         Block block = p_176563_0_.func_177230_c();
@ -9,7 +9,7 @@
     }
 
     protected BlockRailBase(boolean p_i45389_1_)
-@@ -65,7 +65,7 @@
+@@ -67,7 +67,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -18,37 +18,37 @@
     }
 
     public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
-@@ -88,24 +88,24 @@
-             BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_176204_3_.func_177229_b(this.func_176560_l());
+@@ -90,24 +90,24 @@
+             BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_189540_1_.func_177229_b(this.func_176560_l());
             boolean flag = false;
 
-            if (!p_176204_1_.func_180495_p(p_176204_2_.func_177977_b()).func_185896_q())
-+            if (!p_176204_1_.func_180495_p(p_176204_2_.func_177977_b()).isSideSolid(p_176204_1_, p_176204_2_.func_177977_b(), EnumFacing.UP))
+-            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()).isSideSolid(p_189540_2_, p_189540_3_.func_177977_b(), EnumFacing.UP))
             {
                 flag = true;
             }
 
-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_EAST && !p_176204_1_.func_180495_p(p_176204_2_.func_177974_f()).func_185896_q())
-+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_EAST && !p_176204_1_.func_180495_p(p_176204_2_.func_177974_f()).isSideSolid(p_176204_1_, p_176204_2_.func_177974_f(), EnumFacing.UP))
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_EAST && !p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).func_185896_q())
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_EAST && !p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).isSideSolid(p_189540_2_, p_189540_3_.func_177974_f(), EnumFacing.UP))
             {
                 flag = true;
             }
-            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_WEST && !p_176204_1_.func_180495_p(p_176204_2_.func_177976_e()).func_185896_q())
-+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_WEST && !p_176204_1_.func_180495_p(p_176204_2_.func_177976_e()).isSideSolid(p_176204_1_, p_176204_2_.func_177976_e(), EnumFacing.UP))
+-            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_WEST && !p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).func_185896_q())
+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_WEST && !p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).isSideSolid(p_189540_2_, p_189540_3_.func_177976_e(), EnumFacing.UP))
             {
                 flag = true;
             }
-            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_NORTH && !p_176204_1_.func_180495_p(p_176204_2_.func_177978_c()).func_185896_q())
-+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_NORTH && !p_176204_1_.func_180495_p(p_176204_2_.func_177978_c()).isSideSolid(p_176204_1_, p_176204_2_.func_177978_c(), EnumFacing.UP))
+-            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_NORTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).func_185896_q())
+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_NORTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).isSideSolid(p_189540_2_, p_189540_3_.func_177978_c(), EnumFacing.UP))
             {
                 flag = true;
             }
-            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_SOUTH && !p_176204_1_.func_180495_p(p_176204_2_.func_177968_d()).func_185896_q())
-+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_SOUTH && !p_176204_1_.func_180495_p(p_176204_2_.func_177968_d()).isSideSolid(p_176204_1_, p_176204_2_.func_177968_d(), EnumFacing.UP))
+-            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_SOUTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).func_185896_q())
+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_SOUTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).isSideSolid(p_189540_2_, p_189540_3_.func_177968_d(), EnumFacing.UP))
             {
                 flag = true;
             }
-@@ -160,6 +160,98 @@
+@@ -162,6 +162,98 @@
 
     public abstract IProperty<BlockRailBase.EnumRailDirection> func_176560_l();
 
@ -147,7 +147,7 @@
     public static enum EnumRailDirection implements IStringSerializable
     {
         NORTH_SOUTH(0, "north_south"),
-@@ -230,6 +322,7 @@
+@@ -232,6 +324,7 @@
         private IBlockState field_180366_e;
         private final boolean field_150656_f;
         private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
@ -155,7 +155,7 @@
 
         public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
         {
-@@ -237,8 +330,9 @@
+@@ -239,8 +332,9 @@
             this.field_180367_c = p_i45739_3_;
             this.field_180366_e = p_i45739_4_;
             this.field_180365_d = (BlockRailBase)p_i45739_4_.func_177230_c();
@ -167,7 +167,7 @@
             this.func_180360_a(blockrailbase$enumraildirection);
         }
 
-@@ -429,7 +523,7 @@
+@@ -432,7 +526,7 @@
                 }
             }
 
@ -176,7 +176,7 @@
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                 {
-@@ -442,7 +536,7 @@
+@@ -445,7 +539,7 @@
                 }
             }
 
@ -185,7 +185,7 @@
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
                 {
-@@ -585,7 +679,7 @@
+@@ -588,7 +682,7 @@
                 }
             }
 
@ -194,7 +194,7 @@
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                 {
-@@ -598,7 +692,7 @@
+@@ -601,7 +695,7 @@
                 }
             }
 
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
-@@ -310,6 +310,21 @@
+@@ -313,6 +313,21 @@
         return this.func_176223_P().func_177226_a(field_185512_D, p_180642_8_.func_174811_aO().func_176734_d()).func_177226_a(field_176464_a, Boolean.valueOf(false)).func_177226_a(field_176463_b, BlockRedstoneComparator.Mode.COMPARE);
     }
 
@ -9,7 +9,7 @@
 +    {
 +        if (pos.func_177956_o() == neighbor.func_177956_o() && world instanceof World)
 +        {
-+            func_176204_a((World)world, pos, world.func_180495_p(pos), world.func_180495_p(neighbor).func_177230_c());
+            func_189540_a(world.func_180495_p(pos), (World)world, pos, world.func_180495_p(neighbor).func_177230_c());
 +        }
 +    }
 +
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
-@@ -92,12 +92,16 @@
+@@ -94,12 +94,16 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneWire.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneWire.java
-@@ -97,15 +97,15 @@
+@@ -98,15 +98,15 @@
         BlockPos blockpos = p_176341_2_.func_177972_a(p_176341_3_);
         IBlockState iblockstate = p_176341_1_.func_180495_p(p_176341_2_.func_177972_a(p_176341_3_));
 
@ -19,7 +19,7 @@
                 {
                     if (iblockstate.func_185898_k())
                     {
-@@ -406,35 +406,30 @@
+@@ -409,21 +409,16 @@
         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();
@ -34,32 +34,22 @@
     }
 
 -    protected static boolean func_176346_d(IBlockState p_176346_0_)
-+    protected static boolean canConnectTo(IBlockState blockState, EnumFacing side, IBlockAccess world, BlockPos pos)
+    protected static boolean canConnectTo(IBlockState p_176343_0_, @Nullable EnumFacing p_176343_1_, IBlockAccess world, BlockPos pos )
     {
 -        return func_176343_a(p_176346_0_, (EnumFacing)null);
 -    }
-+        Block block = blockState.func_177230_c();
- 
-    protected static boolean func_176343_a(IBlockState p_176343_0_, EnumFacing p_176343_1_)
-    {
-        Block block = p_176343_0_.func_177230_c();
 -
+-    protected static boolean func_176343_a(IBlockState p_176343_0_, @Nullable EnumFacing p_176343_1_)
+-    {
+         Block block = p_176343_0_.func_177230_c();
+ 
         if (block == Blocks.field_150488_af)
-         {
-             return true;
-         }
-        else if (Blocks.field_150413_aR.func_185547_C(p_176343_0_))
-+        else if (Blocks.field_150413_aR.func_185547_C(blockState))
-         {
-            EnumFacing enumfacing = (EnumFacing)p_176343_0_.func_177229_b(BlockRedstoneRepeater.field_185512_D);
-            return enumfacing == p_176343_1_ || enumfacing.func_176734_d() == p_176343_1_;
-+            EnumFacing enumfacing = (EnumFacing)blockState.func_177229_b(BlockRedstoneRepeater.field_185512_D);
-+            return enumfacing == side || enumfacing.func_176734_d() == side;
+@@ -437,7 +432,7 @@
         }
         else
         {
 -            return p_176343_0_.func_185897_m() && p_176343_1_ != null;
-+            return blockState.func_177230_c().canConnectRedstone(blockState, world, pos, side);
+            return p_176343_0_.func_177230_c().canConnectRedstone(p_176343_0_, world, pos, p_176343_1_);
         }
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockReed.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockReed.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockReed.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockReed.java
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -9,7 +9,7 @@
 {
     public static final PropertyInteger field_176355_a = PropertyInteger.func_177719_a("age", 0, 15);
     protected static final AxisAlignedBB field_185701_b = new AxisAlignedBB(0.125D, 0.0D, 0.125D, 0.875D, 1.0D, 0.875D);
-@@ -69,7 +69,9 @@
+@@ -70,7 +70,9 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -20,7 +20,7 @@
 
         if (block == this)
         {
-@@ -162,6 +164,17 @@
+@@ -165,6 +167,17 @@
         return ((Integer)p_176201_1_.func_177229_b(field_176355_a)).intValue();
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
-@@ -116,10 +116,6 @@
+@@ -117,10 +117,6 @@
         return new ItemStack(Items.field_151144_bL, 1, i);
     }
 
@ -11,7 +11,7 @@
     public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_)
     {
         if (p_176208_4_.field_71075_bZ.field_75098_d)
-@@ -127,22 +123,27 @@
+@@ -128,13 +124,18 @@
             p_176208_3_ = p_176208_3_.func_177226_a(field_176417_b, Boolean.valueOf(true));
             p_176208_1_.func_180501_a(p_176208_2_, p_176208_3_, 4);
         }
@ -25,16 +25,13 @@
 -        if (!p_180663_1_.field_72995_K)
 +        super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
 +    }
-+    public java.util.List<ItemStack> getDrops(IBlockAccess worldIn, BlockPos pos, IBlockState state, int fortune)
+    public java.util.List<ItemStack> getDrops(IBlockAccess p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_, int fortune)
 +    {
 +        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
         {
-            if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
-+            if (!((Boolean)state.func_177229_b(field_176417_b)).booleanValue())
+             if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
             {
-                TileEntity tileentity = p_180663_1_.func_175625_s(p_180663_2_);
-+                TileEntity tileentity = worldIn.func_175625_s(pos);
- 
+@@ -143,7 +144,7 @@
                 if (tileentity instanceof TileEntitySkull)
                 {
                     TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
@ -43,7 +40,7 @@
 
                     if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null)
                     {
-@@ -152,12 +153,11 @@
+@@ -153,12 +154,11 @@
                         itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound);
                     }
 
@ -57,4 +54,4 @@
 +        return ret;
     }
 
-     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
+     @Nullable
--- a/patches/minecraft/net/minecraft/block/BlockSnow.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSnow.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSnow.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSnow.java
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
     {
         IBlockState iblockstate = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
         Block block = iblockstate.func_177230_c();
@ -8,8 +8,8 @@
 +        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (iblockstate.func_177230_c().isLeaves(iblockstate, p_176196_1_, p_176196_2_.func_177977_b()) ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() >= 7 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
     }
 
-     public void func_176204_a(World p_176204_1_, BlockPos p_176204_2_, IBlockState p_176204_3_, Block p_176204_4_)
-@@ -85,7 +85,6 @@
+     public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_)
+@@ -87,7 +87,6 @@
     {
         if (!this.func_176196_c(p_176314_1_, p_176314_2_))
         {
@ -17,9 +17,9 @@
             p_176314_1_.func_175698_g(p_176314_2_);
             return false;
         }
-@@ -97,9 +96,8 @@
+@@ -99,9 +98,8 @@
 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_, ItemStack p_180657_6_)
+     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_, @Nullable ItemStack p_180657_6_)
     {
 -        func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Items.field_151126_ay, ((Integer)p_180657_4_.func_177229_b(field_176315_a)).intValue() + 1, 0));
 +        super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
@ -27,8 +27,8 @@
 -        p_180657_2_.func_71029_a(StatList.func_188055_a(this));
     }
 
-     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -109,14 +107,13 @@
+     @Nullable
+@@ -112,14 +110,13 @@
 
     public int func_149745_a(Random p_149745_1_)
     {
@ -44,7 +44,7 @@
             p_180650_1_.func_175698_g(p_180650_2_);
         }
     }
-@@ -150,6 +147,8 @@
+@@ -153,6 +150,8 @@
         return ((Integer)p_176201_1_.func_177229_b(field_176315_a)).intValue() - 1;
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockStairs.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStairs.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockStairs.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockStairs.java
-@@ -443,6 +443,17 @@
+@@ -445,6 +445,17 @@
         return new BlockStateContainer(this, new IProperty[] {field_176309_a, field_176308_b, field_176310_M});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockStem.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStem.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockStem.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
-@@ -89,9 +89,10 @@
+@@ -90,9 +90,10 @@
                     }
 
                     p_180650_2_ = p_180650_2_.func_177972_a(EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_));
@ -13,7 +13,7 @@
                     {
                         p_180650_1_.func_175656_a(p_180650_2_, this.field_149877_a.func_176223_P());
                     }
-@@ -109,24 +110,29 @@
+@@ -110,24 +111,29 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
@ -46,4 +46,4 @@
 +        return ret;
     }
 
-     protected Item func_176481_j()
+     @Nullable
--- a/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTallGrass.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTallGrass.java
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -9,7 +9,7 @@
 {
     public static final PropertyEnum<BlockTallGrass.EnumType> field_176497_a = PropertyEnum.<BlockTallGrass.EnumType>func_177709_a("type", BlockTallGrass.EnumType.class);
     protected static final AxisAlignedBB field_185522_c = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -18,8 +18,8 @@
     }
 
     public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
-@@ -51,7 +51,7 @@
- 
+@@ -53,7 +53,7 @@
+     @Nullable
     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
     {
 -        return p_180660_2_.nextInt(8) == 0 ? Items.field_151014_N : null;
@ -27,16 +27,16 @@
     }
 
     public int func_149679_a(int p_149679_1_, Random p_149679_2_)
-@@ -61,7 +61,7 @@
+@@ -63,7 +63,7 @@
 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_, ItemStack p_180657_6_)
+     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_, @Nullable ItemStack p_180657_6_)
     {
 -        if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
 +        if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) // Forge: Noop Taken care of by IShearable
         {
             p_180657_2_.func_71029_a(StatList.func_188055_a(this));
             func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150329_H, 1, ((BlockTallGrass.EnumType)p_180657_4_.func_177229_b(field_176497_a)).func_177044_a()));
-@@ -181,4 +181,22 @@
+@@ -183,4 +183,22 @@
             }
         }
     }
--- a/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
-@@ -79,14 +79,14 @@
+@@ -81,14 +81,14 @@
 
     private boolean func_176594_d(World p_176594_1_, BlockPos p_176594_2_)
     {
@ -18,7 +18,7 @@
         }
     }
 
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
     {
         BlockPos blockpos = p_176595_2_.func_177972_a(p_176595_3_.func_176734_d());
         boolean flag = p_176595_3_.func_176740_k().func_176722_c();
@ -27,7 +27,7 @@
     }
 
     public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
-@@ -120,7 +120,7 @@
+@@ -122,7 +122,7 @@
         {
             for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
             {
@ -36,7 +36,7 @@
                 {
                     return this.func_176223_P().func_177226_a(field_176596_a, enumfacing);
                 }
-@@ -153,7 +153,7 @@
+@@ -155,7 +155,7 @@
             EnumFacing enumfacing1 = enumfacing.func_176734_d();
             boolean flag = false;
 
--- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
-@@ -241,6 +241,18 @@
+@@ -242,6 +242,18 @@
         return new BlockStateContainer(this, new IProperty[] {field_176284_a, field_176283_b, field_176285_M});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTripWireHook.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTripWireHook.java
-@@ -77,14 +77,14 @@
+@@ -79,14 +79,14 @@
 
     public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
     {
@ -17,12 +17,12 @@
             {
                 return true;
             }
-@@ -118,7 +118,7 @@
+@@ -120,7 +120,7 @@
             {
-                 EnumFacing enumfacing = (EnumFacing)p_176204_3_.func_177229_b(field_176264_a);
+                 EnumFacing enumfacing = (EnumFacing)p_189540_1_.func_177229_b(field_176264_a);
 
-                if (!p_176204_1_.func_180495_p(p_176204_2_.func_177972_a(enumfacing.func_176734_d())).func_185915_l())
-+                if (!p_176204_1_.func_180495_p(p_176204_2_.func_177972_a(enumfacing.func_176734_d())).isSideSolid(p_176204_1_, p_176204_2_.func_177972_a(enumfacing.func_176734_d()), enumfacing))
+-                if (!p_189540_2_.func_180495_p(p_189540_3_.func_177972_a(enumfacing.func_176734_d())).func_185915_l())
+                if (!p_189540_2_.func_180495_p(p_189540_3_.func_177972_a(enumfacing.func_176734_d())).isSideSolid(p_189540_2_, p_189540_3_.func_177972_a(enumfacing.func_176734_d()), enumfacing))
                 {
-                     this.func_176226_b(p_176204_1_, p_176204_2_, p_176204_3_, 0);
-                     p_176204_1_.func_175698_g(p_176204_2_);
+                     this.func_176226_b(p_189540_2_, p_189540_3_, p_189540_1_, 0);
+                     p_189540_2_.func_175698_g(p_189540_3_);
--- a/patches/minecraft/net/minecraft/block/BlockVine.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockVine.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockVine.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockVine.java
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -9,16 +9,16 @@
 {
     public static final PropertyBool field_176277_a = PropertyBool.func_177716_a("up");
     public static final PropertyBool field_176273_b = PropertyBool.func_177716_a("north");
-@@ -342,7 +342,7 @@
+@@ -345,7 +345,7 @@
 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_, ItemStack p_180657_6_)
+     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_, @Nullable ItemStack p_180657_6_)
     {
 -        if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
 +        if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) // Forge: Noop, Covered by IShearable
         {
             p_180657_2_.func_71029_a(StatList.func_188055_a(this));
             func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150395_bd, 1, 0));
-@@ -457,4 +457,14 @@
+@@ -460,4 +460,14 @@
 
         return i;
     }
--- a/patches/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/state/BlockStateBase.java
 +++ ../src-work/minecraft/net/minecraft/block/state/BlockStateBase.java
-@@ -71,4 +71,9 @@
+@@ -73,4 +73,9 @@
 
         return stringbuilder.toString();
     }
--- a/patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/state/BlockStateContainer.java
 +++ ../src-work/minecraft/net/minecraft/block/state/BlockStateContainer.java
-@@ -55,12 +55,22 @@
+@@ -57,12 +57,22 @@
 
     public BlockStateContainer(Block p_i45663_1_, IProperty<?>... p_i45663_2_)
     {
@ -26,7 +26,7 @@
             map.put(iproperty.func_177701_a(), iproperty);
         }
 
-@@ -71,7 +81,7 @@
+@@ -73,7 +83,7 @@
         for (List < Comparable<? >> list : Cartesian.func_179321_a(this.func_177620_e()))
         {
             Map < IProperty<?>, Comparable<? >> map1 = MapPopulator. < IProperty<?>, Comparable<? >> func_179400_b(this.field_177624_d.values(), list);
@ -35,7 +35,7 @@
             map2.put(map1, blockstatecontainer$stateimplementation);
             list1.add(blockstatecontainer$stateimplementation);
         }
-@@ -163,6 +173,13 @@
+@@ -166,6 +176,13 @@
                 this.field_177237_b = p_i45660_2_;
             }
 
@ -49,9 +49,9 @@
             public Collection < IProperty<? >> func_177227_a()
             {
                 return Collections. < IProperty<? >> unmodifiableCollection(this.field_177237_b.keySet());
-@@ -414,5 +431,86 @@
+@@ -441,5 +458,86 @@
             {
-                 return this.field_177239_a.func_185481_k(this);
+                 this.field_177239_a.func_189540_a(this, p_189546_1_, p_189546_2_, p_189546_3_);
             }
 +
 +            //Forge Start
--- a/patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/state/IBlockProperties.java
 +++ ../src-work/minecraft/net/minecraft/block/state/IBlockProperties.java
-@@ -25,9 +25,13 @@
+@@ -26,9 +26,13 @@
 
     boolean func_185913_b();
 
@ -14,7 +14,7 @@
 
     @SideOnly(Side.CLIENT)
     boolean func_185895_e();
-@@ -88,5 +92,10 @@
+@@ -90,5 +94,10 @@
 
     RayTraceResult func_185910_a(World p_185910_1_, BlockPos p_185910_2_, Vec3d p_185910_3_, Vec3d p_185910_4_);
 
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -318,7 +318,6 @@
+@@ -321,7 +321,6 @@
         this.field_152355_az = (new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString())).createMinecraftSessionService();
         this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a;
         field_147123_G.info("Setting user: " + this.field_71449_j.func_111285_a());
-        field_147123_G.info("(Session ID is " + this.field_71449_j.func_111286_b() + ")");
+-        field_147123_G.debug("(Session ID is " + this.field_71449_j.func_111286_b() + ")");
         this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
         this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
         this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
-@@ -432,10 +431,10 @@
+@@ -435,10 +434,10 @@
         this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
         this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
         this.field_110451_am.func_110542_a(this.field_135017_as);
@ -21,7 +21,7 @@
         this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
         this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"), this.field_184131_U);
         this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
-@@ -460,7 +459,7 @@
+@@ -463,7 +462,7 @@
             {
                 try
                 {
@ -30,7 +30,7 @@
                 }
                 catch (Exception exception)
                 {
-@@ -469,6 +468,8 @@
+@@ -472,6 +471,8 @@
             }
         });
         this.field_71417_B = new MouseHelper();
@ -39,7 +39,7 @@
         this.func_71361_d("Pre startup");
         GlStateManager.func_179098_w();
         GlStateManager.func_179103_j(7425);
-@@ -482,19 +483,23 @@
+@@ -485,19 +486,23 @@
         GlStateManager.func_179096_D();
         GlStateManager.func_179128_n(5888);
         this.func_71361_d("Startup");
@ -64,10 +64,10 @@
         this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
         this.field_110451_am.func_110542_a(this.field_71460_t);
         this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH);
-@@ -504,23 +509,26 @@
+@@ -507,23 +512,26 @@
         this.field_71458_u = new GuiAchievement(this);
         GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
+         this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
 +        net.minecraftforge.fml.common.ProgressManager.pop(bar);
 +        net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
         this.func_71361_d("Post startup");
@ -94,7 +94,7 @@
         if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
         {
             this.func_71352_k();
-@@ -692,21 +700,23 @@
+@@ -695,21 +703,23 @@
         File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
         Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
 
@ -121,9 +121,9 @@
     }
 
     public boolean func_152349_b()
-@@ -899,11 +909,6 @@
+@@ -902,11 +912,6 @@
 
-     public void func_147108_a(GuiScreen p_147108_1_)
+     public void func_147108_a(@Nullable GuiScreen p_147108_1_)
     {
 -        if (this.field_71462_r != null)
 -        {
@ -133,7 +133,7 @@
         if (p_147108_1_ == null && this.field_71441_e == null)
         {
             p_147108_1_ = new GuiMainMenu();
-@@ -913,6 +918,17 @@
+@@ -916,6 +921,17 @@
             p_147108_1_ = new GuiGameOver((ITextComponent)null);
         }
 
@ -151,7 +151,7 @@
         if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer)
         {
             this.field_71474_y.field_74330_P = false;
-@@ -1051,9 +1067,11 @@
+@@ -1054,9 +1070,11 @@
 
         if (!this.field_71454_w)
         {
@ -163,7 +163,7 @@
         }
 
         this.field_71424_I.func_76319_b();
-@@ -1393,9 +1411,9 @@
+@@ -1396,9 +1414,9 @@
             {
                 BlockPos blockpos = this.field_71476_x.func_178782_a();
 
@ -175,7 +175,7 @@
                     this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
                 }
             }
-@@ -1429,7 +1447,7 @@
+@@ -1432,7 +1450,7 @@
                     case BLOCK:
                         BlockPos blockpos = this.field_71476_x.func_178782_a();
 
@ -184,7 +184,7 @@
                         {
                             this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
                             break;
-@@ -1473,7 +1491,7 @@
+@@ -1476,7 +1494,7 @@
                         switch (this.field_71476_x.field_72313_a)
                         {
                             case ENTITY:
@ -193,7 +193,7 @@
                                 if (this.field_71442_b.func_187102_a(this.field_71439_g, this.field_71476_x.field_72308_g, this.field_71476_x, this.field_71439_g.func_184586_b(enumhand), enumhand) == EnumActionResult.SUCCESS)
                                 {
                                     return;
-@@ -1516,7 +1534,7 @@
+@@ -1519,7 +1537,7 @@
                     }
 
                     ItemStack itemstack1 = this.field_71439_g.func_184586_b(enumhand);
@ -202,7 +202,7 @@
                     if (itemstack1 != null && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, itemstack1, enumhand) == EnumActionResult.SUCCESS)
                     {
                         this.field_71460_t.field_78516_c.func_187460_a(enumhand);
-@@ -1623,6 +1641,8 @@
+@@ -1626,6 +1644,8 @@
             --this.field_71467_ac;
         }
 
@ -211,7 +211,7 @@
         this.field_71424_I.func_76320_a("gui");
 
         if (!this.field_71445_n)
-@@ -1734,6 +1754,7 @@
+@@ -1737,6 +1757,7 @@
                     this.field_71457_ai = 0;
                     this.field_71441_e.func_72897_h(this.field_71439_g);
                 }
@ -219,7 +219,7 @@
             }
 
             this.field_71424_I.func_76318_c("gameRenderer");
-@@ -1821,6 +1842,7 @@
+@@ -1824,6 +1845,7 @@
             this.field_71453_ak.func_74428_b();
         }
 
@ -227,7 +227,7 @@
         this.field_71424_I.func_76319_b();
         this.field_71423_H = func_71386_F();
     }
-@@ -1927,6 +1949,7 @@
+@@ -1930,6 +1952,7 @@
                     }
                 }
             }
@ -235,7 +235,7 @@
         }
 
         this.func_184117_aA();
-@@ -2166,6 +2189,8 @@
+@@ -2169,6 +2192,8 @@
     {
         while (Mouse.next())
         {
@ -244,15 +244,15 @@
             int i = Mouse.getEventButton();
             KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
 
-@@ -2231,6 +2256,7 @@
+@@ -2234,6 +2259,7 @@
 
-     public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_)
+     public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_)
     {
 +        net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_);
         this.func_71403_a((WorldClient)null);
         System.gc();
         ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2273,6 +2299,12 @@
+@@ -2276,6 +2302,12 @@
 
         while (!this.field_71437_Z.func_71200_ad())
         {
@ -265,13 +265,13 @@
             String s = this.field_71437_Z.func_71195_b_();
 
             if (s != null)
-@@ -2298,8 +2330,14 @@
+@@ -2301,8 +2333,14 @@
         SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
         NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
         networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
-        networkmanager.func_179290_a(new C00Handshake(107, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
+-        networkmanager.func_179290_a(new C00Handshake(110, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
 -        networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e()));
-+        networkmanager.func_179290_a(new C00Handshake(107, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
+        networkmanager.func_179290_a(new C00Handshake(110, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
 +        com.mojang.authlib.GameProfile gameProfile = this.func_110432_I().func_148256_e();
 +        if (!this.func_110432_I().hasCachedProperties())
 +        {
@ -282,16 +282,16 @@
         this.field_71453_ak = networkmanager;
     }
 
-@@ -2310,6 +2348,8 @@
+@@ -2313,6 +2351,8 @@
 
-     public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
+     public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
     {
 +        if (field_71441_e != null) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(field_71441_e));
 +
         if (p_71353_1_ == null)
         {
             NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2322,6 +2362,18 @@
+@@ -2325,6 +2365,18 @@
             if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
             {
                 this.field_71437_Z.func_71263_m();
@ -310,7 +310,7 @@
             }
 
             this.field_71437_Z = null;
-@@ -2345,6 +2397,7 @@
+@@ -2348,6 +2400,7 @@
             this.field_71456_v.func_181029_i();
             this.func_71351_a((ServerData)null);
             this.field_71455_al = false;
@ -318,7 +318,7 @@
         }
 
         this.field_147127_av.func_147690_c();
-@@ -2461,159 +2514,8 @@
+@@ -2464,159 +2517,8 @@
     {
         if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
         {
@ -480,7 +480,7 @@
         }
     }
 
-@@ -2909,18 +2811,8 @@
+@@ -2912,18 +2814,8 @@
 
     public static int func_71369_N()
     {
@ -501,7 +501,7 @@
     }
 
     public boolean func_70002_Q()
-@@ -3057,15 +2949,16 @@
+@@ -3060,15 +2952,16 @@
             {
                 if (Keyboard.getEventKeyState())
                 {
@ -520,7 +520,7 @@
             }
         }
     }
-@@ -3192,4 +3085,10 @@
+@@ -3195,4 +3088,10 @@
     {
         return this.field_184127_aH;
     }
--- a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
 +++ ../src-work/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
-@@ -148,6 +148,6 @@
+@@ -152,6 +152,6 @@
             f *= 1.0F - f1 * 0.15F;
         }
 
--- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
 +++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
-@@ -400,6 +400,15 @@
+@@ -404,6 +404,15 @@
         this.field_71159_c.field_71456_v.func_146158_b().func_146227_a(p_146105_1_);
     }
 
@ -16,7 +16,7 @@
     protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
     {
         if (this.field_70145_X)
-@@ -412,30 +421,34 @@
+@@ -416,30 +425,34 @@
             double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
             double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
 
@ -56,7 +56,7 @@
                 {
                     d2 = 1.0D - d1;
                     i = 5;
-@@ -470,7 +483,7 @@
+@@ -474,7 +487,7 @@
 
     private boolean func_175162_d(BlockPos p_175162_1_)
     {
@ -65,7 +65,7 @@
     }
 
     public void func_70031_b(boolean p_70031_1_)
-@@ -515,7 +528,13 @@
+@@ -519,7 +532,13 @@
 
     public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
     {
--- a/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
@ -1,10 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiChat.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiChat.java
-@@ -250,6 +250,7 @@
- 
-             public BlockPos func_186839_b()
-             {
-+
-                 BlockPos blockpos = null;
- 
-                 if (this.field_186853_g.field_71476_x != null && this.field_186853_g.field_71476_x.field_72313_a == RayTraceResult.Type.BLOCK)
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiIngame.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngame.java
-@@ -360,7 +360,8 @@
+@@ -361,7 +361,8 @@
 
                 BlockPos blockpos = raytraceresult.func_178782_a();
 
@ -10,7 +10,7 @@
                 {
                     return;
                 }
-@@ -418,7 +419,10 @@
+@@ -419,7 +420,10 @@
             {
                 Potion potion = potioneffect.func_188419_a();
 
@ -22,7 +22,7 @@
                 {
                     int k = p_184048_1_.func_78326_a();
                     int l = 1;
-@@ -455,7 +459,10 @@
+@@ -456,7 +460,10 @@
                     }
 
                     GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f);
--- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
-@@ -190,6 +190,9 @@
+@@ -193,6 +193,9 @@
         long l = j - k;
         List<String> list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.func_183029_j()}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GlStateManager.func_187416_u(7936)}), GlStateManager.func_187416_u(7937), GlStateManager.func_187416_u(7938)});
 
--- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
@@ -82,7 +82,7 @@
-         boolean flag1 = this.field_148301_e.field_82821_f < 107;
+         boolean flag1 = this.field_148301_e.field_82821_f < 110;
         boolean flag2 = flag || flag1;
         this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
 -        List<String> list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
@@ -49,6 +49,10 @@
-     private StatFileWriter field_146556_E;
+     private StatisticsManager field_146556_E;
     private boolean field_146558_F = true;
 
 +    private int currentPage = -1;
 +    private GuiButton button;
 +    private java.util.LinkedList<Achievement> minecraftAchievements = new java.util.LinkedList<Achievement>();
 +
-     public GuiAchievements(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_)
+     public GuiAchievements(GuiScreen p_i45026_1_, StatisticsManager p_i45026_2_)
     {
         this.field_146562_a = p_i45026_1_;
@@ -57,6 +61,14 @@
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
-@@ -49,6 +49,8 @@
+@@ -50,6 +50,8 @@
     private Slot field_147064_C;
     private boolean field_147057_D;
     private CreativeCrafting field_147059_E;
@ -9,7 +9,7 @@
 
     public GuiContainerCreative(EntityPlayer p_i1088_1_)
     {
-@@ -258,6 +260,13 @@
+@@ -259,6 +261,13 @@
             this.func_147050_b(CreativeTabs.field_78032_a[i]);
             this.field_147059_E = new CreativeCrafting(this.field_146297_k);
             this.field_146297_k.field_71439_g.field_71069_bz.func_75132_a(this.field_147059_E);
@ -23,7 +23,7 @@
         }
         else
         {
-@@ -279,7 +288,7 @@
+@@ -280,7 +289,7 @@
 
     protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
     {
@ -32,7 +32,7 @@
         {
             if (GameSettings.func_100015_a(this.field_146297_k.field_71474_y.field_74310_D))
             {
-@@ -317,6 +326,14 @@
+@@ -318,6 +327,14 @@
         GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
         guicontainercreative$containercreative.field_148330_a.clear();
 
@ -47,7 +47,7 @@
         for (Item item : Item.field_150901_e)
         {
             if (item != null && item.func_77640_w() != null)
-@@ -324,7 +341,13 @@
+@@ -325,7 +342,13 @@
                 item.func_150895_a(item, (CreativeTabs)null, guicontainercreative$containercreative.field_148330_a);
             }
         }
@ -57,11 +57,11 @@
 +    //split from above for custom search tabs
 +    private void updateFilteredItems(GuiContainerCreative.ContainerCreative guicontainercreative$containercreative)
 +    {
-+    	if (CreativeTabs.field_78032_a[field_147058_w] == CreativeTabs.field_78027_g) // FORGE: Only add enchanted books to the regular search
+        if (CreativeTabs.field_78032_a[field_147058_w] == CreativeTabs.field_78027_g) // FORGE: Only add enchanted books to the regular search
         for (Enchantment enchantment : Enchantment.field_185264_b)
         {
             if (enchantment != null && enchantment.field_77351_y != null)
-@@ -332,7 +355,6 @@
+@@ -333,7 +356,6 @@
                 Items.field_151134_bR.func_92113_a(enchantment, guicontainercreative$containercreative.field_148330_a);
             }
         }
@ -69,7 +69,7 @@
         Iterator<ItemStack> iterator = guicontainercreative$containercreative.field_148330_a.iterator();
         String s1 = this.field_147062_A.func_146179_b().toLowerCase();
 
-@@ -364,7 +386,7 @@
+@@ -365,7 +387,7 @@
     {
         CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
 
@ -78,7 +78,7 @@
         {
             GlStateManager.func_179084_k();
             this.field_146289_q.func_78276_b(I18n.func_135052_a(creativetabs.func_78024_c(), new Object[0]), 8, 6, 4210752);
-@@ -399,7 +421,7 @@
+@@ -400,7 +422,7 @@
 
             for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
             {
@ -87,7 +87,7 @@
                 {
                     this.func_147050_b(creativetabs);
                     return;
-@@ -412,11 +434,13 @@
+@@ -413,11 +435,13 @@
 
     private boolean func_147055_p()
     {
@ -101,7 +101,7 @@
         int i = field_147058_w;
         field_147058_w = p_147050_1_.func_78021_a();
         GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
-@@ -487,12 +511,14 @@
+@@ -488,12 +512,14 @@
 
         if (this.field_147062_A != null)
         {
@ -117,7 +117,7 @@
                 this.func_147053_i();
             }
             else
-@@ -562,20 +588,43 @@
+@@ -563,20 +589,43 @@
         }
 
         super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
@ -137,7 +137,7 @@
             }
         }
 
-+        if (!rendered && func_147052_b(CreativeTabs.field_78027_g, p_73863_1_, p_73863_2_))
+        if (!rendered && !func_147052_b(CreativeTabs.field_78027_g, p_73863_1_, p_73863_2_))
 +        {
 +            func_147052_b(CreativeTabs.field_78036_m, p_73863_1_, p_73863_2_);
 +        }
@ -162,7 +162,7 @@
         GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
         GlStateManager.func_179140_f();
     }
-@@ -637,16 +686,35 @@
+@@ -638,16 +687,35 @@
         RenderHelper.func_74520_c();
         CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
 
@ -199,7 +199,7 @@
         this.field_146297_k.func_110434_K().func_110577_a(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativetabs.func_78015_f()));
         this.func_73729_b(this.field_147003_i, this.field_147009_r, 0, 0, this.field_146999_f, this.field_147000_g);
         this.field_147062_A.func_146194_f();
-@@ -661,6 +729,14 @@
+@@ -662,6 +730,14 @@
             this.func_73729_b(i, j + (int)((float)(k - j - 17) * this.field_147067_x), 232 + (this.func_147055_p() ? 0 : 12), 0, 12, 15);
         }
 
@ -214,7 +214,7 @@
         this.func_147051_a(creativetabs);
 
         if (creativetabs == CreativeTabs.field_78036_m)
-@@ -671,6 +747,14 @@
+@@ -672,6 +748,14 @@
 
     protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
     {
@ -229,7 +229,7 @@
         int i = p_147049_1_.func_78020_k();
         int j = 28 * i;
         int k = 0;
-@@ -767,6 +851,8 @@
+@@ -768,6 +852,8 @@
         }
 
         GlStateManager.func_179140_f();
@ -238,7 +238,7 @@
         this.func_73729_b(l, i1, j, k, 28, j1);
         this.field_73735_i = 100.0F;
         this.field_146296_j.field_77023_b = 100.0F;
-@@ -793,6 +879,15 @@
+@@ -794,6 +880,15 @@
         {
             this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m()));
         }
--- a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
@ -1,9 +1,9 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
-@@ -52,6 +52,7 @@
+@@ -59,6 +59,7 @@
+     {
         Chunk chunk = new Chunk(this.field_73235_d, p_73158_1_, p_73158_2_);
-         this.field_73236_b.func_76163_a(ChunkCoordIntPair.func_77272_a(p_73158_1_, p_73158_2_), chunk);
-         this.field_73237_c.add(chunk);
+         this.field_73236_b.put(ChunkPos.func_77272_a(p_73158_1_, p_73158_2_), chunk);
 +        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkEvent.Load(chunk));
         chunk.func_177417_c(true);
         return chunk;
--- a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
@ -4,8 +4,8 @@
                     inetaddress = InetAddress.getByName(p_146367_1_);
                     GuiConnecting.this.field_146371_g = NetworkManager.func_181124_a(inetaddress, p_146367_2_, GuiConnecting.this.field_146297_k.field_71474_y.func_181148_f());
                     GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i));
-                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(107, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
-+                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(107, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
+-                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(110, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
+                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(110, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
                     GuiConnecting.this.field_146371_g.func_179290_a(new CPacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e()));
                 }
                 catch (UnknownHostException unknownhostexception)
--- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
-@@ -121,6 +121,12 @@
+@@ -122,6 +122,12 @@
             }
         }
 
@ -13,7 +13,7 @@
         if (this.field_78779_k.func_77145_d() && this.field_78776_a.field_71439_g.func_184614_ca() != null && this.field_78776_a.field_71439_g.func_184614_ca().func_77973_b() instanceof ItemSword)
         {
             return false;
-@@ -142,14 +148,7 @@
+@@ -143,14 +149,7 @@
             else
             {
                 world.func_175718_b(2001, p_187103_1_, Block.func_176210_f(iblockstate));
@ -28,7 +28,7 @@
                 this.field_178895_c = new BlockPos(this.field_178895_c.func_177958_n(), -1, this.field_178895_c.func_177952_p());
 
                 if (!this.field_78779_k.func_77145_d())
-@@ -160,13 +159,20 @@
+@@ -161,13 +160,20 @@
                     {
                         itemstack1.func_179548_a(world, iblockstate, p_187103_1_, this.field_78776_a.field_71439_g);
 
@ -50,7 +50,7 @@
                 return flag;
             }
         }
-@@ -217,14 +223,17 @@
+@@ -218,14 +224,17 @@
                 }
 
                 this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
@ -69,7 +69,7 @@
                 if (flag && iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180511_1_) >= 1.0F)
                 {
                     this.func_187103_a(p_180511_1_);
-@@ -371,13 +380,32 @@
+@@ -372,13 +381,32 @@
         }
         else
         {
@ -78,7 +78,7 @@
 +            if (event.isCanceled())
 +            {
 +                // Give the server a chance to fire event as well. That way server event is not dependant on client event.
-+                this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItem(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
+                this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
 +                return EnumActionResult.PASS;
 +            }
 +            EnumActionResult result = EnumActionResult.PASS;
@ -104,16 +104,16 @@
                 }
 
                 if (!flag && p_187099_3_ != null && p_187099_3_.func_77973_b() instanceof ItemBlock)
-@@ -393,7 +421,7 @@
+@@ -394,7 +422,7 @@
 
-             this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItem(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
+             this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
 
 -            if (!flag && this.field_78779_k != WorldSettings.GameType.SPECTATOR)
 +            if (!flag && this.field_78779_k != WorldSettings.GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW)
             {
                 if (p_187099_3_ == null)
                 {
-@@ -411,14 +439,19 @@
+@@ -412,14 +440,19 @@
                 {
                     int i = p_187099_3_.func_77960_j();
                     int j = p_187099_3_.field_77994_a;
@ -134,7 +134,7 @@
                 }
             }
             else
-@@ -445,6 +478,7 @@
+@@ -446,6 +479,7 @@
             }
             else
             {
@ -142,7 +142,7 @@
                 int i = p_187101_3_.field_77994_a;
                 ActionResult<ItemStack> actionresult = p_187101_3_.func_77957_a(p_187101_2_, p_187101_1_, p_187101_4_);
                 ItemStack itemstack = (ItemStack)actionresult.func_188398_b();
-@@ -453,9 +487,10 @@
+@@ -454,9 +488,10 @@
                 {
                     p_187101_1_.func_184611_a(p_187101_4_, itemstack);
 
--- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
@ -1,13 +1,13 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
-@@ -58,17 +58,18 @@
+@@ -59,17 +59,18 @@
 
     public WorldClient(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_)
     {
 -        super(new SaveHandlerMP(), new WorldInfo(p_i45063_2_, "MpServer"), DimensionType.func_186069_a(p_i45063_3_).func_186070_d(), p_i45063_5_, true);
 +        super(new SaveHandlerMP(), new WorldInfo(p_i45063_2_, "MpServer"), net.minecraftforge.common.DimensionManager.createProviderFor(p_i45063_3_), p_i45063_5_, true);
         this.field_184158_M = this.field_73012_v.nextInt(12000);
-         this.field_184157_a = Sets.<ChunkCoordIntPair>newHashSet();
+         this.field_184157_a = Sets.<ChunkPos>newHashSet();
         this.field_73035_a = p_i45063_1_;
         this.func_72912_H().func_176144_a(p_i45063_4_);
 -        this.func_175652_B(new BlockPos(8, 64, 8));
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
 +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-@@ -267,7 +267,7 @@
+@@ -268,7 +268,7 @@
     {
         PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
         this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
@ -9,7 +9,16 @@
         this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
         this.field_147299_f.func_71403_a(this.field_147300_g);
         this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
-@@ -785,14 +785,16 @@
+@@ -719,7 +719,7 @@
+ 
+             if (tileentity != null)
+             {
+-                tileentity.func_145839_a(nbttagcompound);
+                tileentity.handleUpdateTag(nbttagcompound);
+             }
+         }
+     }
+@@ -797,14 +797,16 @@
     public void func_147251_a(SPacketChat p_147251_1_)
     {
         PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
@ -28,7 +37,7 @@
         }
     }
 
-@@ -848,6 +850,11 @@
+@@ -860,6 +862,11 @@
         float f = (float)(p_147281_1_.func_149028_l() * 360) / 256.0F;
         float f1 = (float)(p_147281_1_.func_149030_m() * 360) / 256.0F;
         EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.func_75616_a(p_147281_1_.func_149025_e(), this.field_147299_f.field_71441_e);
@ -40,7 +49,7 @@
         EntityTracker.func_187254_a(entitylivingbase, d0, d1, d2);
         entitylivingbase.field_70761_aq = entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
         Entity[] aentity = entitylivingbase.func_70021_al();
-@@ -919,7 +926,7 @@
+@@ -931,7 +938,7 @@
 
                     if (entity1 == this.field_147299_f.field_71439_g && !flag)
                     {
@ -49,7 +58,7 @@
                     }
                 }
             }
-@@ -1179,6 +1186,10 @@
+@@ -1162,6 +1169,10 @@
             {
                 tileentity.func_145839_a(p_147273_1_.func_148857_g());
             }
@ -60,7 +69,7 @@
 
             if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
             {
-@@ -1276,15 +1287,15 @@
+@@ -1259,15 +1270,15 @@
             }
             else if (f == 101.0F)
             {
@ -79,7 +88,7 @@
             }
         }
         else if (i == 6)
-@@ -1378,7 +1389,7 @@
+@@ -1361,7 +1372,7 @@
 
         if (entity instanceof EntityLivingBase)
         {
--- a/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch
@ -1,23 +1,23 @@
--- ../src-base/minecraft/net/minecraft/client/particle/EffectRenderer.java
-+++ ../src-work/minecraft/net/minecraft/client/particle/EffectRenderer.java
-@@ -143,6 +143,7 @@
+--- ../src-base/minecraft/net/minecraft/client/particle/ParticleManager.java
+++ ../src-work/minecraft/net/minecraft/client/particle/ParticleManager.java
+@@ -145,6 +145,7 @@
 
-     public void func_78873_a(EntityFX p_78873_1_)
+     public void func_78873_a(Particle p_78873_1_)
     {
 +        if (p_78873_1_ == null) return; //Forge: Prevent modders from being bad and adding nulls causing untraceable NPEs.
         this.field_187241_h.add(p_78873_1_);
     }
 
-@@ -376,7 +377,7 @@
+@@ -378,7 +379,7 @@
 
     public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
     {
 -        if (p_180533_2_.func_185904_a() != Material.field_151579_a)
-+        if (!p_180533_2_.func_177230_c().isAir(p_180533_2_, field_78878_a, p_180533_1_) && !p_180533_2_.func_177230_c().addDestroyEffects(field_78878_a, p_180533_1_, this))
+        if (!p_180533_2_.func_177230_c().isAir(p_180533_2_, this.field_78878_a, p_180533_1_) && !p_180533_2_.func_177230_c().addDestroyEffects(field_78878_a, p_180533_1_, this))
         {
             p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_);
             int i = 4;
-@@ -460,4 +461,13 @@
+@@ -462,4 +463,13 @@
 
         return "" + i;
     }
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
-@@ -140,7 +140,14 @@
+@@ -141,7 +141,14 @@
             p_187492_8_.func_187491_a(p_187492_1_, p_187492_2_, p_187492_3_, bakedquad.func_178210_d(), p_187492_6_, p_187492_7_);
             p_187492_4_.func_178981_a(bakedquad.func_178209_a());
             p_187492_4_.func_178962_a(p_187492_8_.field_178207_c[0], p_187492_8_.field_178207_c[1], p_187492_8_.field_178207_c[2], p_187492_8_.field_178207_c[3]);
@ -16,7 +16,7 @@
             if (bakedquad.func_178212_b())
             {
                 int k = this.field_187499_a.func_186724_a(p_187492_2_, p_187492_1_, p_187492_3_, bakedquad.func_178211_c());
-@@ -289,11 +296,26 @@
+@@ -290,11 +297,26 @@
                 float f = (float)(l >> 16 & 255) / 255.0F;
                 float f1 = (float)(l >> 8 & 255) / 255.0F;
                 float f2 = (float)(l & 255) / 255.0F;
--- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/EntityRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/EntityRenderer.java
-@@ -207,6 +207,7 @@
+@@ -208,6 +208,7 @@
             {
                 this.func_175069_a(new ResourceLocation("shaders/post/invert.json"));
             }
@ -8,7 +8,7 @@
         }
     }
 
-@@ -398,7 +399,7 @@
+@@ -399,7 +400,7 @@
 
                         if (d3 < d2 || d2 == 0.0D)
                         {
@ -17,7 +17,7 @@
                             {
                                 if (d2 == 0.0D)
                                 {
-@@ -491,7 +492,7 @@
+@@ -492,7 +493,7 @@
                 f = f * 60.0F / 70.0F;
             }
 
@ -26,7 +26,7 @@
         }
     }
 
-@@ -555,14 +556,8 @@
+@@ -556,14 +557,8 @@
             {
                 BlockPos blockpos = new BlockPos(entity);
                 IBlockState iblockstate = this.field_78531_r.field_71441_e.func_180495_p(blockpos);
@ -42,7 +42,7 @@
                 GlStateManager.func_179114_b(entity.field_70126_B + (entity.field_70177_z - entity.field_70126_B) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F);
                 GlStateManager.func_179114_b(entity.field_70127_C + (entity.field_70125_A - entity.field_70127_C) * p_78467_1_, -1.0F, 0.0F, 0.0F);
             }
-@@ -629,17 +624,20 @@
+@@ -630,17 +625,20 @@
 
         if (!this.field_78531_r.field_71474_y.field_74325_U)
         {
@ -70,7 +70,7 @@
         }
 
         GlStateManager.func_179109_b(0.0F, -f, 0.0F);
-@@ -757,6 +755,7 @@
+@@ -758,6 +756,7 @@
 
             boolean flag = this.field_78531_r.func_175606_aa() instanceof EntityLivingBase && ((EntityLivingBase)this.field_78531_r.func_175606_aa()).func_70608_bn();
 
@ -78,7 +78,7 @@
             if (this.field_78531_r.field_71474_y.field_74320_O == 0 && !flag && !this.field_78531_r.field_71474_y.field_74319_N && !this.field_78531_r.field_71442_b.func_78747_a())
             {
                 this.func_180436_i();
-@@ -1092,7 +1091,7 @@
+@@ -1093,7 +1092,7 @@
 
                 try
                 {
@ -87,7 +87,7 @@
                 }
                 catch (Throwable throwable)
                 {
-@@ -1187,7 +1186,7 @@
+@@ -1188,7 +1187,7 @@
 
                     if (this.field_78531_r.field_71442_b.func_178889_l() == WorldSettings.GameType.SPECTATOR)
                     {
@ -96,7 +96,7 @@
                     }
                     else
                     {
-@@ -1312,7 +1311,9 @@
+@@ -1313,7 +1312,9 @@
             GlStateManager.func_179094_E();
             RenderHelper.func_74519_b();
             this.field_78531_r.field_71424_I.func_76318_c("entities");
@ -106,7 +106,7 @@
             RenderHelper.func_74518_a();
             this.func_175072_h();
         }
-@@ -1325,6 +1326,7 @@
+@@ -1326,6 +1327,7 @@
             EntityPlayer entityplayer = (EntityPlayer)entity;
             GlStateManager.func_179118_c();
             this.field_78531_r.field_71424_I.func_76318_c("outline");
@ -114,7 +114,7 @@
             renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_175068_2_);
             GlStateManager.func_179141_d();
         }
-@@ -1366,6 +1368,17 @@
+@@ -1367,6 +1369,17 @@
         GlStateManager.func_179103_j(7425);
         this.field_78531_r.field_71424_I.func_76318_c("translucent");
         renderglobal.func_174977_a(BlockRenderLayer.TRANSLUCENT, (double)p_175068_2_, p_175068_1_, entity);
@ -132,7 +132,7 @@
         GlStateManager.func_179103_j(7424);
         GlStateManager.func_179132_a(true);
         GlStateManager.func_179089_o();
-@@ -1378,6 +1391,9 @@
+@@ -1379,6 +1392,9 @@
             this.func_180437_a(renderglobal, p_175068_2_, p_175068_1_);
         }
 
@ -142,7 +142,7 @@
         this.field_78531_r.field_71424_I.func_76318_c("hand");
 
         if (this.field_175074_C)
-@@ -1490,6 +1506,13 @@
+@@ -1491,6 +1507,13 @@
 
     protected void func_78474_d(float p_78474_1_)
     {
@ -156,7 +156,7 @@
         float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_);
 
         if (f > 0.0F)
-@@ -1820,6 +1843,13 @@
+@@ -1821,6 +1844,13 @@
             this.field_175081_S = f7;
         }
 
@ -170,7 +170,7 @@
         GlStateManager.func_179082_a(this.field_175080_Q, this.field_175082_R, this.field_175081_S, 0.0F);
     }
 
-@@ -1830,7 +1860,9 @@
+@@ -1831,7 +1861,9 @@
         GlStateManager.func_187432_a(0.0F, -1.0F, 0.0F);
         GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
         IBlockState iblockstate = ActiveRenderInfo.func_186703_a(this.field_78531_r.field_71441_e, entity, p_78468_2_);
@ -181,7 +181,7 @@
         if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).func_70644_a(MobEffects.field_76440_q))
         {
             float f1 = 5.0F;
-@@ -1915,6 +1947,7 @@
+@@ -1916,6 +1948,7 @@
                 GlStateManager.func_179102_b(f * 0.05F);
                 GlStateManager.func_179153_c(Math.min(f, 192.0F) * 0.5F);
             }
--- a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/ItemModelMesher.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/ItemModelMesher.java
-@@ -32,7 +32,9 @@
+@@ -33,7 +33,9 @@
 
     public TextureAtlasSprite func_178087_a(Item p_178087_1_, int p_178087_2_)
     {
--- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/ItemRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/ItemRenderer.java
-@@ -316,7 +316,7 @@
+@@ -317,7 +317,7 @@
         {
             ItemStack itemstack = abstractclientplayer.func_184607_cu();
 
@ -9,7 +9,7 @@
             {
                 EnumHand enumhand1 = abstractclientplayer.func_184600_cs();
                 flag = enumhand1 == EnumHand.MAIN_HAND;
-@@ -360,7 +360,7 @@
+@@ -361,7 +361,7 @@
                 this.func_187456_a(p_187457_7_, p_187457_5_, enumhandside);
             }
         }
@ -18,7 +18,7 @@
         {
             if (flag && this.field_187468_e == null)
             {
-@@ -444,6 +444,7 @@
+@@ -445,6 +445,7 @@
         if (this.field_78455_a.field_71439_g.func_70094_T())
         {
             IBlockState iblockstate = this.field_78455_a.field_71441_e.func_180495_p(new BlockPos(this.field_78455_a.field_71439_g));
@ -26,7 +26,7 @@
             EntityPlayer entityplayer = this.field_78455_a.field_71439_g;
 
             for (int i = 0; i < 8; ++i)
-@@ -457,11 +458,13 @@
+@@ -458,11 +459,13 @@
                 if (iblockstate1.func_177230_c().func_176214_u())
                 {
                     iblockstate = iblockstate1;
@ -40,7 +40,7 @@
                 this.func_178108_a(p_78447_1_, this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(iblockstate));
             }
         }
-@@ -470,11 +473,13 @@
+@@ -471,11 +474,13 @@
         {
             if (this.field_78455_a.field_71439_g.func_70055_a(Material.field_151586_h))
             {
@ -54,7 +54,7 @@
                 this.func_78442_d(p_78447_1_);
             }
         }
-@@ -596,8 +601,8 @@
+@@ -597,8 +602,8 @@
         else
         {
             float f = entityplayersp.func_184825_o(1.0F);
--- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/RenderGlobal.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/RenderGlobal.java
-@@ -547,8 +547,10 @@
+@@ -548,8 +548,10 @@
 
     public void func_180446_a(Entity p_180446_1_, ICamera p_180446_2_, float p_180446_3_)
     {
@ -11,7 +11,7 @@
             --this.field_72740_G;
         }
         else
-@@ -559,9 +561,12 @@
+@@ -560,9 +562,12 @@
             this.field_72769_h.field_72984_F.func_76320_a("prepare");
             TileEntityRendererDispatcher.field_147556_a.func_178470_a(this.field_72769_h, this.field_72777_q.func_110434_K(), this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), p_180446_3_);
             this.field_175010_j.func_180597_a(this.field_72769_h, this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), this.field_72777_q.field_147125_j, this.field_72777_q.field_71474_y, p_180446_3_);
@ -24,7 +24,7 @@
             Entity entity = this.field_72777_q.func_175606_aa();
             double d3 = entity.field_70142_S + (entity.field_70165_t - entity.field_70142_S) * (double)p_180446_3_;
             double d4 = entity.field_70137_T + (entity.field_70163_u - entity.field_70137_T) * (double)p_180446_3_;
-@@ -573,11 +578,15 @@
+@@ -574,11 +579,15 @@
             this.field_72777_q.field_71460_t.func_180436_i();
             this.field_72769_h.field_72984_F.func_76318_c("global");
             List<Entity> list = this.field_72769_h.func_72910_y();
@ -40,7 +40,7 @@
                 ++this.field_72749_I;
 
                 if (entity1.func_145770_h(d0, d1, d2))
-@@ -599,6 +608,7 @@
+@@ -601,6 +610,7 @@
                 {
                     for (Entity entity2 : classinheritancemultimap)
                     {
@ -48,7 +48,7 @@
                         boolean flag = this.field_175010_j.func_178635_a(entity2, p_180446_2_, d0, d1, d2) || entity2.func_184215_y(this.field_72777_q.field_71439_g);
 
                         if (flag)
-@@ -633,6 +643,7 @@
+@@ -637,6 +647,7 @@
                 }
             }
 
@ -56,7 +56,7 @@
             if (this.func_174985_d() && (!list1.isEmpty() || this.field_184386_ad))
             {
                 this.field_72769_h.field_72984_F.func_76318_c("entityOutlines");
-@@ -672,6 +683,7 @@
+@@ -676,6 +687,7 @@
             this.field_72769_h.field_72984_F.func_76318_c("blockentities");
             RenderHelper.func_74519_b();
 
@ -64,7 +64,7 @@
             for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation1 : this.field_72755_R)
             {
                 List<TileEntity> list3 = renderglobal$containerlocalrenderinformation1.field_178036_a.func_178571_g().func_178485_b();
-@@ -680,6 +692,7 @@
+@@ -684,6 +696,7 @@
                 {
                     for (TileEntity tileentity2 : list3)
                     {
@ -72,7 +72,7 @@
                         TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity2, p_180446_3_, -1);
                     }
                 }
-@@ -689,9 +702,11 @@
+@@ -693,9 +706,11 @@
             {
                 for (TileEntity tileentity : this.field_181024_n)
                 {
@ -84,7 +84,7 @@
 
             this.func_180443_s();
 
-@@ -718,7 +733,7 @@
+@@ -722,7 +737,7 @@
 
                 Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c();
 
@ -93,7 +93,7 @@
                 {
                     TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity1, p_180446_3_, destroyblockprogress.func_73106_e());
                 }
-@@ -1210,6 +1225,13 @@
+@@ -1214,6 +1229,13 @@
 
     public void func_174976_a(float p_174976_1_, int p_174976_2_)
     {
@ -107,7 +107,7 @@
         if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p().func_186068_a() == 1)
         {
             this.func_180448_r();
-@@ -1427,6 +1449,12 @@
+@@ -1431,6 +1453,12 @@
 
     public void func_180447_b(float p_180447_1_, int p_180447_2_)
     {
@ -120,7 +120,7 @@
         if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d())
         {
             if (this.field_72777_q.field_71474_y.func_181147_e() == 2)
-@@ -1854,8 +1882,11 @@
+@@ -1858,8 +1886,11 @@
                 double d4 = (double)blockpos.func_177956_o() - d1;
                 double d5 = (double)blockpos.func_177952_p() - d2;
                 Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c();
--- a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/RenderItem.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/RenderItem.java
-@@ -71,7 +71,7 @@
+@@ -72,7 +72,7 @@
     public RenderItem(TextureManager p_i46552_1_, ModelManager p_i46552_2_, ItemColors p_i46552_3_)
     {
         this.field_175057_n = p_i46552_1_;
@ -9,7 +9,7 @@
         this.func_175041_b();
         this.field_184395_f = p_i46552_3_;
     }
-@@ -223,7 +223,7 @@
+@@ -224,7 +224,7 @@
                 k = k | -16777216;
             }
 
@ -18,8 +18,8 @@
         }
     }
 
-@@ -245,17 +245,7 @@
-     public IBakedModel func_184393_a(ItemStack p_184393_1_, World p_184393_2_, EntityLivingBase p_184393_3_)
+@@ -246,17 +246,7 @@
+     public IBakedModel func_184393_a(ItemStack p_184393_1_, @Nullable World p_184393_2_, @Nullable EntityLivingBase p_184393_3_)
     {
         IBakedModel ibakedmodel = this.field_175059_m.func_178089_a(p_184393_1_);
 -        Item item = p_184393_1_.func_77973_b();
@ -37,7 +37,7 @@
     }
 
     public void func_184392_a(ItemStack p_184392_1_, EntityLivingBase p_184392_2_, ItemCameraTransforms.TransformType p_184392_3_, boolean p_184392_4_)
-@@ -279,14 +269,9 @@
+@@ -280,14 +270,9 @@
             GlStateManager.func_179147_l();
             GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
             GlStateManager.func_179094_E();
@ -54,7 +54,7 @@
             this.func_180454_a(p_184394_1_, p_184394_2_);
             GlStateManager.func_187407_a(GlStateManager.CullFace.BACK);
             GlStateManager.func_179121_F();
-@@ -319,7 +304,7 @@
+@@ -320,7 +305,7 @@
         GlStateManager.func_187401_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
         GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
         this.func_180452_a(p_184390_2_, p_184390_3_, p_184390_4_.func_177556_c());
@ -63,7 +63,7 @@
         this.func_180454_a(p_184390_1_, p_184390_4_);
         GlStateManager.func_179118_c();
         GlStateManager.func_179101_C();
-@@ -424,12 +409,16 @@
+@@ -425,12 +410,16 @@
                 p_180453_1_.func_175063_a(s, (float)(p_180453_3_ + 19 - 2 - p_180453_1_.func_78256_a(s)), (float)(p_180453_4_ + 6 + 3), 16777215);
                 GlStateManager.func_179145_e();
                 GlStateManager.func_179126_j();
@ -83,7 +83,7 @@
                 GlStateManager.func_179140_f();
                 GlStateManager.func_179097_i();
                 GlStateManager.func_179090_x();
-@@ -1053,6 +1042,7 @@
+@@ -1054,6 +1043,7 @@
         this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.LOAD.func_185110_a(), "structure_block");
         this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.CORNER.func_185110_a(), "structure_block");
         this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.DATA.func_185110_a(), "structure_block");
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
@ -1,8 +1,8 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
-@@ -48,14 +48,19 @@
+@@ -49,14 +49,19 @@
 
-     public BakedQuad func_178414_a(Vector3f p_178414_1_, Vector3f p_178414_2_, BlockPartFace p_178414_3_, TextureAtlasSprite p_178414_4_, EnumFacing p_178414_5_, ModelRotation p_178414_6_, BlockPartRotation p_178414_7_, boolean p_178414_8_, boolean p_178414_9_)
+     public BakedQuad func_178414_a(Vector3f p_178414_1_, Vector3f p_178414_2_, BlockPartFace p_178414_3_, TextureAtlasSprite p_178414_4_, EnumFacing p_178414_5_, ModelRotation p_178414_6_, @Nullable BlockPartRotation p_178414_7_, boolean p_178414_8_, boolean p_178414_9_)
     {
 +        return makeBakedQuad(p_178414_1_, p_178414_2_, p_178414_3_, p_178414_4_, p_178414_5_, (net.minecraftforge.common.model.ITransformation)p_178414_6_, p_178414_7_, p_178414_8_, p_178414_9_);
 +    }
@ -22,7 +22,7 @@
         EnumFacing enumfacing = func_178410_a(aint);
 
         if (p_178414_7_ == null)
-@@ -63,7 +68,8 @@
+@@ -64,7 +69,8 @@
             this.func_178408_a(aint, enumfacing);
         }
 
@ -32,9 +32,9 @@
     }
 
     private BlockFaceUV func_188010_a(BlockFaceUV p_188010_1_, EnumFacing p_188010_2_, ModelRotation p_188010_3_)
-@@ -73,11 +79,16 @@
+@@ -74,11 +80,16 @@
 
-     private int[] func_188012_a(BlockFaceUV p_188012_1_, TextureAtlasSprite p_188012_2_, EnumFacing p_188012_3_, float[] p_188012_4_, ModelRotation p_188012_5_, BlockPartRotation p_188012_6_, boolean p_188012_7_)
+     private int[] func_188012_a(BlockFaceUV p_188012_1_, TextureAtlasSprite p_188012_2_, EnumFacing p_188012_3_, float[] p_188012_4_, ModelRotation p_188012_5_, @Nullable BlockPartRotation p_188012_6_, boolean p_188012_7_)
     {
 +        return makeQuadVertexData(p_188012_1_, p_188012_2_, p_188012_3_, p_188012_4_, (net.minecraftforge.common.model.ITransformation)p_188012_5_, p_188012_6_, p_188012_7_);
 +    }
@ -50,9 +50,9 @@
         }
 
         return aint;
-@@ -123,12 +134,17 @@
+@@ -124,12 +135,17 @@
 
-     private void func_188015_a(int[] p_188015_1_, int p_188015_2_, EnumFacing p_188015_3_, BlockFaceUV p_188015_4_, float[] p_188015_5_, TextureAtlasSprite p_188015_6_, ModelRotation p_188015_7_, BlockPartRotation p_188015_8_, boolean p_188015_9_)
+     private void func_188015_a(int[] p_188015_1_, int p_188015_2_, EnumFacing p_188015_3_, BlockFaceUV p_188015_4_, float[] p_188015_5_, TextureAtlasSprite p_188015_6_, ModelRotation p_188015_7_, @Nullable BlockPartRotation p_188015_8_, boolean p_188015_9_)
     {
 -        EnumFacing enumfacing = p_188015_7_.func_177523_a(p_188015_3_);
 +        fillVertexData(p_188015_1_, p_188015_2_, p_188015_3_, p_188015_4_, p_188015_5_, p_188015_6_, (net.minecraftforge.common.model.ITransformation)p_188015_7_, p_188015_8_, p_188015_9_);
@ -70,7 +70,7 @@
         this.func_178404_a(p_188015_1_, j, p_188015_2_, vector3f, i, p_188015_6_, p_188015_4_);
     }
 
-@@ -139,8 +155,8 @@
+@@ -140,8 +156,8 @@
         p_178404_1_[i + 1] = Float.floatToRawIntBits(p_178404_4_.y);
         p_178404_1_[i + 2] = Float.floatToRawIntBits(p_178404_4_.z);
         p_178404_1_[i + 3] = p_178404_5_;
@ -80,8 +80,8 @@
 +        p_178404_1_[i + 4 + 1] = Float.floatToRawIntBits(p_178404_6_.func_94207_b((double)p_178404_7_.func_178346_b(p_178404_3_) * .999 + p_178404_7_.func_178346_b((p_178404_3_ + 2) % 4) * .001));
     }
 
-     private void func_178407_a(Vector3f p_178407_1_, BlockPartRotation p_178407_2_)
-@@ -189,14 +205,19 @@
+     private void func_178407_a(Vector3f p_178407_1_, @Nullable BlockPartRotation p_178407_2_)
+@@ -190,14 +206,19 @@
 
     public int func_188011_a(Vector3f p_188011_1_, EnumFacing p_188011_2_, int p_188011_3_, ModelRotation p_188011_4_)
     {
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/IBakedModel.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/IBakedModel.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/block/model/IBakedModel.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/IBakedModel.java
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
 
     TextureAtlasSprite func_177554_e();
 
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java.patch
@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java
-@@ -27,6 +27,7 @@
-         }
+@@ -29,6 +29,7 @@
     }
 
+     @Nullable
 +    @Deprecated
-     public ResourceLocation func_188021_a(ItemStack p_188021_1_, World p_188021_2_, EntityLivingBase p_188021_3_)
+     public ResourceLocation func_188021_a(ItemStack p_188021_1_, @Nullable World p_188021_2_, @Nullable EntityLivingBase p_188021_3_)
     {
         if (!this.field_188023_b.isEmpty())
-@@ -42,4 +43,23 @@
+@@ -44,4 +45,23 @@
 
         return null;
     }
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java
-@@ -102,6 +102,21 @@
+@@ -103,6 +103,21 @@
             {
                 try
                 {
@ -22,16 +22,16 @@
                     ModelBlockDefinition modelblockdefinition = this.func_177586_a(resourcelocation);
                     Map<IBlockState, ModelResourceLocation> map = blockstatemapper.func_188181_b(block);
 
-@@ -109,7 +124,7 @@
+@@ -110,7 +125,7 @@
                     {
                         Collection<ModelResourceLocation> collection = Sets.newHashSet(map.values());
                         modelblockdefinition.func_188001_c().func_188138_a(block.func_176194_O());
 -                        this.field_188642_k.put(modelblockdefinition, Lists.newArrayList(Iterables.filter(collection, new Predicate<ModelResourceLocation>()
 +                        registerMultipartVariant(modelblockdefinition, Lists.newArrayList(Iterables.filter(collection, new Predicate<ModelResourceLocation>()
                         {
-                             public boolean apply(ModelResourceLocation p_apply_1_)
+                             public boolean apply(@Nullable ModelResourceLocation p_apply_1_)
                             {
-@@ -126,22 +141,18 @@
+@@ -127,22 +142,18 @@
                         {
                             try
                             {
@ -56,7 +56,7 @@
             }
         }
     }
-@@ -370,6 +381,7 @@
+@@ -371,6 +382,7 @@
 
     protected void func_177592_e()
     {
@ -64,7 +64,7 @@
         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150348_b), Lists.newArrayList(new String[] {"stone", "granite", "granite_smooth", "diorite", "diorite_smooth", "andesite", "andesite_smooth"}));
         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150346_d), Lists.newArrayList(new String[] {"dirt", "coarse_dirt", "podzol"}));
         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150344_f), Lists.newArrayList(new String[] {"oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks"}));
-@@ -413,6 +425,10 @@
+@@ -414,6 +426,10 @@
         this.field_177613_u.put(Item.func_150898_a(Blocks.field_180407_aO), Lists.newArrayList(new String[] {"oak_fence"}));
         this.field_177613_u.put(Items.field_179570_aq, Lists.newArrayList(new String[] {"oak_door"}));
         this.field_177613_u.put(Items.field_151124_az, Lists.newArrayList(new String[] {"oak_boat"}));
@ -75,7 +75,7 @@
     }
 
     protected List<String> func_177596_a(Item p_177596_1_)
-@@ -429,7 +445,7 @@
+@@ -430,7 +446,7 @@
 
     protected ResourceLocation func_177583_a(String p_177583_1_)
     {
@ -84,7 +84,7 @@
         return new ResourceLocation(resourcelocation.func_110624_b(), "item/" + resourcelocation.func_110623_a());
     }
 
-@@ -536,7 +552,7 @@
+@@ -538,7 +554,7 @@
         for (Entry<String, ResourceLocation> entry : this.field_177615_s.entrySet())
         {
             ResourceLocation resourcelocation = (ResourceLocation)entry.getValue();
@ -93,8 +93,8 @@
             ModelBlock modelblock = (ModelBlock)this.field_177611_h.get(resourcelocation);
 
             if (modelblock != null && modelblock.func_178303_d())
-@@ -623,6 +639,11 @@
- 
+@@ -626,6 +642,11 @@
+     @Nullable
     private IBakedModel func_177578_a(ModelBlock p_177578_1_, ModelRotation p_177578_2_, boolean p_177578_3_)
     {
 +        return bakeModel(p_177578_1_, (net.minecraftforge.common.model.ITransformation)p_177578_2_, p_177578_3_);
@ -105,7 +105,7 @@
         TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)this.field_177599_g.get(new ResourceLocation(p_177578_1_.func_178308_c("particle")));
         SimpleBakedModel.Builder simplebakedmodel$builder = (new SimpleBakedModel.Builder(p_177578_1_, p_177578_1_.func_187967_g())).func_177646_a(textureatlassprite);
 
-@@ -639,13 +660,13 @@
+@@ -642,13 +663,13 @@
                     BlockPartFace blockpartface = (BlockPartFace)blockpart.field_178240_c.get(enumfacing);
                     TextureAtlasSprite textureatlassprite1 = (TextureAtlasSprite)this.field_177599_g.get(new ResourceLocation(p_177578_1_.func_178308_c(blockpartface.field_178242_d)));
 
@ -122,7 +122,7 @@
                     }
                 }
             }
-@@ -656,9 +677,14 @@
+@@ -659,9 +680,14 @@
 
     private BakedQuad func_177589_a(BlockPart p_177589_1_, BlockPartFace p_177589_2_, TextureAtlasSprite p_177589_3_, EnumFacing p_177589_4_, ModelRotation p_177589_5_, boolean p_177589_6_)
     {
@ -138,7 +138,7 @@
     private void func_177597_h()
     {
         this.func_177574_i();
-@@ -878,4 +904,23 @@
+@@ -882,4 +908,23 @@
         field_177606_o.field_178317_b = "generation marker";
         field_177616_r.field_178317_b = "block entity marker";
     }
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
-@@ -31,7 +31,7 @@
+@@ -34,7 +34,7 @@
 
     public static ModelBlockDefinition func_178331_a(Reader p_178331_0_)
     {
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
         }
         else
         {
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch
@ -1,26 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
-@@ -133,7 +133,9 @@
-                 return;
-             }
- 
-            iblockaccess = new RegionRenderCache(this.field_178588_d, blockpos.func_177982_a(-1, -1, -1), blockpos1.func_177982_a(1, 1, 1), 1);
-+            RegionRenderCache cache = createRegionRenderCache(this.field_178588_d, blockpos.func_177982_a(-1, -1, -1), blockpos1.func_177982_a(1, 1, 1), 1);
-+            net.minecraftforge.client.MinecraftForgeClient.onRebuildChunk(field_178588_d, field_178586_f, cache);
-+            iblockaccess = cache;
-             p_178581_4_.func_178543_a(compiledchunk);
-         }
-         finally
-@@ -160,7 +162,7 @@
-                     lvt_10_1_.func_178606_a(blockpos$mutableblockpos);
+@@ -162,7 +162,7 @@
+                     lvt_9_1_.func_178606_a(blockpos$mutableblockpos);
                 }
 
 -                if (block.func_149716_u())
 +                if (block.hasTileEntity(iblockstate))
                 {
-                     TileEntity tileentity = iblockaccess.func_175625_s(new BlockPos(blockpos$mutableblockpos));
-                     TileEntitySpecialRenderer<TileEntity> tileentityspecialrenderer = TileEntityRendererDispatcher.field_147556_a.<TileEntity>func_147547_b(tileentity);
-@@ -176,7 +178,9 @@
+                     TileEntity tileentity = this.field_189564_r.func_175625_s(new BlockPos(blockpos$mutableblockpos));
+ 
+@@ -182,7 +182,9 @@
                     }
                 }
 
@ -31,16 +20,27 @@
                 int j = blockrenderlayer1.ordinal();
 
                 if (block.func_176223_P().func_185901_i() != EnumBlockRenderType.INVISIBLE)
-@@ -191,6 +195,8 @@
+@@ -197,6 +199,8 @@
 
-                     aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, iblockaccess, vertexbuffer);
+                     aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, this.field_189564_r, vertexbuffer);
                 }
 +                }
 +                net.minecraftforge.client.ForgeHooksClient.setRenderLayer(null);
             }
 
             for (BlockRenderLayer blockrenderlayer : BlockRenderLayer.values())
-@@ -413,6 +419,26 @@
+@@ -278,7 +282,9 @@
+     private void func_189563_q()
+     {
+         int i = 1;
+-        this.field_189564_r = new ChunkCache(this.field_178588_d, this.field_178586_f.func_177982_a(-1, -1, -1), this.field_178586_f.func_177982_a(16, 16, 16), 1);
+        ChunkCache cache = createRegionRenderCache(this.field_178588_d, this.field_178586_f.func_177982_a(-1, -1, -1), this.field_178586_f.func_177982_a(16, 16, 16), 1);
+        net.minecraftforge.client.MinecraftForgeClient.onRebuildChunk(this.field_178588_d, this.field_178586_f, cache);
+        this.field_189564_r = cache;
+     }
+ 
+     @Nullable
+@@ -427,6 +433,26 @@
         return this.field_178593_n && this.field_188284_q;
     }
 
@ -58,12 +58,12 @@
 +     *                 the cache a 20x20x20 cube, for a total of 8000 states in the cache.
 +     * @return new RegionRenderCache instance
 +     */
-+    protected RegionRenderCache createRegionRenderCache(World world, BlockPos from, BlockPos to, int subtract)
+    protected ChunkCache createRegionRenderCache(World world, BlockPos from, BlockPos to, int subtract)
 +    {
-+        return new RegionRenderCache(world, from, to, subtract);
+        return new ChunkCache(world, from, to, subtract);
 +    }
 +    /* ========================================= FORGE END ======================================*/
 +
     public BlockPos func_181701_a(EnumFacing p_181701_1_)
     {
-         return (BlockPos)this.field_181702_p.get(p_181701_1_);
+         return this.field_181702_p[p_181701_1_.ordinal()];
--- a/patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/color/BlockColors.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/color/BlockColors.java
-@@ -25,7 +25,8 @@
+@@ -26,7 +26,8 @@
 @SideOnly(Side.CLIENT)
 public class BlockColors
 {
@ -10,16 +10,16 @@
 
     public static BlockColors func_186723_a()
     {
-@@ -145,7 +146,7 @@
+@@ -146,7 +147,7 @@
 
-     public int func_186724_a(IBlockState p_186724_1_, IBlockAccess p_186724_2_, BlockPos p_186724_3_, int p_186724_4_)
+     public int func_186724_a(IBlockState p_186724_1_, @Nullable IBlockAccess p_186724_2_, @Nullable BlockPos p_186724_3_, int p_186724_4_)
     {
 -        IBlockColor iblockcolor = (IBlockColor)this.field_186725_a.func_148745_a(Block.func_149682_b(p_186724_1_.func_177230_c()));
 +        IBlockColor iblockcolor = (IBlockColor)this.blockColorMap.get(p_186724_1_.func_177230_c().delegate);
         return iblockcolor == null ? -1 : iblockcolor.func_186720_a(p_186724_1_, p_186724_2_, p_186724_3_, p_186724_4_);
     }
 
-@@ -155,7 +156,9 @@
+@@ -156,7 +157,9 @@
 
         for (int j = p_186722_2_.length; i < j; ++i)
         {
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
-@@ -204,8 +204,13 @@
+@@ -205,8 +205,13 @@
         this.field_178637_m = new RenderPlayer(this);
         this.field_178636_l.put("default", this.field_178637_m);
         this.field_178636_l.put("slim", new RenderPlayer(this, true));
@ -14,7 +14,7 @@
     public void func_178628_a(double p_178628_1_, double p_178628_3_, double p_178628_5_)
     {
         this.field_78725_b = p_178628_1_;
-@@ -253,9 +258,9 @@
+@@ -255,9 +260,9 @@
             IBlockState iblockstate = p_180597_1_.func_180495_p(new BlockPos(p_180597_3_));
             Block block = iblockstate.func_177230_c();
 
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch
@ -1,10 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
-@@ -59,29 +59,27 @@
+@@ -58,31 +58,29 @@
+             if (itemarmor.func_185083_B_() == p_188361_9_)
+             {
                 T t = this.func_188360_a(p_188361_9_);
+                t = getArmorModelHook(p_188361_1_, itemstack, p_188361_9_, t);
                 t.func_178686_a(this.field_177190_a.func_177087_b());
                 t.func_78086_a(p_188361_1_, p_188361_2_, p_188361_3_, p_188361_4_);
-+                t = getArmorModelHook(p_188361_1_, itemstack, p_188361_9_, t);
                 this.func_188359_a(t, p_188361_9_);
                 boolean flag = this.func_188363_b(p_188361_9_);
 -                this.field_177190_a.func_110776_a(this.func_177181_a(itemarmor, flag));
@ -40,7 +42,7 @@
                         {
                             func_188364_a(this.field_177190_a, p_188361_1_, t, p_188361_2_, p_188361_3_, p_188361_4_, p_188361_5_, p_188361_6_, p_188361_7_, p_188361_8_);
                         }
-@@ -140,11 +138,13 @@
+@@ -142,11 +140,13 @@
         GlStateManager.func_179084_k();
     }
 
@ -54,7 +56,7 @@
     private ResourceLocation func_177178_a(ItemArmor p_177178_1_, boolean p_177178_2_, String p_177178_3_)
     {
         String s = String.format("textures/models/armor/%s_layer_%d%s.png", new Object[] {p_177178_1_.func_82812_d().func_179242_c(), Integer.valueOf(p_177178_2_ ? 2 : 1), p_177178_3_ == null ? "" : String.format("_%s", new Object[]{p_177178_3_})});
-@@ -162,4 +162,49 @@
+@@ -164,4 +164,49 @@
     protected abstract void func_177177_a();
 
     protected abstract void func_188359_a(T p_188359_1_, EntityEquipmentSlot p_188359_2_);
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java.patch
@ -0,0 +1,18 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
+@@ -50,13 +50,13 @@
+         if (p_188358_2_ != null)
+         {
+             GlStateManager.func_179094_E();
+-            ((ModelBiped)this.field_177206_a.func_177087_b()).func_187073_a(0.0625F, p_188358_4_);
+ 
+             if (p_188358_1_.func_70093_af())
+             {
+                 GlStateManager.func_179109_b(0.0F, 0.2F, 0.0F);
+             }
+-
+            // Forge: moved this call down, fixes incorrect offset while sneaking.
+            ((ModelBiped)this.field_177206_a.func_177087_b()).func_187073_a(0.0625F, p_188358_4_);
+             GlStateManager.func_179114_b(-90.0F, 1.0F, 0.0F, 0.0F);
+             GlStateManager.func_179114_b(180.0F, 0.0F, 1.0F, 0.0F);
+             boolean flag = p_188358_4_ == EnumHandSide.LEFT;
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
 @SideOnly(Side.CLIENT)
 public class TextureMap extends AbstractTexture implements ITickableTextureObject
 {
@ -8,17 +8,17 @@
     private static final Logger field_147635_d = LogManager.getLogger();
     public static final ResourceLocation field_174945_f = new ResourceLocation("missingno");
     public static final ResourceLocation field_110575_b = new ResourceLocation("textures/atlas/blocks.png");
-@@ -36,6 +37,7 @@
-     private final IIconCreator field_174946_m;
+@@ -37,6 +38,7 @@
+     private final ITextureMapPopulator field_174946_m;
     private int field_147636_j;
     private final TextureAtlasSprite field_94249_f;
 +    private boolean skipFirst = false;
 
     public TextureMap(String p_i46099_1_)
     {
-@@ -44,12 +46,23 @@
+@@ -45,12 +47,23 @@
 
-     public TextureMap(String p_i46100_1_, IIconCreator p_i46100_2_)
+     public TextureMap(String p_i46100_1_, @Nullable ITextureMapPopulator p_i46100_2_)
     {
 +        this(p_i46100_1_, p_i46100_2_, false);
 +    }
@ -28,7 +28,7 @@
 +        this(basePathIn, null, skipFirst);
 +    }
 +
-+    public TextureMap(String p_i46100_1_, IIconCreator p_i46100_2_, boolean skipFirst)
+    public TextureMap(String p_i46100_1_, ITextureMapPopulator p_i46100_2_, boolean skipFirst)
 +    {
         this.field_94258_i = Lists.<TextureAtlasSprite>newArrayList();
         this.field_110574_e = Maps.<String, TextureAtlasSprite>newHashMap();
@ -40,7 +40,7 @@
     }
 
     private void func_110569_e()
-@@ -88,12 +101,26 @@
+@@ -89,12 +102,26 @@
         int j = Integer.MAX_VALUE;
         int k = 1 << this.field_147636_j;
 
@ -67,7 +67,7 @@
             try
             {
                 PngSizeInfo pngsizeinfo = PngSizeInfo.func_188532_a(p_110571_1_.func_110536_a(resourcelocation));
-@@ -103,12 +130,14 @@
+@@ -104,12 +131,14 @@
             }
             catch (RuntimeException runtimeexception)
             {
@ -84,7 +84,7 @@
                 continue;
             }
             finally
-@@ -128,6 +157,7 @@
+@@ -129,6 +158,7 @@
             stitcher.func_110934_a(textureatlassprite);
         }
 
@ -92,7 +92,7 @@
         int l = Math.min(j, k);
         int i1 = MathHelper.func_151239_c(l);
 
-@@ -139,9 +169,12 @@
+@@ -140,9 +170,12 @@
 
         this.field_94249_f.func_147963_d(this.field_147636_j);
         stitcher.func_110934_a(this.field_94249_f);
@ -105,7 +105,7 @@
             stitcher.func_94305_f();
         }
         catch (StitcherException stitcherexception)
-@@ -150,11 +183,16 @@
+@@ -151,11 +184,16 @@
         }
 
         field_147635_d.info("Created: {}x{} {}-atlas", new Object[] {Integer.valueOf(stitcher.func_110935_a()), Integer.valueOf(stitcher.func_110936_b()), this.field_94254_c});
@ -122,7 +122,7 @@
             if (textureatlassprite1 == this.field_94249_f || this.func_184397_a(p_110571_1_, textureatlassprite1))
             {
                 String s = textureatlassprite1.func_94215_i();
-@@ -185,6 +223,13 @@
+@@ -186,6 +224,13 @@
         {
             textureatlassprite2.func_94217_a(this.field_94249_f);
         }
@ -136,7 +136,7 @@
     }
 
     private boolean func_184397_a(IResourceManager p_184397_1_, final TextureAtlasSprite p_184397_2_)
-@@ -194,7 +239,7 @@
+@@ -195,7 +240,7 @@
         label9:
         {
             boolean flag;
@ -145,7 +145,7 @@
             try
             {
                 iresource = p_184397_1_.func_110536_a(resourcelocation);
-@@ -291,7 +336,7 @@
+@@ -292,7 +337,7 @@
         }
         else
         {
@ -154,7 +154,7 @@
 
             if (textureatlassprite == null)
             {
-@@ -317,4 +362,37 @@
+@@ -318,4 +363,37 @@
     {
         return this.field_94249_f;
     }
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
-@@ -106,11 +106,14 @@
+@@ -108,11 +108,14 @@
     {
         if (p_180546_1_.func_145835_a(this.field_147560_j, this.field_147561_k, this.field_147558_l) < p_180546_1_.func_145833_n())
         {
@ -15,7 +15,7 @@
             BlockPos blockpos = p_180546_1_.func_174877_v();
             this.func_178469_a(p_180546_1_, (double)blockpos.func_177958_n() - field_147554_b, (double)blockpos.func_177956_o() - field_147555_c, (double)blockpos.func_177952_p() - field_147552_d, p_180546_2_, p_180546_3_);
         }
-@@ -129,6 +132,11 @@
+@@ -131,6 +134,11 @@
         {
             try
             {
@ -27,7 +27,7 @@
                 tileentityspecialrenderer.func_180535_a(p_178469_1_, p_178469_2_, p_178469_4_, p_178469_6_, p_178469_8_, p_178469_9_);
             }
             catch (Throwable throwable)
-@@ -155,4 +163,52 @@
+@@ -157,4 +165,52 @@
     {
         return this.field_147557_n;
     }
--- a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch
+++ b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch
@ -8,4 +8,4 @@
 +        field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", new Object[] {p_110594_1_, this.field_110597_b});
     }
 
-     public <T extends IMetadataSection> T func_135058_a(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException
+     public <T extends IMetadataSection> T func_135058_a(MetadataSerializer p_135058_1_, String p_135058_2_) throws IOException
--- a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
 +++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
-@@ -92,6 +92,7 @@
+@@ -93,6 +93,7 @@
     public void func_110541_a(List<IResourcePack> p_110541_1_)
     {
         this.func_110543_a();
 +        net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1, true);
         field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function<IResourcePack, String>()
         {
-             public String apply(IResourcePack p_apply_1_)
-@@ -102,23 +103,32 @@
+             public String apply(@Nullable IResourcePack p_apply_1_)
+@@ -103,23 +104,32 @@
 
         for (IResourcePack iresourcepack : p_110541_1_)
         {
--- a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
+++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
 +++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
-@@ -147,6 +147,7 @@
+@@ -148,6 +148,7 @@
 
     public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_)
     {
@ -8,7 +8,7 @@
         this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac);
         this.field_74318_M = EnumDifficulty.NORMAL;
         this.field_74332_R = "";
-@@ -171,6 +172,7 @@
+@@ -172,6 +173,7 @@
 
     public GameSettings()
     {
@ -16,7 +16,7 @@
         this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac);
         this.field_74318_M = EnumDifficulty.NORMAL;
         this.field_74332_R = "";
-@@ -846,6 +848,7 @@
+@@ -854,6 +856,7 @@
                         if (astring[0].equals("key_" + keybinding.func_151464_g()))
                         {
                             keybinding.func_151462_b(Integer.parseInt(astring[1]));
@ -24,7 +24,7 @@
                         }
                     }
 
-@@ -887,6 +890,7 @@
+@@ -895,6 +898,7 @@
 
     public void func_74303_b()
     {
@ -32,7 +32,7 @@
         try
         {
             PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai));
-@@ -955,7 +959,8 @@
+@@ -964,7 +968,8 @@
 
             for (KeyBinding keybinding : this.field_74324_K)
             {
@ -42,7 +42,7 @@
             }
 
             for (SoundCategory soundcategory : SoundCategory.values())
-@@ -1184,4 +1189,24 @@
+@@ -1194,4 +1199,24 @@
             return p_148264_1_;
         }
     }
--- a/patches/minecraft/net/minecraft/command/CommandEnchant.java.patch
+++ b/patches/minecraft/net/minecraft/command/CommandEnchant.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/CommandEnchant.java
 +++ ../src-work/minecraft/net/minecraft/command/CommandEnchant.java
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
                                 {
                                     Enchantment enchantment1 = Enchantment.func_185262_c(k);
 
--- a/patches/minecraft/net/minecraft/command/CommandFill.java.patch
+++ b/patches/minecraft/net/minecraft/command/CommandFill.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/CommandFill.java
 +++ ../src-work/minecraft/net/minecraft/command/CommandFill.java
-@@ -50,6 +50,7 @@
+@@ -51,6 +51,7 @@
             {
                 i = func_175764_a(p_184881_3_[7], 0, 15);
             }
@ -8,7 +8,7 @@
 
             BlockPos blockpos2 = new BlockPos(Math.min(blockpos.func_177958_n(), blockpos1.func_177958_n()), Math.min(blockpos.func_177956_o(), blockpos1.func_177956_o()), Math.min(blockpos.func_177952_p(), blockpos1.func_177952_p()));
             BlockPos blockpos3 = new BlockPos(Math.max(blockpos.func_177958_n(), blockpos1.func_177958_n()), Math.max(blockpos.func_177956_o(), blockpos1.func_177956_o()), Math.max(blockpos.func_177952_p(), blockpos1.func_177952_p()));
-@@ -77,7 +78,7 @@
+@@ -78,7 +79,7 @@
                 NBTTagCompound nbttagcompound = new NBTTagCompound();
                 boolean flag = false;
 
@ -17,7 +17,7 @@
                 {
                     String s = func_147178_a(p_184881_2_, p_184881_3_, 9).func_150260_c();
 
-@@ -118,7 +119,7 @@
+@@ -119,7 +120,7 @@
                                             continue;
                                         }
                                     }
--- a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch
+++ b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/CommandHandler.java
 +++ ../src-work/minecraft/net/minecraft/command/CommandHandler.java
-@@ -46,6 +46,16 @@
+@@ -47,6 +47,16 @@
         }
         else if (icommand.func_184882_a(this.func_184879_a(), p_71556_1_))
         {
@ -17,7 +17,7 @@
             if (i > -1)
             {
                 List<Entity> list = EntitySelector.<Entity>func_179656_b(p_71556_1_, astring[i], Entity.class);
-@@ -109,7 +119,7 @@
+@@ -110,7 +120,7 @@
             TextComponentTranslation textcomponenttranslation = new TextComponentTranslation("commands.generic.exception", new Object[0]);
             textcomponenttranslation.func_150256_b().func_150238_a(TextFormatting.RED);
             p_175786_1_.func_145747_a(textcomponenttranslation);
--- a/patches/minecraft/net/minecraft/command/EntitySelector.java.patch
+++ b/patches/minecraft/net/minecraft/command/EntitySelector.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/EntitySelector.java
 +++ ../src-work/minecraft/net/minecraft/command/EntitySelector.java
-@@ -36,9 +36,9 @@
+@@ -37,9 +37,9 @@
 
 public class EntitySelector
 {
@ -11,4 +11,4 @@
 +    private static final Pattern field_82388_c = Pattern.compile("\\G(\\w+)=([-!]?[\\w\\.-]*)(?:$|,)"); // FORGE: allow . in entity selectors
     private static final Set<String> field_179666_d = Sets.newHashSet(new String[] {"x", "y", "z", "dx", "dy", "dz", "rm", "r"});
 
-     public static EntityPlayerMP func_82386_a(ICommandSender p_82386_0_, String p_82386_1_)
+     @Nullable
--- a/patches/minecraft/net/minecraft/command/server/CommandSetBlock.java.patch
+++ b/patches/minecraft/net/minecraft/command/server/CommandSetBlock.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/server/CommandSetBlock.java
 +++ ../src-work/minecraft/net/minecraft/command/server/CommandSetBlock.java
-@@ -54,6 +54,8 @@
+@@ -55,6 +55,8 @@
                 i = func_175764_a(p_184881_3_[4], 0, 15);
             }
 
@ -9,7 +9,7 @@
             World world = p_184881_2_.func_130014_f_();
 
             if (!world.func_175667_e(blockpos))
-@@ -65,7 +67,7 @@
+@@ -66,7 +68,7 @@
                 NBTTagCompound nbttagcompound = new NBTTagCompound();
                 boolean flag = false;
 
--- a/patches/minecraft/net/minecraft/command/server/CommandTestForBlock.java.patch
+++ b/patches/minecraft/net/minecraft/command/server/CommandTestForBlock.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/server/CommandTestForBlock.java
 +++ ../src-work/minecraft/net/minecraft/command/server/CommandTestForBlock.java
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@
                     NBTTagCompound nbttagcompound = new NBTTagCompound();
                     boolean flag = false;
 
--- a/patches/minecraft/net/minecraft/crash/CrashReport.java.patch
+++ b/patches/minecraft/net/minecraft/crash/CrashReport.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/crash/CrashReport.java
 +++ ../src-work/minecraft/net/minecraft/crash/CrashReport.java
-@@ -115,6 +115,7 @@
+@@ -114,6 +114,7 @@
                 return IntCache.func_85144_b();
             }
         });
--- a/patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch
+++ b/patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/crash/CrashReportCategory.java
 +++ ../src-work/minecraft/net/minecraft/crash/CrashReportCategory.java
-@@ -122,8 +122,11 @@
+@@ -121,8 +121,11 @@
         }
         else
         {
--- a/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch
+++ b/patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/enchantment/Enchantment.java
 +++ ../src-work/minecraft/net/minecraft/enchantment/Enchantment.java
-@@ -12,9 +12,9 @@
+@@ -13,9 +13,9 @@
 import net.minecraft.util.registry.RegistryNamespaced;
 import net.minecraft.util.text.translation.I18n;
 
@ -12,7 +12,7 @@
     private final EntityEquipmentSlot[] field_185263_a;
     private final Enchantment.Rarity field_77333_a;
     public EnumEnchantmentType field_77351_y;
-@@ -118,7 +118,7 @@
+@@ -122,7 +122,7 @@
 
     public boolean func_92089_a(ItemStack p_92089_1_)
     {
@ -21,7 +21,7 @@
     }
 
     public void func_151368_a(EntityLivingBase p_151368_1_, Entity p_151368_2_, int p_151368_3_)
-@@ -134,6 +134,26 @@
+@@ -138,6 +138,26 @@
         return false;
     }
 
--- a/Show more
+++ b/Show more