Fixed an unroll from the MCL merge. Updated MCP mappings.

forge/conf/fields.csv

@@ -5020,7 +5020,7 @@
 "field_9156_bu","lastHealth","cc","I","I","EntityPlayerMP","fl","net/minecraft/src","1"
 "field_35221_cc","field_35221_cc","cd","I","I","EntityPlayerMP","fl","net/minecraft/src","1"
 "field_35222_cd","field_35222_cd","ce","Z","Z","EntityPlayerMP","fl","net/minecraft/src","1"
-"field_35220_ce","field_35220_ce","cf","I","I","EntityPlayerMP","fl","net/minecraft/src","1"
+"field_35220_ce","lastExperience","cf","I","I","EntityPlayerMP","fl","net/minecraft/src","1"
 "field_15004_bw","ticksOfInvuln","cg","I","I","EntityPlayerMP","fl","net/minecraft/src","1"
 "field_20066_bG","playerInventory","ch","[LItemStack;","[Ljb;","EntityPlayerMP","fl","net/minecraft/src","1"
 "field_20065_bH","currentWindowId","ci","I","I","EntityPlayerMP","fl","net/minecraft/src","1"

forge/conf/methods.csv

@@ -881,8 +881,8 @@
 "func_6329_a","getFontRendererFromRenderManager","a","()LFontRenderer;","()Labe;","Render","rg","net/minecraft/src","0"
 "func_40288_a","func_40288_a","a","(LEntitySnowman;F)V","(Lahd;F)V","RenderSnowMan","bh","net/minecraft/src","0"
 "func_31016_a","getStoredBlockID","a","()I","()I","TileEntityPiston","agb","net/minecraft/src","0"
-"func_31015_b","func_31015_b","c","()Z","()Z","TileEntityPiston","agb","net/minecraft/src","0"
+"func_31015_b","isExtending","c","()Z","()Z","TileEntityPiston","agb","net/minecraft/src","0"
-"func_31009_d","func_31009_d","d","()I","()I","TileEntityPiston","agb","net/minecraft/src","0"
+"func_31009_d","getPistonOrientation","d","()I","()I","TileEntityPiston","agb","net/minecraft/src","0"
 "func_31012_k","func_31012_k","e","()Z","()Z","TileEntityPiston","agb","net/minecraft/src","0"
 "func_31008_a","func_31008_a","a","(F)F","(F)F","TileEntityPiston","agb","net/minecraft/src","0"
 "func_31017_b","func_31017_b","b","(F)F","(F)F","TileEntityPiston","agb","net/minecraft/src","0"
@@ -937,7 +937,7 @@
 "func_40145_a","spawnBabyAnimal","a","(LEntityAnimal;)LEntityAnimal;","(Lfx;)Lfx;","EntityAnimal","fx","net/minecraft/src","0"
 "func_40146_g","getDelay","m","()I","()I","EntityAnimal","fx","net/minecraft/src","0"
 "func_40142_a_","setDelay","b","(I)V","(I)V","EntityAnimal","fx","net/minecraft/src","0"
-"func_40144_b","proceate","b","(LEntityAnimal;)V","(Lfx;)V","EntityAnimal","fx","net/minecraft/src","0"
+"func_40144_b","procreate","b","(LEntityAnimal;)V","(Lfx;)V","EntityAnimal","fx","net/minecraft/src","0"
 "func_40143_a","isWheat","a","(LItemStack;)Z","(Ldk;)Z","EntityAnimal","fx","net/minecraft/src","0"
 "func_40088_g","getPotionDamage","e","()I","()I","EntityPotion","ab","net/minecraft/src","0"
 "func_27059_b","applyTo","c","(Ljava/lang/Object;)Ljava/lang/Object;","(Ljava/lang/Object;)Ljava/lang/Object;","J_Functor","gz","net/minecraft/src","0"
@@ -1178,7 +1178,7 @@
 "func_4045_l","getHeldItem","s","()LItemStack;","()Ldk;","EntityLiving","nq","net/minecraft/src","0"
 "func_432_b","heal","a_","(I)V","(I)V","EntityLiving","nq","net/minecraft/src","0"
 "func_4044_a","damageEntity","b","(LDamageSource;I)V","(Lpm;I)V","EntityLiving","nq","net/minecraft/src","0"
-"func_35162_ad","func_35162_ad","aj","()Z","()Z","EntityLiving","nq","net/minecraft/src","0"
+"func_35162_ad","isBlocking","aj","()Z","()Z","EntityLiving","nq","net/minecraft/src","0"
 "func_22049_v","isMovementBlocked","ai","()Z","()Z","EntityLiving","nq","net/minecraft/src","0"
 "func_418_b_","updateEntityActionState","n","()V","()V","EntityLiving","nq","net/minecraft/src","0"
 "func_419_b","onDeath","a","(LDamageSource;)V","(Lpm;)V","EntityLiving","nq","net/minecraft/src","0"
