diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
index 2092f9703..56a47d36f 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
@@ -38,7 +38,7 @@
 -                float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
 -                EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
 -                entityitem.delayBeforeCanPickup = 10;
--                world.entityJoinedWorld(entityitem);
+-                world.spawnEntityInWorld(entityitem);
 +                tr.add(new ItemStack(Item.seeds));
              }
          }
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch
index 39b16e4b9..5e92d3fc4 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch
@@ -11,7 +11,7 @@
 -        double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
 -        EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
 -        entityitem.delayBeforeCanPickup = 10;
--        world.entityJoinedWorld(entityitem);
+-        world.spawnEntityInWorld(entityitem);
 -        world.setBlockWithNotify(i, j, k, 0);
 +
 +	dropBlockAsItem(world,i,j,k,l,0);
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
index c79b15d3d..a23b43ffd 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
@@ -30,7 +30,7 @@
  
      public void dropPlayerItem(ItemStack itemstack)
 @@ -548,6 +561,8 @@
-         worldObj.entityJoinedWorld(entityitem);
+         worldObj.spawnEntityInWorld(entityitem);
      }
  
 +    /* FORGE: This isnt called anymore
@@ -107,7 +107,7 @@
 +            return;
 +        }
 +    	
-         if(!damagesource.unblockable() && func_35162_ad())
+         if(!damagesource.isUnblockable() && func_35162_ad())
          {
              i = 1 + i >> 1;
 @@ -825,7 +898,9 @@
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
index 3feb57103..05bc96b24 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
@@ -137,7 +137,7 @@
 +     * others.
 +     */
 +    public boolean isBlockNormalCube(World world, int i, int j, int k) {
-+	    return blockMaterial.getIsOpaque() && isACube();
++	    return blockMaterial.getIsOpaque() && renderAsNormalBlock();
 +    }
 +
 +    /* FORGE: Return true if the block is solid on the given side.  This
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
index 55399e4b0..434ec56af 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
@@ -109,7 +109,7 @@
 +            return;
 +        }
 +        
-         if(!damagesource.unblockable() && func_35180_G())
+         if(!damagesource.isUnblockable() && func_35180_G())
          {
              i = 1 + i >> 1;
 @@ -770,7 +843,9 @@
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
index 90b3b62eb..53c1d0879 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
@@ -19,6 +19,6 @@
 +            		return customBucket;
 +            	}
 +
-                 if(!entityplayer.func_35200_c(i, j, k))
+                 if(!entityplayer.canPlayerEdit(i, j, k))
                  {
                      return itemstack;
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
index 094891bc5..2a1c836b5 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
@@ -12,8 +12,8 @@
  
      public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
      {
--        if(!entityplayer.func_35200_c(i, j, k))
-+        if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
+-        if(!entityplayer.canPlayerEdit(i, j, k))
++        if(entityplayer!=null && !entityplayer.canPlayerEdit(i, j, k))
          {
              return false;
          }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
index b2ccbedd7..ec13045a1 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
@@ -154,7 +154,7 @@
 -            return false;
 -        } else
 -        {
--            return block.blockMaterial.getIsOpaque() && block.isACube();
+-            return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock();
 -        }
 +        if(block == null) return false;
 +	return block.isBlockNormalCube(this,i,j,k);