Merge remote-tracking branch 'origin/1.8.8'

2015-12-29 19:25:38 -08:00 · 2015-12-29 19:25:38 -08:00 · 6644e8c9ed
commit 6644e8c9ed
parent 11d237f5f2 ad40f24fb1
561 changed files with 10755 additions and 8237 deletions
--- a/build.gradle
+++ b/build.gradle
@ -11,20 +11,26 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
    }
 }

+repositories {
+        maven {
+            name = "local"
+            url = "file:///home/cpw/projects/repo"
+        }
+}
 apply plugin: "maven"
 apply plugin: "net.minecraftforge.gradle.patcher"
 apply plugin: "net.minecraftforge.gradle.launch4j"

 minecraft {
-    version = "1.8"
+    version = "1.8.8"
    //mappings = 'stable_16'
-    mappings = "snapshot_nodoc_20141130"
+    mappings = "snapshot_nodoc_20151122"
    workspaceDir = "projects"
-    versionJson = "jsons/1.8-dev.json"
+    versionJson = "jsons/1.8.8-dev.json"
    buildUserdev = true
    buildInstaller = true
    installerVersion = "1.4"
@ -39,20 +45,13 @@ minecraft {
    }

    projects {
-//        fml {
-//            rootDir 'fml'
-//            patchDir "fml/patches/minecraft"
-//            patchAfter "clean"
-//            genPatchesFrom "clean"
-//
-//            with common
-//        }
        forge {
            rootDir "."
            patchDir "patches/minecraft"
            patchAfter "clean"
            genPatchesFrom "clean"
-
+            genMcpPatches = false
+            applyMcpPatches = false
            with common
        }
    }
@ -66,7 +65,7 @@ extractForgeSources { exclude "**/SideOnly.java", "**/Side.java" }
 genGradleProjects { addTestCompileDep "junit:junit:4.12" }

 processJson {
-    releaseJson = "jsons/1.8-rel.json"
+    releaseJson = "jsons/1.8.8-rel.json"
    addReplacements([
        "@minecraft_version@": project.minecraft.version,
        "@version@": project.version,
@ -126,7 +125,7 @@ outputJar {
    manifest.attributes([
        "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper",
        "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker",
-        "Class-Path": getServerClasspath(file("jsons/1.8-rel.json"))
+        "Class-Path": getServerClasspath(file("jsons/${minecraft.version}-rel.json"))
    ])
 }

--- a/jsons/1.8-dev.json
+++ b/jsons/1.8-dev.json
@ -8,6 +8,11 @@
    {
      "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"],
--- a/jsons/1.8-rel.json
+++ b/jsons/1.8-rel.json
@ -39,6 +39,13 @@
      "name": "org.ow2.asm:asm-all:5.0.3",
      "serverreq":true
    },
+    {
+      "name": "jline:jline:2.13",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "TODO", "TODO" ],
+      "serverreq":true,
+      "clientreq":false
+    },
    {
      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
      "url" : "http://files.minecraftforge.net/maven/",
@ -126,4 +133,4 @@
    }
  ]
 }
-}
+}
--- a/jsons/1.8.8-dev.json
+++ b/jsons/1.8.8-dev.json
@ -0,0 +1,328 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
+  "libraries": [
+    {
+      "name": "net.minecraft:launchwrapper:1.12"
+    },
+    {
+      "name": "jline:jline:2.13",
+      "children": ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.google.code.findbugs:jsr305:1.3.9",
+      "children": ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.ow2.asm:asm-debug-all:5.0.3",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.typesafe:config:1.2.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.11.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.11.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang:scala-reflect:2.11.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "lzma:lzma:0.0.1"
+    },
+    {
+      "name": "java3d:vecmath:1.5.2"
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3"
+    },
+    {
+      "name": "oshi-project:oshi-core:1.1"
+    },
+    {
+      "name": "net.java.dev.jna:jna:3.4.0"
+    },
+    {
+      "name": "net.java.dev.jna:platform:3.4.0"
+    },
+    {
+      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.6",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.paulscode:codecjorbis:20101023"
+    },
+    {
+      "name": "com.paulscode:codecwav:20101023"
+    },
+    {
+      "name": "com.paulscode:libraryjavasound:20101123"
+    },
+    {
+      "name": "com.paulscode:librarylwjglopenal:20100824"
+    },
+    {
+      "name": "com.paulscode:soundsystem:20120107"
+    },
+    {
+      "name": "io.netty:netty-all:4.0.23.Final"
+    },
+    {
+      "name": "com.google.guava:guava:17.0"
+    },
+    {
+      "name": "org.apache.commons:commons-lang3:3.3.2"
+    },
+    {
+      "name": "commons-io:commons-io:2.4"
+    },
+    {
+      "name": "commons-codec:commons-codec:1.9"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0"
+    },
+    {
+      "name": "com.google.code.gson:gson:2.2.4"
+    },
+    {
+      "name": "com.mojang:authlib:1.5.21"
+    },
+    {
+      "name": "com.mojang:realms:1.7.39"
+    },
+    {
+      "name": "org.apache.commons:commons-compress:1.8.1"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpclient:4.3.3"
+    },
+    {
+      "name": "commons-logging:commons-logging:1.1.3"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpcore:4.3.2"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch:6.5"
+    },
+    {
+      "name": "tv.twitch:twitch-platform:6.5",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "linux"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows-${arch}",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch-external-platform:4.5",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "windows"
+          }
+        }
+      ],
+      "natives": {
+        "windows": "natives-windows-${arch}"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "minimumLauncherVersion": 14,
+  "assets": "1.8"
+}
--- a/jsons/1.8.8-rel.json
+++ b/jsons/1.8.8-rel.json
@ -0,0 +1,146 @@
+{
+"install": {
+  "profileName": "@project@",
+  "target":"@minecraft_version@-@project@@version@",
+  "path":"@artifact@",
+  "version":"@project@ @version@",
+  "filePath":"@universal_jar@",
+  "welcome":"Welcome to the simple @project@ installer.",
+  "minecraft":"@minecraft_version@",
+  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
+  "logo":"/big_logo.png"
+},
+"versionInfo": {
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "minimumLauncherVersion": 14,
+  "assets": "1.8",
+  "inheritsFrom": "1.8.8",
+  "jar": "1.8.8",
+  "libraries": [
+    {
+      "name": "@artifact@",
+      "url": "http://files.minecraftforge.net/maven/"
+    },
+    {
+	  "comment": "Force the downgrade on dedicated server to match client. Netty bug: https://github.com/MinecraftForge/MinecraftForge/issues/1848",
+      "name": "io.netty:netty-all:4.0.23.Final",
+      "serverreq":true
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12",
+      "serverreq":true
+    },
+    {
+      "name": "org.ow2.asm:asm-all:5.0.3",
+      "serverreq":true
+    },
+    {
+      "name": "jline:jline:2.13",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
+      "serverreq":true,
+      "clientreq":false
+    },
+    {
+      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "com.typesafe:config:1.2.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-reflect:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-swing_2.11:1.0.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-xml_2.11:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "lzma:lzma:0.0.1",
+      "serverreq":true
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.6",
+      "serverreq":true
+    },
+    {
+      "name": "java3d:vecmath:1.5.2",
+      "clientreq":true,
+      "serverreq":true
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3",
+      "clientreq":true,
+      "serverreq":true
+    }
+  ]
+}
+}
--- a/jsons/1.8.8.json
+++ b/jsons/1.8.8.json
@ -0,0 +1,244 @@
+{
+  "id": "1.8.8",
+  "time": "2015-07-27T06:31:28-04:00",
+  "releaseTime": "2015-07-27T06:31:28-04:00",
+  "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} --userProperties ${user_properties} --userType ${user_type}",
+  "libraries": [
+    {
+      "name": "oshi-project:oshi-core:1.1"
+    },
+    {
+      "name": "net.java.dev.jna:jna:3.4.0"
+    },
+    {
+      "name": "net.java.dev.jna:platform:3.4.0"
+    },
+    {
+      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.6"
+    },
+    {
+      "name": "com.paulscode:codecjorbis:20101023"
+    },
+    {
+      "name": "com.paulscode:codecwav:20101023"
+    },
+    {
+      "name": "com.paulscode:libraryjavasound:20101123"
+    },
+    {
+      "name": "com.paulscode:librarylwjglopenal:20100824"
+    },
+    {
+      "name": "com.paulscode:soundsystem:20120107"
+    },
+    {
+      "name": "io.netty:netty-all:4.0.23.Final"
+    },
+    {
+      "name": "com.google.guava:guava:17.0"
+    },
+    {
+      "name": "org.apache.commons:commons-lang3:3.3.2"
+    },
+    {
+      "name": "commons-io:commons-io:2.4"
+    },
+    {
+      "name": "commons-codec:commons-codec:1.9"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0"
+    },
+    {
+      "name": "com.google.code.gson:gson:2.2.4"
+    },
+    {
+      "name": "com.mojang:authlib:1.5.21"
+    },
+    {
+      "name": "com.mojang:realms:1.7.39"
+    },
+    {
+      "name": "org.apache.commons:commons-compress:1.8.1"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpclient:4.3.3"
+    },
+    {
+      "name": "commons-logging:commons-logging:1.1.3"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpcore:4.3.2"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch:6.5"
+    },
+    {
+      "name": "tv.twitch:twitch-platform:6.5",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "linux"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows-${arch}",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch-external-platform:4.5",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "windows"
+          }
+        }
+      ],
+      "natives": {
+        "windows": "natives-windows-${arch}"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.client.main.Main",
+  "minimumLauncherVersion": 14,
+  "assets": "1.8"
+}
--- a/mdk/build.gradle
+++ b/mdk/build.gradle
@ -1,4 +1,4 @@
-/*
+
 // For those who want the bleeding edge
 buildscript {
    repositories {
@ -9,17 +9,17 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
    }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
-*/

-// for people who want stable
+/*
+// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
 plugins {
    id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
-
+*/
 version = "1.0"
 group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "modid"
--- a/patches/minecraft/net/minecraft/block/Block.java.patch
+++ b/patches/minecraft/net/minecraft/block/Block.java.patch
@ -1,20 +1,20 @@
 --- ../src-base/minecraft/net/minecraft/block/Block.java
 +++ ../src-work/minecraft/net/minecraft/block/Block.java
-@@ -39,8 +39,9 @@
+@@ -38,8 +38,9 @@
 public class Block
 {
     private static final ResourceLocation field_176230_a = new ResourceLocation("air");
-    public static final RegistryNamespacedDefaultedByKey field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a);
-    public static final ObjectIntIdentityMap field_176229_d = new ObjectIntIdentityMap();
-+    public static final RegistryNamespacedDefaultedByKey field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry();
+-    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 = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry();
 +    @Deprecated //Modders: DO NOT use this! Use GameRegistry
-+    public static final ObjectIntIdentityMap field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
+    public static final ObjectIntIdentityMap<IBlockState> field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
     private CreativeTabs field_149772_a;
     public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F);
     public static final Block.SoundType field_149766_f = new Block.SoundType("wood", 1.0F, 1.0F);
-@@ -124,6 +125,9 @@
+@@ -119,6 +120,9 @@
+     private IBlockState field_176228_M;
     private String field_149770_b;
-     private static final String __OBFID = "CL_00000199";
 
 +    public final net.minecraftforge.fml.common.registry.RegistryDelegate<Block> delegate =
 +            ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class);
@ -22,7 +22,7 @@
     public static int func_149682_b(Block p_149682_0_)
     {
         return field_149771_c.func_148757_b(p_149682_0_);
-@@ -136,7 +140,8 @@
+@@ -132,7 +136,8 @@
 
     public static Block func_149729_e(int p_149729_0_)
     {
@ -32,7 +32,7 @@
     }
 
     public static IBlockState func_176220_d(int p_176220_0_)
-@@ -300,7 +305,7 @@
+@@ -303,7 +308,7 @@
 
     public boolean func_176200_f(World p_176200_1_, BlockPos p_176200_2_)
     {
@ -41,7 +41,7 @@
     }
 
     public Block func_149711_c(float p_149711_1_)
-@@ -337,9 +342,10 @@
+@@ -340,9 +345,10 @@
         return this.field_149789_z;
     }
 
@ -53,7 +53,7 @@
     }
 
     public final void func_149676_a(float p_149676_1_, float p_149676_2_, float p_149676_3_, float p_149676_4_, float p_149676_5_, float p_149676_6_)
-@@ -356,13 +362,13 @@
+@@ -359,13 +365,13 @@
     public int func_176207_c(IBlockAccess p_176207_1_, BlockPos p_176207_2_)
     {
         Block block = p_176207_1_.func_180495_p(p_176207_2_).func_177230_c();
@ -69,22 +69,27 @@
         }
         else
         {
-@@ -438,7 +444,13 @@
+@@ -376,7 +382,7 @@
+     @SideOnly(Side.CLIENT)
+     public boolean func_176225_a(IBlockAccess p_176225_1_, BlockPos p_176225_2_, EnumFacing p_176225_3_)
+     {
+-        return p_176225_3_ == EnumFacing.DOWN && this.field_149760_C > 0.0D ? true : (p_176225_3_ == EnumFacing.UP && this.field_149756_F < 1.0D ? true : (p_176225_3_ == EnumFacing.NORTH && this.field_149754_D > 0.0D ? true : (p_176225_3_ == EnumFacing.SOUTH && this.field_149757_G < 1.0D ? true : (p_176225_3_ == EnumFacing.WEST && this.field_149759_B > 0.0D ? true : (p_176225_3_ == EnumFacing.EAST && this.field_149755_E < 1.0D ? true : !p_176225_1_.func_180495_p(p_176225_2_).func_177230_c().func_149662_c())))));
+        return p_176225_3_ == EnumFacing.DOWN && this.field_149760_C > 0.0D ? true : (p_176225_3_ == EnumFacing.UP && this.field_149756_F < 1.0D ? true : (p_176225_3_ == EnumFacing.NORTH && this.field_149754_D > 0.0D ? true : (p_176225_3_ == EnumFacing.SOUTH && this.field_149757_G < 1.0D ? true : (p_176225_3_ == EnumFacing.WEST && this.field_149759_B > 0.0D ? true : (p_176225_3_ == EnumFacing.EAST && this.field_149755_E < 1.0D ? true : !p_176225_1_.func_180495_p(p_176225_2_).func_177230_c().doesSideBlockRendering(p_176225_1_, p_176225_2_, p_176225_3_))))));
+     }
 
-     public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_) {}
+     public boolean func_176212_b(IBlockAccess p_176212_1_, BlockPos p_176212_2_, EnumFacing p_176212_3_)
+@@ -453,6 +459,10 @@
 
-    public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_) {}
-+    public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
-+    {
+     public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
+     {
 +        if (hasTileEntity(p_180663_3_) && !(this instanceof BlockContainer))
 +        {
 +            p_180663_1_.func_175713_t(p_180663_2_);
 +        }
-+    }
+     }
 
     public int func_149745_a(Random p_149745_1_)
-     {
-@@ -452,8 +464,7 @@
+@@ -467,8 +477,7 @@
 
     public float func_180647_a(EntityPlayer p_180647_1_, World p_180647_2_, BlockPos p_180647_3_)
     {
@ -94,18 +99,18 @@
     }
 
     public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_)
-@@ -463,20 +474,16 @@
+@@ -478,20 +487,16 @@
 
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
 -        if (!p_180653_1_.field_72995_K)
 +        if (!p_180653_1_.field_72995_K && !p_180653_1_.restoringBlockSnapshots) // do not drop items while restoring blockstates, prevents item dupe
         {
-            int j = this.func_149679_a(p_180653_5_, p_180653_1_.field_73012_v);
+-            int i = this.func_149679_a(p_180653_5_, p_180653_1_.field_73012_v);
 +            java.util.List<ItemStack> items = getDrops(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_);
 +            p_180653_4_ = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_, p_180653_4_, false, harvesters.get());
 
-            for (int k = 0; k < j; ++k)
+-            for (int j = 0; j < i; ++j)
 +            for (ItemStack item : items)
             {
                 if (p_180653_1_.field_73012_v.nextFloat() <= p_180653_4_)
@ -120,7 +125,7 @@
                 }
             }
         }
-@@ -484,8 +491,13 @@
+@@ -499,8 +504,13 @@
 
     public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_)
     {
@ -135,7 +140,7 @@
             float f = 0.5F;
             double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
             double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-@@ -670,7 +682,7 @@
+@@ -687,7 +697,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -144,7 +149,7 @@
     }
 
     public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumFacing p_180639_5_, float p_180639_6_, float p_180639_7_, float p_180639_8_)
-@@ -772,25 +784,35 @@
+@@ -799,25 +809,35 @@
         p_180657_2_.func_71029_a(StatList.field_75934_C[func_149682_b(this)]);
         p_180657_2_.func_71020_j(0.025F);
 
@ -183,8 +188,8 @@
     }
 
     protected ItemStack func_180643_i(IBlockState p_180643_1_)
-@@ -967,6 +989,1033 @@
-         return Block.EnumOffsetType.NONE;
+@@ -1010,6 +1030,1065 @@
+         return "Block{" + field_149771_c.func_177774_c(this) + "}";
     }
 
 +    /* ======================================== FORGE START =====================================*/
@ -234,6 +239,22 @@
 +    }
 +
 +    /**
+     * Check if the face of a block should block rendering.
+     *
+     * Faces which are fully opaque should return true, faces with transparency
+     * or faces which do not span the full size of the block should return false.
+     *
+     * @param world The current world
+     * @param pos Block position in world
+     * @param side The side to check
+     * @return True if the block is opaque on the specified side.
+     */
+    public boolean doesSideBlockRendering(IBlockAccess world, BlockPos pos, EnumFacing face)
+    {
+        return func_149662_c();
+    }
+
+    /**
 +     * Checks if the block is a solid face on the given side, used by placement logic.
 +     *
 +     * @param world The current world
@ -247,7 +268,9 @@
 +
 +        if (this instanceof BlockSlab)
 +        {
-+            return func_149730_j() || (state.func_177229_b(BlockSlab.field_176554_a) == BlockSlab.EnumBlockHalf.TOP && side == EnumFacing.UP);
+            return func_149730_j()
+                  || (state.func_177229_b(BlockSlab.field_176554_a) == BlockSlab.EnumBlockHalf.TOP    && side == EnumFacing.UP  )
+                  || (state.func_177229_b(BlockSlab.field_176554_a) == BlockSlab.EnumBlockHalf.BOTTOM && side == EnumFacing.DOWN);
 +        }
 +        else if (this instanceof BlockFarmland)
 +        {
@ -259,6 +282,7 @@
 +            BlockStairs.EnumShape shape = (BlockStairs.EnumShape)state.func_177229_b(BlockStairs.field_176310_M);
 +            EnumFacing facing = (EnumFacing)state.func_177229_b(BlockStairs.field_176309_a);
 +            if (side == EnumFacing.UP) return flipped;
+            if (side == EnumFacing.DOWN) return !flipped;
 +            if (facing == side) return true;
 +            if (flipped)
 +            {
@ -786,6 +810,23 @@
 +    }
 +
 +    /**
+     * Allows a block to override the standard EntityLivingBase.updateFallState
+     * particles, this is a server side method that spawns particles with
+     * WorldServer.spawnParticle
+     *
+     * @param world The current Server world
+     * @param blockPosition of the block that the entity landed on.
+     * @param iblockstate State at the specific world/pos
+     * @param entity the entity that hit landed on the block.
+     * @param numberOfParticles that vanilla would have spawned.
+     * @return True to prevent vanilla landing particles form spawning.
+     */
+    public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles )
+    {
+        return false;
+    }
+
+    /**
 +     * Spawn a digging particle effect in the world, this is a wrapper
 +     * around EffectRenderer.addBlockHitEffects to allow the block more
 +     * control over the particles. Useful when you have entirely different
@ -943,11 +984,7 @@
 +     */
 +    public boolean canEntityDestroy(IBlockAccess world, BlockPos pos, Entity entity)
 +    {
-+        if (entity instanceof net.minecraft.entity.boss.EntityWither)
-+        {
-+            return this != net.minecraft.init.Blocks.field_180401_cv && this != net.minecraft.init.Blocks.field_150357_h && this != net.minecraft.init.Blocks.field_150384_bq && this != net.minecraft.init.Blocks.field_150378_br && this != net.minecraft.init.Blocks.field_150483_bI;
-+        }
-+        else if (entity instanceof net.minecraft.entity.boss.EntityDragon)
+        if (entity instanceof net.minecraft.entity.boss.EntityDragon)
 +        {
 +            return this != net.minecraft.init.Blocks.field_180401_cv && this != net.minecraft.init.Blocks.field_150343_Z && this != net.minecraft.init.Blocks.field_150377_bs && this != net.minecraft.init.Blocks.field_150357_h && this != net.minecraft.init.Blocks.field_150483_bI;
 +        }
@ -1114,7 +1151,7 @@
 +     */
 +    public void setHarvestLevel(String toolClass, int level)
 +    {
-+        Iterator<IBlockState> itr = func_176194_O().func_177619_a().iterator();
+        java.util.Iterator<IBlockState> itr = func_176194_O().func_177619_a().iterator();
 +        while (itr.hasNext())
 +        {
 +            setHarvestLevel(toolClass, level, itr.next());
--- a/patches/minecraft/net/minecraft/block/BlockAir.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockAir.java.patch
@ -1,9 +0,0 @@
--- ../src-base/minecraft/net/minecraft/block/BlockAir.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockAir.java
-@@ -36,4 +36,6 @@
-     }
- 
-     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_) {}
-+
-+    public boolean func_176200_f(World worldIn, BlockPos pos){ return true; }
- }
--- a/patches/minecraft/net/minecraft/block/BlockBush.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockBush.java.patch
@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockBush.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 -public class BlockBush extends Block
 +public class BlockBush extends Block implements net.minecraftforge.common.IPlantable
 {
-     private static final String __OBFID = "CL_00000208";
- 
-@@ -32,7 +32,7 @@
+     protected BlockBush()
+     {
+@@ -36,7 +36,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -18,7 +18,7 @@
     }
 
     protected boolean func_149854_a(Block p_149854_1_)
-@@ -62,7 +62,10 @@
+@@ -66,7 +66,10 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -30,7 +30,7 @@
     }
 
     public AxisAlignedBB func_180640_a(World p_180640_1_, BlockPos p_180640_2_, IBlockState p_180640_3_)
-@@ -85,4 +88,33 @@
+@@ -89,4 +92,33 @@
     {
         return EnumWorldBlockLayer.CUTOUT;
     }
--- a/patches/minecraft/net/minecraft/block/BlockButton.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockButton.java.patch
@ -1,46 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockButton.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -18,6 +18,7 @@
- import net.minecraft.util.EnumFacing;
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import static net.minecraft.util.EnumFacing.*;
+@@ -74,8 +74,7 @@
 
- public abstract class BlockButton extends Block
- {
-@@ -57,7 +58,7 @@
- 
-     public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
+     protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
     {
-        return p_176198_1_.func_180495_p(p_176198_2_.func_177972_a(p_176198_3_.func_176734_d())).func_177230_c().func_149721_r();
-+        return p_176198_1_.isSideSolid(p_176198_2_.func_177972_a(p_176198_3_.func_176734_d()), p_176198_3_, true);
+-        BlockPos blockpos = p_181088_1_.func_177972_a(p_181088_2_);
+-        return p_181088_2_ == EnumFacing.DOWN ? World.func_175683_a(p_181088_0_, blockpos) : p_181088_0_.func_180495_p(blockpos).func_177230_c().func_149721_r();
+        return p_181088_2_ == EnumFacing.DOWN && World.func_175683_a(p_181088_0_, p_181088_1_.func_177977_b()) ? true : p_181088_0_.isSideSolid(p_181088_1_.func_177972_a(p_181088_2_), p_181088_2_.func_176734_d());
     }
 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -69,7 +70,7 @@
-         {
-             EnumFacing enumfacing = aenumfacing[j];
- 
-            if (p_176196_1_.func_180495_p(p_176196_2_.func_177972_a(enumfacing)).func_177230_c().func_149721_r())
-+            if (p_176196_1_.isSideSolid(p_176196_2_.func_177972_a(enumfacing), enumfacing.func_176734_d(), true))
-             {
-                 return true;
-             }
-@@ -80,7 +81,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 p_180642_1_.func_180495_p(p_180642_2_.func_177972_a(p_180642_3_.func_176734_d())).func_177230_c().func_149721_r() ? this.func_176223_P().func_177226_a(field_176585_a, p_180642_3_).func_177226_a(field_176584_b, Boolean.valueOf(false)) : this.func_176223_P().func_177226_a(field_176585_a, EnumFacing.DOWN).func_177226_a(field_176584_b, Boolean.valueOf(false));
-+        return p_180642_1_.isSideSolid(p_180642_2_.func_177972_a(p_180642_3_.func_176734_d()), p_180642_3_, true) ? this.func_176223_P().func_177226_a(field_176585_a, p_180642_3_).func_177226_a(field_176584_b, Boolean.valueOf(false)) : this.func_176223_P().func_177226_a(field_176585_a, EnumFacing.DOWN).func_177226_a(field_176584_b, Boolean.valueOf(false));
-     }
- 
-     public void func_176204_a(World p_176204_1_, BlockPos p_176204_2_, IBlockState p_176204_3_, Block p_176204_4_)
-@@ -89,7 +90,7 @@
-         {
-             EnumFacing enumfacing = (EnumFacing)p_176204_3_.func_177229_b(field_176585_a);
- 
-            if (!p_176204_1_.func_180495_p(p_176204_2_.func_177972_a(enumfacing.func_176734_d())).func_177230_c().func_149721_r())
-+            if (!p_176204_1_.isSideSolid(p_176204_2_.func_177972_a(enumfacing.func_176734_d()), enumfacing, true))
-             {
-                 this.func_176226_b(p_176204_1_, p_176204_2_, p_176204_3_, 0);
-                 p_176204_1_.func_175698_g(p_176204_2_);
--- a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
+++ b/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 @@
+@@ -18,7 +18,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -8,8 +8,8 @@
 +public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable
 {
     public static final PropertyInteger field_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
-     private static final String __OBFID = "CL_00000210";
-@@ -115,7 +115,7 @@
+ 
+@@ -109,7 +109,7 @@
         }
 
         Block block = p_176586_1_.func_180495_p(p_176586_2_.func_177977_b()).func_177230_c();
@ -18,7 +18,7 @@
     }
 
     public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
-@@ -143,4 +143,16 @@
+@@ -137,4 +137,16 @@
     {
         return new BlockState(this, new IProperty[] {field_176587_a});
     }
--- a/patches/minecraft/net/minecraft/block/BlockChest.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockChest.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockChest.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
-@@ -531,7 +531,7 @@
+@@ -527,7 +527,7 @@
 
     private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
@ -4,7 +4,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_)
     {
-        int j = ((Integer)p_180653_3_.func_177229_b(field_176501_a)).intValue();
+-        int i = ((Integer)p_180653_3_.func_177229_b(field_176501_a)).intValue();
 +        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
 +    }
 +
@ -12,13 +12,13 @@
 +    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
 +    {
 +        java.util.List<ItemStack> dropped = super.getDrops(world, pos, state, fortune);
-+        int j = ((Integer)state.func_177229_b(field_176501_a)).intValue();
-         byte b0 = 1;
+        int i = ((Integer)state.func_177229_b(field_176501_a)).intValue();
+         int j = 1;
 
-         if (j >= 2)
+         if (i >= 2)
@@ -147,8 +154,9 @@
 
-         for (int k = 0; k < b0; ++k)
+         for (int k = 0; k < j; ++k)
         {
 -            func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
 +            dropped.add(new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
--- a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
@ -1,20 +1,20 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -82,11 +82,11 @@
+@@ -81,11 +81,11 @@
                 float f1 = 0.0F;
-                 IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos1.func_177982_a(i, 0, j));
+                 IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
 
 -                if (iblockstate.func_177230_c() == Blocks.field_150458_ak)
-+                if (iblockstate.func_177230_c().canSustainPlant(p_180672_1_, blockpos1.func_177982_a(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)p_180672_0_))
+                if (iblockstate.func_177230_c().canSustainPlant(p_180672_1_, blockpos.func_177982_a(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)p_180672_0_))
                 {
                     f1 = 1.0F;
 
 -                    if (((Integer)iblockstate.func_177229_b(BlockFarmland.field_176531_a)).intValue() > 0)
-+                    if (iblockstate.func_177230_c().isFertile(p_180672_1_, blockpos1.func_177982_a(i, 0, j)))
+                    if (iblockstate.func_177230_c().isFertile(p_180672_1_, blockpos.func_177982_a(i, 0, j)))
                     {
                         f1 = 3.0F;
                     }
-@@ -127,7 +127,7 @@
+@@ -126,7 +126,7 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -23,22 +23,22 @@
     }
 
     protected Item func_149866_i()
-@@ -143,24 +143,6 @@
+@@ -142,24 +142,6 @@
     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_, 0);
 -
 -        if (!p_180653_1_.field_72995_K)
 -        {
-            int j = ((Integer)p_180653_3_.func_177229_b(field_176488_a)).intValue();
+-            int i = ((Integer)p_180653_3_.func_177229_b(field_176488_a)).intValue();
 -
-            if (j >= 7)
+-            if (i >= 7)
 -            {
-                int k = 3 + p_180653_5_;
+-                int j = 3 + p_180653_5_;
 -
-                for (int l = 0; l < k; ++l)
+-                for (int k = 0; k < j; ++k)
 -                {
-                    if (p_180653_1_.field_73012_v.nextInt(15) <= j)
+-                    if (p_180653_1_.field_73012_v.nextInt(15) <= i)
 -                    {
 -                        func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(this.func_149866_i(), 1, 0));
 -                    }
@ -48,7 +48,7 @@
     }
 
     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -203,4 +185,26 @@
+@@ -202,4 +184,26 @@
     {
         return new BlockState(this, new IProperty[] {field_176488_a});
     }
--- a/patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch
@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
 
 -public class BlockDeadBush extends BlockBush
 +public class BlockDeadBush extends BlockBush implements net.minecraftforge.common.IShearable
 {
-     private static final String __OBFID = "CL_00000224";
- 
-@@ -41,14 +41,15 @@
+     protected BlockDeadBush()
+     {
+@@ -45,14 +45,15 @@
 
     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
-@@ -149,7 +149,7 @@
+@@ -154,7 +154,7 @@
     {
         if (this.field_149764_J == Material.field_151573_f)
         {
@ -9,7 +9,7 @@
         }
         else
         {
-@@ -267,7 +267,7 @@
+@@ -272,7 +272,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
@ -1,31 +1,31 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 -public class BlockDoublePlant extends BlockBush implements IGrowable
 +public class BlockDoublePlant extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
 {
-     public static final PropertyEnum field_176493_a = PropertyEnum.func_177709_a("variant", BlockDoublePlant.EnumPlantType.class);
-     public static final PropertyEnum field_176492_b = PropertyEnum.func_177709_a("half", BlockDoublePlant.EnumBlockHalf.class);
-@@ -89,6 +89,8 @@
-             Object object = flag ? this : p_176475_1_.func_180495_p(blockpos1).func_177230_c();
-             Object object1 = flag ? p_176475_1_.func_180495_p(blockpos2).func_177230_c() : this;
+     public static final PropertyEnum<BlockDoublePlant.EnumPlantType> field_176493_a = PropertyEnum.<BlockDoublePlant.EnumPlantType>func_177709_a("variant", BlockDoublePlant.EnumPlantType.class);
+     public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> field_176492_b = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>func_177709_a("half", BlockDoublePlant.EnumBlockHalf.class);
+@@ -90,6 +90,8 @@
+             Block block = (Block)(flag ? this : p_176475_1_.func_180495_p(blockpos).func_177230_c());
+             Block block1 = (Block)(flag ? p_176475_1_.func_180495_p(blockpos1).func_177230_c() : this);
 
 +            if (!flag) this.func_176226_b(p_176475_1_, p_176475_2_, p_176475_3_, 0); //Forge move above the setting to air.
 +
-             if (object == this)
+             if (block == this)
+             {
+                 p_176475_1_.func_180501_a(blockpos, Blocks.field_150350_a.func_176223_P(), 2);
+@@ -98,17 +100,13 @@
+             if (block1 == this)
             {
                 p_176475_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 3);
-@@ -97,17 +99,13 @@
-             if (object1 == this)
-             {
-                 p_176475_1_.func_180501_a(blockpos2, Blocks.field_150350_a.func_176223_P(), 3);
 -
 -                if (!flag)
 -                {
-                    this.func_176226_b(p_176475_1_, blockpos2, p_176475_3_, 0);
+-                    this.func_176226_b(p_176475_1_, blockpos1, p_176475_3_, 0);
 -                }
             }
         }
@ -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;
-@@ -157,7 +155,6 @@
+@@ -158,7 +156,6 @@
 
     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
     {
@ -45,16 +45,16 @@
         {
             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
         }
-@@ -220,8 +217,6 @@
+@@ -221,8 +218,6 @@
         else
         {
             p_176489_4_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
-            int i = (enumplanttype == BlockDoublePlant.EnumPlantType.GRASS ? BlockTallGrass.EnumType.GRASS : BlockTallGrass.EnumType.FERN).func_177044_a();
+-            int i = (blockdoubleplant$enumplanttype == BlockDoublePlant.EnumPlantType.GRASS ? BlockTallGrass.EnumType.GRASS : BlockTallGrass.EnumType.FERN).func_177044_a();
 -            func_180635_a(p_176489_1_, p_176489_2_, new ItemStack(Blocks.field_150329_H, 2, i));
             return true;
         }
     }
-@@ -296,6 +291,32 @@
+@@ -293,6 +288,32 @@
         return Block.EnumOffsetType.XZ;
     }
 
@ -84,6 +84,6 @@
 +        return world.func_175698_g(pos);
 +    }
 +
-     static enum EnumBlockHalf implements IStringSerializable
+     public static enum EnumBlockHalf implements IStringSerializable
     {
         UPPER,
--- a/patches/minecraft/net/minecraft/block/BlockFalling.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFalling.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
-@@ -85,6 +85,7 @@
+@@ -86,6 +86,7 @@
 
     public static boolean func_180685_d(World p_180685_0_, BlockPos p_180685_1_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockFire.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFire.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFire.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
-@@ -42,18 +42,24 @@
+@@ -41,18 +41,24 @@
         int j = p_176221_3_.func_177956_o();
         int k = p_176221_3_.func_177952_p();
 
@ -28,7 +28,7 @@
         }
         else
         {
-@@ -109,6 +115,7 @@
+@@ -108,6 +114,7 @@
 
     public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_)
     {
@ -36,7 +36,7 @@
         this.field_149849_a.put(p_180686_1_, Integer.valueOf(p_180686_2_));
         this.field_149848_b.put(p_180686_1_, Integer.valueOf(p_180686_3_));
     }
-@@ -148,13 +155,8 @@
+@@ -147,13 +154,8 @@
             }
 
             Block block = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_177230_c();
@ -51,7 +51,7 @@
             if (!flag && p_180650_1_.func_72896_J() && this.func_176537_d(p_180650_1_, p_180650_2_))
             {
                 p_180650_1_.func_175698_g(p_180650_2_);
-@@ -183,7 +185,7 @@
+@@ -182,7 +184,7 @@
                         return;
                     }
 
@ -60,26 +60,26 @@
                     {
                         p_180650_1_.func_175698_g(p_180650_2_);
                         return;
-@@ -198,12 +200,12 @@
-                     b0 = -50;
+@@ -197,12 +199,12 @@
+                     j = -50;
                 }
 
-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177974_f(), 300 + b0, p_180650_4_, i);
-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177976_e(), 300 + b0, p_180650_4_, i);
-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177977_b(), 250 + b0, p_180650_4_, i);
-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177984_a(), 250 + b0, p_180650_4_, i);
-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177978_c(), 300 + b0, p_180650_4_, i);
-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177968_d(), 300 + b0, p_180650_4_, i);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177974_f(), 300 + b0, p_180650_4_, i, EnumFacing.WEST);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177976_e(), 300 + b0, p_180650_4_, i, EnumFacing.EAST);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177977_b(), 250 + b0, p_180650_4_, i, EnumFacing.UP);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177984_a(), 250 + b0, p_180650_4_, i, EnumFacing.DOWN);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177978_c(), 300 + b0, p_180650_4_, i, EnumFacing.SOUTH);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177968_d(), 300 + b0, p_180650_4_, i, EnumFacing.NORTH);
+-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177974_f(), 300 + j, p_180650_4_, i);
+-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177976_e(), 300 + j, p_180650_4_, i);
+-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177977_b(), 250 + j, p_180650_4_, i);
+-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177984_a(), 250 + j, p_180650_4_, i);
+-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i);
+-                this.func_176536_a(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i);
+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177974_f(), 300 + j, p_180650_4_, i, EnumFacing.WEST);
+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177976_e(), 300 + j, p_180650_4_, i, EnumFacing.EAST);
+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177977_b(), 250 + j, p_180650_4_, i, EnumFacing.UP);
+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177984_a(), 250 + j, p_180650_4_, i, EnumFacing.DOWN);
+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i, EnumFacing.SOUTH);
+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i, EnumFacing.NORTH);
 
-                 for (int j = -1; j <= 1; ++j)
+                 for (int k = -1; k <= 1; ++k)
                 {
-@@ -262,22 +264,30 @@
+@@ -261,22 +263,30 @@
         return false;
     }
 
@ -100,36 +100,36 @@
 +    @Deprecated // Use tryCatchFire with face below
     private void func_176536_a(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_)
     {
-        int k = this.func_176532_c(p_176536_1_.func_180495_p(p_176536_2_).func_177230_c());
+-        int i = this.func_176532_c(p_176536_1_.func_180495_p(p_176536_2_).func_177230_c());
 +        this.tryCatchFire(p_176536_1_, p_176536_2_, p_176536_3_, p_176536_4_, p_176536_5_, EnumFacing.UP);
 +    }
 
 +    private void tryCatchFire(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_, EnumFacing face)
 +    {
-+        int k = p_176536_1_.func_180495_p(p_176536_2_).func_177230_c().getFlammability(p_176536_1_, p_176536_2_, face);
+        int i = p_176536_1_.func_180495_p(p_176536_2_).func_177230_c().getFlammability(p_176536_1_, p_176536_2_, face);
 +
-         if (p_176536_4_.nextInt(p_176536_3_) < k)
+         if (p_176536_4_.nextInt(p_176536_3_) < i)
         {
             IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
-@@ -314,7 +324,7 @@
+@@ -308,7 +318,7 @@
+     {
+         for (EnumFacing enumfacing : EnumFacing.values())
         {
-             EnumFacing enumfacing = aenumfacing[j];
- 
 -            if (this.func_176535_e(p_176533_1_, p_176533_2_.func_177972_a(enumfacing)))
 +            if (this.canCatchFire(p_176533_1_, p_176533_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()))
             {
                 return true;
             }
-@@ -338,7 +348,7 @@
-             for (int k = 0; k < j; ++k)
+@@ -329,7 +339,7 @@
+ 
+             for (EnumFacing enumfacing : EnumFacing.values())
             {
-                 EnumFacing enumfacing = aenumfacing[k];
 -                i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
 +                i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c().getFlammability(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
             }
 
             return i;
-@@ -350,9 +360,10 @@
+@@ -341,9 +351,10 @@
         return false;
     }
 
@ -141,9 +141,9 @@
     }
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -396,9 +407,9 @@
-         double d1;
-         double d2;
+@@ -382,9 +393,9 @@
+             p_180655_1_.func_72980_b((double)((float)p_180655_2_.func_177958_n() + 0.5F), (double)((float)p_180655_2_.func_177956_o() + 0.5F), (double)((float)p_180655_2_.func_177952_p() + 0.5F), "fire.fire", 1.0F + p_180655_4_.nextFloat(), p_180655_4_.nextFloat() * 0.7F + 0.3F, false);
+         }
 
 -        if (!World.func_175683_a(p_180655_1_, p_180655_2_.func_177977_b()) && !Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177977_b()))
 +        if (!World.func_175683_a(p_180655_1_, p_180655_2_.func_177977_b()) && !Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177977_b(), EnumFacing.UP))
@ -151,45 +151,45 @@
 -            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177976_e()))
 +            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177976_e(), EnumFacing.EAST))
             {
-                 for (i = 0; i < 2; ++i)
+                 for (int j = 0; j < 2; ++j)
                 {
-@@ -409,7 +420,7 @@
+@@ -395,7 +406,7 @@
                 }
             }
 
 -            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177974_f()))
 +            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177974_f(), EnumFacing.WEST))
             {
-                 for (i = 0; i < 2; ++i)
+                 for (int k = 0; k < 2; ++k)
                 {
-@@ -420,7 +431,7 @@
+@@ -406,7 +417,7 @@
                 }
             }
 
 -            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177978_c()))
 +            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177978_c(), EnumFacing.SOUTH))
             {
-                 for (i = 0; i < 2; ++i)
+                 for (int l = 0; l < 2; ++l)
                 {
-@@ -431,7 +442,7 @@
+@@ -417,7 +428,7 @@
                 }
             }
 
 -            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177968_d()))
 +            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177968_d(), EnumFacing.NORTH))
             {
-                 for (i = 0; i < 2; ++i)
+                 for (int i1 = 0; i1 < 2; ++i1)
                 {
-@@ -442,7 +453,7 @@
+@@ -428,7 +439,7 @@
                 }
             }
 
 -            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177984_a()))
 +            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177984_a(), EnumFacing.DOWN))
             {
-                 for (i = 0; i < 2; ++i)
+                 for (int j1 = 0; j1 < 2; ++j1)
                 {
-@@ -490,4 +501,19 @@
+@@ -476,4 +487,19 @@
     {
         return new BlockState(this, new IProperty[] {field_176543_a, field_176545_N, field_176546_O, field_176541_P, field_176539_Q, field_176542_R, field_176540_b, field_176544_M});
     }
--- a/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -162,13 +162,6 @@
+@@ -169,13 +169,6 @@
 
     public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
     {
@ -14,7 +14,7 @@
         super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
     }
 
-@@ -388,6 +381,31 @@
+@@ -395,6 +388,31 @@
         return EnumWorldBlockLayer.CUTOUT;
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
-@@ -59,7 +59,7 @@
+@@ -58,7 +58,7 @@
     {
         if (!p_180650_1_.field_72995_K)
         {
@ -9,33 +9,21 @@
             {
                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
             }
-@@ -73,7 +73,7 @@
-                         Block block = p_180650_1_.func_180495_p(blockpos1.func_177984_a()).func_177230_c();
-                         IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos1);
+@@ -72,7 +72,7 @@
+                         Block block = p_180650_1_.func_180495_p(blockpos.func_177984_a()).func_177230_c();
+                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
 
-                        if (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos1.func_177984_a()) >= 4 && block.func_149717_k() <= 2)
-+                        if (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos1.func_177984_a()) >= 4 && block.getLightOpacity(p_180650_1_, blockpos1.func_177984_a()) <= 2)
+-                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.func_149717_k() <= 2)
+                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.getLightOpacity(p_180650_1_, blockpos.func_177984_a()) <= 2)
                         {
-                             p_180650_1_.func_175656_a(blockpos1, Blocks.field_150349_c.func_176223_P());
+                             p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
                         }
-@@ -120,18 +120,11 @@
-                         continue;
-                     }
-                 }
-                else if (p_176474_1_.func_180495_p(blockpos2).func_177230_c().field_149764_J == Material.field_151579_a)
-+                else if (p_176474_1_.func_175623_d(blockpos2))
+@@ -110,7 +110,7 @@
+             {
+                 if (j >= i / 16)
                 {
-                     if (p_176474_2_.nextInt(8) == 0)
-                     {
-                        BlockFlower.EnumFlowerType enumflowertype = p_176474_1_.func_180494_b(blockpos2).func_180623_a(p_176474_2_, blockpos2);
-                        BlockFlower blockflower = enumflowertype.func_176964_a().func_180346_a();
-                        IBlockState iblockstate1 = blockflower.func_176223_P().func_177226_a(blockflower.func_176494_l(), enumflowertype);
-
-                        if (blockflower.func_180671_f(p_176474_1_, blockpos2, iblockstate1))
-                        {
-                            p_176474_1_.func_180501_a(blockpos2, iblockstate1, 3);
-                        }
-+                        p_176474_1_.func_180494_b(blockpos2).plantFlower(p_176474_1_, p_176474_2_, blockpos2);
-                     }
-                     else
+-                    if (p_176474_1_.func_180495_p(blockpos1).func_177230_c().field_149764_J == Material.field_151579_a)
+                    if (p_176474_1_.func_175623_d(blockpos1))
                     {
+                         if (p_176474_2_.nextInt(8) == 0)
+                         {
--- a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
-@@ -64,6 +64,20 @@
+@@ -79,6 +79,20 @@
         return new BlockState(this, new IProperty[] {field_176380_a});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockIce.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockIce.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockIce.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
-@@ -40,14 +40,17 @@
+@@ -38,14 +38,17 @@
         p_180657_2_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
         p_180657_2_.func_71020_j(0.025F);
 
@ -23,7 +23,7 @@
         }
         else
         {
-@@ -58,7 +61,9 @@
+@@ -56,7 +59,9 @@
             }
 
             int i = EnchantmentHelper.func_77517_e(p_180657_2_);
--- a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
-@@ -80,7 +80,10 @@
+@@ -78,7 +78,10 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
@ -12,7 +12,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_)
-@@ -124,7 +127,7 @@
+@@ -116,7 +119,7 @@
 
     protected boolean func_176381_b(World p_176381_1_, BlockPos p_176381_2_, EnumFacing p_176381_3_)
     {
@ -20,13 +20,11 @@
 +        return p_176381_1_.isSideSolid(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d()), p_176381_3_, true);
     }
 
-     @SideOnly(Side.CLIENT)
-@@ -155,6 +158,8 @@
+     public IBlockState func_176203_a(int p_176203_1_)
+@@ -146,4 +149,6 @@
+     {
         return new BlockState(this, new IProperty[] {field_176382_a});
     }
- 
-+    @Override public boolean isLadder(IBlockAccess world, BlockPos pos, EntityLivingBase entity) { return true; }
 +
-     static final class SwitchEnumFacing
-         {
-             static final int[] field_180190_a = new int[EnumFacing.values().length];
+    @Override public boolean isLadder(IBlockAccess world, BlockPos pos, EntityLivingBase entity) { return true; }
+ }
--- a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
@ -9,77 +9,73 @@
 {
     public static final PropertyBool field_176237_a = PropertyBool.func_177716_a("decayable");
     public static final PropertyBool field_176236_b = PropertyBool.func_177716_a("check_decay");
-@@ -76,9 +76,9 @@
-                         BlockPos blockpos1 = p_180663_2_.func_177982_a(i1, j1, k1);
-                         IBlockState iblockstate1 = p_180663_1_.func_180495_p(blockpos1);
+@@ -75,9 +75,9 @@
+                         BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
+                         IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
 
-                        if (iblockstate1.func_177230_c().func_149688_o() == Material.field_151584_j && !((Boolean)iblockstate1.func_177229_b(field_176236_b)).booleanValue())
-+                        if (iblockstate1.func_177230_c().isLeaves(p_180663_1_, blockpos1))
+-                        if (iblockstate.func_177230_c().func_149688_o() == Material.field_151584_j && !((Boolean)iblockstate.func_177229_b(field_176236_b)).booleanValue())
+                        if (iblockstate.func_177230_c().isLeaves(p_180663_1_, blockpos))
                         {
-                            p_180663_1_.func_180501_a(blockpos1, iblockstate1.func_177226_a(field_176236_b, Boolean.valueOf(true)), 4);
-+                            iblockstate1.func_177230_c().beginLeavesDecay(p_180663_1_, blockpos1);
+-                            p_180663_1_.func_180501_a(blockpos, iblockstate.func_177226_a(field_176236_b, Boolean.valueOf(true)), 4);
+                            iblockstate.func_177230_c().beginLeavesDecay(p_180663_1_, blockpos);
                         }
                     }
                 }
-@@ -119,11 +119,12 @@
-                         {
-                             for (i2 = -b0; i2 <= b0; ++i2)
+@@ -117,9 +117,9 @@
                             {
-                                Block block = p_180650_1_.func_180495_p(new BlockPos(j + k1, k + l1, l + i2)).func_177230_c();
-+                                BlockPos tmp = new BlockPos(j + k1, k + l1, l + i2);
-+                                Block block = p_180650_1_.func_180495_p(tmp).func_177230_c();
+                                 Block block = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)).func_177230_c();
 
 -                                if (block != Blocks.field_150364_r && block != Blocks.field_150363_s)
-+                                if (!block.canSustainLeaves(p_180650_1_, tmp))
+                                if (!block.canSustainLeaves(p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)))
                                 {
 -                                    if (block.func_149688_o() == Material.field_151584_j)
-+                                    if (block.isLeaves(p_180650_1_, tmp))
+                                    if (block.isLeaves(p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)))
                                     {
-                                         this.field_150128_a[(k1 + j1) * i1 + (l1 + j1) * b1 + i2 + j1] = -2;
+                                         this.field_150128_a[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2;
                                     }
-@@ -230,40 +231,7 @@
+@@ -226,40 +226,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_)
     {
 -        if (!p_180653_1_.field_72995_K)
 -        {
-            int j = this.func_176232_d(p_180653_3_);
+-            int i = this.func_176232_d(p_180653_3_);
 -
 -            if (p_180653_5_ > 0)
 -            {
-                j -= 2 << p_180653_5_;
+-                i -= 2 << p_180653_5_;
 -
-                if (j < 10)
+-                if (i < 10)
 -                {
-                    j = 10;
+-                    i = 10;
 -                }
 -            }
 -
-            if (p_180653_1_.field_73012_v.nextInt(j) == 0)
+-            if (p_180653_1_.field_73012_v.nextInt(i) == 0)
 -            {
 -                Item item = this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_);
 -                func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(item, 1, this.func_180651_a(p_180653_3_)));
 -            }
 -
-            j = 200;
+-            i = 200;
 -
 -            if (p_180653_5_ > 0)
 -            {
-                j -= 10 << p_180653_5_;
+-                i -= 10 << p_180653_5_;
 -
-                if (j < 40)
+-                if (i < 40)
 -                {
-                    j = 40;
+-                    i = 40;
 -                }
 -            }
 -
-            this.func_176234_a(p_180653_1_, p_180653_2_, p_180653_3_, j);
+-            this.func_176234_a(p_180653_1_, p_180653_2_, p_180653_3_, i);
 -        }
 +        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
     }
 
-     protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_) {}
-@@ -298,4 +266,48 @@
+     protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
+@@ -296,4 +263,48 @@
     }
 
     public abstract BlockPlanks.EnumType func_176233_b(int p_176233_1_);
--- a/patches/minecraft/net/minecraft/block/BlockLever.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLever.java.patch
@ -1,58 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLever.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
-@@ -47,24 +47,24 @@
- 
-     public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
-     {
-        return p_176198_3_ == EnumFacing.UP && World.func_175683_a(p_176198_1_, p_176198_2_.func_177977_b()) ? true : this.func_176358_d(p_176198_1_, p_176198_2_.func_177972_a(p_176198_3_.func_176734_d()));
-+        return p_176198_3_ == EnumFacing.UP && World.func_175683_a(p_176198_1_, p_176198_2_.func_177977_b()) ? true : p_176198_1_.isSideSolid(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_)
-     {
-        return this.func_176358_d(p_176196_1_, p_176196_2_.func_177976_e()) ? true : (this.func_176358_d(p_176196_1_, p_176196_2_.func_177974_f()) ? true : (this.func_176358_d(p_176196_1_, p_176196_2_.func_177978_c()) ? true : (this.func_176358_d(p_176196_1_, p_176196_2_.func_177968_d()) ? true : (World.func_175683_a(p_176196_1_, p_176196_2_.func_177977_b()) ? true : this.func_176358_d(p_176196_1_, p_176196_2_.func_177984_a())))));
-+        return p_176196_1_.isSideSolid(p_176196_2_.func_177976_e(),  EnumFacing.EAST ) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177974_f(),  EnumFacing.WEST ) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177978_c(), EnumFacing.SOUTH) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177968_d(), EnumFacing.NORTH) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177977_b(),  EnumFacing.UP   ) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177984_a(),    EnumFacing.DOWN );
-     }
- 
-    protected boolean func_176358_d(World p_176358_1_, BlockPos p_176358_2_)
-    {
-        return p_176358_1_.func_180495_p(p_176358_2_).func_177230_c().func_149721_r();
-    }
-
-     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 = this.func_176223_P().func_177226_a(field_176359_b, Boolean.valueOf(false));
- 
-        if (this.func_176358_d(p_180642_1_, p_180642_2_.func_177972_a(p_180642_3_.func_176734_d())))
-+        if (p_180642_1_.isSideSolid(p_180642_2_.func_177972_a(p_180642_3_.func_176734_d()), p_180642_3_))
-         {
-             return iblockstate.func_177226_a(field_176360_a, BlockLever.EnumOrientation.func_176856_a(p_180642_3_, p_180642_8_.func_174811_aO()));
-         }
-@@ -87,7 +87,7 @@
- 
-                 enumfacing1 = (EnumFacing)iterator.next();
-             }
-            while (enumfacing1 == p_180642_3_ || !this.func_176358_d(p_180642_1_, p_180642_2_.func_177972_a(enumfacing1.func_176734_d())));
-+            while (enumfacing1 == p_180642_3_ || !p_180642_1_.isSideSolid(p_180642_2_.func_177972_a(enumfacing1.func_176734_d()), enumfacing1));
- 
-             return iblockstate.func_177226_a(field_176360_a, BlockLever.EnumOrientation.func_176856_a(enumfacing1, p_180642_8_.func_174811_aO()));
-         }
-@@ -116,7 +116,8 @@
- 
-     public void func_176204_a(World p_176204_1_, BlockPos p_176204_2_, IBlockState p_176204_3_, Block p_176204_4_)
-     {
-        if (this.func_176356_e(p_176204_1_, p_176204_2_) && !this.func_176358_d(p_176204_1_, p_176204_2_.func_177972_a(((BlockLever.EnumOrientation)p_176204_3_.func_177229_b(field_176360_a)).func_176852_c().func_176734_d())))
-+        EnumFacing dir = ((BlockLever.EnumOrientation)p_176204_3_.func_177229_b(field_176360_a)).func_176852_c();
-+        if (this.func_176356_e(p_176204_1_, p_176204_2_) && !p_176204_1_.isSideSolid(p_176204_2_.func_177972_a(dir.func_176734_d()), dir))
-         {
-             this.func_176226_b(p_176204_1_, p_176204_2_, p_176204_3_, 0);
-             p_176204_1_.func_175698_g(p_176204_2_);
-@@ -235,6 +236,12 @@
+@@ -237,6 +237,12 @@
         return new BlockState(this, new IProperty[] {field_176360_a, field_176359_b});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockLog.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLog.java.patch
@ -1,18 +1,18 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLog.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLog.java
-@@ -38,9 +38,9 @@
-                 BlockPos blockpos1 = (BlockPos)iterator.next();
-                 IBlockState iblockstate1 = p_180663_1_.func_180495_p(blockpos1);
+@@ -33,9 +33,9 @@
+             {
+                 IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
 
-                if (iblockstate1.func_177230_c().func_149688_o() == Material.field_151584_j && !((Boolean)iblockstate1.func_177229_b(BlockLeaves.field_176236_b)).booleanValue())
-+                if (iblockstate1.func_177230_c().isLeaves(p_180663_1_, blockpos1))
+-                if (iblockstate.func_177230_c().func_149688_o() == Material.field_151584_j && !((Boolean)iblockstate.func_177229_b(BlockLeaves.field_176236_b)).booleanValue())
+                if (iblockstate.func_177230_c().isLeaves(p_180663_1_, blockpos))
                 {
-                    p_180663_1_.func_180501_a(blockpos1, iblockstate1.func_177226_a(BlockLeaves.field_176236_b, Boolean.valueOf(true)), 4);
-+                    iblockstate1.func_177230_c().beginLeavesDecay(p_180663_1_, blockpos1);
+-                    p_180663_1_.func_180501_a(blockpos, iblockstate.func_177226_a(BlockLeaves.field_176236_b, Boolean.valueOf(true)), 4);
+                    iblockstate.func_177230_c().beginLeavesDecay(p_180663_1_, blockpos);
                 }
             }
         }
-@@ -51,6 +51,9 @@
+@@ -46,6 +46,9 @@
         return 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_176299_a, BlockLog.EnumAxis.func_176870_a(p_180642_3_.func_176740_k()));
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
@ -1,11 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
-@@ -39,10 +39,14 @@
+@@ -37,10 +37,14 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-        int j = 15 + p_180653_1_.field_73012_v.nextInt(15) + p_180653_1_.field_73012_v.nextInt(15);
-        this.func_180637_b(p_180653_1_, p_180653_2_, j);
+-        int i = 15 + p_180653_1_.field_73012_v.nextInt(15) + p_180653_1_.field_73012_v.nextInt(15);
+-        this.func_180637_b(p_180653_1_, p_180653_2_, i);
     }
 
 +    @Override
--- a/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch
+++ b/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
-@@ -76,7 +76,7 @@
+@@ -71,7 +71,7 @@
         if (p_180671_2_.func_177956_o() >= 0 && p_180671_2_.func_177956_o() < 256)
         {
-             IBlockState iblockstate1 = p_180671_1_.func_180495_p(p_180671_2_.func_177977_b());
-            return iblockstate1.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_149854_a(iblockstate1.func_177230_c()));
-+            return iblockstate1.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && iblockstate1.func_177230_c().canSustainPlant(p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this));
+             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_149854_a(iblockstate.func_177230_c()));
+            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(p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this));
         }
         else
         {
--- a/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
@ -10,11 +10,11 @@
                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
             }
@@ -53,7 +53,7 @@
-                         IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos1);
-                         Block block = p_180650_1_.func_180495_p(blockpos1.func_177984_a()).func_177230_c();
+                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
+                         Block block = p_180650_1_.func_180495_p(blockpos.func_177984_a()).func_177230_c();
 
-                        if (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos1.func_177984_a()) >= 4 && block.func_149717_k() <= 2)
-+                        if (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos1.func_177984_a()) >= 4 && block.getLightOpacity(p_180650_1_, blockpos1.func_177984_a()) <= 2)
+-                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.func_149717_k() <= 2)
+                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.getLightOpacity(p_180650_1_, blockpos.func_177984_a()) <= 2)
                         {
-                             p_180650_1_.func_175656_a(blockpos1, this.func_176223_P());
+                             p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
                         }
--- a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -9,7 +9,7 @@
     }
 
     public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
-@@ -52,9 +52,11 @@
+@@ -54,9 +54,11 @@
         super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
     }
 
@ -20,9 +20,9 @@
 +        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
 +        if (false && !p_180653_1_.field_72995_K)
         {
-             int j = 1;
+             int i = 1;
 
-@@ -105,4 +107,24 @@
+@@ -107,4 +109,24 @@
     {
         return new BlockState(this, new IProperty[] {field_176486_a});
     }
--- a/patches/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
-@@ -105,14 +105,15 @@
+@@ -99,14 +99,15 @@
 
     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockNote.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNote.java.patch
@ -8,9 +8,9 @@
                 tileentitynote.func_145877_a();
 +                if (old == tileentitynote.field_145879_a) return false;
                 tileentitynote.func_175108_a(p_180639_1_, p_180639_2_);
+                 p_180639_4_.func_71029_a(StatList.field_181735_S);
             }
- 
-@@ -96,6 +98,10 @@
+@@ -98,6 +100,10 @@
 
     public boolean func_180648_a(World p_180648_1_, BlockPos p_180648_2_, IBlockState p_180648_3_, int p_180648_4_, int p_180648_5_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
-@@ -148,11 +148,17 @@
+@@ -142,11 +142,17 @@
         if (!p_180657_1_.field_72995_K && p_180657_2_.func_71045_bC() != null && p_180657_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
         {
             p_180657_2_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
--- a/patches/minecraft/net/minecraft/block/BlockOre.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockOre.java.patch
@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockOre.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
-@@ -10,6 +10,7 @@
- import net.minecraft.item.Item;
- import net.minecraft.util.BlockPos;
- import net.minecraft.util.MathHelper;
-+import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- 
- public class BlockOre extends Block
-@@ -54,34 +55,40 @@
+@@ -58,34 +58,40 @@
     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_);
@ -16,42 +8,42 @@
 -        if (this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_) != Item.func_150898_a(this))
 +    }
 +    @Override
-+    public int getExpDrop(IBlockAccess world, BlockPos pos, int fortune)
+    public int getExpDrop(net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
 +    {
 +        IBlockState state = world.func_180495_p(pos);
 +        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
 +        if (this.func_180660_a(state, rand, fortune) != Item.func_150898_a(this))
         {
-             int j = 0;
+             int i = 0;
 
             if (this == Blocks.field_150365_q)
             {
-                j = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 0, 2);
-+                j = MathHelper.func_76136_a(rand, 0, 2);
+-                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 0, 2);
+                i = MathHelper.func_76136_a(rand, 0, 2);
             }
             else if (this == Blocks.field_150482_ag)
             {
-                j = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
-+                j = MathHelper.func_76136_a(rand, 3, 7);
+-                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
+                i = MathHelper.func_76136_a(rand, 3, 7);
             }
             else if (this == Blocks.field_150412_bA)
             {
-                j = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
-+                j = MathHelper.func_76136_a(rand, 3, 7);
+-                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
+                i = MathHelper.func_76136_a(rand, 3, 7);
             }
             else if (this == Blocks.field_150369_x)
             {
-                j = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
-+                j = MathHelper.func_76136_a(rand, 2, 5);
+-                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
+                i = MathHelper.func_76136_a(rand, 2, 5);
             }
             else if (this == Blocks.field_150449_bY)
             {
-                j = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
-+                j = MathHelper.func_76136_a(rand, 2, 5);
+-                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
+                i = MathHelper.func_76136_a(rand, 2, 5);
             }
 
-            this.func_180637_b(p_180653_1_, p_180653_2_, j);
-+            return j;
+-            this.func_180637_b(p_180653_1_, p_180653_2_, i);
+            return i;
         }
 +        return 0;
     }
--- a/patches/minecraft/net/minecraft/block/BlockPane.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPane.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPane.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
-@@ -39,7 +39,10 @@
+@@ -38,7 +38,10 @@
 
     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
     {
@ -12,9 +12,9 @@
     }
 
     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -65,10 +68,10 @@
+@@ -64,10 +67,10 @@
 
-     public void func_180638_a(World p_180638_1_, BlockPos p_180638_2_, IBlockState p_180638_3_, AxisAlignedBB p_180638_4_, List p_180638_5_, Entity p_180638_6_)
+     public void func_180638_a(World p_180638_1_, BlockPos p_180638_2_, IBlockState p_180638_3_, AxisAlignedBB p_180638_4_, List<AxisAlignedBB> p_180638_5_, Entity p_180638_6_)
     {
 -        boolean flag = this.func_150098_a(p_180638_1_.func_180495_p(p_180638_2_.func_177978_c()).func_177230_c());
 -        boolean flag1 = this.func_150098_a(p_180638_1_.func_180495_p(p_180638_2_.func_177968_d()).func_177230_c());
@ -27,7 +27,7 @@
 
         if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1))
         {
-@@ -187,4 +190,11 @@
+@@ -186,4 +189,11 @@
     {
         return new BlockState(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
     }
--- a/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
-@@ -200,7 +200,7 @@
+@@ -189,7 +189,7 @@
                     }
                 }
 
-                if (!flag1 && block.func_149688_o() != Material.field_151579_a && func_180696_a(block, p_180648_1_, blockpos1, enumfacing.func_176734_d(), false) && (block.func_149656_h() == 0 || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
-+                if (!flag1 && !block.isAir(p_180648_1_, blockpos1) && func_180696_a(block, p_180648_1_, blockpos1, enumfacing.func_176734_d(), false) && (block.func_149656_h() == 0 || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
+-                if (!flag1 && block.func_149688_o() != Material.field_151579_a && func_180696_a(block, p_180648_1_, blockpos, enumfacing.func_176734_d(), false) && (block.func_149656_h() == 0 || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
+                if (!flag1 && !block.isAir(p_180648_1_, blockpos) && func_180696_a(block, p_180648_1_, blockpos, enumfacing.func_176734_d(), false) && (block.func_149656_h() == 0 || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
                 {
                     this.func_176319_a(p_180648_1_, p_180648_2_, enumfacing, false);
                 }
-@@ -344,7 +344,7 @@
+@@ -333,7 +333,7 @@
                     return false;
                 }
 
@ -18,14 +18,14 @@
             }
             else
             {
-@@ -384,7 +384,9 @@
+@@ -371,7 +371,9 @@
             {
-                 blockpos1 = (BlockPos)list1.get(j);
-                 Block block = p_176319_1_.func_180495_p(blockpos1).func_177230_c();
-                block.func_176226_b(p_176319_1_, blockpos1, p_176319_1_.func_180495_p(blockpos1), 0);
+                 BlockPos blockpos = (BlockPos)list1.get(j);
+                 Block block = p_176319_1_.func_180495_p(blockpos).func_177230_c();
+-                block.func_176226_b(p_176319_1_, blockpos, p_176319_1_.func_180495_p(blockpos), 0);
 +                //With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
 +                float chance = block instanceof BlockSnow ? -1.0f : 1.0f;
-+                block.func_180653_a(p_176319_1_, blockpos1, p_176319_1_.func_180495_p(blockpos1), chance, 0);
-                 p_176319_1_.func_175698_g(blockpos1);
+                block.func_180653_a(p_176319_1_, blockpos, p_176319_1_.func_180495_p(blockpos), chance, 0);
+                 p_176319_1_.func_175698_g(blockpos);
                 --i;
                 ablock[i] = block;
--- a/patches/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
-@@ -110,16 +110,7 @@
+@@ -109,16 +109,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_)
     {
@ -10,15 +10,15 @@
 -
 -            if (tileentitypiston != null)
 -            {
-                IBlockState iblockstate1 = tileentitypiston.func_174927_b();
-                iblockstate1.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate1, 0);
+-                IBlockState iblockstate = tileentitypiston.func_174927_b();
+-                iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
 -            }
 -        }
 +        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
     }
 
     public MovingObjectPosition func_180636_a(World p_180636_1_, BlockPos p_180636_2_, Vec3 p_180636_3_, Vec3 p_180636_4_)
-@@ -283,4 +274,16 @@
+@@ -282,4 +273,16 @@
     {
         return new BlockState(this, new IProperty[] {field_176426_a, field_176425_b});
     }
--- a/patches/minecraft/net/minecraft/block/BlockPotato.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPotato.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPotato.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPotato.java
-@@ -24,13 +24,14 @@
+@@ -22,13 +22,14 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--- a/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
-@@ -109,7 +109,7 @@
+@@ -115,7 +115,7 @@
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockQuartz.java.patch
+++ b/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
-@@ -91,6 +91,26 @@
+@@ -90,6 +90,26 @@
         return new BlockState(this, new IProperty[] {field_176335_a});
     }
 
--- a/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
-@@ -33,7 +33,7 @@
+@@ -31,7 +31,7 @@
     public static boolean func_176563_d(IBlockState p_176563_0_)
     {
         Block block = p_176563_0_.func_177230_c();
@ -9,10 +9,10 @@
     }
 
     protected BlockRailBase(boolean p_i45389_1_)
-@@ -174,7 +174,81 @@
-     }
+@@ -175,6 +175,81 @@
+ 
+     public abstract IProperty<BlockRailBase.EnumRailDirection> func_176560_l();
 
-     public abstract IProperty func_176560_l();
 +    /* ======================================== FORGE START =====================================*/
 +    /**
 +     * Return true if the rail can make corners.
@ -25,7 +25,7 @@
 +    {
 +        return !this.field_150053_a;
 +    }
- 
+
 +    /**
 +     * Returns true if the rail can make up and down slopes.
 +     * Used by placement logic.
@ -91,57 +91,57 @@
     public static enum EnumRailDirection implements IStringSerializable
     {
         NORTH_SOUTH(0, "north_south"),
-@@ -251,6 +325,7 @@
+@@ -245,6 +320,7 @@
+         private IBlockState field_180366_e;
         private final boolean field_150656_f;
-         private final List field_150657_g = Lists.newArrayList();
-         private static final String __OBFID = "CL_00000196";
+         private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
 +        private final boolean canMakeSlopes;
 
         public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
         {
-@@ -259,7 +334,8 @@
+@@ -253,7 +329,8 @@
             this.field_180366_e = p_i45739_4_;
             this.field_180365_d = (BlockRailBase)p_i45739_4_.func_177230_c();
-             BlockRailBase.EnumRailDirection enumraildirection = (BlockRailBase.EnumRailDirection)p_i45739_4_.func_177229_b(BlockRailBase.this.func_176560_l());
+             BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_i45739_4_.func_177229_b(BlockRailBase.this.func_176560_l());
 -            this.field_150656_f = this.field_180365_d.field_150053_a;
 +            this.field_150656_f = !this.field_180365_d.isFlexibleRail(p_i45739_2_, p_i45739_3_);
 +            canMakeSlopes = this.field_180365_d.canMakeSlopes(p_i45739_2_, p_i45739_3_);
-             this.func_180360_a(enumraildirection);
+             this.func_180360_a(blockrailbase$enumraildirection);
         }
 
-@@ -448,7 +524,7 @@
+@@ -439,7 +516,7 @@
                 }
             }
 
-            if (enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
-+            if (enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                 {
-@@ -461,7 +537,7 @@
+@@ -452,7 +529,7 @@
                 }
             }
 
-            if (enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
-+            if (enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
                 {
-@@ -604,7 +680,7 @@
+@@ -595,7 +672,7 @@
                 }
             }
 
-            if (enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
-+            if (enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                 {
-@@ -617,7 +693,7 @@
+@@ -608,7 +685,7 @@
                 }
             }
 
-            if (enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
-+            if (enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
             {
                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
                 {
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
@ -1,11 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneDiode.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneDiode.java
-@@ -200,6 +200,8 @@
+@@ -198,6 +198,8 @@
     {
         EnumFacing enumfacing = (EnumFacing)p_176400_3_.func_177229_b(field_176387_N);
-         BlockPos blockpos1 = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
+         BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
 +        if(net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(enumfacing.func_176734_d())).isCanceled())
 +            return;
-         p_176400_1_.func_180496_d(blockpos1, this);
-         p_176400_1_.func_175695_a(blockpos1, this, enumfacing);
+         p_176400_1_.func_180496_d(blockpos, this);
+         p_176400_1_.func_175695_a(blockpos, this, enumfacing);
     }
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
-@@ -92,12 +92,16 @@
+@@ -91,12 +91,16 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
@ -12,8 +12,8 @@
 +    {
 +        if (this.func_180660_a(world.func_180495_p(pos), RANDOM, fortune) != Item.func_150898_a(this))
         {
-            int j = 1 + p_180653_1_.field_73012_v.nextInt(5);
-            this.func_180637_b(p_180653_1_, p_180653_2_, j);
+-            int i = 1 + p_180653_1_.field_73012_v.nextInt(5);
+-            this.func_180637_b(p_180653_1_, p_180653_2_, i);
 +            return 1 + RANDOM.nextInt(5);
         }
 +        return 0;
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
@ -1,24 +1,24 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneWire.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneWire.java
-@@ -60,10 +60,10 @@
-         BlockPos blockpos1 = p_176341_2_.func_177972_a(p_176341_3_);
+@@ -58,10 +58,10 @@
+         BlockPos blockpos = p_176341_2_.func_177972_a(p_176341_3_);
         Block block = p_176341_1_.func_180495_p(p_176341_2_.func_177972_a(p_176341_3_)).func_177230_c();
 
-        if (!func_176343_a(p_176341_1_.func_180495_p(blockpos1), p_176341_3_) && (block.func_149637_q() || !func_176346_d(p_176341_1_.func_180495_p(blockpos1.func_177977_b()))))
-+        if (!canRestoneConnect(p_176341_1_, blockpos1, p_176341_3_) && (block.func_149637_q() || !canRestoneConnect(p_176341_1_, blockpos1.func_177977_b(), null)))
+-        if (!func_176343_a(p_176341_1_.func_180495_p(blockpos), p_176341_3_) && (block.func_149637_q() || !func_176346_d(p_176341_1_.func_180495_p(blockpos.func_177977_b()))))
+        if (!canRestoneConnect(p_176341_1_, blockpos, p_176341_3_) && (block.func_149637_q() || !canRestoneConnect(p_176341_1_, blockpos.func_177977_b(), null)))
         {
             Block block1 = p_176341_1_.func_180495_p(p_176341_2_.func_177984_a()).func_177230_c();
-            return !block1.func_149637_q() && block.func_149637_q() && func_176346_d(p_176341_1_.func_180495_p(blockpos1.func_177984_a())) ? BlockRedstoneWire.EnumAttachPosition.UP : BlockRedstoneWire.EnumAttachPosition.NONE;
-+            return !block1.func_149637_q() && block.func_149637_q() && canRestoneConnect(p_176341_1_, blockpos1.func_177984_a(), null) ? BlockRedstoneWire.EnumAttachPosition.UP : BlockRedstoneWire.EnumAttachPosition.NONE;
+-            return !block1.func_149637_q() && block.func_149637_q() && func_176346_d(p_176341_1_.func_180495_p(blockpos.func_177984_a())) ? BlockRedstoneWire.EnumAttachPosition.UP : BlockRedstoneWire.EnumAttachPosition.NONE;
+            return !block1.func_149637_q() && block.func_149637_q() && canRestoneConnect(p_176341_1_, blockpos.func_177984_a(), null) ? BlockRedstoneWire.EnumAttachPosition.UP : BlockRedstoneWire.EnumAttachPosition.NONE;
         }
         else
         {
-@@ -393,35 +393,25 @@
+@@ -359,35 +359,24 @@
         Block block = iblockstate.func_177230_c();
         boolean flag = block.func_149721_r();
         boolean flag1 = p_176339_1_.func_180495_p(p_176339_2_.func_177984_a()).func_177230_c().func_149721_r();
-        return !flag1 && flag && func_176340_e(p_176339_1_, blockpos1.func_177984_a()) ? true : (func_176343_a(iblockstate, p_176339_3_) ? true : (block == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_176387_N) == p_176339_3_ ? true : !flag && func_176340_e(p_176339_1_, blockpos1.func_177977_b())));
-+        return !flag1 && flag && canRestoneConnect(p_176339_1_, blockpos1.func_177984_a(), null) ? true : (canRestoneConnect(p_176339_1_, blockpos1, p_176339_3_) ? true : (block == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_176387_N) == p_176339_3_ ? true : !flag && canRestoneConnect(p_176339_1_, blockpos1.func_177977_b(), null)));
+-        return !flag1 && flag && func_176340_e(p_176339_1_, blockpos.func_177984_a()) ? true : (func_176343_a(iblockstate, p_176339_3_) ? true : (block == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_176387_N) == p_176339_3_ ? true : !flag && func_176340_e(p_176339_1_, blockpos.func_177977_b())));
+        return !flag1 && flag && canRestoneConnect(p_176339_1_, blockpos.func_177984_a(), null) ? true : (canRestoneConnect(p_176339_1_, blockpos, p_176339_3_) ? true : (block == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_176387_N) == p_176339_3_ ? true : !flag && canRestoneConnect(p_176339_1_, blockpos.func_177977_b(), null)));
     }
 
 -    protected static boolean func_176340_e(IBlockAccess p_176340_0_, BlockPos p_176340_1_)
@ -26,8 +26,7 @@
     {
 -        return func_176346_d(p_176340_0_.func_180495_p(p_176340_1_));
 -    }
-+        IBlockState state = world.func_180495_p(pos);
- 
+-
 -    protected static boolean func_176346_d(IBlockState p_176346_0_)
 -    {
 -        return func_176343_a(p_176346_0_, (EnumFacing)null);
@ -38,6 +37,7 @@
 -        Block block = p_176343_0_.func_177230_c();
 -
 -        if (block == Blocks.field_150488_af)
+        IBlockState state = world.func_180495_p(pos);
 +        if (state.func_177230_c() == Blocks.field_150488_af)
         {
             return true;
@ -45,8 +45,8 @@
 -        else if (Blocks.field_150413_aR.func_149907_e(block))
 +        else if (Blocks.field_150413_aR.func_149907_e(state.func_177230_c()))
         {
-            EnumFacing enumfacing1 = (EnumFacing)p_176343_0_.func_177229_b(BlockRedstoneRepeater.field_176387_N);
-            return enumfacing1 == p_176343_1_ || enumfacing1.func_176734_d() == p_176343_1_;
+-            EnumFacing enumfacing = (EnumFacing)p_176343_0_.func_177229_b(BlockRedstoneRepeater.field_176387_N);
+-            return enumfacing == p_176343_1_ || enumfacing.func_176734_d() == p_176343_1_;
 +            EnumFacing direction = (EnumFacing)state.func_177229_b(BlockRedstoneRepeater.field_176387_N);
 +            return direction == side || direction.func_176734_d() == side;
         }
--- a/patches/minecraft/net/minecraft/block/BlockReed.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockReed.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockReed.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockReed.java
-@@ -19,7 +19,7 @@
+@@ -18,7 +18,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@ -8,8 +8,8 @@
 +public class BlockReed extends Block implements net.minecraftforge.common.IPlantable
 {
     public static final PropertyInteger field_176355_a = PropertyInteger.func_177719_a("age", 0, 15);
-     private static final String __OBFID = "CL_00000300";
-@@ -67,6 +67,7 @@
+ 
+@@ -65,6 +65,7 @@
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
     {
         Block block = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_177230_c();
@ -17,7 +17,7 @@
 
         if (block == this)
         {
-@@ -172,4 +173,15 @@
+@@ -164,4 +165,15 @@
     {
         return new BlockState(this, new IProperty[] {field_176355_a});
     }
--- a/patches/minecraft/net/minecraft/block/BlockRotatedPillar.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRotatedPillar.java.patch
@ -1,22 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRotatedPillar.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRotatedPillar.java
-@@ -2,6 +2,7 @@
- 
- import net.minecraft.block.material.Material;
- import net.minecraft.block.properties.PropertyEnum;
-+import net.minecraft.block.state.IBlockState;
- import net.minecraft.util.EnumFacing;
- 
- public abstract class BlockRotatedPillar extends Block
-@@ -13,4 +14,18 @@
+@@ -18,4 +18,18 @@
     {
-         super(p_i45425_1_);
+         super(p_i46385_1_, p_i46385_2_);
     }
 +
 +    public boolean rotateBlock(net.minecraft.world.World world, net.minecraft.util.BlockPos pos, EnumFacing axis)
 +    {
-+        IBlockState state = world.func_180495_p(pos);
-+        for (net.minecraft.block.properties.IProperty prop : (java.util.Set<net.minecraft.block.properties.IProperty>)state.func_177228_b().keySet())
+        net.minecraft.block.state.IBlockState state = world.func_180495_p(pos);
+        for (net.minecraft.block.properties.IProperty<?> prop : state.func_177228_b().keySet())
 +        {
 +            if (prop.func_177701_a().equals("axis"))
 +            {
--- a/patches/minecraft/net/minecraft/block/BlockSapling.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch
@ -1,10 +1,10 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSapling.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSapling.java
-@@ -66,6 +66,7 @@
+@@ -71,6 +71,7 @@
 
     public void func_176476_e(World p_176476_1_, BlockPos p_176476_2_, IBlockState p_176476_3_, Random p_176476_4_)
     {
 +        if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(p_176476_1_, p_176476_4_, p_176476_2_)) return;
-         Object object = p_176476_4_.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true);
+         WorldGenerator worldgenerator = (WorldGenerator)(p_176476_4_.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true));
         int i = 0;
         int j = 0;
--- a/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
@ -1,15 +1,17 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
-@@ -122,8 +122,6 @@
+@@ -121,10 +121,6 @@
         return tileentity instanceof TileEntitySkull ? ((TileEntitySkull)tileentity).func_145904_a() : super.func_176222_j(p_176222_1_, p_176222_2_);
     }
 
-    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_) {}
+-    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_)
+-    {
+-    }
 -
     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)
-@@ -131,13 +129,18 @@
+@@ -132,13 +128,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);
         }
@ -29,7 +31,7 @@
         {
             if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
             {
-@@ -146,7 +149,7 @@
+@@ -147,7 +148,7 @@
                 if (tileentity instanceof TileEntitySkull)
                 {
                     TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
@ -38,7 +40,7 @@
 
                     if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null)
                     {
-@@ -156,12 +159,11 @@
+@@ -157,12 +158,11 @@
                         itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound);
                     }
 
--- a/patches/minecraft/net/minecraft/block/BlockSlab.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSlab.java.patch
@ -0,0 +1,38 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockSlab.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSlab.java
+@@ -91,6 +91,17 @@
+         return this.func_176552_j();
+     }
+ 
+    @Override
+    public boolean doesSideBlockRendering(IBlockAccess world, BlockPos pos, EnumFacing face)
+	{
+        if ( func_149662_c() )
+            return true;
+        
+        // face is on the block being rendered, not this block.
+        EnumBlockHalf side = world.func_180495_p(pos).func_177229_b(field_176554_a);
+        return (side == EnumBlockHalf.TOP && face == EnumFacing.DOWN) || (side == EnumBlockHalf.BOTTOM && face == EnumFacing.UP);
+    }
+
+     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);
+@@ -118,15 +129,8 @@
+         {
+             return false;
+         }
+-        else
+-        {
+-            BlockPos blockpos = p_176225_2_.func_177972_a(p_176225_3_.func_176734_d());
+-            IBlockState iblockstate = p_176225_1_.func_180495_p(p_176225_2_);
+-            IBlockState iblockstate1 = p_176225_1_.func_180495_p(blockpos);
+-            boolean flag = func_150003_a(iblockstate.func_177230_c()) && iblockstate.func_177229_b(field_176554_a) == BlockSlab.EnumBlockHalf.TOP;
+-            boolean flag1 = func_150003_a(iblockstate1.func_177230_c()) && iblockstate1.func_177229_b(field_176554_a) == BlockSlab.EnumBlockHalf.TOP;
+-            return flag1 ? (p_176225_3_ == EnumFacing.DOWN ? true : (p_176225_3_ == EnumFacing.UP && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_) ? true : !func_150003_a(iblockstate.func_177230_c()) || !flag)) : (p_176225_3_ == EnumFacing.UP ? true : (p_176225_3_ == EnumFacing.DOWN && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_) ? true : !func_150003_a(iblockstate.func_177230_c()) || flag));
+-        }
+        // additional logic breaks doesSideBlockRendering and is no longer useful.
+        return super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_);
+     }
+ 
+     @SideOnly(Side.CLIENT)
--- a/patches/minecraft/net/minecraft/block/BlockSnow.java.patch
+++ b/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
-@@ -80,7 +80,7 @@
+@@ -79,7 +79,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 ? (block.func_149688_o() == Material.field_151584_j ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 7 ? true : block.func_149662_c() && block.field_149764_J.func_76230_c())) : false;
-+        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (block.isLeaves(p_176196_1_, p_176196_2_.func_177977_b()) ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 7 ? true : block.func_149662_c() && block.field_149764_J.func_76230_c())) : false;
+-        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (block.func_149688_o() == Material.field_151584_j ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() >= 7 ? true : block.func_149662_c() && block.field_149764_J.func_76230_c())) : false;
+        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (block.isLeaves(p_176196_1_, p_176196_2_.func_177977_b()) ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() >= 7 ? true : block.func_149662_c() && block.field_149764_J.func_76230_c())) : false;
     }
 
     public void func_176204_a(World p_176204_1_, BlockPos p_176204_2_, IBlockState p_176204_3_, Block p_176204_4_)
-@@ -92,7 +92,6 @@
+@@ -91,7 +91,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;
         }
-@@ -104,9 +103,8 @@
+@@ -103,9 +102,8 @@
 
     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
     {
@ -28,7 +28,7 @@
     }
 
     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -116,14 +114,13 @@
+@@ -115,14 +113,13 @@
 
     public int func_149745_a(Random p_149745_1_)
     {
@ -44,7 +44,7 @@
             p_180650_1_.func_175698_g(p_180650_2_);
         }
     }
-@@ -153,4 +150,6 @@
+@@ -152,4 +149,6 @@
     {
         return new BlockState(this, new IProperty[] {field_176315_a});
     }
--- a/patches/minecraft/net/minecraft/block/BlockStairs.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStairs.java.patch
@ -0,0 +1,22 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockStairs.java
+++ ../src-work/minecraft/net/minecraft/block/BlockStairs.java
+@@ -68,6 +68,19 @@
+         return false;
+     }
+ 
+    @Override
+    public boolean doesSideBlockRendering(IBlockAccess world, BlockPos pos, EnumFacing face)
+	{
+        if ( func_149662_c() )
+            return true;
+        
+        // face is on the block being rendered, not this block.
+        IBlockState iblockstate = world.func_180495_p(pos);
+        EnumHalf half = iblockstate.func_177229_b(field_176308_b);
+        EnumFacing side = iblockstate.func_177229_b(field_176309_a);
+        return side == face.func_176734_d() || (half == EnumHalf.TOP && face == EnumFacing.DOWN) || (half == EnumHalf.BOTTOM && face == EnumFacing.UP);
+    }
+
+     public boolean func_149686_d()
+     {
+         return false;
--- a/patches/minecraft/net/minecraft/block/BlockStem.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStem.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockStem.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
-@@ -108,7 +108,7 @@
+@@ -94,7 +94,7 @@
                     p_180650_2_ = p_180650_2_.func_177972_a(EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_));
                     Block block = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_177230_c();
 
@ -9,7 +9,7 @@
                     {
                         p_180650_1_.func_175656_a(p_180650_2_, this.field_149877_a.func_176223_P());
                     }
-@@ -162,24 +162,29 @@
+@@ -148,24 +148,29 @@
     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
     {
         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
@ -25,13 +25,13 @@
 
             if (item != null)
             {
-                int j = ((Integer)p_180653_3_.func_177229_b(field_176484_a)).intValue();
-+                int j = ((Integer)state.func_177229_b(field_176484_a)).intValue();
+-                int i = ((Integer)p_180653_3_.func_177229_b(field_176484_a)).intValue();
+                int i = ((Integer)state.func_177229_b(field_176484_a)).intValue();
 
-                 for (int k = 0; k < 3; ++k)
+                 for (int j = 0; j < 3; ++j)
                 {
-                    if (p_180653_1_.field_73012_v.nextInt(15) <= j)
-+                    if (RANDOM.nextInt(15) <= j)
+-                    if (p_180653_1_.field_73012_v.nextInt(15) <= i)
+                    if (RANDOM.nextInt(15) <= i)
                     {
 -                        func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(item));
 +                        ret.add(new ItemStack(item));
--- a/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
@ -7,9 +7,9 @@
 -public class BlockTallGrass extends BlockBush implements IGrowable
 +public class BlockTallGrass extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
 {
-     public static final PropertyEnum field_176497_a = PropertyEnum.func_177709_a("type", BlockTallGrass.EnumType.class);
-     private static final String __OBFID = "CL_00000321";
-@@ -44,7 +44,7 @@
+     public static final PropertyEnum<BlockTallGrass.EnumType> field_176497_a = PropertyEnum.<BlockTallGrass.EnumType>func_177709_a("type", BlockTallGrass.EnumType.class);
+ 
+@@ -43,7 +43,7 @@
 
     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
     {
@ -18,7 +18,7 @@
     }
 
     public boolean func_176200_f(World p_176200_1_, BlockPos p_176200_2_)
-@@ -74,7 +74,7 @@
+@@ -53,7 +53,7 @@
 
     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
     {
@ -27,7 +27,7 @@
     }
 
     public int func_149679_a(int p_149679_1_, Random p_149679_2_)
-@@ -84,13 +84,7 @@
+@@ -63,13 +63,7 @@
 
     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
     {
@ -41,7 +41,7 @@
             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
         }
     }
-@@ -210,4 +204,22 @@
+@@ -204,4 +198,22 @@
             }
         }
     }
--- a/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
-@@ -70,7 +70,7 @@
+@@ -63,7 +63,7 @@
         else
         {
             Block block = p_176594_1_.func_180495_p(p_176594_2_).func_177230_c();
@ -9,30 +9,30 @@
         }
     }
 
-@@ -97,7 +97,7 @@
+@@ -84,7 +84,7 @@
     {
-         BlockPos blockpos1 = p_176595_2_.func_177972_a(p_176595_3_.func_176734_d());
+         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(blockpos1, true) || p_176595_3_.equals(EnumFacing.UP) && this.func_176594_d(p_176595_1_, blockpos1);
-+        return flag && p_176595_1_.isSideSolid(blockpos1, p_176595_3_, true) || p_176595_3_.equals(EnumFacing.UP) && this.func_176594_d(p_176595_1_, blockpos1);
+-        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_)
-@@ -120,7 +120,7 @@
- 
-                 enumfacing1 = (EnumFacing)iterator.next();
-             }
-            while (!p_180642_1_.func_175677_d(p_180642_2_.func_177972_a(enumfacing1.func_176734_d()), true));
-+            while (!p_180642_1_.isSideSolid(p_180642_2_.func_177972_a(enumfacing1.func_176734_d()), enumfacing1, true));
- 
-             return this.func_176223_P().func_177226_a(field_176596_a, enumfacing1);
-         }
-@@ -149,7 +149,7 @@
+@@ -97,7 +97,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);
+                 }
+@@ -130,7 +130,7 @@
             EnumFacing enumfacing1 = enumfacing.func_176734_d();
             boolean flag = false;
 
-            if (axis.func_176722_c() && !p_176592_1_.func_175677_d(p_176592_2_.func_177972_a(enumfacing1), true))
-+            if (axis.func_176722_c() && !p_176592_1_.isSideSolid(p_176592_2_.func_177972_a(enumfacing1), enumfacing1, true))
+-            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;
             }
--- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
@ -8,20 +8,20 @@
 +    public static boolean disableValidation = false;
     public static final PropertyDirection field_176284_a = PropertyDirection.func_177712_a("facing", EnumFacing.Plane.HORIZONTAL);
     public static final PropertyBool field_176283_b = PropertyBool.func_177716_a("open");
-     public static final PropertyEnum field_176285_M = PropertyEnum.func_177709_a("half", BlockTrapDoor.DoorHalf.class);
-@@ -141,9 +143,10 @@
+     public static final PropertyEnum<BlockTrapDoor.DoorHalf> field_176285_M = PropertyEnum.<BlockTrapDoor.DoorHalf>func_177709_a("half", BlockTrapDoor.DoorHalf.class);
+@@ -140,9 +142,10 @@
     {
         if (!p_176204_1_.field_72995_K)
         {
 +            EnumFacing direction = (EnumFacing)p_176204_3_.func_177229_b(field_176284_a);
-             BlockPos blockpos1 = p_176204_2_.func_177972_a(((EnumFacing)p_176204_3_.func_177229_b(field_176284_a)).func_176734_d());
+             BlockPos blockpos = p_176204_2_.func_177972_a(((EnumFacing)p_176204_3_.func_177229_b(field_176284_a)).func_176734_d());
 
-            if (!func_150119_a(p_176204_1_.func_180495_p(blockpos1).func_177230_c()))
-+            if (!(func_150119_a(p_176204_1_.func_180495_p(blockpos1).func_177230_c()) || p_176204_1_.isSideSolid(blockpos1, direction, true)))
+-            if (!func_150119_a(p_176204_1_.func_180495_p(blockpos).func_177230_c()))
+            if (!(func_150119_a(p_176204_1_.func_180495_p(blockpos).func_177230_c()) || p_176204_1_.isSideSolid(blockpos, direction, true)))
             {
                 p_176204_1_.func_175698_g(p_176204_2_);
                 this.func_176226_b(p_176204_1_, p_176204_2_, p_176204_3_, 0);
-@@ -187,7 +190,10 @@
+@@ -186,7 +189,10 @@
 
     public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
     {
@ -33,7 +33,7 @@
     }
 
     protected static EnumFacing func_176281_b(int p_176281_0_)
-@@ -224,6 +230,7 @@
+@@ -223,6 +229,7 @@
 
     private static boolean func_150119_a(Block p_150119_0_)
     {
--- a/patches/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTripWireHook.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTripWireHook.java
-@@ -60,7 +60,7 @@
+@@ -58,14 +58,14 @@
 
     public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
     {
@ -9,16 +9,15 @@
     }
 
     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -77,7 +77,7 @@
- 
-             enumfacing = (EnumFacing)iterator.next();
-         }
-        while (!p_176196_1_.func_180495_p(p_176196_2_.func_177972_a(enumfacing)).func_177230_c().func_149721_r());
-+        while (!p_176196_1_.isSideSolid(p_176196_2_.func_177972_a(enumfacing), enumfacing.func_176734_d(), true));
- 
-         return true;
-     }
-@@ -107,7 +107,7 @@
+     {
+         for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
+         {
+-            if (p_176196_1_.func_180495_p(p_176196_2_.func_177972_a(enumfacing)).func_177230_c().func_149721_r())
+            if (p_176196_1_.isSideSolid(p_176196_2_.func_177972_a(enumfacing), enumfacing.func_176734_d(), true))
+             {
+                 return true;
+             }
+@@ -99,7 +99,7 @@
             {
                 EnumFacing enumfacing = (EnumFacing)p_176204_3_.func_177229_b(field_176264_a);
 
--- a/patches/minecraft/net/minecraft/block/BlockVine.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockVine.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockVine.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockVine.java
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,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");
-@@ -416,13 +416,7 @@
+@@ -387,13 +387,7 @@
 
     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
     {
@ -23,10 +23,10 @@
             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
         }
     }
-@@ -508,6 +502,16 @@
+@@ -474,4 +468,14 @@
+ 
         return i;
     }
- 
 +    /*************************FORGE START***********************************/
 +    @Override public boolean isLadder(IBlockAccess world, BlockPos pos, EntityLivingBase entity){ return true; }
 +    @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
@ -37,6 +37,4 @@
 +    }
 +    /*************************FORGE END***********************************/
 +
-     static final class SwitchEnumFacing
-         {
-             static final int[] field_177057_a = new int[EnumFacing.values().length];
+ }
--- a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
 +++ ../src-work/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
-@@ -80,7 +80,7 @@
+@@ -78,7 +78,7 @@
     {
         Block block = this.field_177261_a.func_180495_p(p_177251_1_).func_177230_c();
 
@ -9,21 +9,21 @@
         {
             return true;
         }
-@@ -111,7 +111,7 @@
-                     BlockPos blockpos1 = p_177251_1_.func_177967_a(this.field_177257_d.func_176734_d(), i);
-                     block = this.field_177261_a.func_180495_p(blockpos1).func_177230_c();
+@@ -109,7 +109,7 @@
+                     BlockPos blockpos = p_177251_1_.func_177967_a(this.field_177257_d.func_176734_d(), i);
+                     block = this.field_177261_a.func_180495_p(blockpos).func_177230_c();
 
-                    if (block.func_149688_o() == Material.field_151579_a || !BlockPistonBase.func_180696_a(block, this.field_177261_a, blockpos1, this.field_177257_d, false) || blockpos1.equals(this.field_177259_b))
-+                    if (block.isAir(field_177261_a, blockpos1)|| !BlockPistonBase.func_180696_a(block, this.field_177261_a, blockpos1, this.field_177257_d, false) || blockpos1.equals(this.field_177259_b))
+-                    if (block.func_149688_o() == Material.field_151579_a || !BlockPistonBase.func_180696_a(block, this.field_177261_a, blockpos, this.field_177257_d, false) || blockpos.equals(this.field_177259_b))
+                    if (block.isAir(field_177261_a, blockpos)|| !BlockPistonBase.func_180696_a(block, this.field_177261_a, blockpos, this.field_177257_d, false) || blockpos.equals(this.field_177259_b))
                     {
                         break;
                     }
-@@ -159,7 +159,7 @@
+@@ -156,7 +156,7 @@
 
-                     block = this.field_177261_a.func_180495_p(blockpos2).func_177230_c();
+                     block = this.field_177261_a.func_180495_p(blockpos1).func_177230_c();
 
 -                    if (block.func_149688_o() == Material.field_151579_a)
-+                    if (block.isAir(field_177261_a, blockpos2))
+                    if (block.isAir(field_177261_a, blockpos1))
                     {
                         return true;
                     }
--- a/patches/minecraft/net/minecraft/block/state/BlockState.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/BlockState.java.patch
@ -1,48 +1,48 @@
 --- ../src-base/minecraft/net/minecraft/block/state/BlockState.java
 +++ ../src-work/minecraft/net/minecraft/block/state/BlockState.java
-@@ -47,6 +47,16 @@
+@@ -38,6 +38,16 @@
 
-     public BlockState(Block p_i45663_1_, IProperty ... p_i45663_2_)
+     public BlockState(Block p_i45663_1_, IProperty... p_i45663_2_)
     {
 +        this(p_i45663_1_, p_i45663_2_, null);
 +    }
 +
-+    protected StateImplementation createState(Block block, ImmutableMap properties, ImmutableMap unlistedProperties)
+    protected StateImplementation createState(Block block, ImmutableMap<IProperty, Comparable> properties, ImmutableMap<net.minecraftforge.common.property.IUnlistedProperty<?>, com.google.common.base.Optional<?>> unlistedProperties)
 +    {
 +        return new StateImplementation(block, properties);
 +    }
 +
-+    protected BlockState(Block p_i45663_1_, IProperty[] p_i45663_2_, ImmutableMap unlistedProperties)
+    protected BlockState(Block p_i45663_1_, IProperty[] p_i45663_2_, ImmutableMap<net.minecraftforge.common.property.IUnlistedProperty<?>, com.google.common.base.Optional<?>> unlistedProperties)
 +    {
         this.field_177627_c = p_i45663_1_;
-         Arrays.sort(p_i45663_2_, new Comparator()
+         Arrays.sort(p_i45663_2_, new Comparator<IProperty>()
         {
-@@ -70,7 +80,7 @@
+@@ -53,7 +63,7 @@
+         for (List<Comparable> list1 : Cartesian.func_179321_a(this.func_177620_e()))
         {
-             List list = (List)iterator.next();
-             Map map = MapPopulator.func_179400_b(this.field_177624_d, list);
-            BlockState.StateImplementation stateimplementation = new BlockState.StateImplementation(p_i45663_1_, ImmutableMap.copyOf(map), null);
-+            BlockState.StateImplementation stateimplementation = createState(p_i45663_1_, ImmutableMap.copyOf(map), unlistedProperties);
-             linkedhashmap.put(map, stateimplementation);
-             arraylist.add(stateimplementation);
+             Map<IProperty, Comparable> map1 = MapPopulator.<IProperty, Comparable>func_179400_b(this.field_177624_d, list1);
+-            BlockState.StateImplementation blockstate$stateimplementation = new BlockState.StateImplementation(p_i45663_1_, ImmutableMap.copyOf(map1));
+            BlockState.StateImplementation blockstate$stateimplementation = createState(p_i45663_1_, ImmutableMap.copyOf(map1), unlistedProperties);
+             map.put(map1, blockstate$stateimplementation);
+             list.add(blockstate$stateimplementation);
         }
-@@ -135,6 +145,13 @@
-                 this.field_177239_a = p_i45660_1_;
-                 this.field_177237_b = p_i45660_2_;
+@@ -132,6 +142,13 @@
+                 }
             }
-+            
-+            protected StateImplementation(Block blockIn, ImmutableMap propertiesIn, ImmutableTable propertyValueTable)
+ 
+            protected StateImplementation(Block blockIn, ImmutableMap<IProperty, Comparable> propertiesIn, ImmutableTable<IProperty, Comparable, IBlockState> propertyValueTable)
 +            {
 +                this.field_177239_a = blockIn;
 +                this.field_177237_b = propertiesIn;
 +                this.field_177238_c = propertyValueTable;
 +            }
- 
-             public Collection func_177227_a()
+
+             public <T extends Comparable<T>, V extends T> IBlockState func_177226_a(IProperty<T> p_177226_1_, V p_177226_2_)
             {
-@@ -231,5 +248,10 @@
-             {
-                 this(p_i45661_1_, p_i45661_2_);
+                 if (!this.field_177237_b.containsKey(p_177226_1_))
+@@ -199,5 +216,10 @@
+                 map.put(p_177236_1_, p_177236_2_);
+                 return map;
             }
 +
 +            public ImmutableTable<IProperty, Comparable, IBlockState> getPropertyValueTable()
--- a/patches/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/state/BlockStateBase.java
 +++ ../src-work/minecraft/net/minecraft/block/state/BlockStateBase.java
-@@ -76,4 +76,9 @@
+@@ -67,4 +67,9 @@
 
         return stringbuilder.toString();
     }
--- a/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
+++ b/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
 +++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
-@@ -10,6 +10,6 @@
- 
+@@ -8,6 +8,6 @@
+ {
     public static String getClientModName()
     {
 -        return "vanilla";
--- a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch
@ -11,10 +11,10 @@
                 Tessellator tessellator = Tessellator.func_178181_a();
                 WorldRenderer worldrenderer = tessellator.func_178180_c();
                 this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k);
-@@ -177,6 +181,12 @@
+@@ -174,6 +178,12 @@
                 GlStateManager.func_179120_a(770, 771, 1, 0);
-                 this.field_73725_b.field_71466_p.func_175063_a(this.field_73726_c, (float)((l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2), (float)(i1 / 2 - 4 - 16), 16777215);
-                 this.field_73725_b.field_71466_p.func_175063_a(this.field_73727_a, (float)((l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2), (float)(i1 / 2 - 4 + 8), 16777215);
+                 this.field_73725_b.field_71466_p.func_175063_a(this.field_73726_c, (float)((k - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2), (float)(l / 2 - 4 - 16), 16777215);
+                 this.field_73725_b.field_71466_p.func_175063_a(this.field_73727_a, (float)((k - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2), (float)(l / 2 - 4 + 8), 16777215);
 +                }
 +                }
 +                catch (java.io.IOException e)
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -296,7 +296,6 @@
+@@ -301,7 +301,6 @@
         this.field_152355_az = (new YggdrasilAuthenticationService(p_i45547_1_.field_178745_a.field_178751_c, UUID.randomUUID().toString())).createMinecraftSessionService();
         this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a;
         field_147123_G.info("Setting user: " + this.field_71449_j.func_111285_a());
@ -8,7 +8,7 @@
         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;
-@@ -411,10 +410,10 @@
+@@ -415,10 +414,10 @@
         this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
         this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
         this.field_110451_am.func_110542_a(this.field_135017_as);
@ -21,7 +21,7 @@
         this.func_175595_al();
         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"));
-@@ -450,6 +449,8 @@
+@@ -453,6 +452,8 @@
             }
         });
         this.field_71417_B = new MouseHelper();
@ -30,7 +30,7 @@
         this.func_71361_d("Pre startup");
         GlStateManager.func_179098_w();
         GlStateManager.func_179103_j(7425);
-@@ -463,17 +464,21 @@
+@@ -466,17 +467,21 @@
         GlStateManager.func_179096_D();
         GlStateManager.func_179128_n(5888);
         this.func_71361_d("Startup");
@ -53,7 +53,7 @@
         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_71474_y);
-@@ -483,22 +488,25 @@
+@@ -486,22 +491,25 @@
         this.field_71458_u = new GuiAchievement(this);
         GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
@ -82,7 +82,7 @@
         if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
         {
             this.func_71352_k();
-@@ -682,21 +690,23 @@
+@@ -681,21 +689,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());
 
@ -109,7 +109,7 @@
     }
 
     public boolean func_152349_b()
-@@ -888,11 +898,6 @@
+@@ -883,11 +893,6 @@
 
     public void func_147108_a(GuiScreen p_147108_1_)
     {
@ -121,7 +121,7 @@
         if (p_147108_1_ == null && this.field_71441_e == null)
         {
             p_147108_1_ = new GuiMainMenu();
-@@ -902,6 +907,17 @@
+@@ -897,6 +902,17 @@
             p_147108_1_ = new GuiGameOver();
         }
 
@ -139,28 +139,19 @@
         if (p_147108_1_ instanceof GuiMainMenu)
         {
             this.field_71474_y.field_74330_P = false;
-@@ -1000,7 +1016,7 @@
-         {
-             while (!this.field_152351_aB.isEmpty())
-             {
-                ((FutureTask)this.field_152351_aB.poll()).run();
-+                net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_152351_aB.poll()));
-             }
-         }
- 
-@@ -1035,9 +1051,11 @@
+@@ -1030,9 +1046,11 @@
 
         if (!this.field_71454_w)
         {
 +            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
             this.field_71424_I.func_76318_c("gameRenderer");
-             this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
+             this.field_71460_t.func_181560_a(this.field_71428_T.field_74281_c, i);
             this.field_71424_I.func_76319_b();
 +            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
         }
 
         this.field_71424_I.func_76319_b();
-@@ -1383,7 +1401,7 @@
+@@ -1377,7 +1395,7 @@
 
                 if (this.field_71441_e.func_180495_p(blockpos).func_177230_c().func_149688_o() != Material.field_151579_a && this.field_71442_b.func_180512_c(blockpos, this.field_71476_x.field_178784_b))
                 {
@ -170,37 +161,37 @@
                 }
             }
@@ -1463,15 +1481,19 @@
-                 case 2:
-                     BlockPos blockpos = this.field_71476_x.func_178782_a();
+                     case BLOCK:
+                         BlockPos blockpos = this.field_71476_x.func_178782_a();
 
-                    if (this.field_71441_e.func_180495_p(blockpos).func_177230_c().func_149688_o() != Material.field_151579_a)
-+                    if (!this.field_71441_e.func_175623_d(blockpos))
-                     {
-                         int i = itemstack != null ? itemstack.field_77994_a : 0;
+-                        if (this.field_71441_e.func_180495_p(blockpos).func_177230_c().func_149688_o() != Material.field_151579_a)
+                        if (!this.field_71441_e.func_175623_d(blockpos))
+                         {
+                             int i = itemstack != null ? itemstack.field_77994_a : 0;
 
 +
-+                        boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(field_71439_g, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK, this.field_71441_e, blockpos, this.field_71476_x.field_178784_b).isCanceled();
-+                        if (result) { //Forge: Kept separate to simplify patch
-                         if (this.field_71442_b.func_178890_a(this.field_71439_g, this.field_71441_e, itemstack, blockpos, this.field_71476_x.field_178784_b, this.field_71476_x.field_72307_f))
-                         {
-                             flag = false;
-                             this.field_71439_g.func_71038_i();
-                         }
-+                        }
+                            boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(field_71439_g, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK, this.field_71441_e, blockpos, this.field_71476_x.field_178784_b).isCanceled();
+                            if (result) { //Forge: Kept separate to simplify patch
+                             if (this.field_71442_b.func_178890_a(this.field_71439_g, this.field_71441_e, itemstack, blockpos, this.field_71476_x.field_178784_b, this.field_71476_x.field_72307_f))
+                             {
+                                 flag = false;
+                                 this.field_71439_g.func_71038_i();
+                             }
+                            }
 
-                         if (itemstack == null)
-                         {
+                             if (itemstack == null)
+                             {
@@ -1494,7 +1516,8 @@
-         {
-             ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g();
- 
-            if (itemstack1 != null && this.field_71442_b.func_78769_a(this.field_71439_g, this.field_71441_e, itemstack1))
-+            boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(field_71439_g, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_AIR, field_71441_e, null, null).isCanceled();
-+            if (result && itemstack1 != null && this.field_71442_b.func_78769_a(this.field_71439_g, this.field_71441_e, itemstack1))
             {
-                 this.field_71460_t.field_78516_c.func_78445_c();
-             }
-@@ -1592,6 +1615,8 @@
+                 ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g();
+ 
+-                if (itemstack1 != null && this.field_71442_b.func_78769_a(this.field_71439_g, this.field_71441_e, itemstack1))
+                boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(field_71439_g, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_AIR, field_71441_e, null, null).isCanceled();
+                if (result && itemstack1 != null && this.field_71442_b.func_78769_a(this.field_71439_g, this.field_71441_e, itemstack1))
+                 {
+                     this.field_71460_t.field_78516_c.func_78445_c();
+                 }
+@@ -1598,6 +1621,8 @@
             --this.field_71467_ac;
         }
 
@ -215,7 +206,7 @@
             {
 +                if (net.minecraftforge.client.ForgeHooksClient.postMouseEvent()) continue;
 +
-                 i = Mouse.getEventButton();
+                 int i = Mouse.getEventButton();
                 KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
 
@@ -1745,6 +1772,7 @@
@ -226,15 +217,15 @@
             }
 
             if (this.field_71429_W > 0)
-@@ -1921,6 +1949,7 @@
+@@ -1923,6 +1951,7 @@
                         }
                     }
                 }
 +                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput();
             }
 
-             for (i = 0; i < 9; ++i)
-@@ -2121,12 +2150,15 @@
+             for (int l = 0; l < 9; ++l)
+@@ -2119,12 +2148,15 @@
             this.field_71453_ak.func_74428_b();
         }
 
@ -250,7 +241,7 @@
         this.func_71403_a((WorldClient)null);
         System.gc();
         ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2162,6 +2194,12 @@
+@@ -2160,6 +2192,12 @@
 
         while (!this.field_71437_Z.func_71200_ad())
         {
@ -260,10 +251,10 @@
 +                func_147108_a(null);
 +                return;
 +            }
-             String s2 = this.field_71437_Z.func_71195_b_();
+             String s = this.field_71437_Z.func_71195_b_();
 
-             if (s2 != null)
-@@ -2187,8 +2225,14 @@
+             if (s != null)
+@@ -2185,8 +2223,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));
@ -280,7 +271,7 @@
         this.field_71453_ak = networkmanager;
     }
 
-@@ -2199,6 +2243,8 @@
+@@ -2197,6 +2241,8 @@
 
     public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
     {
@ -289,7 +280,7 @@
         if (p_71353_1_ == null)
         {
             NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2212,6 +2258,18 @@
+@@ -2210,6 +2256,18 @@
             {
                 this.field_71437_Z.func_71263_m();
                 this.field_71437_Z.func_175592_a();
@ -308,23 +299,23 @@
             }
 
             this.field_71437_Z = null;
-@@ -2238,6 +2296,7 @@
- 
+@@ -2232,6 +2290,7 @@
+             this.field_71456_v.func_181029_i();
             this.func_71351_a((ServerData)null);
             this.field_71455_al = false;
 +            net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
         }
 
         this.field_147127_av.func_147690_c();
-@@ -2342,134 +2401,11 @@
+@@ -2336,126 +2395,10 @@
         if (this.field_71476_x != null)
         {
             boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d;
 -            int i = 0;
 -            boolean flag1 = false;
 -            TileEntity tileentity = null;
-            Object object;
- 
+-            Item item;
+-
 -            if (this.field_71476_x.field_72313_a == MovingObjectPosition.MovingObjectType.BLOCK)
 -            {
 -                BlockPos blockpos = this.field_71476_x.func_178782_a();
@ -335,9 +326,9 @@
 -                    return;
 -                }
 -
-                object = block.func_180665_b(this.field_71441_e, blockpos);
+-                item = block.func_180665_b(this.field_71441_e, blockpos);
 -
-                if (object == null)
+-                if (item == null)
 -                {
 -                    return;
 -                }
@ -347,9 +338,9 @@
 -                    tileentity = this.field_71441_e.func_175625_s(blockpos);
 -                }
 -
-                Block block1 = object instanceof ItemBlock && !block.func_149648_K() ? Block.func_149634_a((Item)object) : block;
+-                Block block1 = item instanceof ItemBlock && !block.func_149648_K() ? Block.func_149634_a(item) : block;
 -                i = block1.func_176222_j(this.field_71441_e, blockpos);
-                flag1 = ((Item)object).func_77614_k();
+-                flag1 = item.func_77614_k();
 -            }
 -            else
 -            {
@ -360,11 +351,11 @@
 -
 -                if (this.field_71476_x.field_72308_g instanceof EntityPainting)
 -                {
-                    object = Items.field_151159_an;
+-                    item = Items.field_151159_an;
 -                }
 -                else if (this.field_71476_x.field_72308_g instanceof EntityLeashKnot)
 -                {
-                    object = Items.field_151058_ca;
+-                    item = Items.field_151058_ca;
 -                }
 -                else if (this.field_71476_x.field_72308_g instanceof EntityItemFrame)
 -                {
@ -373,11 +364,11 @@
 -
 -                    if (itemstack == null)
 -                    {
-                        object = Items.field_151160_bD;
+-                        item = Items.field_151160_bD;
 -                    }
 -                    else
 -                    {
-                        object = itemstack.func_77973_b();
+-                        item = itemstack.func_77973_b();
 -                        i = itemstack.func_77960_j();
 -                        flag1 = true;
 -                    }
@ -386,38 +377,38 @@
 -                {
 -                    EntityMinecart entityminecart = (EntityMinecart)this.field_71476_x.field_72308_g;
 -
-                    switch (Minecraft.SwitchEnumMinecartType.field_178901_b[entityminecart.func_180456_s().ordinal()])
+-                    switch (entityminecart.func_180456_s())
 -                    {
-                        case 1:
-                            object = Items.field_151109_aJ;
+-                        case FURNACE:
+-                            item = Items.field_151109_aJ;
 -                            break;
-                        case 2:
-                            object = Items.field_151108_aI;
+-                        case CHEST:
+-                            item = Items.field_151108_aI;
 -                            break;
-                        case 3:
-                            object = Items.field_151142_bV;
+-                        case TNT:
+-                            item = Items.field_151142_bV;
 -                            break;
-                        case 4:
-                            object = Items.field_151140_bW;
+-                        case HOPPER:
+-                            item = Items.field_151140_bW;
 -                            break;
-                        case 5:
-                            object = Items.field_151095_cc;
+-                        case COMMAND_BLOCK:
+-                            item = Items.field_151095_cc;
 -                            break;
 -                        default:
-                            object = Items.field_151143_au;
+-                            item = Items.field_151143_au;
 -                    }
 -                }
 -                else if (this.field_71476_x.field_72308_g instanceof EntityBoat)
 -                {
-                    object = Items.field_151124_az;
+-                    item = Items.field_151124_az;
 -                }
 -                else if (this.field_71476_x.field_72308_g instanceof EntityArmorStand)
 -                {
-                    object = Items.field_179565_cj;
+-                    item = Items.field_179565_cj;
 -                }
 -                else
 -                {
-                    object = Items.field_151063_bx;
+-                    item = Items.field_151063_bx;
 -                    i = EntityList.func_75619_a(this.field_71476_x.field_72308_g);
 -                    flag1 = true;
 -
@ -432,19 +423,11 @@
 
 -            if (tileentity == null)
 -            {
-                inventoryplayer.func_146030_a((Item)object, i, flag1, flag);
+-                inventoryplayer.func_146030_a(item, i, flag1, flag);
 -            }
 -            else
 -            {
-                NBTTagCompound nbttagcompound1 = new NBTTagCompound();
-                tileentity.func_145841_b(nbttagcompound1);
-                ItemStack itemstack1 = new ItemStack((Item)object, 1, i);
-                itemstack1.func_77983_a("BlockEntityTag", nbttagcompound1);
-                NBTTagCompound nbttagcompound = new NBTTagCompound();
-                NBTTagList nbttaglist = new NBTTagList();
-                nbttaglist.func_74742_a(new NBTTagString("(+NBT)"));
-                nbttagcompound.func_74782_a("Lore", nbttaglist);
-                itemstack1.func_77983_a("display", nbttagcompound);
+-                ItemStack itemstack1 = this.func_181036_a(item, i, tileentity);
 -                inventoryplayer.func_70299_a(inventoryplayer.field_70461_c, itemstack1);
 -            }
 -
@ -453,13 +436,13 @@
             if (flag)
             {
                 int j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + inventoryplayer.field_70461_c;
-@@ -2727,18 +2663,8 @@
+@@ -2756,18 +2699,8 @@
 
     public static int func_71369_N()
     {
 -        for (int i = 16384; i > 0; i >>= 1)
 -        {
-            GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
+-            GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)((ByteBuffer)null));
 -            int j = GL11.glGetTexLevelParameteri(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH);
 -
 -            if (j != 0)
@ -474,3 +457,15 @@
     }
 
     public boolean func_70002_Q()
+@@ -2924,9 +2857,9 @@
+                         {
+                             this.func_147108_a(new GuiYesNo(new GuiYesNoCallback()
+                             {
+-                                public void func_73878_a(boolean p_73878_1_, int p_73878_2_)
+                                public void func_73878_a(boolean result, int id)
+                                 {
+-                                    if (p_73878_1_)
+                                    if (result)
+                                     {
+                                         Minecraft.this.func_152346_Z().func_152930_t();
+                                     }
--- a/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
@ -1,52 +1,41 @@
 --- ../src-base/minecraft/net/minecraft/client/audio/SoundManager.java
 +++ ../src-work/minecraft/net/minecraft/client/audio/SoundManager.java
-@@ -36,6 +36,10 @@
- import paulscode.sound.codecs.CodecJOrbis;
- import paulscode.sound.libraries.LibraryLWJGLOpenAL;
- 
-+import net.minecraftforge.client.ForgeHooksClient;
-+import net.minecraftforge.client.event.sound.*;
-+import net.minecraftforge.common.MinecraftForge;
-+
- @SideOnly(Side.CLIENT)
- public class SoundManager
- {
-@@ -70,6 +74,7 @@
+@@ -69,6 +69,7 @@
         {
             SoundSystemConfig.addLibrary(LibraryLWJGLOpenAL.class);
             SoundSystemConfig.setCodec("ogg", CodecJOrbis.class);
-+            MinecraftForge.EVENT_BUS.post(new SoundSetupEvent(this));
+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.SoundSetupEvent(this));
         }
         catch (SoundSystemException soundsystemexception)
         {
-@@ -81,6 +86,7 @@
+@@ -80,6 +81,7 @@
     {
         this.func_148613_b();
         this.func_148608_i();
-+        MinecraftForge.EVENT_BUS.post(new SoundLoadEvent(this));
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.SoundLoadEvent(this));
     }
 
     private synchronized void func_148608_i()
-@@ -329,6 +335,9 @@
+@@ -316,6 +318,9 @@
             }
             else
             {
-+                p_148611_1_ = ForgeHooksClient.playSound(this, p_148611_1_);
+                p_148611_1_ = net.minecraftforge.client.ForgeHooksClient.playSound(this, p_148611_1_);
 +                if (p_148611_1_ == null) return;
 +
                 SoundEventAccessorComposite soundeventaccessorcomposite = this.field_148622_c.func_147680_a(p_148611_1_.func_147650_b());
 
                 if (soundeventaccessorcomposite == null)
-@@ -370,10 +379,12 @@
+@@ -357,10 +362,12 @@
                             if (soundpoolentry.func_148648_d())
                             {
                                 this.field_148620_e.newStreamingSource(false, s, func_148612_a(resourcelocation), resourcelocation.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(), f1);
-+                                MinecraftForge.EVENT_BUS.post(new PlayStreamingSourceEvent(this, p_148611_1_, s));
+                                net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.PlayStreamingSourceEvent(this, p_148611_1_, s));
                             }
                             else
                             {
                                 this.field_148620_e.newSource(false, s, func_148612_a(resourcelocation), resourcelocation.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(), f1);
-+                                MinecraftForge.EVENT_BUS.post(new PlaySoundSourceEvent(this, p_148611_1_, s));
+                                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[] {soundpoolentry.func_148652_a(), soundeventaccessorcomposite.func_148729_c(), s});
--- a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
 +++ ../src-work/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
-@@ -129,6 +129,6 @@
+@@ -128,6 +128,6 @@
             f *= 1.0F - f1 * 0.15F;
         }
 
--- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
@ -1,16 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
 +++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
-@@ -53,6 +53,9 @@
- import net.minecraft.world.World;
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
-+import net.minecraftforge.client.ForgeHooksClient;
-+import net.minecraftforge.common.MinecraftForge;
-+import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
- 
- @SideOnly(Side.CLIENT)
- public class EntityPlayerSP extends AbstractClientPlayer
-@@ -342,6 +345,15 @@
+@@ -345,6 +345,15 @@
         this.field_71159_c.field_71456_v.func_146158_b().func_146227_a(p_146105_1_);
     }
 
@ -26,9 +16,9 @@
     protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
     {
         if (this.field_70145_X)
-@@ -354,30 +366,34 @@
-             double d3 = p_145771_1_ - (double)blockpos.func_177958_n();
-             double d4 = p_145771_5_ - (double)blockpos.func_177952_p();
+@@ -357,30 +366,34 @@
+             double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
+             double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
 
 -            if (!this.func_175162_d(blockpos))
 +            int entHeight = Math.max(Math.round(this.field_70131_O), 1);
@ -37,44 +27,45 @@
 +
 +            if (inTranslucentBlock)
             {
-                 byte b0 = -1;
-                 double d5 = 9999.0D;
+                 int i = -1;
+                 double d2 = 9999.0D;
 
-                if (this.func_175162_d(blockpos.func_177976_e()) && d3 < d5)
-+                if (!this.isHeadspaceFree(blockpos.func_177976_e(), entHeight) && d3 < d5)
+-                if (this.func_175162_d(blockpos.func_177976_e()) && d0 < d2)
+                if (!this.isHeadspaceFree(blockpos.func_177976_e(), entHeight) && d0 < d2)
                 {
-                     d5 = d3;
-                     b0 = 0;
+                     d2 = d0;
+                     i = 0;
                 }
 
-                if (this.func_175162_d(blockpos.func_177974_f()) && 1.0D - d3 < d5)
-+                if (!this.isHeadspaceFree(blockpos.func_177974_f(), entHeight) && 1.0D - d3 < d5)
+-                if (this.func_175162_d(blockpos.func_177974_f()) && 1.0D - d0 < d2)
+                if (!this.isHeadspaceFree(blockpos.func_177974_f(), entHeight) && 1.0D - d0 < d2)
                 {
-                     d5 = 1.0D - d3;
-                     b0 = 1;
+                     d2 = 1.0D - d0;
+                     i = 1;
                 }
 
-                if (this.func_175162_d(blockpos.func_177978_c()) && d4 < d5)
-+                if (!this.isHeadspaceFree(blockpos.func_177978_c(), entHeight) && d4 < d5)
+-                if (this.func_175162_d(blockpos.func_177978_c()) && d1 < d2)
+                if (!this.isHeadspaceFree(blockpos.func_177978_c(), entHeight) && d1 < d2)
                 {
-                     d5 = d4;
-                     b0 = 4;
+                     d2 = d1;
+                     i = 4;
                 }
 
-                if (this.func_175162_d(blockpos.func_177968_d()) && 1.0D - d4 < d5)
-+                if (!this.isHeadspaceFree(blockpos.func_177968_d(), entHeight) && 1.0D - d4 < d5)
+-                if (this.func_175162_d(blockpos.func_177968_d()) && 1.0D - d1 < d2)
+                if (!this.isHeadspaceFree(blockpos.func_177968_d(), entHeight) && 1.0D - d1 < d2)
                 {
-                     d5 = 1.0D - d4;
-                     b0 = 5;
-@@ -445,6 +461,11 @@
+                     d2 = 1.0D - d1;
+                     i = 5;
+@@ -448,6 +461,12 @@
 
     public void func_85030_a(String p_85030_1_, float p_85030_2_, float p_85030_3_)
     {
-+        PlaySoundAtEntityEvent event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtEntity(this, p_85030_1_, p_85030_2_, p_85030_3_);
+        net.minecraftforge.event.entity.PlaySoundAtEntityEvent event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtEntity(this, p_85030_1_, p_85030_2_, p_85030_3_);
 +        if (event.isCanceled() || event.name == null) return;
 +        p_85030_1_ = event.name;
 +        p_85030_2_ = event.newVolume;
 +        p_85030_3_ = event.newPitch;
+
         this.field_70170_p.func_72980_b(this.field_70165_t, this.field_70163_u, this.field_70161_v, p_85030_1_, p_85030_2_, p_85030_3_, false);
     }
 
--- a/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
@ -26,7 +26,7 @@
         }
         catch (IOException ioexception)
         {
-@@ -172,7 +173,7 @@
+@@ -165,7 +166,7 @@
 
         try
         {
@ -35,16 +35,16 @@
             inputstream.read(this.field_78287_e);
         }
         catch (IOException ioexception)
-@@ -195,7 +196,7 @@
-         float f = (float)(p_78266_1_ % 16 * 8);
-         float f1 = (float)(p_78266_1_ / 16 * 8);
-         float f2 = p_78266_2_ ? 1.0F : 0.0F;
+@@ -196,7 +197,7 @@
+         int i = p_78266_1_ % 16 * 8;
+         int j = p_78266_1_ / 16 * 8;
+         int k = p_78266_2_ ? 1 : 0;
 -        this.field_78298_i.func_110577_a(this.field_111273_g);
 +        bindTexture(this.field_111273_g);
-         float f3 = (float)this.field_78286_d[p_78266_1_] - 0.01F;
+         int l = this.field_78286_d[p_78266_1_];
+         float f = (float)l - 0.01F;
         GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
-         GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F);
-@@ -222,7 +223,7 @@
+@@ -224,7 +225,7 @@
 
     private void func_78257_a(int p_78257_1_)
     {
@ -53,23 +53,23 @@
     }
 
     protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
-@@ -269,7 +270,7 @@
+@@ -271,7 +272,7 @@
 
     public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
     {
 -        GlStateManager.func_179141_d();
 +        enableAlpha();
         this.func_78265_b();
-         int j;
+         int i;
 
@@ -341,7 +342,7 @@
 
-                     k = this.field_78285_g[j];
-                     this.field_78304_r = k;
-                    GlStateManager.func_179131_c((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
-+                    setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
+                     int j1 = this.field_78285_g[i1];
+                     this.field_78304_r = j1;
+-                    GlStateManager.func_179131_c((float)(j1 >> 16) / 255.0F, (float)(j1 >> 8 & 255) / 255.0F, (float)(j1 & 255) / 255.0F, this.field_78305_q);
+                    setColor((float)(j1 >> 16) / 255.0F, (float)(j1 >> 8 & 255) / 255.0F, (float)(j1 & 255) / 255.0F, this.field_78305_q);
                 }
-                 else if (j == 16)
+                 else if (i1 == 16)
                 {
@@ -370,7 +371,7 @@
                     this.field_78299_w = false;
@ -80,32 +80,33 @@
                 }
 
                 ++i;
-@@ -390,7 +391,7 @@
-                     j = k;
+@@ -398,7 +399,7 @@
+                     c0 = c1;
                 }
 
 -                float f1 = this.field_78293_l ? 0.5F : 1.0F;
 +                float f1 = j == -1 || this.field_78293_l ? 0.5f : 1f;
-                 boolean flag1 = (c0 == 0 || j == -1 || this.field_78293_l) && p_78255_2_;
+                 boolean flag = (c0 == 0 || j == -1 || this.field_78293_l) && p_78255_2_;
+ 
+                 if (flag)
+@@ -436,7 +437,16 @@
 
-                 if (flag1)
-@@ -429,6 +430,15 @@
                     ++f;
                 }
- 
 +                doDraw(f);
 +            }
 +        }
 +    }
-+
+ 
 +    protected void doDraw(float f)
 +    {
 +        {
 +            {
-                 Tessellator tessellator;
-                 WorldRenderer worldrenderer;
- 
-@@ -504,7 +514,7 @@
+
+                 if (this.field_78299_w)
+                 {
+                     Tessellator tessellator = Tessellator.func_178181_a();
+@@ -509,7 +519,7 @@
             this.field_78292_o = (float)(p_180455_4_ >> 8 & 255) / 255.0F;
             this.field_78306_p = (float)(p_180455_4_ & 255) / 255.0F;
             this.field_78305_q = (float)(p_180455_4_ >> 24 & 255) / 255.0F;
@ -114,7 +115,7 @@
             this.field_78295_j = p_180455_2_;
             this.field_78296_k = p_180455_3_;
             this.func_78255_a(p_180455_1_, p_180455_5_);
-@@ -583,12 +593,6 @@
+@@ -588,11 +598,6 @@
                 int j = this.field_78287_e[p_78263_1_] >>> 4;
                 int k = this.field_78287_e[p_78263_1_] & 15;
 
@ -123,11 +124,10 @@
 -                    k = 15;
 -                    j = 0;
 -                }
-
+ 
                 ++k;
                 return (k - j) / 2 + 1;
-             }
-@@ -842,6 +846,26 @@
+@@ -846,6 +851,26 @@
         return this.field_78294_m;
     }
 
--- a/patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch
@ -1,24 +1,22 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiButton.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiButton.java
-@@ -22,6 +22,7 @@
+@@ -21,6 +21,7 @@
+     public boolean field_146124_l;
     public boolean field_146125_m;
     protected boolean field_146123_n;
-     private static final String __OBFID = "CL_00000668";
 +    public int packedFGColour; //FML
 
     public GuiButton(int p_i1020_1_, int p_i1020_2_, int p_i1020_3_, String p_i1020_4_)
     {
-@@ -75,8 +76,12 @@
+@@ -74,6 +75,11 @@
             this.func_146119_b(p_146112_1_, p_146112_2_, p_146112_3_);
-             int l = 14737632;
+             int j = 14737632;
 
-            if (!this.field_146124_l)
 +            if (packedFGColour != 0)
-             {
-+                l = packedFGColour;
-+            }
-+            else if (!this.field_146124_l)
 +            {
-                 l = 10526880;
-             }
-             else if (this.field_146123_n)
+                j = packedFGColour;
+            }
+            else
+             if (!this.field_146124_l)
+             {
+                 j = 10526880;
--- a/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiChat.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiChat.java
-@@ -217,13 +217,14 @@
+@@ -215,13 +215,14 @@
             this.field_146297_k.field_71456_v.func_146158_b().func_146234_a(new ChatComponentText(stringbuilder.toString()), 1);
         }
 
@ -16,17 +16,24 @@
             BlockPos blockpos = null;
 
             if (this.field_146297_k.field_71476_x != null && this.field_146297_k.field_71476_x.field_72313_a == MovingObjectPosition.MovingObjectType.BLOCK)
-@@ -285,6 +286,13 @@
-             String[] astring1 = p_146406_1_;
-             int i = p_146406_1_.length;
+@@ -281,6 +282,12 @@
+             this.field_146417_i = false;
+             this.field_146412_t.clear();
 
 +            String[] complete = net.minecraftforge.client.ClientCommandHandler.instance.latestAutoComplete;
 +            if (complete != null)
 +            {
-+                astring1 = com.google.common.collect.ObjectArrays.concat(complete, astring1, String.class);
-+                i = astring1.length;
+                p_146406_1_ = com.google.common.collect.ObjectArrays.concat(complete, p_146406_1_, String.class);
 +            }
 +
-             for (int j = 0; j < i; ++j)
+             for (String s : p_146406_1_)
+             {
+                 if (s.length() > 0)
+@@ -291,6 +298,7 @@
+ 
+             String s1 = this.field_146415_a.func_146179_b().substring(this.field_146415_a.func_146197_a(-1, this.field_146415_a.func_146198_h(), false));
+             String s2 = StringUtils.getCommonPrefix(p_146406_1_);
+            s2 = net.minecraft.util.EnumChatFormatting.func_110646_a(s2);
+ 
+             if (s2.length() > 0 && !s1.equalsIgnoreCase(s2))
             {
-                 String s = astring1[j];
--- a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java.patch
@ -1,11 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java
-@@ -26,6 +26,8 @@
- 
-     public void func_73866_w_()
-     {
-+        super.func_73866_w_();// Call super to add line #2
-+        this.field_146292_n.clear();
-         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 50 - 105, this.field_146295_m / 6 + 96, 100, 20, this.field_146352_g));
-         this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 50, this.field_146295_m / 6 + 96, 100, 20, this.field_146362_s));
-         this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 50 + 105, this.field_146295_m / 6 + 96, 100, 20, this.field_146356_h));
--- a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-@@ -213,6 +213,8 @@
+@@ -205,6 +205,8 @@
                     }
                 }
 
 +                WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress();
 +
-                 WorldSettings.GameType gametype = WorldSettings.GameType.func_77142_a(this.field_146342_r);
-                 WorldSettings worldsettings = new WorldSettings(i, gametype, this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
+                 WorldSettings.GameType worldsettings$gametype = WorldSettings.GameType.func_77142_a(this.field_146342_r);
+                 WorldSettings worldsettings = new WorldSettings(i, worldsettings$gametype, this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
                 worldsettings.func_82750_a(this.field_146334_a);
-@@ -320,14 +322,7 @@
+@@ -312,14 +314,7 @@
             }
             else if (p_146284_1_.field_146127_k == 8)
             {
@ -25,7 +25,7 @@
             }
         }
     }
-@@ -379,7 +374,7 @@
+@@ -371,7 +366,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;
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
@ -2,16 +2,16 @@
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
@@ -30,8 +30,9 @@
 
-         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + b0, 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 + b0, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
-+        this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("fml.menu.modoptions")));
+         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + i, 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 + i, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
+        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.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-+        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + b0, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + b0, 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 + b0, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
+-        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
+        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + i, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
+         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + i, 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 + i, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
         guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c();
-@@ -58,13 +59,19 @@
+@@ -74,13 +75,19 @@
                 this.field_146297_k.func_71381_h();
                 break;
             case 5:
--- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-@@ -198,6 +198,11 @@
+@@ -197,6 +197,11 @@
         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_146292_n.add(this.field_175372_K = 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])));
@ -12,7 +12,7 @@
     }
 
     private void func_73972_b(int p_73972_1_, int p_73972_2_)
-@@ -245,6 +250,11 @@
+@@ -244,6 +249,11 @@
             this.field_146297_k.func_71400_g();
         }
 
@ -24,18 +24,18 @@
         if (p_146284_1_.field_146127_k == 11)
         {
             this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
-@@ -492,7 +502,16 @@
+@@ -489,7 +499,16 @@
             s = s + " Demo";
         }
 
 -        this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
 +        java.util.List<String> brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true));
-+        for (int i = 0; i < brandings.size(); i++)
+        for (int brdline = 0; brdline < brandings.size(); brdline++)
 +        {
-+            String brd = brandings.get(i);
+            String brd = brandings.get(brdline);
 +            if (!com.google.common.base.Strings.isNullOrEmpty(brd))
 +            {
-+                this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + i * (this.field_146289_q.field_78288_b + 1)), 16777215);
+                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);
 +            }
 +        }
 +        net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, this.field_146289_q, this.field_146294_l, this.field_146295_m);
--- a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
-@@ -41,6 +41,7 @@
+@@ -40,6 +40,7 @@
     public GuiMultiplayer(GuiScreen p_i1040_1_)
     {
         this.field_146798_g = p_i1040_1_;
@ -8,7 +8,7 @@
     }
 
     public void func_73866_w_()
-@@ -373,7 +374,7 @@
+@@ -372,7 +373,7 @@
 
     private void func_146791_a(ServerData p_146791_1_)
     {
--- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
@ -1,12 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
-@@ -170,6 +170,9 @@
+@@ -176,6 +176,9 @@
         long l = j - k;
-         ArrayList arraylist = 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("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)});
+         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()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)});
 
-+        arraylist.add("");
-+        arraylist.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));
+        list.add("");
+        list.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));
 +
         if (this.func_175236_d())
         {
-             return arraylist;
+             return list;
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
@ -1,16 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
-@@ -37,6 +37,9 @@
- import net.minecraft.util.ChatComponentTranslation;
- import net.minecraft.util.EnumChatFormatting;
- import net.minecraft.util.IChatComponent;
-+import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
-+import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
-+import net.minecraftforge.common.MinecraftForge;
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
- import org.apache.commons.lang3.StringUtils;
-@@ -146,7 +149,8 @@
+@@ -143,7 +143,8 @@
             }
         }
 
@ -20,94 +10,90 @@
     }
 
     protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_)
-@@ -156,6 +160,11 @@
+@@ -153,6 +154,11 @@
 
-     protected void func_146283_a(List p_146283_1_, int p_146283_2_, int p_146283_3_)
+     protected void func_146283_a(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_)
     {
-+        drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);
+        drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);   
 +    }
 +
-+    protected void drawHoveringText(List p_146283_1_, int p_146283_2_, int p_146283_3_, FontRenderer font)
+    protected void drawHoveringText(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_, FontRenderer font)
 +    {
         if (!p_146283_1_.isEmpty())
         {
             GlStateManager.func_179101_C();
-@@ -168,7 +177,7 @@
-             while (iterator.hasNext())
-             {
-                 String s = (String)iterator.next();
-                int l = this.field_146289_q.func_78256_a(s);
-+                int l = font.func_78256_a(s);
+@@ -163,7 +169,7 @@
 
-                 if (l > k)
-                 {
-@@ -213,7 +222,7 @@
-             for (int i2 = 0; i2 < p_146283_1_.size(); ++i2)
+             for (String s : p_146283_1_)
             {
-                 String s1 = (String)p_146283_1_.get(i2);
-                this.field_146289_q.func_175063_a(s1, (float)j2, (float)k2, -1);
-+                font.func_175063_a(s1, j2, k2, -1);
+-                int j = this.field_146289_q.func_78256_a(s);
+                int j = font.func_78256_a(s);
 
-                 if (i2 == 0)
+                 if (j > i)
                 {
-@@ -441,6 +450,7 @@
+@@ -208,7 +214,7 @@
+             for (int k1 = 0; k1 < p_146283_1_.size(); ++k1)
+             {
+                 String s1 = (String)p_146283_1_.get(k1);
+-                this.field_146289_q.func_175063_a(s1, (float)l1, (float)i2, -1);
+                font.func_175063_a(s1, (float)l1, (float)i2, -1);
+ 
+                 if (k1 == 0)
+                 {
+@@ -436,6 +442,7 @@
+         {
             this.field_146297_k.field_71456_v.func_146158_b().func_146239_a(p_175281_1_);
         }
- 
 +        if (net.minecraftforge.client.ClientCommandHandler.instance.func_71556_a(field_146297_k.field_71439_g, p_175281_1_) != 0) return;
+ 
         this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_);
     }
- 
-@@ -454,9 +464,14 @@
+@@ -450,9 +457,15 @@
 
                 if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_))
                 {
-                    this.field_146290_a = guibutton;
-                    guibutton.func_146113_a(this.field_146297_k.func_147118_V());
-                    this.func_146284_a(guibutton);
-+                    ActionPerformedEvent.Pre event = new ActionPerformedEvent.Pre(this, guibutton, this.field_146292_n);
-+                    if (MinecraftForge.EVENT_BUS.post(event))
+                    net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent.Pre event = new net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent.Pre(this, guibutton, this.field_146292_n);
+                    if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event))
 +                        break;
-+                    this.field_146290_a = event.button;
-+                    event.button.func_146113_a(this.field_146297_k.func_147118_V());
-+                    this.func_146284_a(event.button);
+                    guibutton = event.button;
+                     this.field_146290_a = guibutton;
+                     guibutton.func_146113_a(this.field_146297_k.func_147118_V());
+                     this.func_146284_a(guibutton);
 +                    if (this.equals(this.field_146297_k.field_71462_r))
-+                        MinecraftForge.EVENT_BUS.post(new ActionPerformedEvent.Post(this, event.button, this.field_146292_n));
+                        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent.Post(this, event.button, this.field_146292_n));
                 }
             }
         }
-@@ -482,8 +497,12 @@
+@@ -482,8 +495,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_;
-        this.field_146292_n.clear();
-        this.func_73866_w_();
-+        if (!MinecraftForge.EVENT_BUS.post(new InitGuiEvent.Pre(this, this.field_146292_n)))
+        if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Pre(this, this.field_146292_n)))
 +        {
-+            this.field_146292_n.clear();
-+            this.func_73866_w_();
+         this.field_146292_n.clear();
+         this.func_73866_w_();
 +        }
-+        MinecraftForge.EVENT_BUS.post(new InitGuiEvent.Post(this, this.field_146292_n));
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Post(this, this.field_146292_n));
     }
 
-     public void func_73866_w_() {}
-@@ -494,7 +513,9 @@
+     public void func_73866_w_()
+@@ -496,7 +513,9 @@
         {
             while (Mouse.next())
             {
-+                if (MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Pre(this))) continue;
+                if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Pre(this))) continue;
                 this.func_146274_d();
-+                if (this.equals(this.field_146297_k.field_71462_r)) MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Post(this));
+                if (this.equals(this.field_146297_k.field_71462_r)) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Post(this));
             }
         }
 
-@@ -502,7 +523,9 @@
+@@ -504,7 +523,9 @@
         {
             while (Keyboard.next())
             {
-+                if (MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Pre(this))) continue;
+                if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Pre(this))) continue;
                 this.func_146282_l();
-+                if (this.equals(this.field_146297_k.field_71462_r)) MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Post(this));
+                if (this.equals(this.field_146297_k.field_71462_r)) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Post(this));
             }
         }
     }
--- a/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
-@@ -187,7 +187,7 @@
+@@ -186,7 +186,7 @@
 
             if (this.field_146297_k.func_71359_d().func_90033_f(s))
             {
--- a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiSleepMP.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiSleepMP.java
-@@ -34,7 +34,7 @@
+@@ -32,7 +32,7 @@
 
             if (!s.isEmpty())
             {
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
@ -1,24 +1,24 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiSlot.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiSlot.java
-@@ -185,16 +185,7 @@
+@@ -181,15 +181,8 @@
             GlStateManager.func_179106_n();
             Tessellator tessellator = Tessellator.func_178181_a();
             WorldRenderer worldrenderer = 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 f1 = 32.0F;
-            worldrenderer.func_178970_b();
-            worldrenderer.func_178991_c(2105376);
-            worldrenderer.func_178985_a((double)this.field_148152_e, (double)this.field_148154_c, 0.0D, (double)((float)this.field_148152_e / f1), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f1));
-            worldrenderer.func_178985_a((double)this.field_148151_d, (double)this.field_148154_c, 0.0D, (double)((float)this.field_148151_d / f1), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f1));
-            worldrenderer.func_178985_a((double)this.field_148151_d, (double)this.field_148153_b, 0.0D, (double)((float)this.field_148151_d / f1), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f1));
-            worldrenderer.func_178985_a((double)this.field_148152_e, (double)this.field_148153_b, 0.0D, (double)((float)this.field_148152_e / f1), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f1));
+-            float f = 32.0F;
+-            worldrenderer.func_181668_a(7, DefaultVertexFormats.field_181709_i);
+-            worldrenderer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_181673_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            worldrenderer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_181673_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            worldrenderer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_181673_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            worldrenderer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_181673_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
 -            tessellator.func_78381_a();
+            // Forge: background rendering moved into separate method.
 +            this.drawContainerBackground(tessellator);
-             int i1 = this.field_148152_e + this.field_148155_a / 2 - this.func_148139_c() / 2 + 2;
-             int j1 = this.field_148153_b + 4 - (int)this.field_148169_q;
+             int k = this.field_148152_e + this.field_148155_a / 2 - this.func_148139_c() / 2 + 2;
+             int l = this.field_148153_b + 4 - (int)this.field_148169_q;
 
-@@ -456,4 +447,19 @@
+@@ -458,4 +451,18 @@
     {
         return this.field_148149_f;
     }
@ -28,13 +28,12 @@
 +        WorldRenderer worldrenderer = 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 f1 = 32.0F;
-+        worldrenderer.func_178970_b();
-+        worldrenderer.func_178991_c(2105376);
-+        worldrenderer.func_178985_a((double)this.field_148152_e, (double)this.field_148154_c, 0.0D, (double)((float)this.field_148152_e / f1), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f1));
-+        worldrenderer.func_178985_a((double)this.field_148151_d, (double)this.field_148154_c, 0.0D, (double)((float)this.field_148151_d / f1), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f1));
-+        worldrenderer.func_178985_a((double)this.field_148151_d, (double)this.field_148153_b, 0.0D, (double)((float)this.field_148151_d / f1), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f1));
-+        worldrenderer.func_178985_a((double)this.field_148152_e, (double)this.field_148153_b, 0.0D, (double)((float)this.field_148152_e / f1), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f1));
+        float f = 32.0F;
+        worldrenderer.func_181668_a(7, DefaultVertexFormats.field_181709_i);
+        worldrenderer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_181673_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+        worldrenderer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_181673_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+        worldrenderer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_181673_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+        worldrenderer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_181673_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
 +        tessellator.func_78381_a();
 +    }
 }
--- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
+++ b/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
-@@ -84,7 +84,7 @@
-         boolean flag2 = this.field_148301_e.field_82821_f < 47;
-         boolean flag3 = flag1 || flag2;
+@@ -82,7 +82,7 @@
+         boolean flag1 = this.field_148301_e.field_82821_f < 47;
+         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 list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
-+        List 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);
+-        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);
 
-         for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1)
+         for (int i = 0; i < Math.min(list.size(), 2); ++i)
         {
-@@ -178,6 +178,11 @@
-         int k2 = p_180790_6_ - p_180790_2_;
-         int l2 = p_180790_7_ - p_180790_3_;
+@@ -176,6 +176,11 @@
+         int i1 = p_180790_6_ - p_180790_2_;
+         int j1 = p_180790_7_ - p_180790_3_;
 
-+        String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2);
+        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);
 +        if (tooltip != null)
 +        {
 +            this.field_148303_c.func_146793_a(tooltip);
 +        } else
-         if (k2 >= p_180790_4_ - 15 && k2 <= p_180790_4_ - 5 && l2 >= 0 && l2 <= 8)
+         if (i1 >= p_180790_4_ - 15 && i1 <= p_180790_4_ - 5 && j1 >= 0 && j1 <= 8)
         {
             this.field_148303_c.func_146793_a(s1);
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
@ -1,50 +1,40 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
-@@ -24,6 +24,9 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
- import org.lwjgl.input.Mouse;
-+import java.util.LinkedList;
-+import java.util.List;
-+import net.minecraftforge.common.AchievementPage;
- 
- @SideOnly(Side.CLIENT)
- public class GuiAchievements extends GuiScreen implements IProgressMeter
-@@ -50,6 +53,10 @@
+@@ -49,6 +49,10 @@
+     private StatFileWriter field_146556_E;
     private boolean field_146558_F = true;
-     private static final String __OBFID = "CL_00000722";
 
 +    private int currentPage = -1;
 +    private GuiButton button;
-+    private LinkedList<Achievement> minecraftAchievements = new LinkedList<Achievement>();
+    private java.util.LinkedList<Achievement> minecraftAchievements = new java.util.LinkedList<Achievement>();
 +
     public GuiAchievements(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_)
     {
         this.field_146562_a = p_i45026_1_;
-@@ -58,6 +65,14 @@
-         short short2 = 141;
-         this.field_146569_s = this.field_146567_u = this.field_146565_w = (double)(AchievementList.field_76004_f.field_75993_a * 24 - short1 / 2 - 12);
-         this.field_146568_t = this.field_146566_v = this.field_146573_x = (double)(AchievementList.field_76004_f.field_75991_b * 24 - short2 / 2);
+@@ -57,6 +61,14 @@
+         int j = 141;
+         this.field_146569_s = this.field_146567_u = this.field_146565_w = (double)(AchievementList.field_76004_f.field_75993_a * 24 - i / 2 - 12);
+         this.field_146568_t = this.field_146566_v = this.field_146573_x = (double)(AchievementList.field_76004_f.field_75991_b * 24 - j / 2);
 +        minecraftAchievements.clear();
-+        for (Object achievement : AchievementList.field_76007_e)
+        for (Achievement achievement : AchievementList.field_76007_e)
 +        {
-+            if (!AchievementPage.isAchievementInPages((Achievement)achievement))
+            if (!net.minecraftforge.common.AchievementPage.isAchievementInPages(achievement))
 +            {
-+                minecraftAchievements.add((Achievement)achievement);
+                minecraftAchievements.add(achievement);
 +            }
 +        }
     }
 
     public void func_73866_w_()
-@@ -65,6 +80,7 @@
+@@ -64,6 +76,7 @@
         this.field_146297_k.func_147114_u().func_147297_a(new C16PacketClientStatus(C16PacketClientStatus.EnumState.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, AchievementPage.getTitle(currentPage)));
+        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
-@@ -75,6 +91,16 @@
+@@ -74,6 +87,16 @@
             {
                 this.field_146297_k.func_147108_a(this.field_146562_a);
             }
@ -52,19 +42,19 @@
 +            if (p_146284_1_.field_146127_k == 2)
 +            {
 +                currentPage++;
-+                if (currentPage >= AchievementPage.getAchievementPages().size())
+                if (currentPage >= net.minecraftforge.common.AchievementPage.getAchievementPages().size())
 +                {
 +                    currentPage = -1;
 +                }
-+                this.button.field_146126_j = AchievementPage.getTitle(currentPage);
+                this.button.field_146126_j = net.minecraftforge.common.AchievementPage.getTitle(currentPage);
 +            }
         }
     }
 
-@@ -260,7 +286,9 @@
+@@ -257,7 +280,9 @@
         GlStateManager.func_179143_c(518);
         GlStateManager.func_179094_E();
-         GlStateManager.func_179109_b((float)k1, (float)l1, -200.0F);
+         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
@ -72,56 +62,56 @@
         GlStateManager.func_179098_w();
         GlStateManager.func_179140_f();
         GlStateManager.func_179091_B();
-@@ -341,11 +369,12 @@
-         int i4;
-         int l4;
+@@ -331,11 +356,12 @@
+         GlStateManager.func_179143_c(515);
+         this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
 
-        for (i3 = 0; i3 < AchievementList.field_76007_e.size(); ++i3)
-+        List<Achievement> achievementList = (currentPage == -1 ? minecraftAchievements : AchievementPage.getAchievementPage(currentPage).getAchievements());
-+        for (i3 = 0; i3 < achievementList.size(); ++i3)
+-        for (int j5 = 0; j5 < AchievementList.field_76007_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_76007_e.get(i3);
-+            Achievement achievement1 = achievementList.get(i3);
+-            Achievement achievement1 = (Achievement)AchievementList.field_76007_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))
             {
-                 j3 = achievement1.field_75993_a * 24 - k + 11;
-                 k3 = achievement1.field_75991_b * 24 - l + 11;
-@@ -401,9 +430,9 @@
-         int i5;
-         int j5;
+                 int k5 = achievement1.field_75993_a * 24 - i + 11;
+                 int l5 = achievement1.field_75991_b * 24 - j + 11;
+@@ -389,9 +415,9 @@
+         GlStateManager.func_179091_B();
+         GlStateManager.func_179142_g();
 
-        for (k3 = 0; k3 < AchievementList.field_76007_e.size(); ++k3)
-+        for (k3 = 0; k3 < achievementList.size(); ++k3)
+-        for (int i6 = 0; i6 < AchievementList.field_76007_e.size(); ++i6)
+        for (int i6 = 0; i6 < achievementList.size(); ++i6)
         {
-            Achievement achievement2 = (Achievement)AchievementList.field_76007_e.get(k3);
-+            Achievement achievement2 = (Achievement)achievementList.get(k3);
-             l4 = achievement2.field_75993_a * 24 - k;
-             i5 = achievement2.field_75991_b * 24 - l;
+-            Achievement achievement2 = (Achievement)AchievementList.field_76007_e.get(i6);
+            Achievement achievement2 = achievementList.get(i6);
+             int l6 = achievement2.field_75993_a * 24 - i;
+             int j7 = achievement2.field_75991_b * 24 - j;
 
-@@ -445,6 +474,7 @@
+@@ -432,6 +458,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(l4 - 2, i5 - 2, 26, 202, 26, 26);
-@@ -453,6 +483,7 @@
+                     this.func_73729_b(l6 - 2, j7 - 2, 26, 202, 26, 26);
+@@ -440,6 +467,7 @@
                 {
-                     this.func_73729_b(l4 - 2, i5 - 2, 0, 202, 26, 26);
+                     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))
                 {
-@@ -461,7 +492,7 @@
+@@ -448,7 +476,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, l4 + 3, i5 + 3);
+                 this.field_146296_j.func_180450_b(achievement2.field_75990_d, l6 + 3, j7 + 3);
                 GlStateManager.func_179112_b(770, 771);
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
@ -1,19 +1,69 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
-@@ -769,6 +769,7 @@
+@@ -5,6 +5,8 @@
+ import java.util.Collections;
+ import java.util.Comparator;
+ import java.util.List;
+
+import net.minecraft.block.Block;
+ import net.minecraft.client.Minecraft;
+ import net.minecraft.client.audio.PositionedSoundRecord;
+ import net.minecraft.client.gui.GuiButton;
+@@ -443,17 +445,18 @@
+             for (StatCrafting statcrafting : StatList.field_75939_e)
+             {
+                 boolean flag = false;
+-                int i = Item.func_150891_b(statcrafting.func_150959_a());
+                int i = Block.func_149682_b(Block.func_149634_a(statcrafting.func_150959_a()));
+                int itemId = Item.func_150891_b(statcrafting.func_150959_a());
+ 
+                 if (GuiStats.this.field_146546_t.func_77444_a(statcrafting) > 0)
+                 {
+                     flag = true;
+                 }
+-                else if (StatList.field_75929_E[i] != null && GuiStats.this.field_146546_t.func_77444_a(StatList.field_75929_E[i]) > 0)
+                else if (StatList.field_75929_E[itemId] != null && GuiStats.this.field_146546_t.func_77444_a(StatList.field_75929_E[itemId]) > 0)
+                 {
+                     flag = true;
+                 }
+-                else if (StatList.field_75928_D[i] != null && GuiStats.this.field_146546_t.func_77444_a(StatList.field_75928_D[i]) > 0)
+                else if (StatList.field_75928_D[itemId] != null && GuiStats.this.field_146546_t.func_77444_a(StatList.field_75928_D[itemId]) > 0)
+                 {
+                     flag = true;
+                 }
+@@ -468,8 +471,15 @@
+             {
+                 public int compare(StatCrafting p_compare_1_, StatCrafting p_compare_2_)
+                 {
+-                    int j = Item.func_150891_b(p_compare_1_.func_150959_a());
+-                    int k = Item.func_150891_b(p_compare_2_.func_150959_a());
+                    int j;
+                    int k;
+                    if (StatsBlock.this.field_148217_o == 2) {
+                        j = Block.func_149682_b(Block.func_149634_a(p_compare_1_.func_150959_a()));
+                        k = Block.func_149682_b(Block.func_149634_a(p_compare_2_.func_150959_a()));
+                    } else {
+                        j = Item.func_150891_b(p_compare_1_.func_150959_a());
+                        k = Item.func_150891_b(p_compare_2_.func_150959_a());
+                    }
+                     StatBase statbase = null;
+                     StatBase statbase1 = null;
+ 
+@@ -748,7 +758,7 @@
             super(p_i45510_2_, GuiStats.this.field_146294_l, GuiStats.this.field_146295_m, 32, GuiStats.this.field_146295_m - 64, GuiStats.this.field_146289_q.field_78288_b * 4);
             this.func_148130_a(false);
-             Iterator iterator = EntityList.field_75627_a.values().iterator();
-+            iterator = com.google.common.collect.Iterators.concat(iterator, net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().values().iterator());
 
-             while (iterator.hasNext())
+-            for (EntityList.EntityEggInfo entitylist$entityegginfo : EntityList.field_75627_a.values())
+            for (EntityList.EntityEggInfo entitylist$entityegginfo : com.google.common.collect.Iterables.concat(EntityList.field_75627_a.values(), net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().values()))
             {
-@@ -806,7 +807,7 @@
+                 if (GuiStats.this.field_146546_t.func_77444_a(entitylist$entityegginfo.field_151512_d) > 0 || GuiStats.this.field_146546_t.func_77444_a(entitylist$entityegginfo.field_151513_e) > 0)
+                 {
+@@ -784,7 +794,7 @@
         protected void func_180791_a(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
         {
-             EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)this.field_148222_l.get(p_180791_1_);
-            String s = I18n.func_135052_a("entity." + EntityList.func_75617_a(entityegginfo.field_75613_a) + ".name", new Object[0]);
-+            String s = I18n.func_135052_a("entity." + entityegginfo.name + ".name", new Object[0]);
-             int k1 = GuiStats.this.field_146546_t.func_77444_a(entityegginfo.field_151512_d);
-             int l1 = GuiStats.this.field_146546_t.func_77444_a(entityegginfo.field_151513_e);
-             String s1 = I18n.func_135052_a("stat.entityKills", new Object[] {Integer.valueOf(k1), s});
+             EntityList.EntityEggInfo entitylist$entityegginfo = (EntityList.EntityEggInfo)this.field_148222_l.get(p_180791_1_);
+-            String s = I18n.func_135052_a("entity." + EntityList.func_75617_a(entitylist$entityegginfo.field_75613_a) + ".name", new Object[0]);
+            String s = I18n.func_135052_a("entity." + entitylist$entityegginfo.name + ".name", new Object[0]);
+             int i = GuiStats.this.field_146546_t.func_77444_a(entitylist$entityegginfo.field_151512_d);
+             int j = GuiStats.this.field_146546_t.func_77444_a(entitylist$entityegginfo.field_151513_e);
+             String s1 = I18n.func_135052_a("stat.entityKills", new Object[] {Integer.valueOf(i), s});
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
@ -1,18 +1,10 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
-@@ -5,6 +5,7 @@
- import java.util.Iterator;
- import java.util.Set;
- import net.minecraft.client.Minecraft;
-+import net.minecraft.client.gui.FontRenderer;
- import net.minecraft.client.gui.GuiScreen;
- import net.minecraft.client.renderer.GlStateManager;
- import net.minecraft.client.renderer.OpenGlHelper;
-@@ -178,8 +179,11 @@
+@@ -175,8 +175,11 @@
         GlStateManager.func_179109_b(0.0F, 0.0F, 32.0F);
         this.field_73735_i = 200.0F;
         this.field_146296_j.field_77023_b = 200.0F;
-+        FontRenderer font = null;
+        net.minecraft.client.gui.FontRenderer font = null;
 +        if (p_146982_1_ != null) font = p_146982_1_.func_77973_b().getFontRenderer(p_146982_1_);
 +        if (font == null) font = field_146289_q;
         this.field_146296_j.func_180450_b(p_146982_1_, p_146982_2_, p_146982_3_);
@ -21,7 +13,7 @@
         this.field_73735_i = 0.0F;
         this.field_146296_j.field_77023_b = 0.0F;
     }
-@@ -240,13 +244,12 @@
+@@ -239,13 +242,12 @@
 
         if (itemstack == null)
         {
@ -38,15 +30,15 @@
                 this.func_175175_a(i, j, textureatlassprite, 16, 16);
                 GlStateManager.func_179145_e();
                 flag1 = true;
-@@ -465,6 +468,7 @@
+@@ -463,6 +465,7 @@
 
     protected void func_146286_b(int p_146286_1_, int p_146286_2_, int p_146286_3_)
     {
 +        super.func_146286_b(p_146286_1_, p_146286_2_, p_146286_3_); //Forge, Call parent to release buttons
         Slot slot = this.func_146975_c(p_146286_1_, p_146286_2_);
-         int l = this.field_147003_i;
-         int i1 = this.field_147009_r;
-@@ -698,4 +702,16 @@
+         int i = this.field_147003_i;
+         int j = this.field_147009_r;
+@@ -685,4 +688,16 @@
             this.field_146297_k.field_71439_g.func_71053_j();
         }
     }
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
@ -1,24 +1,24 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
-@@ -49,6 +49,8 @@
+@@ -48,6 +48,8 @@
+     private Slot field_147064_C;
     private boolean field_147057_D;
     private CreativeCrafting field_147059_E;
-     private static final String __OBFID = "CL_00000752";
 +    private static int tabPage = 0;
 +    private int maxPages = 0;
 
     public GuiContainerCreative(EntityPlayer p_i1088_1_)
     {
-@@ -187,7 +189,7 @@
-                         return;
-                     }
+@@ -175,7 +177,7 @@
+                 return;
+             }
 
-                    if (itemstack1 != null && itemstack2 != null && itemstack1.func_77969_a(itemstack2))
-+                    if (itemstack1 != null && itemstack2 != null && itemstack1.func_77969_a(itemstack2) && ItemStack.func_77970_a(itemstack1, itemstack2)) //Forge: Bugfix, Compare NBT data, allow for deletion of enchanted books, MC-12770
-                     {
-                         if (p_146984_3_ == 0)
-                         {
-@@ -262,6 +264,13 @@
+-            if (itemstack1 != null && itemstack2 != null && itemstack1.func_77969_a(itemstack2))
+            if (itemstack1 != null && itemstack2 != null && itemstack1.func_77969_a(itemstack2) && ItemStack.func_77970_a(itemstack1, itemstack2)) //Forge: Bugfix, Compare NBT data, allow for deletion of enchanted books, MC-12770
+             {
+                 if (p_146984_3_ == 0)
+                 {
+@@ -259,6 +261,13 @@
             this.func_147050_b(CreativeTabs.field_78032_a[i]);
             this.field_147059_E = new CreativeCrafting(this.field_146297_k);
             this.field_146297_k.field_71439_g.field_71069_bz.func_75132_a(this.field_147059_E);
@ -32,7 +32,7 @@
         }
         else
         {
-@@ -283,7 +292,7 @@
+@@ -280,7 +289,7 @@
 
     protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
     {
@ -41,41 +41,44 @@
         {
             if (GameSettings.func_100015_a(this.field_146297_k.field_71474_y.field_74310_D))
             {
-@@ -320,6 +329,15 @@
-     {
-         GuiContainerCreative.ContainerCreative containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
-         containercreative.field_148330_a.clear();
-+
+@@ -318,6 +327,14 @@
+         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(containercreative.field_148330_a);
-+            updateFilteredItems(containercreative);
+            tab.func_78018_a(guicontainercreative$containercreative.field_148330_a);
+            updateFilteredItems(guicontainercreative$containercreative);
 +            return;
 +        }
 +
-         Iterator iterator = Item.field_150901_e.iterator();
- 
-         while (iterator.hasNext())
-@@ -331,10 +349,17 @@
-                 item.func_150895_a(item, (CreativeTabs)null, containercreative.field_148330_a);
+         for (Item item : Item.field_150901_e)
+         {
+             if (item != null && item.func_77640_w() != null)
+@@ -325,7 +342,13 @@
+                 item.func_150895_a(item, (CreativeTabs)null, guicontainercreative$containercreative.field_148330_a);
             }
         }
-+        updateFilteredItems(containercreative);
+        updateFilteredItems(guicontainercreative$containercreative);
 +    }
 
 +    //split from above for custom search tabs
-+    private void updateFilteredItems(GuiContainerCreative.ContainerCreative containercreative)
+    private void updateFilteredItems(GuiContainerCreative.ContainerCreative guicontainercreative$containercreative)
 +    {
-+        Iterator iterator;
-         Enchantment[] aenchantment = Enchantment.field_77331_b;
-         int j = aenchantment.length;
- 
-+        if (CreativeTabs.field_78032_a[field_147058_w] != CreativeTabs.field_78027_g) j = 0; //Forge: Don't add enchants to custom tabs.
-         for (int i = 0; i < j; ++i)
+        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_77331_b)
         {
-             Enchantment enchantment = aenchantment[i];
-@@ -385,7 +410,7 @@
+             if (enchantment != null && enchantment.field_77351_y != null)
+@@ -333,7 +356,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();
+ 
+@@ -365,7 +387,7 @@
     {
         CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
 
@ -84,16 +87,16 @@
         {
             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);
-@@ -428,7 +453,7 @@
-             {
-                 CreativeTabs creativetabs = acreativetabs[k1];
+@@ -400,7 +422,7 @@
 
-                if (this.func_147049_a(creativetabs, l, i1))
-+                if (creativetabs != null && this.func_147049_a(creativetabs, l, i1))
+             for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
+             {
+-                if (this.func_147049_a(creativetabs, i, j))
+                if (creativetabs != null && this.func_147049_a(creativetabs, i, j))
                 {
                     this.func_147050_b(creativetabs);
                     return;
-@@ -441,11 +466,13 @@
+@@ -413,11 +435,13 @@
 
     private boolean func_147055_p()
     {
@ -106,8 +109,8 @@
 +        if (p_147050_1_ == null) return;
         int i = field_147058_w;
         field_147058_w = p_147050_1_.func_78021_a();
-         GuiContainerCreative.ContainerCreative containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
-@@ -514,12 +541,14 @@
+         GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
+@@ -483,12 +507,14 @@
 
         if (this.field_147062_A != null)
         {
@ -123,21 +126,18 @@
                 this.func_147053_i();
             }
             else
-@@ -590,23 +619,45 @@
+@@ -558,20 +584,43 @@
+         }
 
         super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
-         CreativeTabs[] acreativetabs = CreativeTabs.field_78032_a;
-        int i2 = acreativetabs.length;
 +        int start = tabPage * 10;
-+        int i2 = Math.min(acreativetabs.length, ((tabPage + 1) * 10) + 2);
+        int end = Math.min(CreativeTabs.field_78032_a.length, ((tabPage + 1) * 10) + 2);
 +        if (tabPage != 0) start += 2;
 +        boolean rendered = false;
 
-        for (int j2 = 0; j2 < i2; ++j2)
-+        for (int j2 = start; j2 < i2; ++j2)
+-        for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
+        for (CreativeTabs creativetabs : java.util.Arrays.copyOfRange(CreativeTabs.field_78032_a,start,end))
         {
-             CreativeTabs creativetabs = acreativetabs[j2];
- 
 +            if (creativetabs == null) continue;
             if (this.func_147052_b(creativetabs, p_73863_1_, p_73863_2_))
             {
@ -171,18 +171,17 @@
         GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
         GlStateManager.func_179140_f();
     }
-@@ -675,17 +726,36 @@
-         int k = acreativetabs.length;
-         int l;
+@@ -633,16 +682,35 @@
+         RenderHelper.func_74520_c();
+         CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
 
-        for (l = 0; l < k; ++l)
+-        for (CreativeTabs creativetabs1 : CreativeTabs.field_78032_a)
 +        int start = tabPage * 10;
-+        k = Math.min(acreativetabs.length, ((tabPage + 1) * 10 + 2));
+        int end = Math.min(CreativeTabs.field_78032_a.length, ((tabPage + 1) * 10 + 2));
 +        if (tabPage != 0) start += 2;
 +
-+        for (l = start; l < k; ++l)
+        for (CreativeTabs creativetabs1 : java.util.Arrays.copyOfRange(CreativeTabs.field_78032_a,start,end))
         {
-             CreativeTabs creativetabs1 = acreativetabs[l];
             this.field_146297_k.func_110434_K().func_110577_a(field_147061_u);
 
 +            if (creativetabs1 == null) continue;
@ -209,8 +208,8 @@
         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();
-@@ -700,6 +770,14 @@
-             this.func_73729_b(i1, k + (int)((float)(l - k - 17) * this.field_147067_x), 232 + (this.func_147055_p() ? 0 : 12), 0, 12, 15);
+@@ -657,6 +725,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);
         }
 
 +        if (creativetabs == null || creativetabs.getTabPage() != tabPage)
@ -224,32 +223,31 @@
         this.func_147051_a(creativetabs);
 
         if (creativetabs == CreativeTabs.field_78036_m)
-@@ -710,6 +788,15 @@
+@@ -667,6 +743,14 @@
 
     protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
     {
 +        if (p_147049_1_.getTabPage() != tabPage)
 +        {
-+            if (p_147049_1_ != CreativeTabs.field_78027_g &&
-+                p_147049_1_ != CreativeTabs.field_78036_m)
+            if (p_147049_1_ != CreativeTabs.field_78027_g && p_147049_1_ != CreativeTabs.field_78036_m)
 +            {
 +                return false;
 +            }
 +        }
 +
-         int k = p_147049_1_.func_78020_k();
-         int l = 28 * k;
-         byte b0 = 0;
-@@ -810,6 +897,8 @@
+         int i = p_147049_1_.func_78020_k();
+         int j = 28 * i;
+         int k = 0;
+@@ -763,6 +847,8 @@
         }
 
         GlStateManager.func_179140_f();
 +        GlStateManager.func_179124_c(1F, 1F, 1F); //Forge: Reset color in case Items change it.
 +        GlStateManager.func_179147_l(); //Forge: Make sure blend is enabled else tabs show a white border.
-         this.func_73729_b(l, i1, j, k, 28, b0);
+         this.func_73729_b(l, i1, j, k, 28, j1);
         this.field_73735_i = 100.0F;
         this.field_146296_j.field_77023_b = 100.0F;
-@@ -836,6 +925,15 @@
+@@ -789,6 +875,15 @@
         {
             this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m()));
         }
--- a/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch
+++ b/patches/minecraft/net/minecraft/client/model/ModelBox.java.patch
@ -8,7 +8,7 @@
 public class ModelBox
 {
     private PositionTextureVertex[] field_78253_h;
-@@ -82,6 +81,7 @@
+@@ -81,6 +80,7 @@
         }
     }
 
--- a/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
@ -8,7 +8,7 @@
 public class ModelRenderer
 {
     public float field_78801_a;
-@@ -110,6 +109,7 @@
+@@ -109,6 +108,7 @@
         this.field_78798_e = p_78793_3_;
     }
 
@ -16,7 +16,7 @@
     public void func_78785_a(float p_78785_1_)
     {
         if (!this.field_78807_k)
-@@ -192,6 +192,7 @@
+@@ -190,6 +190,7 @@
         }
     }
 
@ -24,7 +24,7 @@
     public void func_78791_b(float p_78791_1_)
     {
         if (!this.field_78807_k)
-@@ -227,6 +228,7 @@
+@@ -225,6 +226,7 @@
         }
     }
 
@ -32,7 +32,7 @@
     public void func_78794_c(float p_78794_1_)
     {
         if (!this.field_78807_k)
-@@ -268,6 +270,7 @@
+@@ -266,6 +268,7 @@
         }
     }
 
--- a/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
+++ b/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
@ -1,8 +1,8 @@
 --- ../src-base/minecraft/net/minecraft/client/model/TexturedQuad.java
 +++ ../src-work/minecraft/net/minecraft/client/model/TexturedQuad.java
-@@ -3,10 +3,7 @@
- import net.minecraft.client.renderer.Tessellator;
+@@ -4,10 +4,7 @@
 import net.minecraft.client.renderer.WorldRenderer;
+ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.Vec3;
 -import net.minecraftforge.fml.relauncher.Side;
 -import net.minecraftforge.fml.relauncher.SideOnly;
--- a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
-@@ -56,6 +56,7 @@
+@@ -55,6 +55,7 @@
         Chunk chunk = new Chunk(this.field_73235_d, p_73158_1_, p_73158_2_);
         this.field_73236_b.func_76163_a(ChunkCoordIntPair.func_77272_a(p_73158_1_, p_73158_2_), chunk);
         this.field_73237_c.add(chunk);
--- a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
@ -1,8 +1,8 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
-@@ -69,7 +69,7 @@
+@@ -67,7 +67,7 @@
                     inetaddress = InetAddress.getByName(p_146367_1_);
-                     GuiConnecting.this.field_146371_g = NetworkManager.func_150726_a(inetaddress, p_146367_2_);
+                     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(47, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
 +                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(47, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
--- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
-@@ -113,6 +113,12 @@
+@@ -111,6 +111,12 @@
             }
         }
 
@ -13,35 +13,34 @@
         if (this.field_78779_k.func_77145_d() && this.field_78776_a.field_71439_g.func_70694_bm() != null && this.field_78776_a.field_71439_g.func_70694_bm().func_77973_b() instanceof ItemSword)
         {
             return false;
-@@ -130,13 +136,7 @@
+@@ -128,13 +134,7 @@
             else
             {
-                 worldclient.func_175718_b(2001, p_178888_1_, Block.func_176210_f(iblockstate));
-                boolean flag = worldclient.func_175698_g(p_178888_1_);
+                 world.func_175718_b(2001, p_178888_1_, Block.func_176210_f(iblockstate));
+-                boolean flag = world.func_175698_g(p_178888_1_);
 
 -                if (flag)
 -                {
-                    block1.func_176206_d(worldclient, p_178888_1_, iblockstate);
+-                    block1.func_176206_d(world, p_178888_1_, iblockstate);
 -                }
 -
                 this.field_178895_c = new BlockPos(this.field_178895_c.func_177958_n(), -1, this.field_178895_c.func_177952_p());
 
                 if (!this.field_78779_k.func_77145_d())
-@@ -154,6 +154,13 @@
+@@ -152,6 +152,12 @@
                     }
                 }
 
-+                boolean flag = block1.removedByPlayer(worldclient, p_178888_1_, field_78776_a.field_71439_g, false);
+                boolean flag = block1.removedByPlayer(world, p_178888_1_, field_78776_a.field_71439_g, false);
 +
 +                if (flag)
 +                {
-+                    block1.func_176206_d(worldclient, p_178888_1_, iblockstate);
+                    block1.func_176206_d(world, p_178888_1_, iblockstate);
 +                }
-+
                 return flag;
             }
         }
-@@ -360,11 +367,19 @@
+@@ -356,11 +362,19 @@
         {
             if (this.field_78779_k != WorldSettings.GameType.SPECTATOR)
             {
@ -50,7 +49,7 @@
 +                    p_178890_3_.func_77973_b() != null &&
 +                    p_178890_3_.func_77973_b().onItemUseFirst(p_178890_3_, p_178890_1_, p_178890_2_, p_178890_4_, p_178890_5_, f, f1, f2))
 +                {
-+                        return true;
+                    return true;
 +                }
 +
                 IBlockState iblockstate = p_178890_2_.func_180495_p(p_178890_4_);
@ -63,7 +62,7 @@
                 }
 
                 if (!flag && p_178890_3_ != null && p_178890_3_.func_77973_b() instanceof ItemBlock)
-@@ -397,7 +412,9 @@
+@@ -393,7 +407,9 @@
                 }
                 else
                 {
@ -74,15 +73,15 @@
                 }
             }
             else
-@@ -428,9 +445,10 @@
+@@ -420,9 +436,10 @@
             {
-                 p_78769_1_.field_71071_by.field_70462_a[p_78769_1_.field_71071_by.field_70461_c] = itemstack1;
+                 p_78769_1_.field_71071_by.field_70462_a[p_78769_1_.field_71071_by.field_70461_c] = itemstack;
 
-                if (itemstack1.field_77994_a == 0)
-+                if (itemstack1.field_77994_a <= 0)
+-                if (itemstack.field_77994_a == 0)
+                if (itemstack.field_77994_a <= 0)
                 {
                     p_78769_1_.field_71071_by.field_70462_a[p_78769_1_.field_71071_by.field_70461_c] = null;
-+                    net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_78769_1_, itemstack1);
+                    net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_78769_1_, itemstack);
                 }
 
                 return true;
--- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
-@@ -54,12 +54,13 @@
+@@ -52,12 +52,13 @@
         super(new SaveHandlerMP(), new WorldInfo(p_i45063_2_, "MpServer"), WorldProvider.func_76570_a(p_i45063_3_), p_i45063_5_, true);
         this.field_73035_a = p_i45063_1_;
         this.func_72912_H().func_176144_a(p_i45063_4_);
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
 +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
 
     public void func_147383_a(C00Handshake p_147383_1_)
     {
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
 +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
-@@ -92,7 +92,10 @@
+@@ -104,7 +104,10 @@
     {
         this.field_175091_e = p_147390_1_.func_179730_a();
         this.field_147393_d.func_150723_a(EnumConnectionState.PLAY);
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
 +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-@@ -247,7 +247,7 @@
+@@ -246,7 +246,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,17 +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();
-@@ -410,7 +410,8 @@
-     public void func_147286_a(S11PacketSpawnExperienceOrb p_147286_1_)
-     {
-         PacketThreadUtil.func_180031_a(p_147286_1_, this, this.field_147299_f);
-        EntityXPOrb entityxporb = new EntityXPOrb(this.field_147300_g, (double)p_147286_1_.func_148984_d(), (double)p_147286_1_.func_148983_e(), (double)p_147286_1_.func_148982_f(), p_147286_1_.func_148986_g());
-+        EntityXPOrb entityxporb = new EntityXPOrb(this.field_147300_g, (double)p_147286_1_.func_148984_d() / 32.0D, (double)p_147286_1_.func_148983_e() / 32.0D, (double)p_147286_1_.func_148982_f() / 32.0D, p_147286_1_.func_148986_g());
-+        // FORGE: BugFix MC-12013 Wrong XP orb clientside spawn position
-         entityxporb.field_70118_ct = p_147286_1_.func_148984_d();
-         entityxporb.field_70117_cu = p_147286_1_.func_148983_e();
-         entityxporb.field_70116_cv = p_147286_1_.func_148982_f();
-@@ -754,14 +755,16 @@
+@@ -750,14 +750,16 @@
     public void func_147251_a(S02PacketChat p_147251_1_)
     {
         PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
@ -38,7 +28,7 @@
         }
     }
 
-@@ -812,6 +815,11 @@
+@@ -808,6 +810,11 @@
         float f = (float)(p_147281_1_.func_149028_l() * 360) / 256.0F;
         float f1 = (float)(p_147281_1_.func_149030_m() * 360) / 256.0F;
         EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.func_75616_a(p_147281_1_.func_149025_e(), this.field_147299_f.field_71441_e);
@ -50,7 +40,7 @@
         entitylivingbase.field_70118_ct = p_147281_1_.func_149023_f();
         entitylivingbase.field_70117_cu = p_147281_1_.func_149034_g();
         entitylivingbase.field_70116_cv = p_147281_1_.func_149029_h();
-@@ -1137,6 +1145,10 @@
+@@ -1133,6 +1140,10 @@
             {
                 tileentity.func_145839_a(p_147273_1_.func_148857_g());
             }
@ -61,7 +51,7 @@
         }
     }
 
-@@ -1346,7 +1358,7 @@
+@@ -1341,7 +1352,7 @@
 
         if (entity instanceof EntityLivingBase)
         {
--- a/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch
+++ b/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch
@ -1,10 +1,10 @@
 --- ../src-base/minecraft/net/minecraft/client/network/OldServerPinger.java
 +++ ../src-work/minecraft/net/minecraft/client/network/OldServerPinger.java
-@@ -148,6 +148,7 @@
-                     p_147224_1_.func_147407_a((String)null);
-                 }
+@@ -150,6 +150,7 @@
+                         p_147224_1_.func_147407_a((String)null);
+                     }
 
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse);
-                 this.field_175092_e = Minecraft.func_71386_F();
-                 networkmanager.func_179290_a(new C01PacketPing(this.field_175092_e));
-                 this.field_147403_d = true;
+                    net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse);
+                     this.field_175092_e = Minecraft.func_71386_F();
+                     networkmanager.func_179290_a(new C01PacketPing(this.field_175092_e));
+                     this.field_147403_d = true;
--- a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch
@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/particle/EffectRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/particle/EffectRenderer.java
-@@ -135,6 +135,7 @@
+@@ -133,6 +133,7 @@
 
     public void func_78873_a(EntityFX p_78873_1_)
     {
@ -8,7 +8,7 @@
         int i = p_78873_1_.func_70537_b();
         int j = p_78873_1_.func_174838_j() != 1.0F ? 0 : 1;
 
-@@ -361,7 +362,7 @@
+@@ -351,7 +352,7 @@
 
     public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
     {
@ -16,8 +16,8 @@
 +        if (!p_180533_2_.func_177230_c().isAir(field_78878_a, p_180533_1_) && !p_180533_2_.func_177230_c().addDestroyEffects(field_78878_a, p_180533_1_, this))
         {
             p_180533_2_ = p_180533_2_.func_177230_c().func_176221_a(p_180533_2_, this.field_78878_a, p_180533_1_);
-             byte b0 = 4;
-@@ -467,4 +468,13 @@
+             int i = 4;
+@@ -457,4 +458,13 @@
 
         return "" + i;
     }
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
-@@ -20,6 +20,7 @@
- import net.minecraft.world.IBlockAccess;
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
-+import static net.minecraft.client.renderer.BlockModelRenderer.Orientation.*;
- 
- @SideOnly(Side.CLIENT)
- public class BlockModelRenderer
-@@ -556,8 +557,19 @@
+@@ -533,8 +533,19 @@
     @SideOnly(Side.CLIENT)
     public static enum EnumNeighborInfo
     {
@ -18,15 +10,15 @@
 +        // Forge PR - https://github.com/MinecraftForge/MinecraftForge/pull/1892
 +        // Mojang Bug - https://bugs.mojang.com/browse/MC-80148
 +        DOWN( new EnumFacing[]{ EnumFacing.WEST, EnumFacing.EAST, EnumFacing.NORTH, EnumFacing.SOUTH }, 0.5F, true,
-+            new Orientation[]{ FLIP_WEST, Orientation.SOUTH, FLIP_WEST, FLIP_SOUTH, Orientation.WEST, FLIP_SOUTH, Orientation.WEST, Orientation.SOUTH },
-+            new Orientation[]{ FLIP_WEST, Orientation.NORTH, FLIP_WEST, FLIP_NORTH, Orientation.WEST, Orientation.FLIP_NORTH, Orientation.WEST, Orientation.NORTH },
-+            new Orientation[]{ FLIP_EAST, Orientation.NORTH, FLIP_EAST, FLIP_NORTH, Orientation.EAST, Orientation.FLIP_NORTH, Orientation.EAST, Orientation.NORTH },
-+            new Orientation[]{ FLIP_EAST, Orientation.SOUTH, FLIP_EAST, FLIP_SOUTH, Orientation.EAST, FLIP_SOUTH, Orientation.EAST, Orientation.SOUTH } ),
+            new Orientation[]{ Orientation.FLIP_WEST, Orientation.SOUTH, Orientation.FLIP_WEST, Orientation.FLIP_SOUTH, Orientation.WEST, Orientation.FLIP_SOUTH, Orientation.WEST, Orientation.SOUTH },
+            new Orientation[]{ Orientation.FLIP_WEST, Orientation.NORTH, Orientation.FLIP_WEST, Orientation.FLIP_NORTH, Orientation.WEST, Orientation.FLIP_NORTH, Orientation.WEST, Orientation.NORTH },
+            new Orientation[]{ Orientation.FLIP_EAST, Orientation.NORTH, Orientation.FLIP_EAST, Orientation.FLIP_NORTH, Orientation.EAST, Orientation.FLIP_NORTH, Orientation.EAST, Orientation.NORTH },
+            new Orientation[]{ Orientation.FLIP_EAST, Orientation.SOUTH, Orientation.FLIP_EAST, Orientation.FLIP_SOUTH, Orientation.EAST, Orientation.FLIP_SOUTH, Orientation.EAST, Orientation.SOUTH } ),
 +        UP( new EnumFacing[]{ EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH }, 1.0F, true,
-+            new Orientation[]{ Orientation.EAST, Orientation.SOUTH, Orientation.EAST, FLIP_SOUTH, FLIP_EAST, FLIP_SOUTH, FLIP_EAST, Orientation.SOUTH },
-+            new Orientation[]{ Orientation.EAST, Orientation.NORTH, Orientation.EAST, FLIP_NORTH, FLIP_EAST, FLIP_NORTH, FLIP_EAST, Orientation.NORTH },
-+            new Orientation[]{ Orientation.WEST, Orientation.NORTH, Orientation.WEST, FLIP_NORTH, FLIP_WEST, FLIP_NORTH, FLIP_WEST, Orientation.NORTH },
-+            new Orientation[]{ Orientation.WEST, Orientation.SOUTH, Orientation.WEST, FLIP_SOUTH, FLIP_WEST, FLIP_SOUTH, FLIP_WEST, Orientation.SOUTH } ),
+            new Orientation[]{ Orientation.EAST, Orientation.SOUTH, Orientation.EAST, Orientation.FLIP_SOUTH, Orientation.FLIP_EAST, Orientation.FLIP_SOUTH, Orientation.FLIP_EAST, Orientation.SOUTH },
+            new Orientation[]{ Orientation.EAST, Orientation.NORTH, Orientation.EAST, Orientation.FLIP_NORTH, Orientation.FLIP_EAST, Orientation.FLIP_NORTH, Orientation.FLIP_EAST, Orientation.NORTH },
+            new Orientation[]{ Orientation.WEST, Orientation.NORTH, Orientation.WEST, Orientation.FLIP_NORTH, Orientation.FLIP_WEST, Orientation.FLIP_NORTH, Orientation.FLIP_WEST, Orientation.NORTH },
+            new Orientation[]{ Orientation.WEST, Orientation.SOUTH, Orientation.WEST, Orientation.FLIP_SOUTH, Orientation.FLIP_WEST, Orientation.FLIP_SOUTH, Orientation.FLIP_WEST, Orientation.SOUTH } ),
         NORTH(new EnumFacing[]{EnumFacing.UP, EnumFacing.DOWN, EnumFacing.EAST, EnumFacing.WEST}, 0.8F, true, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_WEST}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_EAST}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_EAST}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_WEST}),
         SOUTH(new EnumFacing[]{EnumFacing.WEST, EnumFacing.EAST, EnumFacing.DOWN, EnumFacing.UP}, 0.8F, true, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.WEST}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.WEST}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.EAST}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.EAST}),
         WEST(new EnumFacing[]{EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH}, 0.6F, true, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.SOUTH}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.NORTH}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.NORTH}, new BlockModelRenderer.Orientation[]{BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.SOUTH}),
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.java.patch
@ -1,10 +1,9 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
-@@ -321,6 +321,7 @@
+@@ -309,5 +309,6 @@
                 return new ModelResourceLocation(s + "_double_slab", s1);
             }
         });
 +        net.minecraftforge.client.model.ModelLoader.onRegisterAllBlocks(this);
     }
- 
-     @SideOnly(Side.CLIENT)
+ }
--- a/Show more
+++ b/Show more