Updated to MC: 1.2.4 MLMP: 1.2.4 v1

Removed all code that was marked as deprecated, IE: ICustomItemRenderer, and the functions in Configuration

forge/clean_src.py

@@ -1,24 +0,0 @@
-import re, os, shutil, sys, fnmatch
-
-if __name__ == '__main__':
-    print "Cleaning trailing zeros from source files"
-    trailing = re.compile(r'(?P<full>[0-9]+\.(?P<decimal>[0-9]+?)0)(?P<type>[Dd])')
-    for path, _, filelist in os.walk(sys.argv[1], followlinks=True):
-        for cur_file in fnmatch.filter(filelist, '*.java'):
-            src_file = os.path.normpath(os.path.join(path, cur_file))
-            tmp_file = src_file + '.tmp'
-            with open(src_file, 'r') as fh:
-                buf = fh.read()
-
-                
-            def strip_zeros_match(match):
-                ret = match.group('full').rstrip('0')
-                if ret[-1] == '.':
-                    ret += '0'
-                return ret + match.group('type')
-                
-            buf = trailing.sub(strip_zeros_match, buf) #Strip trailing zeroes: 1.0040D -> 1.004D
-
-            with open(tmp_file, 'w') as fh:
-                fh.write(buf)
-            shutil.move(tmp_file, src_file)

forge/conf/client.exc

@@ -1,5 +1,5 @@
-#max index=1097
+#max index=1209
-#Sat Mar 03 15:09:40 NZDT 2012
+#Fri Mar 23 22:29:01 NZDT 2012
 argo/format/CompactJsonFormatter.<init>()V=|
 argo/format/CompactJsonFormatter.func_27327_a(Largo/jdom/JsonRootNode;)Ljava/lang/String;=|p_27327_1_
 argo/format/CompactJsonFormatter.func_27328_a(Largo/jdom/JsonNode;Ljava/io/Writer;)V=java/io/IOException|p_27328_1_,p_27328_2_
@@ -257,7 +257,7 @@ net/minecraft/client/Minecraft.func_6248_s()V=|
 net/minecraft/client/Minecraft.func_6249_a(II)V=|p_6249_1_,p_6249_2_
 net/minecraft/client/Minecraft.func_6250_c(Ljava/lang/String;)V=|p_6250_1_
 net/minecraft/client/Minecraft.func_6252_g()V=|
-net/minecraft/client/Minecraft.func_6253_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=org/lwjgl/LWJGLException|p_6253_0_,p_6253_1_,p_6253_2_
+net/minecraft/client/Minecraft.func_6253_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_6253_0_,p_6253_1_,p_6253_2_
 net/minecraft/client/Minecraft.func_6254_a(IZ)V=|p_6254_1_,p_6254_2_
 net/minecraft/client/Minecraft.func_6255_d(Ljava/lang/String;)V=|p_6255_1_
 net/minecraft/client/Minecraft.func_6256_a(Lnet/minecraft/src/World;Ljava/lang/String;Lnet/minecraft/src/EntityPlayer;)V=|p_6256_1_,p_6256_2_,p_6256_3_
@@ -406,6 +406,7 @@ net/minecraft/src/BiomeGenBase.func_48412_k()I=|
 net/minecraft/src/BiomeGenBase.func_48413_d()Z=|
 net/minecraft/src/BiomeGenBase.func_48414_h()F=|
 net/minecraft/src/BiomeGenBase.func_48415_j()I=|
+net/minecraft/src/BiomeGenBase.func_50086_b()Lnet/minecraft/src/BiomeGenBase;=|
 net/minecraft/src/BiomeGenBeach.<init>(I)V=|p_i473_1_
 net/minecraft/src/BiomeGenDesert.<init>(I)V=|p_i128_1_
 net/minecraft/src/BiomeGenDesert.func_35477_a(Lnet/minecraft/src/World;Ljava/util/Random;II)V=|p_35477_1_,p_35477_2_,p_35477_3_,p_35477_4_
@@ -513,6 +514,7 @@ net/minecraft/src/Block.func_48203_o()Z=|
 net/minecraft/src/Block.func_48204_b(Lnet/minecraft/src/IBlockAccess;III)Z=|p_48204_1_,p_48204_2_,p_48204_3_,p_48204_4_
 net/minecraft/src/Block.func_48205_p()Z=|
 net/minecraft/src/Block.func_48206_g(I)Z=|p_48206_0_
+net/minecraft/src/Block.func_50074_q()Z=|
 net/minecraft/src/BlockBed.<init>(I)V=|p_i518_1_
 net/minecraft/src/BlockBed.func_210_f()I=|
 net/minecraft/src/BlockBed.func_216_a(Lnet/minecraft/src/World;IIIIFI)V=|p_216_1_,p_216_2_,p_216_3_,p_216_4_,p_216_5_,p_216_6_,p_216_7_
@@ -620,6 +622,7 @@ net/minecraft/src/BlockChest.func_283_a_()Lnet/minecraft/src/TileEntity;=|
 net/minecraft/src/BlockChest.func_286_h(Lnet/minecraft/src/World;III)Z=|p_286_1_,p_286_2_,p_286_3_,p_286_4_
 net/minecraft/src/BlockChest.func_35306_h(Lnet/minecraft/src/World;III)V=|p_35306_1_,p_35306_2_,p_35306_3_,p_35306_4_
 net/minecraft/src/BlockChest.func_4026_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityLiving;)V=|p_4026_1_,p_4026_2_,p_4026_3_,p_4026_4_,p_4026_5_
+net/minecraft/src/BlockChest.func_50075_j(Lnet/minecraft/src/World;III)Z=|p_50075_0_,p_50075_1_,p_50075_2_,p_50075_3_
 net/minecraft/src/BlockClay.<init>(II)V=|p_i117_1_,p_i117_2_
 net/minecraft/src/BlockClay.func_229_a(Ljava/util/Random;)I=|p_229_1_
 net/minecraft/src/BlockClay.func_240_a(ILjava/util/Random;I)I=|p_240_1_,p_240_2_,p_240_3_
@@ -860,6 +863,7 @@ net/minecraft/src/BlockGlass.func_217_b()Z=|
 net/minecraft/src/BlockGlass.func_229_a(Ljava/util/Random;)I=|p_229_1_
 net/minecraft/src/BlockGlass.func_234_g()I=|
 net/minecraft/src/BlockGlass.func_242_c()Z=|
+net/minecraft/src/BlockGlass.func_50074_q()Z=|
 net/minecraft/src/BlockGlowStone.<init>(IILnet/minecraft/src/Material;)V=|p_i379_1_,p_i379_2_,p_i379_3_
 net/minecraft/src/BlockGlowStone.func_229_a(Ljava/util/Random;)I=|p_229_1_
 net/minecraft/src/BlockGlowStone.func_240_a(ILjava/util/Random;I)I=|p_240_1_,p_240_2_,p_240_3_
@@ -971,6 +975,7 @@ net/minecraft/src/BlockMobSpawner.func_283_a_()Lnet/minecraft/src/TileEntity;=|
 net/minecraft/src/BlockMushroom.<init>(II)V=|p_i134_1_,p_i134_2_
 net/minecraft/src/BlockMushroom.func_208_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_208_1_,p_208_2_,p_208_3_,p_208_4_,p_208_5_
 net/minecraft/src/BlockMushroom.func_223_g(Lnet/minecraft/src/World;III)Z=|p_223_1_,p_223_2_,p_223_3_,p_223_4_
+net/minecraft/src/BlockMushroom.func_243_a(Lnet/minecraft/src/World;III)Z=|p_243_1_,p_243_2_,p_243_3_,p_243_4_
 net/minecraft/src/BlockMushroom.func_269_b(I)Z=|p_269_1_
 net/minecraft/src/BlockMushroom.func_35293_c(Lnet/minecraft/src/World;IIILjava/util/Random;)Z=|p_35293_1_,p_35293_2_,p_35293_3_,p_35293_4_,p_35293_5_
 net/minecraft/src/BlockMushroomCap.<init>(ILnet/minecraft/src/Material;II)V=|p_i529_1_,p_i529_2_,p_i529_3_,p_i529_4_
@@ -1135,8 +1140,10 @@ net/minecraft/src/BlockRail.func_27044_a(Lnet/minecraft/src/World;IIIIZI)Z=|p_27
 net/minecraft/src/BlockRail.func_31029_h()I=|
 net/minecraft/src/BlockRail.func_4031_h(Lnet/minecraft/src/World;IIIZ)V=|p_4031_1_,p_4031_2_,p_4031_3_,p_4031_4_,p_4031_5_
 net/minecraft/src/BlockRedstoneLight.<init>(IZ)V=|p_i1044_1_,p_i1044_2_
+net/minecraft/src/BlockRedstoneLight.func_208_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_208_1_,p_208_2_,p_208_3_,p_208_4_,p_208_5_
 net/minecraft/src/BlockRedstoneLight.func_226_a(Lnet/minecraft/src/World;IIII)V=|p_226_1_,p_226_2_,p_226_3_,p_226_4_,p_226_5_
 net/minecraft/src/BlockRedstoneLight.func_235_e(Lnet/minecraft/src/World;III)V=|p_235_1_,p_235_2_,p_235_3_,p_235_4_
+net/minecraft/src/BlockRedstoneLight.func_240_a(ILjava/util/Random;I)I=|p_240_1_,p_240_2_,p_240_3_
 net/minecraft/src/BlockRedstoneOre.<init>(IIZ)V=|p_i627_1_,p_i627_2_,p_i627_3_
 net/minecraft/src/BlockRedstoneOre.func_208_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_208_1_,p_208_2_,p_208_3_,p_208_4_,p_208_5_
 net/minecraft/src/BlockRedstoneOre.func_229_a(Ljava/util/Random;)I=|p_229_1_
@@ -1226,12 +1233,15 @@ net/minecraft/src/BlockSand.func_315_h(Lnet/minecraft/src/World;III)V=|p_315_1_,
 net/minecraft/src/BlockSand.func_316_a_(Lnet/minecraft/src/World;III)Z=|p_316_0_,p_316_1_,p_316_2_,p_316_3_
 net/minecraft/src/BlockSand.func_4025_d()I=|
 net/minecraft/src/BlockSandStone.<init>(I)V=|p_i461_1_
+net/minecraft/src/BlockSandStone.func_21025_b(I)I=|p_21025_1_
 net/minecraft/src/BlockSandStone.func_218_a(I)I=|p_218_1_
+net/minecraft/src/BlockSandStone.func_232_a(II)I=|p_232_1_,p_232_2_
 net/minecraft/src/BlockSapling.<init>(II)V=|p_i714_1_,p_i714_2_
 net/minecraft/src/BlockSapling.func_208_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_208_1_,p_208_2_,p_208_3_,p_208_4_,p_208_5_
 net/minecraft/src/BlockSapling.func_21025_b(I)I=|p_21025_1_
 net/minecraft/src/BlockSapling.func_21028_c(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_21028_1_,p_21028_2_,p_21028_3_,p_21028_4_,p_21028_5_
 net/minecraft/src/BlockSapling.func_232_a(II)I=|p_232_1_,p_232_2_
+net/minecraft/src/BlockSapling.func_50076_f(Lnet/minecraft/src/World;IIII)Z=|p_50076_1_,p_50076_2_,p_50076_3_,p_50076_4_,p_50076_5_
 net/minecraft/src/BlockSign.<init>(ILjava/lang/Class;Z)V=|p_i501_1_,p_i501_2_,p_i501_3_
 net/minecraft/src/BlockSign.func_210_f()I=|
 net/minecraft/src/BlockSign.func_217_b()Z=|
@@ -1422,6 +1432,9 @@ net/minecraft/src/BlockWeb.func_221_d(Lnet/minecraft/src/World;III)Lnet/minecraf
 net/minecraft/src/BlockWeb.func_236_b(Lnet/minecraft/src/World;IIILnet/minecraft/src/Entity;)V=|p_236_1_,p_236_2_,p_236_3_,p_236_4_,p_236_5_
 net/minecraft/src/BlockWeb.func_240_a(ILjava/util/Random;I)I=|p_240_1_,p_240_2_,p_240_3_
 net/minecraft/src/BlockWeb.func_242_c()Z=|
+net/minecraft/src/BlockWood.<init>(I)V=|p_i1205_1_
+net/minecraft/src/BlockWood.func_21025_b(I)I=|p_21025_1_
+net/minecraft/src/BlockWood.func_232_a(II)I=|p_232_1_,p_232_2_
 net/minecraft/src/BlockWorkbench.<init>(I)V=|p_i298_1_
 net/minecraft/src/BlockWorkbench.func_218_a(I)I=|p_218_1_
 net/minecraft/src/BlockWorkbench.func_250_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)Z=|p_250_1_,p_250_2_,p_250_3_,p_250_4_,p_250_5_
@@ -1459,6 +1472,10 @@ net/minecraft/src/CanvasMojangLogo.paint(Ljava/awt/Graphics;)V=|p_paint_1_
 net/minecraft/src/ChatAllowedCharacters.<init>()V=|
 net/minecraft/src/ChatAllowedCharacters.func_20156_a()Ljava/lang/String;=|
 net/minecraft/src/ChatAllowedCharacters.func_48614_a(C)Z=|p_48614_0_
+net/minecraft/src/ChatClickData.<init>(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/ChatLine;II)V=|p_i1203_1_,p_i1203_2_,p_i1203_3_,p_i1203_4_
+net/minecraft/src/ChatClickData.func_50088_a()Ljava/lang/String;=|
+net/minecraft/src/ChatClickData.func_50089_b()Ljava/net/URI;=|
+net/minecraft/src/ChatClickData.func_50090_c()Ljava/lang/String;=|
 net/minecraft/src/ChatLine.<init>(Ljava/lang/String;)V=|p_i484_1_
 net/minecraft/src/ChestItemRenderHelper.<init>()V=|
 net/minecraft/src/ChestItemRenderHelper.func_35609_a(Lnet/minecraft/src/Block;IF)V=|p_35609_1_,p_35609_2_,p_35609_3_
@@ -2365,6 +2382,14 @@ net/minecraft/src/EntityAIOcelotAttack.func_46077_d()V=|
 net/minecraft/src/EntityAIOcelotAttack.func_46081_b()V=|
 net/minecraft/src/EntityAIOcelotAttack.func_46082_a()Z=|
 net/minecraft/src/EntityAIOcelotAttack.func_46084_g()Z=|
+net/minecraft/src/EntityAIOcelotSit.<init>(Lnet/minecraft/src/EntityOcelot;F)V=|p_i1206_1_,p_i1206_2_
+net/minecraft/src/EntityAIOcelotSit.func_46077_d()V=|
+net/minecraft/src/EntityAIOcelotSit.func_46080_e()V=|
+net/minecraft/src/EntityAIOcelotSit.func_46081_b()V=|
+net/minecraft/src/EntityAIOcelotSit.func_46082_a()Z=|
+net/minecraft/src/EntityAIOcelotSit.func_46084_g()Z=|
+net/minecraft/src/EntityAIOcelotSit.func_50077_h()Z=|
+net/minecraft/src/EntityAIOcelotSit.func_50078_a(Lnet/minecraft/src/World;III)Z=|p_50078_1_,p_50078_2_,p_50078_3_,p_50078_4_
 net/minecraft/src/EntityAIOpenDoor.<init>(Lnet/minecraft/src/EntityLiving;Z)V=|p_i1003_1_,p_i1003_2_
 net/minecraft/src/EntityAIOpenDoor.func_46077_d()V=|
 net/minecraft/src/EntityAIOpenDoor.func_46080_e()V=|
@@ -2472,6 +2497,7 @@ net/minecraft/src/EntityAnimal.func_433_a()Z=|
 net/minecraft/src/EntityAnimal.func_437_a(Lnet/minecraft/src/Entity;F)V=|p_437_1_,p_437_2_
 net/minecraft/src/EntityAnimal.func_438_i()Lnet/minecraft/src/Entity;=|
 net/minecraft/src/EntityAnimal.func_439_a(III)F=|p_439_1_,p_439_2_,p_439_3_
+net/minecraft/src/EntityAnimal.func_48097_s_()V=|
 net/minecraft/src/EntityAnimal.func_48134_p_()V=|
 net/minecraft/src/EntityAnimal.func_48135_b(Lnet/minecraft/src/EntityAnimal;)Z=|p_48135_1_
 net/minecraft/src/EntityAnimal.func_48136_o_()Z=|
