tagged 1.3.2

On windows they no longer need the user to press enter every step
Moved version info out to version.txt, This will only effect the svn. If you update the version do it in version.txt not in ForgeHooks.java.
Introduced the build number into the version string.
Cleaned up some extra echos in scripts.

build.bat

@@ -1,11 +0,0 @@
-cd ..
-
-rmdir /S /Q src
-mkdir src
-xcopy  /Y /E src_work\* src\
-
-xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
-xcopy /Y /E forge\forge_common\net\* src\minecraft\net
-xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
-
-cmd /C recompile.bat

conf/version.cfg

@@ -1,4 +0,0 @@
-[VERSION]
-MCPVersion = 5.0
-ClientVersion = 1.0.0
-ServerVersion = 1.0.1

forge/build.bat

@@ -0,0 +1,15 @@
+@cd ..
+
+@rmdir /S /Q src
+@mkdir src
+xcopy  /Y /E src_work\* src\
+xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
+
+@cd forge
+@cmd /C inject_version.bat ../src/minecraft/net/minecraft/src/forge/ForgeHooks.java
+@cmd /C inject_version.bat ../src/minecraft_server/net/minecraft/src/forge/ForgeHooks.java
+@cd ..
+
+@echo  | call recompile.bat

forge/build.sh

@@ -10,6 +10,11 @@ cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
 cp -a forge/forge_common/net/* src_forge/minecraft/net/
 cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
 
+cd forge
+./inject_version.sh ../src_forge/minecraft/net/minecraft/src/forge/ForgeHooks.java
+./inject_version.sh ../src_forge/minecraft_server/net/minecraft/src/forge/ForgeHooks.java
+cd ..
+
 cp -a src_forge src
 
 ./recompile.sh

forge/conf/client.exc

@@ -213,6 +213,8 @@ net/minecraft/src/Packet8UpdateHealth.func_322_a(Ljava/io/DataOutputStream;)V=ja
 net/minecraft/src/Packet8UpdateHealth.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
 net/minecraft/src/Packet9Respawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
 net/minecraft/src/Packet9Respawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet250CustomPayload.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet250CustomPayload.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
 net/minecraft/src/RegionFile.func_22196_b()V=java/io/IOException
 net/minecraft/src/RegionFile.func_22198_a(III)V=java/io/IOException
 net/minecraft/src/RegionFile.func_22200_a(I[BI)V=java/io/IOException
@@ -226,3 +228,4 @@ net/minecraft/src/ThreadDownloadResources.func_1212_a(Ljava/net/URL;Ljava/io/Fil
 net/minecraft/src/ThreadedChunkLoader.func_40551_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
 net/minecraft/src/ThreadedChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
 net/minecraft/src/ThreadedFileIOBase.func_40566_a()V=java/lang/InterruptedException
+net/minecraft/src/StringTranslate.func_44025_a(Ljava/util/Properties;Ljava/lang/String;)V=java/io/IOException

forge/conf/mcp.cfg

@@ -9,6 +9,9 @@ DirConf    = conf
 DirRuntime = runtime
 DirLib     = lib
 DirFFOut   = temp/ffout
+DirBinOut  = temp/bin
+DirModSrc  = modsrc
+DirEclipse = eclipse
 
 [CSV]
 Classes = %(DirConf)s/classes.csv
@@ -23,8 +26,8 @@ Server  = %(DirTemp)s/server_rg.srg
 DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
-MD5Client  = 3820d222b95d0b8c520d9596a756a6e6
-MD5Server  = 934b6010999daa1f1b1ccdf4cb77e052
+MD5Client  = e92302d2acdba7c97e0d8df1e10d2006
+MD5Server  = b0f4fb91f9723104adf35944bbf3d3cf
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -50,8 +53,6 @@ XClientLog      = %(DirLogs)s/client_exc.log
 XServerLog      = %(DirLogs)s/server_exc.log
 
 [DECOMPILE]
-FFClientConf  = -rbr=0 -dgs=1 -asc=1
-FFServerConf  = -rbr=0 -dgs=1 -asc=1
 FFClientOut   = %(DirFFOut)s/client
 FFServerOut   = %(DirFFOut)s/server
 FFClientSrc   = %(DirFFOut)s/minecraft_exc.jar
@@ -59,15 +60,12 @@ FFServerSrc   = %(DirFFOut)s/minecraft_server_exc.jar
 FFSource      = net
 
 [OUTPUT]
-BinOut     = %(DirTemp)s/bin
-BinClient  = %(DirTemp)s/bin/minecraft
-BinServer  = %(DirTemp)s/bin/minecraft_server
+BinClient  = %(DirBinOut)s/minecraft
+BinServer  = %(DirBinOut)s/minecraft_server
 SrcClient  = %(DirSrc)s/minecraft
 SrcServer  = %(DirSrc)s/minecraft_server
-
-[PACKAGES]
-PkgClient  = net/minecraft/src,net/minecraft/client
-PkgServer  = net/minecraft/src,net/minecraft/server
+TestClient = net/minecraft/client/Minecraft
+TestServer = net/minecraft/server/MinecraftServer
 
 [PATCHES]
 PatchClient   = %(DirConf)s/patches/minecraft.patch
@@ -75,6 +73,8 @@ PatchServer   = %(DirConf)s/patches/minecraft_server.patch
 PatchTemp     = %(DirTemp)s/temp.patch
 FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
 FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
+PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
+PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
 
 [RECOMPILE]
 BinClient       = %(DirBin)s/minecraft
@@ -84,8 +84,6 @@ ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
 ClientFixes     = %(DirConf)s/patches
 
 [REOBF]
-SAFFXClient       = %(DirTemp)s/minecraft.saffx
-SAFFXServer       = %(DirTemp)s/minecraft_server.saffx
 MD5Client         = %(DirTemp)s/client.md5
 MD5Server         = %(DirTemp)s/server.md5
 MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
@@ -98,42 +96,46 @@ ObfJarClient      = %(DirTemp)s/client_reobf.jar
 ObfJarServer      = %(DirTemp)s/server_reobf.jar
 ReobfDirClient    = %(DirReobf)s/minecraft
 ReobfDirServer    = %(DirReobf)s/minecraft_server
+ClientRoLog       = %(DirLogs)s/client_ro.log
+ServerRoLog       = %(DirLogs)s/server_ro.log
 ReobfClientLog    = %(DirLogs)s/client_reob.log
 ReobfServerLog    = %(DirLogs)s/server_reob.log
-FixSound          = minecraft/me.class
-FixStart          = minecraft/Start.class
+FixSound          = ga
+FixStart          = Start
 NullPkg           = net/minecraft/src
 IgnorePkg         = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
 
 [GETMODSOURCE]
-OutSRCClient	= modsrc/client
-OutSRCServer	= modsrc/server
-OutSRC			= modsrc
+OutSRCClient      = %(DirModSrc)s/minecraft
+OutSRCServer      = %(DirModSrc)s/minecraft_server
 
 [MCP]
 LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
+UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
+IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
 
 [COMMANDS]
-Patcher       = %(DirRuntime)s/bin/applydiff.exe
+Patcher_win   = %(DirRuntime)s/bin/applydiff.exe
+Patcher_linux = patch
+Patcher_osx   = patch
+Jad_win       = %(DirRuntime)s/bin/jad.exe
+Jad_linux     = wine %(DirRuntime)s/bin/jad.exe
+Jad_osx       = %(DirRuntime)s/bin/jad-osx
+AStyle_win    = %(DirRuntime)s/bin/astyle.exe
+AStyle_linux  = wine %(DirRuntime)s/bin/astyle.exe
+AStyle_osx    = %(DirRuntime)s/bin/astyle-osx
 JadRetro      = %(DirRuntime)s/bin/jadretro.jar
 Fernflower    = %(DirRuntime)s/bin/fernflower.jar
-Jadwin        = %(DirRuntime)s/bin/jad.exe
-Jadlinux      = %(DirRuntime)s/bin/jad.exe
-Jadosx        = %(DirRuntime)s/bin/jad-osx
 Exceptor      = %(DirRuntime)s/bin/exceptor.jar
-CmdRG         = %s -cp {classpath} RetroGuard -searge {conffile}
-CmdRGReobf    = %s -cp {classpath} RetroGuard -notch  {conffile}
-CmdJadretro   = %s -jar {jarjr} {targetdir}
-CmdRecompClt  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} {fixes}/*.java
-CmdRecompSrv  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdPatch      = %s -p1 -u -i {patchfile} -d {srcdir}
+CmdJad        = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
+CmdAStyle     = %s -A1s4CSKYm1M1pHjcnqz2 {classes}
+CmdRG         = %s -cp "{classpath}" RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
+CmdJadretro   = %s -jar %s {targetdir}
+CmdFernflower = %s -jar %s -rbr=0 -dgs=1 -asc=1 -log=WARN {jarin} {jarout}
+CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
+CmdRecomp     = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
 CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
-CmdJadwin     = .\{binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
-CmdJadlinux   = wine {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff "{classes}"
-CmdJadosx     = {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
-CmdPatchwin   = .\%(Patcher)s --binary -p1 -u -i ..\..\{patchfile} -d {srcdir}
-CmdPatchlinux = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
-CmdPatchosx   = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
-CmdFernflower = %s -jar {jarff} {conf} {jarin} {jarout}
-CmdExceptor   = %s -jar {jarexc} {input} {output} {conf} {log}

forge/conf/patches/ga.java

@@ -1,6 +1,6 @@
 // this is needed for the sound engine to work with deobfuscated sourcecode without crashing
 
-public class me
+public class ga
 {
     public static int c(double d)
     {

forge/conf/patches/minecraft_ff.patch

@@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Tue Nov 22 23:21:44 2011
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Wed Nov 23 00:09:14 2011
-@@ -1600,11 +1600,13 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Fri Jan 13 17:44:46 2012
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Jan 13 17:35:06 2012
+@@ -1609,11 +1609,13 @@
  
              this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8);
              if(!this.field_6327_b.func_35643_e()) {
@@ -16,8 +16,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
           }
        }
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Tue Nov 22 23:21:36 2011
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Wed Nov 23 00:09:14 2011
+--- minecraft\net\minecraft\src\CodecMus.java	Fri Jan 13 17:44:20 2012
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Jan 13 17:35:06 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -39,8 +39,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
---- minecraft\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:24 2011
-+++ minecraft_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:14 2011
+--- minecraft\net\minecraft\src\ItemMap.java	Fri Jan 13 17:43:42 2012
++++ minecraft_patched\net\minecraft\src\ItemMap.java	Fri Jan 13 17:35:06 2012
 @@ -19,7 +19,6 @@
     }
  
@@ -58,8 +58,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\mine
        if(var4 == null) {
           var1.func_28156_b(var2.func_28101_b("map"));
 diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
---- minecraft\net\minecraft\src\MusInputStream.java	Tue Nov 22 23:21:24 2011
-+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Wed Nov 23 00:09:14 2011
+--- minecraft\net\minecraft\src\MusInputStream.java	Fri Jan 13 17:42:36 2012
++++ minecraft_patched\net\minecraft\src\MusInputStream.java	Fri Jan 13 17:35:06 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -82,8 +82,8 @@ diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\n
        for(int var4 = 0; var4 < var3; ++var4) {
           byte var5 = var1[var2 + var4] = (byte)(var1[var2 + var4] ^ this.field_1516_c >> 8);
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Tue Nov 22 23:21:20 2011
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Wed Nov 23 00:10:20 2011
+--- minecraft\net\minecraft\src\RenderGlobal.java	Fri Jan 13 17:43:24 2012
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Jan 13 17:35:06 2012
 @@ -1466,7 +1466,7 @@
           double var15 = this.field_1439_t.field_22009_h.field_611_ak - var2;
           double var17 = this.field_1439_t.field_22009_h.field_610_al - var4;
@@ -94,8 +94,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
              this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, var2, var4, var6, var8, var10, var12));
           } else if(var1.equals("largeexplode")) {
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Nov 22 23:21:30 2011
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:14 2011
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Fri Jan 13 17:43:00 2012
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Jan 13 17:35:06 2012
 @@ -21,7 +21,9 @@
     }
  

forge/conf/patches/minecraft_osx.patch

@@ -0,0 +1,54 @@
+diff -r -U 3 minecraft\net\minecraft\src\EntityMinecart.java minecraft_patched\net\minecraft\src\EntityMinecart.java
+--- minecraft\net\minecraft\src\EntityMinecart.java	Sat Jan 14 16:05:10 2012
++++ minecraft_patched\net\minecraft\src\EntityMinecart.java	Sat Jan 14 16:07:41 2012
+@@ -811,7 +811,7 @@
+         double d = entity.field_611_ak - field_611_ak;
+         double d1 = entity.field_609_am - field_609_am;
+         double d2 = d * d + d1 * d1;
+-        if(d2 >= 9.9999997473787516E-05D)
++        if(d2 >= 9.9999997473787516E-005D)
+         {
+             d2 = MathHelper.func_1109_a(d2);
+             d /= d2;
+diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sat Jan 14 16:05:10 2012
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Jan 14 16:07:41 2012
+@@ -968,7 +968,7 @@
+             f3 = f7;
+             f4 = f8;
+         }
+-        float f6 = 0.0004882812F;
++        float f6 = 0.0004882813F;
+         double d = (float)field_1435_x + f;
+         double d1 = field_1439_t.field_22009_h.field_9285_at + (field_1439_t.field_22009_h.field_611_ak - field_1439_t.field_22009_h.field_9285_at) * (double)f + d * 0.029999999329447746D;
+         double d2 = field_1439_t.field_22009_h.field_9283_av + (field_1439_t.field_22009_h.field_609_am - field_1439_t.field_22009_h.field_9283_av) * (double)f;
+diff -r -U 3 minecraft\net\minecraft\src\Vec3D.java minecraft_patched\net\minecraft\src\Vec3D.java
+--- minecraft\net\minecraft\src\Vec3D.java	Sat Jan 14 16:05:10 2012
++++ minecraft_patched\net\minecraft\src\Vec3D.java	Sat Jan 14 16:07:41 2012
+@@ -137,7 +137,7 @@
+         double d1 = vec3d.field_1776_a - field_1776_a;
+         double d2 = vec3d.field_1775_b - field_1775_b;
+         double d3 = vec3d.field_1779_c - field_1779_c;
+-        if(d1 * d1 < 1.0000000116860974E-07D)
++        if(d1 * d1 < 1.0000000116860974E-007D)
+         {
+             return null;
+         }
+@@ -156,7 +156,7 @@
+         double d1 = vec3d.field_1776_a - field_1776_a;
+         double d2 = vec3d.field_1775_b - field_1775_b;
+         double d3 = vec3d.field_1779_c - field_1779_c;
+-        if(d2 * d2 < 1.0000000116860974E-07D)
++        if(d2 * d2 < 1.0000000116860974E-007D)
+         {
+             return null;
+         }
+@@ -175,7 +175,7 @@
+         double d1 = vec3d.field_1776_a - field_1776_a;
+         double d2 = vec3d.field_1775_b - field_1775_b;
+         double d3 = vec3d.field_1779_c - field_1779_c;
+-        if(d3 * d3 < 1.0000000116860974E-07D)
++        if(d3 * d3 < 1.0000000116860974E-007D)
+         {
+             return null;
+         }

forge/conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
---- minecraft_server\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:56 2011
-+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:45 2011
+--- minecraft_server\net\minecraft\src\ItemMap.java	Fri Jan 13 17:46:22 2012
++++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Fri Jan 13 17:37:00 2012
 @@ -22,7 +22,6 @@
     }
  
@@ -11,8 +11,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_pa
           var1.func_28145_b(var2.func_28104_b("map"));
 diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Nov 22 23:22:10 2011
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:45 2011
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Fri Jan 13 17:45:20 2012
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Jan 13 17:37:00 2012
 @@ -21,7 +21,9 @@
     }
  

forge/conf/patches/minecraft_server_osx.patch

@@ -0,0 +1,60 @@
+diff -r -U 3 minecraft_server\net\minecraft\src\EntityMinecart.java minecraft_server_patched\net\minecraft\src\EntityMinecart.java
+--- minecraft_server\net\minecraft\src\EntityMinecart.java	Sat Jan 14 16:05:25 2012
++++ minecraft_server_patched\net\minecraft\src\EntityMinecart.java	Sat Jan 14 16:07:50 2012
+@@ -751,7 +751,7 @@
+         double d = entity.field_322_l - field_322_l;
+         double d1 = entity.field_320_n - field_320_n;
+         double d2 = d * d + d1 * d1;
+-        if(d2 >= 9.9999997473787516E-05D)
++        if(d2 >= 9.9999997473787516E-005D)
+         {
+             d2 = MathHelper.func_583_a(d2);
+             d /= d2;
+diff -r -U 3 minecraft_server\net\minecraft\src\GuiStatsComponent.java minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java
+--- minecraft_server\net\minecraft\src\GuiStatsComponent.java	Sat Jan 14 16:05:25 2012
++++ minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java	Sat Jan 14 16:07:50 2012
+@@ -43,12 +43,12 @@
+         System.gc();
+         field_768_c[0] = (new StringBuilder()).append("Memory use: ").append(l / 1024L / 1024L).append(" mb (").append((Runtime.getRuntime().freeMemory() * 100L) / Runtime.getRuntime().maxMemory()).append("% free)").toString();
+         field_768_c[1] = (new StringBuilder()).append("Threads: ").append(NetworkManager.field_1052_b).append(" + ").append(NetworkManager.field_1051_c).toString();
+-        field_768_c[2] = (new StringBuilder()).append("Avg tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40027_f) * 9.9999999999999995E-07D)).append(" ms").toString();
++        field_768_c[2] = (new StringBuilder()).append("Avg tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40027_f) * 9.9999999999999995E-007D)).append(" ms").toString();
+         i = 0;
+ _L3:
+         if(i >= field_40572_e.field_6034_e.length) goto _L2; else goto _L1
+ _L1:
+-        field_768_c[3 + i] = (new StringBuilder()).append("Lvl ").append(i).append(" tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40028_g[i]) * 9.9999999999999995E-07D)).append(" ms").toString();
++        field_768_c[3 + i] = (new StringBuilder()).append("Lvl ").append(i).append(" tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40028_g[i]) * 9.9999999999999995E-007D)).append(" ms").toString();
+         if(field_40572_e.field_6034_e[i] == null || field_40572_e.field_6034_e[i].field_20911_y == null)
+         {
+             continue; /* Loop/switch isn't completed */
+diff -r -U 3 minecraft_server\net\minecraft\src\Vec3D.java minecraft_server_patched\net\minecraft\src\Vec3D.java
+--- minecraft_server\net\minecraft\src\Vec3D.java	Sat Jan 14 16:05:25 2012
++++ minecraft_server_patched\net\minecraft\src\Vec3D.java	Sat Jan 14 16:07:50 2012
+@@ -121,7 +121,7 @@
+         double d1 = vec3d.field_1055_a - field_1055_a;
+         double d2 = vec3d.field_1054_b - field_1054_b;
+         double d3 = vec3d.field_1058_c - field_1058_c;
+-        if(d1 * d1 < 1.0000000116860974E-07D)
++        if(d1 * d1 < 1.0000000116860974E-007D)
+         {
+             return null;
+         }
+@@ -140,7 +140,7 @@
+         double d1 = vec3d.field_1055_a - field_1055_a;
+         double d2 = vec3d.field_1054_b - field_1054_b;
+         double d3 = vec3d.field_1058_c - field_1058_c;
+-        if(d2 * d2 < 1.0000000116860974E-07D)
++        if(d2 * d2 < 1.0000000116860974E-007D)
+         {
+             return null;
+         }
+@@ -159,7 +159,7 @@
+         double d1 = vec3d.field_1055_a - field_1055_a;
+         double d2 = vec3d.field_1054_b - field_1054_b;
+         double d3 = vec3d.field_1058_c - field_1058_c;
+-        if(d3 * d3 < 1.0000000116860974E-07D)
++        if(d3 * d3 < 1.0000000116860974E-007D)
+         {
+             return null;
+         }

forge/conf/server.exc

@@ -182,6 +182,8 @@ net/minecraft/src/Packet8UpdateHealth.func_68_a(Ljava/io/DataOutputStream;)V=jav
 net/minecraft/src/Packet8UpdateHealth.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
 net/minecraft/src/Packet9Respawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
 net/minecraft/src/Packet9Respawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet250CustomPayload.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet250CustomPayload.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
 net/minecraft/src/RConOutputStream.func_40393_a(I)V=java/io/IOException
 net/minecraft/src/RConOutputStream.func_40394_a(S)V=java/io/IOException
 net/minecraft/src/RConOutputStream.func_40396_a([B)V=java/io/IOException
@@ -200,3 +202,4 @@ net/minecraft/src/RegionFile.func_22138_b(III)V=java/io/IOException
 net/minecraft/src/ThreadedChunkLoader.func_40325_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
 net/minecraft/src/ThreadedChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
 net/minecraft/src/ThreadedFileIOBase.func_40508_a()V=java/lang/InterruptedException
+net/minecraft/src/StringTranslate.func_44011_a(Ljava/util/Properties;Ljava/lang/String;)V=java/io/IOException

forge/conf/version.cfg

@@ -0,0 +1,4 @@
+[VERSION]
+MCPVersion = 5.6
+ClientVersion = 1.1
+ServerVersion = 1.1

forge/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java

@@ -0,0 +1,123 @@
+package net.minecraft.src.forge;
+
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.src.GameSettings;
+import net.minecraft.src.GuiControls;
+import net.minecraft.src.GuiSlot;
+import net.minecraft.src.KeyBinding;
+import net.minecraft.src.Tessellator;
+
+public class GuiControlsScrollPanel extends GuiSlot 
+{
+	private GuiControls controls;
+	private GameSettings options;
+	private Minecraft mc;
+	private String[] message;
+	private int mouseX;
+	private int mouseY;
+	private int selected = -1;
+
+	public GuiControlsScrollPanel(GuiControls controls, GameSettings options, Minecraft mc) 
+	{
+        super(mc, controls.width, controls.height, 16, (controls.height - 32) + 4, 25);
+        this.controls = controls;
+        this.options = options;
+        this.mc = mc;
+	}
+
+	@Override
+	protected int getSize() {
+		return options.keyBindings.length;
+	}
+
+	@Override
+	protected void elementClicked(int i, boolean flag) 
+	{
+		if (!flag)
+		{
+			if (selected == -1)
+			{
+				selected = i;
+			}
+			else
+			{
+				options.setKeyBinding(selected, -100);
+				selected = -1;
+				KeyBinding.resetKeyBindingArrayAndHash();
+			}
+		}
+	}
+
+	@Override
+	protected boolean isSelected(int i) 
+	{
+		return false;
+	}
+
+	@Override
+	protected void drawBackground() {}
+	
+	@Override
+	public void drawScreen(int mX, int mY, float f)
+	{
+		mouseX = mX;
+		mouseY = mY;
+		
+		if (selected != -1 && !Mouse.isButtonDown(0) && Mouse.getDWheel() == 0)
+		{
+			if (Mouse.next() && Mouse.getEventButtonState())
+			{
+				System.out.println(Mouse.getEventButton());
+				options.setKeyBinding(selected, -100 + Mouse.getEventButton());
+				selected = -1;
+				KeyBinding.resetKeyBindingArrayAndHash();
+			}
+		}
+		
+		super.drawScreen(mX, mY, f);
+	}
+
+	@Override
+	protected void drawSlot(int index, int xPosition, int yPosition, int l, Tessellator tessellator) 
+	{
+		int width = 70;
+		int height = 20;
+		xPosition -= 20;
+		boolean flag = mouseX >= xPosition && mouseY >= yPosition && mouseX < xPosition + width && mouseY < yPosition + height;
+		int k = (flag ? 2 : 1);
+		
+        GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/gui.png"));
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        controls.drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height);
+        controls.drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height);   
+        controls.drawString(mc.fontRenderer, options.getKeyBindingDescription(index), xPosition + width + 4, yPosition + 6, 0xFFFFFFFF);
+          
+        boolean conflict = false;
+        for (int x = 0; x < options.keyBindings.length; x++)
+        {
+        	if (x != index && options.keyBindings[x].keyCode == options.keyBindings[index].keyCode)
+        	{
+        		conflict = true;
+        		break;
+        	}
+        }
+    	String str = (conflict ? "\247c" : "") + options.getOptionDisplayString(index);
+    	str = (index == selected ? "\247f> \247e??? \247f<" : str);
+		controls.drawCenteredString(mc.fontRenderer, str, xPosition + (width / 2), yPosition + (height - 8) / 2, 0xFFFFFFFF);        
+	}
+
+	public boolean keyTyped(char c, int i) 
+	{
+		if (selected != -1)
+		{
+			options.setKeyBinding(selected, i);
+			selected = -1;
+			KeyBinding.resetKeyBindingArrayAndHash();
+			return false;
+		}
+		return true;
+	}
+}

