Update to MC 1.4.6

fml/common/cpw/mods/fml/common/CertificateHelper.java

@@ -10,6 +10,10 @@ public class CertificateHelper {
 
     public static String getFingerprint(Certificate certificate)
     {
+        if (certificate == null)
+        {
+            return "NO VALID CERTIFICATE FOUND";
+        }
         try
         {
             MessageDigest md = MessageDigest.getInstance("SHA-1");

fml/common/cpw/mods/fml/common/DummyModContainer.java

@@ -1,6 +1,7 @@
 package cpw.mods.fml.common;
 
 import java.io.File;
+import java.security.cert.Certificate;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -138,4 +139,10 @@ public class DummyModContainer implements ModContainer
     {
         return Loader.instance().getMinecraftModContainer().getStaticVersionRange();
     }
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return null;
+    }
 }

fml/common/cpw/mods/fml/common/FMLDummyContainer.java.rej

@@ -1,23 +0,0 @@
---- common/cpw/mods/fml/common/FMLDummyContainer.java
-+++ common/cpw/mods/fml/common/FMLDummyContainer.java
-@@ -17,16 +17,16 @@
- import java.util.Arrays;
- import java.util.Map;
- import java.util.Set;
--import java.util.concurrent.ConcurrentMap;
- 
--import net.minecraft.nbt.*;
-+import net.minecraft.nbt.NBTBase;
-+import net.minecraft.nbt.NBTTagCompound;
-+import net.minecraft.nbt.NBTTagList;
- import net.minecraft.world.storage.SaveHandler;
- import net.minecraft.world.storage.WorldInfo;
- 
--import com.google.common.collect.MapMaker;
--import com.google.common.collect.Sets;
- import com.google.common.eventbus.EventBus;
- 
-+import cpw.mods.fml.common.registry.GameData;
- import cpw.mods.fml.common.registry.GameRegistry;
- import cpw.mods.fml.common.registry.ItemData;
- 

fml/common/cpw/mods/fml/common/FMLModContainer.java

@@ -30,13 +30,16 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
+import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
@@ -97,6 +100,7 @@ public class FMLModContainer implements ModContainer
     private VersionRange minecraftAccepted;
     private boolean fingerprintNotPresent;
     private Set<String> sourceFingerprints;
+    private Certificate certificate;
 
 
     public FMLModContainer(String className, File modSource, Map<String,Object> modDescriptor)
@@ -415,13 +419,14 @@ public class FMLModContainer implements ModContainer
             {
                 len = certificates.length;
             }
-            Builder<String> certBuilder = ImmutableSet.<String>builder();
+            Builder<String> certBuilder = ImmutableList.<String>builder();
             for (int i = 0; i < len; i++)
             {
                 certBuilder.add(CertificateHelper.getFingerprint(certificates[i]));
             }
 
-            sourceFingerprints = certBuilder.build();
+            ImmutableList<String> certList = certBuilder.build();
+            sourceFingerprints = ImmutableSet.copyOf(certList);
 
             String expectedFingerprint = (String) descriptor.get("certificateFingerprint");
 
@@ -434,6 +439,10 @@ public class FMLModContainer implements ModContainer
                 }
                 FMLLog.log(warnLevel, "The mod %s is expecting signature %s for source %s, however there is no signature matching that description", getModId(), expectedFingerprint, source.getName());
             }
+            else
+            {
+                certificate = certificates[certList.indexOf(expectedFingerprint)];
+            }
             annotations = gatherAnnotations(clazz);
             isNetworkMod = FMLNetworkHandler.instance().registerNetworkMod(this, clazz, event.getASMHarvestedData());
             modInstance = clazz.newInstance();
@@ -506,4 +515,10 @@ public class FMLModContainer implements ModContainer
     {
         return minecraftAccepted;
     }
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return certificate;
+    }
 }

fml/common/cpw/mods/fml/common/InjectedModContainer.java

@@ -1,6 +1,7 @@
 package cpw.mods.fml.common;
 
 import java.io.File;
+import java.security.cert.Certificate;
 import java.util.List;
 import java.util.Set;
 
@@ -129,4 +130,10 @@ public class InjectedModContainer implements ModContainer
             return null;
         }
     }
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return wrappedContainer.getSigningCertificate();
+    }
 }

fml/common/cpw/mods/fml/common/Loader.java

@@ -476,6 +476,11 @@ public class Loader
         }
         modController.transition(LoaderState.CONSTRUCTING);
         modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, disc.getASMTable());
+        FMLLog.fine("Mod signature data:");
+        for (ModContainer mod : getActiveModList())
+        {
+            FMLLog.fine("\t%s(%s:%s): %s (%s)", mod.getModId(), mod.getName(), mod.getVersion(), mod.getSource().getName(), CertificateHelper.getFingerprint(mod.getSigningCertificate()));
+        }
         modController.transition(LoaderState.PREINITIALIZATION);
         modController.distributeStateMessage(LoaderState.PREINITIALIZATION, disc.getASMTable(), canonicalConfigDir);
         modController.transition(LoaderState.INITIALIZATION);

fml/common/cpw/mods/fml/common/ModContainer.java

@@ -14,6 +14,7 @@
 package cpw.mods.fml.common;
 
 import java.io.File;
+import java.security.cert.Certificate;
 import java.util.List;
 import java.util.Set;
 
@@ -129,4 +130,6 @@ public interface ModContainer
     String getDisplayVersion();
 
     VersionRange acceptableMinecraftVersionRange();
+
+    Certificate getSigningCertificate();
 }

fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java

@@ -1,9 +1,22 @@
 package cpw.mods.fml.common.asm;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
 import java.io.ObjectInputStream.GetField;
+import java.io.StringReader;
 import java.net.JarURLConnection;
+import java.nio.charset.Charset;
 import java.security.CodeSource;
+import java.security.cert.CertPath;
+import java.security.cert.CertPathValidator;
 import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.PKIXCertPathValidatorResult;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 
 import javax.swing.JOptionPane;
@@ -21,7 +34,7 @@ import cpw.mods.fml.relauncher.RelaunchClassLoader;
 public class FMLSanityChecker implements IFMLCallHook
 {
     private static final String FMLFINGERPRINT = "AE:F6:54:79:96:E9:1B:D1:59:70:6C:B4:6B:F5:4A:89:C5:CE:08:1D".toLowerCase().replace(":","");
-    private static final String FORGEFINGERPRINT = "".toLowerCase().replace(":", "");
+    private static final String FORGEFINGERPRINT = "DE:4C:F8:A3:F3:BC:15:63:58:10:04:4C:39:24:0B:F9:68:04:EA:7D".toLowerCase().replace(":", "");
     static class MLDetectorClassVisitor extends ClassVisitor
     {
         private boolean foundMarker = false;
@@ -51,23 +64,26 @@ public class FMLSanityChecker implements IFMLCallHook
         if (codeSource.getLocation().getProtocol().equals("jar"))
         {
             Certificate[] certificates = codeSource.getCertificates();
-            if (certificates!=null && certificates.length>0)
+            if (certificates!=null)
             {
-                Certificate certificate = certificates[0];
-                String fingerprint = CertificateHelper.getFingerprint(certificate);
-                if (fingerprint.equals(FMLFINGERPRINT))
+
+                for (Certificate cert : certificates)
                 {
-                    FMLLog.info("Found valid fingerprint for FML: %s", fingerprint);
-                    goodFML = true;
-                }
-                else if (fingerprint.equals(FORGEFINGERPRINT))
-                {
-                    FMLLog.info("Found valid fingerprint for Minecraft Forge: %s", fingerprint);
-                    goodFML = true;
-                }
-                else
-                {
-                    FMLLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
+                    String fingerprint = CertificateHelper.getFingerprint(cert);
+                    if (fingerprint.equals(FMLFINGERPRINT))
+                    {
+                        FMLLog.info("Found valid fingerprint for FML. Certificate fingerprint %s", fingerprint);
+                        goodFML = true;
+                    }
+                    else if (fingerprint.equals(FORGEFINGERPRINT))
+                    {
+                        FMLLog.info("Found valid fingerprint for Minecraft Forge. Certificate fingerprint %s", fingerprint);
+                        goodFML = true;
+                    }
+                    else
+                    {
+                        FMLLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
+                    }
                 }
             }
         }

fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java

@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -616,4 +617,9 @@ public class ModLoaderModContainer implements ModContainer
     {
         return Loader.instance().getMinecraftModContainer().getStaticVersionRange();
     }
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return null;
+    }
 }

fml/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java

@@ -17,7 +17,7 @@ public class ModLoaderPickupNotifier implements IPickupNotifier
     @Override
     public void notifyPickup(EntityItem item, EntityPlayer player)
     {
-        mod.onItemPickup(player, item.field_70294_a);
+        mod.onItemPickup(player, item.func_92014_d());
     }
 
 }

fml/common/cpw/mods/fml/common/registry/GameRegistry.java

@@ -250,7 +250,7 @@ public class GameRegistry
 
     public static void addRecipe(ItemStack output, Object... params)
     {
-        CraftingManager.func_77594_a().func_77595_a(output, params);
+        CraftingManager.func_77594_a().func_92051_a(output, params);
     }
 
     public static void addShapelessRecipe(ItemStack output, Object... params)

fml/common/fml_at.cfg

@@ -1,6 +1,6 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public anq.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public any.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
 public lv.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
 public lv.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
@@ -8,25 +8,25 @@ public lv.b #FD:EntityList/field_75625_b #nameToClassMap
 public lv.c #FD:EntityList/field_75626_c #classToNameMap
 public lv.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
-public bap.h #FD:RenderEngine/field_78367_h #textureList
-public bap.k #FD:RenderEngine/field_78366_k #texturePack
+public bba.h #FD:RenderEngine/field_78367_h #textureList
+public bba.k #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bbj.p #FD:RenderManager/field_78729_o #renderers
+public bbu.p #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public baq.* #FD:RenderBlocks/*
-public baq.*() #MD:RenderBlocks/*
+public bbb.* #FD:RenderBlocks/*
+public bbb.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bcd.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bco.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bbr.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bcc.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 public bn.b #FD:StringTranslate/field_74815_b
 public bn.d #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bdl.m #FD:TileEntityRenderer/field_76966_m