@@ -2578,6 +2604,7 @@ net/minecraft/src/EntityClientPlayerMP.func_446_a(Lnet/minecraft/src/EntityItem;
 net/minecraft/src/EntityClientPlayerMP.func_457_w()V=|
 net/minecraft/src/EntityClientPlayerMP.func_461_a(Ljava/lang/String;)V=|p_461_1_
 net/minecraft/src/EntityClientPlayerMP.func_48152_as()Lnet/minecraft/src/EntityItem;=|
+net/minecraft/src/EntityClientPlayerMP.func_50009_aI()V=|
 net/minecraft/src/EntityClientPlayerMP.func_9367_r()V=|
 net/minecraft/src/EntityClientPlayerMP.func_9372_a_(I)V=|p_9372_1_
 net/minecraft/src/EntityClientPlayerMP.func_9375_Q()V=|
@@ -3311,6 +3338,7 @@ net/minecraft/src/EntityPlayer.func_463_a(Lnet/minecraft/src/Entity;)V=|p_463_1_
 net/minecraft/src/EntityPlayer.func_48151_a(Lnet/minecraft/src/ItemStack;Z)Lnet/minecraft/src/EntityItem;=|p_48151_1_,p_48151_2_
 net/minecraft/src/EntityPlayer.func_48152_as()Lnet/minecraft/src/EntityItem;=|
 net/minecraft/src/EntityPlayer.func_48153_a(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EntityItem;=|p_48153_1_
+net/minecraft/src/EntityPlayer.func_50009_aI()V=|
 net/minecraft/src/EntityPlayer.func_6415_a_(Lnet/minecraft/src/Entity;)V=|p_6415_1_
 net/minecraft/src/EntityPlayer.func_6416_v()Lnet/minecraft/src/ItemStack;=|
 net/minecraft/src/EntityPlayer.func_6417_t()I=|
@@ -3571,6 +3599,7 @@ net/minecraft/src/EntityTameable.func_48142_a(Z)V=|p_48142_1_
 net/minecraft/src/EntityTameable.func_48143_a(Ljava/lang/String;)V=|p_48143_1_
 net/minecraft/src/EntityTameable.func_48144_ah()Lnet/minecraft/src/EntityLiving;=|
 net/minecraft/src/EntityTameable.func_48145_ag()Ljava/lang/String;=|
+net/minecraft/src/EntityTameable.func_50008_ai()Lnet/minecraft/src/EntityAISit;=|
 net/minecraft/src/EntityTameable.func_9282_a(B)V=|p_9282_1_
 net/minecraft/src/EntityThrowable.<init>(Lnet/minecraft/src/World;)V=|p_i233_1_
 net/minecraft/src/EntityThrowable.<init>(Lnet/minecraft/src/World;DDD)V=|p_i235_1_,p_i235_2_,p_i235_4_,p_i235_6_
@@ -3594,7 +3623,6 @@ net/minecraft/src/EntityVillager.func_25023_u()Z=|
 net/minecraft/src/EntityVillager.func_352_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_352_1_
 net/minecraft/src/EntityVillager.func_357_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_357_1_
 net/minecraft/src/EntityVillager.func_40117_c()I=|
-net/minecraft/src/EntityVillager.func_40140_ac()V=|
 net/minecraft/src/EntityVillager.func_425_j()V=|
 net/minecraft/src/EntityVillager.func_46006_aR()Z=|
 net/minecraft/src/EntityVillager.func_48086_a(Lnet/minecraft/src/EntityLiving;)V=|p_48086_1_
@@ -3605,6 +3633,7 @@ net/minecraft/src/EntityVillager.func_48126_w_()Z=|
 net/minecraft/src/EntityVillager.func_48127_b(Z)V=|p_48127_1_
 net/minecraft/src/EntityVillager.func_48128_a(Z)V=|p_48128_1_
 net/minecraft/src/EntityVillager.func_48129_t()I=|
+net/minecraft/src/EntityVillager.func_6376_z()Ljava/lang/String;=|
 net/minecraft/src/EntityVillager.func_6389_d()Ljava/lang/String;=|
 net/minecraft/src/EntityVillager.func_6390_f()Ljava/lang/String;=|
 net/minecraft/src/EntityVillager.func_6394_f_()Ljava/lang/String;=|
@@ -3777,23 +3806,33 @@ net/minecraft/src/ExtendedBlockStorage.func_48713_d(Lnet/minecraft/src/NibbleArr
 net/minecraft/src/ExtendedBlockStorage.func_48714_l()Lnet/minecraft/src/NibbleArray;=|
 net/minecraft/src/ExtendedBlockStorage.func_48715_h()V=|
 net/minecraft/src/Facing.<init>()V=|
+net/minecraft/src/FontRenderer.<init>()V=|
 net/minecraft/src/FontRenderer.<init>(Lnet/minecraft/src/GameSettings;Ljava/lang/String;Lnet/minecraft/src/RenderEngine;Z)V=|p_i476_1_,p_i476_2_,p_i476_3_,p_i476_4_
 net/minecraft/src/FontRenderer.func_27277_a(Ljava/lang/String;I)I=|p_27277_1_,p_27277_2_
 net/minecraft/src/FontRenderer.func_27278_a(Ljava/lang/String;IIII)V=|p_27278_1_,p_27278_2_,p_27278_3_,p_27278_4_,p_27278_5_
-net/minecraft/src/FontRenderer.func_40609_a(Ljava/lang/String;IIIIZ)V=|p_40609_1_,p_40609_2_,p_40609_3_,p_40609_4_,p_40609_5_,p_40609_6_
 net/minecraft/src/FontRenderer.func_44029_a(Ljava/lang/String;Z)V=|p_44029_1_,p_44029_2_
 net/minecraft/src/FontRenderer.func_44030_b(I)V=|p_44030_1_
-net/minecraft/src/FontRenderer.func_44031_a(I)V=|p_44031_1_
 net/minecraft/src/FontRenderer.func_44032_a(Z)V=|p_44032_1_
-net/minecraft/src/FontRenderer.func_44033_a(C)V=|p_44033_1_
 net/minecraft/src/FontRenderer.func_46121_b(Ljava/lang/String;)Ljava/lang/String;=|p_46121_1_
 net/minecraft/src/FontRenderer.func_46122_b(Ljava/lang/String;IIIIZ)V=|p_46122_1_,p_46122_2_,p_46122_3_,p_46122_4_,p_46122_5_,p_46122_6_
 net/minecraft/src/FontRenderer.func_46123_b(Z)V=|p_46123_1_
 net/minecraft/src/FontRenderer.func_46124_b(Ljava/lang/String;IIII)V=|p_46124_1_,p_46124_2_,p_46124_3_,p_46124_4_,p_46124_5_
+net/minecraft/src/FontRenderer.func_50101_a(Ljava/lang/String;IIIZ)I=|p_50101_1_,p_50101_2_,p_50101_3_,p_50101_4_,p_50101_5_
+net/minecraft/src/FontRenderer.func_50102_e(Ljava/lang/String;I)I=|p_50102_1_,p_50102_2_
+net/minecraft/src/FontRenderer.func_50103_a(Ljava/lang/String;III)I=|p_50103_1_,p_50103_2_,p_50103_3_,p_50103_4_
+net/minecraft/src/FontRenderer.func_50104_a(Ljava/lang/String;IZ)Ljava/lang/String;=|p_50104_1_,p_50104_2_,p_50104_3_
+net/minecraft/src/FontRenderer.func_50105_a(C)I=|p_50105_1_
+net/minecraft/src/FontRenderer.func_50106_a(IZ)F=|p_50106_1_,p_50106_2_
+net/minecraft/src/FontRenderer.func_50107_a(Ljava/lang/String;I)Ljava/lang/String;=|p_50107_1_,p_50107_2_
+net/minecraft/src/FontRenderer.func_50108_c(Ljava/lang/String;I)Ljava/util/List;=|p_50108_1_,p_50108_2_
+net/minecraft/src/FontRenderer.func_50109_c(C)Z=|p_50109_0_
+net/minecraft/src/FontRenderer.func_50110_b(C)Z=|p_50110_0_
+net/minecraft/src/FontRenderer.func_50111_a(CZ)F=|p_50111_1_,p_50111_2_
+net/minecraft/src/FontRenderer.func_50112_a(ICZ)F=|p_50112_1_,p_50112_2_,p_50112_3_
+net/minecraft/src/FontRenderer.func_50113_d(Ljava/lang/String;I)Ljava/lang/String;=|p_50113_1_,p_50113_2_
+net/minecraft/src/FontRenderer.func_50114_c(Ljava/lang/String;)Ljava/lang/String;=|p_50114_0_
 net/minecraft/src/FontRenderer.func_871_a(Ljava/lang/String;)I=|p_871_1_
-net/minecraft/src/FontRenderer.func_872_a(Ljava/lang/String;IIIZ)V=|p_872_1_,p_872_2_,p_872_3_,p_872_4_,p_872_5_
 net/minecraft/src/FontRenderer.func_873_b(Ljava/lang/String;III)V=|p_873_1_,p_873_2_,p_873_3_,p_873_4_
-net/minecraft/src/FontRenderer.func_874_a(Ljava/lang/String;III)V=|p_874_1_,p_874_2_,p_874_3_,p_874_4_
 net/minecraft/src/FoodStats.<init>()V=|
 net/minecraft/src/FoodStats.func_35760_d()F=|
 net/minecraft/src/FoodStats.func_35761_a(Lnet/minecraft/src/ItemFood;)V=|p_35761_1_
@@ -3918,15 +3957,26 @@ net/minecraft/src/GuiButton.func_562_c(Lnet/minecraft/client/Minecraft;II)Z=|p_5
 net/minecraft/src/GuiButtonLanguage.<init>(III)V=|p_i44_1_,p_i44_2_,p_i44_3_
 net/minecraft/src/GuiButtonLanguage.func_561_a(Lnet/minecraft/client/Minecraft;II)V=|p_561_1_,p_561_2_,p_561_3_
 net/minecraft/src/GuiChat.<init>()V=|
+net/minecraft/src/GuiChat.<init>(Ljava/lang/String;)V=|p_i1207_1_
+net/minecraft/src/GuiChat.func_50057_d()V=|
+net/minecraft/src/GuiChat.func_50058_a(I)V=|p_50058_1_
 net/minecraft/src/GuiChat.func_565_a(III)V=|p_565_1_,p_565_2_,p_565_3_
+net/minecraft/src/GuiChat.func_566_e()V=|
+net/minecraft/src/GuiChat.func_568_a(ZI)V=|p_568_1_,p_568_2_
 net/minecraft/src/GuiChat.func_570_g()V=|
 net/minecraft/src/GuiChat.func_571_a(IIF)V=|p_571_1_,p_571_2_,p_571_3_
 net/minecraft/src/GuiChat.func_580_a(CI)V=|p_580_1_,p_580_2_
 net/minecraft/src/GuiChat.func_6448_a()V=|
 net/minecraft/src/GuiChat.func_6449_h()V=|
+net/minecraft/src/GuiChatConfirmLink.<init>(Lnet/minecraft/src/GuiChat;Lnet/minecraft/src/GuiScreen;Ljava/lang/String;ILnet/minecraft/src/ChatClickData;)V=|p_i1202_1_,p_i1202_2_,p_i1202_3_,p_i1202_4_,p_i1202_5_
+net/minecraft/src/GuiChatConfirmLink.func_50052_d()V=|
 net/minecraft/src/GuiChest.<init>(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/IInventory;)V=|p_i721_1_,p_i721_2_
 net/minecraft/src/GuiChest.func_587_j()V=|
 net/minecraft/src/GuiChest.func_589_a(FII)V=|p_589_1_,p_589_2_,p_589_3_
+net/minecraft/src/GuiConfirmOpenLink.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;I)V=|p_i1200_1_,p_i1200_2_,p_i1200_3_
+net/minecraft/src/GuiConfirmOpenLink.func_571_a(IIF)V=|p_571_1_,p_571_2_,p_571_3_
+net/minecraft/src/GuiConfirmOpenLink.func_572_a(Lnet/minecraft/src/GuiButton;)V=|p_572_1_
+net/minecraft/src/GuiConfirmOpenLink.func_6448_a()V=|
 net/minecraft/src/GuiConflictWarning.<init>()V=|
 net/minecraft/src/GuiConflictWarning.func_570_g()V=|
 net/minecraft/src/GuiConflictWarning.func_571_a(IIF)V=|p_571_1_,p_571_2_,p_571_3_
@@ -3978,7 +4028,6 @@ net/minecraft/src/GuiCrafting.func_6449_h()V=|
 net/minecraft/src/GuiCreateWorld.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i680_1_
 net/minecraft/src/GuiCreateWorld.func_22129_j()V=|
 net/minecraft/src/GuiCreateWorld.func_25097_a(Lnet/minecraft/src/ISaveFormat;Ljava/lang/String;)Ljava/lang/String;=|p_25097_0_,p_25097_1_
-net/minecraft/src/GuiCreateWorld.func_27108_j()V=|
 net/minecraft/src/GuiCreateWorld.func_35363_g()V=|
 net/minecraft/src/GuiCreateWorld.func_565_a(III)V=|p_565_1_,p_565_2_,p_565_3_
 net/minecraft/src/GuiCreateWorld.func_570_g()V=|
@@ -4037,6 +4086,12 @@ net/minecraft/src/GuiIngame.func_4064_a(FII)V=|p_4064_1_,p_4064_2_,p_4064_3_
 net/minecraft/src/GuiIngame.func_4065_b(FII)V=|p_4065_1_,p_4065_2_,p_4065_3_
 net/minecraft/src/GuiIngame.func_4066_a(FZII)V=|p_4066_1_,p_4066_2_,p_4066_3_,p_4066_4_
 net/minecraft/src/GuiIngame.func_41039_c()V=|
+net/minecraft/src/GuiIngame.func_50010_a(Lnet/minecraft/src/FontRenderer;)V=|p_50010_1_
+net/minecraft/src/GuiIngame.func_50011_a(I)V=|p_50011_1_
+net/minecraft/src/GuiIngame.func_50012_a(II)Lnet/minecraft/src/ChatClickData;=|p_50012_1_,p_50012_2_
+net/minecraft/src/GuiIngame.func_50013_c()Ljava/util/List;=|
+net/minecraft/src/GuiIngame.func_50014_d()V=|
+net/minecraft/src/GuiIngame.func_50015_e()Z=|
 net/minecraft/src/GuiIngame.func_552_a(Ljava/lang/String;)V=|p_552_1_
 net/minecraft/src/GuiIngame.func_553_b(Ljava/lang/String;)V=|p_553_1_
 net/minecraft/src/GuiIngame.func_554_a(IIIF)V=|p_554_1_,p_554_2_,p_554_3_,p_554_4_
@@ -4117,6 +4172,7 @@ net/minecraft/src/GuiParticle.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i656_
 net/minecraft/src/GuiParticle.func_25087_a(F)V=|p_25087_1_
 net/minecraft/src/GuiParticle.func_25088_a()V=|
 net/minecraft/src/GuiPlayerInfo.<init>(Ljava/lang/String;)V=|p_i119_1_
+net/minecraft/src/GuiPlayerInfo.func_50098_a(Ljava/lang/String;)Z=|p_50098_1_
 net/minecraft/src/GuiRenameWorld.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;)V=|p_i756_1_,p_i756_2_
 net/minecraft/src/GuiRenameWorld.func_565_a(III)V=|p_565_1_,p_565_2_,p_565_3_
 net/minecraft/src/GuiRenameWorld.func_570_g()V=|
@@ -4126,7 +4182,9 @@ net/minecraft/src/GuiRenameWorld.func_580_a(CI)V=|p_580_1_,p_580_2_
 net/minecraft/src/GuiRenameWorld.func_6448_a()V=|
 net/minecraft/src/GuiRenameWorld.func_6449_h()V=|
 net/minecraft/src/GuiScreen.<init>()V=|
-net/minecraft/src/GuiScreen.func_27108_j()V=|
+net/minecraft/src/GuiScreen.func_50049_m()Z=|
+net/minecraft/src/GuiScreen.func_50050_a(Ljava/lang/String;)V=|p_50050_0_
+net/minecraft/src/GuiScreen.func_50051_l()Z=|
 net/minecraft/src/GuiScreen.func_564_d()V=|
 net/minecraft/src/GuiScreen.func_565_a(III)V=|p_565_1_,p_565_2_,p_565_3_
 net/minecraft/src/GuiScreen.func_566_e()V=|
@@ -4183,11 +4241,9 @@ net/minecraft/src/GuiSelectWorld.func_585_j()V=|
 net/minecraft/src/GuiSelectWorld.func_6448_a()V=|
 net/minecraft/src/GuiSleepMP.<init>()V=|
 net/minecraft/src/GuiSleepMP.func_22115_j()V=|
-net/minecraft/src/GuiSleepMP.func_571_a(IIF)V=|p_571_1_,p_571_2_,p_571_3_
 net/minecraft/src/GuiSleepMP.func_572_a(Lnet/minecraft/src/GuiButton;)V=|p_572_1_
 net/minecraft/src/GuiSleepMP.func_580_a(CI)V=|p_580_1_,p_580_2_
 net/minecraft/src/GuiSleepMP.func_6448_a()V=|
-net/minecraft/src/GuiSleepMP.func_6449_h()V=|
 net/minecraft/src/GuiSlider.<init>(IIILnet/minecraft/src/EnumOptions;Ljava/lang/String;F)V=|p_i173_1_,p_i173_2_,p_i173_3_,p_i173_4_,p_i173_5_,p_i173_6_
 net/minecraft/src/GuiSlider.func_558_a(Z)I=|p_558_1_
 net/minecraft/src/GuiSlider.func_559_a(II)V=|p_559_1_,p_559_2_
@@ -4278,15 +4334,35 @@ net/minecraft/src/GuiStats.func_27149_g(Lnet/minecraft/src/GuiStats;)Lnet/minecr
 net/minecraft/src/GuiStats.func_571_a(IIF)V=|p_571_1_,p_571_2_,p_571_3_
 net/minecraft/src/GuiStats.func_572_a(Lnet/minecraft/src/GuiButton;)V=|p_572_1_
 net/minecraft/src/GuiStats.func_6448_a()V=|
-net/minecraft/src/GuiTextField.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/FontRenderer;IIIILjava/lang/String;)V=|p_i111_1_,p_i111_2_,p_i111_3_,p_i111_4_,p_i111_5_,p_i111_6_,p_i111_7_
+net/minecraft/src/GuiTextField.<init>(Lnet/minecraft/src/FontRenderer;IIII)V=|p_i1201_1_,p_i1201_2_,p_i1201_3_,p_i1201_4_,p_i1201_5_
 net/minecraft/src/GuiTextField.func_22066_a(I)V=|p_22066_1_
 net/minecraft/src/GuiTextField.func_22067_c()V=|
 net/minecraft/src/GuiTextField.func_22068_a(Ljava/lang/String;)V=|p_22068_1_
 net/minecraft/src/GuiTextField.func_22069_a(III)V=|p_22069_1_,p_22069_2_,p_22069_3_
 net/minecraft/src/GuiTextField.func_22070_b()V=|
 net/minecraft/src/GuiTextField.func_22071_a()Ljava/lang/String;=|
-net/minecraft/src/GuiTextField.func_22072_a(CI)V=|p_22072_1_,p_22072_2_
+net/minecraft/src/GuiTextField.func_50019_l()I=|
-net/minecraft/src/GuiTextField.func_27106_a(Z)V=|p_27106_1_
+net/minecraft/src/GuiTextField.func_50020_b(I)V=|p_50020_1_
+net/minecraft/src/GuiTextField.func_50021_a(I)V=|p_50021_1_
+net/minecraft/src/GuiTextField.func_50022_i()Z=|
+net/minecraft/src/GuiTextField.func_50023_d(I)V=|p_50023_1_
+net/minecraft/src/GuiTextField.func_50024_a(II)I=|p_50024_1_,p_50024_2_
+net/minecraft/src/GuiTextField.func_50025_j()Z=|
+net/minecraft/src/GuiTextField.func_50026_c(Z)V=|p_50026_1_
+net/minecraft/src/GuiTextField.func_50027_a(Z)V=|p_50027_1_
+net/minecraft/src/GuiTextField.func_50028_c(I)I=|p_50028_1_
+net/minecraft/src/GuiTextField.func_50029_c(IIII)V=|p_50029_1_,p_50029_2_,p_50029_3_,p_50029_4_
+net/minecraft/src/GuiTextField.func_50030_e(I)V=|p_50030_1_
+net/minecraft/src/GuiTextField.func_50031_b(Ljava/lang/String;)V=|p_50031_1_
+net/minecraft/src/GuiTextField.func_50032_g(I)V=|p_50032_1_
+net/minecraft/src/GuiTextField.func_50033_b(Z)V=|p_50033_1_
+net/minecraft/src/GuiTextField.func_50034_d()V=|
+net/minecraft/src/GuiTextField.func_50035_h()I=|
+net/minecraft/src/GuiTextField.func_50036_k()I=|
+net/minecraft/src/GuiTextField.func_50037_a(CI)Z=|p_50037_1_,p_50037_2_
+net/minecraft/src/GuiTextField.func_50038_e()V=|
+net/minecraft/src/GuiTextField.func_50039_c()Ljava/lang/String;=|
+net/minecraft/src/GuiTextField.func_50040_g()I=|
 net/minecraft/src/GuiTexturePackSlot.<init>(Lnet/minecraft/src/GuiTexturePacks;)V=|p_i267_1_
 net/minecraft/src/GuiTexturePackSlot.func_22242_a(IIIILnet/minecraft/src/Tessellator;)V=|p_22242_1_,p_22242_2_,p_22242_3_,p_22242_4_,p_22242_5_
 net/minecraft/src/GuiTexturePackSlot.func_22245_b()I=|
@@ -4335,6 +4411,7 @@ net/minecraft/src/GuiWorldSlot.func_22246_a(I)Z=|p_22246_1_
 net/minecraft/src/GuiWorldSlot.func_22247_a(IZ)V=|p_22247_1_,p_22247_2_
 net/minecraft/src/GuiWorldSlot.func_22248_c()V=|
 net/minecraft/src/GuiWorldSlot.func_22249_a()I=|
+net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;I)V=|p_i1204_1_,p_i1204_2_,p_i1204_3_,p_i1204_4_
 net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i453_1_,p_i453_2_,p_i453_3_,p_i453_4_,p_i453_5_,p_i453_6_
 net/minecraft/src/GuiYesNo.func_571_a(IIF)V=|p_571_1_,p_571_2_,p_571_3_
 net/minecraft/src/GuiYesNo.func_572_a(Lnet/minecraft/src/GuiButton;)V=|p_572_1_
