MCP Conf update for 1.2.5

2012-04-06 01:57:50 -07:00 · 2012-04-06 01:57:50 -07:00 · 7c148ffa60
parent f327dd5d7f
commit 7c148ffa60
14 changed files with 584 additions and 495 deletions
--- a/forge/.gitignore
+++ b/forge/.gitignore
@ -1 +1,4 @@
 /*.zip
+/fml/
+/logs/
+/*.pyc
--- a/forge/conf/client.exc
+++ b/forge/conf/client.exc
@ -1,5 +1,5 @@
-#max index=1209
-#Fri Mar 23 22:29:01 NZDT 2012
+#max index=1301
+#Fri Mar 30 23:13:44 CEST 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_
@ -242,6 +242,8 @@ net/minecraft/client/Minecraft.func_28003_b(Lnet/minecraft/src/UnexpectedThrowab
 net/minecraft/client/Minecraft.func_40001_x()V=|
 net/minecraft/client/Minecraft.func_40002_b(Ljava/lang/String;)V=|p_40002_1_
 net/minecraft/client/Minecraft.func_40003_b(I)V=|p_40003_1_
+net/minecraft/client/Minecraft.func_52003_C()Ljava/lang/String;=|
+net/minecraft/client/Minecraft.func_52004_D()V=|
 net/minecraft/client/Minecraft.func_6237_k(I)V=|p_6237_1_
 net/minecraft/client/Minecraft.func_6238_a(J)V=|p_6238_1_
 net/minecraft/client/Minecraft.func_6239_p(ZIZ)V=|p_6239_1_,p_6239_2_,p_6239_3_
@ -1472,6 +1474,7 @@ 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/ChatAllowedCharacters.func_52019_a(Ljava/lang/String;)Ljava/lang/String;=|p_52019_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;=|
@ -2607,7 +2610,6 @@ net/minecraft/src/EntityClientPlayerMP.func_48152_as()Lnet/minecraft/src/EntityI
 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=|
 net/minecraft/src/EntityCloudFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i152_1_,p_i152_2_,p_i152_4_,p_i152_6_,p_i152_8_,p_i152_10_,p_i152_12_
 net/minecraft/src/EntityCloudFX.func_370_e_()V=|
 net/minecraft/src/EntityCloudFX.func_406_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_406_1_,p_406_2_,p_406_3_,p_406_4_,p_406_5_,p_406_6_,p_406_7_
@ -2707,7 +2709,6 @@ net/minecraft/src/EntityDropParticleFX.<init>(Lnet/minecraft/src/World;DDDLnet/m
 net/minecraft/src/EntityDropParticleFX.func_35115_a(F)I=|p_35115_1_
 net/minecraft/src/EntityDropParticleFX.func_370_e_()V=|
 net/minecraft/src/EntityDropParticleFX.func_382_a(F)F=|p_382_1_
-net/minecraft/src/EntityDropParticleFX.func_406_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_406_1_,p_406_2_,p_406_3_,p_406_4_,p_406_5_,p_406_6_,p_406_7_
 net/minecraft/src/EntityEgg.<init>(Lnet/minecraft/src/World;)V=|p_i539_1_
 net/minecraft/src/EntityEgg.<init>(Lnet/minecraft/src/World;DDD)V=|p_i541_1_,p_i541_2_,p_i541_4_,p_i541_6_
 net/minecraft/src/EntityEgg.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;)V=|p_i540_1_,p_i540_2_
@ -2717,7 +2718,6 @@ net/minecraft/src/EntityEnchantmentTableParticleFX.<init>(Lnet/minecraft/src/Wor
 net/minecraft/src/EntityEnchantmentTableParticleFX.func_35115_a(F)I=|p_35115_1_
 net/minecraft/src/EntityEnchantmentTableParticleFX.func_370_e_()V=|
 net/minecraft/src/EntityEnchantmentTableParticleFX.func_382_a(F)F=|p_382_1_
-net/minecraft/src/EntityEnchantmentTableParticleFX.func_406_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_406_1_,p_406_2_,p_406_3_,p_406_4_,p_406_5_,p_406_6_,p_406_7_
 net/minecraft/src/EntityEnderCrystal.<init>(Lnet/minecraft/src/World;)V=|p_i302_1_
 net/minecraft/src/EntityEnderCrystal.<init>(Lnet/minecraft/src/World;DDD)V=|p_i303_1_,p_i303_2_,p_i303_4_,p_i303_6_
 net/minecraft/src/EntityEnderCrystal.func_21057_b()V=|
@ -2778,7 +2778,6 @@ net/minecraft/src/EntityExpBottle.func_40077_c()F=|
 net/minecraft/src/EntityExpBottle.func_40078_a(Lnet/minecraft/src/MovingObjectPosition;)V=|p_40078_1_
 net/minecraft/src/EntityExplodeFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i711_1_,p_i711_2_,p_i711_4_,p_i711_6_,p_i711_8_,p_i711_10_,p_i711_12_
 net/minecraft/src/EntityExplodeFX.func_370_e_()V=|
-net/minecraft/src/EntityExplodeFX.func_406_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_406_1_,p_406_2_,p_406_3_,p_406_4_,p_406_5_,p_406_6_,p_406_7_
 net/minecraft/src/EntityFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i579_1_,p_i579_2_,p_i579_4_,p_i579_6_,p_i579_8_,p_i579_10_,p_i579_12_
 net/minecraft/src/EntityFX.func_21057_b()V=|
 net/minecraft/src/EntityFX.func_25021_m()Z=|
@ -3390,7 +3389,6 @@ net/minecraft/src/EntityPotion.func_40078_a(Lnet/minecraft/src/MovingObjectPosit
 net/minecraft/src/EntityPotion.func_40088_g()I=|
 net/minecraft/src/EntityRainFX.<init>(Lnet/minecraft/src/World;DDD)V=|p_i568_1_,p_i568_2_,p_i568_4_,p_i568_6_
 net/minecraft/src/EntityRainFX.func_370_e_()V=|
-net/minecraft/src/EntityRainFX.func_406_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_406_1_,p_406_2_,p_406_3_,p_406_4_,p_406_5_,p_406_6_,p_406_7_
 net/minecraft/src/EntityReddustFX.<init>(Lnet/minecraft/src/World;DDDFFF)V=|p_i732_1_,p_i732_2_,p_i732_4_,p_i732_6_,p_i732_8_,p_i732_9_,p_i732_10_
 net/minecraft/src/EntityReddustFX.<init>(Lnet/minecraft/src/World;DDDFFFF)V=|p_i733_1_,p_i733_2_,p_i733_4_,p_i733_6_,p_i733_8_,p_i733_9_,p_i733_10_,p_i733_11_
 net/minecraft/src/EntityReddustFX.func_370_e_()V=|
@ -3831,6 +3829,7 @@ 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_52014_d(Ljava/lang/String;)Ljava/lang/String;=|p_52014_0_
 net/minecraft/src/FontRenderer.func_871_a(Ljava/lang/String;)I=|p_871_1_
 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/FoodStats.<init>()V=|
@ -4534,6 +4533,7 @@ net/minecraft/src/InventoryPlayer.func_509_b(Lnet/minecraft/src/Block;)Z=|p_509_
 net/minecraft/src/InventoryPlayer.func_510_b(I)Z=|p_510_1_
 net/minecraft/src/InventoryPlayer.func_511_b()V=|
 net/minecraft/src/InventoryPlayer.func_513_b(Lnet/minecraft/src/NBTTagList;)V=|p_513_1_
+net/minecraft/src/InventoryPlayer.func_52006_a(Lnet/minecraft/src/Item;I)V=|p_52006_1_,p_52006_2_
 net/minecraft/src/IsoImageBuffer.<init>(Lnet/minecraft/src/World;II)V=|p_i462_1_,p_i462_2_,p_i462_3_
 net/minecraft/src/IsoImageBuffer.func_888_a(Lnet/minecraft/src/World;II)V=|p_888_1_,p_888_2_,p_888_3_
 net/minecraft/src/IsoImageBuffer.func_889_a(II)V=|p_889_1_,p_889_2_
@ -5104,7 +5104,6 @@ net/minecraft/src/ModelSpider.func_864_b(Lnet/minecraft/src/Entity;FFFFFF)V=|p_8
 net/minecraft/src/ModelSquid.<init>()V=|
 net/minecraft/src/ModelSquid.func_863_a(FFFFFF)V=|p_863_1_,p_863_2_,p_863_3_,p_863_4_,p_863_5_,p_863_6_
 net/minecraft/src/ModelSquid.func_864_b(Lnet/minecraft/src/Entity;FFFFFF)V=|p_864_1_,p_864_2_,p_864_3_,p_864_4_,p_864_5_,p_864_6_,p_864_7_
-net/minecraft/src/ModelVillager.<init>()V=|
 net/minecraft/src/ModelVillager.<init>(F)V=|p_i638_1_
 net/minecraft/src/ModelVillager.<init>(FF)V=|p_i639_1_,p_i639_2_
 net/minecraft/src/ModelVillager.func_863_a(FFFFFF)V=|p_863_1_,p_863_2_,p_863_3_,p_863_4_,p_863_5_,p_863_6_
@ -5122,9 +5121,9 @@ net/minecraft/src/MouseHelper.func_772_c()V=|
 net/minecraft/src/MouseHelper.func_773_b()V=|
 net/minecraft/src/MouseHelper.func_774_a()V=|
 net/minecraft/src/MovementInput.<init>()V=|
-net/minecraft/src/MovementInput.func_797_a(Lnet/minecraft/src/EntityPlayer;)V=|p_797_1_
+net/minecraft/src/MovementInput.func_52013_a()V=|
 net/minecraft/src/MovementInputFromOptions.<init>(Lnet/minecraft/src/GameSettings;)V=|p_i372_1_
-net/minecraft/src/MovementInputFromOptions.func_797_a(Lnet/minecraft/src/EntityPlayer;)V=|p_797_1_
+net/minecraft/src/MovementInputFromOptions.func_52013_a()V=|
 net/minecraft/src/MovingObjectPosition.<init>(IIIILnet/minecraft/src/Vec3D;)V=|p_i516_1_,p_i516_2_,p_i516_3_,p_i516_4_,p_i516_5_
 net/minecraft/src/MovingObjectPosition.<init>(Lnet/minecraft/src/Entity;)V=|p_i517_1_
 net/minecraft/src/MusInputStream.<init>(Lnet/minecraft/src/CodecMus;Ljava/net/URL;Ljava/io/InputStream;)V=|p_i46_1_,p_i46_2_,p_i46_3_
@ -5949,15 +5948,6 @@ net/minecraft/src/PlayerControllerCreative.func_717_a(Lnet/minecraft/src/World;)
 net/minecraft/src/PlayerControllerCreative.func_719_a(IIII)V=|p_719_1_,p_719_2_,p_719_3_,p_719_4_
 net/minecraft/src/PlayerControllerCreative.func_722_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;IIII)Z=|p_722_1_,p_722_2_,p_722_3_,p_722_4_,p_722_5_,p_722_6_,p_722_7_
 net/minecraft/src/PlayerControllerCreative.func_727_b()F=|
-net/minecraft/src/PlayerControllerDemo.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i1078_1_
-net/minecraft/src/PlayerControllerDemo.func_48516_j()V=|
-net/minecraft/src/PlayerControllerDemo.func_6470_c(IIII)V=|p_6470_1_,p_6470_2_,p_6470_3_,p_6470_4_
-net/minecraft/src/PlayerControllerDemo.func_6471_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;)Z=|p_6471_1_,p_6471_2_,p_6471_3_
-net/minecraft/src/PlayerControllerDemo.func_6472_b(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/Entity;)V=|p_6472_1_,p_6472_2_
-net/minecraft/src/PlayerControllerDemo.func_6474_c()V=|
-net/minecraft/src/PlayerControllerDemo.func_719_a(IIII)V=|p_719_1_,p_719_2_,p_719_3_,p_719_4_
-net/minecraft/src/PlayerControllerDemo.func_722_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;IIII)Z=|p_722_1_,p_722_2_,p_722_3_,p_722_4_,p_722_5_,p_722_6_,p_722_7_
-net/minecraft/src/PlayerControllerDemo.func_729_b(IIII)Z=|p_729_1_,p_729_2_,p_729_3_,p_729_4_
 net/minecraft/src/PlayerControllerMP.<init>(Lnet/minecraft/client/Minecraft;Lnet/minecraft/src/NetClientHandler;)V=|p_i572_1_,p_i572_2_
 net/minecraft/src/PlayerControllerMP.func_20086_a(ILnet/minecraft/src/EntityPlayer;)V=|p_20086_1_,p_20086_2_
 net/minecraft/src/PlayerControllerMP.func_27174_a(IIIZLnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_27174_1_,p_27174_2_,p_27174_3_,p_27174_4_,p_27174_5_
@ -6000,16 +5990,21 @@ net/minecraft/src/PlayerControllerSP.func_719_a(IIII)V=|p_719_1_,p_719_2_,p_719_
 net/minecraft/src/PlayerControllerSP.func_722_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;IIII)Z=|p_722_1_,p_722_2_,p_722_3_,p_722_4_,p_722_5_,p_722_6_,p_722_7_
 net/minecraft/src/PlayerControllerSP.func_727_b()F=|
 net/minecraft/src/PlayerControllerSP.func_729_b(IIII)Z=|p_729_1_,p_729_2_,p_729_3_,p_729_4_
-net/minecraft/src/PlayerUsageSnooper.<init>()V=|
-net/minecraft/src/PlayerUsageSnooper.func_48472_a()V=|
-net/minecraft/src/PlayerUsageSnooper.func_48473_b()V=|
-net/minecraft/src/PlayerUsageSnooper.func_48474_a(Ljava/lang/String;Ljava/lang/String;)V=|p_48474_1_,p_48474_2_
+net/minecraft/src/PlayerUsageSnooper.<init>(Ljava/lang/String;)V=|p_i1300_1_
+net/minecraft/src/PlayerUsageSnooper.func_52020_b(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/util/Map;=|p_52020_0_
+net/minecraft/src/PlayerUsageSnooper.func_52021_a()V=|
+net/minecraft/src/PlayerUsageSnooper.func_52022_a(Ljava/lang/String;Ljava/lang/Object;)V=|p_52022_1_,p_52022_2_
+net/minecraft/src/PlayerUsageSnooper.func_52023_a(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/net/URL;=|p_52023_0_
 net/minecraft/src/PlayerUsageSnooperThread.<init>(Lnet/minecraft/src/PlayerUsageSnooper;Ljava/lang/String;)V=|p_i1050_1_,p_i1050_2_
 net/minecraft/src/PlayerUsageSnooperThread.run()V=|
 net/minecraft/src/PositionTextureVertex.<init>(FFFFF)V=|p_i725_1_,p_i725_2_,p_i725_3_,p_i725_4_,p_i725_5_
 net/minecraft/src/PositionTextureVertex.<init>(Lnet/minecraft/src/PositionTextureVertex;FF)V=|p_i726_1_,p_i726_2_,p_i726_3_
 net/minecraft/src/PositionTextureVertex.<init>(Lnet/minecraft/src/Vec3D;FF)V=|p_i727_1_,p_i727_2_,p_i727_3_
 net/minecraft/src/PositionTextureVertex.func_1115_a(FF)Lnet/minecraft/src/PositionTextureVertex;=|p_1115_1_,p_1115_2_
+net/minecraft/src/PostHttp.<init>()V=|
+net/minecraft/src/PostHttp.func_52016_a(Ljava/util/Map;)Ljava/lang/String;=|p_52016_0_
+net/minecraft/src/PostHttp.func_52017_a(Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String;=|p_52017_0_,p_52017_1_,p_52017_2_
+net/minecraft/src/PostHttp.func_52018_a(Ljava/net/URL;Ljava/util/Map;Z)Ljava/lang/String;=|p_52018_0_,p_52018_1_,p_52018_2_
 net/minecraft/src/Potion.<init>(IZI)V=|p_i734_1_,p_i734_2_,p_i734_3_
 net/minecraft/src/Potion.func_35660_a(II)Z=|p_35660_1_,p_35660_2_
 net/minecraft/src/Potion.func_35661_a(Ljava/lang/String;)Lnet/minecraft/src/Potion;=|p_35661_1_
@ -7041,6 +7036,7 @@ net/minecraft/src/TileEntityFurnace.func_488_a(Lnet/minecraft/src/ItemStack;)I=|
 net/minecraft/src/TileEntityFurnace.func_489_b(I)I=|p_489_1_
 net/minecraft/src/TileEntityFurnace.func_490_a(I)I=|p_490_1_
 net/minecraft/src/TileEntityFurnace.func_491_j()Z=|
+net/minecraft/src/TileEntityFurnace.func_52005_b(Lnet/minecraft/src/ItemStack;)Z=|p_52005_0_
 net/minecraft/src/TileEntityMobSpawner.<init>()V=|
 net/minecraft/src/TileEntityMobSpawner.func_21098_a(Ljava/lang/String;)V=|p_21098_1_
 net/minecraft/src/TileEntityMobSpawner.func_21099_a()Ljava/lang/String;=|
@ -7410,9 +7406,6 @@ net/minecraft/src/WorldClient.func_4080_j()V=|
 net/minecraft/src/WorldClient.func_4081_a()Lnet/minecraft/src/IChunkProvider;=|
 net/minecraft/src/WorldClient.func_606_b(Lnet/minecraft/src/Entity;)V=|p_606_1_
 net/minecraft/src/WorldClient.func_607_d(Lnet/minecraft/src/Entity;)V=|p_607_1_
-net/minecraft/src/WorldClient.func_634_a(IIII)Z=|p_634_1_,p_634_2_,p_634_3_,p_634_4_
-net/minecraft/src/WorldClient.func_635_c(IIII)Z=|p_635_1_,p_635_2_,p_635_3_,p_635_4_
-net/minecraft/src/WorldClient.func_643_a(IIIII)Z=|p_643_1_,p_643_2_,p_643_3_,p_643_4_,p_643_5_
 net/minecraft/src/WorldClient.func_649_g()V=|
 net/minecraft/src/WorldClient.func_660_k()V=|
 net/minecraft/src/WorldClient.func_674_a(Lnet/minecraft/src/Entity;)Z=|p_674_1_
--- a/forge/conf/client.srg
+++ b/forge/conf/client.srg
@ -325,7 +325,7 @@ CL: als net/minecraft/src/EntityAIMate
 CL: alt net/minecraft/src/EntityPigZombie
 CL: alu net/minecraft/src/GuiEditSign
 CL: alv net/minecraft/src/ComponentNetherBridgeCrossing2
-CL: alw net/minecraft/src/PlayerUsageSnooper
+CL: alw net/minecraft/src/PlayerUsageSnooperThread
 CL: alx net/minecraft/src/ItemFlintAndSteel
 CL: aly net/minecraft/src/ChunkProviderGenerate
 CL: alz net/minecraft/src/RenderGiantZombie
@ -620,7 +620,7 @@ CL: ko net/minecraft/src/ChunkProvider
 CL: kp net/minecraft/src/ComponentStrongholdStraight
 CL: kq argo/jdom/JsonNodeFactories
 CL: kr net/minecraft/src/BlockFlowing
-CL: ks net/minecraft/src/PlayerUsageSnooperThread
+CL: ks net/minecraft/src/PostHttp
 CL: kt net/minecraft/src/BlockTrapDoor
 CL: ku net/minecraft/src/ComponentStrongholdRightTurn
 CL: kv net/minecraft/src/GuiFurnace
@ -921,7 +921,7 @@ CL: vp net/minecraft/src/GuiScreen
 CL: vq net/minecraft/src/EntityPlayerSP
 CL: vr net/minecraft/src/ComponentNetherBridgeCorridor2
 CL: vs net/minecraft/src/RenderSilverfish
-CL: vt net/minecraft/src/PlayerControllerDemo
+CL: vt net/minecraft/src/PlayerUsageSnooper
 CL: vu net/minecraft/src/PathEntity
 CL: vv net/minecraft/src/Packet22Collect
 CL: vw net/minecraft/src/EntityAIMoveTwardsRestriction
@ -1268,8 +1268,8 @@ FD: abn/w net/minecraft/src/BiomeGenBase/field_48416_w
 FD: abn/x net/minecraft/src/BiomeGenBase/field_48417_x
 FD: abn/y net/minecraft/src/BiomeGenBase/field_6504_m
 FD: abn/z net/minecraft/src/BiomeGenBase/field_6503_n
-FD: abp/a net/minecraft/src/GuiButton/field_935_a
-FD: abp/b net/minecraft/src/GuiButton/field_934_b
+FD: abp/a net/minecraft/src/GuiButton/field_52008_a
+FD: abp/b net/minecraft/src/GuiButton/field_52007_b
 FD: abp/c net/minecraft/src/GuiButton/field_941_c
 FD: abp/d net/minecraft/src/GuiButton/field_940_d
 FD: abp/e net/minecraft/src/GuiButton/field_939_e
@ -1532,6 +1532,7 @@ FD: acy/j net/minecraft/src/EntityAIOpenDoor/field_48327_j
 FD: acz/a net/minecraft/src/GuiScreenServerList/field_35319_a
 FD: acz/b net/minecraft/src/GuiScreenServerList/field_35317_b
 FD: acz/c net/minecraft/src/GuiScreenServerList/field_35318_c
+FD: acz/d net/minecraft/src/GuiScreenServerList/field_52009_d
 FD: ad/a net/minecraft/src/IntCache/field_35273_a
 FD: ad/b net/minecraft/src/IntCache/field_35271_b
 FD: ad/c net/minecraft/src/IntCache/field_35272_c
@ -1691,6 +1692,7 @@ FD: afc/au net/minecraft/src/EntityEnchantmentTableParticleFX/field_40109_aw
 FD: afc/av net/minecraft/src/EntityEnchantmentTableParticleFX/field_40108_ax
 FD: afc/aw net/minecraft/src/EntityEnchantmentTableParticleFX/field_40106_ay
 FD: afd/a net/minecraft/src/Packet3Chat/field_517_a
+FD: afd/b net/minecraft/src/Packet3Chat/field_52010_b
 FD: aff/c net/minecraft/src/PlayerControllerCreative/field_35647_c
 FD: afi/a net/minecraft/src/ComponentVillageWell/field_35104_a
 FD: afi/b net/minecraft/src/ComponentVillageWell/field_35103_b
@ -1952,7 +1954,6 @@ FD: aix/d net/minecraft/src/TerrainTextureManager/field_1185_d
 FD: aix/e net/minecraft/src/TerrainTextureManager/field_1184_e
 FD: aix/f net/minecraft/src/TerrainTextureManager/field_1183_f
 FD: aix/g net/minecraft/src/TerrainTextureManager/field_1182_g
-FD: aiy/a net/minecraft/src/GuiIngame/field_933_a
 FD: aiy/b net/minecraft/src/GuiIngame/field_6446_b
 FD: aiy/c net/minecraft/src/GuiIngame/field_931_c
 FD: aiy/d net/minecraft/src/GuiIngame/field_930_d
@ -2124,10 +2125,7 @@ FD: alu/b net/minecraft/src/GuiEditSign/field_1002_h
 FD: alu/c net/minecraft/src/GuiEditSign/field_4189_i
 FD: alu/d net/minecraft/src/GuiEditSign/field_1000_j
 FD: alu/e net/minecraft/src/GuiEditSign/field_20083_l
-FD: alw/a net/minecraft/src/PlayerUsageSnooper/field_48478_a
-FD: alw/b net/minecraft/src/PlayerUsageSnooper/field_48476_b
-FD: alw/c net/minecraft/src/PlayerUsageSnooper/field_48477_c
-FD: alw/d net/minecraft/src/PlayerUsageSnooper/field_48475_d
+FD: alw/a net/minecraft/src/PlayerUsageSnooperThread/field_52012_a
 FD: aly/a net/minecraft/src/ChunkProviderGenerate/field_922_a
 FD: aly/b net/minecraft/src/ChunkProviderGenerate/field_921_b
 FD: aly/c net/minecraft/src/ChunkProviderGenerate/field_920_c
@ -3071,7 +3069,6 @@ FD: kp/c net/minecraft/src/ComponentStrongholdStraight/field_35049_c
 FD: kr/a net/minecraft/src/BlockFlowing/field_460_a
 FD: kr/b net/minecraft/src/BlockFlowing/field_459_b
 FD: kr/c net/minecraft/src/BlockFlowing/field_461_c
-FD: ks/a net/minecraft/src/PlayerUsageSnooperThread/field_48553_a
 FD: kv/h net/minecraft/src/GuiFurnace/field_978_j
 FD: kw/a net/minecraft/src/TileEntity/field_820_a
 FD: kw/b net/minecraft/src/TileEntity/field_819_b
@ -3514,6 +3511,7 @@ FD: nl/n net/minecraft/src/FontRenderer/field_50115_n
 FD: nl/o net/minecraft/src/FontRenderer/field_50116_o
 FD: nl/p net/minecraft/src/FontRenderer/field_50118_p
 FD: nl/q net/minecraft/src/FontRenderer/field_50117_q
+FD: nl/r net/minecraft/src/FontRenderer/field_52015_r
 FD: nm/a net/minecraft/src/EntityArrow/field_28020_a
 FD: nm/am net/minecraft/src/EntityArrow/field_9318_d
 FD: nm/an net/minecraft/src/EntityArrow/field_9317_e
@ -3700,7 +3698,6 @@ FD: ow/a net/minecraft/src/NBTTagShort/field_1088_a
 FD: ox/a net/minecraft/src/Teleporter/field_4232_a
 FD: oy/a net/minecraft/src/MovementInput/field_1174_a
 FD: oy/b net/minecraft/src/MovementInput/field_1173_b
-FD: oy/c net/minecraft/src/MovementInput/field_1177_c
 FD: oy/d net/minecraft/src/MovementInput/field_1176_d
 FD: oy/e net/minecraft/src/MovementInput/field_1175_e
 FD: oz/a net/minecraft/src/GuiControls/field_954_a
@ -4081,7 +4078,6 @@ FD: rt/b net/minecraft/src/EntityFX/field_669_c
 FD: rt/c net/minecraft/src/EntityFX/field_668_d
 FD: rt/d net/minecraft/src/EntityFX/field_20923_e
 FD: rt/e net/minecraft/src/EntityFX/field_666_f
-FD: rv/a net/minecraft/src/EntityOtherPlayerMP/field_20924_a
 FD: rv/am net/minecraft/src/EntityOtherPlayerMP/field_782_bj
 FD: rv/an net/minecraft/src/EntityOtherPlayerMP/field_780_bk
 FD: rv/ao net/minecraft/src/EntityOtherPlayerMP/field_786_bl
@ -4121,7 +4117,6 @@ FD: sf/h net/minecraft/src/EntityAIArrowAttack/field_48374_h
 FD: sj/a net/minecraft/src/ChunkCoordIntPair/field_189_a
 FD: sj/b net/minecraft/src/ChunkCoordIntPair/field_188_b
 FD: sk/a net/minecraft/src/EntityCritFX/field_35137_a
-FD: sk/au net/minecraft/src/EntityCritFX/field_35136_ay
 FD: sl/a net/minecraft/src/SlotEnchantment/field_40443_a
 FD: sm/h net/minecraft/src/GuiEnchantment/field_40227_h
 FD: sm/i net/minecraft/src/GuiEnchantment/field_40229_i
@ -4183,7 +4178,6 @@ FD: tg/c net/minecraft/src/RenderBiped/field_4013_a
 FD: tg/d net/minecraft/src/RenderBiped/field_40296_d
 FD: th/a net/minecraft/src/TextureOffset/field_40734_a
 FD: th/b net/minecraft/src/TextureOffset/field_40733_b
-FD: ti/a net/minecraft/src/GuiMemoryErrorScreen/field_28098_a
 FD: tj/a net/minecraft/src/SlotEnchantmentTable/field_40070_a
 FD: tk/a net/minecraft/src/RecipesArmor/field_1681_a
 FD: tk/b net/minecraft/src/RecipesArmor/field_1680_b
@ -4316,10 +4310,6 @@ FD: vb/b net/minecraft/src/ModelVillager/field_40338_b
 FD: vb/c net/minecraft/src/ModelVillager/field_40339_c
 FD: vb/d net/minecraft/src/ModelVillager/field_40336_d
 FD: vb/e net/minecraft/src/ModelVillager/field_40337_e
-FD: vb/f net/minecraft/src/ModelVillager/field_40334_f
-FD: vb/g net/minecraft/src/ModelVillager/field_40335_g
-FD: vb/n net/minecraft/src/ModelVillager/field_40341_n
-FD: vb/o net/minecraft/src/ModelVillager/field_40342_o
 FD: vc/a net/minecraft/src/StatsSyncher/field_27438_a
 FD: vc/b net/minecraft/src/StatsSyncher/field_27437_b
 FD: vc/c net/minecraft/src/StatsSyncher/field_27436_c
@ -4454,8 +4444,8 @@ FD: vq/cm net/minecraft/src/EntityPlayerSP/field_21904_bK
 FD: vq/cn net/minecraft/src/EntityPlayerSP/field_21902_bL
 FD: vq/d net/minecraft/src/EntityPlayerSP/field_35221_d
 FD: vq/e net/minecraft/src/EntityPlayerSP/field_35222_e
-FD: vt/c net/minecraft/src/PlayerControllerDemo/field_48518_c
-FD: vt/d net/minecraft/src/PlayerControllerDemo/field_48517_d
+FD: vt/a net/minecraft/src/PlayerUsageSnooper/field_52025_a
+FD: vt/b net/minecraft/src/PlayerUsageSnooper/field_52024_b
 FD: vu/a net/minecraft/src/PathEntity/field_1764_b
 FD: vu/b net/minecraft/src/PathEntity/field_48649_b
 FD: vu/c net/minecraft/src/PathEntity/field_1765_a
@ -4576,6 +4566,7 @@ FD: x/d net/minecraft/src/EntityAIOcelotSit/field_50081_d
 FD: x/e net/minecraft/src/EntityAIOcelotSit/field_50082_e
 FD: x/f net/minecraft/src/EntityAIOcelotSit/field_50079_f
 FD: x/g net/minecraft/src/EntityAIOcelotSit/field_50080_g
+FD: x/h net/minecraft/src/EntityAIOcelotSit/field_52011_h
 FD: xa/a net/minecraft/src/BlockPumpkin/field_4072_a
 FD: xc/a net/minecraft/src/BlockBrewingStand/field_40214_a
 FD: xd/A net/minecraft/src/World/field_48465_A
@ -5157,6 +5148,7 @@ MD: aak/a (Laan;)Z net/minecraft/src/InventoryPlayer/func_504_a (Lnet/minecraft/
 MD: aak/a (Lnn;)I net/minecraft/src/InventoryPlayer/func_502_a (Lnet/minecraft/src/Entity;)I
 MD: aak/a (Lno;)Lno; net/minecraft/src/InventoryPlayer/func_493_a (Lnet/minecraft/src/NBTTagList;)Lnet/minecraft/src/NBTTagList;
 MD: aak/a (Lpb;)F net/minecraft/src/InventoryPlayer/func_508_a (Lnet/minecraft/src/Block;)F
+MD: aak/a (Lyr;I)V net/minecraft/src/InventoryPlayer/func_52006_a (Lnet/minecraft/src/Item;I)V
 MD: aak/a_ (Lyw;)Z net/minecraft/src/InventoryPlayer/func_20070_a_ (Lnet/minecraft/src/EntityPlayer;)Z
 MD: aak/b ()Laan; net/minecraft/src/InventoryPlayer/func_494_a ()Lnet/minecraft/src/ItemStack;
 MD: aak/b (I)Laan; net/minecraft/src/InventoryPlayer/func_48081_b (I)Lnet/minecraft/src/ItemStack;
@ -6195,7 +6187,6 @@ MD: afa/valueOf (Ljava/lang/String;)Lafa; net/minecraft/src/EnumOS2/valueOf (Lja
 MD: afa/values ()[Lafa; net/minecraft/src/EnumOS2/values ()[Lnet/minecraft/src/EnumOS2;
 MD: afc/J_ ()V net/minecraft/src/EntityEnchantmentTableParticleFX/func_370_e_ ()V
 MD: afc/a (F)F net/minecraft/src/EntityEnchantmentTableParticleFX/func_382_a (F)F
-MD: afc/a (Ladz;FFFFFF)V net/minecraft/src/EntityEnchantmentTableParticleFX/func_406_a (Lnet/minecraft/src/Tessellator;FFFFFF)V
 MD: afc/b (F)I net/minecraft/src/EntityEnchantmentTableParticleFX/func_35115_a (F)I
 MD: afd/a ()I net/minecraft/src/Packet3Chat/func_329_a ()I
 MD: afd/a (Ljava/io/DataInputStream;)V net/minecraft/src/Packet3Chat/func_327_a (Ljava/io/DataInputStream;)V
@ -6481,6 +6472,7 @@ MD: ahg/a (Laan;)I net/minecraft/src/TileEntityFurnace/func_488_a (Lnet/minecraf
 MD: ahg/a (Lady;)V net/minecraft/src/TileEntityFurnace/func_482_a (Lnet/minecraft/src/NBTTagCompound;)V
 MD: ahg/a_ (Lyw;)Z net/minecraft/src/TileEntityFurnace/func_20070_a_ (Lnet/minecraft/src/EntityPlayer;)Z
 MD: ahg/b (I)Laan; net/minecraft/src/TileEntityFurnace/func_48081_b (I)Lnet/minecraft/src/ItemStack;
+MD: ahg/b (Laan;)Z net/minecraft/src/TileEntityFurnace/func_52005_b (Lnet/minecraft/src/ItemStack;)Z
 MD: ahg/b (Lady;)V net/minecraft/src/TileEntityFurnace/func_481_b (Lnet/minecraft/src/NBTTagCompound;)V
 MD: ahg/c ()Ljava/lang/String; net/minecraft/src/TileEntityFurnace/func_471_d ()Ljava/lang/String;
 MD: ahg/c (I)I net/minecraft/src/TileEntityFurnace/func_490_a (I)I
@ -6575,7 +6567,6 @@ MD: ahv/as ()Lfq; net/minecraft/src/EntityClientPlayerMP/func_48152_as ()Lnet/mi
 MD: ahv/ax ()V net/minecraft/src/EntityClientPlayerMP/func_457_w ()V
 MD: ahv/b (Lajw;I)V net/minecraft/src/EntityClientPlayerMP/func_27027_b (Lnet/minecraft/src/StatBase;I)V
 MD: ahv/bj ()V net/minecraft/src/EntityClientPlayerMP/func_4056_N ()V
-MD: ahv/bk ()V net/minecraft/src/EntityClientPlayerMP/func_9375_Q ()V
 MD: ahv/c (Lmd;I)V net/minecraft/src/EntityClientPlayerMP/func_4044_a (Lnet/minecraft/src/DamageSource;I)V
 MD: ahv/d (I)V net/minecraft/src/EntityClientPlayerMP/func_9372_a_ (I)V
 MD: ahv/k (I)V net/minecraft/src/EntityClientPlayerMP/func_432_b (I)V
@ -7163,9 +7154,7 @@ MD: alu/e ()V net/minecraft/src/GuiEditSign/func_6449_h ()V
 MD: alv/a (Lhe;Ljava/util/List;Ljava/util/Random;)V net/minecraft/src/ComponentNetherBridgeCrossing2/func_35004_a (Lnet/minecraft/src/StructureComponent;Ljava/util/List;Ljava/util/Random;)V
 MD: alv/a (Ljava/util/List;Ljava/util/Random;IIIII)Lalv; net/minecraft/src/ComponentNetherBridgeCrossing2/func_40025_a (Ljava/util/List;Ljava/util/Random;IIIII)Lnet/minecraft/src/ComponentNetherBridgeCrossing2;
 MD: alv/a (Lxd;Ljava/util/Random;Lqg;)Z net/minecraft/src/ComponentNetherBridgeCrossing2/func_35023_a (Lnet/minecraft/src/World;Ljava/util/Random;Lnet/minecraft/src/StructureBoundingBox;)Z
-MD: alw/a ()V net/minecraft/src/PlayerUsageSnooper/func_48472_a ()V
-MD: alw/a (Ljava/lang/String;Ljava/lang/String;)V net/minecraft/src/PlayerUsageSnooper/func_48474_a (Ljava/lang/String;Ljava/lang/String;)V
-MD: alw/b ()V net/minecraft/src/PlayerUsageSnooper/func_48473_b ()V
+MD: alw/run ()V net/minecraft/src/PlayerUsageSnooperThread/run ()V
 MD: alx/a (Laan;Lyw;Lxd;IIII)Z net/minecraft/src/ItemFlintAndSteel/func_192_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIII)Z
 MD: aly/a ()Z net/minecraft/src/ChunkProviderGenerate/func_532_a ()Z
 MD: aly/a (II)Z net/minecraft/src/ChunkProviderGenerate/func_537_a (II)Z
@ -8081,7 +8070,6 @@ MD: fz/a (F)I net/minecraft/src/BiomeGenEnd/func_4126_a (F)I
 MD: g/a ()Lrs; net/minecraft/src/ComponentVillageStartPiece/func_35105_a ()Lnet/minecraft/src/WorldChunkManager;
 MD: ga/J_ ()V net/minecraft/src/EntityDropParticleFX/func_370_e_ ()V
 MD: ga/a (F)F net/minecraft/src/EntityDropParticleFX/func_382_a (F)F
-MD: ga/a (Ladz;FFFFFF)V net/minecraft/src/EntityDropParticleFX/func_406_a (Lnet/minecraft/src/Tessellator;FFFFFF)V
 MD: ga/b (F)I net/minecraft/src/EntityDropParticleFX/func_35115_a (F)I
 MD: gb/a ()V net/minecraft/src/GuiContainer/func_570_g ()V
 MD: gb/a (CI)V net/minecraft/src/GuiContainer/func_580_a (CI)V
@ -8409,7 +8397,7 @@ MD: ii/e ()Z net/minecraft/src/WorldProviderEnd/func_48217_e ()Z
 MD: ii/f ()F net/minecraft/src/WorldProviderEnd/func_28111_d ()F
 MD: ii/g ()Luh; net/minecraft/src/WorldProviderEnd/func_40469_f ()Lnet/minecraft/src/ChunkCoordinates;
 MD: ii/h ()I net/minecraft/src/WorldProviderEnd/func_46066_g ()I
-MD: ij/a (Lyw;)V net/minecraft/src/MovementInputFromOptions/func_797_a (Lnet/minecraft/src/EntityPlayer;)V
+MD: ij/a ()V net/minecraft/src/MovementInputFromOptions/func_52013_a ()V
 MD: ik/a (Lel;DDDFF)V net/minecraft/src/RenderEnderCrystal/func_41035_a (Lnet/minecraft/src/EntityEnderCrystal;DDDFF)V
 MD: ik/a (Lnn;DDDFF)V net/minecraft/src/RenderEnderCrystal/func_147_a (Lnet/minecraft/src/Entity;DDDFF)V
 MD: il/a ()I net/minecraft/src/SlotBrewingStandPotion/func_4104_e ()I
@ -8495,14 +8483,11 @@ MD: je/a (ILnn;)V net/minecraft/src/WorldClient/func_712_a (ILnet/minecraft/src/
 MD: je/a (Lnn;)Z net/minecraft/src/WorldClient/func_674_a (Lnet/minecraft/src/Entity;)Z
 MD: je/a (Z)Z net/minecraft/src/WorldClient/func_700_a (Z)Z
 MD: je/b (I)Lnn; net/minecraft/src/WorldClient/func_710_c (I)Lnet/minecraft/src/Entity;
-MD: je/b (IIIII)Z net/minecraft/src/WorldClient/func_643_a (IIIII)Z
 MD: je/b (Lnn;)V net/minecraft/src/WorldClient/func_607_d (Lnet/minecraft/src/Entity;)V
 MD: je/c ()V net/minecraft/src/WorldClient/func_649_g ()V
-MD: je/c (IIII)Z net/minecraft/src/WorldClient/func_635_c (IIII)Z
 MD: je/c (IIIII)Z net/minecraft/src/WorldClient/func_714_c (IIIII)Z
 MD: je/c (Lnn;)V net/minecraft/src/WorldClient/func_606_b (Lnet/minecraft/src/Entity;)V
 MD: je/d ()Lca; net/minecraft/src/WorldClient/func_4081_a ()Lnet/minecraft/src/IChunkProvider;
-MD: je/d (IIII)Z net/minecraft/src/WorldClient/func_634_a (IIII)Z
 MD: je/d (Lnn;)V net/minecraft/src/WorldClient/func_678_c (Lnet/minecraft/src/Entity;)V
 MD: je/e ()V net/minecraft/src/WorldClient/func_4076_b ()V
 MD: je/f ()V net/minecraft/src/WorldClient/func_4080_j ()V
@ -8745,7 +8730,9 @@ MD: kr/j (Lxd;III)V net/minecraft/src/BlockFlowing/func_30003_j (Lnet/minecraft/
 MD: kr/k (Lxd;III)[Z net/minecraft/src/BlockFlowing/func_297_k (Lnet/minecraft/src/World;III)[Z
 MD: kr/l (Lxd;III)Z net/minecraft/src/BlockFlowing/func_295_l (Lnet/minecraft/src/World;III)Z
 MD: kr/m (Lxd;III)Z net/minecraft/src/BlockFlowing/func_298_m (Lnet/minecraft/src/World;III)Z
-MD: ks/run ()V net/minecraft/src/PlayerUsageSnooperThread/run ()V
+MD: ks/a (Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String; net/minecraft/src/PostHttp/func_52017_a (Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String;
+MD: ks/a (Ljava/net/URL;Ljava/util/Map;Z)Ljava/lang/String; net/minecraft/src/PostHttp/func_52018_a (Ljava/net/URL;Ljava/util/Map;Z)Ljava/lang/String;
+MD: ks/a (Ljava/util/Map;)Ljava/lang/String; net/minecraft/src/PostHttp/func_52016_a (Ljava/util/Map;)Ljava/lang/String;
 MD: kt/a ()Z net/minecraft/src/BlockTrapDoor/func_217_b ()Z
 MD: kt/a (Lali;III)V net/minecraft/src/BlockTrapDoor/func_238_a (Lnet/minecraft/src/IBlockAccess;III)V
 MD: kt/a (Lxd;IIII)V net/minecraft/src/BlockTrapDoor/func_226_a (Lnet/minecraft/src/World;IIII)V
@ -9135,6 +9122,8 @@ MD: ne/c ()Z net/minecraft/src/FoodStats/func_35770_c ()Z
 MD: ne/d ()F net/minecraft/src/FoodStats/func_35760_d ()F
 MD: net/minecraft/client/Minecraft/A ()V net/minecraft/client/Minecraft/func_6242_u ()V
 MD: net/minecraft/client/Minecraft/B ()V net/minecraft/client/Minecraft/func_6265_t ()V
+MD: net/minecraft/client/Minecraft/C ()Ljava/lang/String; net/minecraft/client/Minecraft/func_52003_C ()Ljava/lang/String;
+MD: net/minecraft/client/Minecraft/D ()V net/minecraft/client/Minecraft/func_52004_D ()V
 MD: net/minecraft/client/Minecraft/a ()V net/minecraft/client/Minecraft/func_6271_a ()V
 MD: net/minecraft/client/Minecraft/a (I)V net/minecraft/client/Minecraft/func_6237_k (I)V
 MD: net/minecraft/client/Minecraft/a (II)V net/minecraft/client/Minecraft/func_6249_a (II)V
@ -9229,6 +9218,7 @@ MD: nl/b (Z)V net/minecraft/src/FontRenderer/func_46123_b (Z)V
 MD: nl/c (C)Z net/minecraft/src/FontRenderer/func_50109_c (C)Z
 MD: nl/c (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/FontRenderer/func_50114_c (Ljava/lang/String;)Ljava/lang/String;
 MD: nl/c (Ljava/lang/String;I)Ljava/util/List; net/minecraft/src/FontRenderer/func_50108_c (Ljava/lang/String;I)Ljava/util/List;
+MD: nl/d (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/FontRenderer/func_52014_d (Ljava/lang/String;)Ljava/lang/String;
 MD: nl/d (Ljava/lang/String;I)Ljava/lang/String; net/minecraft/src/FontRenderer/func_50113_d (Ljava/lang/String;I)Ljava/lang/String;
 MD: nl/e (Ljava/lang/String;I)I net/minecraft/src/FontRenderer/func_50102_e (Ljava/lang/String;I)I
 MD: nm/J_ ()V net/minecraft/src/EntityArrow/func_370_e_ ()V
@ -9599,7 +9589,7 @@ MD: ow/toString ()Ljava/lang/String; net/minecraft/src/NBTTagShort/toString ()Lj
 MD: ox/a (Lxd;Lnn;)V net/minecraft/src/Teleporter/func_4107_a (Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;)V
 MD: ox/b (Lxd;Lnn;)Z net/minecraft/src/Teleporter/func_4106_b (Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;)Z
 MD: ox/c (Lxd;Lnn;)Z net/minecraft/src/Teleporter/func_4108_c (Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;)Z
-MD: oy/a (Lyw;)V net/minecraft/src/MovementInput/func_797_a (Lnet/minecraft/src/EntityPlayer;)V
+MD: oy/a ()V net/minecraft/src/MovementInput/func_52013_a ()V
 MD: oz/a (CI)V net/minecraft/src/GuiControls/func_580_a (CI)V
 MD: oz/a (IIF)V net/minecraft/src/GuiControls/func_571_a (IIF)V
 MD: oz/a (III)V net/minecraft/src/GuiControls/func_565_a (III)V
@ -10013,7 +10003,6 @@ MD: re/a (Lxd;IIII[B)V net/minecraft/src/MapGenRavine/func_868_a (Lnet/minecraft
 MD: rf/a (Lxd;III)V net/minecraft/src/BlockSponge/func_235_e (Lnet/minecraft/src/World;III)V
 MD: rf/b_ (Lxd;III)V net/minecraft/src/BlockSponge/func_214_b (Lnet/minecraft/src/World;III)V
 MD: rg/J_ ()V net/minecraft/src/EntityRainFX/func_370_e_ ()V
-MD: rg/a (Ladz;FFFFFF)V net/minecraft/src/EntityRainFX/func_406_a (Lnet/minecraft/src/Tessellator;FFFFFF)V
 MD: rh/a ()Z net/minecraft/src/PathNavigate/func_48658_a ()Z
 MD: rh/a (DDD)Lvu; net/minecraft/src/PathNavigate/func_48671_a (DDD)Lnet/minecraft/src/PathEntity;
 MD: rh/a (DDDF)Z net/minecraft/src/PathNavigate/func_48666_a (DDDF)Z
@ -10739,14 +10728,10 @@ MD: vs/a (Lqn;)F net/minecraft/src/RenderSilverfish/func_35447_a (Lnet/minecraft
 MD: vs/a (Lqn;DDDFF)V net/minecraft/src/RenderSilverfish/func_35448_a (Lnet/minecraft/src/EntitySilverfish;DDDFF)V
 MD: vs/a (Lqn;IF)I net/minecraft/src/RenderSilverfish/func_35449_a (Lnet/minecraft/src/EntitySilverfish;IF)I
 MD: vs/b (Lacq;IF)I net/minecraft/src/RenderSilverfish/func_166_a (Lnet/minecraft/src/EntityLiving;IF)I
-MD: vt/a (IIII)V net/minecraft/src/PlayerControllerDemo/func_719_a (IIII)V
-MD: vt/a (Lyw;Lxd;Laan;)Z net/minecraft/src/PlayerControllerDemo/func_6471_a (Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;)Z
-MD: vt/a (Lyw;Lxd;Laan;IIII)Z net/minecraft/src/PlayerControllerDemo/func_722_a (Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;IIII)Z
-MD: vt/b (IIII)Z net/minecraft/src/PlayerControllerDemo/func_729_b (IIII)Z
-MD: vt/b (Lyw;Lnn;)V net/minecraft/src/PlayerControllerDemo/func_6472_b (Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/Entity;)V
-MD: vt/c ()V net/minecraft/src/PlayerControllerDemo/func_6474_c ()V
-MD: vt/c (IIII)V net/minecraft/src/PlayerControllerDemo/func_6470_c (IIII)V
-MD: vt/j ()V net/minecraft/src/PlayerControllerDemo/func_48516_j ()V
+MD: vt/a ()V net/minecraft/src/PlayerUsageSnooper/func_52021_a ()V
+MD: vt/a (Ljava/lang/String;Ljava/lang/Object;)V net/minecraft/src/PlayerUsageSnooper/func_52022_a (Ljava/lang/String;Ljava/lang/Object;)V
+MD: vt/a (Lvt;)Ljava/net/URL; net/minecraft/src/PlayerUsageSnooper/func_52023_a (Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/net/URL;
+MD: vt/b (Lvt;)Ljava/util/Map; net/minecraft/src/PlayerUsageSnooper/func_52020_b (Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/util/Map;
 MD: vu/a ()V net/minecraft/src/PathEntity/func_1206_a ()V
 MD: vu/a (I)Le; net/minecraft/src/PathEntity/func_48648_a (I)Lnet/minecraft/src/PathPoint;
 MD: vu/a (Lbo;)Z net/minecraft/src/PathEntity/func_48639_a (Lnet/minecraft/src/Vec3D;)Z
@ -11199,6 +11184,7 @@ MD: xm/d ()I net/minecraft/src/BlockCauldron/func_210_f ()I
 MD: xm/h ()V net/minecraft/src/BlockCauldron/func_237_e ()V
 MD: xn/a ()Ljava/lang/String; net/minecraft/src/ChatAllowedCharacters/func_20156_a ()Ljava/lang/String;
 MD: xn/a (C)Z net/minecraft/src/ChatAllowedCharacters/func_48614_a (C)Z
+MD: xn/a (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/ChatAllowedCharacters/func_52019_a (Ljava/lang/String;)Ljava/lang/String;
 MD: xo/a ()Z net/minecraft/src/ChunkProviderEnd/func_532_a ()Z
 MD: xo/a (II)Z net/minecraft/src/ChunkProviderEnd/func_537_a (II)Z
 MD: xo/a (II[B[Labn;)V net/minecraft/src/ChunkProviderEnd/func_40380_a (II[B[Lnet/minecraft/src/BiomeGenBase;)V
@ -11572,7 +11558,6 @@ MD: yw/n (Lnn;)V net/minecraft/src/EntityPlayer/func_451_h (Lnet/minecraft/src/E
 MD: yw/y_ ()V net/minecraft/src/EntityPlayer/func_418_b_ ()V
 MD: yw/z ()V net/minecraft/src/EntityPlayer/func_374_q ()V
 MD: yx/J_ ()V net/minecraft/src/EntityExplodeFX/func_370_e_ ()V
-MD: yx/a (Ladz;FFFFFF)V net/minecraft/src/EntityExplodeFX/func_406_a (Lnet/minecraft/src/Tessellator;FFFFFF)V
 MD: yy/J_ ()V net/minecraft/src/EntityMob/func_370_e_ ()V
 MD: yy/a (III)F net/minecraft/src/EntityMob/func_439_a (III)F
 MD: yy/a (Lady;)V net/minecraft/src/EntityMob/func_357_b (Lnet/minecraft/src/NBTTagCompound;)V
--- a/forge/conf/fields.csv
+++ b/forge/conf/fields.csv
@ -13,7 +13,7 @@ field_1019_F,cloudColour,0,
 field_1024_A,unloadedEntityList,0,
 field_1026_y,isRemote,0,"This is set to true when you are a client connected to a multiplayer world, false otherwise."
 field_1033_r,isNewWorld,0,Used to differentiate between a newly generated world and an already existing world.
-field_1037_n,rand,0,RNG for world.
+field_1037_n,rand,0,RNG for World.
 field_1039_l,difficultySetting,0,Option > Difficulty setting (0 - 3)
 field_1040_k,playerEntities,0,Array list of players in the world.
 field_1043_h,editingBlocks,0,true while the world is editing blocks
@ -592,7 +592,7 @@ field_1792_b,zoom,0,
 field_1793_a,currentRender,0,
 field_185_a,fullscreen,0,
 field_186_a,mainFrame,0,"Reference to the main frame, in this case, the applet window itself."
-field_188_b,chunkZPos,0,The Z position of this Chunk Coordinate Pair
+field_188_b,chunkZPosition,0,The Z position of this Chunk Coordinate Pair
 field_189_a,chunkXPos,0,The X position of this Chunk Coordinate Pair
 field_191_a,renderManager,0,
 field_194_c,shadowOpaque,0,Determines the darkness of the object's shadow. Higher value makes a darker shadow.
@ -615,7 +615,7 @@ field_20023_b,inventorySlot,0,The clicked slot (-999 is outside of inventory)
 field_20024_a,window_Id,0,The id of the window which was clicked. 0 for player inventory.
 field_20025_e,itemStack,0,Item stack for inventory
 field_20026_d,action,0,"A unique number for the action, used for transaction handling"
-field_20027_c,mouseClick,0,1 when right-clicking and otherwise 0 - I'm not sure...
+field_20027_c,mouseClick,0,1 when right-clicking and otherwise 0
 field_20028_b,shortWindowId,0,
 field_20029_a,windowId,0,The id of the window that the action occurred in.
 field_20030_c,accepted,0,
@ -801,7 +801,7 @@ field_22073_k,cursorCounter,0,
 field_22074_i,maxStringLength,0,
 field_22075_h,text,0,Have the current text beign edited on the textbox.
 field_22076_g,height,0,
-field_22077_f,width,0,
+field_22077_f,width,0,The width of this text field.
 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.
@ -847,7 +847,7 @@ field_22168_d,sizeOnDisk,0,
 field_22169_c,lastTimePlayed,0,
 field_22180_a,savesDirectory,0,Reference to the File object representing the directory for the world saves
 field_22188_h,livingPlayer,0,Rendermanager's variable for the player
-field_22195_a,regionsByFilename,0,A map containing Files and keys and RegionFiles as values
+field_22195_a,regionsByFilename,0,A map containing Files as keys and RegionFiles as values
 field_221_o,swordSteel,0,
 field_22212_b,fileName,0,
 field_22213_a,emptySector,0,
@ -915,10 +915,10 @@ field_22312_i,dimension,0,
 field_22313_h,playerTag,0,
 field_22314_g,sizeOnDisk,0,"The size of entire save of current world on the disk, isn't exactly."
 field_22315_f,lastTimePlayed,0,The last time the player was in this world.
-field_22316_e,worldTime,0,The current world time in range from 0 to 23999.
-field_22317_d,spawnZ,0,The player spawn Z coordinate.
-field_22318_c,spawnY,0,The player spawn Y coordinate.
-field_22319_b,spawnX,0,The player spawn X coordinate.
+field_22316_e,worldTime,0,"The current world time in ticks, ranging from 0 to 23999."
+field_22317_d,spawnZ,0,The spawn zone position Z coordinate.
+field_22318_c,spawnY,0,The spawn zone position Y coordinate.
+field_22319_b,spawnX,0,The spawn zone position X coordinate.
 field_22320_a,randomSeed,0,Holds the seed of the currently world.
 field_22333_Z,aoGrassXYZNCP,0,"Grass flag for ambient occlusion on Negative X, Center Y, and Positive Z"
 field_22334_Y,aoGrassXYZPCP,0,"Grass flag for ambient occlusion on Positive X, Center Y, and Positive Z"
@ -1128,8 +1128,8 @@ field_26901_B,prevRainingStrength,0,
 field_26902_a,type,0,
 field_26903_b,numberFormat,0,
 field_26904_c,decimalFormat,0,
-field_26905_d,serverPacketIdList,0,list of the server's packets id
-field_26906_c,clientPacketIdList,0,list of the client's packets id
+field_26905_d,serverPacketIdList,0,List of the server's packet IDs.
+field_26906_c,clientPacketIdList,0,List of the client's packet IDs.
 field_26907_d,startMinecartRidingCoordinate,0,Holds the coordinate of the player when enter a minecraft to ride.
 field_269_ar,appleGold,0,
 field_27011_d,thePlayer,0,The player that is using the GUI where this slot resides.
@ -1268,7 +1268,7 @@ field_273_an,flint,0,
 field_27401_o,thunderTime,0,Number of ticks untils next thunderbolt.
 field_27402_n,thundering,0,Is thunderbolts failing now?
 field_27403_m,rainTime,0,Number of ticks until next rain.
-field_27404_l,raining,0,Is current raining?
+field_27404_l,raining,0,"True if it's raining, false otherwise."
 field_27406_a,fancyGrass,0,Fancy grass side matching biome
 field_27428_k,theSession,0,The Session object
 field_27429_j,oldFile,0,A file named 'stats_' [lower case username] '.old'
@ -1324,10 +1324,9 @@ field_28067_f,chunkList,0,A list of all the currently loaded chunks.
 field_28068_e,chunkMap,0,"A map of all the currently loaded chunks, uses the chunk id as the key."
 field_28069_d,chunkLoader,0,The IChunkLoader used by this ChunkProvider
 field_28070_c,chunkProvider,0,The parent IChunkProvider for this ChunkProvider.
-field_28098_a,updateTimer,0,"Timer, increases every tick."
 field_280_ag,plateDiamond,0,
 field_28108_z,mapStorage,0,
-field_28109_a,netManager,0,Reference to the NetworkManager object.
+field_28109_a,netManager,0,"This was actually an inner class of NetworkManager, so this field is the reference to 'this' NetworkManager."
 field_28114_d,mapDataDir,0,
 field_28118_b,mapStorage,0,
 field_28120_a,entityplayerObj,0,Reference for EntityPlayer object in MapInfo
@ -1423,7 +1422,7 @@ field_31056_b,offsetsXForSide,0,gives the offset required for this axis to get t
 field_31057_a,faceToSide,0,Converts a face to a side.
 field_31058_d,offsetsZForSide,0,gives the offset required for this axis to get the block at that side.
 field_31059_c,offsetsYForSide,0,gives the offset required for this axis to get the block at that side.
-field_31065_H,mobilityFlag,0,"Mobility information / flag of the material. 0 = normal, 1 = can't be push but enabled piston to move over it, 2 = can't be pushed and stop pistons"
+field_31065_H,mobilityFlag,0,"Mobility information flag. 0 indicates that this block is normal, 1 indicates that it can't push other blocks, 2 indicates that it can't be pushed."
 field_31066_G,canHarvest,0,Determines if the materials is one that can be collected by the player.
 field_31067_B,piston,0,Pistons' material.
 field_31068_A,web,0,Web's material.
@ -1441,7 +1440,7 @@ field_313_aX,armorType,0,"Stores the armor type: 0 is helmet, 1 is plate, 2 is l
 field_314_bb,maxDamageArray,0,Holds the 'base' maxDamage that each armorType have.
 field_316_a,recordName,0,The name of the record.
 field_317_a,minecartType,0,
-field_318_a,blockType,0,the type of block this seed turns into (wheat or pumpkin stems for instance)
+field_318_a,blockType,0,The type of block this seed turns into (wheat or pumpkin stems for instance)
 field_319_a,weaponDamage,0,
 field_320_a,spawnID,0,The ID of the block the reed will spawn when used from inventory bar.
 field_321_a,doorMaterial,0,
@ -1471,10 +1470,10 @@ field_34903_b,genBiomes,0,
 field_34904_b,attackingPlayer,0,The most recent player that has attacked this entity
 field_34905_c,recentlyHit,0,"Set to 60 when hit by the player or the player's wolf, then decrements. Used to determine whether the entity should drop items on death."
 field_34906_e,itemInUseCount,0,This field starts off equal to getMaxItemUseDuration and is decremented on each tick
-field_34907_d,itemInUse,0,"this is the item that is in use when the player is holding down the useItemButton (e.g., bow, food, sword)"
+field_34907_d,itemInUse,0,"This is the item that is in use when the player is holding down the useItemButton (e.g., bow, food, sword)"
 field_35001_ab,rightClickDelayTimer,0,"When you place a block, it's set to 6, decremented once per tick, when it's 0, you can place another block."
 field_35024_g,boundingBox,0,
-field_35025_h,coordBaseMode,0,'switches the Coordinate System base off the Bounding Box'
+field_35025_h,coordBaseMode,0,switches the Coordinate System base off the Bounding Box
 field_35026_i,componentType,0,The type ID of this component.
 field_35035_b,doorType,0,
 field_35044_a,doorType,0,
@ -1527,15 +1526,15 @@ field_35139_a,timeSinceStart,0,
 field_35140_d,arrowCritical,0,Is this arrow a critical hit? (Controls particles and damage)
 field_35145_n,blockMetadata,0,
 field_35146_o,blockType,0,the Block type that this TileEntity is contained within
-field_35148_f,lidAngle,0,the current angle of the lid (between 0 and 1)
-field_35149_g,prevLidAngle,0,the angle of the lid last tick
-field_35150_d,adjacentChestXNeg,0,contains the chest tile located adjacent to this one (if any)
-field_35151_e,adjacentChestZPos,0,contains the chest tile located adjacent to this one (if any)
-field_35152_b,adjacentChestZNeg,0,contains the chest tile located adjacent to this one (if any)
-field_35153_c,adjacentChestXPos,0,contains the chest tile located adjacent to this one (if any)
-field_35154_q,ticksSinceSync,0,server sync counter (once per 20 ticks)
-field_35155_a,adjacentChestChecked,0,determines if the check for adjacent chests has taken place.
-field_35156_h,numUsingPlayers,0,the number of players currently using this chest
+field_35148_f,lidAngle,0,The current angle of the lid (between 0 and 1)
+field_35149_g,prevLidAngle,0,The angle of the lid last tick
+field_35150_d,adjacentChestXNeg,0,Contains the chest tile located adjacent to this one (if any)
+field_35151_e,adjacentChestZPosition,0,Contains the chest tile located adjacent to this one (if any)
+field_35152_b,adjacentChestZNeg,0,Contains the chest tile located adjacent to this one (if any)
+field_35153_c,adjacentChestXPos,0,Contains the chest tile located adjacent to this one (if any)
+field_35154_q,ticksSinceSync,0,Server sync counter (once per 20 ticks)
+field_35155_a,adjacentChestChecked,0,Determines if the check for adjacent chests has taken place.
+field_35156_h,numUsingPlayers,0,The number of players currently using this chest
 field_35168_bw,jumpMovementFactor,0,A factor used to determine how far this entity will move each tick if it is jumping or falling.
 field_35169_bv,landMovementFactor,0,"A factor used to determine how far this entity will move each tick if it is walking on land. Adjusted by speed, and slipperiness of the current block."
 field_35170_bR,activePotionsMap,0,
@ -1552,7 +1551,7 @@ field_35210_aY,experienceLevel,0,The current experience level the player is on.
 field_35211_aX,experience,0,The current amount of experience the player has within their Experience Bar.
 field_35212_aW,capabilities,0,The player's capabilities. (See class PlayerCapabilities)
 field_35213_bb,speedInAir,0,
-field_35214_aG,xpCooldown,0,used by EntityPlayer to prevent too many xp orbs from getting absorbed at once.
+field_35214_aG,xpCooldown,0,Used by EntityPlayer to prevent too many xp orbs from getting absorbed at once.
 field_35215_ba,speedOnGround,0,
 field_35216_aw,flyToggleTimer,0,"Used to tell if the player pressed jump twice. If this is at 0 and it's pressed (And they are allowed to fly, as defined in the player's movementInput) it sets this to 7. If it's pressed and it's greater than 0 enable fly."
 field_35217_av,foodStats,0,The player's food stats. (See class FoodStats)
@ -1578,7 +1577,7 @@ field_35241_a,entityId,0,Entity ID for the XP Orb
 field_35242_d,worldHeight,0,Defaults to 128
 field_35243_e,creativeMode,0,"0 for survival, 1 for creative"
 field_35244_b,respawnDimension,0,
-field_35245_c,difficulty,0,"0 thru 3 for Peaceful, Easy, Normal, Hard. 1 is always sent c->s"
+field_35245_c,difficulty,0,"The difficulty setting. 0 through 3 for peaceful, easy, normal, hard. The client always sends 1."
 field_35247_f,difficultySetting,0,The difficulty setting byte.
 field_35248_g,worldHeight,0,Defaults to 128
 field_35249_d,serverMode,0,"0 for survival, 1 for creative"
@ -1591,7 +1590,7 @@ field_35256_c,ping,0,
 field_35257_a,playerName,0,The player's name.
 field_35258_d,duration,0,
 field_35259_b,effectId,0,
-field_35260_c,effectAmp,0,amplifier
+field_35260_c,effectAmplifier,0,The effect's amplifier.
 field_35261_a,entityId,0,
 field_35262_c,gameMode,0,"Used only when reason = 3. 0 is survival, 1 is creative."
 field_35263_b,radius,0,The maximum radius used when generating a patch of blocks.
@ -1646,7 +1645,7 @@ field_35359_d,serverNBTStorage,0,
 field_35360_b,serverAddress,0,
 field_35361_c,serverName,0,
 field_35362_a,parentGui,0,This GUI's parent GUI.
-field_35364_f,gameMode,0,"'hardcore', 'creative' or 'survival'"
+field_35364_f,gameMode,0,"hardcore', 'creative' or 'survival"
 field_35366_j,gameModeButton,0,The GUIButton that you click to change game modes.
 field_35367_k,moreWorldOptions,0,The GUIButton that you click to get to options like the seed when creating a world.
 field_35368_i,moreOptions,0,"True if the extra options (Seed box, structure toggle button, world type button, etc.) are being shown"
@ -1723,7 +1722,7 @@ field_35502_b,worldGenSeed,0,seed from World#getWorldSeed that is used in the LC
 field_35503_c,chunkSeed,0,"final part of the LCG prng that uses the chunk X, Z coords along with the other two seeds to generate pseudorandom numbers"
 field_35504_a,parent,0,parent GenLayer that was provided via the constructor
 field_35509_b,allowedBiomes,0,this sets all the biomes that are allowed to appear in the overworld
-field_35521_b,gameType,0,"The game mode, 1 for creative, 0 for survival."
+field_35521_b,gameType,0,"The type of the map. 0 is survival, 1 is creative."
 field_35522_c,mapFeaturesEnabled,0,"Switch for the map features. 'true' for enabled, 'false' for disabled."
 field_35523_a,seed,0,The seed for the map.
 field_35536_f,starve,0,
@ -1751,7 +1750,7 @@ field_35581_e,modCount,0,count of times elements have been added/removed
 field_35582_b,numHashElements,0,the number of elements in the hash array
 field_35583_c,capacity,0,the maximum amount of elements in the hash (probably 3/4 the size due to meh hashing function)
 field_35584_a,hashArray,0,the array of all elements in the hash
-field_35589_a,lootArray,0,'Contains stuff you might find in chests'
+field_35589_a,lootArray,0,Contains stuff you might find in chests
 field_35590_d,itemWeight,0,The Weight is how often the item is chosen(higher number is higher chance(lower is lower))
 field_35591_b,minGroupCount,0,
 field_35592_c,maxGroupCount,0,
@ -1768,8 +1767,8 @@ field_35606_c,villagePiecesSpawned,0,
 field_35607_a,villagePieceClass,0,The Class object for the represantation of this village piece.
 field_35608_v,snipeSkeleton,0,The achievement for killing a Skeleton from 50 meters aways.
 field_35611_a,instance,0,The static instance of ChestItemRenderHelper.
-field_35615_d,instancesLimit,0,'How many Structure Pieces of this type may spawn in a structure'
-field_35616_b,pieceWeight,0,"'This basically keeps track of the 'epicness' of a structure. Epic structure components have a higher 'weight', and Structures may only grow up to a certain 'weight' before generation is stopped'"
+field_35615_d,instancesLimit,0,How many Structure Pieces of this type may spawn in a structure
+field_35616_b,pieceWeight,0,"This basically keeps track of the 'epicness' of a structure. Epic structure components have a higher 'weight', and Structures may only grow up to a certain 'weight' before generation is stopped"
 field_35617_c,instancesSpawned,0,
 field_35618_a,pieceClass,0,
 field_35619_a,doorEnum,0,
@ -1816,7 +1815,7 @@ field_35709_b,selectedBlockMetaData,0,
 field_35710_a,selectedBlockId,0,
 field_35716_b,boundingBox,0,
 field_35717_a,components,0,List of all StructureComponents that are part of this structure
-field_35718_c,hasMoreThanTwoComponents,0,'well ... thats what it does'
+field_35718_c,hasMoreThanTwoComponents,0,well ... thats what it does
 field_35720_f,gameType,0,
 field_35728_d,cache,0,The list of cached BiomeCacheBlocks
 field_35729_b,lastCleanupTime,0,"The last time this BiomeCache was cleaned, in milliseconds."
@ -1916,7 +1915,7 @@ field_35913_p,reedGen,0,Field that holds WorldGenReed
 field_35914_z,sandPerChunk2,0,The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There appear to be two separate fields for this.
 field_35915_y,sandPerChunk,0,The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater.
 field_35916_x,cactiPerChunk,0,The number of cactus plants to generate per chunk. Cacti only work on sand.
-field_35919_q,mapFeaturesEnabled,0,are map structures going to be generated (e.g. strongholds)
+field_35919_q,mapFeaturesEnabled,0,Whether the map features (e.g. strongholds) generation is enabled or disabled.
 field_35920_p,gameType,0,"Indicates the type of the game. 0 for survival, 1 for creative."
 field_35931_U,aoBrightnessXYZPNN,0,Ambient occlusion brightness XYZPNN
 field_35932_T,aoBrightnessYZNP,0,Ambient occlusion brightness YZNP
@ -2033,6 +2032,10 @@ field_40153_b,heightOffsetUpdateTime,0,ticks until heightOffset is randomized
 field_40154_a,heightOffset,0,Random offset used in floating behaviour
 field_40157_aB,maxHealth,0,The maximum health of the Entity.
 field_4015_b,itemRand,0,The RNG used by the Item subclasses.
+field_40161_az,slowed,0,"Activated if the dragon is flying though obsidian, white stone or bedrock. Slows movement and animation speed."
+field_40162_d,ringBuffer,0,Ring buffer array for the last 64 Y-positions and yaw rotations. Used to calculate offsets for the animations.
+field_40163_ay,forceNewTarget,0,Force selecting a new flight target at next tick if set to true.
+field_40164_e,ringBufferIndex,0,Index into the ring buffer. Incremented once per tick and restarts at 0 once it reaches the end of the buffer.
 field_40165_b,targetY,0,
 field_40166_c,targetZ,0,
 field_40167_a,targetX,0,
@ -2041,10 +2044,13 @@ field_40169_as,dragonPartTail2,0,
 field_4016_av,bucketWater,0,
 field_40170_ar,dragonPartTail1,0,
 field_40171_aq,dragonPartBody,0,The body bounding box of a dragon
+field_40172_ax,animTime,0,"Animation time, used to control the speed of the animation cycles (wings flapping, jaw opening, etc.)"
+field_40173_aw,prevAnimTime,0,Animation time at previous tick.
 field_40174_av,dragonPartWing2,0,
 field_40175_au,dragonPartWing1,0,
 field_40176_ao,dragonPartArray,0,An array containing all body parts of this dragon
 field_40177_ap,dragonPartHead,0,The head bounding box of a dragon
+field_40178_aA,deathTicks,0,
 field_40179_aC,target,0,
 field_4017_ap,porkCooked,0,
 field_4018_aZ,iconIndex,0,Icon index in the icons table.
@ -2110,6 +2116,7 @@ field_40264_a,enchantmentobj,0,Enchantment object associated with this Enchantme
 field_40268_b,zLevel,0,Defines the zLevel of rendering of item on GUI.
 field_4026_aM,minecartPowered,0,
 field_4027_aL,minecartCrate,0,
+field_40284_d,updateModelState,0,Reloads the dragon model if not equal to 4. Presumably a leftover debugging field.
 field_40285_c,modelDragon,0,An instance of the dragon model in RenderDragon
 field_40289_c,snowmanModel,0,A reference to the Snowman model in RenderSnowMan.
 field_4028_aJ,book,0,
@ -2128,6 +2135,7 @@ field_40313_c,jaw,0,The jaw Model renderer of the dragon
 field_40314_a,head,0,The head Model renderer of the dragon
 field_40315_n,frontLegTip,0,The front leg tip Model renderer of the dragon
 field_40316_o,rearFoot,0,The rear foot Model renderer of the dragon
+field_40317_s,partialTicks,0,
 field_40318_r,wingTip,0,The wing tip Model renderer of the dragon
 field_40319_q,wing,0,The wing Model renderer of the dragon
 field_4031_aC,boat,0,
@ -2384,7 +2392,7 @@ field_4117_a,angerLevel,0,Above zero if this PigZombie is Angry.
 field_4118_c,defaultHeldItem,0,"The ItemStack that any PigZombie holds (a gold sword, in fact)."
 field_4119_a,defaultHeldItem,0,The ItemStack that any Skeleton holds (a bow).
 field_411_ak,stairDouble,0,
-field_4120_b,currentTarget,0,This entities' current target
+field_4120_b,currentTarget,0,This entity's current target.
 field_4121_a,livingSoundTime,0,Number of ticks since this EntityLiving last produced its sound
 field_4122_h,aggroCooldown,0,Cooldown time between target loss and new target aquirement.
 field_4123_g,targetedEntity,0,
@ -2398,7 +2406,7 @@ field_412_aj,blockSteel,0,
 field_413_ai,blockGold,0,
 field_414_ah,mushroomRed,0,
 field_4157_a,liquidBlockId,0,The ID of the liquid block used in this liquid generator.
-field_4158_a,hellLavaID,0,Stores ID for WorldGenHellLava
+field_4158_a,hellLavaID,0,Stores the ID for WorldGenHellLava
 field_4159_s,netherCaveGenerator,0,
 field_415_ag,mushroomBrown,0,
 field_4160_r,netherrackExclusivityNoise,0,Holds the noise used to determine whether something other than netherrack can be generated at a location
@ -2518,7 +2526,7 @@ field_449_a,chanceToEncourageFire,0,The chance this block will encourage nearby
 field_450_b,torchUpdates,0,An array of when redstone torches became active.  Used for redstone torches to burn out.
 field_451_a,torchActive,0,Whether the redstone torch is currently active or not.
 field_452_a,modelBlock,0,The block that is used as model for the stair.
-field_453_a,wiresProvidePower,0,"When false, power transmission methods do not look at other redstone wires.  Used internally during updateCurrentStrength."
+field_453_a,wiresProvidePower,0,"When false, power transmission methods do not look at other redstone wires. Used internally during updateCurrentStrength."
 field_454_b,isFreestanding,0,Whether this is a freestanding sign or a wall-mounted sign
 field_455_a,signEntityClass,0,
 field_456_a,isActive,0,"True if this is an active furnace, false if idle"
@ -2571,6 +2579,9 @@ field_46088_c,lookZ,0,Z offset to look at
 field_46089_a,idleEntity,0,The entity that is looking idle.
 field_46094_c,entityTarget,0,
 field_46095_a,worldObj,0,
+field_46097_d,zPosition,0,
+field_46098_b,xPosition,0,
+field_46099_c,yPosition,0,
 field_460_a,numAdjacentSources,0,Number of horizontally adjacent liquid source blocks. Diagonal doesn't count. Only source blocks of the same liquid as the block using the field are counted.
 field_46100_a,entity,0,
 field_46106_a,theEntity,0,
@ -2606,6 +2617,7 @@ field_479_a,xPosition,0,Chunk X position.
 field_480_f,size,0,The size of the arrays.
 field_48102_d,lastAttackingEntity,0,
 field_48103_c,revengeTimer,0,
+field_48104_at,senses,0,
 field_48105_bU,targetTasks,0,
 field_48106_as,attackTarget,0,The active target the Task system uses for tracking
 field_48107_ar,navigator,0,
@ -2686,6 +2698,8 @@ field_48306_e,theOwner,0,
 field_48307_b,maxDist,0,
 field_48308_c,minDist,0,
 field_48309_a,theWorld,0,
+field_48314_b,speed,0,
+field_48317_e,speed,0,
 field_48321_d,entityPosZ,0,
 field_48322_e,targetDoor,0,
 field_48323_b,entityPosX,0,
@ -2718,9 +2732,11 @@ field_48371_b,entityHost,0,The entity the AI instance has been applied to
 field_48372_c,attackTarget,0,
 field_48373_a,worldObj,0,
 field_48374_h,maxRangedAttackTime,0,The maximum time the AI has to wait before peforming another ranged attack.
+field_48379_d,targetDistance,0,
 field_48382_c,taskOwner,0,The entity that this task belongs to
 field_48384_b,villageAgressorTarget,0,The aggressor of the iron golem's village which is now the golem's attack target.
 field_48385_a,irongolem,0,
+field_48386_f,targetChance,0,
 field_48388_b,targetClass,0,
 field_48389_a,targetEntity,0,
 field_48397_b,theEntity,0,
@ -2758,8 +2774,6 @@ field_48511_a,data,0,
 field_48513_b,agressionTime,0,
 field_48514_c,villageObj,0,
 field_48515_a,agressor,0,
-field_48517_d,demoNotificationTime,0,"Counter used to show the demo expired message. Increases every tick, when a player action is performed and the counter is over 100, displays the demo expired message and resets to 0."
-field_48518_c,demoExpired,0,Whether the demo has expired.
 field_48542_f,lastAddDoorTimestamp,0,
 field_48543_g,tickCounter,0,
 field_48544_d,center,0,This is the actual village center.
@ -2836,8 +2850,21 @@ 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_50016_f,sentMessageList,0,A list with all the sent chat messages in it.
+field_50017_n,historyOffset,0,
+field_50043_m,isEnabled,0,"If this value is true along isFocused, keyTyped will process the keys."
+field_50044_j,enableBackgroundDrawing,0,
+field_50064_a,inputField,0,Chat entry field
+field_50069_d,isCreativeMode,0,"Used to determine if creative mode is enabled, and therefore if items should be depleted on usage"
+field_50070_b,isFlying,0,Indicates whether the player is flying or not.
+field_50071_c,allowFlying,0,Whether or not to allow the player to fly when they double jump.
+field_50072_a,disableDamage,0,Disables player damage.
 field_50099_c,nameinLowerCase,0,Player name in lowercase.
 field_500_a,entityId,0,Entity ID of the object.
+field_50115_n,red,0,Used to specify new red value for the current color.
+field_50116_o,blue,0,Used to specify new blue value for the current color.
+field_50117_q,alpha,0,Used to speify new alpha value for the current color.
+field_50118_p,green,0,Used to specify new green value for the current color.
 field_501_e,type,0,The type of object.
 field_502_d,zPosition,0,The Z position of the object.
 field_503_c,yPosition,0,The Y position of the object.
@ -2857,6 +2884,11 @@ field_516_c,zPosition,0,Z coordinate of spawn.
 field_517_a,message,0,The message being sent.
 field_518_b,username,0,The name of the user attempting to login.
 field_519_a,protocolVersion,0,The protocol version in use. Current version is 2.
+field_52007_b,height,0,Button height in pixels
+field_52008_a,width,0,Button width in pixels
+field_52015_r,colorCodeRegex,0,Compiled regular expression pattern for matching color codes in a string
+field_52024_b,serverUrl,0,URL of the server to send the report to
+field_52025_a,dataMap,0,String map for report data
 field_521_b,animate,0,
 field_522_a,entityId,0,"The entity ID, in this case it's the player ID."
 field_523_i,count,0,The number of items.
@ -3171,7 +3203,7 @@ field_885_a,plantBlockId,0,The ID of the plant block used in this plant generato
 field_886_b,chunkMapping,0,The mapping between ChunkCoordinates and Chunks that ChunkProviderClient maintains.
 field_887_a,blankChunk,0,The completely empty chunk used by ChunkProviderClient when field_886_b doesn't contain the requested coordinates.
 field_888_d,worldObj,0,Reference to the World object.
-field_890_b,lastQueriedChunkZPos,0,The last Z position of a chunk that was returned from func_553_b
+field_890_b,lastQueriedChunkZPosition,0,The last Z position of a chunk that was returned from func_553_b
 field_891_a,lastQueriedChunkXPos,0,The last X position of a chunk that was returned from func_553_b
 field_892_h,lastQueriedChunk,0,The last Chunk that was returned from func_553_b
 field_893_g,worldObj,0,Reference to the World object.
@ -3292,14 +3324,12 @@ field_9342_ah,moveStrafing,0,
 field_9344_ag,entityAge,0,"Holds the living entity age, used to control the despawn."
 field_9346_af,naturalArmorRating,0,intrinsic armor level for entity
 field_9347_E,scoreValue,0,"The score value of the Mob, the amount of points the mob is worth."
-field_934_b,height,0,The height of this control.
 field_9350_ad,newRotationPitch,0,The new yaw rotation to be applied to the entity.
 field_9351_C,entityType,0,a string holding the type of entity it is currently only implemented in entityPlayer(as 'humanoid')
 field_9352_ac,newRotationYaw,0,The new yaw rotation to be applied to the entity.
 field_9354_ab,newPosZ,0,The new Z position to be applied to the entity.
 field_9356_aa,newPosY,0,The new Y position to be applied to the entity.
 field_9357_z,texture,0,the path for the texture of this entityLiving
-field_935_a,width,0,The width of this control.
 field_9366_o,heartsHalvesLife,0,
 field_9368_k,swingProgressInt,0,
 field_9369_j,isSwinging,0,Whether the player is swinging the current item in their hand.
@ -3545,7 +3575,7 @@ field_149_c,xPosition,1,The player's X position.
 field_15004_bw,ticksOfInvuln,1,how many ticks of invulnerability(spawn protection) this player has
 field_15005_a,blockIndex,1,
 field_150_a,message,1,The message being sent.
-field_151_b,chunkZPos,1,The Z position of this Chunk Coordinate Pair
+field_151_b,chunkZPosition,1,The Z position of this Chunk Coordinate Pair
 field_152_a,chunkXPos,1,The X position of this Chunk Coordinate Pair
 field_166_m,ingotIron,1,
 field_167_l,diamond,1,
@ -3628,7 +3658,7 @@ field_20142_b,craftResult,1,
 field_20143_a,craftMatrix,1,The crafting matrix inventory.
 field_20144_c,isLocalWorld,1,Determines if inventory manipulation should be handled.
 field_20145_b,craftResult,1,
-field_20146_a,craftMatrix,1,The crafting matrix inventory.
+field_20146_a,craftMatrix,1,The crafting matrix inventory (3x3).
 field_20147_j,posZ,1,
 field_20148_i,posY,1,
 field_20149_h,posX,1,
@ -3649,8 +3679,8 @@ field_20901_a,healAmount,1,The amount this food item heals the player.
 field_20902_b,waypointX,1,
 field_20903_a,courseChangeCooldown,1,
 field_20904_c,waypointY,1,
-field_20905_e,yTile,1,"The tile this entity is on, Y position(unifying naming)"
-field_20906_d,xTile,1,"The tile this entity is on, X position(unifying naming)"
+field_20905_e,yTile,1,"The tile this entity is on, Y position"
+field_20906_d,xTile,1,"The tile this entity is on, X position"
 field_20907_c,bobber,1,the bobber that the fish hit
 field_20908_a,playerNetServerHandler,1,The NetServerHandler for this particular player.
 field_20909_b,angler,1,
@ -3786,10 +3816,10 @@ field_22194_i,dimension,1,
 field_22195_h,playerTag,1,
 field_22196_g,sizeOnDisk,1,"The size of entire save of current world on the disk, isn't exactly."
 field_22197_f,lastTimePlayed,1,The last time the player was in this world.
-field_22198_e,worldTime,1,The world time (in ticks)
-field_22199_d,spawnZ,1,The spawn zone position (Z)
-field_22200_c,spawnY,1,The spawn zone position (Y)
-field_22201_b,spawnX,1,The spawn zone position (X)
+field_22198_e,worldTime,1,"The current world time in ticks, ranging from 0 to 23999."
+field_22199_d,spawnZ,1,The spawn zone position Z coordinate.
+field_22200_c,spawnY,1,The spawn zone position Y coordinate.
+field_22201_b,spawnX,1,The spawn zone position X coordinate.
 field_22202_a,randomSeed,1,Holds the seed of the currently world.
 field_22213_a,nightSpawnEntities,1,An array of entity classes that spawn at night.
 field_22216_a,posX,1,
@ -3936,10 +3966,10 @@ field_27111_d,maxDisplayRow,1,Is the biggest row used to display a achievement o
 field_27112_c,maxDisplayColumn,1,Is the biggest column used to display a achievement on the GUI.
 field_27113_b,minDisplayRow,1,Is the smallest row used to display a achievement on the GUI.
 field_27114_a,minDisplayColumn,1,Is the smallest column used to display a achievement on the GUI.
-field_27123_o,thunderTime,1,hold the during of the thunder
+field_27123_o,thunderTime,1,Number of ticks untils next thunderbolt.
 field_27124_n,thundering,1,Is thunderbolts failing now?
-field_27125_m,rainTime,1,holds the time of the rain
-field_27126_l,raining,1,hold the boolean if its raining or not
+field_27125_m,rainTime,1,Number of ticks until next rain.
+field_27126_l,raining,1,"True if it's raining, false otherwise."
 field_271_a,blockType,1,The type of block this seed turns into (wheat or pumpkin stems for instance)
 field_272_a,blockID,1,The block ID of the Block associated with this ItemBlock
 field_274_a,isFull,1,field for checking if the bucket has been filled.
@ -3948,8 +3978,8 @@ field_276_Z,addedToChunk,1,Has this entity been added to the chunk its within
 field_27990_a,itemID,1,
 field_27991_b,displayRow,1,"Is the row (related to center of achievement gui, in 24 pixels unit) that the achievement will be displayed."
 field_27992_c,parentAchievement,1,"Holds the parent achievement, that must be taken before this achievement is avaiable."
-field_27993_d,serverPacketIdList,1,list of the servers packets id
-field_27994_c,clientPacketIdList,1,list of the clients packets id
+field_27993_d,serverPacketIdList,1,List of the server's packet IDs.
+field_27994_c,clientPacketIdList,1,List of the client's packet IDs.
 field_27995_d,startMinecartRidingCoordinate,1,Holds the coordinate of the player when enter a minecraft to ride.
 field_28008_bI,ignoreFrustumCheck,1,Render entity even if it is outside the camera frustum. Only true in EntityFish for now. Used in RenderGlobal: render if ignoreFrustumCheck or in frustum.
 field_28009_a,record,1,ID of record which is in Jukebox
@ -4059,7 +4089,7 @@ field_31051_b,offsetsXForSide,1,gives the offset required for this axis to get t
 field_31052_a,faceToSide,1,Converts a face to a side.
 field_31053_d,offsetsZForSide,1,gives the offset required for this axis to get the block at that side.
 field_31054_c,offsetsYForSide,1,gives the offset required for this axis to get the block at that side.
-field_31060_H,mobilityFlag,1,"0 indicates normal, 1 indicates this block can't push other blocks, 2 indicates this block cant be pushed"
+field_31060_H,mobilityFlag,1,"Mobility information flag. 0 indicates that this block is normal, 1 indicates that it can't push other blocks, 2 indicates that it can't be pushed."
 field_31061_G,canHarvest,1,Determines if the materials is one that can be collected by the player.
 field_31062_B,piston,1,Pistons' material.
 field_31063_A,web,1,Web's material.
@ -4139,11 +4169,11 @@ field_35111_a,playerName,1,The player's name.
 field_35112_c,gameMode,1,"Used only when reason = 3. 0 is survival, 1 is creative."
 field_35113_d,duration,1,
 field_35114_b,effectId,1,
-field_35115_c,effectAmp,1,effectAmp
+field_35115_c,effectAmplifier,1,The effect's amplifier.
 field_35116_a,entityId,1,
 field_35117_d,worldHeight,1,Defaults to 128
 field_35118_e,creativeMode,1,"0 for survival, 1 for creative"
-field_35119_c,difficulty,1,The difficulty setting of the server.
+field_35119_c,difficulty,1,"The difficulty setting. 0 through 3 for peaceful, easy, normal, hard. The client always sends 1."
 field_35121_d,posZ,1,
 field_35122_e,xpValue,1,The Orbs Experience points value.
 field_35123_b,posX,1,
@ -4171,7 +4201,7 @@ field_35166_o,blockType,1,the Block type that this TileEntity is contained withi
 field_35168_f,lidAngle,1,The current angle of the lid (between 0 and 1)
 field_35169_g,prevLidAngle,1,The angle of the lid last tick
 field_35170_d,adjacentChestXNeg,1,Contains the chest tile located adjacent to this one (if any)
-field_35171_e,adjacentChestZPos,1,Contains the chest tile located adjacent to this one (if any)
+field_35171_e,adjacentChestZPosition,1,Contains the chest tile located adjacent to this one (if any)
 field_35172_b,adjacentChestZNeg,1,Contains the chest tile located adjacent to this one (if any)
 field_35173_c,adjacentChestXPos,1,Contains the chest tile located adjacent to this one (if any)
 field_35174_q,ticksSinceSync,1,Server sync counter (once per 20 ticks)
@ -4183,9 +4213,9 @@ field_35191_aF,activePotionsMap,1,
 field_35192_ax,experienceValue,1,The experience points the Entity gives.
 field_35193_ak,jumpMovementFactor,1,A factor used to determine how far this entity will move each tick if it is jumping or falling.
 field_35194_aj,landMovementFactor,1,"A factor used to determine how far this entity will move each tick if it is walking on land. Adjusted by speed, and slipperiness of the current block."
-field_35210_L,experience,1,The player's experience score.
-field_35211_M,experienceLevel,1,The player's experience level.
-field_35212_N,experienceTotal,1,The player's experience total score.
+field_35210_L,experience,1,The current amount of experience the player has within their Experience Bar.
+field_35211_M,experienceLevel,1,The current experience level the player is on.
+field_35212_N,experienceTotal,1,The total amount of experience the player has. This also includes the amount of experience within their Experience Bar.
 field_35213_O,speedOnGround,1,
 field_35214_K,capabilities,1,The player's capabilities. (See class PlayerCapabilities)
 field_35215_P,speedInAir,1,
@ -4236,7 +4266,7 @@ field_35290_b,radius,1,The maximum radius used when generating a patch of blocks
 field_35291_a,sandID,1,Stores ID for WorldGenSand
 field_35293_a,mushroomType,1,"The mushroom type. 0 for brown, 1 for red."
 field_35316_g,boundingBox,1,
-field_35317_h,coordBaseMode,1,'switches the Coordinate System base off the Bounding Box'
+field_35317_h,coordBaseMode,1,switches the Coordinate System base off the Bounding Box
 field_35318_i,componentType,1,The type ID of this component.
 field_35326_b,doorType,1,
 field_35331_a,doorType,1,
@ -4329,7 +4359,7 @@ field_35493_d,villagePiecesLimit,1,
 field_35494_b,villagePieceWeight,1,
 field_35495_c,villagePiecesSpawned,1,
 field_35496_a,villagePieceClass,1,The Class object for the represantation of this village piece.
-field_35502_q,mapFeaturesEnabled,1,Are map structures going to be generated? (e.g. strongholds)
+field_35502_q,mapFeaturesEnabled,1,Whether the map features (e.g. strongholds) generation is enabled or disabled.
 field_35503_p,gameType,1,"Indicates the type of the game. 0 for survival, 1 for creative."
 field_35515_A,worldGenBigTree,1,The big tree generator.
 field_35516_B,worldGenForest,1,The forest generator.
@ -4354,7 +4384,7 @@ field_35537_a,allowedBiomeGenBases,1,
 field_35538_a,villageSpawnBiomes,1,A list of all the biomes villages can spawn in.
 field_35546_b,boundingBox,1,
 field_35547_a,components,1,List of all StructureComponents that are part of this structure
-field_35548_c,hasMoreThanTwoComponents,1,'well ... thats what it does'
+field_35548_c,hasMoreThanTwoComponents,1,well ... thats what it does
 field_35551_d,freeLargeArrays,1,A list of pre-allocated int[cacheSize] arrays that are currently unused and can be returned by getIntCache()
 field_35552_e,inUseLargeArrays,1,A list of pre-allocated int[cacheSize] arrays that were previously returned by getIntCache() and which will not be re-used again until resetIntCache() is called.
 field_35553_b,freeSmallArrays,1,A list of pre-allocated int[256] arrays that are currently unused and can be returned by getIntCache()
@ -4369,8 +4399,8 @@ field_35564_x,ravineGenerator,1,Holds ravine generator
 field_35568_b,selectedBlockMetaData,1,
 field_35569_a,selectedBlockId,1,
 field_35574_k,vine,1,
-field_35577_d,instancesLimit,1,'How many Structure Pieces of this type may spawn in a structure'
-field_35578_b,pieceWeight,1,"'This basically keeps track of the 'epicness' of a structure. Epic structure components have a higher 'weight', and Structures may only grow up to a certain 'weight' before generation is stopped'"
+field_35577_d,instancesLimit,1,How many Structure Pieces of this type may spawn in a structure
+field_35578_b,pieceWeight,1,"This basically keeps track of the 'epicness' of a structure. Epic structure components have a higher 'weight', and Structures may only grow up to a certain 'weight' before generation is stopped"
 field_35579_c,instancesSpawned,1,
 field_35580_a,pieceClass,1,
 field_35581_a,doorEnum,1,
@ -4421,7 +4451,7 @@ field_35707_a,temperatureValues,1,An array of chunk temperatures saved by this c
 field_384_a,nextEntityID,1,
 field_387_ah,hasAttacked,1,returns true if a creature has attacked recently only used for creepers and skeletons
 field_388_a,pathToEntity,1,
-field_389_ag,entityToAttack,1,The Player this EntityCreature will attack next.
+field_389_ag,entityToAttack,1,The Entity this EntityCreature is set to attack.
 field_38_b,packetClassToIdMap,1,Maps packet class to packet id
 field_39000_a,inLove,1,
 field_39001_b,breeding,1,This is representation of a counter for reproduction progress. (Note that this is different from the inLove which represent being in Love-Mode)
@ -4476,9 +4506,13 @@ field_40130_a,heightOffset,1,Random offset used in floating behaviour
 field_40138_s,maxHealth,1,The maximum health of the Entity.
 field_40142_f,dragonPartArray,1,An array containing all body parts of this dragon
 field_40143_g,dragonPartHead,1,The head bounding box of a dragon
+field_40144_d,ringBuffer,1,Ring buffer array for the last 64 Y-positions and yaw rotations. Used to calculate offsets for the animations.
+field_40145_e,ringBufferIndex,1,Index into the ring buffer. Incremented once per tick and restarts at 0 once it reaches the end of the buffer.
 field_40146_b,targetY,1,
 field_40147_c,targetZ,1,
 field_40148_a,targetX,1,
+field_40149_n,prevAnimTime,1,Animation time at previous tick.
+field_40150_o,animTime,1,"Animation time, used to control the speed of the animation cycles (wings flapping, jaw opening, etc.)"
 field_40151_l,dragonPartWing1,1,
 field_40152_m,dragonPartWing2,1,
 field_40153_j,dragonPartTail2,1,
@ -4486,6 +4520,9 @@ field_40154_k,dragonPartTail3,1,
 field_40155_h,dragonPartBody,1,The body bounding box of a dragon
 field_40156_i,dragonPartTail1,1,
 field_40157_t,target,1,
+field_40158_r,deathTicks,1,
+field_40159_q,slowed,1,"Activated if the dragon is flying though obsidian, white stone or bedrock. Slows movement and animation speed."
+field_40160_p,forceNewTarget,1,Force selecting a new flight target at next tick if set to true.
 field_40164_bz,mycelium,1,
 field_40165_bA,waterlily,1,
 field_40166_bL,useNeighborBrightness,1,Flag if block ID should use the brightest neighbor light value as its own
@ -4551,7 +4588,7 @@ field_40258_f,saveDirectoryName,1,The directory name of the world
 field_40263_b,itemStack,1,
 field_40264_b,enchantment,1,"The position of the enchantment on the enchantment table window, starting with 0 as the topmost one."
 field_40265_a,windowId,1,
-field_40266_a,experience,1,Experience at the current level
+field_40266_a,experience,1,The current experience bar points.
 field_40267_a,container,1,The brewing stand this clot belongs to.
 field_40268_a,container,1,The brewing stand this slot belongs to.
 field_40269_f,player,1,The player that has this container open.
@ -4619,7 +4656,7 @@ field_40387_f,requestIDstring,1,The request ID stored as a String
 field_40388_d,requestID,1,A client-provided request ID associated with this query
 field_40389_e,challengeValue,1,A unique string of bytes used to verify client auth
 field_40390_b,timestamp,1,The creation timestamp for this auth
-field_40391_c,randomChallenge,1,A
+field_40391_c,randomChallenge,1,A random integer value to be used for client response authentication
 field_40392_a,queryThread,1,The RConThreadQuery that this is probably an inner class of
 field_40399_b,output,1,ByteArrayOutputStream wrapper
 field_40400_a,byteArrayOutput,1,Output stream
@ -4645,7 +4682,7 @@ field_40444_h,queryPort,1,The RCon query port
 field_40445_i,serverPort,1,Port the server is running on
 field_40446_v,lastQueryResponseTime,1,The time of the last query response sent
 field_40447_u,output,1,The RConQuery output stream
-field_40449_s,queryClients,1,A map
+field_40449_s,queryClients,1,A map of pending client SocketAddresses to the RConThreadQueryAuth that has been sent to them
 field_4044_bf,portal,1,The purple teleport blocks inside the obsidian circle
 field_40450_r,serverHostname,1,The hostname of the running server
 field_40451_q,queryHostname,1,The hostname of this query server
@ -4745,7 +4782,7 @@ field_4082_aJ,signWall,1,
 field_4084_aE,signPost,1,
 field_4086_a,blockType,1,Boolean used to seperate different states of blocks
 field_4097_ai,targetedEntity,1,
-field_4098_b,currentTarget,1,this entities current target
+field_4098_b,currentTarget,1,This entity's current target.
 field_4099_a,livingSoundTime,1,Number of ticks since this EntityLiving last produced its sound
 field_409_aq,username,1,
 field_40_j,isChunkDataPacket,1,"Only true for Packet51MapChunk, Packet52MultiBlockChange, Packet53BlockChange and Packet59ComplexEntity. Used to separate them into a different send queue."
@ -4762,7 +4799,7 @@ field_4103_aj,aggroCooldown,1,Cooldown time between target loss and new target a
 field_41041_b,blockNames,1,
 field_41042_z,dragonEgg,1,
 field_41044_a,doBlockNotify,1,"Sets wither or not the generator should notify blocks of blocks it changes. When the world is first generated, this is false, when saplings grow, this is true."
-field_4104_c,numTicksToChaseTarget,1,how long to keep a specific target entity
+field_4104_c,numTicksToChaseTarget,1,How long to keep a specific target entity
 field_4105_b,randomSoundDelay,1,A random delay until this PigZombie next makes a sound.
 field_4106_a,angerLevel,1,Above zero if this PigZombie is Angry.
 field_4107_c,defaultHeldItem,1,"The ItemStack that any PigZombie holds (a gold sword, in fact)."
@ -4770,7 +4807,7 @@ field_4108_a,defaultHeldItem,1,The ItemStack that any Skeleton holds (a bow).
 field_4110_as,dimension,1,"Which dimension the player is in (-1 = the Nether, 0 = normal world)"
 field_4124_am,ticksCatchable,1,the number of ticks remaining until this fish can no longer be caught
 field_4125_al,ticksInAir,1,
-field_4126_f,zTile,1,"The tile this entity is on, Z position(unifying naming)"
+field_4126_f,zTile,1,"The tile this entity is on, Z position"
 field_4128_e,entityRiderYawDelta,1,
 field_4129_aj,inGround,1,
 field_4130_d,entityRiderPitchDelta,1,
@ -4946,6 +4983,7 @@ field_46027_X,rotationYawHead,1,Entity head rotation yaw
 field_46028_f,jumpHelper,1,Entity jumping helper
 field_46030_d,lookHelper,1,
 field_46031_e,moveHelper,1,
+field_46036_d,speed,1,
 field_46037_b,worldObj,1,
 field_46038_c,currentPath,1,The PathEntity being followed.
 field_46039_a,theEntity,1,
@ -4953,7 +4991,7 @@ field_46043_d,villageGen,1,
 field_46044_b,random,1,
 field_46045_c,useStructures,1,
 field_46046_a,worldObj,1,
-field_46047_f,terrainType,1,"World terrain type, 0 for normal, 1 for flap map"
+field_46047_f,terrainType,1,"World terrain type, 0 for normal, 1 for flat map"
 field_46052_c,worldType,1,
 field_46054_w,infinity,1,"Infinity enchantment for bows. The bow will not consume arrows anymore, but will still required at least one arrow on inventory use the bow."
 field_46055_v,flame,1,Flame enchantment for bows. Arrows fired by the bow will be on fire. Any target hit will also set on fire.
@ -4977,6 +5015,9 @@ field_46084_r,beach,1,Beach biome.
 field_46093_a,mutexBits,1,"A bitmask telling which other tasks may not run concurrently. The test is a simple bitwise AND - if it yields zero, the two tasks may run concurrently, if not - they must run exclusively from each other."
 field_46098_c,entityTarget,1,
 field_46099_a,worldObj,1,
+field_46101_d,zPosition,1,
+field_46102_b,xPosition,1,
+field_46103_c,yPosition,1,
 field_46104_a,entity,1,
 field_46105_a,theEntity,1,
 field_46111_d,idleTime,1,A decrementing tick that stops the entity from being idle once it reaches 0.
@ -5034,6 +5075,8 @@ field_48148_d,movePosZ,1,
 field_48150_b,movePosX,1,
 field_48151_c,movePosY,1,
 field_48152_a,theEntity,1,
+field_48156_b,attacker,1,
+field_48157_h,classTarget,1,
 field_48159_b,frontDoor,1,
 field_48160_a,entityObj,1,
 field_48161_b,leapTarget,1,The entity that the leaper is leaping towards.
@ -5062,6 +5105,8 @@ field_48199_d,theAnimal,1,
 field_481_e,nameToClassMap,1,A HashMap storing string names of classes mapping to the actual java.lang.Class type.
 field_48200_e,targetMate,1,
 field_48203_a,theWorld,1,
+field_48206_b,speed,1,
+field_48209_e,speed,1,
 field_48212_a,theEntity,1,
 field_48214_b,theGolem,1,
 field_48216_a,theVillager,1,
@ -5101,7 +5146,9 @@ field_48274_i,delayTemptCounter,1,A counter that is decremented each time the sh
 field_48278_f,doorList,1,
 field_48279_d,doorInfo,1,
 field_48283_a,theEntity,1,
+field_48288_d,targetDistance,1,
 field_48291_c,taskOwner,1,The entity that this task belongs to
+field_48295_f,targetChance,1,
 field_48297_b,targetClass,1,
 field_48298_a,targetEntity,1,
 field_482_d,zCoord,1,The z coordinate of the tile entity.
@ -5117,6 +5164,7 @@ field_48338_d,lastAttackingEntity,1,
 field_48339_c,revengeTimer,1,
 field_48341_o,homePosition,1,
 field_48342_l,attackTarget,1,The active target the Task system uses for tracking
+field_48343_m,senses,1,
 field_48344_j,bodyHelper,1,
 field_48345_k,navigator,1,
 field_48346_p,maximumHomeDistance,1,If -1 there is no maximum distance
@ -5212,6 +5260,14 @@ field_48643_c,newDoors,1,
 field_48644_a,worldObj,1,
 field_48645_a,parent,1,
 field_48670_f,noSunPathfind,1,
+field_48671_g,totalTicks,1,"Time, in number of ticks, following the current path"
+field_48672_e,pathSearchRange,1,The number of blocks (extra) +/- in each axis that get pulled out as cache for the pathfinder's search space
+field_48673_l,avoidsWater,1,If water blocks are avoided (at least by the pathfinder)
+field_48674_m,canSwim,1,If the entity can swim. Swimming AI enables this and the pathfinder will also cause the entity to swim straight upwards when underwater
+field_48675_j,canPassOpenWoodenDoors,1,"Specifically, if a wooden door block is even considered to be passable by the pathfinder"
+field_48676_k,canPassClosedWoodenDoors,1,If door blocks are considered passable even when closed
+field_48677_h,ticksAtLastPos,1,The time when the last position check was done (to detect successful movement)
+field_48678_i,lastPosCheck,1,Coordinates of the entity's position last time a check was done (part of monitoring getting 'stuck')
 field_486_h,furnaceCookTime,1,The number of ticks that the current item has been cooking for
 field_487_g,currentItemBurnTime,1,The number of ticks that a fresh copy of the currently-burning item would keep the furnace burning for
 field_488_f,furnaceBurnTime,1,The number of ticks that the furnace will keep burning
@ -5228,6 +5284,10 @@ field_497_f,player,1,The player whose inventory this is.
 field_498_e,inventoryChanged,1,Set true whenever the inventory changes. Nothing sets it false so you will have to write your own code to check it and reset the value.
 field_499_d,currentItem,1,The index of the currently held item (0-8).
 field_49_f,size,1,The size of the arrays.
+field_50004_d,isCreativeMode,1,"Used to determine if creative mode is enabled, and therefore if items should be depleted on usage"
+field_50005_b,isFlying,1,Indicates whether the player is flying or not.
+field_50006_c,allowFlying,1,Whether or not to allow the player to fly when they double jump.
+field_50007_a,disableDamage,1,Disables player damage.
 field_501_b,upperChest,1,Inventory object corresponding to double chest upper part
 field_502_a,name,1,Name of the chest.
 field_503_c,lowerChest,1,Inventory object corresponding to double chest lower part
@ -5472,7 +5532,7 @@ field_788_B,scheduledTickSet,1,Set of scheduled ticks (used for checking if a ti
 field_789_A,scheduledTickTreeSet,1,TreeSet of scheduled ticks which is used as a priority queue for the ticks
 field_78_a,xPosition,1,
 field_790_z,unloadedEntityList,1,
-field_792_x,isRemote,1,This is always false on a server
+field_792_x,isRemote,1,"This is set to true when you are a client connected to a multiplayer world, false otherwise."
 field_797_s,worldInfo,1,"holds information about a world (size on disk, time, spawn point, seed, ...)"
 field_798_r,worldAccesses,1,
 field_79_e,itemStack,1,
@ -5746,7 +5806,7 @@ field_927_a,typeOfHit,1,"What type of ray trace hit was this? 0 = block, 1 = ent
 field_928_g,entityHit,1,The hit entity
 field_929_f,hitVec,1,The vector position of the hit
 field_92_d,type,1,The new block type for the block.
-field_930_e,sideHit,1,Which side was hit. If its -1 then it went the full length of the ray trace.
+field_930_e,sideHit,1,"Which side was hit. If its -1 then it went the full length of the ray trace. Bottom = 0, Top = 1, East = 2, West = 3, North = 4, South = 5."
 field_931_d,blockZ,1,z coordinate of the block ray traced against
 field_932_c,blockY,1,y coordinate of the block ray traced against
 field_933_a,logger,1,Reference to the logger.
--- a/forge/conf/mcp.cfg
+++ b/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  = 25423eab6d8707f96cc6ad8a21a7250a
-MD5Server  = 6524b7299b1717ffb6e2b38f171568d0
+MD5Client  = 8e8778078a175a33603a585257f28563
+MD5Server  = 5f078323c2d661b8d9773c8242d912c3

 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@ -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           = 50000
-ParamIndex        = 1200
+RGIndex           = 52000
+ParamIndex        = 1300

 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
--- a/forge/conf/methods.csv
+++ b/forge/conf/methods.csv
@ -200,8 +200,8 @@ func_12243_a,createExplosion,0,"Creates an explosion. Args: entity, x, y, z, str
 func_12244_a,newExplosion,0,returns a new explosion. Does initiation (at time of writing Explosion is not finished)
 func_12245_a,handleExplosion,0,
 func_12246_a,getEntityByID,0,
-func_12247_b,doExplosionB,0,"Does the second part of explosion (sound, particles, drop spawn)"
-func_12248_a,doExplosionA,0,Does the first part of explosion (destroy blocks)
+func_12247_b,doExplosionB,0,"Does the second part of the explosion (sound, particles, drop spawn)"
+func_12248_a,doExplosionA,0,Does the first part of the explosion (destroy blocks)
 func_1224_a,getFluidHeight,0,Get fluid height
 func_1225_d,renderWestFace,0,"Renders the given texture to the west (z-positive) face of the block.  Args: block, x, y, z, texture"
 func_1226_h,renderCrossedSquares,0,"Renders any block requiring croseed squares such as reeds, flowers, and mushrooms"
@ -593,7 +593,7 @@ func_22288_b,getSeed,0,Returns the seed of current world.
 func_22289_d,setSaveVersion,0,Sets the save version of the world
 func_22290_i,getDimension,0,
 func_22291_a,updateTagCompound,0,
-func_22292_a,setSpawnPosition,0,"Sets the spawn position Args: x, y, z"
+func_22292_a,setSpawnPosition,0,"Sets the spawn zone position. Args: x, y, z"
 func_22293_c,getSpawnX,0,Returns the x spawn position
 func_22294_a,setSpawnX,0,Set the x spawn position to the passed in value
 func_22295_d,getSpawnY,0,Return the Y axis spawning point of the player.
@ -657,12 +657,12 @@ func_25028_d_,isMovementCeased,0,Disables a mob's ability to move on its own whi
 func_25029_a,setPathToEntity,0,sets the Entities walk path in EntityCreature
 func_25030_F,getEntityToAttack,0,Returns current entities target
 func_25031_E,hasPath,0,Returns true if entity has a path to follow
-func_25032_c,setTarget,0,Sets entities target to attack
+func_25032_c,setTarget,0,Sets the entity which is to be attacked.
 func_25033_c,getInterestedAngle,0,
 func_25037_z,getTailRotation,0,
 func_25039_v,getWolfShaking,0,
-func_25040_C,isAngry,0,gets this wolf's angry state
-func_25041_c,setAngry,0,sets this wolf's angry state to true if the boolean argument is true
+func_25040_C,isAngry,0,Determines whether this wolf is angry or not.
+func_25041_c,setAngry,0,Sets whether this wolf is angry or not.
 func_25042_a,getShakeAngle,0,
 func_25043_b_,getShadingWhileShaking,0,Used when calculating the amount of shading to apply while the wolf is shaking.
 func_25055_a,alertWolves,0,"Called when the player attack or gets attacked, it's alert all wolves in the area that are owned by the player to join the attack or defend the player."
@ -752,7 +752,7 @@ func_27043_a,isRailPassingPower,0,Returns true if the specified rail is passing
 func_27044_a,isNeighborRailPowered,0,"Powered minecart rail is conductive like wire, so check for powered neighbors"
 func_27046_f,setStateIfMinecartInteractsWithRail,0,"Update the detector rail power state if a minecart enter, stays or leave the block."
 func_27048_a,readString,0,Reads a string from a packet
-func_27049_a,writeString,0,Writes a string to a packet
+func_27049_a,writeString,0,Writes a String to the DataOutputStream
 func_27058_a,matchesNode,0,
 func_27059_b,applyTo,0,
 func_27060_a,shortForm,0,
@ -902,11 +902,11 @@ func_27367_a,parse,0,Parse the specified JSON String
 func_27369_a,getMD5String,0,Gets the MD5 string
 func_27374_a,init,0,A stub functions called to make the static initializer for this class run.
 func_27393_p,getRainTime,0,Return the number of ticks until rain.
-func_27394_b,setRaining,0,Sets the current state of raining.
+func_27394_b,setRaining,0,Sets whether it is raining or not.
 func_27395_f,setRainTime,0,Sets the number of ticks until rain.
-func_27396_m,isThundering,0,Returns the current state of thunderbolts.
-func_27397_o,isRaining,0,Gets the current state of raining.
-func_27398_a,setThundering,0,Defines if is thundering now.
+func_27396_m,isThundering,0,"Returns true if it is thundering, false otherwise."
+func_27397_o,isRaining,0,"Returns true if it is raining, false otherwise."
+func_27398_a,setThundering,0,Sets whether it is thundering or not.
 func_27399_e,setThunderTime,0,Defines the number of ticks until next thunderbolt.
 func_273_a,checkForBurnout,0,
 func_27400_n,getThunderTime,0,Returns the number of ticks until next thunderbolt.
@ -1013,7 +1013,7 @@ func_28189_a,saveData,0,Saves the given MapDataBase to disk.
 func_28194_b,deleteDisplayLists,0,
 func_28195_e,contract,0,Returns a bounding box that is inset by the specified amounts
 func_28196_a,clearBoundingBoxes,0,
-func_281_g,getMaxCurrentStrength,0,"Returns the current strength at the specified block if it is greater than the passed value, or the passed value otherwise.  Signature: (world, x, y, z, strength)"
+func_281_g,getMaxCurrentStrength,0,"Returns the current strength at the specified block if it is greater than the passed value, or the passed value otherwise. Signature: (world, x, y, z, strength)"
 func_28215_a,clearVectorList,0,Clears the vector list.
 func_282_i,notifyWireNeighborsOfNeighborChange,0,"Calls World.notifyBlocksOfNeighborChange() for all neighboring blocks, but only if the given block is a redstone wire."
 func_283_a_,getBlockEntity,0,Returns the TileEntity used by this block.
@ -1130,34 +1130,34 @@ func_348_f,addVelocity,0,"Adds to the current velocity of the entity. Args: x, y
 func_349_c,moveEntity,0,"Tries to moves the entity by the passed in displacement. Args: x, y, z"
 func_35002_a,placeDoorAtCurrentPosition,0,
 func_35003_a,createTreasureChestAtCurrentPosition,0,
-func_35004_a,buildComponent,0,"'Initiates construction of the Structure Component picked, at the current Location of StructGen'"
-func_35005_b,fillCurrentPositionBlocksDownwards,0,"'overwrites Air and Liquids from selected Position downwards, stops at hitting anything else'"
+func_35004_a,buildComponent,0,"Initiates construction of the Structure Component picked, at the current Location of StructGen"
+func_35005_b,fillCurrentPositionBlocksDownwards,0,"Overwrites air and liquids from selected position downwards, stops at hitting anything else."
 func_35006_b,getZWithOffset,0,
 func_35007_a,getBlockIdAtCurrentPosition,0,
 func_35008_a,getYWithOffset,0,
 func_35009_c,getMetadataWithOffset,0,"Returns the direction-shifted metadata for blocks that require orientation, e.g. doors, stairs, ladders. Parameters: block ID, original metadata"
-func_35010_a,randomlyFillWithBlocks,0,"'arguments: World worldObj, StructureBoundingBox structBB, Random rand, float randLimit, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int olaceBlockId, int replaceBlockId, boolean alwaysreplace'"
-func_35011_a,fillWithBlocks,0,"'arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)'"
+func_35010_a,randomlyFillWithBlocks,0,"arguments: World worldObj, StructureBoundingBox structBB, Random rand, float randLimit, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int olaceBlockId, int replaceBlockId, boolean alwaysreplace"
+func_35011_a,fillWithBlocks,0,"arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)"
 func_35012_c,getComponentType,0,Returns the component type ID of this component.
-func_35013_a,isLiquidInStructureBoundingBox,0,'checks the entire StructureBoundingBox for Liquids'
-func_35014_a,randomlyPlaceBlock,0,'Randomly decides if placing or not. Used for Decoration such as Torches and Spiderwebs'
+func_35013_a,isLiquidInStructureBoundingBox,0,checks the entire StructureBoundingBox for Liquids
+func_35014_a,randomlyPlaceBlock,0,Randomly decides if placing or not. Used for Decoration such as Torches and Spiderwebs
 func_35015_a,randomlyRareFillWithBlocks,0,"arguments: World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, boolean alwaysreplace"
-func_35016_b,clearCurrentPositionBlocksUpwards,0,'deletes all continuous Blocks from selected Position upwards. Stops at hitting air'
+func_35016_b,clearCurrentPositionBlocksUpwards,0,Deletes all continuous blocks from selected position upwards. Stops at hitting air.
 func_35017_a,getXWithOffset,0,
-func_35018_a,placeBlockAtCurrentPosition,0,"'current Position depends on currently set Coordinates mode, is computed here'"
+func_35018_a,placeBlockAtCurrentPosition,0,"current Position depends on currently set Coordinates mode, is computed here"
 func_35019_a,fillTreasureChestWithLoot,0,
 func_35020_a,findIntersecting,0,Discover if bounding box can fit within the current bounding box object.
 func_35021_b,getBoundingBox,0,
-func_35022_a,fillWithRandomizedBlocks,0,"'arguments: World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, boolean alwaysreplace, Random rand, StructurePieceBlockSelector blockselector'"
-func_35023_a,addComponentParts,0,"'second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at the end, it adds Fences...'"
+func_35022_a,fillWithRandomizedBlocks,0,"arguments: World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, boolean alwaysreplace, Random rand, StructurePieceBlockSelector blockselector"
+func_35023_a,addComponentParts,0,"second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at the end, it adds Fences..."
 func_35027_a,findValidPlacement,0,Trys to find a valid place to put this component.
 func_35028_a,getNextComponentNormal,0,Gets the next component in any cardinal direction
 func_35029_c,getNextComponentZ,0,Gets the next component in the +/- Z direction
 func_35030_a,canStrongholdGoDeeper,0,returns false if the Structure Bounding Box goes below 10
 func_35031_a,getRandomDoor,0,
 func_35032_b,getNextComponentX,0,Gets the next component in the +/- X direction
-func_35033_a,placeDoor,0,'builds a door of the enumerated types (empty opening is a door)'
-func_35034_a,getStrongholdStairsComponent,0,"'performs some checks, then gives out a fresh Stairs component'"
+func_35033_a,placeDoor,0,builds a door of the enumerated types (empty opening is a door)
+func_35034_a,getStrongholdStairsComponent,0,"performs some checks, then gives out a fresh Stairs component"
 func_35039_a,findValidPlacement,0,
 func_35045_a,findValidPlacement,0,
 func_35047_a,findValidPlacement,0,
@ -1195,8 +1195,8 @@ func_35121_b,getXPSplit,0,Get xp split rate (Is called until the xp drop code in
 func_35141_y_,closeChest,0,
 func_35142_x_,openChest,0,
 func_35143_b,onTileEntityPowered,0,
-func_35144_b,updateContainingBlockInfo,0,"causes the TileEntity to reset all it's cached values for it's container block, blockID, metaData and in the case of chests, the adjcacent chest check"
-func_35147_g,checkForAdjacentChests,0,performs the check for adjacent chests to determine if this chest is double or not.
+func_35144_b,updateContainingBlockInfo,0,"Causes the TileEntity to reset all it's cached values for it's container block, blockID, metaData and in the case of chests, the adjcacent chest check"
+func_35147_g,checkForAdjacentChests,0,Performs the check for adjacent chests to determine if this chest is double or not.
 func_35157_d,hasItem,0,Get if a specifiied item id is inside the inventory.
 func_35158_d,onFinishedPotionEffect,0,
 func_35159_aC,getRenderSizeModifier,0,Returns render size modifier
@ -1206,7 +1206,7 @@ func_35162_ad,isBlocking,0,
 func_35163_av,isPlayer,0,Only use is to identify if class is an instance of player for experience dropping
 func_35164_b,onNewPotionEffect,0,
 func_35165_a,addPotionEffect,0,adds a PotionEffect to the entity
-func_35166_t_,getSpeedModifier,0,"This method return a value to be applyed directly to entity speed, this factor is less than 1 when a slowdown potion effect is applyed, more than 1 when a haste potion effect is applyed and 2 for fleeing entities."
+func_35166_t_,getSpeedModifier,0,"This method returns a value to be applied directly to entity speed, this factor is less than 1 when a slowdown potion effect is applied, more than 1 when a haste potion effect is applied and 2 for fleeing entities."
 func_35167_b,getActivePotionEffect,0,"returns the PotionEffect for the supplied Potion if it is active, null otherwise."
 func_35175_b,attackEntityAsMob,0,
 func_35176_r,getCarried,0,Get the id of the block an enderman carries
@ -1229,7 +1229,7 @@ func_35197_b,canEat,0,
 func_35198_d,addExhaustion,0,increases exhaustion level by supplied amount
 func_35199_b,setItemInUse,0,"sets the itemInUse when the use item button is clicked. Args: itemstack, int maxItemUseDuration"
 func_351_a,moveFlying,0,Used in both water and by flying objects
-func_35200_b,onCriticalHit,0,is called when the player performs a critical hit on the Entity. Args: entity that was hit critically
+func_35200_b,onCriticalHit,0,Called when the player performs a critical hit on the Entity. Args: entity that was hit critically
 func_35201_a,updateItemUse,0,Plays sounds and makes particles for item in use state
 func_35202_aE,getSwingSpeedModifier,0,Returns the swing speed modifier
 func_35203_aG,increaseLevel,0,This method increases the player's experience level by one.
@ -1244,7 +1244,7 @@ func_35265_a,generateVines,0,Generates vines at the given position until it hits
 func_35267_a,getIntCache,0,
 func_35268_a,resetIntCache,0,Mark all pre-allocated arrays as available for re-use by moving them to the appropriate free lists.
 func_35274_i,getBlockColor,0,
-func_35275_c,getMixedBrightnessForBlock,0,"'Goes straight to getLightBrightnessForSkyBlocks for Blocks, does some fancy computing for Fluids'"
+func_35275_c,getMixedBrightnessForBlock,0,"Goes straight to getLightBrightnessForSkyBlocks for Blocks, does some fancy computing for Fluids"
 func_35276_e,getAmbientOcclusionLightValue,0,Returns the default ambient occlusion value based on block opacity
 func_35291_d,isFenceGateOpen,0,Returns if the fence gate is open according to its metadata.
 func_35293_c,fertilizeMushroom,0,Fertilize the mushroom.
@ -1306,8 +1306,8 @@ func_35446_a,scaleSpider,0,
 func_35447_a,getSilverfishDeathRotation,0,Return the silverfish's maximum death rotation.
 func_35448_a,renderSilverfish,0,Renders the silverfish.
 func_35449_a,shouldSilverfishRenderPass,0,Disallows the silverfish to render the renderPassModel.
-func_35451_b,getLightBrightnessForSkyBlocks,0,'Any Light rendered on a 1.8 Block goes through here'
-func_35453_b,getSpecialBlockBrightness,0,'is only used on stairs and tilled fields'
+func_35451_b,getLightBrightnessForSkyBlocks,0,Any Light rendered on a 1.8 Block goes through here
+func_35453_b,getSpecialBlockBrightness,0,is only used on stairs and tilled fields
 func_35454_a,getSkyBlockTypeBrightness,0,Brightness for SkyBlock.Sky is clear white and (through color computing it is assumed) DEPENDENT ON DAYTIME. Brightness for SkyBlock.Block is yellowish and independent.
 func_35455_a,markTileEntityForDespawn,0,adds tile entity to despawn list (renamed from markEntityForDespawn)
 func_35456_d,getCelestialAngleRadians,0,Return getCelestialAngle()*2*PI
@ -1334,7 +1334,7 @@ func_35511_a,choose,0,randomly choose between the two args
 func_35516_a,choose,0,Chooses one of the two inputs randomly.
 func_35518_a,getSeed,0,Returns the seed for the world.
 func_35519_b,getGameType,0,Returns the world game type.
-func_35520_c,isMapFeaturesEnabled,0,"Returns if map features are enabled, caves, mines, etc.."
+func_35520_c,isMapFeaturesEnabled,0,Get whether the map features (e.g. strongholds) generation is enabled or disabled.
 func_35524_a,causeThrownDamage,0,
 func_35525_a,causeMobDamage,0,
 func_35526_e,getSourceOfDamage,0,
@ -1365,7 +1365,7 @@ func_35573_a,getHashIndex,0,gets the index in the hash given the array length an
 func_35574_d,remove,0,calls the removeKey method and returns removed object
 func_35575_b,containsItem,0,
 func_35576_a,getNumHashElements,0,
-func_35577_a,add,0,add the key value pair to the list
+func_35577_a,add,0,Add a key-value pair.
 func_35578_a,getValueByKey,0,get the value from the map given the key
 func_35579_a,copyHashTableTo,0,copies the hash table to the specified array
 func_35585_a,getNextComponent,0,
@ -1402,20 +1402,20 @@ func_35661_a,setPotionName,0,Set the potion name.
 func_35662_a,performEffect,0,
 func_35698_e,getNextComponentVillagePath,0,
 func_35699_a,getVillageComponentFromWeightedPiece,0,
-func_35700_c,getNextVillageComponent,0,'attempts to find a next Village Component to be spawned'
+func_35700_c,getNextVillageComponent,0,attempts to find a next Village Component to be spawned
 func_35701_b,getNextStructureComponentVillagePath,0,
-func_35702_d,getNextVillageStructureComponent,0,"'attempts to find a next Structure Component to be spawned, private Village function'"
+func_35702_d,getNextVillageStructureComponent,0,"attempts to find a next Structure Component to be spawned, private Village function"
 func_35703_a,getAvailablePieceWeight,0,
-func_35704_a,getNextStructureComponent,0,'attempts to find a next Structure Component to be spawned'
+func_35704_a,getNextStructureComponent,0,attempts to find a next Structure Component to be spawned
 func_35705_a,getStructureVillageWeightedPieceList,0,
-func_35706_a,selectBlocks,0,'picks Block Ids and Metadata (Silverfish)'
+func_35706_a,selectBlocks,0,picks Block Ids and Metadata (Silverfish)
 func_35707_a,getSelectedBlockId,0,
 func_35708_b,getSelectedBlockMetaData,0,
-func_35711_a,generateStructure,0,'Keeps iterating Structure Pieces and spawning them until the checks tell it to stop'
+func_35711_a,generateStructure,0,Keeps iterating Structure Pieces and spawning them until the checks tell it to stop
 func_35712_a,getBoundingBox,0,
-func_35713_a,markAvailableHeight,0,"'offsets the structure Bounding Boxes up to a certain height, typically 63 - 10'"
+func_35713_a,markAvailableHeight,0,"offsets the structure Bounding Boxes up to a certain height, typically 63 - 10"
 func_35714_b,updateBoundingBox,0,Calculates total bounding box based on components' bounding boxes and saves it to boundingBox
-func_35715_c,isSizeableStructure,0,"'currently only defined for Villages, returns true if Village has more than 2 non-road components'"
+func_35715_c,isSizeableStructure,0,"currently only defined for Villages, returns true if Village has more than 2 non-road components"
 func_35719_f,getGameType,0,
 func_35721_a,getChunkManager,0,Get the world chunk manager object for a biome list.
 func_35723_d,getCachedBiomes,0,Returns the array of cached biome types in the BiomeCacheBlock at the given location.
@ -1431,13 +1431,13 @@ func_35737_a,getTotalWeight,0,Returns the total weight of all items in a array.
 func_35738_b,expandTo,0,Expands a bounding box's dimensions to include the supplied bounding box.
 func_35739_d,getZSize,0,Returns length of a bounding box
 func_35740_a,intersectsWith,0,Returns whether the given bounding box intersects with this one. Args: structureboundingbox
-func_35741_a,getNewBoundingBox,0,'returns a new StructureBoundingBox with MAX values'
+func_35741_a,getNewBoundingBox,0,returns a new StructureBoundingBox with MAX values
 func_35742_b,isVecInside,0,Returns true if block is inside bounding box
 func_35743_c,getYSize,0,Returns height of a bounding box
 func_35744_b,getXSize,0,Returns width of a bounding box
 func_35745_a,offset,0,"Offsets the current bounding box by the specified coordinates. Args: x, y, z"
 func_35746_a,intersectsWith,0,Discover if a coordinate is inside the bounding box area.
-func_35747_a,getComponentToAddBoundingBox,0,'used to project a possible new component Bounding Box - to check if it would cut anything already spawned'
+func_35747_a,getComponentToAddBoundingBox,0,used to project a possible new component Bounding Box - to check if it would cut anything already spawned
 func_35760_d,getSaturationLevel,0,Get the player's food saturation level.
 func_35761_a,addStats,0,Eat some food.
 func_35762_a,addExhaustion,0,adds input to foodExhaustionLevel to a max of 40
@ -1483,15 +1483,15 @@ func_35842_d,updateSkylightNeighborHeight,0,
 func_35843_a,populateChunk,0,
 func_35847_b,getNextComponent,0,
 func_35848_c,getNextValidComponent,0,
-func_35849_a,prepareStructurePieces,0,'sets up Arrays with the Structure pieces and their weights'
+func_35849_a,prepareStructurePieces,0,sets up Arrays with the Structure pieces and their weights
 func_35850_a,getNextValidComponentAccess,0,
-func_35851_a,getStrongholdComponentFromWeightedPiece,0,'translates the PieceWeight class to the Component class'
+func_35851_a,getStrongholdComponentFromWeightedPiece,0,translates the PieceWeight class to the Component class
 func_35852_b,getStrongholdStones,0,
 func_35853_c,canAddStructurePieces,0,
 func_35858_b,containsItem,0,Return true if an object is associated with the given key
 func_35859_c,lookupEntry,0,Returns the key/object mapping for a given key as a MCHashEntry
 func_35860_b,getKeySet,0,Return the Set of all keys stored in this MCHash object
-func_35862_a,onPlayerStoppedUsing,0,"called when the player releases the use item button. Args: world, entityplayer, itemInUseCount"
+func_35862_a,onPlayerStoppedUsing,0,"Called when the player releases the use item button. Args: world, entityplayer, itemInUseCount"
 func_35863_b,onFoodEaten,0,
 func_35864_a,loadItemStackFromNBT,0,
 func_35865_n,getItemUseAction,0,
@ -1502,7 +1502,7 @@ func_35882_b,decorate,0,The method that does the work of actually decorating chu
 func_35883_b,genStandardOre2,0,Standard ore generation helper. Generates Lapis Lazuli.
 func_35884_a,genStandardOre1,0,Standard ore generation helper. Generates most ores.
 func_358_c,addEntityID,0,adds the ID of this entity to the NBT given
-func_35917_r,isMapFeaturesEnabled,0,are map structures going to be generated (e.g. strongholds)
+func_35917_r,isMapFeaturesEnabled,0,Get whether the map features (e.g. strongholds) generation is enabled or disabled.
 func_35918_q,getGameType,0,"Get the game type, 0 for survival, 1 for creative."
 func_35922_a,renderBlockPane,0,
 func_35923_a,renderBlockFenceGate,0,Render block fence gate
@ -1601,7 +1601,7 @@ func_40052_p,brewPotions,0,
 func_40053_g,getBrewTime,0,
 func_40054_n,getFilledSlots,0,returns an integer with each bit specifying wether that slot of the stand contains a potion
 func_40076_a,setThrowableHeading,0,"Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction."
-func_40078_a,onImpact,0,Called when the throwable hits a block or entity.
+func_40078_a,onImpact,0,Called when this EntityThrowable hits a block or entity.
 func_4007_a,displayUnexpectedThrowable,0,Displays an unexpected error that has come up during the game.
 func_40088_g,getPotionDamage,0,Returns the damage value of the thrown potion that this EntityPotion represents.
 func_40099_c,setParticleTextureIndex,0,Public method to set private field particleTextureIndex.
@ -1639,6 +1639,7 @@ func_40156_a,attackEntityFromPart,0,
 func_40158_a,destroyBlocksInAABB,0,Destroys all blocks that aren't associated with 'The End' inside the given bounding box.
 func_40159_b,simplifyAngle,0,Simplifies the value of a number by adding/subtracting 180 to the point that the number is between -180 and 180.
 func_4015_a,renderSpecials,0,Method for adding special render rules
+func_40160_a,getMovementOffsets,0,"Returns a double[3] array with movement offsets, used to calculate trailing tail/neck positions. [0] = yaw offset, [1] = y offset, [2] = unused, always 0. Parameters: buffer index offset, partial ticks."
 func_4016_e,setFull3D,0,Sets bFull3D to True and return the object.
 func_4017_a,isFull3D,0,Returns True is the item is renderer in full 3D when hold.
 func_40180_a,displayGUIBrewingStand,0,Displays the GUI for interacting with a brewing stand.
@ -1676,8 +1677,10 @@ func_40275_a,renderMagmaCube,0,
 func_40277_a,renderBlaze,0,
 func_40279_a,renderDragonDying,0,Renders the animation for when an enderdragon dies
 func_4027_c,onBlockDestroyedByExplosion,0,Called upon the block being destroyed by an explosion
+func_40280_a,renderDragonModel,0,Renders the dragon model. Called by renderModel.
 func_40281_a,renderDragon,0,"Renders the dragon, along with its dying animation"
 func_40282_a,rotateDragonBody,0,Used to rotate the dragon as a whole in RenderDragon. It's called in the rotateCorpse method.
+func_40283_a,renderGlow,0,Renders the overlay for glowing eyes and the mouth. Called by shouldRenderPass.
 func_40294_a,renderVillager,0,
 func_40297_a,getTextureOffset,0,
 func_40298_a,setTextureOffset,0,
@ -1729,17 +1732,17 @@ func_4045_l,getHeldItem,0,"Returns the item that this EntityLiving is holding, i
 func_40468_d,getEffectName,0,
 func_40469_f,getEntrancePortalLocation,0,Gets the hard-coded portal location to use when entering this dimension
 func_40470_b,getMoonPhase,0,
-func_40471_p,isBlockHydratedDirectly,0,Checks if the block is hydrating itself.
+func_40471_p,isBlockFreezable,0,checks to see if a given block is both water and is cold enough to freeze
 func_40472_j,getEntrancePortalLocation,0,Gets the hard-coded portal location to use when entering this dimension
 func_40473_b,getClosestVulnerablePlayer,0,"Returns the closest vulnerable player within the given radius, or null if none is found."
 func_40474_a,getRandomMob,0,Gets a random mob for spawning in this world.
 func_40475_d,getMoonPhase,0,
-func_40476_b,isBlockHydrated,0,(I think)
+func_40476_b,canBlockFreeze,0,"checks to see if a given block is both water, and cold enough to freeze - if the par4 boolean is set, this will only return true if there is a non-water block immediately adjacent to the specified block"
 func_40477_b,findClosestStructure,0,Returns the location of the closest structure of the specified type. If not found returns null.
 func_40478_r,canSnowAt,0,Tests whether or not snow can be placed at a given location
 func_40479_y,getSaveHandler,0,Returns this world's current save handler
 func_40480_b,getClosestVulnerablePlayerToEntity,0,"Returns the closest vulnerable player to this entity within the given radius, or null if none is found"
-func_40481_q,isBlockHydratedIndirectly,0,Check if the block is being hydrated by an adjacent block.
+func_40481_q,isBlockFreezableNaturally,0,checks to see if a given block is both water and has at least one immediately adjacent non-water block
 func_40484_a,getNearestInstance,0,
 func_40485_b,getSpawnList,0,
 func_40487_c,getTranslatedName,0,Returns the correct traslated name of the enchantment and the level in roman numbers.
@ -1844,13 +1847,13 @@ func_40690_b,createNextComponentRandom,0,
 func_406_a,renderParticle,0,
 func_40700_a,getDisplayColor,0,Compute the color used to display this ProfilerResult on the debug screen
 func_40701_a,compareProfilerResult,0,Called from compareTo()
-func_40705_a,addEnchantment,0,Adds a enchantments with a desired level on the ItemStack.
+func_40705_a,addEnchantment,0,Adds an enchantment with a desired level on the ItemStack.
 func_40706_d,setTagCompound,0,"Assigns a NBTTagCompound to the ItemStack, minecraft validates that only non-stackable items can have it."
 func_40707_s,getRarity,0,
 func_40708_t,isItemEnchantable,0,True if it is a tool and has no enchantments to begin with
 func_40709_o,getTagCompound,0,Returns the NBTTagCompound of the ItemStack.
 func_4070_a,loadBlockGeneratorData,0,"Returns biomes to use for the blocks and loads the other data like temperature and humidity onto the WorldChunkManager Args: oldBiomeList, x, z, width, depth"
-func_40710_n,hasTagCompound,0,Returns true if the ItemStack have a NBTTagCompound. Used currently to store enchantments.
+func_40710_n,hasTagCompound,0,Returns true if the ItemStack has an NBTTagCompound. Currently used to store enchantments.
 func_40711_u,isItemEnchanted,0,True if the item has enchantment data
 func_40712_q,getItemNameandInformation,0,"gets a list of strings representing the item name and successive extra data, eg Enchantments and potion effects"
 func_40713_r,hasEffect,0,
@ -1864,7 +1867,7 @@ func_40729_s,renderBlockEndPortalFrame,0,Render BlockEndPortalFrame
 func_40730_a,renderBlockBrewingStand,0,Render BlockBrewingStand
 func_40731_e,getEnchantability,0,Return the natural enchantability factor of the material.
 func_40735_a,getCenterXPos,0,
-func_40736_b,getCenterZPos,0,
+func_40736_b,getCenterZPosition,0,
 func_40737_a,getChunkPosition,0,
 func_4073_a,getBiomeGenAt,0,"Returns the BiomeGenBase related to the x, z position on the world."
 func_40740_k,getChunkCoordIntPair,0,Gets a ChunkCoordIntPair representing the Chunk's position.
@ -1893,9 +1896,11 @@ func_41002_a,playStepSound,0,"Plays step sound at given x, y, z for the entity"
 func_41003_g,setAir,0,
 func_41004_h,isEntityEqual,0,Returns true if Entity argument is equal to this Entity
 func_41005_b,renderBrokenItemStack,0,Renders broken item particles using the given ItemStack
+func_41006_aA,setNewTarget,0,Sets a new target for the flight AI. It can be a random coordinate or a nearby player.
 func_41008_a,collideWithEntities,0,Pushes all entities inside the list away from the enderdragon.
 func_41009_b,attackEntitiesInList,0,"Attacks all entities inside this list, dealing 5 hearts of damage."
 func_4100_a,calculateCelestialAngle,0,Calculates the angle of sun and moon in the sky relative to a specified time (usually worldTime)
+func_41010_ax,getDragonHealth,0,Returns the health points of the dragon.
 func_41011_ay,updateDragonEnderCrystal,0,Updates the state of the enderdragon's current endercrystal.
 func_41012_a,createEnderPortal,0,Creates the ender portal leading back to the normal world after defeating the enderdragon.
 func_41014_d,copyPlayer,0,Copy the inventory and various stats from another EntityPlayer
@ -1911,7 +1916,7 @@ func_41022_a,copyInventory,0,Copy the ItemStack contents from another InventoryP
 func_41026_g,isMinecartPowered,0,Is this minecart powered (Fuel > 0)
 func_41027_b,setMinecartPowered,0,Set if this minecart is powered (Fuel > 0)
 func_4102_a,canCoordinateBeSpawn,0,"Will check if the x, z position specified is alright to be set as the map spawn point"
-func_41033_a,setBlockNames,0,sets the array of strings to be used for name lookups from item damage to metadata
+func_41033_a,setBlockNames,0,Sets the array of strings to be used for name lookups from item damage to metadata
 func_41039_c,renderBossHealth,0,Renders dragon's (boss) health on the HUD
 func_4103_a,onPickupFromSlot,0,Called when the player picks up an item from an inventory slot
 func_41041_e,respawnPlayer,0,Respawns the player.
@ -1978,9 +1983,9 @@ func_419_b,onDeath,0,Called when the mob's health reaches 0.
 func_420_c,canEntityBeSeen,0,returns true if the entity provided in the argument can be seen. (Raytrace)
 func_421_b,getTalkInterval,0,"Get number of ticks, at least during which the living entity will be silent."
 func_422_g,getDropItemId,0,Returns the item ID for the item the mob drops on death.
-func_424_C,jump,0,"jump, Causes this entity to do an upwards motion (jumping)"
+func_424_C,jump,0,Causes this entity to do an upwards motion (jumping).
 func_425_j,onLivingUpdate,0,"Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons use this to react to sunlight and start to burn."
-func_426_b,faceEntity,0,changes pitch and yaw so that the entity calling the function is facing the entity provided as an argument
+func_426_b,faceEntity,0,Changes pitch and yaw so that the entity calling the function is facing the entity provided as an argument.
 func_427_e,getPosition,0,interpolated position vector
 func_429_A,isOnLadder,0,"returns true if this entity is by a ladder, false otherwise"
 func_43001_a,onFallenUpon,0,Block's chance to react to an entity falling on it.
@ -2092,6 +2097,7 @@ func_48086_a,setRevengeTarget,0,
 func_48087_aX,hasHome,0,
 func_48088_aP,getLastAttackingEntity,0,
 func_48089_l,setLastAttackingEntity,0,
+func_48090_aM,getEntitySenses,0,returns the EntitySenses Object for the EntityLiving
 func_48091_aU,getHomePosition,0,
 func_48092_c,setAttackTarget,0,Sets the active target the Task system uses for tracking
 func_48093_aT,isWithinHomeDistanceCurrentPosition,0,Returns true if entity is within home distance from current position
@ -2114,6 +2120,7 @@ func_48134_p_,resetInLove,0,
 func_48136_o_,isInLove,0,Returns if the entity is currently in 'love mode'.
 func_48138_b,setTamed,0,
 func_48139_F_,isTamed,0,
+func_48140_f,setSitting,0,
 func_48141_af,isSitting,0,
 func_48143_a,setOwner,0,
 func_48144_ah,getOwner,0,
@ -2146,6 +2153,8 @@ func_48413_d,isHighHumidity,0,Checks to see if the rainfall level of the biome i
 func_48414_h,getFloatRainfall,0,Gets a floating point representation of this biome's rainfall
 func_48415_j,getBiomeGrassColor,0,Provides the basic grass color based on the biome temperature and rainfall
 func_48442_a,clamp_float,0,"Returns the value of the first parameter, clamped to be within the lower and upper limits given by the second and third parameters"
+func_48444_a,readChunkFromNBT,0,Reads the data stored in the passed NBTTagCompound and creates a Chunk with that data in the passed World. Returns the created Chunk.
+func_48445_a,writeChunkToNBT,0,"Writes the Chunk passed as an argument to the NBTTagCompound also passed, using the World argument to retrieve the Chunk's last update time."
 func_48453_b,getHeight,0,Returns current world height.
 func_48454_a,getBiomeGenForCoords,0,Gets the biome for a given set of x/z coordinates
 func_48455_z,isBlockHighHumidity,0,"Checks to see if the biome rainfall values for a given x,y,z coordinate set are extremely high"
@ -2158,7 +2167,7 @@ func_48485_a,load,0,
 func_48486_a,convertToAnvilFormat,0,
 func_48488_a,handleEntityHeadRotation,0,
 func_48489_a,handleTileEntityData,0,
-func_48491_o,enqueueRelightChecks,0,"Called once-per-chunk-per-tick, and advances the round-robin relight check index by up to 8 blocks at a time. In a worst-case scenario, can potentially take up to 25.6 seconds, calculated via (4096/8)/20, to re-check all blocks in a chunk, which may explain lagging light updates on initial world generation."
+func_48491_o,enqueueRelightChecks,0,"Called once-per-chunk-per-tick, and advances the round-robin relight check index per-storage-block by up to 8 blocks at a time. In a worst-case scenario, can potentially take up to 1.6 seconds, calculated via (4096/(8*16))/20, to re-check all blocks in a chunk, which could explain both lagging light updates in certain cases as well as Nether relight"
 func_48492_c,getAreLevelsEmpty,0,Returns whether the ExtendedBlockStorages containing levels (in blocks) from arg 1 to arg 2 are fully empty (true) or not (false).
 func_48493_m,getBiomeArray,0,Returns an array containing a 16x16 mapping on the X/Z of block positions in this Chunk to biome IDs.
 func_48495_i,getBlockStorageArray,0,Returns the ExtendedBlockStorage array for this Chunk.
@ -2230,11 +2239,18 @@ func_48646_a,getVectorFromIndex,0,Gets the vector of the PathPoint associated wi
 func_48648_a,getPathPointFromIndex,0,"return the PathPoint located at the specified PathIndex, usually the current one"
 func_48655_c,getDistanceSquared,0,Returns the squared distance between this coordinates and the coordinates given as argument.
 func_48656_a,set,0,
+func_48657_k,isInFluid,0,"Returns true if the entity is in water or lava, false otherwise"
+func_48658_a,getAvoidsWater,0,
 func_48659_j,canNavigate,0,If on ground or swimming and can swim
 func_48660_a,setSpeed,0,Sets the speed
 func_48661_h,getEntityPosition,0,
 func_48662_a,isDirectPathBetweenPoints,0,"Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: pos1, pos2, entityXSize, entityYSize, entityZSize"
+func_48663_c,setEnterDoors,0,Sets if the entity can enter open doors
+func_48664_a,setAvoidsWater,0,
+func_48665_b,getCanBreakDoors,0,"Returns true if the entity can break doors, false otherwise"
+func_48666_a,tryMoveToXYZ,0,Try to find and set a path to XYZ. Returns true if successful.
 func_48668_i,getPathableYPos,0,Gets the safe pathing Y position for the entity depending on if it can path swim or not
+func_48669_e,setCanSwim,0,Sets if the entity can swim
 func_48670_c,getPath,0,gets the actively used PathEntity
 func_48671_a,getPathToXYZ,0,Returns the path to the given coordinates
 func_48672_f,clearPathEntity,0,sets active PathEntity to null
@ -2244,6 +2260,7 @@ func_48675_a,isSafeToStandAt,0,"Returns true when an entity could stand at a pos
 func_48676_b,isPositionClear,0,"Returns true if an entity does not collide with any solid blocks at the position. Args: xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ"
 func_48677_l,removeSunnyPath,0,Trims path data from the end to the first sun covered block
 func_48678_a,setPath,0,"sets the active path data if path is 100% unique compared to old path, checks to adjust path for sun avoiding ents and stores end coords"
+func_48680_d,setAvoidSun,0,Sets if the path should avoid sunlight
 func_48690_b,setExtBlockMetadata,0,Sets the metadata of the Block at the given coordinates in this ExtendedBlockStorage to the given metadata.
 func_48691_a,setExtBlockID,0,"Sets the extended block ID for a location in a chunk, splitting bits 11..8 into a NibbleArray and bits 7..0 into a byte array. Also performs reference counting to determine whether or not to broadly cull this Chunk from the random-update tick list."
 func_48693_a,getIsEmpty,0,"Returns whether or not this block storage's Chunk is fully empty, based on its internal reference count."
@ -2275,10 +2292,36 @@ 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_50007_a,isEditable,0,
+func_50011_a,adjustHistoryOffset,0,increment/decrement history scroll offset
+func_50013_c,getSentMessageList,0,Returns the list with the sent chat messages in it.
 func_50015_e,isChatOpen,0,Return true if chat gui is open
+func_50022_i,getEnableBackgroundDrawing,0,get enable drawing background and outline
+func_50025_j,getIsFocused,0,getter for the focused field
+func_50027_a,setEnableBackgroundDrawing,0,enable drawing background and outline
+func_50033_b,setFocused,0,setter for the focused field
+func_50037_a,textboxKeyTyped,0,Call this method from you GuiScreen to process the keys into textbox.
+func_50050_a,setClipboardString,0,store a string in the system clipboard
 func_50057_d,completePlayerName,0,Autocompletes player name
+func_50073_a,setBlock,0,"Sets the block without metadata in the world, notifying neighbors if enabled."
+func_50074_q,canSilkHarvest,0,"Return true if a player with SlikTouch can harvest this block directly, and not it's normal drops."
+func_50086_b,setEnableSnow,0,sets enableSnow to true during biome initialization. returns BiomeGenBase.
 func_50098_a,nameStartsWith,0,Returns true if the current player name starts with string specified value.
+func_50100_a,handlePlayerAbilities,0,Handle a player abilities packet.
+func_50101_a,renderString,0,
+func_50102_e,sizeStringToWidth,0,Determines how many characters from the string will fit into the specified width.
 func_50103_a,drawStringWithShadow,0,Draws the specified string with a shadow.
+func_50104_a,trimStringToWidth,0,"Trims a string to a specified width, and will reverse it if par3 is set."
+func_50105_a,getCharWidth,0,Returns the width of this character as rendered.
+func_50106_a,renderDefaultChar,0,"Render a single character with the default.png font at current (posX,posY) location..."
+func_50107_a,trimStringToWidth,0,Trims a string to fit a specified Width.
+func_50108_c,listFormattedStringToWidth,0,Breaks a string into a list of pieces that will fit a specified width.
+func_50109_c,isFormatSpecial,0,Checks if the char code is O-K...lLrRk-o... used to set special formatting.
+func_50110_b,isFormatColor,0,"Checks if the char code is a hexadecimal character, used to set colour."
+func_50111_a,renderUnicodeChar,0,"Render a single Unicode character at current (posX,posY) location using one of the /font/glyph_XX.png files..."
+func_50112_a,renderCharAtPos,0,Pick how to render a single character and return the width used.
+func_50113_d,wrapFormattedStringToWidth,0,Inserts newline and formatting into a string to wrap it within the specified width.
+func_50114_c,getFormatFromString,0,Digests a string for nonprinting formatting characters then returns a string containing only that formatting.
 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."
@ -2294,6 +2337,17 @@ func_516_a,generate,0,
 func_517_a,setScale,0,"Rescales the generator settings, only used in WorldGenBigTree"
 func_518_b,generateLeaves,0,Generates the leaf portion of the tree as specified by the leafNodes list.
 func_519_e,validTreeLocation,0,"Returns a boolean indicating whether or not the current location for the tree, spanning basePos to to the height limit, is valid."
+func_52003_C,getVersion,0,Returns the version of Minecraft as a string
+func_52004_D,createAndSendReport,0,Creates and sends anonymous system information to Mojang's stats server
+func_52013_a,updatePlayerMoveState,0,
+func_52014_d,stripColorCodes,0,Remove all embedded color codes from a string
+func_52016_a,buildPostString,0,Builds an encoded HTTP POST content string from a string map
+func_52017_a,sendPost,0,Sends a HTTP POST request to the given URL with data from a string
+func_52018_a,sendPost,0,Sends a HTTP POST request to the given URL with data from a map
+func_52020_b,getDataMap,0,Returns the data map for the given usage snooper
+func_52021_a,sendReport,0,Starts a new thread to send the information to the report server
+func_52022_a,addData,0,Adds information to the report
+func_52023_a,getServerURL,0,Returns the server URL for the given usage snooper
 func_520_a,generateLeafNode,0,Generates the leaves surrounding an individual entry in the leafNodes list.
 func_521_a,generateLeafNodeList,0,"Generates a list of leaf nodes for the tree, to be populated by generateLeaves."
 func_522_a,placeBlockLine,0,Places a line of the specified block ID into the world from the first coordinate triplet to the second.
@ -2365,7 +2419,7 @@ func_603_b,getBlockTileEntity,0,"Returns the TileEntity associated with a given
 func_604_a,checkIfAABBIsClear,0,"Returns true if there are no solid, live entities in the specified AxisAlignedBB"
 func_605_c,isBoundingBoxBurning,0,Returns whether or not the given bounding box is on fire or not
 func_606_b,obtainEntitySkin,0,"Start the skin for this entity downloading, if necessary, and increment its reference counter"
-func_607_d,setEntityDead,0,"Not sure what this does 100%, but from the calling methods this method should be called like this."
+func_607_d,setEntityDead,0,"Dismounts the entity (and anything riding the entity), sets the dead flag, and removes the player entity from the player entity list. Called by the playerLoggedOut function."
 func_608_a,spawnPlayerWithLoadedChunks,0,"spawns a player, load data from level.dat if needed and loads surrounding chunks"
 func_609_a,getClosestPlayerToEntity,0,"Gets the closest player to the entity within the specified distance (if distance is less than 0 then ignored). Args: entity, dist"
 func_611_g,notifyBlocksOfNeighborChange,0,"Notifies neighboring blocks that this specified block changed  Args: x, y, z, blockID"
@ -2443,7 +2497,7 @@ func_6391_i,getMaxSpawnedInChunk,0,Will return how many at most can spawn in a c
 func_6392_F,onEntityDeath,0,Called when the entity vanishes after dies by damage (or other method that put health below or at zero).
 func_6393_h,getSoundVolume,0,Returns the volume for the sounds this mob makes.
 func_6394_f_,getHurtSound,0,Returns the sound this mob makes when it is hurt.
-func_639_a,saveWorld,0,"Saves the data for this World.  If passed true, then only save up to 2 chunks, otherwise, save all chunks."
+func_639_a,saveWorld,0,"Saves the data for this World. If passed true, then only save up to 2 chunks, otherwise, save all chunks."
 func_640_a,checkChunksExist,0,"Checks between a min and max all the chunks inbetween actually exist. Args: minX, minY, minZ, maxX, maxY, maxZ"
 func_6415_a_,useCurrentItemOnEntity,0,Uses the currently equipped item on the specified entity. Args: entity
 func_6416_v,getCurrentEquippedItem,0,Returns the currently being used item by the player.
@ -2529,7 +2583,7 @@ func_690_d,setBlockWithNotify,0,"Sets a block and notifies relevant systems with
 func_691_b,setBlockMetadataWithNotify,0,"Sets the blocks metadata and if set will then notify blocks that this block changed. Args: x, y, z, metadata"
 func_692_l,removeBlockTileEntity,0,"Removes the TileEntity for a given block in X,Y,Z coordinates"
 func_694_a,spawnParticle,0,"Spawns a particle.  Args particleName, x, y, z, velX, velY, velZ"
-func_695_a,canBlockBePlacedAt,0,"Returns true if the specified block can be placed at the given coordinates, optionally making sure there are no entities in the way.  Args: blockID, x, y, z, ignoreEntities"
+func_695_a,canBlockBePlacedAt,0,"Returns true if the specified block can be placed at the given coordinates, optionally making sure there are no entities in the way. Args: blockID, x, y, z, ignoreEntities"
 func_697_a,getCollidingBoundingBoxes,0,"Returns a list of bounding boxes that collide with aabb excluding the passed in entity's collision. Args: entity, aabb"
 func_698_b,updateTileEntityChunkAndDoNothing,0,marks the chunk that contains this tilentity as modified and then calls worldAccesses.doNothingWithTileEntity
 func_699_a,getBlockLightValue_do,0,"Gets the light value of a block location. This is the actual function that gets the value and has a bool flag that indicates if its a half step block to get the maximum light value of a direct neighboring block (left, right, forward, back, and up)"
@ -2563,7 +2617,7 @@ func_738_a,writeNamedTag,0,"Writes the specified tag to the given DataOutput, wr
 func_739_a,newTag,0,"Creates and returns a new tag of the specified type, or null if invalid."
 func_740_c,tagCount,0,Returns the number of tags in the list.
 func_741_a,tagAt,0,Retrieves the tag at the specified index from the list.
-func_742_a,appendTag,0,Adds the provided tag to the end of the list. There is no check to veriy this tag is of the same type as any previous tag.
+func_742_a,appendTag,0,Adds the provided tag to the end of the list. There is no check to verify this tag is of the same type as any previous tag.
 func_743_k,getCompoundTag,0,"Retrieves a NBTTagCompound subtag matching the specified key, or a new empty NBTTagCompound if no such key was stored."
 func_744_a,setFloat,0,Stores a new NBTTagFloat with the given float value into the map with the given string key.
 func_745_d,getShort,0,"Retrieves a short value using the specified key, or 0 if no such key was stored."
@ -2596,7 +2650,7 @@ func_772_c,mouseXYChange,0,
 func_773_b,ungrabMouseCursor,0,Ungrabs the mouse cursor so it can be moved and set it to the center of the screen
 func_774_a,grabMouseCursor,0,Grabs the mouse cursor it doesn't move and isn't seen.
 func_775_c,getBackgroundIconIndex,0,Returns the icon index on items.png that is used as background image of the slot.
-func_776_b,putStack,0,Helper fnct to put a stack in the slot.
+func_776_b,putStack,0,Helper method to put a stack in the slot.
 func_777_b,getStack,0,Helper fnct to get the stack in the slot.
 func_779_d,onSlotChanged,0,Called when the stack in a Slot changes
 func_782_a,bindImage,0,
@ -2612,7 +2666,6 @@ func_792_a,refreshTrackShape,0,Completely recalculates the track shape based on
 func_793_b,isConnectedTo,0,
 func_794_b,isInTrack,0,Returns true if the specified block is in the same railway.
 func_795_a,getMinecartTrackLogic,0,
-func_797_a,updatePlayerMoveState,0,
 func_799_a,render,0,
 func_800_a,postProcess,0,
 func_803_a,grad,0,
@ -2709,7 +2762,6 @@ func_934_a,markBlockNeedsUpdate,0,"Will mark the block and neighbors that their
 func_935_a,doNothingWithTileEntity,0,"In all implementations, this method does nothing."
 func_9367_r,respawnPlayer,0,
 func_9372_a_,setHealth,0,Updates health locally.
-func_9375_Q,sendInventoryChanged,0,Send a inventory changed message to the server if the current inventory has been modified.
 func_937_b,markBlockRangeNeedsUpdate,0,"Called across all registered IWorldAccess instances when a block range is invalidated. Args: minX, minY, minZ, maxX, maxY, maxZ"
 func_938_b,releaseEntitySkin,0,Decrement the reference counter for this entity's skin image data
 func_939_a,spawnParticle,0,"Spawns a particle. Arg: particleType, x, y, z, velX, velY, velZ"
@ -2823,12 +2875,12 @@ func_143_a,knockBack,1,knocks back this entity
 func_144_E,isOnLadder,1,"returns true if this entity is by a ladder, false otherwise"
 func_145_g,canEntityBeSeen,1,returns true if the entity provided in the argument can be seen. (Raytrace)
 func_146_b,getTalkInterval,1,"Get number of ticks, at least during which the living entity will be silent."
-func_147_b,faceEntity,1,changes pitch and yaw so that the entity calling the function is facing the entity provided as an argumen
+func_147_b,faceEntity,1,Changes pitch and yaw so that the entity calling the function is facing the entity provided as an argument.
 func_148_c,moveEntityWithHeading,1,"Moves the entity based on the specified heading.  Args: strafe, forward"
 func_149_g,getDropItemId,1,Returns the item ID for the item the mob drops on death.
 func_152_d_,updateEntityActionState,1,
 func_153_y,onLivingUpdate,1,"Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons use this to react to sunlight and start to burn."
-func_154_F,jump,1,causes this entity to jump (or at least move upwards)
+func_154_F,jump,1,Causes this entity to do an upwards motion (jumping).
 func_155_a,getCanSpawnHere,1,Checks if the entity's current position is a valid location to spawn this entity.
 func_156_D,spawnExplosionParticle,1,Spawns an explosion particle around the Entity's location
 func_157_a,attackEntity,1,Basic mob attack. Default to touch of death in EntityCreature. Overridden by each mob to define their attack.
@ -2899,15 +2951,15 @@ func_20091_b,onPickupFromSlot,1,Called when the player picks up an item from an
 func_20092_c,getStack,1,Helper fnct to get the stack in the slot.
 func_20093_a,getSlotStackLimit,1,"Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case of armor slots)"
 func_20094_d,onSlotChanged,1,Called when the stack in a Slot changes
-func_20095_a,isItemValid,1,Check if the stack is a valid item for this slot.
+func_20095_a,isItemValid,1,Check if the stack is a valid item for this slot. Always true beside for the armor slots.
 func_200_a,writeToNBT,1,"Writes the inventory out as a list of compound tags. This is where the slot indices are used (+100 for armor, +80 for crafting)."
 func_20104_a,setIconCoord,1,
 func_20105_a,setItemName,1,set name of item from language file
 func_20106_a,getItemName,1,
 func_20107_a,compareRecipes,1,
 func_20111_e,isAirBlock,1,Returns true if the block at the specified coordinates is empty
-func_20112_a,addRecipes,1,Adds weapon recipes to the CraftingManager
-func_20115_a,addRecipes,1,Adds crafting recipes to the CraftingManager
+func_20112_a,addRecipes,1,Adds the weapon recipes to the CraftingManager.
+func_20115_a,addRecipes,1,Adds the crafting recipes to the CraftingManager.
 func_20116_b,isItemStackEqual,1,compares ItemStack argument to the instance ItemStack; returns true if both ItemStacks are equal
 func_20117_a,copyItemStack,1,"Creates a copy of a ItemStack, a null parameters will return a null."
 func_20118_a,splitStack,1,Remove the argument from the stack size. Return a new stack object with argument size.
@ -2923,12 +2975,12 @@ func_20129_a,setCanCraft,1,sets whether the player can craft in this inventory o
 func_20130_a,onCraftGuiClosed,1,Callback for when the crafting gui is closed.
 func_20151_a,getInstance,1,Returns the static instance of this class
 func_20153_a,addRecipe,1,Adds a recipe. See spreadsheet on first page for details.
-func_20156_a,addRecipes,1,Adds tool recipes to the CraftingManager.
-func_20159_a,addRecipes,1,Adds ingot recipes to the CraftingManager.
+func_20156_a,addRecipes,1,Adds the tool recipes to the CraftingManager.
+func_20159_a,addRecipes,1,Adds the ingot recipes to the CraftingManager.
 func_20161_a,getAllowedCharacters,1,"Load the font.txt resource file, that is on UTF-8 format. This file contains the characters that minecraft can render Strings on screen."
 func_20165_a,getRecipeSize,1,Returns the size of the recipe area
 func_20172_a,addRecipes,1,Adds the armor recipes to the CraftingManager.
-func_20177_a,addRecipes,1,Adds food recipes to the CraftingManager.
+func_20177_a,addRecipes,1,Adds the food recipes to the CraftingManager.
 func_20178_a,updateTileEntity,1,sends players update packet about the given entity
 func_201_a,addItemStackToInventory,1,"Adds the item stack to the inventory, returns false if it is impossible."
 func_202_d,getInventoryStackLimit,1,"Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't this more of a set than a get?*"
@ -3128,7 +3180,7 @@ func_22176_a,updateTagCompound,1,
 func_22178_h,getDimension,1,
 func_22179_d,getSpawnY,1,Return the Y axis spawning point of the player.
 func_22180_a,setWorldTime,1,Set current world time
-func_22181_a,setSpawnPosition,1,Sets the spawn (zone) position
+func_22181_a,setSpawnPosition,1,"Sets the spawn zone position. Args: x, y, z"
 func_22183_a,getNBTTagCompoundWithPlayers,1,stores the current level's dat to an nbt tag for future saving in level.dat
 func_22184_c,getSpawnX,1,Returns the x spawn position
 func_22185_a,getNBTTagCompound,1,Gets the NBTTagCompound for the worldInfo
@ -3184,21 +3236,21 @@ func_25020_s,canDespawn,1,"Determines if an entity can be despawned, used on idl
 func_25022_a,setPathToEntity,1,sets the pathToEntity
 func_25023_z,hasPath,1,"if the entity got a PathEntity it returns true, else false"
 func_25024_A,getEntityToAttack,1,returns the target Entity
-func_25025_c,setTarget,1,sets the target Entity
+func_25025_c,setTarget,1,Sets the entity which is to be attacked.
 func_25026_u,isMovementCeased,1,Disables a mob's ability to move on its own while true.
 func_25027_m,getSlimeSize,1,Returns the size of the slime.
-func_25028_x,isAngry,1,gets if the wolf is angry
-func_25037_c,setAngry,1,sets if the wolf is angry or not
+func_25028_x,isAngry,1,Determines whether this wolf is angry or not.
+func_25037_c,setAngry,1,Sets whether this wolf is angry or not.
 func_25045_g,addMovementStat,1,"Adds a value to a movement statistic field - like run, walk, swin or climb."
 func_25046_a,addStat,1,Adds a value to a statistic field.
 func_25047_a,alertWolves,1,"Called when the player attack or gets attacked, it's alert all wolves in the area that are owned by the player to join the attack or defend the player."
-func_25049_H,getSpawnChunk,1,gets the players spawn chunk
-func_25050_a,setSpawnChunk,1,sets the players spawn chunk
+func_25049_H,getSpawnChunk,1,Returns the coordinates to respawn the player based on last bed that the player sleep.
+func_25050_a,setSpawnChunk,1,Defines a spawn coordinate to player spawn. Used by bed after the player sleep on it.
 func_25051_a,verifyRespawnCoordinates,1,Ensure that a block enabling respawning exists at the specified coordinates and find an empty space nearby to spawn.
 func_25052_a,isEditable,1,
 func_25055_a,getSpawnableList,1,Returns the correspondent list of the EnumCreatureType informed.
 func_25071_a,getPlayerEntityByName,1,Find a player by name in this world.
-func_25072_c,generateSpawnPoint,1,generates a spawn point for this world
+func_25072_c,generateSpawnPoint,1,Finds an initial spawn location upon creating a new world
 func_25073_n,getChunkProvider,1,gets the world's chunk provider
 func_25074_a,getPlayerData,1,
 func_25075_b,getWatchableObjectInt,1,gets a watchable object and returns it as a Integer
@ -3218,7 +3270,7 @@ func_25091_c,initCraftableStats,1,Initializes statistics related to craftable it
 func_25092_a,replaceAllSimilarBlocks,1,Forces all dual blocks to count for each other on the stats list
 func_250_e,onBlockAdded,1,"Called whenever the block is added into the world. Args: world, x, y, z"
 func_25124_a,onDestroyBlock,1,
-func_25125_a,damageItem,1,damages the item in an itemstack.
+func_25125_a,damageItem,1,Damages the item in the ItemStack
 func_25126_b,getRecipeList,1,returns the List<> of all recipes
 func_25127_b,getSmeltingList,1,
 func_25132_a,getGuid,1,Returns the unique GUID of a achievement id.
@ -3262,8 +3314,8 @@ func_27031_a,isRailPassingPower,1,Returns true if the specified rail is passing
 func_27032_a,isNeighborRailPowered,1,"Powered minecart rail is conductive like wire, so check for powered neighbors"
 func_27033_a,isPoweredBlockRail,1,Return true if the blocks passed is a power related rail.
 func_27035_f,setStateIfMinecartInteractsWithRail,1,"Update the detector rail power state if a minecart enter, stays or leave the block."
-func_27037_a,readString,1,reads a string from the datastream
-func_27038_a,writeString,1,writes a string to the datastream
+func_27037_a,readString,1,Reads a string from a packet
+func_27038_a,writeString,1,Writes a String to the DataOutputStream
 func_27047_e,setDisableRain,1,Disable the rain for the biome.
 func_27048_d,canSpawnLightningBolt,1,"Return true if the biome supports lightning bolt spawn, either by have the bolts enabled and have rain enabled."
 func_27049_c,getEnableSnow,1,Returns true if the biome have snowfall instead a normal rain.
@ -3273,12 +3325,12 @@ func_27059_a,setIndependent,1,"Indicates whether or not the given achievement or
 func_27060_b,setSpecial,1,"Special achievements have a 'spiked' (on normal texture pack) frame, special achievements are the hardest ones to achieve."
 func_27061_c,registerAchievement,1,"Adds the achievement on the internal list of registered achievements, also, it's check for duplicated id's."
 func_27065_c,getWeightedThunderStrength,1,
-func_27066_i,updateWeather,1,update's all weather states.
+func_27066_i,updateWeather,1,Updates all weather states.
 func_27067_u,isThundering,1,Returns true if the current thunder strength (weighted with the rain strength) is greater than 0.9
 func_27068_v,isRaining,1,Returns true if the current rain strength is greater than 0.2
 func_27069_b,isAABBEmpty,1,checks to see if there are any blocks in the region constrained by an AxisAlignedBB
-func_27070_x,calculateInitialWeather,1,updates rainingStrength and thunderingStrength
-func_27071_y,clearWeather,1,stops all weather effects
+func_27070_x,calculateInitialWeather,1,Called from World constructor to set rainingStrength and thunderingStrength
+func_27071_y,clearWeather,1,Stops all weather effects.
 func_27072_q,canLightningStrikeAt,1,
 func_27073_a,addWeatherEffect,1,adds a lightning bolt to the list of lightning bolts in this world.
 func_27074_d,getRainStrength,1,Not sure about this actually. Reverting this one myself.
@ -3289,14 +3341,14 @@ func_27089_f,setGroundCover,1,"Sets the material as a form of ground cover, e.g.
 func_27090_g,isGroundCover,1,"Return whether the material is a form of ground cover, e.g. Snow"
 func_27097_a,init,1,A stub functions called to make the static initializer for this class run.
 func_270_h,getChanceOfNeighborsEncouragingFire,1,Gets the highest chance of a neighbor block encouraging this block to catch fire
-func_27115_l,isRaining,1,returns whether it's raining
-func_27116_b,setRaining,1,sets whether it's raining
-func_27117_k,getThunderTime,1,gets the during of the thunder
-func_27118_c,setRainTime,1,sets the rainTime
-func_27119_a,setThundering,1,sets if it's thundering or not
-func_27120_m,getRainTime,1,gets the rainTime
-func_27121_b,setThunderTime,1,sets the during of the Thunder
-func_27122_j,isThundering,1,gets if it's thundering or not
+func_27115_l,isRaining,1,"Returns true if it is raining, false otherwise."
+func_27116_b,setRaining,1,Sets whether it is raining or not.
+func_27117_k,getThunderTime,1,Returns the number of ticks until next thunderbolt.
+func_27118_c,setRainTime,1,Sets the number of ticks until rain.
+func_27119_a,setThundering,1,Sets whether it is thundering or not.
+func_27120_m,getRainTime,1,Return the number of ticks until rain.
+func_27121_b,setThunderTime,1,Defines the number of ticks until next thunderbolt.
+func_27122_j,isThundering,1,"Returns true if it is thundering, false otherwise."
 func_27127_a,getEuclideanDistanceTo,1,"Returns the euclidean distance of the chunk coordinate to the x, y, z parameters passed."
 func_272_a,onPoweredBlockChange,1,A function to open a door.
 func_273_b,setDoorRotation,1,
@ -3365,6 +3417,7 @@ func_28166_b,readPlayerDataFromFile,1,called during player login. reads the play
 func_28167_a,getPlayerManager,1,returns the player manager object for the specified dimension
 func_28168_f,sendPlayerToOtherDimension,1,moves provided player from overworld to nether or vice versa
 func_28169_a,sendPacketToAllPlayersInDimension,1,Sends a packet to all players in the specified Dimension
+func_28170_a,updateTimeAndWeather,1,Updates the time and weather for the given player to those of the given world
 func_28172_a,joinNewPlayerManager,1,"called when a player is teleported to a new dimension in order to clean up old dim refs, send them new dim chunks, and make sure their new location chunk is loaded and initialized"
 func_28173_a,getUniqueDataId,1,Returns an unique new data id for the given prefix and saves the idCounts map to the 'idcounts' file.
 func_28174_b,loadIdCounts,1,Loads the idCounts Map from the 'idcounts' file.
@ -3433,7 +3486,7 @@ func_31045_b,getDirectionMeta,1,
 func_31047_a,addTileEntity,1,
 func_31055_i,isHarvestable,1,Returns true if material can be harvested by player.
 func_31056_j,getMaterialMobility,1,returns a materials mobility flag
-func_31057_l,setImmovableMobility,1,marks this material as being immovable
+func_31057_l,setImmovableMobility,1,"This type of material can't be pushed, and pistons are blocked to move."
 func_31058_n,setNoHarvest,1,Disables the ability to harvest this material.
 func_31059_k,setNoPushMobility,1,marks this material as being unable to push blocks
 func_311_f,flowIntoBlock,1,"flowIntoBlock(World world, int x, int y, int z, int newFlowDecay) - Flows into the block at the coordinates and changes the block type to the liquid."
@ -3489,7 +3542,7 @@ func_35032_a,choose,1,randomly choose between the two args
 func_35037_a,validGameType,1,Checks to see if the int passed is a valid game type indicator.
 func_35038_a,getSeed,1,Get the seed of the map.
 func_35039_b,getGameType,1,"Get the type of game the map is set at. 0 is survival, 1 is creative."
-func_35040_c,isMapFeaturesEnabled,1,Get whether the map features generation is enabled or disabled.
+func_35040_c,isMapFeaturesEnabled,1,Get whether the map features (e.g. strongholds) generation is enabled or disabled.
 func_35057_b,unifyAdjacentChests,1,Turns the adjacent chests to a double chest.
 func_35058_c,canBePlacedOn,1,returns true if a vine can be placed on that block (checks for render as normal block and if it is solid)
 func_35059_g,canVineStay,1,Returns if the vine can stay in the world. It also changes the metadata according to neighboring blocks.
@ -3533,7 +3586,7 @@ func_35163_b,onTileEntityPowered,1,
 func_35164_g,updateContainingBlockInfo,1,"Causes the TileEntity to reset all it's cached values for it's container block, blockID, metaData and in the case of chests, the adjcacent chest check"
 func_35167_h,checkForAdjacentChests,1,Performs the check for adjacent chests to determine if this chest is double or not.
 func_35177_c,hasItem,1,Get if a specifiied item id is inside the inventory.
-func_35178_D,getSpeedModifier,1,"This method return a value to be applied directly to entity speed, this factor is less than 1 when a slowdown potion effect is applied, more than 1 when a haste potion effect is applied and 2 for fleeing entities."
+func_35178_D,getSpeedModifier,1,"This method returns a value to be applied directly to entity speed, this factor is less than 1 when a slowdown potion effect is applied, more than 1 when a haste potion effect is applied and 2 for fleeing entities."
 func_35179_b,onChangedPotionEffect,1,
 func_35180_G,isBlocking,1,
 func_35181_a,onNewPotionEffect,1,
@ -3559,7 +3612,7 @@ func_35205_F,clearItemInUse,1,
 func_35206_W,shouldHeal,1,Checks if the player's health is not full and not zero.
 func_35207_V,getFoodStats,1,Returns the player's FoodStats object.
 func_35208_b,updateItemUse,1,Plays sounds and makes particles for item in use state
-func_35209_o_,isUsingItem,1,"checks if the entity is currently using an item (e.g., bow, food, sword) by holding down the useItemButton"
+func_35209_o_,isUsingItem,1,"Checks if the entity is currently using an item (e.g., bow, food, sword) by holding down the useItemButton"
 func_35224_c,attackEntityAsMob,1,
 func_35225_x,getCarried,1,Get the id of the block an enderman carries
 func_35226_b,setCarried,1,Set the id of the block an enderman carries
@ -3581,8 +3634,8 @@ func_35255_a,decorate,1,Decorates the world. Calls code that was formerly (pre-1
 func_35256_b,decorate,1,The method that does the work of actually decorating chunks
 func_35257_a,genStandardOre1,1,Standard ore generation helper. Generates most ores.
 func_35292_a,generateVines,1,Generates vines at the given position until it hits a block.
-func_35294_a,fillWithBlocks,1,"'arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)'"
-func_35295_a,isLiquidInStructureBoundingBox,1,'checks the entire StructureBoundingBox for Liquids'
+func_35294_a,fillWithBlocks,1,"arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)"
+func_35295_a,isLiquidInStructureBoundingBox,1,checks the entire StructureBoundingBox for Liquids
 func_35296_b,getZWithOffset,1,
 func_35297_a,getBlockIdAtCurrentPosition,1,
 func_35298_a,placeDoorAtCurrentPosition,1,
@ -3590,27 +3643,27 @@ func_35299_a,createTreasureChestAtCurrentPosition,1,
 func_352_a,setChunkBlockTileEntity,1,Sets the TileEntity for a given block in this chunk
 func_35300_a,getYWithOffset,1,
 func_35301_c,getMetadataWithOffset,1,"Returns the direction-shifted metadata for blocks that require orientation, e.g. doors, stairs, ladders. Parameters: block ID, original metadata"
-func_35302_a,randomlyPlaceBlock,1,'Randomly decides if placing or not. Used for Decoration such as Torches and Spiderwebs'
-func_35303_b,fillCurrentPositionBlocksDownwards,1,"Overwrites Air and Liquids from selected Position downwards, stops at hitting anything else"
+func_35302_a,randomlyPlaceBlock,1,Randomly decides if placing or not. Used for Decoration such as Torches and Spiderwebs
+func_35303_b,fillCurrentPositionBlocksDownwards,1,"Overwrites air and liquids from selected position downwards, stops at hitting anything else."
 func_35304_a,randomlyRareFillWithBlocks,1,"arguments: World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, boolean alwaysreplace"
 func_35305_c,getComponentType,1,Returns the component type ID of this component.
 func_35306_a,getXWithOffset,1,
 func_35307_a,fillWithRandomizedBlocks,1,"arguments: World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, boolean alwaysreplace, Random rand, StructurePieceBlockSelector blockselector"
-func_35308_a,buildComponent,1,"'Initiates construction of the Structure Component picked, at the current Location of StructGen'"
+func_35308_a,buildComponent,1,"Initiates construction of the Structure Component picked, at the current Location of StructGen"
 func_35309_a,placeBlockAtCurrentPosition,1,"current Position depends on currently set Coordinates mode, is computed here"
-func_35310_a,addComponentParts,1,"'second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at the end, it adds Fences...'"
+func_35310_a,addComponentParts,1,"second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at the end, it adds Fences..."
 func_35311_a,fillTreasureChestWithLoot,1,
 func_35312_a,findIntersecting,1,Discover if bounding box can fit within the current bounding box object.
 func_35313_b,getBoundingBox,1,
-func_35314_b,clearCurrentPositionBlocksUpwards,1,Deletes all continuous Blocks from selected position upwards. Stops at hitting air
-func_35315_a,randomlyFillWithBlocks,1,"'arguments: World worldObj, StructureBoundingBox structBB, Random rand, float randLimit, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int olaceBlockId, int replaceBlockId, boolean alwaysreplace'"
+func_35314_b,clearCurrentPositionBlocksUpwards,1,Deletes all continuous blocks from selected position upwards. Stops at hitting air.
+func_35315_a,randomlyFillWithBlocks,1,"arguments: World worldObj, StructureBoundingBox structBB, Random rand, float randLimit, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int olaceBlockId, int replaceBlockId, boolean alwaysreplace"
 func_35319_a,canStrongholdGoDeeper,1,returns false if the Structure Bounding Box goes below 10
 func_35320_c,getNextComponentZ,1,Gets the next component in the +/- Z direction
 func_35321_b,getNextComponentX,1,Gets the next component in the +/- X direction
 func_35322_a,getRandomDoor,1,
-func_35323_a,placeDoor,1,'builds a door of the enumerated types (empty opening is a door)'
+func_35323_a,placeDoor,1,builds a door of the enumerated types (empty opening is a door)
 func_35324_a,getNextComponentNormal,1,Gets the next component in any cardinal direction
-func_35325_a,getStrongholdStairsComponent,1,"'performs some checks, then gives out a fresh Stairs component'"
+func_35325_a,getStrongholdStairsComponent,1,"performs some checks, then gives out a fresh Stairs component"
 func_35330_a,findValidPlacement,1,
 func_35332_a,findValidPlacement,1,
 func_35334_a,findValidPlacement,1,
@ -3665,7 +3718,7 @@ func_35491_a,canSpawnMoreVillagePiecesOfType,1,
 func_35492_a,canSpawnMoreVillagePieces,1,
 func_35497_b,retrySlotClick,1,
 func_35498_a,putStackInSlot,1,"args: slotID, itemStack to put in slot"
-func_35499_o,isMapFeaturesEnabled,1,Get whether the map features generation is enabled or disabled.
+func_35499_o,isMapFeaturesEnabled,1,Get whether the map features (e.g. strongholds) generation is enabled or disabled.
 func_354_c,getBlockLightValue,1,Gets the amount of light on a block taking into account sunlight
 func_35500_d,setGameType,1,"Set the game type, <=0 for survival, >0 for creative."
 func_35501_n,getGameType,1,"Get the game type, 0 for survival, 1 for creative."
@ -3681,15 +3734,15 @@ func_35531_a,canSpawnStructureAtCoords,1,
 func_35532_a,generateStructuresInChunk,1,Generates structures in specified chunk next to existing structures. Does *not* generate StructureStarts.
 func_35533_b,getStructureStart,1,
 func_35539_a,generateRavine,1,
-func_35541_a,generateStructure,1,'Keeps iterating Structure Pieces and spawning them until the checks tell it to stop'
-func_35542_a,isSizeableStructure,1,"'currently only defined for Villages, returns true if Village has more than 2 non-road components'"
+func_35541_a,generateStructure,1,Keeps iterating Structure Pieces and spawning them until the checks tell it to stop
+func_35542_a,isSizeableStructure,1,"currently only defined for Villages, returns true if Village has more than 2 non-road components"
 func_35543_b,getBoundingBox,1,
 func_35544_c,updateBoundingBox,1,Calculates total bounding box based on components' bounding boxes and saves it to boundingBox
 func_35545_a,markAvailableHeight,1,"offsets the structure Bounding Boxes up to a certain height, typically 63 - 10"
 func_35549_a,getIntCache,1,
 func_35550_a,resetIntCache,1,Mark all pre-allocated arrays as available for re-use by moving them to the appropriate free lists.
 func_35556_d,dropChunk,1,Drops the specified chunk.
-func_35565_a,selectBlocks,1,'picks Block Ids and Metadata (Silverfish)'
+func_35565_a,selectBlocks,1,picks Block Ids and Metadata (Silverfish)
 func_35566_a,getSelectedBlockId,1,
 func_35567_b,getSelectedBlockMetaData,1,
 func_35570_a,dotProduct,1,
@ -3715,12 +3768,12 @@ func_35615_m,getItemUseAction,1,
 func_35616_k,getItemName,1,
 func_35617_b,onFoodEaten,1,
 func_35618_a,loadItemStackFromNBT,1,
-func_35620_a,getStrongholdComponentFromWeightedPiece,1,'translates the PieceWeight class to the Component class'
+func_35620_a,getStrongholdComponentFromWeightedPiece,1,translates the PieceWeight class to the Component class
 func_35621_c,getNextValidComponent,1,
 func_35622_b,getStrongholdStones,1,
 func_35623_b,getNextComponent,1,
 func_35624_a,getNextValidComponentAccess,1,
-func_35625_a,prepareStructurePieces,1,'sets up Arrays with the Structure pieces and their weights'
+func_35625_a,prepareStructurePieces,1,sets up Arrays with the Structure pieces and their weights
 func_35626_c,canAddStructurePieces,1,
 func_35631_c,getPrecipitationHeight,1,Gets the height to which rain/snow will fall. Calculates it if not already stored.
 func_35632_a,populateChunk,1,
@ -3728,10 +3781,10 @@ func_35633_i,updateSkylight_do,1,Runs delayed skylight updates.
 func_35634_d,updateSkylightNeighborHeight,1,
 func_35635_h,updateSkylight,1,"Checks whether skylight needs updated; if it does, calls updateSkylight_do"
 func_35639_a,getVillageComponentFromWeightedPiece,1,
-func_35640_a,getNextStructureComponent,1,'attempts to find a next Structure Component to be spawned'
-func_35641_d,getNextVillageStructureComponent,1,"'attempts to find a next Structure Component to be spawned, private Village function'"
+func_35640_a,getNextStructureComponent,1,attempts to find a next Structure Component to be spawned
+func_35641_d,getNextVillageStructureComponent,1,"attempts to find a next Structure Component to be spawned, private Village function"
 func_35642_b,getNextStructureComponentVillagePath,1,
-func_35643_c,getNextVillageComponent,1,'attempts to find a next Village Component to be spawned'
+func_35643_c,getNextVillageComponent,1,attempts to find a next Village Component to be spawned
 func_35644_e,getNextComponentVillagePath,1,
 func_35645_a,getAvailablePieceWeight,1,
 func_35646_a,getStructureVillageWeightedPieceList,1,
@ -3884,6 +3937,7 @@ func_40133_a,spawnBabyAnimal,1,This function is used when two same-species anima
 func_40134_a,isWheat,1,Checks if the parameter is an wheat item.
 func_40136_a,attackEntityFromPart,1,
 func_40137_e,superAttackFrom,1,"Returns a super of attackEntityFrom in EntityDragonBase, because the normal attackEntityFrom is overriden"
+func_40139_a,getMovementOffsets,1,"Returns a double[3] array with movement offsets, used to calculate trailing tail/neck positions. [0] = yaw offset, [1] = y offset, [2] = unused, always 0. Parameters: buffer index offset, partial ticks."
 func_40140_a,destroyBlocksInAABB,1,Destroys all blocks that aren't associated with 'The End' inside the given bounding box.
 func_40141_a,simplifyAngle,1,Simplifies the value of a number by adding/subtracting 180 to the point that the number is between -180 and 180.
 func_40161_b,getRenderType,1,The type of render function that is called for this block
@ -3898,14 +3952,14 @@ func_40202_a,getNearestInstance,1,
 func_40205_b,getSpawnList,1,
 func_40208_c,getComponents,1,
 func_40209_a,setRandomHeight,1,
-func_40210_p,isBlockHydratedDirectly,1,Checks if the block is hydrating itself.
+func_40210_p,isBlockFreezable,1,checks to see if a given block is both water and is cold enough to freeze
 func_40211_b,getClosestVulnerablePlayerToEntity,1,"Returns the closest vulnerable player to this entity within the given radius, or null if none is found"
 func_40212_d,getEntrancePortalLocation,1,Gets the hard-coded portal location to use when entering this dimension
-func_40213_b,isBlockHydrated,1,(I think)
+func_40213_b,canBlockFreeze,1,"checks to see if a given block is both water, and cold enough to freeze - if the par4 boolean is set, this will only return true if there is a non-water block immediately adjacent to the specified block"
 func_40214_b,findClosestStructure,1,Returns the location of the closest structure of the specified type. If not found returns null.
 func_40215_r,canSnowAt,1,Tests whether or not snow can be placed at a given location
 func_40216_a,getRandomMob,1,Gets a random mob for spawning in this world.
-func_40217_q,isBlockHydratedIndirectly,1,Check if the block is being hydrated by an adjacent block.
+func_40217_q,isBlockFreezableNaturally,1,checks to see if a given block is both water and has at least one immediately adjacent non-water block
 func_40218_j,commandToggleDownfall,1,start precipitation in this world (2 ticks after command posted)
 func_40219_b,getClosestVulnerablePlayer,1,"Returns the closest vulnerable player within the given radius, or null if none is found."
 func_40220_m,isPotionIngredient,1,Returns true if this item serves as a potion ingredient (its ingredient information is not null).
@ -4123,7 +4177,7 @@ func_40657_a,setProperty,1,Saves an Object with the given property name
 func_40658_a,getChunkPosition,1,
 func_40659_a,getCenterXPos,1,
 func_4065_a,getRainfall,1,"Returns a list of rainfall values for the specified blocks. Args: listToReuse, x, z, width, length."
-func_40660_b,getCenterZPos,1,
+func_40660_b,getCenterZPosition,1,
 func_4067_a,getBiomeGenAt,1,"Returns the BiomeGenBase related to the x, z position on the world."
 func_4068_a,getTemperatures,1,"Returns a list of temperatures to use for the specified blocks.  Args: listToReuse, x, y, width, length"
 func_406_c,getShort,1,"Retrieves a short value using the specified key, or 0 if no such key was stored."
@ -4169,6 +4223,7 @@ func_41031_d,copyPlayer,1,Copy the inventory and various stats from another Enti
 func_41034_a,collideWithEntities,1,Pushes all entities inside the list away from the enderdragon.
 func_41035_b,attackEntitiesInList,1,"Attacks all entities inside this list, dealing 5 hearts of damage."
 func_41036_u,updateDragonEnderCrystal,1,Updates the state of the enderdragon's current endercrystal.
+func_41037_w,setNewTarget,1,Sets a new target for the flight AI. It can be a random coordinate or a nearby player.
 func_41038_a,createEnderPortal,1,Creates the ender portal leading back to the normal world after defeating the enderdragon.
 func_4103_a,generateNoiseOctaves,1,Bouncer function to the main one with some default arguments.
 func_41040_a,setBlockNames,1,Sets the array of strings to be used for name lookups from item damage to metadata
@ -4237,7 +4292,7 @@ func_450_b,getEntitiesWithinAABBExcludingEntity,1,"Will get all entities within
 func_451_k,getBlockTileEntity,1,"Returns the TileEntity associated with a given block in X,Y,Z coordinates, or null if no TileEntity exists"
 func_453_a,isDaytime,1,Checks whether its daytime by seeing if the light subtracted from the skylight is less than 4
 func_454_e,notifyBlockChange,1,"The block type change and need to notify other systems  Args: x, y, z, blockID"
-func_455_j,getLightBrightness,1,"Returns how bright the block is shown as which is the block's light value looked up in a lookup table (light values aren't linear for brihgtness). Args: x, y, z"
+func_455_j,getLightBrightness,1,"Returns how bright the block is shown as which is the block's light value looked up in a lookup table (light values aren't linear for brightness). Args: x, y, z"
 func_456_a,getClosestPlayer,1,"Gets the closest player to the point within the specified distance (distance can be set to less than 0 to not limit the distance). Args: x, y, z, dist"
 func_457_a,getEntitiesWithinAABB,1,"Returns all entities of the specified class type which intersect with the AABB. Args: entityClass, aabb"
 func_459_b,updateEntities,1,Updates (and cleans up) entities and tile entities
@ -4305,6 +4360,7 @@ func_48072_a,handleEntityHeadRotation,1,
 func_48083_a,getPathEntityToEntity,1,
 func_48085_a,findNearestEntityWithinAABB,1,
 func_48088_a,getEntityPathToXYZ,1,
+func_48089_z,isBlockHighHumidity,1,"Checks to see if the biome rainfall values for a given x,y,z coordinate set are extremely high"
 func_48091_a,getBiomeGenForCoords,1,Gets the biome for a given set of x/z coordinates
 func_48095_y,getHeight,1,Returns current world height.
 func_48124_n,hasTileEntity,1,
@ -4324,6 +4380,7 @@ func_48307_a,spawnHeartParticles,1,
 func_48313_k_,canAttackWithItem,1,"If returns false, the item will not inflict any damage against entities."
 func_48315_b,getStackInSlotOnClosing,1,"When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - like when you close a workbench GUI."
 func_48317_b,setHomeArea,1,
+func_48318_al,getEntitySenses,1,returns the EntitySenses Object for the EntityLiving
 func_48319_z,eatGrassBonus,1,This function applies the benefits of growing back wool and faster growing up to the acting entity. (This function is used in the AIEatGrass)
 func_48321_b,dropRareDrop,1,
 func_48322_aw,detachHome,1,
@ -4340,7 +4397,7 @@ func_48333_ak,getNavigator,1,
 func_48334_a,setRevengeTarget,1,
 func_48335_g,setLastAttackingEntity,1,
 func_48347_R,dropOneItem,1,Called when player presses the drop item key
-func_48348_b,dropPlayerItem,1,Args: itemstack
+func_48348_b,dropPlayerItem,1,Args: itemstack - called when player drops an item stack that's not in his inventory (like items still placed in a workbench while the workbench'es GUI gets closed)
 func_48349_a,dropPlayerItemWithRandomChoice,1,"Args: itemstack, flag"
 func_48350_c,setGrowingAge,1,"The age value may be negative or positive or zero. If it's negative, it get's incremented on each tick, if it's positive, it get's decremented each tick. With a negative value the Entity is considered a child."
 func_48351_J,getGrowingAge,1,"The age value may be negative or positive or zero. If it's negative, it get's incremented on each tick, if it's positive, it get's decremented each tick. Don't confuse this with EntityLiving.getAge. With a negative value the Entity is considered a child."
@ -4355,6 +4412,7 @@ func_48364_s_,resetInLove,1,
 func_48366_b,setTamed,1,
 func_48367_A,getOwnerName,1,
 func_48368_w_,getOwner,1,
+func_48369_c,setSitting,1,
 func_48371_v_,isSitting,1,
 func_48372_a,setOwner,1,
 func_48373_u_,isTamed,1,
@ -4372,9 +4430,12 @@ func_48428_a,getVectorFromIndex,1,Gets the vector of the PathPoint associated wi
 func_48429_a,getPathPointFromIndex,1,"return the PathPoint located at the specified PathIndex, usually the current one"
 func_48436_b,getSpeed,1,
 func_48439_a,setMoveTo,1,Sets the speed and location to move to
+func_48441_d,isHighHumidity,1,Checks to see if the rainfall level of the biome is extremely high
 func_48442_h,getFloatTemperature,1,Gets a floating point representation of this biome's temperature
 func_48450_a,setCanBeCreated,1,"Sets canBeCreated to the provided value, and returns this."
 func_48452_b,getGeneratorVersion,1,Returns generatorVersion.
+func_48462_a,writeChunkToNBT,1,"Writes the Chunk passed as an argument to the NBTTagCompound also passed, using the World argument to retrieve the Chunk's last update time."
+func_48465_a,readChunkFromNBT,1,Reads the data stored in the passed NBTTagCompound and creates a Chunk with that data in the passed World. Returns the created Chunk.
 func_48473_c,getDistanceSquared,1,Returns the squared distance between this coordinates and the coordinates given as argument.
 func_48474_a,set,1,
 func_48478_d,resetDoorOpeningRestrictionCounter,1,
@ -4457,15 +4518,28 @@ func_48636_d,isVillagerPositionPresent,1,
 func_48637_c,removeAnnihilatedVillages,1,
 func_48638_b,getVillageDoorAt,1,
 func_48639_a,addVillagerPosition,1,"This is a black hole. You can add data to this list through a public interface, but you can't query that information in any way and it's not used internally either."
+func_48646_a,isSafeToStandAt,1,"Returns true when an entity could stand at a position, including solid blocks under the entire entity. Args: xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ"
 func_48647_a,setPath,1,"sets the active path data if path is 100% unique compared to old path, checks to adjust path for sun avoiding ents and stores end coords"
+func_48648_k,isInFluid,1,"Returns true if the entity is in water or lava, false otherwise"
+func_48649_a,getAvoidsWater,1,
+func_48650_a,getPathToXYZ,1,Returns the path to the given coordinates
 func_48651_j,canNavigate,1,If on ground or swimming and can swim
+func_48653_a,isDirectPathBetweenPoints,1,"Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: pos1, pos2, entityXSize, entityYSize, entityZSize"
+func_48654_a,setSpeed,1,Sets the speed
+func_48655_c,setEnterDoors,1,Sets if the entity can enter open doors
+func_48656_a,setAvoidsWater,1,
+func_48657_b,getCanBreakDoors,1,"Returns true if the entity can break doors, false otherwise"
+func_48658_a,tryMoveToXYZ,1,Try to find and set a path to XYZ. Returns true if successful.
 func_48659_i,getPathableYPos,1,Gets the safe pathing Y position for the entity depending on if it can path swim or not
+func_48660_e,setCanSwim,1,Sets if the entity can swim
 func_48662_f,clearPathEntity,1,sets active PathEntity to null
 func_48663_b,setBreakDoors,1,
 func_48664_g,pathFollow,1,
 func_48665_h,getEntityPosition,1,
+func_48666_b,isPositionClear,1,"Returns true if an entity does not collide with any solid blocks at the position. Args: xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ"
 func_48667_l,removeSunnyPath,1,Trims path data from the end to the first sun covered block
 func_48668_c,getPath,1,gets the actively used PathEntity
+func_48669_d,setAvoidSun,1,Sets if the path should avoid sunlight
 func_486_a,rayTraceBlocks,1,"ray traces all blocks, including non-collideable ones"
 func_487_a,countEntities,1,Counts how many entities of an entity class exist in the world. Args: entityClass
 func_488_c,getHeightValue,1,"Returns the y coordinate with a block in it at this x, z coordinate"
@ -4473,17 +4547,21 @@ func_489_j,isBlockIndirectlyProvidingPowerTo,1,"Is a block next to you getting p
 func_48_b,getPlayerListComponent,1,Returns a new JScrollPane with a new PlayerListBox inside.
 func_490_a,handleMaterialAcceleration,1,handles the acceleration of an object whilst in water. Not sure if it is used elsewhere.
 func_491_a,playRecord,1,"Plays a record at the specified coordinates of the specified name. Args: recordName, x, y, z"
-func_492_a,getChunkFromBlockCoords,1,"Returns a chunk looked up by block coordinates. Args: x, y"
+func_492_a,getChunkFromBlockCoords,1,"Returns a chunk looked up by block coordinates. Args: x, z"
 func_493_a,calculateSkylightSubtracted,1,Returns the amount of skylight subtracted for the current time
 func_494_a,getBlockDensity,1,"Gets the percentage of real blocks within within a bounding box, along a specified vector."
 func_495_h,getBlockLightValue,1,Gets the light value of a block location
 func_496_m,isBlockGettingPowered,1,"Whether one of the neighboring blocks is putting power into this block. Args: x, y, z"
 func_497_g,canBlockSeeTheSky,1,Checks if the specified block is able to see the sky
 func_498_f,markBlocksDirtyVertical,1,marks a vertical line of blocks as dirty
+func_50003_a,handlePlayerAbilities,1,Handle a player abilities packet.
+func_50008_h,canSilkHarvest,1,"Return true if a player with SlikTouch can harvest this block directly, and not it's normal drops."
+func_50023_a,setBlock,1,"Sets the block without metadata in the world, notifying neighbors if enabled."
+func_50024_b,setEnableSnow,1,sets enableSnow to true during biome initialization. returns BiomeGenBase.
 func_500_a,isMaterialInBB,1,Returns true if the given bounding box contains the given material
 func_502_a,playSoundEffect,1,"Play a sound effect. Many many parameters for this function. Not sure what they do, but a classic call is : (double)i + 0.5D, (double)j + 0.5D, (double)k + 0.5D, 'random.door_open', 1.0F, world.rand.nextFloat() * 0.1F + 0.9F with i,j,k position of the block."
 func_505_a,rayTraceBlocks_do,1,
-func_506_a,playSoundAtEntity,1,"Plays a sound at the entity's position. Args: entity, sound, unknown1, unknown2"
+func_506_a,playSoundAtEntity,1,"Plays a sound at the entity's position. Args: entity, sound, unknown1, volume (relative to 1.0)"
 func_507_b,setBlockAndMetadataWithNotify,1,"Sets the block ID and metadata, then notifies neighboring blocks of the change Params: x, y, z, BlockID, Metadata"
 func_508_d,setBlockWithNotify,1,"Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID"
 func_511_b,setBlockMetadataWithNotify,1,"Sets the blocks metadata and if set will then notify blocks that this block changed. Args: x, y, z, metadata"
@ -4668,11 +4746,11 @@ func_671_e,getHashedKey,1,returns the hashed key given the original key
 func_672_c,removeKey,1,removes the key from the hash linked list
 func_673_a,copyHashTableTo,1,copies the hash table to the specified array
 func_674_d,getHashCode,1,public method to get the hashed key(hashCode)
-func_675_a,add,1,add the key value pair to the hash
+func_675_a,add,1,Add a key-value pair.
 func_676_a,hash,1,the hash function
 func_677_a,getValueByKey,1,get the value from the map given the key
 func_678_a,getHashIndex,1,gets the index in the hash given the array length and the hashed key
-func_679_a,createKey,1,creates the key in the hashTable
+func_679_a,createKey,1,creates the key in the hash table
 func_67_a,getNewPacket,1,Returns a new instance of the specified Packet class.
 func_680_b,resizeTable,1,resizes the table
 func_681_a,obtainEntitySkin,1,"Start the skin for this entity downloading, if necessary, and increment its reference counter"
@ -4743,7 +4821,7 @@ func_748_f,getWriteThread,1,Returns the write thread.
 func_749_d,sendNetworkPacket,1,Static accessor to sendPacket.
 func_750_a,onNetworkError,1,Used to report network errors and causes a network shutdown.
 func_751_c,readNetworkPacket,1,Static accessor to readPacket.
-func_752_c,serverShutdown,1,Server-only method to shut down the network.
+func_752_c,serverShutdown,1,Shuts down the server. (Only actually used on the server)
 func_753_a,networkShutdown,1,"Shuts down the network with the specified reason. Closes all streams and sockets, spawns NetworkMasterThread to stop reading and writing threads."
 func_754_a,setNetHandler,1,Sets the NetHandler for this NetworkManager. Server-only.
 func_755_b,getRemoteAddress,1,Returns the socket address of the remote side. Server-only.
--- a/forge/conf/params.csv
+++ b/forge/conf/params.csv
@ -4417,8 +4417,6 @@ p_48464_2_,par2,0
 p_48464_3_,par3,0
 p_48469_1_,par1Entity,0
 p_48469_2_,par2Entity,0
-p_48474_1_,par1Str,0
-p_48474_2_,par2Str,0
 p_48480_1_,par1Entity,0
 p_48485_0_,par0NBTTagCompound,0
 p_48486_0_,par0AnvilConverterData,0
@ -4737,6 +4735,22 @@ p_516_5_,par5,0
 p_517_1_,par1,0
 p_517_3_,par3,0
 p_517_5_,par5,0
+p_52005_0_,par0ItemStack,0
+p_52006_1_,par1Item,0
+p_52006_2_,par2,0
+p_52014_0_,par0Str,0
+p_52016_0_,par0Map,0
+p_52017_0_,par0URL,0
+p_52017_1_,par1Str,0
+p_52017_2_,par2,0
+p_52018_0_,par0URL,0
+p_52018_1_,par1Map,0
+p_52018_2_,par2,0
+p_52019_0_,par0Str,0
+p_52020_0_,par0PlayerUsageSnooper,0
+p_52022_1_,par1Str,0
+p_52022_2_,par2Obj,0
+p_52023_0_,par0PlayerUsageSnooper,0
 p_520_1_,par1,0
 p_520_2_,par2,0
 p_520_3_,par3,0
@ -5265,7 +5279,6 @@ p_794_1_,par1,0
 p_794_2_,par2,0
 p_794_3_,par3,0
 p_795_1_,par1ChunkPosition,0
-p_797_1_,par1EntityPlayer,0
 p_799_1_,par1IsoImageBuffer,0
 p_803_1_,par1,0
 p_803_2_,par2,0
@ -5818,7 +5831,6 @@ p_i1077_1_,par1EntityLiving,0
 p_i1077_2_,par2Class,0
 p_i1077_3_,par3,0
 p_i1077_4_,par4,0
-p_i1078_1_,par1Minecraft,0
 p_i1079_1_,par1EntityCreature,0
 p_i1079_2_,par2,0
 p_i107_1_,par1,0
@ -5929,6 +5941,7 @@ p_i129_1_,par1,0
 p_i129_2_,par2,0
 p_i12_1_,par1,0
 p_i12_2_,par2,0
+p_i1300_1_,par1Str,0
 p_i130_1_,par1,0
 p_i131_1_,par1,0
 p_i132_1_,par1Minecraft,0
@ -11035,6 +11048,18 @@ p_519_3_,par3,1
 p_519_4_,par4,1
 p_519_5_,par5,1
 p_519_6_,par6,1
+p_52006_0_,par0ItemStack,1
+p_52008_0_,par0Map,1
+p_52009_0_,par0URL,1
+p_52009_1_,par1Str,1
+p_52009_2_,par2,1
+p_52010_0_,par0URL,1
+p_52010_1_,par1Map,1
+p_52010_2_,par2,1
+p_52011_0_,par0PlayerUsageSnooper,1
+p_52013_0_,par0PlayerUsageSnooper,1
+p_52014_1_,par1Str,1
+p_52014_2_,par2Obj,1
 p_520_1_,par1Entity,1
 p_521_1_,par1,1
 p_521_2_,par2,1
@ -11907,6 +11932,9 @@ p_i129_2_,par2,1
 p_i129_3_,par3,1
 p_i12_1_,par1,1
 p_i12_2_,par2,1
+p_i1300_1_,par1PlayerUsageSnooper,1
+p_i1300_2_,par2Str,1
+p_i1301_1_,par1Str,1
 p_i130_1_,par1,1
 p_i131_1_,par1ISaveHandler,1
 p_i131_2_,par2Str,1
--- a/forge/conf/patches/minecraft.patch
+++ b/forge/conf/patches/minecraft.patch
@ -1,15 +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	Sun Mar 25 23:20:47 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sun Mar 25 23:29:05 2012
-@@ -120,7 +120,6 @@
- import org.lwjgl.input.Controllers;
- import org.lwjgl.input.Keyboard;
- import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.AWTGLCanvas;
- import org.lwjgl.opengl.Display;
- import org.lwjgl.opengl.DisplayMode;
- import org.lwjgl.opengl.GL11;
-@@ -866,8 +865,7 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Fri Mar 30 23:47:16 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Mar 30 23:49:03 2012
+@@ -847,8 +847,7 @@
         }
         profilerresult = (ProfilerResult)list.remove(0);
         if(!(p_40003_1_ != 0))
@ -19,7 +11,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
         if(profilerresult.field_40703_c.length() > 0)
         {
             int i = field_40006_ak.lastIndexOf(".");
-@@ -876,18 +874,15 @@
+@@ -857,18 +856,15 @@
                 field_40006_ak = field_40006_ak.substring(0, i);
             }
         }
@ -43,18 +35,9 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
     }
 
     private void func_6238_a(long p_6238_1_)
-@@ -1984,7 +1979,7 @@
-         boolean flag = false;
-         String s = p_6253_0_;
-         Frame frame = new Frame("Minecraft");
-        AWTGLCanvas awtglcanvas = new AWTGLCanvas();
-+        Canvas awtglcanvas = new Canvas();
-         frame.setLayout(new BorderLayout());
-         frame.add(awtglcanvas, "Center");
-         awtglcanvas.setPreferredSize(new Dimension(854, 480));
 diff -r -U 3 minecraft\net\minecraft\client\MinecraftApplet.java minecraft_patched\net\minecraft\client\MinecraftApplet.java
--- minecraft\net\minecraft\client\MinecraftApplet.java	Sun Mar 25 23:20:47 2012
-+++ minecraft_patched\net\minecraft\client\MinecraftApplet.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\client\MinecraftApplet.java	Fri Mar 30 23:47:16 2012
+++ minecraft_patched\net\minecraft\client\MinecraftApplet.java	Fri Mar 30 23:49:03 2012
@@ -37,10 +37,9 @@
         field_6234_b = new MinecraftAppletImpl(this, this, field_6235_a, this, getWidth(), getHeight(), flag);
         field_6234_b.field_6319_j = getDocumentBase().getHost();
@ -69,8 +52,8 @@ diff -r -U 3 minecraft\net\minecraft\client\MinecraftApplet.java minecraft_patch
         {
             field_6234_b.field_6320_i = new Session(getParameter("username"), getParameter("sessionid"));
 diff -r -U 3 minecraft\net\minecraft\src\Block.java minecraft_patched\net\minecraft\src\Block.java
--- minecraft\net\minecraft\src\Block.java	Sun Mar 25 23:20:47 2012
-+++ minecraft_patched\net\minecraft\src\Block.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\Block.java	Fri Mar 30 23:47:16 2012
+++ minecraft_patched\net\minecraft\src\Block.java	Fri Mar 30 23:49:03 2012
@@ -51,11 +51,11 @@
     public static final StepSound field_9248_k;
     public static final StepSound field_9247_l;
@ -186,8 +169,8 @@ diff -r -U 3 minecraft\net\minecraft\src\Block.java minecraft_patched\net\minecr
         field_40202_bJ = (new BlockEndPortalFrame(120)).func_4024_a(field_9249_j).func_215_a(0.125F).func_222_c(-1F).func_20012_a("endPortalFrame").func_28031_n().func_219_b(6000000F);
         field_40203_bK = (new Block(121, 175, Material.field_1334_d)).func_222_c(3F).func_219_b(15F).func_4024_a(field_9251_h).func_20012_a("whiteStone");
 diff -r -U 3 minecraft\net\minecraft\src\ChatClickData.java minecraft_patched\net\minecraft\src\ChatClickData.java
--- minecraft\net\minecraft\src\ChatClickData.java	Sun Mar 25 23:20:47 2012
-+++ minecraft_patched\net\minecraft\src\ChatClickData.java	Sun Mar 25 23:30:24 2012
+--- minecraft\net\minecraft\src\ChatClickData.java	Fri Mar 30 23:47:17 2012
+++ minecraft_patched\net\minecraft\src\ChatClickData.java	Fri Mar 30 23:49:03 2012
@@ -23,7 +23,7 @@
     private final int field_50093_d;
     private final int field_50094_e;
@ -206,8 +189,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ChatClickData.java minecraft_patched\ne
 
     public String func_50088_a()
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java	Sun Mar 25 23:20:48 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Fri Mar 30 23:47:17 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Mar 30 23:49:03 2012
@@ -20,6 +20,9 @@
 
     protected InputStream openInputStream()
@ -219,8 +202,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
 }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentNetherBridgePiece.java minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java
--- minecraft\net\minecraft\src\ComponentNetherBridgePiece.java	Sun Mar 25 23:20:48 2012
-+++ minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\ComponentNetherBridgePiece.java	Fri Mar 30 23:47:17 2012
+++ minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java	Fri Mar 30 23:49:03 2012
@@ -35,51 +35,41 @@
         return flag ? i : -1;
     }
@ -308,8 +291,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentNetherBridgePiece.java minecra
     private StructureComponent func_40018_a(ComponentNetherBridgeStartPiece p_40018_1_, List p_40018_2_, Random p_40018_3_, int p_40018_4_, int p_40018_5_, int p_40018_6_, int p_40018_7_, int p_40018_8_, boolean p_40018_9_)
     {
 diff -r -U 3 minecraft\net\minecraft\src\GenLayer.java minecraft_patched\net\minecraft\src\GenLayer.java
--- minecraft\net\minecraft\src\GenLayer.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\GenLayer.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\GenLayer.java	Fri Mar 30 23:47:20 2012
+++ minecraft_patched\net\minecraft\src\GenLayer.java	Fri Mar 30 23:49:04 2012
@@ -20,7 +20,7 @@
 
     public static GenLayer[] func_48425_a(long p_48425_0_, WorldType p_48425_2_)
@ -336,8 +319,8 @@ diff -r -U 3 minecraft\net\minecraft\src\GenLayer.java minecraft_patched\net\min
         obj2 = new GenLayerBiome(200L, ((GenLayer) (obj2)), p_48425_2_);
         obj2 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj2)), 2);
 diff -r -U 3 minecraft\net\minecraft\src\GuiCreateWorld.java minecraft_patched\net\minecraft\src\GuiCreateWorld.java
--- minecraft\net\minecraft\src\GuiCreateWorld.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\GuiCreateWorld.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\GuiCreateWorld.java	Fri Mar 30 23:47:20 2012
+++ minecraft_patched\net\minecraft\src\GuiCreateWorld.java	Fri Mar 30 23:49:04 2012
@@ -102,13 +102,11 @@
         field_35369_v = stringtranslate.func_20163_a((new StringBuilder()).append("selectWorld.gameMode.").append(field_35364_f).append(".line2").toString());
         field_35372_s.field_939_e = (new StringBuilder()).append(stringtranslate.func_20163_a("selectWorld.mapFeatures")).append(" ").toString();
@ -356,8 +339,8 @@ diff -r -U 3 minecraft\net\minecraft\src\GuiCreateWorld.java minecraft_patched\n
         return;
     }
 diff -r -U 3 minecraft\net\minecraft\src\GuiEditSign.java minecraft_patched\net\minecraft\src\GuiEditSign.java
--- minecraft\net\minecraft\src\GuiEditSign.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\GuiEditSign.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\GuiEditSign.java	Fri Mar 30 23:47:20 2012
+++ minecraft_patched\net\minecraft\src\GuiEditSign.java	Fri Mar 30 23:49:04 2012
@@ -81,10 +81,9 @@
             field_1002_h.field_826_a[field_1000_j] = field_1002_h.field_826_a[field_1000_j].substring(0, field_1002_h.field_826_a[field_1000_j].length() - 1);
         }
@ -371,31 +354,9 @@ diff -r -U 3 minecraft\net\minecraft\src\GuiEditSign.java minecraft_patched\net\
     }
 
     public void func_571_a(int p_571_1_, int p_571_2_, float p_571_3_)
-diff -r -U 3 minecraft\net\minecraft\src\GuiIngame.java minecraft_patched\net\minecraft\src\GuiIngame.java
--- minecraft\net\minecraft\src\GuiIngame.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\GuiIngame.java	Sun Mar 25 23:29:05 2012
-@@ -322,13 +322,13 @@
-             func_547_b(fontrenderer, (new StringBuilder()).append("y: ").append(field_9422_g.field_6322_g.field_610_al).toString(), 2, 72, 0xe0e0e0);
-             func_547_b(fontrenderer, (new StringBuilder()).append("z: ").append(field_9422_g.field_6322_g.field_609_am).toString(), 2, 80, 0xe0e0e0);
-             func_547_b(fontrenderer, (new StringBuilder()).append("f: ").append(MathHelper.func_1108_b((double)((field_9422_g.field_6322_g.field_605_aq * 4F) / 360F) + 0.5D) & 3).toString(), 2, 88, 0xe0e0e0);
-            l = MathHelper.func_1108_b(field_9422_g.field_6322_g.field_611_ak);
-+            int j0 = MathHelper.func_1108_b(field_9422_g.field_6322_g.field_611_ak);
-             int j1 = MathHelper.func_1108_b(field_9422_g.field_6322_g.field_610_al);
-            l2 = MathHelper.func_1108_b(field_9422_g.field_6322_g.field_609_am);
-            if(field_9422_g.field_6324_e != null && field_9422_g.field_6324_e.func_630_d(l, j1, l2))
-+            int j2 = MathHelper.func_1108_b(field_9422_g.field_6322_g.field_609_am);
-+            if(field_9422_g.field_6324_e != null && field_9422_g.field_6324_e.func_630_d(j0, j1, j2))
-             {
-                Chunk chunk = field_9422_g.field_6324_e.func_673_a(l, l2);
-                func_547_b(fontrenderer, (new StringBuilder()).append("lc: ").append(chunk.func_48498_h() + 15).append(" b: ").append(chunk.func_48490_a(l & 0xf, l2 & 0xf, field_9422_g.field_6324_e.func_4075_a()).field_6504_m).append(" bl: ").append(chunk.func_1025_a(EnumSkyBlock.Block, l & 0xf, j1, l2 & 0xf)).append(" sl: ").append(chunk.func_1025_a(EnumSkyBlock.Sky, l & 0xf, j1, l2 & 0xf)).append(" rl: ").append(chunk.func_1019_c(l & 0xf, j1, l2 & 0xf, 0)).toString(), 2, 96, 0xe0e0e0);
-+                Chunk chunk = field_9422_g.field_6324_e.func_673_a(j0, j2);
-+                func_547_b(fontrenderer, (new StringBuilder()).append("lc: ").append(chunk.func_48498_h() + 15).append(" b: ").append(chunk.func_48490_a(j0 & 0xf, j2 & 0xf, field_9422_g.field_6324_e.func_4075_a()).field_6504_m).append(" bl: ").append(chunk.func_1025_a(EnumSkyBlock.Block, j0 & 0xf, j1, j2 & 0xf)).append(" sl: ").append(chunk.func_1025_a(EnumSkyBlock.Sky, j0 & 0xf, j1, j2 & 0xf)).append(" rl: ").append(chunk.func_1019_c(j0 & 0xf, j1, j2 & 0xf, 0)).toString(), 2, 96, 0xe0e0e0);
-             }
-             if(!field_9422_g.field_6324_e.field_1026_y)
-             {
 diff -r -U 3 minecraft\net\minecraft\src\GuiVideoSettings.java minecraft_patched\net\minecraft\src\GuiVideoSettings.java
--- minecraft\net\minecraft\src\GuiVideoSettings.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\GuiVideoSettings.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\GuiVideoSettings.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\GuiVideoSettings.java	Fri Mar 30 23:49:04 2012
@@ -38,7 +38,7 @@
         int j = aobj.length;
         for(int k = 0; k < j; k++)
@ -406,8 +367,8 @@ diff -r -U 3 minecraft\net\minecraft\src\GuiVideoSettings.java minecraft_patched
             {
                 field_949_e.add(new GuiSmallButton(enumoptions.func_20135_c(), (field_951_c / 2 - 155) + (i % 2) * 160, field_950_d / 6 + 24 * (i >> 1), enumoptions, field_22109_i.func_1043_a(enumoptions)));
 diff -r -U 3 minecraft\net\minecraft\src\MapGenCaves.java minecraft_patched\net\minecraft\src\MapGenCaves.java
--- minecraft\net\minecraft\src\MapGenCaves.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\MapGenCaves.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\MapGenCaves.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\MapGenCaves.java	Fri Mar 30 23:49:04 2012
@@ -117,9 +117,9 @@
                 i1 = 16;
             }
@ -444,8 +405,8 @@ diff -r -U 3 minecraft\net\minecraft\src\MapGenCaves.java minecraft_patched\net\
                     double d9 = (((double)(k2 + p_869_4_ * 16) + 0.5D) - p_869_10_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
 diff -r -U 3 minecraft\net\minecraft\src\MapGenCavesHell.java minecraft_patched\net\minecraft\src\MapGenCavesHell.java
--- minecraft\net\minecraft\src\MapGenCavesHell.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\MapGenCavesHell.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\MapGenCavesHell.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\MapGenCavesHell.java	Fri Mar 30 23:49:04 2012
@@ -117,9 +117,9 @@
                 i1 = 16;
             }
@ -481,8 +442,8 @@ diff -r -U 3 minecraft\net\minecraft\src\MapGenCavesHell.java minecraft_patched\
                     double d9 = (((double)(k2 + p_4128_2_ * 16) + 0.5D) - p_4128_8_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
 diff -r -U 3 minecraft\net\minecraft\src\MapGenRavine.java minecraft_patched\net\minecraft\src\MapGenRavine.java
--- minecraft\net\minecraft\src\MapGenRavine.java	Sun Mar 25 23:20:49 2012
-+++ minecraft_patched\net\minecraft\src\MapGenRavine.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\MapGenRavine.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\MapGenRavine.java	Fri Mar 30 23:49:04 2012
@@ -113,9 +113,9 @@
                 i1 = 16;
             }
@ -519,8 +480,8 @@ diff -r -U 3 minecraft\net\minecraft\src\MapGenRavine.java minecraft_patched\net
                     double d9 = (((double)(k2 + p_35626_4_ * 16) + 0.5D) - p_35626_10_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
 diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
--- minecraft\net\minecraft\src\MusInputStream.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\MusInputStream.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Fri Mar 30 23:49:04 2012
@@ -42,7 +42,10 @@
 
     public int read(byte p_read_1_[], int p_read_2_, int p_read_3_)
@ -533,8 +494,8 @@ diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\n
         {
             byte byte0 = p_read_1_[p_read_2_ + i] ^= field_1516_c >> 8;
 diff -r -U 3 minecraft\net\minecraft\src\NetClientHandler.java minecraft_patched\net\minecraft\src\NetClientHandler.java
--- minecraft\net\minecraft\src\NetClientHandler.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\NetClientHandler.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\NetClientHandler.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetClientHandler.java	Fri Mar 30 23:49:04 2012
@@ -114,7 +114,7 @@
         double d = (double)p_835_1_.field_499_b / 32D;
         double d1 = (double)p_835_1_.field_503_c / 32D;
@ -545,8 +506,8 @@ diff -r -U 3 minecraft\net\minecraft\src\NetClientHandler.java minecraft_patched
         {
             obj = new EntityMinecart(field_1211_f, d, d1, d2, 0);
 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 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:49:04 2012
@@ -17,6 +17,7 @@
         field_1086_a = p_i570_1_;
     }
@ -556,8 +517,8 @@ diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patc
     {
         try
 diff -r -U 3 minecraft\net\minecraft\src\NetworkReaderThread.java minecraft_patched\net\minecraft\src\NetworkReaderThread.java
--- minecraft\net\minecraft\src\NetworkReaderThread.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\NetworkReaderThread.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\NetworkReaderThread.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetworkReaderThread.java	Fri Mar 30 23:49:04 2012
@@ -24,6 +24,7 @@
         {
             NetworkManager.field_1477_b++;
@ -586,8 +547,8 @@ diff -r -U 3 minecraft\net\minecraft\src\NetworkReaderThread.java minecraft_patc
     }
 }
 diff -r -U 3 minecraft\net\minecraft\src\NetworkWriterThread.java minecraft_patched\net\minecraft\src\NetworkWriterThread.java
--- minecraft\net\minecraft\src\NetworkWriterThread.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\NetworkWriterThread.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\NetworkWriterThread.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetworkWriterThread.java	Fri Mar 30 23:49:04 2012
@@ -27,6 +27,7 @@
         {
             NetworkManager.field_1476_c++;
@ -616,8 +577,8 @@ diff -r -U 3 minecraft\net\minecraft\src\NetworkWriterThread.java minecraft_patc
     }
 }
 diff -r -U 3 minecraft\net\minecraft\src\PathNavigate.java minecraft_patched\net\minecraft\src\PathNavigate.java
--- minecraft\net\minecraft\src\PathNavigate.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\PathNavigate.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\PathNavigate.java	Fri Mar 30 23:47:23 2012
+++ minecraft_patched\net\minecraft\src\PathNavigate.java	Fri Mar 30 23:49:04 2012
@@ -184,21 +184,21 @@
     {
         Vec3D vec3d = func_48661_h();
@ -647,8 +608,8 @@ diff -r -U 3 minecraft\net\minecraft\src\PathNavigate.java minecraft_patched\net
         {
             if(vec3d.func_1261_d(field_46075_c.func_48646_a(field_46076_a, j)) < (double)f)
 diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
--- minecraft\net\minecraft\src\RenderBlocks.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\RenderBlocks.java	Fri Mar 30 23:47:23 2012
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Fri Mar 30 23:49:04 2012
@@ -1678,7 +1678,7 @@
         tessellator.func_35835_b(p_35929_1_.func_35275_c(field_1772_a, p_35929_2_, p_35929_3_, p_35929_4_));
         int j = p_35929_1_.func_207_d(field_1772_a, p_35929_2_, p_35929_3_, p_35929_4_);
@ -659,8 +620,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
         tessellator.func_987_a(f * f1, f * d, f * f2);
         j = (i & 0xf) << 4;
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java	Sun Mar 25 23:20:50 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\RenderGlobal.java	Fri Mar 30 23:47:23 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Mar 30 23:49:04 2012
@@ -507,7 +507,7 @@
             do
             {
@ -702,8 +663,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
         {
             GL11.glColor4f(f18, f18, f18, f18);
 diff -r -U 3 minecraft\net\minecraft\src\RenderXPOrb.java minecraft_patched\net\minecraft\src\RenderXPOrb.java
--- minecraft\net\minecraft\src\RenderXPOrb.java	Sun Mar 25 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\RenderXPOrb.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\RenderXPOrb.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\RenderXPOrb.java	Fri Mar 30 23:49:04 2012
@@ -38,12 +38,12 @@
         float f4 = 1.0F;
         float f5 = 0.5F;
@ -722,8 +683,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderXPOrb.java minecraft_patched\net\
         j = (int)((MathHelper.func_1106_a(f8 + 0.0F) + 1.0F) * 0.5F * f7);
         int k = (int)f7;
 diff -r -U 3 minecraft\net\minecraft\src\SpawnerAnimals.java minecraft_patched\net\minecraft\src\SpawnerAnimals.java
--- minecraft\net\minecraft\src\SpawnerAnimals.java	Sun Mar 25 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\SpawnerAnimals.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\SpawnerAnimals.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\SpawnerAnimals.java	Fri Mar 30 23:49:04 2012
@@ -33,172 +33,127 @@
         return new ChunkPosition(i, j, k);
     }
@ -1014,8 +975,8 @@ diff -r -U 3 minecraft\net\minecraft\src\SpawnerAnimals.java minecraft_patched\n
     public static boolean func_21203_a(EnumCreatureType p_21203_0_, World p_21203_1_, int p_21203_2_, int p_21203_3_, int p_21203_4_)
     {
 diff -r -U 3 minecraft\net\minecraft\src\StringTranslate.java minecraft_patched\net\minecraft\src\StringTranslate.java
--- minecraft\net\minecraft\src\StringTranslate.java	Sun Mar 25 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\StringTranslate.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\StringTranslate.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\StringTranslate.java	Fri Mar 30 23:49:04 2012
@@ -76,63 +76,46 @@
 
     }
@ -1120,8 +1081,8 @@ diff -r -U 3 minecraft\net\minecraft\src\StringTranslate.java minecraft_patched\
     public String func_44024_c()
     {
 diff -r -U 3 minecraft\net\minecraft\src\StructureStrongholdPieces.java minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java
--- minecraft\net\minecraft\src\StructureStrongholdPieces.java	Sun Mar 25 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\StructureStrongholdPieces.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java	Fri Mar 30 23:49:04 2012
@@ -108,66 +108,55 @@
         return ((ComponentStronghold) (obj));
     }
@ -1238,8 +1199,8 @@ diff -r -U 3 minecraft\net\minecraft\src\StructureStrongholdPieces.java minecraf
     private static StructureComponent func_35848_c(ComponentStrongholdStairs2 p_35848_0_, List p_35848_1_, Random p_35848_2_, int p_35848_3_, int p_35848_4_, int p_35848_5_, int p_35848_6_, int p_35848_7_)
     {
 diff -r -U 3 minecraft\net\minecraft\src\StructureVillagePieces.java minecraft_patched\net\minecraft\src\StructureVillagePieces.java
--- minecraft\net\minecraft\src\StructureVillagePieces.java	Sun Mar 25 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\StructureVillagePieces.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\StructureVillagePieces.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\StructureVillagePieces.java	Fri Mar 30 23:49:04 2012
@@ -107,59 +107,48 @@
         return ((ComponentVillage) (obj));
     }
@ -1342,8 +1303,8 @@ diff -r -U 3 minecraft\net\minecraft\src\StructureVillagePieces.java minecraft_p
     private static StructureComponent func_35702_d(ComponentVillageStartPiece p_35702_0_, List p_35702_1_, Random p_35702_2_, int p_35702_3_, int p_35702_4_, int p_35702_5_, int p_35702_6_, int p_35702_7_)
     {
 diff -r -U 3 minecraft\net\minecraft\src\ThreadPollServers.java minecraft_patched\net\minecraft\src\ThreadPollServers.java
--- minecraft\net\minecraft\src\ThreadPollServers.java	Sun Mar 25 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\ThreadPollServers.java	Sun Mar 25 23:29:05 2012
+--- minecraft\net\minecraft\src\ThreadPollServers.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\ThreadPollServers.java	Fri Mar 30 23:49:04 2012
@@ -36,63 +36,32 @@
         {
             field_35601_a.field_35792_e = -1L;
@ -1409,15 +1370,3 @@ diff -r -U 3 minecraft\net\minecraft\src\ThreadPollServers.java minecraft_patche
 -        throw exception7;
     }
 }
-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 23:20:51 2012
-+++ minecraft_patched\net\minecraft\src\WorldGenerator.java	Sun Mar 25 23:29:05 2012
-@@ -41,7 +41,7 @@
-         {
-             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)
-+        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_))
-             {
--- a/forge/conf/patches/minecraft_ff.patch
+++ b/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	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sun Mar 25 05:08:08 2012
-@@ -1631,11 +1631,13 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Fri Mar 30 23:25:51 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Mar 30 23:38:36 2012
+@@ -1618,11 +1618,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,9 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
             }
          }
       }
-@@ -1757,7 +1759,7 @@
-    public static void func_6253_a(String p_6253_0_, String p_6253_1_, String p_6253_2_) {
-       boolean var3 = false;
-       Frame var5 = new Frame("Minecraft");
-      AWTGLCanvas var6 = new AWTGLCanvas();
-+      Canvas var6 = new Canvas();
-       var5.setLayout(new BorderLayout());
-       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	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Sun Mar 25 05:08:08 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Fri Mar 30 23:25:52 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Mar 30 23:38:36 2012
@@ -1,5 +1,6 @@
 package net.minecraft.src;
 
@ -47,8 +38,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	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\src\ItemMap.java	Sun Mar 25 05:08:08 2012
+--- minecraft\net\minecraft\src\ItemMap.java	Fri Mar 30 23:25:53 2012
+++ minecraft_patched\net\minecraft\src\ItemMap.java	Fri Mar 30 23:38:36 2012
@@ -19,7 +19,6 @@
    }
 
@ -66,8 +57,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	Sun Mar 25 05:06:23 2012
-+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Sun Mar 25 05:08:08 2012
+--- minecraft\net\minecraft\src\MusInputStream.java	Fri Mar 30 23:25:54 2012
+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Fri Mar 30 23:38:36 2012
@@ -1,5 +1,6 @@
 package net.minecraft.src;
 
@ -89,8 +80,8 @@ 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
+--- minecraft\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:25:54 2012
+++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:38:36 2012
@@ -11,6 +11,7 @@
       this.field_1086_a = p_i570_1_;
    }
@ -100,8 +91,8 @@ diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patc
       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	Sun Mar 25 05:06:24 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Mar 25 05:08:08 2012
+--- minecraft\net\minecraft\src\RenderGlobal.java	Fri Mar 30 23:25:54 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Mar 30 23:38:36 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_;
@ -112,8 +103,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	Sun Mar 25 05:06:24 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Mar 25 05:08:08 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Fri Mar 30 23:25:55 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Mar 30 23:38:36 2012
@@ -20,7 +20,9 @@
    }
 
@ -124,15 +115,3 @@ 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_);
-          }
--- a/forge/conf/patches/minecraft_server.patch
+++ b/forge/conf/patches/minecraft_server.patch
@ -1,7 +1,7 @@
 diff -r -U 3 minecraft_server\net\minecraft\server\MinecraftServer.java minecraft_server_patched\net\minecraft\server\MinecraftServer.java
--- minecraft_server\net\minecraft\server\MinecraftServer.java	Sat Mar 24 02:09:24 2012
-+++ minecraft_server_patched\net\minecraft\server\MinecraftServer.java	Sat Mar 24 03:22:36 2012
-@@ -330,122 +330,73 @@
+--- minecraft_server\net\minecraft\server\MinecraftServer.java	Fri Mar 30 23:47:40 2012
+++ minecraft_server_patched\net\minecraft\server\MinecraftServer.java	Fri Mar 30 23:49:24 2012
+@@ -334,122 +334,73 @@
         field_6025_n = false;
     }
 
@ -189,8 +189,8 @@ diff -r -U 3 minecraft_server\net\minecraft\server\MinecraftServer.java minecraf
     private void func_6018_h()
     {
 diff -r -U 3 minecraft_server\net\minecraft\src\Block.java minecraft_server_patched\net\minecraft\src\Block.java
--- minecraft_server\net\minecraft\src\Block.java	Sat Mar 24 02:09:24 2012
-+++ minecraft_server_patched\net\minecraft\src\Block.java	Sat Mar 24 03:39:13 2012
+--- minecraft_server\net\minecraft\src\Block.java	Fri Mar 30 23:47:40 2012
+++ minecraft_server_patched\net\minecraft\src\Block.java	Fri Mar 30 23:49:24 2012
@@ -51,11 +51,11 @@
     public static final StepSound field_9022_k;
     public static final StepSound field_9021_l;
@ -306,8 +306,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\Block.java minecraft_server_patc
         field_40167_bJ = (new BlockEndPortalFrame(120)).func_4026_a(field_9023_j).func_224_a(0.125F).func_237_c(-1F).func_20037_a("endPortalFrame").func_28027_k().func_232_b(6000000F);
         field_40168_bK = (new Block(121, 175, Material.field_523_d)).func_237_c(3F).func_232_b(15F).func_4026_a(field_9025_h).func_20037_a("whiteStone");
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentNetherBridgePiece.java minecraft_server_patched\net\minecraft\src\ComponentNetherBridgePiece.java
--- minecraft_server\net\minecraft\src\ComponentNetherBridgePiece.java	Sat Mar 24 02:09:25 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentNetherBridgePiece.java	Sat Mar 24 03:24:16 2012
+--- minecraft_server\net\minecraft\src\ComponentNetherBridgePiece.java	Fri Mar 30 23:47:41 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentNetherBridgePiece.java	Fri Mar 30 23:49:24 2012
@@ -35,51 +35,41 @@
         return flag ? i : -1;
     }
@ -395,8 +395,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentNetherBridgePiece.java
     private StructureComponent func_40283_a(ComponentNetherBridgeStartPiece p_40283_1_, List p_40283_2_, Random p_40283_3_, int p_40283_4_, int p_40283_5_, int p_40283_6_, int p_40283_7_, int p_40283_8_, boolean p_40283_9_)
     {
 diff -r -U 3 minecraft_server\net\minecraft\src\GenLayer.java minecraft_server_patched\net\minecraft\src\GenLayer.java
--- minecraft_server\net\minecraft\src\GenLayer.java	Sat Mar 24 02:09:27 2012
-+++ minecraft_server_patched\net\minecraft\src\GenLayer.java	Sat Mar 24 03:24:42 2012
+--- minecraft_server\net\minecraft\src\GenLayer.java	Fri Mar 30 23:47:43 2012
+++ minecraft_server_patched\net\minecraft\src\GenLayer.java	Fri Mar 30 23:49:24 2012
@@ -20,7 +20,7 @@
 
     public static GenLayer[] func_48391_a(long p_48391_0_, WorldType p_48391_2_)
@ -423,8 +423,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\GenLayer.java minecraft_server_p
         obj2 = new GenLayerBiome(200L, ((GenLayer) (obj2)), p_48391_2_);
         obj2 = GenLayerZoom.func_35025_a(1000L, ((GenLayer) (obj2)), 2);
 diff -r -U 3 minecraft_server\net\minecraft\src\GuiStatsComponent.java minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java
--- minecraft_server\net\minecraft\src\GuiStatsComponent.java	Sat Mar 24 02:09:27 2012
-+++ minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java	Sat Mar 24 03:26:45 2012
+--- minecraft_server\net\minecraft\src\GuiStatsComponent.java	Fri Mar 30 23:47:43 2012
+++ minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java	Fri Mar 30 23:49:24 2012
@@ -45,24 +45,14 @@
         field_768_c[2] = (new StringBuilder()).append("Avg tick: ").append(field_40573_a.format(func_48551_a(field_40572_e.field_40027_f) * 9.9999999999999995E-007D)).append(" ms").toString();
         field_768_c[3] = (new StringBuilder()).append("Avg sent: ").append((int)func_48551_a(field_40572_e.field_48080_u)).append(", Avg size: ").append((int)func_48551_a(field_40572_e.field_48079_v)).toString();
@ -459,8 +459,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\GuiStatsComponent.java minecraft
         repaint();
         return;
 diff -r -U 3 minecraft_server\net\minecraft\src\MapGenCaves.java minecraft_server_patched\net\minecraft\src\MapGenCaves.java
--- minecraft_server\net\minecraft\src\MapGenCaves.java	Sat Mar 24 02:09:28 2012
-+++ minecraft_server_patched\net\minecraft\src\MapGenCaves.java	Sat Mar 24 03:27:50 2012
+--- minecraft_server\net\minecraft\src\MapGenCaves.java	Fri Mar 30 23:47:44 2012
+++ minecraft_server_patched\net\minecraft\src\MapGenCaves.java	Fri Mar 30 23:49:24 2012
@@ -117,9 +117,9 @@
                 i1 = 16;
             }
@ -497,8 +497,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MapGenCaves.java minecraft_serve
                     double d9 = (((double)(k2 + p_668_4_ * 16) + 0.5D) - p_668_10_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
 diff -r -U 3 minecraft_server\net\minecraft\src\MapGenCavesHell.java minecraft_server_patched\net\minecraft\src\MapGenCavesHell.java
--- minecraft_server\net\minecraft\src\MapGenCavesHell.java	Sat Mar 24 02:09:28 2012
-+++ minecraft_server_patched\net\minecraft\src\MapGenCavesHell.java	Sat Mar 24 03:27:50 2012
+--- minecraft_server\net\minecraft\src\MapGenCavesHell.java	Fri Mar 30 23:47:44 2012
+++ minecraft_server_patched\net\minecraft\src\MapGenCavesHell.java	Fri Mar 30 23:49:24 2012
@@ -117,9 +117,9 @@
                 i1 = 16;
             }
@ -534,8 +534,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MapGenCavesHell.java minecraft_s
                     double d9 = (((double)(k2 + p_4105_2_ * 16) + 0.5D) - p_4105_8_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
 diff -r -U 3 minecraft_server\net\minecraft\src\MapGenRavine.java minecraft_server_patched\net\minecraft\src\MapGenRavine.java
--- minecraft_server\net\minecraft\src\MapGenRavine.java	Sat Mar 24 02:09:28 2012
-+++ minecraft_server_patched\net\minecraft\src\MapGenRavine.java	Sat Mar 24 03:27:50 2012
+--- minecraft_server\net\minecraft\src\MapGenRavine.java	Fri Mar 30 23:47:44 2012
+++ minecraft_server_patched\net\minecraft\src\MapGenRavine.java	Fri Mar 30 23:49:24 2012
@@ -113,9 +113,9 @@
                 i1 = 16;
             }
@ -572,8 +572,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MapGenRavine.java minecraft_serv
                     double d9 = (((double)(k2 + p_35539_4_ * 16) + 0.5D) - p_35539_10_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
 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	Sat Mar 24 16:09:33 2012
-+++ minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java	Sat Mar 24 16:12:56 2012
+--- minecraft_server\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:47:44 2012
+++ minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:49:24 2012
@@ -17,6 +17,7 @@
         field_829_a = p_i577_1_;
     }
@ -583,8 +583,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\NetworkMasterThread.java minecra
     {
         try
 diff -r -U 3 minecraft_server\net\minecraft\src\NetworkReaderThread.java minecraft_server_patched\net\minecraft\src\NetworkReaderThread.java
--- minecraft_server\net\minecraft\src\NetworkReaderThread.java	Sat Mar 24 02:09:28 2012
-+++ minecraft_server_patched\net\minecraft\src\NetworkReaderThread.java	Sat Mar 24 03:28:41 2012
+--- minecraft_server\net\minecraft\src\NetworkReaderThread.java	Fri Mar 30 23:47:44 2012
+++ minecraft_server_patched\net\minecraft\src\NetworkReaderThread.java	Fri Mar 30 23:49:24 2012
@@ -24,6 +24,7 @@
         {
             NetworkManager.field_1052_b++;
@ -613,8 +613,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\NetworkReaderThread.java minecra
     }
 }
 diff -r -U 3 minecraft_server\net\minecraft\src\NetworkWriterThread.java minecraft_server_patched\net\minecraft\src\NetworkWriterThread.java
--- minecraft_server\net\minecraft\src\NetworkWriterThread.java	Sat Mar 24 02:09:28 2012
-+++ minecraft_server_patched\net\minecraft\src\NetworkWriterThread.java	Sat Mar 24 03:28:41 2012
+--- minecraft_server\net\minecraft\src\NetworkWriterThread.java	Fri Mar 30 23:47:44 2012
+++ minecraft_server_patched\net\minecraft\src\NetworkWriterThread.java	Fri Mar 30 23:49:24 2012
@@ -27,6 +27,7 @@
         {
             NetworkManager.field_1051_c++;
@ -643,8 +643,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\NetworkWriterThread.java minecra
     }
 }
 diff -r -U 3 minecraft_server\net\minecraft\src\PathNavigate.java minecraft_server_patched\net\minecraft\src\PathNavigate.java
--- minecraft_server\net\minecraft\src\PathNavigate.java	Sat Mar 24 02:09:28 2012
-+++ minecraft_server_patched\net\minecraft\src\PathNavigate.java	Sat Mar 24 03:29:53 2012
+--- minecraft_server\net\minecraft\src\PathNavigate.java	Fri Mar 30 23:47:45 2012
+++ minecraft_server_patched\net\minecraft\src\PathNavigate.java	Fri Mar 30 23:49:24 2012
@@ -184,21 +184,21 @@
     {
         Vec3D vec3d = func_48665_h();
@ -674,8 +674,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\PathNavigate.java minecraft_serv
         {
             if(vec3d.func_764_b(field_46038_c.func_48428_a(field_46039_a, j)) < (double)f)
 diff -r -U 3 minecraft_server\net\minecraft\src\SpawnerAnimals.java minecraft_server_patched\net\minecraft\src\SpawnerAnimals.java
--- minecraft_server\net\minecraft\src\SpawnerAnimals.java	Sat Mar 24 02:09:29 2012
-+++ minecraft_server_patched\net\minecraft\src\SpawnerAnimals.java	Sat Mar 24 03:30:44 2012
+--- minecraft_server\net\minecraft\src\SpawnerAnimals.java	Fri Mar 30 23:47:45 2012
+++ minecraft_server_patched\net\minecraft\src\SpawnerAnimals.java	Fri Mar 30 23:49:24 2012
@@ -33,172 +33,127 @@
         return new ChunkPosition(i, j, k);
     }
@ -966,8 +966,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\SpawnerAnimals.java minecraft_se
     public static boolean func_21167_a(EnumCreatureType p_21167_0_, World p_21167_1_, int p_21167_2_, int p_21167_3_, int p_21167_4_)
     {
 diff -r -U 3 minecraft_server\net\minecraft\src\StringTranslate.java minecraft_server_patched\net\minecraft\src\StringTranslate.java
--- minecraft_server\net\minecraft\src\StringTranslate.java	Sat Mar 24 02:09:29 2012
-+++ minecraft_server_patched\net\minecraft\src\StringTranslate.java	Sat Mar 24 03:31:30 2012
+--- minecraft_server\net\minecraft\src\StringTranslate.java	Fri Mar 30 23:47:45 2012
+++ minecraft_server_patched\net\minecraft\src\StringTranslate.java	Fri Mar 30 23:49:24 2012
@@ -71,63 +71,46 @@
 
     }
@ -1072,8 +1072,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\StringTranslate.java minecraft_s
     public String func_25080_a(String p_25080_1_)
     {
 diff -r -U 3 minecraft_server\net\minecraft\src\StructureStrongholdPieces.java minecraft_server_patched\net\minecraft\src\StructureStrongholdPieces.java
--- minecraft_server\net\minecraft\src\StructureStrongholdPieces.java	Sat Mar 24 02:09:29 2012
-+++ minecraft_server_patched\net\minecraft\src\StructureStrongholdPieces.java	Sat Mar 24 03:32:20 2012
+--- minecraft_server\net\minecraft\src\StructureStrongholdPieces.java	Fri Mar 30 23:47:45 2012
+++ minecraft_server_patched\net\minecraft\src\StructureStrongholdPieces.java	Fri Mar 30 23:49:24 2012
@@ -108,66 +108,55 @@
         return ((ComponentStronghold) (obj));
     }
@ -1190,8 +1190,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\StructureStrongholdPieces.java m
     private static StructureComponent func_35621_c(ComponentStrongholdStairs2 p_35621_0_, List p_35621_1_, Random p_35621_2_, int p_35621_3_, int p_35621_4_, int p_35621_5_, int p_35621_6_, int p_35621_7_)
     {
 diff -r -U 3 minecraft_server\net\minecraft\src\StructureVillagePieces.java minecraft_server_patched\net\minecraft\src\StructureVillagePieces.java
--- minecraft_server\net\minecraft\src\StructureVillagePieces.java	Sat Mar 24 02:09:29 2012
-+++ minecraft_server_patched\net\minecraft\src\StructureVillagePieces.java	Sat Mar 24 03:32:55 2012
+--- minecraft_server\net\minecraft\src\StructureVillagePieces.java	Fri Mar 30 23:47:45 2012
+++ minecraft_server_patched\net\minecraft\src\StructureVillagePieces.java	Fri Mar 30 23:49:24 2012
@@ -107,59 +107,48 @@
         return ((ComponentVillage) (obj));
     }
@ -1293,15 +1293,3 @@ diff -r -U 3 minecraft_server\net\minecraft\src\StructureVillagePieces.java mine
 
     private static StructureComponent func_35641_d(ComponentVillageStartPiece p_35641_0_, List p_35641_1_, Random p_35641_2_, int p_35641_3_, int p_35641_4_, int p_35641_5_, int p_35641_6_, int p_35641_7_)
     {
-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	Sat Mar 24 02:09:29 2012
-+++ minecraft_server_patched\net\minecraft\src\WorldGenerator.java	Sat Mar 24 16:57:05 2012
-@@ -41,7 +41,7 @@
-         {
-             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)
-+        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_))
-             {
--- a/forge/conf/patches/minecraft_server_ff.patch
+++ b/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	Sun Mar 25 05:06:56 2012
-+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Sun Mar 25 05:08:42 2012
+--- minecraft_server\net\minecraft\src\ItemMap.java	Fri Mar 30 23:27:06 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Fri Mar 30 23:40:00 2012
@@ -22,7 +22,6 @@
    }
 
@ -10,8 +10,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_pa
       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
+--- minecraft_server\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:27:07 2012
+++ minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:40:00 2012
@@ -11,6 +11,7 @@
       this.field_829_a = p_i577_1_;
    }
@ -21,8 +21,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\NetworkMasterThread.java minecra
       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	Sun Mar 25 05:06:57 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Mar 25 05:08:42 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Fri Mar 30 23:27:07 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Mar 30 23:40:00 2012
@@ -20,7 +20,9 @@
    }
 
@ -33,15 +33,3 @@ 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_);
-          }
--- a/forge/conf/server.exc
+++ b/forge/conf/server.exc
@ -1,5 +1,5 @@
-#max index=1203
-#Fri Mar 23 22:29:22 NZDT 2012
+#max index=1302
+#Fri Mar 30 23:14:18 CEST 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_
@ -27,6 +27,7 @@ net/minecraft/server/MinecraftServer.func_40023_a(Ljava/lang/String;Ljava/lang/S
 net/minecraft/server/MinecraftServer.func_40024_m()Ljava/lang/String;=|
 net/minecraft/server/MinecraftServer.func_40025_r()[Ljava/lang/String;=|
 net/minecraft/server/MinecraftServer.func_40026_q()[Ljava/lang/String;=|
+net/minecraft/server/MinecraftServer.func_52003_getServerModName()Ljava/lang/String;=|
 net/minecraft/server/MinecraftServer.func_6008_d()Z=java/net/UnknownHostException|
 net/minecraft/server/MinecraftServer.func_6009_a(Ljava/lang/String;)Ljava/io/File;=|p_6009_1_
 net/minecraft/server/MinecraftServer.func_6010_a(Ljava/lang/String;Lnet/minecraft/src/ICommandListener;)V=|p_6010_1_,p_6010_2_
@ -4508,6 +4509,17 @@ net/minecraft/src/PlayerManager.func_543_c(Lnet/minecraft/src/EntityPlayerMP;)V=
 net/minecraft/src/PlayerManager.func_544_a(IIII)Z=|p_544_1_,p_544_2_,p_544_3_,p_544_4_
 net/minecraft/src/PlayerManager.func_9213_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_9213_1_
 net/minecraft/src/PlayerManager.func_9214_a(Lnet/minecraft/src/EntityPlayerMP;)V=|p_9214_1_
+net/minecraft/src/PlayerUsageSnooper.<init>(Ljava/lang/String;)V=|p_i1301_1_
+net/minecraft/src/PlayerUsageSnooper.func_52011_b(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/util/Map;=|p_52011_0_
+net/minecraft/src/PlayerUsageSnooper.func_52012_a()V=|
+net/minecraft/src/PlayerUsageSnooper.func_52013_a(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/net/URL;=|p_52013_0_
+net/minecraft/src/PlayerUsageSnooper.func_52014_a(Ljava/lang/String;Ljava/lang/Object;)V=|p_52014_1_,p_52014_2_
+net/minecraft/src/PlayerUsageSnooperThread.<init>(Lnet/minecraft/src/PlayerUsageSnooper;Ljava/lang/String;)V=|p_i1300_1_,p_i1300_2_
+net/minecraft/src/PlayerUsageSnooperThread.run()V=|
+net/minecraft/src/PostHttp.<init>()V=|
+net/minecraft/src/PostHttp.func_52008_a(Ljava/util/Map;)Ljava/lang/String;=|p_52008_0_
+net/minecraft/src/PostHttp.func_52009_a(Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String;=|p_52009_0_,p_52009_1_,p_52009_2_
+net/minecraft/src/PostHttp.func_52010_a(Ljava/net/URL;Ljava/util/Map;Z)Ljava/lang/String;=|p_52010_0_,p_52010_1_,p_52010_2_
 net/minecraft/src/Potion.<init>(IZI)V=|p_i211_1_,p_i211_2_,p_i211_3_
 net/minecraft/src/Potion.func_35437_a(II)Z=|p_35437_1_,p_35437_2_
 net/minecraft/src/Potion.func_35438_a(Lnet/minecraft/src/EntityLiving;I)V=|p_35438_1_,p_35438_2_
@ -4698,6 +4710,7 @@ net/minecraft/src/SaveHandler.func_22097_a()Ljava/io/File;=|
 net/minecraft/src/SaveHandler.func_22098_f()V=|
 net/minecraft/src/SaveHandler.func_25074_a(Ljava/lang/String;)Lnet/minecraft/src/NBTTagCompound;=|p_25074_1_
 net/minecraft/src/SaveHandler.func_28111_b(Ljava/lang/String;)Ljava/io/File;=|p_28111_1_
+net/minecraft/src/SaveHandler.func_52007_g()[Ljava/lang/String;=|
 net/minecraft/src/SaveHandler.func_725_b(Lnet/minecraft/src/EntityPlayer;)V=|p_725_1_
 net/minecraft/src/SaveHandler.func_726_a(Lnet/minecraft/src/EntityPlayer;)V=|p_726_1_
 net/minecraft/src/ServerCommand.<init>(Ljava/lang/String;Lnet/minecraft/src/ICommandListener;)V=|p_i23_1_,p_i23_2_
@ -4729,6 +4742,8 @@ net/minecraft/src/ServerConfigurationManager.func_35481_g()I=|
 net/minecraft/src/ServerConfigurationManager.func_40574_f()Ljava/util/Set;=|
 net/minecraft/src/ServerConfigurationManager.func_40575_d()[Ljava/lang/String;=|
 net/minecraft/src/ServerConfigurationManager.func_40576_e()Ljava/util/Set;=|
+net/minecraft/src/ServerConfigurationManager.func_52018_u()V=|
+net/minecraft/src/ServerConfigurationManager.func_52019_t()[Ljava/lang/String;=|
 net/minecraft/src/ServerConfigurationManager.func_613_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_613_1_
 net/minecraft/src/ServerConfigurationManager.func_616_c(Lnet/minecraft/src/EntityPlayerMP;)V=|p_616_1_
 net/minecraft/src/ServerConfigurationManager.func_617_d()V=|
@ -5069,6 +5084,7 @@ net/minecraft/src/TileEntityFurnace.func_206_a(ILnet/minecraft/src/ItemStack;)V=
 net/minecraft/src/TileEntityFurnace.func_35161_e()V=|
 net/minecraft/src/TileEntityFurnace.func_35162_t_()V=|
 net/minecraft/src/TileEntityFurnace.func_48315_b(I)Lnet/minecraft/src/ItemStack;=|p_48315_1_
+net/minecraft/src/TileEntityFurnace.func_52006_b(Lnet/minecraft/src/ItemStack;)Z=|p_52006_0_
 net/minecraft/src/TileEntityFurnace.func_82_a(I)Lnet/minecraft/src/ItemStack;=|p_82_1_
 net/minecraft/src/TileEntityFurnace.func_83_a()I=|
 net/minecraft/src/TileEntityMobSpawner.<init>()V=|
--- a/forge/conf/server.srg
+++ b/forge/conf/server.srg
@ -43,6 +43,9 @@ CL: abi net/minecraft/src/ItemFood
 CL: abj net/minecraft/src/SlotCrafting
 CL: abk net/minecraft/src/EntityWeatherEffect
 CL: abl net/minecraft/src/ChunkCoordIntPair
+CL: abm net/minecraft/src/PostHttp
+CL: abn net/minecraft/src/PlayerUsageSnooper
+CL: abo net/minecraft/src/PlayerUsageSnooperThread
 CL: ac net/minecraft/src/BlockDirectional
 CL: ad net/minecraft/src/RecipesArmor
 CL: ae net/minecraft/src/EntityAIOcelotSit
@ -861,6 +864,9 @@ FD: abj/f net/minecraft/src/SlotCrafting/field_25004_e
 FD: abj/g net/minecraft/src/SlotCrafting/field_48418_g
 FD: abl/a net/minecraft/src/ChunkCoordIntPair/field_152_a
 FD: abl/b net/minecraft/src/ChunkCoordIntPair/field_151_b
+FD: abn/a net/minecraft/src/PlayerUsageSnooper/field_52016_a
+FD: abn/b net/minecraft/src/PlayerUsageSnooper/field_52015_b
+FD: abo/a net/minecraft/src/PlayerUsageSnooperThread/field_52017_a
 FD: ad/a net/minecraft/src/RecipesArmor/field_20174_a
 FD: ad/b net/minecraft/src/RecipesArmor/field_20173_b
 FD: ae/a net/minecraft/src/EntityAIOcelotSit/field_50019_a
@ -870,6 +876,7 @@ FD: ae/d net/minecraft/src/EntityAIOcelotSit/field_50015_d
 FD: ae/e net/minecraft/src/EntityAIOcelotSit/field_50016_e
 FD: ae/f net/minecraft/src/EntityAIOcelotSit/field_50013_f
 FD: ae/g net/minecraft/src/EntityAIOcelotSit/field_50014_g
+FD: ae/h net/minecraft/src/EntityAIOcelotSit/field_52005_h
 FD: af/a net/minecraft/src/ContainerPlayer/field_20143_a
 FD: af/b net/minecraft/src/ContainerPlayer/field_20142_b
 FD: af/c net/minecraft/src/ContainerPlayer/field_20144_c
@ -2695,6 +2702,7 @@ FD: qq/w net/minecraft/src/NetworkManager/field_1036_r
 FD: qq/x net/minecraft/src/NetworkManager/field_1035_s
 FD: qq/y net/minecraft/src/NetworkManager/field_20175_w
 FD: qr/a net/minecraft/src/Packet3Chat/field_150_a
+FD: qr/b net/minecraft/src/Packet3Chat/field_52004_b
 FD: qs/a net/minecraft/src/Packet108EnchantItem/field_40265_a
 FD: qs/b net/minecraft/src/Packet108EnchantItem/field_40264_b
 FD: qt/a net/minecraft/src/WorldGenerator/field_41044_a
@ -3789,6 +3797,14 @@ MD: abl/b ()I net/minecraft/src/ChunkCoordIntPair/func_40660_b ()I
 MD: abl/equals (Ljava/lang/Object;)Z net/minecraft/src/ChunkCoordIntPair/equals (Ljava/lang/Object;)Z
 MD: abl/hashCode ()I net/minecraft/src/ChunkCoordIntPair/hashCode ()I
 MD: abl/toString ()Ljava/lang/String; net/minecraft/src/ChunkCoordIntPair/toString ()Ljava/lang/String;
+MD: abm/a (Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String; net/minecraft/src/PostHttp/func_52009_a (Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String;
+MD: abm/a (Ljava/net/URL;Ljava/util/Map;Z)Ljava/lang/String; net/minecraft/src/PostHttp/func_52010_a (Ljava/net/URL;Ljava/util/Map;Z)Ljava/lang/String;
+MD: abm/a (Ljava/util/Map;)Ljava/lang/String; net/minecraft/src/PostHttp/func_52008_a (Ljava/util/Map;)Ljava/lang/String;
+MD: abn/a ()V net/minecraft/src/PlayerUsageSnooper/func_52012_a ()V
+MD: abn/a (Labn;)Ljava/net/URL; net/minecraft/src/PlayerUsageSnooper/func_52013_a (Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/net/URL;
+MD: abn/a (Ljava/lang/String;Ljava/lang/Object;)V net/minecraft/src/PlayerUsageSnooper/func_52014_a (Ljava/lang/String;Ljava/lang/Object;)V
+MD: abn/b (Labn;)Ljava/util/Map; net/minecraft/src/PlayerUsageSnooper/func_52011_b (Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/util/Map;
+MD: abo/run ()V net/minecraft/src/PlayerUsageSnooperThread/run ()V
 MD: ac/b (I)I net/minecraft/src/BlockDirectional/func_48132_b (I)I
 MD: ad/a (Ljb;)V net/minecraft/src/RecipesArmor/func_20172_a (Lnet/minecraft/src/CraftingManager;)V
 MD: ae/a ()Z net/minecraft/src/EntityAIOcelotSit/func_46090_a ()Z
@ -4867,6 +4883,7 @@ MD: gq/c ()Lfj; net/minecraft/src/SaveHandler/func_22096_c ()Lnet/minecraft/src/
 MD: gq/d ()Ljv; net/minecraft/src/SaveHandler/func_22090_d ()Lnet/minecraft/src/IPlayerFileData;
 MD: gq/e ()V net/minecraft/src/SaveHandler/func_22093_e ()V
 MD: gq/f ()V net/minecraft/src/SaveHandler/func_22098_f ()V
+MD: gq/g ()[Ljava/lang/String; net/minecraft/src/SaveHandler/func_52007_g ()[Ljava/lang/String;
 MD: gr/a (Lge;Ljava/util/Random;III)Z net/minecraft/src/WorldGenMinable/func_419_a (Lnet/minecraft/src/World;Ljava/util/Random;III)Z
 MD: gs/a ()Z net/minecraft/src/EntityAIOwnerHurtByTarget/func_46090_a ()Z
 MD: gs/c ()V net/minecraft/src/EntityAIOwnerHurtByTarget/func_46088_e ()V
@ -5444,6 +5461,8 @@ MD: jg/p ()V net/minecraft/src/ServerConfigurationManager/func_9249_i ()V
 MD: jg/q ()V net/minecraft/src/ServerConfigurationManager/func_9239_j ()V
 MD: jg/r ()V net/minecraft/src/ServerConfigurationManager/func_22168_m ()V
 MD: jg/s ()V net/minecraft/src/ServerConfigurationManager/func_22160_n ()V
+MD: jg/t ()[Ljava/lang/String; net/minecraft/src/ServerConfigurationManager/func_52019_t ()[Ljava/lang/String;
+MD: jg/u ()V net/minecraft/src/ServerConfigurationManager/func_52018_u ()V
 MD: jh/a ()I net/minecraft/src/Packet16BlockItemSwitch/func_71_a ()I
 MD: jh/a (Ljava/io/DataInputStream;)V net/minecraft/src/Packet16BlockItemSwitch/func_70_a (Ljava/io/DataInputStream;)V
 MD: jh/a (Ljava/io/DataOutputStream;)V net/minecraft/src/Packet16BlockItemSwitch/func_68_a (Ljava/io/DataOutputStream;)V
@ -5485,6 +5504,7 @@ MD: js/toString ()Ljava/lang/String; net/minecraft/src/NBTTagIntArray/toString (
 MD: jt/a (Lkp;Lih;Lge;IIII)Z net/minecraft/src/ItemRedstone/func_78_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIII)Z
 MD: jv/a (Lih;)V net/minecraft/src/IPlayerFileData/func_726_a (Lnet/minecraft/src/EntityPlayer;)V
 MD: jv/b (Lih;)V net/minecraft/src/IPlayerFileData/func_725_b (Lnet/minecraft/src/EntityPlayer;)V
+MD: jv/g ()[Ljava/lang/String; net/minecraft/src/IPlayerFileData/func_52007_g ()[Ljava/lang/String;
 MD: jw/a ()I net/minecraft/src/Packet10Flying/func_71_a ()I
 MD: jw/a (Ljava/io/DataInputStream;)V net/minecraft/src/Packet10Flying/func_70_a (Ljava/io/DataInputStream;)V
 MD: jw/a (Ljava/io/DataOutputStream;)V net/minecraft/src/Packet10Flying/func_68_a (Ljava/io/DataOutputStream;)V
@ -6278,6 +6298,7 @@ MD: net/minecraft/server/MinecraftServer/e (Ljava/lang/String;)V net/minecraft/s
 MD: net/minecraft/server/MinecraftServer/f ()Ljava/lang/String; net/minecraft/server/MinecraftServer/func_40009_f ()Ljava/lang/String;
 MD: net/minecraft/server/MinecraftServer/f (Ljava/lang/String;)V net/minecraft/server/MinecraftServer/func_40006_f (Ljava/lang/String;)V
 MD: net/minecraft/server/MinecraftServer/g ()I net/minecraft/server/MinecraftServer/func_40022_g ()I
+MD: net/minecraft/server/MinecraftServer/getServerModName ()Ljava/lang/String; net/minecraft/server/MinecraftServer/func_52003_getServerModName ()Ljava/lang/String;
 MD: net/minecraft/server/MinecraftServer/h ()Ljava/lang/String; net/minecraft/server/MinecraftServer/func_40014_h ()Ljava/lang/String;
 MD: net/minecraft/server/MinecraftServer/i ()Ljava/lang/String; net/minecraft/server/MinecraftServer/func_40012_i ()Ljava/lang/String;
 MD: net/minecraft/server/MinecraftServer/j ()I net/minecraft/server/MinecraftServer/func_40018_j ()I
@ -7189,6 +7210,7 @@ MD: tr/a (Lih;)Z net/minecraft/src/TileEntityFurnace/func_20067_a_ (Lnet/minecra
 MD: tr/a (Lkp;)I net/minecraft/src/TileEntityFurnace/func_194_a (Lnet/minecraft/src/ItemStack;)I
 MD: tr/a (Lph;)V net/minecraft/src/TileEntityFurnace/func_186_a (Lnet/minecraft/src/NBTTagCompound;)V
 MD: tr/b (I)Lkp; net/minecraft/src/TileEntityFurnace/func_48315_b (I)Lnet/minecraft/src/ItemStack;
+MD: tr/b (Lkp;)Z net/minecraft/src/TileEntityFurnace/func_52006_b (Lnet/minecraft/src/ItemStack;)Z
 MD: tr/b (Lph;)V net/minecraft/src/TileEntityFurnace/func_188_b (Lnet/minecraft/src/NBTTagCompound;)V
 MD: tr/c ()I net/minecraft/src/TileEntityFurnace/func_83_a ()I
 MD: tr/e ()Ljava/lang/String; net/minecraft/src/TileEntityFurnace/func_20068_b ()Ljava/lang/String;
--- a/forge/conf/version.cfg
+++ b/forge/conf/version.cfg
@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 6.1
-ClientVersion = 1.2.4
-ServerVersion = 1.2.4
+MCPVersion = 6.2
+ClientVersion = 1.2.5
+ServerVersion = 1.2.5