Initial patch update to 1.12.

Some things to note:
Netty is screwy so currently can't join single player. @cpw
Crafting has been MAJORY reworked. The current GameRegistry functions are nooped, this is IN THE WORKS.
  Just need to move the recipe list to a full class registry, and then re implement the in-code recipe registration.
  Also, it IS advised that modders move to JSON, because ideally we'll see a S->C recipe syncing system in 1.13
  which would allow servers to have custom recipes.
  OreDictionary currently 1/2 works, need to write a better algorithm for replacing ingredients.
  Please be patient
Rendering:
  A lot of functions got a new float parameter, this is similar to partial ticks, needs more research

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 
@@ -26,7 +26,7 @@ apply plugin: "maven"
 apply plugin: "net.minecraftforge.gradle.patcher"
 apply plugin: "net.minecraftforge.gradle.launch4j"
 
-minecraft.version = "1.11.2"
+minecraft.version = "1.12"
 
 minecraft {
     mappings = 'snapshot_nodoc_20161220'
@@ -202,7 +202,7 @@ launch4j {
     outfile = file("build/distributions/${project.name}-${project.version}-installer-win.exe").canonicalPath
     icon = file('icon.ico').canonicalPath
     manifest = file('l4jManifest.xml').canonicalPath
-    jreMinVersion = '1.6.0'
+    jreMinVersion = '1.8.0'
     initialHeapPercent = 5;
     maxHeapPercent = 100;
 }

jsons/1.12-dev.json

@@ -0,0 +1,92 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "inheritsFrom": "1.12",
+  "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.1",
+      "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"
+    }
+  ]
+}

jsons/1.12-rel.json

@@ -0,0 +1,154 @@
+{
+"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",
+  "modList":"none"
+},
+"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.12",
+  "jar": "1.12",
+  "logging": {},
+  "libraries": [
+    {
+      "name": "@artifact@",
+      "url": "http://files.minecraftforge.net/maven/"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12",
+      "serverreq":true
+    },
+    {
+      "name": "org.ow2.asm:asm-all:5.1",
+      "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
+    }
+  ]
+},
+"optionals": [
+    {
+        "name": "Mercurius",
+        "client": true,
+        "server": true,
+        "default": true,
+        "inject": true,
+        "desc": "A mod that collects statistics about Minecraft and your system.<br>Useful for Forge to understand how Minecraft/Forge are used.",
+        "url": "http://www.minecraftforge.net/forum/index.php?topic=43278.0",
+        "artifact": "net.minecraftforge:MercuriusUpdater:1.12",
+        "maven": "http://files.minecraftforge.net/maven/"
+    }
+]
+}

jsons/1.12.json

@@ -0,0 +1,724 @@
+{
+    "assetIndex": {
+        "id": "1.12",
+        "sha1": "9838fc4e7d9808b5d9b44c97f6034a304ed4854c",
+        "size": 169014,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.12/9838fc4e7d9808b5d9b44c97f6034a304ed4854c/1.12.json",
+        "totalSize": 127005140
+    },
+    "assets": "1.12",
+    "downloads": {
+        "client": {
+            "sha1": "909823f9c467f9934687f136bc95a667a0d19d7f",
+            "size": 10177098,
+            "url": "https://launcher.mojang.com/mc/game/1.12/client/909823f9c467f9934687f136bc95a667a0d19d7f/client.jar"
+        },
+        "server": {
+            "sha1": "8494e844e911ea0d63878f64da9dcc21f53a3463",
+            "size": 30202458,
+            "url": "https://launcher.mojang.com/mc/game/1.12/server/8494e844e911ea0d63878f64da9dcc21f53a3463/server.jar"
+        }
+    },
+    "id": "1.12",
+    "libraries": [
+        {
+            "name": "com.mojang:patchy:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 15817,
+                    "sha1": "aef610b34a1be37fa851825f12372b78424d8903",
+                    "path": "com/mojang/patchy/1.1/patchy-1.1.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/patchy/1.1/patchy-1.1.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:4.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1091208,
+                    "sha1": "cb208278274bf12ebdb56c61bd7407e6f774d65a",
+                    "path": "net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/4.4.0/jna-4.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:5.0.3",
+            "downloads": {
+                "artifact": {
+                    "size": 78175,
+                    "sha1": "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
+                    "path": "net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.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.1.9.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 3511093,
+                    "sha1": "0097860965d6a0a6b98e7f569f3f966727b8db75",
+                    "path": "io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:21.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2521113,
+                    "sha1": "3a3d111be1be1b745edfa7d91678a12d7ed38709",
+                    "path": "com/google/guava/guava/21.0/guava-21.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/21.0/guava-21.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 780282,
+                        "sha1": "8ca309192f104265c67a1570245ae827a8650af9",
+                        "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 479881,
+                    "sha1": "6c6c702c89bfff3cd9e80b04d668c5e190d588c6",
+                    "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 372821,
+                        "sha1": "32b15369c83e9435ced8cd3fbe652dfba9c497ef",
+                        "path": "commons-io/commons-io/2.5/commons-io-2.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 208700,
+                    "sha1": "2852e6e05fbb95076fc091f6d1780f1f8fe35e0f",
+                    "path": "commons-io/commons-io/2.5/commons-io-2.5.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.10",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 256617,
+                        "sha1": "df86446f0fe79f15ce8048c0ed04d1a92fa8d265",
+                        "path": "commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 284184,
+                    "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+                    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10.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.8.0",
+            "downloads": {
+                "artifact": {
+                    "size": 231952,
+                    "sha1": "c4ba5371a29ac9b2ad6129b1d39ea38750043eff",
+                    "path": "com/google/code/gson/gson/2.8.0/gson-2.8.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.25",
+            "downloads": {
+                "artifact": {
+                    "size": 65621,
+                    "sha1": "9834cdf236c22e84b946bba989e2f94ef5897c3c",
+                    "path": "com/mojang/authlib/1.5.25/authlib-1.5.25.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.25/authlib-1.5.25.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.10.16",
+            "downloads": {
+                "artifact": {
+                    "size": 3257394,
+                    "sha1": "b4948eb06ff238e45044f47aa69c2c977ce69dcb",
+                    "path": "com/mojang/realms/1.10.16/realms-1.10.16.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.16/realms-1.10.16.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.1.0",
+            "downloads": {
+                "artifact": {
+                    "size": 17655579,
+                    "sha1": "9835253257524c1be7ab50c057aa2d418fb72082",
+                    "path": "it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 192791,
+                        "sha1": "9d0c48c6186ea7f7f443803801ee7c9469129b85",
+                        "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 228859,
+                    "sha1": "e801d13612e22cad62a3f4f3fe7fdbe6334a8e72",
+                    "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 1412295,
+                        "sha1": "ef19122d4ad5de8da81fafabd007403007c8a832",
+                        "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 1402925,
+                    "sha1": "4ac28ff2f1ddf05dae3043a190451e8c46b73c31",
+                    "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.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"
+                    }
+                }
+            }
+        },
+        {
+            "name": "com.mojang:text2speech:1.10.3",
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "com.mojang:text2speech:1.10.3",
+            "natives": {
+                "linux": "natives-linux",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "natives": {
+                "osx": "natives-osx"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        }
+    ],
+    "logging": {
+        "client": {
+            "file": {
+                "id": "client-1.12.xml",
+                "sha1": "ef4f57b922df243d0cef096efe808c72db042149",
+                "size": 877,
+                "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.12.xml/ef4f57b922df243d0cef096efe808c72db042149/client-1.12.xml"
+            },
+            "argument": "-Dlog4j.configurationFile=${path}",
+            "type": "log4j2-xml"
+        }
+    },
+    "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": "2017-06-02T13:50:27+00:00",
+    "time": "2017-06-07T11:50:36+00:00",
+    "type": "release"
+}

mdk/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -15,9 +15,9 @@ version = "1.0"
 group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "modid"
 
-sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly.
+sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 compileJava {
-    sourceCompatibility = targetCompatibility = "1.6"
+    sourceCompatibility = targetCompatibility = '1.8'
 }
 
 minecraft {

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
-@@ -50,11 +50,12 @@
+@@ -52,11 +52,12 @@
  import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
  
@@ -8,15 +8,15 @@
 +public class Block extends net.minecraftforge.fml.common.registry.IForgeRegistryEntry.Impl<Block>
  {
      private static final ResourceLocation field_176230_a = new ResourceLocation("air");
--    public static final RegistryNamespacedDefaultedByKey<ResourceLocation, Block> field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a);
--    public static final ObjectIntIdentityMap<IBlockState> field_176229_d = new ObjectIntIdentityMap();
+-    public static final RegistryNamespacedDefaultedByKey<ResourceLocation, Block> field_149771_c = new RegistryNamespacedDefaultedByKey<ResourceLocation, Block>(field_176230_a);
+-    public static final ObjectIntIdentityMap<IBlockState> field_176229_d = new ObjectIntIdentityMap<IBlockState>();
 +    public static final RegistryNamespacedDefaultedByKey<ResourceLocation, Block> field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry();
 +    @Deprecated //Modders: DO NOT use this! Use GameRegistry
 +    public static final ObjectIntIdentityMap<IBlockState> field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
      public static final AxisAlignedBB field_185505_j = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
      @Nullable
      public static final AxisAlignedBB field_185506_k = null;
-@@ -307,7 +308,7 @@
+@@ -319,7 +320,7 @@
  
      public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
      {
@@ -25,7 +25,7 @@
      }
  
      public Block func_149711_c(float p_149711_1_)
-@@ -345,9 +346,10 @@
+@@ -357,9 +358,10 @@
          return this.field_149789_z;
      }
  
@@ -37,7 +37,7 @@
      }
  
      @Deprecated
-@@ -360,13 +362,13 @@
+@@ -372,13 +374,13 @@
      @SideOnly(Side.CLIENT)
      public int func_185484_c(IBlockState p_185484_1_, IBlockAccess p_185484_2_, BlockPos p_185484_3_)
      {
@@ -53,7 +53,7 @@
          }
          else
          {
-@@ -430,7 +432,7 @@
+@@ -442,7 +444,7 @@
                  }
          }
  
@@ -61,8 +61,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());
      }
  
-     public boolean func_176212_b(IBlockAccess p_176212_1_, BlockPos p_176212_2_, EnumFacing p_176212_3_)
-@@ -521,6 +523,10 @@
+     @Deprecated
+@@ -534,6 +536,10 @@
  
      public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
      {
@@ -73,17 +73,25 @@
      }
  
      public int func_149745_a(Random p_149745_1_)
-@@ -536,8 +542,7 @@
+@@ -549,16 +555,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_);
--        return f < 0.0F ? 0.0F : (!p_180647_2_.func_184823_b(p_180647_1_) ? p_180647_2_.func_184813_a(p_180647_1_) / f / 100.0F : p_180647_2_.func_184813_a(p_180647_1_) / f / 30.0F);
+-
+-        if (f < 0.0F)
+-        {
+-            return 0.0F;
+-        }
+-        else
+-        {
+-            return !p_180647_2_.func_184823_b(p_180647_1_) ? p_180647_2_.func_184813_a(p_180647_1_) / f / 100.0F : p_180647_2_.func_184813_a(p_180647_1_) / f / 30.0F;
+-        }
 +        return net.minecraftforge.common.ForgeHooks.blockStrength(p_180647_1_, p_180647_2_, p_180647_3_, p_180647_4_);
      }
  
      public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_)
-@@ -547,20 +552,17 @@
+@@ -568,20 +565,17 @@
  
      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_)
      {
@@ -110,7 +118,7 @@
                  }
              }
          }
-@@ -568,8 +570,13 @@
+@@ -589,8 +583,13 @@
  
      public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_)
      {
@@ -125,7 +133,7 @@
              float f = 0.5F;
              double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
              double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
-@@ -598,6 +605,7 @@
+@@ -619,6 +618,7 @@
          return 0;
      }
  
@@ -133,7 +141,7 @@
      public float func_149638_a(Entity p_149638_1_)
      {
          return this.field_149781_w / 5.0F;
-@@ -636,7 +644,7 @@
+@@ -657,7 +657,7 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {
@@ -142,7 +150,7 @@
      }
  
      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_, EnumFacing p_180639_6_, float p_180639_7_, float p_180639_8_, float p_180639_9_)
-@@ -648,6 +656,8 @@
+@@ -669,6 +669,8 @@
      {
      }
  
@@ -151,7 +159,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_)
      {
          return this.func_176203_a(p_180642_7_);
-@@ -689,21 +699,35 @@
+@@ -710,21 +712,35 @@
          p_180657_2_.func_71029_a(StatList.func_188055_a(this));
          p_180657_2_.func_71020_j(0.005F);
  
@@ -190,7 +198,7 @@
      }
  
      protected ItemStack func_180643_i(IBlockState p_180643_1_)
-@@ -789,6 +813,7 @@
+@@ -810,6 +826,7 @@
          p_176216_2_.field_70181_x = 0.0D;
      }
  
@@ -198,7 +206,7 @@
      public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
      {
          return new ItemStack(Item.func_150898_a(this), 1, this.func_180651_a(p_185473_3_));
-@@ -893,6 +918,7 @@
+@@ -921,6 +938,7 @@
          }
      }
  
@@ -206,7 +214,7 @@
      public SoundType func_185467_w()
      {
          return this.field_149762_H;
-@@ -908,6 +934,1217 @@
+@@ -936,6 +954,1216 @@
      {
      }
  
@@ -285,6 +293,7 @@
 +     * @param side The side to check
 +     * @return True if the block is solid on the specified side.
 +     */
++    @Deprecated //Use IBlockState.func_193401_d
 +    public boolean isSideSolid(IBlockState base_state, IBlockAccess world, BlockPos pos, EnumFacing side)
 +    {
 +        if (base_state.func_185896_q() && side == EnumFacing.UP) // Short circuit to vanilla function if its true
@@ -458,14 +467,12 @@
 +     */
 +    public boolean isFireSource(World world, BlockPos pos, EnumFacing side)
 +    {
-+        if (this == net.minecraft.init.Blocks.field_150424_aL && side == EnumFacing.UP)
-+        {
++        if (side != EnumFacing.UP)
++            return false;
++        if (this == Blocks.field_150424_aL || this == Blocks.field_189877_df)
 +            return true;
-+        }
-+        if ((world.field_73011_w instanceof net.minecraft.world.WorldProviderEnd) && this == net.minecraft.init.Blocks.field_150357_h && side == EnumFacing.UP)
-+        {
++        if ((world.field_73011_w instanceof net.minecraft.world.WorldProviderEnd) && this == Blocks.field_150357_h)
 +            return true;
-+        }
 +        return false;
 +    }
 +
@@ -783,13 +790,13 @@
 +     */
 +    public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos)
 +    {
-+        if (state.isSideSolid(world, pos, EnumFacing.UP))
++        if (state.func_193401_d(world, pos, EnumFacing.UP) == BlockFaceShape.SOLID)
 +        {
-+            return true;
++            return this != Blocks.field_185775_db && this != Blocks.field_150428_aP;
 +        }
 +        else
 +        {
-+            return this instanceof BlockFence || this == net.minecraft.init.Blocks.field_150359_w || this == net.minecraft.init.Blocks.field_150463_bK || this == net.minecraft.init.Blocks.field_150399_cn;
++            return this instanceof BlockFence || this == Blocks.field_150359_w || this == Blocks.field_150463_bK || this == Blocks.field_150399_cn;
 +        }
 +    }
 +
@@ -1424,19 +1431,19 @@
      public static void func_149671_p()
      {
          func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air"));
-@@ -1201,14 +2438,7 @@
+@@ -1247,14 +2475,7 @@
              }
              else
              {
--                UnmodifiableIterator lvt_18_2_ = block16.func_176194_O().func_177619_a().iterator();
+-                UnmodifiableIterator unmodifiableiterator = block16.func_176194_O().func_177619_a().iterator();
 -
--                while (lvt_18_2_.hasNext())
+-                while (unmodifiableiterator.hasNext())
 -                {
--                    IBlockState iblockstate = (IBlockState)lvt_18_2_.next();
+-                    IBlockState iblockstate = (IBlockState)unmodifiableiterator.next();
 -                    int k = field_149771_c.func_148757_b(block16) << 4 | block16.func_176201_c(iblockstate);
 -                    field_176229_d.func_148746_a(iblockstate, k);
 -                }
-+//                Handled in GameData.BlockCallbacks - leaving tripwire as it seems to be special cased
++//              Handled in GameData.BlockCallbacks - leaving tripwire as it seems to be special cased
              }
          }
      }

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
-@@ -89,16 +89,9 @@
+@@ -90,16 +90,9 @@
  
      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_)
      {
@@ -17,8 +17,8 @@
      }
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -120,6 +113,25 @@
-         }
+@@ -126,6 +119,25 @@
+         return BlockFaceShape.UNDEFINED;
      }
  
 +    @Override

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
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,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);
  
-@@ -38,7 +38,8 @@
+@@ -40,7 +40,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_)
-@@ -68,6 +69,11 @@
+@@ -70,6 +71,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()));
      }
  
-@@ -92,6 +98,35 @@
+@@ -94,6 +100,35 @@
          return false;
      }
  

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockButton.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -90,7 +90,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_);
--        return p_181088_2_ == EnumFacing.DOWN ? p_181088_0_.func_180495_p(blockpos).func_185896_q() : p_181088_0_.func_180495_p(blockpos).func_185915_l();
-+        return p_181088_0_.func_180495_p(blockpos).isSideSolid(p_181088_0_, blockpos, p_181088_2_.func_176734_d());
-     }
- 
-     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_)

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCactus.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_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
      protected static final AxisAlignedBB field_185593_b = new AxisAlignedBB(0.0625D, 0.0D, 0.0625D, 0.9375D, 0.9375D, 0.9375D);
-@@ -50,6 +50,8 @@
+@@ -51,6 +51,8 @@
              {
                  int j = ((Integer)p_180650_3_.func_177229_b(field_176587_a)).intValue();
  
@@ -18,7 +18,7 @@
                  if (j == 15)
                  {
                      p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
-@@ -61,6 +63,8 @@
+@@ -62,6 +64,8 @@
                  {
                      p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176587_a, Integer.valueOf(j + 1)), 4);
                  }
@@ -27,7 +27,7 @@
              }
          }
      }
-@@ -111,8 +115,8 @@
+@@ -112,8 +116,8 @@
              }
          }
  
@@ -38,7 +38,7 @@
      }
  
      public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
-@@ -136,6 +140,18 @@
+@@ -137,6 +141,18 @@
          return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
      }
  

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
-@@ -522,7 +522,7 @@
+@@ -538,7 +538,7 @@
  
      private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
      {
@@ -9,7 +9,7 @@
      }
  
      private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_)
-@@ -587,4 +587,10 @@
+@@ -608,4 +608,10 @@
          BASIC,
          TRAP;
      }

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockChorusFlower.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockChorusFlower.java
-@@ -53,7 +53,7 @@
+@@ -55,7 +55,7 @@
              {
                  int i = ((Integer)p_180650_3_.func_177229_b(field_185607_a)).intValue();
  
@@ -9,7 +9,7 @@
                  {
                      boolean flag = false;
                      boolean flag1 = false;
-@@ -142,6 +142,7 @@
+@@ -144,6 +144,7 @@
                      {
                          this.func_185605_c(p_180650_1_, p_180650_2_);
                      }

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -43,13 +43,14 @@
+@@ -44,13 +44,14 @@
          {
              this.func_176500_f(p_180650_1_, p_180650_2_, p_180650_3_);
          }
@@ -17,7 +17,7 @@
              }
          }
      }
