diff --git a/fml/conf/joined.exc b/fml/conf/joined.exc index fa40dc7194..2904ea655d 100644 --- a/fml/conf/joined.exc +++ b/fml/conf/joined.exc @@ -267,23 +267,23 @@ net/minecraft/src/BehaviorDefaultDispenseItem.func_82486_a(Lnet/minecraft/src/Wo net/minecraft/src/BehaviorDefaultDispenseItem.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82488_a(Lnet/minecraft/src/EnumFacing;)I=|p_82488_1_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82489_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/EnumFacing;)V=|p_82489_1_,p_82489_2_ -net/minecraft/src/BehaviorDispenseBoat.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5007_1_ +net/minecraft/src/BehaviorDispenseBoat.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5049_1_ net/minecraft/src/BehaviorDispenseBoat.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDispenseBoat.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorDispenseFireball.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5019_1_ +net/minecraft/src/BehaviorDispenseFireball.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5047_1_ net/minecraft/src/BehaviorDispenseFireball.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDispenseFireball.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ net/minecraft/src/BehaviorDispenseItemProvider.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_ -net/minecraft/src/BehaviorDispenseMinecart.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5010_1_ +net/minecraft/src/BehaviorDispenseMinecart.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5048_1_ net/minecraft/src/BehaviorDispenseMinecart.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDispenseMinecart.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorEggDispense.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5011_1_ +net/minecraft/src/BehaviorEggDispense.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5044_1_ net/minecraft/src/BehaviorEggDispense.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_ -net/minecraft/src/BehaviorMinecraftServer_10.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5006_1_ +net/minecraft/src/BehaviorMinecraftServer_10.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5036_1_ net/minecraft/src/BehaviorMinecraftServer_10.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorMinecraftServer_11.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5014_1_ +net/minecraft/src/BehaviorMinecraftServer_11.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5037_1_ net/minecraft/src/BehaviorMinecraftServer_11.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorPotionDispense.(Lnet/minecraft/src/CallableServerProfiler;Lnet/minecraft/src/ItemStack;)V=|p_i5015_1_,p_i5015_2_ +net/minecraft/src/BehaviorPotionDispense.(Lnet/minecraft/src/CallableServerProfiler;Lnet/minecraft/src/ItemStack;)V=|p_i5046_1_,p_i5046_2_ net/minecraft/src/BehaviorPotionDispense.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_ net/minecraft/src/BehaviorProjectileDispense.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorProjectileDispense.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ @@ -405,7 +405,7 @@ net/minecraft/src/Block.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_, net/minecraft/src/Block.func_71932_i(I)Z=|p_71932_0_ net/minecraft/src/Block.func_71934_m(Lnet/minecraft/src/World;III)F=|p_71934_1_,p_71934_2_,p_71934_3_,p_71934_4_ net/minecraft/src/Block.func_71936_b(Lnet/minecraft/src/Vec3;)Z=|p_71936_1_ -net/minecraft/src/BlockAnvil.(I)V=|p_i5029_1_ +net/minecraft/src/BlockAnvil.(I)V=|p_i5098_1_ net/minecraft/src/BlockAnvil.func_71851_a(I)I=|p_71851_1_ net/minecraft/src/BlockAnvil.func_71858_a(II)I=|p_71858_1_,p_71858_2_ net/minecraft/src/BlockAnvil.func_71860_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityLiving;)V=|p_71860_1_,p_71860_2_,p_71860_3_,p_71860_4_,p_71860_5_ @@ -414,7 +414,7 @@ net/minecraft/src/BlockAnvil.func_71899_b(I)I=|p_71899_1_ net/minecraft/src/BlockAnvil.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_ net/minecraft/src/BlockAnvil.func_82519_a_(Lnet/minecraft/src/World;IIII)V=|p_82519_1_,p_82519_2_,p_82519_3_,p_82519_4_,p_82519_5_ net/minecraft/src/BlockAnvil.func_82520_a(Lnet/minecraft/src/EntityFallingSand;)V=|p_82520_1_ -net/minecraft/src/BlockBeacon.(I)V=|p_i5028_1_ +net/minecraft/src/BlockBeacon.(I)V=|p_i5099_1_ net/minecraft/src/BlockBeacon.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_ net/minecraft/src/BlockBeacon.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_ net/minecraft/src/BlockBed.(I)V=|p_i3919_1_ @@ -443,7 +443,7 @@ net/minecraft/src/BlockBrewingStand.func_71885_a(ILjava/util/Random;I)I=|p_71885 net/minecraft/src/BlockBrewingStand.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_ net/minecraft/src/BlockBrewingStand.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_ net/minecraft/src/BlockBrewingStand.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_ -net/minecraft/src/BlockButton.(IIZ)V=|p_i5030_1_,p_i5030_2_,p_i5030_3_ +net/minecraft/src/BlockButton.(IIZ)V=|p_i5100_1_,p_i5100_2_,p_i5100_3_ net/minecraft/src/BlockButton.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_ net/minecraft/src/BlockButton.func_71850_a_(Lnet/minecraft/src/World;IIII)Z=|p_71850_1_,p_71850_2_,p_71850_3_,p_71850_4_,p_71850_5_ net/minecraft/src/BlockButton.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ @@ -486,7 +486,7 @@ net/minecraft/src/BlockCake.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922 net/minecraft/src/BlockCake.func_71925_a(Ljava/util/Random;)I=|p_71925_1_ net/minecraft/src/BlockCake.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_ net/minecraft/src/BlockCake.func_72259_b(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_72259_1_,p_72259_2_,p_72259_3_,p_72259_4_,p_72259_5_ -net/minecraft/src/BlockCarrot.(I)V=|p_i5032_1_ +net/minecraft/src/BlockCarrot.(I)V=|p_i5101_1_ net/minecraft/src/BlockCarrot.func_71858_a(II)I=|p_71858_1_,p_71858_2_ net/minecraft/src/BlockCauldron.(I)V=|p_i3927_1_ net/minecraft/src/BlockCauldron.func_71858_a(II)I=|p_71858_1_,p_71858_2_ @@ -529,7 +529,7 @@ net/minecraft/src/BlockCocoa.func_71911_a_(Lnet/minecraft/src/World;III)Lnet/min net/minecraft/src/BlockCocoa.func_71914_a(Lnet/minecraft/src/World;IIIIFI)V=|p_71914_1_,p_71914_2_,p_71914_3_,p_71914_4_,p_71914_5_,p_71914_6_,p_71914_7_ net/minecraft/src/BlockCocoa.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_ net/minecraft/src/BlockCocoa.func_72219_c(I)I=|p_72219_0_ -net/minecraft/src/BlockCommandBlock.(I)V=|p_i5027_1_ +net/minecraft/src/BlockCommandBlock.(I)V=|p_i5102_1_ net/minecraft/src/BlockCommandBlock.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_ net/minecraft/src/BlockCommandBlock.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_ net/minecraft/src/BlockCommandBlock.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_ @@ -684,7 +684,7 @@ net/minecraft/src/BlockFlower.func_71872_e(Lnet/minecraft/src/World;III)Lnet/min net/minecraft/src/BlockFlower.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_ net/minecraft/src/BlockFlower.func_72262_c(Lnet/minecraft/src/World;III)V=|p_72262_1_,p_72262_2_,p_72262_3_,p_72262_4_ net/minecraft/src/BlockFlower.func_72263_d_(I)Z=|p_72263_1_ -net/minecraft/src/BlockFlowerPot.(I)V=|p_i5034_1_ +net/minecraft/src/BlockFlowerPot.(I)V=|p_i5103_1_ net/minecraft/src/BlockFlowerPot.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_ net/minecraft/src/BlockFlowerPot.func_71873_h(Lnet/minecraft/src/World;III)I=|p_71873_1_,p_71873_2_,p_71873_3_,p_71873_4_ net/minecraft/src/BlockFlowerPot.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71885_2_,p_71885_3_ @@ -958,7 +958,7 @@ net/minecraft/src/BlockPortal.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V net/minecraft/src/BlockPortal.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_ net/minecraft/src/BlockPortal.func_71925_a(Ljava/util/Random;)I=|p_71925_1_ net/minecraft/src/BlockPortal.func_72246_i_(Lnet/minecraft/src/World;III)Z=|p_72246_1_,p_72246_2_,p_72246_3_,p_72246_4_ -net/minecraft/src/BlockPotato.(I)V=|p_i5025_1_ +net/minecraft/src/BlockPotato.(I)V=|p_i5105_1_ net/minecraft/src/BlockPotato.func_71858_a(II)I=|p_71858_1_,p_71858_2_ net/minecraft/src/BlockPotato.func_71914_a(Lnet/minecraft/src/World;IIIIFI)V=|p_71914_1_,p_71914_2_,p_71914_3_,p_71914_4_,p_71914_5_,p_71914_6_,p_71914_7_ net/minecraft/src/BlockPressurePlate.(IILnet/minecraft/src/EnumMobType;Lnet/minecraft/src/Material;)V=|p_i3981_1_,p_i3981_2_,p_i3981_3_,p_i3981_4_ @@ -1075,7 +1075,7 @@ net/minecraft/src/BlockReed.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922 net/minecraft/src/BlockReed.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_ net/minecraft/src/BlockReed.func_72167_k_(Lnet/minecraft/src/World;III)V=|p_72167_1_,p_72167_2_,p_72167_3_,p_72167_4_ net/minecraft/src/BlockSand.(II)V=|p_i3991_1_,p_i3991_2_ -net/minecraft/src/BlockSand.(IILnet/minecraft/src/Material;)V=|p_i5026_1_,p_i5026_2_,p_i5026_3_ +net/minecraft/src/BlockSand.(IILnet/minecraft/src/Material;)V=|p_i5104_1_,p_i5104_2_,p_i5104_3_ net/minecraft/src/BlockSand.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_ net/minecraft/src/BlockSand.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_ net/minecraft/src/BlockSand.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_ @@ -1113,7 +1113,7 @@ net/minecraft/src/BlockSilverfish.func_71898_d(Lnet/minecraft/src/World;IIII)V=| net/minecraft/src/BlockSilverfish.func_71925_a(Ljava/util/Random;)I=|p_71925_1_ net/minecraft/src/BlockSilverfish.func_72153_f(I)I=|p_72153_0_ net/minecraft/src/BlockSilverfish.func_72154_e(I)Z=|p_72154_0_ -net/minecraft/src/BlockSkull.(I)V=|p_i5033_1_ +net/minecraft/src/BlockSkull.(I)V=|p_i5106_1_ net/minecraft/src/BlockSkull.func_71846_a(Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityPlayer;)V=|p_71846_1_,p_71846_2_,p_71846_3_,p_71846_4_,p_71846_5_,p_71846_6_ net/minecraft/src/BlockSkull.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ net/minecraft/src/BlockSkull.func_71860_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityLiving;)V=|p_71860_1_,p_71860_2_,p_71860_3_,p_71860_4_,p_71860_5_ @@ -1145,7 +1145,7 @@ net/minecraft/src/BlockSnowBlock.func_71925_a(Ljava/util/Random;)I=|p_71925_1_ net/minecraft/src/BlockSoulSand.(II)V=|p_i3956_1_,p_i3956_2_ net/minecraft/src/BlockSoulSand.func_71869_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/Entity;)V=|p_71869_1_,p_71869_2_,p_71869_3_,p_71869_4_,p_71869_5_ net/minecraft/src/BlockSoulSand.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_ -net/minecraft/src/BlockSourceImpl.(Lnet/minecraft/src/World;III)V=|p_i5020_1_,p_i5020_2_,p_i5020_3_,p_i5020_4_ +net/minecraft/src/BlockSourceImpl.(Lnet/minecraft/src/World;III)V=|p_i5025_1_,p_i5025_2_,p_i5025_3_,p_i5025_4_ net/minecraft/src/BlockSponge.(I)V=|p_i3996_1_ net/minecraft/src/BlockStairs.(ILnet/minecraft/src/Block;I)V=|p_i3997_1_,p_i3997_2_,p_i3997_3_ net/minecraft/src/BlockStairs.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_ @@ -1296,7 +1296,7 @@ net/minecraft/src/BlockVine.func_71920_b(Lnet/minecraft/src/IBlockAccess;III)I=| net/minecraft/src/BlockVine.func_71925_a(Ljava/util/Random;)I=|p_71925_1_ net/minecraft/src/BlockVine.func_72150_l(Lnet/minecraft/src/World;III)Z=|p_72150_1_,p_72150_2_,p_72150_3_,p_72150_4_ net/minecraft/src/BlockVine.func_72151_e(I)Z=|p_72151_1_ -net/minecraft/src/BlockWall.(ILnet/minecraft/src/Block;)V=|p_i5035_1_,p_i5035_2_ +net/minecraft/src/BlockWall.(ILnet/minecraft/src/Block;)V=|p_i5108_1_,p_i5108_2_ net/minecraft/src/BlockWall.func_71858_a(II)I=|p_71858_1_,p_71858_2_ net/minecraft/src/BlockWall.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_ net/minecraft/src/BlockWall.func_71879_a(ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V=|p_71879_1_,p_71879_2_,p_71879_3_ @@ -1342,8 +1342,8 @@ net/minecraft/src/CallableMemoryInfo.(Lnet/minecraft/src/CrashReport;)V=|p net/minecraft/src/CallableMemoryStats.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5009_1_ net/minecraft/src/CallableMemoryStats.call()Ljava/lang/Object;=| net/minecraft/src/CallableMemoryStats.func_82551_a()Ljava/lang/String;=| -net/minecraft/src/CallableMinecraftServer_16.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5018_1_ -net/minecraft/src/CallableMinecraftServer_18.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5008_1_ +net/minecraft/src/CallableMinecraftServer_16.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5041_1_ +net/minecraft/src/CallableMinecraftServer_18.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5043_1_ net/minecraft/src/CallableMinecraftVersion.(Lnet/minecraft/src/CrashReport;)V=|p_i3244_1_ net/minecraft/src/CallableModded.(Lnet/minecraft/client/Minecraft;)V=|p_i3006_1_ net/minecraft/src/CallableOSInfo.(Lnet/minecraft/src/CrashReport;)V=|p_i3245_1_ @@ -1353,13 +1353,13 @@ net/minecraft/src/CallablePlayers.func_82487_b(Lnet/minecraft/src/IBlockSource;L net/minecraft/src/CallableServerMemoryStats.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5042_1_ net/minecraft/src/CallableServerProfiler.(Lnet/minecraft/server/MinecraftServer;)V=|p_i3373_1_ net/minecraft/src/CallableServerProfiler.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_ -net/minecraft/src/CallableTagCompound1.(Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i5000_1_,p_i5000_2_ -net/minecraft/src/CallableTagCompound2.(Lnet/minecraft/src/NBTTagCompound;I)V=|p_i5001_1_,p_i5001_2_ +net/minecraft/src/CallableTagCompound1.(Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i5029_1_,p_i5029_2_ +net/minecraft/src/CallableTagCompound2.(Lnet/minecraft/src/NBTTagCompound;I)V=|p_i5030_1_,p_i5030_2_ net/minecraft/src/CallableTexturePack.(Lnet/minecraft/client/Minecraft;)V=|p_i3012_1_ net/minecraft/src/CallableType.(Lnet/minecraft/src/DedicatedServer;)V=|p_i3381_1_ net/minecraft/src/CallableType2.(Lnet/minecraft/client/Minecraft;)V=|p_i3007_1_ net/minecraft/src/CallableType3.(Lnet/minecraft/src/IntegratedServer;)V=|p_i3120_1_ -net/minecraft/src/CallableVanilla.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5005_1_ +net/minecraft/src/CallableVanilla.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5040_1_ net/minecraft/src/CanvasCrashReport.(I)V=|p_i3008_1_ net/minecraft/src/CanvasMinecraftApplet.(Lnet/minecraft/client/MinecraftApplet;)V=|p_i3020_1_ net/minecraft/src/CanvasMojangLogo.paint(Ljava/awt/Graphics;)V=|p_paint_1_ @@ -1461,7 +1461,7 @@ net/minecraft/src/ChunkProviderEnd.func_73187_a([DIIIIII)[D=|p_73187_1_,p_73187_ net/minecraft/src/ChunkProviderEnd.func_73188_b(II[B[Lnet/minecraft/src/BiomeGenBase;)V=|p_73188_1_,p_73188_2_,p_73188_3_,p_73188_4_ net/minecraft/src/ChunkProviderEnd.func_73189_a(II[B[Lnet/minecraft/src/BiomeGenBase;)V=|p_73189_1_,p_73189_2_,p_73189_3_,p_73189_4_ net/minecraft/src/ChunkProviderEnd.func_82695_e(II)V=|p_82695_1_,p_82695_2_ -net/minecraft/src/ChunkProviderFlat.(Lnet/minecraft/src/World;JZLjava/lang/String;)V=|p_i5036_1_,p_i5036_2_,p_i5036_4_,p_i5036_5_ +net/minecraft/src/ChunkProviderFlat.(Lnet/minecraft/src/World;JZLjava/lang/String;)V=|p_i5090_1_,p_i5090_2_,p_i5090_4_,p_i5090_5_ net/minecraft/src/ChunkProviderFlat.func_73149_a(II)Z=|p_73149_1_,p_73149_2_ net/minecraft/src/ChunkProviderFlat.func_73150_a(Lnet/minecraft/src/World;Ljava/lang/String;III)Lnet/minecraft/src/ChunkPosition;=|p_73150_1_,p_73150_2_,p_73150_3_,p_73150_4_,p_73150_5_ net/minecraft/src/ChunkProviderFlat.func_73151_a(ZLnet/minecraft/src/IProgressUpdate;)Z=|p_73151_1_,p_73151_2_ @@ -1732,7 +1732,7 @@ net/minecraft/src/ComponentScatteredFeatureDesertPyramid.(Ljava/util/Rando net/minecraft/src/ComponentScatteredFeatureDesertPyramid.func_74875_a(Lnet/minecraft/src/World;Ljava/util/Random;Lnet/minecraft/src/StructureBoundingBox;)Z=|p_74875_1_,p_74875_2_,p_74875_3_ net/minecraft/src/ComponentScatteredFeatureJunglePyramid.(Ljava/util/Random;II)V=|p_i3835_1_,p_i3835_2_,p_i3835_3_ net/minecraft/src/ComponentScatteredFeatureJunglePyramid.func_74875_a(Lnet/minecraft/src/World;Ljava/util/Random;Lnet/minecraft/src/StructureBoundingBox;)Z=|p_74875_1_,p_74875_2_,p_74875_3_ -net/minecraft/src/ComponentScatteredFeatureSwampHut.(Ljava/util/Random;II)V=|p_i5041_1_,p_i5041_2_,p_i5041_3_ +net/minecraft/src/ComponentScatteredFeatureSwampHut.(Ljava/util/Random;II)V=|p_i5095_1_,p_i5095_2_,p_i5095_3_ net/minecraft/src/ComponentScatteredFeatureSwampHut.func_74875_a(Lnet/minecraft/src/World;Ljava/util/Random;Lnet/minecraft/src/StructureBoundingBox;)Z=|p_74875_1_,p_74875_2_,p_74875_3_ net/minecraft/src/ComponentStronghold.(I)V=|p_i3856_1_ net/minecraft/src/ComponentStronghold.func_74986_a(Lnet/minecraft/src/ComponentStrongholdStairs2;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/src/StructureComponent;=|p_74986_1_,p_74986_2_,p_74986_3_,p_74986_4_,p_74986_5_ @@ -1872,7 +1872,7 @@ net/minecraft/src/Container.func_75146_a(Lnet/minecraft/src/Slot;)Lnet/minecraft net/minecraft/src/Container.func_75147_a(Lnet/minecraft/src/IInventory;I)Lnet/minecraft/src/Slot;=|p_75147_1_,p_75147_2_ net/minecraft/src/Container.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_ net/minecraft/src/Container.func_82847_b(Lnet/minecraft/src/ICrafting;)V=|p_82847_1_ -net/minecraft/src/ContainerBeacon.(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/TileEntityBeacon;)V=|p_i5073_1_,p_i5073_2_ +net/minecraft/src/ContainerBeacon.(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/TileEntityBeacon;)V=|p_i5076_1_,p_i5076_2_ net/minecraft/src/ContainerBeacon.func_75132_a(Lnet/minecraft/src/ICrafting;)V=|p_75132_1_ net/minecraft/src/ContainerBeacon.func_75137_b(II)V=|p_75137_1_,p_75137_2_ net/minecraft/src/ContainerBeacon.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_ @@ -1915,12 +1915,12 @@ net/minecraft/src/ContainerMerchant.func_75137_b(II)V=|p_75137_1_,p_75137_2_ net/minecraft/src/ContainerMerchant.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_ net/minecraft/src/ContainerMerchant.func_75175_c(I)V=|p_75175_1_ net/minecraft/src/ContainerMerchant.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_ -net/minecraft/src/ContainerPlayer.(Lnet/minecraft/src/InventoryPlayer;ZLnet/minecraft/src/EntityPlayer;)V=|p_i5074_1_,p_i5074_2_,p_i5074_3_ +net/minecraft/src/ContainerPlayer.(Lnet/minecraft/src/InventoryPlayer;ZLnet/minecraft/src/EntityPlayer;)V=|p_i5077_1_,p_i5077_2_,p_i5077_3_ net/minecraft/src/ContainerPlayer.func_75130_a(Lnet/minecraft/src/IInventory;)V=|p_75130_1_ net/minecraft/src/ContainerPlayer.func_75134_a(Lnet/minecraft/src/EntityPlayer;)V=|p_75134_1_ net/minecraft/src/ContainerPlayer.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_ net/minecraft/src/ContainerPlayer.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_ -net/minecraft/src/ContainerRepair.(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_i5077_1_,p_i5077_2_,p_i5077_3_,p_i5077_4_,p_i5077_5_,p_i5077_6_ +net/minecraft/src/ContainerRepair.(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_i5080_1_,p_i5080_2_,p_i5080_3_,p_i5080_4_,p_i5080_5_,p_i5080_6_ net/minecraft/src/ContainerRepair.func_75130_a(Lnet/minecraft/src/IInventory;)V=|p_75130_1_ net/minecraft/src/ContainerRepair.func_75132_a(Lnet/minecraft/src/ICrafting;)V=|p_75132_1_ net/minecraft/src/ContainerRepair.func_75134_a(Lnet/minecraft/src/EntityPlayer;)V=|p_75134_1_ @@ -1937,7 +1937,7 @@ net/minecraft/src/ContainerWorkbench.func_75145_c(Lnet/minecraft/src/EntityPlaye net/minecraft/src/ContainerWorkbench.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_ net/minecraft/src/ConvertProgressUpdater.(Lnet/minecraft/server/MinecraftServer;)V=|p_i3370_1_ net/minecraft/src/ConvertProgressUpdater.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_ -net/minecraft/src/ConvertingProgressUpdate.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5017_1_ +net/minecraft/src/ConvertingProgressUpdate.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5038_1_ net/minecraft/src/ConvertingProgressUpdate.func_73718_a(I)V=|p_73718_1_ net/minecraft/src/ConvertingProgressUpdate.func_73719_c(Ljava/lang/String;)V=|p_73719_1_ net/minecraft/src/ConvertingProgressUpdate.func_73720_a(Ljava/lang/String;)V=|p_73720_1_ @@ -2232,7 +2232,7 @@ net/minecraft/src/Entity.func_82141_a(Lnet/minecraft/src/Entity;Z)V=|p_82141_1_, net/minecraft/src/Entity.func_82142_c(Z)V=|p_82142_1_ net/minecraft/src/Entity.func_82146_a(Lnet/minecraft/src/Explosion;Lnet/minecraft/src/Block;III)F=|p_82146_1_,p_82146_2_,p_82146_3_,p_82146_4_,p_82146_5_ net/minecraft/src/Entity.func_82149_j(Lnet/minecraft/src/Entity;)V=|p_82149_1_ -net/minecraft/src/EntityAIArrowAttack.(Lnet/minecraft/src/IRangedAttackMob;FIF)V=|p_i5068_1_,p_i5068_2_,p_i5068_3_,p_i5068_4_ +net/minecraft/src/EntityAIArrowAttack.(Lnet/minecraft/src/IRangedAttackMob;FIF)V=|p_i5059_1_,p_i5059_2_,p_i5059_3_,p_i5059_4_ net/minecraft/src/EntityAIAttackOnCollide.(Lnet/minecraft/src/EntityLiving;FZ)V=|p_i3477_1_,p_i3477_2_,p_i3477_3_ net/minecraft/src/EntityAIAttackOnCollide.(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FZ)V=|p_i3476_1_,p_i3476_2_,p_i3476_3_,p_i3476_4_ net/minecraft/src/EntityAIAvoidEntity.(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;FFF)V=|p_i3458_1_,p_i3458_2_,p_i3458_3_,p_i3458_4_,p_i3458_5_ @@ -2240,7 +2240,7 @@ net/minecraft/src/EntityAIBase.func_75248_a(I)V=|p_75248_1_ net/minecraft/src/EntityAIBeg.(Lnet/minecraft/src/EntityWolf;F)V=|p_i3459_1_,p_i3459_2_ net/minecraft/src/EntityAIBeg.func_75382_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_75382_1_ net/minecraft/src/EntityAIBreakDoor.(Lnet/minecraft/src/EntityLiving;)V=|p_i3460_1_ -net/minecraft/src/EntityAIControlledByPlayer.(Lnet/minecraft/src/EntityLiving;F)V=|p_i5069_1_,p_i5069_2_ +net/minecraft/src/EntityAIControlledByPlayer.(Lnet/minecraft/src/EntityLiving;F)V=|p_i5058_1_,p_i5058_2_ net/minecraft/src/EntityAICreeperSwell.(Lnet/minecraft/src/EntityCreeper;)V=|p_i3493_1_ net/minecraft/src/EntityAIDefendVillage.(Lnet/minecraft/src/EntityIronGolem;)V=|p_i3497_1_ net/minecraft/src/EntityAIDoorInteract.(Lnet/minecraft/src/EntityLiving;)V=|p_i3462_1_ @@ -2264,7 +2264,7 @@ net/minecraft/src/EntityAIMoveTowardsTarget.(Lnet/minecraft/src/EntityCrea net/minecraft/src/EntityAIMoveTwardsRestriction.(Lnet/minecraft/src/EntityCreature;F)V=|p_i3480_1_,p_i3480_2_ net/minecraft/src/EntityAINearestAttackableTarget.(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FIZ)V=|p_i3500_1_,p_i3500_2_,p_i3500_3_,p_i3500_4_,p_i3500_5_ net/minecraft/src/EntityAINearestAttackableTarget.(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FIZZ)V=|p_i3501_1_,p_i3501_2_,p_i3501_3_,p_i3501_4_,p_i3501_5_,p_i3501_6_ -net/minecraft/src/EntityAINearestAttackableTarget.(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FIZZLnet/minecraft/src/EntitySelector;)V=|p_i5070_1_,p_i5070_2_,p_i5070_3_,p_i5070_4_,p_i5070_5_,p_i5070_6_,p_i5070_7_ +net/minecraft/src/EntityAINearestAttackableTarget.(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FIZZLnet/minecraft/src/EntitySelector;)V=|p_i5060_1_,p_i5060_2_,p_i5060_3_,p_i5060_4_,p_i5060_5_,p_i5060_6_,p_i5060_7_ net/minecraft/src/EntityAINearestAttackableTargetSorter.(Lnet/minecraft/src/EntityAINearestAttackableTarget;Lnet/minecraft/src/Entity;)V=|p_i3499_1_,p_i3499_2_ net/minecraft/src/EntityAINearestAttackableTargetSorter.compare(Ljava/lang/Object;Ljava/lang/Object;)I=|p_compare_1_,p_compare_2_ net/minecraft/src/EntityAINearestAttackableTargetSorter.func_75458_a(Lnet/minecraft/src/Entity;Lnet/minecraft/src/Entity;)I=|p_75458_1_,p_75458_2_ @@ -2303,7 +2303,7 @@ net/minecraft/src/EntityAgeable.(Lnet/minecraft/src/World;)V=|p_i3436_1_ net/minecraft/src/EntityAgeable.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityAgeable.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ net/minecraft/src/EntityAgeable.func_70873_a(I)V=|p_70873_1_ -net/minecraft/src/EntityAmbientCreature.(Lnet/minecraft/src/World;)V=|p_i5059_1_ +net/minecraft/src/EntityAmbientCreature.(Lnet/minecraft/src/World;)V=|p_i5062_1_ net/minecraft/src/EntityAnimal.(Lnet/minecraft/src/World;)V=|p_i3514_1_ net/minecraft/src/EntityAnimal.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityAnimal.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ @@ -2329,7 +2329,7 @@ net/minecraft/src/EntityArrow.func_70240_a(I)V=|p_70240_1_ net/minecraft/src/EntityArrow.func_70243_d(Z)V=|p_70243_1_ net/minecraft/src/EntityArrow.func_70244_c(DDDFF)V=|p_70244_1_,p_70244_3_,p_70244_5_,p_70244_7_,p_70244_8_ net/minecraft/src/EntityAuraFX.(Lnet/minecraft/src/World;DDDDDD)V=|p_i3166_1_,p_i3166_2_,p_i3166_4_,p_i3166_6_,p_i3166_8_,p_i3166_10_,p_i3166_12_ -net/minecraft/src/EntityBat.(Lnet/minecraft/src/World;)V=|p_i5058_1_ +net/minecraft/src/EntityBat.(Lnet/minecraft/src/World;)V=|p_i5063_1_ net/minecraft/src/EntityBat.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityBat.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ net/minecraft/src/EntityBat.func_70064_a(DZ)V=|p_70064_1_,p_70064_3_ @@ -2424,7 +2424,7 @@ net/minecraft/src/EntityDragon.func_70973_b(D)F=|p_70973_1_ net/minecraft/src/EntityDragon.func_70974_a(IF)[D=|p_70974_1_,p_70974_2_ net/minecraft/src/EntityDragon.func_70975_a(II)V=|p_70975_1_,p_70975_2_ net/minecraft/src/EntityDragon.func_82195_e(Lnet/minecraft/src/DamageSource;I)Z=|p_82195_1_,p_82195_2_ -net/minecraft/src/EntityDragonPart.(Lnet/minecraft/src/EntityMultiPart;Ljava/lang/String;FF)V=|p_i5071_1_,p_i5071_2_,p_i5071_3_,p_i5071_4_ +net/minecraft/src/EntityDragonPart.(Lnet/minecraft/src/EntityMultiPart;Ljava/lang/String;FF)V=|p_i5064_1_,p_i5064_2_,p_i5064_3_,p_i5064_4_ net/minecraft/src/EntityDragonPart.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityDragonPart.func_70028_i(Lnet/minecraft/src/Entity;)Z=|p_70028_1_ net/minecraft/src/EntityDragonPart.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ @@ -2528,8 +2528,8 @@ net/minecraft/src/EntityGiantZombie.func_70783_a(III)F=|p_70783_1_,p_70783_2_,p_ net/minecraft/src/EntityGiantZombie.func_82193_c(Lnet/minecraft/src/Entity;)I=|p_82193_1_ net/minecraft/src/EntityGolem.(Lnet/minecraft/src/World;)V=|p_i3517_1_ net/minecraft/src/EntityGolem.func_70069_a(F)V=|p_70069_1_ -net/minecraft/src/EntityHanging.(Lnet/minecraft/src/World;)V=|p_i5056_1_ -net/minecraft/src/EntityHanging.(Lnet/minecraft/src/World;IIII)V=|p_i5057_1_,p_i5057_2_,p_i5057_3_,p_i5057_4_,p_i5057_5_ +net/minecraft/src/EntityHanging.(Lnet/minecraft/src/World;)V=|p_i5053_1_ +net/minecraft/src/EntityHanging.(Lnet/minecraft/src/World;IIII)V=|p_i5054_1_,p_i5054_2_,p_i5054_3_,p_i5054_4_,p_i5054_5_ net/minecraft/src/EntityHanging.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityHanging.func_70024_g(DDD)V=|p_70024_1_,p_70024_3_,p_70024_5_ net/minecraft/src/EntityHanging.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ @@ -2563,8 +2563,8 @@ net/minecraft/src/EntityItem.func_70081_e(I)V=|p_70081_1_ net/minecraft/src/EntityItem.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_ net/minecraft/src/EntityItem.func_70100_b_(Lnet/minecraft/src/EntityPlayer;)V=|p_70100_1_ net/minecraft/src/EntityItem.func_70289_a(Lnet/minecraft/src/EntityItem;)Z=|p_70289_1_ -net/minecraft/src/EntityItemFrame.(Lnet/minecraft/src/World;)V=|p_i5054_1_ -net/minecraft/src/EntityItemFrame.(Lnet/minecraft/src/World;IIII)V=|p_i5055_1_,p_i5055_2_,p_i5055_3_,p_i5055_4_,p_i5055_5_ +net/minecraft/src/EntityItemFrame.(Lnet/minecraft/src/World;)V=|p_i5055_1_ +net/minecraft/src/EntityItemFrame.(Lnet/minecraft/src/World;IIII)V=|p_i5056_1_,p_i5056_2_,p_i5056_3_,p_i5056_4_,p_i5056_5_ net/minecraft/src/EntityItemFrame.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityItemFrame.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ net/minecraft/src/EntityItemFrame.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_ @@ -2575,9 +2575,9 @@ net/minecraft/src/EntityJumpHelper.(Lnet/minecraft/src/EntityLiving;)V=|p_ net/minecraft/src/EntityLargeExplodeFX.(Lnet/minecraft/src/RenderEngine;Lnet/minecraft/src/World;DDDDDD)V=|p_i3181_1_,p_i3181_2_,p_i3181_3_,p_i3181_5_,p_i3181_7_,p_i3181_9_,p_i3181_11_,p_i3181_13_ net/minecraft/src/EntityLargeExplodeFX.func_70070_b(F)I=|p_70070_1_ net/minecraft/src/EntityLargeExplodeFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_ -net/minecraft/src/EntityLargeFireball.(Lnet/minecraft/src/World;)V=|p_i5060_1_ +net/minecraft/src/EntityLargeFireball.(Lnet/minecraft/src/World;)V=|p_i5067_1_ net/minecraft/src/EntityLargeFireball.(Lnet/minecraft/src/World;DDDDDD)V=|p_i5068_1_,p_i5068_2_,p_i5068_4_,p_i5068_6_,p_i5068_8_,p_i5068_10_,p_i5068_12_ -net/minecraft/src/EntityLargeFireball.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;DDD)V=|p_i5061_1_,p_i5061_2_,p_i5061_3_,p_i5061_5_,p_i5061_7_ +net/minecraft/src/EntityLargeFireball.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;DDD)V=|p_i5069_1_,p_i5069_2_,p_i5069_3_,p_i5069_5_,p_i5069_7_ net/minecraft/src/EntityLargeFireball.func_70227_a(Lnet/minecraft/src/MovingObjectPosition;)V=|p_70227_1_ net/minecraft/src/EntityLavaFX.(Lnet/minecraft/src/World;DDD)V=|p_i3169_1_,p_i3169_2_,p_i3169_4_,p_i3169_6_ net/minecraft/src/EntityLavaFX.func_70013_c(F)F=|p_70013_1_ @@ -2884,9 +2884,9 @@ net/minecraft/src/EntityPortalFX.func_70070_b(F)I=|p_70070_1_ net/minecraft/src/EntityPortalFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_ net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;)V=|p_i3595_1_ net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;DDDI)V=|p_i3597_1_,p_i3597_2_,p_i3597_4_,p_i3597_6_,p_i3597_8_ -net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;DDDLnet/minecraft/src/ItemStack;)V=|p_i5065_1_,p_i5065_2_,p_i5065_4_,p_i5065_6_,p_i5065_8_ +net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;DDDLnet/minecraft/src/ItemStack;)V=|p_i5071_1_,p_i5071_2_,p_i5071_4_,p_i5071_6_,p_i5071_8_ net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;I)V=|p_i3596_1_,p_i3596_2_,p_i3596_3_ -net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/ItemStack;)V=|p_i5064_1_,p_i5064_2_,p_i5064_3_ +net/minecraft/src/EntityPotion.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/ItemStack;)V=|p_i5070_1_,p_i5070_2_,p_i5070_3_ net/minecraft/src/EntityPotion.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityPotion.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ net/minecraft/src/EntityPotion.func_70184_a(Lnet/minecraft/src/MovingObjectPosition;)V=|p_70184_1_ @@ -3057,7 +3057,7 @@ net/minecraft/src/EntityWitch.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_ net/minecraft/src/EntityWitch.func_70672_c(Lnet/minecraft/src/DamageSource;I)I=|p_70672_1_,p_70672_2_ net/minecraft/src/EntityWitch.func_82196_d(Lnet/minecraft/src/EntityLiving;)V=|p_82196_1_ net/minecraft/src/EntityWitch.func_82197_f(Z)V=|p_82197_1_ -net/minecraft/src/EntityWither.(Lnet/minecraft/src/World;)V=|p_i5072_1_ +net/minecraft/src/EntityWither.(Lnet/minecraft/src/World;)V=|p_i5065_1_ net/minecraft/src/EntityWither.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_ net/minecraft/src/EntityWither.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_ net/minecraft/src/EntityWither.func_70069_a(F)V=|p_70069_1_ @@ -3078,9 +3078,9 @@ net/minecraft/src/EntityWither.func_82214_u(I)D=|p_82214_1_ net/minecraft/src/EntityWither.func_82215_s(I)V=|p_82215_1_ net/minecraft/src/EntityWither.func_82216_a(ILnet/minecraft/src/EntityLiving;)V=|p_82216_1_,p_82216_2_ net/minecraft/src/EntityWitherAttackFilter.func_82704_a(Lnet/minecraft/src/Entity;)Z=|p_82704_1_ -net/minecraft/src/EntityWitherSkull.(Lnet/minecraft/src/World;)V=|p_i5062_1_ +net/minecraft/src/EntityWitherSkull.(Lnet/minecraft/src/World;)V=|p_i5072_1_ net/minecraft/src/EntityWitherSkull.(Lnet/minecraft/src/World;DDDDDD)V=|p_i5074_1_,p_i5074_2_,p_i5074_4_,p_i5074_6_,p_i5074_8_,p_i5074_10_,p_i5074_12_ -net/minecraft/src/EntityWitherSkull.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;DDD)V=|p_i5063_1_,p_i5063_2_,p_i5063_3_,p_i5063_5_,p_i5063_7_ +net/minecraft/src/EntityWitherSkull.(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;DDD)V=|p_i5073_1_,p_i5073_2_,p_i5073_3_,p_i5073_5_,p_i5073_7_ net/minecraft/src/EntityWitherSkull.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_ net/minecraft/src/EntityWitherSkull.func_70227_a(Lnet/minecraft/src/MovingObjectPosition;)V=|p_70227_1_ net/minecraft/src/EntityWitherSkull.func_82146_a(Lnet/minecraft/src/Explosion;Lnet/minecraft/src/Block;III)F=|p_82146_1_,p_82146_2_,p_82146_3_,p_82146_4_,p_82146_5_ @@ -3134,7 +3134,7 @@ net/minecraft/src/EnumArt.(Ljava/lang/String;ILjava/lang/String;IIII)V=|p_ net/minecraft/src/EnumArt.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumArt;=|p_valueOf_0_ net/minecraft/src/EnumCreatureAttribute.(Ljava/lang/String;I)V=|p_i3445_1_,p_i3445_2_ net/minecraft/src/EnumCreatureAttribute.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumCreatureAttribute;=|p_valueOf_0_ -net/minecraft/src/EnumCreatureType.(Ljava/lang/String;ILjava/lang/Class;ILnet/minecraft/src/Material;ZZ)V=|p_i5053_1_,p_i5053_2_,p_i5053_3_,p_i5053_4_,p_i5053_5_,p_i5053_6_,p_i5053_7_ +net/minecraft/src/EnumCreatureType.(Ljava/lang/String;ILjava/lang/Class;ILnet/minecraft/src/Material;ZZ)V=|p_i5057_1_,p_i5057_2_,p_i5057_3_,p_i5057_4_,p_i5057_5_,p_i5057_6_,p_i5057_7_ net/minecraft/src/EnumCreatureType.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumCreatureType;=|p_valueOf_0_ net/minecraft/src/EnumDoor.(Ljava/lang/String;I)V=|p_i3855_1_,p_i3855_2_ net/minecraft/src/EnumDoor.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumDoor;=|p_valueOf_0_ @@ -3144,7 +3144,7 @@ net/minecraft/src/EnumEnchantmentType.valueOf(Ljava/lang/String;)Lnet/minecraft/ net/minecraft/src/EnumEntitySize.(Ljava/lang/String;I)V=|p_i3437_1_,p_i3437_2_ net/minecraft/src/EnumEntitySize.func_75630_a(D)I=|p_75630_1_ net/minecraft/src/EnumEntitySize.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumEntitySize;=|p_valueOf_0_ -net/minecraft/src/EnumFacing.(Ljava/lang/String;IIIIII)V=|p_i5022_1_,p_i5022_2_,p_i5022_3_,p_i5022_4_,p_i5022_5_,p_i5022_6_,p_i5022_7_ +net/minecraft/src/EnumFacing.(Ljava/lang/String;IIIIII)V=|p_i5027_1_,p_i5027_2_,p_i5027_3_,p_i5027_4_,p_i5027_5_,p_i5027_6_,p_i5027_7_ net/minecraft/src/EnumFacing.func_82600_a(I)Lnet/minecraft/src/EnumFacing;=|p_82600_0_ net/minecraft/src/EnumFacing.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumFacing;=|p_valueOf_0_ net/minecraft/src/EnumGameType.(Ljava/lang/String;IILjava/lang/String;)V=|p_i3734_1_,p_i3734_2_,p_i3734_3_,p_i3734_4_ @@ -3190,8 +3190,8 @@ net/minecraft/src/FlatGeneratorInfo.func_82646_a(Ljava/lang/String;I)Lnet/minecr net/minecraft/src/FlatGeneratorInfo.func_82647_a(I)V=|p_82647_1_ net/minecraft/src/FlatGeneratorInfo.func_82651_a(Ljava/lang/String;)Lnet/minecraft/src/FlatGeneratorInfo;=|p_82651_0_ net/minecraft/src/FlatGeneratorInfo.func_82652_b(Ljava/lang/String;)Ljava/util/List;=|p_82652_0_ -net/minecraft/src/FlatLayerInfo.(II)V=|p_i5037_1_,p_i5037_2_ -net/minecraft/src/FlatLayerInfo.(III)V=|p_i5038_1_,p_i5038_2_,p_i5038_3_ +net/minecraft/src/FlatLayerInfo.(II)V=|p_i5091_1_,p_i5091_2_ +net/minecraft/src/FlatLayerInfo.(III)V=|p_i5092_1_,p_i5092_2_,p_i5092_3_ net/minecraft/src/FlatLayerInfo.func_82660_d(I)V=|p_82660_1_ net/minecraft/src/FontRenderer.(Lnet/minecraft/src/GameSettings;Ljava/lang/String;Lnet/minecraft/src/RenderEngine;Z)V=|p_i3067_1_,p_i3067_2_,p_i3067_3_,p_i3067_4_ net/minecraft/src/FontRenderer.func_78255_a(Ljava/lang/String;Z)V=|p_78255_1_,p_78255_2_ @@ -3241,7 +3241,7 @@ net/minecraft/src/GLAllocation.func_74526_a(I)I=|p_74526_0_ net/minecraft/src/GLAllocation.func_74527_f(I)Ljava/nio/IntBuffer;=|p_74527_0_ net/minecraft/src/GLAllocation.func_74528_a(Ljava/nio/IntBuffer;)V=|p_74528_0_ net/minecraft/src/GLAllocation.func_74529_h(I)Ljava/nio/FloatBuffer;=|p_74529_0_ -net/minecraft/src/GameRuleValue.(Ljava/lang/String;)V=|p_i5024_1_ +net/minecraft/src/GameRuleValue.(Ljava/lang/String;)V=|p_i5089_1_ net/minecraft/src/GameRuleValue.func_82757_a(Ljava/lang/String;)V=|p_82757_1_ net/minecraft/src/GameRules.func_82764_b(Ljava/lang/String;Ljava/lang/String;)V=|p_82764_1_,p_82764_2_ net/minecraft/src/GameRules.func_82765_e(Ljava/lang/String;)Z=|p_82765_1_ @@ -3891,7 +3891,7 @@ net/minecraft/src/InventoryPlayer.func_70453_c(I)V=|p_70453_1_ net/minecraft/src/InventoryPlayer.func_70454_b(Lnet/minecraft/src/Block;)Z=|p_70454_1_ net/minecraft/src/InventoryPlayer.func_70455_b(Lnet/minecraft/src/InventoryPlayer;)V=|p_70455_1_ net/minecraft/src/InventoryPlayer.func_82347_b(II)I=|p_82347_1_,p_82347_2_ -net/minecraft/src/InventoryRepair.(Lnet/minecraft/src/ContainerRepair;Ljava/lang/String;I)V=|p_i5076_1_,p_i5076_2_,p_i5076_3_ +net/minecraft/src/InventoryRepair.(Lnet/minecraft/src/ContainerRepair;Ljava/lang/String;I)V=|p_i5078_1_,p_i5078_2_,p_i5078_3_ net/minecraft/src/Item.(I)V=|p_i3659_1_ net/minecraft/src/Item.func_77613_e(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumRarity;=|p_77613_1_ net/minecraft/src/Item.func_77615_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;I)V=|p_77615_1_,p_77615_2_,p_77615_3_,p_77615_4_ @@ -3933,7 +3933,7 @@ net/minecraft/src/Item.func_77665_c(I)Lnet/minecraft/src/Item;=|p_77665_1_ net/minecraft/src/Item.func_77667_c(Lnet/minecraft/src/ItemStack;)Ljava/lang/String;=|p_77667_1_ net/minecraft/src/Item.func_82789_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/ItemStack;)Z=|p_82789_1_,p_82789_2_ net/minecraft/src/Item.func_82790_a(Lnet/minecraft/src/ItemStack;I)I=|p_82790_1_,p_82790_2_ -net/minecraft/src/ItemAnvilBlock.(Lnet/minecraft/src/Block;)V=|p_i5051_1_ +net/minecraft/src/ItemAnvilBlock.(Lnet/minecraft/src/Block;)V=|p_i5081_1_ net/minecraft/src/ItemAnvilBlock.func_77647_b(I)I=|p_77647_1_ net/minecraft/src/ItemAppleGold.(IIFZ)V=|p_i3655_1_,p_i3655_2_,p_i3655_3_,p_i3655_4_ net/minecraft/src/ItemAppleGold.func_77613_e(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumRarity;=|p_77613_1_ @@ -3973,7 +3973,7 @@ net/minecraft/src/ItemBucketMilk.func_77626_a(Lnet/minecraft/src/ItemStack;)I=|p net/minecraft/src/ItemBucketMilk.func_77654_b(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77654_1_,p_77654_2_,p_77654_3_ net/minecraft/src/ItemBucketMilk.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_ net/minecraft/src/ItemBucketMilk.func_77661_b(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumAction;=|p_77661_1_ -net/minecraft/src/ItemCarrotOnAStick.(I)V=|p_i5047_1_ +net/minecraft/src/ItemCarrotOnAStick.(I)V=|p_i5082_1_ net/minecraft/src/ItemCarrotOnAStick.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_ net/minecraft/src/ItemCloth.(I)V=|p_i3626_1_ net/minecraft/src/ItemCloth.func_77617_a(I)I=|p_77617_1_ @@ -4005,7 +4005,7 @@ net/minecraft/src/ItemEditableBook.func_77659_a(Lnet/minecraft/src/ItemStack;Lne net/minecraft/src/ItemEditableBook.func_77828_a(Lnet/minecraft/src/NBTTagCompound;)Z=|p_77828_0_ net/minecraft/src/ItemEgg.(I)V=|p_i3646_1_ net/minecraft/src/ItemEgg.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_ -net/minecraft/src/ItemEmptyMap.(I)V=|p_i5050_1_ +net/minecraft/src/ItemEmptyMap.(I)V=|p_i5083_1_ net/minecraft/src/ItemEmptyMap.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_ net/minecraft/src/ItemEnderEye.(I)V=|p_i3647_1_ net/minecraft/src/ItemEnderEye.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_ @@ -4031,7 +4031,7 @@ net/minecraft/src/ItemFood.func_77844_a(IIIF)Lnet/minecraft/src/ItemFood;=|p_778 net/minecraft/src/ItemFood.func_77849_c(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)V=|p_77849_1_,p_77849_2_,p_77849_3_ net/minecraft/src/ItemGlassBottle.(I)V=|p_i3622_1_ net/minecraft/src/ItemGlassBottle.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_ -net/minecraft/src/ItemHangingEntity.(ILjava/lang/Class;)V=|p_i5048_1_,p_i5048_2_ +net/minecraft/src/ItemHangingEntity.(ILjava/lang/Class;)V=|p_i5084_1_,p_i5084_2_ net/minecraft/src/ItemHangingEntity.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_ net/minecraft/src/ItemHangingEntity.func_82810_a(Lnet/minecraft/src/World;IIII)Lnet/minecraft/src/EntityHanging;=|p_82810_1_,p_82810_2_,p_82810_3_,p_82810_4_,p_82810_5_ net/minecraft/src/ItemHoe.(ILnet/minecraft/src/EnumToolMaterial;)V=|p_i3657_1_,p_i3657_2_ @@ -4074,7 +4074,7 @@ net/minecraft/src/ItemMonsterPlacer.func_77633_a(ILnet/minecraft/src/CreativeTab net/minecraft/src/ItemMonsterPlacer.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_ net/minecraft/src/ItemMonsterPlacer.func_77840_a(Lnet/minecraft/src/World;IDDD)Z=|p_77840_0_,p_77840_1_,p_77840_2_,p_77840_4_,p_77840_6_ net/minecraft/src/ItemMonsterPlacer.func_82790_a(Lnet/minecraft/src/ItemStack;I)I=|p_82790_1_,p_82790_2_ -net/minecraft/src/ItemMultiTextureTile.(ILnet/minecraft/src/Block;[Ljava/lang/String;)V=|p_i5044_1_,p_i5044_2_,p_i5044_3_ +net/minecraft/src/ItemMultiTextureTile.(ILnet/minecraft/src/Block;[Ljava/lang/String;)V=|p_i5085_1_,p_i5085_2_,p_i5085_3_ net/minecraft/src/ItemMultiTextureTile.func_77617_a(I)I=|p_77617_1_ net/minecraft/src/ItemMultiTextureTile.func_77647_b(I)I=|p_77647_1_ net/minecraft/src/ItemMultiTextureTile.func_77667_c(Lnet/minecraft/src/ItemStack;)Ljava/lang/String;=|p_77667_1_ @@ -4120,7 +4120,7 @@ net/minecraft/src/ItemRenderer.func_78448_c(F)V=|p_78448_1_ net/minecraft/src/ItemSaddle.(I)V=|p_i3679_1_ net/minecraft/src/ItemSaddle.func_77644_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/EntityLiving;)Z=|p_77644_1_,p_77644_2_,p_77644_3_ net/minecraft/src/ItemSaddle.func_77646_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityLiving;)Z=|p_77646_1_,p_77646_2_ -net/minecraft/src/ItemSeedFood.(IIFII)V=|p_i5045_1_,p_i5045_2_,p_i5045_3_,p_i5045_4_,p_i5045_5_ +net/minecraft/src/ItemSeedFood.(IIFII)V=|p_i5086_1_,p_i5086_2_,p_i5086_3_,p_i5086_4_,p_i5086_5_ net/minecraft/src/ItemSeedFood.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_ net/minecraft/src/ItemSeeds.(III)V=|p_i3682_1_,p_i3682_2_,p_i3682_3_ net/minecraft/src/ItemSeeds.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_ @@ -4130,9 +4130,9 @@ net/minecraft/src/ItemShears.func_77641_a(Lnet/minecraft/src/Block;)Z=|p_77641_1 net/minecraft/src/ItemShears.func_77660_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityLiving;)Z=|p_77660_1_,p_77660_2_,p_77660_3_,p_77660_4_,p_77660_5_,p_77660_6_,p_77660_7_ net/minecraft/src/ItemSign.(I)V=|p_i3685_1_ net/minecraft/src/ItemSign.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_ -net/minecraft/src/ItemSimpleFoiled.(I)V=|p_i5049_1_ +net/minecraft/src/ItemSimpleFoiled.(I)V=|p_i5087_1_ net/minecraft/src/ItemSimpleFoiled.func_77636_d(Lnet/minecraft/src/ItemStack;)Z=|p_77636_1_ -net/minecraft/src/ItemSkull.(I)V=|p_i5046_1_ +net/minecraft/src/ItemSkull.(I)V=|p_i5088_1_ net/minecraft/src/ItemSkull.func_77617_a(I)I=|p_77617_1_ net/minecraft/src/ItemSkull.func_77628_j(Lnet/minecraft/src/ItemStack;)Ljava/lang/String;=|p_77628_1_ net/minecraft/src/ItemSkull.func_77633_a(ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V=|p_77633_1_,p_77633_2_,p_77633_3_ @@ -4262,24 +4262,24 @@ net/minecraft/src/MapGenCaves.func_75042_a(JII[BDDDFFFIID)V=|p_75042_1_,p_75042_ net/minecraft/src/MapGenCavesHell.func_75037_a(Lnet/minecraft/src/World;IIII[B)V=|p_75037_1_,p_75037_2_,p_75037_3_,p_75037_4_,p_75037_5_,p_75037_6_ net/minecraft/src/MapGenCavesHell.func_75043_a(II[BDDDFFFIID)V=|p_75043_1_,p_75043_2_,p_75043_3_,p_75043_4_,p_75043_6_,p_75043_8_,p_75043_10_,p_75043_11_,p_75043_12_,p_75043_13_,p_75043_14_,p_75043_15_ net/minecraft/src/MapGenCavesHell.func_75044_a(II[BDDD)V=|p_75044_1_,p_75044_2_,p_75044_3_,p_75044_4_,p_75044_6_,p_75044_8_ -net/minecraft/src/MapGenMineshaft.(Ljava/util/Map;)V=|p_i5040_1_ +net/minecraft/src/MapGenMineshaft.(Ljava/util/Map;)V=|p_i5093_1_ net/minecraft/src/MapGenMineshaft.func_75047_a(II)Z=|p_75047_1_,p_75047_2_ net/minecraft/src/MapGenMineshaft.func_75049_b(II)Lnet/minecraft/src/StructureStart;=|p_75049_1_,p_75049_2_ net/minecraft/src/MapGenNetherBridge.func_75047_a(II)Z=|p_75047_1_,p_75047_2_ net/minecraft/src/MapGenNetherBridge.func_75049_b(II)Lnet/minecraft/src/StructureStart;=|p_75049_1_,p_75049_2_ net/minecraft/src/MapGenRavine.func_75037_a(Lnet/minecraft/src/World;IIII[B)V=|p_75037_1_,p_75037_2_,p_75037_3_,p_75037_4_,p_75037_5_,p_75037_6_ net/minecraft/src/MapGenRavine.func_75045_a(JII[BDDDFFFIID)V=|p_75045_1_,p_75045_3_,p_75045_4_,p_75045_5_,p_75045_6_,p_75045_8_,p_75045_10_,p_75045_12_,p_75045_13_,p_75045_14_,p_75045_15_,p_75045_16_,p_75045_17_ -net/minecraft/src/MapGenScatteredFeature.(Ljava/util/Map;)V=|p_i5042_1_ +net/minecraft/src/MapGenScatteredFeature.(Ljava/util/Map;)V=|p_i5094_1_ net/minecraft/src/MapGenScatteredFeature.func_75047_a(II)Z=|p_75047_1_,p_75047_2_ net/minecraft/src/MapGenScatteredFeature.func_75049_b(II)Lnet/minecraft/src/StructureStart;=|p_75049_1_,p_75049_2_ -net/minecraft/src/MapGenStronghold.(Ljava/util/Map;)V=|p_i5039_1_ +net/minecraft/src/MapGenStronghold.(Ljava/util/Map;)V=|p_i5096_1_ net/minecraft/src/MapGenStronghold.func_75047_a(II)Z=|p_75047_1_,p_75047_2_ net/minecraft/src/MapGenStronghold.func_75049_b(II)Lnet/minecraft/src/StructureStart;=|p_75049_1_,p_75049_2_ net/minecraft/src/MapGenStructure.func_75037_a(Lnet/minecraft/src/World;IIII[B)V=|p_75037_1_,p_75037_2_,p_75037_3_,p_75037_4_,p_75037_5_,p_75037_6_ net/minecraft/src/MapGenStructure.func_75048_a(III)Z=|p_75048_1_,p_75048_2_,p_75048_3_ net/minecraft/src/MapGenStructure.func_75050_a(Lnet/minecraft/src/World;III)Lnet/minecraft/src/ChunkPosition;=|p_75050_1_,p_75050_2_,p_75050_3_,p_75050_4_ net/minecraft/src/MapGenStructure.func_75051_a(Lnet/minecraft/src/World;Ljava/util/Random;II)Z=|p_75051_1_,p_75051_2_,p_75051_3_,p_75051_4_ -net/minecraft/src/MapGenVillage.(Ljava/util/Map;)V=|p_i5043_1_ +net/minecraft/src/MapGenVillage.(Ljava/util/Map;)V=|p_i5097_1_ net/minecraft/src/MapGenVillage.func_75047_a(II)Z=|p_75047_1_,p_75047_2_ net/minecraft/src/MapGenVillage.func_75049_b(II)Lnet/minecraft/src/StructureStart;=|p_75049_1_,p_75049_2_ net/minecraft/src/MapInfo.(Lnet/minecraft/src/MapData;Lnet/minecraft/src/EntityPlayer;)V=|p_i3904_1_,p_i3904_2_ @@ -5015,7 +5015,7 @@ net/minecraft/src/Packet3Chat.(Ljava/lang/String;Z)V=|p_i3301_1_,p_i3301_2 net/minecraft/src/Packet3Chat.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_ net/minecraft/src/Packet3Chat.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_ net/minecraft/src/Packet3Chat.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_ -net/minecraft/src/Packet40EntityMetadata.(ILnet/minecraft/src/DataWatcher;Z)V=|p_i5002_1_,p_i5002_2_,p_i5002_3_ +net/minecraft/src/Packet40EntityMetadata.(ILnet/minecraft/src/DataWatcher;Z)V=|p_i5034_1_,p_i5034_2_,p_i5034_3_ net/minecraft/src/Packet40EntityMetadata.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_ net/minecraft/src/Packet40EntityMetadata.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_ net/minecraft/src/Packet40EntityMetadata.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_ @@ -5033,7 +5033,7 @@ net/minecraft/src/Packet43Experience.func_73267_a(Ljava/io/DataInputStream;)V=ja net/minecraft/src/Packet43Experience.func_73268_a(Lnet/minecraft/src/Packet;)Z=|p_73268_1_ net/minecraft/src/Packet43Experience.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_ net/minecraft/src/Packet43Experience.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_ -net/minecraft/src/Packet4UpdateTime.(JJ)V=|p_i5004_1_,p_i5004_3_ +net/minecraft/src/Packet4UpdateTime.(JJ)V=|p_i5035_1_,p_i5035_3_ net/minecraft/src/Packet4UpdateTime.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_ net/minecraft/src/Packet4UpdateTime.func_73268_a(Lnet/minecraft/src/Packet;)Z=|p_73268_1_ net/minecraft/src/Packet4UpdateTime.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_ @@ -5076,7 +5076,7 @@ net/minecraft/src/Packet60Explosion.(DDDFLjava/util/List;Lnet/minecraft/sr net/minecraft/src/Packet60Explosion.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_ net/minecraft/src/Packet60Explosion.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_ net/minecraft/src/Packet60Explosion.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_ -net/minecraft/src/Packet61DoorChange.(IIIIIZ)V=|p_i5003_1_,p_i5003_2_,p_i5003_3_,p_i5003_4_,p_i5003_5_,p_i5003_6_ +net/minecraft/src/Packet61DoorChange.(IIIIIZ)V=|p_i5033_1_,p_i5033_2_,p_i5033_3_,p_i5033_4_,p_i5033_5_,p_i5033_6_ net/minecraft/src/Packet61DoorChange.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_ net/minecraft/src/Packet61DoorChange.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_ net/minecraft/src/Packet61DoorChange.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_ @@ -5202,7 +5202,7 @@ net/minecraft/src/PlayerManager.func_72692_a(Lnet/minecraft/src/PlayerManager;)L net/minecraft/src/PlayerManager.func_72694_a(Lnet/minecraft/src/EntityPlayerMP;II)Z=|p_72694_1_,p_72694_2_,p_72694_3_ net/minecraft/src/PlayerManager.func_72695_c(Lnet/minecraft/src/EntityPlayerMP;)V=|p_72695_1_ net/minecraft/src/PlayerNotFoundException.(Ljava/lang/String;[Ljava/lang/Object;)V=|p_i3257_1_,p_i3257_2_ -net/minecraft/src/PlayerPositionComparator.(Lnet/minecraft/src/ChunkCoordinates;)V=|p_i5016_1_ +net/minecraft/src/PlayerPositionComparator.(Lnet/minecraft/src/ChunkCoordinates;)V=|p_i5050_1_ net/minecraft/src/PlayerPositionComparator.compare(Ljava/lang/Object;Ljava/lang/Object;)I=|p_compare_1_,p_compare_2_ net/minecraft/src/PlayerPositionComparator.func_82547_a(Lnet/minecraft/src/EntityPlayerMP;Lnet/minecraft/src/EntityPlayerMP;)I=|p_82547_1_,p_82547_2_ net/minecraft/src/PlayerSelector.func_82375_f(Ljava/lang/String;)I=|p_82375_0_ @@ -5225,7 +5225,7 @@ net/minecraft/src/PlayerUsageSnooper.func_76473_a(Lnet/minecraft/src/PlayerUsage net/minecraft/src/PlayerUsageSnooper.func_76474_b(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/lang/Object;=|p_76474_0_ net/minecraft/src/PlayerUsageSnooper.func_76475_e(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/net/URL;=|p_76475_0_ net/minecraft/src/PlayerUsageSnooperThread.(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_i3427_1_ -net/minecraft/src/PositionImpl.(DDD)V=|p_i5023_1_,p_i5023_3_,p_i5023_5_ +net/minecraft/src/PositionImpl.(DDD)V=|p_i5028_1_,p_i5028_3_,p_i5028_5_ net/minecraft/src/PositionTextureVertex.(FFFFF)V=|p_i3140_1_,p_i3140_2_,p_i3140_3_,p_i3140_4_,p_i3140_5_ net/minecraft/src/PositionTextureVertex.(Lnet/minecraft/src/PositionTextureVertex;FF)V=|p_i3141_1_,p_i3141_2_,p_i3141_3_ net/minecraft/src/PositionTextureVertex.(Lnet/minecraft/src/Vec3;FF)V=|p_i3142_1_,p_i3142_2_,p_i3142_3_ @@ -5238,9 +5238,9 @@ net/minecraft/src/Potion.func_76397_a(II)Z=|p_76397_1_,p_76397_2_ net/minecraft/src/Potion.func_76399_b(II)Lnet/minecraft/src/Potion;=|p_76399_1_,p_76399_2_ net/minecraft/src/Potion.func_76402_a(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/EntityLiving;ID)V=|p_76402_1_,p_76402_2_,p_76402_3_,p_76402_4_ net/minecraft/src/Potion.func_76404_a(D)Lnet/minecraft/src/Potion;=|p_76404_1_ -net/minecraft/src/PotionEffect.(II)V=|p_i5079_1_,p_i5079_2_ +net/minecraft/src/PotionEffect.(II)V=|p_i5051_1_,p_i5051_2_ net/minecraft/src/PotionEffect.(III)V=|p_i3434_1_,p_i3434_2_,p_i3434_3_ -net/minecraft/src/PotionEffect.(IIIZ)V=|p_i5080_1_,p_i5080_2_,p_i5080_3_,p_i5080_4_ +net/minecraft/src/PotionEffect.(IIIZ)V=|p_i5052_1_,p_i5052_2_,p_i5052_3_,p_i5052_4_ net/minecraft/src/PotionEffect.(Lnet/minecraft/src/PotionEffect;)V=|p_i3435_1_ net/minecraft/src/PotionEffect.equals(Ljava/lang/Object;)Z=|p_equals_1_ net/minecraft/src/PotionEffect.func_76452_a(Lnet/minecraft/src/PotionEffect;)V=|p_76452_1_ @@ -5363,7 +5363,7 @@ net/minecraft/src/RegionFileCache.func_76550_a(Ljava/io/File;II)Lnet/minecraft/s net/minecraft/src/RegionFileCache.func_76552_d(Ljava/io/File;II)Ljava/io/DataOutputStream;=|p_76552_0_,p_76552_1_,p_76552_2_ net/minecraft/src/RegionFileChunkBuffer.(Lnet/minecraft/src/RegionFile;II)V=|p_i3776_1_,p_i3776_2_,p_i3776_3_ net/minecraft/src/RegionFileChunkBuffer.close()V=java/io/IOException| -net/minecraft/src/RegistryDefaulted.(Ljava/lang/Object;)V=|p_i5021_1_ +net/minecraft/src/RegistryDefaulted.(Ljava/lang/Object;)V=|p_i5026_1_ net/minecraft/src/RegistryDefaulted.func_82594_a(Ljava/lang/Object;)Ljava/lang/Object;=|p_82594_1_ net/minecraft/src/RegistrySimple.func_82594_a(Ljava/lang/Object;)Ljava/lang/Object;=|p_82594_1_ net/minecraft/src/RegistrySimple.func_82595_a(Ljava/lang/Object;Ljava/lang/Object;)V=|p_82595_1_,p_82595_2_ @@ -5919,7 +5919,7 @@ net/minecraft/src/SlotMerchantResult.func_75210_a(Lnet/minecraft/src/ItemStack;I net/minecraft/src/SlotMerchantResult.func_75214_a(Lnet/minecraft/src/ItemStack;)Z=|p_75214_1_ net/minecraft/src/SlotMerchantResult.func_75230_a(Lnet/minecraft/src/MerchantRecipe;Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/ItemStack;)Z=|p_75230_1_,p_75230_2_,p_75230_3_ net/minecraft/src/SlotMerchantResult.func_82870_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/ItemStack;)V=|p_82870_1_,p_82870_2_ -net/minecraft/src/SlotRepair.(Lnet/minecraft/src/ContainerRepair;Lnet/minecraft/src/IInventory;IIILnet/minecraft/src/World;III)V=|p_i5078_1_,p_i5078_2_,p_i5078_3_,p_i5078_4_,p_i5078_5_,p_i5078_6_,p_i5078_7_,p_i5078_8_,p_i5078_9_ +net/minecraft/src/SlotRepair.(Lnet/minecraft/src/ContainerRepair;Lnet/minecraft/src/IInventory;IIILnet/minecraft/src/World;III)V=|p_i5079_1_,p_i5079_2_,p_i5079_3_,p_i5079_4_,p_i5079_5_,p_i5079_6_,p_i5079_7_,p_i5079_8_,p_i5079_9_ net/minecraft/src/SlotRepair.func_75214_a(Lnet/minecraft/src/ItemStack;)Z=|p_75214_1_ net/minecraft/src/SlotRepair.func_82869_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_82869_1_ net/minecraft/src/SlotRepair.func_82870_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/ItemStack;)V=|p_82870_1_,p_82870_2_ @@ -6003,7 +6003,7 @@ net/minecraft/src/StatsSyncher.func_77420_c(Ljava/util/Map;)V=|p_77420_1_ net/minecraft/src/StatsSyncher.func_77421_a(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException|p_77421_1_,p_77421_2_,p_77421_3_,p_77421_4_ net/minecraft/src/StatsSyncher.func_77424_g(Lnet/minecraft/src/StatsSyncher;)Ljava/io/File;=|p_77424_0_ net/minecraft/src/StepSound.(Ljava/lang/String;FF)V=|p_i4008_1_,p_i4008_2_,p_i4008_3_ -net/minecraft/src/StepSoundAnvil.(Ljava/lang/String;FF)V=|p_i5031_1_,p_i5031_2_,p_i5031_3_ +net/minecraft/src/StepSoundAnvil.(Ljava/lang/String;FF)V=|p_i5107_1_,p_i5107_2_,p_i5107_3_ net/minecraft/src/StepSoundSand.(Ljava/lang/String;FF)V=|p_i4007_1_,p_i4007_2_,p_i4007_3_ net/minecraft/src/StepSoundStone.(Ljava/lang/String;FF)V=|p_i4006_1_,p_i4006_2_,p_i4006_3_ net/minecraft/src/StringTranslate.(Ljava/lang/String;)V=|p_i3260_1_ @@ -6177,9 +6177,9 @@ net/minecraft/src/ThreadLanServerPing.func_77523_b(Ljava/lang/String;)Ljava/lang net/minecraft/src/ThreadLanServerPing.func_77524_a(Ljava/lang/String;)Ljava/lang/String;=|p_77524_0_ net/minecraft/src/ThreadLanServerPing.func_77525_a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;=|p_77525_0_,p_77525_1_ net/minecraft/src/ThreadLoginVerifier.(Lnet/minecraft/src/NetLoginHandler;)V=|p_i3399_1_ -net/minecraft/src/ThreadMinecraftServer.(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i5012_1_,p_i5012_2_ +net/minecraft/src/ThreadMinecraftServer.(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i5039_1_,p_i5039_2_ net/minecraft/src/ThreadPollServers.(Lnet/minecraft/src/GuiSlotServer;Lnet/minecraft/src/ServerData;)V=|p_i3040_1_,p_i3040_2_ -net/minecraft/src/ThreadServerApplication.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5013_1_ +net/minecraft/src/ThreadServerApplication.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5045_1_ net/minecraft/src/ThreadServerApplication.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_ net/minecraft/src/ThreadStatSyncherReceive.(Lnet/minecraft/src/StatsSyncher;)V=|p_i3219_1_ net/minecraft/src/ThreadStatSyncherSend.(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;)V=|p_i3217_1_,p_i3217_2_ @@ -6302,7 +6302,7 @@ net/minecraft/src/TileEntitySpecialRenderer.func_76897_a(Ljava/lang/String;)V=|p net/minecraft/src/TileEntitySpecialRenderer.func_82392_a(Ljava/lang/String;Ljava/lang/String;)V=|p_82392_1_,p_82392_2_ net/minecraft/src/Timer.(F)V=|p_i3005_1_ net/minecraft/src/Tuple.(Ljava/lang/Object;Ljava/lang/Object;)V=|p_i3422_1_,p_i3422_2_ -net/minecraft/src/Vec3.(Lnet/minecraft/src/Vec3Pool;DDD)V=|p_i5052_1_,p_i5052_2_,p_i5052_4_,p_i5052_6_ +net/minecraft/src/Vec3.(Lnet/minecraft/src/Vec3Pool;DDD)V=|p_i5109_1_,p_i5109_2_,p_i5109_4_,p_i5109_6_ net/minecraft/src/Vec3.func_72429_b(Lnet/minecraft/src/Vec3;D)Lnet/minecraft/src/Vec3;=|p_72429_1_,p_72429_2_ net/minecraft/src/Vec3.func_72430_b(Lnet/minecraft/src/Vec3;)D=|p_72430_1_ net/minecraft/src/Vec3.func_72431_c(Lnet/minecraft/src/Vec3;)Lnet/minecraft/src/Vec3;=|p_72431_1_ @@ -6341,7 +6341,7 @@ net/minecraft/src/Village.func_82689_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_8 net/minecraft/src/Village.func_82690_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_82690_1_ net/minecraft/src/Village.func_82691_a(Lnet/minecraft/src/World;)V=|p_82691_1_ net/minecraft/src/VillageAgressor.(Lnet/minecraft/src/Village;Lnet/minecraft/src/EntityLiving;I)V=|p_i3510_1_,p_i3510_2_,p_i3510_3_ -net/minecraft/src/VillageCollection.(Ljava/lang/String;)V=|p_i5067_1_ +net/minecraft/src/VillageCollection.(Ljava/lang/String;)V=|p_i5061_1_ net/minecraft/src/VillageCollection.(Lnet/minecraft/src/World;)V=|p_i3513_1_ net/minecraft/src/VillageCollection.func_75541_e(III)Z=|p_75541_1_,p_75541_2_,p_75541_3_ net/minecraft/src/VillageCollection.func_75542_c(III)V=|p_75542_1_,p_75542_2_,p_75542_3_ diff --git a/fml/conf/joined.srg b/fml/conf/joined.srg index 2baafe75ad..175e2d4915 100644 --- a/fml/conf/joined.srg +++ b/fml/conf/joined.srg @@ -853,22 +853,22 @@ CL: fe net/minecraft/src/BanList CL: ff net/minecraft/src/ServerCommand CL: fh net/minecraft/src/ConsoleLogManager CL: fi net/minecraft/src/ConsoleLogFormatter -CL: fj net/minecraft/src/ConvertProgressUpdater -CL: fk net/minecraft/src/BehaviorMinecraftServer_10 -CL: fl net/minecraft/src/BehaviorMinecraftServer_11 +CL: fj net/minecraft/src/BehaviorArrowDispense +CL: fk net/minecraft/src/BehaviorBucketFullDispense +CL: fl net/minecraft/src/BehaviorBucketEmptyDispense CL: fm net/minecraft/src/ConvertingProgressUpdate CL: fn net/minecraft/src/ThreadDedicatedServer CL: fo net/minecraft/src/ThreadMinecraftServer -CL: fp net/minecraft/src/CallableVanilla -CL: fq net/minecraft/src/CallableMinecraftServer_16 -CL: fr net/minecraft/src/CallableMemoryStats -CL: fs net/minecraft/src/CallableMinecraftServer_18 +CL: fp net/minecraft/src/CallableIsServerModded +CL: fq net/minecraft/src/CallableServerProfiler +CL: fr net/minecraft/src/CallableServerMemoryStats +CL: fs net/minecraft/src/CallablePlayers CL: ft net/minecraft/src/BehaviorEggDispense -CL: fu net/minecraft/src/ThreadServerApplication -CL: fv net/minecraft/src/CallableIsServerModded -CL: fw net/minecraft/src/CallableServerProfiler -CL: fx net/minecraft/src/BehaviorPotionDispense -CL: fy net/minecraft/src/CallablePlayers +CL: fu net/minecraft/src/BehaviorSnowballDispense +CL: fv net/minecraft/src/BehaviorExpBottleDispense +CL: fw net/minecraft/src/BehaviorPotionDispense +CL: fx net/minecraft/src/BehaviorPotionDispenseLogic +CL: fy net/minecraft/src/BehaviorMobEggDispense CL: fz net/minecraft/src/BehaviorDispenseFireball CL: g net/minecraft/src/CallableJVMFlags CL: ga net/minecraft/src/BehaviorDispenseMinecart @@ -2466,7 +2466,7 @@ FD: aqj/b net/minecraft/src/GLAllocation/field_74530_b FD: aqk/a net/minecraft/src/ThreadClientSleep/field_74532_a FD: aql/a net/minecraft/src/CallableClientProfiler/field_74500_a FD: aqm/a net/minecraft/src/CallableClientMemoryStats/field_82887_a -FD: aqn/a net/minecraft/src/EnumOSHelper/field_82888_a +FD: aqn/a net/minecraft/src/EnumOSHelper/field_74533_a FD: aqo/a net/minecraft/src/MinecraftFakeLauncher/field_74534_a FD: aqp/a net/minecraft/src/StatStringFormatKeyInv/field_74536_a FD: aqs/a net/minecraft/src/CallableLWJGLVersion/field_74421_a @@ -4441,26 +4441,26 @@ FD: hk/e net/minecraft/src/ServerListenThread/field_71774_e FD: hk/f net/minecraft/src/ServerListenThread/field_71771_f FD: hk/g net/minecraft/src/ServerListenThread/field_71772_g FD: hk/h net/minecraft/src/ServerListenThread/field_71778_h -FD: hl/a net/minecraft/src/ServerGUI/field_82039_a -FD: hl/b net/minecraft/src/ServerGUI/field_82037_b -FD: hl/c net/minecraft/src/ServerGUI/field_82038_c -FD: hm/a net/minecraft/src/ServerWindowAdapter/field_82040_a -FD: hn/a net/minecraft/src/ServerGuiCommandListener/field_82030_a -FD: hn/b net/minecraft/src/ServerGuiCommandListener/field_82029_b -FD: ho/a net/minecraft/src/ServerGuiFocusAdapter/field_82031_a -FD: hp/a net/minecraft/src/PlayerListBox/field_82014_a -FD: hp/b net/minecraft/src/PlayerListBox/field_82013_b -FD: hq/a net/minecraft/src/GuiStatsComponent/field_82027_a -FD: hq/b net/minecraft/src/GuiStatsComponent/field_82025_b -FD: hq/c net/minecraft/src/GuiStatsComponent/field_82026_c -FD: hq/d net/minecraft/src/GuiStatsComponent/field_82023_d -FD: hq/e net/minecraft/src/GuiStatsComponent/field_82024_e -FD: hr/a net/minecraft/src/GuiStatsListener/field_82015_a -FD: hs/a net/minecraft/src/GuiLogOutputHandler/field_82019_a -FD: hs/b net/minecraft/src/GuiLogOutputHandler/field_82017_b -FD: hs/c net/minecraft/src/GuiLogOutputHandler/field_82018_c -FD: hs/d net/minecraft/src/GuiLogOutputHandler/field_82016_d -FD: ht/a net/minecraft/src/GuiLogFormatter/field_82028_a +FD: hl/a net/minecraft/src/ServerGUI/field_79010_a +FD: hl/b net/minecraft/src/ServerGUI/field_79008_b +FD: hl/c net/minecraft/src/ServerGUI/field_79009_c +FD: hm/a net/minecraft/src/ServerWindowAdapter/field_79002_a +FD: hn/a net/minecraft/src/ServerGuiCommandListener/field_79027_a +FD: hn/b net/minecraft/src/ServerGuiCommandListener/field_79026_b +FD: ho/a net/minecraft/src/ServerGuiFocusAdapter/field_79028_a +FD: hp/a net/minecraft/src/PlayerListBox/field_79012_a +FD: hp/b net/minecraft/src/PlayerListBox/field_79011_b +FD: hq/a net/minecraft/src/GuiStatsComponent/field_79020_a +FD: hq/b net/minecraft/src/GuiStatsComponent/field_79018_b +FD: hq/c net/minecraft/src/GuiStatsComponent/field_79019_c +FD: hq/d net/minecraft/src/GuiStatsComponent/field_79016_d +FD: hq/e net/minecraft/src/GuiStatsComponent/field_79017_e +FD: hr/a net/minecraft/src/GuiStatsListener/field_79021_a +FD: hs/a net/minecraft/src/GuiLogOutputHandler/field_79025_a +FD: hs/b net/minecraft/src/GuiLogOutputHandler/field_79023_b +FD: hs/c net/minecraft/src/GuiLogOutputHandler/field_79024_c +FD: hs/d net/minecraft/src/GuiLogOutputHandler/field_79022_d +FD: ht/a net/minecraft/src/GuiLogFormatter/field_79029_a FD: hu/a net/minecraft/src/DestroyBlockProgress/field_73115_a FD: hu/b net/minecraft/src/DestroyBlockProgress/field_73113_b FD: hu/c net/minecraft/src/DestroyBlockProgress/field_73114_c @@ -11849,18 +11849,18 @@ MD: hk/b (Ljava/net/InetAddress;)Z net/minecraft/src/ServerListenThread/func_717 MD: hk/c ()Ljava/net/InetAddress; net/minecraft/src/ServerListenThread/func_71767_c ()Ljava/net/InetAddress; MD: hk/d ()I net/minecraft/src/ServerListenThread/func_71765_d ()I MD: hk/run ()V net/minecraft/src/ServerListenThread/run ()V -MD: hl/a (Lhf;)V net/minecraft/src/ServerGUI/func_82032_a (Lnet/minecraft/src/DedicatedServer;)V -MD: hl/a (Lhl;)Lhf; net/minecraft/src/ServerGUI/func_82033_a (Lnet/minecraft/src/ServerGUI;)Lnet/minecraft/src/DedicatedServer; -MD: hl/b ()Ljavax/swing/JComponent; net/minecraft/src/ServerGUI/func_82035_b ()Ljavax/swing/JComponent; -MD: hl/c ()Ljavax/swing/JComponent; net/minecraft/src/ServerGUI/func_82036_c ()Ljavax/swing/JComponent; -MD: hl/d ()Ljavax/swing/JComponent; net/minecraft/src/ServerGUI/func_82034_d ()Ljavax/swing/JComponent; +MD: hl/a (Lhf;)V net/minecraft/src/ServerGUI/func_79003_a (Lnet/minecraft/src/DedicatedServer;)V +MD: hl/a (Lhl;)Lhf; net/minecraft/src/ServerGUI/func_79004_a (Lnet/minecraft/src/ServerGUI;)Lnet/minecraft/src/DedicatedServer; +MD: hl/b ()Ljavax/swing/JComponent; net/minecraft/src/ServerGUI/func_79006_b ()Ljavax/swing/JComponent; +MD: hl/c ()Ljavax/swing/JComponent; net/minecraft/src/ServerGUI/func_79007_c ()Ljavax/swing/JComponent; +MD: hl/d ()Ljavax/swing/JComponent; net/minecraft/src/ServerGUI/func_79005_d ()Ljavax/swing/JComponent; MD: hm/windowClosing (Ljava/awt/event/WindowEvent;)V net/minecraft/src/ServerWindowAdapter/windowClosing (Ljava/awt/event/WindowEvent;)V MD: hn/actionPerformed (Ljava/awt/event/ActionEvent;)V net/minecraft/src/ServerGuiCommandListener/actionPerformed (Ljava/awt/event/ActionEvent;)V MD: ho/focusGained (Ljava/awt/event/FocusEvent;)V net/minecraft/src/ServerGuiFocusAdapter/focusGained (Ljava/awt/event/FocusEvent;)V MD: hp/a ()V net/minecraft/src/PlayerListBox/func_73660_a ()V -MD: hq/a ()V net/minecraft/src/GuiStatsComponent/func_82021_a ()V -MD: hq/a (Lhq;)V net/minecraft/src/GuiStatsComponent/func_82020_a (Lnet/minecraft/src/GuiStatsComponent;)V -MD: hq/a ([J)D net/minecraft/src/GuiStatsComponent/func_82022_a ([J)D +MD: hq/a ()V net/minecraft/src/GuiStatsComponent/func_79014_a ()V +MD: hq/a (Lhq;)V net/minecraft/src/GuiStatsComponent/func_79013_a (Lnet/minecraft/src/GuiStatsComponent;)V +MD: hq/a ([J)D net/minecraft/src/GuiStatsComponent/func_79015_a ([J)D MD: hq/paint (Ljava/awt/Graphics;)V net/minecraft/src/GuiStatsComponent/paint (Ljava/awt/Graphics;)V MD: hr/actionPerformed (Ljava/awt/event/ActionEvent;)V net/minecraft/src/GuiStatsListener/actionPerformed (Ljava/awt/event/ActionEvent;)V MD: hs/close ()V net/minecraft/src/GuiLogOutputHandler/close ()V diff --git a/fml/conf/params.csv b/fml/conf/params.csv index d318a3f69d..44a5390294 100644 --- a/fml/conf/params.csv +++ b/fml/conf/params.csv @@ -9595,21 +9595,13 @@ p_i4107_1_,par1ServerGUI,2 p_i4108_1_,par1DedicatedServer,2 p_i4109_1_,par1GuiStatsComponent,2 p_i5000_1_,par1Minecraft,2 -p_i5000_2_,par2Str,2 p_i5001_1_,par1GuiCreateFlatWorld,2 -p_i5001_2_,par2,2 p_i5002_1_,par1GuiFlatPresets,2 -p_i5002_2_,par2DataWatcher,2 -p_i5002_3_,par3,2 p_i5003_1_,par1,2 p_i5003_2_,par2Str,2 p_i5003_3_,par3Str,2 -p_i5003_4_,par4,2 -p_i5003_5_,par5,2 -p_i5003_6_,par6,2 p_i5004_1_,par1GuiCreateWorld,2 p_i5004_2_,par2Str,2 -p_i5004_3_,par3,2 p_i5005_1_,par1GuiCreateFlatWorld,2 p_i5006_1_,par1InventoryPlayer,2 p_i5006_2_,par2World,2 @@ -9623,7 +9615,7 @@ p_i5007_4_,par4,2 p_i5007_5_,par5,2 p_i5007_6_,par6,2 p_i5008_1_,par1Minecraft,2 -p_i5009_1_,par1TileEntityCommandBlock,2 +p_i5009_1_,par1,2 p_i5010_1_,par1GuiBeacon,2 p_i5010_2_,par2,2 p_i5010_3_,par3,2 @@ -9658,7 +9650,6 @@ p_i5019_1_,par1,2 p_i5020_1_,par1,2 p_i5020_2_,par2,2 p_i5020_3_,par3,2 -p_i5020_4_,par4,2 p_i5021_1_,par1,2 p_i5021_2_,par2,2 p_i5021_3_,par3,2 @@ -9667,13 +9658,8 @@ p_i5022_1_,par1,2 p_i5022_2_,par2,2 p_i5022_3_,par3,2 p_i5022_4_,par4,2 -p_i5022_5_,par5,2 -p_i5022_6_,par6,2 -p_i5022_7_,par7,2 p_i5023_1_,par1,2 p_i5023_2_,par2,2 -p_i5023_3_,par3,2 -p_i5023_5_,par5,2 p_i5024_1_,par1ModelBase,2 p_i5024_2_,par2ModelBase,2 p_i5024_3_,par3,2 @@ -9682,8 +9668,6 @@ p_i5025_2_,par2,2 p_i5025_3_,par3,2 p_i5025_4_,par4,2 p_i5026_1_,par1Obj,2 -p_i5026_2_,par2,2 -p_i5026_3_,par3Material,2 p_i5027_1_,par1Str,2 p_i5027_2_,par2,2 p_i5027_3_,par3,2 @@ -9698,7 +9682,6 @@ p_i5029_1_,par1NBTTagCompound,2 p_i5029_2_,par2Str,2 p_i5030_1_,par1NBTTagCompound,2 p_i5030_2_,par2,2 -p_i5030_3_,par3,2 p_i5031_1_,par1Str,2 p_i5031_2_,par2,2 p_i5031_3_,par3,2 @@ -9721,38 +9704,22 @@ p_i5034_1_,par1,2 p_i5034_2_,par2DataWatcher,2 p_i5034_3_,par3,2 p_i5035_1_,par1,2 -p_i5035_2_,par2Block,2 p_i5035_3_,par3,2 p_i5036_1_,par1MinecraftServer,2 -p_i5036_2_,par2,2 -p_i5036_4_,par4,2 -p_i5036_5_,par5Str,2 p_i5037_1_,par1MinecraftServer,2 -p_i5037_2_,par2,2 p_i5038_1_,par1MinecraftServer,2 -p_i5038_2_,par2,2 -p_i5038_3_,par3,2 p_i5039_1_,par1MinecraftServer,2 p_i5039_2_,par2Str,2 p_i5040_1_,par1MinecraftServer,2 p_i5041_1_,par1MinecraftServer,2 -p_i5041_2_,par2,2 -p_i5041_3_,par3,2 p_i5042_1_,par1MinecraftServer,2 p_i5043_1_,par1MinecraftServer,2 p_i5044_1_,par1MinecraftServer,2 -p_i5044_2_,par2Block,2 -p_i5044_3_,par3ArrayOfStr,2 p_i5045_1_,par1MinecraftServer,2 -p_i5045_2_,par2,2 -p_i5045_3_,par3,2 -p_i5045_4_,par4,2 -p_i5045_5_,par5,2 p_i5046_1_,par1CallableServerProfiler,2 p_i5046_2_,par2ItemStack,2 p_i5047_1_,par1MinecraftServer,2 p_i5048_1_,par1MinecraftServer,2 -p_i5048_2_,par2Class,2 p_i5049_1_,par1MinecraftServer,2 p_i5050_1_,par1ChunkCoordinates,2 p_i5051_1_,par1,2 @@ -9761,24 +9728,13 @@ p_i5052_1_,par1,2 p_i5052_2_,par2,2 p_i5052_3_,par3,2 p_i5052_4_,par4,2 -p_i5052_6_,par6,2 p_i5053_1_,par1World,2 -p_i5053_2_,par2,2 -p_i5053_3_,par3Class,2 -p_i5053_4_,par4,2 -p_i5053_5_,par5Material,2 -p_i5053_6_,par6,2 -p_i5053_7_,par7,2 p_i5054_1_,par1World,2 p_i5054_2_,par2,2 p_i5054_3_,par3,2 p_i5054_4_,par4,2 p_i5054_5_,par5,2 p_i5055_1_,par1World,2 -p_i5055_2_,par2,2 -p_i5055_3_,par3,2 -p_i5055_4_,par4,2 -p_i5055_5_,par5,2 p_i5056_1_,par1World,2 p_i5056_2_,par2,2 p_i5056_3_,par3,2 @@ -9805,32 +9761,19 @@ p_i5060_5_,par5,2 p_i5060_6_,par6,2 p_i5060_7_,par7EntitySelector,2 p_i5061_1_,par1Str,2 -p_i5061_2_,par2EntityLiving,2 -p_i5061_3_,par3,2 -p_i5061_5_,par5,2 -p_i5061_7_,par7,2 p_i5062_1_,par1World,2 p_i5063_1_,par1World,2 -p_i5063_2_,par2EntityLiving,2 -p_i5063_3_,par3,2 -p_i5063_5_,par5,2 -p_i5063_7_,par7,2 p_i5064_1_,par1EntityMultiPart,2 p_i5064_2_,par2Str,2 p_i5064_3_,par3,2 p_i5064_4_,par4,2 p_i5065_1_,par1World,2 -p_i5065_2_,par2,2 -p_i5065_4_,par4,2 -p_i5065_6_,par6,2 -p_i5065_8_,par8ItemStack,2 p_i5066_1_,par1World,2 p_i5067_1_,par1World,2 p_i5068_10_,par10,2 p_i5068_12_,par12,2 p_i5068_1_,par1World,2 p_i5068_2_,par2,2 -p_i5068_3_,par3,2 p_i5068_4_,par4,2 p_i5068_6_,par6,2 p_i5068_8_,par8,2 @@ -9842,13 +9785,8 @@ p_i5069_7_,par7,2 p_i5070_1_,par1World,2 p_i5070_2_,par2EntityLiving,2 p_i5070_3_,par3ItemStack,2 -p_i5070_4_,par4,2 -p_i5070_5_,par5,2 -p_i5070_6_,par6,2 -p_i5070_7_,par7EntitySelector,2 p_i5071_1_,par1World,2 p_i5071_2_,par2,2 -p_i5071_3_,par3,2 p_i5071_4_,par4,2 p_i5071_6_,par6,2 p_i5071_8_,par8ItemStack,2 @@ -9862,7 +9800,6 @@ p_i5074_10_,par10,2 p_i5074_12_,par12,2 p_i5074_1_,par1World,2 p_i5074_2_,par2,2 -p_i5074_3_,par3EntityPlayer,2 p_i5074_4_,par4,2 p_i5074_6_,par6,2 p_i5074_8_,par8,2 @@ -9873,22 +9810,12 @@ p_i5075_4_,par4,2 p_i5075_5_,par5,2 p_i5076_1_,par1InventoryPlayer,2 p_i5076_2_,par2TileEntityBeacon,2 -p_i5076_3_,par3,2 p_i5077_1_,par1InventoryPlayer,2 p_i5077_2_,par2,2 p_i5077_3_,par3EntityPlayer,2 -p_i5077_4_,par4,2 -p_i5077_5_,par5,2 -p_i5077_6_,par6EntityPlayer,2 p_i5078_1_,par1ContainerRepair,2 p_i5078_2_,par2Str,2 p_i5078_3_,par3,2 -p_i5078_4_,par4,2 -p_i5078_5_,par5,2 -p_i5078_6_,par6World,2 -p_i5078_7_,par7,2 -p_i5078_8_,par8,2 -p_i5078_9_,par9,2 p_i5079_1_,par1ContainerRepair,2 p_i5079_2_,par2IInventory,2 p_i5079_3_,par3,2 diff --git a/fml/conf/patches/minecraft_ff.patch b/fml/conf/patches/minecraft_ff.patch index fe9f82116e..24d87c257e 100644 --- a/fml/conf/patches/minecraft_ff.patch +++ b/fml/conf/patches/minecraft_ff.patch @@ -32,11 +32,9 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java --- minecraft\net\minecraft\src\CodecMus.java Sat Oct 20 04:10:43 2012 +++ minecraft_patched\net\minecraft\src\CodecMus.java Sat Oct 20 04:17:33 2012 -@@ -1,7 +1,8 @@ +@@ -1,5 +1,6 @@ package net.minecraft.src; - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; +import java.io.IOException; import java.io.InputStream; import net.minecraft.src.MusInputStream; @@ -180,4 +178,4 @@ diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patch + this.func_75736_b(); } - private void func_75736_b() { \ No newline at end of file + private void func_75736_b() { diff --git a/fml/install/fml.py b/fml/install/fml.py index e9088607af..82e0dae614 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -701,48 +701,17 @@ def gen_merged_srg(mcp_dir, fml_dir): return common def gen_merged_exc(mcp_dir, fml_dir): - print 'Generating merged MCInjector config' - exc_client = os.path.join(mcp_dir, 'conf', 'client.exc') - exc_server = os.path.join(mcp_dir, 'conf', 'server.exc') + print 'Reading merged MCInjector config' + exc_joined = os.path.join(mcp_dir, 'conf', 'joined.exc') - client = {} - with open(exc_client, 'r') as fh: + joined = {} + with open(exc_joined, 'r') as fh: for line in fh: if not line.startswith('#'): pts = line.rstrip('\r\n').split('=') - client[pts[0]] = pts[1] - - server = {} - with open(exc_server, 'r') as fh: - for line in fh: - if not line.startswith('#'): - pts = line.rstrip('\r\n').split('=') - server[pts[0]] = pts[1] + joined[pts[0]] = pts[1] - common = {} - for key, value in client.items(): - if key in server: - if value != server[key]: - print 'Error: Exec for shared function does not match client and server:' - print 'Function: ' + key - print 'Client: ' + value - print 'Server: ' + server[key] - if value != '|': - common[key] = value - client.pop(key) - server.pop(key) - else: - if value != '|': - common[key] = value - - joined = dict(common.items() + server.items()) - - #Print joined mcinjector files - with open(os.path.join(fml_dir, 'conf', 'joined.exc'), 'wb') as f: - for key in sorted(joined): - f.write('%s=%s\n' % (key, joined[key])) - - return common + return joined def gen_shared_searge_names(common_srg, common_exc): field = re.compile(r'field_[0-9]+_[a-zA-Z_]+$')