@@ -4687,6 +4764,7 @@ net/minecraft/src/ItemSlab.func_192_a(Lnet/minecraft/src/ItemStack;Lnet/minecraf
 net/minecraft/src/ItemSlab.func_21011_b(Lnet/minecraft/src/ItemStack;)Ljava/lang/String;=|p_21011_1_
 net/minecraft/src/ItemSlab.func_21012_a(I)I=|p_21012_1_
 net/minecraft/src/ItemSlab.func_27009_a(I)I=|p_27009_1_
+net/minecraft/src/ItemSlab.func_50087_b(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIII)Z=|p_50087_0_,p_50087_1_,p_50087_2_,p_50087_3_,p_50087_4_,p_50087_5_,p_50087_6_
 net/minecraft/src/ItemSnowball.<init>(I)V=|p_i273_1_
 net/minecraft/src/ItemSnowball.func_193_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_193_1_,p_193_2_,p_193_3_
 net/minecraft/src/ItemSoup.<init>(II)V=|p_i248_1_,p_i248_2_
@@ -5062,6 +5140,7 @@ net/minecraft/src/NBTBase.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|
 net/minecraft/src/NBTBase.func_737_b()Ljava/lang/String;=|
 net/minecraft/src/NBTBase.func_738_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException|p_738_0_,p_738_1_
 net/minecraft/src/NBTBase.func_739_a(BLjava/lang/String;)Lnet/minecraft/src/NBTBase;=|p_739_0_,p_739_1_
+net/minecraft/src/NBTBase.hashCode()I=|
 net/minecraft/src/NBTTagByte.<init>(Ljava/lang/String;)V=|p_i449_1_
 net/minecraft/src/NBTTagByte.<init>(Ljava/lang/String;B)V=|p_i450_1_,p_i450_2_
 net/minecraft/src/NBTTagByte.equals(Ljava/lang/Object;)Z=|p_equals_1_
@@ -5069,6 +5148,7 @@ net/minecraft/src/NBTTagByte.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagByte.func_733_a()B=|
 net/minecraft/src/NBTTagByte.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagByte.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagByte.hashCode()I=|
 net/minecraft/src/NBTTagByte.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagByteArray.<init>(Ljava/lang/String;)V=|p_i718_1_
 net/minecraft/src/NBTTagByteArray.<init>(Ljava/lang/String;[B)V=|p_i719_1_,p_i719_2_
@@ -5077,6 +5157,7 @@ net/minecraft/src/NBTTagByteArray.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagByteArray.func_733_a()B=|
 net/minecraft/src/NBTTagByteArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagByteArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagByteArray.hashCode()I=|
 net/minecraft/src/NBTTagByteArray.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagCompound.<init>()V=|
 net/minecraft/src/NBTTagCompound.<init>(Ljava/lang/String;)V=|p_i51_1_
@@ -5112,6 +5193,7 @@ net/minecraft/src/NBTTagCompound.func_762_a(Ljava/lang/String;Lnet/minecraft/src
 net/minecraft/src/NBTTagCompound.func_763_a(Ljava/lang/String;Lnet/minecraft/src/NBTTagCompound;)V=|p_763_1_,p_763_2_
 net/minecraft/src/NBTTagCompound.func_764_f(Ljava/lang/String;)J=|p_764_1_
 net/minecraft/src/NBTTagCompound.func_765_a(Ljava/lang/String;D)V=|p_765_1_,p_765_2_
+net/minecraft/src/NBTTagCompound.hashCode()I=|
 net/minecraft/src/NBTTagCompound.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagDouble.<init>(Ljava/lang/String;)V=|p_i126_1_
 net/minecraft/src/NBTTagDouble.<init>(Ljava/lang/String;D)V=|p_i127_1_,p_i127_2_
@@ -5120,6 +5202,7 @@ net/minecraft/src/NBTTagDouble.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagDouble.func_733_a()B=|
 net/minecraft/src/NBTTagDouble.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagDouble.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagDouble.hashCode()I=|
 net/minecraft/src/NBTTagDouble.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagEnd.<init>()V=|
 net/minecraft/src/NBTTagEnd.equals(Ljava/lang/Object;)Z=|p_equals_1_
@@ -5135,6 +5218,7 @@ net/minecraft/src/NBTTagFloat.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagFloat.func_733_a()B=|
 net/minecraft/src/NBTTagFloat.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagFloat.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagFloat.hashCode()I=|
 net/minecraft/src/NBTTagFloat.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagInt.<init>(Ljava/lang/String;)V=|p_i85_1_
 net/minecraft/src/NBTTagInt.<init>(Ljava/lang/String;I)V=|p_i86_1_,p_i86_2_
@@ -5143,6 +5227,7 @@ net/minecraft/src/NBTTagInt.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagInt.func_733_a()B=|
 net/minecraft/src/NBTTagInt.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagInt.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagInt.hashCode()I=|
 net/minecraft/src/NBTTagInt.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagIntArray.<init>(Ljava/lang/String;)V=|p_i1036_1_
 net/minecraft/src/NBTTagIntArray.<init>(Ljava/lang/String;[I)V=|p_i1037_1_,p_i1037_2_
@@ -5151,6 +5236,7 @@ net/minecraft/src/NBTTagIntArray.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagIntArray.func_733_a()B=|
 net/minecraft/src/NBTTagIntArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagIntArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagIntArray.hashCode()I=|
 net/minecraft/src/NBTTagIntArray.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagList.<init>()V=|
 net/minecraft/src/NBTTagList.<init>(Ljava/lang/String;)V=|p_i481_1_
@@ -5162,6 +5248,7 @@ net/minecraft/src/NBTTagList.func_736_a(Ljava/io/DataInput;)V=java/io/IOExceptio
 net/minecraft/src/NBTTagList.func_740_c()I=|
 net/minecraft/src/NBTTagList.func_741_a(I)Lnet/minecraft/src/NBTBase;=|p_741_1_
 net/minecraft/src/NBTTagList.func_742_a(Lnet/minecraft/src/NBTBase;)V=|p_742_1_
+net/minecraft/src/NBTTagList.hashCode()I=|
 net/minecraft/src/NBTTagList.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagLong.<init>(Ljava/lang/String;)V=|p_i30_1_
 net/minecraft/src/NBTTagLong.<init>(Ljava/lang/String;J)V=|p_i31_1_,p_i31_2_
@@ -5170,6 +5257,7 @@ net/minecraft/src/NBTTagLong.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagLong.func_733_a()B=|
 net/minecraft/src/NBTTagLong.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagLong.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagLong.hashCode()I=|
 net/minecraft/src/NBTTagLong.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagShort.<init>(Ljava/lang/String;)V=|p_i504_1_
 net/minecraft/src/NBTTagShort.<init>(Ljava/lang/String;S)V=|p_i505_1_,p_i505_2_
@@ -5178,6 +5266,7 @@ net/minecraft/src/NBTTagShort.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagShort.func_733_a()B=|
 net/minecraft/src/NBTTagShort.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagShort.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagShort.hashCode()I=|
 net/minecraft/src/NBTTagShort.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagString.<init>(Ljava/lang/String;)V=|p_i191_1_
 net/minecraft/src/NBTTagString.<init>(Ljava/lang/String;Ljava/lang/String;)V=|p_i192_1_,p_i192_2_
@@ -5186,6 +5275,7 @@ net/minecraft/src/NBTTagString.func_40195_b()Lnet/minecraft/src/NBTBase;=|
 net/minecraft/src/NBTTagString.func_733_a()B=|
 net/minecraft/src/NBTTagString.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException|p_735_1_
 net/minecraft/src/NBTTagString.func_736_a(Ljava/io/DataInput;)V=java/io/IOException|p_736_1_
+net/minecraft/src/NBTTagString.hashCode()I=|
 net/minecraft/src/NBTTagString.toString()Ljava/lang/String;=|
 net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=java/net/UnknownHostException,java/io/IOException|p_i42_1_,p_i42_2_,p_i42_3_
 net/minecraft/src/NetClientHandler.func_12245_a(Lnet/minecraft/src/Packet60Explosion;)V=|p_12245_1_
@@ -5219,6 +5309,7 @@ net/minecraft/src/NetClientHandler.func_4115_a(Lnet/minecraft/src/Packet1Login;)
 net/minecraft/src/NetClientHandler.func_48487_a(Lnet/minecraft/src/Packet51MapChunk;)V=|p_48487_1_
 net/minecraft/src/NetClientHandler.func_48488_a(Lnet/minecraft/src/Packet35EntityHeadRotation;)V=|p_48488_1_
 net/minecraft/src/NetClientHandler.func_48489_a(Lnet/minecraft/src/Packet132TileEntityData;)V=|p_48489_1_
+net/minecraft/src/NetClientHandler.func_50100_a(Lnet/minecraft/src/Packet202PlayerAbilities;)V=|p_50100_1_
 net/minecraft/src/NetClientHandler.func_6497_a(Lnet/minecraft/src/Packet39AttachEntity;)V=|p_6497_1_
 net/minecraft/src/NetClientHandler.func_6498_a(Lnet/minecraft/src/Packet28EntityVelocity;)V=|p_6498_1_
 net/minecraft/src/NetClientHandler.func_820_a(Lnet/minecraft/src/Packet20NamedEntitySpawn;)V=|p_820_1_
@@ -5282,6 +5373,7 @@ net/minecraft/src/NetHandler.func_44028_a(Lnet/minecraft/src/Packet250CustomPayl
 net/minecraft/src/NetHandler.func_48487_a(Lnet/minecraft/src/Packet51MapChunk;)V=|p_48487_1_
 net/minecraft/src/NetHandler.func_48488_a(Lnet/minecraft/src/Packet35EntityHeadRotation;)V=|p_48488_1_
 net/minecraft/src/NetHandler.func_48489_a(Lnet/minecraft/src/Packet132TileEntityData;)V=|p_48489_1_
+net/minecraft/src/NetHandler.func_50100_a(Lnet/minecraft/src/Packet202PlayerAbilities;)V=|p_50100_1_
 net/minecraft/src/NetHandler.func_6497_a(Lnet/minecraft/src/Packet39AttachEntity;)V=|p_6497_1_
 net/minecraft/src/NetHandler.func_6498_a(Lnet/minecraft/src/Packet28EntityVelocity;)V=|p_6498_1_
 net/minecraft/src/NetHandler.func_6499_a(Lnet/minecraft/src/Packet7UseEntity;)V=|p_6499_1_
@@ -5521,6 +5613,12 @@ net/minecraft/src/Packet201PlayerInfo.func_322_a(Ljava/io/DataOutputStream;)V=ja
 net/minecraft/src/Packet201PlayerInfo.func_323_a(Lnet/minecraft/src/NetHandler;)V=|p_323_1_
 net/minecraft/src/Packet201PlayerInfo.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_327_1_
 net/minecraft/src/Packet201PlayerInfo.func_329_a()I=|
+net/minecraft/src/Packet202PlayerAbilities.<init>()V=|
+net/minecraft/src/Packet202PlayerAbilities.<init>(Lnet/minecraft/src/PlayerCapabilities;)V=|p_i1208_1_
+net/minecraft/src/Packet202PlayerAbilities.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_322_1_
+net/minecraft/src/Packet202PlayerAbilities.func_323_a(Lnet/minecraft/src/NetHandler;)V=|p_323_1_
+net/minecraft/src/Packet202PlayerAbilities.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_327_1_
+net/minecraft/src/Packet202PlayerAbilities.func_329_a()I=|
 net/minecraft/src/Packet20NamedEntitySpawn.<init>()V=|
 net/minecraft/src/Packet20NamedEntitySpawn.<init>(Lnet/minecraft/src/EntityPlayer;)V=|p_i382_1_
 net/minecraft/src/Packet20NamedEntitySpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_322_1_
@@ -6486,6 +6584,7 @@ net/minecraft/src/Slot.func_779_d()V=|
 net/minecraft/src/SlotArmor.<init>(Lnet/minecraft/src/ContainerPlayer;Lnet/minecraft/src/IInventory;IIII)V=|p_i89_1_,p_i89_2_,p_i89_3_,p_i89_4_,p_i89_5_,p_i89_6_
 net/minecraft/src/SlotArmor.func_4104_e()I=|
 net/minecraft/src/SlotArmor.func_4105_a(Lnet/minecraft/src/ItemStack;)Z=|p_4105_1_
+net/minecraft/src/SlotArmor.func_775_c()I=|
 net/minecraft/src/SlotBrewingStandIngredient.<init>(Lnet/minecraft/src/ContainerBrewingStand;Lnet/minecraft/src/IInventory;III)V=|p_i648_1_,p_i648_2_,p_i648_3_,p_i648_4_,p_i648_5_
 net/minecraft/src/SlotBrewingStandIngredient.func_4104_e()I=|
 net/minecraft/src/SlotBrewingStandIngredient.func_4105_a(Lnet/minecraft/src/ItemStack;)Z=|p_4105_1_
@@ -6994,6 +7093,8 @@ net/minecraft/src/TileEntityRendererPiston.func_930_a(Lnet/minecraft/src/TileEnt
 net/minecraft/src/TileEntitySign.<init>()V=|
 net/minecraft/src/TileEntitySign.func_481_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_481_1_
 net/minecraft/src/TileEntitySign.func_482_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_482_1_
+net/minecraft/src/TileEntitySign.func_50006_a(Z)V=|p_50006_1_
+net/minecraft/src/TileEntitySign.func_50007_a()Z=|
 net/minecraft/src/TileEntitySignRenderer.<init>()V=|
 net/minecraft/src/TileEntitySignRenderer.func_930_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_930_1_,p_930_2_,p_930_4_,p_930_6_,p_930_8_
 net/minecraft/src/TileEntitySignRenderer.func_932_a(Lnet/minecraft/src/TileEntitySign;DDDF)V=|p_932_1_,p_932_2_,p_932_4_,p_932_6_,p_932_8_
@@ -7404,6 +7505,7 @@ net/minecraft/src/WorldGenWaterlily.func_516_a(Lnet/minecraft/src/World;Ljava/ut
 net/minecraft/src/WorldGenerator.<init>()V=|
 net/minecraft/src/WorldGenerator.<init>(Z)V=|p_i432_1_
 net/minecraft/src/WorldGenerator.func_41060_a(Lnet/minecraft/src/World;IIIII)V=|p_41060_1_,p_41060_2_,p_41060_3_,p_41060_4_,p_41060_5_,p_41060_6_
+net/minecraft/src/WorldGenerator.func_50073_a(Lnet/minecraft/src/World;IIII)V=|p_50073_1_,p_50073_2_,p_50073_3_,p_50073_4_,p_50073_5_
 net/minecraft/src/WorldGenerator.func_517_a(DDD)V=|p_517_1_,p_517_3_,p_517_5_
 net/minecraft/src/WorldInfo.<init>(Lnet/minecraft/src/NBTTagCompound;)V=|p_i662_1_
 net/minecraft/src/WorldInfo.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i664_1_

forge/conf/fields.csv

@@ -805,7 +805,6 @@ field_22077_f,width,0,
 field_22078_e,yPos,0,
 field_22079_d,xPos,0,
 field_22080_c,fontRenderer,0,Have the font renderer from GuiScreen to render the textbox text into the screen.
-field_22081_b,isEnabled,0,"If this value is true along isFocused, keyTyped will process the keys."
 field_22082_a,isFocused,0,"If this value is true along isEnabled, keyTyped will process the keys."
 field_22095_r,buttonRename,0,the rename button in the world selection gui
 field_22096_q,deleting,0,set to true if you arein the process of deleteing a world/save
@@ -1169,7 +1168,6 @@ field_270_aq,painting,0,
 field_27103_i,haveAchiement,0,
 field_27104_h,itemRender,0,"Holds a instance of RenderItem, used to draw the achievement icons on screen (is based on ItemStack)"
 field_27105_f,theAchievement,0,Holds the achievement that will be displayed on the GUI.
-field_27107_l,parentGuiScreen,0,"Holds the GuiScreen that the textfield is attached, used for tab purposes."
 field_27113_p,guiMapY,0,The y position of the achievement map
 field_27114_o,guiMapX,0,The x position of the achievement map
 field_27117_l,mouseY,0,The current mouse y coordinate
@@ -2838,6 +2836,7 @@ field_493_e,metadata,0,Metadata of the block.
 field_494_d,type,0,The new block type for the block.
 field_495_c,zPosition,0,Block Z position.
 field_499_b,xPosition,0,The X position of the object.
+field_50099_c,nameinLowerCase,0,Player name in lowercase.
 field_500_a,entityId,0,Entity ID of the object.
 field_501_e,type,0,The type of object.
 field_502_d,zPosition,0,The Z position of the object.
@@ -3414,8 +3413,6 @@ field_981_l,lowerChestInventory,0,
 field_982_j,upperChestInventory,0,
 field_983_a,netHandler,0,Network object that downloads the terrain data.
 field_984_h,updateCounter,0,Counts the number of screen updates.
-field_985_a,message,0,The chat message.
-field_986_h,updateCounter,0,Counts the number of screen updates. Used to make the caret flash.
 field_989_j,updateCounter,0,Counts the number of screen updates.
 field_992_a,errorMessage,0,The error message.
 field_993_h,errorDetail,0,The details about the error.

forge/conf/mcp.cfg

@@ -35,8 +35,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 12f6c4b1bdcc63f029e3c088a364b8e4
+MD5Client  = 25423eab6d8707f96cc6ad8a21a7250a
-MD5Server  = 2604b805012028d522c3f8abe93d36c5
+MD5Server  = 6524b7299b1717ffb6e2b38f171568d0
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -94,7 +94,7 @@ LogServer       = %(DirLogs)s/server_compile.log
 ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
 ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
 ClientFixes     = %(DirConf)s/patches
-FixSound        = gh
+FixSound        = gk
 FixStart        = Start
 IgnorePkg       = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
 
@@ -123,8 +123,8 @@ 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
-RGIndex           = 48000
+RGIndex           = 50000
-ParamIndex        = 1000
+ParamIndex        = 1200
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -150,6 +150,6 @@ CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
 CmdJadretro   = %s -jar %s {targetdir}
 CmdFernflower = %s -jar %s -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
 CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
-CmdRecomp     = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdRecomp     = %s -Xlint:-options -deprecation -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

forge/conf/methods.csv

@@ -507,7 +507,6 @@ func_22068_a,setText,0,Sets the text of the textbox.
 func_22069_a,mouseClicked,0,"Args: x, y, buttonClicked"
 func_22070_b,updateCursorCounter,0,Increments the cursor counter
 func_22071_a,getText,0,Returns the text beign edited on the textbox.
-func_22072_a,textboxKeyTyped,0,Call this method from you GuiScreen to process the keys into textbox.
 func_22083_c,getSelectButton,0,returns the select button
 func_22084_k,loadSaves,0,loads the saves
 func_22085_d,getRenameButton,0,returns the rename button
@@ -779,8 +778,6 @@ func_270_i,getGrowthRate,0,"Gets the growth rate for the crop. Setup to encourag
 func_27100_a,drawHorizontalLine,0,
 func_27101_b,queueAchievementInformation,0,Queue a information about a achievement to be displayed.
 func_27102_a,queueTakenAchievement,0,Queue a taken achievement to be displayed.
-func_27106_a,setFocused,0,
-func_27108_j,selectNextField,0,
 func_27109_b,genAchievementBackground,0,
 func_27127_n,getFontRenderer10,0,there are 11 identical methods like this
 func_27128_a,drawSprite,0,Draws a sprite from /gui/slot.png.
@@ -1633,7 +1630,6 @@ func_4012_a,doRenderFireball,0,
 func_40132_ae,createInstance,0,
 func_40135_ac,getSlimeParticle,0,Returns the name of a particle effect that may be randomly created by EntitySlime.onUpdate()
 func_4013_a,setRenderPassModel,0,Sets the model to be used in the current render pass (the first render pass is done after the primary model is rendered) Args: model
-func_40140_ac,setTextureByProfession,0,This is the function which sets a Villager's skin based on its villagerProfession value
 func_40143_a,isWheat,0,Checks if the parameter is an wheat item.
 func_40144_b,procreate,0,Creates a baby animal according to the animal type of the target at the actual position and spawns 'love' particles.
 func_40145_a,spawnBabyAnimal,0,This function is used when two same-species animals in 'love mode' breed to generate the new baby animal.
@@ -1793,7 +1789,6 @@ func_40601_a,writeCapabilitiesToNBT,0,
 func_40602_a,setTextureOffset,0,
 func_40603_a,addBox,0,
 func_40604_a,addBox,0,
-func_40609_a,drawSplitString,0,Splits and draws a String with wordwrap (maximum length is parameter k) and with darker drop shadow color if flag is set
 func_4060_a,generateTerrain,0,Generates the shape of the terrain for the chunk though its all stone though the water is frozen if the temperature is low enough
 func_40610_g,getEffectiveness,0,
 func_40611_e,getStatusIconIndex,0,Returns the index for the icon to display when the potion is active.
@@ -2008,9 +2003,7 @@ func_44025_a,loadLanguage,0,
 func_44028_a,handleCustomPayload,0,
 func_44029_a,renderStringAtPos,0,"Render a single line string at the current (posX,posY) and update posX"
 func_44030_b,loadGlyphTexture,0,Load one of the /font/glyph_XX.png into a new GL texture and store the texture ID in glyphTextureName array.
-func_44031_a,renderDefaultChar,0,"Render a single character with the default.png font at current (posX,posY) location."
 func_44032_a,setUnicodeFlag,0,Set unicodeFlag controlling whether strings should be rendered with Unicode fonts instead of the default.png font.
-func_44033_a,renderUnicodeChar,0,"Render a single Unicode character at current (posX,posY) location using one of the /font/glyph_XX.png files."
 func_44040_a,getStringFromID,0,Finds the class using IDtoClassMapping and classToStringMapping
 func_440_b,setCreeperFlashTime,0,Connects the the creeper flashes to the creeper's color multiplier
 func_441_c,setSlimeSize,0,
@@ -2282,6 +2275,10 @@ func_494_a,getCurrentItem,0,Returns the item stack currently held by the player.
 func_496_a,setCurrentItem,0,Sets a specific itemID as the current item being held (only if it exists on the hotbar)
 func_498_a,changeCurrentItem,0,Switch the current item to the next one or the previous one
 func_499_j,getFirstEmptyStack,0,Returns the first item stack that is empty.
+func_50015_e,isChatOpen,0,Return true if chat gui is open
+func_50057_d,completePlayerName,0,Autocompletes player name
+func_50098_a,nameStartsWith,0,Returns true if the current player name starts with string specified value.
+func_50103_a,drawStringWithShadow,0,Draws the specified string with a shadow.
 func_502_a,getDamageVsEntity,0,"Return damage vs an entity done by the current held weapon, or 1 if nothing is held"
 func_503_g,dropAllItems,0,Drop all armor and main inventory items.
 func_504_a,addItemStackToInventory,0,"Adds the item stack to the inventory, returns false if it is impossible."
@@ -2336,7 +2333,7 @@ func_564_d,handleInput,0,Delegates mouse and keyboard input.
 func_565_a,mouseClicked,0,Called when the mouse is clicked.
 func_566_e,handleMouseInput,0,Handles mouse input.
 func_567_a,drawWorldBackground,0,
-func_568_a,deleteWorld,0,Deletes the selected world.
+func_568_a,confirmClicked,0,
 func_569_f,handleKeyboardInput,0,Handles keyboard input.
 func_570_g,updateScreen,0,Called from the main game loop to update the screen.
 func_571_a,drawScreen,0,Draws the screen and all the components in it.
@@ -2666,9 +2663,7 @@ func_868_a,recursiveGenerate,0,Recursively called by generate() (func_867_a) and
 func_869_a,generateCaveNode,0,Generates a node in the current cave system recursion tree.
 func_870_a,generateLargeCaveNode,0,Generates a larger initial cave node than usual. Called 25% of the time.
 func_871_a,getStringWidth,0,Returns the width of this string. Equivalent of FontMetrics.stringWidth(String s).
-func_872_a,renderString,0,The actual rendering takes place here.
 func_873_b,drawString,0,Draws the specified string.
-func_874_a,drawStringWithShadow,0,Draws the specified string with a drop shadow.
 func_876_e,getCanBurn,0,Returns if the block can burn or not.
 func_878_a,isSolid,0,
 func_879_d,isLiquid,0,Returns if blocks of these materials are liquids.
@@ -3881,7 +3876,6 @@ func_40108_b,removeExperience,1,Removes the specified number of experience level
 func_40109_c,onEnchantmentCritical,1,
 func_4010_d,handleSlashCommand,1,Processes a / command
 func_40110_a,displayGUIBrewingStand,1,Displays the GUI for interacting with a brewing stand.
-func_40111_y,setTextureByProfession,1,This is the function which sets a Villager's skin based on its profession value
 func_40114_y,createInstance,1,
 func_40120_w,getSlimeParticle,1,Returns the name of a particle effect that may be randomly created by EntitySlime.onUpdate()
 func_40123_y,isValidLightLevel,1,Checks to make sure the light is not too bright where the mob is spawning

forge/conf/params.csv

@@ -971,8 +971,6 @@ p_22068_1_,par1Str,0
 p_22069_1_,par1,0
 p_22069_2_,par2,0
 p_22069_3_,par3,0
-p_22072_1_,par1,0
-p_22072_2_,par2,0
 p_22083_0_,par0GuiSelectWorld,0
 p_22085_0_,par0GuiSelectWorld,0
 p_22086_0_,par0GuiSelectWorld,0
@@ -1460,7 +1458,6 @@ p_27100_3_,par3,0
 p_27100_4_,par4,0
 p_27101_1_,par1Achievement,0
 p_27102_1_,par1Achievement,0
-p_27106_1_,par1,0
 p_27109_1_,par1,0
 p_27109_2_,par2,0
 p_27109_3_,par3,0
@@ -3760,12 +3757,6 @@ p_40604_3_,par3,0
 p_40604_4_,par4,0
 p_40604_5_,par5,0
 p_40604_6_,par6,0
-p_40609_1_,par1Str,0
-p_40609_2_,par2,0
-p_40609_3_,par3,0
-p_40609_4_,par4,0
-p_40609_5_,par5,0
-p_40609_6_,par6,0
 p_4060_1_,par1,0
 p_4060_2_,par2,0
 p_4060_3_,par3ArrayOfByte,0
@@ -4139,9 +4130,7 @@ p_44028_1_,par1Packet250CustomPayload,0
 p_44029_1_,par1Str,0
 p_44029_2_,par2,0
 p_44030_1_,par1,0
-p_44031_1_,par1,0
 p_44032_1_,par1,0
-p_44033_1_,par1,0
 p_44040_0_,par0,0
 p_440_1_,par1,0
 p_441_1_,par1,0
@@ -4642,6 +4631,89 @@ p_496_2_,par2,0
 p_496_3_,par3,0
 p_496_4_,par4,0
 p_498_1_,par1,0
+p_50006_1_,par1,0
+p_50010_1_,par1FontRenderer,0
+p_50011_1_,par1,0
+p_50012_1_,par1,0
+p_50012_2_,par2,0
+p_50020_1_,par1,0
+p_50021_1_,par1,0
+p_50023_1_,par1,0
+p_50024_1_,par1,0
+p_50024_2_,par2,0
+p_50026_1_,par1,0
+p_50027_1_,par1,0
+p_50028_1_,par1,0
+p_50029_1_,par1,0
+p_50029_2_,par2,0
+p_50029_3_,par3,0
+p_50029_4_,par4,0
+p_50030_1_,par1,0
+p_50031_1_,par1Str,0
+p_50032_1_,par1,0
+p_50033_1_,par1,0
+p_50037_1_,par1,0
+p_50037_2_,par2,0
+p_50050_0_,par0Str,0
+p_50058_1_,par1,0
+p_50073_1_,par1World,0
+p_50073_2_,par2,0
+p_50073_3_,par3,0
+p_50073_4_,par4,0
+p_50073_5_,par5,0
+p_50075_0_,par0World,0
+p_50075_1_,par1,0
+p_50075_2_,par2,0
+p_50075_3_,par3,0
+p_50076_1_,par1World,0
+p_50076_2_,par2,0
+p_50076_3_,par3,0
+p_50076_4_,par4,0
+p_50076_5_,par5,0
+p_50078_1_,par1World,0
+p_50078_2_,par2,0
+p_50078_3_,par3,0
+p_50078_4_,par4,0
+p_50087_0_,par0ItemStack,0
+p_50087_1_,par1EntityPlayer,0
+p_50087_2_,par2World,0
+p_50087_3_,par3,0
+p_50087_4_,par4,0
+p_50087_5_,par5,0
+p_50087_6_,par6,0
+p_50098_1_,par1Str,0
+p_50100_1_,par1Packet202PlayerAbilities,0
+p_50101_1_,par1Str,0
+p_50101_2_,par2,0
+p_50101_3_,par3,0
+p_50101_4_,par4,0
+p_50101_5_,par5,0
+p_50102_1_,par1Str,0
+p_50102_2_,par2,0
+p_50103_1_,par1Str,0
+p_50103_2_,par2,0
+p_50103_3_,par3,0
+p_50103_4_,par4,0
+p_50104_1_,par1Str,0
+p_50104_2_,par2,0
+p_50104_3_,par3,0
+p_50105_1_,par1,0
+p_50106_1_,par1,0
+p_50106_2_,par2,0
+p_50107_1_,par1Str,0
+p_50107_2_,par2,0
+p_50108_1_,par1Str,0
+p_50108_2_,par2,0
+p_50109_0_,par0,0
+p_50110_0_,par0,0
+p_50111_1_,par1,0
+p_50111_2_,par2,0
+p_50112_1_,par1,0
+p_50112_2_,par2,0
+p_50112_3_,par3,0
+p_50113_1_,par1Str,0
+p_50113_2_,par2,0
+p_50114_0_,par0Str,0
 p_502_1_,par1Entity,0
 p_504_1_,par1ItemStack,0
 p_505_1_,par1,0
@@ -5325,19 +5397,10 @@ p_870_5_,par5ArrayOfByte,0
 p_870_6_,par6,0
 p_870_8_,par8,0
 p_871_1_,par1Str,0
-p_872_1_,par1Str,0
-p_872_2_,par2,0
-p_872_3_,par3,0
-p_872_4_,par4,0
-p_872_5_,par5,0
 p_873_1_,par1Str,0
 p_873_2_,par2,0
 p_873_3_,par3,0
 p_873_4_,par4,0
-p_874_1_,par1Str,0
-p_874_2_,par2,0
-p_874_3_,par3,0
-p_874_4_,par4,0
 p_883_1_,par1BufferedImage,0
 p_884_1_,par1,0
 p_884_2_,par2,0
@@ -5801,13 +5864,6 @@ p_i10_5_,par5Material,0
 p_i10_6_,par6,0
 p_i110_1_,par1,0
 p_i110_2_,par2,0
-p_i111_1_,par1GuiScreen,0
-p_i111_2_,par2FontRenderer,0
-p_i111_3_,par3,0
-p_i111_4_,par4,0
-p_i111_5_,par5,0
-p_i111_6_,par6,0
-p_i111_7_,par7Str,0
 p_i112_1_,par1,0
 p_i112_2_,par2Material,0
 p_i114_1_,par1Str,0
@@ -5824,6 +5880,32 @@ p_i118_2_,par2,0
 p_i119_1_,par1Str,0
 p_i11_1_,par1,0
 p_i11_2_,par2,0
+p_i1200_1_,par1GuiScreen,0
+p_i1200_2_,par2Str,0
+p_i1200_3_,par3,0
+p_i1201_1_,par1FontRenderer,0
+p_i1201_2_,par2,0
+p_i1201_3_,par3,0
+p_i1201_4_,par4,0
+p_i1201_5_,par5,0
+p_i1202_1_,par1GuiChat,0
+p_i1202_2_,par2GuiScreen,0
+p_i1202_3_,par3Str,0
+p_i1202_4_,par4,0
+p_i1202_5_,par5ChatClickData,0
+p_i1203_1_,par1FontRenderer,0
+p_i1203_2_,par2ChatLine,0
+p_i1203_3_,par3,0
+p_i1203_4_,par4,0
+p_i1204_1_,par1GuiScreen,0
+p_i1204_2_,par2Str,0
+p_i1204_3_,par3Str,0
+p_i1204_4_,par4,0
+p_i1205_1_,par1,0
+p_i1206_1_,par1EntityOcelot,0
+p_i1206_2_,par2,0
+p_i1207_1_,par1Str,0
+p_i1208_1_,par1PlayerCapabilities,0
 p_i120_1_,par1MapColor,0
 p_i121_1_,par1IInventory,0
 p_i121_2_,par2TileEntityDispenser,0
@@ -10864,6 +10946,32 @@ p_498_1_,par1,1
 p_498_2_,par2,1
 p_498_3_,par3,1
 p_498_4_,par4,1
+p_50003_1_,par1Packet202PlayerAbilities,1
+p_50009_0_,par0World,1
+p_50009_1_,par1,1
+p_50009_2_,par2,1
+p_50009_3_,par3,1
+p_50010_1_,par1World,1
+p_50010_2_,par2,1
+p_50010_3_,par3,1
+p_50010_4_,par4,1
+p_50010_5_,par5,1
+p_50011_1_,par1World,1
+p_50011_2_,par2,1
+p_50011_3_,par3,1
+p_50011_4_,par4,1
+p_50020_0_,par0ItemStack,1
+p_50020_1_,par1EntityPlayer,1
+p_50020_2_,par2World,1
+p_50020_3_,par3,1
+p_50020_4_,par4,1
+p_50020_5_,par5,1
+p_50020_6_,par6,1
+p_50023_1_,par1World,1
+p_50023_2_,par2,1
+p_50023_3_,par3,1
+p_50023_4_,par4,1
+p_50023_5_,par5,1
 p_500_1_,par1AxisAlignedBB,1
 p_500_2_,par2Material,1
 p_502_1_,par1,1
@@ -11756,6 +11864,10 @@ p_i119_1_,par1,1
 p_i11_1_,par1PlayerManager,1
 p_i11_2_,par2,1
 p_i11_3_,par3,1
+p_i1200_1_,par1EntityOcelot,1
+p_i1200_2_,par2,1
+p_i1201_1_,par1PlayerCapabilities,1
+p_i1202_1_,par1,1
 p_i120_11_,par11,1
 p_i120_1_,par1,1
 p_i120_3_,par3,1

forge/conf/patches/gk.java

@@ -1,6 +1,6 @@
 // this is needed for the sound engine to work with deobfuscated sourcecode without crashing
 
-public class gh
+public class gk
 {
     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 Mar 06 11:25:27 2012
+--- minecraft\net\minecraft\client\Minecraft.java	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Tue Mar 06 11:39:29 2012
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Sun Mar 25 05:08:08 2012
-@@ -1626,11 +1626,13 @@
+@@ -1631,11 +1631,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()) {
@@ -15,18 +15,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
              }
           }
        }
-@@ -1746,13 +1748,17 @@
+@@ -1757,7 +1759,7 @@
-    }
+    public static void func_6253_a(String p_6253_0_, String p_6253_1_, String p_6253_2_) {
- 
-    public static void func_6269_a(String p_6269_0_, String p_6269_1_) {
-+      try {
-       func_6253_a(p_6269_0_, p_6269_1_, (String)null);
-+      }
-+      catch (LWJGLException e) {
-+      }
-    }
- 
-    public static void func_6253_a(String p_6253_0_, String p_6253_1_, String p_6253_2_) throws LWJGLException {
        boolean var3 = false;
        Frame var5 = new Frame("Minecraft");
 -      AWTGLCanvas var6 = new AWTGLCanvas();
@@ -35,8 +25,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
        var5.add(var6, "Center");
        var6.setPreferredSize(new Dimension(854, 480));
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Tue Mar 06 11:25:28 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Tue Mar 06 11:37:54 2012
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Sun Mar 25 05:08:08 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -57,8 +47,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 Mar 06 11:25:30 2012
+--- minecraft\net\minecraft\src\ItemMap.java	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\src\ItemMap.java	Tue Mar 06 11:37:54 2012
++++ minecraft_patched\net\minecraft\src\ItemMap.java	Sun Mar 25 05:08:08 2012
 @@ -19,7 +19,6 @@
     }
  
@@ -76,8 +66,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\mine
        if(var4 == null) {
           p_28012_1_.func_28156_b(p_28012_2_.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 Mar 06 11:25:31 2012
+--- minecraft\net\minecraft\src\MusInputStream.java	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Tue Mar 06 11:37:54 2012
++++ minecraft_patched\net\minecraft\src\MusInputStream.java	Sun Mar 25 05:08:08 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -98,9 +88,20 @@ diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\n
  
        for(int var4 = 0; var4 < p_read_3_; ++var4) {
           byte var5 = p_read_1_[p_read_2_ + var4] = (byte)(p_read_1_[p_read_2_ + var4] ^ this.field_1516_c >> 8);
+diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patched\net\minecraft\src\NetworkMasterThread.java
+--- minecraft\net\minecraft\src\NetworkMasterThread.java	Sun Mar 25 05:06:23 2012
++++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java	Sun Mar 25 05:08:08 2012
+@@ -11,6 +11,7 @@
+       this.field_1086_a = p_i570_1_;
+    }
+ 
++   @SuppressWarnings("deprecation")
+    public void run() {
+       try {
+          Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Tue Mar 06 11:25:31 2012
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sun Mar 25 05:06:24 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Mar 06 11:37:54 2012
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Mar 25 05:08:08 2012
 @@ -1458,7 +1458,7 @@
           double var15 = this.field_1439_t.field_22009_h.field_611_ak - p_40193_2_;
           double var17 = this.field_1439_t.field_22009_h.field_610_al - p_40193_4_;
@@ -111,8 +112,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, p_40193_2_, p_40193_4_, p_40193_6_, p_40193_8_, p_40193_10_, p_40193_12_));
           } else if(p_40193_1_.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 Mar 06 11:25:32 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sun Mar 25 05:06:24 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 06 11:37:54 2012
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Mar 25 05:08:08 2012
 @@ -20,7 +20,9 @@
     }
  
@@ -123,3 +124,15 @@ diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patch
     }
  
     private void func_40568_b() {
+diff -r -U 3 minecraft\net\minecraft\src\WorldGenerator.java minecraft_patched\net\minecraft\src\WorldGenerator.java
+--- minecraft\net\minecraft\src\WorldGenerator.java	Sun Mar 25 05:06:24 2012
++++ minecraft_patched\net\minecraft\src\WorldGenerator.java	Sun Mar 25 05:09:17 2012
+@@ -26,7 +26,7 @@
+    protected void func_41060_a(World p_41060_1_, int p_41060_2_, int p_41060_3_, int p_41060_4_, int p_41060_5_, int p_41060_6_) {
+       if(this.field_41061_a) {
+          p_41060_1_.func_688_b(p_41060_2_, p_41060_3_, p_41060_4_, p_41060_5_, p_41060_6_);
+-      } else if(p_41060_1_.func_673_a(p_41060_2_ >> 4, p_41060_4_ >> 4).field_50120_o) {
++      } else if(p_41060_1_.func_673_a(p_41060_2_, p_41060_4_).field_50120_o) {
+          if(p_41060_1_.func_643_a(p_41060_2_, p_41060_3_, p_41060_4_, p_41060_5_, p_41060_6_)) {
+             p_41060_1_.func_665_h(p_41060_2_, p_41060_3_, p_41060_4_);
+          }

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	Sat Mar 03 17:30:52 2012
+--- minecraft_server\net\minecraft\src\ItemMap.java	Sun Mar 25 05:06:56 2012
-+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Sat Mar 03 17:32:42 2012
++++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Sun Mar 25 05:08:42 2012
 @@ -22,7 +22,6 @@
     }
  
@@ -9,9 +9,20 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_pa
        MapData var4 = (MapData)p_28023_2_.func_28103_a(MapData.class, "map_" + p_28023_1_.func_21125_h());
        if(var4 == null) {
           p_28023_1_.func_28145_b(p_28023_2_.func_28104_b("map"));
+diff -r -U 3 minecraft_server\net\minecraft\src\NetworkMasterThread.java minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java
+--- minecraft_server\net\minecraft\src\NetworkMasterThread.java	Sun Mar 25 05:06:57 2012
++++ minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java	Sun Mar 25 05:08:42 2012
+@@ -11,6 +11,7 @@
+       this.field_829_a = p_i577_1_;
+    }
+ 
++   @SuppressWarnings("deprecation")
+    public void run() {
+       try {
+          Thread.sleep(5000L);
 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	Sat Mar 03 17:30:52 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sun Mar 25 05:06:57 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Mar 03 17:32:42 2012
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Mar 25 05:08:42 2012
 @@ -20,7 +20,9 @@
     }
  
@@ -22,3 +33,15 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraf
     }
  
     private void func_40509_b() {
+diff -r -U 3 minecraft_server\net\minecraft\src\WorldGenerator.java minecraft_server_patched\net\minecraft\src\WorldGenerator.java
+--- minecraft_server\net\minecraft\src\WorldGenerator.java	Sun Mar 25 05:06:57 2012
++++ minecraft_server_patched\net\minecraft\src\WorldGenerator.java	Sun Mar 25 05:11:32 2012
+@@ -26,7 +26,7 @@
+    protected void func_41043_a(World p_41043_1_, int p_41043_2_, int p_41043_3_, int p_41043_4_, int p_41043_5_, int p_41043_6_) {
+       if(this.field_41044_a) {
+          p_41043_1_.func_507_b(p_41043_2_, p_41043_3_, p_41043_4_, p_41043_5_, p_41043_6_);
+-      } else if(p_41043_1_.func_492_a(p_41043_2_ >> 4, p_41043_4_ >> 4).field_50025_o) {
++      } else if(p_41043_1_.func_492_a(p_41043_2_, p_41043_4_).field_50025_o) {
+          if(p_41043_1_.func_470_a(p_41043_2_, p_41043_3_, p_41043_4_, p_41043_5_, p_41043_6_)) {
+             p_41043_1_.func_521_f(p_41043_2_, p_41043_3_, p_41043_4_);
+          }

forge/conf/server.exc

@@ -1,5 +1,5 @@
-#max index=1095
+#max index=1203
-#Sat Mar 03 15:09:55 NZDT 2012
+#Fri Mar 23 22:29:22 NZDT 2012
 net/minecraft/server/MinecraftServer.<init>()V=|
 net/minecraft/server/MinecraftServer.func_1_c()Ljava/lang/String;=|
 net/minecraft/server/MinecraftServer.func_25002_c(Ljava/lang/String;)V=|p_25002_1_
@@ -140,6 +140,7 @@ net/minecraft/src/BiomeGenBase.func_4082_a(Ljava/lang/String;)Lnet/minecraft/src
 net/minecraft/src/BiomeGenBase.func_48440_b(Ljava/util/Random;)Lnet/minecraft/src/WorldGenerator;=|p_48440_1_
 net/minecraft/src/BiomeGenBase.func_48441_d()Z=|
 net/minecraft/src/BiomeGenBase.func_48442_h()F=|
+net/minecraft/src/BiomeGenBase.func_50024_b()Lnet/minecraft/src/BiomeGenBase;=|
 net/minecraft/src/BiomeGenBeach.<init>(I)V=|p_i433_1_
 net/minecraft/src/BiomeGenDesert.<init>(I)V=|p_i455_1_
 net/minecraft/src/BiomeGenDesert.func_35513_a(Lnet/minecraft/src/World;Ljava/util/Random;II)V=|p_35513_1_,p_35513_2_,p_35513_3_,p_35513_4_
@@ -233,6 +234,7 @@ net/minecraft/src/Block.func_48124_n()Z=|
 net/minecraft/src/Block.func_48125_m()Z=|
 net/minecraft/src/Block.func_48126_g(I)Z=|p_48126_0_
 net/minecraft/src/Block.func_48127_b(Lnet/minecraft/src/IBlockAccess;III)Z=|p_48127_1_,p_48127_2_,p_48127_3_,p_48127_4_
+net/minecraft/src/Block.func_50008_h()Z=|
 net/minecraft/src/BlockBed.<init>(I)V=|p_i508_1_
 net/minecraft/src/BlockBed.func_22009_a(II)I=|p_22009_1_,p_22009_2_
 net/minecraft/src/BlockBed.func_22017_f()V=|
@@ -335,6 +337,7 @@ net/minecraft/src/BlockChest.func_297_g(Lnet/minecraft/src/World;III)Z=|p_297_1_
 net/minecraft/src/BlockChest.func_35057_b(Lnet/minecraft/src/World;III)V=|p_35057_1_,p_35057_2_,p_35057_3_,p_35057_4_
 net/minecraft/src/BlockChest.func_40161_b()I=|
 net/minecraft/src/BlockChest.func_4027_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityLiving;)V=|p_4027_1_,p_4027_2_,p_4027_3_,p_4027_4_,p_4027_5_
+net/minecraft/src/BlockChest.func_50009_h(Lnet/minecraft/src/World;III)Z=|p_50009_0_,p_50009_1_,p_50009_2_,p_50009_3_
 net/minecraft/src/BlockClay.<init>(II)V=|p_i429_1_,p_i429_2_
 net/minecraft/src/BlockClay.func_244_a(Ljava/util/Random;)I=|p_244_1_
 net/minecraft/src/BlockClay.func_252_a(ILjava/util/Random;I)I=|p_252_1_,p_252_2_,p_252_3_
@@ -557,6 +560,7 @@ net/minecraft/src/BlockGlass.<init>(IILnet/minecraft/src/Material;Z)V=|p_i139_1_
 net/minecraft/src/BlockGlass.func_240_b()Z=|
 net/minecraft/src/BlockGlass.func_244_a(Ljava/util/Random;)I=|p_244_1_
 net/minecraft/src/BlockGlass.func_28025_b()Z=|
+net/minecraft/src/BlockGlass.func_50008_h()Z=|
 net/minecraft/src/BlockGlowStone.<init>(IILnet/minecraft/src/Material;)V=|p_i288_1_,p_i288_2_,p_i288_3_
 net/minecraft/src/BlockGlowStone.func_244_a(Ljava/util/Random;)I=|p_244_1_
 net/minecraft/src/BlockGlowStone.func_252_a(ILjava/util/Random;I)I=|p_252_1_,p_252_2_,p_252_3_
@@ -652,6 +656,7 @@ net/minecraft/src/BlockMobSpawner.func_294_a_()Lnet/minecraft/src/TileEntity;=|
 net/minecraft/src/BlockMushroom.<init>(II)V=|p_i463_1_,p_i463_2_
 net/minecraft/src/BlockMushroom.func_220_f(Lnet/minecraft/src/World;III)Z=|p_220_1_,p_220_2_,p_220_3_,p_220_4_
 net/minecraft/src/BlockMushroom.func_221_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_221_1_,p_221_2_,p_221_3_,p_221_4_,p_221_5_
+net/minecraft/src/BlockMushroom.func_259_a(Lnet/minecraft/src/World;III)Z=|p_259_1_,p_259_2_,p_259_3_,p_259_4_
 net/minecraft/src/BlockMushroom.func_277_b(I)Z=|p_277_1_
 net/minecraft/src/BlockMushroom.func_35065_b(Lnet/minecraft/src/World;IIILjava/util/Random;)Z=|p_35065_1_,p_35065_2_,p_35065_3_,p_35065_4_,p_35065_5_
 net/minecraft/src/BlockMushroomCap.<init>(ILnet/minecraft/src/Material;II)V=|p_i524_1_,p_i524_2_,p_i524_3_,p_i524_4_
@@ -806,8 +811,10 @@ net/minecraft/src/BlockRail.func_31025_e()I=|
 net/minecraft/src/BlockRail.func_40161_b()I=|
 net/minecraft/src/BlockRail.func_4038_g(Lnet/minecraft/src/World;IIIZ)V=|p_4038_1_,p_4038_2_,p_4038_3_,p_4038_4_,p_4038_5_
 net/minecraft/src/BlockRedstoneLight.<init>(IZ)V=|p_i1057_1_,p_i1057_2_
+net/minecraft/src/BlockRedstoneLight.func_221_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_221_1_,p_221_2_,p_221_3_,p_221_4_,p_221_5_
 net/minecraft/src/BlockRedstoneLight.func_234_b(Lnet/minecraft/src/World;IIII)V=|p_234_1_,p_234_2_,p_234_3_,p_234_4_,p_234_5_
 net/minecraft/src/BlockRedstoneLight.func_250_e(Lnet/minecraft/src/World;III)V=|p_250_1_,p_250_2_,p_250_3_,p_250_4_
+net/minecraft/src/BlockRedstoneLight.func_252_a(ILjava/util/Random;I)I=|p_252_1_,p_252_2_,p_252_3_
 net/minecraft/src/BlockRedstoneOre.<init>(IIZ)V=|p_i49_1_,p_i49_2_,p_i49_3_
 net/minecraft/src/BlockRedstoneOre.func_221_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_221_1_,p_221_2_,p_221_3_,p_221_4_,p_221_5_
 net/minecraft/src/BlockRedstoneOre.func_235_b(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_235_1_,p_235_2_,p_235_3_,p_235_4_,p_235_5_
@@ -891,12 +898,15 @@ net/minecraft/src/BlockSand.func_284_h(Lnet/minecraft/src/World;III)V=|p_284_1_,
 net/minecraft/src/BlockSand.func_285_g(Lnet/minecraft/src/World;III)Z=|p_285_0_,p_285_1_,p_285_2_,p_285_3_
 net/minecraft/src/BlockSand.func_4028_b()I=|
 net/minecraft/src/BlockSandStone.<init>(I)V=|p_i407_1_
+net/minecraft/src/BlockSandStone.func_21025_b(I)I=|p_21025_1_
+net/minecraft/src/BlockSandStone.func_22009_a(II)I=|p_22009_1_,p_22009_2_
 net/minecraft/src/BlockSandStone.func_241_a(I)I=|p_241_1_
 net/minecraft/src/BlockSapling.<init>(II)V=|p_i182_1_,p_i182_2_
 net/minecraft/src/BlockSapling.func_21025_b(I)I=|p_21025_1_
 net/minecraft/src/BlockSapling.func_21027_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_21027_1_,p_21027_2_,p_21027_3_,p_21027_4_,p_21027_5_
 net/minecraft/src/BlockSapling.func_22009_a(II)I=|p_22009_1_,p_22009_2_
 net/minecraft/src/BlockSapling.func_221_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_221_1_,p_221_2_,p_221_3_,p_221_4_,p_221_5_
+net/minecraft/src/BlockSapling.func_50010_f(Lnet/minecraft/src/World;IIII)Z=|p_50010_1_,p_50010_2_,p_50010_3_,p_50010_4_,p_50010_5_
 net/minecraft/src/BlockSign.<init>(ILjava/lang/Class;Z)V=|p_i484_1_,p_i484_2_,p_i484_3_
 net/minecraft/src/BlockSign.func_233_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_233_1_,p_233_2_,p_233_3_,p_233_4_
 net/minecraft/src/BlockSign.func_234_b(Lnet/minecraft/src/World;IIII)V=|p_234_1_,p_234_2_,p_234_3_,p_234_4_,p_234_5_
@@ -1067,6 +1077,9 @@ net/minecraft/src/BlockWeb.func_252_a(ILjava/util/Random;I)I=|p_252_1_,p_252_2_,
 net/minecraft/src/BlockWeb.func_263_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/Entity;)V=|p_263_1_,p_263_2_,p_263_3_,p_263_4_,p_263_5_
 net/minecraft/src/BlockWeb.func_28025_b()Z=|
 net/minecraft/src/BlockWeb.func_40161_b()I=|
+net/minecraft/src/BlockWood.<init>(I)V=|p_i1202_1_
+net/minecraft/src/BlockWood.func_21025_b(I)I=|p_21025_1_
+net/minecraft/src/BlockWood.func_22009_a(II)I=|p_22009_1_,p_22009_2_
 net/minecraft/src/BlockWorkbench.<init>(I)V=|p_i137_1_
 net/minecraft/src/BlockWorkbench.func_241_a(I)I=|p_241_1_
 net/minecraft/src/BlockWorkbench.func_246_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)Z=|p_246_1_,p_246_2_,p_246_3_,p_246_4_,p_246_5_
@@ -1908,6 +1921,14 @@ net/minecraft/src/EntityAIOcelotAttack.func_46085_d()V=|
 net/minecraft/src/EntityAIOcelotAttack.func_46089_b()V=|
 net/minecraft/src/EntityAIOcelotAttack.func_46090_a()Z=|
 net/minecraft/src/EntityAIOcelotAttack.func_46092_g()Z=|
+net/minecraft/src/EntityAIOcelotSit.<init>(Lnet/minecraft/src/EntityOcelot;F)V=|p_i1200_1_,p_i1200_2_
+net/minecraft/src/EntityAIOcelotSit.func_46085_d()V=|
+net/minecraft/src/EntityAIOcelotSit.func_46088_e()V=|
+net/minecraft/src/EntityAIOcelotSit.func_46089_b()V=|
+net/minecraft/src/EntityAIOcelotSit.func_46090_a()Z=|
+net/minecraft/src/EntityAIOcelotSit.func_46092_g()Z=|
+net/minecraft/src/EntityAIOcelotSit.func_50011_a(Lnet/minecraft/src/World;III)Z=|p_50011_1_,p_50011_2_,p_50011_3_,p_50011_4_
+net/minecraft/src/EntityAIOcelotSit.func_50012_f()Z=|
 net/minecraft/src/EntityAIOpenDoor.<init>(Lnet/minecraft/src/EntityLiving;Z)V=|p_i1059_1_,p_i1059_2_
 net/minecraft/src/EntityAIOpenDoor.func_46085_d()V=|
 net/minecraft/src/EntityAIOpenDoor.func_46088_e()V=|
@@ -2012,6 +2033,7 @@ net/minecraft/src/EntityAnimal.func_28013_b(Lnet/minecraft/src/Entity;F)V=|p_280
 net/minecraft/src/EntityAnimal.func_36000_a(Lnet/minecraft/src/EntityPlayer;)I=|p_36000_1_
 net/minecraft/src/EntityAnimal.func_40131_b(Lnet/minecraft/src/EntityAnimal;)V=|p_40131_1_
 net/minecraft/src/EntityAnimal.func_40134_a(Lnet/minecraft/src/ItemStack;)Z=|p_40134_1_
+net/minecraft/src/EntityAnimal.func_48326_g()V=|
 net/minecraft/src/EntityAnimal.func_48362_b(Lnet/minecraft/src/EntityAnimal;)Z=|p_48362_1_
 net/minecraft/src/EntityAnimal.func_48363_r_()Z=|
 net/minecraft/src/EntityAnimal.func_48364_s_()V=|
@@ -2682,6 +2704,7 @@ net/minecraft/src/EntityPlayer.func_41031_d(Lnet/minecraft/src/EntityPlayer;)V=|
 net/minecraft/src/EntityPlayer.func_48347_R()Lnet/minecraft/src/EntityItem;=|
 net/minecraft/src/EntityPlayer.func_48348_b(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EntityItem;=|p_48348_1_
 net/minecraft/src/EntityPlayer.func_48349_a(Lnet/minecraft/src/ItemStack;Z)Lnet/minecraft/src/EntityItem;=|p_48349_1_,p_48349_2_
+net/minecraft/src/EntityPlayer.func_50022_L()V=|
 net/minecraft/src/EntityPlayer.func_6099_c(Lnet/minecraft/src/DamageSource;I)V=|p_6099_1_,p_6099_2_
 net/minecraft/src/EntityPlayer.func_9145_g(Lnet/minecraft/src/Entity;)V=|p_9145_1_
 net/minecraft/src/EntityPlayer.func_9146_h(Lnet/minecraft/src/Entity;)V=|p_9146_1_
@@ -2738,6 +2761,7 @@ net/minecraft/src/EntityPlayerMP.func_40107_e(I)V=|p_40107_1_
 net/minecraft/src/EntityPlayerMP.func_40108_b(I)V=|p_40108_1_
 net/minecraft/src/EntityPlayerMP.func_40109_c(Lnet/minecraft/src/Entity;)V=|p_40109_1_
 net/minecraft/src/EntityPlayerMP.func_40110_a(Lnet/minecraft/src/TileEntityBrewingStand;)V=|p_40110_1_
+net/minecraft/src/EntityPlayerMP.func_50022_L()V=|
 net/minecraft/src/EntityPlayerMP.func_6094_e(Lnet/minecraft/src/Entity;)V=|p_6094_1_
 net/minecraft/src/EntityPlayerMP.func_9153_b(DZ)V=|p_9153_1_,p_9153_3_
 net/minecraft/src/EntityPlayerMP.func_97_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_97_1_
@@ -2906,6 +2930,7 @@ net/minecraft/src/EntityTameable.func_48370_a(Z)V=|p_48370_1_
 net/minecraft/src/EntityTameable.func_48371_v_()Z=|
 net/minecraft/src/EntityTameable.func_48372_a(Ljava/lang/String;)V=|p_48372_1_
 net/minecraft/src/EntityTameable.func_48373_u_()Z=|
+net/minecraft/src/EntityTameable.func_50021_C()Lnet/minecraft/src/EntityAISit;=|
 net/minecraft/src/EntityTameable.func_97_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_97_1_
 net/minecraft/src/EntityTameable.func_99_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_99_1_
 net/minecraft/src/EntityThrowable.<init>(Lnet/minecraft/src/World;)V=|p_i27_1_
@@ -2947,7 +2972,6 @@ net/minecraft/src/EntityVillager.func_153_y()V=|
 net/minecraft/src/EntityVillager.func_21044_a()V=|
 net/minecraft/src/EntityVillager.func_25020_s()Z=|
 net/minecraft/src/EntityVillager.func_40095_c()I=|
-net/minecraft/src/EntityVillager.func_40111_y()V=|
 net/minecraft/src/EntityVillager.func_46022_as()Z=|
 net/minecraft/src/EntityVillager.func_48326_g()V=|
 net/minecraft/src/EntityVillager.func_48334_a(Lnet/minecraft/src/EntityLiving;)V=|p_48334_1_
@@ -3470,6 +3494,7 @@ net/minecraft/src/ItemSign.func_78_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft
 net/minecraft/src/ItemSlab.<init>(I)V=|p_i117_1_
 net/minecraft/src/ItemSlab.func_21089_a(I)I=|p_21089_1_
 net/minecraft/src/ItemSlab.func_35407_a(Lnet/minecraft/src/ItemStack;)Ljava/lang/String;=|p_35407_1_
+net/minecraft/src/ItemSlab.func_50020_b(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIII)Z=|p_50020_0_,p_50020_1_,p_50020_2_,p_50020_3_,p_50020_4_,p_50020_5_,p_50020_6_
 net/minecraft/src/ItemSlab.func_78_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIII)Z=|p_78_1_,p_78_2_,p_78_3_,p_78_4_,p_78_5_,p_78_6_,p_78_7_
 net/minecraft/src/ItemSnowball.<init>(I)V=|p_i90_1_
 net/minecraft/src/ItemSnowball.func_6152_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_6152_1_,p_6152_2_,p_6152_3_
@@ -3680,6 +3705,7 @@ net/minecraft/src/NBTBase.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|
 net/minecraft/src/NBTBase.func_383_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException|p_383_0_
 net/minecraft/src/NBTBase.func_384_c()Ljava/lang/String;=|
 net/minecraft/src/NBTBase.func_385_m(Ljava/lang/String;)Lnet/minecraft/src/NBTBase;=|p_385_1_
+net/minecraft/src/NBTBase.hashCode()I=|
 net/minecraft/src/NBTTagByte.<init>(Ljava/lang/String;)V=|p_i392_1_
 net/minecraft/src/NBTTagByte.<init>(Ljava/lang/String;B)V=|p_i393_1_,p_i393_2_
 net/minecraft/src/NBTTagByte.equals(Ljava/lang/Object;)Z=|p_equals_1_
@@ -3687,6 +3713,7 @@ net/minecraft/src/NBTTagByte.func_379_a()B=|
 net/minecraft/src/NBTTagByte.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagByte.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagByte.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagByte.hashCode()I=|
 net/minecraft/src/NBTTagByte.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagByteArray.<init>(Ljava/lang/String;)V=|p_i191_1_
 net/minecraft/src/NBTTagByteArray.<init>(Ljava/lang/String;[B)V=|p_i192_1_,p_i192_2_
@@ -3695,6 +3722,7 @@ net/minecraft/src/NBTTagByteArray.func_379_a()B=|
 net/minecraft/src/NBTTagByteArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagByteArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagByteArray.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagByteArray.hashCode()I=|
 net/minecraft/src/NBTTagByteArray.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagCompound.<init>()V=|
 net/minecraft/src/NBTTagCompound.<init>(Ljava/lang/String;)V=|p_i329_1_
@@ -3730,6 +3758,7 @@ net/minecraft/src/NBTTagCompound.func_410_a(Ljava/lang/String;)Z=|p_410_1_
 net/minecraft/src/NBTTagCompound.func_411_a(Ljava/lang/String;D)V=|p_411_1_,p_411_2_
 net/minecraft/src/NBTTagCompound.func_48445_l(Ljava/lang/String;)[I=|p_48445_1_
 net/minecraft/src/NBTTagCompound.func_48446_a(Ljava/lang/String;[I)V=|p_48446_1_,p_48446_2_
+net/minecraft/src/NBTTagCompound.hashCode()I=|
 net/minecraft/src/NBTTagCompound.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagDouble.<init>(Ljava/lang/String;)V=|p_i453_1_
 net/minecraft/src/NBTTagDouble.<init>(Ljava/lang/String;D)V=|p_i454_1_,p_i454_2_
@@ -3738,6 +3767,7 @@ net/minecraft/src/NBTTagDouble.func_379_a()B=|
 net/minecraft/src/NBTTagDouble.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagDouble.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagDouble.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagDouble.hashCode()I=|
 net/minecraft/src/NBTTagDouble.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagEnd.<init>()V=|
 net/minecraft/src/NBTTagEnd.equals(Ljava/lang/Object;)Z=|p_equals_1_
@@ -3753,6 +3783,7 @@ net/minecraft/src/NBTTagFloat.func_379_a()B=|
 net/minecraft/src/NBTTagFloat.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagFloat.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagFloat.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagFloat.hashCode()I=|
 net/minecraft/src/NBTTagFloat.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagInt.<init>(Ljava/lang/String;)V=|p_i371_1_
 net/minecraft/src/NBTTagInt.<init>(Ljava/lang/String;I)V=|p_i372_1_,p_i372_2_
@@ -3761,6 +3792,7 @@ net/minecraft/src/NBTTagInt.func_379_a()B=|
 net/minecraft/src/NBTTagInt.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagInt.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagInt.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagInt.hashCode()I=|
 net/minecraft/src/NBTTagInt.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagIntArray.<init>(Ljava/lang/String;)V=|p_i1044_1_
 net/minecraft/src/NBTTagIntArray.<init>(Ljava/lang/String;[I)V=|p_i1045_1_,p_i1045_2_
@@ -3769,6 +3801,7 @@ net/minecraft/src/NBTTagIntArray.func_379_a()B=|
 net/minecraft/src/NBTTagIntArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagIntArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagIntArray.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagIntArray.hashCode()I=|
 net/minecraft/src/NBTTagIntArray.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagList.<init>()V=|
 net/minecraft/src/NBTTagList.<init>(Ljava/lang/String;)V=|p_i447_1_
@@ -3780,6 +3813,7 @@ net/minecraft/src/NBTTagList.func_386_a(Lnet/minecraft/src/NBTBase;)V=|p_386_1_
 net/minecraft/src/NBTTagList.func_387_b()I=|
 net/minecraft/src/NBTTagList.func_388_a(I)Lnet/minecraft/src/NBTBase;=|p_388_1_
 net/minecraft/src/NBTTagList.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagList.hashCode()I=|
 net/minecraft/src/NBTTagList.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagLong.<init>(Ljava/lang/String;)V=|p_i294_1_
 net/minecraft/src/NBTTagLong.<init>(Ljava/lang/String;J)V=|p_i295_1_,p_i295_2_
@@ -3788,6 +3822,7 @@ net/minecraft/src/NBTTagLong.func_379_a()B=|
 net/minecraft/src/NBTTagLong.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagLong.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagLong.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagLong.hashCode()I=|
 net/minecraft/src/NBTTagLong.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagShort.<init>(Ljava/lang/String;)V=|p_i486_1_
 net/minecraft/src/NBTTagShort.<init>(Ljava/lang/String;S)V=|p_i487_1_,p_i487_2_
@@ -3796,6 +3831,7 @@ net/minecraft/src/NBTTagShort.func_379_a()B=|
 net/minecraft/src/NBTTagShort.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagShort.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagShort.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagShort.hashCode()I=|
 net/minecraft/src/NBTTagShort.toString()Ljava/lang/String;=|
 net/minecraft/src/NBTTagString.<init>(Ljava/lang/String;)V=|p_i573_1_
 net/minecraft/src/NBTTagString.<init>(Ljava/lang/String;Ljava/lang/String;)V=|p_i574_1_,p_i574_2_
@@ -3804,6 +3840,7 @@ net/minecraft/src/NBTTagString.func_379_a()B=|
 net/minecraft/src/NBTTagString.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException|p_381_1_
 net/minecraft/src/NBTTagString.func_382_a(Ljava/io/DataInput;)V=java/io/IOException|p_382_1_
 net/minecraft/src/NBTTagString.func_40468_b()Lnet/minecraft/src/NBTBase;=|
+net/minecraft/src/NBTTagString.hashCode()I=|
 net/minecraft/src/NBTTagString.toString()Ljava/lang/String;=|
 net/minecraft/src/NetHandler.<init>()V=|
 net/minecraft/src/NetHandler.func_11_a(Lnet/minecraft/src/Packet16BlockItemSwitch;)V=|p_11_1_
@@ -3859,6 +3896,7 @@ net/minecraft/src/NetHandler.func_44001_a(Lnet/minecraft/src/Packet250CustomPayl
 net/minecraft/src/NetHandler.func_48070_a(Lnet/minecraft/src/Packet51MapChunk;)V=|p_48070_1_
 net/minecraft/src/NetHandler.func_48071_a(Lnet/minecraft/src/Packet132TileEntityData;)V=|p_48071_1_
 net/minecraft/src/NetHandler.func_48072_a(Lnet/minecraft/src/Packet35EntityHeadRotation;)V=|p_48072_1_
+net/minecraft/src/NetHandler.func_50003_a(Lnet/minecraft/src/Packet202PlayerAbilities;)V=|p_50003_1_
 net/minecraft/src/NetHandler.func_6001_a(Lnet/minecraft/src/Packet;)V=|p_6001_1_
 net/minecraft/src/NetHandler.func_6002_a(Lnet/minecraft/src/Packet28EntityVelocity;)V=|p_6002_1_
 net/minecraft/src/NetHandler.func_6003_a(Lnet/minecraft/src/Packet39AttachEntity;)V=|p_6003_1_
@@ -3907,6 +3945,7 @@ net/minecraft/src/NetServerHandler.func_4010_d(Ljava/lang/String;)V=|p_4010_1_
 net/minecraft/src/NetServerHandler.func_41_a(DDDFF)V=|p_41_1_,p_41_3_,p_41_5_,p_41_7_,p_41_8_
 net/minecraft/src/NetServerHandler.func_42_a()V=|
 net/minecraft/src/NetServerHandler.func_43_c(Ljava/lang/String;)V=|p_43_1_
+net/minecraft/src/NetServerHandler.func_50003_a(Lnet/minecraft/src/Packet202PlayerAbilities;)V=|p_50003_1_
 net/minecraft/src/NetServerHandler.func_6001_a(Lnet/minecraft/src/Packet;)V=|p_6001_1_
 net/minecraft/src/NetServerHandler.func_6006_a(Lnet/minecraft/src/Packet7UseEntity;)V=|p_6006_1_
 net/minecraft/src/NetServerHandler.func_6_a(Ljava/lang/String;[Ljava/lang/Object;)V=|p_6_1_,p_6_2_
@@ -4129,6 +4168,12 @@ net/minecraft/src/Packet201PlayerInfo.func_68_a(Ljava/io/DataOutputStream;)V=jav
 net/minecraft/src/Packet201PlayerInfo.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_70_1_
 net/minecraft/src/Packet201PlayerInfo.func_71_a()I=|
 net/minecraft/src/Packet201PlayerInfo.func_72_a(Lnet/minecraft/src/NetHandler;)V=|p_72_1_
+net/minecraft/src/Packet202PlayerAbilities.<init>()V=|
+net/minecraft/src/Packet202PlayerAbilities.<init>(Lnet/minecraft/src/PlayerCapabilities;)V=|p_i1201_1_
+net/minecraft/src/Packet202PlayerAbilities.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_68_1_
+net/minecraft/src/Packet202PlayerAbilities.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_70_1_
+net/minecraft/src/Packet202PlayerAbilities.func_71_a()I=|
+net/minecraft/src/Packet202PlayerAbilities.func_72_a(Lnet/minecraft/src/NetHandler;)V=|p_72_1_
 net/minecraft/src/Packet20NamedEntitySpawn.<init>()V=|
 net/minecraft/src/Packet20NamedEntitySpawn.<init>(Lnet/minecraft/src/EntityPlayer;)V=|p_i293_1_
 net/minecraft/src/Packet20NamedEntitySpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_68_1_
@@ -5407,6 +5452,7 @@ net/minecraft/src/WorldGenerator.<init>()V=|
 net/minecraft/src/WorldGenerator.<init>(Z)V=|p_i367_1_
 net/minecraft/src/WorldGenerator.func_41043_a(Lnet/minecraft/src/World;IIIII)V=|p_41043_1_,p_41043_2_,p_41043_3_,p_41043_4_,p_41043_5_,p_41043_6_
 net/minecraft/src/WorldGenerator.func_420_a(DDD)V=|p_420_1_,p_420_3_,p_420_5_
+net/minecraft/src/WorldGenerator.func_50023_a(Lnet/minecraft/src/World;IIII)V=|p_50023_1_,p_50023_2_,p_50023_3_,p_50023_4_,p_50023_5_
 net/minecraft/src/WorldInfo.<init>(Lnet/minecraft/src/NBTTagCompound;)V=|p_i112_1_
 net/minecraft/src/WorldInfo.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i114_1_
 net/minecraft/src/WorldInfo.<init>(Lnet/minecraft/src/WorldSettings;Ljava/lang/String;)V=|p_i113_1_,p_i113_2_

forge/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 6.0
+MCPVersion = 6.1
-ClientVersion = 1.2.3
+ClientVersion = 1.2.4
-ServerVersion = 1.2.3
+ServerVersion = 1.2.4

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

@@ -252,24 +252,6 @@ public class ForgeHooksClient
         }
     }
     
-    @Deprecated //Deprecated in favor of new more Robust IItemRenderer, Remove in next MC version
-    public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks, int itemID, int metadata, float brightness)
-    {
-        MinecraftForgeClient.checkMinecraftVersion("Minecraft Minecraft 1.2.3", "Deprecated call to MC 1.2.3 ForgeHooksClient.renderCustomItem on: %version%");
-        Tessellator tessellator = Tessellator.instance;
-        if (renderBlocks.useInventoryTint)
-        {
-            int j = 0xffffff;//block.getRenderColor(i);
-            float f1 = (float) (j >> 16 & 0xff) / 255F;
-            float f3 = (float) (j >> 8 & 0xff) / 255F;
-            float f5 = (float) (j & 0xff) / 255F;
-            GL11.glColor4f(f1 * brightness, f3 * brightness, f5 * brightness, 1.0F);
-        }
-
-        //ModLoader.RenderInvBlock(this, block, i, k);
-        customRenderer.renderInventory(renderBlocks, itemID, metadata);
-    }
-    
     public static void renderEntityItem(IItemRenderer customRenderer, RenderBlocks renderBlocks, EntityItem item)
     {
         customRenderer.renderEntityItem(renderBlocks, item);

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

@@ -1,10 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.RenderBlocks;
-
-@Deprecated //Deprecated in favor of new more Robust IItemRenderer, Remove in next MC version
-public interface ICustomItemRenderer
-{
-    @Deprecated
-    public void renderInventory(RenderBlocks render, int itemID, int metadata);
-}

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

@@ -87,23 +87,6 @@ public class MinecraftForgeClient
         return ForgeHooksClient.renderPass;
     }
     
-    @Deprecated //Deprecated in favor of new more Robust IItemRenderer, Remove in next MC version
-    private static ICustomItemRenderer[] customItemRenderersOld = new ICustomItemRenderer[Item.itemsList.length];
-
-    @Deprecated //Deprecated in favor of new more Robust IItemRenderer, Remove in next MC version
-    public static void registerCustomItemRenderer(int itemID, ICustomItemRenderer renderer)
-    {
-        MinecraftForgeClient.checkMinecraftVersion("Minecraft Minecraft 1.2.3", "Deprecated call to MC 1.2.3 MinecraftForgeClient.registerCustomItemRenderer on: %version%");
-        customItemRenderersOld[itemID] = renderer;
-    }
-
-    @Deprecated //Deprecated in favor of new more Robust IItemRenderer, Remove in next MC version
-    public static ICustomItemRenderer getCustomItemRenderer (int itemID)
-    {
-        MinecraftForgeClient.checkMinecraftVersion("Minecraft Minecraft 1.2.3", "Deprecated call to MC 1.2.3 MinecraftForgeClient.getCustomItemRenderer on: %version%");
-        return customItemRenderersOld[itemID];
-    }
-    
     private static IItemRenderer[] customItemRenderers = new IItemRenderer[Item.itemsList.length];
 
     /** Register a custom renderer for a specific item. This can be used to

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

@@ -34,15 +34,6 @@ public class Configuration
     public static final String CATEGORY_BLOCK   = "block";
     public static final String CATEGORY_ITEM    = "item";
 
-    @Deprecated
-    public static final int GENERAL_PROPERTY = 0;
-    
-    @Deprecated
-    public static final int BLOCK_PROPERTY   = 1;
-    
-    @Deprecated
-    public static final int ITEM_PROPERTY    = 2;
-
     File file;
     
     public Map<String, Map<String, Property>> categories = new TreeMap<String, Map<String, Property>>();
@@ -62,22 +53,6 @@ public class Configuration
         categories.put(CATEGORY_ITEM, itemProperties);
     }
 
-    /**
-     * Helper for depreciated functions
-     */
-    private String getCategoryFromIndex(int kind)
-    {
-        switch(kind)
-        {
-            case 1:
-                return CATEGORY_BLOCK;
-            case 2:
-                return CATEGORY_ITEM;      
-            default:
-                return CATEGORY_GENERAL;          
-        }
-    }
-
     /**
      * Gets or create a block id property. If the block id property key is
      * already in the configuration, then it will be used. Otherwise,
@@ -132,12 +107,6 @@ public class Configuration
         }
     }
     
-    @Deprecated
-    public Property getOrCreateIntProperty(String key, int kind, int defaultValue)
-    {
-        return getOrCreateIntProperty(key, getCategoryFromIndex(kind), defaultValue);
-    }
-    
     public Property getOrCreateIntProperty(String key, String category, int defaultValue)
     {
         Property prop = getOrCreateProperty(key, category, Integer.toString(defaultValue));
@@ -153,12 +122,6 @@ public class Configuration
         }
     }
     
-    @Deprecated
-    public Property getOrCreateBooleanProperty(String key, int kind, boolean defaultValue)
-    {
-        return getOrCreateBooleanProperty(key, getCategoryFromIndex(kind), defaultValue);
-    }
-    
     public Property getOrCreateBooleanProperty(String key, String category, boolean defaultValue)
     {
         Property prop = getOrCreateProperty(key, category, Boolean.toString(defaultValue));
@@ -173,12 +136,6 @@ public class Configuration
         }
     }
     
-    @Deprecated
-    public Property getOrCreateProperty(String key, int kind, String defaultValue)
-    {
-        return getOrCreateProperty(key, getCategoryFromIndex(kind), defaultValue);
-    }
-    
     public Property getOrCreateProperty(String key, String category, String defaultValue)
     {
         category = category.toLowerCase();

forge/install/install.cmd

@@ -25,7 +25,6 @@ if exist ".\src" (
     exit 1
 )
 runtime\bin\python\python_mcp runtime\decompile.py
-runtime\bin\python\python_mcp forge\clean_src.py src
 
 pushd src >nul
 

forge/install/install.sh

@@ -27,7 +27,6 @@ then
     exit 1
 fi
 ./decompile.sh
-python forge/clean_src.py src
 
 pushd src > /dev/null
     if [ -f ../jars/bin/minecraft.jar ];

forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/client/Minecraft.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/client/Minecraft.java	0000-00-00 00:00:00.000000000 -0000
-@@ -1966,86 +1966,54 @@
+@@ -1972,86 +1972,54 @@
       */
      public void usePortal(int par1)
      {

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

@@ -75,12 +75,12 @@
          par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
          par2EntityPlayer.addExhaustion(0.025F);
  
--        if (this.renderAsNormalBlock() && !this.isBlockContainer && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
+-        if (this.func_50074_q() && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
-+        if (this.renderAsNormalBlock() && !hasTileEntity(par6) && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
++        if (canSilkHarvest(par1World, par2EntityPlayer, par3, par4, par5, par6) && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
          {
              ItemStack var8 = this.createStackedBlock(par6);
  
-@@ -1046,6 +1046,376 @@
+@@ -1051,6 +1051,396 @@
       */
      public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {}
  
@@ -453,6 +453,26 @@
 +    	}
 +    	return ret;
 +    }
++    
++    /**
++     * Return true from this function if the player with silk touch can harvest this block directly, and not it's normal drops.
++     * 
++     * @param world The world
++     * @param player The player doing the harvesting
++     * @param x X Position
++     * @param y Y Position
++     * @param z Z Position
++     * @param metadata The metadata
++     * @return True if the block can be directly harvested using silk touch
++     */
++    public boolean canSilkHarvest(World world, EntityPlayer player, int x, int y, int z, int metadata)
++    {
++    	if (this instanceof BlockGlass)
++    	{
++    		return true;
++    	}
++    	return renderAsNormalBlock() && !hasTileEntity(metadata);
++    }
 +    
      static
      {

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

@@ -1,6 +1,6 @@
 --- ../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
-@@ -496,23 +496,23 @@
+@@ -497,7 +497,7 @@
          {
              return true;
          }
@@ -9,23 +9,27 @@
          {
              return true;
          }
--        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && par1World.isBlockNormalCube(par2 - 1, par3 + 1, par4))
+@@ -505,19 +505,19 @@
-+        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && par1World.isBlockSolidOnSide(par2 - 1, par3 + 1, par4, 0))
          {
              return true;
          }
--        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && par1World.isBlockNormalCube(par2 + 1, par3 + 1, par4))
+-        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && (par1World.isBlockNormalCube(par2 - 1, par3 + 1, par4) || func_50075_j(par1World, par2 - 1, par3, par4)))
-+        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && par1World.isBlockSolidOnSide(par2 + 1, par3 + 1, par4, 0))
++        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && (par1World.isBlockSolidOnSide(par2 - 1, par3 + 1, par4, 0) || func_50075_j(par1World, par2 - 1, par3, par4)))
          {
              return true;
          }
--        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && par1World.isBlockNormalCube(par2, par3 + 1, par4 - 1))
+-        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && (par1World.isBlockNormalCube(par2 + 1, par3 + 1, par4) || func_50075_j(par1World, par2 + 1, par3, par4)))
-+        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && par1World.isBlockSolidOnSide(par2, par3 + 1, par4 - 1, 0))
++        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && (par1World.isBlockSolidOnSide(par2 + 1, par3 + 1, par4, 0) || func_50075_j(par1World, par2 + 1, par3, par4)))
          {
              return true;
          }
--        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && par1World.isBlockNormalCube(par2, par3 + 1, par4 + 1))
+-        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && (par1World.isBlockNormalCube(par2, par3 + 1, par4 - 1) || func_50075_j(par1World, par2, par3, par4 - 1)))
-+        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && par1World.isBlockSolidOnSide(par2, par3 + 1, par4 + 1, 0))
++        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && (par1World.isBlockSolidOnSide(par2, par3 + 1, par4 - 1, 0) || func_50075_j(par1World, par2, par3, par4 - 1)))
+         {
+             return true;
+         }
+-        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && (par1World.isBlockNormalCube(par2, par3 + 1, par4 + 1) || func_50075_j(par1World, par2, par3, par4 + 1)))
++        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && (par1World.isBlockSolidOnSide(par2, par3 + 1, par4 + 1, 0) || func_50075_j(par1World, par2, par3, par4 + 1)))
          {
              return true;
          }

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

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
-@@ -569,7 +569,7 @@
+@@ -585,7 +585,7 @@
                  {
                      Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12);
                  }