-@@ -131,7 +132,14 @@
+@@ -132,7 +133,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_)
      {
@@ -33,7 +33,7 @@
          int j = 1;
  
          if (i >= 2)
-@@ -141,8 +149,9 @@
+@@ -142,8 +150,9 @@
  
          for (int k = 0; k < j; ++k)
          {

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 @@
+@@ -135,7 +135,7 @@
      {
          if (this.field_149764_J == Material.field_151573_f)
          {
@@ -9,7 +9,7 @@
          }
          else
          {
-@@ -175,7 +175,7 @@
+@@ -203,7 +203,7 @@
                  flag1 = true;
              }
  
@@ -18,12 +18,19 @@
              {
                  p_189540_2_.func_175698_g(p_189540_3_);
                  flag1 = true;
-@@ -219,7 +219,7 @@
+@@ -247,13 +247,13 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {
--        return p_176196_2_.func_177956_o() >= 255 ? false : p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q() && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
-+        return p_176196_2_.func_177956_o() >= p_176196_1_.func_72800_K() - 1 ? false : p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).isSideSolid(p_176196_1_,  p_176196_2_.func_177977_b(), EnumFacing.UP) && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
+-        if (p_176196_2_.func_177956_o() >= 255)
++        if (p_176196_2_.func_177956_o() >= p_176196_1_.func_72800_K() - 1)
+         {
+             return false;
+         }
+         else
+         {
+-            return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q() && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
++            return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_193401_d(p_176196_1_, p_176196_2_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
+         }
      }
  
-     public EnumPushReaction func_149656_h(IBlockState p_149656_1_)

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

@@ -37,7 +37,7 @@
          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;
-@@ -150,7 +148,6 @@
+@@ -162,7 +160,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_, ItemStack p_180657_6_)
      {
@@ -45,7 +45,7 @@
          {
              super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
          }
-@@ -210,8 +207,6 @@
+@@ -222,8 +219,6 @@
          else
          {
              p_176489_4_.func_71029_a(StatList.func_188055_a(this));
@@ -54,7 +54,7 @@
              return true;
          }
      }
-@@ -281,6 +276,33 @@
+@@ -293,6 +288,33 @@
          return Block.EnumOffsetType.XZ;
      }
  

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
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
  
      private void func_180683_d(World p_180683_1_, BlockPos p_180683_2_)
      {
@@ -9,7 +9,7 @@
          {
              int i = 32;
  
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
                  p_180683_1_.func_175698_g(p_180683_2_);
                  BlockPos blockpos;
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockEnchantmentTable.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockEnchantmentTable.java
-@@ -63,7 +63,7 @@
+@@ -64,7 +64,7 @@
                      {
                          BlockPos blockpos = p_180655_3_.func_177982_a(i, k, j);
  

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
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
  
      public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_)
      {
@@ -9,7 +9,7 @@
          {
              this.func_190970_b(p_180658_1_, p_180658_2_);
          }
-@@ -93,7 +93,7 @@
+@@ -94,7 +94,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();

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

@@ -1,22 +1,21 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFence.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFence.java
-@@ -157,7 +157,10 @@
+@@ -165,7 +165,10 @@
  
      public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
      {
--        return p_176221_1_.func_177226_a(field_176526_a, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177978_c()))).func_177226_a(field_176525_b, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177974_f()))).func_177226_a(field_176527_M, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177968_d()))).func_177226_a(field_176528_N, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177976_e())));
+-        return p_176221_1_.func_177226_a(field_176526_a, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177978_c(), EnumFacing.SOUTH))).func_177226_a(field_176525_b, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177974_f(), EnumFacing.WEST))).func_177226_a(field_176527_M, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177968_d(), EnumFacing.NORTH))).func_177226_a(field_176528_N, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177976_e(), EnumFacing.EAST)));
 +        return p_176221_1_.func_177226_a(field_176526_a, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
-+                .func_177226_a(field_176525_b, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST))
-+                .func_177226_a(field_176527_M, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
-+                .func_177226_a(field_176528_N, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST));
++                    .func_177226_a(field_176525_b,  canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST))
++                    .func_177226_a(field_176527_M, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
++                    .func_177226_a(field_176528_N,  canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST));
      }
  
      public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
-@@ -192,4 +195,34 @@
-     {
+@@ -201,6 +204,37 @@
          return new BlockStateContainer(this, new IProperty[] {field_176526_a, field_176525_b, field_176528_N, field_176527_M});
      }
-+
+ 
 +    /* ======================================== FORGE START ======================================== */
 +
 +    @Override
@@ -41,9 +40,13 @@
 +
 +    private boolean canFenceConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
 +    {
-+        Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+        return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d()) || func_176524_e(world, pos.func_177972_a(facing));
++        BlockPos other = pos.func_177972_a(facing);
++        Block block = world.func_180495_p(other).func_177230_c();
++        return block.canBeConnectedTo(world, other, facing.func_176734_d()) || func_176524_e(world, other, facing.func_176734_d());
 +    }
 +
 +    /* ======================================== FORGE END ======================================== */
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE : BlockFaceShape.CENTER;

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFenceGate.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFenceGate.java
-@@ -50,7 +50,7 @@
+@@ -59,7 +59,7 @@
      {
          EnumFacing.Axis enumfacing$axis = ((EnumFacing)p_176221_1_.func_177229_b(field_185512_D)).func_176740_k();
  
@@ -9,11 +9,10 @@
          {
              p_176221_1_ = p_176221_1_.func_177226_a(field_176467_M, Boolean.valueOf(true));
          }
-@@ -175,4 +175,21 @@
-     {
+@@ -192,6 +192,23 @@
          return new BlockStateContainer(this, new IProperty[] {field_185512_D, field_176466_a, field_176465_b, field_176467_M});
      }
-+
+ 
 +    /* ======================================== FORGE START ======================================== */
 +
 +    @Override
@@ -30,4 +29,7 @@
 +    }
 +
 +    /* ======================================== FORGE END ======================================== */
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         if (p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN)

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
-@@ -38,7 +38,15 @@
+@@ -39,7 +39,15 @@
  
      public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
      {
@@ -17,7 +17,7 @@
      }
  
      protected BlockFire()
-@@ -91,6 +99,7 @@
+@@ -92,6 +100,7 @@
  
      public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_)
      {
@@ -25,11 +25,11 @@
          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_));
      }
-@@ -131,13 +140,8 @@
+@@ -132,13 +141,8 @@
              }
  
              Block block = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_177230_c();
--            boolean flag = block == Blocks.field_150424_aL;
+-            boolean flag = block == Blocks.field_150424_aL || block == Blocks.field_189877_df;
 +            boolean flag = block.isFireSource(p_180650_1_, p_180650_2_.func_177977_b(), EnumFacing.UP);
  
 -            if (p_180650_1_.field_73011_w instanceof WorldProviderEnd && block == Blocks.field_150357_h)
@@ -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)
-@@ -158,7 +162,7 @@
+@@ -159,7 +163,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_);
                          }
-@@ -166,7 +170,7 @@
+@@ -167,7 +171,7 @@
                          return;
                      }
  
@@ -58,7 +58,7 @@
                      {
                          p_180650_1_.func_175698_g(p_180650_2_);
                          return;
-@@ -181,12 +185,12 @@
+@@ -182,12 +186,12 @@
                      j = -50;
                  }
  
@@ -77,21 +77,21 @@
  
                  for (int k = -1; k <= 1; ++k)
                  {
-@@ -245,22 +249,30 @@
+@@ -246,22 +250,30 @@
          return false;
      }
  
 +    @Deprecated // Use Block.getFlammability
      public int func_176532_c(Block p_176532_1_)
      {
-         Integer integer = (Integer)this.field_149848_b.get(p_176532_1_);
+         Integer integer = this.field_149848_b.get(p_176532_1_);
          return integer == null ? 0 : integer.intValue();
      }
  
-+    @Deprecated // Use Block.getFlammability
++    @Deprecated // Use Block.getFireSpreadSpeed
      public int func_176534_d(Block p_176534_1_)
      {
-         Integer integer = (Integer)this.field_149849_a.get(p_176534_1_);
+         Integer integer = this.field_149849_a.get(p_176534_1_);
          return integer == null ? 0 : integer.intValue();
      }
  
@@ -109,7 +109,7 @@
          if (p_176536_4_.nextInt(p_176536_3_) < i)
          {
              IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
-@@ -292,7 +304,7 @@
+@@ -293,7 +305,7 @@
      {
          for (EnumFacing enumfacing : EnumFacing.values())
          {
@@ -118,7 +118,7 @@
              {
                  return true;
              }
-@@ -313,7 +325,7 @@
+@@ -314,7 +326,7 @@
  
              for (EnumFacing enumfacing : EnumFacing.values())
              {
@@ -127,7 +127,7 @@
              }
  
              return i;
-@@ -325,9 +337,10 @@
+@@ -326,9 +338,10 @@
          return false;
      }
  
@@ -139,7 +139,7 @@
      }
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -366,9 +379,9 @@
+@@ -372,9 +385,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);
          }
  
@@ -151,7 +151,7 @@
              {
                  for (int j = 0; j < 2; ++j)
                  {
-@@ -379,7 +392,7 @@
+@@ -385,7 +398,7 @@
                  }
              }
  
@@ -160,7 +160,7 @@
              {
                  for (int k = 0; k < 2; ++k)
                  {
-@@ -390,7 +403,7 @@
+@@ -396,7 +409,7 @@
                  }
              }
  
@@ -169,7 +169,7 @@
              {
                  for (int l = 0; l < 2; ++l)
                  {
-@@ -401,7 +414,7 @@
+@@ -407,7 +420,7 @@
                  }
              }
  
@@ -178,7 +178,7 @@
              {
                  for (int i1 = 0; i1 < 2; ++i1)
                  {
-@@ -412,7 +425,7 @@
+@@ -418,7 +431,7 @@
                  }
              }
  
@@ -187,11 +187,10 @@
              {
                  for (int j1 = 0; j1 < 2; ++j1)
                  {
-@@ -460,4 +473,19 @@
-     {
+@@ -462,6 +475,21 @@
          return new BlockStateContainer(this, new IProperty[] {field_176543_a, field_176545_N, field_176546_O, field_176541_P, field_176539_Q, field_176542_R});
      }
-+
+ 
 +    /*================================= Forge Start ======================================*/
 +    /**
 +     * Side sensitive version that calls the block function.
@@ -206,4 +205,7 @@
 +        return world.func_180495_p(pos).func_177230_c().isFlammable(world, pos, face);
 +    }
 +    /*================================= Forge Start ======================================*/
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return BlockFaceShape.UNDEFINED;

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
-@@ -165,13 +165,6 @@
+@@ -166,13 +166,6 @@
  
      public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
      {
@@ -14,8 +14,8 @@
          super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
      }
  
-@@ -392,6 +385,31 @@
-         return BlockRenderLayer.CUTOUT;
+@@ -398,6 +391,31 @@
+         return BlockFaceShape.UNDEFINED;
      }
  
 +

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 @@
+@@ -222,6 +222,20 @@
          return new BlockStateContainer(this, new IProperty[] {field_176380_a});
      }
  

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

@@ -1,30 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
-@@ -61,7 +61,10 @@
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
--        return p_176196_1_.func_180495_p(p_176196_2_.func_177976_e()).func_185915_l() ? true : (p_176196_1_.func_180495_p(p_176196_2_.func_177974_f()).func_185915_l() ? true : (p_176196_1_.func_180495_p(p_176196_2_.func_177978_c()).func_185915_l() ? true : p_176196_1_.func_180495_p(p_176196_2_.func_177968_d()).func_185915_l()));
-+        return p_176196_1_.func_180495_p(p_176196_2_.func_177976_e()).isSideSolid(p_176196_1_, p_176196_2_.func_177976_e(), EnumFacing.EAST) ||
-+               p_176196_1_.func_180495_p(p_176196_2_.func_177974_f()).isSideSolid(p_176196_1_, p_176196_2_.func_177974_f(), EnumFacing.WEST) ||
-+               p_176196_1_.func_180495_p(p_176196_2_.func_177978_c()).isSideSolid(p_176196_1_, p_176196_2_.func_177978_c(), EnumFacing.SOUTH) ||
-+               p_176196_1_.func_180495_p(p_176196_2_.func_177968_d()).isSideSolid(p_176196_1_, p_176196_2_.func_177968_d(), EnumFacing.NORTH);
-     }
- 
-     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_)
-@@ -99,7 +102,7 @@
- 
-     protected boolean func_176381_b(World p_176381_1_, BlockPos p_176381_2_, EnumFacing p_176381_3_)
-     {
--        return p_176381_1_.func_180495_p(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d())).func_185915_l();
-+        return p_176381_1_.func_180495_p(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d())).isSideSolid(p_176381_1_, p_176381_2_.func_177972_a(p_176381_3_.func_176734_d()), p_176381_3_);
-     }
- 
-     public IBlockState func_176203_a(int p_176203_1_)
-@@ -139,4 +142,6 @@
-     {
+@@ -158,6 +158,8 @@
          return new BlockStateContainer(this, new IProperty[] {field_176382_a});
      }
-+
+ 
 +    @Override public boolean isLadder(IBlockState state, IBlockAccess world, BlockPos pos, EntityLivingBase entity) { return true; }
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return BlockFaceShape.UNDEFINED;

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

@@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLever.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
-@@ -296,6 +296,12 @@
-         return new BlockStateContainer(this, new IProperty[] {field_176360_a, field_176359_b});
+@@ -309,6 +309,12 @@
+         return BlockFaceShape.UNDEFINED;
      }
  
 +

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

@@ -1,11 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java
-@@ -78,7 +78,7 @@
-         if (p_180671_2_.func_177956_o() >= 0 && p_180671_2_.func_177956_o() < 256)
-         {
-             IBlockState iblockstate = p_180671_1_.func_180495_p(p_180671_2_.func_177977_b());
--            return iblockstate.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_185514_i(iblockstate));
-+            return iblockstate.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && iblockstate.func_177230_c().canSustainPlant(iblockstate, p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this));
+@@ -89,7 +89,7 @@
+             }
+             else
+             {
+-                return p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_185514_i(iblockstate);
++                return p_180671_1_.func_175699_k(p_180671_2_) < 13 && iblockstate.func_177230_c().canSustainPlant(iblockstate, p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
+             }
          }
          else
-         {

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

@@ -20,4 +20,4 @@
 +        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.RECORDS, 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]);
+         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);

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 @@
+@@ -78,34 +78,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_);

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

@@ -1,22 +1,9 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPane.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
-@@ -111,7 +111,10 @@
- 
-     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
-     {
--        return p_176221_1_.func_177226_a(field_176241_b, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177978_c()).func_177230_c()))).func_177226_a(field_176243_N, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177968_d()).func_177230_c()))).func_177226_a(field_176244_O, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177976_e()).func_177230_c()))).func_177226_a(field_176242_M, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177974_f()).func_177230_c())));
-+        return p_176221_1_.func_177226_a(field_176241_b, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
-+                .func_177226_a(field_176243_N, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
-+                .func_177226_a(field_176244_O, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST))
-+                .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_)
-@@ -188,4 +191,21 @@
-     {
+@@ -197,6 +197,24 @@
          return new BlockStateContainer(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
      }
-+
+ 
 +    /* ======================================== FORGE START ======================================== */
 +
 +    @Override
@@ -28,9 +15,13 @@
 +
 +    public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir)
 +    {
-+        IBlockState state = world.func_180495_p(pos.func_177972_a(dir));
-+        return state.func_177230_c().canBeConnectedTo(world, pos.func_177972_a(dir), dir.func_176734_d()) || func_150098_a(state.func_177230_c()) || state.isSideSolid(world, pos.func_177972_a(dir), dir.func_176734_d());
++        BlockPos other = pos.func_177972_a(dir);
++        IBlockState state = world.func_180495_p(other);
++        return state.func_177230_c().canBeConnectedTo(world, other, dir.func_176734_d()) || func_193393_b(world, state, other, dir.func_176734_d());
 +    }
 +
 +    /* ======================================== FORGE END ======================================== */
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE_THIN : BlockFaceShape.CENTER_SMALL;

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
-@@ -240,7 +240,7 @@
+@@ -241,7 +241,7 @@
                      }
                  }
  
--                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))
+-                if (!flag1 && iblockstate.func_185904_a() != Material.field_151579_a && func_185646_a(iblockstate, p_189539_2_, blockpos, enumfacing.func_176734_d(), false, enumfacing) && (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_, blockpos) && func_185646_a(iblockstate, p_189539_2_, blockpos, enumfacing.func_176734_d(), false, enumfacing) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
                  {
                      this.func_176319_a(p_189539_2_, p_189539_3_, enumfacing, false);
                  }
-@@ -306,7 +306,7 @@
+@@ -307,7 +307,7 @@
                      return false;
                  }
  
@@ -18,9 +18,9 @@
              }
              else
              {
-@@ -352,7 +352,9 @@
+@@ -353,7 +353,9 @@
              {
-                 BlockPos blockpos1 = (BlockPos)list2.get(j);
+                 BlockPos blockpos1 = list2.get(j);
                  IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
 -                iblockstate.func_177230_c().func_176226_b(p_176319_1_, blockpos1, iblockstate, 0);
 +                // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
@@ -29,15 +29,17 @@
                  p_176319_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 4);
                  --k;
                  aiblockstate[k] = iblockstate;
-@@ -432,4 +434,11 @@
-     {
+@@ -434,6 +436,13 @@
          return new BlockStateContainer(this, new IProperty[] {field_176387_N, field_176320_b});
      }
-+
+ 
 +    /* ======================================== FORGE START =====================================*/
 +    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
 +    {
 +        IBlockState state = world.func_180495_p(pos);
 +        return !state.func_177229_b(field_176320_b) && super.rotateBlock(world, pos, axis);
 +    }
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         p_193383_2_ = this.func_176221_a(p_193383_2_, p_193383_1_, p_193383_3_);

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
-@@ -115,7 +115,7 @@
+@@ -116,7 +116,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_);
  
-@@ -125,6 +125,7 @@
+@@ -126,6 +126,7 @@
                  iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
              }
          }
@@ -17,11 +17,10 @@
      }
  
      @Nullable
-@@ -208,4 +209,16 @@
-     {
+@@ -210,6 +211,18 @@
          return new BlockStateContainer(this, new IProperty[] {field_176426_a, field_176425_b});
      }
-+
+ 
 +    @Override
 +    public java.util.List<net.minecraft.item.ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
 +    {
@@ -33,4 +32,7 @@
 +        }
 +        return new java.util.ArrayList();
 +    }
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return BlockFaceShape.UNDEFINED;

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
-@@ -124,7 +124,7 @@
+@@ -136,7 +136,7 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java
-@@ -110,6 +110,26 @@
+@@ -111,6 +111,26 @@
          return new BlockStateContainer(this, new IProperty[] {field_176335_a});
      }
  

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
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,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_)
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
  
      public AxisAlignedBB func_185496_a(IBlockState p_185496_1_, IBlockAccess p_185496_2_, BlockPos p_185496_3_)
      {
@@ -18,7 +18,7 @@
          return blockrailbase$enumraildirection != null && blockrailbase$enumraildirection.func_177018_c() ? field_190959_b : field_185590_a;
      }
  
-@@ -67,7 +67,7 @@
+@@ -73,7 +73,7 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {
@@ -27,7 +27,7 @@
      }
  
      public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
