Update to 1.4.3

fml/common/cpw/mods/fml/common/FMLCommonHandler.java

@@ -22,6 +22,7 @@ import java.util.logging.Logger;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.CrashReport;
+import net.minecraft.src.CrashReportCategory;
 import net.minecraft.src.DedicatedServer;
 import net.minecraft.src.Entity;
 import net.minecraft.src.EntityPlayer;
@@ -386,11 +387,11 @@ public class FMLCommonHandler
         crashCallables.add(callable);
     }
 
-    public void enhanceCrashReport(CrashReport crashReport)
+    public void enhanceCrashReport(CrashReport crashReport, CrashReportCategory category)
     {
         for (ICrashCallable call: crashCallables)
         {
-            crashReport.func_71500_a(call.getLabel(), call);
+            category.func_71500_a(call.getLabel(), call);
         }
     }
 

fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java

@@ -134,8 +134,9 @@ public class MCPMerger
             String line;
             while ((line = br.readLine()) != null)
             {
+		line = line.split("#")[0];
                 boolean toClient = line.charAt(0) == '<';
-                line = line.substring(1);
+                line = line.substring(1).trim();
                 if (toClient) copyToClient.add(line);
                 else copyToServer.add(line);
             }
@@ -288,7 +289,7 @@ public class MCPMerger
 
         reader.accept(classNode, 0);
 