@@ -9,7 +9,7 @@
                  {
                      this.worldObj.removeBlockTileEntity(var11, par2, var12);
                  }
-@@ -607,32 +607,23 @@
+@@ -629,32 +629,23 @@
                          Block.blocksList[par4].onBlockAdded(this.worldObj, var11, par2, var12);
                      }
  
@@ -45,7 +45,7 @@
                  this.isModified = true;
                  return true;
              }
-@@ -663,7 +654,7 @@
+@@ -686,7 +677,7 @@
                  var5.setExtBlockMetadata(par1, par2 & 15, par3, par4);
                  int var7 = var5.getExtBlockID(par1, par2 & 15, par3);
  
@@ -54,7 +54,7 @@
                  {
                      TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
  
-@@ -829,34 +820,33 @@
+@@ -852,34 +843,33 @@
      {
          ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
          TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
@@ -100,7 +100,7 @@
      }
  
      /**
-@@ -871,7 +861,7 @@
+@@ -894,7 +884,7 @@
  
          if (this.isChunkLoaded)
          {
@@ -109,7 +109,7 @@
          }
      }
  
-@@ -886,8 +876,14 @@
+@@ -909,8 +899,14 @@
          par4TileEntity.yCoord = par2;
          par4TileEntity.zCoord = this.zPosition * 16 + par3;
  
@@ -125,7 +125,7 @@
              par4TileEntity.validate();
              this.chunkTileEntityMap.put(var5, par4TileEntity);
          }
-@@ -1205,6 +1201,16 @@
+@@ -1228,6 +1224,16 @@
  
      public void func_48494_a(byte[] par1ArrayOfByte, int par2, int par3, boolean par4)
      {
@@ -142,7 +142,7 @@
          int var5 = 0;
          int var6;
  
-@@ -1308,6 +1314,29 @@
+@@ -1331,6 +1337,29 @@
              TileEntity var9 = (TileEntity)var10.next();
              var9.updateContainingBlockInfo();
          }
@@ -172,7 +172,7 @@
      }
  
      public BiomeGenBase func_48490_a(int par1, int par2, WorldChunkManager par3WorldChunkManager)
-@@ -1411,4 +1440,18 @@
+@@ -1434,4 +1463,18 @@
              }
          }
      }

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

@@ -1,32 +1,30 @@
 --- ../src_base/minecraft/net/minecraft/src/ContainerCreative.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/ContainerCreative.java	0000-00-00 00:00:00.000000000 -0000
-@@ -57,18 +57,22 @@
+@@ -68,17 +68,21 @@
- 
+             this.itemList.add(new ItemStack(var2[var12], 1, var13));
-             this.itemList.add(new ItemStack(var2[var10], 1, var11));
          }
--
+ 
--        for (var10 = 256; var10 < Item.itemsList.length; ++var10)
+-        for (var12 = 256; var12 < Item.itemsList.length; ++var12)
-+        
 +        for (Block block : Block.blocksList)
          {
--            if (Item.itemsList[var10] != null && Item.itemsList[var10].shiftedIndex != Item.potion.shiftedIndex && Item.itemsList[var10].shiftedIndex != Item.monsterPlacer.shiftedIndex)
+-            if (Item.itemsList[var12] != null && Item.itemsList[var12].shiftedIndex != Item.potion.shiftedIndex && Item.itemsList[var12].shiftedIndex != Item.monsterPlacer.shiftedIndex)
 +            if (block != null)
              {
--                this.itemList.add(new ItemStack(Item.itemsList[var10]));
+-                this.itemList.add(new ItemStack(Item.itemsList[var12]));
 +                block.addCreativeItems((ArrayList)itemList);
              }
          }
 -
--        for (var10 = 1; var10 < 16; ++var10)
+-        for (var12 = 1; var12 < 16; ++var12)
 +        
 +        int x = 0;
 +        for (Item item : Item.itemsList)
          {
--            this.itemList.add(new ItemStack(Item.dyePowder.shiftedIndex, 1, var10));
+-            this.itemList.add(new ItemStack(Item.dyePowder.shiftedIndex, 1, var12));
 +            if (x++ >= 256 && item != null)
 +            {
 +                item.addCreativeItems((ArrayList)itemList);
 +            }
          }
  
-         Iterator var14 = EntityList.entityEggs.keySet().iterator();
+         Iterator var15 = EntityList.entityEggs.keySet().iterator();

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

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/CraftingManager.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/CraftingManager.java	0000-00-00 00:00:00.000000000 -0000
-@@ -239,7 +239,7 @@
+@@ -242,7 +242,7 @@
              }
          }
  

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

@@ -40,7 +40,7 @@
  
      public DataWatcher getDataWatcher()
      {
-@@ -1286,6 +1312,10 @@
+@@ -1318,6 +1344,10 @@
          par1NBTTagCompound.setShort("Fire", (short)this.fire);
          par1NBTTagCompound.setShort("Air", (short)this.getAir());
          par1NBTTagCompound.setBoolean("OnGround", this.onGround);
@@ -51,7 +51,7 @@
          this.writeEntityToNBT(par1NBTTagCompound);
      }
  
-@@ -1327,6 +1357,10 @@
+@@ -1359,6 +1389,10 @@
          this.onGround = par1NBTTagCompound.getBoolean("OnGround");
          this.setPosition(this.posX, this.posY, this.posZ);
          this.setRotation(this.rotationYaw, this.rotationPitch);
@@ -62,7 +62,7 @@
          this.readEntityFromNBT(par1NBTTagCompound);
      }
  
-@@ -1685,7 +1719,7 @@
+@@ -1717,7 +1751,7 @@
       */
      public boolean isRiding()
      {

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

@@ -164,8 +164,8 @@
              }
  
              return true;
-@@ -243,7 +242,7 @@
+@@ -254,7 +253,7 @@
-             this.func_41024_b(this.func_41025_i() - 1);
+             this.kill();
          }
  
 -        if (this.isMinecartPowered() && this.rand.nextInt(4) == 0)