-@@ -87,27 +87,27 @@
+@@ -93,27 +93,27 @@
      {
          if (!p_189540_2_.field_72995_K)
          {
@@ -61,7 +61,7 @@
              {
                  flag = true;
              }
-@@ -148,7 +148,7 @@
+@@ -154,7 +154,7 @@
      {
          super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
  
@@ -70,7 +70,7 @@
          {
              p_180663_1_.func_175685_c(p_180663_2_.func_177984_a(), this, false);
          }
-@@ -160,8 +160,101 @@
+@@ -166,8 +166,101 @@
          }
      }
  
@@ -172,7 +172,7 @@
      public static enum EnumRailDirection implements IStringSerializable
      {
          NORTH_SOUTH(0, "north_south"),
-@@ -232,6 +325,7 @@
+@@ -238,6 +331,7 @@
          private IBlockState field_180366_e;
          private final boolean field_150656_f;
          private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
@@ -180,7 +180,7 @@
  
          public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
          {
-@@ -239,8 +333,9 @@
+@@ -245,8 +339,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();
@@ -192,7 +192,7 @@
              this.func_180360_a(blockrailbase$enumraildirection);
          }
  
-@@ -432,7 +527,7 @@
+@@ -438,7 +533,7 @@
                  }
              }
  
@@ -201,7 +201,7 @@
              {
                  if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                  {
-@@ -445,7 +540,7 @@
+@@ -451,7 +546,7 @@
                  }
              }
  
@@ -210,7 +210,7 @@
              {
                  if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
                  {
-@@ -588,7 +683,7 @@
+@@ -594,7 +689,7 @@
                  }
              }
  
@@ -219,7 +219,7 @@
              {
                  if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                  {
-@@ -601,7 +696,7 @@
+@@ -607,7 +702,7 @@
                  }
              }
  

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

@@ -1,11 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRailDetector.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRailDetector.java
-@@ -156,6 +156,8 @@
+@@ -163,6 +163,8 @@
      {
          if (((Boolean)p_180641_1_.func_177229_b(field_176574_M)).booleanValue())
          {
 +            List<EntityMinecart> carts = this.func_176571_a(p_180641_2_, p_180641_3_, EntityMinecart.class);
 +            if (!carts.isEmpty() && carts.get(0).getComparatorLevel() > -1) return carts.get(0).getComparatorLevel();
-             List<EntityMinecartCommandBlock> list = this.<EntityMinecartCommandBlock>func_176571_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class, new Predicate[0]);
+             List<EntityMinecartCommandBlock> list = this.<EntityMinecartCommandBlock>func_176571_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class);
  
              if (!list.isEmpty())

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
-@@ -311,6 +311,21 @@
+@@ -319,6 +319,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);
      }
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneDiode.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneDiode.java
-@@ -204,6 +204,8 @@
+@@ -227,6 +227,8 @@
      {
          EnumFacing enumfacing = (EnumFacing)p_176400_3_.func_177229_b(field_185512_D);
          BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
@@ -9,11 +9,10 @@
          p_176400_1_.func_190524_a(blockpos, this, p_176400_2_);
          p_176400_1_.func_175695_a(blockpos, this, enumfacing);
      }
-@@ -275,4 +277,23 @@
-     {
+@@ -307,6 +309,25 @@
          return BlockRenderLayer.CUTOUT;
      }
-+
+ 
 +    /* ======================================== FORGE START =====================================*/
 +    @Override
 +    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
@@ -32,4 +31,7 @@
 +        }
 +        return false;
 +    }
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return p_193383_4_ == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;

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
-@@ -98,15 +98,15 @@
+@@ -99,15 +99,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,13 +19,16 @@
                  {
                      if (iblockstate.func_185898_k())
                      {
-@@ -408,21 +408,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();
--        return !flag1 && flag && func_176340_e(p_176339_1_, blockpos.func_177984_a()) ? true : (func_176343_a(iblockstate, p_176339_3_) ? true : (iblockstate.func_177230_c() == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_185512_D) == p_176339_3_ ? true : !flag && func_176340_e(p_176339_1_, blockpos.func_177977_b())));
-+        return !flag1 && flag && func_176340_e(p_176339_1_, blockpos.func_177984_a()) ? true : (canConnectTo(iblockstate, p_176339_3_, p_176339_1_, p_176339_2_) ? true : (iblockstate.func_177230_c() == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_185512_D) == p_176339_3_ ? true : !flag && func_176340_e(p_176339_1_, blockpos.func_177977_b())));
-     }
+@@ -414,7 +414,7 @@
+         {
+             return true;
+         }
+-        else if (func_176343_a(iblockstate, p_176339_3_))
++        else if (canConnectTo(iblockstate, p_176339_3_, p_176339_1_, p_176339_2_))
+         {
+             return true;
+         }
+@@ -430,16 +430,11 @@
  
      protected static boolean func_176340_e(IBlockAccess p_176340_0_, BlockPos p_176340_1_)
      {
@@ -34,7 +37,7 @@
      }
  
 -    protected static boolean func_176346_d(IBlockState p_176346_0_)
-+    protected static boolean canConnectTo(IBlockState p_176343_0_, @Nullable EnumFacing p_176343_1_, 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);
 -    }
@@ -44,12 +47,12 @@
          Block block = p_176343_0_.func_177230_c();
  
          if (block == Blocks.field_150488_af)
-@@ -436,7 +431,7 @@
+@@ -457,7 +452,7 @@
          }
          else
          {
--            return Blocks.field_190976_dk == p_176343_0_.func_177230_c() ? p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N) : p_176343_0_.func_185897_m() && p_176343_1_ != null;
-+            return Blocks.field_190976_dk == p_176343_0_.func_177230_c() ? p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N) : p_176343_0_.func_177230_c().canConnectRedstone(p_176343_0_, world, pos, p_176343_1_);
+-            return p_176343_0_.func_185897_m() && p_176343_1_ != null;
++            return p_176343_0_.func_177230_c().canConnectRedstone(p_176343_0_, world, pos, p_176343_1_);
          }
      }
  

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
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,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);
-@@ -54,6 +54,8 @@
+@@ -55,6 +55,8 @@
                  {
                      int j = ((Integer)p_180650_3_.func_177229_b(field_176355_a)).intValue();
  
@@ -18,7 +18,7 @@
                      if (j == 15)
                      {
                          p_180650_1_.func_175656_a(p_180650_2_.func_177984_a(), this.func_176223_P());
-@@ -63,6 +65,8 @@
+@@ -64,6 +66,8 @@
                      {
                          p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176355_a, Integer.valueOf(j + 1)), 4);
                      }
@@ -27,7 +27,7 @@
                  }
              }
          }
-@@ -70,7 +74,9 @@
+@@ -71,7 +75,9 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {
@@ -38,7 +38,7 @@
  
          if (block == this)
          {
-@@ -164,6 +170,17 @@
+@@ -165,6 +171,17 @@
          return ((Integer)p_176201_1_.func_177229_b(field_176355_a)).intValue();
      }
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSapling.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSapling.java
-@@ -77,6 +77,7 @@
+@@ -76,6 +76,7 @@
  
      public void func_176476_e(World p_176476_1_, BlockPos p_176476_2_, IBlockState p_176476_3_, Random p_176476_4_)
      {

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
-@@ -126,10 +126,6 @@
+@@ -128,10 +128,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)
-@@ -137,13 +133,18 @@
+@@ -139,13 +135,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);
          }
@@ -31,7 +31,7 @@
          {
              if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
              {
-@@ -152,7 +153,7 @@
+@@ -154,7 +155,7 @@
                  if (tileentity instanceof TileEntitySkull)
                  {
                      TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
@@ -40,7 +40,7 @@
  
                      if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null)
                      {
-@@ -162,12 +163,11 @@
+@@ -164,12 +165,11 @@
                          itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound);
                      }
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSlab.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSlab.java
-@@ -56,6 +56,19 @@
+@@ -80,6 +80,19 @@
          return this.func_176552_j();
      }
  
@@ -20,7 +20,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_)
      {
          IBlockState iblockstate = super.func_180642_a(p_180642_1_, p_180642_2_, p_180642_3_, p_180642_4_, p_180642_5_, p_180642_6_, p_180642_7_, p_180642_8_).func_177226_a(field_176554_a, BlockSlab.EnumBlockHalf.BOTTOM);
-@@ -83,13 +96,14 @@
+@@ -115,7 +128,7 @@
          {
              return false;
          }
@@ -29,8 +29,9 @@
          {
              IBlockState iblockstate = p_176225_2_.func_180495_p(p_176225_3_.func_177972_a(p_176225_4_));
              boolean flag = func_185675_i(iblockstate) && iblockstate.func_177229_b(field_176554_a) == BlockSlab.EnumBlockHalf.TOP;
-             boolean flag1 = func_185675_i(p_176225_1_) && p_176225_1_.func_177229_b(field_176554_a) == BlockSlab.EnumBlockHalf.TOP;
-             return flag1 ? (p_176225_4_ == EnumFacing.DOWN ? true : (p_176225_4_ == EnumFacing.UP && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_) ? true : !func_185675_i(iblockstate) || !flag)) : (p_176225_4_ == EnumFacing.UP ? true : (p_176225_4_ == EnumFacing.DOWN && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_) ? true : !func_185675_i(iblockstate) || flag));
+@@ -149,6 +162,7 @@
+                 return !func_185675_i(iblockstate) || flag;
+             }
          }
 +        return super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_);
      }

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

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSnow.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSnow.java
-@@ -75,7 +75,7 @@
-     {
-         IBlockState iblockstate = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
-         Block block = iblockstate.func_177230_c();
--        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (iblockstate.func_185904_a() == Material.field_151584_j ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 8 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
-+        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() == 8 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
-     }
- 
-     public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_)
-@@ -87,7 +87,6 @@
+@@ -85,7 +85,7 @@
+         if (block != Blocks.field_150432_aD && block != Blocks.field_150403_cj && block != Blocks.field_180401_cv)
+         {
+             BlockFaceShape blockfaceshape = iblockstate.func_193401_d(p_176196_1_, p_176196_2_.func_177977_b(), EnumFacing.UP);
+-            return blockfaceshape == BlockFaceShape.SOLID || iblockstate.func_185904_a() == Material.field_151584_j || block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 8;
++            return blockfaceshape == BlockFaceShape.SOLID || iblockstate.func_177230_c().isLeaves(iblockstate, p_176196_1_, p_176196_2_.func_177977_b()) || block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 8;
+         }
+         else
+         {
+@@ -102,7 +102,6 @@
      {
          if (!this.func_176196_c(p_176314_1_, p_176314_2_))
          {
@@ -17,7 +17,7 @@
              p_176314_1_.func_175698_g(p_176314_2_);
              return false;
          }
-@@ -99,9 +98,8 @@
+@@ -114,9 +113,8 @@
  
      public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_)
      {
@@ -28,7 +28,7 @@
      }
  
      public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -111,14 +109,13 @@
+@@ -126,14 +124,13 @@
  
      public int func_149745_a(Random p_149745_1_)
      {
@@ -44,7 +44,7 @@
              p_180650_1_.func_175698_g(p_180650_2_);
          }
      }
-@@ -152,6 +149,8 @@
+@@ -167,6 +164,8 @@
          return ((Integer)p_176201_1_.func_177229_b(field_176315_a)).intValue() - 1;
      }
  

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
-@@ -447,6 +447,29 @@
+@@ -483,6 +483,29 @@
          return new BlockStateContainer(this, new IProperty[] {field_176309_a, field_176308_b, field_176310_M});
      }
  

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

@@ -1,47 +1,23 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
-@@ -81,14 +81,14 @@
+@@ -82,18 +82,8 @@
  
      private boolean func_176594_d(World p_176594_1_, BlockPos p_176594_2_)
      {
+-        Block block = p_176594_1_.func_180495_p(p_176594_2_).func_177230_c();
+-        boolean flag = block == Blocks.field_185775_db || block == Blocks.field_150428_aP;
+-
 -        if (p_176594_1_.func_180495_p(p_176594_2_).func_185896_q())
+-        {
+-            return !flag;
+-        }
+-        else
+-        {
+-            boolean flag1 = block instanceof BlockFence || block == Blocks.field_150359_w || block == Blocks.field_150463_bK || block == Blocks.field_150399_cn;
+-            return flag1 && !flag;
+-        }
 +        IBlockState state = p_176594_1_.func_180495_p(p_176594_2_);
-+        if (state.isSideSolid(p_176594_1_, p_176594_2_, EnumFacing.UP))
-         {
-             return true;
-         }
-         else
-         {
--            Block block = p_176594_1_.func_180495_p(p_176594_2_).func_177230_c();
--            return block instanceof BlockFence || block == Blocks.field_150359_w || block == Blocks.field_150463_bK || block == Blocks.field_150399_cn;
-+            return state.func_177230_c().canPlaceTorchOnTop(state, p_176594_1_, p_176594_2_);
-         }
++        return state.func_177230_c().canPlaceTorchOnTop(state, p_176594_1_, p_176594_2_);
      }
  
-@@ -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();
--        return flag && p_176595_1_.func_175677_d(blockpos, true) || p_176595_3_.equals(EnumFacing.UP) && this.func_176594_d(p_176595_1_, blockpos);
-+        return flag && p_176595_1_.isSideSolid(blockpos, p_176595_3_, true) || p_176595_3_.equals(EnumFacing.UP) && this.func_176594_d(p_176595_1_, blockpos);
-     }
- 
-     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_)
-@@ -122,7 +122,7 @@
-         {
-             for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
-             {
--                if (p_180642_1_.func_175677_d(p_180642_2_.func_177972_a(enumfacing.func_176734_d()), true))
-+                if (p_180642_1_.isSideSolid(p_180642_2_.func_177972_a(enumfacing.func_176734_d()), enumfacing, true))
-                 {
-                     return this.func_176223_P().func_177226_a(field_176596_a, enumfacing);
-                 }
-@@ -155,7 +155,7 @@
-             EnumFacing enumfacing1 = enumfacing.func_176734_d();
-             boolean flag = false;
- 
--            if (enumfacing$axis.func_176722_c() && !p_176592_1_.func_175677_d(p_176592_2_.func_177972_a(enumfacing1), true))
-+            if (enumfacing$axis.func_176722_c() && !p_176592_1_.isSideSolid(p_176592_2_.func_177972_a(enumfacing1), enumfacing, true))
-             {
-                 flag = true;
-             }
+     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)

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

@@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
-@@ -244,6 +244,18 @@
-         return new BlockStateContainer(this, new IProperty[] {field_176284_a, field_176283_b, field_176285_M});
+@@ -250,6 +250,18 @@
+         return (p_193383_4_ == EnumFacing.UP && p_193383_2_.func_177229_b(field_176285_M) == BlockTrapDoor.DoorHalf.TOP || p_193383_4_ == EnumFacing.DOWN && p_193383_2_.func_177229_b(field_176285_M) == BlockTrapDoor.DoorHalf.BOTTOM) && !((Boolean)p_193383_2_.func_177229_b(field_176283_b)).booleanValue() ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
      }
  
 +    @Override

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

@@ -1,28 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockTripWireHook.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockTripWireHook.java
-@@ -79,14 +79,14 @@
- 
-     public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
-     {
--        return p_176198_3_.func_176740_k().func_176722_c() && p_176198_1_.func_180495_p(p_176198_2_.func_177972_a(p_176198_3_.func_176734_d())).func_185915_l();
-+        return p_176198_3_.func_176740_k().func_176722_c() && p_176198_1_.func_180495_p(p_176198_2_.func_177972_a(p_176198_3_.func_176734_d())).isSideSolid(p_176198_1_, p_176198_2_.func_177972_a(p_176198_3_.func_176734_d()), p_176198_3_);
-     }
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
-         for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
-         {
--            if (p_176196_1_.func_180495_p(p_176196_2_.func_177972_a(enumfacing)).func_185915_l())
-+            if (p_176196_1_.func_180495_p(p_176196_2_.func_177972_a(enumfacing)).isSideSolid(p_176196_1_, p_176196_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()))
-             {
-                 return true;
-             }
-@@ -120,7 +120,7 @@
-             {
-                 EnumFacing enumfacing = (EnumFacing)p_189540_1_.func_177229_b(field_176264_a);
- 
--                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_189540_2_, p_189540_3_, p_189540_1_, 0);
-                     p_189540_2_.func_175698_g(p_189540_3_);

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
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
  import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
  
@@ -9,7 +9,7 @@
  {
      public static final PropertyBool field_176277_a = PropertyBool.func_177716_a("up");
      public static final PropertyBool field_176273_b = PropertyBool.func_177716_a("north");
-@@ -459,4 +459,14 @@
+@@ -459,7 +459,17 @@
  
          return i;
      }
@@ -22,5 +22,8 @@
 +        return java.util.Arrays.asList(new ItemStack(this, 1));
 +    }
 +    /*************************FORGE END***********************************/
+ 
 +
- }
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return BlockFaceShape.UNDEFINED;

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

@@ -1,22 +1,22 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockWall.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockWall.java
-@@ -154,10 +154,10 @@
+@@ -160,10 +160,10 @@
  
      public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
      {
--        boolean flag = this.func_176253_e(p_176221_2_, p_176221_3_.func_177978_c());
--        boolean flag1 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177974_f());
--        boolean flag2 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177968_d());
--        boolean flag3 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177976_e());
-+        boolean flag = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH);
+-        boolean flag = this.func_176253_e(p_176221_2_, p_176221_3_.func_177978_c(), EnumFacing.SOUTH);
+-        boolean flag1 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177974_f(), EnumFacing.WEST);
+-        boolean flag2 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177968_d(), EnumFacing.NORTH);
+-        boolean flag3 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177976_e(), EnumFacing.EAST);
++        boolean flag =  canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH);
 +        boolean flag1 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST);
 +        boolean flag2 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH);
 +        boolean flag3 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST);
          boolean flag4 = flag && !flag1 && flag2 && !flag3 || !flag && flag1 && !flag2 && flag3;
          return p_176221_1_.func_177226_a(field_176256_a, Boolean.valueOf(!flag4 || !p_176221_2_.func_175623_d(p_176221_3_.func_177984_a()))).func_177226_a(field_176254_b, Boolean.valueOf(flag)).func_177226_a(field_176257_M, Boolean.valueOf(flag1)).func_177226_a(field_176258_N, Boolean.valueOf(flag2)).func_177226_a(field_176259_O, Boolean.valueOf(flag3));
      }
-@@ -167,6 +167,23 @@
-         return new BlockStateContainer(this, new IProperty[] {field_176256_a, field_176254_b, field_176257_M, field_176259_O, field_176258_N, field_176255_P});
+@@ -178,6 +178,24 @@
+         return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE_THICK : BlockFaceShape.CENTER_BIG;
      }
  
 +    /* ======================================== FORGE START ======================================== */
@@ -30,8 +30,9 @@
 +
 +    private boolean canWallConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
 +    {
-+        Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+        return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d()) || func_176253_e(world, pos.func_177972_a(facing));
++        BlockPos other = pos.func_177972_a(facing);
++        Block block = world.func_180495_p(other).func_177230_c();
++        return block.canBeConnectedTo(world, other, facing.func_176734_d()) || func_176253_e(world, other, facing.func_176734_d());
 +    }
 +
 +    /* ======================================== FORGE END ======================================== */

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockWeb.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockWeb.java
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@
  import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
  
@@ -9,14 +9,16 @@
  {
      public BlockWeb()
      {
-@@ -77,4 +77,10 @@
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
+@@ -80,6 +80,12 @@
          }
      }
-+
+ 
 +    @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return true; }
 +    @Override
 +    public java.util.List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) {
 +        return com.google.common.collect.Lists.newArrayList(new ItemStack(Item.func_150898_a(this)));
 +    }
