Update FML for Minecraft 1.4.1

fml/common/fml_at.cfg

@@ -3,10 +3,10 @@
 public amm.a(Ljava/lang/Class;Ljava/lang/String;)V # 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.a(Ljava/lang/Class;Ljava/lang/String;III)V # EntityList/func_75614_a
-public le.b # EntityList/field_75625_b nameToClassMap
+public lf.b # EntityList/field_75625_b nameToClassMap
-public le.c # EntityList/field_75626_c classToNameMap
+public lf.c # EntityList/field_75626_c classToNameMap
-public le.d # EntityList/field_75623_d idToClassMap
+public lf.d # EntityList/field_75623_d idToClassMap
 # RenderEngine
 public azc.h # RenderEngine/field_78367_h textureList
 public azc.k # RenderEngine/field_78366_k texturePack
@@ -25,7 +25,7 @@ public be.d # StringTranslate/field_74813_d
 # TileEntityRenderer
 public bby.m # 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.a(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77595_a
 public vq.b(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77596_b
 # WeightedRandomItem
 public kg.a # WeightedRandomItem/field_76292_a probability
@@ -35,7 +35,7 @@ public kg.a # WeightedRandomItem/field_76292_a probability
 public jc.a # StatBase/field_75978_a statName
 # NetLoginHandler
 public ik.a(Lik;Z)Z # NetLoginHandler/func_72531_a 'complete connection'
-public ij.h # NetLoginHandler/field_72543_h userName
+public ik.h # NetLoginHandler/field_72543_h userName
 # EntityPlayerMP getNextWindowId
 public ih.cd()V # EntityPlayerMP/func_71117_bO
 public ih.cv # EntityPlayerMP/field_71139_cq

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

@@ -9,16 +9,3 @@
  import java.util.Random;
  
  public class BlockDispenser extends BlockContainer
-@@ -278,7 +280,11 @@
-     {
-         float var15 = 1.1F;
-         byte var16 = 6;
--
-+        int modDispense = GameRegistry.tryDispense(p_72283_1_, p_72283_4_, p_72283_5_, p_72283_6_, p_72283_7_, p_72283_8_, p_72283_2_, p_72283_3_, p_72283_9_, p_72283_11_, p_72283_13_);
-+        if (modDispense > -1)
-+        {
-+            return modDispense;
-+        }
-         if (p_72283_2_.field_77993_c == Item.field_77704_l.field_77779_bT)
-         {
-             EntityArrow var28 = new EntityArrow(p_72283_1_, p_72283_9_, p_72283_11_, p_72283_13_);

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

@@ -7,10 +7,10 @@
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.File;
-@@ -39,6 +40,7 @@
+@@ -40,6 +41,7 @@
-         this.func_71500_a("Java VM Version", new CallableJavaInfo2(this));
          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);
      }
  

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

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

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

@@ -1,6 +1,6 @@
 --- ../src-base/common/net/minecraft/src/World.java
 +++ ../src-work/common/net/minecraft/src/World.java
-@@ -3473,7 +3473,7 @@
+@@ -3475,7 +3475,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {

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

@@ -31,7 +31,7 @@
  
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
-@@ -311,7 +320,7 @@
+@@ -312,7 +321,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);
-@@ -356,6 +365,8 @@
+@@ -357,6 +366,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);
-@@ -384,6 +395,7 @@
+@@ -385,6 +396,7 @@
          {
              this.func_71352_k();
          }
@@ -57,7 +57,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -742,9 +754,11 @@
+@@ -743,9 +755,11 @@
  
              if (!this.field_71454_w)
              {
@@ -69,7 +69,7 @@
              }
  
              GL11.glFlush();
-@@ -1270,11 +1284,13 @@
+@@ -1271,11 +1285,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");
-@@ -1654,6 +1670,7 @@
+@@ -1672,6 +1688,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();
      }
-@@ -1908,6 +1925,12 @@
+@@ -1926,6 +1943,12 @@
  
      public static void main(String[] p_main_0_)
      {

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

@@ -1,9 +1,9 @@
 --- ../src-base/minecraft/net/minecraft/src/RenderBlocks.java
 +++ ../src-work/minecraft/net/minecraft/src/RenderBlocks.java
-@@ -134,7 +134,81 @@
+@@ -184,7 +184,81 @@
-     {
          int var5 = p_78612_1_.func_71857_b();
          p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
+         this.func_83018_a(p_78612_1_);
 -        return var5 == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 3 ? this.func_78590_h(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 9 ? this.func_78586_a((BlockRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 15 ? this.func_78610_x(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (var5 == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (var5 == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 26 ? this.func_78567_v(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))));
 +        switch (var5)
 +        {
@@ -83,8 +83,8 @@
      }
  
      public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
-@@ -6427,6 +6501,10 @@
+@@ -6478,6 +6552,10 @@
-                 p_78600_1_.func_71905_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+                 this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
                  this.func_78595_a();
              }
 +            else
@@ -94,7 +94,7 @@
          }
          else
          {
-@@ -6484,6 +6562,36 @@
+@@ -6536,6 +6614,36 @@
  
      public static boolean func_78597_b(int p_78597_0_)
      {