Update for 1.6.2 and MCP 8.04

fml/commands.patch

@@ -9,7 +9,7 @@
  
  class Commands(object):
      """Contains the commands and initialisation for a full mcp run"""
-@@ -949,6 +951,8 @@
+@@ -950,6 +952,8 @@
          binlk = {CLIENT: self.binclient, SERVER: self.binserver}
          testlk = {CLIENT: self.testclient, SERVER: self.testserver}
  
@@ -18,7 +18,7 @@
          if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
              return False
          return True
-@@ -1280,6 +1284,9 @@
+@@ -1281,6 +1285,9 @@
          pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@@ -28,7 +28,7 @@
  
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
-@@ -1337,7 +1344,7 @@
+@@ -1338,7 +1345,7 @@
              raise
  
      def startserver(self, mainclass, extraargs):
@@ -37,7 +37,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1702,7 +1709,7 @@
+@@ -1703,7 +1710,7 @@
          self.runcmd(forkcmd)
          return True
  
@@ -46,7 +46,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1717,6 +1724,9 @@
+@@ -1718,6 +1725,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -56,7 +56,7 @@
                  for class_file in fnmatch.filter(filelist, '*.class'):
                      class_name = class_path + os.path.splitext(class_file)[0]
                      bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1889,6 +1899,9 @@
+@@ -1890,6 +1900,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -66,7 +66,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1909,6 +1922,9 @@
+@@ -1910,6 +1923,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}

fml/common/fml_at.cfg

@@ -1,76 +1,76 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public asi.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public asm.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public nq.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public nq.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public nq.b #FD:EntityList/field_75625_b #nameToClassMap
-public nq.c #FD:EntityList/field_75626_c #classToNameMap
-public nq.d #FD:EntityList/field_75623_d #idToClassMap
+public ns.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public ns.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public ns.b #FD:EntityList/field_75625_b #nameToClassMap
+public ns.c #FD:EntityList/field_75626_c #classToNameMap
+public ns.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 #public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
 #public bge.g #FD:RenderEngine/field_78366_k #texturePack # -- MISSING MAPPING
 # RenderManager
-public bga.q #FD:RenderManager/field_78729_o #renderers
+public bgi.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bfg.* #FD:RenderBlocks/*
-public bfg.*() #MD:RenderBlocks/*
+public bfo.* #FD:RenderBlocks/*
+public bfo.*() #MD:RenderBlocks/*
 #RenderPlayer
 #public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist # -- MISSING MAPPING
 #RenderBiped
-public-f bgj.l #FD:RenderBiped/field_82424_k #armorlist
+public-f bgr.l #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 #public bp.b #FD:StringTranslate/field_74815_b # -- MISSING MAPPING
 #public bp.e #FD:StringTranslate/field_74813_d # -- MISSING MAPPING
 # TileEntityRenderer