- }
++
+     public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
+     {
+         return BlockFaceShape.UNDEFINED;

patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch

@@ -13,8 +13,8 @@
                      iblockstate = this.field_177261_a.func_180495_p(blockpos);
                      block = iblockstate.func_177230_c();
  
--                    if (iblockstate.func_185904_a() == Material.field_151579_a || !BlockPistonBase.func_185646_a(iblockstate, this.field_177261_a, blockpos, this.field_177257_d, false) || blockpos.equals(this.field_177259_b))
-+                    if (iblockstate.func_177230_c().isAir(iblockstate, this.field_177261_a, blockpos) || !BlockPistonBase.func_185646_a(iblockstate, this.field_177261_a, blockpos, this.field_177257_d, false) || blockpos.equals(this.field_177259_b))
+-                    if (iblockstate.func_185904_a() == Material.field_151579_a || !BlockPistonBase.func_185646_a(iblockstate, this.field_177261_a, blockpos, this.field_177257_d, false, this.field_177257_d.func_176734_d()) || blockpos.equals(this.field_177259_b))
++                    if (iblockstate.func_177230_c().isAir(iblockstate, this.field_177261_a, blockpos) || !BlockPistonBase.func_185646_a(iblockstate, this.field_177261_a, blockpos, this.field_177257_d, false, this.field_177257_d.func_176734_d()) || blockpos.equals(this.field_177259_b))
                      {
                          break;
                      }

patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch

@@ -49,9 +49,9 @@
              public Collection < IProperty<? >> func_177227_a()
              {
                  return Collections. < IProperty<? >> unmodifiableCollection(this.field_177237_b.keySet());
-@@ -468,5 +485,86 @@
+@@ -473,5 +490,86 @@
              {
-                 return this.field_177239_a.func_176214_u(this);
+                 return this.field_177239_a.func_193383_a(p_193401_1_, this, p_193401_2_, p_193401_3_);
              }
 +
 +            //Forge Start

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

@@ -9,7 +9,7 @@
 +                if (!net.minecraftforge.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering
 +                {
                  Tessellator tessellator = Tessellator.func_178181_a();
-                 VertexBuffer vertexbuffer = tessellator.func_178180_c();
+                 BufferBuilder bufferbuilder = tessellator.func_178180_c();
                  this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k);
 @@ -174,6 +178,12 @@
                  GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);

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
-@@ -322,7 +322,6 @@
+@@ -344,7 +344,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: {}", new Object[] {this.field_71449_j.func_111285_a()});
--        field_147123_G.debug("(Session ID is {})", new Object[] {this.field_71449_j.func_111286_b()});
+         field_147123_G.info("Setting user: {}", (Object)this.field_71449_j.func_111285_a());
+-        field_147123_G.debug("(Session ID is {})", (Object)this.field_71449_j.func_111286_b());
          this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
          this.field_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;
-@@ -438,10 +437,10 @@
+@@ -464,10 +463,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,25 +21,16 @@
          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);
-@@ -466,7 +465,7 @@
-             {
-                 try
-                 {
--                    return String.format(p_74535_1_, new Object[] {GameSettings.func_74298_c(Minecraft.this.field_71474_y.field_151445_Q.func_151463_i())});
-+                    return String.format(p_74535_1_, new Object[] {Minecraft.this.field_71474_y.field_151445_Q.getDisplayName()});
-                 }
-                 catch (Exception exception)
-                 {
-@@ -475,6 +474,8 @@
-             }
-         });
+@@ -487,6 +486,8 @@
+         this.field_110451_am.func_110542_a(new GrassColorReloadListener());
+         this.field_110451_am.func_110542_a(new FoliageColorReloadListener());
          this.field_71417_B = new MouseHelper();
 +        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 5, true);
 +        bar.step("GL Setup");
          this.func_71361_d("Pre startup");
          GlStateManager.func_179098_w();
          GlStateManager.func_179103_j(7425);
-@@ -488,19 +489,24 @@
+@@ -500,19 +501,24 @@
          GlStateManager.func_179096_D();
          GlStateManager.func_179128_n(5888);
          this.func_71361_d("Startup");
@@ -65,8 +56,8 @@
          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);
-@@ -510,23 +516,27 @@
-         this.field_71458_u = new GuiAchievement(this);
+@@ -523,23 +529,27 @@
+         this.field_110451_am.func_110542_a(this.field_193995_ae);
          GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
 +        net.minecraftforge.fml.client.SplashProgress.resume();
@@ -96,7 +87,16 @@
          if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
          {
              this.func_71352_k();
-@@ -698,21 +708,23 @@
+@@ -581,7 +591,7 @@
+         {
+             return (List)p_193990_0_.func_192711_b().stream().flatMap((p_193993_0_) -> {
+                 return p_193993_0_.func_77571_b().func_82840_a((EntityPlayer)null, ITooltipFlag.TooltipFlags.NORMAL).stream();
+-            }).map(TextFormatting::func_110646_a).map(String::trim).filter((p_193994_0_) -> {
++            }).map(TextFormatting::getTextWithoutFormattingCodes).map(String::trim).filter((p_193994_0_) -> {
+                 return !p_193994_0_.isEmpty();
+             }).collect(Collectors.toList());
+         }, (p_193991_0_) ->
+@@ -748,21 +758,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());
  
@@ -123,7 +123,7 @@
      }
  
      public boolean func_152349_b()
-@@ -905,11 +917,6 @@
+@@ -955,11 +967,6 @@
  
      public void func_147108_a(@Nullable GuiScreen p_147108_1_)
      {
@@ -135,7 +135,7 @@
          if (p_147108_1_ == null && this.field_71441_e == null)
          {
              p_147108_1_ = new GuiMainMenu();
-@@ -919,6 +926,17 @@
+@@ -969,6 +976,17 @@
              p_147108_1_ = new GuiGameOver((ITextComponent)null);
          }
  
@@ -153,19 +153,21 @@
          if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer)
          {
              this.field_71474_y.field_74330_P = false;
-@@ -1054,9 +1072,11 @@
+@@ -1094,11 +1112,13 @@
  
          if (!this.field_71454_w)
          {
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
++            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_194147_b);
              this.field_71424_I.func_76318_c("gameRenderer");
-             this.field_71460_t.func_181560_a(this.field_71428_T.field_74281_c, i);
+             this.field_71460_t.func_181560_a(this.field_71445_n ? this.field_193996_ah : this.field_71428_T.field_194147_b, i);
+             this.field_71424_I.func_76318_c("toasts");
+             this.field_193034_aS.func_191783_a(new ScaledResolution(this));
              this.field_71424_I.func_76319_b();
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
++            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_194147_b);
          }
  
          this.field_71424_I.func_76319_b();
-@@ -1399,9 +1419,9 @@
+@@ -1455,9 +1475,9 @@
              {
                  BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -177,7 +179,7 @@
                      this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
                  }
              }
-@@ -1435,7 +1455,7 @@
+@@ -1491,7 +1511,7 @@
                      case BLOCK:
                          BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -186,7 +188,7 @@
                          {
                              this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
                              break;
-@@ -1449,6 +1469,7 @@
+@@ -1505,6 +1525,7 @@
                          }
  
                          this.field_71439_g.func_184821_cY();
@@ -194,7 +196,7 @@
                  }
  
                  this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
-@@ -1514,6 +1535,7 @@
+@@ -1570,6 +1591,7 @@
                          }
                      }
  
@@ -202,7 +204,7 @@
                      if (!itemstack.func_190926_b() && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, enumhand) == EnumActionResult.SUCCESS)
                      {
                          this.field_71460_t.field_78516_c.func_187460_a(enumhand);
-@@ -1620,6 +1642,8 @@
+@@ -1676,6 +1698,8 @@
              --this.field_71467_ac;
          }
  
@@ -211,7 +213,7 @@
          this.field_71424_I.func_76320_a("gui");
  
          if (!this.field_71445_n)
-@@ -1731,6 +1755,7 @@
+@@ -1788,6 +1812,7 @@
                      this.field_71457_ai = 0;
                      this.field_71441_e.func_72897_h(this.field_71439_g);
                  }
@@ -219,7 +221,7 @@
              }
  
              this.field_71424_I.func_76318_c("gameRenderer");
-@@ -1819,6 +1844,7 @@
+@@ -1877,6 +1902,7 @@
          }
  
          this.field_71424_I.func_76319_b();
@@ -227,7 +229,7 @@
          this.field_71423_H = func_71386_F();
      }
  
-@@ -1924,6 +1950,7 @@
+@@ -1982,6 +2008,7 @@
                      }
                  }
              }
@@ -235,7 +237,7 @@
          }
  
          this.func_184117_aA();
-@@ -2170,6 +2197,8 @@
+@@ -2239,6 +2266,8 @@
      {
          while (Mouse.next())
          {
@@ -244,7 +246,7 @@
              int i = Mouse.getEventButton();
              KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
  
-@@ -2235,6 +2264,7 @@
+@@ -2304,6 +2333,7 @@
  
      public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_)
      {
@@ -252,7 +254,7 @@
          this.func_71403_a((WorldClient)null);
          System.gc();
          ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2277,6 +2307,12 @@
+@@ -2346,6 +2376,12 @@
  
          while (!this.field_71437_Z.func_71200_ad())
          {
@@ -265,13 +267,13 @@
              String s = this.field_71437_Z.func_71195_b_();
  
              if (s != null)
-@@ -2302,8 +2338,14 @@
+@@ -2371,8 +2407,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(316, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
+-        networkmanager.func_179290_a(new C00Handshake(335, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
 -        networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e()));
-+        networkmanager.func_179290_a(new C00Handshake(316, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
++        networkmanager.func_179290_a(new C00Handshake(335, 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,7 +284,7 @@
          this.field_71453_ak = networkmanager;
      }
  
-@@ -2314,6 +2356,8 @@
+@@ -2383,6 +2425,8 @@
  
      public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
      {
@@ -291,7 +293,7 @@
          if (p_71353_1_ == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2326,6 +2370,18 @@
+@@ -2395,6 +2439,18 @@
              if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
              {
                  this.field_71437_Z.func_71263_m();
@@ -310,7 +312,7 @@
              }
  
              this.field_71437_Z = null;
-@@ -2349,6 +2405,7 @@
+@@ -2418,6 +2474,7 @@
              this.field_71456_v.func_181029_i();
              this.func_71351_a((ServerData)null);
              this.field_71455_al = false;
@@ -318,7 +320,7 @@
          }
  
          this.field_147127_av.func_147690_c();
-@@ -2466,159 +2523,8 @@
+@@ -2535,159 +2592,8 @@
      {
          if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
          {
@@ -381,30 +383,30 @@
 -                else if (this.field_71476_x.field_72308_g instanceof EntityMinecart)
 -                {
 -                    EntityMinecart entityminecart = (EntityMinecart)this.field_71476_x.field_72308_g;
--                    Item item;
+-                    Item item1;
 -
 -                    switch (entityminecart.func_184264_v())
 -                    {
 -                        case FURNACE:
--                            item = Items.field_151109_aJ;
+-                            item1 = Items.field_151109_aJ;
 -                            break;
 -                        case CHEST:
--                            item = Items.field_151108_aI;
+-                            item1 = Items.field_151108_aI;
 -                            break;
 -                        case TNT:
--                            item = Items.field_151142_bV;
+-                            item1 = Items.field_151142_bV;
 -                            break;
 -                        case HOPPER:
--                            item = Items.field_151140_bW;
+-                            item1 = Items.field_151140_bW;
 -                            break;
 -                        case COMMAND_BLOCK:
--                            item = Items.field_151095_cc;
+-                            item1 = Items.field_151095_cc;
 -                            break;
 -                        default:
--                            item = Items.field_151143_au;
+-                            item1 = Items.field_151143_au;
 -                    }
 -
--                    itemstack = new ItemStack(item);
+-                    itemstack = new ItemStack(item1);
 -                }
 -                else if (this.field_71476_x.field_72308_g instanceof EntityBoat)
 -                {
@@ -445,7 +447,7 @@
 -                    s = EntityList.func_191301_a(this.field_71476_x.field_72308_g).toString();
 -                }
 -
--                field_147123_G.warn("Picking on: [{}] {} gave null item", new Object[] {this.field_71476_x.field_72313_a, s});
+-                field_147123_G.warn("Picking on: [{}] {} gave null item", this.field_71476_x.field_72313_a, s);
 -            }
 -            else
 -            {
@@ -480,7 +482,7 @@
          }
      }
  
-@@ -2921,18 +2827,8 @@
+@@ -3009,18 +2915,8 @@
  
      public static int func_71369_N()
      {
@@ -501,7 +503,7 @@
      }
  
      public boolean func_70002_Q()
-@@ -3071,15 +2967,16 @@
+@@ -3181,11 +3077,11 @@
              {
                  if (Keyboard.getEventKeyState())
                  {
@@ -515,12 +517,15 @@
                      {
                          this.field_71456_v.func_146158_b().func_146227_a(ScreenShotHelper.func_148260_a(this.field_71412_D, this.field_71443_c, this.field_71440_d, this.field_147124_at));
                      }
+@@ -3199,6 +3095,7 @@
+                         }
+                     }
                  }
 +                else if (this.field_71462_r instanceof GuiControls) ((GuiControls)this.field_71462_r).field_146491_f = null;
              }
          }
      }
-@@ -3199,6 +3096,12 @@
+@@ -3328,6 +3225,12 @@
          return this.field_184127_aH;
      }
  

patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch

@@ -24,7 +24,7 @@
              this.field_148629_h.clear();
              this.field_148626_m.clear();
              this.field_148625_l.clear();
-@@ -338,6 +341,9 @@
+@@ -346,6 +349,9 @@
      {
          if (this.field_148617_f)
          {
@@ -34,7 +34,7 @@
              SoundEventAccessor soundeventaccessor = p_148611_1_.func_184366_a(this.field_148622_c);
              ResourceLocation resourcelocation = p_148611_1_.func_147650_b();
  
-@@ -400,10 +406,12 @@
+@@ -408,10 +414,12 @@
                              if (sound.func_188723_h())
                              {
                                  this.field_148620_e.newStreamingSource(false, s, func_148612_a(resourcelocation1), resourcelocation1.toString(), flag, p_148611_1_.func_147649_g(), p_148611_1_.func_147654_h(), p_148611_1_.func_147651_i(), p_148611_1_.func_147656_j().func_148586_a(), f);
@@ -46,4 +46,4 @@
 +                                net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.PlaySoundSourceEvent(this, p_148611_1_, s));
                              }
  
-                             field_148621_b.debug(field_148623_a, "Playing sound {} for event {} as channel {}", new Object[] {sound.func_188719_a(), resourcelocation, s});
+                             field_148621_b.debug(field_148623_a, "Playing sound {} for event {} as channel {}", sound.func_188719_a(), resourcelocation, s);

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
-@@ -125,6 +125,7 @@
+@@ -130,6 +130,7 @@
  
      public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
      {
@@ -8,7 +8,7 @@
          return false;
      }
  
-@@ -428,6 +429,15 @@
+@@ -447,6 +448,15 @@
          }
      }
  
@@ -24,7 +24,7 @@
      protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
      {
          if (this.field_70145_X)
-@@ -440,30 +450,34 @@
+@@ -459,30 +469,34 @@
              double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
              double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
  
@@ -64,7 +64,7 @@
                  {
                      d2 = 1.0D - d1;
                      i = 5;
-@@ -498,7 +512,8 @@
+@@ -517,7 +531,8 @@
  
      private boolean func_175162_d(BlockPos p_175162_1_)
      {
@@ -74,7 +74,7 @@
      }
  
      public void func_70031_b(boolean p_70031_1_)
-@@ -543,7 +558,13 @@
+@@ -562,7 +577,13 @@
  
      public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
      {

patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch

@@ -32,7 +32,7 @@
      private float func_181559_a(char p_181559_1_, boolean p_181559_2_)
      {
 +        if (p_181559_1_ == 160) return 4.0F; // forge: display nbsp as space. MC-2595
-         if (p_181559_1_ == 32)
+         if (p_181559_1_ == ' ')
          {
              return 4.0F;
 @@ -203,7 +204,7 @@

patches/minecraft/net/minecraft/client/gui/GuiBossOverlay.java.patch

@@ -1,16 +1,16 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiBossOverlay.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiBossOverlay.java
-@@ -35,13 +35,18 @@
-             for (BossInfoLerping bossinfolerping : this.field_184060_g.values())
+@@ -34,13 +34,18 @@
+             for (BossInfoClient bossinfoclient : this.field_184060_g.values())
              {
                  int k = i / 2 - 91;
 +                net.minecraftforge.client.event.RenderGameOverlayEvent.BossInfo event =
-+                        net.minecraftforge.client.ForgeHooksClient.bossBarRenderPre(scaledresolution, bossinfolerping, k, j, 10 + this.field_184059_f.field_71466_p.field_78288_b);
++                        net.minecraftforge.client.ForgeHooksClient.bossBarRenderPre(scaledresolution, bossinfoclient, k, j, 10 + this.field_184059_f.field_71466_p.field_78288_b);
 +                if (!event.isCanceled()) {
                  GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
                  this.field_184059_f.func_110434_K().func_110577_a(field_184058_a);
-                 this.func_184052_a(k, j, bossinfolerping);
-                 String s = bossinfolerping.func_186744_e().func_150254_d();
+                 this.func_184052_a(k, j, bossinfoclient);
+                 String s = bossinfoclient.func_186744_e().func_150254_d();
                  this.field_184059_f.field_71466_p.func_175063_a(s, (float)(i / 2 - this.field_184059_f.field_71466_p.func_78256_a(s) / 2), (float)(j - 9), 16777215);
 -                j += 10 + this.field_184059_f.field_71466_p.field_78288_b;
 +                }

patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch

@@ -9,7 +9,7 @@
      public GuiButton(int p_i1020_1_, int p_i1020_2_, int p_i1020_3_, String p_i1020_4_)
      {
 @@ -75,6 +76,11 @@
-             this.func_146119_b(p_146112_1_, p_146112_2_, p_146112_3_);
+             this.func_146119_b(p_191745_1_, p_191745_2_, p_191745_3_);
              int j = 14737632;
  
 +            if (packedFGColour != 0)

patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch

@@ -25,7 +25,7 @@
              }
          }
      }
-@@ -371,7 +366,7 @@
+@@ -379,7 +374,7 @@
              this.field_146326_C.field_146125_m = this.field_146344_y;
              this.field_146320_D.field_146125_m = this.field_146344_y;
              this.field_146321_E.field_146125_m = this.field_146344_y;

patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch

@@ -9,7 +9,7 @@
                  {
                      this.func_73729_b(i1, j + 14 + 19 * l, 0, 185, 108, 19);
                      this.func_73729_b(i1 + 1, j + 15 + 19 * l, 16 * l, 239, 16, 16);
-@@ -217,11 +217,12 @@
+@@ -220,11 +220,12 @@
              int l = this.field_147075_G.field_185002_i[j];
              int i1 = j + 1;
  
@@ -17,8 +17,8 @@
 +            if (this.func_146978_c(60, 14 + 19 * j, 108, 17, p_73863_1_, p_73863_2_) && k > 0)
              {
                  List<String> list = Lists.<String>newArrayList();
--                list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", new Object[] {enchantment.func_77316_c(l)}));
-+                list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", new Object[] {enchantment == null ? "" : enchantment.func_77316_c(l)}));
+-                list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", enchantment.func_77316_c(l)));
++                list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", enchantment == null ? "" : enchantment.func_77316_c(l)));
  
 +                if(enchantment == null) java.util.Collections.addAll(list, "", TextFormatting.RED + I18n.func_135052_a("forge.container.enchant.limitedEnchantability")); else
                  if (!flag)

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
-@@ -359,7 +359,8 @@
+@@ -379,7 +379,8 @@
  
                  BlockPos blockpos = raytraceresult.func_178782_a();
  
@@ -10,7 +10,7 @@
                  {
                      return;
                  }
-@@ -429,7 +430,10 @@
+@@ -449,7 +450,10 @@
              {
                  Potion potion = potioneffect.func_188419_a();
  
@@ -22,7 +22,7 @@
                  {
                      int k = p_184048_1_.func_78326_a();
                      int l = 1;
-@@ -472,7 +476,10 @@
+@@ -492,7 +496,10 @@
                      }
  
                      GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f);

patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch

@@ -2,20 +2,20 @@
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
 @@ -30,7 +30,8 @@
  
-         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + -16, I18n.func_135052_a("menu.returnToGame", new Object[0])));
-         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
--        GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
+         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + -16, I18n.func_135052_a("menu.returnToGame")));
+         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.options")));
+-        GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.shareToLan")));
 +        this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("fml.menu.modoptions")));
 +        GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + -16, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
          guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c();
-         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0])));
-         this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
+         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.advancements")));
+         this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.stats")));
 @@ -73,13 +74,19 @@
                  this.field_146297_k.func_71381_h();
                  break;
              case 5:
 +                if (this.field_146297_k.field_71439_g != null)
-                 this.field_146297_k.func_147108_a(new GuiAchievements(this, this.field_146297_k.field_71439_g.func_146107_m()));
+                 this.field_146297_k.func_147108_a(new GuiScreenAdvancements(this.field_146297_k.field_71439_g.field_71174_a.func_191982_f()));
                  break;
              case 6:
 +                if (this.field_146297_k.field_71439_g != null)

patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.java.patch

@@ -12,24 +12,24 @@
 @@ -113,7 +113,7 @@
          {
              this.field_148282_b = p_i45029_2_;
-             this.field_148283_c = I18n.func_135052_a(p_i45029_2_.func_151464_g(), new Object[0]);
--            this.field_148280_d = new GuiButton(0, 0, 0, 75, 20, I18n.func_135052_a(p_i45029_2_.func_151464_g(), new Object[0]));
-+            this.field_148280_d = new GuiButton(0, 0, 0, 95, 20, I18n.func_135052_a(p_i45029_2_.func_151464_g(), new Object[0]));
-             this.field_148281_e = new GuiButton(0, 0, 0, 50, 20, I18n.func_135052_a("controls.reset", new Object[0]));
+             this.field_148283_c = I18n.func_135052_a(p_i45029_2_.func_151464_g());
+-            this.field_148280_d = new GuiButton(0, 0, 0, 75, 20, I18n.func_135052_a(p_i45029_2_.func_151464_g()));
++            this.field_148280_d = new GuiButton(0, 0, 0, 95, 20, I18n.func_135052_a(p_i45029_2_.func_151464_g()));
+             this.field_148281_e = new GuiButton(0, 0, 0, 50, 20, I18n.func_135052_a("controls.reset"));
          }
  
 @@ -121,23 +121,24 @@
          {
              boolean flag = GuiKeyBindingList.this.field_148191_k.field_146491_f == this.field_148282_b;
-             GuiKeyBindingList.this.field_148189_l.field_71466_p.func_78276_b(this.field_148283_c, p_180790_2_ + 90 - GuiKeyBindingList.this.field_148188_n, p_180790_3_ + p_180790_5_ / 2 - GuiKeyBindingList.this.field_148189_l.field_71466_p.field_78288_b / 2, 16777215);
--            this.field_148281_e.field_146128_h = p_180790_2_ + 190;
-+            this.field_148281_e.field_146128_h = p_180790_2_ + 210;
-             this.field_148281_e.field_146129_i = p_180790_3_;
+             GuiKeyBindingList.this.field_148189_l.field_71466_p.func_78276_b(this.field_148283_c, p_192634_2_ + 90 - GuiKeyBindingList.this.field_148188_n, p_192634_3_ + p_192634_5_ / 2 - GuiKeyBindingList.this.field_148189_l.field_71466_p.field_78288_b / 2, 16777215);
+-            this.field_148281_e.field_146128_h = p_192634_2_ + 190;
++            this.field_148281_e.field_146128_h = p_192634_2_ + 210;
+             this.field_148281_e.field_146129_i = p_192634_3_;
 -            this.field_148281_e.field_146124_l = this.field_148282_b.func_151463_i() != this.field_148282_b.func_151469_h();
-+            this.field_148281_e.field_146124_l = !this.field_148282_b.isSetToDefaultValue();
-             this.field_148281_e.func_146112_a(GuiKeyBindingList.this.field_148189_l, p_180790_6_, p_180790_7_);
-             this.field_148280_d.field_146128_h = p_180790_2_ + 105;
-             this.field_148280_d.field_146129_i = p_180790_3_;
++            this.field_148281_e.field_146124_l = this.field_148282_b.isSetToDefaultValue();
+             this.field_148281_e.func_191745_a(GuiKeyBindingList.this.field_148189_l, p_192634_6_, p_192634_7_, p_192634_9_);
+             this.field_148280_d.field_146128_h = p_192634_2_ + 105;
+             this.field_148280_d.field_146129_i = p_192634_3_;
 -            this.field_148280_d.field_146126_j = GameSettings.func_74298_c(this.field_148282_b.func_151463_i());
 +            this.field_148280_d.field_146126_j = this.field_148282_b.getDisplayName();
              boolean flag1 = false;
@@ -56,7 +56,7 @@
 +                this.field_148280_d.field_146126_j = (keyCodeModifierConflict ? TextFormatting.GOLD : TextFormatting.RED) + this.field_148280_d.field_146126_j;
              }
  
-             this.field_148280_d.func_146112_a(GuiKeyBindingList.this.field_148189_l, p_180790_6_, p_180790_7_);
+             this.field_148280_d.func_191745_a(GuiKeyBindingList.this.field_148189_l, p_192634_6_, p_192634_7_, p_192634_9_);
 @@ -163,6 +164,7 @@
              }
              else if (this.field_148281_e.func_146116_c(GuiKeyBindingList.this.field_148189_l, p_148278_2_, p_148278_3_))

patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-@@ -65,6 +65,8 @@
-     private GuiButton field_175372_K;
-     private boolean field_183502_L;
+@@ -69,6 +69,8 @@
      private GuiScreen field_183503_M;
+     private int field_193978_M;
+     private int field_193979_N;
 +    private GuiButton modButton;
 +    private net.minecraftforge.client.gui.NotificationModUpdateScreen modUpdateNotification;
  
      public GuiMainMenu()
      {
-@@ -216,13 +218,15 @@
+@@ -211,13 +213,15 @@
              this.field_183503_M.func_183500_a(this.field_146294_l, this.field_146295_m);
              this.field_183503_M.func_73866_w_();
          }
@@ -18,15 +18,15 @@
  
      private void func_73969_a(int p_73969_1_, int p_73969_2_)
      {
-         this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
-         this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
--        this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
-+        this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("menu.online", new Object[0]).replace("Minecraft", "").trim()));
+         this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer")));
+         this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer")));
+-        this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online")));
++        this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("menu.online").replace("Minecraft", "").trim()));
 +        this.field_146292_n.add(modButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("fml.menu.mods")));
      }
  
      private void func_73972_b(int p_73972_1_, int p_73972_2_)
-@@ -270,6 +274,11 @@
+@@ -265,6 +269,11 @@
              this.field_146297_k.func_71400_g();
          }
  
@@ -37,8 +37,8 @@
 +
          if (p_146284_1_.field_146127_k == 11)
          {
-             this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
-@@ -501,6 +510,8 @@
+             this.field_146297_k.func_71371_a("Demo_World", "Demo_World", WorldServerDemo.field_73071_a);
+@@ -497,6 +506,8 @@
              this.func_73729_b(j + 155, 30, 0, 45, 155, 44);
          }
  
@@ -47,7 +47,7 @@
          GlStateManager.func_179094_E();
          GlStateManager.func_179109_b((float)(this.field_146294_l / 2 + 90), 70.0F, 0.0F);
          GlStateManager.func_179114_b(-20.0F, 0.0F, 0.0F, 1.0F);
-@@ -520,7 +531,15 @@
+@@ -516,7 +527,16 @@
              s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d());
          }
  
@@ -61,10 +61,11 @@
 +                this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + brdline * (this.field_146289_q.field_78288_b + 1)), 16777215);
 +            }
 +        }
-         String s1 = "Copyright Mojang AB. Do not distribute!";
-         this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_146294_l - this.field_146289_q.func_78256_a("Copyright Mojang AB. Do not distribute!") - 2, this.field_146295_m - 10, -1);
++
+         this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_193979_N, this.field_146295_m - 10, -1);
  
-@@ -537,6 +556,7 @@
+         if (p_73863_1_ > this.field_193979_N && p_73863_1_ < this.field_193979_N + this.field_193978_M && p_73863_2_ > this.field_146295_m - 10 && p_73863_2_ < this.field_146295_m && Mouse.isInsideWindow())
+@@ -537,6 +557,7 @@
          {
              this.field_183503_M.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
          }
@@ -72,9 +73,9 @@
      }
  
      protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
-@@ -557,6 +577,8 @@
+@@ -562,6 +583,8 @@
          {
-             this.field_183503_M.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
+             this.field_146297_k.func_147108_a(new GuiWinGame(false, Runnables.doNothing()));
          }
 +
 +        net.minecraftforge.client.ForgeHooksClient.mainMenuMouseClick(p_73864_1_, p_73864_2_, p_73864_3_, this.field_146289_q, this.field_146294_l);

patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch

@@ -2,7 +2,7 @@
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
 @@ -189,6 +189,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)});
+         List<String> list = Lists.newArrayList(String.format("Java: %s %dbit", System.getProperty("java.version"), this.field_175242_a.func_147111_S() ? 64 : 32), String.format("Mem: % 2d%% %03d/%03dMB", l * 100L / i, func_175240_a(l), func_175240_a(i)), String.format("Allocated: % 2d%% %03dMB", j * 100L / i, func_175240_a(j)), "", String.format("CPU: %s", OpenGlHelper.func_183029_j()), "", String.format("Display: %dx%d (%s)", Display.getWidth(), Display.getHeight(), GlStateManager.func_187416_u(7936)), GlStateManager.func_187416_u(7937), GlStateManager.func_187416_u(7938));
  
 +        list.add("");
 +        list.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));

patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch

@@ -1,28 +1,28 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
-@@ -63,6 +63,7 @@
-     private long field_146288_g;
+@@ -61,6 +61,7 @@
      private int field_146298_h;
      private URI field_175286_t;
+     private boolean field_193977_u;
 +    protected boolean keyHandled, mouseHandled; // Forge: allow canceling key and mouse Post events from handleMouseInput and handleKeyboardInput
  
      public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
      {
-@@ -147,7 +148,10 @@
-             }
-         }
+@@ -131,7 +132,10 @@
  
--        this.func_146283_a(list, p_146285_2_, p_146285_3_);
+     protected void func_146285_a(ItemStack p_146285_1_, int p_146285_2_, int p_146285_3_)
+     {
+-        this.func_146283_a(this.func_191927_a(p_146285_1_), p_146285_2_, p_146285_3_);
 +        FontRenderer font = p_146285_1_.func_77973_b().getFontRenderer(p_146285_1_);
 +        net.minecraftforge.fml.client.config.GuiUtils.preItemToolTip(p_146285_1_);
-+        this.drawHoveringText(list, p_146285_2_, p_146285_3_, (font == null ? field_146289_q : font));
++        this.drawHoveringText(this.func_191927_a(p_146285_1_), p_146285_2_, p_146285_3_, (font == null ? field_146289_q : font));
 +        net.minecraftforge.fml.client.config.GuiUtils.postItemToolTip();
      }
  
-     protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_)
-@@ -157,7 +161,13 @@
+     public List<String> func_191927_a(ItemStack p_191927_1_)
+@@ -170,7 +174,13 @@
  
-     protected void func_146283_a(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_)
+     public void func_146283_a(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_)
      {
 -        if (!p_146283_1_.isEmpty())
 +        drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);
@@ -35,7 +35,7 @@
          {
              GlStateManager.func_179101_C();
              RenderHelper.func_74518_a();
-@@ -414,10 +424,13 @@
+@@ -403,10 +413,13 @@
  
      public void func_175281_b(String p_175281_1_, boolean p_175281_2_)
      {
@@ -49,7 +49,7 @@
  
          this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_);
      }
-@@ -432,9 +445,15 @@
+@@ -421,9 +434,15 @@
  
                  if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_))
                  {
@@ -65,7 +65,7 @@
                  }
              }
          }
-@@ -464,8 +483,12 @@
+@@ -453,8 +472,12 @@
          this.field_146289_q = p_146280_1_.field_71466_p;
          this.field_146294_l = p_146280_2_;
          this.field_146295_m = p_146280_3_;
@@ -78,7 +78,7 @@
      }
  
      public void func_183500_a(int p_183500_1_, int p_183500_2_)
-@@ -484,7 +507,10 @@
+@@ -473,7 +496,10 @@
          {
              while (Mouse.next())
              {
@@ -89,7 +89,7 @@
              }
          }
  
-@@ -492,7 +518,10 @@
+@@ -481,7 +507,10 @@
          {
              while (Keyboard.next())
              {
@@ -100,7 +100,7 @@
              }
          }
      }
-@@ -554,6 +583,7 @@
+@@ -543,6 +572,7 @@
      public void func_146276_q_()
      {
          this.func_146270_b(0);

patches/minecraft/net/minecraft/client/gui/GuiScreenDemo.java.patch

@@ -1,16 +1,16 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
 @@ -68,10 +68,10 @@
-         this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.title", new Object[0]), i, j, 2039583);
+         this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.title"), i, j, 2039583);
          j = j + 12;
          GameSettings gamesettings = this.field_146297_k.field_71474_y;
--        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.movementShort", new Object[] {GameSettings.func_74298_c(gamesettings.field_74351_w.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74370_x.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74368_y.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74366_z.func_151463_i())}), i, j, 5197647);
-+        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.movementShort", new Object[] {gamesettings.field_74351_w.getDisplayName(), gamesettings.field_74370_x.getDisplayName(), gamesettings.field_74368_y.getDisplayName(), gamesettings.field_74366_z.getDisplayName()}), i, j, 5197647);
-         this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.movementMouse", new Object[0]), i, j + 12, 5197647);
--        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.jump", new Object[] {GameSettings.func_74298_c(gamesettings.field_74314_A.func_151463_i())}), i, j + 24, 5197647);
--        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.inventory", new Object[] {GameSettings.func_74298_c(gamesettings.field_151445_Q.func_151463_i())}), i, j + 36, 5197647);
-+        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.jump", new Object[] {gamesettings.field_74314_A.getDisplayName()}), i, j + 24, 5197647);
-+        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.inventory", new Object[] {gamesettings.field_151445_Q.getDisplayName()}), i, j + 36, 5197647);
-         this.field_146289_q.func_78279_b(I18n.func_135052_a("demo.help.fullWrapped", new Object[0]), i, j + 68, 218, 2039583);
+-        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.movementShort", GameSettings.func_74298_c(gamesettings.field_74351_w.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74370_x.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74368_y.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74366_z.func_151463_i())), i, j, 5197647);
++        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.movementShort", gamesettings.field_74351_w.getDisplayName(), gamesettings.field_74370_x.getDisplayName(), gamesettings.field_74368_y.getDisplayName(), gamesettings.field_74366_z.getDisplayName()), i, j, 5197647);
+         this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.movementMouse"), i, j + 12, 5197647);
+-        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.jump", GameSettings.func_74298_c(gamesettings.field_74314_A.func_151463_i())), i, j + 24, 5197647);
+-        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.inventory", GameSettings.func_74298_c(gamesettings.field_151445_Q.func_151463_i())), i, j + 36, 5197647);
++        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.jump", gamesettings.field_74314_A.getDisplayName()), i, j + 24, 5197647);
++        this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.inventory", gamesettings.field_151445_Q.getDisplayName()), i, j + 36, 5197647);
+         this.field_146289_q.func_78279_b(I18n.func_135052_a("demo.help.fullWrapped"), i, j + 68, 218, 2039583);
          super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
      }

patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch

@@ -3,15 +3,15 @@
 @@ -181,15 +181,8 @@
              GlStateManager.func_179106_n();
              Tessellator tessellator = Tessellator.func_178181_a();
-             VertexBuffer vertexbuffer = tessellator.func_178180_c();
+             BufferBuilder bufferbuilder = tessellator.func_178180_c();
 -            this.field_148161_k.func_110434_K().func_110577_a(Gui.field_110325_k);
 -            GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
 -            float f = 32.0F;
--            vertexbuffer.func_181668_a(7, DefaultVertexFormats.field_181709_i);
--            vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
--            vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
--            vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
--            vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181709_i);
+-            bufferbuilder.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            bufferbuilder.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            bufferbuilder.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            bufferbuilder.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
 -            tessellator.func_78381_a();
 +            // Forge: background rendering moved into separate method.
 +            this.drawContainerBackground(tessellator);
@@ -25,7 +25,7 @@
 +
 +    protected void drawContainerBackground(Tessellator tessellator)
 +    {
-+        VertexBuffer buffer = tessellator.func_178180_c();
++        BufferBuilder buffer = tessellator.func_178180_c();
 +        this.field_148161_k.func_110434_K().func_110577_a(Gui.field_110325_k);
 +        GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
 +        float f = 32.0F;

patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch

@@ -1,23 +1,23 @@
 --- ../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 < 316;
+@@ -83,7 +83,7 @@
+         boolean flag1 = this.field_148301_e.field_82821_f < 335;
          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);
-+        List<String> list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2);
+         this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_192634_2_ + 32 + 3, p_192634_3_ + 1, 16777215);
+-        List<String> list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_192634_4_ - 32 - 2);
++        List<String> list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_192634_4_ - 32 - 2);
  
          for (int i = 0; i < Math.min(list.size(), 2); ++i)
          {
-@@ -176,6 +176,11 @@
-         int i1 = p_180790_6_ - p_180790_2_;
-         int j1 = p_180790_7_ - p_180790_3_;
+@@ -177,6 +177,11 @@
+         int i1 = p_192634_6_ - p_192634_2_;
+         int j1 = p_192634_7_ - p_192634_3_;
  
-+        String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, i1, j1);
++        String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_192634_2_, p_192634_4_, p_192634_3_, i1, j1);
 +        if (tooltip != null)
 +        {
 +            this.field_148303_c.func_146793_a(tooltip);
 +        } else
-         if (i1 >= p_180790_4_ - 15 && i1 <= p_180790_4_ - 5 && j1 >= 0 && j1 <= 8)
+         if (i1 >= p_192634_4_ - 15 && i1 <= p_192634_4_ - 5 && j1 >= 0 && j1 <= 8)
          {
              this.field_148303_c.func_146793_a(s1);

patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch

@@ -1,124 +0,0 @@
---- ../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 final 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_, StatisticsManager p_i45026_2_)
-     {
-         this.field_146562_a = p_i45026_1_;
-@@ -61,6 +65,14 @@
-         this.field_146573_x = (double)(AchievementList.field_187982_f.field_75991_b * 24 - 70);
-         this.field_146568_t = this.field_146573_x;
-         this.field_146566_v = this.field_146573_x;
-+        minecraftAchievements.clear();
-+        for (Achievement achievement : AchievementList.field_187981_e)
-+        {
-+            if (!net.minecraftforge.common.AchievementPage.isAchievementInPages(achievement))
-+            {
-+                minecraftAchievements.add(achievement);
-+            }
-+        }
-     }
- 
-     public void func_73866_w_()
-@@ -68,6 +80,7 @@
-         this.field_146297_k.func_147114_u().func_147297_a(new CPacketClientStatus(CPacketClientStatus.State.REQUEST_STATS));
-         this.field_146292_n.clear();
-         this.field_146292_n.add(new GuiOptionButton(1, this.field_146294_l / 2 + 24, this.field_146295_m / 2 + 74, 80, 20, I18n.func_135052_a("gui.done", new Object[0])));
-+        this.field_146292_n.add(button = new GuiButton(2, (field_146294_l - field_146555_f) / 2 + 24, field_146295_m / 2 + 74, 125, 20, net.minecraftforge.common.AchievementPage.getTitle(currentPage)));
-     }
- 
-     protected void func_146284_a(GuiButton p_146284_1_) throws IOException
-@@ -78,12 +91,22 @@
-             {
-                 this.field_146297_k.func_147108_a(this.field_146562_a);
-             }
-+
-+            if (p_146284_1_.field_146127_k == 2)
-+            {
-+                currentPage++;
-+                if (currentPage >= net.minecraftforge.common.AchievementPage.getAchievementPages().size())
-+                {
-+                    currentPage = -1;
-+                }
-+                this.button.field_146126_j = net.minecraftforge.common.AchievementPage.getTitle(currentPage);
-+            }
-         }
-     }
- 
-     protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
-     {
--        if (p_73869_2_ == this.field_146297_k.field_71474_y.field_151445_Q.func_151463_i())
-+        if (this.field_146297_k.field_71474_y.field_151445_Q.isActiveAndMatches(p_73869_2_))
-         {
-             this.field_146297_k.func_147108_a((GuiScreen)null);
-             this.field_146297_k.func_71381_h();
-@@ -264,7 +287,9 @@
-         GlStateManager.func_179143_c(518);
-         GlStateManager.func_179094_E();
-         GlStateManager.func_179109_b((float)i1, (float)j1, -200.0F);
--        GlStateManager.func_179152_a(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 0.0F);
-+        // FIXES models rendering weirdly in the acheivements pane
-+        // see https://github.com/MinecraftForge/MinecraftForge/commit/1b7ce7592caafb760ec93066184182ae0711e793#commitcomment-10512284
-+        GlStateManager.func_179152_a(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 1.0F);
-         GlStateManager.func_179098_w();
-         GlStateManager.func_179140_f();
-         GlStateManager.func_179091_B();
-@@ -338,11 +363,12 @@
-         GlStateManager.func_179143_c(515);
-         this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
- 
--        for (int j5 = 0; j5 < AchievementList.field_187981_e.size(); ++j5)
-+        java.util.List<Achievement> achievementList = (currentPage == -1 ? minecraftAchievements : net.minecraftforge.common.AchievementPage.getAchievementPage(currentPage).getAchievements());
-+        for (int j5 = 0; j5 < achievementList.size(); ++j5)
-         {
--            Achievement achievement1 = (Achievement)AchievementList.field_187981_e.get(j5);
-+            Achievement achievement1 = achievementList.get(j5);
- 
--            if (achievement1.field_75992_c != null)
-+            if (achievement1.field_75992_c != null && achievementList.contains(achievement1.field_75992_c))
-             {
-                 int k5 = achievement1.field_75993_a * 24 - i + 11;
-                 int l5 = achievement1.field_75991_b * 24 - j + 11;
-@@ -396,9 +422,9 @@
-         GlStateManager.func_179091_B();
-         GlStateManager.func_179142_g();
- 
--        for (int i6 = 0; i6 < AchievementList.field_187981_e.size(); ++i6)
-+        for (int i6 = 0; i6 < achievementList.size(); ++i6)
-         {
--            Achievement achievement2 = (Achievement)AchievementList.field_187981_e.get(i6);
-+            Achievement achievement2 = achievementList.get(i6);
-             int l6 = achievement2.field_75993_a * 24 - i;
-             int j7 = achievement2.field_75991_b * 24 - j;
- 
-@@ -439,6 +465,7 @@
- 
-                 this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
- 
-+                GlStateManager.func_179147_l(); // Forge: Specifically enable blend because it is needed here. And we fix Generic RenderItem's leakage of it.
-                 if (achievement2.func_75984_f())
-                 {
-                     this.func_73729_b(l6 - 2, j7 - 2, 26, 202, 26, 26);
-@@ -447,6 +474,7 @@
-                 {
-                     this.func_73729_b(l6 - 2, j7 - 2, 0, 202, 26, 26);
-                 }
-+                GlStateManager.func_179084_k(); //Forge: Cleanup states we set.
- 
-                 if (!this.field_146556_E.func_77442_b(achievement2))
-                 {
-@@ -455,7 +483,7 @@
-                     this.field_146296_j.func_175039_a(false);
-                 }
- 
--                GlStateManager.func_179145_e();
-+                GlStateManager.func_179140_f(); //Forge: Make sure Lighting is disabled. Fixes MC-33065
-                 GlStateManager.func_179089_o();
-                 this.field_146296_j.func_180450_b(achievement2.field_75990_d, l6 + 3, j7 + 3);
-                 GlStateManager.func_187401_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);

patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch

@@ -41,7 +41,7 @@
 @@ -330,6 +331,7 @@
              int j = this.field_147003_i;
              int k = this.field_147009_r;
-             boolean flag1 = p_73864_1_ < j || p_73864_2_ < k || p_73864_1_ >= j + this.field_146999_f || p_73864_2_ >= k + this.field_147000_g;
+             boolean flag1 = this.func_193983_c(p_73864_1_, p_73864_2_, j, k);
 +            if (slot != null) flag1 = false; // Forge, prevent dropping of items through slots outside of GUI boundaries
              int l = -1;
  
@@ -64,7 +64,7 @@
                          {
                              this.field_146987_F = 2;
                          }
-@@ -467,10 +469,12 @@
+@@ -472,10 +474,12 @@
  
      protected void func_146286_b(int p_146286_1_, int p_146286_2_, int p_146286_3_)
      {
@@ -72,12 +72,12 @@
          Slot slot = this.func_146975_c(p_146286_1_, p_146286_2_);
          int i = this.field_147003_i;
          int j = this.field_147009_r;
-         boolean flag = p_146286_1_ < i || p_146286_2_ < j || p_146286_1_ >= i + this.field_146999_f || p_146286_2_ >= j + this.field_147000_g;
+         boolean flag = this.func_193983_c(p_146286_1_, p_146286_2_, i, j);
 +        if (slot != null) flag = false; // Forge, prevent dropping of items through slots outside of GUI boundaries
          int k = -1;
  
          if (slot != null)
-@@ -491,7 +495,7 @@
+@@ -496,7 +500,7 @@
                  {
                      for (Slot slot2 : this.field_147002_h.field_75151_b)
                      {
@@ -86,7 +86,7 @@
                          {
                              this.func_184098_a(slot2, slot2.field_75222_d, p_146286_3_, ClickType.QUICK_MOVE);
                          }
-@@ -578,7 +582,7 @@
+@@ -583,7 +587,7 @@
              }
              else if (!this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b())
              {
@@ -95,7 +95,7 @@
                  {
                      this.func_184098_a(slot, k, p_146286_3_, ClickType.CLONE);
                  }
-@@ -630,7 +634,7 @@
+@@ -635,7 +639,7 @@
  
      protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
      {
@@ -104,7 +104,7 @@
          {
              this.field_146297_k.field_71439_g.func_71053_j();
          }
-@@ -639,11 +643,11 @@
+@@ -644,11 +648,11 @@
  
          if (this.field_147006_u != null && this.field_147006_u.func_75216_d())
          {
@@ -118,7 +118,7 @@
              {
                  this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW);
              }
-@@ -656,7 +660,7 @@
+@@ -661,7 +665,7 @@
          {
              for (int i = 0; i < 9; ++i)
              {
@@ -127,7 +127,7 @@
                  {
                      this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, i, ClickType.SWAP);
                      return true;
-@@ -689,4 +693,18 @@
+@@ -694,4 +698,18 @@
              this.field_146297_k.field_71439_g.func_71053_j();
          }
      }

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
-@@ -52,6 +52,8 @@
+@@ -57,6 +57,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_)
      {
-@@ -272,6 +274,13 @@
+@@ -287,6 +289,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
          {
-@@ -293,7 +302,7 @@
+@@ -308,7 +317,7 @@
  
      protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
      {
@@ -32,44 +32,43 @@
          {
              if (GameSettings.func_100015_a(this.field_146297_k.field_71474_y.field_74310_D))
              {
-@@ -331,6 +340,14 @@
+@@ -346,6 +355,35 @@
          GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
          guicontainercreative$containercreative.field_148330_a.clear();
  
 +        CreativeTabs tab = CreativeTabs.field_78032_a[field_147058_w];
 +        if (tab.hasSearchBar() && tab != CreativeTabs.field_78027_g)
 +        {
-+            tab.func_78018_a(guicontainercreative$containercreative.field_148330_a);
-+            updateFilteredItems(guicontainercreative$containercreative);
++            for (Item item : Item.field_150901_e)
++                item.func_150895_a(tab, guicontainercreative$containercreative.field_148330_a);
++            if (!this.field_147062_A.func_146179_b().isEmpty())
++            {
++                //TODO: Make this a SearchTree not a manual search
++                String search = this.field_147062_A.func_146179_b().toLowerCase(Locale.ROOT);
++                java.util.Iterator<ItemStack> itr = guicontainercreative$containercreative.field_148330_a.iterator();
++                while (itr.hasNext()) {
++                    ItemStack stack = itr.next();
++                    boolean matches = false;
++                    for (String line : stack.func_82840_a(this.field_146297_k.field_71439_g, this.field_146297_k.field_71474_y.field_82882_x ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL))
++                    {
++                        if (TextFormatting.func_110646_a(line).toLowerCase(Locale.ROOT).contains(search)) {
++                            matches = true;
++                            break;
++                        }
++                    }
++                    if (!matches)
++                        itr.remove();
++                }
++            }
++            this.field_147067_x = 0.0F;
++            guicontainercreative$containercreative.func_148329_a(0.0F);
 +            return;
 +        }
 +
-         for (Item item : Item.field_150901_e)
+         if (this.field_147062_A.func_146179_b().isEmpty())
          {
-             if (item != null && item.func_77640_w() != null)
-@@ -338,7 +355,13 @@
-                 item.func_150895_a(item, (CreativeTabs)null, guicontainercreative$containercreative.field_148330_a);
-             }
-         }
-+        updateFilteredItems(guicontainercreative$containercreative);
-+    }
- 
-+    //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
-         for (Enchantment enchantment : Enchantment.field_185264_b)
-         {
-             if (enchantment != null && enchantment.field_77351_y != null)
-@@ -346,7 +369,6 @@
-                 Items.field_151134_bR.func_92113_a(enchantment, guicontainercreative$containercreative.field_148330_a);
-             }
-         }
--
-         Iterator<ItemStack> iterator = guicontainercreative$containercreative.field_148330_a.iterator();
-         String s1 = this.field_147062_A.func_146179_b().toLowerCase(Locale.ROOT);
- 
-@@ -378,7 +400,7 @@
+             for (Item item : Item.field_150901_e)
+@@ -366,7 +404,7 @@
      {
          CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
  
@@ -77,8 +76,8 @@
 +        if (creativetabs != null && creativetabs.func_78019_g())
          {
              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);
-@@ -413,7 +435,7 @@
+             this.field_146289_q.func_78276_b(I18n.func_135052_a(creativetabs.func_78024_c()), 8, 6, 4210752);
+@@ -401,7 +439,7 @@
  
              for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
              {
@@ -87,7 +86,7 @@
                  {
                      this.func_147050_b(creativetabs);
                      return;
-@@ -426,11 +448,13 @@
+@@ -414,11 +452,13 @@
  
      private boolean func_147055_p()
      {
@@ -101,7 +100,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;
-@@ -501,12 +525,14 @@
+@@ -524,12 +564,14 @@
  
          if (this.field_147062_A != null)
          {
@@ -117,16 +116,16 @@
                  this.func_147053_i();
              }
              else
-@@ -576,20 +602,43 @@
-         }
+@@ -601,19 +643,43 @@
  
          super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
+ 
+-        for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
 +        int start = tabPage * 10;
 +        int end = Math.min(CreativeTabs.field_78032_a.length, ((tabPage + 1) * 10) + 2);
 +        if (tabPage != 0) start += 2;
 +        boolean rendered = false;
- 
--        for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
++
 +        for (CreativeTabs creativetabs : java.util.Arrays.copyOfRange(CreativeTabs.field_78032_a,start,end))
          {
 +            if (creativetabs == null) continue;
@@ -144,7 +143,7 @@
 +
          if (this.field_147064_C != null && field_147058_w == CreativeTabs.field_78036_m.func_78021_a() && this.func_146978_c(this.field_147064_C.field_75223_e, this.field_147064_C.field_75221_f, 16, 16, p_73863_1_, p_73863_2_))
          {
-             this.func_146279_a(I18n.func_135052_a("inventory.binSlot", new Object[0]), p_73863_1_, p_73863_2_);
+             this.func_146279_a(I18n.func_135052_a("inventory.binSlot"), p_73863_1_, p_73863_2_);
          }
  
 +        if (maxPages != 0)
@@ -161,8 +160,8 @@
 +
          GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
          GlStateManager.func_179140_f();
-     }
-@@ -637,7 +686,9 @@
+         this.func_191948_b(p_73863_1_, p_73863_2_);
+@@ -662,7 +728,9 @@
                  }
              }
  
@@ -172,7 +171,7 @@
          }
          else
          {
-@@ -651,16 +702,35 @@
+@@ -676,16 +744,35 @@
          RenderHelper.func_74520_c();
          CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
  
@@ -209,7 +208,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();
-@@ -675,6 +745,14 @@
+@@ -700,6 +787,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);
          }
  
@@ -224,7 +223,7 @@
          this.func_147051_a(creativetabs);
  
          if (creativetabs == CreativeTabs.field_78036_m)
-@@ -685,6 +763,14 @@
+@@ -710,6 +805,14 @@
  
      protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
      {
@@ -239,7 +238,7 @@
          int i = p_147049_1_.func_78020_k();
          int j = 28 * i;
          int k = 0;
-@@ -781,6 +867,8 @@
+@@ -806,6 +909,8 @@
          }
  
          GlStateManager.func_179140_f();
@@ -248,7 +247,7 @@
          this.func_73729_b(l, i1, j, k, 28, 32);
          this.field_73735_i = 100.0F;
          this.field_146296_j.field_77023_b = 100.0F;
-@@ -807,6 +895,15 @@
+@@ -827,6 +932,15 @@
          {
              this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m()));
          }
@@ -264,7 +263,7 @@
      }
  
      public int func_147056_g()
-@@ -984,5 +1081,37 @@
+@@ -1031,6 +1145,38 @@
          {
              return this.field_148332_b.func_82869_a(p_82869_1_);
          }
@@ -301,4 +300,5 @@
 +        }
 +        /*========================================= FORGE END =====================================*/
      }
- }
+ 
+     @SideOnly(Side.CLIENT)

patches/minecraft/net/minecraft/client/model/ModelBox.java.patch

@@ -13,6 +13,6 @@
      }
  
 +    @SideOnly(Side.CLIENT)
-     public void func_178780_a(VertexBuffer p_178780_1_, float p_178780_2_)
+     public void func_178780_a(BufferBuilder p_178780_1_, float p_178780_2_)
      {
          for (TexturedQuad texturedquad : this.field_78254_i)

patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch

@@ -13,6 +13,6 @@
      }
  
 +    @SideOnly(Side.CLIENT)
-     public void func_178765_a(VertexBuffer p_178765_1_, float p_178765_2_)
+     public void func_178765_a(BufferBuilder p_178765_1_, float p_178765_2_)
      {
          Vec3d vec3d = this.field_78239_a[1].field_78243_a.func_72444_a(this.field_78239_a[0].field_78243_a);

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(316, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
-+                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(316, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
+-                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(335, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
++                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(335, 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)

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
-@@ -122,10 +122,16 @@
+@@ -126,10 +126,16 @@
              }
          }
  
@@ -18,7 +18,7 @@
          else
          {
              World world = this.field_78776_a.field_71441_e;
-@@ -143,19 +149,13 @@
+@@ -147,19 +153,13 @@
              else
              {
                  world.func_175718_b(2001, p_187103_1_, Block.func_176210_f(iblockstate));
@@ -39,7 +39,7 @@
  
                      if (!itemstack1.func_190926_b())
                      {
-@@ -163,11 +163,18 @@
+@@ -167,11 +167,18 @@
  
                          if (itemstack1.func_190926_b())
                          {
@@ -58,34 +58,37 @@
                  return flag;
              }
          }
-@@ -207,6 +214,7 @@
-             if (this.field_78779_k.func_77145_d())
+@@ -212,6 +219,7 @@
              {
+                 this.field_78776_a.func_193032_ao().func_193294_a(this.field_78776_a.field_71441_e, p_180511_1_, this.field_78776_a.field_71441_e.func_180495_p(p_180511_1_), 1.0F);
                  this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
 +                if (!net.minecraftforge.common.ForgeHooks.onLeftClickBlock(this.field_78776_a.field_71439_g, p_180511_1_, p_180511_2_, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(this.field_78776_a.field_71439_g, func_78757_d() + 1)).isCanceled())
                  func_178891_a(this.field_78776_a, this, p_180511_1_, p_180511_2_);
                  this.field_78781_i = 5;
              }
-@@ -218,14 +226,17 @@
+@@ -222,6 +230,9 @@
+                     this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, this.field_178895_c, p_180511_2_));
                  }
  
-                 this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
++                this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
 +                net.minecraftforge.event.entity.player.PlayerInteractEvent.LeftClickBlock event = net.minecraftforge.common.ForgeHooks.onLeftClickBlock(this.field_78776_a.field_71439_g, p_180511_1_, p_180511_2_, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(this.field_78776_a.field_71439_g, func_78757_d() + 1));
 +
                  IBlockState iblockstate = this.field_78776_a.field_71441_e.func_180495_p(p_180511_1_);
-                 boolean flag = iblockstate.func_185904_a() != Material.field_151579_a;
+                 this.field_78776_a.func_193032_ao().func_193294_a(this.field_78776_a.field_71441_e, p_180511_1_, iblockstate, 0.0F);
+                 this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
+@@ -229,9 +240,11 @@
  
                  if (flag && this.field_78770_f == 0.0F)
                  {
 +                    if (event.getUseBlock() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
                      iblockstate.func_177230_c().func_180649_a(this.field_78776_a.field_71441_e, p_180511_1_, this.field_78776_a.field_71439_g);
                  }
--
+ 
 +                if (event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) return true;
                  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_);
-@@ -289,7 +300,7 @@
+@@ -297,7 +310,7 @@
  
                  if (this.field_78780_h % 4.0F == 0.0F)
                  {
@@ -94,7 +97,7 @@
                      this.field_78776_a.func_147118_V().func_147682_a(new PositionedSoundRecord(soundtype.func_185846_f(), SoundCategory.NEUTRAL, (soundtype.func_185843_a() + 1.0F) / 8.0F, soundtype.func_185847_b() * 0.5F, p_180512_1_));
                  }
  
-@@ -341,7 +352,7 @@
+@@ -350,7 +363,7 @@
  
          if (!this.field_85183_f.func_190926_b() && !itemstack.func_190926_b())
          {
@@ -103,7 +106,7 @@
          }
  
          return p_178893_1_.equals(this.field_178895_c) && flag;
-@@ -373,13 +384,29 @@
+@@ -382,13 +395,29 @@
          }
          else
          {
@@ -135,7 +138,7 @@
                  }
  
                  if (!flag && itemstack.func_77973_b() instanceof ItemBlock)
-@@ -395,7 +422,7 @@
+@@ -404,7 +433,7 @@
  
              this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_3_, p_187099_4_, p_187099_6_, f, f1, f2));
  
@@ -144,7 +147,7 @@
              {
                  if (itemstack.func_190926_b())
                  {
-@@ -421,14 +448,20 @@
+@@ -430,14 +459,20 @@
                      {
                          int i = itemstack.func_77960_j();
                          int j = itemstack.func_190916_E();
@@ -166,7 +169,7 @@
                      }
                  }
              }
-@@ -457,6 +490,8 @@
+@@ -466,6 +501,8 @@
              }
              else
              {
@@ -174,8 +177,8 @@
 +                if (cancelResult != null) return cancelResult;
                  int i = itemstack.func_190916_E();
                  ActionResult<ItemStack> actionresult = itemstack.func_77957_a(p_187101_2_, p_187101_1_, p_187101_3_);
-                 ItemStack itemstack1 = (ItemStack)actionresult.func_188398_b();
-@@ -464,6 +499,10 @@
+                 ItemStack itemstack1 = actionresult.func_188398_b();
+@@ -473,6 +510,10 @@
                  if (itemstack1 != itemstack || itemstack1.func_190916_E() != i)
                  {
                      p_187101_1_.func_184611_a(p_187101_3_, itemstack1);
@@ -186,7 +189,7 @@
                  }
  
                  return actionresult.func_188397_a();
-@@ -500,6 +539,9 @@
+@@ -509,6 +550,9 @@
          this.func_78750_j();
          Vec3d vec3d = new Vec3d(p_187102_3_.field_72307_f.field_72450_a - p_187102_2_.field_70165_t, p_187102_3_.field_72307_f.field_72448_b - p_187102_2_.field_70163_u, p_187102_3_.field_72307_f.field_72449_c - p_187102_2_.field_70161_v);
          this.field_78774_b.func_147297_a(new CPacketUseEntity(p_187102_2_, p_187102_4_, vec3d));

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
-@@ -280,7 +280,7 @@
+@@ -293,7 +293,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,7 @@
          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();
-@@ -742,7 +742,7 @@
+@@ -755,7 +755,7 @@
  
              if (tileentity != null)
              {
@@ -18,35 +18,27 @@
              }
          }
      }
-@@ -825,14 +825,16 @@
+@@ -838,7 +838,9 @@
      public void func_147251_a(SPacketChat p_147251_1_)
      {
          PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
-+        net.minecraft.util.text.ITextComponent message = net.minecraftforge.event.ForgeEventFactory.onClientChat(p_147251_1_.func_179841_c(), p_147251_1_.func_148915_c());
+-        this.field_147299_f.field_71456_v.func_191742_a(p_147251_1_.func_192590_c(), p_147251_1_.func_148915_c());
++        net.minecraft.util.text.ITextComponent message = net.minecraftforge.event.ForgeEventFactory.onClientChat(p_147251_1_.func_192590_c(), p_147251_1_.func_148915_c());
 +        if (message == null) return;
- 
-         if (p_147251_1_.func_179841_c() == 2)
-         {
--            this.field_147299_f.field_71456_v.func_175188_a(p_147251_1_.func_148915_c(), false);
-+            this.field_147299_f.field_71456_v.func_175188_a(message, false);
-         }
-         else
-         {
--            this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(p_147251_1_.func_148915_c());
-+            this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(message);
-         }
++        this.field_147299_f.field_71456_v.func_191742_a(p_147251_1_.func_192590_c(), message);
      }
  
-@@ -964,7 +966,7 @@
+     public void func_147279_a(SPacketAnimation p_147279_1_)
+@@ -969,7 +971,7 @@
  
                      if (entity1 == this.field_147299_f.field_71439_g && !flag)
                      {
--                        this.field_147299_f.field_71456_v.func_110326_a(I18n.func_135052_a("mount.onboard", new Object[] {GameSettings.func_74298_c(this.field_147299_f.field_71474_y.field_74311_E.func_151463_i())}), false);
-+                        this.field_147299_f.field_71456_v.func_110326_a(I18n.func_135052_a("mount.onboard", new Object[] {this.field_147299_f.field_71474_y.field_74311_E.getDisplayName()}), false);
+-                        this.field_147299_f.field_71456_v.func_110326_a(I18n.func_135052_a("mount.onboard", GameSettings.func_74298_c(this.field_147299_f.field_71474_y.field_74311_E.func_151463_i())), false);
++                        this.field_147299_f.field_71456_v.func_110326_a(I18n.func_135052_a("mount.onboard", this.field_147299_f.field_71474_y.field_74311_E.getDisplayName()), false);
                      }
                  }
              }
-@@ -1211,6 +1213,15 @@
+@@ -1217,6 +1219,15 @@
              {
                  tileentity.func_145839_a(p_147273_1_.func_148857_g());
              }
@@ -62,7 +54,7 @@
  
              if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
              {
-@@ -1308,15 +1319,15 @@
+@@ -1317,15 +1328,15 @@
              }
              else if (f == 101.0F)
              {
@@ -81,7 +73,7 @@
              }
          }
          else if (i == 6)
-@@ -1430,7 +1441,7 @@
+@@ -1487,7 +1498,7 @@
  
          if (entity instanceof EntityLivingBase)
          {

patches/minecraft/net/minecraft/client/network/ServerPinger.java.patch

@@ -12,8 +12,8 @@
  
          try
          {
--            networkmanager.func_179290_a(new C00Handshake(316, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS));
-+            networkmanager.func_179290_a(new C00Handshake(316, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS, true));
+-            networkmanager.func_179290_a(new C00Handshake(335, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS));
++            networkmanager.func_179290_a(new C00Handshake(335, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS, true));
              networkmanager.func_179290_a(new CPacketServerQuery());
          }
          catch (Throwable throwable)

patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch

@@ -8,7 +8,7 @@
          this.field_187241_h.add(p_78873_1_);
      }
  
-@@ -387,7 +388,7 @@
+@@ -409,7 +410,7 @@
  
      public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
      {
@@ -17,7 +17,7 @@
          {
              p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_);
              int i = 4;
-@@ -471,4 +472,13 @@
+@@ -493,4 +494,13 @@
  
          return "" + i;
      }

patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
-@@ -392,5 +392,6 @@
+@@ -391,5 +391,6 @@
                  return new ModelResourceLocation(s + "_double_slab", s1);
              }
          });

patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch

@@ -1,5 +1,5 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/VertexBuffer.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/VertexBuffer.java
+--- ../src-base/minecraft/net/minecraft/client/renderer/BufferBuilder.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/BufferBuilder.java
 @@ -123,6 +123,8 @@
  
              bitset.set(i1);
@@ -8,8 +8,8 @@
 +        this.field_178999_b.position(this.func_181664_j());
      }
  
-     public VertexBuffer.State func_181672_a()
-@@ -507,15 +509,15 @@
+     public BufferBuilder.State func_181672_a()
+@@ -506,15 +508,15 @@
                  break;
              case USHORT:
              case SHORT:
@@ -31,13 +31,23 @@
          }
  
          this.func_181667_k();
-@@ -606,4 +608,9 @@
+@@ -605,4 +607,19 @@
              return this.field_179018_e;
          }
      }
 +
++
++    //For some unknown reason Mojang changed the vanilla function to hardcode alpha as 255.... So lets re-add the parameter -.-
++    public void putColorRGBA(int index, int red, int green, int blue, int alpha)
++    {
++        if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN)
++            this.field_178999_b.put(index, alpha << 24 | blue << 16 | green << 8 | red);
++        else
++            this.field_178999_b.put(index, red << 24 | green << 16 | blue << 8 | alpha);
++    }
++
 +    public boolean isColorDisabled()
 +    {
-+        return field_78939_q;
++        return this.field_78939_q;
 +    }
  }

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
-@@ -212,6 +212,7 @@
+@@ -211,6 +211,7 @@
              {
                  this.func_175069_a(new ResourceLocation("shaders/post/invert.json"));
              }
@@ -8,7 +8,7 @@
          }
      }
  
-@@ -413,7 +414,7 @@
+@@ -412,7 +413,7 @@
  
                          if (d3 < d2 || d2 == 0.0D)
                          {
@@ -17,7 +17,7 @@
                              {
                                  if (d2 == 0.0D)
                                  {
-@@ -506,7 +507,7 @@
+@@ -505,7 +506,7 @@
                  f = f * 60.0F / 70.0F;
              }
  
@@ -26,7 +26,7 @@
          }
      }
  
-@@ -570,14 +571,8 @@
+@@ -569,14 +570,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);
              }
-@@ -644,17 +639,20 @@
+@@ -643,17 +638,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);
-@@ -772,6 +770,7 @@
+@@ -771,6 +769,7 @@
  
              boolean flag = this.field_78531_r.func_175606_aa() instanceof EntityLivingBase && ((EntityLivingBase)this.field_78531_r.func_175606_aa()).func_70608_bn();
  