forge/forge_common/net/minecraft/src/forge/ForgeHooks.java

@@ -13,6 +13,7 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Item;
 import net.minecraft.src.EnumStatus;
+import net.minecraft.src.ModLoader;
 import net.minecraft.src.World;
 
 import java.util.*;
@@ -299,11 +300,13 @@ public class ForgeHooks {
 
 	}
 
-	public static final int majorVersion=1;
-	public static final int minorVersion=2;
-	public static final int revisionVersion=4;
+	public static final int majorVersion=0;
+	public static final int minorVersion=0;
+	public static final int revisionVersion=0;
+	public static final int buildVersion=0;
 	static {
-		System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion);
+		System.out.printf("MinecraftForge v%d.%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion, buildVersion);
+		ModLoader.getLogger().info(String.format("MinecraftForge v%d.%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion, buildVersion));
 	}
 
 	static boolean toolInit=false;

forge/forge_common/net/minecraft/src/forge/MinecraftForge.java

@@ -699,7 +699,15 @@ public class MinecraftForge {
      */
     public static Class<? extends EntityMinecart> getCartClassForItem(ItemStack item)
     {
-        MinecartKey k = minecartForItem.get(item);
+        MinecartKey k = null;
+    	for (ItemStack key : minecartForItem.keySet())
+    	{
+    		if (key.isItemEqual(item))
+    		{
+    			k = minecartForItem.get(k);
+    			break;
+    		}
+    	}
         if(k != null) 
         {
             return k.minecart;
@@ -716,7 +724,15 @@ public class MinecraftForge {
      */
     public static int getCartTypeForItem(ItemStack item)
     {
-        MinecartKey k = minecartForItem.get(item);
+        MinecartKey k = null;
+    	for (ItemStack key : minecartForItem.keySet())
+    	{
+    		if (key.isItemEqual(item))
+    		{
+    			k = minecartForItem.get(k);
+    			break;
+    		}
+    	}
         if(k != null) 
         {
             return k.type;

forge/inject_version.bat

@@ -0,0 +1,20 @@
+@echo off
+setlocal enableextensions enabledelayedexpansion
+FOR /F "tokens=1-4" %%A IN (version.txt) DO (
+    set major=%%A
+    set minor=%%B
+    set revision=%%C
+    set build=%%D
+)
+set file=%*
+
+echo Injecting Revision !major!.!minor!.!revision!.!build! %file%
+
+set PATH=.\bin;%PATH%
+sed s/majorVersion=0/majorVersion=!major!/ <!file! | ^
+sed s/minorVersion=0/minorVersion=!minor!/ | ^
+sed s/revisionVersion=0/revisionVersion=!revision!/ | ^
+sed s/buildVersion=0/buildVersion=!build!/ | ^
+tr -d '\r' >!file!.tmp
+
+mv "!file!.tmp" "!file!"

forge/inject_version.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+target=$1
+read major minor rev build <version.txt
+
+echo Injecting Revision $major.$minor.$rev.$build $target
+
+sed s/majorVersion=0/majorVersion=$major/ <$target | \
+sed s/minorVersion=0/minorVersion=$minor/ | \
+sed s/revisionVersion=0/revisionVersion=$rev/ | \
+sed s/buildVersion=0/buildVersion=$build/ | \
+tr -d '\r' > $target.tmp
+
+mv $target.tmp $target

forge/install/install.cmd

@@ -3,14 +3,16 @@ echo off
 echo MinecraftForge Windows Setup Program
 echo:
 
+@set PATH=%PATH%;%SystemDir%\system32;%SystemRoot%\System32
+
 pushd .. >nul
 
 xcopy /Y /E /I forge\conf\* conf
 
 if exist runtime\bin\fernflower.jar move runtime\bin\fernflower.jar runtime\bin\fernflower.jar-backup
 
-cmd /C cleanup.bat
-cmd /C decompile.bat
+echo | call cleanup.bat
+echo | call decompile.bat
 
 if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar
 
@@ -49,6 +51,7 @@ popd >nul
 
 xcopy /Y /E forge\src\* src
 
-cmd /C updatemcp.bat
-cmd /C updatenames.bat
+rem Removed until MCP's Update Names is fixed
+rem cmd /C updatemcp.bat
+rem cmd /C updatenames.bat
 cmd /C updatemd5.bat

forge/install/install.sh

@@ -53,7 +53,7 @@ popd > /dev/null
 
 cp -r forge/src/* src
 
-
-./updatemcp.sh
-./updatenames.sh
+# Removed until MCP's UpdateNames Is fixed
+#./updatemcp.sh
+#./updatenames.sh
 ./updatemd5.sh

forge/modLoaderMP.patch

@@ -1,33 +1,18 @@
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
 --- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:07.755771900 +0200
 +++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:09.485870900 +0200
-@@ -333,41 +333,22 @@
-             }
-             finally
+@@ -397,38 +397,7 @@
              {
--                System.exit(0);
-+                    try
-+                    {
-+                            stopServer();
-+                            serverStopped = true;
-+                    }
-+                    catch(Throwable throwable2)
-+                    {
-+                            throwable2.printStackTrace();
-+                    }
-+                    finally
-+                    {
-+                            System.exit(0);
-+                    }
+                 System.exit(0);
              }
 -            break MISSING_BLOCK_LABEL_350;
--        }
+         }
 -        try
 -        {
 -            stopServer();
 -            serverStopped = true;
 -        }
--        catch(Throwable throwable)
+-        catch (Throwable throwable)
 -        {
 -            throwable.printStackTrace();
 -        }
@@ -43,7 +28,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server
 -            stopServer();
 -            serverStopped = true;
 -        }
--        catch(Throwable throwable3)
+-        catch (Throwable throwable3)
 -        {
 -            throwable3.printStackTrace();
 -        }
@@ -53,10 +38,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server
 -        }
 -        throw exception2;
      }
-+}
  
      private void doTick()
-     {
+
 diff U3 ../src_base/minecraft_server/net/minecraft/src/MLProp.java ../src_work/minecraft_server/net/minecraft/src/MLProp.java
 --- ../src_base/minecraft_server/net/minecraft/src/MLProp.java	Wed Nov 30 22:27:22 2011
 +++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java	Sun Dec 04 14:31:04 2011

forge/package.sh

@@ -1,10 +1,11 @@
-version=$1
+read major minor revision build <version.txt
+version=$major.$minor.$revision.$build
 build_dir=`pwd`
 dir=`pwd`/../forge-$version
 
 function remove_svn () {
   (
-  cd $1
+  cd "$1"
 
   if [ -d .svn ]; then
      rm -rf .svn
@@ -24,7 +25,7 @@ function package_all () {
 
    cp $build_dir/minecraftforge_credits.txt .
 
-   zip -r $dir/minecraftforge$qual-$version.zip \
+   zip -r "$dir/minecraftforge$qual-$version.zip" \
       minecraftforge_credits.txt \
       *.class \
       forge
@@ -34,8 +35,8 @@ cd ../reobf
 
 remove_svn .
 
-rm -rf $dir
-mkdir $dir
+rm -rf "$dir"
+mkdir "$dir"
 
 cd minecraft
 package_all "-client"
@@ -71,6 +72,11 @@ cp ../install/README.txt .
 cp ../minecraftforge_credits.txt .
 cp -r ../doc .
 
+cd ..
+sh inject_version.sh forge/src/minecraft/net/minecraft/src/forge/ForgeHooks.java
+sh inject_version.sh forge/src/minecraft_server/net/minecraft/src/forge/ForgeHooks.java
+cd forge 
+
 cd src
 remove_svn .
 cd ../patches
@@ -81,5 +87,5 @@ cd ..
 
 cd ..
 
-zip -r $dir/minecraftforge-src-$version.zip forge
+zip -r "$dir/minecraftforge-src-$version.zip" forge
 rm -rf forge

forge/patches/minecraft/net/minecraft/src/Block.java.patch

@@ -1,146 +1,89 @@
 --- ../src_base/minecraft/net/minecraft/src/Block.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/Block.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,7 @@
- 
+@@ -1,5 +1,6 @@
  package net.minecraft.src;
  
 +import net.minecraft.src.forge.ForgeHooks;
  import java.util.ArrayList;
  import java.util.Random;
  
-@@ -312,12 +313,14 @@
+@@ -277,12 +278,12 @@
  
      public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k)
      {
 -        return iblockaccess.getBrightness(i, j, k, lightValue[blockID]);
-+        return iblockaccess.getBrightness(i, j, k,
-+        		getLightValue(iblockaccess,i,j,k));
++        return iblockaccess.getBrightness(i, j, k, getLightValue(iblockaccess,i,j,k));
      }
  
      public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k)
      {
 -        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]);
-+        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k,
-+        		getLightValue(iblockaccess,i,j,k));
++        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, getLightValue(iblockaccess,i,j,k));
      }
  
      public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
-@@ -438,25 +441,70 @@
-     {
-         return 1;
-     }
--
-+    
-+    /* FORGE: Metadata-sensitive version.
-+     */
-+    public int quantityDropped(int meta, int fortune, Random random)
-+    {
-+        return quantityDroppedWithBonus(fortune, random);
-+    }
-+    
-+    /* FORGE: Metadata-sensitive version.
-+     * 
-+     * This is deprecated in MC 1.0+ versions because of the new Enchantment 
-+     * system requiring a new argument. Will be removed unless a valid reason
-+     * for it to remain is brought to light.
-+     * 
-+     * Implementing this in your mod will not do anything!
-+     */
-+    @Deprecated
-+    public int quantityDropped(int meta, Random random)
-+    {
-+        return quantityDropped(meta, 0, random);
-+    }
-+    
-     public int idDropped(int i, Random random, int j)
-     {
+@@ -410,20 +411,15 @@
          return blockID;
      }
  
-+    /* FORGE: This function isnt called by Minecraft anymore.  Use
-+     * blockStrength(EntityPlayer,int) instead.
++    /**
++     * Deprecated in favor of a metadata sensitive version
++     * @param entityplayer Entity attacking the block
++     * @return
 +     */
++    @Deprecated
      public float blockStrength(EntityPlayer entityplayer)
      {
--        if(blockHardness < 0.0F)
+-        if (blockHardness < 0.0F)
 -        {
 -            return 0.0F;
 -        }
--        if(!entityplayer.canHarvestBlock(this))
+-        if (!entityplayer.canHarvestBlock(this))
 -        {
 -            return 1.0F / blockHardness / 100F;
--        } else
+-        }
+-        else
 -        {
 -            return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F;
 -        }
-+        return blockStrength(entityplayer,0);
-+    }
-+
-+    /* FORGE: This function returns the complete list of drops for a block.
-+     */
-+    public ArrayList<ItemStack> getBlockDropped(World world,
-+        	    int i, int j, int k, int md, int fortune) {
-+    	
-+    	ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
-+
-+    	int q = quantityDropped(md, fortune, world.rand);
-+    	for (int n = 0; n < q; n++) {
-+    		int id = idDropped(md, world.rand, 0);
-+    		if(id > 0) {
-+    			tr.add(new ItemStack(id, 1, damageDropped(md)));
-+    		}
-+    	}
-+    	return tr;
-+    }
-+    
-+    /* FORGE: This function returns the complete list of drops for a block.
-+     * 
-+     * This is deprecated in MC 1.0+ versions because of the new Enchantment 
-+     * system requiring a new argument. Will be removed unless a valid reason
-+     * for it to remain is brought to light.
-+     * 
-+     * Implementing this in your mod will not do anything!
-+     */
-+    @Deprecated
-+    public ArrayList<ItemStack> getBlockDropped(World world,
-+        	    int i, int j, int k, int md) {
-+    	return getBlockDropped (world, i, j, k, md, 0);
++        return blockStrength(entityplayer, 0);
      }
  
      public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
-@@ -470,18 +518,13 @@
+@@ -437,18 +433,15 @@
          {
              return;
          }
 -        int j1 = quantityDroppedWithBonus(i1, world.rand);
--        for(int k1 = 0; k1 < j1; k1++)
--        {
-+	ArrayList<ItemStack> ar = getBlockDropped(world, i, j, k, l, i1);
-+	for (ItemStack ist : ar) {
-             if(world.rand.nextFloat() > f)
+-        for (int k1 = 0; k1 < j1; k1++)
++
++        ArrayList<ItemStack> items = getBlockDropped(world, i, j, k, l, i1);
++        for(ItemStack item : items)
+         {
+             if (world.rand.nextFloat() > f)
              {
                  continue;
              }
 -            int l1 = idDropped(l, world.rand, i1);
--            if(l1 > 0)
+-            if (l1 > 0)
 -            {
 -                dropBlockAsItem_do(world, i, j, k, new ItemStack(l1, 1, damageDropped(l)));
 -            }
-+	    dropBlockAsItem_do(world, i, j, k, ist);
++            dropBlockAsItem_do(world, i, j, k, item);
          }
- 
      }
-@@ -726,7 +769,7 @@
+ 
+@@ -696,7 +689,7 @@
      {
          entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
          entityplayer.addExhaustion(0.025F);
--        if(renderAsNormalBlock() && !isBlockContainer[blockID] && EnchantmentHelper.getSilkTouchModifier(entityplayer.inventory))
-+        if(renderAsNormalBlock() && !hasTileEntity(l) && EnchantmentHelper.getSilkTouchModifier(entityplayer.inventory))
+-        if (renderAsNormalBlock() && !isBlockContainer[blockID] && EnchantmentHelper.getSilkTouchModifier(entityplayer.inventory))
++        if (renderAsNormalBlock() && !hasTileEntity(l) && EnchantmentHelper.getSilkTouchModifier(entityplayer.inventory))
          {
              ItemStack itemstack = createStackedBlock(l);
-             if(itemstack != null)
-@@ -805,6 +848,248 @@
-         return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F;
+             if (itemstack != null)
+@@ -780,6 +773,273 @@
+     {
      }
  
 +    /* FORGE: Allow a block to set illumination on a coordinate basis.
@@ -151,19 +94,9 @@
 +
 +    /* FORGE: Implement and return true if you wish this block to behave
 +     * like a ladder when the player is inside.
-+     *
-+     * This is deprecated in favor of the more flexible version below.
-+     */
-+    @Deprecated
-+    public boolean isLadder() {
-+	return false;
-+    }
-+
-+    /* FORGE: Implement and return true if you wish this block to behave
-+     * like a ladder when the player is inside.
 +     */
 +    public boolean isLadder(World world, int i, int j, int k) {
-+	return isLadder();
++    	return false;
 +    }
 +
 +    /* FORGE: Return true if the block is a normal, solid cube.  This
@@ -358,14 +291,7 @@
 +     */
 +    public boolean hasTileEntity(int metadata)
 +    {
-+    	if (isBlockContainer[blockID])
-+    	{
-+     		return true;
-+    	}
-+    	else
-+    	{
-+    		return false;
-+    	}
++    	return isBlockContainer[blockID];
 +    }
 +    
 +    /**
@@ -383,7 +309,49 @@
 +    		return ((BlockContainer)this).getBlockEntity(metadata);
 +    	}
 +    	return null;
++    }    
++    
++    /**
++     * Metadata and fortune sensitive version, this replaces the old (int meta, Random rand)
++     * version in 1.1. 
++     * 
++     * @param meta Blocks Metadata
++     * @param fortune Current item fortune level
++     * @param random Random number generator
++     * @return The number of items to drop
++     */
++    public int quantityDropped(int meta, int fortune, Random random)
++    {
++    	return quantityDroppedWithBonus(fortune, random);
 +    }
++    
++    /**
++     * This returns a complete list of items dropped from this block.
++     * 
++     * @param world The current world
++     * @param X X Position
++     * @param Y Y Position
++     * @param Z Z Position
++     * @param metadata Current metadata
++     * @param fortune Breakers fortune level
++     * @return A ArrayList containing all items this block drops
++     */
++    public ArrayList<ItemStack> getBlockDropped(World world, int X, int Y, int Z, int metadata, int fortune)
++    {
++    	ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
++    	
++    	int count = quantityDropped(metadata, fortune, world.rand);
++    	for(int i = 0; i < count; i++)
++    	{
++    		int id = idDropped(metadata, world.rand, 0);
++    		if (id > 0)
++    		{
++    			ret.add(new ItemStack(id, 1, damageDropped(metadata)));
++    		}
++    	}
++    	return ret;
++    }
++    	
 +
      static Class _mthclass$(String s)
      {

forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch

@@ -0,0 +1,119 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockButton.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java	0000-00-00 00:00:00.000000000 -0000
+@@ -32,36 +32,36 @@
+ 
+     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
+     {
+-        if (l == 2 && world.isBlockNormalCube(i, j, k + 1))
++        if (l == 2 && world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             return true;
+         }
+-        if (l == 3 && world.isBlockNormalCube(i, j, k - 1))
++        if (l == 3 && world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             return true;
+         }
+-        if (l == 4 && world.isBlockNormalCube(i + 1, j, k))
++        if (l == 4 && world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             return true;
+         }
+-        return l == 5 && world.isBlockNormalCube(i - 1, j, k);
++        return l == 5 && world.isBlockSolidOnSide(i - 1, j, k, 5);
+     }
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        if (world.isBlockNormalCube(i - 1, j, k))
++        if (world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i + 1, j, k))
++        if (world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i, j, k - 1))
++        if (world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             return true;
+         }
+-        return world.isBlockNormalCube(i, j, k + 1);
++        return world.isBlockSolidOnSide(i, j, k + 1, 2);
+     }
+ 
+     public void onBlockPlaced(World world, int i, int j, int k, int l)
+@@ -69,19 +69,19 @@
+         int i1 = world.getBlockMetadata(i, j, k);
+         int j1 = i1 & 8;
+         i1 &= 7;
+-        if (l == 2 && world.isBlockNormalCube(i, j, k + 1))
++        if (l == 2 && world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             i1 = 4;
+         }
+-        else if (l == 3 && world.isBlockNormalCube(i, j, k - 1))
++        else if (l == 3 && world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             i1 = 3;
+         }
+-        else if (l == 4 && world.isBlockNormalCube(i + 1, j, k))
++        else if (l == 4 && world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             i1 = 2;
+         }
+-        else if (l == 5 && world.isBlockNormalCube(i - 1, j, k))
++        else if (l == 5 && world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             i1 = 1;
+         }
+@@ -94,19 +94,19 @@
+ 
+     private int getOrientation(World world, int i, int j, int k)
+     {
+-        if (world.isBlockNormalCube(i - 1, j, k))
++        if (world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             return 1;
+         }
+-        if (world.isBlockNormalCube(i + 1, j, k))
++        if (world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             return 2;
+         }
+-        if (world.isBlockNormalCube(i, j, k - 1))
++        if (world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             return 3;
+         }
+-        return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
++        return !world.isBlockSolidOnSide(i, j, k + 1, 2) ? 1 : 4;
+     }
+ 
+     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
+@@ -115,19 +115,19 @@
+         {
+             int i1 = world.getBlockMetadata(i, j, k) & 7;
+             boolean flag = false;
+-            if (!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
++            if (!world.isBlockSolidOnSide(i - 1, j, k, 5) && i1 == 1)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
++            if (!world.isBlockSolidOnSide(i + 1, j, k, 4) && i1 == 2)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
++            if (!world.isBlockSolidOnSide(i, j, k - 1, 3) && i1 == 3)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
++            if (!world.isBlockSolidOnSide(i, j, k + 1, 2) && i1 == 4)
+             {
+                 flag = true;
+             }

forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch

@@ -0,0 +1,31 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
+@@ -424,23 +424,23 @@
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i, j + 1, k))
++        if (world.isBlockSolidOnSide(i, j + 1, k, 0))
+         {
+             return true;
+         }
+-        if (world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
++        if (world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k, 0))
+         {
+             return true;
+         }
+-        if (world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
++        if (world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k, 0))
+         {
+             return true;
+         }
+-        if (world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
++        if (world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1, 0))
+         {
+             return true;
+         }
+-        if (world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
++        if (world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1, 0))
+         {
+             return true;
+         }

forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockContainer.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -26,7 +26,7 @@
+@@ -17,7 +17,7 @@
      public void onBlockAdded(World world, int i, int j, int k)
      {
          super.onBlockAdded(world, i, j, k);
@@ -9,13 +9,19 @@
      }
  
      public void onBlockRemoval(World world, int i, int j, int k)
-@@ -37,6 +37,12 @@
+@@ -28,6 +28,18 @@
  
      public abstract TileEntity getBlockEntity();
  
 +    /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression.
 +     */
-+    public TileEntity getBlockEntity(int md) {
++    /**
++     * Metadata-sensitive version, to fix 1.8.1 regression.
++     * @param metadata The current Metadata 
++     * @return And instance of the TileEntity class for this block
++     */
++    public TileEntity getBlockEntity(int md) 
++    {
 +	    return getBlockEntity();
 +    }
 + 

forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch

@@ -1,36 +1,36 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockCrops.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java	0000-00-00 00:00:00.000000000 -0000
-@@ -5,6 +5,7 @@
+@@ -1,6 +1,7 @@
  package net.minecraft.src;
  
  import java.util.Random;
 +import java.util.ArrayList;
  
- // Referenced classes of package net.minecraft.src:
- //            BlockFlower, Block, World, EntityItem, 
-@@ -108,28 +109,22 @@
+ public class BlockCrops extends BlockFlower
+ {
+@@ -98,27 +99,23 @@
          return 6;
      }
  
 -    public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
--    {
--        super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
--        if(world.multiplayerWorld)
 +    @Override
-+    public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune) {
-+        ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
-+        if (md == 7)
++    public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int meta, int fortune)
+     {
+-        super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
+-        if (world.isRemote)
++    	ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
++        if (meta == 7)
          {
 -            return;
-+        	tr.add(new ItemStack(Item.wheat));
++        	ret.add(new ItemStack(Item.wheat));
          }
 -        int j1 = 3 + i1;
--        for(int k1 = 0; k1 < j1; k1++)
-+            
-+        for(int n = 0; n < 3+fortune; n++) 
+-        for (int k1 = 0; k1 < j1; k1++)
++        
++        for (int n = 0; n < 3 + fortune; n++)
          {
--            if(world.rand.nextInt(15) <= l)
-+            if (world.rand.nextInt(15) <= md)
+-            if (world.rand.nextInt(15) <= l)
++            if (world.rand.nextInt(15) <= meta)
              {
 -                float f1 = 0.7F;
 -                float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
@@ -39,11 +39,10 @@
 -                EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
 -                entityitem.delayBeforeCanPickup = 10;
 -                world.spawnEntityInWorld(entityitem);
-+                tr.add(new ItemStack(Item.seeds));
++                ret.add(new ItemStack(Item.seeds));
              }
          }
--
-+        return tr;
++        return ret;
      }
  
      public int idDropped(int i, Random random, int j)

forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch

@@ -1,29 +1,29 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockDoor.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java	0000-00-00 00:00:00.000000000 -0000
-@@ -111,7 +111,7 @@
+@@ -101,7 +101,7 @@
      {
-         if(blockMaterial == Material.iron)
+         if (blockMaterial == Material.iron)
          {
 -            return true;
 +            return false;
          }
          int l = world.getBlockMetadata(i, j, k);
-         if((l & 8) != 0)
-@@ -178,7 +178,7 @@
+         if ((l & 8) != 0)
+@@ -169,7 +169,7 @@
                  world.setBlockWithNotify(i, j, k, 0);
                  flag = true;
              }
--            if(!world.isBlockNormalCube(i, j - 1, k))
-+            if(!world.isBlockSolidOnSide(i, j - 1, k,1))
+-            if (!world.isBlockNormalCube(i, j - 1, k))
++            if (!world.isBlockSolidOnSide(i, j - 1, k, 1))
              {
                  world.setBlockWithNotify(i, j, k, 0);
                  flag = true;
-@@ -241,7 +241,7 @@
-             return false;
-         } else
+@@ -238,7 +238,7 @@
+         }
+         else
          {
 -            return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
-+            return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
++            return world.isBlockSolidOnSide(i, j - 1, k, 1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
          }
      }
  

forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch

@@ -1,15 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockFire.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockFire.java	0000-00-00 00:00:00.000000000 -0000
-@@ -14,14 +14,14 @@
- public class BlockFire extends Block
- {
- 
--    private int chanceToEncourageFire[];
--    private int abilityToCatchFire[];
--
-+	private int chanceToEncourageFire[]; 
-+	private int abilityToCatchFire[];
-+	
+@@ -10,8 +10,8 @@
      protected BlockFire(int i, int j)
      {
          super(i, j, Material.fire);
@@ -20,7 +11,7 @@
          setTickOnLoad(true);
      }
  
-@@ -38,11 +38,10 @@
+@@ -28,11 +28,10 @@
          setBurnRate(Block.cloth.blockID, 30, 60);
          setBurnRate(Block.vine.blockID, 15, 100);
      }
@@ -34,34 +25,30 @@
      }
  
      public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k)
-@@ -77,11 +76,9 @@
+@@ -67,7 +66,9 @@
  
      public void updateTick(World world, int i, int j, int k, Random random)
      {
 -        boolean flag = world.getBlockId(i, j - 1, k) == Block.netherrack.blockID;
--        if((world.worldProvider instanceof WorldProviderEnd) && world.getBlockId(i, j - 1, k) == Block.bedrock.blockID)
--        {
--            flag = true;
--        }
-+        Block base = Block.blocksList[world.getBlockId(i,  j - 1, k)];
++        Block base = Block.blocksList[world.getBlockId(i, j - 1, k)];
 +        boolean flag = (base != null && base.isFireSource(world, i, j - 1, k, world.getBlockMetadata(i, j - 1, k), 0));
-+        
-         if(!canPlaceBlockAt(world, i, j, k))
++
+         if ((world.worldProvider instanceof WorldProviderEnd) && world.getBlockId(i, j - 1, k) == Block.bedrock.blockID)
          {
-             world.setBlockWithNotify(i, j, k, 0);
-@@ -99,23 +96,23 @@
+             flag = true;
+@@ -89,23 +90,23 @@
          world.scheduleBlockUpdate(i, j, k, blockID, tickRate());
-         if(!flag && !func_263_h(world, i, j, k))
+         if (!flag && !canNeighborBurn(world, i, j, k))
          {
--            if(!world.isBlockNormalCube(i, j - 1, k) || l > 3)
-+            if(!world.isBlockSolidOnSide(i, j - 1, k, 0) || l > 3)
+-            if (!world.isBlockNormalCube(i, j - 1, k) || l > 3)
++            if (!world.isBlockSolidOnSide(i, j - 1, k, 1) || l > 3)
              {
                  world.setBlockWithNotify(i, j, k, 0);
              }
              return;
          }
--        if(!flag && !canBlockCatchFire(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0)
-+        if(!flag && !canBlockCatchFire(world, i, j - 1, k, 0) && l == 15 && random.nextInt(4) == 0)
+-        if (!flag && !canBlockCatchFire(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0)
++        if (!flag && !canBlockCatchFire(world, i, j - 1, k, 1) && l == 15 && random.nextInt(4) == 0)
          {
              world.setBlockWithNotify(i, j, k, 0);
              return;
@@ -78,60 +65,61 @@
 +        tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 0);
 +        tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3);
 +        tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2);
-         for(int i1 = i - 1; i1 <= i + 1; i1++)
+         for (int i1 = i - 1; i1 <= i + 1; i1++)
          {
-             for(int j1 = k - 1; j1 <= k + 1; j1++)
-@@ -155,9 +152,23 @@
- 
+             for (int j1 = k - 1; j1 <= k + 1; j1++)
+@@ -142,9 +143,24 @@
+         }
      }
  
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
++    /**
++     * Deprecated for a side-sensitive version
 +     */
 +    @Deprecated
      private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
      {
 -        int j1 = abilityToCatchFire[world.getBlockId(i, j, k)];
-+    	tryToCatchBlockOnFire(world, i, j, k, l, random, i1, 0);
++        tryToCatchBlockOnFire(world, i, j, k, l, random, i1, 0);
 +    }
 +    
 +    private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
 +    {
-+        Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+        int j1 = 0;
-+        if (block != null) 
-+        {
-+        	j1 = block.getFlammability(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+        }
-         if(random.nextInt(l) < j1)
++    	int j1 = 0;
++    	Block block = Block.blocksList[world.getBlockId(i, j, k)];
++    	if (block != null)
++    	{
++    		j1 = block.getFlammability(world, i, j, k, world.getBlockMetadata(i, j, k), face);
++    	}
++    	
+         if (random.nextInt(l) < j1)
          {
              boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID;
-@@ -182,27 +193,27 @@
+@@ -170,27 +186,27 @@
  
-     private boolean func_263_h(World world, int i, int j, int k)
+     private boolean canNeighborBurn(World world, int i, int j, int k)
      {
--        if(canBlockCatchFire(world, i + 1, j, k))
-+        if(canBlockCatchFire(world, i + 1, j, k, 4))
+-        if (canBlockCatchFire(world, i + 1, j, k))
++        if (canBlockCatchFire(world, i + 1, j, k, 4))
          {
              return true;
          }
--        if(canBlockCatchFire(world, i - 1, j, k))
-+        if(canBlockCatchFire(world, i - 1, j, k, 5))
+-        if (canBlockCatchFire(world, i - 1, j, k))
++        if (canBlockCatchFire(world, i - 1, j, k, 5))
          {
              return true;
          }
--        if(canBlockCatchFire(world, i, j - 1, k))
-+        if(canBlockCatchFire(world, i, j - 1, k, 1))
+-        if (canBlockCatchFire(world, i, j - 1, k))
++        if (canBlockCatchFire(world, i, j - 1, k, 1))
          {
              return true;
          }
--        if(canBlockCatchFire(world, i, j + 1, k))
-+        if(canBlockCatchFire(world, i, j + 1, k, 0))
+-        if (canBlockCatchFire(world, i, j + 1, k))
++        if (canBlockCatchFire(world, i, j + 1, k, 0))
          {
              return true;
          }
--        if(canBlockCatchFire(world, i, j, k - 1))
-+        if(canBlockCatchFire(world, i, j, k - 1, 3))
+-        if (canBlockCatchFire(world, i, j, k - 1))
++        if (canBlockCatchFire(world, i, j, k - 1, 3))
          {
              return true;
          }
@@ -140,9 +128,9 @@
      }
  
      private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k)
-@@ -213,12 +224,12 @@
-             return 0;
-         } else
+@@ -202,12 +218,12 @@
+         }
+         else
          {
 -            l = getChanceToEncourageFire(world, i + 1, j, k, l);
 -            l = getChanceToEncourageFire(world, i - 1, j, k, l);
@@ -159,22 +147,122 @@
              return l;
          }
      }
-@@ -227,15 +238,43 @@
-     {
+@@ -217,32 +233,32 @@
          return false;
      }
--
-+    
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
+ 
++    /**
++     * Deprecated for a side-sensitive version
 +     */
 +    @Deprecated
      public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
      {
 -        return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
-+    	return canBlockCatchFire(iblockaccess, i, j, k, 0);
++        return canBlockCatchFire(iblockaccess, i, j, k, 0);
      }
  
++    /**
++     * Deprecated for a side-sensitive version
++     */
++    @Deprecated
+     public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
+     {
+-        int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
+-        if (i1 > l)
+-        {
+-            return i1;
+-        }
+-        else
+-        {
+-            return l;
+-        }
++        return getChanceToEncourageFire(world, i, j, k, l, 0);
+     }
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        return world.isBlockNormalCube(i, j - 1, k) || canNeighborBurn(world, i, j, k);
++        return world.isBlockSolidOnSide(i, j - 1, k, 1) || canNeighborBurn(world, i, j, k);
+     }
+ 
+     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
+     {
+-        if (!world.isBlockNormalCube(i, j - 1, k) && !canNeighborBurn(world, i, j, k))
++        if (!world.isBlockSolidOnSide(i, j - 1, k, 1) && !canNeighborBurn(world, i, j, k))
+         {
+             world.setBlockWithNotify(i, j, k, 0);
+             return;
+@@ -259,7 +275,7 @@
+         {
+             return;
+         }
+-        if (!world.isBlockNormalCube(i, j - 1, k) && !canNeighborBurn(world, i, j, k))
++        if (!world.isBlockSolidOnSide(i, j - 1, k, 1) && !canNeighborBurn(world, i, j, k))
+         {
+             world.setBlockWithNotify(i, j, k, 0);
+             return;
+@@ -277,7 +293,7 @@
+         {
+             world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F);
+         }
+-        if (world.isBlockNormalCube(i, j - 1, k) || Block.fire.canBlockCatchFire(world, i, j - 1, k))
++        if (world.isBlockSolidOnSide(i, j - 1, k, 1) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 1))
+         {
+             for (int l = 0; l < 3; l++)
+             {
+@@ -289,7 +305,7 @@
+         }
+         else
+         {
+-            if (Block.fire.canBlockCatchFire(world, i - 1, j, k))
++            if (Block.fire.canBlockCatchFire(world, i - 1, j, k, 5))
+             {
+                 for (int i1 = 0; i1 < 2; i1++)
+                 {
+@@ -299,7 +315,7 @@
+                     world.spawnParticle("largesmoke", f1, f7, f13, 0.0D, 0.0D, 0.0D);
+                 }
+             }
+-            if (Block.fire.canBlockCatchFire(world, i + 1, j, k))
++            if (Block.fire.canBlockCatchFire(world, i + 1, j, k, 4))
+             {
+                 for (int j1 = 0; j1 < 2; j1++)
+                 {
+@@ -309,7 +325,7 @@
+                     world.spawnParticle("largesmoke", f2, f8, f14, 0.0D, 0.0D, 0.0D);
+                 }
+             }
+-            if (Block.fire.canBlockCatchFire(world, i, j, k - 1))
++            if (Block.fire.canBlockCatchFire(world, i, j, k - 1, 3))
+             {
+                 for (int k1 = 0; k1 < 2; k1++)
+                 {
+@@ -319,7 +335,7 @@
+                     world.spawnParticle("largesmoke", f3, f9, f15, 0.0D, 0.0D, 0.0D);
+                 }
+             }
+-            if (Block.fire.canBlockCatchFire(world, i, j, k + 1))
++            if (Block.fire.canBlockCatchFire(world, i, j, k + 1, 2))
+             {
+                 for (int l1 = 0; l1 < 2; l1++)
+                 {
+@@ -329,7 +345,7 @@
+                     world.spawnParticle("largesmoke", f4, f10, f16, 0.0D, 0.0D, 0.0D);
+                 }
+             }
+-            if (Block.fire.canBlockCatchFire(world, i, j + 1, k))
++            if (Block.fire.canBlockCatchFire(world, i, j + 1, k, 0))
+             {
+                 for (int i2 = 0; i2 < 2; i2++)
+                 {
+@@ -341,4 +357,39 @@
+             }
+         }
+     }
++
++    /**
++     * Forge: Side sensitive version
++     */
 +    public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
 +    {
 +    	Block block = Block.blocksList[world.getBlockId(i, j, k)];
@@ -185,16 +273,9 @@
 +    	return false;
 +    }
 +
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
++    /**
++     * Forge: Side sensitive version
 +     */
-+    @Deprecated
-     public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
-     {
--        int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
-+    	return getChanceToEncourageFire(world, i, j, k, l, 0);
-+    }
-+    
 +    public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face)
 +    {
 +    	int i1 = 0;
@@ -203,84 +284,14 @@
 +    	{
 +    		i1 = block.getFireSpreadSpeed(world, i, j, k, world.getBlockMetadata(i, j, k), face);
 +    	}
-         if(i1 > l)
-         {
-             return i1;
-@@ -247,12 +286,12 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        return world.isBlockNormalCube(i, j - 1, k) || func_263_h(world, i, j, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k, 1) || func_263_h(world, i, j, k);
-     }
- 
-     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-     {
--        if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k, 1) && !func_263_h(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-@@ -268,7 +307,7 @@
-         {
-             return;
-         }
--        if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_263_h(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-@@ -285,7 +324,7 @@
-         {
-             world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F);
-         }
--        if(world.isBlockNormalCube(i, j - 1, k) || Block.fire.canBlockCatchFire(world, i, j - 1, k))
-+        if(world.isBlockSolidOnSide(i, j - 1, k, 1) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 1))
-         {
-             for(int l = 0; l < 3; l++)
-             {
-@@ -297,7 +336,7 @@
- 
-         } else
-         {
--            if(Block.fire.canBlockCatchFire(world, i - 1, j, k))
-+            if(Block.fire.canBlockCatchFire(world, i - 1, j, k, 5))
-             {
-                 for(int i1 = 0; i1 < 2; i1++)
-                 {
-@@ -308,7 +347,7 @@
-                 }
- 
-             }
--            if(Block.fire.canBlockCatchFire(world, i + 1, j, k))
-+            if(Block.fire.canBlockCatchFire(world, i + 1, j, k, 4))
-             {
-                 for(int j1 = 0; j1 < 2; j1++)
-                 {
-@@ -319,7 +358,7 @@
-                 }
- 
-             }
--            if(Block.fire.canBlockCatchFire(world, i, j, k - 1))
-+            if(Block.fire.canBlockCatchFire(world, i, j, k - 1, 3))
-             {
-                 for(int k1 = 0; k1 < 2; k1++)
-                 {
-@@ -330,7 +369,7 @@
-                 }
- 
-             }
--            if(Block.fire.canBlockCatchFire(world, i, j, k + 1))
-+            if(Block.fire.canBlockCatchFire(world, i, j, k + 1, 2))
-             {
-                 for(int l1 = 0; l1 < 2; l1++)
-                 {
-@@ -341,7 +380,7 @@
-                 }
- 
-             }
--            if(Block.fire.canBlockCatchFire(world, i, j + 1, k))
-+            if(Block.fire.canBlockCatchFire(world, i, j + 1, k, 0))
-             {
-                 for(int i2 = 0; i2 < 2; i2++)
-                 {
++
++        if (i1 > l)
++        {
++            return i1;
++        }
++        else
++        {
++            return l;
++        }
++    }    
+ }

forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch

@@ -0,0 +1,93 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java	0000-00-00 00:00:00.000000000 -0000
+@@ -35,7 +35,7 @@
+             setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
+         }
+         return super.getSelectedBoundingBoxFromPool(world, i, j, k);
+-    }
++    }    
+ 
+     public boolean isOpaqueCube()
+     {
+@@ -54,37 +54,37 @@
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        if (world.isBlockNormalCube(i - 1, j, k))
++        if (world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i + 1, j, k))
++        if (world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i, j, k - 1))
++        if (world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             return true;
+         }
+-        return world.isBlockNormalCube(i, j, k + 1);
++        return world.isBlockSolidOnSide(i, j, k + 1, 2);
+     }
+ 
+     public void onBlockPlaced(World world, int i, int j, int k, int l)
+     {
+         int i1 = world.getBlockMetadata(i, j, k);
+-        if ((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1))
++        if ((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             i1 = 2;
+         }
+-        if ((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1))
++        if ((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             i1 = 3;
+         }
+-        if ((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k))
++        if ((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             i1 = 4;
+         }
+-        if ((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k))
++        if ((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             i1 = 5;
+         }
+@@ -95,19 +95,19 @@
+     {
+         int i1 = world.getBlockMetadata(i, j, k);
+         boolean flag = false;
+-        if (i1 == 2 && world.isBlockNormalCube(i, j, k + 1))
++        if (i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             flag = true;
+         }
+-        if (i1 == 3 && world.isBlockNormalCube(i, j, k - 1))
++        if (i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             flag = true;
+         }
+-        if (i1 == 4 && world.isBlockNormalCube(i + 1, j, k))
++        if (i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             flag = true;
+         }
+-        if (i1 == 5 && world.isBlockNormalCube(i - 1, j, k))
++        if (i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             flag = true;
+         }
+@@ -123,4 +123,11 @@
+     {
+         return 1;
+     }
++    
++    /* FORGE: Implemented base method, see Block.isLadder */
++    @Override
++    public boolean isLadder(World world, int X, int Y, int Z) 
++    {
++    	return true;
++    }
+ }

forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch

@@ -0,0 +1,120 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockLever.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java	0000-00-00 00:00:00.000000000 -0000
+@@ -31,44 +31,44 @@
+ 
+     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
+     {
+-        if (l == 1 && world.isBlockNormalCube(i, j - 1, k))
++        if (l == 1 && world.isBlockSolidOnSide(i, j - 1, k, 1))
+         {
+             return true;
+         }
+-        if (l == 2 && world.isBlockNormalCube(i, j, k + 1))
++        if (l == 2 && world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             return true;
+         }
+-        if (l == 3 && world.isBlockNormalCube(i, j, k - 1))
++        if (l == 3 && world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             return true;
+         }
+-        if (l == 4 && world.isBlockNormalCube(i + 1, j, k))
++        if (l == 4 && world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             return true;
+         }
+-        return l == 5 && world.isBlockNormalCube(i - 1, j, k);
++        return l == 5 && world.isBlockSolidOnSide(i - 1, j, k, 5);
+     }
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        if (world.isBlockNormalCube(i - 1, j, k))
++        if (world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i + 1, j, k))
++        if (world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i, j, k - 1))
++        if (world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             return true;
+         }
+-        if (world.isBlockNormalCube(i, j, k + 1))
++        if (world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             return true;
+         }
+-        return world.isBlockNormalCube(i, j - 1, k);
++        return world.isBlockSolidOnSide(i, j - 1, k, 1);
+     }
+ 
+     public void onBlockPlaced(World world, int i, int j, int k, int l)
+@@ -77,23 +77,23 @@
+         int j1 = i1 & 8;
+         i1 &= 7;
+         i1 = -1;
+-        if (l == 1 && world.isBlockNormalCube(i, j - 1, k))
++        if (l == 1 && world.isBlockSolidOnSide(i, j - 1, k, 1))
+         {
+             i1 = 5 + world.rand.nextInt(2);
+         }
+-        if (l == 2 && world.isBlockNormalCube(i, j, k + 1))
++        if (l == 2 && world.isBlockSolidOnSide(i, j, k + 1, 2))
+         {
+             i1 = 4;
+         }
+-        if (l == 3 && world.isBlockNormalCube(i, j, k - 1))
++        if (l == 3 && world.isBlockSolidOnSide(i, j, k - 1, 3))
+         {
+             i1 = 3;
+         }
+-        if (l == 4 && world.isBlockNormalCube(i + 1, j, k))
++        if (l == 4 && world.isBlockSolidOnSide(i + 1, j, k, 4))
+         {
+             i1 = 2;
+         }
+-        if (l == 5 && world.isBlockNormalCube(i - 1, j, k))
++        if (l == 5 && world.isBlockSolidOnSide(i - 1, j, k, 5))
+         {
+             i1 = 1;
+         }
+@@ -116,27 +116,27 @@
+         {
+             int i1 = world.getBlockMetadata(i, j, k) & 7;
+             boolean flag = false;
+-            if (!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
++            if (!world.isBlockSolidOnSide(i - 1, j, k, 5) && i1 == 1)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
++            if (!world.isBlockSolidOnSide(i + 1, j, k, 4) && i1 == 2)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
++            if (!world.isBlockSolidOnSide(i, j, k - 1, 3) && i1 == 3)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
++            if (!world.isBlockSolidOnSide(i, j, k + 1, 2) && i1 == 4)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i, j - 1, k) && i1 == 5)
++            if (!world.isBlockSolidOnSide(i, j - 1, k, 1) && i1 == 5)
+             {
+                 flag = true;
+             }
+-            if (!world.isBlockNormalCube(i, j - 1, k) && i1 == 6)
++            if (!world.isBlockSolidOnSide(i, j - 1, k, 1) && i1 == 6)
+             {
+                 flag = true;
+             }

forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch

@@ -0,0 +1,43 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockNetherStalk.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/BlockNetherStalk.java	0000-00-00 00:00:00.000000000 -0000
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
++import java.util.ArrayList;
+ import java.util.Random;
+ 
+ public class BlockNetherStalk extends BlockFlower
+@@ -57,25 +58,24 @@
+         return 6;
+     }
+ 
+-    public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
++    @Override
++    public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int meta, int fortune)
+     {
+-        if (world.isRemote)
+-        {
+-            return;
+-        }
++        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
+         int j1 = 1;
+-        if (l >= 3)
++        if (meta >= 3)
+         {
+             j1 = 2 + world.rand.nextInt(3);
+-            if (i1 > 0)
++            if (fortune > 0)
+             {
+-                j1 += world.rand.nextInt(i1 + 1);
++                j1 += world.rand.nextInt(fortune + 1);
+             }
+         }
+         for (int k1 = 0; k1 < j1; k1++)
+         {
+-            dropBlockAsItem_do(world, i, j, k, new ItemStack(Item.netherStalkSeeds));
++            ret.add(new ItemStack(Item.netherStalkSeeds));
+         }
++        return ret;
+     }
+ 
+     public int idDropped(int i, Random random, int j)

forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockPistonBase.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockPistonBase.java	0000-00-00 00:00:00.000000000 -0000
-@@ -361,7 +361,7 @@
+@@ -355,7 +355,7 @@
                  return false;
              }
          }

forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch

@@ -1,22 +1,20 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java	0000-00-00 00:00:00.000000000 -0000
-@@ -48,7 +48,8 @@
+@@ -38,7 +38,7 @@
  
      public boolean canPlaceBlockAt(World world, int i, int j, int k)
      {
 -        return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID;
-+        return world.isBlockSolidOnSide(i, j - 1, k,1)
-+		|| world.getBlockId(i, j - 1, k) == Block.fence.blockID;
++        return world.isBlockSolidOnSide(i, j - 1, k, 1) || world.getBlockId(i, j - 1, k) == Block.fence.blockID;
      }
  
      public void onBlockAdded(World world, int i, int j, int k)
-@@ -58,7 +59,8 @@
+@@ -48,7 +48,7 @@
      public void onNeighborBlockChange(World world, int i, int j, int k, int l)
      {
          boolean flag = false;
--        if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID)
-+        if(!world.isBlockSolidOnSide(i, j - 1, k,1)
-+			&& world.getBlockId(i, j - 1, k) != Block.fence.blockID)
+-        if (!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID)
++        if (!world.isBlockSolidOnSide(i, j - 1, k, 1) && world.getBlockId(i, j - 1, k) != Block.fence.blockID)
          {
              flag = true;
          }

forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch

@@ -1,8 +1,8 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockRail.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockRail.java	0000-00-00 00:00:00.000000000 -0000
-@@ -14,16 +14,29 @@
+@@ -5,16 +5,29 @@
+ public class BlockRail extends Block
  {
- 
      private final boolean isPowered;
 +    
 +    /**
@@ -32,7 +32,7 @@
      }
  
      protected BlockRail(int i, int j, boolean flag)
-@@ -89,7 +102,7 @@
+@@ -81,7 +94,7 @@
  
      public int getRenderType()
      {
@@ -41,51 +41,52 @@
      }
  
      public int quantityDropped(Random random)
-@@ -99,7 +112,7 @@
+@@ -91,7 +104,7 @@
  
      public boolean canPlaceBlockAt(World world, int i, int j, int k)
      {
 -        return world.isBlockNormalCube(i, j - 1, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k,1);
++        return world.isBlockSolidOnSide(i, j - 1, k, 1);
      }
  
      public void onBlockAdded(World world, int i, int j, int k)
-@@ -123,23 +136,23 @@
+@@ -119,23 +132,23 @@
              j1 &= 7;
          }
          boolean flag = false;
--        if(!world.isBlockNormalCube(i, j - 1, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k,1))
+-        if (!world.isBlockNormalCube(i, j - 1, k))
++        if (!world.isBlockSolidOnSide(i, j - 1, k, 1))
          {
              flag = true;
          }
--        if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k))
-+        if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1))
+-        if (j1 == 2 && !world.isBlockNormalCube(i + 1, j, k))
++        if (j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k, 1))
          {
              flag = true;
          }
--        if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k))
-+        if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1))
+-        if (j1 == 3 && !world.isBlockNormalCube(i - 1, j, k))
++        if (j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k, 1))
          {
              flag = true;
          }
--        if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1))
-+        if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1))
+-        if (j1 == 4 && !world.isBlockNormalCube(i, j, k - 1))
++        if (j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1, 1))
          {
              flag = true;
          }
--        if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1))
-+        if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1))
+-        if (j1 == 5 && !world.isBlockNormalCube(i, j, k + 1))
++        if (j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1, 1))
          {
              flag = true;
          }
-@@ -313,8 +326,118 @@
+@@ -317,8 +330,119 @@
          return 0;
      }
  
 +    /**
 +     * This function is no longer called by Minecraft
 +     */
++    @Deprecated
      static boolean isPoweredBlockRail(BlockRail blockrail)
      {
          return blockrail.isPowered;