@@ -1399,7 +1399,7 @@
 "func_27010_f","getColorFromDamage","c","(I)I","(I)I","Item","acy","net/minecraft/src","0"
 "func_40397_d","getItemDisplayName","f","(LItemStack;)Ljava/lang/String;","(Ldk;)Ljava/lang/String;","Item","acy","net/minecraft/src","0"
 "func_40403_e","hasEffect","g","(LItemStack;)Z","(Ldk;)Z","Item","acy","net/minecraft/src","0"
-"func_21012_a","getPlacedBlockMetadata","b","(I)I","(I)I","Item","acy","net/minecraft/src","0"
+"func_21012_a","getMetadata","b","(I)I","(I)I","Item","acy","net/minecraft/src","0"
 "func_21011_b","getItemNameIS","a","(LItemStack;)Ljava/lang/String;","(Ldk;)Ljava/lang/String;","Item","acy","net/minecraft/src","0"
 "func_25008_a","onBlockDestroyed","a","(LItemStack;IIIILEntityLiving;)Z","(Ldk;IIIILnq;)Z","Item","acy","net/minecraft/src","0"
 "func_4018_a","canHarvestBlock","a","(LBlock;)Z","(Lyy;)Z","Item","acy","net/minecraft/src","0"
@@ -3600,7 +3600,7 @@
 "func_148_c","moveEntityWithHeading","a","(FF)V","(FF)V","EntityLiving","lk","net/minecraft/src","1"
 "func_144_E","isOnLadder","r","()Z","()Z","EntityLiving","lk","net/minecraft/src","1"
 "func_155_a","getCanSpawnHere","g","()Z","()Z","EntityLiving","lk","net/minecraft/src","1"
-"func_35180_G","func_35180_G","K","()Z","()Z","EntityLiving","lk","net/minecraft/src","1"
+"func_35180_G","isBlocking","K","()Z","()Z","EntityLiving","lk","net/minecraft/src","1"
 "func_22058_w","isMovementBlocked","L","()Z","()Z","EntityLiving","lk","net/minecraft/src","1"
 "func_152_d_","updateEntityActionState","m_","()V","()V","EntityLiving","lk","net/minecraft/src","1"
 "func_142_f","onDeath","a","(LDamageSource;)V","(Lpo;)V","EntityLiving","lk","net/minecraft/src","1"

forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch

@@ -115,7 +115,7 @@
 +             return;
 +         }
 +     	
-         if(!damagesource.isUnblockable() && func_35162_ad())
+         if(!damagesource.isUnblockable() && isBlocking())
          {
              i = 1 + i >> 1;
 @@ -825,7 +899,9 @@

forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch

@@ -29,18 +29,17 @@
          nbttagcompound.setBoolean("OnGround", onGround);
 +        if (customEntityData != null)
 +        {
-+        	nbttagcompound.setCompoundTag("ForgeEntityData", customEntityData);
++        	nbttagcompound.setCompoundTag("ForgeData", customEntityData);
 +        }
          writeEntityToNBT(nbttagcompound);
      }
  
-@@ -907,6 +927,10 @@
+@@ -907,6 +927,9 @@
          onGround = nbttagcompound.getBoolean("OnGround");
          setPosition(posX, posY, posZ);
          setRotation(rotationYaw, rotationPitch);
-+        if (nbttagcompound.hasKey("ForgeEntityData"))
++        if (nbttagcompound.hasKey("ForgeData")) {
-+        {
++        	customEntityData=nbttagcompound.getCompoundTag("ForgeData");
-+        	customEntityData.getCompoundTag("ForgeEntityData");
 +        }
          readEntityFromNBT(nbttagcompound);
      }

forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch

@@ -139,7 +139,7 @@
                  EntityMinecart entityminecart = this;
  label0:
 @@ -204,12 +256,6 @@
-                         worldObj.entityJoinedWorld(entityitem);
+                         worldObj.spawnEntityInWorld(entityitem);
                      } while(true);
                  }
 -

forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch

@@ -92,12 +92,10 @@
      public boolean canHarvestBlock(Block block)
      {
          return inventory.canHarvestBlock(block);
-@@ -718,7 +773,26 @@
+@@ -719,6 +774,25 @@
-     }
  
      protected void damageEntity(DamageSource damagesource, int i)
--    {
+     {
-+    {        
 +         boolean doRegularComputation = true;
 +         int initialDamage = i;
 +     
@@ -117,7 +115,7 @@
 +             return;
 +         }
 +         
-         if(!damagesource.isUnblockable() && func_35180_G())
+         if(!damagesource.isUnblockable() && isBlocking())
          {
              i = 1 + i >> 1;
 @@ -770,7 +844,9 @@