Update for MCP release

fml/conf/joined.exc

@@ -261,6 +261,12 @@ net/minecraft/src/BanList.func_73704_a(Ljava/lang/String;)Z=|p_73704_1_
 net/minecraft/src/BanList.func_73706_a(Lnet/minecraft/src/BanEntry;)V=|p_73706_1_
 net/minecraft/src/BanList.func_73708_a(Z)V=|p_73708_1_
 net/minecraft/src/BanList.func_73709_b(Ljava/lang/String;)V=|p_73709_1_
+net/minecraft/src/BehaviorArrowDispense.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5002_1_
+net/minecraft/src/BehaviorArrowDispense.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_
+net/minecraft/src/BehaviorBucketEmptyDispense.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5004_1_
+net/minecraft/src/BehaviorBucketEmptyDispense.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_
+net/minecraft/src/BehaviorBucketFullDispense.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5003_1_
+net/minecraft/src/BehaviorBucketFullDispense.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_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_
 net/minecraft/src/BehaviorDefaultDispenseItem.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_
 net/minecraft/src/BehaviorDefaultDispenseItem.func_82486_a(Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;ILnet/minecraft/src/EnumFacing;Lnet/minecraft/src/IPosition;)V=|p_82486_0_,p_82486_1_,p_82486_2_,p_82486_3_,p_82486_4_
@@ -279,14 +285,19 @@ net/minecraft/src/BehaviorDispenseMinecart.func_82485_a(Lnet/minecraft/src/IBloc
 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.<init>(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.<init>(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.<init>(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.<init>(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/BehaviorExpBottleDispense.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5006_1_
+net/minecraft/src/BehaviorExpBottleDispense.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_
+net/minecraft/src/BehaviorMobEggDispense.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5009_1_
+net/minecraft/src/BehaviorMobEggDispense.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_
+net/minecraft/src/BehaviorMobEggDispense.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.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5008_1_
+net/minecraft/src/BehaviorPotionDispense.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_
+net/minecraft/src/BehaviorPotionDispenseLogic.<init>(Lnet/minecraft/src/BehaviorPotionDispense;Lnet/minecraft/src/ItemStack;)V=|p_i5007_1_,p_i5007_2_
+net/minecraft/src/BehaviorPotionDispenseLogic.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_
+net/minecraft/src/BehaviorSnowballDispense.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5005_1_
+net/minecraft/src/BehaviorSnowballDispense.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_
 net/minecraft/src/BiomeCache.<init>(Lnet/minecraft/src/WorldChunkManager;)V=|p_i3749_1_
 net/minecraft/src/BiomeCache.func_76836_a(Lnet/minecraft/src/BiomeCache;)Lnet/minecraft/src/WorldChunkManager;=|p_76836_0_
 net/minecraft/src/BiomeCache.func_76837_b(II)Lnet/minecraft/src/BiomeGenBase;=|p_76837_1_,p_76837_2_
@@ -1322,13 +1333,12 @@ net/minecraft/src/BlockWoodSlab.func_72240_d(I)Ljava/lang/String;=|p_72240_1_
 net/minecraft/src/BlockWorkbench.<init>(I)V=|p_i4024_1_
 net/minecraft/src/BlockWorkbench.func_71851_a(I)I=|p_71851_1_
 net/minecraft/src/BlockWorkbench.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/BossStatus.func_82824_a(Lnet/minecraft/src/EntityDragonBase;Z)V=|p_82824_0_,p_82824_1_
+net/minecraft/src/BossStatus.func_82824_a(Lnet/minecraft/src/IBossDisplayData;Z)V=|p_82824_0_,p_82824_1_
 net/minecraft/src/CallableClientMemoryStats.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i5000_1_
 net/minecraft/src/CallableClientProfiler.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3017_1_
 net/minecraft/src/CallableGLInfo.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3016_1_
 net/minecraft/src/CallableIsModded.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3123_1_
 net/minecraft/src/CallableIsServerModded.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3372_1_
-net/minecraft/src/CallableIsServerModded.func_82499_a(Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;=|p_82499_1_,p_82499_2_
 net/minecraft/src/CallableJVMFlags.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3249_1_
 net/minecraft/src/CallableJavaInfo.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3246_1_
 net/minecraft/src/CallableJavaInfo2.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3247_1_
@@ -1339,27 +1349,18 @@ net/minecraft/src/CallableLvl3.<init>(Lnet/minecraft/src/World;)V=|p_i3730_1_
 net/minecraft/src/CallableMPL1.<init>(Lnet/minecraft/src/WorldClient;)V=|p_i3098_1_
 net/minecraft/src/CallableMPL2.<init>(Lnet/minecraft/src/WorldClient;)V=|p_i3097_1_
 net/minecraft/src/CallableMemoryInfo.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3248_1_
-net/minecraft/src/CallableMemoryStats.<init>(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.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5041_1_
-net/minecraft/src/CallableMinecraftServer_18.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5043_1_
 net/minecraft/src/CallableMinecraftVersion.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3244_1_
 net/minecraft/src/CallableModded.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3006_1_
 net/minecraft/src/CallableOSInfo.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3245_1_
 net/minecraft/src/CallablePlayers.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3374_1_
-net/minecraft/src/CallablePlayers.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_
-net/minecraft/src/CallablePlayers.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_
 net/minecraft/src/CallableServerMemoryStats.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5042_1_
 net/minecraft/src/CallableServerProfiler.<init>(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.<init>(Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i5029_1_,p_i5029_2_
 net/minecraft/src/CallableTagCompound2.<init>(Lnet/minecraft/src/NBTTagCompound;I)V=|p_i5030_1_,p_i5030_2_
 net/minecraft/src/CallableTexturePack.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3012_1_
 net/minecraft/src/CallableType.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i3381_1_
 net/minecraft/src/CallableType2.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3007_1_
 net/minecraft/src/CallableType3.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3120_1_
-net/minecraft/src/CallableVanilla.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5040_1_
 net/minecraft/src/CanvasCrashReport.<init>(I)V=|p_i3008_1_
 net/minecraft/src/CanvasMinecraftApplet.<init>(Lnet/minecraft/client/MinecraftApplet;)V=|p_i3020_1_
 net/minecraft/src/CanvasMojangLogo.paint(Ljava/awt/Graphics;)V=|p_paint_1_
@@ -1394,7 +1395,7 @@ net/minecraft/src/Chunk.func_76614_a(Lnet/minecraft/src/EnumSkyBlock;III)I=|p_76
 net/minecraft/src/Chunk.func_76615_h(III)V=|p_76615_1_,p_76615_2_,p_76615_3_
 net/minecraft/src/Chunk.func_76616_a([B)V=|p_76616_1_
 net/minecraft/src/Chunk.func_76617_a(J)Ljava/util/Random;=|p_76617_1_
-net/minecraft/src/Chunk.func_76618_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/EntitySelector;)V=|p_76618_1_,p_76618_2_,p_76618_3_,p_76618_4_
+net/minecraft/src/Chunk.func_76618_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/IEntitySelector;)V=|p_76618_1_,p_76618_2_,p_76618_3_,p_76618_4_
 net/minecraft/src/Chunk.func_76619_d(III)Z=|p_76619_1_,p_76619_2_,p_76619_3_
 net/minecraft/src/Chunk.func_76620_a(Lnet/minecraft/src/TileEntity;)V=|p_76620_1_
 net/minecraft/src/Chunk.func_76622_b(Lnet/minecraft/src/Entity;)V=|p_76622_1_
@@ -1935,8 +1936,6 @@ net/minecraft/src/ContainerWorkbench.func_75130_a(Lnet/minecraft/src/IInventory;
 net/minecraft/src/ContainerWorkbench.func_75134_a(Lnet/minecraft/src/EntityPlayer;)V=|p_75134_1_
 net/minecraft/src/ContainerWorkbench.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_
 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.<init>(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.<init>(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_
@@ -2078,7 +2077,7 @@ net/minecraft/src/EmptyChunk.func_76611_b(II)I=|p_76611_1_,p_76611_2_
 net/minecraft/src/EmptyChunk.func_76612_a(Lnet/minecraft/src/Entity;)V=|p_76612_1_
 net/minecraft/src/EmptyChunk.func_76614_a(Lnet/minecraft/src/EnumSkyBlock;III)I=|p_76614_1_,p_76614_2_,p_76614_3_,p_76614_4_
 net/minecraft/src/EmptyChunk.func_76617_a(J)Ljava/util/Random;=|p_76617_1_
-net/minecraft/src/EmptyChunk.func_76618_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/EntitySelector;)V=|p_76618_1_,p_76618_2_,p_76618_3_,p_76618_4_
+net/minecraft/src/EmptyChunk.func_76618_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/IEntitySelector;)V=|p_76618_1_,p_76618_2_,p_76618_3_,p_76618_4_
 net/minecraft/src/EmptyChunk.func_76619_d(III)Z=|p_76619_1_,p_76619_2_,p_76619_3_
 net/minecraft/src/EmptyChunk.func_76620_a(Lnet/minecraft/src/TileEntity;)V=|p_76620_1_
 net/minecraft/src/EmptyChunk.func_76622_b(Lnet/minecraft/src/Entity;)V=|p_76622_1_
@@ -2264,7 +2263,7 @@ net/minecraft/src/EntityAIMoveTowardsTarget.<init>(Lnet/minecraft/src/EntityCrea
 net/minecraft/src/EntityAIMoveTwardsRestriction.<init>(Lnet/minecraft/src/EntityCreature;F)V=|p_i3480_1_,p_i3480_2_
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(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.<init>(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.<init>(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/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FIZZLnet/minecraft/src/IEntitySelector;)V=|p_i5011_1_,p_i5011_2_,p_i5011_3_,p_i5011_4_,p_i5011_5_,p_i5011_6_,p_i5011_7_
 net/minecraft/src/EntityAINearestAttackableTargetSorter.<init>(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_
@@ -2424,7 +2423,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.<init>(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.<init>(Lnet/minecraft/src/IEntityMultiPart;Ljava/lang/String;FF)V=|p_i5012_1_,p_i5012_2_,p_i5012_3_,p_i5012_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_
@@ -3720,9 +3719,9 @@ net/minecraft/src/GuiStats.func_74147_l(Lnet/minecraft/src/GuiStats;)Lnet/minecr
 net/minecraft/src/GuiStats.func_74148_k(Lnet/minecraft/src/GuiStats;)Lnet/minecraft/src/FontRenderer;=|p_74148_0_
 net/minecraft/src/GuiStats.func_74149_a(Lnet/minecraft/src/GuiStats;IIIIII)V=|p_74149_0_,p_74149_1_,p_74149_2_,p_74149_3_,p_74149_4_,p_74149_5_,p_74149_6_
 net/minecraft/src/GuiStatsComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i4103_1_
-net/minecraft/src/GuiStatsComponent.func_82020_a(Lnet/minecraft/src/GuiStatsComponent;)V=|p_82020_0_
-net/minecraft/src/GuiStatsComponent.func_82021_a()V=|
-net/minecraft/src/GuiStatsComponent.func_82022_a([J)D=|p_82022_1_
+net/minecraft/src/GuiStatsComponent.func_79013_a(Lnet/minecraft/src/GuiStatsComponent;)V=|p_79013_0_
+net/minecraft/src/GuiStatsComponent.func_79014_a()V=|
+net/minecraft/src/GuiStatsComponent.func_79015_a([J)D=|p_79015_1_
 net/minecraft/src/GuiStatsComponent.paint(Ljava/awt/Graphics;)V=|p_paint_1_
 net/minecraft/src/GuiStatsListener.<init>(Lnet/minecraft/src/GuiStatsComponent;)V=|p_i4109_1_
 net/minecraft/src/GuiStatsListener.actionPerformed(Ljava/awt/event/ActionEvent;)V=|p_actionPerformed_1_
@@ -4707,7 +4706,7 @@ net/minecraft/src/NetLoginHandler.func_72527_a(Ljava/lang/String;)V=|p_72527_1_
 net/minecraft/src/NetLoginHandler.func_72530_b(Lnet/minecraft/src/NetLoginHandler;)Lnet/minecraft/server/MinecraftServer;=|p_72530_0_
 net/minecraft/src/NetLoginHandler.func_72531_a(Lnet/minecraft/src/NetLoginHandler;Z)Z=|p_72531_0_,p_72531_1_
 net/minecraft/src/NetLoginHandler.func_72533_d(Lnet/minecraft/src/NetLoginHandler;)Ljava/lang/String;=|p_72533_0_
-net/minecraft/src/NetServerHandler.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/NetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V=|p_i3401_1_,p_i3401_2_,p_i3401_3_
+net/minecraft/src/NetServerHandler.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/INetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V=|p_i5010_1_,p_i5010_2_,p_i5010_3_
 net/minecraft/src/NetServerHandler.func_72458_a(Lnet/minecraft/src/Packet205ClientCommand;)V=|p_72458_1_
 net/minecraft/src/NetServerHandler.func_72461_a(Lnet/minecraft/src/Packet203AutoComplete;)V=|p_72461_1_
 net/minecraft/src/NetServerHandler.func_72464_a(Lnet/minecraft/src/Packet107CreativeSetSlot;)V=|p_72464_1_
@@ -5524,7 +5523,7 @@ net/minecraft/src/RenderEngine.func_78351_a(Ljava/awt/image/BufferedImage;I)V=|p
 net/minecraft/src/RenderEngine.func_78353_a(Ljava/awt/image/BufferedImage;)I=|p_78353_1_
 net/minecraft/src/RenderEngine.func_78354_c(Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;=|p_78354_1_
 net/minecraft/src/RenderEngine.func_78355_a(Lnet/minecraft/src/TextureFX;)V=|p_78355_1_
-net/minecraft/src/RenderEngine.func_78356_a(Ljava/lang/String;Lnet/minecraft/src/ImageBuffer;)Lnet/minecraft/src/ThreadDownloadImageData;=|p_78356_1_,p_78356_2_
+net/minecraft/src/RenderEngine.func_78356_a(Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)Lnet/minecraft/src/ThreadDownloadImageData;=|p_78356_1_,p_78356_2_
 net/minecraft/src/RenderEngine.func_82772_a(Lnet/minecraft/src/TextureFX;I)I=|p_82772_1_,p_82772_2_
 net/minecraft/src/RenderEngine.func_82773_c(Ljava/lang/String;)Z=|p_82773_1_
 net/minecraft/src/RenderEntity.func_76986_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_76986_1_,p_76986_2_,p_76986_4_,p_76986_6_,p_76986_8_,p_76986_9_
@@ -5805,7 +5804,7 @@ net/minecraft/src/ServerCommandManager.func_71563_a(Lnet/minecraft/src/ICommandS
 net/minecraft/src/ServerConfigurationManager.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3376_1_
 net/minecraft/src/ServerConfigurationManager.func_72353_e(Ljava/lang/String;)Z=|p_72353_1_
 net/minecraft/src/ServerConfigurationManager.func_72354_b(Lnet/minecraft/src/EntityPlayerMP;Lnet/minecraft/src/WorldServer;)V=|p_72354_1_,p_72354_2_
-net/minecraft/src/ServerConfigurationManager.func_72355_a(Lnet/minecraft/src/NetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V=|p_72355_1_,p_72355_2_
+net/minecraft/src/ServerConfigurationManager.func_72355_a(Lnet/minecraft/src/INetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V=|p_72355_1_,p_72355_2_
 net/minecraft/src/ServerConfigurationManager.func_72356_a(Lnet/minecraft/src/EntityPlayerMP;I)V=|p_72356_1_,p_72356_2_
 net/minecraft/src/ServerConfigurationManager.func_72357_a(Lnet/minecraft/src/EnumGameType;)V=|p_72357_1_
 net/minecraft/src/ServerConfigurationManager.func_72358_d(Lnet/minecraft/src/EntityPlayerMP;)V=|p_72358_1_
@@ -5840,11 +5839,11 @@ net/minecraft/src/ServerData.func_78837_a(Lnet/minecraft/src/NBTTagCompound;)Lne
 net/minecraft/src/ServerData.func_78838_a(Z)V=|p_78838_1_
 net/minecraft/src/ServerData.func_82819_b(Z)V=|p_82819_1_
 net/minecraft/src/ServerGUI.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i4106_1_
-net/minecraft/src/ServerGUI.func_82032_a(Lnet/minecraft/src/DedicatedServer;)V=|p_82032_0_
-net/minecraft/src/ServerGUI.func_82033_a(Lnet/minecraft/src/ServerGUI;)Lnet/minecraft/src/DedicatedServer;=|p_82033_0_
-net/minecraft/src/ServerGUI.func_82034_d()Ljavax/swing/JComponent;=|
-net/minecraft/src/ServerGUI.func_82035_b()Ljavax/swing/JComponent;=|
-net/minecraft/src/ServerGUI.func_82036_c()Ljavax/swing/JComponent;=|
+net/minecraft/src/ServerGUI.func_79003_a(Lnet/minecraft/src/DedicatedServer;)V=|p_79003_0_
+net/minecraft/src/ServerGUI.func_79004_a(Lnet/minecraft/src/ServerGUI;)Lnet/minecraft/src/DedicatedServer;=|p_79004_0_
+net/minecraft/src/ServerGUI.func_79005_d()Ljavax/swing/JComponent;=|
+net/minecraft/src/ServerGUI.func_79006_b()Ljavax/swing/JComponent;=|
+net/minecraft/src/ServerGUI.func_79007_c()Ljavax/swing/JComponent;=|
 net/minecraft/src/ServerGuiCommandListener.<init>(Lnet/minecraft/src/ServerGUI;Ljavax/swing/JTextField;)V=|p_i4104_1_,p_i4104_2_
 net/minecraft/src/ServerGuiCommandListener.actionPerformed(Ljava/awt/event/ActionEvent;)V=|p_actionPerformed_1_
 net/minecraft/src/ServerGuiFocusAdapter.<init>(Lnet/minecraft/src/ServerGUI;)V=|p_i4107_1_
@@ -6150,12 +6149,12 @@ net/minecraft/src/TexturePackImplementation.func_77535_b(Lnet/minecraft/src/Rend
 net/minecraft/src/TexturePackImplementation.func_77541_b(Ljava/lang/String;)Ljava/lang/String;=|p_77541_0_
 net/minecraft/src/TexturePackList.<init>(Ljava/io/File;Lnet/minecraft/client/Minecraft;)V=|p_i3025_1_,p_i3025_2_
 net/minecraft/src/TexturePackList.func_77291_a(Lnet/minecraft/src/TexturePackList;Ljava/io/File;)Ljava/lang/String;=|p_77291_0_,p_77291_1_
-net/minecraft/src/TexturePackList.func_77294_a(Lnet/minecraft/src/TexturePackBase;)Z=|p_77294_1_
+net/minecraft/src/TexturePackList.func_77294_a(Lnet/minecraft/src/ITexturePack;)Z=|p_77294_1_
 net/minecraft/src/TexturePackList.func_77296_a(Ljava/lang/String;)V=|p_77296_1_
 net/minecraft/src/TexturePackList.func_77297_a(Ljava/lang/String;Ljava/io/File;)V=|p_77297_1_,p_77297_2_
 net/minecraft/src/TexturePackList.func_77301_a(Lnet/minecraft/src/TexturePackList;)Z=|p_77301_0_
 net/minecraft/src/TexturePackList.func_77302_a(Ljava/io/File;)Ljava/lang/String;=|p_77302_1_
-net/minecraft/src/TexturePackList.func_77303_a(Lnet/minecraft/src/TexturePackList;Lnet/minecraft/src/TexturePackBase;)Lnet/minecraft/src/TexturePackBase;=|p_77303_0_,p_77303_1_
+net/minecraft/src/TexturePackList.func_77303_a(Lnet/minecraft/src/TexturePackList;Lnet/minecraft/src/ITexturePack;)Lnet/minecraft/src/ITexturePack;=|p_77303_0_,p_77303_1_
 net/minecraft/src/TexturePackList.func_77306_b(Lnet/minecraft/src/TexturePackList;)Lnet/minecraft/client/Minecraft;=|p_77306_0_
 net/minecraft/src/TextureWatchFX.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3214_1_
 net/minecraft/src/TexturedQuad.<init>([Lnet/minecraft/src/PositionTextureVertex;)V=|p_i3136_1_
@@ -6165,8 +6164,8 @@ net/minecraft/src/ThreadClientSleep.<init>(Lnet/minecraft/client/Minecraft;Ljava
 net/minecraft/src/ThreadConnectToServer.<init>(Lnet/minecraft/src/GuiConnecting;Ljava/lang/String;I)V=|p_i3110_1_,p_i3110_2_,p_i3110_3_
 net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i4100_1_
 net/minecraft/src/ThreadDedicatedServer.run()V=|
-net/minecraft/src/ThreadDownloadImage.<init>(Lnet/minecraft/src/ThreadDownloadImageData;Ljava/lang/String;Lnet/minecraft/src/ImageBuffer;)V=|p_i3193_1_,p_i3193_2_,p_i3193_3_
-net/minecraft/src/ThreadDownloadImageData.<init>(Ljava/lang/String;Lnet/minecraft/src/ImageBuffer;)V=|p_i3195_1_,p_i3195_2_
+net/minecraft/src/ThreadDownloadImage.<init>(Lnet/minecraft/src/ThreadDownloadImageData;Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)V=|p_i5000_1_,p_i5000_2_,p_i5000_3_
+net/minecraft/src/ThreadDownloadImageData.<init>(Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)V=|p_i5001_1_,p_i5001_2_
 net/minecraft/src/ThreadDownloadResources.<init>(Ljava/io/File;Lnet/minecraft/client/Minecraft;)V=|p_i3000_1_,p_i3000_2_
 net/minecraft/src/ThreadDownloadResources.func_74572_a(Ljava/net/URL;Ljava/io/File;J)V=java/io/IOException|p_74572_1_,p_74572_2_,p_74572_3_
 net/minecraft/src/ThreadDownloadResources.func_74575_a(Ljava/net/URL;Ljava/lang/String;JI)V=|p_74575_1_,p_74575_2_,p_74575_3_,p_74575_5_
@@ -6179,8 +6178,6 @@ net/minecraft/src/ThreadLanServerPing.func_77525_a(Ljava/lang/String;Ljava/lang/
 net/minecraft/src/ThreadLoginVerifier.<init>(Lnet/minecraft/src/NetLoginHandler;)V=|p_i3399_1_
 net/minecraft/src/ThreadMinecraftServer.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i5039_1_,p_i5039_2_
 net/minecraft/src/ThreadPollServers.<init>(Lnet/minecraft/src/GuiSlotServer;Lnet/minecraft/src/ServerData;)V=|p_i3040_1_,p_i3040_2_
-net/minecraft/src/ThreadServerApplication.<init>(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.<init>(Lnet/minecraft/src/StatsSyncher;)V=|p_i3219_1_
 net/minecraft/src/ThreadStatSyncherSend.<init>(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;)V=|p_i3217_1_,p_i3217_2_
 net/minecraft/src/ThreadedFileIOBase.func_75734_a()V=java/lang/InterruptedException|
@@ -6522,7 +6519,7 @@ net/minecraft/src/World.func_72976_f(II)I=|p_72976_1_,p_72976_2_
 net/minecraft/src/World.func_72977_a(DDDD)Lnet/minecraft/src/EntityPlayer;=|p_72977_1_,p_72977_3_,p_72977_5_,p_72977_7_
 net/minecraft/src/World.func_72978_e(Lnet/minecraft/src/AxisAlignedBB;)Z=|p_72978_1_
 net/minecraft/src/World.func_72980_b(DDDLjava/lang/String;FF)V=|p_72980_1_,p_72980_3_,p_72980_5_,p_72980_7_,p_72980_8_,p_72980_9_
-net/minecraft/src/World.func_82733_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/EntitySelector;)Ljava/util/List;=|p_82733_1_,p_82733_2_,p_82733_3_
+net/minecraft/src/World.func_82733_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/IEntitySelector;)Ljava/util/List;=|p_82733_1_,p_82733_2_,p_82733_3_
 net/minecraft/src/World.func_82734_g(II)I=|p_82734_1_,p_82734_2_
 net/minecraft/src/World.func_82735_a(Lnet/minecraft/src/EntityMinecart;)Lnet/minecraft/src/IUpdatePlayerListBox;=|p_82735_1_
 net/minecraft/src/World.func_82738_a(J)V=|p_82738_1_
@@ -6556,7 +6553,6 @@ net/minecraft/src/WorldClient.func_72914_a(Lnet/minecraft/src/CrashReport;)Lnet/
 net/minecraft/src/WorldClient.func_72923_a(Lnet/minecraft/src/Entity;)V=|p_72923_1_
 net/minecraft/src/WorldClient.func_72980_b(DDDLjava/lang/String;FF)V=|p_72980_1_,p_72980_3_,p_72980_5_,p_72980_7_,p_72980_8_,p_72980_9_
 net/minecraft/src/WorldClient.func_73023_g(IIIII)Z=|p_73023_1_,p_73023_2_,p_73023_3_,p_73023_4_,p_73023_5_
-net/minecraft/src/WorldClient.func_73024_a(I)Lnet/minecraft/src/Entity;=|p_73024_1_
 net/minecraft/src/WorldClient.func_73025_a(IIZ)V=|p_73025_1_,p_73025_2_,p_73025_3_
 net/minecraft/src/WorldClient.func_73026_a(Lnet/minecraft/src/WorldClient;)Ljava/util/Set;=|p_73026_0_
 net/minecraft/src/WorldClient.func_73027_a(ILnet/minecraft/src/Entity;)V=|p_73027_1_,p_73027_2_
@@ -6564,6 +6560,7 @@ net/minecraft/src/WorldClient.func_73028_b(I)Lnet/minecraft/src/Entity;=|p_73028
 net/minecraft/src/WorldClient.func_73029_E(III)V=|p_73029_1_,p_73029_2_,p_73029_3_
 net/minecraft/src/WorldClient.func_73030_b(Lnet/minecraft/src/WorldClient;)Ljava/util/Set;=|p_73030_0_
 net/minecraft/src/WorldClient.func_73031_a(IIIIII)V=|p_73031_1_,p_73031_2_,p_73031_3_,p_73031_4_,p_73031_5_,p_73031_6_
+net/minecraft/src/WorldClient.func_73045_a(I)Lnet/minecraft/src/Entity;=|p_73045_1_
 net/minecraft/src/WorldClient.func_82735_a(Lnet/minecraft/src/EntityMinecart;)Lnet/minecraft/src/IUpdatePlayerListBox;=|p_82735_1_
 net/minecraft/src/WorldGenBigMushroom.<init>(I)V=|p_i3793_1_
 net/minecraft/src/WorldGenBigMushroom.func_76484_a(Lnet/minecraft/src/World;Ljava/util/Random;III)Z=|p_76484_1_,p_76484_2_,p_76484_3_,p_76484_4_,p_76484_5_

fml/conf/joined.srg

@@ -629,7 +629,7 @@ CL: ayr net/minecraft/src/ChestItemRenderHelper
 CL: ays net/minecraft/src/EntityRenderer
 CL: ayt net/minecraft/src/ThreadDownloadImageData
 CL: ayu net/minecraft/src/ThreadDownloadImage
-CL: ayv net/minecraft/src/ImageBuffer
+CL: ayv net/minecraft/src/IImageBuffer
 CL: ayw net/minecraft/src/ItemRenderer
 CL: ayx net/minecraft/src/RenderGlobal
 CL: ayy net/minecraft/src/ImageBufferDownload
@@ -724,7 +724,7 @@ CL: bcj net/minecraft/src/TexturePackImplementation
 CL: bck net/minecraft/src/TexturePackDefault
 CL: bcl net/minecraft/src/TexturePackCustom
 CL: bcm net/minecraft/src/TexturePackFolder
-CL: bcn net/minecraft/src/TexturePackBase
+CL: bcn net/minecraft/src/ITexturePack
 CL: bco net/minecraft/src/TexturePackList
 CL: bcp net/minecraft/src/TexturePackDownloadSuccess
 CL: bcq net/minecraft/src/GuiTexturePacks
@@ -758,7 +758,7 @@ CL: bq net/minecraft/src/CompressedStreamTools
 CL: br net/minecraft/src/NBTTagShort
 CL: bs net/minecraft/src/NBTTagString
 CL: bt net/minecraft/src/NBTBase
-CL: bu net/minecraft/src/NetworkManager
+CL: bu net/minecraft/src/INetworkManager
 CL: bv net/minecraft/src/MemoryConnection
 CL: bw net/minecraft/src/TcpConnection
 CL: bx net/minecraft/src/TcpReaderThread
@@ -1002,7 +1002,7 @@ CL: lb net/minecraft/src/EnumEntitySizeHelper
 CL: lc net/minecraft/src/EnumEntitySize
 CL: le net/minecraft/src/EntityList
 CL: lf net/minecraft/src/EntityEggInfo
-CL: lh net/minecraft/src/EntitySelector
+CL: lh net/minecraft/src/IEntitySelector
 CL: li net/minecraft/src/EntityXPOrb
 CL: lj net/minecraft/src/EntityFlying
 CL: lk net/minecraft/src/EntityHanging
@@ -1098,8 +1098,8 @@ CL: op net/minecraft/src/EntitySquid
 CL: oq net/minecraft/src/EntityIronGolem
 CL: or net/minecraft/src/EntityWaterMob
 CL: os net/minecraft/src/EntityWolf
-CL: ot net/minecraft/src/EntityDragonBase
-CL: ou net/minecraft/src/EntityMultiPart
+CL: ot net/minecraft/src/IBossDisplayData
+CL: ou net/minecraft/src/IEntityMultiPart
 CL: ov net/minecraft/src/EntityDragonPart
 CL: ow net/minecraft/src/EntityEnderCrystal
 CL: ox net/minecraft/src/EntityDragon
@@ -4361,27 +4361,27 @@ FD: ff/a net/minecraft/src/ServerCommand/field_73702_a
 FD: ff/b net/minecraft/src/ServerCommand/field_73701_b
 FD: fh/a net/minecraft/src/ConsoleLogManager/field_73700_a
 FD: fi/a net/minecraft/src/ConsoleLogFormatter/field_74268_a
-FD: fj/b net/minecraft/src/ConvertProgressUpdater/field_74267_a
-FD: fk/b net/minecraft/src/BehaviorMinecraftServer_10/field_82494_b
-FD: fk/c net/minecraft/src/BehaviorMinecraftServer_10/field_82495_c
-FD: fl/b net/minecraft/src/BehaviorMinecraftServer_11/field_82496_b
-FD: fl/c net/minecraft/src/BehaviorMinecraftServer_11/field_82497_c
+FD: fj/b net/minecraft/src/BehaviorArrowDispense/field_74267_a
+FD: fk/b net/minecraft/src/BehaviorBucketFullDispense/field_82494_b
+FD: fk/c net/minecraft/src/BehaviorBucketFullDispense/field_82495_c
+FD: fl/b net/minecraft/src/BehaviorBucketEmptyDispense/field_82496_b
+FD: fl/c net/minecraft/src/BehaviorBucketEmptyDispense/field_82497_c
 FD: fm/a net/minecraft/src/ConvertingProgressUpdate/field_82310_a
 FD: fm/b net/minecraft/src/ConvertingProgressUpdate/field_82309_b
 FD: fn/a net/minecraft/src/ThreadDedicatedServer/field_82012_a
 FD: fo/a net/minecraft/src/ThreadMinecraftServer/field_82553_a
-FD: fp/a net/minecraft/src/CallableVanilla/field_82557_a
-FD: fq/a net/minecraft/src/CallableMinecraftServer_16/field_82555_a
-FD: fr/a net/minecraft/src/CallableMemoryStats/field_82552_a
-FD: fs/a net/minecraft/src/CallableMinecraftServer_18/field_82550_a
+FD: fp/a net/minecraft/src/CallableIsServerModded/field_82557_a
+FD: fq/a net/minecraft/src/CallableServerProfiler/field_82555_a
+FD: fr/a net/minecraft/src/CallableServerMemoryStats/field_82552_a
+FD: fs/a net/minecraft/src/CallablePlayers/field_82550_a
 FD: ft/b net/minecraft/src/BehaviorEggDispense/field_82503_b
-FD: fu/b net/minecraft/src/ThreadServerApplication/field_73716_a
-FD: fv/b net/minecraft/src/CallableIsServerModded/field_74274_a
-FD: fw/b net/minecraft/src/CallableServerProfiler/field_74272_a
-FD: fw/c net/minecraft/src/CallableServerProfiler/field_82484_c
-FD: fx/b net/minecraft/src/BehaviorPotionDispense/field_82501_b
-FD: fx/c net/minecraft/src/BehaviorPotionDispense/field_82502_c
-FD: fy/b net/minecraft/src/CallablePlayers/field_74270_a
+FD: fu/b net/minecraft/src/BehaviorSnowballDispense/field_73716_a
+FD: fv/b net/minecraft/src/BehaviorExpBottleDispense/field_74274_a
+FD: fw/b net/minecraft/src/BehaviorPotionDispense/field_74272_a
+FD: fw/c net/minecraft/src/BehaviorPotionDispense/field_82484_c
+FD: fx/b net/minecraft/src/BehaviorPotionDispenseLogic/field_82501_b
+FD: fx/c net/minecraft/src/BehaviorPotionDispenseLogic/field_82502_c
+FD: fy/b net/minecraft/src/BehaviorMobEggDispense/field_74270_a
 FD: fz/b net/minecraft/src/BehaviorDispenseFireball/field_82504_b
 FD: g/a net/minecraft/src/CallableJVMFlags/field_71488_a
 FD: ga/b net/minecraft/src/BehaviorDispenseMinecart/field_82490_b
@@ -9826,7 +9826,7 @@ MD: awq/c ()V net/minecraft/src/NetClientHandler/func_72547_c ()V
 MD: awq/c (Ldw;)V net/minecraft/src/NetClientHandler/func_72552_c (Lnet/minecraft/src/Packet;)V
 MD: awq/d ()V net/minecraft/src/NetClientHandler/func_72551_d ()V
 MD: awq/e ()V net/minecraft/src/NetClientHandler/func_72553_e ()V
-MD: awq/f ()Lbu; net/minecraft/src/NetClientHandler/func_72548_f ()Lnet/minecraft/src/NetworkManager;
+MD: awq/f ()Lbu; net/minecraft/src/NetClientHandler/func_72548_f ()Lnet/minecraft/src/INetworkManager;
 MD: awr/a (ZI)V net/minecraft/src/NetClientWebTextures/func_73878_a (ZI)V
 MD: aws/A_ ()V net/minecraft/src/GuiConfirmOpenLink/func_73866_w_ ()V
 MD: aws/a (IIF)V net/minecraft/src/GuiConfirmOpenLink/func_73863_a (IIF)V
@@ -9894,7 +9894,7 @@ MD: awx/j ()V net/minecraft/src/PlayerControllerMP/func_78750_j ()V
 MD: awy/B ()V net/minecraft/src/WorldClient/func_72882_A ()V
 MD: awy/E (III)V net/minecraft/src/WorldClient/func_73029_E (III)V
 MD: awy/a ()V net/minecraft/src/WorldClient/func_73022_a ()V
-MD: awy/a (I)Lla; net/minecraft/src/WorldClient/func_73024_a (I)Lnet/minecraft/src/Entity;
+MD: awy/a (I)Lla; net/minecraft/src/WorldClient/func_73045_a (I)Lnet/minecraft/src/Entity;
 MD: awy/a (IIZ)V net/minecraft/src/WorldClient/func_73025_a (IIZ)V
 MD: awy/a (ILla;)V net/minecraft/src/WorldClient/func_73027_a (ILnet/minecraft/src/Entity;)V
 MD: awy/a (La;)La; net/minecraft/src/WorldClient/func_72914_a (Lnet/minecraft/src/CrashReport;)Lnet/minecraft/src/CrashReport;
@@ -10098,7 +10098,7 @@ MD: aym/c ()V net/minecraft/src/EntityOtherPlayerMP/func_70636_d ()V
 MD: aym/e ()F net/minecraft/src/EntityOtherPlayerMP/func_70047_e ()F
 MD: aym/e_ ()V net/minecraft/src/EntityOtherPlayerMP/func_71061_d_ ()V
 MD: aym/j_ ()V net/minecraft/src/EntityOtherPlayerMP/func_70071_h_ ()V
-MD: ayn/a (Lot;Z)V net/minecraft/src/BossStatus/func_82824_a (Lnet/minecraft/src/EntityDragonBase;Z)V
+MD: ayn/a (Lot;Z)V net/minecraft/src/BossStatus/func_82824_a (Lnet/minecraft/src/IBossDisplayData;Z)V
 MD: ayo/a ()V net/minecraft/src/WorldRenderer/func_78907_a ()V
 MD: ayo/a (I)I net/minecraft/src/WorldRenderer/func_78909_a (I)I
 MD: ayo/a (III)V net/minecraft/src/WorldRenderer/func_78913_a (III)V
@@ -10140,7 +10140,7 @@ MD: ays/g (F)V net/minecraft/src/EntityRenderer/func_78467_g (F)V
 MD: ays/h (F)V net/minecraft/src/EntityRenderer/func_78472_g (F)V
 MD: ays/i (F)V net/minecraft/src/EntityRenderer/func_78466_h (F)V
 MD: ayu/run ()V net/minecraft/src/ThreadDownloadImage/run ()V
-MD: ayv/a (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; net/minecraft/src/ImageBuffer/func_78432_a (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
+MD: ayv/a (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; net/minecraft/src/IImageBuffer/func_78432_a (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage;
 MD: ayw/a ()V net/minecraft/src/ItemRenderer/func_78441_a ()V
 MD: ayw/a (F)V net/minecraft/src/ItemRenderer/func_78440_a (F)V
 MD: ayw/a (FI)V net/minecraft/src/ItemRenderer/func_78446_a (FI)V
@@ -10225,7 +10225,7 @@ MD: azb/a (Ljava/awt/image/BufferedImage;I)V net/minecraft/src/RenderEngine/func
 MD: azb/a (Ljava/awt/image/BufferedImage;[I)[I net/minecraft/src/RenderEngine/func_78340_a (Ljava/awt/image/BufferedImage;[I)[I
 MD: azb/a (Ljava/io/InputStream;)Ljava/awt/image/BufferedImage; net/minecraft/src/RenderEngine/func_78345_a (Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;
 MD: azb/a (Ljava/lang/String;)[I net/minecraft/src/RenderEngine/func_78346_a (Ljava/lang/String;)[I
-MD: azb/a (Ljava/lang/String;Layv;)Layt; net/minecraft/src/RenderEngine/func_78356_a (Ljava/lang/String;Lnet/minecraft/src/ImageBuffer;)Lnet/minecraft/src/ThreadDownloadImageData;
+MD: azb/a (Ljava/lang/String;Layv;)Layt; net/minecraft/src/RenderEngine/func_78356_a (Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)Lnet/minecraft/src/ThreadDownloadImageData;
 MD: azb/a (Ljava/lang/String;Ljava/lang/String;)I net/minecraft/src/RenderEngine/func_78350_a (Ljava/lang/String;Ljava/lang/String;)I
 MD: azb/a ([IIII)V net/minecraft/src/RenderEngine/func_78349_a ([IIII)V
 MD: azb/b ()V net/minecraft/src/RenderEngine/func_78352_b ()V
@@ -10686,18 +10686,18 @@ MD: bcl/a (Lazb;)V net/minecraft/src/TexturePackCustom/func_77533_a (Lnet/minecr
 MD: bcl/a (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackCustom/func_77532_a (Ljava/lang/String;)Ljava/io/InputStream;
 MD: bcl/g ()V net/minecraft/src/TexturePackCustom/func_77549_g ()V
 MD: bcm/a (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackFolder/func_77532_a (Ljava/lang/String;)Ljava/io/InputStream;
-MD: bcn/a (Lazb;)V net/minecraft/src/TexturePackBase/func_77533_a (Lnet/minecraft/src/RenderEngine;)V
-MD: bcn/a (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackBase/func_77532_a (Ljava/lang/String;)Ljava/io/InputStream;
-MD: bcn/b ()Ljava/lang/String; net/minecraft/src/TexturePackBase/func_77536_b ()Ljava/lang/String;
-MD: bcn/b (Lazb;)V net/minecraft/src/TexturePackBase/func_77535_b (Lnet/minecraft/src/RenderEngine;)V
-MD: bcn/c ()Ljava/lang/String; net/minecraft/src/TexturePackBase/func_77538_c ()Ljava/lang/String;
-MD: bcn/d ()Ljava/lang/String; net/minecraft/src/TexturePackBase/func_77531_d ()Ljava/lang/String;
-MD: bcn/e ()Ljava/lang/String; net/minecraft/src/TexturePackBase/func_77537_e ()Ljava/lang/String;
-MD: bcn/f ()I net/minecraft/src/TexturePackBase/func_77534_f ()I
+MD: bcn/a (Lazb;)V net/minecraft/src/ITexturePack/func_77533_a (Lnet/minecraft/src/RenderEngine;)V
+MD: bcn/a (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/ITexturePack/func_77532_a (Ljava/lang/String;)Ljava/io/InputStream;
+MD: bcn/b ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77536_b ()Ljava/lang/String;
+MD: bcn/b (Lazb;)V net/minecraft/src/ITexturePack/func_77535_b (Lnet/minecraft/src/RenderEngine;)V
+MD: bcn/c ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77538_c ()Ljava/lang/String;
+MD: bcn/d ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77531_d ()Ljava/lang/String;
+MD: bcn/e ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77537_e ()Ljava/lang/String;
+MD: bcn/f ()I net/minecraft/src/ITexturePack/func_77534_f ()I
 MD: bco/a ()Z net/minecraft/src/TexturePackList/func_77295_a ()Z
-MD: bco/a (Lbcn;)Z net/minecraft/src/TexturePackList/func_77294_a (Lnet/minecraft/src/TexturePackBase;)Z
+MD: bco/a (Lbcn;)Z net/minecraft/src/TexturePackList/func_77294_a (Lnet/minecraft/src/ITexturePack;)Z
 MD: bco/a (Lbco;)Z net/minecraft/src/TexturePackList/func_77301_a (Lnet/minecraft/src/TexturePackList;)Z
-MD: bco/a (Lbco;Lbcn;)Lbcn; net/minecraft/src/TexturePackList/func_77303_a (Lnet/minecraft/src/TexturePackList;Lnet/minecraft/src/TexturePackBase;)Lnet/minecraft/src/TexturePackBase;
+MD: bco/a (Lbco;Lbcn;)Lbcn; net/minecraft/src/TexturePackList/func_77303_a (Lnet/minecraft/src/TexturePackList;Lnet/minecraft/src/ITexturePack;)Lnet/minecraft/src/ITexturePack;
 MD: bco/a (Lbco;Ljava/io/File;)Ljava/lang/String; net/minecraft/src/TexturePackList/func_77291_a (Lnet/minecraft/src/TexturePackList;Ljava/io/File;)Ljava/lang/String;
 MD: bco/a (Ljava/io/File;)Ljava/lang/String; net/minecraft/src/TexturePackList/func_77302_a (Ljava/io/File;)Ljava/lang/String;
 MD: bco/a (Ljava/lang/String;)V net/minecraft/src/TexturePackList/func_77296_a (Ljava/lang/String;)V
@@ -10706,7 +10706,7 @@ MD: bco/b ()V net/minecraft/src/TexturePackList/func_77304_b ()V
 MD: bco/b (Lbco;)Lnet/minecraft/client/Minecraft; net/minecraft/src/TexturePackList/func_77306_b (Lnet/minecraft/src/TexturePackList;)Lnet/minecraft/client/Minecraft;
 MD: bco/c ()V net/minecraft/src/TexturePackList/func_77305_c ()V
 MD: bco/d ()Ljava/util/List; net/minecraft/src/TexturePackList/func_77293_d ()Ljava/util/List;
-MD: bco/e ()Lbcn; net/minecraft/src/TexturePackList/func_77292_e ()Lnet/minecraft/src/TexturePackBase;
+MD: bco/e ()Lbcn; net/minecraft/src/TexturePackList/func_77292_e ()Lnet/minecraft/src/ITexturePack;
 MD: bco/f ()Z net/minecraft/src/TexturePackList/func_77300_f ()Z
 MD: bco/g ()Z net/minecraft/src/TexturePackList/func_77298_g ()Z
 MD: bco/h ()V net/minecraft/src/TexturePackList/func_77307_h ()V
@@ -10971,15 +10971,15 @@ MD: bt/e ()Ljava/lang/String; net/minecraft/src/NBTBase/func_74740_e ()Ljava/lan
 MD: bt/equals (Ljava/lang/Object;)Z net/minecraft/src/NBTBase/equals (Ljava/lang/Object;)Z
 MD: bt/hashCode ()I net/minecraft/src/NBTBase/hashCode ()I
 MD: bt/p (Ljava/lang/String;)Lbt; net/minecraft/src/NBTBase/func_74738_o (Ljava/lang/String;)Lnet/minecraft/src/NBTBase;
-MD: bu/a ()V net/minecraft/src/NetworkManager/func_74427_a ()V
-MD: bu/a (Ldw;)V net/minecraft/src/NetworkManager/func_74429_a (Lnet/minecraft/src/Packet;)V
-MD: bu/a (Ldx;)V net/minecraft/src/NetworkManager/func_74425_a (Lnet/minecraft/src/NetHandler;)V
-MD: bu/a (Ljava/lang/String;[Ljava/lang/Object;)V net/minecraft/src/NetworkManager/func_74424_a (Ljava/lang/String;[Ljava/lang/Object;)V
-MD: bu/b ()V net/minecraft/src/NetworkManager/func_74428_b ()V
-MD: bu/c ()Ljava/net/SocketAddress; net/minecraft/src/NetworkManager/func_74430_c ()Ljava/net/SocketAddress;
-MD: bu/d ()V net/minecraft/src/NetworkManager/func_74423_d ()V
-MD: bu/e ()I net/minecraft/src/NetworkManager/func_74426_e ()I
-MD: bu/f ()V net/minecraft/src/NetworkManager/func_74431_f ()V
+MD: bu/a ()V net/minecraft/src/INetworkManager/func_74427_a ()V
+MD: bu/a (Ldw;)V net/minecraft/src/INetworkManager/func_74429_a (Lnet/minecraft/src/Packet;)V
+MD: bu/a (Ldx;)V net/minecraft/src/INetworkManager/func_74425_a (Lnet/minecraft/src/NetHandler;)V
+MD: bu/a (Ljava/lang/String;[Ljava/lang/Object;)V net/minecraft/src/INetworkManager/func_74424_a (Ljava/lang/String;[Ljava/lang/Object;)V
+MD: bu/b ()V net/minecraft/src/INetworkManager/func_74428_b ()V
+MD: bu/c ()Ljava/net/SocketAddress; net/minecraft/src/INetworkManager/func_74430_c ()Ljava/net/SocketAddress;
+MD: bu/d ()V net/minecraft/src/INetworkManager/func_74423_d ()V
+MD: bu/e ()I net/minecraft/src/INetworkManager/func_74426_e ()I
+MD: bu/f ()V net/minecraft/src/INetworkManager/func_74431_f ()V
 MD: bv/a ()V net/minecraft/src/MemoryConnection/func_74427_a ()V
 MD: bv/a (Lbv;)V net/minecraft/src/MemoryConnection/func_74434_a (Lnet/minecraft/src/MemoryConnection;)V
 MD: bv/a (Ldw;)V net/minecraft/src/MemoryConnection/func_74429_a (Lnet/minecraft/src/Packet;)V
@@ -11556,9 +11556,9 @@ MD: fe/e ()V net/minecraft/src/BanList/func_73707_e ()V
 MD: fe/f ()V net/minecraft/src/BanList/func_73711_f ()V
 MD: fh/a ()V net/minecraft/src/ConsoleLogManager/func_73699_a ()V
 MD: fi/format (Ljava/util/logging/LogRecord;)Ljava/lang/String; net/minecraft/src/ConsoleLogFormatter/format (Ljava/util/logging/LogRecord;)Ljava/lang/String;
-MD: fj/a (Lxd;Law;)Lqm; net/minecraft/src/ConvertProgressUpdater/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
-MD: fk/b (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorMinecraftServer_10/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
-MD: fl/b (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorMinecraftServer_11/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
+MD: fj/a (Lxd;Law;)Lqm; net/minecraft/src/BehaviorArrowDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
+MD: fk/b (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorBucketFullDispense/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
+MD: fl/b (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorBucketEmptyDispense/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
 MD: fm/a ()V net/minecraft/src/ConvertingProgressUpdate/func_73717_a ()V
 MD: fm/a (I)V net/minecraft/src/ConvertingProgressUpdate/func_73718_a (I)V
 MD: fm/a (Ljava/lang/String;)V net/minecraft/src/ConvertingProgressUpdate/func_73720_a (Ljava/lang/String;)V
@@ -11566,25 +11566,25 @@ MD: fm/b (Ljava/lang/String;)V net/minecraft/src/ConvertingProgressUpdate/func_7
 MD: fm/c (Ljava/lang/String;)V net/minecraft/src/ConvertingProgressUpdate/func_73719_c (Ljava/lang/String;)V
 MD: fn/run ()V net/minecraft/src/ThreadDedicatedServer/run ()V
 MD: fo/run ()V net/minecraft/src/ThreadMinecraftServer/run ()V
-MD: fp/a ()Ljava/lang/String; net/minecraft/src/CallableVanilla/func_82556_a ()Ljava/lang/String;
-MD: fp/call ()Ljava/lang/Object; net/minecraft/src/CallableVanilla/call ()Ljava/lang/Object;
-MD: fq/a ()Ljava/lang/String; net/minecraft/src/CallableMinecraftServer_16/func_82554_a ()Ljava/lang/String;
-MD: fq/call ()Ljava/lang/Object; net/minecraft/src/CallableMinecraftServer_16/call ()Ljava/lang/Object;
-MD: fr/a ()Ljava/lang/String; net/minecraft/src/CallableMemoryStats/func_82551_a ()Ljava/lang/String;
-MD: fr/call ()Ljava/lang/Object; net/minecraft/src/CallableMemoryStats/call ()Ljava/lang/Object;
-MD: fs/a ()Ljava/lang/String; net/minecraft/src/CallableMinecraftServer_18/func_82549_a ()Ljava/lang/String;
-MD: fs/call ()Ljava/lang/Object; net/minecraft/src/CallableMinecraftServer_18/call ()Ljava/lang/Object;
+MD: fp/a ()Ljava/lang/String; net/minecraft/src/CallableIsServerModded/func_82556_a ()Ljava/lang/String;
+MD: fp/call ()Ljava/lang/Object; net/minecraft/src/CallableIsServerModded/call ()Ljava/lang/Object;
+MD: fq/a ()Ljava/lang/String; net/minecraft/src/CallableServerProfiler/func_82554_a ()Ljava/lang/String;
+MD: fq/call ()Ljava/lang/Object; net/minecraft/src/CallableServerProfiler/call ()Ljava/lang/Object;
+MD: fr/a ()Ljava/lang/String; net/minecraft/src/CallableServerMemoryStats/func_82551_a ()Ljava/lang/String;
+MD: fr/call ()Ljava/lang/Object; net/minecraft/src/CallableServerMemoryStats/call ()Ljava/lang/Object;
+MD: fs/a ()Ljava/lang/String; net/minecraft/src/CallablePlayers/func_82549_a ()Ljava/lang/String;
+MD: fs/call ()Ljava/lang/Object; net/minecraft/src/CallablePlayers/call ()Ljava/lang/Object;
 MD: ft/a (Lxd;Law;)Lqm; net/minecraft/src/BehaviorEggDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
-MD: fu/a (Lxd;Law;)Lqm; net/minecraft/src/ThreadServerApplication/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
-MD: fv/a ()F net/minecraft/src/CallableIsServerModded/func_82498_a ()F
-MD: fv/a (Lxd;Law;)Lqm; net/minecraft/src/CallableIsServerModded/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
-MD: fv/b ()F net/minecraft/src/CallableIsServerModded/func_82500_b ()F
-MD: fw/a (Lan;Ltu;)Ltu; net/minecraft/src/CallableServerProfiler/func_82482_a (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
-MD: fx/a ()F net/minecraft/src/BehaviorPotionDispense/func_82498_a ()F
-MD: fx/a (Lxd;Law;)Lqm; net/minecraft/src/BehaviorPotionDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
-MD: fx/b ()F net/minecraft/src/BehaviorPotionDispense/func_82500_b ()F
-MD: fy/a (Lan;)V net/minecraft/src/CallablePlayers/func_82485_a (Lnet/minecraft/src/IBlockSource;)V
-MD: fy/b (Lan;Ltu;)Ltu; net/minecraft/src/CallablePlayers/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
+MD: fu/a (Lxd;Law;)Lqm; net/minecraft/src/BehaviorSnowballDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
+MD: fv/a ()F net/minecraft/src/BehaviorExpBottleDispense/func_82498_a ()F
+MD: fv/a (Lxd;Law;)Lqm; net/minecraft/src/BehaviorExpBottleDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
+MD: fv/b ()F net/minecraft/src/BehaviorExpBottleDispense/func_82500_b ()F
+MD: fw/a (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorPotionDispense/func_82482_a (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
+MD: fx/a ()F net/minecraft/src/BehaviorPotionDispenseLogic/func_82498_a ()F
+MD: fx/a (Lxd;Law;)Lqm; net/minecraft/src/BehaviorPotionDispenseLogic/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile;
+MD: fx/b ()F net/minecraft/src/BehaviorPotionDispenseLogic/func_82500_b ()F
+MD: fy/a (Lan;)V net/minecraft/src/BehaviorMobEggDispense/func_82485_a (Lnet/minecraft/src/IBlockSource;)V
+MD: fy/b (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorMobEggDispense/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
 MD: fz/a (Lan;)V net/minecraft/src/BehaviorDispenseFireball/func_82485_a (Lnet/minecraft/src/IBlockSource;)V
 MD: fz/b (Lan;Ltu;)Ltu; net/minecraft/src/BehaviorDispenseFireball/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;
 MD: g/a ()Ljava/lang/String; net/minecraft/src/CallableJVMFlags/func_71487_a ()Ljava/lang/String;
@@ -11597,7 +11597,7 @@ MD: gc/a (Lig;Lig;)I net/minecraft/src/PlayerPositionComparator/func_82547_a (Ln
 MD: gc/compare (Ljava/lang/Object;Ljava/lang/Object;)I net/minecraft/src/PlayerPositionComparator/compare (Ljava/lang/Object;Ljava/lang/Object;)I
 MD: gd/a ()I net/minecraft/src/ServerConfigurationManager/func_72372_a ()I
 MD: gd/a (DDDDILdw;)V net/minecraft/src/ServerConfigurationManager/func_72393_a (DDDDILnet/minecraft/src/Packet;)V
-MD: gd/a (Lbu;Lig;)V net/minecraft/src/ServerConfigurationManager/func_72355_a (Lnet/minecraft/src/NetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V
+MD: gd/a (Lbu;Lig;)V net/minecraft/src/ServerConfigurationManager/func_72355_a (Lnet/minecraft/src/INetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V
 MD: gd/a (Ldw;)V net/minecraft/src/ServerConfigurationManager/func_72384_a (Lnet/minecraft/src/Packet;)V
 MD: gd/a (Ldw;I)V net/minecraft/src/ServerConfigurationManager/func_72396_a (Lnet/minecraft/src/Packet;I)V
 MD: gd/a (Lig;)V net/minecraft/src/ServerConfigurationManager/func_72380_a (Lnet/minecraft/src/EntityPlayerMP;)V
@@ -12600,7 +12600,7 @@ MD: le/a (Ljava/lang/Class;Ljava/lang/String;III)V net/minecraft/src/EntityList/
 MD: le/a (Ljava/lang/String;Lxd;)Lla; net/minecraft/src/EntityList/func_75620_a (Ljava/lang/String;Lnet/minecraft/src/World;)Lnet/minecraft/src/Entity;
 MD: le/a (Lla;)I net/minecraft/src/EntityList/func_75619_a (Lnet/minecraft/src/Entity;)I
 MD: le/b (Lla;)Ljava/lang/String; net/minecraft/src/EntityList/func_75621_b (Lnet/minecraft/src/Entity;)Ljava/lang/String;
-MD: lh/a (Lla;)Z net/minecraft/src/EntitySelector/func_82704_a (Lnet/minecraft/src/Entity;)Z
+MD: lh/a (Lla;)Z net/minecraft/src/IEntitySelector/func_82704_a (Lnet/minecraft/src/Entity;)Z
 MD: li/I ()Z net/minecraft/src/EntityXPOrb/func_70072_I ()Z
 MD: li/a ()V net/minecraft/src/EntityXPOrb/func_70088_a ()V
 MD: li/a (I)I net/minecraft/src/EntityXPOrb/func_70527_a (I)I
@@ -13589,11 +13589,11 @@ MD: os/l (Lla;)Z net/minecraft/src/EntityWolf/func_70652_k (Lnet/minecraft/src/E
 MD: os/r (I)V net/minecraft/src/EntityWolf/func_82185_r (I)V
 MD: os/t ()Z net/minecraft/src/EntityWolf/func_70921_u ()Z
 MD: os/u ()F net/minecraft/src/EntityWolf/func_70920_v ()F
-MD: ot/aS ()I net/minecraft/src/EntityDragonBase/func_70667_aM ()I
-MD: ot/an ()Ljava/lang/String; net/minecraft/src/EntityDragonBase/func_70023_ak ()Ljava/lang/String;
-MD: ot/b ()I net/minecraft/src/EntityDragonBase/func_70968_i ()I
-MD: ou/a (Lov;Lkr;I)Z net/minecraft/src/EntityMultiPart/func_70965_a (Lnet/minecraft/src/EntityDragonPart;Lnet/minecraft/src/DamageSource;I)Z
-MD: ou/d ()Lxd; net/minecraft/src/EntityMultiPart/func_82194_d ()Lnet/minecraft/src/World;
+MD: ot/aS ()I net/minecraft/src/IBossDisplayData/func_70667_aM ()I
+MD: ot/an ()Ljava/lang/String; net/minecraft/src/IBossDisplayData/func_70023_ak ()Ljava/lang/String;
+MD: ot/b ()I net/minecraft/src/IBossDisplayData/func_70968_i ()I
+MD: ou/a (Lov;Lkr;I)Z net/minecraft/src/IEntityMultiPart/func_70965_a (Lnet/minecraft/src/EntityDragonPart;Lnet/minecraft/src/DamageSource;I)Z
+MD: ou/d ()Lxd; net/minecraft/src/IEntityMultiPart/func_82194_d ()Lnet/minecraft/src/World;
 MD: ov/L ()Z net/minecraft/src/EntityDragonPart/func_70067_L ()Z
 MD: ov/a ()V net/minecraft/src/EntityDragonPart/func_70088_a ()V
 MD: ov/a (Lbg;)V net/minecraft/src/EntityDragonPart/func_70037_a (Lnet/minecraft/src/NBTTagCompound;)V
@@ -14258,7 +14258,7 @@ MD: qh/b (D)V net/minecraft/src/EntityArrow/func_70239_b (D)V
 MD: qh/b (Lbg;)V net/minecraft/src/EntityArrow/func_70014_b (Lnet/minecraft/src/NBTTagCompound;)V
 MD: qh/b_ (Lqf;)V net/minecraft/src/EntityArrow/func_70100_b_ (Lnet/minecraft/src/EntityPlayer;)V
 MD: qh/c ()D net/minecraft/src/EntityArrow/func_70242_d ()D
-MD: qh/c (DDDFF)V net/minecraft/src/EntityArrow/func_70244_c (DDDFF)V
+MD: qh/c (DDDFF)V net/minecraft/src/EntityArrow/func_70186_c (DDDFF)V
 MD: qh/d ()Z net/minecraft/src/EntityArrow/func_70241_g ()Z
 MD: qh/e (Z)V net/minecraft/src/EntityArrow/func_70243_d (Z)V
 MD: qh/f_ ()Z net/minecraft/src/EntityArrow/func_70041_e_ ()Z
@@ -15171,7 +15171,7 @@ MD: xd/a (Lamv;Lamv;ZZ)Lamt; net/minecraft/src/World/func_72831_a (Lnet/minecraf
 MD: xd/a (Ljava/lang/Class;)I net/minecraft/src/World/func_72907_a (Ljava/lang/Class;)I
 MD: xd/a (Ljava/lang/Class;Lamq;)Ljava/util/List; net/minecraft/src/World/func_72872_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;)Ljava/util/List;
 MD: xd/a (Ljava/lang/Class;Lamq;Lla;)Lla; net/minecraft/src/World/func_72857_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/Entity;
-MD: xd/a (Ljava/lang/Class;Lamq;Llh;)Ljava/util/List; net/minecraft/src/World/func_82733_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/EntitySelector;)Ljava/util/List;
+MD: xd/a (Ljava/lang/Class;Lamq;Llh;)Ljava/util/List; net/minecraft/src/World/func_82733_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/IEntitySelector;)Ljava/util/List;
 MD: xd/a (Ljava/lang/Class;Ljava/lang/String;)Lagn; net/minecraft/src/World/func_72943_a (Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/src/WorldSavedData;
 MD: xd/a (Ljava/lang/String;)Lqf; net/minecraft/src/World/func_72924_a (Ljava/lang/String;)Lnet/minecraft/src/EntityPlayer;
 MD: xd/a (Ljava/lang/String;DDDDDD)V net/minecraft/src/World/func_72869_a (Ljava/lang/String;DDDDDD)V
@@ -15512,7 +15512,7 @@ MD: yy/a (IIIII)Z net/minecraft/src/EmptyChunk/func_76592_a (IIIII)Z
 MD: yy/a (IIILaml;)V net/minecraft/src/EmptyChunk/func_76604_a (IIILnet/minecraft/src/TileEntity;)V
 MD: yy/a (J)Ljava/util/Random; net/minecraft/src/EmptyChunk/func_76617_a (J)Ljava/util/Random;
 MD: yy/a (Laml;)V net/minecraft/src/EmptyChunk/func_76620_a (Lnet/minecraft/src/TileEntity;)V
-MD: yy/a (Ljava/lang/Class;Lamq;Ljava/util/List;Llh;)V net/minecraft/src/EmptyChunk/func_76618_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/EntitySelector;)V
+MD: yy/a (Ljava/lang/Class;Lamq;Ljava/util/List;Llh;)V net/minecraft/src/EmptyChunk/func_76618_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/IEntitySelector;)V
 MD: yy/a (Lla;)V net/minecraft/src/EmptyChunk/func_76612_a (Lnet/minecraft/src/Entity;)V
 MD: yy/a (Lla;I)V net/minecraft/src/EmptyChunk/func_76608_a (Lnet/minecraft/src/Entity;I)V
 MD: yy/a (Lla;Lamq;Ljava/util/List;)V net/minecraft/src/EmptyChunk/func_76588_a (Lnet/minecraft/src/Entity;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;)V
@@ -15543,7 +15543,7 @@ MD: yz/a (IIILaml;)V net/minecraft/src/Chunk/func_76604_a (IIILnet/minecraft/src
 MD: yz/a (IILyd;)Lxy; net/minecraft/src/Chunk/func_76591_a (IILnet/minecraft/src/WorldChunkManager;)Lnet/minecraft/src/BiomeGenBase;
 MD: yz/a (J)Ljava/util/Random; net/minecraft/src/Chunk/func_76617_a (J)Ljava/util/Random;
 MD: yz/a (Laml;)V net/minecraft/src/Chunk/func_76620_a (Lnet/minecraft/src/TileEntity;)V
-MD: yz/a (Ljava/lang/Class;Lamq;Ljava/util/List;Llh;)V net/minecraft/src/Chunk/func_76618_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/EntitySelector;)V
+MD: yz/a (Ljava/lang/Class;Lamq;Ljava/util/List;Llh;)V net/minecraft/src/Chunk/func_76618_a (Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/IEntitySelector;)V
 MD: yz/a (Lla;)V net/minecraft/src/Chunk/func_76612_a (Lnet/minecraft/src/Entity;)V
 MD: yz/a (Lla;I)V net/minecraft/src/Chunk/func_76608_a (Lnet/minecraft/src/Entity;I)V
 MD: yz/a (Lla;Lamq;Ljava/util/List;)V net/minecraft/src/Chunk/func_76588_a (Lnet/minecraft/src/Entity;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;)V

fml/conf/params.csv

@@ -1480,7 +1480,7 @@ p_72345_5_,par5,2
 p_72353_1_,par1Str,2
 p_72354_1_,par1EntityPlayerMP,2
 p_72354_2_,par2WorldServer,2
-p_72355_1_,par1NetworkManager,2
+p_72355_1_,par1INetworkManager,2
 p_72355_2_,par2EntityPlayerMP,2
 p_72356_1_,par1EntityPlayerMP,2
 p_72356_2_,par2,2
@@ -2279,7 +2279,6 @@ p_73023_2_,par2,2
 p_73023_3_,par3,2
 p_73023_4_,par4,2
 p_73023_5_,par5,2
-p_73024_1_,par1,2
 p_73025_1_,par1,2
 p_73025_2_,par2,2
 p_73025_3_,par3,2
@@ -4582,7 +4581,7 @@ p_76617_1_,par1,2
 p_76618_1_,par1Class,2
 p_76618_2_,par2AxisAlignedBB,2
 p_76618_3_,par3List,2
-p_76618_4_,par4EntitySelector,2
+p_76618_4_,par4IEntitySelector,2
 p_76619_1_,par1,2
 p_76619_2_,par2,2
 p_76619_3_,par3,2
@@ -5336,14 +5335,14 @@ p_77272_1_,par1,2
 p_77279_1_,par1,2
 p_77291_0_,par0TexturePackList,2
 p_77291_1_,par1File,2
-p_77294_1_,par1TexturePackBase,2
+p_77294_1_,par1ITexturePack,2
 p_77296_1_,par1Str,2
 p_77297_1_,par1Str,2
 p_77297_2_,par2File,2
 p_77301_0_,par0TexturePackList,2
 p_77302_1_,par1File,2
 p_77303_0_,par0TexturePackList,2
-p_77303_1_,par1TexturePackBase,2
+p_77303_1_,par1ITexturePack,2
 p_77306_0_,par0TexturePackList,2
 p_77316_1_,par1,2
 p_77317_1_,par1,2
@@ -5876,7 +5875,7 @@ p_78353_1_,par1BufferedImage,2
 p_78354_1_,par1BufferedImage,2
 p_78355_1_,par1TextureFX,2
 p_78356_1_,par1Str,2
-p_78356_2_,par2ImageBuffer,2
+p_78356_2_,par2IImageBuffer,2
 p_78369_1_,par1,2
 p_78369_2_,par2,2
 p_78369_3_,par3,2
@@ -6470,11 +6469,11 @@ p_78944_1_,par1WorldRenderer,2
 p_78944_2_,par2WorldRenderer,2
 p_78946_1_,par1WorldRenderer,2
 p_78946_2_,par2WorldRenderer,2
+p_79003_0_,par0DedicatedServer,2
+p_79004_0_,par0ServerGUI,2
+p_79013_0_,par0GuiStatsComponent,2
+p_79015_1_,par1ArrayOfLong,2
 p_82010_1_,par1IUpdatePlayerListBox,2
-p_82020_0_,par0GuiStatsComponent,2
-p_82022_1_,par1ArrayOfLong,2
-p_82032_0_,par0DedicatedServer,2
-p_82033_0_,par0ServerGUI,2
 p_82116_1_,par1,2
 p_82118_1_,par1,2
 p_82118_2_,par2Str,2
@@ -6943,7 +6942,7 @@ p_82721_1_,par1,2
 p_82722_0_,par0NBTTagCompound,2
 p_82733_1_,par1Class,2
 p_82733_2_,par2AxisAlignedBB,2
-p_82733_3_,par3EntitySelector,2
+p_82733_3_,par3IEntitySelector,2
 p_82734_1_,par1,2
 p_82734_2_,par2,2
 p_82735_1_,par1EntityMinecart,2
@@ -7036,7 +7035,7 @@ p_82815_1_,par1ItemStack,2
 p_82816_1_,par1ItemStack,2
 p_82817_0_,par0Collection,2
 p_82819_1_,par1,2
-p_82824_0_,par0EntityDragonBase,2
+p_82824_0_,par0IBossDisplayData,2
 p_82824_1_,par1,2
 p_82829_1_,par1RenderGlobal,2
 p_82829_2_,par2,2
@@ -7649,13 +7648,8 @@ p_i3190_1_,par1EntityLiving,2
 p_i3191_1_,par1,2
 p_i3192_1_,par1TexturePackList,2
 p_i3192_2_,par2GameSettings,2
-p_i3193_1_,par1ThreadDownloadImageData,2
-p_i3193_2_,par2Str,2
-p_i3193_3_,par3ImageBuffer,2
 p_i3194_1_,par1Minecraft,2
 p_i3194_2_,par2RenderEngine,2
-p_i3195_1_,par1Str,2
-p_i3195_2_,par2ImageBuffer,2
 p_i3196_1_,par1World,2
 p_i3196_2_,par2List,2
 p_i3196_3_,par3,2
@@ -8026,7 +8020,6 @@ p_i3367_1_,par1Str,2
 p_i3368_1_,par1File,2
 p_i3369_1_,par1Str,2
 p_i3369_2_,par2ICommandSender,2
-p_i3370_1_,par1MinecraftServer,2
 p_i3372_1_,par1MinecraftServer,2
 p_i3373_1_,par1MinecraftServer,2
 p_i3374_1_,par1MinecraftServer,2
@@ -8092,9 +8085,6 @@ p_i3399_1_,par1NetLoginHandler,2
 p_i3400_1_,par1MinecraftServer,2
 p_i3400_2_,par2Socket,2
 p_i3400_3_,par3Str,2
-p_i3401_1_,par1MinecraftServer,2
-p_i3401_2_,par2NetworkManager,2
-p_i3401_3_,par3EntityPlayerMP,2
 p_i3402_1_,par1MinecraftServer,2
 p_i3403_1_,par1,2
 p_i3404_1_,par1IServer,2
@@ -9594,38 +9584,46 @@ p_i4106_1_,par1DedicatedServer,2
 p_i4107_1_,par1ServerGUI,2
 p_i4108_1_,par1DedicatedServer,2
 p_i4109_1_,par1GuiStatsComponent,2
-p_i5000_1_,par1Minecraft,2
-p_i5001_1_,par1GuiCreateFlatWorld,2
-p_i5002_1_,par1GuiFlatPresets,2
+p_i5000_1_,par1,2
+p_i5000_2_,par2Str,2
+p_i5000_3_,par3IImageBuffer,2
+p_i5001_1_,par1,2
+p_i5001_2_,par2IImageBuffer,2
+p_i5002_1_,par1,2
 p_i5003_1_,par1,2
 p_i5003_2_,par2Str,2
 p_i5003_3_,par3Str,2
-p_i5004_1_,par1GuiCreateWorld,2
+p_i5004_1_,par1,2
 p_i5004_2_,par2Str,2
-p_i5005_1_,par1GuiCreateFlatWorld,2
-p_i5006_1_,par1InventoryPlayer,2
+p_i5005_1_,par1,2
+p_i5006_1_,par1,2
 p_i5006_2_,par2World,2
 p_i5006_3_,par3,2
 p_i5006_4_,par4,2
 p_i5006_5_,par5,2
-p_i5007_1_,par1GuiBeacon,2
+p_i5007_1_,par1,2
 p_i5007_2_,par2,2
 p_i5007_3_,par3,2
 p_i5007_4_,par4,2
 p_i5007_5_,par5,2
 p_i5007_6_,par6,2
-p_i5008_1_,par1Minecraft,2
+p_i5008_1_,par1,2
 p_i5009_1_,par1,2
-p_i5010_1_,par1GuiBeacon,2
+p_i5010_1_,par1,2
 p_i5010_2_,par2,2
 p_i5010_3_,par3,2
 p_i5010_4_,par4,2
-p_i5011_1_,par1GuiBeacon,2
+p_i5011_1_,par1,2
 p_i5011_2_,par2,2
 p_i5011_3_,par3,2
 p_i5011_4_,par4,2
-p_i5012_1_,par1InventoryPlayer,2
-p_i5012_2_,par2TileEntityBeacon,2
+p_i5011_5_,par5,2
+p_i5011_6_,par6,2
+p_i5011_7_,par7IEntitySelector,2
+p_i5012_1_,par1,2
+p_i5012_2_,par2,2
+p_i5012_3_,par3,2
+p_i5012_4_,par4,2
 p_i5013_1_,par1,2
 p_i5013_2_,par2,2
 p_i5013_3_,par3,2
@@ -9705,19 +9703,11 @@ p_i5034_2_,par2DataWatcher,2
 p_i5034_3_,par3,2
 p_i5035_1_,par1,2
 p_i5035_3_,par3,2
-p_i5036_1_,par1MinecraftServer,2
-p_i5037_1_,par1MinecraftServer,2
 p_i5038_1_,par1MinecraftServer,2
 p_i5039_1_,par1MinecraftServer,2
 p_i5039_2_,par2Str,2
-p_i5040_1_,par1MinecraftServer,2
-p_i5041_1_,par1MinecraftServer,2
 p_i5042_1_,par1MinecraftServer,2
-p_i5043_1_,par1MinecraftServer,2
 p_i5044_1_,par1MinecraftServer,2
-p_i5045_1_,par1MinecraftServer,2
-p_i5046_1_,par1CallableServerProfiler,2
-p_i5046_2_,par2ItemStack,2
 p_i5047_1_,par1MinecraftServer,2
 p_i5048_1_,par1MinecraftServer,2
 p_i5049_1_,par1MinecraftServer,2
@@ -9753,20 +9743,9 @@ p_i5059_1_,par1IRangedAttackMob,2
 p_i5059_2_,par2,2
 p_i5059_3_,par3,2
 p_i5059_4_,par4,2
-p_i5060_1_,par1EntityLiving,2
-p_i5060_2_,par2Class,2
-p_i5060_3_,par3,2
-p_i5060_4_,par4,2
-p_i5060_5_,par5,2
-p_i5060_6_,par6,2
-p_i5060_7_,par7EntitySelector,2
 p_i5061_1_,par1Str,2
 p_i5062_1_,par1World,2
 p_i5063_1_,par1World,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_i5066_1_,par1World,2
 p_i5067_1_,par1World,2

fml/conf/patches/minecraft_ff.patch

@@ -77,16 +77,6 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft\net\minecraft\src\EntityArrow.java minecraft_patched\net\minecraft\src\EntityArrow.java
---- minecraft\net\minecraft\src\EntityArrow.java	Sat Oct 20 04:10:43 2012
-+++ minecraft_patched\net\minecraft\src\EntityArrow.java	Sat Oct 20 04:16:13 2012
-@@ -406,4 +406,6 @@
-       byte var1 = this.field_70180_af.func_75683_a(16);
-       return (var1 & 1) != 0;
-    }
-+
-+   public void func_70186_c(double var1, double var3, double var5, float var7, float var8) { }
- }
 diff -r -U 3 minecraft\net\minecraft\src\EnumFacing.java minecraft_patched\net\minecraft\src\EnumFacing.java
 --- minecraft\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:10:44 2012
 +++ minecraft_patched\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:15:54 2012

fml/conf/patches/minecraft_server_ff.patch

@@ -24,16 +24,6 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft_server\net\minecraft\src\EntityArrow.java minecraft_server_patched\net\minecraft\src\EntityArrow.java
---- minecraft_server\net\minecraft\src\EntityArrow.java	Sat Oct 20 04:11:53 2012
-+++ minecraft_server_patched\net\minecraft\src\EntityArrow.java	Sat Oct 20 04:13:43 2012
-@@ -381,4 +381,6 @@
-       byte var1 = this.field_70180_af.func_75683_a(16);
-       return (var1 & 1) != 0;
-    }
-+
-+   public void func_70186_c(double var1, double var3, double var5, float var7, float var8) { }
- }
 diff -r -U 3 minecraft_server\net\minecraft\src\EnumFacing.java minecraft_server_patched\net\minecraft\src\EnumFacing.java
 --- minecraft_server\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:11:53 2012
 +++ minecraft_server_patched\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:13:22 2012