-public bis.m #FD:TileEntityRenderer/field_76966_m
+public bja.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public aaa.a(Lxz;[Ljava/lang/Object;)Laad; #MD:CraftingManager/func_92103_a
-public aaa.b(Lxz;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+public aae.a(Lyd;[Ljava/lang/Object;)Laah; #MD:CraftingManager/func_92103_a
+public aae.b(Lyd;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
-public mg.a #FD:WeightedRandomItem/field_76292_a #probability
+public mi.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
 #public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public kr.a #FD:StatBase/field_75978_a #statName
+public kt.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public jv.a(Ljv;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public jv.g #FD:NetLoginHandler/field_72543_h #userName
+public jx.a(Ljx;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public jx.g #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public js.bJ()V #MD:EntityPlayerMP/func_71117_bO
-public js.bX #FD:EntityPlayerMP/field_71139_cq
+public ju.bM()V #MD:EntityPlayerMP/func_71117_bO
+public ju.bX #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public pr #CL:EntityAITaskEntry
+public pt #CL:EntityAITaskEntry
 # EntityAITasks
-public pq.a #FD:EntityAITasks/field_75782_a #taskList
+public ps.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public and.m(Labr;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public anh.m(Labv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
 #public ng.aU #FD:EntityLiving/field_70736_aM #carryoverDamage # -- MISSING MAPPING
-public od.c #FD:EntityLiving/field_70714_bg #tasks
+public of.c #FD:EntityLiving/field_70714_bg #tasks
 #public ng.bG #FD:EntityLiving/field_70703_bu #isJumping # -- MISSING MAPPING
 # EntityAIOcelotSit
-protected qd.a(Labr;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected qd.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected qf.a(Labv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected qf.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public c #CL:CallableMinecraftVersion
 public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public rm.bp #FD:EntityAnimal/field_70881_d #inLove
+public ro.bp #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public acb.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public acb.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
+public acf.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public acf.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public ajf #CL:ComponentVillage
+public ajj #CL:ComponentVillage
 # EntityVillager - minmax lists
-public tw.a(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public tw.b(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public tw.bB #FD:EntityVillager/field_70958_bB
-public tw.bC #FD:EntityVillager/field_70960_bC
+public ua.a(Labl;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public ua.b(Labl;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public ua.bB #FD:EntityVillager/field_70958_bB
+public ua.bC #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public axo #CL:GuiButtonMerchant
+public axu #CL:GuiButtonMerchant
 
-protected auo.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected auu.a #FD:GuiYesNo/field_73942_a #guiScreen
 # Minecraft
-public atn.C #FD:Minecraft/field_71425_J #running
-public atn.M #FD:Minecraft/field_71446_o # textureManager
+public ats.D #FD:Minecraft/field_71425_J #running
+public ats.N #FD:Minecraft/field_71446_o # textureManager

fml/common/fml_marker.cfg

@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-ua cpw/mods/fml/common/network/Player
+ue cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aqs cpw/mods/fml/common/registry/BlockProxy
+aqw cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-xx cpw/mods/fml/common/registry/ItemProxy
+yb 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": "8.03",
-  "mcversion": "1.6.1",
+  "version": "8.04",
+  "mcversion": "1.6.2",
   "logoFile": "/mcp.png",
   "url": "http://mcp.ocean-labs.de/",
   "updateUrl": "",

fml/conf/fields.csv

@@ -6,6 +6,9 @@ field_100002_d,cancelBtn,0,
 field_100003_c,doneBtn,0,
 field_100010_b,iconArray,0,
 field_100013_f,isPotionDurationMax,0,"True if potion effect duration is at maximum, false otherwise."
+field_102009_f,slots_sides,2,
+field_102010_d,slots_top,2,
+field_102011_e,slots_bottom,2,
 field_70009_b,buffer,2,RCon string buffer for log.
 field_70010_a,consoleBuffer,2,only ever used by MinecraftServer.executeCommand
 field_70116_cv,serverPosZ,0,
@@ -1476,7 +1479,7 @@ field_72792_d,entityViewDistance,2,
 field_72793_b,trackedEntities,2,"List of tracked entities, used for iteration operations on tracked entities."
 field_72794_c,trackedEntityIDs,2,
 field_72795_a,theWorld,2,
-field_72814_d,hasExtendedLevels,2,set by !chunk.getAreLevelsEmpty
+field_72814_d,isEmpty,2,True if the chunk cache is empty.
 field_72815_e,worldObj,2,Reference to the World object.
 field_72816_b,chunkZ,2,
 field_72817_c,chunkArray,2,
@@ -1530,7 +1533,8 @@ field_73059_b,theChunkProviderServer,2,
 field_73061_a,mcServer,2,
 field_73062_L,theEntityTracker,2,
 field_73063_M,thePlayerManager,2,
-field_73065_O,pendingTickListEntries,2,All work to do in future ticks.
+field_73064_N,pendingTickListEntriesHashSet,2,
+field_73065_O,pendingTickListEntriesTreeSet,2,All work to do in future ticks.
 field_73066_T,entityIdMap,2,An IntHashMap of entity IDs (integers) to their Entity objects.
 field_73067_Q,blockEventCache,2,Double buffer of ServerBlockEventList[] for holding pending BlockEventData's
 field_73068_P,allPlayersSleeping,2,is false if there are no players
@@ -2717,6 +2721,7 @@ field_75309_a,targetEntity,2,
 field_75310_g,theTameable,2,
 field_75311_b,entityPathNavigate,0,The PathNavigate of our entity.
 field_75311_b,entityPathNavigate,1,The PathNavigate of our entity.
+field_75312_a,entityCallsForHelp,2,
 field_75313_b,theTarget,2,
 field_75314_a,theEntityTameable,2,
 field_75315_b,theOwnerAttacker,2,
@@ -2936,6 +2941,8 @@ field_75768_d,mapDataDir,2,
 field_75769_e,initializationTime,2,The time in milliseconds when this field was initialized. Stored in the session lock file.
 field_75770_b,worldDirectory,2,The directory in which to save world data.
 field_75771_c,playersDirectory,2,The directory in which to save player data.
+field_75778_d,tickCount,2,
+field_75779_e,tickRate,2,
 field_75780_b,executingTaskEntries,2,A list of EntityAITaskEntrys that are currently being executed.
 field_75781_c,theProfiler,2,Instance of Profiler.
 field_75782_a,taskEntries,2,A list of EntityAITaskEntrys in EntityAITasks.
@@ -3841,7 +3848,7 @@ field_77747_aY,sugar,2,
 field_77748_bA,eyeOfEnder,2,
 field_77749_aR,fishingRod,2,
 field_77750_aQ,compass,2,
-field_77751_aT,lightStoneDust,2,
+field_77751_aT,glowstone,2,
 field_77752_aS,pocketSundial,2,
 field_77753_aV,fishCooked,2,
 field_77754_aU,fishRaw,2,
@@ -4728,6 +4735,7 @@ field_82731_v,wither,2,The wither Potion object.
 field_82741_K,vecPool,2,The world-local pool of vectors
 field_82745_f,createdAtCloudUpdateTick,0,keeps track of how many ticks this PartiallyDestroyedBlock already exists
 field_82748_f,worldTypeId,2,ID for this world type.
+field_82754_f,priority,2,
 field_82755_b,isSmoking,2,whether or not this explosion spawns smoke particles
 field_82759_d,valueDouble,2,
 field_82760_b,valueBoolean,2,
@@ -4791,7 +4799,11 @@ field_82893_b,batBody,0,The body box of the bat model.
 field_82894_c,batRightWing,0,The inner right wing box of the bat model.
 field_82895_a,batHead,0,
 field_82896_a,skeletonHead,0,
+field_82898_f,villagerNose,0,
 field_82902_i,witchHat,0,
+field_82906_o,offsetX,0,
+field_82907_q,offsetZ,0,
+field_82908_p,offsetY,0,
 field_82909_b,presetName,0,Name for this preset.
 field_82910_c,presetData,0,Data for this preset.
 field_82911_a,iconId,0,ID for the item used as icon for this preset.
@@ -4811,6 +4823,7 @@ field_83027_i,renderMinY,0,The minimum Y value for rendering (default 0.0).
 field_85037_d,aiArrowAttack,2,
 field_85038_e,aiAttackOnCollide,2,
 field_85042_b,eventButton,0,
+field_85043_c,lastMouseEvent,0,
 field_85045_v,returningStack,0,Used when touchscreen is enabled
 field_85046_u,returningStackTime,0,
 field_85047_t,returningStackDestSlot,0,
@@ -4840,6 +4853,7 @@ field_85141_a,worldInfoInstance,2,
 field_85143_a,worldInfoInstance,2,
 field_85146_a,theTileEntity,2,
 field_85155_a,theEntity,2,
+field_85159_M,isAdventureModeExempt,2,
 field_85161_a,theMapStructureGenerator,2,
 field_85164_c,theMapStructureGenerator,2,
 field_85168_c,theMapStructureGenerator,2,
@@ -4872,6 +4886,7 @@ field_92076_h,skyLightSent,2,"Whether or not the chunk data contains a light nib
 field_92077_h,pitch,2,The pitch in steps of 2p/256
 field_92078_i,yaw,2,The yaw in steps of 2p/256
 field_92086_a,isBlank,2,When isBlank is true the DataWatcher is not watching any objects
+field_92090_c,enchantmentsBookList,2,The list of enchantments applicable by the anvil from a book
 field_92091_k,thorns,2,
 field_92104_bU,firework,2,
 field_92105_bW,enchantedBook,2,
@@ -4882,6 +4897,7 @@ field_92119_C,overrideHeight,0,
 field_94050_c,customName,2,
 field_94054_b,particleTextureIndexX,0,
 field_94055_c,particleTextureIndexY,0,
+field_94063_bt,_combatTracker,2,
 field_94084_b,tntPlacedBy,2,
 field_94102_c,entityName,2,
 field_94106_a,minecartTNTFuse,2,
@@ -4961,8 +4977,8 @@ field_94299_k,textureWrap,0,
 field_94300_h,textureTarget,0,
 field_94301_i,textureMinFilter,0,
 field_94302_r,textureData,0,
-field_94303_q,textureNotModified,0,False if the texture has been modified since it was last uploaded to the GPU.
-field_94304_p,autoCreate,0,"Uninitialized boolean. If true, the texture is re-uploaded every time it's modified. If false, every tick after it's been modified at least once in that tick."
+field_94303_q,textureUploaded,0,If the texture has been uploaded to the GPU
+field_94304_p,autoUpload,0,"If true, the texture is re-uploaded every time it's modified. If false, every tick after it's been modified at least once in that tick."
 field_94313_f,maxHeight,0,
 field_94314_g,forcePowerOf2,0,
 field_94315_d,currentHeight,0,
@@ -5068,6 +5084,7 @@ field_94516_b,logicWorld,2,
 field_94517_c,railX,2,
 field_94518_a,theRail,2,
 field_94557_a,selectAnything,2,
+field_94579_S,pendingTickListEntriesThisTick,2,
 field_94582_cb,minecartTnt,2,
 field_94583_ca,netherQuartz,2,
 field_94584_bZ,netherrackBrick,2,
@@ -5080,6 +5097,7 @@ field_94601_a,bowPullIconNameArray,2,
 field_94610_a,theTileEntity,2,
 field_94612_a,theTileEntity,2,
 field_96093_i,entityUniqueID,2,
+field_96101_a,outputSignal,2,
 field_96105_c,commandSenderName,2,"The name of command sender (usually username, but possibly ""Rcon"")"
 field_96106_a,succesCount,2,
 field_96113_a,isBlocked,2,Whether this hopper minecart is being blocked by an activator rail.
@@ -5137,6 +5155,7 @@ field_98044_b,transferTicker,2,
 field_98048_c,transferCooldown,2,
 field_98051_e,fallingBlockTileEntityData,2,
 field_98130_m,serverLogAgent,0,
+field_98141_g,fallbackTexturePack,0,
 field_98151_a,theTexture,0,
 field_98181_L,worldLogAgent,2,The log agent for this world.
 field_98189_n,partialRenderBounds,0,

fml/conf/joined.exc

@@ -1,5 +1,5 @@
-#max index = 2351
-max_constructor_index=2351
+#max index = 2371
+max_constructor_index=2371
 net/minecraft/client/ClientBrandRetriever.<init>()V=|
 net/minecraft/client/main/Main.<init>()V=|
 net/minecraft/client/main/Main.func_110121_a(Ljava/lang/String;)Z=|p_110121_0_
@@ -240,6 +240,7 @@ net/minecraft/src/AttributeInstance.func_111125_b()D=|
 net/minecraft/src/AttributeInstance.func_111126_e()D=|
 net/minecraft/src/AttributeInstance.func_111127_a(Ljava/util/UUID;)Lnet/minecraft/src/AttributeModifier;=|p_111127_1_
 net/minecraft/src/AttributeInstance.func_111128_a(D)V=|p_111128_1_
+net/minecraft/src/AttributeInstance.func_142049_d()V=|
 net/minecraft/src/AttributeModifier.<init>(Ljava/lang/String;DI)V=|p_i1605_1_,p_i1605_2_,p_i1605_4_
 net/minecraft/src/AttributeModifier.<init>(Ljava/util/UUID;Ljava/lang/String;DI)V=|p_i1606_1_,p_i1606_2_,p_i1606_3_,p_i1606_5_
 net/minecraft/src/AttributeModifier.equals(Ljava/lang/Object;)Z=|p_equals_1_
@@ -1374,6 +1375,7 @@ net/minecraft/src/BlockPistonBase.func_94332_a(Lnet/minecraft/src/IconRegister;)
 net/minecraft/src/BlockPistonBase.func_94496_b(Ljava/lang/String;)Lnet/minecraft/src/Icon;=|p_94496_0_
 net/minecraft/src/BlockPistonBase.func_96479_b(FFFFFF)V=|p_96479_1_,p_96479_2_,p_96479_3_,p_96479_4_,p_96479_5_,p_96479_6_
 net/minecraft/src/BlockPistonExtension.<init>(I)V=|p_i2297_1_
+net/minecraft/src/BlockPistonExtension.func_71846_a(Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityPlayer;)V=|p_71846_1_,p_71846_2_,p_71846_3_,p_71846_4_,p_71846_5_,p_71846_6_
 net/minecraft/src/BlockPistonExtension.func_71850_a_(Lnet/minecraft/src/World;IIII)Z=|p_71850_1_,p_71850_2_,p_71850_3_,p_71850_4_,p_71850_5_
 net/minecraft/src/BlockPistonExtension.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_
 net/minecraft/src/BlockPistonExtension.func_71857_b()I=|
@@ -2358,13 +2360,6 @@ net/minecraft/src/ChunkProviderServer.func_73241_b(II)V=|p_73241_1_,p_73241_2_
 net/minecraft/src/ChunkProviderServer.func_73242_b(Lnet/minecraft/src/Chunk;)V=|p_73242_1_
 net/minecraft/src/ChunkProviderServer.func_73243_a(Lnet/minecraft/src/Chunk;)V=|p_73243_1_
 net/minecraft/src/ChunkProviderServer.func_82695_e(II)V=|p_82695_1_,p_82695_2_
-net/minecraft/src/ClientsideAttributeMap.<init>()V=|
-net/minecraft/src/ClientsideAttributeMap.func_111150_b(Lnet/minecraft/src/Attribute;)Lnet/minecraft/src/AttributeInstance;=|p_111150_1_
-net/minecraft/src/ClientsideAttributeMap.func_111151_a(Lnet/minecraft/src/Attribute;)Lnet/minecraft/src/AttributeInstance;=|p_111151_1_
-net/minecraft/src/ClientsideAttributeMap.func_111152_a(Ljava/lang/String;)Lnet/minecraft/src/AttributeInstance;=|p_111152_1_
-net/minecraft/src/ClientsideAttributeMap.func_111155_b(Ljava/lang/String;)Lnet/minecraft/src/ReadonlyAttributeInstance;=|p_111155_1_
-net/minecraft/src/ClientsideAttributeMap.func_111156_d(Lnet/minecraft/src/Attribute;)Lnet/minecraft/src/ReadonlyAttributeInstance;=|p_111156_1_
-net/minecraft/src/ClientsideAttributeMap.func_111157_c(Lnet/minecraft/src/Attribute;)Lnet/minecraft/src/ReadonlyAttributeInstance;=|p_111157_1_
 net/minecraft/src/ClippingHelper.<init>()V=|
 net/minecraft/src/ClippingHelper.func_78553_b(DDDDDD)Z=|p_78553_1_,p_78553_3_,p_78553_5_,p_78553_7_,p_78553_9_,p_78553_11_
 net/minecraft/src/ClippingHelperImpl.<init>()V=|
@@ -2519,6 +2514,7 @@ net/minecraft/src/CommandPlaySound.<init>()V=|
 net/minecraft/src/CommandPlaySound.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
 net/minecraft/src/CommandPlaySound.func_71517_b()Ljava/lang/String;=|
 net/minecraft/src/CommandPlaySound.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
+net/minecraft/src/CommandPlaySound.func_82358_a([Ljava/lang/String;I)Z=|p_82358_1_,p_82358_2_
 net/minecraft/src/CommandPlaySound.func_82362_a()I=|
 net/minecraft/src/CommandServerBan.<init>()V=|
 net/minecraft/src/CommandServerBan.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
@@ -3523,6 +3519,7 @@ net/minecraft/src/Entity.equals(Ljava/lang/Object;)Z=|p_equals_1_
 net/minecraft/src/Entity.func_110123_P()V=|
 net/minecraft/src/Entity.func_110124_au()Ljava/util/UUID;=|
 net/minecraft/src/Entity.func_130002_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_130002_1_
+net/minecraft/src/Entity.func_142008_O()Z=|
 net/minecraft/src/Entity.func_70011_f(DDD)D=|p_70011_1_,p_70011_3_,p_70011_5_
 net/minecraft/src/Entity.func_70012_b(DDDFF)V=|p_70012_1_,p_70012_3_,p_70012_5_,p_70012_7_,p_70012_8_
 net/minecraft/src/Entity.func_70013_c(F)F=|p_70013_1_
@@ -3784,15 +3781,15 @@ net/minecraft/src/EntityAIMoveThroughVillage.func_75253_b()Z=|
 net/minecraft/src/EntityAIMoveThroughVillage.func_75412_a(Lnet/minecraft/src/Village;)Lnet/minecraft/src/VillageDoorInfo;=|p_75412_1_
 net/minecraft/src/EntityAIMoveThroughVillage.func_75413_a(Lnet/minecraft/src/VillageDoorInfo;)Z=|p_75413_1_
 net/minecraft/src/EntityAIMoveThroughVillage.func_75414_f()V=|
+net/minecraft/src/EntityAIMoveTowardsRestriction.<init>(Lnet/minecraft/src/EntityCreature;D)V=|p_i2347_1_,p_i2347_2_
+net/minecraft/src/EntityAIMoveTowardsRestriction.func_75249_e()V=|
+net/minecraft/src/EntityAIMoveTowardsRestriction.func_75250_a()Z=|
+net/minecraft/src/EntityAIMoveTowardsRestriction.func_75253_b()Z=|
 net/minecraft/src/EntityAIMoveTowardsTarget.<init>(Lnet/minecraft/src/EntityCreature;DF)V=|p_i1640_1_,p_i1640_2_,p_i1640_4_
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75249_e()V=|
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75250_a()Z=|
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75251_c()V=|
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75253_b()Z=|
-net/minecraft/src/EntityAIMoveTowardsRestriction.<init>(Lnet/minecraft/src/EntityCreature;D)V=|p_i1639_1_,p_i1639_2_
-net/minecraft/src/EntityAIMoveTowardsRestriction.func_75249_e()V=|
-net/minecraft/src/EntityAIMoveTowardsRestriction.func_75250_a()Z=|
-net/minecraft/src/EntityAIMoveTowardsRestriction.func_75253_b()Z=|
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;IZ)V=|p_i1663_1_,p_i1663_2_,p_i1663_3_,p_i1663_4_
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;IZZ)V=|p_i1664_1_,p_i1664_2_,p_i1664_3_,p_i1664_4_,p_i1664_5_
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;IZZLnet/minecraft/src/IEntitySelector;)V=|p_i1665_1_,p_i1665_2_,p_i1665_3_,p_i1665_4_,p_i1665_5_,p_i1665_6_
@@ -4067,6 +4064,8 @@ net/minecraft/src/EntityChicken.func_90011_a(Lnet/minecraft/src/EntityAgeable;)L
 net/minecraft/src/EntityClientPlayerMP.<init>(Lnet/minecraft/src/Minecraft;Lnet/minecraft/src/World;Lnet/minecraft/src/Session;Lnet/minecraft/src/NetClientHandler;)V=|p_i1189_1_,p_i1189_2_,p_i1189_3_,p_i1189_4_
 net/minecraft/src/EntityClientPlayerMP.func_110318_g()V=|
 net/minecraft/src/EntityClientPlayerMP.func_110322_i()V=|
+net/minecraft/src/EntityClientPlayerMP.func_142020_c(Ljava/lang/String;)V=|p_142020_1_
+net/minecraft/src/EntityClientPlayerMP.func_142021_k()Ljava/lang/String;=|
 net/minecraft/src/EntityClientPlayerMP.func_70071_h_()V=|
 net/minecraft/src/EntityClientPlayerMP.func_70097_a(Lnet/minecraft/src/DamageSource;F)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityClientPlayerMP.func_70665_d(Lnet/minecraft/src/DamageSource;F)V=|p_70665_1_,p_70665_2_
@@ -4108,6 +4107,7 @@ net/minecraft/src/EntityCreature.func_110174_bM()F=|
 net/minecraft/src/EntityCreature.func_110175_bO()Z=|
 net/minecraft/src/EntityCreature.func_110176_b(III)Z=|p_110176_1_,p_110176_2_,p_110176_3_
 net/minecraft/src/EntityCreature.func_110177_bN()V=|
+net/minecraft/src/EntityCreature.func_142017_o(F)V=|p_142017_1_
 net/minecraft/src/EntityCreature.func_70601_bi()Z=|
 net/minecraft/src/EntityCreature.func_70626_be()V=|
 net/minecraft/src/EntityCreature.func_70777_m()Lnet/minecraft/src/Entity;=|
@@ -4407,6 +4407,7 @@ net/minecraft/src/EntityGolem.func_70692_ba()Z=|
 net/minecraft/src/EntityHanging.<init>(Lnet/minecraft/src/World;)V=|p_i1588_1_
 net/minecraft/src/EntityHanging.<init>(Lnet/minecraft/src/World;IIII)V=|p_i1589_1_,p_i1589_2_,p_i1589_3_,p_i1589_4_,p_i1589_5_
 net/minecraft/src/EntityHanging.func_110128_b(Lnet/minecraft/src/Entity;)V=|p_110128_1_
+net/minecraft/src/EntityHanging.func_142008_O()Z=|
 net/minecraft/src/EntityHanging.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityHanging.func_70024_g(DDD)V=|p_70024_1_,p_70024_3_,p_70024_5_
 net/minecraft/src/EntityHanging.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
@@ -4499,6 +4500,8 @@ net/minecraft/src/EntityHorse.func_110264_co()Ljava/lang/String;=|
 net/minecraft/src/EntityHorse.func_110265_bP()I=|
 net/minecraft/src/EntityHorse.func_110266_cB()V=|
 net/minecraft/src/EntityHorse.func_110267_cL()F=|
+net/minecraft/src/EntityHorse.func_142017_o(F)V=|p_142017_1_
+net/minecraft/src/EntityHorse.func_142019_cb()Ljava/lang/String;=|
 net/minecraft/src/EntityHorse.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityHorse.func_70019_c(Z)V=|p_70019_1_
 net/minecraft/src/EntityHorse.func_70023_ak()Ljava/lang/String;=|
@@ -4512,7 +4515,6 @@ net/minecraft/src/EntityHorse.func_70088_a()V=|
 net/minecraft/src/EntityHorse.func_70097_a(Lnet/minecraft/src/DamageSource;F)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityHorse.func_70103_a(B)V=|p_70103_1_
 net/minecraft/src/EntityHorse.func_70104_M()Z=|
-net/minecraft/src/EntityHorse.func_70106_y()V=|
 net/minecraft/src/EntityHorse.func_70599_aP()F=|
 net/minecraft/src/EntityHorse.func_70601_bi()Z=|
 net/minecraft/src/EntityHorse.func_70610_aX()Z=|
@@ -4654,7 +4656,7 @@ net/minecraft/src/EntityLiving.func_104002_bU()Z=|
 net/minecraft/src/EntityLiving.func_110146_f(FF)F=|p_110146_1_,p_110146_2_
 net/minecraft/src/EntityLiving.func_110147_ax()V=|
 net/minecraft/src/EntityLiving.func_110159_bB()V=|
-net/minecraft/src/EntityLiving.func_110160_i(Z)V=|p_110160_1_
+net/minecraft/src/EntityLiving.func_110160_i(ZZ)V=|p_110160_1_,p_110160_2_
 net/minecraft/src/EntityLiving.func_110161_a(Lnet/minecraft/src/EntityLivingData;)Lnet/minecraft/src/EntityLivingData;=|p_110161_1_
 net/minecraft/src/EntityLiving.func_110162_b(Lnet/minecraft/src/Entity;Z)V=|p_110162_1_,p_110162_2_
 net/minecraft/src/EntityLiving.func_110163_bv()V=|
@@ -4734,6 +4736,10 @@ net/minecraft/src/EntityLivingBase.func_110147_ax()V=|
 net/minecraft/src/EntityLivingBase.func_110148_a(Lnet/minecraft/src/Attribute;)Lnet/minecraft/src/AttributeInstance;=|p_110148_1_
 net/minecraft/src/EntityLivingBase.func_110149_m(F)V=|p_110149_1_
 net/minecraft/src/EntityLivingBase.func_130011_c(Lnet/minecraft/src/Entity;)V=|p_130011_1_
+net/minecraft/src/EntityLivingBase.func_142012_a(Lnet/minecraft/src/Team;)Z=|p_142012_1_
+net/minecraft/src/EntityLivingBase.func_142013_aG()I=|
+net/minecraft/src/EntityLivingBase.func_142014_c(Lnet/minecraft/src/EntityLivingBase;)Z=|p_142014_1_
+net/minecraft/src/EntityLivingBase.func_142015_aE()I=|
 net/minecraft/src/EntityLivingBase.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityLivingBase.func_70018_K()V=|
 net/minecraft/src/EntityLivingBase.func_70030_z()V=|
@@ -4819,7 +4825,7 @@ net/minecraft/src/EntityLivingBase.func_70690_d(Lnet/minecraft/src/PotionEffect;
 net/minecraft/src/EntityLivingBase.func_70691_i(F)V=|p_70691_1_
 net/minecraft/src/EntityLivingBase.func_70693_a(Lnet/minecraft/src/EntityPlayer;)I=|p_70693_1_
 net/minecraft/src/EntityLivingBase.func_70694_bm()Lnet/minecraft/src/ItemStack;=|
-net/minecraft/src/EntityLivingBase.func_70695_b(Lnet/minecraft/src/PotionEffect;)V=|p_70695_1_
+net/minecraft/src/EntityLivingBase.func_70695_b(Lnet/minecraft/src/PotionEffect;Z)V=|p_70695_1_,p_70695_2_
 net/minecraft/src/EntityLivingBase.func_71001_a(Lnet/minecraft/src/Entity;I)V=|p_71001_1_,p_71001_2_
 net/minecraft/src/EntityLivingBase.func_71038_i()V=|
 net/minecraft/src/EntityLivingBase.func_71124_b(I)Lnet/minecraft/src/ItemStack;=|p_71124_1_
@@ -4834,6 +4840,7 @@ net/minecraft/src/EntityLivingBase.func_85034_r(I)V=|p_85034_1_
 net/minecraft/src/EntityLivingBase.func_85035_bI()I=|
 net/minecraft/src/EntityLivingBase.func_94059_bO()Z=|
 net/minecraft/src/EntityLivingBase.func_94060_bK()Lnet/minecraft/src/EntityLivingBase;=|
+net/minecraft/src/EntityLivingBase.func_96124_cp()Lnet/minecraft/src/Team;=|
 net/minecraft/src/EntityLookHelper.<init>(Lnet/minecraft/src/EntityLiving;)V=|p_i1613_1_
 net/minecraft/src/EntityLookHelper.func_75649_a()V=|
 net/minecraft/src/EntityLookHelper.func_75650_a(DDDFF)V=|p_75650_1_,p_75650_3_,p_75650_5_,p_75650_7_,p_75650_8_
@@ -5198,7 +5205,6 @@ net/minecraft/src/EntityPlayer.func_71018_a(III)Lnet/minecraft/src/EnumStatus;=|
 net/minecraft/src/EntityPlayer.func_71019_a(Lnet/minecraft/src/ItemStack;Z)Lnet/minecraft/src/EntityItem;=|p_71019_1_,p_71019_2_
 net/minecraft/src/EntityPlayer.func_71020_j(F)V=|p_71020_1_
 net/minecraft/src/EntityPlayer.func_71021_b(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EntityItem;=|p_71021_1_
-net/minecraft/src/EntityPlayer.func_71022_a(Lnet/minecraft/src/EntityLivingBase;Z)V=|p_71022_1_,p_71022_2_
 net/minecraft/src/EntityPlayer.func_71023_q(I)V=|p_71023_1_
 net/minecraft/src/EntityPlayer.func_71024_bL()Lnet/minecraft/src/FoodStats;=|
 net/minecraft/src/EntityPlayer.func_71026_bH()Z=|
@@ -5258,7 +5264,7 @@ net/minecraft/src/EntityPlayer.func_96090_ax()Ljava/lang/String;=|
 net/minecraft/src/EntityPlayer.func_96092_aw()Z=|
 net/minecraft/src/EntityPlayer.func_96122_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_96122_1_
 net/minecraft/src/EntityPlayer.func_96123_co()Lnet/minecraft/src/Scoreboard;=|
-net/minecraft/src/EntityPlayer.func_96124_cp()Lnet/minecraft/src/ScorePlayerTeam;=|
+net/minecraft/src/EntityPlayer.func_96124_cp()Lnet/minecraft/src/Team;=|
 net/minecraft/src/EntityPlayer.func_96125_a(Lnet/minecraft/src/EntityMinecartHopper;)V=|p_96125_1_
 net/minecraft/src/EntityPlayer.func_98034_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_98034_1_
 net/minecraft/src/EntityPlayerMP.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/World;Ljava/lang/String;Lnet/minecraft/src/ItemInWorldManager;)V=|p_i1523_1_,p_i1523_2_,p_i1523_3_,p_i1523_4_
@@ -5277,7 +5283,7 @@ net/minecraft/src/EntityPlayerMP.func_70634_a(DDD)V=|p_70634_1_,p_70634_3_,p_706
 net/minecraft/src/EntityPlayerMP.func_70645_a(Lnet/minecraft/src/DamageSource;)V=|p_70645_1_
 net/minecraft/src/EntityPlayerMP.func_70670_a(Lnet/minecraft/src/PotionEffect;)V=|p_70670_1_
 net/minecraft/src/EntityPlayerMP.func_70688_c(Lnet/minecraft/src/PotionEffect;)V=|p_70688_1_
-net/minecraft/src/EntityPlayerMP.func_70695_b(Lnet/minecraft/src/PotionEffect;)V=|p_70695_1_
+net/minecraft/src/EntityPlayerMP.func_70695_b(Lnet/minecraft/src/PotionEffect;Z)V=|p_70695_1_,p_70695_2_
 net/minecraft/src/EntityPlayerMP.func_70999_a(ZZZ)V=|p_70999_1_,p_70999_2_,p_70999_3_
 net/minecraft/src/EntityPlayerMP.func_71001_a(Lnet/minecraft/src/Entity;I)V=|p_71001_1_,p_71001_2_
 net/minecraft/src/EntityPlayerMP.func_71002_c(IIILjava/lang/String;)V=|p_71002_1_,p_71002_2_,p_71002_3_,p_71002_4_
@@ -5285,6 +5291,7 @@ net/minecraft/src/EntityPlayerMP.func_71006_a(Lnet/minecraft/src/TileEntityDispe
 net/minecraft/src/EntityPlayerMP.func_71007_a(Lnet/minecraft/src/IInventory;)V=|p_71007_1_
 net/minecraft/src/EntityPlayerMP.func_71008_a(Lnet/minecraft/src/ItemStack;I)V=|p_71008_1_,p_71008_2_
 net/minecraft/src/EntityPlayerMP.func_71009_b(Lnet/minecraft/src/Entity;)V=|p_71009_1_
+net/minecraft/src/EntityPlayerMP.func_71014_a(Lnet/minecraft/src/TileEntity;)V=|p_71014_1_
 net/minecraft/src/EntityPlayerMP.func_71016_p()V=|
 net/minecraft/src/EntityPlayerMP.func_71017_a(Lnet/minecraft/src/TileEntityBrewingStand;)V=|p_71017_1_
 net/minecraft/src/EntityPlayerMP.func_71018_a(III)Lnet/minecraft/src/EnumStatus;=|p_71018_1_,p_71018_2_,p_71018_3_
@@ -5601,6 +5608,8 @@ net/minecraft/src/EntityTNTPrimed.func_70515_d()V=|
 net/minecraft/src/EntityTNTPrimed.func_94083_c()Lnet/minecraft/src/EntityLivingBase;=|
 net/minecraft/src/EntityTameable.<init>(Lnet/minecraft/src/World;)V=|p_i1604_1_
 net/minecraft/src/EntityTameable.func_130012_q()Lnet/minecraft/src/EntityLivingBase;=|
+net/minecraft/src/EntityTameable.func_142014_c(Lnet/minecraft/src/EntityLivingBase;)Z=|p_142014_1_
+net/minecraft/src/EntityTameable.func_142018_a(Lnet/minecraft/src/EntityLivingBase;Lnet/minecraft/src/EntityLivingBase;)Z=|p_142018_1_,p_142018_2_
 net/minecraft/src/EntityTameable.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityTameable.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityTameable.func_70088_a()V=|
@@ -5614,6 +5623,7 @@ net/minecraft/src/EntityTameable.func_70907_r()Lnet/minecraft/src/EntityAISit;=|
 net/minecraft/src/EntityTameable.func_70908_e(Z)V=|p_70908_1_
 net/minecraft/src/EntityTameable.func_70909_n()Z=|
 net/minecraft/src/EntityTameable.func_70910_a(Ljava/lang/String;)V=|p_70910_1_
+net/minecraft/src/EntityTameable.func_96124_cp()Lnet/minecraft/src/Team;=|
 net/minecraft/src/EntityThrowable.<init>(Lnet/minecraft/src/World;)V=|p_i1776_1_
 net/minecraft/src/EntityThrowable.<init>(Lnet/minecraft/src/World;DDD)V=|p_i1778_1_,p_i1778_2_,p_i1778_4_,p_i1778_6_
 net/minecraft/src/EntityThrowable.<init>(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityLivingBase;)V=|p_i1777_1_,p_i1777_2_
@@ -5772,6 +5782,7 @@ net/minecraft/src/EntityWitherSkull.func_82342_d()Z=|
 net/minecraft/src/EntityWitherSkull.func_82343_e(Z)V=|p_82343_1_
 net/minecraft/src/EntityWolf.<init>(Lnet/minecraft/src/World;)V=|p_i1696_1_
 net/minecraft/src/EntityWolf.func_110147_ax()V=|
+net/minecraft/src/EntityWolf.func_142018_a(Lnet/minecraft/src/EntityLivingBase;Lnet/minecraft/src/EntityLivingBase;)Z=|p_142018_1_,p_142018_2_
 net/minecraft/src/EntityWolf.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityWolf.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_70036_3_,p_70036_4_
 net/minecraft/src/EntityWolf.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
@@ -5858,6 +5869,8 @@ net/minecraft/src/EntityZombie.func_82230_o()Z=|
 net/minecraft/src/EntityZombie.func_82231_m()Z=|
 net/minecraft/src/EntityZombie.func_82232_p()V=|
 net/minecraft/src/EntityZombie.func_82233_q()I=|
+net/minecraft/src/EntityZombieGroupData.<init>(Lnet/minecraft/src/EntityZombie;ZZ)V=|p_i2348_1_,p_i2348_2_,p_i2348_3_
+net/minecraft/src/EntityZombieGroupData.<init>(Lnet/minecraft/src/EntityZombie;ZZLnet/minecraft/src/EntityZombieINNER1;)V=|p_i2349_1_,p_i2349_2_,p_i2349_3_,p_i2349_4_
 net/minecraft/src/EnumAction.<init>(Ljava/lang/String;I)V=|p_i1910_1_,p_i1910_2_
 net/minecraft/src/EnumAction.valueOf(Ljava/lang/String;)Lnet/minecraft/src/EnumAction;=|p_valueOf_0_
 net/minecraft/src/EnumArmorMaterial.<init>(Ljava/lang/String;II[II)V=|p_i1827_1_,p_i1827_2_,p_i1827_3_,p_i1827_4_,p_i1827_5_
@@ -6018,6 +6031,7 @@ net/minecraft/src/FontMetadataSectionSerializer.deserialize(Lcom/google/gson/Jso
 net/minecraft/src/FontMetadataSectionSerializer.func_110483_a()Ljava/lang/String;=|
 net/minecraft/src/FontMetadataSectionSerializer.func_110490_a(Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/src/FontMetadataSection;=|p_110490_1_,p_110490_2_,p_110490_3_
 net/minecraft/src/FontRenderer.<init>(Lnet/minecraft/src/GameSettings;Lnet/minecraft/src/ResourceLocation;Lnet/minecraft/src/TextureManager;Z)V=|p_i1035_1_,p_i1035_2_,p_i1035_3_,p_i1035_4_
+net/minecraft/src/FontRenderer.func_110549_a(Lnet/minecraft/src/ResourceManager;)V=|p_110549_1_
 net/minecraft/src/FontRenderer.func_111271_a(I)Lnet/minecraft/src/ResourceLocation;=|p_111271_1_
 net/minecraft/src/FontRenderer.func_111272_d()V=|
 net/minecraft/src/FontRenderer.func_78255_a(Ljava/lang/String;Z)V=|p_78255_1_,p_78255_2_
@@ -6050,7 +6064,6 @@ net/minecraft/src/FontRenderer.func_78282_e(Ljava/lang/String;)Ljava/lang/String
 net/minecraft/src/FontRenderer.func_78283_c(Ljava/lang/String;)Ljava/lang/String;=|p_78283_1_
 net/minecraft/src/FontRenderer.func_82883_a()Z=|
 net/minecraft/src/FontRenderer.func_85187_a(Ljava/lang/String;IIIZ)I=|p_85187_1_,p_85187_2_,p_85187_3_,p_85187_4_,p_85187_5_
-net/minecraft/src/FontRenderer.func_98304_a()V=|
 net/minecraft/src/FontRenderer.func_98306_d()V=|
 net/minecraft/src/FoodStats.<init>()V=|
 net/minecraft/src/FoodStats.func_75111_a(Lnet/minecraft/src/ItemFood;)V=|p_75111_1_
@@ -6615,12 +6628,12 @@ net/minecraft/src/GuiScreenBackupSelectionList.func_104086_b(I)Z=|p_104086_1_
 net/minecraft/src/GuiScreenBackupSelectionList.func_111246_b(IIIILnet/minecraft/src/Tessellator;)V=|p_111246_1_,p_111246_2_,p_111246_3_,p_111246_4_,p_111246_5_
 net/minecraft/src/GuiScreenBackupSelectionList.func_111247_a(Ljava/util/Date;)Ljava/lang/String;=|p_111247_1_
 net/minecraft/src/GuiScreenBackupSelectionList.func_111248_a(Ljava/lang/Long;)Ljava/lang/String;=|p_111248_1_
-net/minecraft/src/GuiScreenBackupSelectionList.func_77212_b()I=|
+net/minecraft/src/GuiScreenBackupSelectionList.func_130003_b()I=|
+net/minecraft/src/GuiScreenBackupSelectionList.func_130004_c()V=|
 net/minecraft/src/GuiScreenBackupSelectionList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiScreenBackupSelectionList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiScreenBackupSelectionList.func_77217_a()I=|
 net/minecraft/src/GuiScreenBackupSelectionList.func_77218_a(I)Z=|p_77218_1_
-net/minecraft/src/GuiScreenBackupSelectionList.func_77221_c()V=|
 net/minecraft/src/GuiScreenBook.<init>(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/ItemStack;Z)V=|p_i1080_1_,p_i1080_2_,p_i1080_3_
 net/minecraft/src/GuiScreenBook.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenBook.func_73866_w_()V=|
@@ -6757,12 +6770,12 @@ net/minecraft/src/GuiScreenMcoWorldTemplateDownloadThread.run()V=|
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.<init>(Lnet/minecraft/src/GuiScreenMcoWorldTemplate;)V=|p_i1114_1_
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_104086_b(I)Z=|p_104086_1_
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_111244_b(IIIILnet/minecraft/src/Tessellator;)V=|p_111244_1_,p_111244_2_,p_111244_3_,p_111244_4_,p_111244_5_
-net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_77212_b()I=|
+net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_130003_b()I=|
+net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_130004_c()V=|
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_77217_a()I=|
 net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_77218_a(I)Z=|p_77218_1_
-net/minecraft/src/GuiScreenMcoWorldTemplateSelectionList.func_77221_c()V=|
 net/minecraft/src/GuiScreenOnlineServers.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i1123_1_
 net/minecraft/src/GuiScreenOnlineServers.func_101001_e(IIII)V=|p_101001_1_,p_101001_2_,p_101001_3_,p_101001_4_
 net/minecraft/src/GuiScreenOnlineServers.func_101006_d(IIII)V=|p_101006_1_,p_101006_2_,p_101006_3_,p_101006_4_
@@ -6785,24 +6798,20 @@ net/minecraft/src/GuiScreenOnlineServers.func_140015_g(Lnet/minecraft/src/GuiScr
 net/minecraft/src/GuiScreenOnlineServers.func_140017_d(Lnet/minecraft/src/GuiScreenOnlineServers;)V=|p_140017_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140019_s()V=|
 net/minecraft/src/GuiScreenOnlineServers.func_140020_c(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_140020_0_,p_140020_1_,p_140020_2_,p_140020_3_,p_140020_4_
-net/minecraft/src/GuiScreenOnlineServers.func_140022_t(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/Minecraft;=|p_140022_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140023_k(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_140023_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140024_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_140024_0_,p_140024_1_
-net/minecraft/src/GuiScreenOnlineServers.func_140025_q(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_140025_0_
-net/minecraft/src/GuiScreenOnlineServers.func_140026_a(Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String;=|p_140026_0_,p_140026_1_
 net/minecraft/src/GuiScreenOnlineServers.func_140027_d(Lnet/minecraft/src/GuiScreenOnlineServers;J)I=|p_140027_0_,p_140027_1_
-net/minecraft/src/GuiScreenOnlineServers.func_140028_s(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_140028_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140030_b(J)Lnet/minecraft/src/McoServer;=|p_140030_1_
 net/minecraft/src/GuiScreenOnlineServers.func_140031_a(Lnet/minecraft/src/GuiScreenOnlineServers;IIIII)V=|p_140031_0_,p_140031_1_,p_140031_2_,p_140031_3_,p_140031_4_,p_140031_5_
 net/minecraft/src/GuiScreenOnlineServers.func_140032_e(J)V=|p_140032_1_
 net/minecraft/src/GuiScreenOnlineServers.func_140033_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/GuiButton;=|p_140033_0_
-net/minecraft/src/GuiScreenOnlineServers.func_140034_r(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_140034_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140035_b(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_140035_0_,p_140035_1_,p_140035_2_,p_140035_3_,p_140035_4_
 net/minecraft/src/GuiScreenOnlineServers.func_140036_b(Lnet/minecraft/src/GuiScreenOnlineServers;J)J=|p_140036_0_,p_140036_1_
 net/minecraft/src/GuiScreenOnlineServers.func_140037_f(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/Minecraft;=|p_140037_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140038_h(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/GuiButton;=|p_140038_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140039_m(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_140039_0_
 net/minecraft/src/GuiScreenOnlineServers.func_140041_a(Lnet/minecraft/src/GuiScreenOnlineServers;)J=|p_140041_0_
+net/minecraft/src/GuiScreenOnlineServers.func_142023_q(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/Minecraft;=|p_142023_0_
 net/minecraft/src/GuiScreenOnlineServers.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenOnlineServers.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiScreenOnlineServers.func_73866_w_()V=|
@@ -6856,13 +6865,13 @@ net/minecraft/src/GuiScreenPendingInvitationINNER3.<init>(Lnet/minecraft/src/Gui
 net/minecraft/src/GuiScreenPendingInvitationINNER3.run()V=|
 net/minecraft/src/GuiScreenPendingInvitationList.<init>(Lnet/minecraft/src/GuiScreenPendingInvitation;)V=|p_i1128_1_
 net/minecraft/src/GuiScreenPendingInvitationList.func_104086_b(I)Z=|p_104086_1_
+net/minecraft/src/GuiScreenPendingInvitationList.func_130003_b()I=|
+net/minecraft/src/GuiScreenPendingInvitationList.func_130004_c()V=|
 net/minecraft/src/GuiScreenPendingInvitationList.func_130119_b(IIIILnet/minecraft/src/Tessellator;)V=|p_130119_1_,p_130119_2_,p_130119_3_,p_130119_4_,p_130119_5_
-net/minecraft/src/GuiScreenPendingInvitationList.func_77212_b()I=|
 net/minecraft/src/GuiScreenPendingInvitationList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiScreenPendingInvitationList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiScreenPendingInvitationList.func_77217_a()I=|
 net/minecraft/src/GuiScreenPendingInvitationList.func_77218_a(I)Z=|p_77218_1_
-net/minecraft/src/GuiScreenPendingInvitationList.func_77221_c()V=|
 net/minecraft/src/GuiScreenResetWorld.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/McoServer;)V=|p_i1135_1_,p_i1135_2_
 net/minecraft/src/GuiScreenResetWorld.func_110354_a(Ljava/lang/Object;)V=|p_110354_1_
 net/minecraft/src/GuiScreenResetWorld.func_110358_a(Lnet/minecraft/src/WorldTemplate;)V=|p_110358_1_
@@ -6889,14 +6898,14 @@ net/minecraft/src/GuiScreenSelectLocation.func_104088_a(IILnet/minecraft/src/Tes
 net/minecraft/src/GuiScreenSelectLocation.func_104089_a(II)V=|p_104089_1_,p_104089_2_
 net/minecraft/src/GuiScreenSelectLocation.func_104090_g()I=|
 net/minecraft/src/GuiScreenSelectLocation.func_104091_h()V=|
+net/minecraft/src/GuiScreenSelectLocation.func_130003_b()I=|
+net/minecraft/src/GuiScreenSelectLocation.func_130004_c()V=|
 net/minecraft/src/GuiScreenSelectLocation.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenSelectLocation.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiScreenSelectLocation.func_77212_b()I=|
 net/minecraft/src/GuiScreenSelectLocation.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiScreenSelectLocation.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiScreenSelectLocation.func_77217_a()I=|
 net/minecraft/src/GuiScreenSelectLocation.func_77218_a(I)Z=|p_77218_1_
-net/minecraft/src/GuiScreenSelectLocation.func_77221_c()V=|
 net/minecraft/src/GuiScreenServerList.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/ServerData;)V=|p_i1031_1_,p_i1031_2_
 net/minecraft/src/GuiScreenServerList.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenServerList.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -7009,12 +7018,12 @@ net/minecraft/src/GuiSlotLanguage.func_77218_a(I)Z=|p_77218_1_
 net/minecraft/src/GuiSlotLanguage.func_77221_c()V=|
 net/minecraft/src/GuiSlotOnlineServerList.<init>(Lnet/minecraft/src/GuiScreenOnlineServers;)V=|p_i1122_1_
 net/minecraft/src/GuiSlotOnlineServerList.func_104086_b(I)Z=|p_104086_1_
-net/minecraft/src/GuiSlotOnlineServerList.func_77212_b()I=|
+net/minecraft/src/GuiSlotOnlineServerList.func_130003_b()I=|
+net/minecraft/src/GuiSlotOnlineServerList.func_130004_c()V=|
 net/minecraft/src/GuiSlotOnlineServerList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotOnlineServerList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotOnlineServerList.func_77217_a()I=|
 net/minecraft/src/GuiSlotOnlineServerList.func_77218_a(I)Z=|p_77218_1_
-net/minecraft/src/GuiSlotOnlineServerList.func_77221_c()V=|
 net/minecraft/src/GuiSlotOnlineServerList.func_96292_b(IIIILnet/minecraft/src/Tessellator;)V=|p_96292_1_,p_96292_2_,p_96292_3_,p_96292_4_,p_96292_5_
 net/minecraft/src/GuiSlotOnlineServerList.func_96293_a(IIILnet/minecraft/src/McoServer;)V=|p_96293_1_,p_96293_2_,p_96293_3_,p_96293_4_
 net/minecraft/src/GuiSlotServer.<init>(Lnet/minecraft/src/GuiMultiplayer;)V=|p_i1039_1_
@@ -8190,6 +8199,7 @@ net/minecraft/src/MapGenStronghold.func_75047_a(II)Z=|p_75047_1_,p_75047_2_
 net/minecraft/src/MapGenStronghold.func_75049_b(II)Lnet/minecraft/src/StructureStart;=|p_75049_1_,p_75049_2_
 net/minecraft/src/MapGenStronghold.func_75052_o_()Ljava/util/List;=|
 net/minecraft/src/MapGenStructure.<init>()V=|
+net/minecraft/src/MapGenStructure.func_142038_b(III)Z=|p_142038_1_,p_142038_2_,p_142038_3_
 net/minecraft/src/MapGenStructure.func_75037_a(Lnet/minecraft/src/World;IIII[B)V=|p_75037_1_,p_75037_2_,p_75037_3_,p_75037_4_,p_75037_5_,p_75037_6_
 net/minecraft/src/MapGenStructure.func_75047_a(II)Z=|p_75047_1_,p_75047_2_
 net/minecraft/src/MapGenStructure.func_75048_a(III)Z=|p_75048_1_,p_75048_2_,p_75048_3_
@@ -8405,6 +8415,7 @@ net/minecraft/src/Minecraft.func_110439_b(Ljava/io/File;)Ljava/nio/ByteBuffer;=j
 net/minecraft/src/Minecraft.func_110441_Q()V=org/lwjgl/LWJGLException|
 net/minecraft/src/Minecraft.func_110442_L()Lnet/minecraft/src/ResourceManager;=|
 net/minecraft/src/Minecraft.func_135016_M()Lnet/minecraft/src/LanguageManager;=|
+net/minecraft/src/Minecraft.func_142024_b(Lnet/minecraft/src/Minecraft;)Lnet/minecraft/src/LanguageManager;=|p_142024_0_
 net/minecraft/src/Minecraft.func_70000_a(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70000_1_
 net/minecraft/src/Minecraft.func_70001_b(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70001_1_
 net/minecraft/src/Minecraft.func_70002_Q()Z=|
@@ -8457,17 +8468,20 @@ net/minecraft/src/Minecraft.func_98033_al()Lnet/minecraft/src/ILogAgent;=|
 net/minecraft/src/Minecraft.run()V=|
 net/minecraft/src/MinecraftError.<init>()V=|
 net/minecraft/src/MinecraftException.<init>(Ljava/lang/String;)V=|p_i1955_1_
-net/minecraft/src/MinecraftServerGui.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2342_1_
+net/minecraft/src/MinecraftINNER13.<init>(Lnet/minecraft/src/Minecraft;)V=|p_i2341_1_
+net/minecraft/src/MinecraftINNER13.call()Ljava/lang/Object;=|
+net/minecraft/src/MinecraftINNER13.func_142055_a()Ljava/lang/String;=|
+net/minecraft/src/MinecraftServerGui.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2362_1_
 net/minecraft/src/MinecraftServerGui.func_120016_a(Lnet/minecraft/src/DedicatedServer;)V=|p_120016_0_
 net/minecraft/src/MinecraftServerGui.func_120017_a(Lnet/minecraft/src/MinecraftServerGui;)Lnet/minecraft/src/DedicatedServer;=|p_120017_0_
 net/minecraft/src/MinecraftServerGui.func_120018_d()Ljavax/swing/JComponent;=|
 net/minecraft/src/MinecraftServerGui.func_120019_b()Ljavax/swing/JComponent;=|
 net/minecraft/src/MinecraftServerGui.func_120020_c()Ljavax/swing/JComponent;=|
-net/minecraft/src/MinecraftServerGuiINNER1.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2343_1_
+net/minecraft/src/MinecraftServerGuiINNER1.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2363_1_
 net/minecraft/src/MinecraftServerGuiINNER1.windowClosing(Ljava/awt/event/WindowEvent;)V=|p_windowClosing_1_
-net/minecraft/src/MinecraftServerGuiINNER2.<init>(Lnet/minecraft/src/MinecraftServerGui;Ljavax/swing/JTextField;)V=|p_i2344_1_,p_i2344_2_
+net/minecraft/src/MinecraftServerGuiINNER2.<init>(Lnet/minecraft/src/MinecraftServerGui;Ljavax/swing/JTextField;)V=|p_i2364_1_,p_i2364_2_
 net/minecraft/src/MinecraftServerGuiINNER2.actionPerformed(Ljava/awt/event/ActionEvent;)V=|p_actionPerformed_1_
-net/minecraft/src/MinecraftServerGuiINNER3.<init>(Lnet/minecraft/src/MinecraftServerGui;)V=|p_i2345_1_
+net/minecraft/src/MinecraftServerGuiINNER3.<init>(Lnet/minecraft/src/MinecraftServerGui;)V=|p_i2365_1_
 net/minecraft/src/MinecraftServerGuiINNER3.focusGained(Ljava/awt/event/FocusEvent;)V=|p_focusGained_1_
 net/minecraft/src/MobSpawnerBaseLogic.<init>()V=|
 net/minecraft/src/MobSpawnerBaseLogic.func_98265_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/Entity;=|p_98265_1_
@@ -8647,6 +8661,7 @@ net/minecraft/src/ModifiableAttributeInstance.func_111128_a(D)V=|p_111128_1_
 net/minecraft/src/ModifiableAttributeInstance.func_111129_g()D=|
 net/minecraft/src/ModifiableAttributeInstance.func_111130_a(I)Ljava/util/Collection;=|p_111130_1_
 net/minecraft/src/ModifiableAttributeInstance.func_111131_f()V=|
+net/minecraft/src/ModifiableAttributeInstance.func_142049_d()V=|
 net/minecraft/src/MouseFilter.<init>()V=|
 net/minecraft/src/MouseFilter.func_76333_a(FF)F=|p_76333_1_,p_76333_2_
 net/minecraft/src/MouseHelper.<init>()V=|
@@ -8817,6 +8832,7 @@ net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/src/Minecraft;Ljava/lan
 net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/src/Minecraft;Ljava/lang/String;ILnet/minecraft/src/GuiScreen;)V=java/io/IOException|p_i1177_1_,p_i1177_2_,p_i1177_3_,p_i1177_4_
 net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/src/Minecraft;Lnet/minecraft/src/IntegratedServer;)V=java/io/IOException|p_i1178_1_,p_i1178_2_
 net/minecraft/src/NetClientHandler.func_110773_a(Lnet/minecraft/src/Packet44UpdateAttributes;)V=|p_110773_1_
+net/minecraft/src/NetClientHandler.func_142031_a(Lnet/minecraft/src/Packet133TileEditorOpen;)V=|p_142031_1_
 net/minecraft/src/NetClientHandler.func_72452_a(Lnet/minecraft/src/Packet42RemoveEntityEffect;)V=|p_72452_1_
 net/minecraft/src/NetClientHandler.func_72453_a(Lnet/minecraft/src/Packet56MapChunks;)V=|p_72453_1_
 net/minecraft/src/NetClientHandler.func_72454_a(Lnet/minecraft/src/Packet54PlayNoteBlock;)V=|p_72454_1_
@@ -8894,6 +8910,8 @@ net/minecraft/src/NetClientHandler.func_98182_a(Lnet/minecraft/src/Packet63World
 net/minecraft/src/NetHandler.<init>()V=|
 net/minecraft/src/NetHandler.func_110773_a(Lnet/minecraft/src/Packet44UpdateAttributes;)V=|p_110773_1_
 net/minecraft/src/NetHandler.func_110774_a(Lnet/minecraft/src/Packet27PlayerInput;)V=|p_110774_1_
+net/minecraft/src/NetHandler.func_142031_a(Lnet/minecraft/src/Packet133TileEditorOpen;)V=|p_142031_1_
+net/minecraft/src/NetHandler.func_142032_c()Z=|
 net/minecraft/src/NetHandler.func_72452_a(Lnet/minecraft/src/Packet42RemoveEntityEffect;)V=|p_72452_1_
 net/minecraft/src/NetHandler.func_72453_a(Lnet/minecraft/src/Packet56MapChunks;)V=|p_72453_1_
 net/minecraft/src/NetHandler.func_72454_a(Lnet/minecraft/src/Packet54PlayNoteBlock;)V=|p_72454_1_
@@ -8972,6 +8990,7 @@ net/minecraft/src/NetHandler.func_96437_a(Lnet/minecraft/src/Packet207SetScore;)
 net/minecraft/src/NetHandler.func_96438_a(Lnet/minecraft/src/Packet208SetDisplayObjective;)V=|p_96438_1_
 net/minecraft/src/NetHandler.func_98182_a(Lnet/minecraft/src/Packet63WorldParticles;)V=|p_98182_1_
 net/minecraft/src/NetLoginHandler.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/Socket;Ljava/lang/String;)V=java/io/IOException|p_i1527_1_,p_i1527_2_,p_i1527_3_
+net/minecraft/src/NetLoginHandler.func_142032_c()Z=|
 net/minecraft/src/NetLoginHandler.func_72455_a(Lnet/minecraft/src/Packet1Login;)V=|p_72455_1_
 net/minecraft/src/NetLoginHandler.func_72458_a(Lnet/minecraft/src/Packet205ClientCommand;)V=|p_72458_1_
 net/minecraft/src/NetLoginHandler.func_72467_a(Lnet/minecraft/src/Packet254ServerPing;)V=|p_72467_1_
@@ -8991,6 +9010,7 @@ net/minecraft/src/NetLoginHandler.func_72532_c()V=|
 net/minecraft/src/NetLoginHandler.func_72533_d(Lnet/minecraft/src/NetLoginHandler;)Ljava/lang/String;=|p_72533_0_
 net/minecraft/src/NetServerHandler.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/INetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V=|p_i1530_1_,p_i1530_2_,p_i1530_3_
 net/minecraft/src/NetServerHandler.func_110774_a(Lnet/minecraft/src/Packet27PlayerInput;)V=|p_110774_1_
+net/minecraft/src/NetServerHandler.func_142032_c()Z=|
 net/minecraft/src/NetServerHandler.func_72458_a(Lnet/minecraft/src/Packet205ClientCommand;)V=|p_72458_1_
 net/minecraft/src/NetServerHandler.func_72461_a(Lnet/minecraft/src/Packet203AutoComplete;)V=|p_72461_1_
 net/minecraft/src/NetServerHandler.func_72464_a(Lnet/minecraft/src/Packet107CreativeSetSlot;)V=|p_72464_1_
@@ -9195,6 +9215,12 @@ net/minecraft/src/Packet132TileEntityData.func_73267_a(Ljava/io/DataInput;)V=jav
 net/minecraft/src/Packet132TileEntityData.func_73273_a(Ljava/io/DataOutput;)V=java/io/IOException|p_73273_1_
 net/minecraft/src/Packet132TileEntityData.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_
 net/minecraft/src/Packet132TileEntityData.func_73284_a()I=|
+net/minecraft/src/Packet133TileEditorOpen.<init>()V=|
+net/minecraft/src/Packet133TileEditorOpen.<init>(IIII)V=|p_i2345_1_,p_i2345_2_,p_i2345_3_,p_i2345_4_
+net/minecraft/src/Packet133TileEditorOpen.func_73267_a(Ljava/io/DataInput;)V=java/io/IOException|p_73267_1_
+net/minecraft/src/Packet133TileEditorOpen.func_73273_a(Ljava/io/DataOutput;)V=java/io/IOException|p_73273_1_
+net/minecraft/src/Packet133TileEditorOpen.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_
+net/minecraft/src/Packet133TileEditorOpen.func_73284_a()I=|
 net/minecraft/src/Packet13PlayerLookMove.<init>()V=|
 net/minecraft/src/Packet13PlayerLookMove.<init>(DDDDFFZ)V=|p_i1446_1_,p_i1446_3_,p_i1446_5_,p_i1446_7_,p_i1446_9_,p_i1446_10_,p_i1446_11_
 net/minecraft/src/Packet13PlayerLookMove.func_73267_a(Ljava/io/DataInput;)V=java/io/IOException|p_73267_1_
@@ -9551,11 +9577,15 @@ net/minecraft/src/Packet43Experience.func_73284_a()I=|
 net/minecraft/src/Packet44UpdateAttributes.<init>()V=|
 net/minecraft/src/Packet44UpdateAttributes.<init>(ILjava/util/Collection;)V=|p_i1486_1_,p_i1486_2_
 net/minecraft/src/Packet44UpdateAttributes.func_111002_d()I=|
-net/minecraft/src/Packet44UpdateAttributes.func_111003_f()Ljava/util/Map;=|
+net/minecraft/src/Packet44UpdateAttributes.func_111003_f()Ljava/util/List;=|
 net/minecraft/src/Packet44UpdateAttributes.func_73267_a(Ljava/io/DataInput;)V=java/io/IOException|p_73267_1_
 net/minecraft/src/Packet44UpdateAttributes.func_73273_a(Ljava/io/DataOutput;)V=java/io/IOException|p_73273_1_
 net/minecraft/src/Packet44UpdateAttributes.func_73279_a(Lnet/minecraft/src/NetHandler;)V=|p_73279_1_
 net/minecraft/src/Packet44UpdateAttributes.func_73284_a()I=|
+net/minecraft/src/Packet44UpdateAttributesSnapshot.<init>(Lnet/minecraft/src/Packet44UpdateAttributes;Ljava/lang/String;DLjava/util/Collection;)V=|p_i2346_1_,p_i2346_2_,p_i2346_3_,p_i2346_5_
+net/minecraft/src/Packet44UpdateAttributesSnapshot.func_142039_c()Ljava/util/Collection;=|
+net/minecraft/src/Packet44UpdateAttributesSnapshot.func_142040_a()Ljava/lang/String;=|
+net/minecraft/src/Packet44UpdateAttributesSnapshot.func_142041_b()D=|
 net/minecraft/src/Packet4UpdateTime.<init>()V=|
 net/minecraft/src/Packet4UpdateTime.<init>(JJZ)V=|p_i1476_1_,p_i1476_3_,p_i1476_5_
 net/minecraft/src/Packet4UpdateTime.func_73267_a(Ljava/io/DataInput;)V=java/io/IOException|p_73267_1_
@@ -9828,7 +9858,7 @@ net/minecraft/src/PlayerInstance.func_73256_a(Lnet/minecraft/src/Packet;)V=|p_73
 net/minecraft/src/PlayerInstance.func_73257_a(Lnet/minecraft/src/TileEntity;)V=|p_73257_1_
 net/minecraft/src/PlayerInstance.func_73258_b(Lnet/minecraft/src/PlayerInstance;)Ljava/util/List;=|p_73258_0_
 net/minecraft/src/PlayerInstance.func_73259_a(III)V=|p_73259_1_,p_73259_2_,p_73259_3_
-net/minecraft/src/PlayerListComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2346_1_
+net/minecraft/src/PlayerListComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2366_1_
 net/minecraft/src/PlayerListComponent.func_73660_a()V=|
 net/minecraft/src/PlayerManager.<init>(Lnet/minecraft/src/WorldServer;I)V=|p_i1519_1_,p_i1519_2_
 net/minecraft/src/PlayerManager.func_111191_d(Lnet/minecraft/src/PlayerManager;)Ljava/util/List;=|p_111191_0_
@@ -10048,16 +10078,6 @@ net/minecraft/src/RangedAttribute.<init>(Ljava/lang/String;DDD)V=|p_i1609_1_,p_i
 net/minecraft/src/RangedAttribute.func_111109_a(D)D=|p_111109_1_
 net/minecraft/src/RangedAttribute.func_111116_f()Ljava/lang/String;=|
 net/minecraft/src/RangedAttribute.func_111117_a(Ljava/lang/String;)Lnet/minecraft/src/RangedAttribute;=|p_111117_1_
-net/minecraft/src/ReadonlyAttributeInstance.<init>(Lnet/minecraft/src/Attribute;)V=|p_i1610_1_
-net/minecraft/src/ReadonlyAttributeInstance.func_111121_a(Lnet/minecraft/src/AttributeModifier;)V=|p_111121_1_
-net/minecraft/src/ReadonlyAttributeInstance.func_111122_c()Ljava/util/Collection;=|
-net/minecraft/src/ReadonlyAttributeInstance.func_111123_a()Lnet/minecraft/src/Attribute;=|
-net/minecraft/src/ReadonlyAttributeInstance.func_111124_b(Lnet/minecraft/src/AttributeModifier;)V=|p_111124_1_
-net/minecraft/src/ReadonlyAttributeInstance.func_111125_b()D=|
-net/minecraft/src/ReadonlyAttributeInstance.func_111126_e()D=|
-net/minecraft/src/ReadonlyAttributeInstance.func_111127_a(Ljava/util/UUID;)Lnet/minecraft/src/AttributeModifier;=|p_111127_1_
-net/minecraft/src/ReadonlyAttributeInstance.func_111128_a(D)V=|p_111128_1_
-net/minecraft/src/ReadonlyAttributeInstance.func_111140_b(D)V=|p_111140_1_
 net/minecraft/src/RecipeFireworks.<init>()V=|
 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_77570_a()I=|
@@ -10141,9 +10161,9 @@ net/minecraft/src/RenderArrow.func_76999_a(Lnet/minecraft/src/EntityArrow;DDDFF)
 net/minecraft/src/RenderBat.<init>()V=|
 net/minecraft/src/RenderBat.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation;=|p_110775_1_
 net/minecraft/src/RenderBat.func_110834_a(Lnet/minecraft/src/EntityBat;)Lnet/minecraft/src/ResourceLocation;=|p_110834_1_
+net/minecraft/src/RenderBat.func_130000_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_130000_1_,p_130000_2_,p_130000_4_,p_130000_6_,p_130000_8_,p_130000_9_
 net/minecraft/src/RenderBat.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_
 net/minecraft/src/RenderBat.func_77031_a(Lnet/minecraft/src/EntityLiving;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
-net/minecraft/src/RenderBat.func_77031_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RenderBat.func_77039_a(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77039_1_,p_77039_2_,p_77039_4_,p_77039_6_
 net/minecraft/src/RenderBat.func_77041_b(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77041_1_,p_77041_2_
 net/minecraft/src/RenderBat.func_77043_a(Lnet/minecraft/src/EntityLivingBase;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
@@ -10159,12 +10179,12 @@ net/minecraft/src/RenderBiped.func_110857_a(Lnet/minecraft/src/ItemArmor;I)Lnet/
 net/minecraft/src/RenderBiped.func_110858_a(Lnet/minecraft/src/ItemArmor;ILjava/lang/String;)Lnet/minecraft/src/ResourceLocation;=|p_110858_0_,p_110858_1_,p_110858_2_
 net/minecraft/src/RenderBiped.func_130005_c(Lnet/minecraft/src/EntityLiving;F)V=|p_130005_1_,p_130005_2_
 net/minecraft/src/RenderBiped.func_130006_a(Lnet/minecraft/src/EntityLiving;IF)I=|p_130006_1_,p_130006_2_,p_130006_3_
+net/minecraft/src/RenderBiped.func_130013_c(Lnet/minecraft/src/EntityLiving;IF)V=|p_130013_1_,p_130013_2_,p_130013_3_
 net/minecraft/src/RenderBiped.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_
 net/minecraft/src/RenderBiped.func_77029_c(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77029_1_,p_77029_2_
 net/minecraft/src/RenderBiped.func_77031_a(Lnet/minecraft/src/EntityLiving;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RenderBiped.func_77032_a(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
 net/minecraft/src/RenderBiped.func_77101_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
-net/minecraft/src/RenderBiped.func_82408_c(Lnet/minecraft/src/EntityLiving;IF)V=|p_82408_1_,p_82408_2_,p_82408_3_
 net/minecraft/src/RenderBiped.func_82420_a(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/ItemStack;)V=|p_82420_1_,p_82420_2_
 net/minecraft/src/RenderBiped.func_82421_b()V=|
 net/minecraft/src/RenderBiped.func_82422_c()V=|
@@ -10525,21 +10545,21 @@ net/minecraft/src/RenderPig.func_77099_a(Lnet/minecraft/src/EntityPig;IF)I=|p_77
 net/minecraft/src/RenderPlayer.<init>()V=|
 net/minecraft/src/RenderPlayer.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation;=|p_110775_1_
 net/minecraft/src/RenderPlayer.func_110817_a(Lnet/minecraft/src/AbstractClientPlayer;)Lnet/minecraft/src/ResourceLocation;=|p_110817_1_
+net/minecraft/src/RenderPlayer.func_130000_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_130000_1_,p_130000_2_,p_130000_4_,p_130000_6_,p_130000_8_,p_130000_9_
+net/minecraft/src/RenderPlayer.func_130009_a(Lnet/minecraft/src/AbstractClientPlayer;DDDFF)V=|p_130009_1_,p_130009_2_,p_130009_4_,p_130009_6_,p_130009_8_,p_130009_9_
+net/minecraft/src/RenderPlayer.func_130220_b(Lnet/minecraft/src/AbstractClientPlayer;IF)V=|p_130220_1_,p_130220_2_,p_130220_3_
 net/minecraft/src/RenderPlayer.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_
 net/minecraft/src/RenderPlayer.func_77029_c(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77029_1_,p_77029_2_
-net/minecraft/src/RenderPlayer.func_77031_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RenderPlayer.func_77032_a(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
 net/minecraft/src/RenderPlayer.func_77039_a(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77039_1_,p_77039_2_,p_77039_4_,p_77039_6_
 net/minecraft/src/RenderPlayer.func_77041_b(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77041_1_,p_77041_2_
 net/minecraft/src/RenderPlayer.func_77043_a(Lnet/minecraft/src/EntityLivingBase;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
 net/minecraft/src/RenderPlayer.func_77100_a(Lnet/minecraft/src/AbstractClientPlayer;F)V=|p_77100_1_,p_77100_2_
-net/minecraft/src/RenderPlayer.func_77101_a(Lnet/minecraft/src/AbstractClientPlayer;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
 net/minecraft/src/RenderPlayer.func_77102_a(Lnet/minecraft/src/AbstractClientPlayer;FFF)V=|p_77102_1_,p_77102_2_,p_77102_3_,p_77102_4_
 net/minecraft/src/RenderPlayer.func_77104_b(Lnet/minecraft/src/AbstractClientPlayer;F)V=|p_77104_1_,p_77104_2_
 net/minecraft/src/RenderPlayer.func_77105_b(Lnet/minecraft/src/AbstractClientPlayer;DDD)V=|p_77105_1_,p_77105_2_,p_77105_4_,p_77105_6_
 net/minecraft/src/RenderPlayer.func_77107_a(Lnet/minecraft/src/AbstractClientPlayer;IF)I=|p_77107_1_,p_77107_2_,p_77107_3_
 net/minecraft/src/RenderPlayer.func_82408_c(Lnet/minecraft/src/EntityLivingBase;IF)V=|p_82408_1_,p_82408_2_,p_82408_3_
-net/minecraft/src/RenderPlayer.func_82439_b(Lnet/minecraft/src/AbstractClientPlayer;IF)V=|p_82439_1_,p_82439_2_,p_82439_3_
 net/minecraft/src/RenderPlayer.func_82441_a(Lnet/minecraft/src/EntityPlayer;)V=|p_82441_1_
 net/minecraft/src/RenderPlayer.func_96449_a(Lnet/minecraft/src/EntityLivingBase;DDDLjava/lang/String;FD)V=|p_96449_1_,p_96449_2_,p_96449_4_,p_96449_6_,p_96449_8_,p_96449_9_,p_96449_10_
 net/minecraft/src/RenderPlayer.func_96450_a(Lnet/minecraft/src/AbstractClientPlayer;DDDLjava/lang/String;FD)V=|p_96450_1_,p_96450_2_,p_96450_4_,p_96450_6_,p_96450_8_,p_96450_9_,p_96450_10_
@@ -10688,10 +10708,10 @@ net/minecraft/src/RenderZombie.func_82429_a(Lnet/minecraft/src/EntityZombie;IF)I
 net/minecraft/src/RenderZombie.func_82430_a(Lnet/minecraft/src/EntityZombie;FFF)V=|p_82430_1_,p_82430_2_,p_82430_3_,p_82430_4_
 net/minecraft/src/RendererLivingEntity.<init>(Lnet/minecraft/src/ModelBase;F)V=|p_i1261_1_,p_i1261_2_
 net/minecraft/src/RendererLivingEntity.func_110813_b(Lnet/minecraft/src/EntityLivingBase;)Z=|p_110813_1_
+net/minecraft/src/RendererLivingEntity.func_130000_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_130000_1_,p_130000_2_,p_130000_4_,p_130000_6_,p_130000_8_,p_130000_9_
 net/minecraft/src/RendererLivingEntity.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_
 net/minecraft/src/RendererLivingEntity.func_77029_c(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77029_1_,p_77029_2_
 net/minecraft/src/RendererLivingEntity.func_77030_a(Lnet/minecraft/src/EntityLivingBase;FF)I=|p_77030_1_,p_77030_2_,p_77030_3_
-net/minecraft/src/RendererLivingEntity.func_77031_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RendererLivingEntity.func_77032_a(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
 net/minecraft/src/RendererLivingEntity.func_77033_b(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77033_1_,p_77033_2_,p_77033_4_,p_77033_6_
 net/minecraft/src/RendererLivingEntity.func_77034_a(FFF)F=|p_77034_1_,p_77034_2_,p_77034_3_
@@ -10869,6 +10889,7 @@ net/minecraft/src/ScoreObjectiveCriteria.func_96635_a(Ljava/util/List;)I=|p_9663
 net/minecraft/src/ScoreObjectiveCriteria.func_96636_a()Ljava/lang/String;=|
 net/minecraft/src/ScoreObjectiveCriteria.func_96637_b()Z=|
 net/minecraft/src/ScorePlayerTeam.<init>(Lnet/minecraft/src/Scoreboard;Ljava/lang/String;)V=|p_i2308_1_,p_i2308_2_
+net/minecraft/src/ScorePlayerTeam.func_142053_d(Ljava/lang/String;)Ljava/lang/String;=|p_142053_1_
 net/minecraft/src/ScorePlayerTeam.func_96660_a(Z)V=|p_96660_1_
 net/minecraft/src/ScorePlayerTeam.func_96661_b()Ljava/lang/String;=|
 net/minecraft/src/ScorePlayerTeam.func_96662_c(Ljava/lang/String;)V=|p_96662_1_
@@ -10876,7 +10897,7 @@ net/minecraft/src/ScorePlayerTeam.func_96663_f()Ljava/lang/String;=|
 net/minecraft/src/ScorePlayerTeam.func_96664_a(Ljava/lang/String;)V=|p_96664_1_
 net/minecraft/src/ScorePlayerTeam.func_96665_g()Z=|
 net/minecraft/src/ScorePlayerTeam.func_96666_b(Ljava/lang/String;)V=|p_96666_1_
-net/minecraft/src/ScorePlayerTeam.func_96667_a(Lnet/minecraft/src/ScorePlayerTeam;Ljava/lang/String;)Ljava/lang/String;=|p_96667_0_,p_96667_1_
+net/minecraft/src/ScorePlayerTeam.func_96667_a(Lnet/minecraft/src/Team;Ljava/lang/String;)Ljava/lang/String;=|p_96667_0_,p_96667_1_
 net/minecraft/src/ScorePlayerTeam.func_96668_e()Ljava/lang/String;=|
 net/minecraft/src/ScorePlayerTeam.func_96669_c()Ljava/lang/String;=|
 net/minecraft/src/ScorePlayerTeam.func_96670_d()Ljava/util/Collection;=|
@@ -11324,12 +11345,12 @@ net/minecraft/src/StatTypeSimple.<init>()V=|
 net/minecraft/src/StatTypeSimple.func_75843_a(I)Ljava/lang/String;=|p_75843_1_
 net/minecraft/src/StatTypeTime.<init>()V=|
 net/minecraft/src/StatTypeTime.func_75843_a(I)Ljava/lang/String;=|p_75843_1_
-net/minecraft/src/StatsComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2347_1_
+net/minecraft/src/StatsComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2367_1_
 net/minecraft/src/StatsComponent.func_120033_a(Lnet/minecraft/src/StatsComponent;)V=|p_120033_0_
 net/minecraft/src/StatsComponent.func_120034_a()V=|
 net/minecraft/src/StatsComponent.func_120035_a([J)D=|p_120035_1_
 net/minecraft/src/StatsComponent.paint(Ljava/awt/Graphics;)V=|p_paint_1_
-net/minecraft/src/StatsComponentINNER1.<init>(Lnet/minecraft/src/StatsComponent;)V=|p_i2348_1_
+net/minecraft/src/StatsComponentINNER1.<init>(Lnet/minecraft/src/StatsComponent;)V=|p_i2368_1_
 net/minecraft/src/StatsComponentINNER1.actionPerformed(Ljava/awt/event/ActionEvent;)V=|p_actionPerformed_1_
 net/minecraft/src/StatsSyncher.<init>(Lnet/minecraft/src/Session;Lnet/minecraft/src/StatFileWriter;Ljava/io/File;)V=|p_i1335_1_,p_i1335_2_,p_i1335_3_
 net/minecraft/src/StatsSyncher.func_77406_a(Lnet/minecraft/src/StatsSyncher;Z)Z=|p_77406_0_,p_77406_1_
@@ -11394,7 +11415,7 @@ net/minecraft/src/Stitcher.func_94308_a(I)I=|p_94308_1_
 net/minecraft/src/Stitcher.func_94309_g()Ljava/util/List;=|
 net/minecraft/src/Stitcher.func_94310_b(Lnet/minecraft/src/StitchHolder;)Z=|p_94310_1_
 net/minecraft/src/Stitcher.func_94311_c(Lnet/minecraft/src/StitchHolder;)Z=|p_94311_1_
-net/minecraft/src/StitcherException.<init>(Lnet/minecraft/src/StitchHolder;)V=|p_i1280_1_
+net/minecraft/src/StitcherException.<init>(Lnet/minecraft/src/StitchHolder;Ljava/lang/String;)V=|p_i2344_1_,p_i2344_2_
 net/minecraft/src/StringTranslate.<init>()V=|
 net/minecraft/src/StringTranslate.func_135063_a(Ljava/util/Map;)V=|p_135063_0_
 net/minecraft/src/StringTranslate.func_135064_c(Ljava/lang/String;)Ljava/lang/String;=|p_135064_1_
@@ -11561,6 +11582,12 @@ net/minecraft/src/TcpReaderThread.<init>(Lnet/minecraft/src/TcpConnection;Ljava/
 net/minecraft/src/TcpReaderThread.run()V=|
 net/minecraft/src/TcpWriterThread.<init>(Lnet/minecraft/src/TcpConnection;Ljava/lang/String;)V=|p_i1394_1_,p_i1394_2_
 net/minecraft/src/TcpWriterThread.run()V=|
+net/minecraft/src/Team.<init>()V=|
+net/minecraft/src/Team.func_142053_d(Ljava/lang/String;)Ljava/lang/String;=|p_142053_1_
+net/minecraft/src/Team.func_142054_a(Lnet/minecraft/src/Team;)Z=|p_142054_1_
+net/minecraft/src/Team.func_96661_b()Ljava/lang/String;=|
+net/minecraft/src/Team.func_96665_g()Z=|
+net/minecraft/src/Team.func_98297_h()Z=|
 net/minecraft/src/Teleporter.<init>(Lnet/minecraft/src/WorldServer;)V=|p_i1963_1_
 net/minecraft/src/Teleporter.func_77184_b(Lnet/minecraft/src/Entity;DDDF)Z=|p_77184_1_,p_77184_2_,p_77184_4_,p_77184_6_,p_77184_8_
 net/minecraft/src/Teleporter.func_77185_a(Lnet/minecraft/src/Entity;DDDF)V=|p_77185_1_,p_77185_2_,p_77185_4_,p_77185_6_,p_77185_8_
@@ -11585,11 +11612,11 @@ net/minecraft/src/Tessellator.func_78383_c()V=|
 net/minecraft/src/Tessellator.func_78384_a(II)V=|p_78384_1_,p_78384_2_
 net/minecraft/src/Tessellator.func_78385_a(DD)V=|p_78385_1_,p_78385_3_
 net/minecraft/src/Tessellator.func_78386_a(FFF)V=|p_78386_1_,p_78386_2_,p_78386_3_
-net/minecraft/src/TextAreaLogHandler.<init>(Ljavax/swing/JTextArea;)V=|p_i2349_1_
+net/minecraft/src/TextAreaLogHandler.<init>(Ljavax/swing/JTextArea;)V=|p_i2369_1_
 net/minecraft/src/TextAreaLogHandler.close()V=|
 net/minecraft/src/TextAreaLogHandler.flush()V=|
 net/minecraft/src/TextAreaLogHandler.publish(Ljava/util/logging/LogRecord;)V=|p_publish_1_
-net/minecraft/src/TextAreaLogHandlerINNER1.<init>(Lnet/minecraft/src/TextAreaLogHandler;)V=|p_i2350_1_
+net/minecraft/src/TextAreaLogHandlerINNER1.<init>(Lnet/minecraft/src/TextAreaLogHandler;)V=|p_i2370_1_
 net/minecraft/src/TextAreaLogHandlerINNER1.format(Ljava/util/logging/LogRecord;)Ljava/lang/String;=|p_format_1_
 net/minecraft/src/TextureAtlasSprite.<init>(Ljava/lang/String;)V=|p_i1282_1_
 net/minecraft/src/TextureAtlasSprite.func_110965_a(I)[I=|p_110965_1_
@@ -11680,7 +11707,7 @@ net/minecraft/src/ThreadConnectToOnlineServer.<init>(Lnet/minecraft/src/GuiSlotO
 net/minecraft/src/ThreadConnectToOnlineServer.run()V=|
 net/minecraft/src/ThreadConnectToServer.<init>(Lnet/minecraft/src/GuiConnecting;Ljava/lang/String;I)V=|p_i1180_1_,p_i1180_2_,p_i1180_3_
 net/minecraft/src/ThreadConnectToServer.run()V=|
-net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2341_1_
+net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2361_1_
 net/minecraft/src/ThreadDedicatedServer.run()V=|
 net/minecraft/src/ThreadDownloadImageData.<init>(Ljava/lang/String;Lnet/minecraft/src/ResourceLocation;Lnet/minecraft/src/IImageBuffer;)V=|p_i1273_1_,p_i1273_2_,p_i1273_3_
 net/minecraft/src/ThreadDownloadImageData.func_110551_a(Lnet/minecraft/src/ResourceManager;)V=java/io/IOException|p_110551_1_
@@ -11798,6 +11825,7 @@ net/minecraft/src/TileEntityBrewingStand.func_94042_c()Z=|
 net/minecraft/src/TileEntityBrewingStand.func_94128_d(I)[I=|p_94128_1_
 net/minecraft/src/TileEntityBrewingStand.func_94131_a(Ljava/lang/String;)V=|p_94131_1_
 net/minecraft/src/TileEntityChest.<init>()V=|
+net/minecraft/src/TileEntityChest.<init>(I)V=|p_i2350_1_
 net/minecraft/src/TileEntityChest.func_70295_k_()V=|
 net/minecraft/src/TileEntityChest.func_70297_j_()I=|
 net/minecraft/src/TileEntityChest.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
@@ -12006,6 +12034,8 @@ net/minecraft/src/TileEntityRendererPiston.func_76894_a(Lnet/minecraft/src/TileE
 net/minecraft/src/TileEntityRendererPiston.func_76896_a(Lnet/minecraft/src/World;)V=|p_76896_1_
 net/minecraft/src/TileEntityRendererPiston.func_76903_a(Lnet/minecraft/src/TileEntityPiston;DDDF)V=|p_76903_1_,p_76903_2_,p_76903_4_,p_76903_6_,p_76903_8_
 net/minecraft/src/TileEntitySign.<init>()V=|
+net/minecraft/src/TileEntitySign.func_142009_b()Lnet/minecraft/src/EntityPlayer;=|
+net/minecraft/src/TileEntitySign.func_142010_a(Lnet/minecraft/src/EntityPlayer;)V=|p_142010_1_
 net/minecraft/src/TileEntitySign.func_70307_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70307_1_
 net/minecraft/src/TileEntitySign.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_
 net/minecraft/src/TileEntitySign.func_70319_e()Lnet/minecraft/src/Packet;=|
@@ -12387,6 +12417,7 @@ net/minecraft/src/WorldChunkManagerHell.func_76937_a([Lnet/minecraft/src/BiomeGe
 net/minecraft/src/WorldChunkManagerHell.func_76940_a(IIILjava/util/List;)Z=|p_76940_1_,p_76940_2_,p_76940_3_,p_76940_4_
 net/minecraft/src/WorldChunkManagerHell.func_76941_a(IIILjava/util/List;Ljava/util/Random;)Lnet/minecraft/src/ChunkPosition;=|p_76941_1_,p_76941_2_,p_76941_3_,p_76941_4_,p_76941_5_
 net/minecraft/src/WorldClient.<init>(Lnet/minecraft/src/NetClientHandler;Lnet/minecraft/src/WorldSettings;IILnet/minecraft/src/Profiler;Lnet/minecraft/src/ILogAgent;)V=|p_i1188_1_,p_i1188_2_,p_i1188_3_,p_i1188_4_,p_i1188_5_,p_i1188_6_
+net/minecraft/src/WorldClient.func_142030_c(Lnet/minecraft/src/WorldClient;)Lnet/minecraft/src/Minecraft;=|p_142030_0_
 net/minecraft/src/WorldClient.func_72835_b()V=|
 net/minecraft/src/WorldClient.func_72838_d(Lnet/minecraft/src/Entity;)Z=|p_72838_1_
 net/minecraft/src/WorldClient.func_72847_b(Lnet/minecraft/src/Entity;)V=|p_72847_1_
@@ -12412,6 +12443,12 @@ net/minecraft/src/WorldClient.func_73045_a(I)Lnet/minecraft/src/Entity;=|p_73045
 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/WorldClient.func_96443_a(Lnet/minecraft/src/Scoreboard;)V=|p_96443_1_
+net/minecraft/src/WorldClientINNER3.<init>(Lnet/minecraft/src/WorldClient;)V=|p_i2342_1_
+net/minecraft/src/WorldClientINNER3.call()Ljava/lang/Object;=|
+net/minecraft/src/WorldClientINNER3.func_142026_a()Ljava/lang/String;=|
+net/minecraft/src/WorldClientINNER4.<init>(Lnet/minecraft/src/WorldClient;)V=|p_i2343_1_
+net/minecraft/src/WorldClientINNER4.call()Ljava/lang/Object;=|
+net/minecraft/src/WorldClientINNER4.func_142028_a()Ljava/lang/String;=|
 net/minecraft/src/WorldGenBigMushroom.<init>()V=|
 net/minecraft/src/WorldGenBigMushroom.<init>(I)V=|p_i2017_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_
@@ -12674,7 +12711,6 @@ net/minecraft/src/WorldServer.func_73045_a(I)Lnet/minecraft/src/Entity;=|p_73045
 net/minecraft/src/WorldServer.func_73046_m()Lnet/minecraft/server/MinecraftServer;=|
 net/minecraft/src/WorldServer.func_73047_i()V=|
 net/minecraft/src/WorldServer.func_73049_a(IIIIII)Ljava/util/List;=|p_73049_1_,p_73049_2_,p_73049_3_,p_73049_4_,p_73049_5_,p_73049_6_
-net/minecraft/src/WorldServer.func_73050_b(Lnet/minecraft/src/Entity;Z)V=|p_73050_1_,p_73050_2_
 net/minecraft/src/WorldServer.func_73051_P()V=|
 net/minecraft/src/WorldServer.func_73052_b(Lnet/minecraft/src/WorldSettings;)V=|p_73052_1_
 net/minecraft/src/WorldServer.func_73053_d()V=|

fml/conf/mcp.cfg

@@ -38,8 +38,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  = 3c56fb4b77b1ca37dde69b5eb896fc4d
-MD5Server  = ff8f81970a5955737c356b534d3aee96
+MD5Client  = 9356f3ad44925a684e918b9270b63a6c
+MD5Server  = 39df9f29e6904ea7b351ffb4fe949881
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -127,8 +127,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           = 140000
-ParamIndex        = 40000
+RGIndex           = 142000
+ParamIndex        = 42000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

fml/conf/methods.csv

@@ -7,7 +7,9 @@ func_100015_a,isKeyDown,0,Returns whether the specified key binding is currently
 func_102007_a,canInsertItem,2,"Returns true if automation can insert the given item in the given slot from the given side. Args: Slot, item, side"
 func_102008_b,canExtractItem,2,"Returns true if automation can extract the given item in the given slot from the given side. Args: Slot, item, side"
 func_102013_b,canExtractItemFromInventory,2,
+func_102015_a,canInsertItemToInventory,2,"Args: inventory, item, slot, side"
 func_102026_a,isBlockTopFacingSurfaceSolid,2,"Performs check to see if the block is a normal, solid block, or if the metadata of the block indicates that its facing puts its solid side upwards. (inverted stairs, for example)"
+func_102027_b,renderBlockWithAmbientOcclusion,0,"Renders non-full-cube block with ambient occusion.  Args: block, x, y, z, red, green, blue (lighting)"
 func_102028_d,isSplashPotionEffect,0,
 func_102028_d,isSplashPotionEffect,1,
 func_70000_a,addServerStatsToSnooper,2,
@@ -162,6 +164,7 @@ func_70305_f,closeChest,2,
 func_70306_a,addMapping,2,Adds a new two-way mapping between the class and its string name in both hashmaps.
 func_70307_a,readFromNBT,2,Reads a tile entity from NBT.
 func_70308_a,setWorldObj,2,Sets the worldObj for this tileEntity.
+func_70309_m,hasWorldObj,2,Returns true if the worldObj isn't null.
 func_70310_b,writeToNBT,2,Writes a tile entity to NBT.
 func_70311_o,getBlockType,2,Gets the block type at the location of this entity (client-only).
 func_70312_q,validate,2,validates a tile entity
@@ -264,6 +267,7 @@ func_70541_f,multipleParticleScaleBy,0,
 func_70542_f,getGreenColorF,0,
 func_70543_e,multiplyVelocity,0,
 func_70589_b,setBaseSpellTextureIndex,0,Sets the base spell texture index
+func_70596_a,applyColourMultiplier,0,"If the block has a colour multiplier, copies it to this particle and returns this particle."
 func_70598_b,setHomeArea,0,
 func_70598_b,setHomeArea,1,
 func_70599_aP,getSoundVolume,2,Returns the volume for the sounds this mob makes.
@@ -505,7 +509,8 @@ func_71018_a,sleepInBedAt,2,Attempts to have the player sleep in a bed at the sp
 func_71019_a,dropPlayerItemWithRandomChoice,2,"Args: itemstack, flag"
 func_71020_j,addExhaustion,2,increases exhaustion level by supplied amount
 func_71021_b,dropPlayerItem,2,Args: itemstack - called when player drops an item stack that's not in his inventory (like items still placed in a workbench while the workbench'es GUI gets closed)
-func_71022_a,alertWolves,2,"Called when the player attack or gets attacked, it's alert all wolves in the area that are owned by the player to join the attack or defend the player."
+func_71022_a,alertWolves,0,"Called when the player attack or gets attacked, it's alert all wolves in the area that are owned by the player to join the attack or defend the player."
+func_71022_a,alertWolves,1,"Called when the player attack or gets attacked, it's alert all wolves in the area that are owned by the player to join the attack or defend the player."
 func_71023_q,addExperience,2,This method increases the player's current amount of experience.
 func_71024_bL,getFoodStats,2,Returns the player's FoodStats object.
 func_71025_t,getTranslator,0,
@@ -564,7 +569,7 @@ func_71124_b,getCurrentItemOrArmor,2,"0 = item, 1-n is armor"
 func_71125_a,updateClientInfo,2,
 func_71126_v,getChatVisibility,2,
 func_71127_g,onUpdateEntity,2,
-func_71128_l,closeInventory,2,
+func_71128_l,closeContainer,2,Closes the container the player currently has open.
 func_71150_b,setHealth,0,Updates health locally.
 func_71151_f,getFOVMultiplier,0,Gets the player's field of view multiplier. (ex. when flying)
 func_71152_a,setXPStats,0,"Sets the current XP, total XP, and level number."
@@ -941,7 +946,7 @@ func_71907_b,setTickRandomly,2,Sets whether this block type will receive random
 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_71910_a,quantityDroppedWithBonus,2,Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive).
 func_71911_a_,getSelectedBoundingBoxFromPool,0,Returns the bounding box of the wired rectangular prism to render.
-func_71913_a,canCollideCheck,2,"Returns whether this block is collideable based on the arguments passed in Args: blockMetaData, unknownFlag"
+func_71913_a,canCollideCheck,2,Returns whether this block is collideable based on the arguments passed in \n@param par1 block metaData \n@param par2 whether the player right-clicked while holding a boat
 func_71914_a,dropBlockAsItemWithChance,2,Drops the block items with a specified chance of dropping the specified items
 func_71915_e,getMobilityFlag,2,"Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility and stop pistons"
 func_71916_a,isVecInsideYZBounds,2,Checks if a vector is within the Y and Z bounds of the block.
@@ -1328,9 +1333,10 @@ func_72677_b,getVolume,2,
 func_72678_c,getPitch,2,
 func_72682_c,getChunkWatchersWithPlayers,2,
 func_72683_a,addPlayer,2,Adds an EntityPlayerMP to the PlayerManager.
+func_72684_a,overlaps,2,"Determine if two rectangles centered at the given points overlap for the provided radius. Arguments: x1, z1, x2, z2, radius."
 func_72685_d,updateMountedMovingPlayer,2,"update chunks around a player being moved by server logic (e.g. cart, boat)"
 func_72686_a,getFurthestViewableBlock,2,Get the furthest viewable block given player's view distance
-func_72687_a,flagChunkForUpdate,2,"the ""PlayerInstance""/ chunkWatcher will send this chunk to all players who are in line of sight"
+func_72687_a,markBlockForUpdate,2,Called by WorldManager.markBlockForUpdate; marks a block to be resent to clients.
 func_72688_a,getWorldServer,2,
 func_72689_b,getChunkWatchers,2,
 func_72690_a,getOrCreateChunkWatcher,2,
@@ -1425,9 +1431,9 @@ func_72841_b,getUniqueDataId,2,Returns an unique new data id from the MapStorage
 func_72842_a,getBlockDensity,2,"Gets the percentage of real blocks within within a bounding box, along a specified vector."
 func_72843_D,setRandomSeed,2,puts the World Random seed to a specific state dependant on the inputs
 func_72844_a,getEntityPathToXYZ,2,
-func_72845_h,markBlockForUpdate,2,"On the client, re-renders the block. On the server, sends the block to the client (which will re-render it), including the tile entity description packet if applicable. Args: x, y, z"
+func_72845_h,markBlockForUpdate,2,"On the client, re-renders the block. On the server, sends the block to the client (which will re-render it only if the ID or MD changes), including the tile entity description packet if applicable. Args: x, y, z"
 func_72846_b,getClosestVulnerablePlayer,2,"Returns the closest vulnerable player within the given radius, or null if none is found."
-func_72847_b,releaseEntitySkin,2,Decrement the reference counter for this entity's skin image data
+func_72847_b,onEntityRemoved,2,
 func_72848_b,removeWorldAccess,0,Removes a worldAccess from the worldAccesses object
 func_72849_a,getBlockLightValue_do,2,"Gets the light value of a block location. This is the actual function that gets the value and has a bool flag that indicates if its a half step block to get the maximum light value of a direct neighboring block (left, right, forward, back, and up)"
 func_72850_v,isBlockFreezableNaturally,2,checks to see if a given block is both water and has at least one immediately adjacent non-water block
@@ -1477,7 +1483,7 @@ func_72897_h,joinEntityInSurroundings,0,spwans an entity and loads surrounding c
 func_72898_h,notifyBlocksOfNeighborChange,2,"Notifies neighboring blocks that this specified block changed  Args: x, y, z, blockID"
 func_72899_e,blockExists,2,"Returns whether a block exists at world coordinates x, y, z"
 func_72900_e,removeEntity,2,Schedule the entity for removal during the next tick. Marks the entity dead in anticipation.
-func_72901_a,rayTraceBlocks_do,2,
+func_72901_a,clip,2,"Performs a raycast against all blocks in the world, and optionally liquids."
 func_72902_n,markBlockForRenderUpdate,2,"On the client, re-renders this block. On the server, does nothing. Used for lighting updates."
 func_72903_x,setActivePlayerChunksAndCheckLight,2,
 func_72904_c,checkChunksExist,2,"Checks between a min and max all the chunks inbetween actually exist. Args: minX, minY, minZ, maxX, maxY, maxZ"
@@ -1499,7 +1505,7 @@ func_72919_O,getHorizon,0,Returns horizon height for use in rendering the sky.
 func_72920_a,getPendingBlockUpdates,2,
 func_72921_c,setBlockMetadataWithNotify,2,"Sets the blocks metadata and if set will then notify blocks that this block changed, depending on the flag. Args: x, y, z, metadata, flag. See setBlock for flag description"
 func_72922_b,getFirstUncoveredBlock,2,"Returns the block ID of the first block at this (x,z) location with air above it, searching from sea level upwards."
-func_72923_a,obtainEntitySkin,2,"Start the skin for this entity downloading, if necessary, and increment its reference counter"
+func_72923_a,onEntityAdded,2,
 func_72924_a,getPlayerEntityByName,2,Find a player by name in this world.
 func_72925_a,getSkyBlockTypeBrightness,0,Brightness for SkyBlock.Sky is clear white and (through color computing it is assumed) DEPENDENT ON DAYTIME. Brightness for SkyBlock.Block is yellowish and independent.
 func_72926_e,playAuxSFX,2,See description for func_72706_a.
@@ -1508,7 +1514,7 @@ func_72928_a,markTileEntityForDespawn,2,adds tile entity to despawn list (rename
 func_72929_e,getCelestialAngleRadians,2,Return getCelestialAngle()*2*PI
 func_72931_a,canPlaceEntityOnSide,2,Returns true if the given Entity can be placed on the given side of the given block position.
 func_72932_q,removeBlockTileEntity,2,"Removes the TileEntity for a given block in X,Y,Z coordinates"
-func_72933_a,rayTraceBlocks,2,"ray traces all blocks, including non-collideable ones"
+func_72933_a,clip,2,Performs a raycast against all blocks in the world except liquids.
 func_72934_a,playRecord,2,"Plays a record at the specified coordinates of the specified name. Args: recordName, x, y, z"
 func_72935_r,isDaytime,2,Checks whether its daytime by seeing if the light subtracted from the skylight is less than 4
 func_72936_c,updateLightByType,2,
@@ -1572,7 +1578,8 @@ func_73045_a,getEntityByID,2,"Returns the Entity with the given ID, or null if i
 func_73046_m,getMinecraftServer,2,Gets the MinecraftServer.
 func_73047_i,createBonusChest,2,Creates the bonus chest in the world.
 func_73049_a,getAllTileEntityInBox,2,"pars: min x,y,z , max x,y,z"
-func_73050_b,uncheckedUpdateEntity,2,direct call to super.updateEntityWithOptionalForce
+func_73050_b,uncheckedUpdateEntity,0,direct call to super.updateEntityWithOptionalForce
+func_73050_b,uncheckedUpdateEntity,1,direct call to super.updateEntityWithOptionalForce
 func_73051_P,resetRainAndThunder,2,
 func_73052_b,createSpawnPosition,2,"creates a spawn position at random within 256 blocks of 0,0"
 func_73053_d,wakeAllPlayers,2,
@@ -1635,10 +1642,10 @@ func_73240_a,unloadAllChunks,2,"marks all chunks for unload, ignoring those near
 func_73241_b,unloadChunksIfNotNearSpawn,2,"marks chunk for unload by ""unload100OldestChunks""  if there is no spawn point, or if the center of the chunk is outside 200 blocks (x or z) of the spawn"
 func_73242_b,safeSaveChunk,2,"used by saveChunks, but catches any exceptions if the save fails."
 func_73243_a,safeSaveExtraChunkData,2,"used by saveChunks, but catches any exceptions if the save fails."
-func_73252_b,sendThisChunkToPlayer,2,
+func_73252_b,removePlayer,2,
 func_73253_a,getChunkLocation,2,
 func_73254_a,sendChunkUpdate,2,
-func_73255_a,addPlayerToChunkWatchingList,2,called for all chunks within the visible radius of the player
+func_73255_a,addPlayer,2,
 func_73256_a,sendToAllPlayersWatchingChunk,2,
 func_73257_a,sendTileToAllPlayersWatchingChunk,2,
 func_73258_b,getPlayersInChunk,2,
@@ -1936,6 +1943,7 @@ func_74226_k,needsScrollBars,0,returns (if you are not on the inventoryTab) and
 func_74227_b,setCurrentCreativeTab,0,
 func_74228_j,updateCreativeSearch,0,
 func_74229_i,getInventory,0,Returns the creative inventory
+func_74230_h,getCurrentTabIndex,0,Returns the current creative tab index.
 func_74231_b,renderCreativeInventoryHoveringText,0,"Renders the creative inventory hovering text if mouse is over it. Returns true if did render or false otherwise. Params: current creative tab to be checked, current mouse x position, current mouse y position."
 func_74233_a,renderCreativeTab,0,Renders passed creative inventory tab into the screen.
 func_74252_a,setNetClientHandler,0,Sets the NetClientHandler.
@@ -2334,7 +2342,7 @@ func_75130_a,onCraftMatrixChanged,2,Callback for when the crafting matrix is cha
 func_75131_a,putStacksInSlots,0,"places itemstacks in first x slots, x being aitemstack.lenght"
 func_75132_a,addCraftingToCrafters,2,
 func_75133_b,retrySlotClick,2,
-func_75134_a,onCraftGuiClosed,2,Callback for when the crafting gui is closed.
+func_75134_a,onContainerClosed,2,Called when the container is closed.
 func_75135_a,mergeItemStack,2,merges provided ItemStack with the first avaliable one in the container/player inventory
 func_75136_a,getNextTransactionID,0,Gets a unique transaction ID. Parameter is unused.
 func_75137_b,updateProgressBar,0,
@@ -2697,7 +2705,7 @@ func_76072_h,getPlayerNBTTagCompound,2,Returns the player's NBTTagCompound to be
 func_76073_f,getWorldTime,2,Get current world time
 func_76074_e,getSpawnZ,2,Returns the z spawn position
 func_76075_d,getSpawnY,2,Return the Y axis spawning point of the player.
-func_76076_i,getDimension,2,
+func_76076_i,getVanillaDimension,2,"Returns vanilla MC dimension (-1,0,1). For custom dimension compatibility, always prefer WorldProvider.dimensionID accessed from World.provider.dimensionID"
 func_76077_q,getGameType,2,Gets the GameType.
 func_76078_e,setSaveVersion,2,Sets the save version of the world
 func_76079_c,getSpawnX,2,Returns the x spawn position
@@ -3411,6 +3419,7 @@ func_77649_a,getDamageVsEntity,0,Returns the damage against a given entity.
 func_77649_a,getDamageVsEntity,1,Returns the damage against a given entity.
 func_77650_f,getIconIndex,0,Returns the icon index of the stack given as argument.
 func_77651_p,getShareTag,2,"If this function returns true (or the item is damageable), the ItemStack's NBT tag will be sent to the client."
+func_77653_i,getItemStackDisplayName,2,
 func_77654_b,onEaten,2,
 func_77655_b,setUnlocalizedName,2,"Sets the unlocalized name of this item to the string passed as the parameter, prefixed by ""item."""
 func_77656_e,setMaxDamage,2,set max damage of an Item
@@ -3858,11 +3867,13 @@ func_82144_au,doesEntityNotTriggerPressurePlate,2,Return whether this entity sho
 func_82145_z,getMaxInPortalTime,2,Return the amount of time this entity should stay in a portal before being transported.
 func_82147_ab,getPortalCooldown,2,Return the amount of cooldown before this entity can use a portal again.
 func_82148_at,getTeleportDirection,2,
+func_82149_j,copyLocationAndAnglesFrom,2,Sets this entity's location and angles to the location and angles of the passed in entity.
 func_82150_aj,isInvisible,2,
 func_82154_e,setIsAnvil,2,
 func_82159_b,getArmorPosition,2,
 func_82160_b,dropEquipment,2,Drop the equipment for this entity.
 func_82161_a,getArmorItemForSlot,2,"Params: Armor slot, Item tier"
+func_82162_bC,enchantEquipment,2,Enchants the entity's armor and held item based on difficulty
 func_82163_bD,initCreature,0,Initialize this creature.
 func_82163_bD,initCreature,1,Initialize this creature.
 func_82164_bB,addRandomArmor,2,Makes entity wear random armor based on difficulty
@@ -3901,7 +3912,7 @@ func_82241_s,getHideCape,0,
 func_82242_a,addExperienceLevel,2,Add experience levels to this player.
 func_82244_d,displayGUIAnvil,2,Displays the GUI for interacting with an anvil.
 func_82245_bX,isSpawnForced,2,
-func_82246_f,canCurrentToolHarvestBlock,2,"Returns true if the item the player is holding can harvest the block at the given coords. Args: x, y, z."
+func_82246_f,isCurrentToolAdventureModeExempt,2,Returns true if the given block can be mined with the current tool in adventure mode.
 func_82247_a,canPlayerEdit,2,
 func_82265_c,setEnabled,0,
 func_82266_h,setDisabledTextColour,0,
@@ -4004,6 +4015,7 @@ func_82581_a,createCrashReport,2,Create a crash report which indicates a NBT rea
 func_82582_d,hasNoTags,2,Return whether this compound has no tags.
 func_82591_c,getPoolSize,2,
 func_82593_b,getPlaceSound,2,Used when a player places a block.
+func_82594_a,getObject,2,
 func_82595_a,putObject,2,Register an object on this registry.
 func_82599_e,getFrontOffsetZ,2,Returns a offset that addresses the block in front of this facing.
 func_82600_a,getFront,2,Returns the facing that represents the block in front of it.
@@ -4064,12 +4076,14 @@ func_82733_a,selectEntitiesWithinAABB,2,
 func_82734_g,getChunkHeightMapMinimum,2,"Gets the heightMapMinimum field of the given chunk, or 0 if the chunk is not loaded. Coords are in blocks. Args: X, Z"
 func_82736_K,getGameRules,2,Gets the GameRules instance.
 func_82737_E,getTotalWorldTime,2,
+func_82740_a,scheduleBlockUpdateWithPriority,2,
 func_82742_i,resetUpdateEntityTick,2,Resets the updateEntityTick field to 0
 func_82743_f,getCreationCloudUpdateTick,0,retrieves the 'date' at which the PartiallyDestroyedBlock was created
 func_82744_b,setCloudUpdateTick,0,saves the current Cloud update tick into the PartiallyDestroyedBlock
 func_82746_a,broadcastSound,2,
 func_82747_f,getWorldTypeID,2,
 func_82752_c,isAdventure,2,Returns true if this is the ADVENTURE game type
+func_82753_a,setPriority,2,
 func_82756_a,getGameRuleStringValue,2,Gets the GameRule's value as String.
 func_82757_a,setValue,2,Set this game rule value.
 func_82758_b,getGameRuleBooleanValue,2,Gets the GameRule's value as boolean.
@@ -4092,6 +4106,7 @@ func_82780_a,renderBlockFlowerpot,0,Renders flower pot
 func_82781_a,getEnchantments,2,Return the enchantments for the specified stack.
 func_82782_a,setEnchantments,2,Set the enchantments for the specified stack.
 func_82787_a,findMatchingRecipe,2,
+func_82788_x,canItemEditBlocks,2,"Returns true if players can use this item to affect the world (e.g. placing blocks, placing ender eyes in portal) when not in creative"
 func_82789_a,getIsRepairable,2,Return whether this item is repairable in an anvil.
 func_82790_a,getColorFromItemStack,0,
 func_82810_a,createHangingEntity,2,Create the hanging entity associated to this item.
@@ -4105,6 +4120,7 @@ func_82829_a,renderCloudsCheck,0,Render clouds if enabled
 func_82830_a,getNightVisionBrightness,0,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_82835_x,canEditBlocks,2,
 func_82836_z,getItemFrame,2,Return the item frame this stack is on. Returns null if not on an item frame.
 func_82837_s,hasDisplayName,2,Returns true if the itemstack has a display name
 func_82838_A,getRepairCost,2,"Get this stack's repair cost, or 0 if no repair cost is defined."
@@ -4144,11 +4160,13 @@ func_83020_a,setRenderBounds,0,"Sets the bounding box for the block to draw in,
 func_85028_t,getClassToNameMap,2,
 func_85030_a,playSound,2,
 func_85032_ar,isEntityInvulnerable,2,Return whether this entity is invulnerable to damage.
+func_85033_bc,collideWithNearbyEntities,2,
 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_85036_m,setCombatTask,2,sets this entity's combat AI.
 func_85039_t,addScore,2,Add to player's score
 func_85040_s,setScore,2,Set player's score
+func_85041_a,mouseClickMove,0,"Called when a mouse button is pressed and the mouse is moved around. Parameters are : mouseX, mouseY, lastButtonClicked & timeSinceMouseClick."
 func_85044_b,drawItemStack,0,
 func_85052_h,getThrower,2,
 func_85054_d,searchForOtherItemsNearby,2,Looks for other itemstacks nearby and tries to stack them together
@@ -4196,12 +4214,13 @@ func_85145_a,callTileEntityName,2,
 func_85151_d,getLowerChestInventory,2,Return this chest container's lower chest inventory.
 func_85154_a,callEntityType,2,
 func_85156_a,removeTask,2,removes the indicated task from the entity's AI tasks.
-func_85157_q,isAlwaysHarvested,2,Check to see if we can harvest it in any case.
-func_85158_p,setAlwaysHarvested,2,Set as harvestable in any case.
+func_85157_q,isAdventureModeExempt,2,Returns true if blocks with this material can always be mined in adventure mode.
+func_85158_p,setAdventureModeExempt,2,@see #isAdventureModeExempt()
 func_85160_a,callStructureType,2,
 func_85162_a,callChunkPositionHash,2,
 func_85170_a,callServerType,2,
 func_85173_a,playSoundToNearExcept,2,Plays sound to all near players except the player reference given
+func_85174_u,isBlockFullCube,2,
 func_85175_e,blockGetRenderType,2,Returns the render type of the block at the given coordinate.
 func_85176_s,getDefaultTeleporter,2,
 func_85181_a,getRandomModelBox,0,
@@ -4236,11 +4255,21 @@ func_92087_a,causeThornsDamage,2,Returns the EntityDamageSource of the Thorns en
 func_92089_a,canApply,2,
 func_92097_a,negateDamage,2,"Used by ItemStack.attemptDamageItem. Randomly determines if a point of damage should be negated using the enchantment level (par1). If the ItemStack is Armor then there is a flat 60% chance for damage to be negated no matter the enchantment level, otherwise there is a 1-(par/1) chance for damage to be negated."
 func_92103_a,addRecipe,2,
-func_94041_b,isStackValidForSlot,2,Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot.
+func_92111_a,getEnchantedItemStack,2,Returns the ItemStack of an enchanted version of this item.
+func_92115_a,getEnchantedItemStack_do,2,Returns the ItemStack of an enchanted version of this item.
+func_92116_a,addEnchantmentBooksToList,0,Adds the enchantment books from the supplied EnumEnchantmentType to the given list.
+func_94041_b,isItemValidForSlot,2,Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot.
 func_94042_c,isInvNameLocalized,2,"If this returns false, the inventory name will be used as an unlocalized name, and translated into the player's language. Otherwise it will be used directly."
+func_94043_a,setChestGuiName,2,Sets the custom display name to use when opening a GUI for this specific TileEntityChest.
 func_94049_a,setCustomName,2,
 func_94052_a,setParticleIcon,0,
 func_94053_h,nextTextureIndexX,0,
+func_94056_bM,hasCustomNameTag,2,
+func_94057_bL,getCustomNameTag,2,
+func_94058_c,setCustomNameTag,2,
+func_94059_bO,getAlwaysRenderNameTagForRender,0,
+func_94061_f,setAlwaysRenderNameTag,2,
+func_94062_bN,getAlwaysRenderNameTag,2,
 func_94064_a,displayGUIHopper,2,
 func_94065_a,drawTexturedModelRectFromIcon,0,
 func_94083_c,getTntPlacedBy,2,returns null or the entityliving it was placed or ignited by
@@ -4269,6 +4298,7 @@ func_94116_j,insertItemToInventory,2,Inserts one item from the hopper into the i
 func_94117_a,insertStack,2,"Inserts a stack into an inventory. Args: Inventory, stack, side. Returns leftover items."
 func_94119_v,getOutputInventory,2,Gets the inventory the hopper is pointing at.
 func_94128_d,getAccessibleSlotsFromSide,2,Returns an array containing the indices of the slots that can be accessed by automation on the given side of this block.
+func_94129_a,setGuiDisplayName,2,Sets the custom display name to use when opening a GUI linked to this tile entity.
 func_94140_a,registerDestroyBlockIcons,0,
 func_94143_a,updateIcons,0,
 func_94144_a,renderBlockInMinecart,0,Renders the block that is inside the minecart.
@@ -4370,6 +4400,8 @@ func_94448_e,getBrewingStandIcon,0,
 func_94451_c,getDirectionFromMetadata,2,
 func_94452_d,getIsBlockNotPoweredFromMetadata,2,
 func_94453_b,getHopperIcon,0,
+func_94478_d,isGettingInput,2,
+func_94491_m,getOutputStrength,2,
 func_94501_a,getRailLogic,2,
 func_94502_a,isMinecartTrack,2,
 func_94503_c,canConnectFrom,2,
@@ -4382,12 +4414,13 @@ func_94509_b,refreshConnectedTracks,2,
 func_94510_b,isPartOfTrack,2,
 func_94520_b,containsTranslateKey,2,
 func_94526_b,calcRedstoneFromInventory,2,
+func_94531_b,canDragIntoSlot,2,"Returns true if the player can ""drag-spilt"" items into this slot,. returns true by default. Called to check if the slot can be added to a list of Slots to split the held ItemStack across."
 func_94539_a,setExplosionSource,2,
 func_94540_d,setExplosion,2,
 func_94541_c,isExplosion,2,
 func_94571_i,setBlockToAir,2,"Sets a block to 0 and notifies relevant systems with the block change  Args: x, y, z"
 func_94572_D,getStrongestIndirectPower,2,
-func_94573_a,isBlockTickScheduled,2,"Returns true if the given block will receive a scheduled tick in the future. Args: X, Y, Z, blockID"
+func_94573_a,isBlockTickScheduledThisTick,2,"Returns true if the given block will receive a scheduled tick in this tick. Args: X, Y, Z, blockID"
 func_94574_k,getIndirectPowerOutput,2,"Returns the indirect signal strength being outputted by the given block in the *opposite* of the given direction. Args: X, Y, Z, direction"
 func_94575_c,setBlock,2,"Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID"
 func_94576_a,getEntitiesWithinAABBExcludingEntity,2,
@@ -4400,8 +4433,11 @@ func_94609_a,callTileEntityID,2,
 func_94611_a,callTileEntityDataInfo,2,
 func_94901_k,getSpriteNumber,0,"Returns 0 for /terrain.png, 1 for /gui/items.png"
 func_96090_ax,getTranslatedEntityName,2,Returns the translated name of the entity.
+func_96094_a,setMinecartName,2,Sets the minecart's name.
 func_96095_a,onActivatorRailPass,2,Called every tick the minecart is on an activator rail.
 func_96096_ay,isIgnited,2,Returns true if the TNT minecart is ignited.
+func_96099_a,setOutputSignal,2,
+func_96100_a,getOutputSignal,2,
 func_96104_c,setCommandSenderName,2,Sets the name of the command sender
 func_96107_aA,getXPos,2,Gets the world X position for this hopper entity.
 func_96108_aC,getZPos,2,Gets the world Z position for this hopper entity.
@@ -4412,6 +4448,9 @@ func_96115_a,setInventoryName,2,
 func_96116_a,suckItemsIntoHopper,2,Sucks one item into the given hopper from an inventory or EntityItem above it.
 func_96117_b,getInventoryAtLocation,2,Gets an inventory at the given location to extract items into or take items from. Can find either a tile entity or regular entity implementing IInventory.
 func_96118_b,getInventoryAboveHopper,2,"Looks for anything, that can hold items (like chests, furnaces, etc.) one block above the given hopper."
+func_96120_a,setEquipmentDropChance,2,
+func_96121_ay,getPathSearchRange,0,
+func_96121_ay,getPathSearchRange,1,
 func_96123_co,getWorldScoreboard,2,
 func_96124_cp,getTeam,2,
 func_96125_a,displayGUIHopperMinecart,2,
@@ -4445,6 +4484,7 @@ func_96446_b,getIconSafe,0,
 func_96447_a,renderBlockHopperMetadata,0,
 func_96448_c,getMissingIcon,0,
 func_96455_e,getMissingIcon,0,
+func_96467_a,registerVanillaDispenserBehaviors,2,
 func_96468_q_,hasComparatorInputOverride,2,"If this returns true, then comparators facing away from this block will use the value from getComparatorInputOverride instead of the actual redstone signal strength."
 func_96471_k,updateMetadata,2,Updates the Metadata to include if the Hopper gets powered by Redstone or not
 func_96472_a,getBehaviorForItemStack,2,Returns the behavior for the given ItemStack.
@@ -4465,6 +4505,11 @@ func_96563_a,callEntityName,2,
 func_96631_a,attemptDamageItem,2,"Attempts to damage the ItemStack with par1 amount of damage, If the ItemStack has the Unbreaking enchantment there is a chance for each point of damage to be negated. Returns true if it takes more damage than getMaxDamage(). Returns false otherwise or if the ItemStack can't be damaged or if all points of damage are negated."
 func_96632_a,callItemDisplayName,2,
 func_96637_b,isReadOnly,2,
+func_96652_c,getScorePoints,2,
+func_96653_e,getPlayerName,2,
+func_96663_f,getColorSuffix,2,Returns the color suffix for the player's team name
+func_96667_a,formatPlayerName,2,Returns the player name including the color prefixes and suffixes
+func_96668_e,getColorPrefix,2,Returns the color prefix for the player's team name
 func_96670_d,getMembershipCollection,2,
 func_96678_d,getDisplayName,2,
 func_96679_b,getName,2,
@@ -4477,6 +4522,7 @@ func_98042_n,setTransferTicker,2,"Sets the transfer ticker, used to determine th
 func_98043_aE,canTransfer,2,Returns whether the hopper cart can currently transfer an item.
 func_98046_c,setTransferCooldown,2,
 func_98047_l,isCoolingDown,2,
+func_98049_a,getSpawnerLogic,2,Returns the spawner logic associated with this spawner
 func_98052_bS,canPickUpLoot,2,
 func_98053_h,setCanPickUpLoot,2,
 func_98076_a,getServerLogger,1,

fml/conf/packages.csv

@@ -151,6 +151,7 @@ CallableTexturePack,net/minecraft/client
 CallableType2,net/minecraft/client
 CallableUpdatingScreenName,net/minecraft/client
 Minecraft,net/minecraft/client
+MinecraftINNER13,net/minecraft/client
 StatStringFormatKeyInv,net/minecraft/client
 ThreadClientSleep,net/minecraft/client
 ScheduledSound,net/minecraft/client/audio
@@ -164,7 +165,6 @@ AbstractClientPlayer,net/minecraft/client/entity
 EntityClientPlayerMP,net/minecraft/client/entity
 EntityOtherPlayerMP,net/minecraft/client/entity
 EntityPlayerSP,net/minecraft/client/entity
-RenderMinecartMobSpawner,net/minecraft/client/renderer/entity
 ChatClickData,net/minecraft/client/gui
 ChatLine,net/minecraft/client/gui
 FontRenderer,net/minecraft/client/gui
@@ -376,6 +376,8 @@ ThreadConnectToServer,net/minecraft/client/multiplayer
 ThreadLanServerFind,net/minecraft/client/multiplayer
 ThreadLanServerPing,net/minecraft/client/multiplayer
 WorldClient,net/minecraft/client/multiplayer
+WorldClientINNER3,net/minecraft/client/multiplayer
+WorldClientINNER4,net/minecraft/client/multiplayer
 EffectRenderer,net/minecraft/client/particle
 EntityAuraFX,net/minecraft/client/particle
 EntityBreakingFX,net/minecraft/client/particle
@@ -466,6 +468,7 @@ RenderLiving,net/minecraft/client/renderer/entity
 RenderMagmaCube,net/minecraft/client/renderer/entity
 RenderManager,net/minecraft/client/renderer/entity
 RenderMinecart,net/minecraft/client/renderer/entity
+RenderMinecartMobSpawner,net/minecraft/client/renderer/entity
 RenderMooshroom,net/minecraft/client/renderer/entity
 RenderOcelot,net/minecraft/client/renderer/entity
 RenderPainting,net/minecraft/client/renderer/entity
@@ -761,8 +764,8 @@ EntityAILookIdle,net/minecraft/entity/ai
 EntityAIMate,net/minecraft/entity/ai
 EntityAIMoveIndoors,net/minecraft/entity/ai
 EntityAIMoveThroughVillage,net/minecraft/entity/ai
-EntityAIMoveTowardsTarget,net/minecraft/entity/ai
 EntityAIMoveTowardsRestriction,net/minecraft/entity/ai
+EntityAIMoveTowardsTarget,net/minecraft/entity/ai
 EntityAINearestAttackableTarget,net/minecraft/entity/ai
 EntityAINearestAttackableTargetSelector,net/minecraft/entity/ai
 EntityAINearestAttackableTargetSorter,net/minecraft/entity/ai
@@ -800,10 +803,8 @@ AttributeInstance,net/minecraft/entity/ai/attributes
 AttributeModifier,net/minecraft/entity/ai/attributes
 BaseAttribute,net/minecraft/entity/ai/attributes
 BaseAttributeMap,net/minecraft/entity/ai/attributes
-ClientsideAttributeMap,net/minecraft/entity/ai/attributes
 ModifiableAttributeInstance,net/minecraft/entity/ai/attributes
 RangedAttribute,net/minecraft/entity/ai/attributes
-ReadonlyAttributeInstance,net/minecraft/entity/ai/attributes
 ServersideAttributeMap,net/minecraft/entity/ai/attributes
 BossStatus,net/minecraft/entity/boss
 EntityDragon,net/minecraft/entity/boss
@@ -851,6 +852,8 @@ EntitySnowman,net/minecraft/entity/monster
 EntitySpider,net/minecraft/entity/monster
 EntityWitch,net/minecraft/entity/monster
 EntityZombie,net/minecraft/entity/monster
+EntityZombieGroupData,net/minecraft/entity/monster
+EntityZombieINNER1,net/minecraft/entity/monster
 FilterIMob,net/minecraft/entity/monster
 IMob,net/minecraft/entity/monster
 ContainerSheep,net/minecraft/entity/passive
@@ -1068,6 +1071,7 @@ Packet12PlayerLook,net/minecraft/network/packet
 Packet130UpdateSign,net/minecraft/network/packet
 Packet131MapData,net/minecraft/network/packet
 Packet132TileEntityData,net/minecraft/network/packet
+Packet133TileEditorOpen,net/minecraft/network/packet
 Packet13PlayerLookMove,net/minecraft/network/packet
 Packet14BlockDig,net/minecraft/network/packet
 Packet15Place,net/minecraft/network/packet
@@ -1115,6 +1119,7 @@ Packet41EntityEffect,net/minecraft/network/packet
 Packet42RemoveEntityEffect,net/minecraft/network/packet
 Packet43Experience,net/minecraft/network/packet
 Packet44UpdateAttributes,net/minecraft/network/packet
+Packet44UpdateAttributesSnapshot,net/minecraft/network/packet
 Packet4UpdateTime,net/minecraft/network/packet
 Packet51MapChunk,net/minecraft/network/packet
 Packet51MapChunkData,net/minecraft/network/packet
@@ -1173,6 +1178,7 @@ ScoreboardSaveData,net/minecraft/scoreboard
 ServerCommandScoreboard,net/minecraft/scoreboard
 ServerCommandTestFor,net/minecraft/scoreboard
 ServerScoreboard,net/minecraft/scoreboard
+Team,net/minecraft/scoreboard
 CallableIsServerModded,net/minecraft/server
 CallableServerMemoryStats,net/minecraft/server
 CallableServerProfiler,net/minecraft/server

fml/conf/params.csv

@@ -109,6 +109,7 @@ p_110146_2_,par2,2
 p_110148_1_,par1Attribute,2
 p_110149_1_,par1,2
 p_110160_1_,par1,2
+p_110160_2_,par2,2
 p_110161_1_,par1EntityLivingData,2
 p_110162_1_,par1Entity,2
 p_110162_2_,par2,2
@@ -565,7 +566,6 @@ p_111124_1_,par1AttributeModifier,2
 p_111127_1_,par1UUID,2
 p_111128_1_,par1,2
 p_111130_1_,par1,2
-p_111140_1_,par1,2
 p_111145_1_,par1,2
 p_111147_1_,par1Multimap,2
 p_111148_1_,par1Multimap,2
@@ -573,9 +573,6 @@ p_111149_1_,par1ModifiableAttributeInstance,2
 p_111150_1_,par1Attribute,2
 p_111151_1_,par1Attribute,2
 p_111152_1_,par1Str,2
-p_111155_1_,par1Str,2
-p_111156_1_,par1Attribute,2
-p_111157_1_,par1Attribute,2
 p_111158_1_,par1Str,2
 p_111159_1_,par1Attribute,2
 p_111168_1_,par1,2
@@ -635,6 +632,12 @@ p_120016_0_,par0DedicatedServer,2
 p_120017_0_,par0MinecraftServerGui,2
 p_120033_0_,par0StatsComponent,2
 p_120035_1_,par1ArrayOfLong,2
+p_130000_1_,par1EntityLivingBase,2
+p_130000_2_,par2,2
+p_130000_4_,par4,2
+p_130000_6_,par6,2
+p_130000_8_,par8,2
+p_130000_9_,par9,2
 p_130002_1_,par1EntityPlayer,2
 p_130005_1_,par1EntityLiving,2
 p_130005_2_,par2,2
@@ -642,7 +645,16 @@ p_130006_1_,par1EntityLiving,2
 p_130006_2_,par2,2
 p_130006_3_,par3,2
 p_130007_1_,par1EntityLiving,2
+p_130009_1_,par1AbstractClientPlayer,2
+p_130009_2_,par2,2
+p_130009_4_,par4,2
+p_130009_6_,par6,2
+p_130009_8_,par8,2
+p_130009_9_,par9,2
 p_130011_1_,par1Entity,2
+p_130013_1_,par1EntityLiving,2
+p_130013_2_,par2,2
+p_130013_3_,par3,2
 p_130015_1_,par1,2
 p_130015_2_,par2,2
 p_130015_3_,par3,2
@@ -724,6 +736,9 @@ p_130122_0_,par0McoServerList,2
 p_130122_1_,par1,2
 p_130123_1_,par1,2
 p_130129_1_,par1Session,2
+p_130220_1_,par1AbstractClientPlayer,2
+p_130220_2_,par2,2
+p_130220_3_,par3,2
 p_135011_0_,par0GuiLanguage,2
 p_135020_1_,par1JsonElement,2
 p_135020_2_,par2Type,2
@@ -768,16 +783,11 @@ p_140020_1_,par1,2
 p_140020_2_,par2,2
 p_140020_3_,par3,2
 p_140020_4_,par4,2
-p_140022_0_,par0GuiScreenOnlineServers,2
 p_140023_0_,par0GuiScreenOnlineServers,2
 p_140024_0_,par0GuiScreenOnlineServers,2
 p_140024_1_,par1McoServer,2
-p_140025_0_,par0GuiScreenOnlineServers,2
-p_140026_0_,par0GuiScreenOnlineServers,2
-p_140026_1_,par1Str,2
 p_140027_0_,par0GuiScreenOnlineServers,2
 p_140027_1_,par1,2
-p_140028_0_,par0GuiScreenOnlineServers,2
 p_140030_1_,par1,2
 p_140031_0_,par0GuiScreenOnlineServers,2
 p_140031_1_,par1,2
@@ -787,7 +797,6 @@ p_140031_4_,par4,2
 p_140031_5_,par5,2
 p_140032_1_,par1,2
 p_140033_0_,par0GuiScreenOnlineServers,2
-p_140034_0_,par0GuiScreenOnlineServers,2
 p_140035_0_,par0GuiScreenOnlineServers,2
 p_140035_1_,par1,2
 p_140035_2_,par2,2
@@ -806,6 +815,22 @@ p_140058_1_,par1McoServer,2
 p_140065_1_,par1List,2
 p_140068_1_,par1McoServer,2
 p_140068_2_,par2McoServer,2
+p_142010_1_,par1EntityPlayer,2
+p_142012_1_,par1Team,2
+p_142014_1_,par1EntityLivingBase,2
+p_142017_1_,par1,2
+p_142018_1_,par1EntityLivingBase,2
+p_142018_2_,par2EntityLivingBase,2
+p_142020_1_,par1Str,2
+p_142023_0_,par0GuiScreenOnlineServers,2
+p_142024_0_,par0Minecraft,2
+p_142030_0_,par0WorldClient,2
+p_142031_1_,par1Packet133TileEditorOpen,2
+p_142038_1_,par1,2
+p_142038_2_,par2,2
+p_142038_3_,par3,2
+p_142053_1_,par1Str,2
+p_142054_1_,par1Team,2
 p_70000_1_,par1PlayerUsageSnooper,2
 p_70001_1_,par1PlayerUsageSnooper,2
 p_70003_1_,par1,2
@@ -1088,6 +1113,7 @@ p_70690_1_,par1PotionEffect,2
 p_70691_1_,par1,2
 p_70693_1_,par1EntityPlayer,2
 p_70695_1_,par1PotionEffect,2
+p_70695_2_,par2,2
 p_70778_1_,par1PathEntity,2
 p_70783_1_,par1,2
 p_70783_2_,par2,2
@@ -1205,8 +1231,6 @@ p_71019_1_,par1ItemStack,2
 p_71019_2_,par2,2
 p_71020_1_,par1,2
 p_71021_1_,par1ItemStack,2
-p_71022_1_,par1EntityLivingBase,2
-p_71022_2_,par2,2
 p_71023_1_,par1,2
 p_71027_1_,par1,2
 p_71029_1_,par1StatBase,2
@@ -2977,8 +3001,6 @@ p_73049_3_,par3,2
 p_73049_4_,par4,2
 p_73049_5_,par5,2
 p_73049_6_,par6,2
-p_73050_1_,par1Entity,2
-p_73050_2_,par2,2
 p_73052_1_,par1WorldSettings,2
 p_73057_1_,par1EnumCreatureType,2
 p_73057_2_,par2,2
@@ -5470,7 +5492,7 @@ p_77029_2_,par2,2
 p_77030_1_,par1EntityLivingBase,2
 p_77030_2_,par2,2
 p_77030_3_,par3,2
-p_77031_1_,par1,2
+p_77031_1_,par1EntityLiving,2
 p_77031_2_,par2,2
 p_77031_4_,par4,2
 p_77031_6_,par6,2
@@ -5635,7 +5657,7 @@ p_77099_2_,par2,2
 p_77099_3_,par3,2
 p_77100_1_,par1AbstractClientPlayer,2
 p_77100_2_,par2,2
-p_77101_1_,par1,2
+p_77101_1_,par1EntityLivingBase,2
 p_77101_2_,par2,2
 p_77101_4_,par4,2
 p_77101_6_,par6,2
@@ -7056,7 +7078,7 @@ p_82406_2_,par2TextureManager,2
 p_82406_3_,par3ItemStack,2
 p_82406_4_,par4,2
 p_82406_5_,par5,2
-p_82408_1_,par1,2
+p_82408_1_,par1EntityLivingBase,2
 p_82408_2_,par2,2
 p_82408_3_,par3,2
 p_82409_1_,par1EntityWitch,2
@@ -7103,7 +7125,7 @@ p_82430_3_,par3,2
 p_82430_4_,par4,2
 p_82438_1_,par1EntitySkeleton,2
 p_82438_2_,par2,2
-p_82439_1_,par1,2
+p_82439_1_,par1EntityLivingBase,2
 p_82439_2_,par2,2
 p_82439_3_,par3,2
 p_82441_1_,par1EntityPlayer,2
@@ -8315,7 +8337,7 @@ p_96660_1_,par1,2
 p_96662_1_,par1Str,2
 p_96664_1_,par1Str,2
 p_96666_1_,par1Str,2
-p_96667_0_,par0ScorePlayerTeam,2
+p_96667_0_,par0Team,2
 p_96667_1_,par1Str,2
 p_96681_1_,par1Str,2
 p_98034_1_,par1EntityPlayer,2
@@ -9236,7 +9258,6 @@ p_i1279_1_,par1,2
 p_i1279_2_,par2,2
 p_i1279_3_,par3,2
 p_i1279_4_,par4,2
-p_i1280_1_,par1StitchHolder,2
 p_i1281_1_,par1,2
 p_i1281_2_,par2Str,2
 p_i1282_1_,par1Str,2
@@ -10030,7 +10051,6 @@ p_i1609_1_,par1Str,2
 p_i1609_2_,par2,2
 p_i1609_4_,par4,2
 p_i1609_6_,par6,2
-p_i1610_1_,par1Attribute,2
 p_i1611_1_,par1EntityLivingBase,2
 p_i1612_1_,par1EntityLiving,2
 p_i1613_1_,par1EntityLiving,2
@@ -10089,8 +10109,6 @@ p_i1637_1_,par1EntityCreature,2
 p_i1638_1_,par1EntityCreature,2
 p_i1638_2_,par2,2
 p_i1638_4_,par4,2
-p_i1639_1_,par1EntityCreature,2
-p_i1639_2_,par2,2
 p_i1640_1_,par1EntityCreature,2
 p_i1640_2_,par2,2
 p_i1640_4_,par4,2
@@ -11631,17 +11649,40 @@ p_i2329_2_,par2McoServerListEmptyAnon,2
 p_i2330_1_,par1,2
 p_i2330_2_,par2Str,2
 p_i2330_3_,par3,2
-p_i2341_1_,par1DedicatedServer,2
-p_i2342_1_,par1DedicatedServer,2
-p_i2343_1_,par1DedicatedServer,2
-p_i2344_1_,par1MinecraftServerGui,2
-p_i2344_2_,par2JTextField,2
-p_i2345_1_,par1MinecraftServerGui,2
-p_i2346_1_,par1MinecraftServer,2
-p_i2347_1_,par1MinecraftServer,2
-p_i2348_1_,par1StatsComponent,2
-p_i2349_1_,par1JTextArea,2
-p_i2350_1_,par1TextAreaLogHandler,2
+p_i2341_1_,par1Minecraft,2
+p_i2342_1_,par1WorldClient,2
+p_i2343_1_,par1WorldClient,2
+p_i2344_1_,par1StitchHolder,2
+p_i2344_2_,par2Str,2
+p_i2345_1_,par1,2
+p_i2345_2_,par2,2
+p_i2345_3_,par3,2
+p_i2345_4_,par4,2
+p_i2346_1_,par1Packet44UpdateAttributes,2
+p_i2346_2_,par2Str,2
+p_i2346_3_,par3,2
+p_i2346_5_,par5Collection,2
+p_i2347_1_,par1EntityCreature,2
+p_i2347_2_,par2,2
+p_i2348_1_,par1EntityZombie,2
+p_i2348_2_,par2,2
+p_i2348_3_,par3,2
+p_i2349_1_,par1EntityZombie,2
+p_i2349_2_,par2,2
+p_i2349_3_,par3,2
+p_i2349_4_,par4EntityZombieINNER1,2
+p_i2350_1_,par1,2
+p_i2361_1_,par1DedicatedServer,2
+p_i2362_1_,par1DedicatedServer,2
+p_i2363_1_,par1DedicatedServer,2
+p_i2364_1_,par1MinecraftServerGui,2
+p_i2364_2_,par2JTextField,2
+p_i2365_1_,par1MinecraftServerGui,2
+p_i2366_1_,par1MinecraftServer,2
+p_i2367_1_,par1MinecraftServer,2
+p_i2368_1_,par1StatsComponent,2
+p_i2369_1_,par1JTextArea,2
+p_i2370_1_,par1TextAreaLogHandler,2
 p_main_0_,par0ArrayOfStr,2
 p_openConnection_1_,par1URL,2
 p_paint_1_,par1Graphics,2

fml/conf/patches/minecraft_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:44:00 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jul 07 12:38:55 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jul 07 12:40:48 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
@@ -29,8 +29,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:44:00 2013
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jul 07 12:38:55 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jul 07 12:40:48 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -43,8 +43,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	Sun Jun 30 21:44:01 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sun Jul 07 12:38:56 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sun Jul 07 12:40:48 2013
 @@ -207,7 +207,7 @@
        System.exit(0);
     }
@@ -55,8 +55,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\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
---- minecraft\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:44:02 2013
-+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sun Jul 07 12:38:56 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jul 07 12:40:48 2013
 @@ -38,7 +38,7 @@
     private final String field_96304_B;
  
@@ -67,8 +67,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patch
  
     private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
 diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched\net\minecraft\src\FileResourcePack.java
---- minecraft\net\minecraft\src\FileResourcePack.java	Sun Jun 30 21:44:02 2013
-+++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\FileResourcePack.java	Sun Jul 07 12:38:56 2013
++++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Sun Jul 07 12:40:48 2013
 @@ -84,12 +84,18 @@
  
     protected void finalize() {
@@ -89,8 +89,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched
        }
  
 diff -r -U 3 minecraft\net\minecraft\src\FolderResourcePack.java minecraft_patched\net\minecraft\src\FolderResourcePack.java
---- minecraft\net\minecraft\src\FolderResourcePack.java	Sun Jun 30 21:44:02 2013
-+++ minecraft_patched\net\minecraft\src\FolderResourcePack.java	Sun Jun 30 21:46:52 2013
+--- minecraft\net\minecraft\src\FolderResourcePack.java	Sun Jul 07 12:38:56 2013
++++ minecraft_patched\net\minecraft\src\FolderResourcePack.java	Sun Jul 07 12:40:48 2013
 @@ -29,7 +29,7 @@
        HashSet var1 = Sets.newHashSet();
        File var2 = new File(this.field_110597_b, "assets/");
@@ -101,9 +101,9 @@ diff -r -U 3 minecraft\net\minecraft\src\FolderResourcePack.java minecraft_patch
  
           for(int var5 = 0; var5 < var4; ++var5) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Sun Jun 30 21:44:02 2013
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sun Jun 30 21:45:42 2013
-@@ -625,8 +625,6 @@
+--- minecraft\net\minecraft\src\FontRenderer.java	Sun Jul 07 12:38:56 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sun Jul 07 12:40:48 2013
+@@ -630,8 +630,6 @@
           case 10:
              --var5;
              break;
@@ -112,7 +112,7 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
           case 167:
              if(var5 < var3 - 1) {
                 ++var5;
-@@ -640,6 +638,8 @@
+@@ -645,6 +643,8 @@
                 }
              }
              break;
@@ -122,8 +122,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	Sun Jun 30 21:44:02 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sun Jul 07 12:38:57 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sun Jul 07 12:40:48 2013
 @@ -103,7 +103,7 @@
        return true;
     }
@@ -134,9 +134,9 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
        this.field_71348_o = this.field_71347_n.func_71752_f();
        if(!var1 && this.field_71348_o) {
 diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\minecraft\src\Minecraft.java
---- minecraft\net\minecraft\src\Minecraft.java	Sun Jun 30 21:44:05 2013
-+++ minecraft_patched\net\minecraft\src\Minecraft.java	Sun Jun 30 21:45:42 2013
-@@ -599,8 +599,8 @@
+--- minecraft\net\minecraft\src\Minecraft.java	Sun Jul 07 12:38:57 2013
++++ minecraft_patched\net\minecraft\src\Minecraft.java	Sun Jul 07 12:40:48 2013
+@@ -604,8 +604,8 @@
           return;
        }
  
@@ -147,7 +147,7 @@ diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\mi
              if(this.field_71425_J) {
                 if(this.field_71434_R && this.field_71433_S != null) {
                    this.func_71377_b(this.field_71433_S);
-@@ -621,23 +621,20 @@
+@@ -626,23 +626,20 @@
                 }
                 continue;
              }
@@ -185,8 +185,8 @@ diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\mi
     }
  
 diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
---- minecraft\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:44:05 2013
-+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\RConThreadClient.java	Sun Jul 07 12:38:58 2013
++++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sun Jul 07 12:40:48 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -226,8 +226,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched
  
     private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
 diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
---- minecraft\net\minecraft\src\RenderBlocks.java	Sun Jun 30 21:44:05 2013
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\RenderBlocks.java	Sun Jul 07 12:38:58 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sun Jul 07 12:40:48 2013
 @@ -1960,16 +1960,16 @@
        float var25 = (float)(p_78589_2_ + 1);
        float var26 = (float)(p_78589_4_ + 0);
@@ -259,9 +259,9 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
           var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
           var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Sun Jun 30 21:44:06 2013
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Jun 30 21:45:42 2013
-@@ -1435,7 +1435,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sun Jul 07 12:38:58 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Jul 07 12:40:48 2013
+@@ -1445,7 +1445,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_;
@@ -271,8 +271,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\SoundPoolURLConnection.java minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java
---- minecraft\net\minecraft\src\SoundPoolURLConnection.java	Sun Jun 30 21:44:06 2013
-+++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\SoundPoolURLConnection.java	Sun Jul 07 12:38:58 2013
++++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Sun Jul 07 12:40:48 2013
 @@ -22,7 +22,11 @@
     public void connect() {}
  
@@ -286,8 +286,8 @@ diff -r -U 3 minecraft\net\minecraft\src\SoundPoolURLConnection.java minecraft_p
  
     // $FF: synthetic method
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:44:06 2013
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sun Jul 07 12:38:58 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sun Jul 07 12:40:48 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i1395_1_;
     }
@@ -297,8 +297,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	Sun Jun 30 21:44:06 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 21:45:42 2013
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sun Jul 07 12:38:58 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jul 07 12:40:48 2013
 @@ -20,6 +20,7 @@
     }
  

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	Sun Jun 30 21:45:24 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jul 07 12:40:12 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jul 07 12:40:42 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
@@ -30,8 +30,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
     }
  }
 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	Sun Jun 30 21:45:25 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jul 07 12:40:12 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jul 07 12:40:42 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -44,8 +44,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	Sun Jun 30 21:45:25 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sun Jul 07 12:40:13 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sun Jul 07 12:40:42 2013
 @@ -208,7 +208,7 @@
        System.exit(0);
     }
@@ -56,8 +56,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\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
---- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:26 2013
-+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sun Jul 07 12:40:13 2013
++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jul 07 12:40:42 2013
 @@ -38,7 +38,7 @@
     private final String field_96304_B;
  
@@ -68,8 +68,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraf
  
     private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
 diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java
---- minecraft_server\net\minecraft\src\MemoryConnection.java	Sun Jun 30 21:45:26 2013
-+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Sun Jul 07 12:40:14 2013
++++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sun Jul 07 12:40:42 2013
 @@ -11,13 +11,18 @@
  public class MemoryConnection implements INetworkManager {
  
@@ -91,8 +91,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_
     public void func_74425_a(NetHandler p_74425_1_) {
        this.field_74440_d = p_74425_1_;
 diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
---- minecraft_server\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:45:26 2013
-+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Sun Jul 07 12:40:14 2013
++++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sun Jul 07 12:40:42 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -132,8 +132,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_
  
     private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
 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	Sun Jun 30 21:45:27 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sun Jul 07 12:40:14 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sun Jul 07 12:40:42 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i1395_1_;
     }
@@ -143,8 +143,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	Sun Jun 30 21:45:27 2013
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 21:45:41 2013
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sun Jul 07 12:40:14 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jul 07 12:40:42 2013
 @@ -20,6 +20,7 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 8.03
-ClientVersion = 1.6.1
-ServerVersion = 1.6.1
+MCPVersion = 8.04
+ClientVersion = 1.6.2
+ServerVersion = 1.6.2

fml/mc_versions.cfg

@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.6.1
+current_ver = 1.6.2
 base_url    = http://s3.amazonaws.com/MinecraftDownload/
 libraries   = lwjgl.jar lwjgl_util.jar jinput.jar
 natives     = windows_natives.jar macosx_natives.jar linux_natives.jar
@@ -107,3 +107,10 @@ server_md5 = ff8f81970a5955737c356b534d3aee96
 mcp_ver    = 8.03
 mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp803.zip
 mcp_md5    = 7810c2fba33e15889685b21ac8dc66cf
+
+[1.6.2]
+client_md5 = 9356f3ad44925a684e918b9270b63a6c
+server_md5 = 39df9f29e6904ea7b351ffb4fe949881
+mcp_ver    = 8.04
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp804.zip
+mcp_md5    = ebcecfa00aae07548e67787044410a11

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

@@ -12,7 +12,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.image.BufferedImage;
-@@ -129,6 +134,8 @@
+@@ -130,6 +135,8 @@
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
  
@@ -21,7 +21,7 @@
  @SideOnly(Side.CLIENT)
  public class Minecraft implements IPlayerUsage
  {
-@@ -364,6 +371,8 @@
+@@ -366,6 +373,8 @@
          this.func_71357_I();
          this.field_71466_p = new FontRenderer(this.field_71474_y, new ResourceLocation("textures/font/ascii.png"), this.field_71446_o, false);
  
@@ -30,7 +30,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              this.field_71466_p.func_78264_a(this.field_135017_as.func_135042_a());
-@@ -396,6 +405,7 @@
+@@ -400,6 +409,7 @@
          this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items/"));
          GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
@@ -38,7 +38,7 @@
          this.func_71361_d("Post startup");
          this.field_71456_v = new GuiIngame(this);
  
-@@ -414,6 +424,7 @@
+@@ -418,6 +428,7 @@
          {
              this.func_71352_k();
          }
@@ -46,7 +46,7 @@
      }
  
      public void func_110436_a()
-@@ -729,6 +740,7 @@
+@@ -733,6 +744,7 @@
          {
              this.func_71405_e();
          }
@@ -54,7 +54,7 @@
      }
  
      private void func_71411_J()
-@@ -797,9 +809,11 @@
+@@ -801,9 +813,11 @@
  
          if (!this.field_71454_w)
          {
@@ -66,7 +66,7 @@
          }
  
          GL11.glFlush();
-@@ -1321,10 +1335,14 @@
+@@ -1325,10 +1339,14 @@
  
      public void func_71407_l()
      {
@@ -81,7 +81,7 @@
  
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
-@@ -1775,6 +1793,8 @@
+@@ -1785,6 +1803,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -90,7 +90,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1798,8 +1818,27 @@
+@@ -1808,8 +1828,27 @@
          }
  
          this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);

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

@@ -1,13 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,8 @@
  package net.minecraft.client.multiplayer;
  
+ import com.google.common.base.Charsets;
++
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.BufferedReader;
-@@ -201,11 +202,14 @@
+@@ -205,11 +207,14 @@
      private GuiScreen field_98183_l;
      Random field_72557_e = new Random();
  
@@ -22,7 +24,7 @@
      }
  
      public NetClientHandler(Minecraft p_i1177_1_, String p_i1177_2_, int p_i1177_3_, GuiScreen p_i1177_4_) throws IOException
-@@ -214,6 +218,7 @@
+@@ -218,6 +223,7 @@
          this.field_98183_l = p_i1177_4_;
          Socket socket = new Socket(InetAddress.getByName(p_i1177_2_), p_i1177_3_);
          this.field_72555_g = new TcpConnection(p_i1177_1_.func_98033_al(), socket, "Client", this);
@@ -30,7 +32,7 @@
      }
  
      public NetClientHandler(Minecraft p_i1178_1_, IntegratedServer p_i1178_2_) throws IOException
-@@ -221,6 +226,7 @@
+@@ -225,6 +231,7 @@
          this.field_72563_h = p_i1178_1_;
          this.field_72555_g = new MemoryConnection(p_i1178_1_.func_98033_al(), this);
          p_i1178_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i1178_1_.func_110432_I().func_111285_a());
@@ -38,7 +40,7 @@
      }
  
      public void func_72547_c()
-@@ -292,6 +298,7 @@
+@@ -296,6 +303,7 @@
  
      public void func_72513_a(Packet252SharedKey p_72513_1_)
      {
@@ -46,15 +48,15 @@
          this.func_72552_c(new Packet205ClientCommand(0));
      }
  
-@@ -307,6 +314,7 @@
+@@ -311,6 +319,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);
 +        FMLNetworkHandler.onConnectionEstablishedToServer(this, field_72555_g, p_72455_1_);
          this.field_72563_h.field_71474_y.func_82879_c();
+         this.field_72555_g.func_74429_a(new Packet250CustomPayload("MC|Brand", ClientBrandRetriever.getClientModName().getBytes(Charsets.UTF_8)));
      }
- 
-@@ -760,6 +768,7 @@
+@@ -765,6 +774,7 @@
          {
              this.field_72555_g.func_74429_a(p_72546_1_);
              this.field_72555_g.func_74423_d();
@@ -62,7 +64,7 @@
          }
      }
  
-@@ -799,6 +808,7 @@
+@@ -804,6 +814,7 @@
  
      public void func_72481_a(Packet3Chat p_72481_1_)
      {
@@ -70,7 +72,7 @@
          this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(ChatMessageComponent.func_111078_c(p_72481_1_.field_73476_b).func_111068_a(true));
      }
  
-@@ -1379,6 +1389,11 @@
+@@ -1403,6 +1414,11 @@
  
      public void func_72494_a(Packet131MapData p_72494_1_)
      {
@@ -82,7 +84,7 @@
          if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT)
          {
              ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c);
-@@ -1490,6 +1505,11 @@
+@@ -1514,6 +1530,11 @@
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
      {
@@ -94,7 +96,7 @@
          if ("MC|TrList".equals(p_72501_1_.field_73630_a))
          {
              DataInputStream datainputstream = new DataInputStream(new ByteArrayInputStream(p_72501_1_.field_73629_c));
-@@ -1670,4 +1690,20 @@
+@@ -1707,4 +1728,20 @@
      {
          return this.field_72555_g;
      }

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.Collection;
-@@ -183,6 +185,7 @@
+@@ -181,6 +183,7 @@
  
      public void func_70071_h_()
      {
@@ -16,7 +16,7 @@
          if (this.field_71074_e != null)
          {
              ItemStack itemstack = this.field_71071_by.func_70448_g();
-@@ -306,6 +309,7 @@
+@@ -304,6 +307,7 @@
          {
              this.field_71100_bB.func_75118_a(this);
          }
@@ -24,7 +24,7 @@
      }
  
      public int func_82145_z()
-@@ -1954,4 +1958,9 @@
+@@ -1906,4 +1910,9 @@
      {
          return this.func_70096_w().func_111145_d(17);
      }

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

@@ -46,7 +46,7 @@
  
          if (s != null)
          {
-@@ -270,4 +281,22 @@
+@@ -275,4 +286,22 @@
      {
          return p_72531_0_.field_72544_i = p_72531_1_;
      }

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

@@ -9,7 +9,7 @@
  import net.minecraft.crash.CrashReport;
  import net.minecraft.crash.CrashReportCategory;
  import net.minecraft.entity.Entity;
-@@ -34,6 +36,7 @@
+@@ -36,6 +38,7 @@
  import net.minecraft.network.packet.Packet108EnchantItem;
  import net.minecraft.network.packet.Packet10Flying;
  import net.minecraft.network.packet.Packet130UpdateSign;
@@ -17,7 +17,7 @@
  import net.minecraft.network.packet.Packet13PlayerLookMove;
  import net.minecraft.network.packet.Packet14BlockDig;
  import net.minecraft.network.packet.Packet15Place;
-@@ -634,6 +637,7 @@
+@@ -615,6 +618,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(ChatMessageComponent.func_111077_e("chat.cannotSend").func_111059_a(EnumChatFormatting.RED)));
-@@ -1009,6 +1013,11 @@
+@@ -997,6 +1001,11 @@
      }
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
@@ -37,9 +37,9 @@
      {
          DataInputStream datainputstream;
          ItemStack itemstack;
-@@ -1173,4 +1182,18 @@
-             }
-         }
+@@ -1166,4 +1175,18 @@
+     {
+         return this.field_72576_c;
      }
 +    
 +

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

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.BufferedOutputStream;
-@@ -386,6 +387,7 @@
+@@ -392,6 +393,7 @@
          if (this.field_74472_n && this.field_74473_o.isEmpty())
          {
              this.field_74485_r.func_72515_a(this.field_74481_v, this.field_74480_w);

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

@@ -7,9 +7,9 @@
  
  public abstract class NetHandler
  {
-@@ -375,4 +377,8 @@
+@@ -382,4 +384,8 @@
      {
-         this.func_72509_a(p_110773_1_);
+         return false;
      }
 +
 +    public abstract void handleVanilla250Packet(Packet250CustomPayload payload);

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

@@ -7,5 +7,5 @@
 -        func_73285_a(131, true, false, Packet131MapData.class);
 +        func_73285_a(131, true, true, Packet131MapData.class);
          func_73285_a(132, true, false, Packet132TileEntityData.class);
+         func_73285_a(133, true, false, Packet133TileEditorOpen.class);
          func_73285_a(200, true, false, Packet200Statistic.class);
-         func_73285_a(201, true, false, Packet201PlayerInfo.class);

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

@@ -1,14 +1,16 @@
 --- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
 +++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
-@@ -1,5 +1,7 @@
+@@ -1,6 +1,9 @@
  package net.minecraft.server.management;
  
+ import com.google.common.base.Charsets;
++
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
 +import cpw.mods.fml.common.registry.GameRegistry;
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.File;
-@@ -120,6 +122,8 @@
+@@ -124,6 +127,8 @@
  
          p_72355_2_.func_71116_b();
  
@@ -17,7 +19,7 @@
          if (nbttagcompound != null && nbttagcompound.func_74764_b("Riding"))
          {
              Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
-@@ -234,6 +238,7 @@
+@@ -238,6 +243,7 @@
  
      public void func_72367_e(EntityPlayerMP p_72367_1_)
      {
@@ -25,7 +27,7 @@
          this.func_72391_b(p_72367_1_);
          WorldServer worldserver = p_72367_1_.func_71121_q();
  
-@@ -391,6 +396,7 @@
+@@ -395,6 +401,7 @@
          this.field_72404_b.add(entityplayermp1);
          entityplayermp1.func_71116_b();
          entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
@@ -33,7 +35,7 @@
          return entityplayermp1;
      }
  
-@@ -416,6 +422,8 @@
+@@ -420,6 +427,8 @@
              PotionEffect potioneffect = (PotionEffect)iterator.next();
              p_72356_1_.field_71135_a.func_72567_b(new Packet41EntityEffect(p_72356_1_.field_70157_k, potioneffect));
          }

fml/patches/minecraft/net/minecraft/world/World.java.patch

@@ -16,7 +16,7 @@
  
          this.field_72984_F.func_76318_c("pendingTileEntities");
  
-@@ -3645,7 +3646,7 @@
+@@ -3646,7 +3647,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {