Add in mcp named patches and use them. Initial 1.9 setup.

2016-02-29 21:37:08 -05:00 · 2016-02-29 21:37:08 -05:00 · d29b9f8752
parent 95d1ba5dc5
commit d29b9f8752
350 changed files with 21753 additions and 52 deletions
--- a/build.gradle
+++ b/build.gradle
@ -26,11 +26,11 @@ apply plugin: "net.minecraftforge.gradle.patcher"
 apply plugin: "net.minecraftforge.gradle.launch4j"

 minecraft {
-    version = "1.8.9"
+    version = "1.9"
    mappings = 'stable_20'
    //mappings = "snapshot_nodoc_20151122"
    workspaceDir = "projects"
-    versionJson = "jsons/1.8.9-dev.json"
+    versionJson = "jsons/1.9-dev.json"
    buildUserdev = true
    buildInstaller = true
    installerVersion = "1.4"
@ -47,11 +47,11 @@ minecraft {
    projects {
        forge {
            rootDir "."
-            patchDir "patches/minecraft"
+            patchDir "patches.mcp/minecraft"
            patchAfter "clean"
            genPatchesFrom "clean"
-            genMcpPatches = false
-            applyMcpPatches = false
+            genMcpPatches = true
+            applyMcpPatches = true
            with common
        }
    }
@ -66,7 +66,7 @@ extractForgeResources { exclude "**/log4j2.xml" }
 genGradleProjects { addTestCompileDep "junit:junit:4.12" }

 processJson {
-    releaseJson = "jsons/1.8.9-rel.json"
+    releaseJson = "jsons/1.9-rel.json"
    addReplacements([
        "@minecraft_version@": project.minecraft.version,
        "@version@": project.version,
--- a/jsons/1.9-dev.json
+++ b/jsons/1.9-dev.json
@ -0,0 +1,95 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "inheritsFrom": "1.9",
+  "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"
+    }
+  ],
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "minimumLauncherVersion": 14,
+  "assets": "1.8"
+}
--- a/jsons/1.9-rel.json
+++ b/jsons/1.9-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.9",
+  "jar": "1.8.9",
+  "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.9.json
+++ b/jsons/1.9.json
@ -0,0 +1,218 @@
+{
+  "id": "1.9",
+  "time": "2016-02-29T08:50:46-05:00",
+  "releaseTime": "2016-02-29T08:49:54-05: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} --userType ${user_type} --versionType ${version_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.22"
+    },
+    {
+      "name": "com.mojang:realms:1.8.3"
+    },
+    {
+      "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",
+        "osx": "natives-osx",
+        "windows": "natives-windows"
+      },
+      "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",
+        "osx": "natives-osx",
+        "windows": "natives-windows"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "osx": "natives-osx",
+        "windows": "natives-windows"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.client.main.Main",
+  "minimumLauncherVersion": 18,
+  "assets": "1.9",
+  "downloads": {
+    "client": {
+      "url": "https://launcher.mojang.com/mc/game/1.9/client/2f67dfe8953299440d1902f9124f0f2c3a2c940f/client.jar",
+      "sha1": "2f67dfe8953299440d1902f9124f0f2c3a2c940f",
+      "size": 8697592
+    },
+    "server": {
+      "url": "https://launcher.mojang.com/mc/game/1.9/server/b4d449cf2918e0f3bd8aa18954b916a4d1880f0d/server.jar",
+      "sha1": "b4d449cf2918e0f3bd8aa18954b916a4d1880f0d",
+      "size": 8848015
+    }
+  },
+  "assetIndex": {
+    "totalSize": 119917473,
+    "id": "1.9",
+    "known": true,
+    "url": "https://launchermeta.mojang.com/mc-staging/assets/1.9/cde65b47a43f638653ab1da3848b53f8a7477b16/1.9.json",
+    "sha1": "cde65b47a43f638653ab1da3848b53f8a7477b16",
+    "size": 136916
+  }
+}
--- a/patches.mcp/minecraft/net/minecraft/block/Block.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/Block.java.patch
--- a/patches.mcp/minecraft/net/minecraft/block/BlockBanner.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockBanner.java.patch
@ -0,0 +1,54 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockBanner.java
+++ ../src-work/minecraft/net/minecraft/block/BlockBanner.java
+@@ -85,22 +85,7 @@
+ 
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+-        TileEntity tileentity = worldIn.getTileEntity(pos);
+-
+-        if (tileentity instanceof TileEntityBanner)
+         {
+-            ItemStack itemstack = new ItemStack(Items.banner, 1, ((TileEntityBanner)tileentity).getBaseColor());
+-            NBTTagCompound nbttagcompound = new NBTTagCompound();
+-            tileentity.writeToNBT(nbttagcompound);
+-            nbttagcompound.removeTag("x");
+-            nbttagcompound.removeTag("y");
+-            nbttagcompound.removeTag("z");
+-            nbttagcompound.removeTag("id");
+-            itemstack.setTagInfo("BlockEntityTag", nbttagcompound);
+-            spawnAsEntity(worldIn, pos, itemstack);
+-        }
+-        else
+-        {
+             super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+         }
+     }
+@@ -133,6 +118,28 @@
+         }
+     }
+ 
+    @Override
+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        TileEntity te = world.getTileEntity(pos);
+
+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        if (te instanceof TileEntityBanner)
+        {
+            TileEntityBanner banner = (TileEntityBanner)te;
+            ItemStack item = new ItemStack(Items.banner, 1, banner.getBaseColor());
+            NBTTagCompound nbt = new NBTTagCompound();
+            TileEntityBanner.func_181020_a(nbt, banner.getBaseColor(), banner.func_181021_d());
+            item.setTagInfo("BlockEntityTag", nbt);
+            ret.add(item);
+        }
+        else
+        {
+            ret.add(new ItemStack(Items.banner, 1, 0));
+        }
+        return ret;
+    }
+
+     public static class BlockBannerHanging extends BlockBanner
+         {
+             public BlockBannerHanging()
--- a/patches.mcp/minecraft/net/minecraft/block/BlockBush.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockBush.java.patch
@ -0,0 +1,66 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockBush.java
+++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
+@@ -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
+ {
+     protected BlockBush()
+     {
+@@ -36,7 +36,7 @@
+ 
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+     {
+-        return super.canPlaceBlockAt(worldIn, pos) && this.canPlaceBlockOn(worldIn.getBlockState(pos.down()).getBlock());
+        return super.canPlaceBlockAt(worldIn, pos) && worldIn.getBlockState(pos.down()).getBlock().canSustainPlant(worldIn, pos.down(), net.minecraft.util.EnumFacing.UP, this);
+     }
+ 
+     protected boolean canPlaceBlockOn(Block ground)
+@@ -66,7 +66,10 @@
+ 
+     public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
+     {
+-        return this.canPlaceBlockOn(worldIn.getBlockState(pos.down()).getBlock());
+        BlockPos down = pos.down();
+        Block soil = worldIn.getBlockState(down).getBlock();
+        if (state.getBlock() != this) return this.canPlaceBlockOn(soil); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
+        return soil.canSustainPlant(worldIn, down, net.minecraft.util.EnumFacing.UP, this);
+     }
+ 
+     public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+@@ -89,4 +92,33 @@
+     {
+         return EnumWorldBlockLayer.CUTOUT;
+     }
+
+    @Override
+    public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
+    {
+        if (this == Blocks.wheat)          return net.minecraftforge.common.EnumPlantType.Crop;
+        if (this == Blocks.carrots)        return net.minecraftforge.common.EnumPlantType.Crop;
+        if (this == Blocks.potatoes)       return net.minecraftforge.common.EnumPlantType.Crop;
+        if (this == Blocks.melon_stem)     return net.minecraftforge.common.EnumPlantType.Crop;
+        if (this == Blocks.pumpkin_stem)   return net.minecraftforge.common.EnumPlantType.Crop;
+        if (this == Blocks.deadbush)       return net.minecraftforge.common.EnumPlantType.Desert;
+        if (this == Blocks.waterlily)      return net.minecraftforge.common.EnumPlantType.Water;
+        if (this == Blocks.red_mushroom)   return net.minecraftforge.common.EnumPlantType.Cave;
+        if (this == Blocks.brown_mushroom) return net.minecraftforge.common.EnumPlantType.Cave;
+        if (this == Blocks.nether_wart)    return net.minecraftforge.common.EnumPlantType.Nether;
+        if (this == Blocks.sapling)        return net.minecraftforge.common.EnumPlantType.Plains;
+        if (this == Blocks.tallgrass)      return net.minecraftforge.common.EnumPlantType.Plains;
+        if (this == Blocks.double_plant)   return net.minecraftforge.common.EnumPlantType.Plains;
+        if (this == Blocks.red_flower)     return net.minecraftforge.common.EnumPlantType.Plains;
+        if (this == Blocks.yellow_flower)  return net.minecraftforge.common.EnumPlantType.Plains;
+        return net.minecraftforge.common.EnumPlantType.Plains;
+    }
+
+    @Override
+    public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
+    {
+        IBlockState state = world.getBlockState(pos);
+        if (state.getBlock() != this) return getDefaultState();
+        return state;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockButton.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockButton.java.patch
@ -0,0 +1,12 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockButton.java
+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
+@@ -74,8 +74,7 @@
+ 
+     protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
+     {
+-        BlockPos blockpos = p_181088_1_.offset(p_181088_2_);
+-        return p_181088_2_ == EnumFacing.DOWN ? World.doesBlockHaveSolidTopSurface(p_181088_0_, blockpos) : p_181088_0_.getBlockState(blockpos).getBlock().isNormalCube();
+        return p_181088_2_ == EnumFacing.DOWN && World.doesBlockHaveSolidTopSurface(p_181088_0_, p_181088_1_.down()) ? true : p_181088_0_.isSideSolid(p_181088_1_.offset(p_181088_2_), p_181088_2_.getOpposite());
+     }
+ 
+     public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockCactus.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockCactus.java.patch
@ -0,0 +1,37 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
+@@ -18,7 +18,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-public class BlockCactus extends Block
+public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable
+ {
+     public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 15);
+ 
+@@ -109,7 +109,7 @@
+         }
+ 
+         Block block = worldIn.getBlockState(pos.down()).getBlock();
+-        return block == Blocks.cactus || block == Blocks.sand;
+        return block.canSustainPlant(worldIn, pos.down(), EnumFacing.UP, this);
+     }
+ 
+     public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+@@ -137,4 +137,16 @@
+     {
+         return new BlockState(this, new IProperty[] {AGE});
+     }
+
+    @Override
+    public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
+    {
+        return net.minecraftforge.common.EnumPlantType.Desert;
+    }
+
+    @Override
+    public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
+    {
+        return getDefaultState();
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockChest.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockChest.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockChest.java
+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
+@@ -527,7 +527,7 @@
+ 
+     private boolean isBelowSolidBlock(World worldIn, BlockPos pos)
+     {
+-        return worldIn.getBlockState(pos.up()).getBlock().isNormalCube();
+        return worldIn.isSideSolid(pos.up(), EnumFacing.DOWN, false);
+     }
+ 
+     private boolean isOcelotSittingOnChest(World worldIn, BlockPos pos)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockCocoa.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockCocoa.java.patch
@ -0,0 +1,27 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
+@@ -137,6 +137,13 @@
+ 
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+        super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    }
+
+    @Override
+    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 i = ((Integer)state.getValue(AGE)).intValue();
+         int j = 1;
+ 
+@@ -147,8 +154,9 @@
+ 
+         for (int k = 0; k < j; ++k)
+         {
+-            spawnAsEntity(worldIn, pos, new ItemStack(Items.dye, 1, EnumDyeColor.BROWN.getDyeDamage()));
+            dropped.add(new ItemStack(Items.dye, 1, EnumDyeColor.BROWN.getDyeDamage()));
+         }
+        return dropped;
+     }
+ 
+     @SideOnly(Side.CLIENT)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockCrops.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockCrops.java.patch
@ -0,0 +1,77 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
+@@ -81,11 +81,11 @@
+                 float f1 = 0.0F;
+                 IBlockState iblockstate = worldIn.getBlockState(blockpos.add(i, 0, j));
+ 
+-                if (iblockstate.getBlock() == Blocks.farmland)
+                if (iblockstate.getBlock().canSustainPlant(worldIn, blockpos.add(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)blockIn))
+                 {
+                     f1 = 1.0F;
+ 
+-                    if (((Integer)iblockstate.getValue(BlockFarmland.MOISTURE)).intValue() > 0)
+                    if (iblockstate.getBlock().isFertile(worldIn, blockpos.add(i, 0, j)))
+                     {
+                         f1 = 3.0F;
+                     }
+@@ -126,7 +126,7 @@
+ 
+     public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
+     {
+-        return (worldIn.getLight(pos) >= 8 || worldIn.canSeeSky(pos)) && this.canPlaceBlockOn(worldIn.getBlockState(pos.down()).getBlock());
+        return (worldIn.getLight(pos) >= 8 || worldIn.canSeeSky(pos)) && worldIn.getBlockState(pos.down()).getBlock().canSustainPlant(worldIn, pos.down(), net.minecraft.util.EnumFacing.UP, this);
+     }
+ 
+     protected Item getSeed()
+@@ -142,24 +142,6 @@
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+         super.dropBlockAsItemWithChance(worldIn, pos, state, chance, 0);
+-
+-        if (!worldIn.isRemote)
+-        {
+-            int i = ((Integer)state.getValue(AGE)).intValue();
+-
+-            if (i >= 7)
+-            {
+-                int j = 3 + fortune;
+-
+-                for (int k = 0; k < j; ++k)
+-                {
+-                    if (worldIn.rand.nextInt(15) <= i)
+-                    {
+-                        spawnAsEntity(worldIn, pos, new ItemStack(this.getSeed(), 1, 0));
+-                    }
+-                }
+-            }
+-        }
+     }
+ 
+     public Item getItemDropped(IBlockState state, Random rand, int fortune)
+@@ -202,4 +184,26 @@
+     {
+         return new BlockState(this, new IProperty[] {AGE});
+     }
+
+    @Override
+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
+        int age = ((Integer)state.getValue(AGE)).intValue();
+        Random rand = world instanceof World ? ((World)world).rand : new Random();
+
+        if (age >= 7)
+        {
+            int k = 3 + fortune;
+
+            for (int i = 0; i < 3 + fortune; ++i)
+            {
+                if (rand.nextInt(15) <= age)
+                {
+                    ret.add(new ItemStack(this.getSeed(), 1, 0));
+                }
+            }
+        }
+        return ret;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockDeadBush.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockDeadBush.java.patch
@ -0,0 +1,33 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
+++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
+@@ -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
+ {
+     protected BlockDeadBush()
+     {
+@@ -45,14 +45,15 @@
+ 
+     public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+     {
+-        if (!worldIn.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
+         {
+-            player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+-            spawnAsEntity(worldIn, pos, new ItemStack(Blocks.deadbush, 1, 0));
+-        }
+-        else
+-        {
+             super.harvestBlock(worldIn, player, pos, state, te);
+         }
+     }
+
+    @Override public boolean isShearable(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
+    @Override
+    public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
+    {
+        return new java.util.ArrayList<ItemStack>(java.util.Arrays.asList(new ItemStack(Blocks.deadbush)));
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockDoor.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockDoor.java.patch
@ -0,0 +1,20 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
+@@ -154,7 +154,7 @@
+     {
+         if (this.blockMaterial == Material.iron)
+         {
+-            return true;
+            return false; //Allow items to interact with the door
+         }
+         else
+         {
+@@ -272,7 +272,7 @@
+ 
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+     {
+-        return pos.getY() >= 255 ? false : World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && super.canPlaceBlockAt(worldIn, pos) && super.canPlaceBlockAt(worldIn, pos.up());
+        return pos.getY() >= worldIn.getHeight() - 1 ? false : World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && super.canPlaceBlockAt(worldIn, pos) && super.canPlaceBlockAt(worldIn, pos.up());
+     }
+ 
+     public int getMobilityFlag()
--- a/patches.mcp/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
@ -0,0 +1,89 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
+++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
+@@ -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<BlockDoublePlant.EnumPlantType> VARIANT = PropertyEnum.<BlockDoublePlant.EnumPlantType>create("variant", BlockDoublePlant.EnumPlantType.class);
+     public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> HALF = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>create("half", BlockDoublePlant.EnumBlockHalf.class);
+@@ -90,6 +90,8 @@
+             Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock());
+             Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this);
+ 
+            if (!flag) this.dropBlockAsItem(worldIn, pos, state, 0); //Forge move above the setting to air.
+
+             if (block == this)
+             {
+                 worldIn.setBlockState(blockpos, Blocks.air.getDefaultState(), 2);
+@@ -98,17 +100,13 @@
+             if (block1 == this)
+             {
+                 worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 3);
+-
+-                if (!flag)
+-                {
+-                    this.dropBlockAsItem(worldIn, blockpos1, state, 0);
+-                }
+             }
+         }
+     }
+ 
+     public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
+     {
+        if (state.getBlock() != this) return super.canBlockStay(worldIn, pos, state); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
+         if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER)
+         {
+             return worldIn.getBlockState(pos.down()).getBlock() == this;
+@@ -158,7 +156,6 @@
+ 
+     public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+     {
+-        if (worldIn.isRemote || player.getCurrentEquippedItem() == null || player.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) != BlockDoublePlant.EnumBlockHalf.LOWER || !this.onHarvest(worldIn, pos, state, player))
+         {
+             super.harvestBlock(worldIn, player, pos, state, te);
+         }
+@@ -221,8 +218,6 @@
+         else
+         {
+             player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+-            int i = (blockdoubleplant$enumplanttype == BlockDoublePlant.EnumPlantType.GRASS ? BlockTallGrass.EnumType.GRASS : BlockTallGrass.EnumType.FERN).getMeta();
+-            spawnAsEntity(worldIn, pos, new ItemStack(Blocks.tallgrass, 2, i));
+             return true;
+         }
+     }
+@@ -293,6 +288,32 @@
+         return Block.EnumOffsetType.XZ;
+     }
+ 
+    @Override
+    public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos)
+    {
+        IBlockState state = world.getBlockState(pos);
+        EnumPlantType type = (EnumPlantType)state.getValue(VARIANT);
+        return state.getValue(HALF) == EnumBlockHalf.LOWER && (type == EnumPlantType.FERN || type == EnumPlantType.GRASS);
+    }
+    @Override
+    public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
+    {
+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        EnumPlantType type = (EnumPlantType)world.getBlockState(pos).getValue(VARIANT);
+        if (type == EnumPlantType.FERN) ret.add(new ItemStack(Blocks.tallgrass, 2, BlockTallGrass.EnumType.FERN.getMeta()));
+        if (type == EnumPlantType.GRASS) ret.add(new ItemStack(Blocks.tallgrass, 2, BlockTallGrass.EnumType.GRASS.getMeta()));
+        return ret;
+    }
+    @Override
+    public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
+    {
+        //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames.
+        IBlockState state = world.getBlockState(pos);
+        if (state.getBlock() ==  this && state.getValue(HALF) == EnumBlockHalf.LOWER && world.getBlockState(pos.up()).getBlock() == this)
+            world.setBlockToAir(pos.up());
+        return world.setBlockToAir(pos);
+    }
+
+     public static enum EnumBlockHalf implements IStringSerializable
+     {
+         UPPER,
--- a/patches.mcp/minecraft/net/minecraft/block/BlockDropper.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockDropper.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
+++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
+@@ -43,7 +43,7 @@
+             {
+                 ItemStack itemstack = tileentitydispenser.getStackInSlot(i);
+ 
+-                if (itemstack != null)
+                if (itemstack != null && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(worldIn, pos, tileentitydispenser, i, itemstack))
+                 {
+                     EnumFacing enumfacing = (EnumFacing)worldIn.getBlockState(pos).getValue(FACING);
+                     BlockPos blockpos = pos.offset(enumfacing);
--- a/patches.mcp/minecraft/net/minecraft/block/BlockFalling.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockFalling.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
+@@ -86,6 +86,7 @@
+ 
+     public static boolean canFallInto(World worldIn, BlockPos pos)
+     {
+        if (worldIn.isAirBlock(pos)) return true;
+         Block block = worldIn.getBlockState(pos).getBlock();
+         Material material = block.blockMaterial;
+         return block == Blocks.fire || material == Material.air || material == Material.water || material == Material.lava;
--- a/patches.mcp/minecraft/net/minecraft/block/BlockFarmland.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockFarmland.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
+@@ -89,7 +89,7 @@
+     private boolean hasCrops(World worldIn, BlockPos pos)
+     {
+         Block block = worldIn.getBlockState(pos.up()).getBlock();
+-        return block instanceof BlockCrops || block instanceof BlockStem;
+        return block instanceof net.minecraftforge.common.IPlantable && canSustainPlant(worldIn, pos, net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)block);
+     }
+ 
+     private boolean hasWater(World worldIn, BlockPos pos)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockFire.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockFire.java.patch
@ -0,0 +1,211 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockFire.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
+@@ -41,18 +41,24 @@
+         int j = pos.getY();
+         int k = pos.getZ();
+ 
+-        if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && !Blocks.fire.canCatchFire(worldIn, pos.down()))
+        if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && !Blocks.fire.canCatchFire(worldIn, pos.down(), EnumFacing.UP))
+         {
+             boolean flag = (i + j + k & 1) == 1;
+             boolean flag1 = (i / 2 + j / 2 + k / 2 & 1) == 1;
+             int l = 0;
+ 
+-            if (this.canCatchFire(worldIn, pos.up()))
+            if (this.canCatchFire(worldIn, pos.up(), EnumFacing.DOWN))
+             {
+                 l = flag ? 1 : 2;
+             }
+ 
+-            return state.withProperty(NORTH, Boolean.valueOf(this.canCatchFire(worldIn, pos.north()))).withProperty(EAST, Boolean.valueOf(this.canCatchFire(worldIn, pos.east()))).withProperty(SOUTH, Boolean.valueOf(this.canCatchFire(worldIn, pos.south()))).withProperty(WEST, Boolean.valueOf(this.canCatchFire(worldIn, pos.west()))).withProperty(UPPER, Integer.valueOf(l)).withProperty(FLIP, Boolean.valueOf(flag1)).withProperty(ALT, Boolean.valueOf(flag));
+            return state.withProperty(NORTH, Boolean.valueOf(this.canCatchFire(worldIn, pos.north(), EnumFacing.SOUTH)))
+                        .withProperty(EAST, Boolean.valueOf(this.canCatchFire(worldIn, pos.east(),  EnumFacing.EAST )))
+                        .withProperty(SOUTH, Boolean.valueOf(this.canCatchFire(worldIn, pos.south(), EnumFacing.NORTH)))
+                        .withProperty(WEST, Boolean.valueOf(this.canCatchFire(worldIn, pos.west(),  EnumFacing.EAST )))
+                        .withProperty(UPPER, Integer.valueOf(l))
+                        .withProperty(FLIP, Boolean.valueOf(flag1))
+                        .withProperty(ALT, Boolean.valueOf(flag));
+         }
+         else
+         {
+@@ -108,6 +114,7 @@
+ 
+     public void setFireInfo(Block blockIn, int encouragement, int flammability)
+     {
+        if (blockIn == Blocks.air) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
+         this.encouragements.put(blockIn, Integer.valueOf(encouragement));
+         this.flammabilities.put(blockIn, Integer.valueOf(flammability));
+     }
+@@ -147,13 +154,8 @@
+             }
+ 
+             Block block = worldIn.getBlockState(pos.down()).getBlock();
+-            boolean flag = block == Blocks.netherrack;
+            boolean flag = block.isFireSource(worldIn, pos.down(), EnumFacing.UP);
+ 
+-            if (worldIn.provider instanceof WorldProviderEnd && block == Blocks.bedrock)
+-            {
+-                flag = true;
+-            }
+-
+             if (!flag && worldIn.isRaining() && this.canDie(worldIn, pos))
+             {
+                 worldIn.setBlockToAir(pos);
+@@ -182,7 +184,7 @@
+                         return;
+                     }
+ 
+-                    if (!this.canCatchFire(worldIn, pos.down()) && i == 15 && rand.nextInt(4) == 0)
+                    if (!this.canCatchFire(worldIn, pos.down(), EnumFacing.UP) && i == 15 && rand.nextInt(4) == 0)
+                     {
+                         worldIn.setBlockToAir(pos);
+                         return;
+@@ -197,12 +199,12 @@
+                     j = -50;
+                 }
+ 
+-                this.catchOnFire(worldIn, pos.east(), 300 + j, rand, i);
+-                this.catchOnFire(worldIn, pos.west(), 300 + j, rand, i);
+-                this.catchOnFire(worldIn, pos.down(), 250 + j, rand, i);
+-                this.catchOnFire(worldIn, pos.up(), 250 + j, rand, i);
+-                this.catchOnFire(worldIn, pos.north(), 300 + j, rand, i);
+-                this.catchOnFire(worldIn, pos.south(), 300 + j, rand, i);
+                this.tryCatchFire(worldIn, pos.east(), 300 + j, rand, i, EnumFacing.WEST);
+                this.tryCatchFire(worldIn, pos.west(), 300 + j, rand, i, EnumFacing.EAST);
+                this.tryCatchFire(worldIn, pos.down(), 250 + j, rand, i, EnumFacing.UP);
+                this.tryCatchFire(worldIn, pos.up(), 250 + j, rand, i, EnumFacing.DOWN);
+                this.tryCatchFire(worldIn, pos.north(), 300 + j, rand, i, EnumFacing.SOUTH);
+                this.tryCatchFire(worldIn, pos.south(), 300 + j, rand, i, EnumFacing.NORTH);
+ 
+                 for (int k = -1; k <= 1; ++k)
+                 {
+@@ -261,22 +263,30 @@
+         return false;
+     }
+ 
+    @Deprecated // Use Block.getFlammability
+     public int getFlammability(Block blockIn)
+     {
+         Integer integer = (Integer)this.flammabilities.get(blockIn);
+         return integer == null ? 0 : integer.intValue();
+     }
+ 
+    @Deprecated // Use Block.getFlammability
+     public int getEncouragement(Block blockIn)
+     {
+         Integer integer = (Integer)this.encouragements.get(blockIn);
+         return integer == null ? 0 : integer.intValue();
+     }
+ 
+    @Deprecated // Use tryCatchFire with face below
+     private void catchOnFire(World worldIn, BlockPos pos, int chance, Random random, int age)
+     {
+-        int i = this.getFlammability(worldIn.getBlockState(pos).getBlock());
+        this.tryCatchFire(worldIn, pos, chance, random, age, EnumFacing.UP);
+    }
+ 
+    private void tryCatchFire(World worldIn, BlockPos pos, int chance, Random random, int age, EnumFacing face)
+    {
+        int i = worldIn.getBlockState(pos).getBlock().getFlammability(worldIn, pos, face);
+
+         if (random.nextInt(chance) < i)
+         {
+             IBlockState iblockstate = worldIn.getBlockState(pos);
+@@ -308,7 +318,7 @@
+     {
+         for (EnumFacing enumfacing : EnumFacing.values())
+         {
+-            if (this.canCatchFire(worldIn, pos.offset(enumfacing)))
+            if (this.canCatchFire(worldIn, pos.offset(enumfacing), enumfacing.getOpposite()))
+             {
+                 return true;
+             }
+@@ -329,7 +339,7 @@
+ 
+             for (EnumFacing enumfacing : EnumFacing.values())
+             {
+-                i = Math.max(this.getEncouragement(worldIn.getBlockState(pos.offset(enumfacing)).getBlock()), i);
+                i = Math.max(worldIn.getBlockState(pos.offset(enumfacing)).getBlock().getFlammability(worldIn, pos.offset(enumfacing), enumfacing.getOpposite()), i);
+             }
+ 
+             return i;
+@@ -341,9 +351,10 @@
+         return false;
+     }
+ 
+    @Deprecated // Use canCatchFire with face sensitive version below
+     public boolean canCatchFire(IBlockAccess worldIn, BlockPos pos)
+     {
+-        return this.getEncouragement(worldIn.getBlockState(pos).getBlock()) > 0;
+        return canCatchFire(worldIn, pos, EnumFacing.UP);
+     }
+ 
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+@@ -382,9 +393,9 @@
+             worldIn.playSound((double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), "fire.fire", 1.0F + rand.nextFloat(), rand.nextFloat() * 0.7F + 0.3F, false);
+         }
+ 
+-        if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && !Blocks.fire.canCatchFire(worldIn, pos.down()))
+        if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && !Blocks.fire.canCatchFire(worldIn, pos.down(), EnumFacing.UP))
+         {
+-            if (Blocks.fire.canCatchFire(worldIn, pos.west()))
+            if (Blocks.fire.canCatchFire(worldIn, pos.west(), EnumFacing.EAST))
+             {
+                 for (int j = 0; j < 2; ++j)
+                 {
+@@ -395,7 +406,7 @@
+                 }
+             }
+ 
+-            if (Blocks.fire.canCatchFire(worldIn, pos.east()))
+            if (Blocks.fire.canCatchFire(worldIn, pos.east(), EnumFacing.WEST))
+             {
+                 for (int k = 0; k < 2; ++k)
+                 {
+@@ -406,7 +417,7 @@
+                 }
+             }
+ 
+-            if (Blocks.fire.canCatchFire(worldIn, pos.north()))
+            if (Blocks.fire.canCatchFire(worldIn, pos.north(), EnumFacing.SOUTH))
+             {
+                 for (int l = 0; l < 2; ++l)
+                 {
+@@ -417,7 +428,7 @@
+                 }
+             }
+ 
+-            if (Blocks.fire.canCatchFire(worldIn, pos.south()))
+            if (Blocks.fire.canCatchFire(worldIn, pos.south(), EnumFacing.NORTH))
+             {
+                 for (int i1 = 0; i1 < 2; ++i1)
+                 {
+@@ -428,7 +439,7 @@
+                 }
+             }
+ 
+-            if (Blocks.fire.canCatchFire(worldIn, pos.up()))
+            if (Blocks.fire.canCatchFire(worldIn, pos.up(), EnumFacing.DOWN))
+             {
+                 for (int j1 = 0; j1 < 2; ++j1)
+                 {
+@@ -476,4 +487,19 @@
+     {
+         return new BlockState(this, new IProperty[] {AGE, NORTH, EAST, SOUTH, WEST, UPPER, FLIP, ALT});
+     }
+
+    /*================================= Forge Start ======================================*/
+    /**
+     * Side sensitive version that calls the block function.
+     *
+     * @param world The current world
+     * @param pos Block position
+     * @param face The side the fire is coming from
+     * @return True if the face can catch fire.
+     */
+    public boolean canCatchFire(IBlockAccess world, BlockPos pos, EnumFacing face)
+    {
+        return world.getBlockState(pos).getBlock().isFlammable(world, pos, face);
+    }
+    /*================================= Forge Start ======================================*/
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockFlowerPot.java.patch
@ -0,0 +1,48 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
+@@ -169,13 +169,6 @@
+ 
+     public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+     {
+-        TileEntityFlowerPot tileentityflowerpot = this.getTileEntity(worldIn, pos);
+-
+-        if (tileentityflowerpot != null && tileentityflowerpot.getFlowerPotItem() != null)
+-        {
+-            spawnAsEntity(worldIn, pos, new ItemStack(tileentityflowerpot.getFlowerPotItem(), 1, tileentityflowerpot.getFlowerPotData()));
+-        }
+-
+         super.breakBlock(worldIn, pos, state);
+     }
+ 
+@@ -395,6 +388,31 @@
+         return EnumWorldBlockLayer.CUTOUT;
+     }
+ 
+
+    /*============================FORGE START=====================================*/
+    @Override
+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
+        TileEntityFlowerPot te = world.getTileEntity(pos) instanceof TileEntityFlowerPot ? (TileEntityFlowerPot)world.getTileEntity(pos) : null;
+        if (te != null && te.getFlowerPotItem() != null)
+            ret.add(new ItemStack(te.getFlowerPotItem(), 1, te.getFlowerPotData()));
+        return ret;
+    }
+    @Override
+    public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
+    {
+        if (willHarvest) return true; //If it will harvest, delay deletion of the block until after getDrops
+        return super.removedByPlayer(world, pos, player, willHarvest);
+    }
+    @Override
+    public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+    {
+        super.harvestBlock(world, player, pos, state, te);
+        world.setBlockToAir(pos);
+    }
+    /*===========================FORGE END==========================================*/
+
+     public static enum EnumFlowerType implements IStringSerializable
+     {
+         EMPTY("empty"),
--- a/patches.mcp/minecraft/net/minecraft/block/BlockGrass.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockGrass.java.patch
@ -0,0 +1,29 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
+@@ -58,7 +58,7 @@
+     {
+         if (!worldIn.isRemote)
+         {
+-            if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getBlockState(pos.up()).getBlock().getLightOpacity() > 2)
+            if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getBlockState(pos.up()).getBlock().getLightOpacity(worldIn, pos.up()) > 2)
+             {
+                 worldIn.setBlockState(pos, Blocks.dirt.getDefaultState());
+             }
+@@ -72,7 +72,7 @@
+                         Block block = worldIn.getBlockState(blockpos.up()).getBlock();
+                         IBlockState iblockstate = worldIn.getBlockState(blockpos);
+ 
+-                        if (iblockstate.getBlock() == Blocks.dirt && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && worldIn.getLightFromNeighbors(blockpos.up()) >= 4 && block.getLightOpacity() <= 2)
+                        if (iblockstate.getBlock() == Blocks.dirt && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && worldIn.getLightFromNeighbors(blockpos.up()) >= 4 && block.getLightOpacity(worldIn, blockpos.up()) <= 2)
+                         {
+                             worldIn.setBlockState(blockpos, Blocks.grass.getDefaultState());
+                         }
+@@ -110,7 +110,7 @@
+             {
+                 if (j >= i / 16)
+                 {
+-                    if (worldIn.getBlockState(blockpos1).getBlock().blockMaterial == Material.air)
+                    if (worldIn.isAirBlock(blockpos1))
+                     {
+                         if (rand.nextInt(8) == 0)
+                         {
--- a/patches.mcp/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
@ -0,0 +1,23 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
+++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
+@@ -79,6 +79,20 @@
+         return new BlockState(this, new IProperty[] {VARIANT});
+     }
+ 
+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
+    {
+        IBlockState state = world.getBlockState(pos);
+        for (IProperty prop : (java.util.Set<IProperty>)state.getProperties().keySet())
+        {
+            if (prop.getName().equals("variant"))
+            {
+                world.setBlockState(pos, state.cycleProperty(prop));
+                return true;
+            }
+        }
+        return false;
+    }
+
+     public static enum EnumType implements IStringSerializable
+     {
+         NORTH_WEST(1, "north_west"),
--- a/patches.mcp/minecraft/net/minecraft/block/BlockIce.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockIce.java.patch
@ -0,0 +1,35 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockIce.java
+++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
+@@ -38,14 +38,17 @@
+         player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+         player.addExhaustion(0.025F);
+ 
+-        if (this.canSilkHarvest() && EnchantmentHelper.getSilkTouchModifier(player))
+        if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getSilkTouchModifier(player))
+         {
+            java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
+             ItemStack itemstack = this.createStackedBlock(state);
+ 
+-            if (itemstack != null)
+-            {
+-                spawnAsEntity(worldIn, pos, itemstack);
+-            }
+            if (itemstack != null) items.add(itemstack);
+
+            net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, worldIn, pos, worldIn.getBlockState(pos), 0, 1.0f, true, player);
+
+            for (ItemStack is : items)
+                spawnAsEntity(worldIn, pos, is);
+         }
+         else
+         {
+@@ -56,7 +59,9 @@
+             }
+ 
+             int i = EnchantmentHelper.getFortuneModifier(player);
+            harvesters.set(player);
+             this.dropBlockAsItem(worldIn, pos, state, i);
+            harvesters.set(null);
+             Material material = worldIn.getBlockState(pos.down()).getBlock().getMaterial();
+ 
+             if (material.blocksMovement() || material.isLiquid())
--- a/patches.mcp/minecraft/net/minecraft/block/BlockLadder.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockLadder.java.patch
@ -0,0 +1,30 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
+@@ -78,7 +78,10 @@
+ 
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+     {
+-        return worldIn.getBlockState(pos.west()).getBlock().isNormalCube() ? true : (worldIn.getBlockState(pos.east()).getBlock().isNormalCube() ? true : (worldIn.getBlockState(pos.north()).getBlock().isNormalCube() ? true : worldIn.getBlockState(pos.south()).getBlock().isNormalCube()));
+        return worldIn.isSideSolid(pos.west(), EnumFacing.EAST, true) ||
+               worldIn.isSideSolid(pos.east(), EnumFacing.WEST, true) ||
+               worldIn.isSideSolid(pos.north(), EnumFacing.SOUTH, true) ||
+               worldIn.isSideSolid(pos.south(), EnumFacing.NORTH, true);
+     }
+ 
+     public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+@@ -116,7 +119,7 @@
+ 
+     protected boolean canBlockStay(World worldIn, BlockPos pos, EnumFacing facing)
+     {
+-        return worldIn.getBlockState(pos.offset(facing.getOpposite())).getBlock().isNormalCube();
+        return worldIn.isSideSolid(pos.offset(facing.getOpposite()), facing, true);
+     }
+ 
+     public IBlockState getStateFromMeta(int meta)
+@@ -146,4 +149,6 @@
+     {
+         return new BlockState(this, new IProperty[] {FACING});
+     }
+
+    @Override public boolean isLadder(IBlockAccess world, BlockPos pos, EntityLivingBase entity) { return true; }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockLeaves.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockLeaves.java.patch
@ -0,0 +1,126 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
+@@ -18,7 +18,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-public abstract class BlockLeaves extends BlockLeavesBase
+public abstract class BlockLeaves extends BlockLeavesBase implements net.minecraftforge.common.IShearable
+ {
+     public static final PropertyBool DECAYABLE = PropertyBool.create("decayable");
+     public static final PropertyBool CHECK_DECAY = PropertyBool.create("check_decay");
+@@ -75,9 +75,9 @@
+                         BlockPos blockpos = pos.add(j1, k1, l1);
+                         IBlockState iblockstate = worldIn.getBlockState(blockpos);
+ 
+-                        if (iblockstate.getBlock().getMaterial() == Material.leaves && !((Boolean)iblockstate.getValue(CHECK_DECAY)).booleanValue())
+                        if (iblockstate.getBlock().isLeaves(worldIn, blockpos))
+                         {
+-                            worldIn.setBlockState(blockpos, iblockstate.withProperty(CHECK_DECAY, Boolean.valueOf(true)), 4);
+                            iblockstate.getBlock().beginLeavesDecay(worldIn, blockpos);
+                         }
+                     }
+                 }
+@@ -117,9 +117,9 @@
+                             {
+                                 Block block = worldIn.getBlockState(blockpos$mutableblockpos.set(k + i2, l + j2, i1 + k2)).getBlock();
+ 
+-                                if (block != Blocks.log && block != Blocks.log2)
+                                if (!block.canSustainLeaves(worldIn, blockpos$mutableblockpos.set(k + i2, l + j2, i1 + k2)))
+                                 {
+-                                    if (block.getMaterial() == Material.leaves)
+                                    if (block.isLeaves(worldIn, blockpos$mutableblockpos.set(k + i2, l + j2, i1 + k2)))
+                                     {
+                                         this.surroundings[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2;
+                                     }
+@@ -226,40 +226,7 @@
+ 
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+-        if (!worldIn.isRemote)
+-        {
+-            int i = this.getSaplingDropChance(state);
+-
+-            if (fortune > 0)
+-            {
+-                i -= 2 << fortune;
+-
+-                if (i < 10)
+-                {
+-                    i = 10;
+-                }
+-            }
+-
+-            if (worldIn.rand.nextInt(i) == 0)
+-            {
+-                Item item = this.getItemDropped(state, worldIn.rand, fortune);
+-                spawnAsEntity(worldIn, pos, new ItemStack(item, 1, this.damageDropped(state)));
+-            }
+-
+-            i = 200;
+-
+-            if (fortune > 0)
+-            {
+-                i -= 10 << fortune;
+-
+-                if (i < 40)
+-                {
+-                    i = 40;
+-                }
+-            }
+-
+-            this.dropApple(worldIn, pos, state, i);
+-        }
+        super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+     }
+ 
+     protected void dropApple(World worldIn, BlockPos pos, IBlockState state, int chance)
+@@ -296,4 +263,48 @@
+     }
+ 
+     public abstract BlockPlanks.EnumType getWoodType(int meta);
+
+    @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
+    @Override public boolean isLeaves(IBlockAccess world, BlockPos pos){ return true; }
+
+    @Override
+    public void beginLeavesDecay(World world, BlockPos pos)
+    {
+        IBlockState state = world.getBlockState(pos);
+        if (!(Boolean)state.getValue(CHECK_DECAY))
+        {
+            world.setBlockState(pos, state.withProperty(CHECK_DECAY, true), 4);
+        }
+    }
+
+    @Override
+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        Random rand = world instanceof World ? ((World)world).rand : new Random();
+        int chance = this.getSaplingDropChance(state);
+
+        if (fortune > 0)
+        {
+            chance -= 2 << fortune;
+            if (chance < 10) chance = 10;
+        }
+
+        if (rand.nextInt(chance) == 0)
+            ret.add(new ItemStack(getItemDropped(state, rand, fortune), 1, damageDropped(state)));
+
+        chance = 200;
+        if (fortune > 0)
+        {
+            chance -= 10 << fortune;
+            if (chance < 40) chance = 40;
+        }
+
+        this.captureDrops(true);
+        if (world instanceof World)
+            this.dropApple((World)world, pos, state, chance); // Dammet mojang
+        ret.addAll(this.captureDrops(false));
+        return ret;
+    }
+
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockLever.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockLever.java.patch
@ -0,0 +1,15 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockLever.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
+@@ -237,6 +237,12 @@
+         return new BlockState(this, new IProperty[] {FACING, POWERED});
+     }
+ 
+
+    private boolean canAttach(World world, BlockPos pos, EnumFacing side)
+    {
+        return world.isSideSolid(pos, side);
+    }
+
+     public static enum EnumOrientation implements IStringSerializable
+     {
+         DOWN_X(0, "down_x", EnumFacing.DOWN),
--- a/patches.mcp/minecraft/net/minecraft/block/BlockLog.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockLog.java.patch
@ -0,0 +1,24 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockLog.java
+++ ../src-work/minecraft/net/minecraft/block/BlockLog.java
+@@ -33,9 +33,9 @@
+             {
+                 IBlockState iblockstate = worldIn.getBlockState(blockpos);
+ 
+-                if (iblockstate.getBlock().getMaterial() == Material.leaves && !((Boolean)iblockstate.getValue(BlockLeaves.CHECK_DECAY)).booleanValue())
+                if (iblockstate.getBlock().isLeaves(worldIn, blockpos))
+                 {
+-                    worldIn.setBlockState(blockpos, iblockstate.withProperty(BlockLeaves.CHECK_DECAY, Boolean.valueOf(true)), 4);
+                    iblockstate.getBlock().beginLeavesDecay(worldIn, blockpos);
+                 }
+             }
+         }
+@@ -46,6 +46,9 @@
+         return super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(LOG_AXIS, BlockLog.EnumAxis.fromFacingAxis(facing.getAxis()));
+     }
+ 
+    @Override public boolean canSustainLeaves(net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
+    @Override public boolean isWood(net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
+
+     public static enum EnumAxis implements IStringSerializable
+     {
+         X("x"),
--- a/patches.mcp/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockMobSpawner.java.patch
@ -0,0 +1,19 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
+++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
+@@ -37,10 +37,14 @@
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+         super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+-        int i = 15 + worldIn.rand.nextInt(15) + worldIn.rand.nextInt(15);
+-        this.dropXpOnBlockBreak(worldIn, pos, i);
+     }
+ 
+    @Override
+    public int getExpDrop(net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
+    {
+        return 15 + RANDOM.nextInt(15) + RANDOM.nextInt(15);
+    }
+
+     public boolean isOpaqueCube()
+     {
+         return false;
--- a/patches.mcp/minecraft/net/minecraft/block/BlockMushroom.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockMushroom.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java
+++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java
+@@ -71,7 +71,7 @@
+         if (pos.getY() >= 0 && pos.getY() < 256)
+         {
+             IBlockState iblockstate = worldIn.getBlockState(pos.down());
+-            return iblockstate.getBlock() == Blocks.mycelium ? true : (iblockstate.getBlock() == Blocks.dirt && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL ? true : worldIn.getLight(pos) < 13 && this.canPlaceBlockOn(iblockstate.getBlock()));
+            return iblockstate.getBlock() == Blocks.mycelium ? true : (iblockstate.getBlock() == Blocks.dirt && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL ? true : worldIn.getLight(pos) < 13 && iblockstate.getBlock().canSustainPlant(worldIn, pos.down(), net.minecraft.util.EnumFacing.UP, this));
+         }
+         else
+         {
--- a/patches.mcp/minecraft/net/minecraft/block/BlockMycelium.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockMycelium.java.patch
@ -0,0 +1,20 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
+@@ -39,7 +39,7 @@
+     {
+         if (!worldIn.isRemote)
+         {
+-            if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getBlockState(pos.up()).getBlock().getLightOpacity() > 2)
+            if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getBlockState(pos.up()).getBlock().getLightOpacity(worldIn, pos.up()) > 2)
+             {
+                 worldIn.setBlockState(pos, Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
+             }
+@@ -53,7 +53,7 @@
+                         IBlockState iblockstate = worldIn.getBlockState(blockpos);
+                         Block block = worldIn.getBlockState(blockpos.up()).getBlock();
+ 
+-                        if (iblockstate.getBlock() == Blocks.dirt && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && worldIn.getLightFromNeighbors(blockpos.up()) >= 4 && block.getLightOpacity() <= 2)
+                        if (iblockstate.getBlock() == Blocks.dirt && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && worldIn.getLightFromNeighbors(blockpos.up()) >= 4 && block.getLightOpacity(worldIn, blockpos.up()) <= 2)
+                         {
+                             worldIn.setBlockState(blockpos, this.getDefaultState());
+                         }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockNetherWart.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockNetherWart.java.patch
@ -0,0 +1,49 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
+@@ -38,7 +38,7 @@
+ 
+     public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
+     {
+-        return this.canPlaceBlockOn(worldIn.getBlockState(pos.down()).getBlock());
+        return super.canBlockStay(worldIn, pos, state);
+     }
+ 
+     public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+@@ -54,9 +54,11 @@
+         super.updateTick(worldIn, pos, state, rand);
+     }
+ 
+    @SuppressWarnings("unused")
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+-        if (!worldIn.isRemote)
+        super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+        if (false && !worldIn.isRemote)
+         {
+             int i = 1;
+ 
+@@ -107,4 +109,24 @@
+     {
+         return new BlockState(this, new IProperty[] {AGE});
+     }
+
+    @Override
+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        Random rand = world instanceof World ? ((World)world).rand : new Random();
+        int count = 1;
+
+        if (((Integer)state.getValue(AGE)) >= 3)
+        {
+            count = 2 + rand.nextInt(3) + (fortune > 0 ? rand.nextInt(fortune + 1) : 0);
+        }
+
+        for (int i = 0; i < count; i++)
+        {
+            ret.add(new ItemStack(Items.nether_wart));
+        }
+
+        return ret;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockNewLeaf.java.patch
@ -0,0 +1,24 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
+@@ -99,14 +99,15 @@
+ 
+     public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+     {
+-        if (!worldIn.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
+         {
+-            player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+-            spawnAsEntity(worldIn, pos, new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(VARIANT)).getMetadata() - 4));
+-        }
+-        else
+-        {
+             super.harvestBlock(worldIn, player, pos, state, te);
+         }
+     }
+
+    @Override
+    public List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
+    {
+        IBlockState state = world.getBlockState(pos);
+        return new java.util.ArrayList(java.util.Arrays.asList(new ItemStack(this, 1, ((BlockPlanks.EnumType)state.getValue(VARIANT)).getMetadata() - 4)));
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockNote.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockNote.java.patch
@ -0,0 +1,23 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockNote.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
+@@ -58,7 +58,9 @@
+             if (tileentity instanceof TileEntityNote)
+             {
+                 TileEntityNote tileentitynote = (TileEntityNote)tileentity;
+                int old = tileentitynote.note;
+                 tileentitynote.changePitch();
+                if (old == tileentitynote.note) return false;
+                 tileentitynote.triggerNote(worldIn, pos);
+                 playerIn.triggerAchievement(StatList.field_181735_S);
+             }
+@@ -98,6 +100,10 @@
+ 
+     public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+     {
+        net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(worldIn, pos, state, eventParam, eventID);
+        if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(e)) return false;
+        eventID = e.instrument.ordinal();
+        eventParam = e.getVanillaNoteId();
+         float f = (float)Math.pow(2.0D, (double)(eventParam - 12) / 12.0D);
+         worldIn.playSoundEffect((double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, "note." + this.getInstrument(eventID), 3.0F, f);
+         worldIn.spawnParticle(EnumParticleTypes.NOTE, (double)pos.getX() + 0.5D, (double)pos.getY() + 1.2D, (double)pos.getZ() + 0.5D, (double)eventParam / 24.0D, 0.0D, 0.0D, new int[0]);
--- a/patches.mcp/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockOldLeaf.java.patch
@ -0,0 +1,21 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
+++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
+@@ -142,11 +142,17 @@
+         if (!worldIn.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
+         {
+             player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+-            spawnAsEntity(worldIn, pos, new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(VARIANT)).getMetadata()));
+         }
+         else
+         {
+             super.harvestBlock(worldIn, player, pos, state, te);
+         }
+     }
+
+    @Override
+    public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
+    {
+        IBlockState state = world.getBlockState(pos);
+        return new java.util.ArrayList(java.util.Arrays.asList(new ItemStack(this, 1, ((BlockPlanks.EnumType)state.getValue(VARIANT)).getMetadata())));
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockOre.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockOre.java.patch
@ -0,0 +1,51 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockOre.java
+++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
+@@ -58,34 +58,40 @@
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+         super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+-
+-        if (this.getItemDropped(state, worldIn.rand, fortune) != Item.getItemFromBlock(this))
+    }
+    @Override
+    public int getExpDrop(net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
+    {
+        IBlockState state = world.getBlockState(pos);
+        Random rand = world instanceof World ? ((World)world).rand : new Random();
+        if (this.getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this))
+         {
+             int i = 0;
+ 
+             if (this == Blocks.coal_ore)
+             {
+-                i = MathHelper.getRandomIntegerInRange(worldIn.rand, 0, 2);
+                i = MathHelper.getRandomIntegerInRange(rand, 0, 2);
+             }
+             else if (this == Blocks.diamond_ore)
+             {
+-                i = MathHelper.getRandomIntegerInRange(worldIn.rand, 3, 7);
+                i = MathHelper.getRandomIntegerInRange(rand, 3, 7);
+             }
+             else if (this == Blocks.emerald_ore)
+             {
+-                i = MathHelper.getRandomIntegerInRange(worldIn.rand, 3, 7);
+                i = MathHelper.getRandomIntegerInRange(rand, 3, 7);
+             }
+             else if (this == Blocks.lapis_ore)
+             {
+-                i = MathHelper.getRandomIntegerInRange(worldIn.rand, 2, 5);
+                i = MathHelper.getRandomIntegerInRange(rand, 2, 5);
+             }
+             else if (this == Blocks.quartz_ore)
+             {
+-                i = MathHelper.getRandomIntegerInRange(worldIn.rand, 2, 5);
+                i = MathHelper.getRandomIntegerInRange(rand, 2, 5);
+             }
+ 
+-            this.dropXpOnBlockBreak(worldIn, pos, i);
+            return i;
+         }
+        return 0;
+     }
+ 
+     public int getDamageValue(World worldIn, BlockPos pos)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockPane.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockPane.java.patch
@ -0,0 +1,41 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockPane.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
+@@ -38,7 +38,10 @@
+ 
+     public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+     {
+-        return state.withProperty(NORTH, Boolean.valueOf(this.canPaneConnectToBlock(worldIn.getBlockState(pos.north()).getBlock()))).withProperty(SOUTH, Boolean.valueOf(this.canPaneConnectToBlock(worldIn.getBlockState(pos.south()).getBlock()))).withProperty(WEST, Boolean.valueOf(this.canPaneConnectToBlock(worldIn.getBlockState(pos.west()).getBlock()))).withProperty(EAST, Boolean.valueOf(this.canPaneConnectToBlock(worldIn.getBlockState(pos.east()).getBlock())));
+        return state.withProperty(NORTH, canPaneConnectTo(worldIn, pos, EnumFacing.NORTH))
+                .withProperty(SOUTH, canPaneConnectTo(worldIn, pos, EnumFacing.SOUTH))
+                .withProperty(WEST, canPaneConnectTo(worldIn, pos, EnumFacing.WEST))
+                .withProperty(EAST, canPaneConnectTo(worldIn, pos, EnumFacing.EAST));
+     }
+ 
+     public Item getItemDropped(IBlockState state, Random rand, int fortune)
+@@ -64,10 +67,10 @@
+ 
+     public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
+     {
+-        boolean flag = this.canPaneConnectToBlock(worldIn.getBlockState(pos.north()).getBlock());
+-        boolean flag1 = this.canPaneConnectToBlock(worldIn.getBlockState(pos.south()).getBlock());
+-        boolean flag2 = this.canPaneConnectToBlock(worldIn.getBlockState(pos.west()).getBlock());
+-        boolean flag3 = this.canPaneConnectToBlock(worldIn.getBlockState(pos.east()).getBlock());
+        boolean flag = this.canPaneConnectTo(worldIn, pos, EnumFacing.NORTH);
+        boolean flag1 = this.canPaneConnectTo(worldIn, pos, EnumFacing.SOUTH);
+        boolean flag2 = this.canPaneConnectTo(worldIn, pos, EnumFacing.WEST);
+        boolean flag3 = this.canPaneConnectTo(worldIn, pos, EnumFacing.EAST);
+ 
+         if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1))
+         {
+@@ -186,4 +189,11 @@
+     {
+         return new BlockState(this, new IProperty[] {NORTH, EAST, WEST, SOUTH});
+     }
+
+    public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir)
+    {
+        BlockPos off = pos.offset(dir);
+        Block block = world.getBlockState(off).getBlock();
+        return canPaneConnectToBlock(block) || block.isSideSolid(world, off, dir.getOpposite());
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockPistonBase.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockPistonBase.java.patch
@ -0,0 +1,31 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
+@@ -189,7 +189,7 @@
+                     }
+                 }
+ 
+-                if (!flag1 && block.getMaterial() != Material.air && canPush(block, worldIn, blockpos, enumfacing.getOpposite(), false) && (block.getMobilityFlag() == 0 || block == Blocks.piston || block == Blocks.sticky_piston))
+                if (!flag1 && !block.isAir(worldIn, blockpos) && canPush(block, worldIn, blockpos, enumfacing.getOpposite(), false) && (block.getMobilityFlag() == 0 || block == Blocks.piston || block == Blocks.sticky_piston))
+                 {
+                     this.doMove(worldIn, pos, enumfacing, false);
+                 }
+@@ -333,7 +333,7 @@
+                     return false;
+                 }
+ 
+-                return !(blockIn instanceof ITileEntityProvider);
+                return !(blockIn.hasTileEntity(worldIn.getBlockState(pos)));
+             }
+             else
+             {
+@@ -371,7 +371,9 @@
+             {
+                 BlockPos blockpos = (BlockPos)list1.get(j);
+                 Block block = worldIn.getBlockState(blockpos).getBlock();
+-                block.dropBlockAsItem(worldIn, blockpos, worldIn.getBlockState(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.dropBlockAsItemWithChance(worldIn, blockpos, worldIn.getBlockState(blockpos), chance, 0);
+                 worldIn.setBlockToAir(blockpos);
+                 --i;
+                 ablock[i] = block;
--- a/patches.mcp/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockPistonMoving.java.patch
@ -0,0 +1,37 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
+@@ -109,16 +109,7 @@
+ 
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+-        if (!worldIn.isRemote)
+-        {
+-            TileEntityPiston tileentitypiston = this.getTileEntity(worldIn, pos);
+-
+-            if (tileentitypiston != null)
+-            {
+-                IBlockState iblockstate = tileentitypiston.getPistonState();
+-                iblockstate.getBlock().dropBlockAsItem(worldIn, pos, iblockstate, 0);
+-            }
+-        }
+        super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+     }
+ 
+     public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+@@ -282,4 +273,16 @@
+     {
+         return new BlockState(this, new IProperty[] {FACING, TYPE});
+     }
+
+    @Override
+    public java.util.List<net.minecraft.item.ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        TileEntityPiston tileentitypiston = this.getTileEntity(world, pos);
+        if (tileentitypiston != null)
+        {
+            IBlockState pushed = tileentitypiston.getPistonState();
+            return pushed.getBlock().getDrops(world, pos, pushed, fortune);
+        }
+        return new java.util.ArrayList();
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockPotato.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockPotato.java.patch
@ -0,0 +1,25 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockPotato.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPotato.java
+@@ -22,13 +22,14 @@
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+         super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+-
+-        if (!worldIn.isRemote)
+-        {
+-            if (((Integer)state.getValue(AGE)).intValue() >= 7 && worldIn.rand.nextInt(50) == 0)
+-            {
+-                spawnAsEntity(worldIn, pos, new ItemStack(Items.poisonous_potato));
+-            }
+-        }
+     }
+    @Override
+    public java.util.List<net.minecraft.item.ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
+        java.util.Random rand = world instanceof World ? ((World)world).rand : new java.util.Random();
+        if (((Integer)state.getValue(AGE)) >= 7 && rand.nextInt(50) == 0)
+            ret.add(new ItemStack(Items.poisonous_potato));
+        return ret;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockPumpkin.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockPumpkin.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
+++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
+@@ -115,7 +115,7 @@
+ 
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+     {
+-        return worldIn.getBlockState(pos).getBlock().blockMaterial.isReplaceable() && World.doesBlockHaveSolidTopSurface(worldIn, pos.down());
+        return worldIn.getBlockState(pos).getBlock().isReplaceable(worldIn, pos) && World.doesBlockHaveSolidTopSurface(worldIn, pos.down());
+     }
+ 
+     public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockQuartz.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockQuartz.java.patch
@ -0,0 +1,29 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java
+++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java
+@@ -90,6 +90,26 @@
+         return new BlockState(this, new IProperty[] {VARIANT});
+     }
+ 
+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
+    {
+        IBlockState state = world.getBlockState(pos);
+        for (IProperty prop : (java.util.Set<IProperty>)state.getProperties().keySet())
+        {
+            if (prop.getName().equals("variant") && prop.getValueClass() == EnumType.class)
+            {
+                EnumType current = (EnumType)state.getValue(prop);
+                EnumType next = current == EnumType.LINES_X ? EnumType.LINES_Y :
+                                current == EnumType.LINES_Y ? EnumType.LINES_Z :
+                                current == EnumType.LINES_Z ? EnumType.LINES_X : current;
+                if (next == current)
+                    return false;
+                world.setBlockState(pos, state.withProperty(prop, next));
+                return true;
+            }
+        }
+        return false;
+    }
+
+     public static enum EnumType implements IStringSerializable
+     {
+         DEFAULT(0, "default", "default"),
--- a/patches.mcp/minecraft/net/minecraft/block/BlockRailBase.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockRailBase.java.patch
@ -0,0 +1,147 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
+@@ -31,7 +31,7 @@
+     public static boolean isRailBlock(IBlockState state)
+     {
+         Block block = state.getBlock();
+-        return block == Blocks.rail || block == Blocks.golden_rail || block == Blocks.detector_rail || block == Blocks.activator_rail;
+        return block instanceof BlockRailBase;
+     }
+ 
+     protected BlockRailBase(boolean isPowered)
+@@ -175,6 +175,81 @@
+ 
+     public abstract IProperty<BlockRailBase.EnumRailDirection> getShapeProperty();
+ 
+    /* ======================================== FORGE START =====================================*/
+    /**
+     * Return true if the rail can make corners.
+     * Used by placement logic.
+     * @param world The world.
+     * @param pod Block's position in world
+     * @return True if the rail can make corners.
+     */
+    public boolean isFlexibleRail(IBlockAccess world, BlockPos pos)
+    {
+        return !this.isPowered;
+    }
+
+    /**
+     * Returns true if the rail can make up and down slopes.
+     * Used by placement logic.
+     * @param world The world.
+     * @param pod Block's position in world
+     * @return True if the rail can make slopes.
+     */
+    public boolean canMakeSlopes(IBlockAccess world, BlockPos pos)
+    {
+        return true;
+    }
+
+    /**
+     * Returns the max speed of the rail at the specified position.
+     * @param world The world.
+     * @param cart The cart on the rail, may be null.
+     * @param pod Block's position in world
+     * @return The max speed of the current rail.
+     */
+    public float getRailMaxSpeed(World world, net.minecraft.entity.item.EntityMinecart cart, BlockPos pos)
+    {
+        return 0.4f;
+    }
+
+    /**
+     * This function is called by any minecart that passes over this rail.
+     * It is called once per update tick that the minecart is on the rail.
+     * @param world The world.
+     * @param cart The cart on the rail.
+     * @param pod Block's position in world
+     */
+    public void onMinecartPass(World world, net.minecraft.entity.item.EntityMinecart cart, BlockPos pos)
+    {
+    }
+
+    /**
+     * Rotate the block. For vanilla blocks this rotates around the axis passed in (generally, it should be the "face" that was hit).
+     * Note: for mod blocks, this is up to the block and modder to decide. It is not mandated that it be a rotation around the
+     * face, but could be a rotation to orient *to* that face, or a visiting of possible rotations.
+     * The method should return true if the rotation was successful though.
+     *
+     * @param world The world
+     * @param pos Block position in world
+     * @param axis The axis to rotate around
+     * @return True if the rotation was successful, False if the rotation failed, or is not possible
+     */
+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
+    {
+        IBlockState state = world.getBlockState(pos);
+        for (IProperty prop : (java.util.Set<IProperty>)state.getProperties().keySet())
+        {
+            if (prop.getName().equals("shape"))
+            {
+                world.setBlockState(pos, state.cycleProperty(prop));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /* ======================================== FORGE END =====================================*/
+
+     public static enum EnumRailDirection implements IStringSerializable
+     {
+         NORTH_SOUTH(0, "north_south"),
+@@ -245,6 +320,7 @@
+         private IBlockState state;
+         private final boolean isPowered;
+         private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
+        private final boolean canMakeSlopes;
+ 
+         public Rail(World worldIn, BlockPos pos, IBlockState state)
+         {
+@@ -253,7 +329,8 @@
+             this.state = state;
+             this.block = (BlockRailBase)state.getBlock();
+             BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)state.getValue(BlockRailBase.this.getShapeProperty());
+-            this.isPowered = this.block.isPowered;
+            this.isPowered = !this.block.isFlexibleRail(worldIn, pos);
+            canMakeSlopes = this.block.canMakeSlopes(worldIn, pos);
+             this.func_180360_a(blockrailbase$enumraildirection);
+         }
+ 
+@@ -439,7 +516,7 @@
+                 }
+             }
+ 
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
+             {
+                 if (BlockRailBase.isRailBlock(this.world, blockpos.up()))
+                 {
+@@ -452,7 +529,7 @@
+                 }
+             }
+ 
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
+             {
+                 if (BlockRailBase.isRailBlock(this.world, blockpos3.up()))
+                 {
+@@ -595,7 +672,7 @@
+                 }
+             }
+ 
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
+             {
+                 if (BlockRailBase.isRailBlock(this.world, blockpos.up()))
+                 {
+@@ -608,7 +685,7 @@
+                 }
+             }
+ 
+-            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
+             {
+                 if (BlockRailBase.isRailBlock(this.world, blockpos3.up()))
+                 {
--- a/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
@ -0,0 +1,24 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
+@@ -295,6 +295,21 @@
+         return this.getDefaultState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()).withProperty(POWERED, Boolean.valueOf(false)).withProperty(MODE, BlockRedstoneComparator.Mode.COMPARE);
+     }
+ 
+    @Override
+    public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
+    {
+        if (pos.getY() == neighbor.getY() && world instanceof World)
+        {
+            onNeighborBlockChange((World)world, pos, world.getBlockState(pos), world.getBlockState(neighbor).getBlock());
+        }
+    }
+
+    @Override
+    public boolean getWeakChanges(IBlockAccess world, BlockPos pos)
+    {
+        return true;
+    }
+
+     public static enum Mode implements IStringSerializable
+     {
+         COMPARE("compare"),
--- a/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneDiode.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneDiode.java
+@@ -198,6 +198,8 @@
+     {
+         EnumFacing enumfacing = (EnumFacing)state.getValue(FACING);
+         BlockPos blockpos = pos.offset(enumfacing.getOpposite());
+        if(net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(worldIn, pos, worldIn.getBlockState(pos), java.util.EnumSet.of(enumfacing.getOpposite())).isCanceled())
+            return;
+         worldIn.notifyBlockOfStateChange(blockpos, this);
+         worldIn.notifyNeighborsOfStateExcept(blockpos, this, enumfacing);
+     }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
@ -0,0 +1,22 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
+@@ -91,12 +91,16 @@
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+         super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    }
+ 
+-        if (this.getItemDropped(state, worldIn.rand, fortune) != Item.getItemFromBlock(this))
+    @Override
+    public int getExpDrop(net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
+    {
+        if (this.getItemDropped(world.getBlockState(pos), RANDOM, fortune) != Item.getItemFromBlock(this))
+         {
+-            int i = 1 + worldIn.rand.nextInt(5);
+-            this.dropXpOnBlockBreak(worldIn, pos, i);
+            return 1 + RANDOM.nextInt(5);
+         }
+        return 0;
+     }
+ 
+     @SideOnly(Side.CLIENT)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
@ -0,0 +1,59 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneWire.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneWire.java
+@@ -58,10 +58,10 @@
+         BlockPos blockpos = pos.offset(direction);
+         Block block = worldIn.getBlockState(pos.offset(direction)).getBlock();
+ 
+-        if (!canConnectTo(worldIn.getBlockState(blockpos), direction) && (block.isBlockNormalCube() || !canConnectUpwardsTo(worldIn.getBlockState(blockpos.down()))))
+        if (!canRestoneConnect(worldIn, blockpos, direction) && (block.isBlockNormalCube() || !canRestoneConnect(worldIn, blockpos.down(), null)))
+         {
+             Block block1 = worldIn.getBlockState(pos.up()).getBlock();
+-            return !block1.isBlockNormalCube() && block.isBlockNormalCube() && canConnectUpwardsTo(worldIn.getBlockState(blockpos.up())) ? BlockRedstoneWire.EnumAttachPosition.UP : BlockRedstoneWire.EnumAttachPosition.NONE;
+            return !block1.isBlockNormalCube() && block.isBlockNormalCube() && canRestoneConnect(worldIn, blockpos.up(), null) ? BlockRedstoneWire.EnumAttachPosition.UP : BlockRedstoneWire.EnumAttachPosition.NONE;
+         }
+         else
+         {
+@@ -359,35 +359,24 @@
+         Block block = iblockstate.getBlock();
+         boolean flag = block.isNormalCube();
+         boolean flag1 = worldIn.getBlockState(pos.up()).getBlock().isNormalCube();
+-        return !flag1 && flag && canConnectUpwardsTo(worldIn, blockpos.up()) ? true : (canConnectTo(iblockstate, side) ? true : (block == Blocks.powered_repeater && iblockstate.getValue(BlockRedstoneDiode.FACING) == side ? true : !flag && canConnectUpwardsTo(worldIn, blockpos.down())));
+        return !flag1 && flag && canRestoneConnect(worldIn, blockpos.up(), null) ? true : (canRestoneConnect(worldIn, blockpos, side) ? true : (block == Blocks.powered_repeater && iblockstate.getValue(BlockRedstoneDiode.FACING) == side ? true : !flag && canRestoneConnect(worldIn, blockpos.down(), null)));
+     }
+ 
+-    protected static boolean canConnectUpwardsTo(IBlockAccess worldIn, BlockPos pos)
+    protected static boolean canRestoneConnect(IBlockAccess world, BlockPos pos, EnumFacing side)
+     {
+-        return canConnectUpwardsTo(worldIn.getBlockState(pos));
+-    }
+-
+-    protected static boolean canConnectUpwardsTo(IBlockState state)
+-    {
+-        return canConnectTo(state, (EnumFacing)null);
+-    }
+-
+-    protected static boolean canConnectTo(IBlockState blockState, EnumFacing side)
+-    {
+-        Block block = blockState.getBlock();
+-
+-        if (block == Blocks.redstone_wire)
+        IBlockState state = world.getBlockState(pos);
+        if (state.getBlock() == Blocks.redstone_wire)
+         {
+             return true;
+         }
+-        else if (Blocks.unpowered_repeater.isAssociated(block))
+        else if (Blocks.unpowered_repeater.isAssociated(state.getBlock()))
+         {
+-            EnumFacing enumfacing = (EnumFacing)blockState.getValue(BlockRedstoneRepeater.FACING);
+-            return enumfacing == side || enumfacing.getOpposite() == side;
+            EnumFacing direction = (EnumFacing)state.getValue(BlockRedstoneRepeater.FACING);
+            return direction == side || direction.getOpposite() == side;
+         }
+         else
+         {
+-            return block.canProvidePower() && side != null;
+            return state.getBlock().canConnectRedstone(world, pos, side);
+         }
+     }
+ 
--- a/patches.mcp/minecraft/net/minecraft/block/BlockReed.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockReed.java.patch
@ -0,0 +1,35 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockReed.java
+++ ../src-work/minecraft/net/minecraft/block/BlockReed.java
+@@ -18,7 +18,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-public class BlockReed extends Block
+public class BlockReed extends Block implements net.minecraftforge.common.IPlantable
+ {
+     public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 15);
+ 
+@@ -65,6 +65,7 @@
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+     {
+         Block block = worldIn.getBlockState(pos.down()).getBlock();
+        if (block.canSustainPlant(worldIn, pos.down(), EnumFacing.UP, this)) return true;
+ 
+         if (block == this)
+         {
+@@ -164,4 +165,15 @@
+     {
+         return new BlockState(this, new IProperty[] {AGE});
+     }
+
+    @Override
+    public net.minecraftforge.common.EnumPlantType getPlantType(IBlockAccess world, BlockPos pos)
+    {
+        return net.minecraftforge.common.EnumPlantType.Beach;
+    }
+    @Override
+    public IBlockState getPlant(IBlockAccess world, BlockPos pos)
+    {
+        return this.getDefaultState();
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockRotatedPillar.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockRotatedPillar.java.patch
@ -0,0 +1,21 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRotatedPillar.java
+++ ../src-work/minecraft/net/minecraft/block/BlockRotatedPillar.java
+@@ -18,4 +18,18 @@
+     {
+         super(p_i46385_1_, p_i46385_2_);
+     }
+
+    public boolean rotateBlock(net.minecraft.world.World world, net.minecraft.util.BlockPos pos, EnumFacing axis)
+    {
+        net.minecraft.block.state.IBlockState state = world.getBlockState(pos);
+        for (net.minecraft.block.properties.IProperty<?> prop : state.getProperties().keySet())
+        {
+            if (prop.getName().equals("axis"))
+            {
+                world.setBlockState(pos, state.cycleProperty(prop));
+                return true;
+            }
+        }
+        return false;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockSapling.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockSapling.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockSapling.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSapling.java
+@@ -71,6 +71,7 @@
+ 
+     public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random rand)
+     {
+        if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(worldIn, rand, pos)) return;
+         WorldGenerator worldgenerator = (WorldGenerator)(rand.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true));
+         int i = 0;
+         int j = 0;
--- a/patches.mcp/minecraft/net/minecraft/block/BlockSkull.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockSkull.java.patch
@ -0,0 +1,57 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
+@@ -121,10 +121,6 @@
+         return tileentity instanceof TileEntitySkull ? ((TileEntitySkull)tileentity).getSkullType() : super.getDamageValue(worldIn, pos);
+     }
+ 
+-    public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+-    {
+-    }
+-
+     public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player)
+     {
+         if (player.capabilities.isCreativeMode)
+@@ -132,13 +128,18 @@
+             state = state.withProperty(NODROP, Boolean.valueOf(true));
+             worldIn.setBlockState(pos, state, 4);
+         }
+        this.dropBlockAsItem(worldIn, pos, state, 0);
+ 
+         super.onBlockHarvested(worldIn, pos, state, player);
+     }
+ 
+     public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+     {
+-        if (!worldIn.isRemote)
+        super.breakBlock(worldIn, pos, state);
+    }
+    public java.util.List<ItemStack> getDrops(IBlockAccess worldIn, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+         {
+             if (!((Boolean)state.getValue(NODROP)).booleanValue())
+             {
+@@ -147,7 +148,7 @@
+                 if (tileentity instanceof TileEntitySkull)
+                 {
+                     TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
+-                    ItemStack itemstack = new ItemStack(Items.skull, 1, this.getDamageValue(worldIn, pos));
+                    ItemStack itemstack = new ItemStack(Items.skull, 1, tileentityskull.getSkullType());
+ 
+                     if (tileentityskull.getSkullType() == 3 && tileentityskull.getPlayerProfile() != null)
+                     {
+@@ -157,12 +158,11 @@
+                         itemstack.getTagCompound().setTag("SkullOwner", nbttagcompound);
+                     }
+ 
+-                    spawnAsEntity(worldIn, pos, itemstack);
+                    ret.add(itemstack);
+                 }
+             }
+-
+-            super.breakBlock(worldIn, pos, state);
+         }
+        return ret;
+     }
+ 
+     public Item getItemDropped(IBlockState state, Random rand, int fortune)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockSlab.java.patch
+++ b/patches.mcp/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.isDouble();
+     }
+ 
+    @Override
+    public boolean doesSideBlockRendering(IBlockAccess world, BlockPos pos, EnumFacing face)
+	{
+        if ( isOpaqueCube() )
+            return true;
+        
+        // face is on the block being rendered, not this block.
+        EnumBlockHalf side = world.getBlockState(pos).getValue(HALF);
+        return (side == EnumBlockHalf.TOP && face == EnumFacing.DOWN) || (side == EnumBlockHalf.BOTTOM && face == EnumFacing.UP);
+    }
+
+     public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+     {
+         IBlockState iblockstate = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(HALF, BlockSlab.EnumBlockHalf.BOTTOM);
+@@ -118,15 +129,8 @@
+         {
+             return false;
+         }
+-        else
+-        {
+-            BlockPos blockpos = pos.offset(side.getOpposite());
+-            IBlockState iblockstate = worldIn.getBlockState(pos);
+-            IBlockState iblockstate1 = worldIn.getBlockState(blockpos);
+-            boolean flag = isSlab(iblockstate.getBlock()) && iblockstate.getValue(HALF) == BlockSlab.EnumBlockHalf.TOP;
+-            boolean flag1 = isSlab(iblockstate1.getBlock()) && iblockstate1.getValue(HALF) == BlockSlab.EnumBlockHalf.TOP;
+-            return flag1 ? (side == EnumFacing.DOWN ? true : (side == EnumFacing.UP && super.shouldSideBeRendered(worldIn, pos, side) ? true : !isSlab(iblockstate.getBlock()) || !flag)) : (side == EnumFacing.UP ? true : (side == EnumFacing.DOWN && super.shouldSideBeRendered(worldIn, pos, side) ? true : !isSlab(iblockstate.getBlock()) || flag));
+-        }
+        // additional logic breaks doesSideBlockRendering and is no longer useful.
+        return super.shouldSideBeRendered(worldIn, pos, side);
+     }
+ 
+     @SideOnly(Side.CLIENT)
--- a/patches.mcp/minecraft/net/minecraft/block/BlockSnow.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockSnow.java.patch
@ -0,0 +1,53 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockSnow.java
+++ ../src-work/minecraft/net/minecraft/block/BlockSnow.java
+@@ -79,7 +79,7 @@
+     {
+         IBlockState iblockstate = worldIn.getBlockState(pos.down());
+         Block block = iblockstate.getBlock();
+-        return block != Blocks.ice && block != Blocks.packed_ice ? (block.getMaterial() == Material.leaves ? true : (block == this && ((Integer)iblockstate.getValue(LAYERS)).intValue() >= 7 ? true : block.isOpaqueCube() && block.blockMaterial.blocksMovement())) : false;
+        return block != Blocks.ice && block != Blocks.packed_ice ? (block.isLeaves(worldIn, pos.down()) ? true : (block == this && ((Integer)iblockstate.getValue(LAYERS)).intValue() >= 7 ? true : block.isOpaqueCube() && block.blockMaterial.blocksMovement())) : false;
+     }
+ 
+     public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+@@ -91,7 +91,6 @@
+     {
+         if (!this.canPlaceBlockAt(worldIn, pos))
+         {
+-            this.dropBlockAsItem(worldIn, pos, state, 0);
+             worldIn.setBlockToAir(pos);
+             return false;
+         }
+@@ -103,9 +102,8 @@
+ 
+     public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+     {
+-        spawnAsEntity(worldIn, pos, new ItemStack(Items.snowball, ((Integer)state.getValue(LAYERS)).intValue() + 1, 0));
+        super.harvestBlock(worldIn, player, pos, state, te);
+         worldIn.setBlockToAir(pos);
+-        player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+     }
+ 
+     public Item getItemDropped(IBlockState state, Random rand, int fortune)
+@@ -115,14 +113,13 @@
+ 
+     public int quantityDropped(Random random)
+     {
+-        return 0;
+        return 1;
+     }
+ 
+     public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+     {
+         if (worldIn.getLightFor(EnumSkyBlock.BLOCK, pos) > 11)
+         {
+-            this.dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0);
+             worldIn.setBlockToAir(pos);
+         }
+     }
+@@ -152,4 +149,6 @@
+     {
+         return new BlockState(this, new IProperty[] {LAYERS});
+     }
+
+    @Override public int quantityDropped(IBlockState state, int fortune, Random random){ return ((Integer)state.getValue(LAYERS)) + 1; }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockStairs.java.patch
+++ b/patches.mcp/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 ( isOpaqueCube() )
+            return true;
+        
+        // face is on the block being rendered, not this block.
+        IBlockState iblockstate = world.getBlockState(pos);
+        EnumHalf half = iblockstate.getValue(HALF);
+        EnumFacing side = iblockstate.getValue(FACING);
+        return side == face.getOpposite() || (half == EnumHalf.TOP && face == EnumFacing.DOWN) || (half == EnumHalf.BOTTOM && face == EnumFacing.UP);
+    }
+
+     public boolean isFullCube()
+     {
+         return false;
--- a/patches.mcp/minecraft/net/minecraft/block/BlockStem.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockStem.java.patch
@ -0,0 +1,42 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockStem.java
+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
+@@ -94,7 +94,7 @@
+                     pos = pos.offset(EnumFacing.Plane.HORIZONTAL.random(rand));
+                     Block block = worldIn.getBlockState(pos.down()).getBlock();
+ 
+-                    if (worldIn.getBlockState(pos).getBlock().blockMaterial == Material.air && (block == Blocks.farmland || block == Blocks.dirt || block == Blocks.grass))
+                    if (worldIn.isAirBlock(pos) && (block.canSustainPlant(worldIn, pos.down(), EnumFacing.UP, this) || block == Blocks.dirt || block == Blocks.grass))
+                     {
+                         worldIn.setBlockState(pos, this.crop.getDefaultState());
+                     }
+@@ -148,8 +148,12 @@
+     public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+     {
+         super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    }
+ 
+-        if (!worldIn.isRemote)
+    @Override
+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+         {
+             Item item = this.getSeedItem();
+ 
+@@ -159,13 +163,14 @@
+ 
+                 for (int j = 0; j < 3; ++j)
+                 {
+-                    if (worldIn.rand.nextInt(15) <= i)
+                    if (RANDOM.nextInt(15) <= i)
+                     {
+-                        spawnAsEntity(worldIn, pos, new ItemStack(item));
+                        ret.add(new ItemStack(item));
+                     }
+                 }
+             }
+         }
+        return ret;
+     }
+ 
+     protected Item getSeedItem()
--- a/patches.mcp/minecraft/net/minecraft/block/BlockTallGrass.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockTallGrass.java.patch
@ -0,0 +1,66 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockTallGrass.java
+++ ../src-work/minecraft/net/minecraft/block/BlockTallGrass.java
+@@ -23,7 +23,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-public class BlockTallGrass extends BlockBush implements IGrowable
+public class BlockTallGrass extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
+ {
+     public static final PropertyEnum<BlockTallGrass.EnumType> TYPE = PropertyEnum.<BlockTallGrass.EnumType>create("type", BlockTallGrass.EnumType.class);
+ 
+@@ -43,7 +43,7 @@
+ 
+     public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
+     {
+-        return this.canPlaceBlockOn(worldIn.getBlockState(pos.down()).getBlock());
+        return super.canBlockStay(worldIn, pos, state);
+     }
+ 
+     public boolean isReplaceable(World worldIn, BlockPos pos)
+@@ -53,7 +53,7 @@
+ 
+     public Item getItemDropped(IBlockState state, Random rand, int fortune)
+     {
+-        return rand.nextInt(8) == 0 ? Items.wheat_seeds : null;
+        return null;
+     }
+ 
+     public int quantityDroppedWithBonus(int fortune, Random random)
+@@ -63,13 +63,7 @@
+ 
+     public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+     {
+-        if (!worldIn.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
+         {
+-            player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+-            spawnAsEntity(worldIn, pos, new ItemStack(Blocks.tallgrass, 1, ((BlockTallGrass.EnumType)state.getValue(TYPE)).getMeta()));
+-        }
+-        else
+-        {
+             super.harvestBlock(worldIn, player, pos, state, te);
+         }
+     }
+@@ -204,4 +198,22 @@
+             }
+         }
+     }
+
+    @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
+    @Override
+    public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
+    {
+        List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        ret.add(new ItemStack(Blocks.tallgrass, 1, ((BlockTallGrass.EnumType)world.getBlockState(pos).getValue(TYPE)).getMeta()));
+        return ret;
+    }
+    @Override
+    public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
+    {
+        List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        if (RANDOM.nextInt(8) != 0) return ret;
+        ItemStack seed = net.minecraftforge.common.ForgeHooks.getGrassSeed(RANDOM);
+        if (seed != null) ret.add(seed);
+        return ret;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockTorch.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockTorch.java.patch
@ -0,0 +1,38 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
+++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
+@@ -63,7 +63,7 @@
+         else
+         {
+             Block block = worldIn.getBlockState(pos).getBlock();
+-            return block instanceof BlockFence || block == Blocks.glass || block == Blocks.cobblestone_wall || block == Blocks.stained_glass;
+            return block.canPlaceTorchOnTop(worldIn, pos);
+         }
+     }
+ 
+@@ -84,7 +84,7 @@
+     {
+         BlockPos blockpos = pos.offset(facing.getOpposite());
+         boolean flag = facing.getAxis().isHorizontal();
+-        return flag && worldIn.isBlockNormalCube(blockpos, true) || facing.equals(EnumFacing.UP) && this.canPlaceOn(worldIn, blockpos);
+        return flag && worldIn.isSideSolid(blockpos, facing, true) || facing.equals(EnumFacing.UP) && this.canPlaceOn(worldIn, blockpos);
+     }
+ 
+     public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+@@ -97,7 +97,7 @@
+         {
+             for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
+             {
+-                if (worldIn.isBlockNormalCube(pos.offset(enumfacing.getOpposite()), true))
+                if (worldIn.isSideSolid(pos.offset(enumfacing.getOpposite()), enumfacing, true))
+                 {
+                     return this.getDefaultState().withProperty(FACING, enumfacing);
+                 }
+@@ -130,7 +130,7 @@
+             EnumFacing enumfacing1 = enumfacing.getOpposite();
+             boolean flag = false;
+ 
+-            if (enumfacing$axis.isHorizontal() && !worldIn.isBlockNormalCube(pos.offset(enumfacing1), true))
+            if (enumfacing$axis.isHorizontal() && !worldIn.isSideSolid(pos.offset(enumfacing1), enumfacing, true))
+             {
+                 flag = true;
+             }
--- a/patches.mcp/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockTrapDoor.java.patch
@ -0,0 +1,43 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
+++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
+@@ -25,6 +25,8 @@
+ 
+ public class BlockTrapDoor extends Block
+ {
+    /** Set this to allow trapdoors to remain free-floating */
+    public static boolean disableValidation = false;
+     public static final PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+     public static final PropertyBool OPEN = PropertyBool.create("open");
+     public static final PropertyEnum<BlockTrapDoor.DoorHalf> HALF = PropertyEnum.<BlockTrapDoor.DoorHalf>create("half", BlockTrapDoor.DoorHalf.class);
+@@ -140,9 +142,10 @@
+     {
+         if (!worldIn.isRemote)
+         {
+            EnumFacing direction = (EnumFacing)state.getValue(FACING);
+             BlockPos blockpos = pos.offset(((EnumFacing)state.getValue(FACING)).getOpposite());
+ 
+-            if (!isValidSupportBlock(worldIn.getBlockState(blockpos).getBlock()))
+            if (!(isValidSupportBlock(worldIn.getBlockState(blockpos).getBlock()) || worldIn.isSideSolid(blockpos, direction, true)))
+             {
+                 worldIn.setBlockToAir(pos);
+                 this.dropBlockAsItem(worldIn, pos, state, 0);
+@@ -186,7 +189,10 @@
+ 
+     public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+     {
+-        return !side.getAxis().isVertical() && isValidSupportBlock(worldIn.getBlockState(pos.offset(side.getOpposite())).getBlock());
+        if (disableValidation) return true;
+        EnumFacing dir = side.getOpposite();
+        pos = pos.offset(dir);
+        return !side.getAxis().isVertical() && (isValidSupportBlock(worldIn.getBlockState(pos).getBlock()) || worldIn.isSideSolid(pos, side, true));
+     }
+ 
+     protected static EnumFacing getFacing(int meta)
+@@ -223,6 +229,7 @@
+ 
+     private static boolean isValidSupportBlock(Block blockIn)
+     {
+        if (disableValidation) return true;
+         return blockIn.blockMaterial.isOpaque() && blockIn.isFullCube() || blockIn == Blocks.glowstone || blockIn instanceof BlockSlab || blockIn instanceof BlockStairs;
+     }
+ 
--- a/patches.mcp/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockTripWireHook.java.patch
@ -0,0 +1,28 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockTripWireHook.java
+++ ../src-work/minecraft/net/minecraft/block/BlockTripWireHook.java
+@@ -58,14 +58,14 @@
+ 
+     public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+     {
+-        return side.getAxis().isHorizontal() && worldIn.getBlockState(pos.offset(side.getOpposite())).getBlock().isNormalCube();
+        return side.getAxis().isHorizontal() && worldIn.isSideSolid(pos.offset(side.getOpposite()), side, true);
+     }
+ 
+     public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+     {
+         for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
+         {
+-            if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock().isNormalCube())
+            if (worldIn.isSideSolid(pos.offset(enumfacing), enumfacing.getOpposite(), true))
+             {
+                 return true;
+             }
+@@ -99,7 +99,7 @@
+             {
+                 EnumFacing enumfacing = (EnumFacing)state.getValue(FACING);
+ 
+-                if (!worldIn.getBlockState(pos.offset(enumfacing.getOpposite())).getBlock().isNormalCube())
+                if (!worldIn.isSideSolid(pos.offset(enumfacing.getOpposite()), enumfacing, true))
+                 {
+                     this.dropBlockAsItem(worldIn, pos, state, 0);
+                     worldIn.setBlockToAir(pos);
--- a/patches.mcp/minecraft/net/minecraft/block/BlockVine.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/BlockVine.java.patch
@ -0,0 +1,40 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockVine.java
+++ ../src-work/minecraft/net/minecraft/block/BlockVine.java
+@@ -25,7 +25,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-public class BlockVine extends Block
+public class BlockVine extends Block implements net.minecraftforge.common.IShearable
+ {
+     public static final PropertyBool UP = PropertyBool.create("up");
+     public static final PropertyBool NORTH = PropertyBool.create("north");
+@@ -387,13 +387,7 @@
+ 
+     public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
+     {
+-        if (!worldIn.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
+         {
+-            player.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+-            spawnAsEntity(worldIn, pos, new ItemStack(Blocks.vine, 1, 0));
+-        }
+-        else
+-        {
+             super.harvestBlock(worldIn, player, pos, state, te);
+         }
+     }
+@@ -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; }
+    @Override
+    public java.util.List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
+    {
+        return java.util.Arrays.asList(new ItemStack(this, 1));
+    }
+    /*************************FORGE END***********************************/
+
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
@ -0,0 +1,29 @@
+--- ../src-base/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
+++ ../src-work/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
+@@ -78,7 +78,7 @@
+     {
+         Block block = this.world.getBlockState(origin).getBlock();
+ 
+-        if (block.getMaterial() == Material.air)
+        if (block.isAir(world, origin))
+         {
+             return true;
+         }
+@@ -109,7 +109,7 @@
+                     BlockPos blockpos = origin.offset(this.moveDirection.getOpposite(), i);
+                     block = this.world.getBlockState(blockpos).getBlock();
+ 
+-                    if (block.getMaterial() == Material.air || !BlockPistonBase.canPush(block, this.world, blockpos, this.moveDirection, false) || blockpos.equals(this.pistonPos))
+                    if (block.isAir(world, blockpos)|| !BlockPistonBase.canPush(block, this.world, blockpos, this.moveDirection, false) || blockpos.equals(this.pistonPos))
+                     {
+                         break;
+                     }
+@@ -156,7 +156,7 @@
+ 
+                     block = this.world.getBlockState(blockpos1).getBlock();
+ 
+-                    if (block.getMaterial() == Material.air)
+                    if (block.isAir(world, blockpos1))
+                     {
+                         return true;
+                     }
--- a/patches.mcp/minecraft/net/minecraft/block/state/BlockState.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/state/BlockState.java.patch
@ -0,0 +1,53 @@
+--- ../src-base/minecraft/net/minecraft/block/state/BlockState.java
+++ ../src-work/minecraft/net/minecraft/block/state/BlockState.java
+@@ -38,6 +38,16 @@
+ 
+     public BlockState(Block blockIn, IProperty... properties)
+     {
+        this(blockIn, properties, null);
+    }
+
+    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 blockIn, IProperty[] properties, ImmutableMap<net.minecraftforge.common.property.IUnlistedProperty<?>, com.google.common.base.Optional<?>> unlistedProperties)
+    {
+         this.block = blockIn;
+         Arrays.sort(properties, new Comparator<IProperty>()
+         {
+@@ -53,7 +63,7 @@
+         for (List<Comparable> list1 : Cartesian.cartesianProduct(this.getAllowedValues()))
+         {
+             Map<IProperty, Comparable> map1 = MapPopulator.<IProperty, Comparable>createMap(this.properties, list1);
+-            BlockState.StateImplementation blockstate$stateimplementation = new BlockState.StateImplementation(blockIn, ImmutableMap.copyOf(map1));
+            BlockState.StateImplementation blockstate$stateimplementation = createState(blockIn, ImmutableMap.copyOf(map1), unlistedProperties);
+             map.put(map1, blockstate$stateimplementation);
+             list.add(blockstate$stateimplementation);
+         }
+@@ -132,6 +142,13 @@
+                 }
+             }
+ 
+            protected StateImplementation(Block blockIn, ImmutableMap<IProperty, Comparable> propertiesIn, ImmutableTable<IProperty, Comparable, IBlockState> propertyValueTable)
+            {
+                this.block = blockIn;
+                this.properties = propertiesIn;
+                this.propertyValueTable = propertyValueTable;
+            }
+
+             public <T extends Comparable<T>, V extends T> IBlockState withProperty(IProperty<T> property, V value)
+             {
+                 if (!this.properties.containsKey(property))
+@@ -199,5 +216,10 @@
+                 map.put(property, value);
+                 return map;
+             }
+
+            public ImmutableTable<IProperty, Comparable, IBlockState> getPropertyValueTable()
+            {
+                return propertyValueTable;
+            }
+         }
+ }
--- a/patches.mcp/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/block/state/BlockStateBase.java.patch
@ -0,0 +1,12 @@
+--- ../src-base/minecraft/net/minecraft/block/state/BlockStateBase.java
+++ ../src-work/minecraft/net/minecraft/block/state/BlockStateBase.java
+@@ -67,4 +67,9 @@
+ 
+         return stringbuilder.toString();
+     }
+    
+    public com.google.common.collect.ImmutableTable<IProperty, Comparable, IBlockState> getPropertyValueTable()
+    {
+        return null;
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
+++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
+@@ -8,6 +8,6 @@
+ {
+     public static String getClientModName()
+     {
+-        return "vanilla";
+        return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName();
+     }
+ }
--- a/patches.mcp/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch
@ -0,0 +1,26 @@
+--- ../src-base/minecraft/net/minecraft/client/LoadingScreenRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/LoadingScreenRenderer.java
+@@ -139,6 +139,10 @@
+                     GlStateManager.clear(16640);
+                 }
+ 
+                try
+                {
+                if (!net.minecraftforge.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering
+                {
+                 Tessellator tessellator = Tessellator.getInstance();
+                 WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+                 this.mc.getTextureManager().bindTexture(Gui.optionsBackground);
+@@ -174,6 +178,12 @@
+                 GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+                 this.mc.fontRendererObj.drawStringWithShadow(this.currentlyDisplayedText, (float)((k - this.mc.fontRendererObj.getStringWidth(this.currentlyDisplayedText)) / 2), (float)(l / 2 - 4 - 16), 16777215);
+                 this.mc.fontRendererObj.drawStringWithShadow(this.message, (float)((k - this.mc.fontRendererObj.getStringWidth(this.message)) / 2), (float)(l / 2 - 4 + 8), 16777215);
+                }
+                }
+                catch (java.io.IOException e)
+                {
+                    com.google.common.base.Throwables.propagate(e);
+                } //FML End
+                 this.framebuffer.unbindFramebuffer();
+ 
+                 if (OpenGlHelper.isFramebufferEnabled())
--- a/patches.mcp/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/Minecraft.java.patch
@ -0,0 +1,459 @@
+--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
+@@ -301,7 +301,6 @@
+         this.sessionService = (new YggdrasilAuthenticationService(gameConfig.userInfo.proxy, UUID.randomUUID().toString())).createMinecraftSessionService();
+         this.session = gameConfig.userInfo.session;
+         logger.info("Setting user: " + this.session.getUsername());
+-        logger.info("(Session ID is " + this.session.getSessionID() + ")");
+         this.isDemo = gameConfig.gameInfo.isDemo;
+         this.displayWidth = gameConfig.displayInfo.width > 0 ? gameConfig.displayInfo.width : 1;
+         this.displayHeight = gameConfig.displayInfo.height > 0 ? gameConfig.displayInfo.height : 1;
+@@ -415,10 +414,10 @@
+         this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_);
+         this.mcLanguageManager = new LanguageManager(this.metadataSerializer_, this.gameSettings.language);
+         this.mcResourceManager.registerReloadListener(this.mcLanguageManager);
+-        this.refreshResources();
+        net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.defaultResourcePacks, this.mcResourceManager);
+         this.renderEngine = new TextureManager(this.mcResourceManager);
+         this.mcResourceManager.registerReloadListener(this.renderEngine);
+-        this.drawSplashScreen(this.renderEngine);
+        net.minecraftforge.fml.client.SplashProgress.drawVanillaScreen(this.renderEngine);
+         this.initStream();
+         this.skinManager = new SkinManager(this.renderEngine, new File(this.fileAssets, "skins"), this.sessionService);
+         this.saveLoader = new AnvilSaveConverter(new File(this.mcDataDir, "saves"));
+@@ -453,6 +452,8 @@
+             }
+         });
+         this.mouseHelper = new MouseHelper();
+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 5, true);
+        bar.step("GL Setup");
+         this.checkGLError("Pre startup");
+         GlStateManager.enableTexture2D();
+         GlStateManager.shadeModel(7425);
+@@ -466,17 +467,21 @@
+         GlStateManager.loadIdentity();
+         GlStateManager.matrixMode(5888);
+         this.checkGLError("Startup");
+-        this.textureMapBlocks = new TextureMap("textures");
+        bar.step("Loading Texture Map");
+        this.textureMapBlocks = new TextureMap("textures",true);
+         this.textureMapBlocks.setMipmapLevels(this.gameSettings.mipmapLevels);
+         this.renderEngine.loadTickableTexture(TextureMap.locationBlocksTexture, this.textureMapBlocks);
+         this.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+         this.textureMapBlocks.setBlurMipmapDirect(false, this.gameSettings.mipmapLevels > 0);
+        bar.step("Loading Model Manager");
+         this.modelManager = new ModelManager(this.textureMapBlocks);
+         this.mcResourceManager.registerReloadListener(this.modelManager);
+        bar.step("Loading Item Renderer");
+         this.renderItem = new RenderItem(this.renderEngine, this.modelManager);
+         this.renderManager = new RenderManager(this.renderEngine, this.renderItem);
+         this.itemRenderer = new ItemRenderer(this);
+         this.mcResourceManager.registerReloadListener(this.renderItem);
+        bar.step("Loading Entity Renderer");
+         this.entityRenderer = new EntityRenderer(this, this.mcResourceManager);
+         this.mcResourceManager.registerReloadListener(this.entityRenderer);
+         this.blockRenderDispatcher = new BlockRendererDispatcher(this.modelManager.getBlockModelShapes(), this.gameSettings);
+@@ -486,22 +491,25 @@
+         this.guiAchievement = new GuiAchievement(this);
+         GlStateManager.viewport(0, 0, this.displayWidth, this.displayHeight);
+         this.effectRenderer = new EffectRenderer(this.theWorld, this.renderEngine);
+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
+        net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
+         this.checkGLError("Post startup");
+-        this.ingameGUI = new GuiIngame(this);
+        this.ingameGUI = new net.minecraftforge.client.GuiIngameForge(this);
+ 
+         if (this.serverName != null)
+         {
+-            this.displayGuiScreen(new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort));
+            net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.serverName, this.serverPort);
+         }
+         else
+         {
+             this.displayGuiScreen(new GuiMainMenu());
+         }
+ 
+-        this.renderEngine.deleteTexture(this.mojangLogo);
+        net.minecraftforge.fml.client.SplashProgress.clearVanillaResources(renderEngine, mojangLogo);
+         this.mojangLogo = null;
+         this.loadingScreen = new LoadingScreenRenderer(this);
+ 
+        net.minecraftforge.fml.client.FMLClientHandler.instance().onInitializationComplete();
+         if (this.gameSettings.fullScreen && !this.fullscreen)
+         {
+             this.toggleFullscreen();
+@@ -681,21 +689,23 @@
+         File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
+         Bootstrap.printToSYSOUT(crashReportIn.getCompleteReport());
+ 
+        int retVal;
+         if (crashReportIn.getFile() != null)
+         {
+             Bootstrap.printToSYSOUT("#@!@# Game crashed! Crash report saved to: #@!@# " + crashReportIn.getFile());
+-            System.exit(-1);
+            retVal = -1;
+         }
+         else if (crashReportIn.saveToFile(file2))
+         {
+             Bootstrap.printToSYSOUT("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
+-            System.exit(-1);
+            retVal = -1;
+         }
+         else
+         {
+             Bootstrap.printToSYSOUT("#@?@# Game crashed! Crash report could not be saved. #@?@#");
+-            System.exit(-2);
+            retVal = -2;
+         }
+        net.minecraftforge.fml.common.FMLCommonHandler.instance().handleExit(retVal);
+     }
+ 
+     public boolean isUnicode()
+@@ -883,11 +893,6 @@
+ 
+     public void displayGuiScreen(GuiScreen guiScreenIn)
+     {
+-        if (this.currentScreen != null)
+-        {
+-            this.currentScreen.onGuiClosed();
+-        }
+-
+         if (guiScreenIn == null && this.theWorld == null)
+         {
+             guiScreenIn = new GuiMainMenu();
+@@ -897,6 +902,17 @@
+             guiScreenIn = new GuiGameOver();
+         }
+ 
+        GuiScreen old = this.currentScreen;
+        net.minecraftforge.client.event.GuiOpenEvent event = new net.minecraftforge.client.event.GuiOpenEvent(guiScreenIn);
+
+        if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) return;
+
+        guiScreenIn = event.gui;
+        if (old != null && guiScreenIn != old)
+        {
+            old.onGuiClosed();
+        }
+
+         if (guiScreenIn instanceof GuiMainMenu)
+         {
+             this.gameSettings.showDebugInfo = false;
+@@ -1030,9 +1046,11 @@
+ 
+         if (!this.skipRenderWorld)
+         {
+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.timer.renderPartialTicks);
+             this.mcProfiler.endStartSection("gameRenderer");
+             this.entityRenderer.updateCameraAndRender(this.timer.renderPartialTicks, i);
+             this.mcProfiler.endSection();
+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.timer.renderPartialTicks);
+         }
+ 
+         this.mcProfiler.endSection();
+@@ -1377,7 +1395,7 @@
+ 
+                 if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air && this.playerController.onPlayerDamageBlock(blockpos, this.objectMouseOver.sideHit))
+                 {
+-                    this.effectRenderer.addBlockHitEffects(blockpos, this.objectMouseOver.sideHit);
+                    this.effectRenderer.addBlockHitEffects(blockpos, this.objectMouseOver);
+                     this.thePlayer.swingItem();
+                 }
+             }
+@@ -1463,15 +1481,19 @@
+                     case BLOCK:
+                         BlockPos blockpos = this.objectMouseOver.getBlockPos();
+ 
+-                        if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air)
+                        if (!this.theWorld.isAirBlock(blockpos))
+                         {
+                             int i = itemstack != null ? itemstack.stackSize : 0;
+ 
+
+                            boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(thePlayer, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK, this.theWorld, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec).isCanceled();
+                            if (result) { //Forge: Kept separate to simplify patch
+                             if (this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, itemstack, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec))
+                             {
+                                 flag = false;
+                                 this.thePlayer.swingItem();
+                             }
+                            }
+ 
+                             if (itemstack == null)
+                             {
+@@ -1494,7 +1516,8 @@
+             {
+                 ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem();
+ 
+-                if (itemstack1 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, itemstack1))
+                boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(thePlayer, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_AIR, theWorld, null, null, null).isCanceled();
+                if (result && itemstack1 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, itemstack1))
+                 {
+                     this.entityRenderer.itemRenderer.resetEquippedProgress2();
+                 }
+@@ -1598,6 +1621,8 @@
+             --this.rightClickDelayTimer;
+         }
+ 
+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick();
+
+         this.mcProfiler.startSection("gui");
+ 
+         if (!this.isGamePaused)
+@@ -1690,6 +1715,8 @@
+ 
+             while (Mouse.next())
+             {
+                if (net.minecraftforge.client.ForgeHooksClient.postMouseEvent()) continue;
+
+                 int i = Mouse.getEventButton();
+                 KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());
+ 
+@@ -1745,6 +1772,7 @@
+                         this.currentScreen.handleMouseInput();
+                     }
+                 }
+                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireMouseInput();
+             }
+ 
+             if (this.leftClickCounter > 0)
+@@ -1923,6 +1951,7 @@
+                         }
+                     }
+                 }
+                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput();
+             }
+ 
+             for (int l = 0; l < 9; ++l)
+@@ -2119,12 +2148,15 @@
+             this.myNetworkManager.processReceivedPackets();
+         }
+ 
+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
+
+         this.mcProfiler.endSection();
+         this.systemTime = getSystemTime();
+     }
+ 
+     public void launchIntegratedServer(String folderName, String worldName, WorldSettings worldSettingsIn)
+     {
+        net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(folderName, worldName, worldSettingsIn);
+         this.loadWorld((WorldClient)null);
+         System.gc();
+         ISaveHandler isavehandler = this.saveLoader.getSaveLoader(folderName, false);
+@@ -2160,6 +2192,12 @@
+ 
+         while (!this.theIntegratedServer.serverIsInRunLoop())
+         {
+            if (!net.minecraftforge.fml.common.StartupQuery.check())
+            {
+                loadWorld(null);
+                displayGuiScreen(null);
+                return;
+            }
+             String s = this.theIntegratedServer.getUserMessage();
+ 
+             if (s != null)
+@@ -2185,8 +2223,14 @@
+         SocketAddress socketaddress = this.theIntegratedServer.getNetworkSystem().addLocalEndpoint();
+         NetworkManager networkmanager = NetworkManager.provideLocalClient(socketaddress);
+         networkmanager.setNetHandler(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
+-        networkmanager.sendPacket(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
+-        networkmanager.sendPacket(new C00PacketLoginStart(this.getSession().getProfile()));
+        networkmanager.sendPacket(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
+        com.mojang.authlib.GameProfile gameProfile = this.getSession().getProfile();
+        if (!this.getSession().hasCachedProperties())
+        {
+            gameProfile = sessionService.fillProfileProperties(gameProfile, true); //Forge: Fill profile properties upon game load. Fixes MC-52974.
+            this.getSession().setProperties(gameProfile.getProperties());
+        }
+        networkmanager.sendPacket(new C00PacketLoginStart(gameProfile));
+         this.myNetworkManager = networkmanager;
+     }
+ 
+@@ -2197,6 +2241,8 @@
+ 
+     public void loadWorld(WorldClient worldClientIn, String loadingMessage)
+     {
+        if (theWorld != null) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(theWorld));
+
+         if (worldClientIn == null)
+         {
+             NetHandlerPlayClient nethandlerplayclient = this.getNetHandler();
+@@ -2210,6 +2256,18 @@
+             {
+                 this.theIntegratedServer.initiateShutdown();
+                 this.theIntegratedServer.setStaticInstance();
+                if (loadingScreen != null)
+                {
+                    this.loadingScreen.displayLoadingString(I18n.format("forge.client.shutdown.internal"));
+                }
+                while (!theIntegratedServer.isServerStopped())
+                {
+                    try
+                    {
+                        Thread.sleep(10);
+                    }
+                    catch (InterruptedException ie) {}
+                }
+             }
+ 
+             this.theIntegratedServer = null;
+@@ -2232,6 +2290,7 @@
+             this.ingameGUI.func_181029_i();
+             this.setServerData((ServerData)null);
+             this.integratedServerIsRunning = false;
+            net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.theWorld);
+         }
+ 
+         this.mcSoundHandler.stopSounds();
+@@ -2336,126 +2395,10 @@
+         if (this.objectMouseOver != null)
+         {
+             boolean flag = this.thePlayer.capabilities.isCreativeMode;
+-            int i = 0;
+-            boolean flag1 = false;
+-            TileEntity tileentity = null;
+-            Item item;
+-
+-            if (this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
+-            {
+-                BlockPos blockpos = this.objectMouseOver.getBlockPos();
+-                Block block = this.theWorld.getBlockState(blockpos).getBlock();
+-
+-                if (block.getMaterial() == Material.air)
+-                {
+-                    return;
+-                }
+-
+-                item = block.getItem(this.theWorld, blockpos);
+-
+-                if (item == null)
+-                {
+-                    return;
+-                }
+-
+-                if (flag && GuiScreen.isCtrlKeyDown())
+-                {
+-                    tileentity = this.theWorld.getTileEntity(blockpos);
+-                }
+-
+-                Block block1 = item instanceof ItemBlock && !block.isFlowerPot() ? Block.getBlockFromItem(item) : block;
+-                i = block1.getDamageValue(this.theWorld, blockpos);
+-                flag1 = item.getHasSubtypes();
+-            }
+-            else
+-            {
+-                if (this.objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.ENTITY || this.objectMouseOver.entityHit == null || !flag)
+-                {
+-                    return;
+-                }
+-
+-                if (this.objectMouseOver.entityHit instanceof EntityPainting)
+-                {
+-                    item = Items.painting;
+-                }
+-                else if (this.objectMouseOver.entityHit instanceof EntityLeashKnot)
+-                {
+-                    item = Items.lead;
+-                }
+-                else if (this.objectMouseOver.entityHit instanceof EntityItemFrame)
+-                {
+-                    EntityItemFrame entityitemframe = (EntityItemFrame)this.objectMouseOver.entityHit;
+-                    ItemStack itemstack = entityitemframe.getDisplayedItem();
+-
+-                    if (itemstack == null)
+-                    {
+-                        item = Items.item_frame;
+-                    }
+-                    else
+-                    {
+-                        item = itemstack.getItem();
+-                        i = itemstack.getMetadata();
+-                        flag1 = true;
+-                    }
+-                }
+-                else if (this.objectMouseOver.entityHit instanceof EntityMinecart)
+-                {
+-                    EntityMinecart entityminecart = (EntityMinecart)this.objectMouseOver.entityHit;
+-
+-                    switch (entityminecart.getMinecartType())
+-                    {
+-                        case FURNACE:
+-                            item = Items.furnace_minecart;
+-                            break;
+-                        case CHEST:
+-                            item = Items.chest_minecart;
+-                            break;
+-                        case TNT:
+-                            item = Items.tnt_minecart;
+-                            break;
+-                        case HOPPER:
+-                            item = Items.hopper_minecart;
+-                            break;
+-                        case COMMAND_BLOCK:
+-                            item = Items.command_block_minecart;
+-                            break;
+-                        default:
+-                            item = Items.minecart;
+-                    }
+-                }
+-                else if (this.objectMouseOver.entityHit instanceof EntityBoat)
+-                {
+-                    item = Items.boat;
+-                }
+-                else if (this.objectMouseOver.entityHit instanceof EntityArmorStand)
+-                {
+-                    item = Items.armor_stand;
+-                }
+-                else
+-                {
+-                    item = Items.spawn_egg;
+-                    i = EntityList.getEntityID(this.objectMouseOver.entityHit);
+-                    flag1 = true;
+-
+-                    if (!EntityList.entityEggs.containsKey(Integer.valueOf(i)))
+-                    {
+-                        return;
+-                    }
+-                }
+-            }
+-
+             InventoryPlayer inventoryplayer = this.thePlayer.inventory;
+ 
+-            if (tileentity == null)
+-            {
+-                inventoryplayer.setCurrentItem(item, i, flag1, flag);
+-            }
+-            else
+-            {
+-                ItemStack itemstack1 = this.func_181036_a(item, i, tileentity);
+-                inventoryplayer.setInventorySlotContents(inventoryplayer.currentItem, itemstack1);
+-            }
+-
+            if (!net.minecraftforge.common.ForgeHooks.onPickBlock(this.objectMouseOver, this.thePlayer, this.theWorld)) return;
+            // We delete this code wholly instead of commenting it out, to make sure we detect changes in it between MC versions
+             if (flag)
+             {
+                 int j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + inventoryplayer.currentItem;
+@@ -2756,18 +2699,8 @@
+ 
+     public static int getGLMaximumTextureSize()
+     {
+-        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)((ByteBuffer)null));
+-            int j = GL11.glGetTexLevelParameteri(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH);
+-
+-            if (j != 0)
+-            {
+-                return i;
+-            }
+-        }
+-
+-        return -1;
+        //Forge we redirect this to our code which caches the value before any splash screen stuff is done.
+        return net.minecraftforge.fml.client.SplashProgress.getMaxTextureSize();
+     }
+ 
+     public boolean isSnooperEnabled()
--- a/patches.mcp/minecraft/net/minecraft/client/audio/SoundManager.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/audio/SoundManager.java.patch
@ -0,0 +1,41 @@
+--- ../src-base/minecraft/net/minecraft/client/audio/SoundManager.java
+++ ../src-work/minecraft/net/minecraft/client/audio/SoundManager.java
+@@ -69,6 +69,7 @@
+         {
+             SoundSystemConfig.addLibrary(LibraryLWJGLOpenAL.class);
+             SoundSystemConfig.setCodec("ogg", CodecJOrbis.class);
+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.SoundSetupEvent(this));
+         }
+         catch (SoundSystemException soundsystemexception)
+         {
+@@ -80,6 +81,7 @@
+     {
+         this.unloadSoundSystem();
+         this.loadSoundSystem();
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.SoundLoadEvent(this));
+     }
+ 
+     private synchronized void loadSoundSystem()
+@@ -316,6 +318,9 @@
+             }
+             else
+             {
+                sound = net.minecraftforge.client.ForgeHooksClient.playSound(this, sound);
+                if (sound == null) return;
+
+                 SoundEventAccessorComposite soundeventaccessorcomposite = this.sndHandler.getSound(sound.getSoundLocation());
+ 
+                 if (soundeventaccessorcomposite == null)
+@@ -357,10 +362,12 @@
+                             if (soundpoolentry.isStreamingSound())
+                             {
+                                 this.sndSystem.newStreamingSource(false, s, getURLForSoundResource(resourcelocation), resourcelocation.toString(), flag, sound.getXPosF(), sound.getYPosF(), sound.getZPosF(), sound.getAttenuationType().getTypeInt(), f1);
+                                net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.PlayStreamingSourceEvent(this, sound, s));
+                             }
+                             else
+                             {
+                                 this.sndSystem.newSource(false, s, getURLForSoundResource(resourcelocation), resourcelocation.toString(), flag, sound.getXPosF(), sound.getYPosF(), sound.getZPosF(), sound.getAttenuationType().getTypeInt(), f1);
+                                net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.PlaySoundSourceEvent(this, sound, s));
+                             }
+ 
+                             logger.debug(LOG_MARKER, "Playing sound {} for event {} as channel {}", new Object[] {soundpoolentry.getSoundPoolEntryLocation(), soundeventaccessorcomposite.getSoundEventLocation(), s});
--- a/patches.mcp/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
+++ ../src-work/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
+@@ -128,6 +128,6 @@
+             f *= 1.0F - f1 * 0.15F;
+         }
+ 
+-        return f;
+        return net.minecraftforge.client.ForgeHooksClient.getOffsetFOV(this, f);
+     }
+ }
--- a/patches.mcp/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
@ -0,0 +1,71 @@
+--- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
+++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
+@@ -345,6 +345,15 @@
+         this.mc.ingameGUI.getChatGUI().printChatMessage(chatComponent);
+     }
+ 
+    private boolean isHeadspaceFree(BlockPos pos, int height)
+    {
+        for (int y = 0; y < height; y++)
+        {
+            if (isOpenBlockSpace(pos.add(0, y, 0))) return false;
+        }
+        return true;
+    }
+
+     protected boolean pushOutOfBlocks(double x, double y, double z)
+     {
+         if (this.noClip)
+@@ -357,30 +366,34 @@
+             double d0 = x - (double)blockpos.getX();
+             double d1 = z - (double)blockpos.getZ();
+ 
+-            if (!this.isOpenBlockSpace(blockpos))
+            int entHeight = Math.max(Math.round(this.height), 1);
+
+            boolean inTranslucentBlock = this.isHeadspaceFree(blockpos, entHeight);
+
+            if (inTranslucentBlock)
+             {
+                 int i = -1;
+                 double d2 = 9999.0D;
+ 
+-                if (this.isOpenBlockSpace(blockpos.west()) && d0 < d2)
+                if (!this.isHeadspaceFree(blockpos.west(), entHeight) && d0 < d2)
+                 {
+                     d2 = d0;
+                     i = 0;
+                 }
+ 
+-                if (this.isOpenBlockSpace(blockpos.east()) && 1.0D - d0 < d2)
+                if (!this.isHeadspaceFree(blockpos.east(), entHeight) && 1.0D - d0 < d2)
+                 {
+                     d2 = 1.0D - d0;
+                     i = 1;
+                 }
+ 
+-                if (this.isOpenBlockSpace(blockpos.north()) && d1 < d2)
+                if (!this.isHeadspaceFree(blockpos.north(), entHeight) && d1 < d2)
+                 {
+                     d2 = d1;
+                     i = 4;
+                 }
+ 
+-                if (this.isOpenBlockSpace(blockpos.south()) && 1.0D - d1 < d2)
+                if (!this.isHeadspaceFree(blockpos.south(), entHeight) && 1.0D - d1 < d2)
+                 {
+                     d2 = 1.0D - d1;
+                     i = 5;
+@@ -448,6 +461,12 @@
+ 
+     public void playSound(String name, float volume, float pitch)
+     {
+        net.minecraftforge.event.entity.PlaySoundAtEntityEvent event = net.minecraftforge.event.ForgeEventFactory.onPlaySoundAtEntity(this, name, volume, pitch);
+        if (event.isCanceled() || event.name == null) return;
+        name = event.name;
+        volume = event.newVolume;
+        pitch = event.newPitch;
+
+         this.worldObj.playSound(this.posX, this.posY, this.posZ, name, volume, pitch, false);
+     }
+ 
--- a/patches.mcp/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
@ -0,0 +1,156 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
+@@ -57,7 +57,7 @@
+         this.locationFontTexture = location;
+         this.renderEngine = textureManagerIn;
+         this.unicodeFlag = unicode;
+-        textureManagerIn.bindTexture(this.locationFontTexture);
+        bindTexture(this.locationFontTexture);
+ 
+         for (int i = 0; i < 32; ++i)
+         {
+@@ -97,6 +97,7 @@
+     public void onResourceManagerReload(IResourceManager resourceManager)
+     {
+         this.readFontTexture();
+        this.readGlyphSizes();
+     }
+ 
+     private void readFontTexture()
+@@ -105,7 +106,7 @@
+ 
+         try
+         {
+-            bufferedimage = TextureUtil.readBufferedImage(Minecraft.getMinecraft().getResourceManager().getResource(this.locationFontTexture).getInputStream());
+            bufferedimage = TextureUtil.readBufferedImage(getResourceInputStream(this.locationFontTexture));
+         }
+         catch (IOException ioexception)
+         {
+@@ -165,7 +166,7 @@
+ 
+         try
+         {
+-            inputstream = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation("font/glyph_sizes.bin")).getInputStream();
+            inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
+             inputstream.read(this.glyphWidth);
+         }
+         catch (IOException ioexception)
+@@ -196,7 +197,7 @@
+         int i = ch % 16 * 8;
+         int j = ch / 16 * 8;
+         int k = italic ? 1 : 0;
+-        this.renderEngine.bindTexture(this.locationFontTexture);
+        bindTexture(this.locationFontTexture);
+         int l = this.charWidth[ch];
+         float f = (float)l - 0.01F;
+         GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
+@@ -224,7 +225,7 @@
+ 
+     private void loadGlyphTexture(int page)
+     {
+-        this.renderEngine.bindTexture(this.getUnicodePageLocation(page));
+        bindTexture(this.getUnicodePageLocation(page));
+     }
+ 
+     protected float renderUnicodeChar(char ch, boolean italic)
+@@ -271,7 +272,7 @@
+ 
+     public int drawString(String text, float x, float y, int color, boolean dropShadow)
+     {
+-        GlStateManager.enableAlpha();
+        enableAlpha();
+         this.resetStyles();
+         int i;
+ 
+@@ -341,7 +342,7 @@
+ 
+                     int j1 = this.colorCode[i1];
+                     this.textColor = j1;
+-                    GlStateManager.color((float)(j1 >> 16) / 255.0F, (float)(j1 >> 8 & 255) / 255.0F, (float)(j1 & 255) / 255.0F, this.alpha);
+                    setColor((float)(j1 >> 16) / 255.0F, (float)(j1 >> 8 & 255) / 255.0F, (float)(j1 & 255) / 255.0F, this.alpha);
+                 }
+                 else if (i1 == 16)
+                 {
+@@ -370,7 +371,7 @@
+                     this.strikethroughStyle = false;
+                     this.underlineStyle = false;
+                     this.italicStyle = false;
+-                    GlStateManager.color(this.red, this.blue, this.green, this.alpha);
+                    setColor(this.red, this.blue, this.green, this.alpha);
+                 }
+ 
+                 ++i;
+@@ -398,7 +399,7 @@
+                     c0 = c1;
+                 }
+ 
+-                float f1 = this.unicodeFlag ? 0.5F : 1.0F;
+                float f1 = j == -1 || this.unicodeFlag ? 0.5f : 1f;
+                 boolean flag = (c0 == 0 || j == -1 || this.unicodeFlag) && shadow;
+ 
+                 if (flag)
+@@ -436,7 +437,16 @@
+ 
+                     ++f;
+                 }
+                doDraw(f);
+            }
+        }
+    }
+ 
+    protected void doDraw(float f)
+    {
+        {
+            {
+
+                 if (this.strikethroughStyle)
+                 {
+                     Tessellator tessellator = Tessellator.getInstance();
+@@ -509,7 +519,7 @@
+             this.blue = (float)(color >> 8 & 255) / 255.0F;
+             this.green = (float)(color & 255) / 255.0F;
+             this.alpha = (float)(color >> 24 & 255) / 255.0F;
+-            GlStateManager.color(this.red, this.blue, this.green, this.alpha);
+            setColor(this.red, this.blue, this.green, this.alpha);
+             this.posX = x;
+             this.posY = y;
+             this.renderStringAtPos(text, dropShadow);
+@@ -588,11 +598,6 @@
+                 int j = this.glyphWidth[character] >>> 4;
+                 int k = this.glyphWidth[character] & 15;
+ 
+-                if (k > 7)
+-                {
+-                    k = 15;
+-                    j = 0;
+-                }
+ 
+                 ++k;
+                 return (k - j) / 2 + 1;
+@@ -846,6 +851,26 @@
+         return this.bidiFlag;
+     }
+ 
+    protected void setColor(float r, float g, float b, float a)
+    {
+        GlStateManager.color(r,g,b,a);
+    }
+
+    protected void enableAlpha()
+    {
+        GlStateManager.enableAlpha();
+    }
+
+    protected void bindTexture(ResourceLocation location)
+    {
+        renderEngine.bindTexture(location);
+    }
+
+    protected InputStream getResourceInputStream(ResourceLocation location) throws IOException
+    {
+        return Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream();
+    }
+
+     public int getColorCode(char character)
+     {
+         return this.colorCode["0123456789abcdef".indexOf(character)];
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiButton.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiButton.java.patch
@ -0,0 +1,22 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiButton.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiButton.java
+@@ -21,6 +21,7 @@
+     public boolean enabled;
+     public boolean visible;
+     protected boolean hovered;
+    public int packedFGColour; //FML
+ 
+     public GuiButton(int buttonId, int x, int y, String buttonText)
+     {
+@@ -74,6 +75,11 @@
+             this.mouseDragged(mc, mouseX, mouseY);
+             int j = 14737632;
+ 
+            if (packedFGColour != 0)
+            {
+                j = packedFGColour;
+            }
+            else
+             if (!this.enabled)
+             {
+                 j = 10526880;
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiChat.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiChat.java.patch
@ -0,0 +1,39 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiChat.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiChat.java
+@@ -215,13 +215,14 @@
+             this.mc.ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(stringbuilder.toString()), 1);
+         }
+ 
+-        this.inputField.writeText((String)this.foundPlayerNames.get(this.autocompleteIndex++));
+        this.inputField.writeText(net.minecraft.util.EnumChatFormatting.getTextWithoutFormattingCodes((String)this.foundPlayerNames.get(this.autocompleteIndex++)));
+     }
+ 
+     private void sendAutocompleteRequest(String p_146405_1_, String p_146405_2_)
+     {
+         if (p_146405_1_.length() >= 1)
+         {
+            net.minecraftforge.client.ClientCommandHandler.instance.autoComplete(p_146405_1_, p_146405_2_);
+             BlockPos blockpos = null;
+ 
+             if (this.mc.objectMouseOver != null && this.mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
+@@ -281,6 +282,12 @@
+             this.playerNamesFound = false;
+             this.foundPlayerNames.clear();
+ 
+            String[] complete = net.minecraftforge.client.ClientCommandHandler.instance.latestAutoComplete;
+            if (complete != null)
+            {
+                p_146406_1_ = com.google.common.collect.ObjectArrays.concat(complete, p_146406_1_, String.class);
+            }
+
+             for (String s : p_146406_1_)
+             {
+                 if (s.length() > 0)
+@@ -291,6 +298,7 @@
+ 
+             String s1 = this.inputField.getText().substring(this.inputField.func_146197_a(-1, this.inputField.getCursorPosition(), false));
+             String s2 = StringUtils.getCommonPrefix(p_146406_1_);
+            s2 = net.minecraft.util.EnumChatFormatting.getTextWithoutFormattingCodes(s2);
+ 
+             if (s2.length() > 0 && !s1.equalsIgnoreCase(s2))
+             {
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
@ -0,0 +1,36 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
+@@ -205,6 +205,8 @@
+                     }
+                 }
+ 
+                WorldType.worldTypes[this.selectedIndex].onGUICreateWorldPress();
+
+                 WorldSettings.GameType worldsettings$gametype = WorldSettings.GameType.getByName(this.gameMode);
+                 WorldSettings worldsettings = new WorldSettings(i, worldsettings$gametype, this.field_146341_s, this.field_146337_w, WorldType.worldTypes[this.selectedIndex]);
+                 worldsettings.setWorldName(this.chunkProviderSettingsJson);
+@@ -312,14 +314,7 @@
+             }
+             else if (button.id == 8)
+             {
+-                if (WorldType.worldTypes[this.selectedIndex] == WorldType.FLAT)
+-                {
+-                    this.mc.displayGuiScreen(new GuiCreateFlatWorld(this, this.chunkProviderSettingsJson));
+-                }
+-                else
+-                {
+-                    this.mc.displayGuiScreen(new GuiCustomizeWorldScreen(this, this.chunkProviderSettingsJson));
+-                }
+                WorldType.worldTypes[this.selectedIndex].onCustomizeButton(mc, this);
+             }
+         }
+     }
+@@ -371,7 +366,7 @@
+             this.btnBonusItems.visible = this.field_146344_y;
+             this.btnMapType.visible = this.field_146344_y;
+             this.btnAllowCommands.visible = this.field_146344_y;
+-            this.btnCustomizeType.visible = this.field_146344_y && (WorldType.worldTypes[this.selectedIndex] == WorldType.FLAT || WorldType.worldTypes[this.selectedIndex] == WorldType.CUSTOMIZED);
+            this.btnCustomizeType.visible = this.field_146344_y && WorldType.worldTypes[this.selectedIndex].isCustomizable();
+         }
+ 
+         this.func_146319_h();
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
@ -0,0 +1,33 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
+@@ -30,8 +30,9 @@
+ 
+         this.buttonList.add(new GuiButton(4, this.width / 2 - 100, this.height / 4 + 24 + i, I18n.format("menu.returnToGame", new Object[0])));
+         this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + i, 98, 20, I18n.format("menu.options", new Object[0])));
+        this.buttonList.add(new GuiButton(12, this.width / 2 + 2, this.height / 4 + 96 + i, 98, 20, I18n.format("fml.menu.modoptions")));
+         GuiButton guibutton;
+-        this.buttonList.add(guibutton = new GuiButton(7, this.width / 2 + 2, this.height / 4 + 96 + i, 98, 20, I18n.format("menu.shareToLan", new Object[0])));
+        this.buttonList.add(guibutton = new GuiButton(7, this.width / 2 - 100, this.height / 4 + 72 + i, 200, 20, I18n.format("menu.shareToLan", new Object[0])));
+         this.buttonList.add(new GuiButton(5, this.width / 2 - 100, this.height / 4 + 48 + i, 98, 20, I18n.format("gui.achievements", new Object[0])));
+         this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + i, 98, 20, I18n.format("gui.stats", new Object[0])));
+         guibutton.enabled = this.mc.isSingleplayer() && !this.mc.getIntegratedServer().getPublic();
+@@ -74,13 +75,19 @@
+                 this.mc.setIngameFocus();
+                 break;
+             case 5:
+                if (this.mc.thePlayer != null)
+                 this.mc.displayGuiScreen(new GuiAchievements(this, this.mc.thePlayer.getStatFileWriter()));
+                 break;
+             case 6:
+                if (this.mc.thePlayer != null)
+                 this.mc.displayGuiScreen(new GuiStats(this, this.mc.thePlayer.getStatFileWriter()));
+                 break;
+             case 7:
+                 this.mc.displayGuiScreen(new GuiShareToLan(this));
+                break;
+            case 12:
+                net.minecraftforge.fml.client.FMLClientHandler.instance().showInGameModOptions(this);
+                break;
+         }
+     }
+ 
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
@ -0,0 +1,42 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
+@@ -223,7 +223,8 @@
+     {
+         this.buttonList.add(new GuiButton(1, this.width / 2 - 100, p_73969_1_, I18n.format("menu.singleplayer", new Object[0])));
+         this.buttonList.add(new GuiButton(2, this.width / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.format("menu.multiplayer", new Object[0])));
+-        this.buttonList.add(this.realmsButton = new GuiButton(14, this.width / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.format("menu.online", new Object[0])));
+        this.buttonList.add(this.realmsButton = new GuiButton(14, this.width / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.format("menu.online", new Object[0]).replace("Minecraft", "").trim()));
+        this.buttonList.add(new GuiButton(6, this.width / 2 - 100, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.format("fml.menu.mods")));
+     }
+ 
+     private void addDemoButtons(int p_73972_1_, int p_73972_2_)
+@@ -271,6 +272,11 @@
+             this.mc.shutdown();
+         }
+ 
+        if (button.id == 6)
+        {
+            this.mc.displayGuiScreen(new net.minecraftforge.fml.client.GuiModList(this));
+        }
+
+         if (button.id == 11)
+         {
+             this.mc.launchIntegratedServer("Demo_World", "Demo_World", DemoWorldServer.demoWorldSettings);
+@@ -516,7 +522,16 @@
+             s = s + " Demo";
+         }
+ 
+-        this.drawString(this.fontRendererObj, s, 2, this.height - 10, -1);
+        java.util.List<String> brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true));
+        for (int brdline = 0; brdline < brandings.size(); brdline++)
+        {
+            String brd = brandings.get(brdline);
+            if (!com.google.common.base.Strings.isNullOrEmpty(brd))
+            {
+                this.drawString(this.fontRendererObj, brd, 2, this.height - ( 10 + brdline * (this.fontRendererObj.FONT_HEIGHT + 1)), 16777215);
+            }
+        }
+        net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, this.fontRendererObj, this.width, this.height);
+         String s1 = "Copyright Mojang AB. Do not distribute!";
+         this.drawString(this.fontRendererObj, s1, this.width - this.fontRendererObj.getStringWidth(s1) - 2, this.height - 10, -1);
+ 
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
@ -0,0 +1,19 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
+@@ -40,6 +40,7 @@
+     public GuiMultiplayer(GuiScreen parentScreen)
+     {
+         this.parentScreen = parentScreen;
+        net.minecraftforge.fml.client.FMLClientHandler.instance().setupServerList();
+     }
+ 
+     public void initGui()
+@@ -372,7 +373,7 @@
+ 
+     private void connectToServer(ServerData server)
+     {
+-        this.mc.displayGuiScreen(new GuiConnecting(this, this.mc, server));
+        net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServer(this, server);
+     }
+ 
+     public void selectServer(int index)
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
@ -0,0 +1,12 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
+@@ -176,6 +176,9 @@
+         long l = j - k;
+         List<String> list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.mc.isJava64bit() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(bytesToMb(l)), Long.valueOf(bytesToMb(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(bytesToMb(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.getCpu()}), "", 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.add("");
+        list.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));
+
+         if (this.isReducedDebug())
+         {
+             return list;
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
@ -0,0 +1,107 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
+@@ -143,7 +143,8 @@
+             }
+         }
+ 
+-        this.drawHoveringText(list, x, y);
+        FontRenderer font = stack.getItem().getFontRenderer(stack);
+        this.drawHoveringText(list, x, y, (font == null ? fontRendererObj : font));
+     }
+ 
+     protected void drawCreativeTabHoveringText(String tabName, int mouseX, int mouseY)
+@@ -153,6 +154,11 @@
+ 
+     protected void drawHoveringText(List<String> textLines, int x, int y)
+     {
+        drawHoveringText(textLines, x, y, fontRendererObj);   
+    }
+
+    protected void drawHoveringText(List<String> textLines, int x, int y, FontRenderer font)
+    {
+         if (!textLines.isEmpty())
+         {
+             GlStateManager.disableRescaleNormal();
+@@ -163,7 +169,7 @@
+ 
+             for (String s : textLines)
+             {
+-                int j = this.fontRendererObj.getStringWidth(s);
+                int j = font.getStringWidth(s);
+ 
+                 if (j > i)
+                 {
+@@ -208,7 +214,7 @@
+             for (int k1 = 0; k1 < textLines.size(); ++k1)
+             {
+                 String s1 = (String)textLines.get(k1);
+-                this.fontRendererObj.drawStringWithShadow(s1, (float)l1, (float)i2, -1);
+                font.drawStringWithShadow(s1, (float)l1, (float)i2, -1);
+ 
+                 if (k1 == 0)
+                 {
+@@ -436,6 +442,7 @@
+         {
+             this.mc.ingameGUI.getChatGUI().addToSentMessages(msg);
+         }
+        if (net.minecraftforge.client.ClientCommandHandler.instance.executeCommand(mc.thePlayer, msg) != 0) return;
+ 
+         this.mc.thePlayer.sendChatMessage(msg);
+     }
+@@ -450,9 +457,15 @@
+ 
+                 if (guibutton.mousePressed(this.mc, mouseX, mouseY))
+                 {
+                    net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent.Pre event = new net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent.Pre(this, guibutton, this.buttonList);
+                    if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event))
+                        break;
+                    guibutton = event.button;
+                     this.selectedButton = guibutton;
+                     guibutton.playPressSound(this.mc.getSoundHandler());
+                     this.actionPerformed(guibutton);
+                    if (this.equals(this.mc.currentScreen))
+                        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent.Post(this, event.button, this.buttonList));
+                 }
+             }
+         }
+@@ -482,8 +495,12 @@
+         this.fontRendererObj = mc.fontRendererObj;
+         this.width = width;
+         this.height = height;
+        if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Pre(this, this.buttonList)))
+        {
+         this.buttonList.clear();
+         this.initGui();
+        }
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Post(this, this.buttonList));
+     }
+ 
+     public void func_183500_a(int p_183500_1_, int p_183500_2_)
+@@ -502,7 +519,9 @@
+         {
+             while (Mouse.next())
+             {
+                if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Pre(this))) continue;
+                 this.handleMouseInput();
+                if (this.equals(this.mc.currentScreen)) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Post(this));
+             }
+         }
+ 
+@@ -510,7 +529,9 @@
+         {
+             while (Keyboard.next())
+             {
+                if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Pre(this))) continue;
+                 this.handleKeyboardInput();
+                if (this.equals(this.mc.currentScreen)) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Post(this));
+             }
+         }
+     }
+@@ -570,6 +591,7 @@
+     public void drawDefaultBackground()
+     {
+         this.drawWorldBackground(0);
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.BackgroundDrawnEvent(this));
+     }
+ 
+     public void drawWorldBackground(int tint)
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
+@@ -186,7 +186,7 @@
+ 
+             if (this.mc.getSaveLoader().canLoadWorld(s))
+             {
+-                this.mc.launchIntegratedServer(s, s1, (WorldSettings)null);
+                net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1);
+             }
+         }
+     }
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiSleepMP.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiSleepMP.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiSleepMP.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSleepMP.java
+@@ -32,7 +32,7 @@
+ 
+             if (!s.isEmpty())
+             {
+-                this.mc.thePlayer.sendChatMessage(s);
+                this.sendChatMessage(s); // Forge: fix vanilla not adding messages to the sent list while sleeping
+             }
+ 
+             this.inputField.setText("");
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
@ -0,0 +1,39 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiSlot.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSlot.java
+@@ -181,15 +181,8 @@
+             GlStateManager.disableFog();
+             Tessellator tessellator = Tessellator.getInstance();
+             WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+-            this.mc.getTextureManager().bindTexture(Gui.optionsBackground);
+-            GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+-            float f = 32.0F;
+-            worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+-            worldrenderer.pos((double)this.left, (double)this.bottom, 0.0D).tex((double)((float)this.left / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+-            worldrenderer.pos((double)this.right, (double)this.bottom, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+-            worldrenderer.pos((double)this.right, (double)this.top, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.top + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+-            worldrenderer.pos((double)this.left, (double)this.top, 0.0D).tex((double)((float)this.left / f), (double)((float)(this.top + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+-            tessellator.draw();
+            // Forge: background rendering moved into separate method.
+            this.drawContainerBackground(tessellator);
+             int k = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
+             int l = this.top + 4 - (int)this.amountScrolled;
+ 
+@@ -458,4 +451,18 @@
+     {
+         return this.slotHeight;
+     }
+
+    protected void drawContainerBackground(Tessellator tessellator)
+    {
+        WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+        this.mc.getTextureManager().bindTexture(Gui.optionsBackground);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        float f = 32.0F;
+        worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+        worldrenderer.pos((double)this.left, (double)this.bottom, 0.0D).tex((double)((float)this.left / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+        worldrenderer.pos((double)this.right, (double)this.bottom, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+        worldrenderer.pos((double)this.right, (double)this.top, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.top + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+        worldrenderer.pos((double)this.left, (double)this.top, 0.0D).tex((double)((float)this.left / f), (double)((float)(this.top + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
+        tessellator.draw();
+    }
+ }
--- a/patches.mcp/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java
+@@ -73,6 +73,7 @@
+                         s3 = s4;
+                     }
+ 
+                    s3 = FontRenderer.getFormatFromString(s2) + s3; //Forge: Fix chat formatting not surviving line wrapping.
+                     ChatComponentText chatcomponenttext2 = new ChatComponentText(s3);
+                     chatcomponenttext2.setChatStyle(ichatcomponent1.getChatStyle().createShallowCopy());
+                     list1.add(j + 1, chatcomponenttext2);
--- a/patches.mcp/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
@ -0,0 +1,23 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
+@@ -82,7 +82,7 @@
+         boolean flag1 = this.field_148301_e.version < 47;
+         boolean flag2 = flag || flag1;
+         this.mc.fontRendererObj.drawString(this.field_148301_e.serverName, x + 32 + 3, y + 1, 16777215);
+-        List<String> list = this.mc.fontRendererObj.listFormattedStringToWidth(this.field_148301_e.serverMOTD, listWidth - 32 - 2);
+        List<String> list = this.mc.fontRendererObj.listFormattedStringToWidth(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.serverMOTD), listWidth - 48 - 2);
+ 
+         for (int i = 0; i < Math.min(list.size(), 2); ++i)
+         {
+@@ -176,6 +176,11 @@
+         int i1 = mouseX - x;
+         int j1 = mouseY - y;
+ 
+        String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, x, listWidth, y, i1, j1);
+        if (tooltip != null)
+        {
+            this.field_148303_c.setHoveringText(tooltip);
+        } else
+         if (i1 >= listWidth - 15 && i1 <= listWidth - 5 && j1 >= 0 && j1 <= 8)
+         {
+             this.field_148303_c.setHoveringText(s1);
--- a/patches.mcp/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch
@ -0,0 +1,117 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
+++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
+@@ -49,6 +49,10 @@
+     private StatFileWriter statFileWriter;
+     private boolean loadingAchievements = true;
+ 
+    private int currentPage = -1;
+    private GuiButton button;
+    private java.util.LinkedList<Achievement> minecraftAchievements = new java.util.LinkedList<Achievement>();
+
+     public GuiAchievements(GuiScreen parentScreenIn, StatFileWriter statFileWriterIn)
+     {
+         this.parentScreen = parentScreenIn;
+@@ -57,6 +61,14 @@
+         int j = 141;
+         this.field_146569_s = this.field_146567_u = this.field_146565_w = (double)(AchievementList.openInventory.displayColumn * 24 - i / 2 - 12);
+         this.field_146568_t = this.field_146566_v = this.field_146573_x = (double)(AchievementList.openInventory.displayRow * 24 - j / 2);
+        minecraftAchievements.clear();
+        for (Achievement achievement : AchievementList.achievementList)
+        {
+            if (!net.minecraftforge.common.AchievementPage.isAchievementInPages(achievement))
+            {
+                minecraftAchievements.add(achievement);
+            }
+        }
+     }
+ 
+     public void initGui()
+@@ -64,6 +76,7 @@
+         this.mc.getNetHandler().addToSendQueue(new C16PacketClientStatus(C16PacketClientStatus.EnumState.REQUEST_STATS));
+         this.buttonList.clear();
+         this.buttonList.add(new GuiOptionButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, I18n.format("gui.done", new Object[0])));
+        this.buttonList.add(button = new GuiButton(2, (width - field_146555_f) / 2 + 24, height / 2 + 74, 125, 20, net.minecraftforge.common.AchievementPage.getTitle(currentPage)));
+     }
+ 
+     protected void actionPerformed(GuiButton button) throws IOException
+@@ -74,6 +87,16 @@
+             {
+                 this.mc.displayGuiScreen(this.parentScreen);
+             }
+
+            if (button.id == 2)
+            {
+                currentPage++;
+                if (currentPage >= net.minecraftforge.common.AchievementPage.getAchievementPages().size())
+                {
+                    currentPage = -1;
+                }
+                this.button.displayString = net.minecraftforge.common.AchievementPage.getTitle(currentPage);
+            }
+         }
+     }
+ 
+@@ -257,7 +280,9 @@
+         GlStateManager.depthFunc(518);
+         GlStateManager.pushMatrix();
+         GlStateManager.translate((float)i1, (float)j1, -200.0F);
+-        GlStateManager.scale(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 0.0F);
+        // FIXES models rendering weirdly in the acheivements pane
+        // see https://github.com/MinecraftForge/MinecraftForge/commit/1b7ce7592caafb760ec93066184182ae0711e793#commitcomment-10512284
+        GlStateManager.scale(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 1.0F);
+         GlStateManager.enableTexture2D();
+         GlStateManager.disableLighting();
+         GlStateManager.enableRescaleNormal();
+@@ -331,11 +356,12 @@
+         GlStateManager.depthFunc(515);
+         this.mc.getTextureManager().bindTexture(ACHIEVEMENT_BACKGROUND);
+ 
+-        for (int j5 = 0; j5 < AchievementList.achievementList.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.achievementList.get(j5);
+            Achievement achievement1 = achievementList.get(j5);
+ 
+-            if (achievement1.parentAchievement != null)
+            if (achievement1.parentAchievement != null && achievementList.contains(achievement1.parentAchievement))
+             {
+                 int k5 = achievement1.displayColumn * 24 - i + 11;
+                 int l5 = achievement1.displayRow * 24 - j + 11;
+@@ -389,9 +415,9 @@
+         GlStateManager.enableRescaleNormal();
+         GlStateManager.enableColorMaterial();
+ 
+-        for (int i6 = 0; i6 < AchievementList.achievementList.size(); ++i6)
+        for (int i6 = 0; i6 < achievementList.size(); ++i6)
+         {
+-            Achievement achievement2 = (Achievement)AchievementList.achievementList.get(i6);
+            Achievement achievement2 = achievementList.get(i6);
+             int l6 = achievement2.displayColumn * 24 - i;
+             int j7 = achievement2.displayRow * 24 - j;
+ 
+@@ -432,6 +458,7 @@
+ 
+                 this.mc.getTextureManager().bindTexture(ACHIEVEMENT_BACKGROUND);
+ 
+                GlStateManager.enableBlend(); // Forge: Specifically enable blend because it is needed here. And we fix Generic RenderItem's leakage of it.
+                 if (achievement2.getSpecial())
+                 {
+                     this.drawTexturedModalRect(l6 - 2, j7 - 2, 26, 202, 26, 26);
+@@ -440,6 +467,7 @@
+                 {
+                     this.drawTexturedModalRect(l6 - 2, j7 - 2, 0, 202, 26, 26);
+                 }
+                GlStateManager.disableBlend(); //Forge: Cleanup states we set.
+ 
+                 if (!this.statFileWriter.canUnlockAchievement(achievement2))
+                 {
+@@ -448,7 +476,7 @@
+                     this.itemRender.func_175039_a(false);
+                 }
+ 
+-                GlStateManager.enableLighting();
+                GlStateManager.disableLighting(); //Forge: Make sure Lighting is disabled. Fixes MC-33065
+                 GlStateManager.enableCull();
+                 this.itemRender.renderItemAndEffectIntoGUI(achievement2.theItemStack, l6 + 3, j7 + 3);
+                 GlStateManager.blendFunc(770, 771);
--- a/patches.mcp/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
@ -0,0 +1,69 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
+++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
+@@ -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.objectMineStats)
+             {
+                 boolean flag = false;
+-                int i = Item.getIdFromItem(statcrafting.func_150959_a());
+                int i = Block.getIdFromBlock(Block.getBlockFromItem(statcrafting.func_150959_a()));
+                int itemId = Item.getIdFromItem(statcrafting.func_150959_a());
+ 
+                 if (GuiStats.this.field_146546_t.readStat(statcrafting) > 0)
+                 {
+                     flag = true;
+                 }
+-                else if (StatList.objectUseStats[i] != null && GuiStats.this.field_146546_t.readStat(StatList.objectUseStats[i]) > 0)
+                else if (StatList.objectUseStats[itemId] != null && GuiStats.this.field_146546_t.readStat(StatList.objectUseStats[itemId]) > 0)
+                 {
+                     flag = true;
+                 }
+-                else if (StatList.objectCraftStats[i] != null && GuiStats.this.field_146546_t.readStat(StatList.objectCraftStats[i]) > 0)
+                else if (StatList.objectCraftStats[itemId] != null && GuiStats.this.field_146546_t.readStat(StatList.objectCraftStats[itemId]) > 0)
+                 {
+                     flag = true;
+                 }
+@@ -468,8 +471,15 @@
+             {
+                 public int compare(StatCrafting p_compare_1_, StatCrafting p_compare_2_)
+                 {
+-                    int j = Item.getIdFromItem(p_compare_1_.func_150959_a());
+-                    int k = Item.getIdFromItem(p_compare_2_.func_150959_a());
+                    int j;
+                    int k;
+                    if (StatsBlock.this.field_148217_o == 2) {
+                        j = Block.getIdFromBlock(Block.getBlockFromItem(p_compare_1_.func_150959_a()));
+                        k = Block.getIdFromBlock(Block.getBlockFromItem(p_compare_2_.func_150959_a()));
+                    } else {
+                        j = Item.getIdFromItem(p_compare_1_.func_150959_a());
+                        k = Item.getIdFromItem(p_compare_2_.func_150959_a());
+                    }
+                     StatBase statbase = null;
+                     StatBase statbase1 = null;
+ 
+@@ -748,7 +758,7 @@
+             super(mcIn, GuiStats.this.width, GuiStats.this.height, 32, GuiStats.this.height - 64, GuiStats.this.fontRendererObj.FONT_HEIGHT * 4);
+             this.setShowSelectionBox(false);
+ 
+-            for (EntityList.EntityEggInfo entitylist$entityegginfo : EntityList.entityEggs.values())
+            for (EntityList.EntityEggInfo entitylist$entityegginfo : com.google.common.collect.Iterables.concat(EntityList.entityEggs.values(), net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().values()))
+             {
+                 if (GuiStats.this.field_146546_t.readStat(entitylist$entityegginfo.field_151512_d) > 0 || GuiStats.this.field_146546_t.readStat(entitylist$entityegginfo.field_151513_e) > 0)
+                 {
+@@ -784,7 +794,7 @@
+         protected void drawSlot(int entryID, int p_180791_2_, int p_180791_3_, int p_180791_4_, int mouseXIn, int mouseYIn)
+         {
+             EntityList.EntityEggInfo entitylist$entityegginfo = (EntityList.EntityEggInfo)this.field_148222_l.get(entryID);
+-            String s = I18n.format("entity." + EntityList.getStringFromID(entitylist$entityegginfo.spawnedID) + ".name", new Object[0]);
+            String s = I18n.format("entity." + entitylist$entityegginfo.name + ".name", new Object[0]);
+             int i = GuiStats.this.field_146546_t.readStat(entitylist$entityegginfo.field_151512_d);
+             int j = GuiStats.this.field_146546_t.readStat(entitylist$entityegginfo.field_151513_e);
+             String s1 = I18n.format("stat.entityKills", new Object[] {Integer.valueOf(i), s});
--- a/patches.mcp/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
@ -0,0 +1,70 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
+@@ -175,8 +175,11 @@
+         GlStateManager.translate(0.0F, 0.0F, 32.0F);
+         this.zLevel = 200.0F;
+         this.itemRender.zLevel = 200.0F;
+        net.minecraft.client.gui.FontRenderer font = null;
+        if (stack != null) font = stack.getItem().getFontRenderer(stack);
+        if (font == null) font = fontRendererObj;
+         this.itemRender.renderItemAndEffectIntoGUI(stack, x, y);
+-        this.itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, stack, x, y - (this.draggedStack == null ? 0 : 8), altText);
+        this.itemRender.renderItemOverlayIntoGUI(font, stack, x, y - (this.draggedStack == null ? 0 : 8), altText);
+         this.zLevel = 0.0F;
+         this.itemRender.zLevel = 0.0F;
+     }
+@@ -239,13 +242,12 @@
+ 
+         if (itemstack == null)
+         {
+-            String s1 = slotIn.getSlotTexture();
+            TextureAtlasSprite textureatlassprite = slotIn.getBackgroundSprite();
+ 
+-            if (s1 != null)
+            if (textureatlassprite != null)
+             {
+-                TextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1);
+                 GlStateManager.disableLighting();
+-                this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+                this.mc.getTextureManager().bindTexture(slotIn.getBackgroundLocation());
+                 this.drawTexturedModalRect(i, j, textureatlassprite, 16, 16);
+                 GlStateManager.enableLighting();
+                 flag1 = true;
+@@ -326,6 +328,7 @@
+             int j = this.guiLeft;
+             int k = this.guiTop;
+             boolean flag1 = mouseX < j || mouseY < k || mouseX >= j + this.xSize || mouseY >= k + this.ySize;
+            if (slot != null) flag1 = false; // Forge, prevent dropping of items through slots outside of GUI boundaries
+             int l = -1;
+ 
+             if (slot != null)
+@@ -463,10 +466,12 @@
+ 
+     protected void mouseReleased(int mouseX, int mouseY, int state)
+     {
+        super.mouseReleased(mouseX, mouseY, state); //Forge, Call parent to release buttons
+         Slot slot = this.getSlotAtPosition(mouseX, mouseY);
+         int i = this.guiLeft;
+         int j = this.guiTop;
+         boolean flag = mouseX < i || mouseY < j || mouseX >= i + this.xSize || mouseY >= j + this.ySize;
+        if (slot != null) flag = false; // Forge, prevent dropping of items through slots outside of GUI boundaries
+         int k = -1;
+ 
+         if (slot != null)
+@@ -685,4 +690,16 @@
+             this.mc.thePlayer.closeScreen();
+         }
+     }
+
+    /* ======================================== FORGE START =====================================*/
+
+    /**
+     * Returns the slot that is currently displayed under the mouse.
+     */
+    public Slot getSlotUnderMouse()
+    {
+        return this.theSlot;
+    }
+
+    /* ======================================== FORGE END   =====================================*/
+ }
--- a/patches.mcp/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
@ -0,0 +1,265 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
+@@ -48,6 +48,8 @@
+     private Slot field_147064_C;
+     private boolean field_147057_D;
+     private CreativeCrafting field_147059_E;
+    private static int tabPage = 0;
+    private int maxPages = 0;
+ 
+     public GuiContainerCreative(EntityPlayer p_i1088_1_)
+     {
+@@ -175,7 +177,7 @@
+                 return;
+             }
+ 
+-            if (itemstack1 != null && itemstack2 != null && itemstack1.isItemEqual(itemstack2))
+            if (itemstack1 != null && itemstack2 != null && itemstack1.isItemEqual(itemstack2) && ItemStack.areItemStackTagsEqual(itemstack1, itemstack2)) //Forge: Bugfix, Compare NBT data, allow for deletion of enchanted books, MC-12770
+             {
+                 if (clickedButton == 0)
+                 {
+@@ -259,6 +261,13 @@
+             this.setCurrentCreativeTab(CreativeTabs.creativeTabArray[i]);
+             this.field_147059_E = new CreativeCrafting(this.mc);
+             this.mc.thePlayer.inventoryContainer.onCraftGuiOpened(this.field_147059_E);
+            int tabCount = CreativeTabs.creativeTabArray.length;
+            if (tabCount > 12)
+            {
+                buttonList.add(new GuiButton(101, guiLeft,              guiTop - 50, 20, 20, "<"));
+                buttonList.add(new GuiButton(102, guiLeft + xSize - 20, guiTop - 50, 20, 20, ">"));
+                maxPages = ((tabCount - 12) / 10) + 1;
+            }
+         }
+         else
+         {
+@@ -280,7 +289,7 @@
+ 
+     protected void keyTyped(char typedChar, int keyCode) throws IOException
+     {
+-        if (selectedTabIndex != CreativeTabs.tabAllSearch.getTabIndex())
+        if (!CreativeTabs.creativeTabArray[selectedTabIndex].hasSearchBar())
+         {
+             if (GameSettings.isKeyDown(this.mc.gameSettings.keyBindChat))
+             {
+@@ -318,6 +327,14 @@
+         GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.inventorySlots;
+         guicontainercreative$containercreative.itemList.clear();
+ 
+        CreativeTabs tab = CreativeTabs.creativeTabArray[selectedTabIndex];
+        if (tab.hasSearchBar() && tab != CreativeTabs.tabAllSearch)
+        {
+            tab.displayAllReleventItems(guicontainercreative$containercreative.itemList);
+            updateFilteredItems(guicontainercreative$containercreative);
+            return;
+        }
+
+         for (Item item : Item.itemRegistry)
+         {
+             if (item != null && item.getCreativeTab() != null)
+@@ -325,7 +342,13 @@
+                 item.getSubItems(item, (CreativeTabs)null, guicontainercreative$containercreative.itemList);
+             }
+         }
+        updateFilteredItems(guicontainercreative$containercreative);
+    }
+ 
+    //split from above for custom search tabs
+    private void updateFilteredItems(GuiContainerCreative.ContainerCreative guicontainercreative$containercreative)
+    {
+        if (CreativeTabs.creativeTabArray[selectedTabIndex] == CreativeTabs.tabAllSearch) // FORGE: Only add enchanted books to the regular search
+         for (Enchantment enchantment : Enchantment.enchantmentsBookList)
+         {
+             if (enchantment != null && enchantment.type != null)
+@@ -333,7 +356,6 @@
+                 Items.enchanted_book.getAll(enchantment, guicontainercreative$containercreative.itemList);
+             }
+         }
+-
+         Iterator<ItemStack> iterator = guicontainercreative$containercreative.itemList.iterator();
+         String s1 = this.searchField.getText().toLowerCase();
+ 
+@@ -365,7 +387,7 @@
+     {
+         CreativeTabs creativetabs = CreativeTabs.creativeTabArray[selectedTabIndex];
+ 
+-        if (creativetabs.drawInForegroundOfTab())
+        if (creativetabs != null && creativetabs.drawInForegroundOfTab())
+         {
+             GlStateManager.disableBlend();
+             this.fontRendererObj.drawString(I18n.format(creativetabs.getTranslatedTabLabel(), new Object[0]), 8, 6, 4210752);
+@@ -400,7 +422,7 @@
+ 
+             for (CreativeTabs creativetabs : CreativeTabs.creativeTabArray)
+             {
+-                if (this.func_147049_a(creativetabs, i, j))
+                if (creativetabs != null && this.func_147049_a(creativetabs, i, j))
+                 {
+                     this.setCurrentCreativeTab(creativetabs);
+                     return;
+@@ -413,11 +435,13 @@
+ 
+     private boolean needsScrollBars()
+     {
+        if (CreativeTabs.creativeTabArray[selectedTabIndex] == null) return false;
+         return selectedTabIndex != CreativeTabs.tabInventory.getTabIndex() && CreativeTabs.creativeTabArray[selectedTabIndex].shouldHidePlayerInventory() && ((GuiContainerCreative.ContainerCreative)this.inventorySlots).func_148328_e();
+     }
+ 
+     private void setCurrentCreativeTab(CreativeTabs p_147050_1_)
+     {
+        if (p_147050_1_ == null) return;
+         int i = selectedTabIndex;
+         selectedTabIndex = p_147050_1_.getTabIndex();
+         GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.inventorySlots;
+@@ -483,12 +507,14 @@
+ 
+         if (this.searchField != null)
+         {
+-            if (p_147050_1_ == CreativeTabs.tabAllSearch)
+            if (p_147050_1_.hasSearchBar())
+             {
+                 this.searchField.setVisible(true);
+                 this.searchField.setCanLoseFocus(false);
+                 this.searchField.setFocused(true);
+                 this.searchField.setText("");
+                this.searchField.width = p_147050_1_.getSearchbarWidth();
+                this.searchField.xPosition = this.guiLeft + (82 /*default left*/ + 89 /*default width*/) - this.searchField.width;
+                 this.updateCreativeSearch();
+             }
+             else
+@@ -558,20 +584,43 @@
+         }
+ 
+         super.drawScreen(mouseX, mouseY, partialTicks);
+        int start = tabPage * 10;
+        int end = Math.min(CreativeTabs.creativeTabArray.length, ((tabPage + 1) * 10) + 2);
+        if (tabPage != 0) start += 2;
+        boolean rendered = false;
+ 
+-        for (CreativeTabs creativetabs : CreativeTabs.creativeTabArray)
+        for (CreativeTabs creativetabs : java.util.Arrays.copyOfRange(CreativeTabs.creativeTabArray,start,end))
+         {
+            if (creativetabs == null) continue;
+             if (this.renderCreativeInventoryHoveringText(creativetabs, mouseX, mouseY))
+             {
+                rendered = true;
+                 break;
+             }
+         }
+ 
+        if (!rendered && renderCreativeInventoryHoveringText(CreativeTabs.tabAllSearch, mouseX, mouseY))
+        {
+            renderCreativeInventoryHoveringText(CreativeTabs.tabInventory, mouseX, mouseY);
+        }
+
+         if (this.field_147064_C != null && selectedTabIndex == CreativeTabs.tabInventory.getTabIndex() && this.isPointInRegion(this.field_147064_C.xDisplayPosition, this.field_147064_C.yDisplayPosition, 16, 16, mouseX, mouseY))
+         {
+             this.drawCreativeTabHoveringText(I18n.format("inventory.binSlot", new Object[0]), mouseX, mouseY);
+         }
+ 
+        if (maxPages != 0)
+        {
+            String page = String.format("%d / %d", tabPage + 1, maxPages + 1);
+            int width = fontRendererObj.getStringWidth(page);
+            GlStateManager.disableLighting();
+            this.zLevel = 300.0F;
+            itemRender.zLevel = 300.0F;
+            fontRendererObj.drawString(page, guiLeft + (xSize / 2) - (width / 2), guiTop - 44, -1);
+            this.zLevel = 0.0F;
+            itemRender.zLevel = 0.0F;
+        }
+
+         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+         GlStateManager.disableLighting();
+     }
+@@ -633,16 +682,35 @@
+         RenderHelper.enableGUIStandardItemLighting();
+         CreativeTabs creativetabs = CreativeTabs.creativeTabArray[selectedTabIndex];
+ 
+-        for (CreativeTabs creativetabs1 : CreativeTabs.creativeTabArray)
+        int start = tabPage * 10;
+        int end = Math.min(CreativeTabs.creativeTabArray.length, ((tabPage + 1) * 10 + 2));
+        if (tabPage != 0) start += 2;
+
+        for (CreativeTabs creativetabs1 : java.util.Arrays.copyOfRange(CreativeTabs.creativeTabArray,start,end))
+         {
+             this.mc.getTextureManager().bindTexture(creativeInventoryTabs);
+ 
+            if (creativetabs1 == null) continue;
+             if (creativetabs1.getTabIndex() != selectedTabIndex)
+             {
+                 this.func_147051_a(creativetabs1);
+             }
+         }
+ 
+        if (tabPage != 0)
+        {
+            if (creativetabs != CreativeTabs.tabAllSearch)
+            {
+                this.mc.getTextureManager().bindTexture(creativeInventoryTabs);
+                func_147051_a(CreativeTabs.tabAllSearch);
+            }
+            if (creativetabs != CreativeTabs.tabInventory)
+            {
+                this.mc.getTextureManager().bindTexture(creativeInventoryTabs);
+                func_147051_a(CreativeTabs.tabInventory);
+            }
+        }
+
+         this.mc.getTextureManager().bindTexture(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativetabs.getBackgroundImageName()));
+         this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
+         this.searchField.drawTextBox();
+@@ -657,6 +725,14 @@
+             this.drawTexturedModalRect(i, j + (int)((float)(k - j - 17) * this.currentScroll), 232 + (this.needsScrollBars() ? 0 : 12), 0, 12, 15);
+         }
+ 
+        if (creativetabs == null || creativetabs.getTabPage() != tabPage)
+        {
+            if (creativetabs != CreativeTabs.tabAllSearch && creativetabs != CreativeTabs.tabInventory)
+            {
+                return;
+            }
+        }
+
+         this.func_147051_a(creativetabs);
+ 
+         if (creativetabs == CreativeTabs.tabInventory)
+@@ -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.tabAllSearch && p_147049_1_ != CreativeTabs.tabInventory)
+            {
+                return false;
+            }
+        }
+
+         int i = p_147049_1_.getTabColumn();
+         int j = 28 * i;
+         int k = 0;
+@@ -763,6 +847,8 @@
+         }
+ 
+         GlStateManager.disableLighting();
+        GlStateManager.color(1F, 1F, 1F); //Forge: Reset color in case Items change it.
+        GlStateManager.enableBlend(); //Forge: Make sure blend is enabled else tabs show a white border.
+         this.drawTexturedModalRect(l, i1, j, k, 28, j1);
+         this.zLevel = 100.0F;
+         this.itemRender.zLevel = 100.0F;
+@@ -789,6 +875,15 @@
+         {
+             this.mc.displayGuiScreen(new GuiStats(this, this.mc.thePlayer.getStatFileWriter()));
+         }
+
+        if (button.id == 101)
+        {
+            tabPage = Math.max(tabPage - 1, 0);
+        }
+        else if (button.id == 102)
+        {
+            tabPage = Math.min(tabPage + 1, maxPages);
+        }
+     }
+ 
+     public int getSelectedTabIndex()
--- a/patches.mcp/minecraft/net/minecraft/client/model/ModelBase.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/model/ModelBase.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/model/ModelBase.java
+++ ../src-work/minecraft/net/minecraft/client/model/ModelBase.java
+@@ -10,7 +10,6 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-@SideOnly(Side.CLIENT)
+ public abstract class ModelBase
+ {
+     public float swingProgress;
--- a/patches.mcp/minecraft/net/minecraft/client/model/ModelBox.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/model/ModelBox.java.patch
@ -0,0 +1,18 @@
+--- ../src-base/minecraft/net/minecraft/client/model/ModelBox.java
+++ ../src-work/minecraft/net/minecraft/client/model/ModelBox.java
+@@ -4,7 +4,6 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-@SideOnly(Side.CLIENT)
+ public class ModelBox
+ {
+     private PositionTextureVertex[] vertexPositions;
+@@ -81,6 +80,7 @@
+         }
+     }
+ 
+    @SideOnly(Side.CLIENT)
+     public void render(WorldRenderer renderer, float scale)
+     {
+         for (int i = 0; i < this.quadList.length; ++i)
--- a/patches.mcp/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
@ -0,0 +1,42 @@
+--- ../src-base/minecraft/net/minecraft/client/model/ModelRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/model/ModelRenderer.java
+@@ -10,7 +10,6 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.lwjgl.opengl.GL11;
+ 
+-@SideOnly(Side.CLIENT)
+ public class ModelRenderer
+ {
+     public float textureWidth;
+@@ -109,6 +108,7 @@
+         this.rotationPointZ = rotationPointZIn;
+     }
+ 
+    @SideOnly(Side.CLIENT)
+     public void render(float p_78785_1_)
+     {
+         if (!this.isHidden)
+@@ -190,6 +190,7 @@
+         }
+     }
+ 
+    @SideOnly(Side.CLIENT)
+     public void renderWithRotation(float p_78791_1_)
+     {
+         if (!this.isHidden)
+@@ -225,6 +226,7 @@
+         }
+     }
+ 
+    @SideOnly(Side.CLIENT)
+     public void postRender(float scale)
+     {
+         if (!this.isHidden)
+@@ -266,6 +268,7 @@
+         }
+     }
+ 
+    @SideOnly(Side.CLIENT)
+     private void compileDisplayList(float scale)
+     {
+         this.displayList = GLAllocation.generateDisplayLists(1);
--- a/patches.mcp/minecraft/net/minecraft/client/model/PositionTextureVertex.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/model/PositionTextureVertex.java.patch
@ -0,0 +1,13 @@
+--- ../src-base/minecraft/net/minecraft/client/model/PositionTextureVertex.java
+++ ../src-work/minecraft/net/minecraft/client/model/PositionTextureVertex.java
+@@ -1,10 +1,7 @@
+ package net.minecraft.client.model;
+ 
+ import net.minecraft.util.Vec3;
+-import net.minecraftforge.fml.relauncher.Side;
+-import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+-@SideOnly(Side.CLIENT)
+ public class PositionTextureVertex
+ {
+     public Vec3 vector3D;
--- a/patches.mcp/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
@ -0,0 +1,13 @@
+--- ../src-base/minecraft/net/minecraft/client/model/TexturedQuad.java
+++ ../src-work/minecraft/net/minecraft/client/model/TexturedQuad.java
+@@ -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;
+ 
+-@SideOnly(Side.CLIENT)
+ public class TexturedQuad
+ {
+     public PositionTextureVertex[] vertexPositions;
--- a/patches.mcp/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
+@@ -55,6 +55,7 @@
+         Chunk chunk = new Chunk(this.worldObj, p_73158_1_, p_73158_2_);
+         this.chunkMapping.add(ChunkCoordIntPair.chunkXZ2Int(p_73158_1_, p_73158_2_), chunk);
+         this.chunkListing.add(chunk);
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkEvent.Load(chunk));
+         chunk.setChunkLoaded(true);
+         return chunk;
+     }
--- a/patches.mcp/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch
@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
+@@ -67,7 +67,7 @@
+                     inetaddress = InetAddress.getByName(ip);
+                     GuiConnecting.this.networkManager = NetworkManager.func_181124_a(inetaddress, port, GuiConnecting.this.mc.gameSettings.func_181148_f());
+                     GuiConnecting.this.networkManager.setNetHandler(new NetHandlerLoginClient(GuiConnecting.this.networkManager, GuiConnecting.this.mc, GuiConnecting.this.previousGuiScreen));
+-                    GuiConnecting.this.networkManager.sendPacket(new C00Handshake(47, ip, port, EnumConnectionState.LOGIN));
+                    GuiConnecting.this.networkManager.sendPacket(new C00Handshake(47, ip, port, EnumConnectionState.LOGIN, true));
+                     GuiConnecting.this.networkManager.sendPacket(new C00PacketLoginStart(GuiConnecting.this.mc.getSession().getProfile()));
+                 }
+                 catch (UnknownHostException unknownhostexception)
--- a/patches.mcp/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
@ -0,0 +1,87 @@
+--- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
+@@ -111,6 +111,12 @@
+             }
+         }
+ 
+        ItemStack stack = mc.thePlayer.getCurrentEquippedItem();
+        if (stack != null && stack.getItem() != null && stack.getItem().onBlockStartBreak(stack, pos, mc.thePlayer))
+        {
+            return false;
+        }
+
+         if (this.currentGameType.isCreative() && this.mc.thePlayer.getHeldItem() != null && this.mc.thePlayer.getHeldItem().getItem() instanceof ItemSword)
+         {
+             return false;
+@@ -128,13 +134,7 @@
+             else
+             {
+                 world.playAuxSFX(2001, pos, Block.getStateId(iblockstate));
+-                boolean flag = world.setBlockToAir(pos);
+ 
+-                if (flag)
+-                {
+-                    block1.onBlockDestroyedByPlayer(world, pos, iblockstate);
+-                }
+-
+                 this.currentBlock = new BlockPos(this.currentBlock.getX(), -1, this.currentBlock.getZ());
+ 
+                 if (!this.currentGameType.isCreative())
+@@ -152,6 +152,12 @@
+                     }
+                 }
+ 
+                boolean flag = block1.removedByPlayer(world, pos, mc.thePlayer, false);
+
+                if (flag)
+                {
+                    block1.onBlockDestroyedByPlayer(world, pos, iblockstate);
+                }
+                 return flag;
+             }
+         }
+@@ -356,11 +362,19 @@
+         {
+             if (this.currentGameType != WorldSettings.GameType.SPECTATOR)
+             {
+
+                if (heldStack != null &&
+                    heldStack.getItem() != null &&
+                    heldStack.getItem().onItemUseFirst(heldStack, player, worldIn, hitPos, side, f, f1, f2))
+                {
+                    return true;
+                }
+
+                 IBlockState iblockstate = worldIn.getBlockState(hitPos);
+ 
+-                if ((!player.isSneaking() || player.getHeldItem() == null) && iblockstate.getBlock().onBlockActivated(worldIn, hitPos, iblockstate, player, side, f, f1, f2))
+                if ((!player.isSneaking() || player.getHeldItem() == null || player.getHeldItem().getItem().doesSneakBypassUse(worldIn, hitPos, player)))
+                 {
+-                    flag = true;
+                    flag = iblockstate.getBlock().onBlockActivated(worldIn, hitPos, iblockstate, player, side, f, f1, f2);
+                 }
+ 
+                 if (!flag && heldStack != null && heldStack.getItem() instanceof ItemBlock)
+@@ -393,7 +407,9 @@
+                 }
+                 else
+                 {
+-                    return heldStack.onItemUse(player, worldIn, hitPos, side, f, f1, f2);
+                    if (!heldStack.onItemUse(player, worldIn, hitPos, side, f, f1, f2)) return false;
+                    if (heldStack.stackSize <= 0) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, heldStack);
+                    return true;
+                 }
+             }
+             else
+@@ -420,9 +436,10 @@
+             {
+                 playerIn.inventory.mainInventory[playerIn.inventory.currentItem] = itemstack;
+ 
+-                if (itemstack.stackSize == 0)
+                if (itemstack.stackSize <= 0)
+                 {
+                     playerIn.inventory.mainInventory[playerIn.inventory.currentItem] = null;
+                    net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(playerIn, itemstack);
+                 }
+ 
+                 return true;
--- a/patches.mcp/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
@ -0,0 +1,17 @@
+--- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
+@@ -52,12 +52,13 @@
+         super(new SaveHandlerMP(), new WorldInfo(p_i45063_2_, "MpServer"), WorldProvider.getProviderForDimension(p_i45063_3_), p_i45063_5_, true);
+         this.sendQueue = p_i45063_1_;
+         this.getWorldInfo().setDifficulty(p_i45063_4_);
+-        this.setSpawnPoint(new BlockPos(8, 64, 8));
+         this.provider.registerWorld(this);
+        this.setSpawnPoint(new BlockPos(8, 64, 8)); //Forge: Moved below registerWorld to prevent NPE in our redirect.
+         this.chunkProvider = this.createChunkProvider();
+         this.mapStorage = new SaveDataMemoryStorage();
+         this.calculateInitialSkylight();
+         this.calculateInitialWeather();
+        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(this));
+     }
+ 
+     public void tick()
--- a/patches.mcp/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
+@@ -23,6 +23,7 @@
+ 
+     public void processHandshake(C00Handshake packetIn)
+     {
+        if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(packetIn, this.networkManager)) return;
+         this.networkManager.setConnectionState(packetIn.getRequestedState());
+         this.networkManager.setNetHandler(new NetHandlerLoginServer(this.mcServer, this.networkManager));
+     }
--- a/patches.mcp/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch
@ -0,0 +1,14 @@
+--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
+@@ -104,7 +104,10 @@
+     {
+         this.gameProfile = packetIn.getProfile();
+         this.networkManager.setConnectionState(EnumConnectionState.PLAY);
+-        this.networkManager.setNetHandler(new NetHandlerPlayClient(this.mc, this.previousGuiScreen, this.networkManager, this.gameProfile));
+        net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.networkManager);
+        NetHandlerPlayClient nhpc = new NetHandlerPlayClient(this.mc, this.previousGuiScreen, this.networkManager, this.gameProfile);
+        this.networkManager.setNetHandler(nhpc);
+        net.minecraftforge.fml.client.FMLClientHandler.instance().setPlayClient(nhpc);
+     }
+ 
+     public void onDisconnect(IChatComponent reason)
--- a/patches.mcp/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
@ -0,0 +1,62 @@
+--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
+@@ -246,7 +246,7 @@
+     {
+         PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController);
+         this.gameController.playerController = new PlayerControllerMP(this.gameController, this);
+-        this.clientWorldController = new WorldClient(this, new WorldSettings(0L, packetIn.getGameType(), false, packetIn.isHardcoreMode(), packetIn.getWorldType()), packetIn.getDimension(), packetIn.getDifficulty(), this.gameController.mcProfiler);
+        this.clientWorldController = new WorldClient(this, new WorldSettings(0L, packetIn.getGameType(), false, packetIn.isHardcoreMode(), packetIn.getWorldType()), net.minecraftforge.fml.common.network.handshake.NetworkDispatcher.get(getNetworkManager()).getOverrideDimension(packetIn), packetIn.getDifficulty(), this.gameController.mcProfiler);
+         this.gameController.gameSettings.difficulty = packetIn.getDifficulty();
+         this.gameController.loadWorld(this.clientWorldController);
+         this.gameController.thePlayer.dimension = packetIn.getDimension();
+@@ -750,14 +750,16 @@
+     public void handleChat(S02PacketChat packetIn)
+     {
+         PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController);
+        net.minecraft.util.IChatComponent message = net.minecraftforge.event.ForgeEventFactory.onClientChat(packetIn.getType(), packetIn.getChatComponent());
+        if (message == null) return;
+ 
+         if (packetIn.getType() == 2)
+         {
+-            this.gameController.ingameGUI.setRecordPlaying(packetIn.getChatComponent(), false);
+            this.gameController.ingameGUI.setRecordPlaying(message, false);
+         }
+         else
+         {
+-            this.gameController.ingameGUI.getChatGUI().printChatMessage(packetIn.getChatComponent());
+            this.gameController.ingameGUI.getChatGUI().printChatMessage(message);
+         }
+     }
+ 
+@@ -808,6 +810,11 @@
+         float f = (float)(packetIn.getYaw() * 360) / 256.0F;
+         float f1 = (float)(packetIn.getPitch() * 360) / 256.0F;
+         EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.createEntityByID(packetIn.getEntityType(), this.gameController.theWorld);
+        if (entitylivingbase == null)
+        {
+            net.minecraftforge.fml.common.FMLLog.info("Server attempted to spawn an unknown entity using ID: {0} at ({1}, {2}, {3}) Skipping!", packetIn.getEntityType(), d0, d1, d2);
+            return;
+        }
+         entitylivingbase.serverPosX = packetIn.getX();
+         entitylivingbase.serverPosY = packetIn.getY();
+         entitylivingbase.serverPosZ = packetIn.getZ();
+@@ -1133,6 +1140,10 @@
+             {
+                 tileentity.readFromNBT(packetIn.getNbtCompound());
+             }
+            else
+            {
+                tileentity.onDataPacket(netManager, packetIn);
+            }
+         }
+     }
+ 
+@@ -1341,7 +1352,7 @@
+ 
+         if (entity instanceof EntityLivingBase)
+         {
+-            PotionEffect potioneffect = new PotionEffect(packetIn.getEffectId(), packetIn.getDuration(), packetIn.getAmplifier(), false, packetIn.func_179707_f());
+            PotionEffect potioneffect = new PotionEffect(packetIn.getEffectId() & 0xff, packetIn.getDuration(), packetIn.getAmplifier(), false, packetIn.func_179707_f());
+             potioneffect.setPotionDurationMax(packetIn.func_149429_c());
+             ((EntityLivingBase)entity).addPotionEffect(potioneffect);
+         }
--- a/patches.mcp/minecraft/net/minecraft/client/network/OldServerPinger.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/network/OldServerPinger.java.patch
@ -0,0 +1,10 @@
+--- ../src-base/minecraft/net/minecraft/client/network/OldServerPinger.java
+++ ../src-work/minecraft/net/minecraft/client/network/OldServerPinger.java
+@@ -150,6 +150,7 @@
+                         server.setBase64EncodedIconData((String)null);
+                     }
+ 
+                    net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(server, serverstatusresponse);
+                     this.field_175092_e = Minecraft.getSystemTime();
+                     networkmanager.sendPacket(new C01PacketPing(this.field_175092_e));
+                     this.field_147403_d = true;
--- a/patches.mcp/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch
+++ b/patches.mcp/minecraft/net/minecraft/client/particle/EffectRenderer.java.patch
@ -0,0 +1,33 @@
+--- ../src-base/minecraft/net/minecraft/client/particle/EffectRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/particle/EffectRenderer.java
+@@ -133,6 +133,7 @@
+ 
+     public void addEffect(EntityFX effect)
+     {
+        if (effect == null) return; //Forge: Prevent modders from being bad and adding nulls causing untraceable NPEs.
+         int i = effect.getFXLayer();
+         int j = effect.getAlpha() != 1.0F ? 0 : 1;
+ 
+@@ -351,7 +352,7 @@
+ 
+     public void addBlockDestroyEffects(BlockPos pos, IBlockState state)
+     {
+-        if (state.getBlock().getMaterial() != Material.air)
+        if (!state.getBlock().isAir(worldObj, pos) && !state.getBlock().addDestroyEffects(worldObj, pos, this))
+         {
+             state = state.getBlock().getActualState(state, this.worldObj, pos);
+             int i = 4;
+@@ -457,4 +458,13 @@
+ 
+         return "" + i;
+     }
+
+    public void addBlockHitEffects(BlockPos pos, net.minecraft.util.MovingObjectPosition target)
+    {
+        Block block = worldObj.getBlockState(pos).getBlock();
+        if (block != null && !block.addHitEffects(worldObj, target, this))
+        {
+            addBlockHitEffects(pos, target.sideHit);
+        }
+     }
+ }
--- a/Show More
+++ b/Show More