@@ -173,7 +173,7 @@
          {
              this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D);
          }
-@@ -298,25 +297,20 @@
+@@ -309,25 +308,20 @@
              double var6 = 0.0078125D;
              int var8 = this.worldObj.getBlockId(var1, var2, var3);
  
@@ -202,7 +202,7 @@
                  if (var10 >= 2 && var10 <= 5)
                  {
                      this.posY = (double)(var2 + 1);
-@@ -359,7 +353,7 @@
+@@ -370,7 +364,7 @@
                  this.motionZ = var22 * var16 / var18;
                  double var24;
  
@@ -211,7 +211,7 @@
                  {
                      var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
  
-@@ -409,36 +403,8 @@
+@@ -420,36 +414,8 @@
                  this.posX = var26 + var14 * var24;
                  this.posZ = var28 + var16 * var24;
                  this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ);
@@ -250,7 +250,7 @@
  
                  if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var1 == var13[0][0] && MathHelper.floor_double(this.posZ) - var3 == var13[0][2])
                  {
-@@ -449,41 +415,7 @@
+@@ -460,41 +426,7 @@
                      this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ);
                  }
  
@@ -293,7 +293,7 @@
  
                  Vec3D var52 = this.func_514_g(this.posX, this.posY, this.posZ);
  
-@@ -512,30 +444,15 @@
+@@ -523,30 +455,15 @@
                  }
  
                  double var41;
@@ -330,7 +330,7 @@
                  {
                      var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
  
-@@ -571,41 +488,7 @@
+@@ -582,41 +499,7 @@
              }
              else
              {
@@ -373,7 +373,7 @@
              }
  
              this.rotationPitch = 0.0F;
-@@ -641,7 +524,18 @@
+@@ -652,7 +535,18 @@
              }
  
              this.setRotation(this.rotationYaw, this.rotationPitch);
@@ -393,7 +393,7 @@
  
              if (var15 != null && var15.size() > 0)
              {
-@@ -666,17 +560,8 @@
+@@ -677,17 +571,8 @@
                  this.riddenByEntity = null;
              }
  
@@ -413,7 +413,7 @@
          }
      }
  
-@@ -699,12 +584,7 @@
+@@ -710,12 +595,7 @@
          }
          else
          {
@@ -427,7 +427,7 @@
  
              par3 = (double)var10;
  
-@@ -750,14 +630,9 @@
+@@ -761,14 +641,9 @@
  
          if (BlockRail.isRailBlock(var10))
          {
@@ -443,7 +443,7 @@
              if (var11 >= 2 && var11 <= 5)
              {
                  par3 = (double)(var8 + 1);
-@@ -822,13 +697,14 @@
+@@ -833,13 +708,14 @@
      {
          par1NBTTagCompound.setInteger("Type", this.minecartType);
  
@@ -461,7 +461,7 @@
          {
              NBTTagList var2 = new NBTTagList();
  
-@@ -854,13 +730,14 @@
+@@ -865,13 +741,14 @@
      {
          this.minecartType = par1NBTTagCompound.getInteger("Type");
  
@@ -479,7 +479,7 @@
          {
              NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
              this.cargoItems = new ItemStack[this.getSizeInventory()];
-@@ -888,11 +765,19 @@
+@@ -899,11 +776,19 @@
       */
      public void applyEntityCollision(Entity par1Entity)
      {
@@ -500,7 +500,7 @@
                  {
                      par1Entity.mountEntity(this);
                  }
-@@ -938,7 +823,7 @@
+@@ -949,7 +834,7 @@
                          double var18 = par1Entity.motionX + this.motionX;
                          double var20 = par1Entity.motionZ + this.motionZ;
  
@@ -509,7 +509,7 @@
                          {
                              this.motionX *= 0.20000000298023224D;
                              this.motionZ *= 0.20000000298023224D;
-@@ -946,7 +831,7 @@
+@@ -957,7 +842,7 @@
                              par1Entity.motionX *= 0.949999988079071D;
                              par1Entity.motionZ *= 0.949999988079071D;
                          }
@@ -518,7 +518,7 @@
                          {
                              par1Entity.motionX *= 0.20000000298023224D;
                              par1Entity.motionZ *= 0.20000000298023224D;
-@@ -981,7 +866,7 @@
+@@ -992,7 +877,7 @@
       */
      public int getSizeInventory()
      {
@@ -527,7 +527,7 @@
      }
  
      /**
-@@ -1084,7 +969,12 @@
+@@ -1095,7 +980,12 @@
       */
      public boolean interact(EntityPlayer par1EntityPlayer)
      {
@@ -541,7 +541,7 @@
          {
              if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer)
              {
-@@ -1096,14 +986,14 @@
+@@ -1107,14 +997,14 @@
                  par1EntityPlayer.mountEntity(this);
              }
          }
@@ -558,7 +558,7 @@
          {
              ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem();
  
-@@ -1162,7 +1052,7 @@
+@@ -1173,7 +1063,7 @@
      /**
       * Is this minecart powered (Fuel > 0)
       */
@@ -567,7 +567,7 @@
      {
          return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0;
      }
-@@ -1215,4 +1105,348 @@
+@@ -1226,4 +1116,348 @@
      {
          return this.dataWatcher.getWatchableObjectInt(18);
      }

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

@@ -131,10 +131,10 @@
          }
  
          return var3;
-@@ -1867,4 +1913,30 @@
+@@ -1869,4 +1915,30 @@
-     {
-         return !this.capabilities.isFlying;
      }
+ 
+     public void func_50009_aI() {}
 +    
 +    /**
 +     * Opens a Gui for the player. 
@@ -142,18 +142,18 @@
 +     * @param mod The mod associated with the gui
 +     * @param ID The ID number for the Gui
 +     * @param world The World
-+     * @param X X Position
++     * @param x X Position
-+     * @param Y Y Position
++     * @param y Y Position
-+     * @param Z Z Position
++     * @param z Z Position
 +     */
-+    public void openGui(BaseMod mod, int ID, World world, int X, int Y, int Z)
++    public void openGui(BaseMod mod, int ID, World world, int x, int y, int z)
 +    {
 +        if (this instanceof EntityPlayerSP)
 +        {
 +            IGuiHandler handler = MinecraftForge.getGuiHandler(mod);
 +            if (handler != null)
 +            {
-+                GuiScreen screen = handler.getGuiScreen(ID, (EntityPlayerSP)this, world, X, Y, Z);
++                GuiScreen screen = handler.getGuiScreen(ID, (EntityPlayerSP)this, world, x, y, z);
 +                if (screen != null)
 +                {
 +                    ModLoader.getMinecraftInstance().displayGuiScreen(screen);

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

@@ -36,7 +36,7 @@
              float var4 = 70.0F;
  
              if (par2)
-@@ -1106,8 +1115,11 @@
+@@ -1102,8 +1111,11 @@
                      var20 = (EntityPlayer)var4;
                      GL11.glDisable(GL11.GL_ALPHA_TEST);
                      Profiler.endStartSection("outline");
@@ -50,7 +50,7 @@
                      GL11.glEnable(GL11.GL_ALPHA_TEST);
                  }
              }
-@@ -1171,8 +1183,12 @@
+@@ -1167,8 +1179,12 @@
                  var20 = (EntityPlayer)var4;
                  GL11.glDisable(GL11.GL_ALPHA_TEST);
                  Profiler.endStartSection("outline");
@@ -65,7 +65,7 @@
                  GL11.glEnable(GL11.GL_ALPHA_TEST);
              }
  
-@@ -1196,6 +1212,9 @@
+@@ -1192,6 +1208,9 @@
                  this.setupFog(1, par1);
                  GL11.glPopMatrix();
              }

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

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/GuiIngame.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/GuiIngame.java	0000-00-00 00:00:00.000000000 -0000
-@@ -8,6 +8,8 @@
+@@ -9,6 +9,8 @@
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.opengl.GL12;
  
@@ -9,10 +9,10 @@
  public class GuiIngame extends Gui
  {
      private static RenderItem itemRenderer = new RenderItem();
-@@ -139,7 +141,19 @@
+@@ -140,7 +142,19 @@
  
-                 var51 = var7 - 39;
+                 int var50 = var7 - 39;
-                 var22 = var51 - 10;
+                 var22 = var50 - 10;
 -                var23 = this.mc.thePlayer.getTotalArmorValue();
 +                var23 = 0;
 +                for (int x = 0; x < mc.thePlayer.inventory.armorInventory.length; x++)

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

@@ -1,11 +1,10 @@
 --- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -1,6 +1,12 @@
+@@ -1,6 +1,11 @@
  package net.minecraft.src;
  
  import net.minecraft.client.Minecraft;
 +import net.minecraft.src.forge.ForgeHooksClient;
-+import net.minecraft.src.forge.ICustomItemRenderer;
 +import net.minecraft.src.forge.IItemRenderer;
 +import net.minecraft.src.forge.ItemRenderType;
 +import net.minecraft.src.forge.MinecraftForgeClient;
@@ -13,12 +12,11 @@
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.opengl.GL12;
  
-@@ -35,21 +41,35 @@
+@@ -35,21 +40,27 @@
      public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3)
      {
          GL11.glPushMatrix();
 +        IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, ItemRenderType.EQUIPPED);
-+        ICustomItemRenderer customRendererOld = MinecraftForgeClient.getCustomItemRenderer(par2ItemStack.itemID);
  
 -        if (par2ItemStack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType()))
 +        if (customRenderer != null)
@@ -26,13 +24,6 @@
 +            GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture(ForgeHooksClient.getTexture(par2ItemStack.itemID < 256 ? "/terrain.png" : "/gui/items.png", par2ItemStack.getItem())));
 +            ForgeHooksClient.renderEquippedItem(customRenderer, renderBlocksInstance, par1EntityLiving, par2ItemStack);
 +        }
-+        //Deprecation Start
-+        else if (customRendererOld != null)
-+        {
-+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture(ForgeHooksClient.getTexture("/terrain.png", par2ItemStack.getItem())));
-+            ForgeHooksClient.renderCustomItem(customRendererOld, renderBlocksInstance, par2ItemStack.itemID,  par2ItemStack.getItemDamage(), par1EntityLiving.getBrightness(1.0F)); 
-+        }
-+        //Deprecation End
 +        else if (par2ItemStack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType()))
          {
 -            GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/terrain.png"));

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

@@ -24,7 +24,6 @@
          this.mc.thePlayer.entityId = par1Packet1Login.protocolVersion;
          this.currentServerMaxPlayers = par1Packet1Login.maxPlayers;
          ((PlayerControllerMP)this.mc.playerController).setCreative(par1Packet1Login.serverMode == 1);
-+        
 +        ForgeHooks.onLogin(netManager, par1Packet1Login);
 +
 +        String[] channels = MessageManager.getInstance().getRegisteredChannels(netManager);
@@ -47,14 +46,15 @@
 +        }
 +        pkt.length = pkt.data.length;
 +        addToSendQueue(pkt);
++        
+         ModLoader.serverLogin(this, par1Packet1Login);
      }
  
-     public void handlePickupSpawn(Packet21PickupSpawn par1Packet21PickupSpawn)
+@@ -675,7 +704,19 @@
-@@ -677,7 +706,19 @@
          }
          else if (par1Packet2Handshake.username.equals("-"))
          {
--            this.addToSendQueue(new Packet1Login(this.mc.session.username, 28));
+-            this.addToSendQueue(new Packet1Login(this.mc.session.username, 29));
 +            /**
 +             * We use some of the unused fields in Packet 001 Login to identify the user as having Forge installed.
 +             * This allows modded clients to connect to Vanilla server without crashing.
@@ -64,18 +64,18 @@
 +             * identifier so we are certain it is not random, and it is Forge installed.
 +             * The C->S dimension is set to the current Forge build number, in case we need to do any quick version checks.
 +             */
-+            Packet1Login pkt = new Packet1Login(mc.session.username, 28);
++            Packet1Login pkt = new Packet1Login(mc.session.username, 29);
 +            pkt.serverMode    = ForgePacket.FORGE_ID;
 +            pkt.field_48170_e = ForgeHooks.buildVersion;
 +            addToSendQueue(pkt);
          }
          else
          {
-@@ -690,7 +731,19 @@
+@@ -688,7 +729,19 @@
  
                  if (var6.equalsIgnoreCase("ok"))
                  {
--                    this.addToSendQueue(new Packet1Login(this.mc.session.username, 28));
+-                    this.addToSendQueue(new Packet1Login(this.mc.session.username, 29));
 +                    /**
 +                     * We use some of the unused fields in Packet 001 Login to identify the user as having Forge installed.
 +                     * This allows modded clients to connect to Vanilla server without crashing.
@@ -85,27 +85,23 @@
 +                     * identifier so we are certain it is not random, and it is Forge installed.
 +                     * The C->S dimension is set to the current Forge build number, in case we need to do any quick version checks.
 +                     */
-+                    Packet1Login pkt = new Packet1Login(mc.session.username, 28);
++                    Packet1Login pkt = new Packet1Login(mc.session.username, 29);
 +                    pkt.serverMode    = ForgePacket.FORGE_ID;
 +                    pkt.field_48170_e = ForgeHooks.buildVersion;
 +                    addToSendQueue(pkt);
                  }
                  else
                  {
-@@ -1143,4 +1196,44 @@
+@@ -1156,5 +1209,40 @@
+     public void handleCustomPayload(Packet250CustomPayload var1)
      {
-         this.addToSendQueue(new Packet0KeepAlive(par1Packet0KeepAlive.randomId));
+         ModLoader.receivePacket(var1);
-     }
-+    
-+    @Override
-+    public void handleCustomPayload(Packet250CustomPayload pkt)
-+    {
 +        MessageManager inst = MessageManager.getInstance();
-+        if (pkt.channel.equals("REGISTER")) 
++        if (var1.channel.equals("REGISTER")) 
 +        {
 +            try 
 +            {
-+                String channels = new String(pkt.data, "UTF8");
++                String channels = new String(var1.data, "UTF8");
 +                for (String channel : channels.split("\0")) 
 +                {
 +                    inst.addActiveChannel(netManager, channel);
@@ -116,11 +112,11 @@
 +                ModLoader.throwException("NetClientHandler.handleCustomPayload", ex);
 +            }
 +        } 
-+        else if (pkt.channel.equals("UNREGISTER")) 
++        else if (var1.channel.equals("UNREGISTER")) 
 +        {
 +            try 
 +            {
-+                String channels = new String(pkt.data, "UTF8");
++                String channels = new String(var1.data, "UTF8");
 +                for (String channel : channels.split("\0")) 
 +                {
 +                    inst.removeActiveChannel(netManager, channel);
@@ -133,7 +129,7 @@
 +        } 
 +        else 
 +        {
-+            inst.dispatchIncomingMessage(netManager, pkt.channel, pkt.data);
++            inst.dispatchIncomingMessage(netManager, var1.channel, var1.data);
-+        }
 +        }
      }
+ }

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

@@ -1,12 +1,11 @@
 --- ../src_base/minecraft/net/minecraft/src/RenderItem.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/RenderItem.java	0000-00-00 00:00:00.000000000 -0000
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,12 @@
  package net.minecraft.src;
  
  import java.util.Random;
 +
 +import net.minecraft.src.forge.ForgeHooksClient;
-+import net.minecraft.src.forge.ICustomItemRenderer;
 +import net.minecraft.src.forge.IItemRenderer;
 +import net.minecraft.src.forge.ItemRenderType;
 +import net.minecraft.src.forge.MinecraftForgeClient;
@@ -14,13 +13,12 @@
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.opengl.GL12;
  
-@@ -55,10 +62,80 @@
+@@ -55,10 +61,58 @@
          float var18;
          float var23;
  
 -        if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
 +        IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(var10, ItemRenderType.ENTITY);
-+        ICustomItemRenderer customRendererOld = MinecraftForgeClient.getCustomItemRenderer(var10.itemID);
 +        
 +        if (customRenderer != null)
 +        {
@@ -68,27 +66,6 @@
 +            }
 +            
 +        }
-+        //Deprecation Start
-+        else if (customRendererOld != null)
-+        {
-+            GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F);
-+            loadTexture(ForgeHooksClient.getTexture("/terrain.png", var10.getItem()));
-+            GL11.glScalef(0.5F, 0.5F, 0.5F);
-+            for(int j = 0; j < var13; j++)
-+            {
-+                GL11.glPushMatrix();
-+                if (j > 0)
-+                {
-+                    GL11.glTranslatef(
-+                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / 0.5F,
-+                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / 0.5F,
-+                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / 0.5F);
-+                }
-+                ForgeHooksClient.renderCustomItem(customRendererOld, renderBlocks, var10.itemID, var10.getItemDamage(), par1EntityItem.getBrightness(par9));
-+                GL11.glPopMatrix();
-+            }
-+        }
-+        //Deprecation End
 +        else if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
          {
              GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F);
@@ -97,7 +74,7 @@
              float var21 = 0.25F;
              var15 = Block.blocksList[var10.itemID].getRenderType();
  
-@@ -94,7 +171,7 @@
+@@ -94,7 +148,7 @@
              if (var10.getItem().func_46058_c())
              {
                  GL11.glScalef(0.5F, 0.5F, 0.5F);
@@ -106,7 +83,7 @@
  
                  for (var14 = 0; var14 <= 1; ++var14)
                  {
-@@ -120,11 +197,11 @@
+@@ -120,11 +174,11 @@
  
                  if (var10.itemID < 256)
                  {
@@ -120,49 +97,20 @@
                  }
  
                  if (this.field_27004_a)
-@@ -186,10 +263,38 @@
+@@ -186,10 +240,10 @@
          float var11;
          float var12;
          float var13;
 -
--        if (par3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par3].getRenderType()))
 +        
-+        //Deprecation Start
+         if (par3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par3].getRenderType()))
-+        ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(par3);
-+        
-+        if (customRenderer != null) 
-+        {
-+            par2RenderEngine.bindTexture(par2RenderEngine.getTexture(ForgeHooksClient.getTexture("/terrain.png", Item.itemsList[par3])));
-+            GL11.glPushMatrix();
-+            GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel);
-+            GL11.glScalef(10F, 10F, 10F);
-+            GL11.glTranslatef(1.0F, 0.5F, 1.0F);
-+            GL11.glScalef(1.0F, 1.0F, -1F);
-+            GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F);
-+            GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F);
-+            int l1 = Item.itemsList[par3].getColorFromDamage(par4, 0);
-+            float f2 = (float)(l1 >> 16 & 0xff) / 255F;
-+            float f4 = (float)(l1 >> 8 & 0xff) / 255F;
-+            float f5 = (float)(l1 & 0xff) / 255F;
-+            if(field_27004_a)
-+            {
-+                GL11.glColor4f(f2, f4, f5, 1.0F);
-+            }
-+            GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
-+            renderBlocks.useInventoryTint = field_27004_a;
-+            ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, par3, par4, 1.0F);
-+            renderBlocks.useInventoryTint = true;
-+            GL11.glPopMatrix();
-+        }
-+        //Deprecation End
-+        else if (par3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par3].getRenderType()))
          {
 -            par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/terrain.png"));
 +            par2RenderEngine.bindTexture(par2RenderEngine.getTexture(ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[par3])));
              Block var15 = Block.blocksList[par3];
              GL11.glPushMatrix();
              GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel);
-@@ -221,7 +326,7 @@
+@@ -221,7 +275,7 @@
              if (Item.itemsList[par3].func_46058_c())
              {
                  GL11.glDisable(GL11.GL_LIGHTING);
@@ -171,7 +119,7 @@
  
                  for (var8 = 0; var8 <= 1; ++var8)
                  {
-@@ -247,11 +352,11 @@
+@@ -247,11 +301,11 @@
  
                  if (par3 < 256)
                  {
@@ -185,7 +133,7 @@
                  }
  
                  var8 = Item.itemsList[par3].getColorFromDamage(par4, 0);
-@@ -279,7 +384,58 @@
+@@ -279,7 +333,58 @@
      {
          if (par3ItemStack != null)
          {

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

@@ -8,7 +8,7 @@
  public abstract class WorldProvider
  {
      /** world object being used */
-@@ -181,7 +183,7 @@
+@@ -174,7 +176,7 @@
  
      public static WorldProvider getProviderForDimension(int par0)
      {
@@ -17,7 +17,7 @@
      }
  
      /**
-@@ -232,4 +234,36 @@
+@@ -225,4 +227,36 @@
      {
          return false;
      }

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

@@ -63,12 +63,12 @@
          par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
          par2EntityPlayer.addExhaustion(0.025F);
  
--        if (this.renderAsNormalBlock() && !this.isBlockContainer && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
+-        if (this.func_50008_h() && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
-+        if (this.renderAsNormalBlock() && !hasTileEntity(par6) && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
++        if (canSilkHarvest(par1World, par2EntityPlayer, par3, par4, par5, par6) && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer.inventory))
          {
              ItemStack var8 = this.createStackedBlock(par6);
  
-@@ -962,6 +964,376 @@
+@@ -967,6 +969,396 @@
       */
      public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {}
  
@@ -441,6 +441,26 @@
 +        }
 +        return ret;
 +    }
++    
++    /**
++     * Return true from this function if the player with silk touch can harvest this block directly, and not it's normal drops.
++     * 
++     * @param world The world
++     * @param player The player doing the harvesting
++     * @param x X Position
++     * @param y Y Position
++     * @param z Z Position
++     * @param metadata The metadata
++     * @return True if the block can be directly harvested using silk touch
++     */
++    public boolean canSilkHarvest(World world, EntityPlayer player, int x, int y, int z, int metadata)
++    {
++    	if (this instanceof BlockGlass)
++    	{
++    		return true;
++    	}
++    	return renderAsNormalBlock() && !hasTileEntity(metadata);
++    }
 +    
      static
      {

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

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
-@@ -370,23 +370,23 @@
+@@ -371,7 +371,7 @@
          {
              return true;
          }
@@ -9,23 +9,27 @@
          {
              return true;
          }
--        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && par1World.isBlockNormalCube(par2 - 1, par3 + 1, par4))
+@@ -379,19 +379,19 @@
-+        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && par1World.isBlockSolidOnSide(par2 - 1, par3 + 1, par4, 0))
          {
              return true;
          }
--        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && par1World.isBlockNormalCube(par2 + 1, par3 + 1, par4))
+-        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && (par1World.isBlockNormalCube(par2 - 1, par3 + 1, par4) || func_50009_h(par1World, par2 - 1, par3, par4)))
-+        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && par1World.isBlockSolidOnSide(par2 + 1, par3 + 1, par4, 0))
++        else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && (par1World.isBlockSolidOnSide(par2 - 1, par3 + 1, par4, 0) || func_50009_h(par1World, par2 - 1, par3, par4)))
          {
              return true;
          }