+public bdw.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-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
+public wn.a(Lur;[Ljava/lang/Object;)Lwq; #MD:CraftingManager/func_92051_a
+public wn.b(Lur;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
 public kv.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
@@ -37,20 +37,20 @@ public jl.a #FD:StatBase/field_75978_a #statName
 public it.a(Lit;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
 public it.h #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public iq.ch()V #MD:EntityPlayerMP/func_71117_bO
-public iq.cs #FD:EntityPlayerMP/field_71139_cq
+public iq.cg()V #MD:EntityPlayerMP/func_71117_bO
+public iq.ct #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
 public ne #CL:EntityAITaskEntry
 # EntityAITasks
 public nd.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public ajd.n(Lxv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public ajk.n(Lyc;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public md.aS #FD:EntityLiving/field_70736_aM #carryoverDamage
-public md.bm #FD:EntityLiving/field_70714_bg #tasks
-public md.bE #FD:EntityLiving/field_70703_bu #isJumping
+public md.aT #FD:EntityLiving/field_70736_aM #carryoverDamage
+public md.bn #FD:EntityLiving/field_70714_bg #tasks
+public md.bF #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected nq.a(Lxv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected nq.a(Lyc;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
 protected nq.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public b #CL:CallableMinecraftVersion
@@ -58,16 +58,16 @@ public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/Cra
 # EntityAnimal
 public ox.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-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)
+public yn.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public yn.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public afl #CL:ComponentVillage
+public afs #CL:ComponentVillage
 # EntityVillager - minmax lists
-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
+public qu.a(Lxu;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public qu.b(Lxu;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public qu.bO #FD:EntityVillager/field_70958_bB
+public qu.bP #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public avu #CL:GuiButtonMerchant
+public awb #CL:GuiButtonMerchant
 
-protected asy.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected atf.a #FD:GuiYesNo/field_73942_a #guiScreen

fml/common/fml_marker.cfg

@@ -5,8 +5,8 @@
 qx cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-amj cpw/mods/fml/common/registry/BlockProxy
+amq cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-uk cpw/mods/fml/common/registry/ItemProxy
+up cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy

fml/common/mcpmod.info

@@ -3,8 +3,8 @@
   "modid": "mcp",
   "name": "Minecraft Coder Pack",
   "description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
-  "version": "7.23",
-  "mcversion": "1.4.5",
+  "version": "7.25",
+  "mcversion": "1.4.6",
   "logoFile": "/mcp.png",
   "url": "http://mcp.ocean-labs.de/",
   "updateUrl": "",

fml/conf/fields.csv

@@ -325,7 +325,6 @@ field_70715_bh,targetTasks,2,
 field_70716_bi,newPosRotationIncrements,2,The number of updates over which the new position and rotation are to be applied to the entity.
 field_70717_bb,attackingPlayer,2,The most recent player that has attacked this entity
 field_70718_bc,recentlyHit,2,"Set to 60 when hit by the player or the player's wolf, then decrements. Used to determine whether the entity should drop items on death."
-field_70719_bd,arrowHitTempCounter,2,"Set to 60 when hit by the player or the player's wolf, then decrements. Used to determine whether the entity should drop items on death."
 field_70720_be,arrowHitTimer,2,
 field_70721_aZ,legYaw,2,
 field_70722_aY,prevLegYaw,2,
@@ -469,7 +468,6 @@ field_71088_bW,timeUntilPortal,2,
 field_71090_bL,xpCooldown,2,Used by EntityPlayer to prevent too many xp orbs from getting absorbed at once.
 field_71092_bJ,username,2,
 field_71093_bK,dimension,2,"Which dimension the player is in (-1 = the Nether, 0 = normal world)"
-field_71099_bE,score,2,
 field_71100_bB,foodStats,2,The player's food stats. (See class FoodStats)
 field_71101_bC,flyToggleTimer,2,"Used to tell if the player pressed jump twice. If this is at 0 and it's pressed (And they are allowed to fly, as defined in the player's movementInput) it sets this to 7. If it's pressed and it's greater than 0 enable fly."
 field_71102_ce,speedInAir,2,
@@ -581,6 +579,7 @@ field_71342_m,theRConThreadQuery,2,
 field_71345_q,lanServerPing,2,
 field_71346_p,isPublic,2,
 field_71347_n,theServerListeningThread,2,Instance of IntegratedServerListenThread.
+field_71348_o,isGamePaused,2,
 field_71349_l,mc,2,The Minecraft instance.
 field_71350_m,theWorldSettings,2,
 field_71412_D,mcDataDir,2,
@@ -1183,7 +1182,7 @@ field_73071_a,demoWorldSettings,2,
 field_73072_L,demoWorldSeed,2,
 field_73086_f,partiallyDestroyedBlockX,2,
 field_73087_g,partiallyDestroyedBlockY,2,
-field_73088_d,isPartiallyDestroyedBlockWhole,2,"set to true on first call of destroyBlockInWorldPartially, false before any further calls"
+field_73088_d,isDestroyingBlock,2,True if the player is destroying a block
 field_73089_e,initialDamage,2,
 field_73090_b,thisPlayerMP,2,The EntityPlayerMP object that this object is connected to.
 field_73091_c,gameType,2,
@@ -1191,6 +1190,7 @@ field_73092_a,theWorld,2,The world object that this object is connected to.
 field_73094_o,durabilityRemainingOnBlock,2,
 field_73095_l,posY,2,
 field_73096_m,posZ,2,
+field_73097_j,receivedFinishDiggingPacket,2,"Set to true when the ""finished destroying block"" packet is received but the block wasn't fully damaged yet. The block will not be destroyed while this is false."
 field_73098_k,posX,2,
 field_73099_h,partiallyDestroyedBlockZ,2,
 field_73100_i,curblockDamage,2,
@@ -1970,9 +1970,7 @@ field_74385_A,enumFloat,2,
 field_74386_B,enumBoolean,2,
 field_74387_C,enumString,2,
 field_74414_a,enumOptionsMappingHelperArray,2,
-field_74416_a,mc,2,Reference to the Minecraft object.
 field_74417_a,theTcpConnection,2,
-field_74419_a,mc,2,Reference to the Minecraft object.
 field_74421_a,mc,2,Reference to the Minecraft object.
 field_74422_a,mcApplet,2,Reference to the MinecraftApplet object.
 field_74438_f,shutdownReason,2,
@@ -2014,7 +2012,6 @@ field_74515_c,keyDescription,2,
 field_74516_a,keybindArray,2,
 field_74522_a,colorBuffer,2,Float buffer used to set OpenGL material colors
 field_74532_a,mc,2,A reference to the Minecraft object.
-field_74533_a,enumOSMappingHelperArray,2,
 field_74534_a,arguments,2,"Arguments that were passed to Minecraft.jar (username, sessionid etc)"
 field_74536_a,mc,2,Minecraft instance
 field_74537_a,logo,2,BufferedImage object containing the Majong logo.
@@ -2482,7 +2479,6 @@ field_75624_e,classToIDMapping,2,provides a mapping between an Entity Class and
 field_75625_b,stringToClassMapping,2,Provides a mapping between entity classes and a string
 field_75626_c,classToStringMapping,2,Provides a mapping between a string and an entity classes
 field_75627_a,entityEggs,2,This is a HashMap of the Creative Entity Eggs/Spawners.
-field_75628_a,enumEntitySizeMappingHelperArray,2,
 field_75644_d,posZ,2,
 field_75645_e,speed,2,The speed at which the entity should move
 field_75646_b,posX,2,
@@ -4185,8 +4181,11 @@ field_82172_bs,canPickUpLoot,2,Whether this entity can pick up items from the gr
 field_82173_br,swingProgressInt,2,
 field_82174_bp,equipmentDropChances,2,Chances for each equipment piece from dropping when this entity dies.
 field_82175_bq,isSwingInProgress,2,Whether an arm swing is currently in progress.
+field_82176_d,armorProbability,2,Probability to get armor
 field_82177_b,enchantmentProbability,2,An array of probabilities that determines whether a random enchantment should be added to the held item. Indexed by difficulty.
+field_82178_c,armorEnchantmentProbability,2,Probability to get enchanted armor
 field_82179_bU,persistenceRequired,2,Whether this entity should NOT despawn.
+field_82181_as,pickUpLootProability,2,Probability to pick up loot
 field_82182_bS,equipment,2,Equipment (armor and held item) for this entity.
 field_82184_d,aiControlledByPlayer,2,AI task for player control.
 field_82189_bL,lastBuyingPlayer,2,"Last player to trade with this villager, used for aggressivity."
@@ -4231,6 +4230,7 @@ field_82322_p,beaconConfirmButton,2,
 field_82323_o,beacon,2,
 field_82332_a,hangingDirection,2,
 field_82337_e,itemDropChance,2,Chance for this item frame's item to drop from the frame.
+field_82339_as,particleAlpha,2,Particle alpha
 field_82346_a,theContainer,2,Container of this anvil's block.
 field_82354_a,command,2,The command this block will execute when powered.
 field_82365_a,difficulties,2,
@@ -4238,6 +4238,7 @@ field_82373_c,directions,2,
 field_82374_e,facings,2,
 field_82397_a,skullRenderer,2,
 field_82401_a,skeletonHeadModel,2,The Skeleton's head model.
+field_82405_a,renderBlocksInstance,2,
 field_82424_k,bipedArmorFilenamePrefix,2,List of armor texture filenames.
 field_82446_a,renderedBatSize,2,"not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and it seems a good match for a bats size"
 field_82453_b,createFlatWorldGui,2,
@@ -4277,7 +4278,6 @@ field_82527_a,dispenseBehaviorRegistry,2,Registry for all dispense behaviors.
 field_82537_a,sensible,2,"Whether this button is sensible to arrows, used by wooden buttons."
 field_82539_a,types,2,The types of the wall.
 field_82548_a,theChunkCoordinates,2,
-field_82550_a,mcServer,2,
 field_82552_a,mcServer,2,
 field_82553_a,mcServer,2,
 field_82555_a,mcServer,2,
@@ -4354,6 +4354,7 @@ field_82809_c,soilId,2,Block ID of the soil this seed food should be planted on.
 field_82811_a,hangingEntityClass,2,
 field_82822_g,gameVersion,2,Game version for this server.
 field_82823_k,hideAddress,2,Whether to hide the IP address for this server.
+field_82826_b,statusBarLenght,2,
 field_82827_c,bossName,2,
 field_82828_a,healthScale,2,
 field_82843_f,itemFrame,2,"Item frame this stack is on, or null if not on an item frame."
@@ -4385,3 +4386,19 @@ field_82911_a,iconId,2,ID for the item used as icon for this preset.
 field_82915_S,theWorldGenerator,2,
 field_83004_a,theCrashReport,2,
 field_83016_L,theCalendar,2,
+field_83021_g,customMinX,2,Custom minimum X for rendering
+field_83022_l,customMaxZ,2,Custom maximum Z for rendering
+field_83023_m,useCustomBlockBounds,2,Use custom block bounds for the rendering
+field_83024_j,customMaxY,2,Custom maximum Y for rendering
+field_83025_k,customMinZ,2,Custom minimum Z for rendering
+field_83026_h,customMaxX,2,Custom maximum X for rendering
+field_83027_i,customMinY,2,Custom minimum Y for rendering
+field_85045_v,returningStack,2,Used when touchscreen is enabled
+field_85046_u,returningStackTime,2,
+field_85047_t,returningStackDestSlot,2,
+field_85050_q,draggedStack,2,Used when touchscreen is enabled
+field_85051_p,clickedSlot,2,Used when touchscreen is enabled
+field_85180_cf,recordWait,2,
+field_85185_A,touchscreen,2,
+field_90017_e,isMacOs,2,
+field_90044_b,records,2,List of all record items and their names.

fml/conf/joined.exc

@@ -279,6 +279,9 @@ net/minecraft/src/BehaviorDispenseBoat.func_82487_b(Lnet/minecraft/src/IBlockSou
 net/minecraft/src/BehaviorDispenseFireball.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5047_1_
 net/minecraft/src/BehaviorDispenseFireball.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_
 net/minecraft/src/BehaviorDispenseFireball.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_
+net/minecraft/src/BehaviorDispenseFirework.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i8005_1_
+net/minecraft/src/BehaviorDispenseFirework.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_
+net/minecraft/src/BehaviorDispenseFirework.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_
 net/minecraft/src/BehaviorDispenseItemProvider.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_
 net/minecraft/src/BehaviorDispenseMinecart.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5048_1_
 net/minecraft/src/BehaviorDispenseMinecart.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_
@@ -288,7 +291,6 @@ net/minecraft/src/BehaviorEggDispense.func_82499_a(Lnet/minecraft/src/World;Lnet
 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_
@@ -780,9 +782,11 @@ net/minecraft/src/BlockGravel.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_
 net/minecraft/src/BlockHalfSlab.<init>(IZLnet/minecraft/src/Material;)V=|p_i3954_1_,p_i3954_2_,p_i3954_3_
 net/minecraft/src/BlockHalfSlab.func_71851_a(I)I=|p_71851_1_
 net/minecraft/src/BlockHalfSlab.func_71871_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/Entity;)V=|p_71871_1_,p_71871_2_,p_71871_3_,p_71871_4_,p_71871_5_,p_71871_6_,p_71871_7_
+net/minecraft/src/BlockHalfSlab.func_71873_h(Lnet/minecraft/src/World;III)I=|p_71873_1_,p_71873_2_,p_71873_3_,p_71873_4_
 net/minecraft/src/BlockHalfSlab.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockHalfSlab.func_71899_b(I)I=|p_71899_1_
 net/minecraft/src/BlockHalfSlab.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
+net/minecraft/src/BlockHalfSlab.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_
 net/minecraft/src/BlockHalfSlab.func_71925_a(Ljava/util/Random;)I=|p_71925_1_
 net/minecraft/src/BlockHalfSlab.func_72241_e(I)Z=|p_72241_0_
 net/minecraft/src/BlockHalfSlab.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
@@ -814,6 +818,7 @@ net/minecraft/src/BlockLeaves.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_7
 net/minecraft/src/BlockLeaves.func_71858_a(II)I=|p_71858_1_,p_71858_2_
 net/minecraft/src/BlockLeaves.func_71862_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71862_1_,p_71862_2_,p_71862_3_,p_71862_4_,p_71862_5_
 net/minecraft/src/BlockLeaves.func_71879_a(ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V=|p_71879_1_,p_71879_2_,p_71879_3_
+net/minecraft/src/BlockLeaves.func_71880_c_(I)Lnet/minecraft/src/ItemStack;=|p_71880_1_
 net/minecraft/src/BlockLeaves.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71885_2_,p_71885_3_
 net/minecraft/src/BlockLeaves.func_71889_f_(I)I=|p_71889_1_
 net/minecraft/src/BlockLeaves.func_71893_a(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;IIII)V=|p_71893_1_,p_71893_2_,p_71893_3_,p_71893_4_,p_71893_5_,p_71893_6_
@@ -1368,7 +1373,6 @@ net/minecraft/src/CallableJVMFlags.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i
 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_
 net/minecraft/src/CallableLWJGLVersion.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3002_1_
-net/minecraft/src/CallableLastTickedParticle.<init>(Lnet/minecraft/src/EffectRenderer;Lnet/minecraft/src/EntityFX;)V=|p_i7003_1_,p_i7003_2_
 net/minecraft/src/CallableLevelDimension.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6825_1_
 net/minecraft/src/CallableLevelGamemode.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6828_1_
 net/minecraft/src/CallableLevelGenerator.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6821_1_
@@ -1393,6 +1397,7 @@ net/minecraft/src/CallableParticleScreenName.<init>(Lnet/minecraft/client/Minecr
 net/minecraft/src/CallableScreenName.<init>(Lnet/minecraft/src/EntityRenderer;)V=|p_i7006_1_
 net/minecraft/src/CallableScreenSize.<init>(Lnet/minecraft/src/EntityRenderer;Lnet/minecraft/src/ScaledResolution;)V=|p_i7004_1_,p_i7004_2_
 net/minecraft/src/CallableServerMemoryStats.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5042_1_
+net/minecraft/src/CallableServerMemoryStats.func_92022_a()Ljava/lang/String;=|
 net/minecraft/src/CallableServerProfiler.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3373_1_
 net/minecraft/src/CallableServerType.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i6810_1_
 net/minecraft/src/CallableStructureType.<init>(Lnet/minecraft/src/MapGenStructure;)V=|p_i6819_1_
@@ -1995,9 +2000,10 @@ net/minecraft/src/ConvertingProgressUpdate.func_73718_a(I)V=|p_73718_1_
 net/minecraft/src/ConvertingProgressUpdate.func_73719_c(Ljava/lang/String;)V=|p_73719_1_
 net/minecraft/src/ConvertingProgressUpdate.func_73720_a(Ljava/lang/String;)V=|p_73720_1_
 net/minecraft/src/ConvertingProgressUpdate.func_73721_b(Ljava/lang/String;)V=|p_73721_1_
-net/minecraft/src/CraftingManager.func_77595_a(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)V=|p_77595_1_,p_77595_2_
 net/minecraft/src/CraftingManager.func_77596_b(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)V=|p_77596_1_,p_77596_2_
 net/minecraft/src/CraftingManager.func_82787_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Lnet/minecraft/src/ItemStack;=|p_82787_1_,p_82787_2_
+net/minecraft/src/CraftingManager.func_92051_a(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes;=|p_92051_1_,p_92051_2_
+net/minecraft/src/CraftingManager.func_92103_a(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes;=|p_92103_1_,p_92103_2_
 net/minecraft/src/CrashReport.<init>(Ljava/lang/String;Ljava/lang/Throwable;)V=|p_i3250_1_,p_i3250_2_
 net/minecraft/src/CrashReport.func_71506_a(Ljava/lang/StringBuilder;)V=|p_71506_1_
 net/minecraft/src/CrashReport.func_71508_a(Ljava/io/File;)Z=|p_71508_1_
@@ -2023,18 +2029,22 @@ net/minecraft/src/CreativeCrafting.func_71112_a(Lnet/minecraft/src/Container;II)
 net/minecraft/src/CreativeTabBlock.<init>(ILjava/lang/String;)V=|p_i3630_1_,p_i3630_2_
 net/minecraft/src/CreativeTabBrewing.<init>(ILjava/lang/String;)V=|p_i3631_1_,p_i3631_2_
 net/minecraft/src/CreativeTabCombat.<init>(ILjava/lang/String;)V=|p_i3641_1_,p_i3641_2_
+net/minecraft/src/CreativeTabCombat.func_78018_a(Ljava/util/List;)V=|p_78018_1_
 net/minecraft/src/CreativeTabDeco.<init>(ILjava/lang/String;)V=|p_i3634_1_,p_i3634_2_
 net/minecraft/src/CreativeTabFood.<init>(ILjava/lang/String;)V=|p_i3639_1_,p_i3639_2_
 net/minecraft/src/CreativeTabInventory.<init>(ILjava/lang/String;)V=|p_i3633_1_,p_i3633_2_
 net/minecraft/src/CreativeTabMaterial.<init>(ILjava/lang/String;)V=|p_i3632_1_,p_i3632_2_
 net/minecraft/src/CreativeTabMisc.<init>(ILjava/lang/String;)V=|p_i3637_1_,p_i3637_2_
+net/minecraft/src/CreativeTabMisc.func_78018_a(Ljava/util/List;)V=|p_78018_1_
 net/minecraft/src/CreativeTabRedstone.<init>(ILjava/lang/String;)V=|p_i3635_1_,p_i3635_2_
 net/minecraft/src/CreativeTabSearch.<init>(ILjava/lang/String;)V=|p_i3638_1_,p_i3638_2_
 net/minecraft/src/CreativeTabTools.<init>(ILjava/lang/String;)V=|p_i3640_1_,p_i3640_2_
+net/minecraft/src/CreativeTabTools.func_78018_a(Ljava/util/List;)V=|p_78018_1_
 net/minecraft/src/CreativeTabTransport.<init>(ILjava/lang/String;)V=|p_i3636_1_,p_i3636_2_
 net/minecraft/src/CreativeTabs.<init>(ILjava/lang/String;)V=|p_i3642_1_,p_i3642_2_
 net/minecraft/src/CreativeTabs.func_78018_a(Ljava/util/List;)V=|p_78018_1_
 net/minecraft/src/CreativeTabs.func_78025_a(Ljava/lang/String;)Lnet/minecraft/src/CreativeTabs;=|p_78025_1_
+net/minecraft/src/CreativeTabs.func_92116_a(Ljava/util/List;[Lnet/minecraft/src/EnumEnchantmentType;)V=|p_92116_1_,p_92116_2_
 net/minecraft/src/CryptManager.func_75885_a(ILjava/security/Key;[B)[B=|p_75885_0_,p_75885_1_,p_75885_2_
 net/minecraft/src/CryptManager.func_75886_a(ILjava/lang/String;Ljava/security/Key;)Ljavax/crypto/Cipher;=|p_75886_0_,p_75886_1_,p_75886_2_
 net/minecraft/src/CryptManager.func_75887_a(Ljava/security/PrivateKey;[B)Ljavax/crypto/SecretKey;=|p_75887_0_,p_75887_1_
@@ -2054,6 +2064,8 @@ net/minecraft/src/DamageSource.func_76358_a(Lnet/minecraft/src/EntityLiving;)Lne
 net/minecraft/src/DamageSource.func_76360_b(Lnet/minecraft/src/EntityPlayer;)Ljava/lang/String;=|p_76360_1_
 net/minecraft/src/DamageSource.func_76362_a(Lnet/minecraft/src/EntityFireball;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_76362_0_,p_76362_1_
 net/minecraft/src/DamageSource.func_76365_a(Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/DamageSource;=|p_76365_0_
+net/minecraft/src/DamageSource.func_92036_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_92036_0_
+net/minecraft/src/DamageSource.func_92087_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_92087_0_
 net/minecraft/src/DataWatcher.func_75679_c(I)I=|p_75679_1_
 net/minecraft/src/DataWatcher.func_75680_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException|p_75680_0_,p_75680_1_
 net/minecraft/src/DataWatcher.func_75681_e(I)Ljava/lang/String;=|p_75681_1_
@@ -2069,6 +2081,7 @@ net/minecraft/src/DataWatcher.func_75693_b(I)S=|p_75693_1_
 net/minecraft/src/DataWatcher.func_82708_h(I)V=|p_82708_1_
 net/minecraft/src/DataWatcher.func_82709_a(II)V=|p_82709_1_,p_82709_2_
 net/minecraft/src/DataWatcher.func_82710_f(I)Lnet/minecraft/src/ItemStack;=|p_82710_1_
+net/minecraft/src/DataWatcher.func_92034_d()Z=|
 net/minecraft/src/DedicatedPlayerList.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i3378_1_
 net/minecraft/src/DedicatedPlayerList.func_72359_h(Ljava/lang/String;)V=|p_72359_1_
 net/minecraft/src/DedicatedPlayerList.func_72360_c(Ljava/lang/String;)V=|p_72360_1_
@@ -2159,6 +2172,8 @@ net/minecraft/src/Enchantment.func_77321_a(I)I=|p_77321_1_
 net/minecraft/src/Enchantment.func_77322_b(Ljava/lang/String;)Lnet/minecraft/src/Enchantment;=|p_77322_1_
 net/minecraft/src/Enchantment.func_77323_a(ILnet/minecraft/src/EntityLiving;)I=|p_77323_1_,p_77323_2_
 net/minecraft/src/Enchantment.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_
+net/minecraft/src/Enchantment.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_
+net/minecraft/src/Enchantment.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_
 net/minecraft/src/EnchantmentArrowDamage.<init>(II)V=|p_i3702_1_,p_i3702_2_
 net/minecraft/src/EnchantmentArrowDamage.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentArrowDamage.func_77321_a(I)I=|p_77321_1_
@@ -2176,19 +2191,27 @@ net/minecraft/src/EnchantmentDamage.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentDamage.func_77321_a(I)I=|p_77321_1_
 net/minecraft/src/EnchantmentDamage.func_77323_a(ILnet/minecraft/src/EntityLiving;)I=|p_77323_1_,p_77323_2_
 net/minecraft/src/EnchantmentDamage.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_
+net/minecraft/src/EnchantmentDamage.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_
+net/minecraft/src/EnchantmentDamage.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_
+net/minecraft/src/EnchantmentData.<init>(II)V=|p_i8014_1_,p_i8014_2_
 net/minecraft/src/EnchantmentData.<init>(Lnet/minecraft/src/Enchantment;I)V=|p_i3713_1_,p_i3713_2_
 net/minecraft/src/EnchantmentDigging.<init>(II)V=|p_i3708_1_,p_i3708_2_
 net/minecraft/src/EnchantmentDigging.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentDigging.func_77321_a(I)I=|p_77321_1_
+net/minecraft/src/EnchantmentDigging.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_
+net/minecraft/src/EnchantmentDigging.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_
 net/minecraft/src/EnchantmentDurability.<init>(II)V=|p_i3707_1_,p_i3707_2_
 net/minecraft/src/EnchantmentDurability.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentDurability.func_77321_a(I)I=|p_77321_1_
+net/minecraft/src/EnchantmentDurability.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_
+net/minecraft/src/EnchantmentDurability.func_92045_a(Lnet/minecraft/src/ItemStack;ILjava/util/Random;)Z=|p_92045_0_,p_92045_1_,p_92045_2_
+net/minecraft/src/EnchantmentDurability.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_
+net/minecraft/src/EnchantmentDurability.func_92097_a(Lnet/minecraft/src/ItemStack;ILjava/util/Random;)Z=|p_92097_0_,p_92097_1_,p_92097_2_
 net/minecraft/src/EnchantmentFireAspect.<init>(II)V=|p_i3714_1_,p_i3714_2_
 net/minecraft/src/EnchantmentFireAspect.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentFireAspect.func_77321_a(I)I=|p_77321_1_
 net/minecraft/src/EnchantmentHelper.func_77501_a(Lnet/minecraft/src/EntityLiving;)I=|p_77501_0_
 net/minecraft/src/EnchantmentHelper.func_77502_d(Lnet/minecraft/src/EntityLiving;)Z=|p_77502_0_
-net/minecraft/src/EnchantmentHelper.func_77503_c(Lnet/minecraft/src/EntityLiving;)I=|p_77503_0_
 net/minecraft/src/EnchantmentHelper.func_77504_a(Ljava/util/Random;Lnet/minecraft/src/ItemStack;I)Lnet/minecraft/src/ItemStack;=|p_77504_0_,p_77504_1_,p_77504_2_
 net/minecraft/src/EnchantmentHelper.func_77505_b(ILnet/minecraft/src/ItemStack;)Ljava/util/Map;=|p_77505_0_,p_77505_1_
 net/minecraft/src/EnchantmentHelper.func_77506_a(ILnet/minecraft/src/ItemStack;)I=|p_77506_0_,p_77506_1_
@@ -2207,6 +2230,10 @@ net/minecraft/src/EnchantmentHelper.func_77519_f(Lnet/minecraft/src/EntityLiving
 net/minecraft/src/EnchantmentHelper.func_82781_a(Lnet/minecraft/src/ItemStack;)Ljava/util/Map;=|p_82781_0_
 net/minecraft/src/EnchantmentHelper.func_82782_a(Ljava/util/Map;Lnet/minecraft/src/ItemStack;)V=|p_82782_0_,p_82782_1_
 net/minecraft/src/EnchantmentHelper.func_90036_a(Lnet/minecraft/src/EntityLiving;)I=|p_90036_0_
+net/minecraft/src/EnchantmentHelper.func_92046_i(Lnet/minecraft/src/EntityLiving;)I=|p_92046_0_
+net/minecraft/src/EnchantmentHelper.func_92047_a(Lnet/minecraft/src/Enchantment;Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/ItemStack;=|p_92047_0_,p_92047_1_
+net/minecraft/src/EnchantmentHelper.func_92098_i(Lnet/minecraft/src/EntityLiving;)I=|p_92098_0_
+net/minecraft/src/EnchantmentHelper.func_92099_a(Lnet/minecraft/src/Enchantment;Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/ItemStack;=|p_92099_0_,p_92099_1_
 net/minecraft/src/EnchantmentKnockback.<init>(II)V=|p_i3715_1_,p_i3715_2_
 net/minecraft/src/EnchantmentKnockback.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentKnockback.func_77321_a(I)I=|p_77321_1_
@@ -2227,10 +2254,27 @@ net/minecraft/src/EnchantmentProtection.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentProtection.func_77318_a(ILnet/minecraft/src/DamageSource;)I=|p_77318_1_,p_77318_2_
 net/minecraft/src/EnchantmentProtection.func_77321_a(I)I=|p_77321_1_
 net/minecraft/src/EnchantmentProtection.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_
+net/minecraft/src/EnchantmentProtection.func_92040_a(Lnet/minecraft/src/Entity;D)D=|p_92040_0_,p_92040_1_
+net/minecraft/src/EnchantmentProtection.func_92041_a(Lnet/minecraft/src/Entity;I)I=|p_92041_0_,p_92041_1_
+net/minecraft/src/EnchantmentProtection.func_92092_a(Lnet/minecraft/src/Entity;D)D=|p_92092_0_,p_92092_1_
+net/minecraft/src/EnchantmentProtection.func_92093_a(Lnet/minecraft/src/Entity;I)I=|p_92093_0_,p_92093_1_
+net/minecraft/src/EnchantmentThorns.<init>(II)V=|p_i8015_1_,p_i8015_2_
+net/minecraft/src/EnchantmentThorns.func_77317_b(I)I=|p_77317_1_
+net/minecraft/src/EnchantmentThorns.func_77321_a(I)I=|p_77321_1_
+net/minecraft/src/EnchantmentThorns.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_
+net/minecraft/src/EnchantmentThorns.func_92042_a(ILjava/util/Random;)Z=|p_92042_0_,p_92042_1_
+net/minecraft/src/EnchantmentThorns.func_92043_b(ILjava/util/Random;)I=|p_92043_0_,p_92043_1_
+net/minecraft/src/EnchantmentThorns.func_92044_a(Lnet/minecraft/src/Entity;Lnet/minecraft/src/EntityLiving;Ljava/util/Random;)V=|p_92044_0_,p_92044_1_,p_92044_2_
+net/minecraft/src/EnchantmentThorns.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_
+net/minecraft/src/EnchantmentThorns.func_92094_a(ILjava/util/Random;)Z=|p_92094_0_,p_92094_1_
+net/minecraft/src/EnchantmentThorns.func_92095_b(ILjava/util/Random;)I=|p_92095_0_,p_92095_1_
+net/minecraft/src/EnchantmentThorns.func_92096_a(Lnet/minecraft/src/Entity;Lnet/minecraft/src/EntityLiving;Ljava/util/Random;)V=|p_92096_0_,p_92096_1_,p_92096_2_
 net/minecraft/src/EnchantmentUntouching.<init>(II)V=|p_i3719_1_,p_i3719_2_
 net/minecraft/src/EnchantmentUntouching.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentUntouching.func_77321_a(I)I=|p_77321_1_
 net/minecraft/src/EnchantmentUntouching.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_
+net/minecraft/src/EnchantmentUntouching.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_
+net/minecraft/src/EnchantmentUntouching.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_
 net/minecraft/src/EnchantmentWaterWorker.<init>(II)V=|p_i3720_1_,p_i3720_2_
 net/minecraft/src/EnchantmentWaterWorker.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentWaterWorker.func_77321_a(I)I=|p_77321_1_
@@ -2448,6 +2492,7 @@ net/minecraft/src/EntityClientPlayerMP.func_70097_a(Lnet/minecraft/src/DamageSou
 net/minecraft/src/EntityClientPlayerMP.func_70665_d(Lnet/minecraft/src/DamageSource;I)V=|p_70665_1_,p_70665_2_
 net/minecraft/src/EntityClientPlayerMP.func_70691_i(I)V=|p_70691_1_
 net/minecraft/src/EntityClientPlayerMP.func_71012_a(Lnet/minecraft/src/EntityItem;)V=|p_71012_1_
+net/minecraft/src/EntityClientPlayerMP.func_71040_bB(Z)Lnet/minecraft/src/EntityItem;=|p_71040_1_
 net/minecraft/src/EntityClientPlayerMP.func_71064_a(Lnet/minecraft/src/StatBase;I)V=|p_71064_1_,p_71064_2_
 net/minecraft/src/EntityClientPlayerMP.func_71150_b(I)V=|p_71150_1_
 net/minecraft/src/EntityClientPlayerMP.func_71165_d(Ljava/lang/String;)V=|p_71165_1_
@@ -2549,6 +2594,7 @@ net/minecraft/src/EntityExpBottle.<init>(Lnet/minecraft/src/World;DDD)V=|p_i3594
 net/minecraft/src/EntityExpBottle.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;)V=|p_i3593_1_,p_i3593_2_
 net/minecraft/src/EntityExpBottle.func_70184_a(Lnet/minecraft/src/MovingObjectPosition;)V=|p_70184_1_
 net/minecraft/src/EntityExplodeFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i3180_1_,p_i3180_2_,p_i3180_4_,p_i3180_6_,p_i3180_8_,p_i3180_10_,p_i3180_12_
+net/minecraft/src/EntityFX.<init>(Lnet/minecraft/src/World;DDD)V=|p_i8001_1_,p_i8001_2_,p_i8001_4_,p_i8001_6_
 net/minecraft/src/EntityFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i3154_1_,p_i3154_2_,p_i3154_4_,p_i3154_6_,p_i3154_8_,p_i3154_10_,p_i3154_12_
 net/minecraft/src/EntityFX.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityFX.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
@@ -2565,6 +2611,7 @@ net/minecraft/src/EntityFallingSand.func_70014_b(Lnet/minecraft/src/NBTTagCompou
 net/minecraft/src/EntityFallingSand.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityFallingSand.func_70069_a(F)V=|p_70069_1_
 net/minecraft/src/EntityFallingSand.func_82154_e(Z)V=|p_82154_1_
+net/minecraft/src/EntityFallingSand.func_85029_a(Lnet/minecraft/src/CrashReportCategory;)V=|p_85029_1_
 net/minecraft/src/EntityFireball.<init>(Lnet/minecraft/src/World;)V=|p_i3571_1_
 net/minecraft/src/EntityFireball.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i3572_1_,p_i3572_2_,p_i3572_4_,p_i3572_6_,p_i3572_8_,p_i3572_10_,p_i3572_12_
 net/minecraft/src/EntityFireball.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;DDD)V=|p_i3573_1_,p_i3573_2_,p_i3573_3_,p_i3573_5_,p_i3573_7_
@@ -2574,6 +2621,31 @@ net/minecraft/src/EntityFireball.func_70037_a(Lnet/minecraft/src/NBTTagCompound;
 net/minecraft/src/EntityFireball.func_70070_b(F)I=|p_70070_1_
 net/minecraft/src/EntityFireball.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityFireball.func_70112_a(D)Z=|p_70112_1_
+net/minecraft/src/EntityFireworkOverlayFX.<init>(Lnet/minecraft/src/World;DDD)V=|p_i8004_1_,p_i8004_2_,p_i8004_4_,p_i8004_6_
+net/minecraft/src/EntityFireworkOverlayFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_
+net/minecraft/src/EntityFireworkRocket.<init>(Lnet/minecraft/src/World;)V=|p_i8008_1_
+net/minecraft/src/EntityFireworkRocket.<init>(Lnet/minecraft/src/World;DDDLnet/minecraft/src/ItemStack;)V=|p_i8009_1_,p_i8009_2_,p_i8009_4_,p_i8009_6_,p_i8009_8_
+net/minecraft/src/EntityFireworkRocket.func_70013_c(F)F=|p_70013_1_
+net/minecraft/src/EntityFireworkRocket.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
+net/minecraft/src/EntityFireworkRocket.func_70016_h(DDD)V=|p_70016_1_,p_70016_3_,p_70016_5_
+net/minecraft/src/EntityFireworkRocket.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
+net/minecraft/src/EntityFireworkRocket.func_70070_b(F)I=|p_70070_1_
+net/minecraft/src/EntityFireworkRocket.func_70103_a(B)V=|p_70103_1_
+net/minecraft/src/EntityFireworkRocket.func_70112_a(D)Z=|p_70112_1_
+net/minecraft/src/EntityFireworkSparkFX.<init>(Lnet/minecraft/src/World;DDDDDDLnet/minecraft/src/EffectRenderer;)V=|p_i8003_1_,p_i8003_2_,p_i8003_4_,p_i8003_6_,p_i8003_8_,p_i8003_10_,p_i8003_12_,p_i8003_14_
+net/minecraft/src/EntityFireworkSparkFX.func_70013_c(F)F=|p_70013_1_
+net/minecraft/src/EntityFireworkSparkFX.func_70070_b(F)I=|p_70070_1_
+net/minecraft/src/EntityFireworkSparkFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_
+net/minecraft/src/EntityFireworkSparkFX.func_92043_f(Z)V=|p_92043_1_
+net/minecraft/src/EntityFireworkSparkFX.func_92044_a(I)V=|p_92044_1_
+net/minecraft/src/EntityFireworkSparkFX.func_92045_e(Z)V=|p_92045_1_
+net/minecraft/src/EntityFireworkSparkFX.func_92046_g(I)V=|p_92046_1_
+net/minecraft/src/EntityFireworkStarterFX.<init>(Lnet/minecraft/src/World;DDDDDDLnet/minecraft/src/EffectRenderer;Lnet/minecraft/src/NBTTagCompound;)V=|p_i8002_1_,p_i8002_2_,p_i8002_4_,p_i8002_6_,p_i8002_8_,p_i8002_10_,p_i8002_12_,p_i8002_14_,p_i8002_15_
+net/minecraft/src/EntityFireworkStarterFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_
+net/minecraft/src/EntityFireworkStarterFX.func_92034_a(DDDDDD[I[IZZ)V=|p_92034_1_,p_92034_3_,p_92034_5_,p_92034_7_,p_92034_9_,p_92034_11_,p_92034_13_,p_92034_14_,p_92034_15_,p_92034_16_
+net/minecraft/src/EntityFireworkStarterFX.func_92035_a(DI[I[IZZ)V=|p_92035_1_,p_92035_3_,p_92035_4_,p_92035_5_,p_92035_6_,p_92035_7_
+net/minecraft/src/EntityFireworkStarterFX.func_92036_a([I[IZZ)V=|p_92036_1_,p_92036_2_,p_92036_3_,p_92036_4_
+net/minecraft/src/EntityFireworkStarterFX.func_92038_a(D[[D[I[IZZZ)V=|p_92038_1_,p_92038_3_,p_92038_4_,p_92038_5_,p_92038_6_,p_92038_7_,p_92038_8_
 net/minecraft/src/EntityFishHook.<init>(Lnet/minecraft/src/World;)V=|p_i3574_1_
 net/minecraft/src/EntityFishHook.<init>(Lnet/minecraft/src/World;DDDLnet/minecraft/src/EntityPlayer;)V=|p_i3575_1_,p_i3575_2_,p_i3575_4_,p_i3575_6_,p_i3575_8_
 net/minecraft/src/EntityFishHook.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)V=|p_i3576_1_,p_i3576_2_
@@ -2594,6 +2666,8 @@ net/minecraft/src/EntityFlying.func_70612_e(FF)V=|p_70612_1_,p_70612_2_
 net/minecraft/src/EntityFootStepFX.<init>(Lnet/minecraft/src/RenderEngine;Lnet/minecraft/src/World;DDD)V=|p_i3168_1_,p_i3168_2_,p_i3168_3_,p_i3168_5_,p_i3168_7_
 net/minecraft/src/EntityFootStepFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_
 net/minecraft/src/EntityGhast.<init>(Lnet/minecraft/src/World;)V=|p_i3549_1_
+net/minecraft/src/EntityGhast.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
+net/minecraft/src/EntityGhast.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityGhast.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityGhast.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
 net/minecraft/src/EntityGhast.func_70790_a(DDDD)Z=|p_70790_1_,p_70790_3_,p_70790_5_,p_70790_7_
@@ -2631,6 +2705,7 @@ net/minecraft/src/EntityIronGolem.func_70849_f(Z)V=|p_70849_1_
 net/minecraft/src/EntityIronGolem.func_70851_e(Z)V=|p_70851_1_
 net/minecraft/src/EntityIronGolem.func_82167_n(Lnet/minecraft/src/Entity;)V=|p_82167_1_
 net/minecraft/src/EntityItem.<init>(Lnet/minecraft/src/World;)V=|p_i3540_1_
+net/minecraft/src/EntityItem.<init>(Lnet/minecraft/src/World;DDD)V=|p_i8007_1_,p_i8007_2_,p_i8007_4_,p_i8007_6_
 net/minecraft/src/EntityItem.<init>(Lnet/minecraft/src/World;DDDLnet/minecraft/src/ItemStack;)V=|p_i3539_1_,p_i3539_2_,p_i3539_4_,p_i3539_6_,p_i3539_8_
 net/minecraft/src/EntityItem.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityItem.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
@@ -2639,6 +2714,9 @@ net/minecraft/src/EntityItem.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p
 net/minecraft/src/EntityItem.func_70100_b_(Lnet/minecraft/src/EntityPlayer;)V=|p_70100_1_
 net/minecraft/src/EntityItem.func_70289_a(Lnet/minecraft/src/EntityItem;)Z=|p_70289_1_
 net/minecraft/src/EntityItem.func_71027_c(I)V=|p_71027_1_
+net/minecraft/src/EntityItem.func_92013_a(Lnet/minecraft/src/ItemStack;)V=|p_92013_1_
+net/minecraft/src/EntityItem.func_92014_d()Lnet/minecraft/src/ItemStack;=|
+net/minecraft/src/EntityItem.func_92058_a(Lnet/minecraft/src/ItemStack;)V=|p_92058_1_
 net/minecraft/src/EntityItemFrame.<init>(Lnet/minecraft/src/World;)V=|p_i5055_1_
 net/minecraft/src/EntityItemFrame.<init>(Lnet/minecraft/src/World;IIII)V=|p_i5056_1_,p_i5056_2_,p_i5056_3_,p_i5056_4_,p_i5056_5_
 net/minecraft/src/EntityItemFrame.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
@@ -2654,6 +2732,8 @@ net/minecraft/src/EntityLargeExplodeFX.func_70539_a(Lnet/minecraft/src/Tessellat
 net/minecraft/src/EntityLargeFireball.<init>(Lnet/minecraft/src/World;)V=|p_i5067_1_
 net/minecraft/src/EntityLargeFireball.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i5068_1_,p_i5068_2_,p_i5068_4_,p_i5068_6_,p_i5068_8_,p_i5068_10_,p_i5068_12_
 net/minecraft/src/EntityLargeFireball.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLiving;DDD)V=|p_i5069_1_,p_i5069_2_,p_i5069_3_,p_i5069_5_,p_i5069_7_
+net/minecraft/src/EntityLargeFireball.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
+net/minecraft/src/EntityLargeFireball.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityLargeFireball.func_70227_a(Lnet/minecraft/src/MovingObjectPosition;)V=|p_70227_1_
 net/minecraft/src/EntityLavaFX.<init>(Lnet/minecraft/src/World;DDD)V=|p_i3169_1_,p_i3169_2_,p_i3169_4_,p_i3169_6_
 net/minecraft/src/EntityLavaFX.func_70013_c(F)F=|p_70013_1_
@@ -2869,6 +2949,7 @@ net/minecraft/src/EntityPlayer.func_71029_a(Lnet/minecraft/src/StatBase;)V=|p_71
 net/minecraft/src/EntityPlayer.func_71030_a(Lnet/minecraft/src/IMerchant;)V=|p_71030_1_
 net/minecraft/src/EntityPlayer.func_71033_a(Lnet/minecraft/src/EnumGameType;)V=|p_71033_1_
 net/minecraft/src/EntityPlayer.func_71035_c(Ljava/lang/String;)V=|p_71035_1_
+net/minecraft/src/EntityPlayer.func_71040_bB(Z)Lnet/minecraft/src/EntityItem;=|p_71040_1_
 net/minecraft/src/EntityPlayer.func_71042_a(Lnet/minecraft/src/TileEntityFurnace;)V=|p_71042_1_
 net/minecraft/src/EntityPlayer.func_71043_e(Z)Z=|p_71043_1_
 net/minecraft/src/EntityPlayer.func_71044_o(Lnet/minecraft/src/Entity;)V=|p_71044_1_
@@ -3264,7 +3345,7 @@ net/minecraft/src/EnumToolMaterial.<init>(Ljava/lang/String;IIIFII)V=|p_i3658_1_
 net/minecraft/src/EnumToolMaterial.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumToolMaterial;=|p_valueOf_0_
 net/minecraft/src/Explosion.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;DDDF)V=|p_i3727_1_,p_i3727_2_,p_i3727_3_,p_i3727_5_,p_i3727_7_,p_i3727_9_
 net/minecraft/src/Explosion.func_77279_a(Z)V=|p_77279_1_
-net/minecraft/src/ExtendedBlockStorage.<init>(I)V=|p_i3773_1_
+net/minecraft/src/ExtendedBlockStorage.<init>(IZ)V=|p_i8016_1_,p_i8016_2_
 net/minecraft/src/ExtendedBlockStorage.func_76654_b(IIII)V=|p_76654_1_,p_76654_2_,p_76654_3_,p_76654_4_
 net/minecraft/src/ExtendedBlockStorage.func_76655_a(IIII)V=|p_76655_1_,p_76655_2_,p_76655_3_,p_76655_4_
 net/minecraft/src/ExtendedBlockStorage.func_76656_a(III)I=|p_76656_1_,p_76656_2_,p_76656_3_
@@ -3450,7 +3531,6 @@ net/minecraft/src/GuiChat.func_73892_a(I)V=|p_73892_1_
 net/minecraft/src/GuiChat.func_73893_a(Ljava/lang/String;Ljava/lang/String;)V=|p_73893_1_,p_73893_2_
 net/minecraft/src/GuiChat.func_73894_a([Ljava/lang/String;)V=|p_73894_1_
 net/minecraft/src/GuiChat.func_73896_a(Ljava/net/URI;)V=|p_73896_1_
-net/minecraft/src/GuiChatConfirmLink.<init>(Lnet/minecraft/src/GuiChat;Lnet/minecraft/src/GuiScreen;Ljava/lang/String;ILnet/minecraft/src/ChatClickData;)V=|p_i3045_1_,p_i3045_2_,p_i3045_3_,p_i3045_4_,p_i3045_5_
 net/minecraft/src/GuiChest.<init>(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/IInventory;)V=|p_i3078_1_,p_i3078_2_
 net/minecraft/src/GuiChest.func_74185_a(FII)V=|p_74185_1_,p_74185_2_,p_74185_3_
 net/minecraft/src/GuiChest.func_74189_g(II)V=|p_74189_1_,p_74189_2_
@@ -3492,6 +3572,7 @@ net/minecraft/src/GuiContainer.func_74192_a(Lnet/minecraft/src/Slot;)V=|p_74192_
 net/minecraft/src/GuiContainer.func_82319_a(I)Z=|p_82319_1_
 net/minecraft/src/GuiContainer.func_85041_a(IIIJ)V=|p_85041_1_,p_85041_2_,p_85041_3_,p_85041_4_
 net/minecraft/src/GuiContainer.func_85044_b(Lnet/minecraft/src/ItemStack;II)V=|p_85044_1_,p_85044_2_,p_85044_3_
+net/minecraft/src/GuiContainer.func_92031_b(Lnet/minecraft/src/Slot;)Z=|p_92031_1_
 net/minecraft/src/GuiContainerCreative.<init>(Lnet/minecraft/src/EntityPlayer;)V=|p_i3083_1_
 net/minecraft/src/GuiContainerCreative.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiContainerCreative.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -3602,6 +3683,7 @@ net/minecraft/src/GuiLogOutputHandler.close()V=|
 net/minecraft/src/GuiLogOutputHandler.flush()V=|
 net/minecraft/src/GuiLogOutputHandler.publish(Ljava/util/logging/LogRecord;)V=|p_publish_1_
 net/minecraft/src/GuiMainMenu.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
+net/minecraft/src/GuiMainMenu.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiMainMenu.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiMainMenu.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiMainMenu.func_73878_a(ZI)V=|p_73878_1_,p_73878_2_
@@ -4058,6 +4140,8 @@ net/minecraft/src/ItemBlock.func_77667_c(Lnet/minecraft/src/ItemStack;)Ljava/lan
 net/minecraft/src/ItemBlock.func_77884_a(Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/ItemStack;)Z=|p_77884_1_,p_77884_2_,p_77884_3_,p_77884_4_,p_77884_5_,p_77884_6_,p_77884_7_
 net/minecraft/src/ItemBoat.<init>(I)V=|p_i3621_1_
 net/minecraft/src/ItemBoat.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_
+net/minecraft/src/ItemBook.<init>(I)V=|p_i8010_1_
+net/minecraft/src/ItemBook.func_77616_k(Lnet/minecraft/src/ItemStack;)Z=|p_77616_1_
 net/minecraft/src/ItemBow.<init>(I)V=|p_i3623_1_
 net/minecraft/src/ItemBow.func_77615_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;I)V=|p_77615_1_,p_77615_2_,p_77615_3_,p_77615_4_
 net/minecraft/src/ItemBow.func_77626_a(Lnet/minecraft/src/ItemStack;)I=|p_77626_1_
@@ -4106,6 +4190,24 @@ net/minecraft/src/ItemEgg.<init>(I)V=|p_i3646_1_
 net/minecraft/src/ItemEgg.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_
 net/minecraft/src/ItemEmptyMap.<init>(I)V=|p_i5083_1_
 net/minecraft/src/ItemEmptyMap.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_
+net/minecraft/src/ItemEnchantedBook.<init>(I)V=|p_i8011_1_
+net/minecraft/src/ItemEnchantedBook.func_77613_e(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumRarity;=|p_77613_1_
+net/minecraft/src/ItemEnchantedBook.func_77616_k(Lnet/minecraft/src/ItemStack;)Z=|p_77616_1_
+net/minecraft/src/ItemEnchantedBook.func_77624_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Ljava/util/List;Z)V=|p_77624_1_,p_77624_2_,p_77624_3_,p_77624_4_
+net/minecraft/src/ItemEnchantedBook.func_77636_d(Lnet/minecraft/src/ItemStack;)Z=|p_77636_1_
+net/minecraft/src/ItemEnchantedBook.func_92055_a(Ljava/util/Random;)Lnet/minecraft/src/ItemStack;=|p_92055_1_
+net/minecraft/src/ItemEnchantedBook.func_92056_g(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/NBTTagList;=|p_92056_1_
+net/minecraft/src/ItemEnchantedBook.func_92057_a(Lnet/minecraft/src/EnchantmentData;)Lnet/minecraft/src/ItemStack;=|p_92057_1_
+net/minecraft/src/ItemEnchantedBook.func_92058_a(Ljava/util/Random;III)Lnet/minecraft/src/WeightedRandomChestContent;=|p_92058_1_,p_92058_2_,p_92058_3_,p_92058_4_
+net/minecraft/src/ItemEnchantedBook.func_92059_b(Ljava/util/Random;)Lnet/minecraft/src/WeightedRandomChestContent;=|p_92059_1_
+net/minecraft/src/ItemEnchantedBook.func_92060_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EnchantmentData;)V=|p_92060_1_,p_92060_2_
+net/minecraft/src/ItemEnchantedBook.func_92109_a(Ljava/util/Random;)Lnet/minecraft/src/ItemStack;=|p_92109_1_
+net/minecraft/src/ItemEnchantedBook.func_92110_g(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/NBTTagList;=|p_92110_1_
+net/minecraft/src/ItemEnchantedBook.func_92111_a(Lnet/minecraft/src/EnchantmentData;)Lnet/minecraft/src/ItemStack;=|p_92111_1_
+net/minecraft/src/ItemEnchantedBook.func_92112_a(Ljava/util/Random;III)Lnet/minecraft/src/WeightedRandomChestContent;=|p_92112_1_,p_92112_2_,p_92112_3_,p_92112_4_
+net/minecraft/src/ItemEnchantedBook.func_92113_a(Lnet/minecraft/src/Enchantment;Ljava/util/List;)V=|p_92113_1_,p_92113_2_
+net/minecraft/src/ItemEnchantedBook.func_92114_b(Ljava/util/Random;)Lnet/minecraft/src/WeightedRandomChestContent;=|p_92114_1_
+net/minecraft/src/ItemEnchantedBook.func_92115_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EnchantmentData;)V=|p_92115_1_,p_92115_2_
 net/minecraft/src/ItemEnderEye.<init>(I)V=|p_i3647_1_
 net/minecraft/src/ItemEnderEye.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
 net/minecraft/src/ItemEnderEye.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_
@@ -4116,6 +4218,15 @@ net/minecraft/src/ItemExpBottle.func_77636_d(Lnet/minecraft/src/ItemStack;)Z=|p_
 net/minecraft/src/ItemExpBottle.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_
 net/minecraft/src/ItemFireball.<init>(I)V=|p_i3650_1_
 net/minecraft/src/ItemFireball.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
+net/minecraft/src/ItemFirework.<init>(I)V=|p_i8013_1_
+net/minecraft/src/ItemFirework.func_77624_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Ljava/util/List;Z)V=|p_77624_1_,p_77624_2_,p_77624_3_,p_77624_4_
+net/minecraft/src/ItemFirework.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
+net/minecraft/src/ItemFireworkCharge.<init>(I)V=|p_i8012_1_
+net/minecraft/src/ItemFireworkCharge.func_77618_c(II)I=|p_77618_1_,p_77618_2_
+net/minecraft/src/ItemFireworkCharge.func_77624_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Ljava/util/List;Z)V=|p_77624_1_,p_77624_2_,p_77624_3_,p_77624_4_
+net/minecraft/src/ItemFireworkCharge.func_82790_a(Lnet/minecraft/src/ItemStack;I)I=|p_82790_1_,p_82790_2_
+net/minecraft/src/ItemFireworkCharge.func_92107_a(Lnet/minecraft/src/NBTTagCompound;Ljava/util/List;)V=|p_92107_0_,p_92107_1_
+net/minecraft/src/ItemFireworkCharge.func_92108_a(Lnet/minecraft/src/ItemStack;Ljava/lang/String;)Lnet/minecraft/src/NBTBase;=|p_92108_0_,p_92108_1_
 net/minecraft/src/ItemFishingRod.<init>(I)V=|p_i3651_1_
 net/minecraft/src/ItemFishingRod.func_77659_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack;=|p_77659_1_,p_77659_2_,p_77659_3_
 net/minecraft/src/ItemFlintAndSteel.<init>(I)V=|p_i3652_1_
@@ -4210,7 +4321,7 @@ net/minecraft/src/ItemRedstone.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/mi
 net/minecraft/src/ItemReed.<init>(ILnet/minecraft/src/Block;)V=|p_i3691_1_,p_i3691_2_
 net/minecraft/src/ItemReed.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
 net/minecraft/src/ItemRenderer.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3186_1_
-net/minecraft/src/ItemRenderer.func_78439_a(Lnet/minecraft/src/Tessellator;FFFF)V=|p_78439_1_,p_78439_2_,p_78439_3_,p_78439_4_,p_78439_5_
+net/minecraft/src/ItemRenderer.func_78439_a(Lnet/minecraft/src/Tessellator;FFFFF)V=|p_78439_0_,p_78439_1_,p_78439_2_,p_78439_3_,p_78439_4_,p_78439_5_
 net/minecraft/src/ItemRenderer.func_78440_a(F)V=|p_78440_1_
 net/minecraft/src/ItemRenderer.func_78442_d(F)V=|p_78442_1_
 net/minecraft/src/ItemRenderer.func_78443_a(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/ItemStack;I)V=|p_78443_1_,p_78443_2_,p_78443_3_
@@ -4445,7 +4556,7 @@ net/minecraft/src/MerchantRecipeList.func_77203_a(Lnet/minecraft/src/ItemStack;L
 net/minecraft/src/MerchantRecipeList.func_77204_a(Ljava/io/DataInputStream;)Lnet/minecraft/src/MerchantRecipeList;=java/io/IOException|p_77204_0_
 net/minecraft/src/MerchantRecipeList.func_77205_a(Lnet/minecraft/src/MerchantRecipe;)V=|p_77205_1_
 net/minecraft/src/MinecraftAppletImpl.<init>(Lnet/minecraft/client/MinecraftApplet;Ljava/awt/Canvas;Lnet/minecraft/client/MinecraftApplet;IIZ)V=|p_i3013_1_,p_i3013_2_,p_i3013_3_,p_i3013_4_,p_i3013_5_,p_i3013_6_
-net/minecraft/src/MinecraftAppletImpl.func_71406_c(Lnet/minecraft/src/CrashReport;)V=|p_71406_1_
+net/minecraft/src/MinecraftAppletImpl.func_71384_a()V=org/lwjgl/LWJGLException|
 net/minecraft/src/MinecraftException.<init>(Ljava/lang/String;)V=|p_i3733_1_
 net/minecraft/src/MinecraftFakeLauncher.<init>(Ljava/util/Map;)V=|p_i3001_1_
 net/minecraft/src/MinecraftFakeLauncher.appletResize(II)V=|p_appletResize_1_,p_appletResize_2_
@@ -4664,7 +4775,6 @@ net/minecraft/src/NetClientHandler.func_72454_a(Lnet/minecraft/src/Packet54PlayN
 net/minecraft/src/NetClientHandler.func_72455_a(Lnet/minecraft/src/Packet1Login;)V=|p_72455_1_
 net/minecraft/src/NetClientHandler.func_72456_a(Lnet/minecraft/src/Packet53BlockChange;)V=|p_72456_1_
 net/minecraft/src/NetClientHandler.func_72457_a(Lnet/minecraft/src/Packet62LevelSound;)V=|p_72457_1_
-net/minecraft/src/NetClientHandler.func_72459_a(Lnet/minecraft/src/Packet21PickupSpawn;)V=|p_72459_1_
 net/minecraft/src/NetClientHandler.func_72460_a(Lnet/minecraft/src/Packet17Sleep;)V=|p_72460_1_
 net/minecraft/src/NetClientHandler.func_72461_a(Lnet/minecraft/src/Packet203AutoComplete;)V=|p_72461_1_
 net/minecraft/src/NetClientHandler.func_72462_a(Lnet/minecraft/src/Packet61DoorChange;)V=|p_72462_1_
@@ -4699,6 +4809,7 @@ net/minecraft/src/NetClientHandler.func_72497_a(Lnet/minecraft/src/Packet4Update
 net/minecraft/src/NetClientHandler.func_72498_a(Lnet/minecraft/src/Packet10Flying;)V=|p_72498_1_
 net/minecraft/src/NetClientHandler.func_72499_a(Lnet/minecraft/src/Packet60Explosion;)V=|p_72499_1_
 net/minecraft/src/NetClientHandler.func_72501_a(Lnet/minecraft/src/Packet250CustomPayload;)V=|p_72501_1_
+net/minecraft/src/NetClientHandler.func_72502_a(Lnet/minecraft/src/Packet16BlockItemSwitch;)V=|p_72502_1_
 net/minecraft/src/NetClientHandler.func_72503_a(Lnet/minecraft/src/Packet41EntityEffect;)V=|p_72503_1_
 net/minecraft/src/NetClientHandler.func_72505_a(Lnet/minecraft/src/Packet105UpdateProgressbar;)V=|p_72505_1_
 net/minecraft/src/NetClientHandler.func_72506_a(Lnet/minecraft/src/Packet5PlayerInventory;)V=|p_72506_1_
@@ -4730,7 +4841,6 @@ net/minecraft/src/NetHandler.func_72455_a(Lnet/minecraft/src/Packet1Login;)V=|p_
 net/minecraft/src/NetHandler.func_72456_a(Lnet/minecraft/src/Packet53BlockChange;)V=|p_72456_1_
 net/minecraft/src/NetHandler.func_72457_a(Lnet/minecraft/src/Packet62LevelSound;)V=|p_72457_1_
 net/minecraft/src/NetHandler.func_72458_a(Lnet/minecraft/src/Packet205ClientCommand;)V=|p_72458_1_
-net/minecraft/src/NetHandler.func_72459_a(Lnet/minecraft/src/Packet21PickupSpawn;)V=|p_72459_1_
 net/minecraft/src/NetHandler.func_72460_a(Lnet/minecraft/src/Packet17Sleep;)V=|p_72460_1_
 net/minecraft/src/NetHandler.func_72461_a(Lnet/minecraft/src/Packet203AutoComplete;)V=|p_72461_1_
 net/minecraft/src/NetHandler.func_72462_a(Lnet/minecraft/src/Packet61DoorChange;)V=|p_72462_1_
@@ -5016,10 +5126,6 @@ net/minecraft/src/Packet20NamedEntitySpawn.<init>(Lnet/minecraft/src/EntityPlaye
 net/minecraft/src/Packet20NamedEntitySpawn.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_
 net/minecraft/src/Packet20NamedEntitySpawn.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_
 net/minecraft/src/Packet20NamedEntitySpawn.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_
-net/minecraft/src/Packet21PickupSpawn.<init>(Lnet/minecraft/src/EntityItem;)V=|p_i3293_1_
-net/minecraft/src/Packet21PickupSpawn.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_
-net/minecraft/src/Packet21PickupSpawn.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_
-net/minecraft/src/Packet21PickupSpawn.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_
 net/minecraft/src/Packet22Collect.<init>(II)V=|p_i3358_1_,p_i3358_2_
 net/minecraft/src/Packet22Collect.func_73267_a(Ljava/io/DataInputStream;)V=java/io/IOException|p_73267_1_
 net/minecraft/src/Packet22Collect.func_73273_a(Ljava/io/DataOutputStream;)V=java/io/IOException|p_73273_1_
@@ -5433,6 +5539,8 @@ net/minecraft/src/RandomPositionGenerator.func_75461_b(Lnet/minecraft/src/Entity
 net/minecraft/src/RandomPositionGenerator.func_75462_c(Lnet/minecraft/src/EntityCreature;IILnet/minecraft/src/Vec3;)Lnet/minecraft/src/Vec3;=|p_75462_0_,p_75462_1_,p_75462_2_,p_75462_3_
 net/minecraft/src/RandomPositionGenerator.func_75463_a(Lnet/minecraft/src/EntityCreature;II)Lnet/minecraft/src/Vec3;=|p_75463_0_,p_75463_1_,p_75463_2_
 net/minecraft/src/RandomPositionGenerator.func_75464_a(Lnet/minecraft/src/EntityCreature;IILnet/minecraft/src/Vec3;)Lnet/minecraft/src/Vec3;=|p_75464_0_,p_75464_1_,p_75464_2_,p_75464_3_
+net/minecraft/src/RecipeFireworks.func_77569_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z=|p_77569_1_,p_77569_2_
+net/minecraft/src/RecipeFireworks.func_77572_b(Lnet/minecraft/src/InventoryCrafting;)Lnet/minecraft/src/ItemStack;=|p_77572_1_
 net/minecraft/src/RecipeSorter.<init>(Lnet/minecraft/src/CraftingManager;)V=|p_i3699_1_
 net/minecraft/src/RecipeSorter.compare(Ljava/lang/Object;Ljava/lang/Object;)I=|p_compare_1_,p_compare_2_
 net/minecraft/src/RecipeSorter.func_77581_a(Lnet/minecraft/src/IRecipe;Lnet/minecraft/src/IRecipe;)I=|p_77581_1_,p_77581_2_
@@ -5694,7 +5802,7 @@ net/minecraft/src/RenderItem.func_77015_a(Lnet/minecraft/src/FontRenderer;Lnet/m
 net/minecraft/src/RenderItem.func_77016_a(IIIIII)V=|p_77016_1_,p_77016_2_,p_77016_3_,p_77016_4_,p_77016_5_,p_77016_6_
 net/minecraft/src/RenderItem.func_77017_a(Lnet/minecraft/src/Tessellator;IIIII)V=|p_77017_1_,p_77017_2_,p_77017_3_,p_77017_4_,p_77017_5_,p_77017_6_
 net/minecraft/src/RenderItem.func_77018_a(IIIII)V=|p_77018_1_,p_77018_2_,p_77018_3_,p_77018_4_,p_77018_5_
-net/minecraft/src/RenderItem.func_77020_a(II)V=|p_77020_1_,p_77020_2_
+net/minecraft/src/RenderItem.func_77020_a(Lnet/minecraft/src/EntityItem;IIFFFF)V=|p_77020_1_,p_77020_2_,p_77020_3_,p_77020_4_,p_77020_5_,p_77020_6_,p_77020_7_
 net/minecraft/src/RenderItem.func_77021_b(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/RenderEngine;Lnet/minecraft/src/ItemStack;II)V=|p_77021_1_,p_77021_2_,p_77021_3_,p_77021_4_,p_77021_5_
 net/minecraft/src/RenderItem.func_82406_b(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/RenderEngine;Lnet/minecraft/src/ItemStack;II)V=|p_82406_1_,p_82406_2_,p_82406_3_,p_82406_4_,p_82406_5_
 net/minecraft/src/RenderItemFrame.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_
@@ -5897,6 +6005,7 @@ net/minecraft/src/SaveHandlerMP.func_75761_a(Lnet/minecraft/src/WorldInfo;)V=|p_
 net/minecraft/src/SaveHandlerMP.func_75762_c()V=net/minecraft/src/MinecraftException|
 net/minecraft/src/SaveHandlerMP.func_75763_a(Lnet/minecraft/src/WorldProvider;)Lnet/minecraft/src/IChunkLoader;=|p_75763_1_
 net/minecraft/src/ScaledResolution.<init>(Lnet/minecraft/src/GameSettings;II)V=|p_i3065_1_,p_i3065_2_,p_i3065_3_
+net/minecraft/src/ScheduledSound.<init>(Ljava/lang/String;FFFFFI)V=|p_i8000_1_,p_i8000_2_,p_i8000_3_,p_i8000_4_,p_i8000_5_,p_i8000_6_,p_i8000_7_
 net/minecraft/src/ScreenChatOptions.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/GameSettings;)V=|p_i3044_1_,p_i3044_2_
 net/minecraft/src/ScreenChatOptions.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/ScreenChatOptions.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
@@ -5944,6 +6053,8 @@ net/minecraft/src/ServerConfigurationManager.func_72397_a(Lnet/minecraft/src/Ent
 net/minecraft/src/ServerConfigurationManager.func_72399_a(Ljava/net/SocketAddress;Ljava/lang/String;)Ljava/lang/String;=|p_72399_1_,p_72399_2_
 net/minecraft/src/ServerConfigurationManager.func_82448_a(Lnet/minecraft/src/Entity;ILnet/minecraft/src/WorldServer;Lnet/minecraft/src/WorldServer;)V=|p_82448_1_,p_82448_2_,p_82448_3_,p_82448_4_
 net/minecraft/src/ServerConfigurationManager.func_82449_a(Lnet/minecraft/src/ChunkCoordinates;IIIIII)Ljava/util/List;=|p_82449_1_,p_82449_2_,p_82449_3_,p_82449_4_,p_82449_5_,p_82449_6_,p_82449_7_
+net/minecraft/src/ServerConfigurationManager.func_92027_k(Ljava/lang/String;)V=|p_92027_1_
+net/minecraft/src/ServerConfigurationManager.func_92062_k(Ljava/lang/String;)V=|p_92062_1_
 net/minecraft/src/ServerData.<init>(Ljava/lang/String;Ljava/lang/String;)V=|p_i3107_1_,p_i3107_2_
 net/minecraft/src/ServerData.func_78837_a(Lnet/minecraft/src/NBTTagCompound;)Lnet/minecraft/src/ServerData;=|p_78837_0_
 net/minecraft/src/ServerData.func_78838_a(Z)V=|p_78838_1_
@@ -5976,6 +6087,7 @@ net/minecraft/src/ShapedRecipes.<init>(II[Lnet/minecraft/src/ItemStack;Lnet/mine
 net/minecraft/src/ShapedRecipes.func_77569_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z=|p_77569_1_,p_77569_2_
 net/minecraft/src/ShapedRecipes.func_77572_b(Lnet/minecraft/src/InventoryCrafting;)Lnet/minecraft/src/ItemStack;=|p_77572_1_
 net/minecraft/src/ShapedRecipes.func_77573_a(Lnet/minecraft/src/InventoryCrafting;IIZ)Z=|p_77573_1_,p_77573_2_,p_77573_3_,p_77573_4_
+net/minecraft/src/ShapedRecipes.func_92048_c()Lnet/minecraft/src/ShapedRecipes;=|
 net/minecraft/src/ShapelessRecipes.<init>(Lnet/minecraft/src/ItemStack;Ljava/util/List;)V=|p_i3701_1_,p_i3701_2_
 net/minecraft/src/ShapelessRecipes.func_77569_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z=|p_77569_1_,p_77569_2_
 net/minecraft/src/ShapelessRecipes.func_77572_b(Lnet/minecraft/src/InventoryCrafting;)Lnet/minecraft/src/ItemStack;=|p_77572_1_
@@ -6053,6 +6165,7 @@ net/minecraft/src/SoundManager.func_82465_b(Lnet/minecraft/src/Entity;)Z=|p_8246
 net/minecraft/src/SoundManager.func_82467_a(Ljava/lang/String;Lnet/minecraft/src/Entity;FFZ)V=|p_82467_1_,p_82467_2_,p_82467_3_,p_82467_4_,p_82467_5_
 net/minecraft/src/SoundManager.func_82468_a(Lnet/minecraft/src/Entity;F)V=|p_82468_1_,p_82468_2_
 net/minecraft/src/SoundManager.func_82469_c(Lnet/minecraft/src/Entity;)V=|p_82469_1_
+net/minecraft/src/SoundManager.func_92070_a(Ljava/lang/String;FFFFFI)V=|p_92070_1_,p_92070_2_,p_92070_3_,p_92070_4_,p_92070_5_,p_92070_6_,p_92070_7_
 net/minecraft/src/SoundPool.func_77458_a(Ljava/lang/String;)Lnet/minecraft/src/SoundPoolEntry;=|p_77458_1_
 net/minecraft/src/SoundPool.func_77459_a(Ljava/lang/String;Ljava/io/File;)Lnet/minecraft/src/SoundPoolEntry;=|p_77459_1_,p_77459_2_
 net/minecraft/src/SoundPoolEntry.<init>(Ljava/lang/String;Ljava/net/URL;)V=|p_i3127_1_,p_i3127_2_
@@ -6369,8 +6482,12 @@ net/minecraft/src/TileEntityMobSpawner.func_70310_b(Lnet/minecraft/src/NBTTagCom
 net/minecraft/src/TileEntityMobSpawner.func_70315_b(II)V=|p_70315_1_,p_70315_2_
 net/minecraft/src/TileEntityMobSpawner.func_70383_a(Lnet/minecraft/src/Entity;)V=|p_70383_1_
 net/minecraft/src/TileEntityMobSpawner.func_70385_a(Ljava/lang/String;)V=|p_70385_1_
+net/minecraft/src/TileEntityMobSpawner.func_92015_a()Ljava/lang/String;=|
 net/minecraft/src/TileEntityMobSpawnerRenderer.func_76894_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_76894_1_,p_76894_2_,p_76894_4_,p_76894_6_,p_76894_8_
 net/minecraft/src/TileEntityMobSpawnerRenderer.func_76905_a(Lnet/minecraft/src/TileEntityMobSpawner;DDDF)V=|p_76905_1_,p_76905_2_,p_76905_4_,p_76905_6_,p_76905_8_
+net/minecraft/src/TileEntityMobSpawnerSpawnData.<init>(Lnet/minecraft/src/TileEntityMobSpawner;Lnet/minecraft/src/NBTTagCompound;)V=|p_i8017_1_,p_i8017_2_
+net/minecraft/src/TileEntityMobSpawnerSpawnData.<init>(Lnet/minecraft/src/TileEntityMobSpawner;Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i8018_1_,p_i8018_2_,p_i8018_3_
+net/minecraft/src/TileEntityMobSpawnerSpawnData.func_92030_a()Lnet/minecraft/src/NBTTagCompound;=|
 net/minecraft/src/TileEntityNote.func_70307_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70307_1_
 net/minecraft/src/TileEntityNote.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_
 net/minecraft/src/TileEntityNote.func_70414_a(Lnet/minecraft/src/World;III)V=|p_70414_1_,p_70414_2_,p_70414_3_,p_70414_4_
@@ -6481,8 +6598,11 @@ net/minecraft/src/WeightedRandom.func_76272_a(Ljava/util/Collection;)I=|p_76272_
 net/minecraft/src/WeightedRandom.func_76273_a(Ljava/util/Random;Ljava/util/Collection;I)Lnet/minecraft/src/WeightedRandomItem;=|p_76273_0_,p_76273_1_,p_76273_2_
 net/minecraft/src/WeightedRandom.func_76274_a(Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomItem;)Lnet/minecraft/src/WeightedRandomItem;=|p_76274_0_,p_76274_1_
 net/minecraft/src/WeightedRandomChestContent.<init>(IIIII)V=|p_i3424_1_,p_i3424_2_,p_i3424_3_,p_i3424_4_,p_i3424_5_
+net/minecraft/src/WeightedRandomChestContent.<init>(Lnet/minecraft/src/ItemStack;III)V=|p_i8006_1_,p_i8006_2_,p_i8006_3_,p_i8006_4_
 net/minecraft/src/WeightedRandomChestContent.func_76293_a(Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomChestContent;Lnet/minecraft/src/TileEntityChest;I)V=|p_76293_0_,p_76293_1_,p_76293_2_,p_76293_3_
 net/minecraft/src/WeightedRandomChestContent.func_76294_a(Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomChestContent;Lnet/minecraft/src/TileEntityDispenser;I)V=|p_76294_0_,p_76294_1_,p_76294_2_,p_76294_3_
+net/minecraft/src/WeightedRandomChestContent.func_92029_a([Lnet/minecraft/src/WeightedRandomChestContent;[Lnet/minecraft/src/WeightedRandomChestContent;)[Lnet/minecraft/src/WeightedRandomChestContent;=|p_92029_0_,p_92029_1_
+net/minecraft/src/WeightedRandomChestContent.func_92080_a([Lnet/minecraft/src/WeightedRandomChestContent;[Lnet/minecraft/src/WeightedRandomChestContent;)[Lnet/minecraft/src/WeightedRandomChestContent;=|p_92080_0_,p_92080_1_
 net/minecraft/src/WeightedRandomItem.<init>(I)V=|p_i3423_1_
 net/minecraft/src/World.<init>(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/Profiler;)V=|p_i3731_1_,p_i3731_2_,p_i3731_3_,p_i3731_4_,p_i3731_5_
 net/minecraft/src/World.<init>(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/Profiler;)V=|p_i3732_1_,p_i3732_2_,p_i3732_3_,p_i3732_4_,p_i3732_5_
@@ -6632,7 +6752,7 @@ net/minecraft/src/World.func_72975_g(IIII)V=|p_72975_1_,p_72975_2_,p_72975_3_,p_
 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_72980_b(DDDLjava/lang/String;FFZ)V=|p_72980_1_,p_72980_3_,p_72980_5_,p_72980_7_,p_72980_8_,p_72980_9_,p_72980_10_
 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_
@@ -6642,6 +6762,7 @@ net/minecraft/src/World.func_82740_a(IIIIII)V=|p_82740_1_,p_82740_2_,p_82740_3_,
 net/minecraft/src/World.func_85173_a(Lnet/minecraft/src/EntityPlayer;Ljava/lang/String;FF)V=|p_85173_1_,p_85173_2_,p_85173_3_,p_85173_4_
 net/minecraft/src/World.func_85174_u(III)Z=|p_85174_1_,p_85174_2_,p_85174_3_
 net/minecraft/src/World.func_85175_e(III)I=|p_85175_1_,p_85175_2_,p_85175_3_
+net/minecraft/src/World.func_92088_a(DDDDDDLnet/minecraft/src/NBTTagCompound;)V=|p_92088_1_,p_92088_3_,p_92088_5_,p_92088_7_,p_92088_9_,p_92088_11_,p_92088_13_
 net/minecraft/src/WorldChunkManager.<init>(JLnet/minecraft/src/WorldType;)V=|p_i3751_1_,p_i3751_3_
 net/minecraft/src/WorldChunkManager.<init>(Lnet/minecraft/src/World;)V=|p_i3752_1_
 net/minecraft/src/WorldChunkManager.func_76931_a([Lnet/minecraft/src/BiomeGenBase;IIIIZ)[Lnet/minecraft/src/BiomeGenBase;=|p_76931_1_,p_76931_2_,p_76931_3_,p_76931_4_,p_76931_5_,p_76931_6_
@@ -6668,7 +6789,7 @@ net/minecraft/src/WorldClient.func_72847_b(Lnet/minecraft/src/Entity;)V=|p_72847
 net/minecraft/src/WorldClient.func_72900_e(Lnet/minecraft/src/Entity;)V=|p_72900_1_
 net/minecraft/src/WorldClient.func_72914_a(Lnet/minecraft/src/CrashReport;)Lnet/minecraft/src/CrashReportCategory;=|p_72914_1_
 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_72980_b(DDDLjava/lang/String;FFZ)V=|p_72980_1_,p_72980_3_,p_72980_5_,p_72980_7_,p_72980_8_,p_72980_9_,p_72980_10_
 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_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_
@@ -6679,6 +6800,7 @@ net/minecraft/src/WorldClient.func_73030_b(Lnet/minecraft/src/WorldClient;)Ljava
 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/WorldClient.func_92088_a(DDDDDDLnet/minecraft/src/NBTTagCompound;)V=|p_92088_1_,p_92088_3_,p_92088_5_,p_92088_7_,p_92088_9_,p_92088_11_,p_92088_13_
 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_
 net/minecraft/src/WorldGenBigTree.<init>(Z)V=|p_i3784_1_

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  = b15e2b2b6b4629f0d99a95b6b44412a0
-MD5Server  = 250654ceae7a26ba955a30095d90a475
+MD5Client  = 48677dc4c2b98c29918722b5ab27b4fd
+MD5Server  = b0700fa969dbf0ff085082cde87384d2
 
 [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           = 91000
-ParamIndex        = 7100
+RGIndex           = 92000
+ParamIndex        = 8000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

fml/conf/methods.csv

@@ -133,6 +133,7 @@ func_70268_h,getTimeSinceHit,2,Gets the time since the last hit.
 func_70269_c,setForwardDirection,2,Sets the forward direction of the entity.
 func_70271_g,getDamageTaken,2,Gets the damage taken from the last hit.
 func_70283_d,getWorld,2,
+func_70289_a,combineItems,2,Tries to merge this item with the item passed as the parameter. Returns true if successful. Either this item or the other item will  be removed from the world.
 func_70295_k_,openChest,2,
 func_70296_d,onInventoryChanged,2,"Called when an the contents of an Inventory change, usually"
 func_70297_j_,getInventoryStackLimit,2,"Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't this more of a set than a get?*"
@@ -726,7 +727,6 @@ func_71505_b,getCrashCause,2,Returns the Throwable object that is the cause for
 func_71506_a,getSectionsInStringBuilder,2,Gets the various sections of the crash report into the given StringBuilder
 func_71507_a,addCrashSection,2,Adds a Crashreport section with the given name with the given value (convered .toString())
 func_71508_a,saveToFile,2,Saves the complete crash report to the given File.
-func_71509_c,getSections,2,Gets a string representation of all sections in the crash report.
 func_71514_a,getCommandAliases,2,
 func_71515_b,processCommand,2,
 func_71516_a,addTabCompletionOptions,2,Adds the strings available in this command to the given list of tab completion options.
@@ -781,6 +781,7 @@ func_71744_a,stopListening,2,
 func_71745_a,addPlayer,2,adds this connection to the list of currently connected players
 func_71746_d,getServer,2,
 func_71747_b,networkTick,2,processes packets and pending connections
+func_71752_f,isGamePaused,2,
 func_71753_e,getIntergatedServerMinecraftServerInstance,2,Gets MinecraftServer instance.
 func_71762_c,getDedicatedServer,2,
 func_71764_a,addPendingConnection,2,
@@ -858,7 +859,6 @@ func_71905_a,setBlockBounds,2,"Sets the bounds of the block.  minX, minY, minZ,
 func_71906_q_,canSilkHarvest,2,"Return true if a player with Silk Touch can harvest this block directly, and not its normal drops."
 func_71907_b,setTickRandomly,2,Sets whether this block type will receive random update ticks
 func_71908_a,getPlayerRelativeBlockHardness,2,"Gets the hardness of block at the given coordinates in the given world, relative to the ability of the given EntityPlayer."
-func_71909_a,updateBlockMetadata,2,called before onBlockPlacedBy by ItemBlock and ItemReed
 func_71910_a,quantityDroppedWithBonus,2,Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive).
 func_71911_a_,getSelectedBoundingBoxFromPool,2,Returns the bounding box of the wired rectangular prism to render.
 func_71912_p,setRequiresSelfNotify,2,Blocks with this attribute will not notify all near blocks when it's metadata change. The default behavior is always notify every neightbor block when anything changes.
@@ -1003,7 +1003,6 @@ func_72272_c_,fertilize,2,Apply bonemeal to the crops.
 func_72273_l,getGrowthRate,2,"Gets the growth rate for the crop. Setup to encourage rows by halving growth rate if there is diagonals, crops on different sides that aren't opposing, and by adding growth for every crop next to this one (and for crop below this one). Args: x, y, z"
 func_72274_a,createNewTileEntity,2,Returns a new instance of a block's tile entity class. Called on placing the block.
 func_72276_j_,ejectRecord,2,Ejects the current record inside of the jukebox.
-func_72277_e,insertRecord,2,Inserts the given record into the JukeBox.
 func_72280_l,setDispenserDefaultDirection,2,sets Dispenser block direction so that the front faces an non-opaque block; chooses west to be direction if all surrounding blocks are opaque.
 func_72285_l,setDefaultDirection,2,set a blocks direction
 func_72286_a,updateFurnaceBlockState,2,Update which block ID the furnace is using depending on whether or not it is burning
@@ -1281,10 +1280,12 @@ func_72717_a,drawBlockDamageTexture,2,
 func_72718_b,renderClouds,2,
 func_72719_a,sortAndRender,2,"Sorts all renderers based on the passed in entity. Args: entityLiving, renderPass, partialTickTime"
 func_72720_a,checkOcclusionQueryResult,2,
+func_72721_a,hasCloudFog,2,Checks if the given position is to be rendered with cloud fog
 func_72722_c,markRenderersForNewPosition,2,Goes through all the renderers setting new positions on them and those that have their position changed are adding to be updated
 func_72723_d,getDebugInfoEntities,2,Gets the entities info for use on the Debug screen
 func_72724_a,renderSortedRenderers,2,"Renders the sorted renders for the specified render pass. Args: startRenderer, numRenderers, renderPass, partialTickTime"
 func_72725_b,markBlocksForUpdate,2,Marks the blocks in the given range for update
+func_72726_b,doSpawnParticle,2,"Spawns a particle. Arg: particleType, x, y, z, velX, velY, velZ"
 func_72727_a,drawBlockBreaking,2,
 func_72729_a,clipRenderersByFrustum,2,"Checks all renderers that previously weren't in the frustum and 1/16th of those that previously were in the frustum for frustum clipping Args: frustum, partialTickTime"
 func_72730_g,renderStars,2,
@@ -1507,7 +1508,7 @@ func_73054_j,getEntrancePortalLocation,2,Gets the hard-coded portal location to
 func_73055_Q,sendAndApplyBlockEvents,2,Send and apply locally all pending BlockEvents to each player with 64m radius of the event.
 func_73056_e,areAllPlayersAsleep,2,
 func_73057_a,spawnRandomCreature,2,only spawns creatures allowed by the chunkProvider
-func_73073_c,destroyBlockInWorldPartially,2,note: this ignores the pars passed in and continues to destroy the onClickedBlock
+func_73073_c,cancelDestroyingBlock,2,note: this ignores the pars passed in and continues to destroy the onClickedBlock
 func_73074_a,onBlockClicked,2,"if not creative, it calls destroyBlockInWorldPartially untill the block is broken first. par4 is the specific side. tryHarvestBlock can also be the result of this call"
 func_73075_a,updateBlockRemoving,2,
 func_73076_a,setGameType,2,
@@ -1839,6 +1840,7 @@ func_74161_g,updateButtons,2,
 func_74163_a,sendBookToServer,2,
 func_74164_b,keyTypedInBook,2,Processes keystrokes when editing the text of a book
 func_74165_h,addNewPage,2,
+func_74184_a,drawItemStackTooltip,2,
 func_74185_a,drawGuiContainerBackgroundLayer,2,Draw the background layer for the GuiContainer (everything behind the items)
 func_74186_a,isMouseOverSlot,2,Returns if the passed mouse position is over the specified slot.
 func_74187_b,getSlotAtPosition,2,Returns the slot at the given coordinates or null if there is none.
@@ -1882,8 +1884,6 @@ func_74379_a,getEnumOptions,2,
 func_74380_a,getEnumFloat,2,
 func_74381_c,returnEnumOrdinal,2,
 func_74382_b,getEnumBoolean,2,
-func_74415_a,getModded,2,"Returns ""Definitely"" if the brand is not vanilla, ""Very likely"" if there are no signers for the Minecraft class, otherwise ""Probably not""."
-func_74418_a,getGLVersion,2,Gets what OpenGL version you have.
 func_74420_a,getLWJGLVersion,2,
 func_74423_d,serverShutdown,2,Shuts down the server. (Only actually used on the server)
 func_74424_a,networkShutdown,2,"Shuts down the network with the specified reason. Closes all streams and sockets, spawns NetworkMasterThread to stop reading and writing threads."
@@ -3078,7 +3078,6 @@ func_77175_a,comparer,2,Compares this tick entry to another tick entry for sorti
 func_77176_a,setScheduledTime,2,Sets the scheduled time for this tick entry
 func_77184_b,placeInExistingPortal,2,Place an entity in a nearby portal which already exists.
 func_77185_a,placeInPortal,2,"Place an entity in a nearby portal, creating one if necessary."
-func_77186_c,createPortal,2,Create a new portal near an entity.
 func_77188_a,creatureSpecificInit,2,"determines if a skeleton spawns on a spider, and if a sheep is a different color"
 func_77189_a,getRandomSpawningPointInChunk,2,"Given a chunk, find a random position in it."
 func_77190_a,canCreatureTypeSpawnAtLocation,2,Returns whether or not the specified creature type can spawn at the specified location.
@@ -3205,7 +3204,6 @@ func_77511_a,getMaxEnchantmentLevel,2,Returns the biggest level of the enchantme
 func_77512_a,getEnchantmentModifierLiving,2,Return the (magic) extra damage of the enchantments on player equipped item.
 func_77513_b,buildEnchantmentList,2,"Create a list of random EnchantmentData (enchantments) that can be added together to the ItemStack, the 3rd parameter is the total enchantability level."
 func_77514_a,calcItemStackEnchantability,2,"Returns the enchantability of itemstack, it's uses a singular formula for each index (2nd parameter: 0, 1 and 2), cutting to the max enchantability power of the table (3rd parameter)"
-func_77515_c,getFireAspectModifier,2,Return the fire aspect value of enchantments on equipped player item.
 func_77516_a,applyEnchantmentModifierArray,2,Executes the enchantment modifier on the array of ItemStack passed.
 func_77517_e,getFortuneModifier,2,Returns the fortune enchantment modifier of the current equipped item of player.
 func_77518_a,applyEnchantmentModifier,2,Executes the enchantment modifier on the ItemStack passed.
@@ -3453,7 +3451,6 @@ func_78277_a,renderUnicodeChar,2,"Render a single Unicode character at current (
 func_78278_a,renderCharAtPos,2,Pick how to render a single character and return the width used.
 func_78279_b,drawSplitString,2,Splits and draws a String with wordwrap (maximum length is parameter k)
 func_78280_d,wrapFormattedStringToWidth,2,Inserts newline and formatting into a string to wrap it within the specified width.
-func_78281_c,renderSplitStringNoShadow,2,renders a multi-line string with wordwrap (maximum length is parameter k) by means of renderSplitString
 func_78282_e,getFormatFromString,2,Digests a string for nonprinting formatting characters then returns a string containing only that formatting.
 func_78283_c,bidiReorder,2,Apply Unicode Bidirectional Algorithm to string and return a new possibly reordered string for visual rendering.
 func_78307_h,findClickedUrl,2,
@@ -3514,6 +3511,7 @@ func_78447_b,renderOverlays,2,Renders all the overlays that are in first person
 func_78448_c,renderWarpedTextureOverlay,2,Renders a texture that warps around based on the direction the player is looking. Texture needs to be bound before being called. Used for the water overlay. Args: parialTickTime
 func_78463_b,enableLightmap,2,Enable lightmap in secondary texture unit
 func_78464_a,updateRenderer,2,Updates the entity renderer
+func_78465_a,performanceToFps,2,Converts performance value (0-2) to FPS (35-200)
 func_78466_h,updateFogColor,2,calculates fog and calls glClearColor
 func_78467_g,orientCamera,2,sets up player's eye (or camera in third person mode)
 func_78468_a,setupFog,2,Sets up the fog to be rendered. If the arg passed in is -1 the fog starts at 0 and goes to 80% of far plane distance and is used for sky rendering.
@@ -3564,6 +3562,7 @@ func_78584_s,renderBlockCactus,2,Renders a cactus block at the given coordinates
 func_78585_a,renderBlockBrewingStand,2,Render BlockBrewingStand
 func_78586_a,renderBlockMinecartTrack,2,Renders a minecart track block at the given coordinates
 func_78587_a,renderPistonExtensionAllFaces,2,Render all faces of the piston extension
+func_78588_a,renderBlockSandFalling,2,Renders a falling sand block
 func_78589_i,renderBlockRedstoneWire,2,Renders a redstone wire block at the given coordinates
 func_78590_h,renderBlockFire,2,Renders a fire block at the given coordinates
 func_78591_a,renderPistonRodUD,2,Render piston rod up/down
@@ -3775,6 +3774,7 @@ func_82333_j,getRotation,2,Return the rotation of the item currently on this fra
 func_82334_a,setDisplayedItem,2,
 func_82335_i,getDisplayedItem,2,
 func_82336_g,setItemRotation,2,
+func_82338_g,setAlphaF,2,Sets the particle alpha (float)
 func_82340_a,setPotionDamage,2,
 func_82341_c,getMotionFactor,2,Return the motion factor for this projectile. The factor is multiplied by the original motion.
 func_82342_d,isInvulnerable,2,Return whether this skull comes from an invulnerable (aura) wither boss.
@@ -3899,7 +3899,12 @@ func_82767_a,getGameRuleStringValue,2,Gets the string Game Rule value.
 func_82768_a,readGameRulesFromNBT,2,Set defined game rules from NBT.
 func_82769_a,addGameRule,2,Define a game rule and its default value.
 func_82770_a,writeGameRulesToNBT,2,Return the defined game rules as NBT.
+func_82772_a,updateDynamicTexture,2,Updates a single dynamic texture
+func_82773_c,hasImageData,2,Checks if urlToImageDataMap has image data for the given key
+func_82774_a,setOverrideBlockTexture,2,Sets overrideBlockTexture
 func_82775_a,renderBlockAnvil,2,Renders anvil
+func_82776_a,renderBlockAnvilOrient,2,Renders anvil block with orientation
+func_82777_a,renderBlockAnvilRotate,2,Renders anvil block with rotation
 func_82778_a,renderBlockBeacon,2,Renders beacon block
 func_82779_a,renderBlockWall,2,Renders wall block
 func_82780_a,renderBlockFlowerpot,2,Renders flower pot
@@ -3915,6 +3920,7 @@ func_82815_c,removeColor,2,Remove the color from the specified armor ItemStack.
 func_82816_b_,hasColor,2,Return whether the specified armor ItemStack has a color.
 func_82819_b,setHideAddress,2,
 func_82820_d,isHidingAddress,2,
+func_82830_a,getNightVisionBrightness,2,Gets the night vision brightness
 func_82833_r,getDisplayName,2,returns the display name of the itemstack
 func_82834_c,setItemName,2,Sets the item's name (used by anvil to rename the items).
 func_82836_z,getItemFrame,2,Return the item frame this stack is on. Returns null if not on an item frame.
@@ -3943,4 +3949,31 @@ func_83010_y,getBlockBoundsMaxY,2,returns the block bounderies maxY value
 func_83012_d,getnextPoolIndex,2,
 func_83013_c,getlistAABBsize,2,
 func_83015_S,getCurrentDate,2,returns a calendar object containing the current date
+func_83017_b,resetCustomBlockBounds,2,Reset customBlockBounds
+func_83018_a,updateCustomBlockBounds,2,Updates the custom block bounds with the bounds of the given block
+func_83019_b,setCustomBlockBounds,2,Sets the custom block bounds for rendering
 func_83020_a,setRenderMinMax,2,"Sets the size and offset of the block to be rendered, ie: half size and rendered center block: 0.25D, 0.75D"
+func_85034_r,setArrowCountInEntity,2,sets the amount of arrows stuck in the entity. used for rendering those
+func_85035_bI,getArrowCountInEntity,2,"counts the amount of arrows stuck in the entity. getting hit by arrows increases this, used in rendering"
+func_85044_b,drawItemStack,2,
+func_85055_a,makeCrashReport,2,Creates a crash report for the exception
+func_85057_a,makeCategoryDepth,2,Creates a CrashReportCategory for the given stack trace depth
+func_85058_a,makeCategory,2,Creates a CrashReportCategory
+func_85093_e,renderArrowsStuckInEntity,2,"renders arrows the Entity has been attacked with, attached to it"
+func_85096_a,renderBlockAnvilMetadata,2,Renders anvil block with metadata
+func_85103_a,canDropFromExplosion,2,Return whether this block can drop from an explosion.
+func_85106_a,insertRecord,2,Insert the specified music disc in the jukebox at the given coordinates
+func_85107_d,updateLadderBounds,2,Update the ladder block bounds based on the given metadata value.
+func_85128_b,getMapFeaturesEnabled,2,Return the map feautures enabled of a world
+func_85132_a,getTerrainTypeOfWorld,2,Return the terrain type of a world
+func_85151_d,getLowerChestInventory,2,Return this chest container's lower chest inventory.
+func_85187_a,drawString,2,"Draws the specified string. Args: string, x, y, color, dropShadow"
+func_90010_a,isPartOfLargeChest,2,Return whether the given inventory is part of this large chest.
+func_90022_d,getListOfPlayers,2,
+func_90030_a,getRendererMinecraft,2,Get minecraft reference from the EntityRenderer
+func_90033_f,canLoadWorld,2,Return whether the given world can be loaded.
+func_90035_a,getClassFromID,2,Return the class assigned to this entity ID.
+func_90036_a,getFireAspectModifier,2,
+func_90042_d,getRecord,2,Return the record item corresponding to the given name.
+func_90043_g,getRecordTitle,2,Return the title for this record.
+func_90999_ad,canRenderOnFire,2,Return whether this entity should be rendered as on fire.

fml/conf/packages.csv

@@ -1,4 +1,17 @@
 class,package
+EntityFireworkOverlayFX,net/minecraft/client/particle
+EntityFireworkSparkFX,net/minecraft/client/particle
+EntityFireworkStarterFX,net/minecraft/client/particle
+ScheduledSound,net/minecraft/client/audio
+BehaviorDispenseFirework,net/minecraft/dispenser
+EnchantmentThorns,net/minecraft/enchantment
+EntityFireworkRocket,net/minecraft/entity/item
+ItemBook,net/minecraft/item
+ItemEnchantedBook,net/minecraft/item
+ItemFirework,net/minecraft/item
+ItemFireworkCharge,net/minecraft/item
+RecipeFireworks,net/minecraft/item/crafting
+TileEntityMobSpawnerSpawnData,net/minecraft/tileentity
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
 BlockBeacon,net/minecraft/block

fml/conf/params.csv

@@ -420,6 +420,7 @@ p_71029_1_,par1StatBase,2
 p_71030_1_,par1IMerchant,2
 p_71033_1_,par1EnumGameType,2
 p_71035_1_,par1Str,2
+p_71040_1_,par1,2
 p_71042_1_,par1TileEntityFurnace,2
 p_71043_1_,par1,2
 p_71044_1_,par1Entity,2
@@ -1539,7 +1540,6 @@ p_72455_1_,par1Packet1Login,2
 p_72456_1_,par1Packet53BlockChange,2
 p_72457_1_,par1Packet62LevelSound,2
 p_72458_1_,par1Packet205ClientCommand,2
-p_72459_1_,par1Packet21PickupSpawn,2
 p_72460_1_,par1Packet17Sleep,2
 p_72461_1_,par1Packet203AutoComplete,2
 p_72462_1_,par1Packet61DoorChange,2
@@ -2245,6 +2245,7 @@ p_72977_3_,par3,2
 p_72977_5_,par5,2
 p_72977_7_,par7,2
 p_72978_1_,par1AxisAlignedBB,2
+p_72980_10_,par10,2
 p_72980_1_,par1,2
 p_72980_3_,par3,2
 p_72980_5_,par5,2
@@ -4928,8 +4929,13 @@ p_77018_2_,par2,2
 p_77018_3_,par3,2
 p_77018_4_,par4,2
 p_77018_5_,par5,2
-p_77020_1_,par1,2
+p_77020_1_,par1EntityItem,2
 p_77020_2_,par2,2
+p_77020_3_,par3,2
+p_77020_4_,par4,2
+p_77020_5_,par5,2
+p_77020_6_,par6,2
+p_77020_7_,par7,2
 p_77021_1_,par1FontRenderer,2
 p_77021_2_,par2RenderEngine,2
 p_77021_3_,par3ItemStack,2
@@ -5417,7 +5423,6 @@ p_77493_1_,par1Enchantment,2
 p_77493_2_,par2,2
 p_77501_0_,par0EntityLiving,2
 p_77502_0_,par0EntityLiving,2
-p_77503_0_,par0EntityLiving,2
 p_77504_0_,par0Random,2
 p_77504_1_,par1ItemStack,2
 p_77504_2_,par2,2
@@ -5472,8 +5477,6 @@ p_77583_1_,par1CraftingManager,2
 p_77586_1_,par1CraftingManager,2
 p_77589_1_,par1CraftingManager,2
 p_77590_1_,par1CraftingManager,2
-p_77595_1_,par1ItemStack,2
-p_77595_2_,par2ArrayOfObj,2
 p_77596_1_,par1ItemStack,2
 p_77596_2_,par2ArrayOfObj,2
 p_77600_1_,par1,2
@@ -5903,7 +5906,8 @@ p_78435_1_,par1,2
 p_78435_2_,par2,2
 p_78435_3_,par3,2
 p_78435_4_,par4,2
-p_78439_1_,par1Tessellator,2
+p_78439_0_,par0Tessellator,2
+p_78439_1_,par1,2
 p_78439_2_,par2,2
 p_78439_3_,par3,2
 p_78439_4_,par4,2
@@ -7171,6 +7175,126 @@ p_90033_1_,par1Str,2
 p_90035_0_,par0,2
 p_90036_0_,par0EntityLiving,2
 p_90042_0_,par0Str,2
+p_92013_1_,par1ItemStack,2
+p_92027_1_,par1Str,2
+p_92029_0_,par0ArrayOfWeightedRandomChestContent,2
+p_92029_1_,par1ArrayOfWeightedRandomChestContent,2
+p_92031_1_,par1Slot,2
+p_92034_11_,par11,2
+p_92034_13_,par13ArrayOfInteger,2
+p_92034_14_,par14ArrayOfInteger,2
+p_92034_15_,par15,2
+p_92034_16_,par16,2
+p_92034_1_,par1,2
+p_92034_3_,par3,2
+p_92034_5_,par5,2
+p_92034_7_,par7,2
+p_92034_9_,par9,2
+p_92035_1_,par1,2
+p_92035_3_,par3,2
+p_92035_4_,par4ArrayOfInteger,2
+p_92035_5_,par5ArrayOfInteger,2
+p_92035_6_,par6,2
+p_92035_7_,par7,2
+p_92036_0_,par0Entity,2
+p_92036_1_,par1ArrayOfInteger,2
+p_92036_2_,par2ArrayOfInteger,2
+p_92036_3_,par3,2
+p_92036_4_,par4,2
+p_92037_1_,par1ItemStack,2
+p_92038_1_,par1,2
+p_92038_3_,par3ArrayOfDouble,2
+p_92038_4_,par4ArrayOfInteger,2
+p_92038_5_,par5ArrayOfInteger,2
+p_92038_6_,par6,2
+p_92038_7_,par7,2
+p_92038_8_,par8,2
+p_92040_0_,par0Entity,2
+p_92040_1_,par1,2
+p_92041_0_,par0Entity,2
+p_92041_1_,par1,2
+p_92042_0_,par0,2
+p_92042_1_,par1Random,2
+p_92043_0_,par0,2
+p_92043_1_,par1,2
+p_92044_0_,par0Entity,2
+p_92044_1_,par1,2
+p_92044_2_,par2Random,2
+p_92045_0_,par0ItemStack,2
+p_92045_1_,par1,2
+p_92045_2_,par2Random,2
+p_92046_0_,par0EntityLiving,2
+p_92046_1_,par1,2
+p_92047_0_,par0Enchantment,2
+p_92047_1_,par1EntityLiving,2
+p_92051_1_,par1ItemStack,2
+p_92051_2_,par2ArrayOfObj,2
+p_92055_1_,par1Random,2
+p_92056_1_,par1ItemStack,2
+p_92057_1_,par1EnchantmentData,2
+p_92058_1_,par1,2
+p_92058_2_,par2,2
+p_92058_3_,par3,2
+p_92058_4_,par4,2
+p_92059_1_,par1Random,2
+p_92060_1_,par1ItemStack,2
+p_92060_2_,par2EnchantmentData,2
+p_92062_1_,par1Str,2
+p_92070_1_,par1Str,2
+p_92070_2_,par2,2
+p_92070_3_,par3,2
+p_92070_4_,par4,2
+p_92070_5_,par5,2
+p_92070_6_,par6,2
+p_92070_7_,par7,2
+p_92080_0_,par0ArrayOfWeightedRandomChestContent,2
+p_92080_1_,par1ArrayOfWeightedRandomChestContent,2
+p_92087_0_,par0Entity,2
+p_92088_11_,par11,2
+p_92088_13_,par13NBTTagCompound,2
+p_92088_1_,par1,2
+p_92088_3_,par3,2
+p_92088_5_,par5,2
+p_92088_7_,par7,2
+p_92088_9_,par9,2
+p_92089_1_,par1ItemStack,2
+p_92092_0_,par0Entity,2
+p_92092_1_,par1,2
+p_92093_0_,par0Entity,2
+p_92093_1_,par1,2
+p_92094_0_,par0,2
+p_92094_1_,par1Random,2
+p_92095_0_,par0,2
+p_92095_1_,par1Random,2
+p_92096_0_,par0Entity,2
+p_92096_1_,par1EntityLiving,2
+p_92096_2_,par2Random,2
+p_92097_0_,par0ItemStack,2
+p_92097_1_,par1,2
+p_92097_2_,par2Random,2
+p_92098_0_,par0EntityLiving,2
+p_92099_0_,par0Enchantment,2
+p_92099_1_,par1EntityLiving,2
+p_92103_1_,par1ItemStack,2
+p_92103_2_,par2ArrayOfObj,2
+p_92107_0_,par0NBTTagCompound,2
+p_92107_1_,par1List,2
+p_92108_0_,par0ItemStack,2
+p_92108_1_,par1Str,2
+p_92109_1_,par1Random,2
+p_92110_1_,par1ItemStack,2
+p_92111_1_,par1EnchantmentData,2
+p_92112_1_,par1Random,2
+p_92112_2_,par2,2
+p_92112_3_,par3,2
+p_92112_4_,par4,2
+p_92113_1_,par1Enchantment,2
+p_92113_2_,par2List,2
+p_92114_1_,par1Random,2
+p_92115_1_,par1ItemStack,2
+p_92115_2_,par2EnchantmentData,2
+p_92116_1_,par1List,2
+p_92116_2_,par2ArrayOfEnumEnchantmentType,2
 p_accept_1_,par1File,2
 p_accept_2_,par2Str,2
 p_actionPerformed_1_,par1ActionEvent,2
@@ -7273,11 +7397,6 @@ p_i3042_2_,par2GameSettings,2
 p_i3043_1_,par1Minecraft,2
 p_i3044_1_,par1GuiScreen,2
 p_i3044_2_,par2GameSettings,2
-p_i3045_1_,par1GuiChat,2
-p_i3045_2_,par2GuiScreen,2
-p_i3045_3_,par3Str,2
-p_i3045_4_,par4,2
-p_i3045_5_,par5ChatClickData,2
 p_i3046_1_,par1GuiScreen,2
 p_i3047_1_,par1GuiScreen,2
 p_i3047_2_,par2Str,2
@@ -7925,7 +8044,6 @@ p_i3290_2_,par2,2
 p_i3290_3_,par3,2
 p_i3291_1_,par1EntityXPOrb,2
 p_i3292_1_,par1Entity,2
-p_i3293_1_,par1EntityItem,2
 p_i3294_1_,par1EntityLiving,2
 p_i3295_1_,par1EntityPainting,2
 p_i3296_1_,par1EntityPlayer,2
@@ -9006,7 +9124,6 @@ p_i3772_1_,par1World,2
 p_i3772_2_,par2ArrayOfByte,2
 p_i3772_3_,par3,2
 p_i3772_4_,par4,2
-p_i3773_1_,par1,2
 p_i3774_1_,par1ArrayOfByte,2
 p_i3774_2_,par2,2
 p_i3775_1_,par1,2
@@ -10025,8 +10142,6 @@ p_i6829_1_,par1TileEntity,2
 p_i7000_1_,par1Minecraft,2
 p_i7001_1_,par1Minecraft,2
 p_i7002_1_,par1Minecraft,2
-p_i7003_1_,par1EffectRenderer,2
-p_i7003_2_,par2EntityFX,2
 p_i7004_1_,par1EntityRenderer,2
 p_i7004_2_,par2ScaledResolution,2
 p_i7005_1_,par1EntityRenderer,2
@@ -10034,6 +10149,68 @@ p_i7005_2_,par2,2
 p_i7005_3_,par3,2
 p_i7006_1_,par1EntityRenderer,2
 p_i7007_1_,par1EntitySheep,2
+p_i8000_1_,par1Str,2
+p_i8000_2_,par2,2
+p_i8000_3_,par3,2
+p_i8000_4_,par4,2
+p_i8000_5_,par5,2
+p_i8000_6_,par6,2
+p_i8000_7_,par7,2
+p_i8001_1_,par1World,2
+p_i8001_2_,par2,2
+p_i8001_4_,par4,2
+p_i8001_6_,par6,2
+p_i8002_10_,par10,2
+p_i8002_12_,par12,2
+p_i8002_14_,par14EffectRenderer,2
+p_i8002_15_,par15NBTTagCompound,2
+p_i8002_1_,par1World,2
+p_i8002_2_,par2,2
+p_i8002_4_,par4,2
+p_i8002_6_,par6,2
+p_i8002_8_,par8,2
+p_i8003_10_,par10,2
+p_i8003_12_,par12,2
+p_i8003_14_,par14EffectRenderer,2
+p_i8003_1_,par1World,2
+p_i8003_2_,par2,2
+p_i8003_4_,par4,2
+p_i8003_6_,par6,2
+p_i8003_8_,par8,2
+p_i8004_1_,par1World,2
+p_i8004_2_,par2,2
+p_i8004_4_,par4,2
+p_i8004_6_,par6,2
+p_i8005_1_,par1MinecraftServer,2
+p_i8006_1_,par1ItemStack,2
+p_i8006_2_,par2,2
+p_i8006_3_,par3,2
+p_i8006_4_,par4,2
+p_i8007_1_,par1World,2
+p_i8007_2_,par2,2
+p_i8007_4_,par4,2
+p_i8007_6_,par6,2
+p_i8008_1_,par1World,2
+p_i8009_1_,par1World,2
+p_i8009_2_,par2,2
+p_i8009_4_,par4,2
+p_i8009_6_,par6,2
+p_i8009_8_,par8ItemStack,2
+p_i8010_1_,par1,2
+p_i8011_1_,par1,2
+p_i8012_1_,par1,2
+p_i8013_1_,par1,2
+p_i8014_1_,par1,2
+p_i8014_2_,par2,2
+p_i8015_1_,par1,2
+p_i8015_2_,par2,2
+p_i8016_1_,par1,2
+p_i8016_2_,par2,2
+p_i8017_1_,par1TileEntityMobSpawner,2
+p_i8017_2_,par2NBTTagCompound,2
+p_i8018_1_,par1TileEntityMobSpawner,2
+p_i8018_2_,par2NBTTagCompound,2
+p_i8018_3_,par3Str,2
 p_implies_1_,par1Permission,2
 p_init_1_,par1,2
 p_init_2_,par2CipherParameters,2

fml/conf/patches/minecraft_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Fri Nov 16 21:42:28 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\client\Minecraft.java	Mon Dec 17 22:49:48 2012
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Mon Dec 17 22:51:37 2012
 @@ -546,9 +546,8 @@
           return;
        }
@@ -30,8 +30,8 @@ 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	Fri Nov 16 21:42:29 2012
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:49:49 2012
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:51:37 2012
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
        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	Fri Nov 16 21:42:29 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Mon Dec 17 22:49:49 2012
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Mon Dec 17 22:51:37 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -73,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	Fri Nov 16 21:42:29 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:49:49 2012
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:51:37 2012
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -87,8 +87,8 @@ 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	Fri Nov 16 21:42:29 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:49:49 2012
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:51:37 2012
 @@ -202,7 +202,7 @@
        System.exit(0);
     }
@@ -99,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\EntityMooshroom.java minecraft_patched\net\minecraft\src\EntityMooshroom.java
---- minecraft\net\minecraft\src\EntityMooshroom.java	Fri Nov 16 21:42:30 2012
-+++ minecraft_patched\net\minecraft\src\EntityMooshroom.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:49:50 2012
++++ minecraft_patched\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:51:37 2012
 @@ -56,10 +56,10 @@
        return new EntityMooshroom(this.field_70170_p);
     }
@@ -117,8 +117,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EntityMooshroom.java minecraft_patched\
     // $FF: synthetic method
     public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Fri Nov 16 21:42:30 2012
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Fri Nov 16 21:47:09 2012
+--- minecraft\net\minecraft\src\FontRenderer.java	Mon Dec 17 22:49:50 2012
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Mon Dec 17 22:51:37 2012
 @@ -611,8 +611,6 @@
           case 10:
              --var5;
@@ -138,8 +138,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
              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	Fri Nov 16 21:42:30 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\IntegratedServer.java	Mon Dec 17 22:49:50 2012
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Mon Dec 17 22:51:37 2012
 @@ -98,7 +98,7 @@
        return true;
     }
@@ -150,9 +150,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	Fri Nov 16 21:42:31 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Nov 16 21:44:38 2012
-@@ -1446,7 +1446,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Mon Dec 17 22:49:52 2012
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Mon Dec 17 22:51:37 2012
+@@ -1447,7 +1447,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_;
@@ -162,8 +162,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	Fri Nov 16 21:42:32 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:49:52 2012
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:51:37 2012
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -173,8 +173,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	Fri Nov 16 21:42:32 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 16 21:44:38 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:49:52 2012
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:51:37 2012
 @@ -20,7 +20,8 @@
     }
  

fml/conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,6 @@
 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 16 21:43:38 2012
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 16 21:44:48 2012
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:50:59 2012
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:52:18 2012
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -20,8 +20,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
        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	Fri Nov 16 21:43:38 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 16 21:44:48 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:50:59 2012
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:52:18 2012
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -34,8 +34,8 @@ 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	Fri Nov 16 21:43:38 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 16 21:44:48 2012
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:50:59 2012
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:52:18 2012
 @@ -203,7 +203,7 @@
        System.exit(0);
     }
@@ -46,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\EntityMooshroom.java minecraft_server_patched\net\minecraft\src\EntityMooshroom.java
---- minecraft_server\net\minecraft\src\EntityMooshroom.java	Fri Nov 16 21:43:39 2012
-+++ minecraft_server_patched\net\minecraft\src\EntityMooshroom.java	Fri Nov 16 21:44:48 2012
+--- minecraft_server\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:51:00 2012
++++ minecraft_server_patched\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:52:18 2012
 @@ -56,10 +56,10 @@
        return new EntityMooshroom(this.field_70170_p);
     }
@@ -64,8 +64,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EntityMooshroom.java minecraft_s
     // $FF: synthetic method
     public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
 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	Fri Nov 16 21:43:40 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 16 21:44:48 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:51:01 2012
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:52:18 2012
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -75,8 +75,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	Fri Nov 16 21:43:40 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 16 21:44:48 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:51:01 2012
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:52:18 2012
 @@ -20,7 +20,8 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.23
-ClientVersion = 1.4.5
-ServerVersion = 1.4.5
+MCPVersion = 7.25
+ClientVersion = 1.4.6
+ServerVersion = 1.4.6

fml/mc_versions.cfg

@@ -27,7 +27,7 @@ client_url = http://assets.minecraft.net/1_4_6/minecraft.jar
 server_url = http://assets.minecraft.net/1_4_6/minecraft_server.jar
 client_md5 = 48677dc4c2b98c29918722b5ab27b4fd
 server_md5 = b0700fa969dbf0ff085082cde87384d2
-mcp_ver    = 7.24
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp724.zip
-mcp_md5    = 9fbb5835b437b64bc5ce618fa5a53d1d
+mcp_ver    = 7.25
+mcp_url    = http://files.minecraftforge.net/mcpmirror/mcp725pre1.zip
+mcp_md5    = d33dadec14762196ecaa17d74462d90e
 

fml/mcp_merge.cfg

@@ -1 +1 @@
-!beg #net/minecraft/src/CodecMus
+!ber #net/minecraft/src/CodecMus

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

@@ -48,7 +48,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -732,9 +746,11 @@
+@@ -738,9 +752,11 @@
  
              if (!this.field_71454_w)
              {
@@ -60,7 +60,7 @@
              }
  
              GL11.glFlush();
-@@ -1264,10 +1280,14 @@
+@@ -1270,10 +1286,14 @@
  
      public void func_71407_l()
      {
@@ -75,7 +75,7 @@
  
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
-@@ -1724,6 +1744,8 @@
+@@ -1730,6 +1750,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -84,7 +84,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1762,8 +1784,27 @@
+@@ -1768,8 +1790,27 @@
          }
  
          this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
@@ -112,7 +112,7 @@
          this.field_71455_al = true;
          this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel"));
  
-@@ -1978,6 +2019,12 @@
+@@ -1984,6 +2025,12 @@
  
      public static void main(String[] p_main_0_)
      {

fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch

@@ -8,7 +8,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.image.BufferedImage;
-@@ -10,6 +12,7 @@
+@@ -11,6 +13,7 @@
  import java.util.ArrayList;
  import java.util.Calendar;
  import java.util.Date;
@@ -17,16 +17,16 @@
  import net.minecraft.client.Minecraft;
  import net.minecraft.client.renderer.Tessellator;
 @@ -22,6 +25,9 @@
+ import net.minecraft.world.storage.WorldInfo;
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.util.glu.GLU;
- 
++
 +import com.google.common.base.Strings;
 +import com.google.common.collect.Lists;
-+
+ 
  @SideOnly(Side.CLIENT)
  public class GuiMainMenu extends GuiScreen
- {
-@@ -132,7 +138,8 @@
+@@ -140,7 +146,8 @@
              this.func_73969_a(var4, 24, var2);
          }
  
@@ -36,7 +36,7 @@
  
          if (this.field_73882_e.field_71448_m)
          {
-@@ -196,6 +203,11 @@
+@@ -224,6 +231,11 @@
          if (p_73875_1_.field_73741_f == 4)
          {
              this.field_73882_e.func_71400_g();
@@ -48,7 +48,7 @@
          }
  
          if (p_73875_1_.field_73741_f == 11)
-@@ -414,7 +426,16 @@
+@@ -460,7 +472,16 @@
              var9 = var9 + " Demo";
          }
  
@@ -65,4 +65,4 @@
 +
          String var10 = "Copyright Mojang AB. Do not distribute!";
          this.func_73731_b(this.field_73886_k, var10, this.field_73880_f - this.field_73886_k.func_78256_a(var10) - 2, this.field_73881_g - 10, 16777215);
-         super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
+ 

fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.BufferedReader;
-@@ -172,11 +173,14 @@
+@@ -174,11 +175,14 @@
      public int field_72556_d = 20;
      Random field_72557_e = new Random();
  
@@ -22,7 +22,7 @@
      }
  
      public NetClientHandler(Minecraft p_i3104_1_, IntegratedServer p_i3104_2_) throws IOException
-@@ -184,6 +188,7 @@
+@@ -186,6 +190,7 @@
          this.field_72563_h = p_i3104_1_;
          this.field_72555_g = new MemoryConnection(this);
          p_i3104_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i3104_1_.field_71449_j.field_74286_b);
@@ -30,7 +30,7 @@
      }
  
      public void func_72547_c()
-@@ -254,6 +259,7 @@
+@@ -256,6 +261,7 @@
  
      public void func_72513_a(Packet252SharedKey p_72513_1_)
      {
@@ -38,7 +38,7 @@
          this.func_72552_c(new Packet205ClientCommand(0));
      }
  
-@@ -269,6 +275,7 @@
+@@ -271,6 +277,7 @@
          this.field_72563_h.field_71439_g.field_70157_k = p_72455_1_.field_73561_a;
          this.field_72556_d = p_72455_1_.field_73562_h;
          this.field_72563_h.field_71442_b.func_78746_a(p_72455_1_.field_73557_d);
@@ -46,7 +46,7 @@
          this.field_72563_h.field_71474_y.func_82879_c();
      }
  
-@@ -754,6 +761,7 @@
+@@ -750,6 +757,7 @@
  
      public void func_72481_a(Packet3Chat p_72481_1_)
      {

fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch

@@ -21,14 +21,14 @@
  
          if (var4 != null && RenderBlocks.func_78597_b(var4.func_71857_b()))
          {
-@@ -137,10 +143,17 @@
+@@ -136,10 +142,17 @@
+         float var9;
          float var10;
-         float var11;
  
--        for (var8 = 0; var8 < 16; ++var8)
+-        for (var7 = 0; var7 < 16; ++var7)
 -        {
--            var9 = (float)var8 / 16.0F;
--            var10 = p_78439_2_ + (p_78439_4_ - p_78439_2_) * var9 - 0.001953125F;
+-            var8 = (float)var7 / 16.0F;
+-            var9 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * var8 - 0.001953125F;
 +        /* Gets the width/16 of the currently bound texture, used
 +         * to fix the side rendering issues on textures != 16 */
 +        int tileSize = TextureFXManager.instance().getTextureDimensions(GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D)).width / 16;
@@ -36,59 +36,59 @@
 +        float tx = 1.0f / (32 * tileSize);
 +        float tz = 1.0f /  tileSize;
 +
-+        for (var8 = 0; var8 < tileSize; ++var8)
++        for (var7 = 0; var7 < tileSize; ++var7)
 +        {
-+            var9 = (float)var8 / tileSize;
-+            var10 = p_78439_2_ + (p_78439_4_ - p_78439_2_) * var9 - tx;
-             var11 = var6 * var9;
-             p_78439_1_.func_78374_a((double)var11, 0.0D, (double)(0.0F - var7), (double)var10, (double)p_78439_5_);
-             p_78439_1_.func_78374_a((double)var11, 0.0D, 0.0D, (double)var10, (double)p_78439_5_);
-@@ -152,11 +165,11 @@
-         p_78439_1_.func_78382_b();
-         p_78439_1_.func_78375_b(1.0F, 0.0F, 0.0F);
++            var8 = (float)var7 / tileSize;
++            var9 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * var8 - tx;
+             var10 = var6 * var8;
+             p_78439_0_.func_78374_a((double)var10, 0.0D, (double)(0.0F - p_78439_5_), (double)var9, (double)p_78439_4_);
+             p_78439_0_.func_78374_a((double)var10, 0.0D, 0.0D, (double)var9, (double)p_78439_4_);
+@@ -151,11 +164,11 @@
+         p_78439_0_.func_78382_b();
+         p_78439_0_.func_78375_b(1.0F, 0.0F, 0.0F);
  
--        for (var8 = 0; var8 < 16; ++var8)
+-        for (var7 = 0; var7 < 16; ++var7)
 -        {
--            var9 = (float)var8 / 16.0F;
--            var10 = p_78439_2_ + (p_78439_4_ - p_78439_2_) * var9 - 0.001953125F;
--            var11 = var6 * var9 + 0.0625F;
-+        for (var8 = 0; var8 < tileSize; ++var8)
+-            var8 = (float)var7 / 16.0F;
+-            var9 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * var8 - 0.001953125F;
+-            var10 = var6 * var8 + 0.0625F;
++        for (var7 = 0; var7 < tileSize; ++var7)
 +        {
-+            var9 = (float)var8 / tileSize;
-+            var10 = p_78439_2_ + (p_78439_4_ - p_78439_2_) * var9 - tx;
-+            var11 = var6 * var9 + tz;
-             p_78439_1_.func_78374_a((double)var11, 1.0D, (double)(0.0F - var7), (double)var10, (double)p_78439_3_);
-             p_78439_1_.func_78374_a((double)var11, 1.0D, 0.0D, (double)var10, (double)p_78439_3_);
-             p_78439_1_.func_78374_a((double)var11, 0.0D, 0.0D, (double)var10, (double)p_78439_5_);
-@@ -167,11 +180,11 @@
-         p_78439_1_.func_78382_b();
-         p_78439_1_.func_78375_b(0.0F, 1.0F, 0.0F);
++            var8 = (float)var7 / tileSize;
++            var9 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * var8 - tx;
++            var10 = var6 * var8 + tz;
+             p_78439_0_.func_78374_a((double)var10, 1.0D, (double)(0.0F - p_78439_5_), (double)var9, (double)p_78439_2_);
+             p_78439_0_.func_78374_a((double)var10, 1.0D, 0.0D, (double)var9, (double)p_78439_2_);
+             p_78439_0_.func_78374_a((double)var10, 0.0D, 0.0D, (double)var9, (double)p_78439_4_);
+@@ -166,11 +179,11 @@
+         p_78439_0_.func_78382_b();
+         p_78439_0_.func_78375_b(0.0F, 1.0F, 0.0F);
  
--        for (var8 = 0; var8 < 16; ++var8)
+-        for (var7 = 0; var7 < 16; ++var7)
 -        {
--            var9 = (float)var8 / 16.0F;
--            var10 = p_78439_5_ + (p_78439_3_ - p_78439_5_) * var9 - 0.001953125F;
--            var11 = var6 * var9 + 0.0625F;
-+        for (var8 = 0; var8 < tileSize; ++var8)
+-            var8 = (float)var7 / 16.0F;
+-            var9 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * var8 - 0.001953125F;
+-            var10 = var6 * var8 + 0.0625F;
++        for (var7 = 0; var7 < tileSize; ++var7)
 +        {
-+            var9 = (float)var8 / tileSize;
-+            var10 = p_78439_5_ + (p_78439_3_ - p_78439_5_) * var9 - tx;
-+            var11 = var6 * var9 + tz;
-             p_78439_1_.func_78374_a(0.0D, (double)var11, 0.0D, (double)p_78439_2_, (double)var10);
-             p_78439_1_.func_78374_a((double)var6, (double)var11, 0.0D, (double)p_78439_4_, (double)var10);
-             p_78439_1_.func_78374_a((double)var6, (double)var11, (double)(0.0F - var7), (double)p_78439_4_, (double)var10);
-@@ -182,10 +195,10 @@
-         p_78439_1_.func_78382_b();
-         p_78439_1_.func_78375_b(0.0F, -1.0F, 0.0F);
++            var8 = (float)var7 / tileSize;
++            var9 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * var8 - tx;
++            var10 = var6 * var8 + tz;
+             p_78439_0_.func_78374_a(0.0D, (double)var10, 0.0D, (double)p_78439_1_, (double)var9);
+             p_78439_0_.func_78374_a((double)var6, (double)var10, 0.0D, (double)p_78439_3_, (double)var9);
+             p_78439_0_.func_78374_a((double)var6, (double)var10, (double)(0.0F - p_78439_5_), (double)p_78439_3_, (double)var9);
+@@ -181,10 +194,10 @@
+         p_78439_0_.func_78382_b();
+         p_78439_0_.func_78375_b(0.0F, -1.0F, 0.0F);
  
--        for (var8 = 0; var8 < 16; ++var8)
+-        for (var7 = 0; var7 < 16; ++var7)
 -        {
--            var9 = (float)var8 / 16.0F;
--            var10 = p_78439_5_ + (p_78439_3_ - p_78439_5_) * var9 - 0.001953125F;
-+        for (var8 = 0; var8 < tileSize; ++var8)
+-            var8 = (float)var7 / 16.0F;
+-            var9 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * var8 - 0.001953125F;
++        for (var7 = 0; var7 < tileSize; ++var7)
 +        {
-+            var9 = (float)var8 / tileSize;
-+            var10 = p_78439_5_ + (p_78439_3_ - p_78439_5_) * var9 - tx;
-             var11 = var6 * var9;
-             p_78439_1_.func_78374_a((double)var6, (double)var11, 0.0D, (double)p_78439_4_, (double)var10);
-             p_78439_1_.func_78374_a(0.0D, (double)var11, 0.0D, (double)p_78439_2_, (double)var10);
++            var8 = (float)var7 / tileSize;
++            var9 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * var8 - tx;
+             var10 = var6 * var8;
+             p_78439_0_.func_78374_a((double)var6, (double)var10, 0.0D, (double)p_78439_3_, (double)var9);
+             p_78439_0_.func_78374_a(0.0D, (double)var10, 0.0D, (double)p_78439_1_, (double)var9);

fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.BufferedReader;
-@@ -607,6 +608,7 @@
+@@ -625,6 +626,7 @@
  
      public void func_74303_b()
      {

fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch

@@ -10,7 +10,7 @@
  import net.minecraft.entity.boss.EntityDragon;
  import net.minecraft.entity.boss.EntityWither;
  import net.minecraft.entity.item.EntityBoat;
-@@ -102,9 +105,10 @@
+@@ -103,9 +106,10 @@
      {
          Entity var2 = null;
  
@@ -22,7 +22,7 @@
  
              if (var3 != null)
              {
-@@ -118,7 +122,17 @@
+@@ -119,7 +123,17 @@
  
          if (var2 != null)
          {

fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch

@@ -9,7 +9,7 @@
  import net.minecraft.entity.boss.EntityDragon;
  import net.minecraft.entity.boss.EntityWither;
  import net.minecraft.entity.item.EntityBoat;
-@@ -49,6 +51,11 @@
+@@ -50,6 +52,11 @@
  
      public void func_72786_a(Entity p_72786_1_)
      {

fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch

@@ -9,12 +9,12 @@
  import net.minecraft.block.Block;
  import net.minecraft.block.material.Material;
  import net.minecraft.entity.Entity;
-@@ -257,6 +259,8 @@
+@@ -279,6 +281,8 @@
                      p_70100_1_.func_71029_a(AchievementList.field_76027_z);
                  }
  
 +                GameRegistry.onPickupNotification(p_70100_1_, this);
 +
                  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);
+                 p_70100_1_.func_71001_a(this, var3);
  

fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.util.Collections;
-@@ -239,7 +240,7 @@
+@@ -241,7 +242,7 @@
              case 4:
                  return "/mob/villager/butcher.png";
              default:
@@ -16,15 +16,15 @@
          }
      }
  
-@@ -420,6 +421,7 @@
+@@ -422,6 +423,7 @@
  
          MerchantRecipeList var2;
          var2 = new MerchantRecipeList();
 +        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);
-         label48:
+         int var6;
+         label50:
  
-         switch (this.func_70946_n())
-@@ -624,7 +626,7 @@
+@@ -637,7 +639,7 @@
  
      public void func_82163_bD()
      {

fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch

@@ -8,7 +8,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.util.Iterator;
-@@ -172,6 +174,7 @@
+@@ -173,6 +175,7 @@
  
      public void func_70071_h_()
      {
@@ -16,7 +16,7 @@
          if (this.field_71074_e != null)
          {
              ItemStack var1 = this.field_71071_by.func_70448_g();
-@@ -295,6 +298,7 @@
+@@ -296,6 +299,7 @@
          {
              this.field_71100_bB.func_75118_a(this);
          }
@@ -24,7 +24,7 @@
      }
  
      public int func_82145_z()
-@@ -1802,4 +1806,9 @@
+@@ -1822,4 +1826,9 @@
      {
          return this.func_82241_s(1);
      }

fml/patches/minecraft/net/minecraft/item/Item.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.util.List;
-@@ -204,6 +205,8 @@
+@@ -207,6 +208,8 @@
          }
  
          field_77698_e[256 + p_i3659_1_] = this;

fml/patches/minecraft/net/minecraft/network/NetLoginHandler.java.patch

@@ -16,7 +16,7 @@
  import net.minecraft.network.packet.Packet252SharedKey;
  import net.minecraft.network.packet.Packet253ServerAuthData;
  import net.minecraft.network.packet.Packet254ServerPing;
-@@ -55,7 +59,7 @@
+@@ -56,7 +60,7 @@
              this.func_72529_d();
          }
  
@@ -25,7 +25,7 @@
          {
              this.func_72527_a("Took too long to log in");
          }
-@@ -141,11 +145,18 @@
+@@ -150,11 +154,18 @@
          }
      }
  
@@ -46,7 +46,7 @@
  
          if (var1 != null)
          {
-@@ -263,4 +274,21 @@
+@@ -272,4 +283,21 @@
      {
          return p_72531_0_.field_72544_i = p_72531_1_;
      }

fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch

@@ -17,7 +17,7 @@
  import net.minecraft.network.packet.Packet13PlayerLookMove;
  import net.minecraft.network.packet.Packet14BlockDig;
  import net.minecraft.network.packet.Packet15Place;
-@@ -628,6 +631,7 @@
+@@ -627,6 +630,7 @@
  
      public void func_72481_a(Packet3Chat p_72481_1_)
      {
@@ -25,7 +25,7 @@
          if (this.field_72574_e.func_71126_v() == 2)
          {
              this.func_72567_b(new Packet3Chat("Cannot send chat message."));
-@@ -993,6 +997,11 @@
+@@ -992,6 +996,11 @@
      }
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
@@ -37,7 +37,7 @@
      {
          DataInputStream var2;
          ItemStack var3;
-@@ -1157,4 +1166,18 @@
+@@ -1156,4 +1165,18 @@
              }
          }
      }

fml/patches/minecraft/net/minecraft/network/packet/NetHandler.java.patch

@@ -7,7 +7,7 @@
  
  public abstract class NetHandler
  {
-@@ -345,4 +347,8 @@
+@@ -340,4 +342,8 @@
      {
          return false;
      }

fml/patches/minecraft/net/minecraft/network/packet/Packet.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/network/packet/Packet.java
 +++ ../src-work/minecraft/net/minecraft/network/packet/Packet.java
-@@ -353,7 +353,7 @@
+@@ -352,7 +352,7 @@
          func_73285_a(107, true, true, Packet107CreativeSetSlot.class);
          func_73285_a(108, false, true, Packet108EnchantItem.class);
          func_73285_a(130, true, true, Packet130UpdateSign.class);

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

@@ -9,7 +9,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.GraphicsEnvironment;
-@@ -376,7 +379,11 @@
+@@ -378,7 +381,11 @@
          {
              if (this.func_71197_b())
              {
@@ -21,7 +21,7 @@
  
                  for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
                  {
-@@ -415,6 +422,7 @@
+@@ -417,6 +424,7 @@
  
                      Thread.sleep(1L);
                  }
@@ -29,7 +29,7 @@
              }
              else
              {
-@@ -423,6 +431,10 @@
+@@ -425,6 +433,10 @@
          }
          catch (Throwable var48)
          {
@@ -40,7 +40,7 @@
              var48.printStackTrace();
              field_71306_a.log(Level.SEVERE, "Encountered an unexpected exception " + var48.getClass().getSimpleName(), var48);
              CrashReport var2 = null;
-@@ -453,6 +465,10 @@
+@@ -455,6 +467,10 @@
          {
              try
              {
@@ -51,7 +51,7 @@
                  this.func_71260_j();
                  this.field_71316_v = true;
              }
-@@ -478,8 +494,10 @@
+@@ -480,8 +496,10 @@
  
      public void func_71217_p()
      {
@@ -62,7 +62,7 @@
          ++this.field_71315_w;
  
          if (this.field_71295_T)
-@@ -525,6 +543,7 @@
+@@ -527,6 +545,7 @@
  
          this.field_71304_b.func_76319_b();
          this.field_71304_b.func_76319_b();
@@ -70,7 +70,7 @@
      }
  
      public void func_71190_q()
-@@ -552,6 +571,7 @@
+@@ -554,6 +573,7 @@
                  }
  
                  this.field_71304_b.func_76320_a("tick");
@@ -78,7 +78,7 @@
                  CrashReport var6;
  
                  try
-@@ -576,6 +596,7 @@
+@@ -578,6 +598,7 @@
                      throw new ReportedException(var6);
                  }
  
@@ -86,7 +86,7 @@
                  this.field_71304_b.func_76319_b();
                  this.field_71304_b.func_76320_a("tracker");
                  var4.func_73039_n().func_72788_a();
-@@ -703,7 +724,7 @@
+@@ -705,7 +726,7 @@
  
      public String getServerModName()
      {
@@ -95,7 +95,7 @@
      }
  
      public CrashReport func_71230_b(CrashReport p_71230_1_)
-@@ -1144,6 +1165,13 @@
+@@ -1146,6 +1167,13 @@
      @SideOnly(Side.SERVER)
      public static void main(String[] p_main_0_)
      {

fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch

@@ -8,7 +8,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.File;
-@@ -107,6 +109,8 @@
+@@ -109,6 +111,8 @@
          }
  
          p_72355_2_.func_71116_b();
@@ -17,7 +17,7 @@
      }
  
      public void func_72364_a(WorldServer[] p_72364_1_)
-@@ -173,6 +177,7 @@
+@@ -175,6 +179,7 @@
  
      public void func_72367_e(EntityPlayerMP p_72367_1_)
      {
@@ -25,7 +25,7 @@
          this.func_72391_b(p_72367_1_);
          WorldServer var2 = p_72367_1_.func_71121_q();
          var2.func_72900_e(p_72367_1_);
-@@ -322,6 +327,7 @@
+@@ -324,6 +329,7 @@
          var8.func_72838_d(var7);
          this.field_72404_b.add(var7);
          var7.func_71116_b();
@@ -33,7 +33,7 @@
          return var7;
      }
  
-@@ -347,6 +353,8 @@
+@@ -349,6 +355,8 @@
              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/minecraft/net/minecraft/world/World.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/world/World.java
 +++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -1796,13 +1796,14 @@
+@@ -1797,13 +1797,14 @@
              }
          }
  
@@ -16,7 +16,7 @@
  
          this.field_72984_F.func_76318_c("pendingTileEntities");
  
-@@ -3627,7 +3628,7 @@
+@@ -3637,7 +3638,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {

fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch

@@ -11,45 +11,48 @@
  import net.minecraft.entity.Entity;
  import net.minecraft.entity.EntityList;
  import net.minecraft.nbt.CompressedStreamTools;
-@@ -237,9 +241,18 @@
+@@ -247,10 +251,20 @@
                  p_75820_1_.field_76644_m = true;
-                 var10 = new NBTTagCompound();
+                 var11 = new NBTTagCompound();
  
--                if (var19.func_70039_c(var10))
+-                if (var21.func_70039_c(var11))
 -                {
--                    var15.func_74742_a(var10);
+-                    var16.func_74742_a(var11);
+-                }
++
 +                try
 +                {
-+                    if (var19.func_70039_c(var10))
++                    if (var21.func_70039_c(var11))
 +                    {
-+                        var15.func_74742_a(var10);
++                        var16.func_74742_a(var11);
 +                    }
 +                }
 +                catch (Exception e)
 +                {
 +                    FMLLog.log(Level.SEVERE, e,
 +                            "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author",
-+                            var19.getClass().getName());
-                 }
++                            var21.getClass().getName());
++                 }
              }
          }
-@@ -252,8 +265,17 @@
+ 
+@@ -262,8 +276,17 @@
          {
-             TileEntity var21 = (TileEntity)var17.next();
-             var10 = new NBTTagCompound();
--            var21.func_70310_b(var10);
--            var16.func_74742_a(var10);
+             TileEntity var22 = (TileEntity)var18.next();
+             var11 = new NBTTagCompound();
+-            var22.func_70310_b(var11);
+-            var17.func_74742_a(var11);
 +            try
 +            {
-+                var21.func_70310_b(var10);
-+                var16.func_74742_a(var10);
++                var22.func_70310_b(var11);
++                var17.func_74742_a(var11);
 +            }
 +            catch (Exception e)
 +            {
 +                FMLLog.log(Level.SEVERE, e,
 +                        "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author",
-+                        var21.getClass().getName());
++                        var22.getClass().getName());
 +            }
          }
  
-         p_75820_3_.func_74782_a("TileEntities", var16);
+         p_75820_3_.func_74782_a("TileEntities", var17);

fml/update_packages.py

@@ -79,7 +79,7 @@ def main():
     
     for cls in pkgs.keys():
         if not cls in classes:
-            print 'Removed Class: %s/%s' % (key, pkgs[key])
+            print 'Removed Class: %s/%s' % (pkgs[cls], cls)
         
     for cls in classes:
         if not cls in pkgs.keys():

fml/updateasmdata.py

@@ -6,7 +6,7 @@ ctorsigre = re.compile('<init>\((.*)\)')
 ctorparamre = re.compile('(([ZBCSIJFD]|L([\w\/]+);))')
 
 def get_merged_info():
-    mcp_dir = os.path.join(os.getcwd(), '..')
+    mcp_dir = os.path.join(os.getcwd(), 'mcp')
     joined = os.path.join(mcp_dir, 'conf', 'joined.srg')
     values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}}
     
@@ -42,7 +42,9 @@ def process_file(file, srg):
             with open(file) as f:
                 for line in f:
                     parts = line.split('#')
-                    
+                    if len(parts) < 2:
+                        nf.write(line)
+                        continue
                     if len(parts[1]) < 4:
                         nf.write(line)
                         continue
@@ -79,10 +81,14 @@ def process_file(file, srg):
                         nf.write(newline)
                         
                     else:
-                        targ = srg[typ][name]
-                        args = targ.replace('/', '.', 1).replace(' ', '', 1)
-                        newline = ('%s %s #%s' % (action[0], args, '#'.join(parts[1:])))
-                        nf.write(newline)
+                        if name not in srg[typ]:
+                            nf.write("%s # -- MISSING MAPPING" %( line ))
+                            print("%s is missing a mapping"% name)
+                        else:
+                            targ = srg[typ][name]
+                            args = targ.replace('/', '.', 1).replace(' ', '', 1)
+                            newline = ('%s %s #%s' % (action[0], args, '#'.join(parts[1:])))
+                            nf.write(newline)
                     
 def main():
     srg = get_merged_info()