@@ -93,8 +93,8 @@
  
                  try
                  {
--                    this.field_78531_r.field_71462_r.func_73863_a(k1, l1, p_181560_1_);
-+                    net.minecraftforge.client.ForgeHooksClient.drawScreen(this.field_78531_r.field_71462_r, k1, l1, p_181560_1_);
+-                    this.field_78531_r.field_71462_r.func_73863_a(k1, l1, this.field_78531_r.func_193989_ak());
++                    net.minecraftforge.client.ForgeHooksClient.drawScreen(this.field_78531_r.field_71462_r, k1, l1, this.field_78531_r.func_193989_ak());
                  }
                  catch (Throwable throwable)
                  {

patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java.patch

@@ -35,6 +35,6 @@
  
 +                potion.renderInventoryEffect(i, j, potioneffect, field_146297_k);
 +                if (!potion.shouldRenderInvText(potioneffect)) { j += l; continue; }
-                 String s1 = I18n.func_135052_a(potion.func_76393_a(), new Object[0]);
+                 String s1 = I18n.func_135052_a(potion.func_76393_a());
  
                  if (potioneffect.func_76458_c() == 1)

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
-@@ -311,7 +311,7 @@
+@@ -312,7 +312,7 @@
          {
              ItemStack itemstack = abstractclientplayer.func_184607_cu();
  
@@ -9,7 +9,7 @@
              {
                  EnumHand enumhand1 = abstractclientplayer.func_184600_cs();
                  flag = enumhand1 == EnumHand.MAIN_HAND;
-@@ -328,6 +328,7 @@
+@@ -329,6 +329,7 @@
          {
              float f3 = enumhand == EnumHand.MAIN_HAND ? f : 0.0F;
              float f5 = 1.0F - (this.field_187470_g + (this.field_187469_f - this.field_187470_g) * p_78440_1_);
@@ -17,7 +17,7 @@
              this.func_187457_a(abstractclientplayer, p_78440_1_, f1, EnumHand.MAIN_HAND, f3, this.field_187467_d, f5);
          }
  
-@@ -335,6 +336,7 @@
+@@ -336,6 +337,7 @@
          {
              float f4 = enumhand == EnumHand.OFF_HAND ? f : 0.0F;
              float f6 = 1.0F - (this.field_187472_i + (this.field_187471_h - this.field_187472_i) * p_78440_1_);
@@ -25,7 +25,7 @@
              this.func_187457_a(abstractclientplayer, p_78440_1_, f1, EnumHand.OFF_HAND, f4, this.field_187468_e, f6);
          }
  
-@@ -355,7 +357,7 @@
+@@ -356,7 +358,7 @@
                  this.func_187456_a(p_187457_7_, p_187457_5_, enumhandside);
              }
          }
@@ -34,7 +34,7 @@
          {
              if (flag && this.field_187468_e.func_190926_b())
              {
-@@ -439,6 +441,7 @@
+@@ -440,6 +442,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));
@@ -42,7 +42,7 @@
              EntityPlayer entityplayer = this.field_78455_a.field_71439_g;
  
              for (int i = 0; i < 8; ++i)
-@@ -452,11 +455,13 @@
+@@ -453,11 +456,13 @@
                  if (iblockstate1.func_191058_s())
                  {
                      iblockstate = iblockstate1;
@@ -53,10 +53,10 @@
              if (iblockstate.func_185901_i() != EnumBlockRenderType.INVISIBLE)
              {
 +                if (!net.minecraftforge.event.ForgeEventFactory.renderBlockOverlay(field_78455_a.field_71439_g, p_78447_1_, net.minecraftforge.client.event.RenderBlockOverlayEvent.OverlayType.BLOCK, iblockstate, overlayPos))
-                 this.func_178108_a(p_78447_1_, this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(iblockstate));
+                 this.func_178108_a(this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(iblockstate));
              }
          }
-@@ -465,11 +470,13 @@
+@@ -466,11 +471,13 @@
          {
              if (this.field_78455_a.field_71439_g.func_70055_a(Material.field_151586_h))
              {
@@ -67,15 +67,15 @@
              if (this.field_78455_a.field_71439_g.func_70027_ad())
              {
 +                if (!net.minecraftforge.event.ForgeEventFactory.renderFireOverlay(field_78455_a.field_71439_g, p_78447_1_))
-                 this.func_78442_d(p_78447_1_);
+                 this.func_78442_d();
              }
          }
-@@ -591,8 +598,8 @@
+@@ -592,8 +599,8 @@
          else
          {
              float f = entityplayersp.func_184825_o(1.0F);
--            this.field_187469_f += MathHelper.func_76131_a((Objects.equal(this.field_187467_d, itemstack) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
--            this.field_187471_h += MathHelper.func_76131_a((float)(Objects.equal(this.field_187468_e, itemstack1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
+-            this.field_187469_f += MathHelper.func_76131_a((Objects.equals(this.field_187467_d, itemstack) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
+-            this.field_187471_h += MathHelper.func_76131_a((float)(Objects.equals(this.field_187468_e, itemstack1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
 +            this.field_187469_f += MathHelper.func_76131_a((!net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187467_d, itemstack, entityplayersp.field_71071_by.field_70461_c) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
 +            this.field_187471_h += MathHelper.func_76131_a((float)(!net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187468_e, itemstack1, -1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
          }

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
-@@ -551,8 +551,10 @@
+@@ -552,8 +552,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
-@@ -563,9 +565,12 @@
+@@ -564,9 +566,12 @@
              this.field_72769_h.field_72984_F.func_76320_a("prepare");
              TileEntityRendererDispatcher.field_147556_a.func_190056_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(), this.field_72777_q.field_71476_x, 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_;
-@@ -577,11 +582,15 @@
+@@ -578,11 +583,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();
@@ -35,12 +35,12 @@
  
              for (int i = 0; i < this.field_72769_h.field_73007_j.size(); ++i)
              {
-                 Entity entity1 = (Entity)this.field_72769_h.field_73007_j.get(i);
+                 Entity entity1 = this.field_72769_h.field_73007_j.get(i);
 +                if (!entity1.shouldRenderInPass(pass)) continue;
                  ++this.field_72749_I;
  
                  if (entity1.func_145770_h(d0, d1, d2))
-@@ -604,6 +613,7 @@
+@@ -605,6 +614,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)
-@@ -640,6 +650,7 @@
+@@ -641,6 +651,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");
-@@ -679,6 +690,7 @@
+@@ -680,6 +691,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();
-@@ -687,6 +699,7 @@
+@@ -688,6 +700,7 @@
                  {
                      for (TileEntity tileentity2 : list3)
                      {
@@ -72,7 +72,7 @@
                          TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity2, p_180446_3_, -1);
                      }
                  }
-@@ -696,9 +709,11 @@
+@@ -697,9 +710,11 @@
              {
                  for (TileEntity tileentity : this.field_181024_n)
                  {
@@ -84,7 +84,7 @@
  
              this.func_180443_s();
  
-@@ -933,7 +948,7 @@
+@@ -950,7 +965,7 @@
                  BlockPos blockpos2 = renderchunk4.func_178568_j().func_177982_a(8, 8, 8);
                  boolean flag3 = blockpos2.func_177951_i(blockpos1) < 768.0D;
  
@@ -93,7 +93,7 @@
                  {
                      this.field_175009_l.add(renderchunk4);
                  }
-@@ -1220,6 +1235,13 @@
+@@ -1249,6 +1264,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();
-@@ -1437,6 +1459,12 @@
+@@ -1466,6 +1488,12 @@
  
      public void func_180447_b(float p_180447_1_, int p_180447_2_, double p_180447_3_, double p_180447_5_, double p_180447_7_)
      {
@@ -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)
-@@ -1859,8 +1887,11 @@
+@@ -1888,8 +1916,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();
@@ -133,7 +133,7 @@
                  {
                      if (d3 * d3 + d4 * d4 + d5 * d5 > 1024.0D)
                      {
-@@ -2328,7 +2359,7 @@
+@@ -2384,7 +2415,7 @@
  
                  if (block.func_176223_P().func_185904_a() != Material.field_151579_a)
                  {

patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch

@@ -9,16 +9,16 @@
          this.func_175041_b();
          this.field_184395_f = p_i46552_3_;
      }
-@@ -223,7 +223,7 @@
+@@ -218,7 +218,7 @@
                  k = k | -16777216;
              }
  
--            this.func_175033_a(p_175032_1_, bakedquad, k);
-+            net.minecraftforge.client.model.pipeline.LightUtil.renderQuadColor(p_175032_1_, bakedquad, k);
+-            this.func_191969_a(p_191970_1_, bakedquad, k);
++            net.minecraftforge.client.model.pipeline.LightUtil.renderQuadColor(p_191970_1_, bakedquad, k);
          }
      }
  
-@@ -245,17 +245,7 @@
+@@ -240,17 +240,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_);
@@ -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 @@
+@@ -274,14 +264,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,16 +54,16 @@
              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 @@
+@@ -314,7 +299,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());
--        p_184390_4_.func_177552_f().func_181689_a(ItemCameraTransforms.TransformType.GUI);
-+        p_184390_4_ = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(p_184390_4_, ItemCameraTransforms.TransformType.GUI, false);
-         this.func_180454_a(p_184390_1_, p_184390_4_);
+         this.func_180452_a(p_191962_2_, p_191962_3_, p_191962_4_.func_177556_c());
+-        p_191962_4_.func_177552_f().func_181689_a(ItemCameraTransforms.TransformType.GUI);
++        p_191962_4_ = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(p_191962_4_, ItemCameraTransforms.TransformType.GUI, false);
+         this.func_180454_a(p_191962_1_, p_191962_4_);
          GlStateManager.func_179118_c();
          GlStateManager.func_179101_C();
-@@ -418,9 +403,12 @@
+@@ -413,9 +398,12 @@
                  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();
@@ -77,10 +77,10 @@
              {
                  GlStateManager.func_179140_f();
                  GlStateManager.func_179097_i();
-@@ -429,11 +417,10 @@
+@@ -424,11 +412,10 @@
                  GlStateManager.func_179084_k();
                  Tessellator tessellator = Tessellator.func_178181_a();
-                 VertexBuffer vertexbuffer = tessellator.func_178180_c();
+                 BufferBuilder bufferbuilder = tessellator.func_178180_c();
 -                float f = (float)p_180453_2_.func_77952_i();
 -                float f1 = (float)p_180453_2_.func_77958_k();
 -                float f2 = Math.max(0.0F, (f1 - f) / f1);
@@ -90,10 +90,10 @@
 +                int rgbfordisplay = p_180453_2_.func_77973_b().getRGBDurabilityForDisplay(p_180453_2_);
 +                int i = Math.round(13.0F - (float)health * 13.0F);
 +                int j = rgbfordisplay;
-                 this.func_181565_a(vertexbuffer, p_180453_3_ + 2, p_180453_4_ + 13, 13, 2, 0, 0, 0, 255);
-                 this.func_181565_a(vertexbuffer, p_180453_3_ + 2, p_180453_4_ + 13, i, 1, j >> 16 & 255, j >> 8 & 255, j & 255, 255);
+                 this.func_181565_a(bufferbuilder, p_180453_3_ + 2, p_180453_4_ + 13, 13, 2, 0, 0, 0, 255);
+                 this.func_181565_a(bufferbuilder, p_180453_3_ + 2, p_180453_4_ + 13, i, 1, j >> 16 & 255, j >> 8 & 255, j & 255, 255);
                  GlStateManager.func_179147_l();
-@@ -1074,6 +1061,7 @@
+@@ -1099,6 +1086,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");

patches/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java
-@@ -28,26 +28,8 @@
+@@ -27,26 +27,8 @@
                  int l = vertexformatelement.func_177369_e();
                  bytebuffer.position(vertexformat.func_181720_d(j));
  
@@ -29,7 +29,7 @@
              }
  
              GlStateManager.func_187439_f(p_181679_1_.func_178979_i(), 0, p_181679_1_.func_178989_h());
-@@ -59,23 +41,8 @@
+@@ -58,23 +40,8 @@
                  VertexFormatElement.EnumUsage vertexformatelement$enumusage1 = vertexformatelement1.func_177375_c();
                  int k1 = vertexformatelement1.func_177369_e();
  

patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch

@@ -43,13 +43,13 @@
                              try
                              {
 -                                this.field_177612_i.put(modelresourcelocation, modelblockdefinition.func_188004_c(modelresourcelocation.func_177518_c()));
-+                                this.func_177569_a(modelblockdefinition, modelresourcelocation);
++                                func_177569_a(modelblockdefinition, modelresourcelocation);
                              }
                              catch (RuntimeException var12)
                              {
                                  if (!modelblockdefinition.func_188002_b())
                                  {
--                                    field_177603_c.warn("Unable to load variant: {} from {}", new Object[] {modelresourcelocation.func_177518_c(), modelresourcelocation});
+-                                    field_177603_c.warn("Unable to load variant: {} from {}", modelresourcelocation.func_177518_c(), modelresourcelocation);
 +                                    field_177603_c.warn("Unable to load variant: " + modelresourcelocation.func_177518_c() + " from " + modelresourcelocation, var12);
                                  }
                              }
@@ -58,7 +58,7 @@
                  }
 -                catch (Exception exception)
 -                {
--                    field_177603_c.warn("Unable to load definition {}", new Object[] {resourcelocation, exception});
+-                    field_177603_c.warn("Unable to load definition {}", resourcelocation, exception);
 -                }
              }
          }
@@ -67,23 +67,22 @@
  
      protected void func_177592_e()
      {
-+        this.field_177613_u.clear(); //FML clear this to prevent double ups.
-         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"}));
-@@ -439,6 +451,11 @@
-         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"}));
-         this.field_177613_u.put(Items.field_190929_cY, Lists.newArrayList(new String[] {"totem"}));
++        this.field_177613_u.clear(); // FML clear this to prevent double ups.
+         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150348_b), Lists.newArrayList("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("dirt", "coarse_dirt", "podzol"));
+         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150344_f), Lists.newArrayList("oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks"));
+@@ -441,6 +453,10 @@
+         this.field_177613_u.put(Items.field_179570_aq, Lists.newArrayList("oak_door"));
+         this.field_177613_u.put(Items.field_151124_az, Lists.newArrayList("oak_boat"));
+         this.field_177613_u.put(Items.field_190929_cY, Lists.newArrayList("totem"));
 +        for (Entry<net.minecraftforge.fml.common.registry.RegistryDelegate<Item>, Set<String>> e : customVariantNames.entrySet())
 +        {
 +            this.field_177613_u.put(e.getKey().get(), Lists.newArrayList(e.getValue().iterator()));
 +        }
-+
      }
  
      protected List<String> func_177596_a(Item p_177596_1_)
-@@ -455,7 +472,7 @@
+@@ -457,7 +473,7 @@
  
      protected ResourceLocation func_177583_a(String p_177583_1_)
      {
@@ -92,16 +91,16 @@
          return new ResourceLocation(resourcelocation.func_110624_b(), "item/" + resourcelocation.func_110623_a());
      }
  
-@@ -563,7 +580,7 @@
+@@ -565,7 +581,7 @@
          for (Entry<String, ResourceLocation> entry : this.field_177615_s.entrySet())
          {
-             ResourceLocation resourcelocation = (ResourceLocation)entry.getValue();
--            ModelResourceLocation modelresourcelocation = new ModelResourceLocation((String)entry.getKey(), "inventory");
+             ResourceLocation resourcelocation = entry.getValue();
+-            ModelResourceLocation modelresourcelocation = new ModelResourceLocation(entry.getKey(), "inventory");
 +            ModelResourceLocation modelresourcelocation = net.minecraftforge.client.model.ModelLoader.getInventoryVariant(entry.getKey());
-             ModelBlock modelblock = (ModelBlock)this.field_177611_h.get(resourcelocation);
+             ModelBlock modelblock = this.field_177611_h.get(resourcelocation);
  
              if (modelblock != null && modelblock.func_178303_d())
-@@ -651,6 +668,11 @@
+@@ -653,6 +669,11 @@
      @Nullable
      private IBakedModel func_177578_a(ModelBlock p_177578_1_, ModelRotation p_177578_2_, boolean p_177578_3_)
      {
@@ -110,12 +109,12 @@
 +
 +    protected IBakedModel bakeModel(ModelBlock p_177578_1_, net.minecraftforge.common.model.ITransformation p_177578_2_, boolean p_177578_3_)
 +    {
-         TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)this.field_177599_g.get(new ResourceLocation(p_177578_1_.func_178308_c("particle")));
+         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);
  
-@@ -667,13 +689,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)));
+@@ -669,13 +690,13 @@
+                     BlockPartFace blockpartface = blockpart.field_178240_c.get(enumfacing);
+                     TextureAtlasSprite textureatlassprite1 = this.field_177599_g.get(new ResourceLocation(p_177578_1_.func_178308_c(blockpartface.field_178242_d)));
  
 -                    if (blockpartface.field_178244_b == null)
 +                    if (blockpartface.field_178244_b == null || !net.minecraftforge.common.model.TRSRTransformation.isInteger(p_177578_2_.getMatrix()))
@@ -130,7 +129,7 @@
                      }
                  }
              }
-@@ -684,9 +706,14 @@
+@@ -686,9 +707,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_)
      {
@@ -146,7 +145,7 @@
      private void func_177597_h()
      {
          this.func_177574_i();
-@@ -907,4 +934,23 @@
+@@ -916,4 +942,23 @@
          field_177606_o.field_178317_b = "generation marker";
          field_177616_r.field_178317_b = "block entity marker";
      }

patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java.patch

@@ -4,7 +4,7 @@
  
      public static ModelBlockDefinition func_178331_a(Reader p_178331_0_)
      {
--        return (ModelBlockDefinition)field_178333_a.fromJson(p_178331_0_, ModelBlockDefinition.class);
+-        return (ModelBlockDefinition)JsonUtils.func_193839_a(field_178333_a, p_178331_0_, ModelBlockDefinition.class);
 +        return net.minecraftforge.client.model.BlockStateLoader.load(p_178331_0_, field_178333_a);
      }
  

patches/minecraft/net/minecraft/client/renderer/block/model/ModelManager.java.patch

@@ -7,7 +7,7 @@
 -        ModelBakery modelbakery = new ModelBakery(p_110549_1_, this.field_174956_b, this.field_174957_c);
 +        net.minecraftforge.client.model.ModelLoader modelbakery = new net.minecraftforge.client.model.ModelLoader(p_110549_1_, this.field_174956_b, this.field_174957_c);
          this.field_174958_a = modelbakery.func_177570_a();
-         this.field_174955_d = (IBakedModel)this.field_174958_a.func_82594_a(ModelBakery.field_177604_a);
+         this.field_174955_d = this.field_174958_a.func_82594_a(ModelBakery.field_177604_a);
 +        net.minecraftforge.client.ForgeHooksClient.onModelBake(this, this.field_174958_a, modelbakery);
          this.field_174957_c.func_178124_c();
      }

patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
-@@ -43,9 +43,15 @@
+@@ -44,9 +44,15 @@
  
      public ChunkRenderDispatcher()
      {

patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
-@@ -161,7 +161,7 @@
+@@ -162,7 +162,7 @@
                      lvt_9_1_.func_178606_a(blockpos$mutableblockpos);
                  }
  
@@ -9,7 +9,7 @@
                  {
                      TileEntity tileentity = this.field_189564_r.func_190300_a(blockpos$mutableblockpos, Chunk.EnumCreateEntityType.CHECK);
  
-@@ -171,17 +171,19 @@
+@@ -172,17 +172,19 @@
  
                          if (tileentityspecialrenderer != null)
                          {
@@ -31,16 +31,16 @@
                  int j = blockrenderlayer1.ordinal();
  
                  if (block.func_176223_P().func_185901_i() != EnumBlockRenderType.INVISIBLE)
-@@ -196,6 +198,8 @@
+@@ -197,6 +199,8 @@
  
-                     aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, this.field_189564_r, vertexbuffer);
+                     aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, this.field_189564_r, bufferbuilder);
                  }
 +                }
 +                net.minecraftforge.client.ForgeHooksClient.setRenderLayer(null);
              }
  
              for (BlockRenderLayer blockrenderlayer : BlockRenderLayer.values())
-@@ -277,7 +281,9 @@
+@@ -278,7 +282,9 @@
      private void func_189563_q()
      {
          int i = 1;
@@ -51,7 +51,7 @@
      }
  
      @Nullable
-@@ -426,6 +432,26 @@
+@@ -427,6 +433,26 @@
          return this.field_178593_n && this.field_188284_q;
      }
  

patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch

@@ -1,34 +1,34 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/color/BlockColors.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/color/BlockColors.java
-@@ -26,7 +26,8 @@
+@@ -27,7 +27,8 @@
  @SideOnly(Side.CLIENT)
  public class BlockColors
  {
--    private final ObjectIntIdentityMap<IBlockColor> field_186725_a = new ObjectIntIdentityMap(32);
+-    private final ObjectIntIdentityMap<IBlockColor> field_186725_a = new ObjectIntIdentityMap<IBlockColor>(32);
 +    // FORGE: Use RegistryDelegates as non-Vanilla block ids are not constant
 +    private final java.util.Map<net.minecraftforge.fml.common.registry.RegistryDelegate<Block>, IBlockColor> blockColorMap = com.google.common.collect.Maps.newHashMap();
  
      public static BlockColors func_186723_a()
      {
-@@ -144,7 +145,7 @@
+@@ -164,7 +165,7 @@
  
-     public int func_189991_a(IBlockState p_189991_1_)
+     public int func_189991_a(IBlockState p_189991_1_, World p_189991_2_, BlockPos p_189991_3_)
      {
--        IBlockColor iblockcolor = (IBlockColor)this.field_186725_a.func_148745_a(Block.func_149682_b(p_189991_1_.func_177230_c()));
-+        IBlockColor iblockcolor = (IBlockColor)this.blockColorMap.get(p_189991_1_.func_177230_c().delegate);
+-        IBlockColor iblockcolor = this.field_186725_a.func_148745_a(Block.func_149682_b(p_189991_1_.func_177230_c()));
++        IBlockColor iblockcolor = this.blockColorMap.get(p_189991_1_.func_177230_c().delegate);
  
          if (iblockcolor != null)
          {
-@@ -159,7 +160,7 @@
+@@ -179,7 +180,7 @@
  
      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);
+-        IBlockColor iblockcolor = this.field_186725_a.func_148745_a(Block.func_149682_b(p_186724_1_.func_177230_c()));
++        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_);
      }
  
-@@ -167,7 +168,9 @@
+@@ -187,7 +188,9 @@
      {
          for (Block block : p_186722_2_)
          {

patches/minecraft/net/minecraft/client/renderer/color/ItemColors.java.patch

@@ -4,22 +4,22 @@
  @SideOnly(Side.CLIENT)
  public class ItemColors
  {
--    private final ObjectIntIdentityMap<IItemColor> field_186732_a = new ObjectIntIdentityMap(32);
+-    private final ObjectIntIdentityMap<IItemColor> field_186732_a = new ObjectIntIdentityMap<IItemColor>(32);
 +    // FORGE: Use RegistryDelegates as non-Vanilla item ids are not constant
 +    private final java.util.Map<net.minecraftforge.fml.common.registry.RegistryDelegate<Item>, IItemColor> itemColorMap = com.google.common.collect.Maps.newHashMap();
  
      public static ItemColors func_186729_a(final BlockColors p_186729_0_)
      {
-@@ -134,7 +135,7 @@
+@@ -142,7 +143,7 @@
  
      public int func_186728_a(ItemStack p_186728_1_, int p_186728_2_)
      {
--        IItemColor iitemcolor = (IItemColor)this.field_186732_a.func_148745_a(Item.field_150901_e.func_148757_b(p_186728_1_.func_77973_b()));
-+        IItemColor iitemcolor = (IItemColor)this.itemColorMap.get(p_186728_1_.func_77973_b().delegate);
+-        IItemColor iitemcolor = this.field_186732_a.func_148745_a(Item.field_150901_e.func_148757_b(p_186728_1_.func_77973_b()));
++        IItemColor iitemcolor = this.itemColorMap.get(p_186728_1_.func_77973_b().delegate);
          return iitemcolor == null ? -1 : iitemcolor.func_186726_a(p_186728_1_, p_186728_2_);
      }
  
-@@ -142,7 +143,9 @@
+@@ -150,7 +151,9 @@
      {
          for (Block block : p_186731_2_)
          {
@@ -30,7 +30,7 @@
          }
      }
  
-@@ -150,7 +153,9 @@
+@@ -158,7 +161,9 @@
      {
          for (Item item : p_186730_2_)
          {

patches/minecraft/net/minecraft/client/renderer/entity/RenderItemFrame.java.patch

@@ -1,27 +1,21 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
-@@ -106,15 +106,18 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderItemFrame.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderItemFrame.java
+@@ -96,10 +96,13 @@
+         {
+             GlStateManager.func_179094_E();
              GlStateManager.func_179140_f();
-             int i = p_82402_1_.func_82333_j();
- 
--            if (item == Items.field_151098_aY)
-+            if (item instanceof net.minecraft.item.ItemMap)
-             {
-                 i = i % 4 * 2;
-             }
- 
+-            boolean flag = itemstack.func_77973_b() == Items.field_151098_aY;
++            boolean flag = itemstack.func_77973_b() instanceof net.minecraft.item.ItemMap;
+             int i = flag ? p_82402_1_.func_82333_j() % 4 * 2 : p_82402_1_.func_82333_j();
              GlStateManager.func_179114_b((float)i * 360.0F / 8.0F, 0.0F, 0.0F, 1.0F);
  
--            if (item == Items.field_151098_aY)
 +            net.minecraftforge.client.event.RenderItemInFrameEvent event = new net.minecraftforge.client.event.RenderItemInFrameEvent(p_82402_1_, this);
 +            if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event))
-             {
-+            if (item instanceof net.minecraft.item.ItemMap)
 +            {
+             if (flag)
+             {
                  this.field_76990_c.field_78724_e.func_110577_a(field_110789_a);
-                 GlStateManager.func_179114_b(180.0F, 0.0F, 0.0F, 1.0F);
-                 float f = 0.0078125F;
-@@ -137,6 +140,7 @@
+@@ -124,6 +127,7 @@
                  RenderHelper.func_74518_a();
                  GlStateManager.func_179099_b();
              }

patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch

@@ -33,15 +33,15 @@
              {
                  EntityLivingBase entitylivingbase = (EntityLivingBase)p_76986_1_.func_184187_bx();
                  f = this.func_77034_a(entitylivingbase.field_70760_ar, entitylivingbase.field_70761_aq, p_76986_9_);
-@@ -107,6 +112,7 @@
+@@ -133,6 +138,7 @@
                  {
-                     f += f3 * 0.2F;
+                     f5 = 1.0F;
                  }
 +                f2 = f1 - f; // Forge: Fix MC-1207
              }
  
-             float f7 = p_76986_1_.field_70127_C + (p_76986_1_.field_70125_A - p_76986_1_.field_70127_C) * p_76986_9_;
-@@ -192,6 +198,7 @@
+             GlStateManager.func_179141_d();
+@@ -194,6 +200,7 @@
          GlStateManager.func_179089_o();
          GlStateManager.func_179121_F();
          super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
@@ -49,7 +49,7 @@
      }
  
      public float func_188322_c(T p_188322_1_, float p_188322_2_)
-@@ -447,10 +454,11 @@
+@@ -454,10 +461,11 @@
  
      public void func_177067_a(T p_177067_1_, double p_177067_2_, double p_177067_4_, double p_177067_6_)
      {
@@ -62,7 +62,7 @@
  
              if (d0 < (double)(f * f))
              {
-@@ -459,6 +467,7 @@
+@@ -466,6 +474,7 @@
                  this.func_188296_a(p_177067_1_, p_177067_2_, p_177067_4_, p_177067_6_, s, d0);
              }
          }

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
-@@ -226,8 +226,13 @@
+@@ -227,8 +227,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_;
-@@ -276,9 +281,9 @@
+@@ -277,9 +282,9 @@
              IBlockState iblockstate = p_180597_1_.func_180495_p(new BlockPos(p_180597_3_));
              Block block = iblockstate.func_177230_c();
  

patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@
  
      public void func_76986_a(AbstractClientPlayer p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
      {
@@ -8,7 +8,7 @@
          if (!p_76986_1_.func_175144_cb() || this.field_76990_c.field_78734_h == p_76986_1_)
          {
              double d0 = p_76986_4_;
-@@ -69,6 +70,7 @@
+@@ -70,6 +71,7 @@
              super.func_76986_a(p_76986_1_, p_76986_2_, d0, p_76986_6_, p_76986_8_, p_76986_9_);
              GlStateManager.func_187440_b(GlStateManager.Profile.PLAYER_SKIN);
          }
@@ -16,7 +16,7 @@
      }
  
      private void func_177137_d(AbstractClientPlayer p_177137_1_)
-@@ -127,6 +129,11 @@
+@@ -128,6 +130,11 @@
                      {
                          modelbiped$armpose1 = ModelBiped.ArmPose.BLOCK;
                      }

patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch

@@ -54,7 +54,7 @@
 +    @Deprecated //Use the more sensitive version getArmorResource below
      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_})});
+         String s = String.format("textures/models/armor/%s_layer_%d%s.png", p_177178_1_.func_82812_d().func_179242_c(), p_177178_2_ ? 2 : 1, p_177178_3_ == null ? "" : String.format("_%s", p_177178_3_));
 @@ -161,4 +161,49 @@
      protected abstract void func_177177_a();