--        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && par1World.isBlockNormalCube(par2, par3 + 1, par4 - 1))
+-        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && (par1World.isBlockNormalCube(par2 + 1, par3 + 1, par4) || func_50009_h(par1World, par2 + 1, par3, par4)))
-+        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && par1World.isBlockSolidOnSide(par2, par3 + 1, par4 - 1, 0))
++        else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && (par1World.isBlockSolidOnSide(par2 + 1, par3 + 1, par4, 0) || func_50009_h(par1World, par2 + 1, par3, par4)))
          {
              return true;
          }
--        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && par1World.isBlockNormalCube(par2, par3 + 1, par4 + 1))
+-        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && (par1World.isBlockNormalCube(par2, par3 + 1, par4 - 1) || func_50009_h(par1World, par2, par3, par4 - 1)))
-+        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && par1World.isBlockSolidOnSide(par2, par3 + 1, par4 + 1, 0))
++        else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && (par1World.isBlockSolidOnSide(par2, par3 + 1, par4 - 1, 0) || func_50009_h(par1World, par2, par3, par4 - 1)))
+         {
+             return true;
+         }
+-        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && (par1World.isBlockNormalCube(par2, par3 + 1, par4 + 1) || func_50009_h(par1World, par2, par3, par4 + 1)))
++        else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && (par1World.isBlockSolidOnSide(par2, par3 + 1, par4 + 1, 0) || func_50009_h(par1World, par2, par3, par4 + 1)))
          {
              return true;
          }

forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
-@@ -529,7 +529,7 @@
+@@ -545,7 +545,7 @@
                  {
                      Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12);
                  }
@@ -9,7 +9,7 @@
                  {
                      this.worldObj.removeBlockTileEntity(var11, par2, var12);
                  }
-@@ -567,31 +567,23 @@
+@@ -589,32 +589,23 @@
                          Block.blocksList[par4].onBlockAdded(this.worldObj, var11, par2, var12);
                      }
  
@@ -41,10 +41,11 @@
 -                        var13.updateContainingBlockInfo();
 -                    }
 -                }
- 
+-
                  this.isModified = true;
                  return true;
-@@ -623,7 +615,7 @@
+             }
+@@ -646,7 +637,7 @@
                  var5.setExtBlockMetadata(par1, par2 & 15, par3, par4);
                  int var7 = var5.getExtBlockID(par1, par2 & 15, par3);
  
@@ -53,7 +54,7 @@
                  {
                      TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
  
-@@ -789,34 +781,31 @@
+@@ -812,34 +803,31 @@
      {
          ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
          TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
@@ -98,7 +99,7 @@
      }
  
      /**
-@@ -831,7 +820,7 @@
+@@ -854,7 +842,7 @@
  
          if (this.isChunkLoaded)
          {
@@ -107,7 +108,7 @@
          }
      }
  
-@@ -846,8 +835,14 @@
+@@ -869,8 +857,14 @@
          par4TileEntity.yCoord = par2;
          par4TileEntity.zCoord = this.zPosition * 16 + par3;
  
@@ -123,7 +124,7 @@
              par4TileEntity.validate();
              this.chunkTileEntityMap.put(var5, par4TileEntity);
          }
-@@ -1264,4 +1259,18 @@
+@@ -1287,4 +1281,18 @@
              }
          }
      }

forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch

@@ -21,12 +21,3 @@
          if (this.world.worldProvider.canRespawnHere())
          {
              ChunkCoordinates var3 = this.world.getSpawnPoint();
-@@ -200,7 +207,7 @@
-             if (this.serverChunkGenerator != null)
-             {
-                 this.serverChunkGenerator.populate(par1IChunkProvider, par2, par3);
--                ModLoader.populateChunk(this.serverChunkGenerator, par2 << 4, par3 << 4, this.world);
-+                ModLoader.populateChunk(this.serverChunkGenerator, par2, par3, this.world);
-                 var4.setChunkModified();
-             }
-         }

forge/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch

@@ -8,7 +8,7 @@
  
  public class ConsoleCommandHandler
  {
-@@ -52,10 +53,9 @@
+@@ -52,9 +53,9 @@
                          var5.savePlayerStates();
                      }
  
@@ -16,12 +16,11 @@
 +                    for (World world : DimensionManager.getWorlds())
                      {
 -                        var7 = this.minecraftServer.worldMngr[var6];
--                        var7.saveWorld(true, (IProgressUpdate)null);
++                        var7 = (WorldServer)world;
-+                        world.saveWorld(true, null);
+                         boolean var8 = var7.levelSaving;
-                     }
+                         var7.levelSaving = false;
- 
+                         var7.saveWorld(true, (IProgressUpdate)null);
-                     this.sendNoticeToOps(var4, "Save complete.");
+@@ -67,20 +68,18 @@
-@@ -64,20 +64,18 @@
                  {
                      this.sendNoticeToOps(var4, "Disabling level saving..");
  
@@ -46,32 +45,32 @@
                      }
                  }
                  else
-@@ -353,20 +351,18 @@
+@@ -356,20 +355,18 @@
  
                                              if ("add".equalsIgnoreCase(var20))
                                              {
 -                                                for (var19 = 0; var19 < this.minecraftServer.worldMngr.length; ++var19)
 +                                                for (World world : DimensionManager.getWorlds())
                                                  {
--                                                    var22 = this.minecraftServer.worldMngr[var19];
+-                                                    var23 = this.minecraftServer.worldMngr[var19];
--                                                    var22.advanceTime(var22.getWorldTime() + (long)var8);
+-                                                    var23.advanceTime(var23.getWorldTime() + (long)var18);
-+                                                    world.advanceTime(world.getWorldTime() + (long)var8);
++                                                    world.advanceTime(world.getWorldTime() + (long)var18);
                                                  }
  
-                                                 this.sendNoticeToOps(var4, "Added " + var8 + " to time");
+                                                 this.sendNoticeToOps(var4, "Added " + var18 + " to time");
                                              }
                                              else if ("set".equalsIgnoreCase(var20))
                                              {
 -                                                for (var19 = 0; var19 < this.minecraftServer.worldMngr.length; ++var19)
 +                                                for (World world : DimensionManager.getWorlds())
                                                  {
--                                                    var22 = this.minecraftServer.worldMngr[var19];
+-                                                    var23 = this.minecraftServer.worldMngr[var19];
--                                                    var22.advanceTime((long)var8);
+-                                                    var23.advanceTime((long)var18);
-+                                                    world.advanceTime((long)var8);
++                                                    world.advanceTime((long)var18);
                                                  }
  
-                                                 this.sendNoticeToOps(var4, "Set time to " + var8);
+                                                 this.sendNoticeToOps(var4, "Set time to " + var18);
-@@ -411,7 +407,7 @@
+@@ -414,7 +411,7 @@
                                      }
                                      else if (var2.toLowerCase().startsWith("toggledownfall"))
                                      {

forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/CraftingManager.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/CraftingManager.java	0000-00-00 00:00:00.000000000 -0000
-@@ -239,7 +239,7 @@
+@@ -242,7 +242,7 @@
              }
          }
  

forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch

@@ -40,7 +40,7 @@
      public DataWatcher getDataWatcher()
      {
          return this.dataWatcher;
-@@ -1183,6 +1209,10 @@
+@@ -1215,6 +1241,10 @@
          par1NBTTagCompound.setShort("Fire", (short)this.fire);
          par1NBTTagCompound.setShort("Air", (short)this.getAir());
          par1NBTTagCompound.setBoolean("OnGround", this.onGround);
@@ -51,7 +51,7 @@
          this.writeEntityToNBT(par1NBTTagCompound);
      }
  
-@@ -1224,6 +1254,10 @@
+@@ -1256,6 +1286,10 @@
          this.onGround = par1NBTTagCompound.getBoolean("OnGround");
          this.setPosition(this.posX, this.posY, this.posZ);
          this.setRotation(this.rotationYaw, this.rotationPitch);

forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch

@@ -163,8 +163,8 @@
              }
  
              return true;
-@@ -230,7 +234,7 @@
+@@ -241,7 +245,7 @@
-             this.func_41018_e_(this.func_41020_o() - 1);
+             this.kill();
          }
  
 -        if (this.isMinecartPowered() && this.rand.nextInt(4) == 0)
@@ -172,7 +172,7 @@
          {
              this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D);
          }
-@@ -285,25 +289,20 @@
+@@ -296,25 +300,20 @@
              double var6 = 0.0078125D;
              int var8 = this.worldObj.getBlockId(var1, var2, var3);
  
@@ -201,7 +201,7 @@
                  if (var10 >= 2 && var10 <= 5)
                  {
                      this.posY = (double)(var2 + 1);
-@@ -346,7 +345,7 @@
+@@ -357,7 +356,7 @@
                  this.motionZ = var22 * var16 / var18;
                  double var24;
  
@@ -210,7 +210,7 @@
                  {
                      var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
  
-@@ -396,36 +395,8 @@
+@@ -407,36 +406,8 @@
                  this.posX = var26 + var14 * var24;
                  this.posZ = var28 + var16 * var24;
                  this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ);
@@ -249,7 +249,7 @@
  
                  if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var1 == var13[0][0] && MathHelper.floor_double(this.posZ) - var3 == var13[0][2])
                  {
-@@ -436,41 +407,7 @@
+@@ -447,41 +418,7 @@
                      this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ);
                  }
  
@@ -292,7 +292,7 @@
  
                  Vec3D var52 = this.func_182_g(this.posX, this.posY, this.posZ);
  
-@@ -499,30 +436,15 @@
+@@ -510,30 +447,15 @@
                  }
  
                  double var41;
@@ -329,7 +329,7 @@
                  {
                      var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
  
-@@ -558,41 +480,7 @@
+@@ -569,41 +491,7 @@
              }
              else
              {
@@ -372,7 +372,7 @@
              }
  
              this.rotationPitch = 0.0F;
-@@ -628,7 +516,18 @@
+@@ -639,7 +527,18 @@
              }
  
              this.setRotation(this.rotationYaw, this.rotationPitch);
@@ -392,7 +392,7 @@
  
              if (var15 != null && var15.size() > 0)
              {
-@@ -653,17 +552,8 @@
+@@ -664,17 +563,8 @@
                  this.riddenByEntity = null;
              }
  
@@ -412,7 +412,7 @@
          }
      }
  
-@@ -682,14 +572,9 @@
+@@ -693,14 +583,9 @@
  
          if (BlockRail.isRailBlock(var10))
          {
@@ -428,7 +428,7 @@
              if (var11 >= 2 && var11 <= 5)
              {
                  par3 = (double)(var8 + 1);
-@@ -754,13 +639,13 @@
+@@ -765,13 +650,13 @@
      {
          par1NBTTagCompound.setInteger("Type", this.minecartType);
  
@@ -445,7 +445,7 @@
          {
              NBTTagList var2 = new NBTTagList();
  
-@@ -786,13 +671,13 @@
+@@ -797,13 +682,13 @@
      {
          this.minecartType = par1NBTTagCompound.getInteger("Type");
  
@@ -462,7 +462,7 @@
          {
              NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
              this.cargoItems = new ItemStack[this.getSizeInventory()];
-@@ -815,11 +700,18 @@
+@@ -826,11 +711,18 @@
       */
      public void applyEntityCollision(Entity par1Entity)
      {
@@ -482,7 +482,7 @@
                  {
                      par1Entity.mountEntity(this);
                  }
-@@ -865,7 +757,7 @@
+@@ -876,7 +768,7 @@
                          double var18 = par1Entity.motionX + this.motionX;
                          double var20 = par1Entity.motionZ + this.motionZ;
  
@@ -491,7 +491,7 @@
                          {
                              this.motionX *= 0.20000000298023224D;
                              this.motionZ *= 0.20000000298023224D;
-@@ -873,7 +765,7 @@
+@@ -884,7 +776,7 @@
                              par1Entity.motionX *= 0.949999988079071D;
                              par1Entity.motionZ *= 0.949999988079071D;
                          }
@@ -500,7 +500,7 @@
                          {
                              par1Entity.motionX *= 0.20000000298023224D;
                              par1Entity.motionZ *= 0.20000000298023224D;
-@@ -908,7 +800,7 @@
+@@ -919,7 +811,7 @@
       */
      public int getSizeInventory()
      {
@@ -509,7 +509,7 @@
      }
  
      /**
-@@ -1011,7 +903,12 @@
+@@ -1022,7 +914,12 @@
       */
      public boolean interact(EntityPlayer par1EntityPlayer)
      {
@@ -523,7 +523,7 @@
          {
              if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer)
              {
-@@ -1023,14 +920,14 @@
+@@ -1034,14 +931,14 @@
                  par1EntityPlayer.mountEntity(this);
              }
          }
@@ -540,7 +540,7 @@
          {
              ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem();
  
-@@ -1062,7 +959,7 @@
+@@ -1073,7 +970,7 @@
      /**
       * Is this minecart powered (Fuel > 0)
       */
@@ -549,7 +549,7 @@
      {
          return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0;
      }
-@@ -1115,4 +1012,348 @@
+@@ -1126,4 +1023,348 @@
      {
          return this.dataWatcher.getWatchableObjectInt(18);
      }

forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch

@@ -136,10 +136,10 @@
          if (!this.worldObj.isRemote)
          {
              if (this.isPlayerSleeping() || !this.isEntityAlive())
-@@ -1717,4 +1773,45 @@
+@@ -1719,4 +1775,45 @@
-     {
-         return !this.capabilities.isFlying;
      }
+ 
+     public void func_50022_L() {}
 +    
 +    /**
 +     * Opens a Gui for the player. 

forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch

@@ -48,9 +48,9 @@
          this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 5, par1TileEntityBrewingStand.getInvName(), par1TileEntityBrewingStand.getSizeInventory()));
          this.craftingInventory = new ContainerBrewingStand(this.inventory, par1TileEntityBrewingStand);
          this.craftingInventory.windowId = this.currentWindowId;
-@@ -797,4 +803,18 @@
+@@ -805,4 +811,18 @@
-         EntityTracker var2 = this.mcServer.getEntityTracker(this.dimension);
+             this.playerNetServerHandler.sendPacket(new Packet202PlayerAbilities(this.capabilities));
-         var2.sendPacketToTrackedPlayersAndTrackedEntity(this, new Packet18Animation(par1Entity, 7));
+         }
      }
 +    
 +    /* These functions are added to have compatibility with PlayerAPI. 

forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch

@@ -12,7 +12,7 @@
      /** The world object that this object is connected to. */
      public World thisWorld;
  
-@@ -81,7 +85,7 @@
+@@ -83,7 +87,7 @@
              if (var2 != 0)
              {
                  Block var3 = Block.blocksList[var2];
@@ -21,7 +21,7 @@
  
                  if (var4 >= 1.0F)
                  {
-@@ -116,7 +120,7 @@
+@@ -118,7 +122,7 @@
                  Block.blocksList[var5].onBlockClicked(this.thisWorld, par1, par2, par3, this.thisPlayer);
              }
  
@@ -30,7 +30,7 @@
              {
                  this.blockHarvessted(par1, par2, par3);
              }
-@@ -139,7 +143,7 @@
+@@ -141,7 +145,7 @@
              if (var5 != 0)
              {
                  Block var6 = Block.blocksList[var5];
@@ -39,7 +39,7 @@
  
                  if (var7 >= 0.7F)
                  {
-@@ -166,7 +170,7 @@
+@@ -168,7 +172,7 @@
      {
          Block var4 = Block.blocksList[this.thisWorld.getBlockId(par1, par2, par3)];
          int var5 = this.thisWorld.getBlockMetadata(par1, par2, par3);
@@ -48,7 +48,7 @@
  
          if (var4 != null && var6)
          {
-@@ -178,6 +182,11 @@
+@@ -180,6 +184,11 @@
  
      public boolean blockHarvessted(int par1, int par2, int par3)
      {
@@ -60,7 +60,7 @@
          int var4 = this.thisWorld.getBlockId(par1, par2, par3);
          int var5 = this.thisWorld.getBlockMetadata(par1, par2, par3);
          this.thisWorld.playAuxSFXAtEntity(this.thisPlayer, 2001, par1, par2, par3, var4 + (this.thisWorld.getBlockMetadata(par1, par2, par3) << 12));
-@@ -190,7 +199,7 @@
+@@ -192,7 +201,7 @@
          else
          {
              ItemStack var7 = this.thisPlayer.getCurrentEquippedItem();
@@ -69,7 +69,7 @@
  
              if (var7 != null)
              {
-@@ -200,6 +209,7 @@
+@@ -202,6 +211,7 @@
                  {
                      var7.onItemDestroyedByUse(this.thisPlayer);
                      this.thisPlayer.destroyCurrentEquippedItem();
@@ -77,7 +77,7 @@
                  }
              }
  
-@@ -246,6 +256,11 @@
+@@ -248,6 +258,11 @@
       */
      public boolean activeBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7)
      {
@@ -89,7 +89,7 @@
          int var8 = par2World.getBlockId(par4, par5, par6);
  
          if (var8 > 0 && Block.blocksList[var8].blockActivated(par2World, par4, par5, par6, par1EntityPlayer))
-@@ -267,7 +282,15 @@
+@@ -269,7 +284,15 @@
          }
          else
          {
@@ -106,7 +106,7 @@
          }
      }
  
-@@ -278,4 +301,13 @@
+@@ -280,4 +303,13 @@
      {
          this.thisWorld = par1WorldServer;
      }

forge/patches/minecraft_server/net/minecraft/src/ModLoader.java.patch

@@ -92,7 +92,7 @@
              }
  
              Iterator var20 = modList.iterator();
-@@ -786,9 +811,10 @@
+@@ -774,9 +799,10 @@
  
          long var1 = 0L;
  
@@ -105,7 +105,7 @@
              Iterator var3 = inGameHooks.entrySet().iterator();
  
              while (var3.hasNext())
-@@ -1111,6 +1137,12 @@
+@@ -1099,6 +1125,12 @@
          }
      }
  
@@ -118,7 +118,7 @@
      public static void registerTileEntity(Class var0, String var1)
      {
          try
-@@ -1220,6 +1252,18 @@
+@@ -1208,6 +1240,18 @@
          }
      }
  
@@ -137,7 +137,7 @@
      public static void setPrivateValue(Class var0, Object var1, int var2, Object var3) throws IllegalArgumentException, SecurityException, NoSuchFieldException
      {
          try
-@@ -1646,4 +1690,9 @@
+@@ -1634,4 +1678,9 @@
  
          init();
      }

forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch

@@ -18,7 +18,7 @@
      }
  
      /**
-@@ -163,7 +167,37 @@
+@@ -164,7 +168,37 @@
              }
  
              var2.func_20057_k();

forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch

@@ -55,9 +55,9 @@
          }
      }
  
-@@ -960,4 +967,49 @@
+@@ -965,4 +972,49 @@
      {
-         return true;
+         this.playerEntity.capabilities.isFlying = par1Packet202PlayerAbilities.field_50005_b && this.playerEntity.capabilities.allowFlying;
      }
 +    
 +    public EntityPlayerMP getPlayerEntity()

forge/setup.bat

@@ -18,8 +18,6 @@ pushd .. >nul
     echo | cmd /C decompile.bat -r
   )
 
-  .\runtime\bin\python\python_mcp forge\clean_src.py src  
-
   echo | cmd /C updatemd5.bat -f
 
   rmdir /S /Q src_base

forge/setup.sh

@@ -34,7 +34,6 @@ rm -rf src src_work src_forge
 
 if [ ! -d src_base ] ; then
 	./decompile.sh
-    python forge/clean_src.py src
 	mv src src_base
 fi
 

forge/version.txt

@@ -1 +1 @@
-1 4 1 0
+2 0 0 0