-        if (!classNode.name.equals("bct")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
+        if (!classNode.name.equals("bdz")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
         {
             if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
             classNode.visibleAnnotations.add(getSideAnn(isClientOnly));

fml/common/fml_at.cfg

@@ -1,71 +1,71 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public amm.a(Ljava/lang/Class;Ljava/lang/String;)V # TileEntity/func_70306_a
+public anq.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public lf.a(Ljava/lang/Class;Ljava/lang/String;I)V # EntityList/func_75618_a
-public lf.a(Ljava/lang/Class;Ljava/lang/String;III)V # EntityList/func_75614_a
-public lf.b # EntityList/field_75625_b nameToClassMap
-public lf.c # EntityList/field_75626_c classToNameMap
-public lf.d # EntityList/field_75623_d idToClassMap
+public lu.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public lu.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public lu.b #FD:EntityList/field_75625_b #nameToClassMap
+public lu.c #FD:EntityList/field_75626_c #classToNameMap
+public lu.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
-public azc.h # RenderEngine/field_78367_h textureList
-public azc.k # RenderEngine/field_78366_k texturePack
+public bai.h #FD:RenderEngine/field_78367_h #textureList
+public bai.k #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public azw.o # RenderManager/field_78729_o renderers
+public bbc.p #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public azd.*
-public azd.*()
+public baj.* #FD:RenderBlocks/*
+public baj.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f baq.h # RenderPlayer/field_77110_j armorlist
+public-f bbw.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bae.k # RenderBiped/field_82424_k armorlist
+public-f bbk.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
-public be.b # StringTranslate/field_74815_b
-public be.d # StringTranslate/field_74813_d
+public bm.b #FD:StringTranslate/field_74815_b
+public bm.d #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bby.m # TileEntityRenderer/field_76966_m
+public bde.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public vq.a(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77595_a
-public vq.b(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77596_b
+public wh.a(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77595_a
+public wh.b(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
-public kg.a # WeightedRandomItem/field_76292_a probability
+public ku.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
-#public+f tv.c # ItemStack/field_77993_c itemId
+#public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public jc.a # StatBase/field_75978_a statName
+public jk.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public ik.a(Lik;Z)Z # NetLoginHandler/func_72531_a 'complete connection'
-public ik.h # NetLoginHandler/field_72543_h userName
+public is.a(Lis;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public is.h #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public ih.cd()V # EntityPlayerMP/func_71117_bO
-public ih.cv # EntityPlayerMP/field_71139_cq
+public ip.cg()V #MD:EntityPlayerMP/func_71117_bO
+public ip.cs #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public mo
+public nd #CL:EntityAITaskEntry
 # EntityAITasks
-public mn.a # EntityAITasks/field_75782_a taskList
+public nc.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public ahy.n(Lxd;III)Z # BlockChest/func_72292_n isOcelotBlockingChest
+public ajd.n(Lxv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public ln.aS # EntityLiving/field_70736_aM carryoverDamage
-public ln.bn # EntityLiving/field_70714_bg tasks
-public ln.bG # EntityLiving/field_70703_bu isJumping
+public mc.aS #FD:EntityLiving/field_70736_aM #carryoverDamage
+public mc.bm #FD:EntityLiving/field_70714_bg #tasks
+public mc.bE #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected na.a(Lxe;III)Z # EntityAIOcelotSit/func_75398_a nearestSittableBlock
-protected na.f()Z # EntityAIOcelotSit/func_75399_f isblocksittable
+protected np.a(Lxv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected np.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
-public b
-public b.<init>(La;)V # constructor
+public b #CL:CallableMinecraftVersion
+public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public oh.d # EntityAnimal/field_70881_d inLove
+public oy.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public xp.<init>(ILjava/lang/String;)V
-public xp.<init>(ILjava/lang/String;I)V
+public yg.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public yg.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public aeq
+public afl #CL:ComponentVillage
 # EntityVillager - minmax lists
-public qd.a(Lww;ILjava/util/Random;F)V # EntityVillager/func_70948_a addBuy
-public qd.b(Lww;ILjava/util/Random;F)V # EntityVillager/func_70949_b addSell
-public qd.bP # EntityVillager/field_70958_bB
-public qd.bQ # EntityVillager/field_70960_bC
+public qu.a(Lxn;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public qu.b(Lxn;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public qu.bN #FD:EntityVillager/field_70958_bB
+public qu.bO #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public aum
+public avr #CL:GuiButtonMerchant

fml/common/fml_marker.cfg

@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-qg cpw/mods/fml/common/network/Player
+qx cpw/mods/fml/common/network/Player
 net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-alf cpw/mods/fml/common/registry/BlockProxy
+amj cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-tt cpw/mods/fml/common/registry/ItemProxy
-net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
+uk cpw/mods/fml/common/registry/ItemProxy
+net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy

fml/conf/mcp.cfg

@@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 771175c01778ea67395bc6919a5a9dc5
-MD5Server  = a726380b5546635662d8706dae0586c7
+MD5Client  = 9cc3295931edb6339f22989fe1b612a6
+MD5Server  = 21b673f18d20cf7682b77fa8df6c195c
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -123,8 +123,8 @@ LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
 UpdateUrl         = 
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 82000
-ParamIndex        = 5000
+RGIndex           = 85000
+ParamIndex        = 6800
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

fml/conf/params.csv

@@ -874,14 +874,6 @@ p_71908_2_,par2World,2
 p_71908_3_,par3,2
 p_71908_4_,par4,2
 p_71908_5_,par5,2
-p_71909_1_,par1World,2
-p_71909_2_,par2,2
-p_71909_3_,par3,2
-p_71909_4_,par4,2
-p_71909_5_,par5,2
-p_71909_6_,par6,2
-p_71909_7_,par7,2
-p_71909_8_,par8,2
 p_71910_1_,par1,2
 p_71910_2_,par2Random,2
 p_71911_1_,par1World,2
@@ -1372,11 +1364,6 @@ p_72276_1_,par1World,2
 p_72276_2_,par2,2
 p_72276_3_,par3,2
 p_72276_4_,par4,2
-p_72277_1_,par1World,2
-p_72277_2_,par2,2
-p_72277_3_,par3,2
-p_72277_4_,par4,2
-p_72277_5_,par5,2
 p_72280_1_,par1World,2
 p_72280_2_,par2,2
 p_72280_3_,par3,2
@@ -5213,20 +5200,16 @@ p_77147_1_,par1PlayerCapabilities,2
 p_77161_0_,par0,2
 p_77175_1_,par1NextTickListEntry,2
 p_77176_1_,par1,2
-p_77184_1_,par1World,2
-p_77184_2_,par2Entity,2
-p_77184_3_,par3,2
-p_77184_5_,par5,2
-p_77184_7_,par7,2
-p_77184_9_,par9,2
-p_77185_1_,par1World,2
-p_77185_2_,par2Entity,2
-p_77185_3_,par3,2
-p_77185_5_,par5,2
-p_77185_7_,par7,2
-p_77185_9_,par9,2
-p_77186_1_,par1World,2
-p_77186_2_,par2Entity,2
+p_77184_1_,par1Entity,2
+p_77184_2_,par2,2
+p_77184_4_,par4,2
+p_77184_6_,par6,2
+p_77184_8_,par8,2
+p_77185_1_,par1Entity,2
+p_77185_2_,par2,2
+p_77185_4_,par4,2
+p_77185_6_,par6,2
+p_77185_8_,par8,2
 p_77188_0_,par0EntityLiving,2
 p_77188_1_,par1World,2
 p_77188_2_,par2,2
@@ -5830,11 +5813,6 @@ p_78279_4_,par4,2
 p_78279_5_,par5,2
 p_78280_1_,par1Str,2
 p_78280_2_,par2,2
-p_78281_1_,par1Str,2
-p_78281_2_,par2,2
-p_78281_3_,par3,2
-p_78281_4_,par4,2
-p_78281_5_,par5,2
 p_78282_0_,par0Str,2
 p_78283_1_,par1Str,2
 p_78319_1_,par1EntityPlayer,2
@@ -6712,13 +6690,6 @@ p_82438_2_,par2,2
 p_82439_1_,par1EntityPlayer,2
 p_82439_2_,par2,2
 p_82439_3_,par3,2
-p_82440_1_,par1EntityPlayer,2
-p_82440_2_,par2,2
-p_82440_3_,par3,2
-p_82440_4_,par4,2
-p_82440_5_,par5,2
-p_82440_6_,par6,2
-p_82440_7_,par7,2
 p_82441_1_,par1EntityPlayer,2
 p_82442_1_,par1EntityBat,2
 p_82442_2_,par2,2
@@ -7064,6 +7035,135 @@ p_83020_3_,par3,2
 p_83020_5_,par5,2
 p_83020_7_,par7,2
 p_83020_9_,par9,2
+p_85027_1_,par1CrashReportCategory,2
+p_85029_1_,par1CrashReportCategory,2
+p_85030_1_,par1Str,2
+p_85030_2_,par2,2
+p_85030_3_,par3,2
+p_85031_1_,par1Entity,2
+p_85034_1_,par1,2
+p_85039_1_,par1,2
+p_85040_1_,par1,2
+p_85041_1_,par1,2
+p_85041_2_,par2,2
+p_85041_3_,par3,2
+p_85041_4_,par4,2
+p_85044_1_,par1ItemStack,2
+p_85044_2_,par2,2
+p_85044_3_,par3,2
+p_85055_0_,par0Throwable,2
+p_85055_1_,par1Str,2
+p_85057_1_,par1Str,2
+p_85057_2_,par2,2
+p_85058_1_,par1Str,2
+p_85068_0_,par0CrashReportCategory,2
+p_85068_1_,par1,2
+p_85068_2_,par2,2
+p_85068_3_,par3,2
+p_85068_4_,par4,2
+p_85068_5_,par5,2
+p_85069_1_,par1StackTraceElement,2
+p_85069_2_,par2StackTraceElement,2
+p_85070_1_,par1,2
+p_85071_0_,par0,2
+p_85071_1_,par1,2
+p_85071_2_,par2,2
+p_85072_1_,par1StringBuilder,2
+p_85073_1_,par1,2
+p_85074_0_,par0,2
+p_85074_2_,par2,2
+p_85074_4_,par4,2
+p_85081_1_,par1Class,2
+p_85081_2_,par2Class,2
+p_85093_1_,par1EntityLiving,2
+p_85093_2_,par2,2
+p_85094_1_,par1Entity,2
+p_85094_2_,par2,2
+p_85094_4_,par4,2
+p_85094_6_,par6,2
+p_85094_8_,par8,2
+p_85094_9_,par9,2
+p_85096_1_,par1BlockAnvil,2
+p_85096_2_,par2,2
+p_85096_3_,par3,2
+p_85096_4_,par4,2
+p_85096_5_,par5,2
+p_85102_10_,par10,2
+p_85102_1_,par1EntityPlayer,2
+p_85102_2_,par2Str,2
+p_85102_3_,par3,2
+p_85102_5_,par5,2
+p_85102_7_,par7,2
+p_85102_9_,par9,2
+p_85103_1_,par1Explosion,2
+p_85104_1_,par1World,2
+p_85104_2_,par2,2
+p_85104_3_,par3,2
+p_85104_4_,par4,2
+p_85104_5_,par5,2
+p_85104_6_,par6,2
+p_85104_7_,par7,2
+p_85104_8_,par8,2
+p_85104_9_,par9,2
+p_85105_1_,par1World,2
+p_85105_2_,par2,2
+p_85105_3_,par3,2
+p_85105_4_,par4,2
+p_85105_5_,par5,2
+p_85106_1_,par1World,2
+p_85106_2_,par2,2
+p_85106_3_,par3,2
+p_85106_4_,par4,2
+p_85106_5_,par5ItemStack,2
+p_85107_1_,par1,2
+p_85116_0_,par0WorldInfo,2
+p_85117_0_,par0WorldInfo,2
+p_85118_1_,par1CrashReportCategory,2
+p_85119_0_,par0WorldInfo,2
+p_85120_0_,par0WorldInfo,2
+p_85121_0_,par0WorldInfo,2
+p_85122_0_,par0WorldInfo,2
+p_85123_0_,par0WorldInfo,2
+p_85124_0_,par0WorldInfo,2
+p_85125_0_,par0WorldInfo,2
+p_85126_0_,par0WorldInfo,2
+p_85127_0_,par0WorldInfo,2
+p_85128_0_,par0WorldInfo,2
+p_85129_0_,par0WorldInfo,2
+p_85130_0_,par0WorldInfo,2
+p_85131_0_,par0WorldInfo,2
+p_85132_0_,par0WorldInfo,2
+p_85133_0_,par0WorldInfo,2
+p_85147_1_,par1EntityAnimal,2
+p_85147_2_,par2EntityAnimal,2
+p_85147_3_,par3EntityAnimal,2
+p_85148_1_,par1EntityAnimal,2
+p_85149_1_,par1EntityAnimal,2
+p_85149_2_,par2EntityAnimal,2
+p_85156_1_,par1EntityAIBase,2
+p_85172_1_,par1EntityPlayerMP,2
+p_85172_2_,par2Chunk,2
+p_85173_1_,par1EntityPlayer,2
+p_85173_2_,par2Str,2
+p_85173_3_,par3,2
+p_85173_4_,par4,2
+p_85174_1_,par1,2
+p_85174_2_,par2,2
+p_85174_3_,par3,2
+p_85175_1_,par1,2
+p_85175_2_,par2,2
+p_85175_3_,par3,2
+p_85181_1_,par1Random,2
+p_85182_1_,par1,2
+p_85182_2_,par2,2
+p_85182_3_,par3,2
+p_85187_1_,par1Str,2
+p_85187_2_,par2,2
+p_85187_3_,par3,2
+p_85187_4_,par4,2
+p_85187_5_,par5,2
+p_85188_1_,par1Entity,2
+p_85189_1_,par1,2
 p_accept_1_,par1File,2
 p_accept_2_,par2Str,2
 p_actionPerformed_1_,par1ActionEvent,2
@@ -7109,7 +7209,6 @@ p_i3013_5_,par5,2
 p_i3013_6_,par6,2
 p_i3014_1_,par1Str,2
 p_i3014_2_,par2Str,2
-p_i3015_1_,par1Component,2
 p_i3016_1_,par1Minecraft,2
 p_i3017_1_,par1Minecraft,2
 p_i3018_1_,par1Minecraft,2
@@ -8030,7 +8129,6 @@ p_i3369_1_,par1Str,2
 p_i3369_2_,par2ICommandSender,2
 p_i3372_1_,par1MinecraftServer,2
 p_i3373_1_,par1MinecraftServer,2
-p_i3374_1_,par1MinecraftServer,2
 p_i3375_1_,par1File,2
 p_i3376_1_,par1MinecraftServer,2
 p_i3377_1_,par1File,2
@@ -8804,7 +8902,6 @@ p_i3727_3_,par3,2
 p_i3727_5_,par5,2
 p_i3727_7_,par7,2
 p_i3727_9_,par9,2
-p_i3728_1_,par1World,2
 p_i3729_1_,par1World,2
 p_i3730_1_,par1World,2
 p_i3731_1_,par1ISaveHandler,2
@@ -9873,6 +9970,54 @@ p_i5109_2_,par2,2
 p_i5109_4_,par4,2
 p_i5109_6_,par6,2
 p_i6000_1_,par1CrashReport,2
+p_i6800_1_,par1Component,2
+p_i6800_2_,par2GameSettings,2
+p_i6801_1_,par1RenderGlobal,2
+p_i6801_2_,par2,2
+p_i6801_4_,par4,2
+p_i6801_6_,par6,2
+p_i6802_1_,par1CallableSuspiciousClasses,2
+p_i6803_1_,par1CrashReport,2
+p_i6804_1_,par1CrashReport,2
+p_i6805_1_,par1,2
+p_i6806_1_,par1,2
+p_i6807_1_,par1,2
+p_i6807_2_,par2,2
+p_i6807_3_,par3,2
+p_i6808_1_,par1Str,2
+p_i6808_2_,par2Obj,2
+p_i6809_1_,par1CrashReport,2
+p_i6809_2_,par2Str,2
+p_i6810_1_,par1DedicatedServer,2
+p_i6811_1_,par1Entity,2
+p_i6812_1_,par1EntityAIBreedSheep,2
+p_i6813_1_,par1EntityAnimal,2
+p_i6813_2_,par2,2
+p_i6814_1_,par1World,2
+p_i6814_2_,par2,2
+p_i6815_1_,par1Teleporter,2
+p_i6815_2_,par2,2
+p_i6815_3_,par3,2
+p_i6815_4_,par4,2
+p_i6815_5_,par5,2
+p_i6816_1_,par1WorldServer,2
+p_i6817_1_,par1MapGenStructure,2
+p_i6817_2_,par2,2
+p_i6817_3_,par3,2
+p_i6818_1_,par1MapGenStructure,2
+p_i6818_2_,par2,2
+p_i6818_3_,par3,2
+p_i6819_1_,par1MapGenStructure,2
+p_i6820_1_,par1WorldInfo,2
+p_i6821_1_,par1WorldInfo,2
+p_i6822_1_,par1WorldInfo,2
+p_i6823_1_,par1WorldInfo,2
+p_i6824_1_,par1WorldInfo,2
+p_i6825_1_,par1WorldInfo,2
+p_i6826_1_,par1WorldInfo,2
+p_i6827_1_,par1WorldInfo,2
+p_i6828_1_,par1WorldInfo,2
+p_i6829_1_,par1TileEntity,2
 p_implies_1_,par1Permission,2
 p_init_1_,par1,2
 p_init_2_,par2CipherParameters,2

fml/conf/patches/minecraft_ff.patch

@@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Sat Oct 20 04:10:42 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Oct 20 04:20:32 2012
-@@ -541,9 +541,8 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Thu Nov 01 23:59:08 2012
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Nov 02 00:00:40 2012
+@@ -543,9 +543,8 @@
           return;
        }
  
@@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
                 if(this.field_71434_R && this.field_71433_S != null) {
                    this.func_71377_b(this.field_71433_S);
                    return;
-@@ -561,7 +560,6 @@
+@@ -563,7 +562,6 @@
                    this.func_71373_a(new GuiMemoryErrorScreen());
                    System.gc();
                 }
@@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
              }
           } catch (MinecraftError var12) {
              ;
-@@ -579,8 +577,6 @@
+@@ -581,8 +579,6 @@
              this.func_71405_e();
           }
  
@@ -29,9 +29,30 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
     }
  
     private void func_71411_J() {
+diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Thu Nov 01 23:59:09 2012
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:06:57 2012
+@@ -21,9 +21,14 @@
+ 
+    public String func_85085_a() {
+       StringBuilder var1 = new StringBuilder();
+-      Field var2 = ClassLoader.class.getDeclaredField("classes");
+-      var2.setAccessible(true);
+-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++      ArrayList var3;
++      try {
++	     Field var2 = ClassLoader.class.getDeclaredField("classes");
++	     var2.setAccessible(true);
++	     var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++      } catch(Exception ex) {
++    	 return "";
++      }
+       boolean var4 = true;
+       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
+       HashMap var6 = new HashMap();
 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
+--- minecraft\net\minecraft\src\CodecMus.java	Thu Nov 01 23:59:09 2012
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Nov 02 00:00:40 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -52,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:10:43 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:16:45 2012
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Thu Nov 01 23:59:09 2012
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:40 2012
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -66,9 +87,9 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
---- minecraft\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:10:43 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:16:25 2012
-@@ -194,7 +194,7 @@
+--- minecraft\net\minecraft\src\DedicatedServer.java	Thu Nov 01 23:59:09 2012
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:40 2012
+@@ -202,7 +202,7 @@
        System.exit(0);
     }
  
@@ -78,8 +99,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        this.func_71333_ah();
     }
 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
+--- minecraft\net\minecraft\src\EnumFacing.java	Thu Nov 01 23:59:10 2012
++++ minecraft_patched\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:40 2012
 @@ -15,10 +15,6 @@
     private final int field_82612_k;
     private static final EnumFacing[] field_82609_l = new EnumFacing[6];
@@ -100,30 +121,9 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumFacing.java minecraft_patched\net\m
        int var1 = var0.length;
  
        for(int var2 = 0; var2 < var1; ++var2) {
-diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Sat Oct 20 04:10:44 2012
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Oct 20 04:21:56 2012
-@@ -713,8 +713,6 @@
-       for(boolean var7 = false; var5 < var3; ++var5) {
-          char var8 = p_78259_1_.charAt(var5);
-          switch(var8) {
--         case 32:
--            var6 = var5;
-          case 167:
-             if(var5 < var3 - 1) {
-                ++var5;
-@@ -728,6 +726,8 @@
-                }
-             }
-             break;
-+         case 32:
-+             var6 = var5;
-          default:
-             var4 += this.func_78263_a(var8);
-             if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
---- minecraft\net\minecraft\src\IntegratedServer.java	Sat Oct 20 04:10:44 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Oct 20 04:15:39 2012
+--- minecraft\net\minecraft\src\IntegratedServer.java	Thu Nov 01 23:59:10 2012
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Fri Nov 02 00:00:40 2012
 @@ -98,7 +98,7 @@
        return true;
     }
@@ -134,9 +134,9 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
        this.field_71348_o = this.field_71347_n.func_71752_f();
        if(!var1 && this.field_71348_o) {
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Sat Oct 20 04:10:45 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Oct 20 04:15:23 2012
-@@ -1443,7 +1443,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Thu Nov 01 23:59:11 2012
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Nov 02 00:00:40 2012
+@@ -1457,7 +1457,7 @@
           double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
           double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
           double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@@ -146,8 +146,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
              this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
           } else if(p_72726_1_.equals("largeexplode")) {
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:10:45 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:22:25 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Thu Nov 01 23:59:12 2012
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:40 2012
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -157,8 +157,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:10:45 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:23:05 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Thu Nov 01 23:59:12 2012
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:40 2012
 @@ -20,7 +20,8 @@
     }
  

fml/conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,27 @@
+diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:00:17 2012
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:07:35 2012
+@@ -21,9 +21,14 @@
+ 
+    public String func_85085_a() {
+       StringBuilder var1 = new StringBuilder();
+-      Field var2 = ClassLoader.class.getDeclaredField("classes");
+-      var2.setAccessible(true);
+-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++      ArrayList var3;
++      try {
++         Field var2 = ClassLoader.class.getDeclaredField("classes");
++         var2.setAccessible(true);
++         var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++      } catch(Exception ex) {
++    	 return "";
++      }
+       boolean var4 = true;
+       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
+       HashMap var6 = new HashMap();
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:11:53 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:14:21 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:18 2012
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:47 2012
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -13,9 +34,9 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
---- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:11:53 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:13:58 2012
-@@ -195,7 +195,7 @@
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:18 2012
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:47 2012
+@@ -203,7 +203,7 @@
        System.exit(0);
     }
  
@@ -25,8 +46,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        this.func_71333_ah();
     }
 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
+--- minecraft_server\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:18 2012
++++ minecraft_server_patched\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:47 2012
 @@ -15,10 +15,6 @@
     private final int field_82612_k;
     private static final EnumFacing[] field_82609_l = new EnumFacing[6];
@@ -48,8 +69,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumFacing.java minecraft_server
  
        for(int var2 = 0; var2 < var1; ++var2) {
 diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:11:54 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:18:38 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:19 2012
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:47 2012
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -59,8 +80,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:11:54 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:19:13 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:19 2012
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:47 2012
 @@ -20,7 +20,8 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.19
-ClientVersion = 1.4.2
-ServerVersion = 1.4.2
+MCPVersion = 7.20
+ClientVersion = 1.4.3
+ServerVersion = 1.4.3

fml/install/fml.py

@@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
     with open(server_jar, 'rb') as fh:
         md5_s = md5(fh.read()).hexdigest()
         
-    clean_c = "771175c01778ea67395bc6919a5a9dc5"
-    clean_s = "a726380b5546635662d8706dae0586c7"
+    clean_c = "9cc3295931edb6339f22989fe1b612a6"
+    clean_s = "21b673f18d20cf7682b77fa8df6c195c"
     
     if not md5_c == clean_c:
         print 'Warning, Modified Client jar detected'
@@ -323,7 +323,7 @@ def merge_client_server(mcp_dir):
         os.makedirs(shared)
         
     #Nasty hack, but these three files sometimes decompile differently, but are identical, so just take the client file
-    special_cases = ['GuiStatsComponent.java', 'HttpUtilRunnable.java', 'PlayerUsageSnooper.java', 'RConThreadClient.java']
+    special_cases = ['GuiStatsComponent.java', 'HttpUtilRunnable.java', 'PlayerUsageSnooper.java', 'RConThreadClient.java', 'World.java']
         
     for path, _, filelist in os.walk(client, followlinks=True):
         for cur_file in filelist:
@@ -585,7 +585,7 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
         commands_sanity_check()
     except ImportError as ex:
         print 'Could not verify commands.py patch integrity, this typically means that you are not in a clean MCP environment.'
-        print 'Download a clean version of MCP 7.17 and try again'
+        print 'Download a clean version of MCP 7.20 and try again'
         print ex
         sys.exit(1)
     
@@ -693,6 +693,9 @@ def gen_merged_srg(mcp_dir, fml_dir):
             common[type][key] = value #+ ' #S'
             
     #Print joined retroguard files
+    if fml_dir is None:
+	return common
+
     with open(os.path.join(fml_dir, 'conf', 'joined.srg'), 'wb') as f:
         for type in ['PK:', 'CL:', 'FD:', 'MD:']:
             for key in sorted(common[type]):

fml/mcp_merge.cfg

@@ -1,20 +1,20 @@
->ou
->iz
->xd
->xa
->anh
->anm
->jn
->uf
->agz
->jo
-<fo
-<hm
-<hn
-<ho
-<hp
-<hq
-<hr
-<hs
-<ht
-<hu
+>pl #net/minecraft/src/IBossDisplayData
+>jh #net/minecraft/src/IStatStringFormat
+>xu #net/minecraft/src/ColorizerGrass
+>xr #net/minecraft/src/ColorizerFoliage
+>aom #org/bouncycastle/crypto/CipherKeyGenerator
+>aor #org/bouncycastle/crypto/KeyGenerationParameters
+>jv #net/minecraft/src/HttpUtilRunnable
+>uw #net/minecraft/src/EnumRarity
+>aid #net/minecraft/src/SaveFormatComparator
+>jw #net/minecraft/src/IDownloadSuccess
+<fw #net/minecraft/src/ThreadDedicatedServer
+<hu #net/minecraft/src/ServerGUI
+<hv #net/minecraft/src/ServerWindowAdapter
+<hw #net/minecraft/src/ServerGuiCommandListener
+<hx #net/minecraft/src/ServerGuiFocusAdapter
+<hy #net/minecraft/src/PlayerListBox
+<hz #net/minecraft/src/GuiStatsComponent
+<ia #net/minecraft/src/GuiStatsListener
+<ib #net/minecraft/src/GuiLogOutputHandler
+<ic #net/minecraft/src/GuiLogFormatter

fml/patches/common/net/minecraft/server/MinecraftServer.java.patch

@@ -10,7 +10,7 @@
  import net.minecraft.src.AnvilSaveConverter;
  import net.minecraft.src.AxisAlignedBB;
  import net.minecraft.src.BehaviorArrowDispense;
-@@ -385,7 +388,10 @@
+@@ -384,7 +387,10 @@
          {
              if (this.func_71197_b())
              {
@@ -21,7 +21,7 @@
  
                  for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
                  {
-@@ -424,6 +430,7 @@
+@@ -423,6 +429,7 @@
  
                      Thread.sleep(1L);
                  }
@@ -29,7 +29,7 @@
              }
              else
              {
-@@ -487,8 +494,10 @@
+@@ -486,8 +493,10 @@
  
      public void func_71217_p()
      {
@@ -40,7 +40,7 @@
          ++this.field_71315_w;
  
          if (this.field_71295_T)
-@@ -534,6 +543,7 @@
+@@ -533,6 +542,7 @@
  
          this.field_71304_b.func_76319_b();
          this.field_71304_b.func_76319_b();
@@ -48,18 +48,23 @@
      }
  
      public void func_71190_q()
-@@ -560,8 +570,10 @@
+@@ -559,6 +569,7 @@
                  }
  
                  this.field_71304_b.func_76320_a("tick");
 +                FMLCommonHandler.instance().onPreWorldTick(var4);
-                 var4.func_72835_b();
-                 var4.func_72939_s();
+                 CrashReport var6;
+ 
+                 try
+@@ -583,6 +594,7 @@
+                     throw new ReportedException(var6);
+                 }
+ 
 +                FMLCommonHandler.instance().onPostWorldTick(var4);
                  this.field_71304_b.func_76319_b();
                  this.field_71304_b.func_76320_a("tracker");
                  var4.func_73039_n().func_72788_a();
-@@ -1149,6 +1161,12 @@
+@@ -1153,6 +1165,12 @@
      @SideOnly(Side.SERVER)
      public static void main(String[] p_main_0_)
      {

fml/patches/common/net/minecraft/src/ChunkProviderServer.java.patch

@@ -9,7 +9,7 @@
  
  public class ChunkProviderServer implements IChunkProvider
  {
-@@ -182,6 +184,7 @@
+@@ -194,6 +196,7 @@
              if (this.field_73246_d != null)
              {
                  this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);

fml/patches/common/net/minecraft/src/CrashReport.java.patch

@@ -7,11 +7,11 @@
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.File;
-@@ -40,6 +41,7 @@
-         this.func_71500_a("Memory", new CallableMemoryInfo(this));
-         this.func_71500_a("JVM Flags", new CallableJVMFlags(this));
-         this.func_71500_a("AABB Pool Size", new CallableCrashMemoryReport(this));
-+        FMLCommonHandler.instance().enhanceCrashReport(this);
+@@ -43,6 +44,7 @@
+         this.field_85061_c.func_71500_a("AABB Pool Size", new CallableCrashMemoryReport(this));
+         this.field_85061_c.func_71500_a("Suspicious classes", new CallableSuspiciousClasses(this));
+         this.field_85061_c.func_71500_a("IntCache", new CallableIntCache(this));
++        FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
      }
  
-     public void func_71500_a(String p_71500_1_, Callable p_71500_2_)
+     public String func_71501_a()

fml/patches/common/net/minecraft/src/DedicatedServer.java.patch

@@ -16,7 +16,7 @@
          field_71306_a.info("Loading properties");
          this.field_71340_o = new PropertyManager(new File("server.properties"));
  
-@@ -101,6 +104,7 @@
+@@ -111,6 +114,7 @@
              field_71306_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
          }
  
@@ -24,7 +24,7 @@
          this.func_71210_a(new DedicatedPlayerList(this));
          long var4 = System.nanoTime();
  
-@@ -161,7 +165,7 @@
+@@ -171,7 +175,7 @@
              this.field_71339_n = new RConThreadMain(this);
              this.field_71339_n.func_72602_a();
          }

fml/patches/common/net/minecraft/src/EntityItem.java.patch

@@ -9,12 +9,12 @@
  
  public class EntityItem extends Entity
  {
-@@ -232,6 +234,8 @@
+@@ -245,6 +247,8 @@
                      p_70100_1_.func_71029_a(AchievementList.field_76027_z);
                  }
  
 +                GameRegistry.onPickupNotification(p_70100_1_, this);
 +
-                 this.field_70170_p.func_72956_a(this, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+                 this.func_85030_a("random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
                  p_70100_1_.func_71001_a(this, var2);
  

fml/patches/common/net/minecraft/src/EntityPlayer.java.patch

@@ -27,7 +27,7 @@
      }
  
      public int func_82145_z()
-@@ -1700,4 +1705,9 @@
+@@ -1745,4 +1750,9 @@
      {
          return this.func_82241_s(1);
      }

fml/patches/common/net/minecraft/src/EntitySlime.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/common/net/minecraft/src/EntitySlime.java
 +++ ../src-work/common/net/minecraft/src/EntitySlime.java
-@@ -224,7 +224,7 @@
+@@ -231,7 +231,7 @@
      {
          Chunk var1 = this.field_70170_p.func_72938_d(MathHelper.func_76128_c(this.field_70165_t), MathHelper.func_76128_c(this.field_70161_v));
  

fml/patches/common/net/minecraft/src/EntityTrackerEntry.java.patch

@@ -9,7 +9,7 @@
  
  public class EntityTrackerEntry
  {
-@@ -293,6 +295,13 @@
+@@ -304,6 +306,13 @@
                      this.field_73138_k = this.field_73132_a.field_70181_x;
                      this.field_73135_l = this.field_73132_a.field_70179_y;
  
@@ -23,7 +23,7 @@
                      if (this.field_73143_t && !(var6 instanceof Packet24MobSpawn))
                      {
                          p_73117_1_.field_71135_a.func_72567_b(new Packet28EntityVelocity(this.field_73132_a.field_70157_k, this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
-@@ -368,6 +377,13 @@
+@@ -379,6 +388,13 @@
          if (this.field_73132_a.field_70128_L)
          {
              System.out.println("Fetching addPacket for removed entity");

fml/patches/common/net/minecraft/src/MemoryConnection.java.patch

@@ -1,5 +1,5 @@
---- ../src-base/minecraft/net/minecraft/src/MemoryConnection.java
-+++ ../src-work/minecraft/net/minecraft/src/MemoryConnection.java
+--- ../src-base/common/net/minecraft/src/MemoryConnection.java
++++ ../src-work/common/net/minecraft/src/MemoryConnection.java
 @@ -8,6 +8,8 @@
  import java.util.ArrayList;
  import java.util.Collections;
@@ -7,9 +7,9 @@
 +
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
  
- @SideOnly(Side.CLIENT)
  public class MemoryConnection implements INetworkManager
-@@ -70,6 +72,7 @@
+ {
+@@ -71,6 +73,7 @@
          if (this.field_74441_e && this.field_74442_b.isEmpty())
          {
              this.field_74440_d.func_72515_a(this.field_74438_f, this.field_74439_g);

fml/patches/common/net/minecraft/src/NetServerHandler.java.patch

@@ -9,7 +9,7 @@
  import net.minecraft.server.MinecraftServer;
  
  public class NetServerHandler extends NetHandler
-@@ -587,6 +589,7 @@
+@@ -576,6 +578,7 @@
  
      public void func_72481_a(Packet3Chat p_72481_1_)
      {
@@ -17,7 +17,7 @@
          if (this.field_72574_e.func_71126_v() == 2)
          {
              this.func_72567_b(new Packet3Chat("Cannot send chat message."));
-@@ -952,6 +955,11 @@
+@@ -941,6 +944,11 @@
      }
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
@@ -29,7 +29,7 @@
      {
          DataInputStream var2;
          ItemStack var3;
-@@ -1114,4 +1122,17 @@
+@@ -1105,4 +1113,17 @@
              }
          }
      }

fml/patches/common/net/minecraft/src/NetworkListenThread.java.patch

@@ -9,11 +9,11 @@
  import net.minecraft.server.MinecraftServer;
  
  public abstract class NetworkListenThread
-@@ -43,6 +45,7 @@
-             }
-             catch (Exception var4)
-             {
-+                FMLLog.log(Level.SEVERE, var4, "A critical server error occured handling a packet, kicking %s", var2.getPlayer().field_70157_k);
-                 field_71751_a.log(Level.WARNING, "Failed to handle packet: " + var4, var4);
+@@ -49,6 +51,7 @@
+                     throw new ReportedException(var4);
+                 }
+ 
++                FMLLog.log(Level.SEVERE, var5, "A critical server error occured handling a packet, kicking %s", var2.getPlayer().field_70157_k);
+                 field_71751_a.log(Level.WARNING, "Failed to handle packet for " + var2.field_72574_e.func_70023_ak() + "/" + var2.field_72574_e.func_71114_r() + ": " + var5, var5);
                  var2.func_72565_c("Internal server error");
              }

fml/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch

@@ -19,7 +19,7 @@
      }
  
      public void func_72364_a(WorldServer[] p_72364_1_)
-@@ -154,6 +159,7 @@
+@@ -148,6 +153,7 @@
  
      public void func_72367_e(EntityPlayerMP p_72367_1_)
      {
@@ -27,7 +27,7 @@
          this.func_72391_b(p_72367_1_);
          WorldServer var2 = p_72367_1_.func_71121_q();
          var2.func_72900_e(p_72367_1_);
-@@ -304,6 +310,7 @@
+@@ -298,6 +304,7 @@
          var8.func_72838_d(var7);
          this.field_72404_b.add(var7);
          var7.func_71116_b();
@@ -35,7 +35,7 @@
          return var7;
      }
  
-@@ -329,6 +336,7 @@
+@@ -323,6 +330,7 @@
              PotionEffect var7 = (PotionEffect)var6.next();
              p_72356_1_.field_71135_a.func_72567_b(new Packet41EntityEffect(p_72356_1_.field_70157_k, var7));
          }

fml/patches/common/net/minecraft/src/ServerListenThread.java.patch

@@ -11,7 +11,7 @@
                  catch (Exception var6)
                  {
                      var3.func_72527_a("Internal server error");
-+                    FMLLog.log(Level.SEVERE, var6, "Error handling login related packet - connection from %s refused", var3.field_72543_h);
-                     field_71777_a.log(Level.WARNING, "Failed to handle packet: " + var6, var6);
++                    FMLLog.log(Level.SEVERE, var6, "Error handling login related packet - connection from %s refused", var3.func_72528_e());
+                     field_71777_a.log(Level.WARNING, "Failed to handle packet for " + var3.func_72528_e() + ": " + var6, var6);
                  }
  

fml/patches/common/net/minecraft/src/TcpConnection.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/common/net/minecraft/src/TcpConnection.java
 +++ ../src-work/common/net/minecraft/src/TcpConnection.java
-@@ -16,6 +16,8 @@
+@@ -17,6 +17,8 @@
  import java.util.List;
  import java.util.concurrent.atomic.AtomicInteger;
  import javax.crypto.SecretKey;
@@ -9,7 +9,7 @@
  
  public class TcpConnection implements INetworkManager
  {
-@@ -377,6 +379,7 @@
+@@ -387,6 +389,7 @@
          if (this.field_74472_n && this.field_74473_o.isEmpty())
          {
              this.field_74485_r.func_72515_a(this.field_74481_v, this.field_74480_w);

fml/patches/common/net/minecraft/src/World.java.patch

@@ -9,37 +9,15 @@
  
  public abstract class World implements IBlockAccess
  {
-@@ -1552,8 +1554,9 @@
-         }
- 
-         this.field_72984_F.func_76318_c("remove");
--        this.field_72996_f.removeAll(this.field_72997_g);
--        Iterator var5 = this.field_72997_g.iterator();
-+        List fml_entitiesToRemove = ImmutableList.copyOf(this.field_72997_g);
-+        this.field_72996_f.removeAll(fml_entitiesToRemove);
-+        Iterator var5 = fml_entitiesToRemove.iterator();
-         int var3;
-         int var4;
- 
-@@ -1569,7 +1572,7 @@
-             }
-         }
- 
--        var5 = this.field_72997_g.iterator();
-+        var5 = fml_entitiesToRemove.iterator();
- 
-         while (var5.hasNext())
-         {
-@@ -1577,7 +1580,7 @@
+@@ -1693,7 +1695,6 @@
              this.func_72847_b(var2);
          }
  
 -        this.field_72997_g.clear();
-+        this.field_72997_g.removeAll(fml_entitiesToRemove);
          this.field_72984_F.func_76318_c("regular");
  
          for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
-@@ -3475,7 +3478,7 @@
+@@ -3644,7 +3645,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {
@@ -47,4 +25,4 @@
 +        return this.field_72986_A.func_76067_t().getHorizon(this);
      }
  
-     public CrashReport func_72914_a(CrashReport p_72914_1_)
+     public CrashReportCategory func_72914_a(CrashReport var1)

fml/patches/common/net/minecraft/src/WorldInfo.java.patch

@@ -17,9 +17,9 @@
  
      protected WorldInfo()
      {
-@@ -430,4 +435,24 @@
+@@ -528,4 +533,24 @@
      {
-         return this.field_82577_x;
+         return var0.field_76110_t;
      }
 +
 +    /**

fml/patches/common/net/minecraft/src/WorldType.java.patch

@@ -45,7 +45,7 @@
      }
  
      public String func_77127_a()
-@@ -97,4 +117,69 @@
+@@ -96,4 +116,69 @@
      {
          return this.field_82748_f;
      }

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

@@ -10,7 +10,7 @@
  import net.minecraft.src.AchievementList;
  import net.minecraft.src.AnvilSaveConverter;
  import net.minecraft.src.AxisAlignedBB;
-@@ -118,6 +120,7 @@
+@@ -119,6 +121,7 @@
  import net.minecraft.src.WorldInfo;
  import net.minecraft.src.WorldRenderer;
  import net.minecraft.src.WorldSettings;
@@ -18,7 +18,7 @@
  import org.lwjgl.LWJGLException;
  import org.lwjgl.Sys;
  import org.lwjgl.input.Keyboard;
-@@ -130,6 +133,12 @@
+@@ -131,6 +134,12 @@
  import org.lwjgl.opengl.GLContext;
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
@@ -31,7 +31,7 @@
  
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
-@@ -312,7 +321,7 @@
+@@ -313,7 +322,7 @@
          this.func_71357_I();
          this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
          this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
@@ -40,7 +40,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
-@@ -357,6 +366,8 @@
+@@ -358,6 +367,8 @@
          GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
  
@@ -49,7 +49,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -385,6 +396,7 @@
+@@ -386,6 +397,7 @@
          {
              this.func_71352_k();
          }
@@ -57,7 +57,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -743,9 +755,11 @@
+@@ -744,9 +756,11 @@
  
              if (!this.field_71454_w)
              {
@@ -69,7 +69,7 @@
              }
  
              GL11.glFlush();
-@@ -1271,11 +1285,13 @@
+@@ -1272,11 +1286,13 @@
  
      public void func_71407_l()
      {
@@ -83,7 +83,7 @@
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
          this.field_71424_I.func_76318_c("gui");
-@@ -1672,6 +1688,7 @@
+@@ -1698,6 +1714,7 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -91,7 +91,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1926,6 +1943,12 @@
+@@ -1952,6 +1969,12 @@
  
      public static void main(String[] p_main_0_)
      {

fml/patches/minecraft/net/minecraft/src/GameSettings.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.BufferedReader;
-@@ -596,6 +597,7 @@
+@@ -609,6 +610,7 @@
  
      public void func_74303_b()
      {

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

@@ -64,7 +64,7 @@
          this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(p_72481_1_.field_73476_b);
      }
  
-@@ -1105,6 +1115,11 @@
+@@ -1114,6 +1124,11 @@
  
      public void func_72494_a(Packet131MapData p_72494_1_)
      {
@@ -76,7 +76,7 @@
          if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT)
          {
              ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c);
-@@ -1214,6 +1229,11 @@
+@@ -1223,6 +1238,11 @@
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
      {
@@ -88,7 +88,7 @@
          if ("MC|TPack".equals(p_72501_1_.field_73630_a))
          {
              String[] var2 = (new String(p_72501_1_.field_73629_c)).split("\u0000");
-@@ -1258,4 +1278,20 @@
+@@ -1267,4 +1287,20 @@
      {
          return this.field_72555_g;
      }

fml/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch

@@ -83,7 +83,7 @@
      }
  
      public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
-@@ -6478,6 +6552,10 @@
+@@ -6510,6 +6584,10 @@
                  this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
                  this.func_78595_a();
              }
@@ -94,7 +94,7 @@
          }
          else
          {
-@@ -6536,6 +6614,36 @@
+@@ -6568,6 +6646,36 @@
  
      public static boolean func_78597_b(int p_78597_0_)
      {