Update for minecraft 1.5.2

fml/commands.patch

@@ -44,7 +44,7 @@
          self.cmdstartsrv = self.config.get('COMMANDS', 'CmdStartSrv', raw=1) % self.cmdjava
          self.cmdstartclt = self.config.get('COMMANDS', 'CmdStartClt', raw=1) % self.cmdjava
  
-@@ -751,6 +760,36 @@
+@@ -753,6 +762,36 @@
          self.cmdjavac = '"%s"' % os.path.join(results[0], 'javac')
          self.cmdjava = '"%s"' % os.path.join(results[0], 'java')
  
@@ -81,7 +81,7 @@
      def checkjars(self, side):
          jarlk = {CLIENT: self.jarclient, SERVER: self.jarserver}
          md5jarlk = {CLIENT: self.md5jarclt, SERVER: self.md5jarsrv}
-@@ -796,6 +835,8 @@
+@@ -798,6 +837,8 @@
          binlk = {CLIENT: self.binclient, SERVER: self.binserver}
          testlk = {CLIENT: self.testclient, SERVER: self.testserver}
  
@@ -90,7 +90,7 @@
          if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
              return False
          return True
-@@ -1036,6 +1077,9 @@
+@@ -1038,6 +1079,9 @@
          pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@@ -100,7 +100,7 @@
  
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
-@@ -1049,6 +1093,29 @@
+@@ -1051,6 +1095,29 @@
              all_files = True
              append_pattern = False
          pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
@@ -130,7 +130,7 @@
          dirs = ' '.join(pkglist)
          classpath = os.pathsep.join(cplk[side])
          forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-@@ -1057,7 +1124,7 @@
+@@ -1059,7 +1126,7 @@
              self.runcmd(forkcmd, log_file=pathlog[side])
          except CalledProcessError as ex:
              self.logger.error('')
@@ -139,7 +139,7 @@
              self.logger.error('')
              for line in ex.output.splitlines():
                  if line.strip():
-@@ -1070,7 +1137,7 @@
+@@ -1072,7 +1139,7 @@
              raise
  
      def startserver(self):
@@ -148,7 +148,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1078,7 +1145,7 @@
+@@ -1080,7 +1147,7 @@
          self.runmc(forkcmd)
  
      def startclient(self):
@@ -157,7 +157,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          natives = os.path.join('..', self.dirnatives)
-@@ -1205,20 +1272,20 @@
+@@ -1207,20 +1274,20 @@
          with open(self.csvmethods, 'rb') as fh:
              methodsreader = csv.DictReader(fh)
              for row in methodsreader:
@@ -181,7 +181,7 @@
                          names['params'][row['param']] = row['name']
  
          regexps = {
-@@ -1352,13 +1419,13 @@
+@@ -1354,13 +1421,13 @@
          methods = {}
          for row in methodsreader:
              #HINT: Only include methods that have a non-empty description
@@ -197,7 +197,7 @@
                  fields[row['searge']] = row['desc'].replace('*/', '* /')
  
          regexps = {
-@@ -1435,7 +1502,7 @@
+@@ -1437,7 +1504,7 @@
          self.runcmd(forkcmd)
          return True
  
@@ -206,7 +206,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1450,6 +1517,9 @@
+@@ -1452,6 +1519,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -216,7 +216,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))
-@@ -1546,6 +1616,8 @@
+@@ -1548,6 +1618,8 @@
          if not os.path.exists(outpathlk[side]):
              os.makedirs(outpathlk[side])
  
@@ -225,7 +225,7 @@
          # HINT: We extract the modified class files
          with closing(zipfile.ZipFile(jarlk[side])) as zipjar:
              for in_class in trgclasses:
-@@ -1559,6 +1631,23 @@
+@@ -1561,6 +1633,23 @@
                      out_class = out_class.replace(self.nullpkg, '')
                      if out_class[0] == '/':
                          out_class = out_class[1:]
@@ -249,7 +249,7 @@
                  try:
                      zipjar.extract(out_class, outpathlk[side])
                      self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class)
-@@ -1605,6 +1694,9 @@
+@@ -1607,6 +1696,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -259,7 +259,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1625,6 +1717,9 @@
+@@ -1627,6 +1719,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}
@@ -268,4 +268,4 @@
 +            return
  
          # HINT: We need a table for the old md5 and the new ones
-         md5table = {}
+         md5table = {}

fml/common/fml_at.cfg

@@ -9,21 +9,21 @@ public mv.c #FD:EntityList/field_75626_c #classToNameMap
 public mv.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 #public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
-public bgf.g #FD:RenderEngine/field_78366_k #texturePack
+public bge.g #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bgz.q #FD:RenderManager/field_78729_o #renderers
+public bgy.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bgg.* #FD:RenderBlocks/*
-public bgg.*() #MD:RenderBlocks/*
+public bgf.* #FD:RenderBlocks/*
+public bgf.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bhu.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bhh.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bhg.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 public bp.b #FD:StringTranslate/field_74815_b
 public bp.e #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bje.m #FD:TileEntityRenderer/field_76966_m
+public bjd.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
 public yk.a(Lwm;[Ljava/lang/Object;)Lyn; #MD:CraftingManager/func_92103_a
 public yk.b(Lwm;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
@@ -37,7 +37,7 @@ public ka.a #FD:StatBase/field_75978_a #statName
 public jf.a(Ljf;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
 public jf.g #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public jc.cr()V #MD:EntityPlayerMP/func_71117_bO
+public jc.ct()V #MD:EntityPlayerMP/func_71117_bO
 public jc.cu #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
 public oo #CL:EntityAITaskEntry

fml/conf/fields.csv

@@ -263,7 +263,7 @@ field_70546_d,particleAge,2,
 field_70547_e,particleMaxAge,2,
 field_70548_b,particleTextureJitterX,2,
 field_70549_c,particleTextureJitterY,2,
-field_70550_a,particleTextureIndex,2,
+field_70550_a,particleIcon,2,The icon field from which the given particle pulls its texture.
 field_70551_j,particleBlue,2,"The blue amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
 field_70552_h,particleRed,2,"The red amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
 field_70553_i,particleGreen,2,"The green amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
@@ -389,8 +389,12 @@ field_70855_f,attackTimer,2,
 field_70856_g,holdRoseTick,2,
 field_70857_d,villageObj,2,
 field_70858_e,homeCheckTimer,2,"deincrements, and a distance-to-home check is done at 0"
+field_70859_f,squidYaw,2,
+field_70860_g,prevSquidYaw,2,
+field_70861_d,squidPitch,2,
+field_70862_e,prevSquidPitch,2,
 field_70863_bz,randomMotionSpeed,2,
-field_70865_by,lastTentacleAngle,2,the last calculated angle of the tentacles in radians
+field_70865_by,prevTentacleAngle,2,the last calculated angle of the tentacles in radians
 field_70866_j,tentacleAngle,2,angle of the tentacles in radians
 field_70869_bD,randomMotionVecY,2,
 field_70870_bE,randomMotionVecZ,2,
@@ -2885,6 +2889,7 @@ field_76168_c,capacity,2,the maximum amount of elements in the hash (probably 3/
 field_76169_a,hashArray,2,the array of all elements in the hash
 field_76171_a,texturePacks,2,
 field_76172_a,parent,2,
+field_76173_f,maxFileSize,2,
 field_76174_d,destinationFile,2,
 field_76175_e,downloadSuccess,2,
 field_76176_b,sourceURL,2,
@@ -4306,6 +4311,7 @@ field_82135_d,isBeaconActive,2,
 field_82136_e,levels,2,Level of this beacon's pyramid.
 field_82139_a,effectsList,2,List of effects that Beacon can apply
 field_82140_h,payment,2,Item given to this beacon as payment.
+field_82151_R,distanceWalkedOnStepModified,2,
 field_82152_aq,teleportDirection,2,
 field_82153_h,timeInPortal,2,
 field_82155_f,isAnvil,2,
@@ -4320,6 +4326,7 @@ field_82176_d,armorProbability,2,Probability to get armor
 field_82177_b,enchantmentProbability,2,An array of probabilities that determines whether a random enchantment should be added to the held item. Indexed by difficulty.
 field_82178_c,armorEnchantmentProbability,2,Probability to get enchanted armor
 field_82179_bU,persistenceRequired,2,Whether this entity should NOT despawn.
+field_82180_bT,previousEquipment,2,"The equipment this mob was previously wearing, used for syncing."
 field_82181_as,pickUpLootProability,2,Probability to pick up loot
 field_82182_bS,equipment,2,Equipment (armor and held item) for this entity.
 field_82184_d,aiControlledByPlayer,2,AI task for player control.
@@ -4611,6 +4618,8 @@ field_90051_a,theMinecraft,2,
 field_90053_a,theMinecraft,2,
 field_90055_a,theMinecraft,2,
 field_92014_j,explosionStrength,2,The explosion radius of spawned fireballs.
+field_92016_l,highlightingItemStack,2,The ItemStack that is currently being highlighted
+field_92017_k,remainingHighlightTicks,2,Remaining ticks the item highlight should be visible
 field_92039_az,fireworkExplosions,2,
 field_92055_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes.
 field_92056_a,fireworkAge,2,The age of the firework in ticks.
@@ -4626,6 +4635,7 @@ field_92106_bV,fireworkCharge,2,
 field_92117_D,heldItemTooltips,2,
 field_92118_B,overrideWidth,2,
 field_92119_C,overrideHeight,2,
+field_94050_c,customName,2,
 field_94054_b,particleTextureIndexX,2,
 field_94055_c,particleTextureIndexY,2,
 field_94084_b,tntPlacedBy,2,
@@ -4751,6 +4761,8 @@ field_94379_b,cactusBottomIcon,2,
 field_94380_a,cactusTopIcon,2,
 field_94381_b,cakeBottomIcon,2,
 field_94383_a,cakeTopIcon,2,
+field_94384_b,workbenchIconFront,2,
+field_94385_a,workbenchIconTop,2,
 field_94386_b,woodTextureTypes,2,
 field_94387_c,iconArray,2,
 field_94388_cO,tree_top,2,
@@ -4776,6 +4788,7 @@ field_94435_b,iconSnowSide,2,
 field_94436_c,iconGrassSideOverlay,2,
 field_94437_a,iconGrassTop,2,
 field_94439_c,iconArray,2,
+field_94443_a,isTrapped,2,Determines whether of not the chest is trapped.
 field_94445_a,iconArray,2,
 field_94447_a,theIcon,2,
 field_94449_b,theIcon,2,
@@ -4783,6 +4796,8 @@ field_94450_a,theIcon,2,
 field_94454_cO,hopperInsideIcon,2,
 field_94455_b,hopperIcon,2,
 field_94456_c,hopperTopIcon,2,
+field_94458_cO,furnaceIconTop,2,
+field_94459_cP,furnaceIconFront,2,
 field_94462_cO,furnaceFrontIcon,2,
 field_94463_c,furnaceTopIcon,2,
 field_94465_b,doorTypeForIcon,2,Used for pointing at icon names.
@@ -4792,6 +4807,9 @@ field_94469_b,iconArray,2,
 field_94470_a,cocoaIcons,2,
 field_94471_cO,bedTopIcons,2,
 field_94473_c,bedSideIcons,2,
+field_94497_cO,topIcon,2,Top icon of piston depends on (either sticky or normal)
+field_94498_b,innerTopIcon,2,Only visible when piston is extended
+field_94499_c,bottomIcon,2,Bottom side texture
 field_94500_e,useProvidedWindowTitle,2,"If false, the client will look up a string like ""window.minecart"". If true, the client uses what the server provides."
 field_94512_f,isStraightRail,2,
 field_94513_g,railChunkPosition,2,The chunk position the rail is at.
@@ -4801,7 +4819,7 @@ field_94516_b,logicWorld,2,
 field_94517_c,railX,2,
 field_94518_a,theRail,2,
 field_94557_a,selectAnything,2,
-field_94582_cb,tntMinecart,2,
+field_94582_cb,minecartTnt,2,
 field_94583_ca,netherQuartz,2,
 field_94584_bZ,netherrackBrick,2,
 field_94585_bY,comparator,2,
@@ -4813,6 +4831,8 @@ field_94601_a,bowPullIconNameArray,2,
 field_94610_a,theTileEntity,2,
 field_94612_a,theTileEntity,2,
 field_96093_i,entityUniqueID,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.
 field_96291_i,pointedEntityLiving,2,
 field_96442_D,worldScoreboard,2,
@@ -4842,16 +4862,19 @@ field_96492_e,playerNames,2,Only if mode = 0 or 3 or 4. Players to be added/remo
 field_96493_b,teamDisplayName,2,Only if mode = 0 or 2.
 field_96494_c,teamPrefix,2,Only if mode = 0 or 2. Displayed before the players' name that are part of this team.
 field_96495_a,teamName,2,A unique name for the team.
+field_96540_f,teamMemberships,2,Map of usernames to ScorePlayerTeam objects.
 field_96545_a,scoreObjectives,2,Map of objective names to ScoreObjective objects.
 field_96564_a,theEntity,2,
 field_96566_b,selectInventories,2,
 field_96569_b,theEntityTracker,2,
-field_96600_cc,hopperMinecart,2,
+field_96600_cc,minecartHopper,2,
 field_96601_a,theBlock,2,
 field_96602_b,dispenserMinecartBehavior,2,
 field_96633_b,playerInventory,2,
 field_96634_a,theItemStack,2,
 field_96656_b,theScoreboard,2,
+field_96676_c,membershipSet,2,A set of all team member usernames.
+field_96677_a,theScoreboard,2,
 field_96683_d,displayName,2,
 field_96684_b,name,2,
 field_96685_c,objectiveCriteria,2,The ScoreObjectiveCriteria for this objetive

fml/conf/joined.exc

@@ -167,6 +167,7 @@ net/minecraft/client/Minecraft.func_71404_a(Lnet/minecraft/src/CrashReport;)V=|p
 net/minecraft/client/Minecraft.func_71409_c(Ljava/lang/String;)Z=|p_71409_1_
 net/minecraft/client/Minecraft.main([Ljava/lang/String;)V=|p_main_0_
 net/minecraft/server/MinecraftServer.<init>(Ljava/io/File;)V=|p_i3375_1_
+net/minecraft/server/MinecraftServer.func_104055_i(Z)V=|p_104055_1_
 net/minecraft/server/MinecraftServer.func_70000_a(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70000_1_
 net/minecraft/server/MinecraftServer.func_70001_b(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70001_1_
 net/minecraft/server/MinecraftServer.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
@@ -867,6 +868,7 @@ net/minecraft/src/BlockFurnace.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71
 net/minecraft/src/BlockFurnace.func_71862_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71862_1_,p_71862_2_,p_71862_3_,p_71862_4_,p_71862_5_
 net/minecraft/src/BlockFurnace.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71885_2_,p_71885_3_
 net/minecraft/src/BlockFurnace.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
+net/minecraft/src/BlockFurnace.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_
 net/minecraft/src/BlockFurnace.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_
 net/minecraft/src/BlockFurnace.func_72285_l(Lnet/minecraft/src/World;III)V=|p_72285_1_,p_72285_2_,p_72285_3_,p_72285_4_
 net/minecraft/src/BlockFurnace.func_72286_a(ZLnet/minecraft/src/World;III)V=|p_72286_0_,p_72286_1_,p_72286_2_,p_72286_3_,p_72286_4_
@@ -3874,7 +3876,7 @@ net/minecraft/src/GuiCommandBlock.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73
 net/minecraft/src/GuiCommandBlock.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiCommandBlock.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiCommandBlock.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiConfirmOpenLink.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;I)V=|p_i3102_1_,p_i3102_2_,p_i3102_3_
+net/minecraft/src/GuiConfirmOpenLink.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;IZ)V=|p_i23004_1_,p_i23004_2_,p_i23004_3_,p_i23004_4_
 net/minecraft/src/GuiConfirmOpenLink.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiConfirmOpenLink.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiConnecting.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=|p_i11014_1_,p_i11014_2_,p_i11014_3_,p_i11014_4_
@@ -4025,6 +4027,26 @@ net/minecraft/src/GuiLogOutputHandler.<init>(Ljavax/swing/JTextArea;)V=|p_i4102_
 net/minecraft/src/GuiLogOutputHandler.close()V=|
 net/minecraft/src/GuiLogOutputHandler.flush()V=|
 net/minecraft/src/GuiLogOutputHandler.publish(Ljava/util/logging/LogRecord;)V=|p_publish_1_
+net/minecraft/src/GuiMainMenu.func_104004_a(Lnet/minecraft/src/GuiMainMenu;)Ljava/lang/Object;=|p_104004_0_
+net/minecraft/src/GuiMainMenu.func_104005_a(Lnet/minecraft/src/GuiMainMenu;Ljava/lang/String;)Ljava/lang/String;=|p_104005_0_,p_104005_1_
+net/minecraft/src/GuiMainMenu.func_104006_a(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104006_0_,p_104006_1_
+net/minecraft/src/GuiMainMenu.func_104007_d(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/src/FontRenderer;=|p_104007_0_
+net/minecraft/src/GuiMainMenu.func_104008_c(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104008_0_,p_104008_1_
+net/minecraft/src/GuiMainMenu.func_104009_d(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104009_0_,p_104009_1_
+net/minecraft/src/GuiMainMenu.func_98059_a(Z)Z=|p_98059_0_
+net/minecraft/src/GuiMainMenu.func_104011_e(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104011_0_,p_104011_1_
+net/minecraft/src/GuiMainMenu.func_104012_f(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104012_0_,p_104012_1_
+net/minecraft/src/GuiMainMenu.func_104013_b(Lnet/minecraft/src/GuiMainMenu;Ljava/lang/String;)Ljava/lang/String;=|p_104013_0_,p_104013_1_
+net/minecraft/src/GuiMainMenu.func_104014_b(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104014_0_,p_104014_1_
+net/minecraft/src/GuiMainMenu.func_104015_f(Lnet/minecraft/src/GuiMainMenu;)I=|p_104015_0_
+net/minecraft/src/GuiMainMenu.func_104016_e(Lnet/minecraft/src/GuiMainMenu;)I=|p_104016_0_
+net/minecraft/src/GuiMainMenu.func_98058_a(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/client/Minecraft;=|p_98058_0_
+net/minecraft/src/GuiMainMenu.func_104018_h(Lnet/minecraft/src/GuiMainMenu;)I=|p_104018_0_
+net/minecraft/src/GuiMainMenu.func_104019_g(Lnet/minecraft/src/GuiMainMenu;)Ljava/util/List;=|p_104019_0_
+net/minecraft/src/GuiMainMenu.func_104020_i(Lnet/minecraft/src/GuiMainMenu;)I=|p_104020_0_
+net/minecraft/src/GuiMainMenu.func_98061_a(Lnet/minecraft/src/GuiMainMenu;Lnet/minecraft/src/StringTranslate;II)V=|p_98061_0_,p_98061_1_,p_98061_2_,p_98061_3_
+net/minecraft/src/GuiMainMenu.func_104022_c(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/src/FontRenderer;=|p_104022_0_
+net/minecraft/src/GuiMainMenu.func_104023_b(Lnet/minecraft/src/GuiMainMenu;)Ljava/lang/String;=|p_104023_0_
 net/minecraft/src/GuiMainMenu.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiMainMenu.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiMainMenu.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
@@ -4036,10 +4058,7 @@ net/minecraft/src/GuiMainMenu.func_73970_b(IIF)V=|p_73970_1_,p_73970_2_,p_73970_
 net/minecraft/src/GuiMainMenu.func_73971_c(IIF)V=|p_73971_1_,p_73971_2_,p_73971_3_
 net/minecraft/src/GuiMainMenu.func_73972_b(IILnet/minecraft/src/StringTranslate;)V=|p_73972_1_,p_73972_2_,p_73972_3_
 net/minecraft/src/GuiMainMenu.func_96137_a(Lnet/minecraft/src/StringTranslate;II)V=|p_96137_1_,p_96137_2_,p_96137_3_
-net/minecraft/src/GuiMainMenu.func_98058_a(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/client/Minecraft;=|p_98058_0_
-net/minecraft/src/GuiMainMenu.func_98059_a(Z)Z=|p_98059_0_
 net/minecraft/src/GuiMainMenu.func_98060_b(Lnet/minecraft/src/StringTranslate;II)V=|p_98060_1_,p_98060_2_,p_98060_3_
-net/minecraft/src/GuiMainMenu.func_98061_a(Lnet/minecraft/src/GuiMainMenu;Lnet/minecraft/src/StringTranslate;II)V=|p_98061_0_,p_98061_1_,p_98061_2_,p_98061_3_
 net/minecraft/src/GuiMemoryErrorScreen.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiMemoryErrorScreen.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiMemoryErrorScreen.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
@@ -4149,19 +4168,13 @@ net/minecraft/src/GuiScreenConfigureWorld.func_96274_a(Lnet/minecraft/src/GuiScr
 net/minecraft/src/GuiScreenConfirmation.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i10019_1_,p_i10019_2_,p_i10019_3_,p_i10019_4_,p_i10019_5_
 net/minecraft/src/GuiScreenConfirmation.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenCreateOnlineWorld.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i10010_1_
+net/minecraft/src/GuiScreenCreateOnlineWorld.func_96246_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96246_0_
+net/minecraft/src/GuiScreenCreateOnlineWorld.func_96247_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/GuiScreen;=|p_96247_0_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_96246_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96246_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_96247_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/GuiScreen;=|p_96247_0_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_96248_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96248_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_96251_a(Lnet/minecraft/src/Location;Ljava/lang/String;Ljava/lang/String;)V=|p_96251_1_,p_96251_2_,p_96251_3_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98099_d(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_98099_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98100_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Lnet/minecraft/src/Location;)Lnet/minecraft/src/Location;=|p_98100_0_,p_98100_1_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98101_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/Location;=|p_98101_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98102_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/util/List;)Ljava/util/List;=|p_98102_0_,p_98102_1_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98103_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Ljava/util/List;=|p_98103_0_
 net/minecraft/src/GuiScreenDemo.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenDemo.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiScreenDisconnectedOnline.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V=|p_i11007_1_,p_i11007_2_,p_i11007_3_,p_i11007_4_
@@ -4186,18 +4199,27 @@ net/minecraft/src/GuiScreenLongRunningTask.func_73875_a(Lnet/minecraft/src/GuiBu
 net/minecraft/src/GuiScreenLongRunningTask.func_96209_a(Ljava/lang/String;)V=|p_96209_1_
 net/minecraft/src/GuiScreenLongRunningTask.func_96210_b(Ljava/lang/String;)V=|p_96210_1_
 net/minecraft/src/GuiScreenOnlineServers.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i10007_1_
-net/minecraft/src/GuiScreenOnlineServers.func_101000_n(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101000_0_
+net/minecraft/src/GuiScreenOnlineServers.func_98079_k(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98079_0_
 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_101002_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_101002_0_,p_101002_1_
-net/minecraft/src/GuiScreenOnlineServers.func_101003_a(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_101003_0_,p_101003_1_,p_101003_2_,p_101003_3_,p_101003_4_
-net/minecraft/src/GuiScreenOnlineServers.func_101004_o(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_101004_0_
-net/minecraft/src/GuiScreenOnlineServers.func_101005_j(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101005_0_
 net/minecraft/src/GuiScreenOnlineServers.func_101006_d(IIII)V=|p_101006_1_,p_101006_2_,p_101006_3_,p_101006_4_
 net/minecraft/src/GuiScreenOnlineServers.func_101008_c(IIII)V=|p_101008_1_,p_101008_2_,p_101008_3_,p_101008_4_
 net/minecraft/src/GuiScreenOnlineServers.func_101009_c(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_101009_0_,p_101009_1_,p_101009_2_,p_101009_3_,p_101009_4_
-net/minecraft/src/GuiScreenOnlineServers.func_101011_a(Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String;=|p_101011_0_,p_101011_1_
 net/minecraft/src/GuiScreenOnlineServers.func_101012_b(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_101012_0_,p_101012_1_,p_101012_2_,p_101012_3_,p_101012_4_
 net/minecraft/src/GuiScreenOnlineServers.func_102018_a(J)V=|p_102018_1_
+net/minecraft/src/GuiScreenOnlineServers.func_101011_a(Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String;=|p_101011_0_,p_101011_1_
+net/minecraft/src/GuiScreenOnlineServers.func_98074_m(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98074_0_
+net/minecraft/src/GuiScreenOnlineServers.func_98087_l(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98087_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101004_o(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_101004_0_
+net/minecraft/src/GuiScreenOnlineServers.func_104030_a(Lnet/minecraft/src/GuiScreenOnlineServers;IIIII)V=|p_104030_0_,p_104030_1_,p_104030_2_,p_104030_3_,p_104030_4_,p_104030_5_
+net/minecraft/src/GuiScreenOnlineServers.func_104031_c(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_104031_0_,p_104031_1_,p_104031_2_,p_104031_3_,p_104031_4_
+net/minecraft/src/GuiScreenOnlineServers.func_104032_j(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_104032_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101000_n(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101000_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101002_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_101002_0_,p_101002_1_
+net/minecraft/src/GuiScreenOnlineServers.func_98091_h(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98091_0_
+net/minecraft/src/GuiScreenOnlineServers.func_104038_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_104038_0_
+net/minecraft/src/GuiScreenOnlineServers.func_104039_b(IIIII)V=|p_104039_1_,p_104039_2_,p_104039_3_,p_104039_4_,p_104039_5_
+net/minecraft/src/GuiScreenOnlineServers.func_98084_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98084_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101005_j(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101005_0_
 net/minecraft/src/GuiScreenOnlineServers.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenOnlineServers.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenOnlineServers.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
@@ -4207,19 +4229,17 @@ net/minecraft/src/GuiScreenOnlineServers.func_96165_a(Ljava/lang/String;II)V=|p_
 net/minecraft/src/GuiScreenOnlineServers.func_96174_a(Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_96174_1_
 net/minecraft/src/GuiScreenOnlineServers.func_96177_a(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_96177_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98072_d(Lnet/minecraft/src/GuiScreenOnlineServers;)I=|p_98072_0_
-net/minecraft/src/GuiScreenOnlineServers.func_98074_m(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98074_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98075_b(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98075_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98076_f(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98076_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98078_c(Lnet/minecraft/src/GuiScreenOnlineServers;I)V=|p_98078_0_,p_98078_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98079_k(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98079_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98081_a(Lnet/minecraft/src/GuiScreenOnlineServers;I)I=|p_98081_0_,p_98081_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98084_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98084_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98086_a(J)Lnet/minecraft/src/McoServer;=|p_98086_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98087_l(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98087_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98089_b(Lnet/minecraft/src/GuiScreenOnlineServers;I)I=|p_98089_0_,p_98089_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98091_h(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98091_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98092_g(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/GuiButton;=|p_98092_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98094_c(Lnet/minecraft/src/GuiScreenOnlineServers;)Ljava/util/List;=|p_98094_0_
+net/minecraft/src/GuiScreenOnlineServersSubscreen.<init>(IIII)V=|p_i23000_1_,p_i23000_2_,p_i23000_3_,p_i23000_4_
+net/minecraft/src/GuiScreenOnlineServersSubscreen.func_104069_a(Lnet/minecraft/src/GuiButton;)V=|p_104069_1_
+net/minecraft/src/GuiScreenOnlineServersSubscreen.func_104071_a(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/FontRenderer;)V=|p_104071_1_,p_104071_2_
 net/minecraft/src/GuiScreenResetWorld.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/McoServer;)V=|p_i10003_1_,p_i10003_2_
 net/minecraft/src/GuiScreenResetWorld.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenResetWorld.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -4227,16 +4247,14 @@ net/minecraft/src/GuiScreenResetWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenResetWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiScreenResetWorld.func_96147_b(Lnet/minecraft/src/GuiScreenResetWorld;)Lnet/minecraft/client/Minecraft;=|p_96147_0_
 net/minecraft/src/GuiScreenResetWorld.func_96148_a(Lnet/minecraft/src/GuiScreenResetWorld;)Lnet/minecraft/src/GuiScreen;=|p_96148_0_
-net/minecraft/src/GuiScreenSelectLocation.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/util/List;Lnet/minecraft/src/Location;Ljava/lang/String;Ljava/lang/String;)V=|p_i10005_1_,p_i10005_2_,p_i10005_3_,p_i10005_4_,p_i10005_5_
+net/minecraft/src/GuiScreenSelectLocation.<init>(Lnet/minecraft/client/Minecraft;IIIII)V=|p_i23001_1_,p_i23001_2_,p_i23001_3_,p_i23001_4_,p_i23001_5_,p_i23001_6_
+net/minecraft/src/GuiScreenSelectLocation.func_104083_b(IIII)V=|p_104083_1_,p_104083_2_,p_104083_3_,p_104083_4_
+net/minecraft/src/GuiScreenSelectLocation.func_104084_a(IIII)V=|p_104084_1_,p_104084_2_,p_104084_3_,p_104084_4_
+net/minecraft/src/GuiScreenSelectLocation.func_104087_b(II)V=|p_104087_1_,p_104087_2_
+net/minecraft/src/GuiScreenSelectLocation.func_104088_a(IILnet/minecraft/src/Tessellator;)V=|p_104088_1_,p_104088_2_,p_104088_3_
+net/minecraft/src/GuiScreenSelectLocation.func_104089_a(II)V=|p_104089_1_,p_104089_2_
 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_96230_c(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/GuiSmallButton;=|p_96230_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96231_e(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96231_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96232_a(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/client/Minecraft;=|p_96232_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96233_d(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/Location;=|p_96233_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96234_a(Lnet/minecraft/src/GuiScreenSelectLocation;Lnet/minecraft/src/Location;)Lnet/minecraft/src/Location;=|p_96234_0_,p_96234_1_
-net/minecraft/src/GuiScreenSelectLocation.func_96235_f(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96235_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96236_b(Lnet/minecraft/src/GuiScreenSelectLocation;)Ljava/util/List;=|p_96236_0_
 net/minecraft/src/GuiScreenServerList.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/ServerData;)V=|p_i3066_1_,p_i3066_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_
@@ -4297,6 +4315,7 @@ net/minecraft/src/GuiSlotLanguage.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotLanguage.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/GuiSlotLanguage.func_77218_a(I)Z=|p_77218_1_
 net/minecraft/src/GuiSlotOnlineServerList.<init>(Lnet/minecraft/src/GuiScreenOnlineServers;)V=|p_i10004_1_
+net/minecraft/src/GuiSlotOnlineServerList.func_104086_b(I)Z=|p_104086_1_
 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_77218_a(I)Z=|p_77218_1_
@@ -4436,6 +4455,7 @@ net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String
 net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i3048_1_,p_i3048_2_,p_i3048_3_,p_i3048_4_,p_i3048_5_,p_i3048_6_
 net/minecraft/src/GuiYesNo.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiYesNo.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
+net/minecraft/src/HttpUtil.func_104145_a(Ljava/net/URL;)Ljava/lang/String;=java/io/IOException|p_104145_0_
 net/minecraft/src/HttpUtil.func_76179_a(Ljava/util/Map;)Ljava/lang/String;=|p_76179_0_
 net/minecraft/src/HttpUtil.func_76180_a(Lnet/minecraft/src/ILogAgent;Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String;=|p_76180_0_,p_76180_1_,p_76180_2_,p_76180_3_
 net/minecraft/src/HttpUtil.func_76181_a()I=java/io/IOException|
@@ -4936,9 +4956,6 @@ net/minecraft/src/LoadingScreenRenderer.func_73719_c(Ljava/lang/String;)V=|p_737
 net/minecraft/src/LoadingScreenRenderer.func_73720_a(Ljava/lang/String;)V=|p_73720_1_
 net/minecraft/src/LoadingScreenRenderer.func_73721_b(Ljava/lang/String;)V=|p_73721_1_
 net/minecraft/src/LoadingScreenRenderer.func_73722_d(Ljava/lang/String;)V=|p_73722_1_
-net/minecraft/src/Location.func_98167_a(Largo/jdom/JsonNode;)Lnet/minecraft/src/Location;=|p_98167_0_
-net/minecraft/src/Location.func_98168_a(Largo/jdom/JsonNode;Ljava/lang/String;)Lnet/minecraft/src/Location;=|p_98168_0_,p_98168_1_
-net/minecraft/src/Locations.func_98174_a(Ljava/lang/String;)Lnet/minecraft/src/Locations;=|p_98174_0_
 net/minecraft/src/LogAgent.<init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_i11036_1_,p_i11036_2_,p_i11036_3_
 net/minecraft/src/LogAgent.func_98076_a()Ljava/util/logging/Logger;=|
 net/minecraft/src/LogAgent.func_98230_d(Ljava/lang/String;)V=|p_98230_1_
@@ -5059,7 +5076,7 @@ net/minecraft/src/MathHelper.func_82716_a(Ljava/util/Random;DD)D=|p_82716_0_,p_8
 net/minecraft/src/McoClient.<init>(Lnet/minecraft/src/Session;)V=|p_i20001_1_
 net/minecraft/src/McoClient.func_96374_a(J)Lnet/minecraft/src/McoServerAddress;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96374_1_
 net/minecraft/src/McoClient.func_96375_b()Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|
-net/minecraft/src/McoClient.func_96376_d(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96376_1_
+net/minecraft/src/McoClient.func_96376_d(JLjava/lang/String;)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96376_1_,p_96376_3_
 net/minecraft/src/McoClient.func_96377_a(Lnet/minecraft/src/Request;)Ljava/lang/String;=net/minecraft/src/ExceptionMcoService|p_96377_1_
 net/minecraft/src/McoClient.func_96378_c(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96378_1_
 net/minecraft/src/McoClient.func_96379_c()I=net/minecraft/src/ExceptionMcoService|
@@ -5067,9 +5084,8 @@ net/minecraft/src/McoClient.func_96380_a(Ljava/lang/String;)Ljava/lang/String;=j
 net/minecraft/src/McoClient.func_96381_a(JLjava/lang/String;)V=net/minecraft/src/ExceptionMcoService|p_96381_1_,p_96381_3_
 net/minecraft/src/McoClient.func_96382_a()Lnet/minecraft/src/ValueObjectList;=net/minecraft/src/ExceptionMcoService|
 net/minecraft/src/McoClient.func_96383_b(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96383_1_
-net/minecraft/src/McoClient.func_96384_a(JLjava/lang/String;Ljava/lang/String;)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96384_1_,p_96384_3_,p_96384_4_
-net/minecraft/src/McoClient.func_96385_d()Lnet/minecraft/src/Locations;=net/minecraft/src/ExceptionMcoService,java/io/IOException|
-net/minecraft/src/McoClient.func_96386_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=java/io/IOException,net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96386_1_,p_96386_2_,p_96386_3_
+net/minecraft/src/McoClient.func_96384_a(JLjava/lang/String;Ljava/lang/String;II)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96384_1_,p_96384_3_,p_96384_4_,p_96384_5_,p_96384_6_
+net/minecraft/src/McoClient.func_96386_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96386_1_,p_96386_2_,p_96386_3_,p_96386_4_
 net/minecraft/src/McoClient.func_96387_b(JLjava/lang/String;)Lnet/minecraft/src/McoServer;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96387_1_,p_96387_3_
 net/minecraft/src/McoClient.func_98176_a(J)Lnet/minecraft/src/McoServer;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_98176_1_
 net/minecraft/src/McoClient.func_98177_f(J)Lnet/minecraft/src/ValueObjectSubscription;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_98177_1_
@@ -6594,6 +6610,7 @@ net/minecraft/src/RenderZombie.func_82430_a(Lnet/minecraft/src/EntityZombie;FFF)
 net/minecraft/src/ReportedException.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3253_1_
 net/minecraft/src/Request.<init>(Ljava/lang/String;II)V=|p_i10026_1_,p_i10026_2_,p_i10026_3_
 net/minecraft/src/Request.func_100006_a(Ljava/lang/String;Ljava/lang/String;)V=|p_100006_1_,p_100006_2_
+net/minecraft/src/Request.func_104064_a(Ljava/lang/String;Ljava/lang/String;II)Lnet/minecraft/src/Request;=|p_104064_0_,p_104064_1_,p_104064_2_,p_104064_3_
 net/minecraft/src/Request.func_96352_a(Ljava/io/InputStream;)Ljava/lang/String;=java/io/IOException|p_96352_1_
 net/minecraft/src/Request.func_96353_a(Ljava/lang/String;Ljava/lang/String;II)Lnet/minecraft/src/Request;=|p_96353_0_,p_96353_1_,p_96353_2_,p_96353_3_
 net/minecraft/src/Request.func_96355_b(Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96355_0_
@@ -6604,6 +6621,7 @@ net/minecraft/src/RequestDelete.<init>(Ljava/lang/String;II)V=|p_i10031_1_,p_i10
 net/minecraft/src/RequestGet.<init>(Ljava/lang/String;II)V=|p_i10030_1_,p_i10030_2_,p_i10030_3_
 net/minecraft/src/RequestPost.<init>(Ljava/lang/String;[BII)V=|p_i10027_1_,p_i10027_2_,p_i10027_3_,p_i10027_4_
 net/minecraft/src/RequestPut.<init>(Ljava/lang/String;[BII)V=|p_i10029_1_,p_i10029_2_,p_i10029_3_,p_i10029_4_
+net/minecraft/src/RunnableTitleScreen.<init>(Lnet/minecraft/src/GuiMainMenu;)V=|p_i23005_1_
 net/minecraft/src/SaveFormatComparator.<init>(Ljava/lang/String;Ljava/lang/String;JJLnet/minecraft/src/EnumGameType;ZZZ)V=|p_i3917_1_,p_i3917_2_,p_i3917_3_,p_i3917_5_,p_i3917_7_,p_i3917_8_,p_i3917_9_,p_i3917_10_
 net/minecraft/src/SaveFormatComparator.compareTo(Ljava/lang/Object;)I=|p_compareTo_1_
 net/minecraft/src/SaveFormatComparator.func_75787_a(Lnet/minecraft/src/SaveFormatComparator;)I=|p_75787_1_
@@ -6705,10 +6723,6 @@ net/minecraft/src/SelectionListInvited.func_96609_a(I)Z=|p_96609_1_
 net/minecraft/src/SelectionListInvited.func_96610_a(IIIILnet/minecraft/src/Tessellator;)V=|p_96610_1_,p_96610_2_,p_96610_3_,p_96610_4_,p_96610_5_
 net/minecraft/src/SelectionListInvited.func_96615_a(IZ)V=|p_96615_1_,p_96615_2_
 net/minecraft/src/SelectionListInvited.func_98263_b(IIIILnet/minecraft/src/Tessellator;)V=|p_98263_1_,p_98263_2_,p_98263_3_,p_98263_4_,p_98263_5_
-net/minecraft/src/SelectionListLocation.<init>(Lnet/minecraft/src/GuiScreenSelectLocation;)V=|p_i10002_1_
-net/minecraft/src/SelectionListLocation.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
-net/minecraft/src/SelectionListLocation.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/SelectionListLocation.func_77218_a(I)Z=|p_77218_1_
 net/minecraft/src/ServerAddress.<init>(Ljava/lang/String;I)V=|p_i3096_1_,p_i3096_2_
 net/minecraft/src/ServerAddress.func_78860_a(Ljava/lang/String;)Lnet/minecraft/src/ServerAddress;=|p_78860_0_
 net/minecraft/src/ServerAddress.func_78862_a(Ljava/lang/String;I)I=|p_78862_0_,p_78862_1_
@@ -7074,8 +7088,8 @@ net/minecraft/src/TaskOnlineConnect.func_96580_a(Lnet/minecraft/src/TaskOnlineCo
 net/minecraft/src/TaskOnlineConnect.func_96582_a(Ljava/lang/String;I)V=|p_96582_1_,p_96582_2_
 net/minecraft/src/TaskOnlineConnect.func_96583_a(Lnet/minecraft/src/TaskOnlineConnect;Lnet/minecraft/src/NetClientHandler;)Lnet/minecraft/src/NetClientHandler;=|p_96583_0_,p_96583_1_
 net/minecraft/src/TaskOnlineConnect.func_98172_a(Lnet/minecraft/src/TaskOnlineConnect;)Lnet/minecraft/src/GuiScreen;=|p_98172_0_
-net/minecraft/src/TaskResetWorld.<init>(Lnet/minecraft/src/GuiScreenResetWorld;J)V=|p_i10011_1_,p_i10011_2_
-net/minecraft/src/TaskWorldCreation.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_i10017_1_,p_i10017_2_,p_i10017_3_,p_i10017_4_
+net/minecraft/src/TaskResetWorld.<init>(Lnet/minecraft/src/GuiScreenResetWorld;JLjava/lang/String;)V=|p_i23002_1_,p_i23002_2_,p_i23002_4_
+net/minecraft/src/TaskWorldCreation.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_i23003_1_,p_i23003_2_,p_i23003_3_,p_i23003_4_,p_i23003_5_
 net/minecraft/src/TcpConnection.<init>(Lnet/minecraft/src/ILogAgent;Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException|p_i11026_1_,p_i11026_2_,p_i11026_3_,p_i11026_4_
 net/minecraft/src/TcpConnection.<init>(Lnet/minecraft/src/ILogAgent;Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;Ljava/security/PrivateKey;)V=java/io/IOException|p_i11027_1_,p_i11027_2_,p_i11027_3_,p_i11027_4_,p_i11027_5_
 net/minecraft/src/TcpConnection.func_74424_a(Ljava/lang/String;[Ljava/lang/Object;)V=|p_74424_1_,p_74424_2_
@@ -7122,6 +7136,7 @@ net/minecraft/src/Tessellator.func_78386_a(FFF)V=|p_78386_1_,p_78386_2_,p_78386_
 net/minecraft/src/Texture.<init>(Ljava/lang/String;IIIIIIII)V=|p_i11021_1_,p_i11021_2_,p_i11021_3_,p_i11021_4_,p_i11021_5_,p_i11021_6_,p_i11021_7_,p_i11021_8_,p_i11021_9_
 net/minecraft/src/Texture.<init>(Ljava/lang/String;IIIIIIIILjava/awt/image/BufferedImage;)V=|p_i11023_1_,p_i11023_2_,p_i11023_3_,p_i11023_4_,p_i11023_5_,p_i11023_6_,p_i11023_7_,p_i11023_8_,p_i11023_9_,p_i11023_10_
 net/minecraft/src/Texture.<init>(Ljava/lang/String;IIIIIIILjava/awt/image/BufferedImage;)V=|p_i11022_1_,p_i11022_2_,p_i11022_3_,p_i11022_4_,p_i11022_5_,p_i11022_6_,p_i11022_7_,p_i11022_8_,p_i11022_9_
+net/minecraft/src/Texture.func_104062_b(IILnet/minecraft/src/Texture;)V=|p_104062_1_,p_104062_2_,p_104062_3_
 net/minecraft/src/Texture.func_94272_a(Lnet/minecraft/src/Rect2i;I)V=|p_94272_1_,p_94272_2_
 net/minecraft/src/Texture.func_94277_a(I)V=|p_94277_1_
 net/minecraft/src/Texture.func_94278_a(Ljava/awt/image/BufferedImage;)V=|p_94278_1_
@@ -7181,7 +7196,6 @@ net/minecraft/src/TexturedQuad.func_78236_a(Lnet/minecraft/src/Tessellator;F)V=|
 net/minecraft/src/ThreadClientSleep.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;)V=|p_i3019_1_,p_i3019_2_
 net/minecraft/src/ThreadConnectToOnlineServer.<init>(Lnet/minecraft/src/GuiSlotOnlineServerList;Lnet/minecraft/src/McoServer;)V=|p_i10009_1_,p_i10009_2_
 net/minecraft/src/ThreadConnectToServer.<init>(Lnet/minecraft/src/GuiConnecting;Ljava/lang/String;I)V=|p_i3110_1_,p_i3110_2_,p_i3110_3_
-net/minecraft/src/ThreadCreateOnlineWorldScreen.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)V=|p_i11008_1_
 net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i11000_1_
 net/minecraft/src/ThreadDedicatedServer.run()V=|
 net/minecraft/src/ThreadDownloadImage.<init>(Lnet/minecraft/src/ThreadDownloadImageData;Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)V=|p_i5000_1_,p_i5000_2_,p_i5000_3_
@@ -7541,7 +7555,6 @@ net/minecraft/src/World.func_72900_e(Lnet/minecraft/src/Entity;)V=|p_72900_1_
 net/minecraft/src/World.func_72901_a(Lnet/minecraft/src/Vec3;Lnet/minecraft/src/Vec3;Z)Lnet/minecraft/src/MovingObjectPosition;=|p_72901_1_,p_72901_2_,p_72901_3_
 net/minecraft/src/World.func_72902_n(III)V=|p_72902_1_,p_72902_2_,p_72902_3_
 net/minecraft/src/World.func_72904_c(IIIIII)Z=|p_72904_1_,p_72904_2_,p_72904_3_,p_72904_4_,p_72904_5_,p_72904_6_
-net/minecraft/src/World.func_72906_B()V=net/minecraft/src/MinecraftException|
 net/minecraft/src/World.func_72907_a(Ljava/lang/Class;)I=|p_72907_1_
 net/minecraft/src/World.func_72908_a(DDDLjava/lang/String;FF)V=|p_72908_1_,p_72908_3_,p_72908_5_,p_72908_7_,p_72908_8_,p_72908_9_
 net/minecraft/src/World.func_72909_d(IIIIII)V=|p_72909_1_,p_72909_2_,p_72909_3_,p_72909_4_,p_72909_5_,p_72909_6_
@@ -7600,6 +7613,7 @@ net/minecraft/src/World.func_72980_b(DDDLjava/lang/String;FFZ)V=|p_72980_1_,p_72
 net/minecraft/src/World.func_82733_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/IEntitySelector;)Ljava/util/List;=|p_82733_1_,p_82733_2_,p_82733_3_
 net/minecraft/src/World.func_82734_g(II)I=|p_82734_1_,p_82734_2_
 net/minecraft/src/World.func_82735_a(Lnet/minecraft/src/EntityMinecart;)Lnet/minecraft/src/IUpdatePlayerListBox;=|p_82735_1_
+net/minecraft/src/World.func_72906_B()V=net/minecraft/src/MinecraftException|
 net/minecraft/src/World.func_82738_a(J)V=|p_82738_1_
 net/minecraft/src/World.func_82739_e(IIIII)V=|p_82739_1_,p_82739_2_,p_82739_3_,p_82739_4_,p_82739_5_
 net/minecraft/src/World.func_82740_a(IIIIII)V=|p_82740_1_,p_82740_2_,p_82740_3_,p_82740_4_,p_82740_5_,p_82740_6_

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  = 5c1219d869b87d233de3033688ec7567
-MD5Server  = 9d31b969c3f197a1d40381d5620717ea
+MD5Client  = 6897c3287fb971c9f362eb3ab20f5ddd
+MD5Server  = c4e1bf89e834bd3670c7bf8f13874bc6
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -125,8 +125,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           = 102000
-ParamIndex        = 22000
+RGIndex           = 104000
+ParamIndex        = 23000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

fml/conf/methods.csv

@@ -4,6 +4,11 @@ func_100009_j_,getFacing,2,
 func_100011_g,getIsPotionDurationMax,2,
 func_100012_b,setPotionDurationMax,2,Toggle the isPotionDurationMax field.
 func_100015_a,isKeyDown,2,Returns whether the specified key binding is currently being pressed.
+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_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_102028_d,isSplashPotionEffect,2,
 func_70000_a,addServerStatsToSnooper,2,
 func_70001_b,addServerTypeToSnooper,2,
 func_70002_Q,isSnooperEnabled,2,Returns whether snooping is enabled or not.
@@ -451,7 +456,7 @@ func_70950_c,addDefaultEquipmentAndRecipies,2,"based on the villagers profession
 func_70951_a,getRandomSizedStack,2,
 func_70965_a,attackEntityFromPart,2,
 func_70967_k,setNewTarget,2,Sets a new target for the flight AI. It can be a random coordinate or a nearby player.
-func_70968_i,getDragonHealth,2,Returns the health points of the dragon.
+func_70968_i,getBossHealth,2,Returns the health points of the dragon.
 func_70969_j,updateDragonEnderCrystal,2,Updates the state of the enderdragon's current endercrystal.
 func_70970_a,collideWithEntities,2,Pushes all entities inside the list away from the enderdragon.
 func_70971_b,attackEntitiesInList,2,"Attacks all entities inside this list, dealing 5 hearts of damage."
@@ -1505,6 +1510,7 @@ func_73025_a,doPreChunk,2,
 func_73026_a,getEntityList,2,
 func_73027_a,addEntityToWorld,2,Add an ID to Entity mapping to entityHashSet
 func_73028_b,removeEntityFromWorld,2,
+func_73029_E,doVoidFogParticles,2,
 func_73030_b,getEntitySpawnQueue,2,
 func_73031_a,invalidateBlockReceiveRegion,2,"Invalidates an AABB region of blocks from the receive queue, in the event that the block has been modified client-side in the intervening 80 receive ticks."
 func_73039_n,getEntityTracker,2,Gets the EntityTracker
@@ -1796,6 +1802,7 @@ func_73879_b,mouseMovedOrUp,2,"Called when the mouse is moved or a mouse button
 func_73892_a,getSentHistory,2,"input is relative and is applied directly to the sentHistoryCursor so -1 is the previous message, 1 is the next message from the current cursor position"
 func_73895_u_,completePlayerName,2,Autocompletes player name
 func_73906_g,wakeEntity,2,Wakes the entity from the bed
+func_73907_g,getLeftBorder,2,Gets the distance from the left border of the window to left border of the controls screen
 func_73912_g,makeUseableName,2,"Makes a the name for a world save folder based on your world name, replacing specific characters for _s and appending -s to the end until a free name is available."
 func_73914_h,updateButtonText,2,
 func_73945_e,copyLinkToClipboard,2,Copies the link to the system clipboard.
@@ -2508,6 +2515,7 @@ func_75820_a,writeChunkToNBT,2,"Writes the Chunk passed as an argument to the NB
 func_75821_a,writeChunkNBTTags,2,
 func_75822_a,checkedReadChunkFromNBT,2,Wraps readChunkFromNBT. Checks the coordinates and several NBT tags.
 func_75823_a,readChunkFromNBT,2,Reads the data stored in the passed NBTTagCompound and creates a Chunk with that data in the passed World. Returns the created Chunk.
+func_75824_a,addChunkToPending,2,
 func_75829_a,distanceTo,2,Returns the linear distance to another path point
 func_75830_a,makeHash,2,
 func_75831_a,isAssigned,2,Returns true if this point has already been assigned to a path
@@ -2561,6 +2569,7 @@ func_75904_a,getInts,2,"Returns a list of integer values generated by this layer
 func_75905_a,initWorldGenSeed,2,Initialize layer's local worldGenSeed based on its own baseSeed and the world's global seed (passed in as an argument).
 func_75912_b,choose,2,randomly choose between the four args
 func_75913_a,choose,2,randomly choose between the two args
+func_75915_a,magnify,2,"Magnify a layer. Parms are seed adjustment, layer, number of times to magnify"
 func_75916_b,modeOrRandom,2,returns the mode (most frequently occuring number) or a random number from the 4 integers provided
 func_75917_a,choose,2,Chooses one of the two inputs randomly.
 func_75918_d,initCraftableStats,2,Initializes statistics related to craftable items. Is only called after both block and item stats have been initialized.
@@ -3356,6 +3365,7 @@ func_77832_l,getEffects,2,Returns a list of potion effects for the specified ite
 func_77833_h,isEffectInstant,2,
 func_77834_f,getEffects,2,Returns a list of effects for the specified potion damage value.
 func_77840_a,spawnCreature,2,"Spawns the creature specified by the egg's type in the location specified by the last three parameters. Parameters: world, entityID, x, y, z."
+func_77842_f,getMaterialName,2,"Returns the name of the material this tool is made from as it is declared in EnumToolMaterial (meaning diamond would return ""EMERALD"")"
 func_77844_a,setPotionEffect,2,"sets a potion effect on the item. Args: int potionId, int duration (will be multiplied by 20), int amplifier, float probability of effect happening"
 func_77845_h,isWolfsFavoriteMeat,2,Whether wolves like this food (true for raw and cooked porkchop).
 func_77846_g,getSaturationModifier,2,gets the saturationModifier of the ItemFood
@@ -3592,7 +3602,7 @@ func_78569_d,renderBlockCactusImpl,2,Render block cactus implementation
 func_78570_q,renderStandardBlock,2,Renders a standard cube block at the given coordinates
 func_78571_c,renderPistonRodEW,2,Render piston rod east/west
 func_78572_c,renderBlockTorch,2,Renders a torch block at the given coordinates
-func_78573_e,renderNorthFace,2,"Renders the given texture to the north (x-negative) face of the block.  Args: block, x, y, z, texture"
+func_78573_e,renderFaceXNeg,2,"Renders the given texture to the west (x-negative) face of the block.  Args: block, x, y, z, texture"
 func_78574_w,renderBlockBed,2,render a bed at the given coordinates
 func_78575_a,renderBlockStemSmall,2,Render block stem small
 func_78576_j,renderBlockLadder,2,Renders a ladder block at the given coordinates
@@ -3624,24 +3634,24 @@ func_78601_u,renderBlockDoor,2,Renders a door block at the given coordinates
 func_78602_a,getAoBrightness,2,Get ambient occlusion brightness
 func_78603_m,renderBlockStem,2,Render block stem
 func_78604_a,renderBlockUsingTexture,2,Renders a block using the given texture instead of the block's own default texture
-func_78605_f,renderSouthFace,2,"Renders the given texture to the south (x-positive) face of the block.  Args: block, x, y, z, texture"
+func_78605_f,renderFaceXPos,2,"Renders the given texture to the east (x-positive) face of the block.  Args: block, x, y, z, texture"
 func_78606_a,renderBlockStemBig,2,Render block stem big
 func_78607_b,renderPistonRodSN,2,Render piston rod south/north
 func_78608_c,renderPistonExtension,2,renders the pushing part of a piston
 func_78609_c,renderStandardBlockWithColorMultiplier,2,"Renders a standard cube block at the given coordinates, with a given color ratio.  Args: block, x, y, z, r, g, b"
 func_78610_x,renderBlockRepeater,2,render a redstone repeater at the given coordinates
-func_78611_c,renderEastFace,2,"Renders the given texture to the east (z-negative) face of the block.  Args: block, x, y, z, texture"
+func_78611_c,renderFaceZNeg,2,"Renders the given texture to the north (z-negative) face of the block.  Args: block, x, y, z, texture"
 func_78612_b,renderBlockByRenderType,2,Renders the block at the given coordinates using the block's rendering type
-func_78613_a,renderBottomFace,2,"Renders the given texture to the bottom face of the block. Args: block, x, y, z, texture"
+func_78613_a,renderFaceYNeg,2,"Renders the given texture to the bottom face of the block. Args: block, x, y, z, texture"
 func_78614_n,renderBlockCrops,2,Render block crops
 func_78615_a,renderBlockCauldron,2,Render block cauldron
 func_78616_a,renderBlockCocoa,2,Renders a Cocoa block at the given coordinates
-func_78617_b,renderTopFace,2,"Renders the given texture to the top face of the block. Args: block, x, y, z, texture"
+func_78617_b,renderFaceYPos,2,"Renders the given texture to the top face of the block. Args: block, x, y, z, texture"
 func_78618_a,renderBlockDragonEgg,2,
 func_78619_g,renderBlockTripWire,2,Renders a trip wire block at the given coordinates
 func_78620_l,renderCrossedSquares,2,"Renders any block requiring croseed squares such as reeds, flowers, and mushrooms"
 func_78621_p,renderBlockFluids,2,Renders a block based on the BlockFluids class at the given coordinates
-func_78622_d,renderWestFace,2,"Renders the given texture to the west (z-positive) face of the block.  Args: block, x, y, z, texture"
+func_78622_d,renderFaceZPos,2,"Renders the given texture to the south (z-positive) face of the block.  Args: block, x, y, z, texture"
 func_78623_a,renderTorchAtAngle,2,"Renders a torch at the given coordinates, with the base slanting at the given delta"
 func_78713_a,getEntityRenderObject,2,
 func_78714_a,getDistanceToCamera,2,
@@ -3773,12 +3783,12 @@ func_82130_k,getLevels,2,Return the levels of this beacon's pyramid.
 func_82131_u,updateState,2,Checks if the Beacon has a valid pyramid underneath and direct sunlight above
 func_82132_j,getSecondaryEffect,2,Return the secondary potion effect given by this beacon.
 func_82141_a,copyDataFrom,2,"Copies important data from another entity to this entity. Used when teleporting entities between worlds, as this actually deletes the teleporting entity and re-creates it on the other side. Params: Entity to copy from, unused (always true)"
-func_82142_c,setHasActivePotion,2,
+func_82142_c,setInvisible,2,
 func_82144_au,doesEntityNotTriggerPressurePlate,2,Return whether this entity should NOT trigger a pressure plate or a tripwire.
 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_82150_aj,getHasActivePotion,2,
+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.
@@ -3821,6 +3831,8 @@ 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_82247_a,canPlayerEdit,2,
+func_82265_c,setEnabled,2,
+func_82266_h,setDisabledTextColour,2,
 func_82273_a,setFlatGeneratorInfo,2,
 func_82274_h,getRenderItem,2,
 func_82275_e,getFlatGeneratorInfo,2,
@@ -3849,6 +3861,7 @@ func_82356_Z,isCommandBlockEnabled,2,Return whether command blocks are enabled.
 func_82357_ak,getSpawnProtectionSize,2,Return the spawn protection area's size.
 func_82358_a,isUsernameIndex,2,Return whether the specified command parameter index is a username parameter.
 func_82362_a,getRequiredPermissionLevel,2,Return the required permission level for this command.
+func_82363_b,parseDouble,2,Parses a double from the given string or throws an exception if it's not a double.
 func_82364_d,getDifficultyForName,2,Return the difficulty value for the specified string.
 func_82366_d,getGameRules,2,Return the game rule set this command should be able to manipulate.
 func_82369_d,getAllOnlineUsernames,2,Return all usernames currently connected to the server.
@@ -3882,7 +3895,7 @@ func_82463_b,setEntitySoundPitch,2,"Sets the pitch of the sound associated with
 func_82464_d,stopAllSounds,2,Stops all currently playing sounds
 func_82465_b,isEntitySoundPlaying,2,"Returns true if a sound is currently associated with the given entity, or false otherwise."
 func_82466_e,pauseAllSounds,2,Pauses all currently playing sounds
-func_82467_a,playEntitySound,2,"If a sound is already playing from the given entity, update the position and velocity of that sound to match the entity. Otherwise, start playing a sound from that entity. Args: The sound name, the entity, the volume, the pitch, unknown flag"
+func_82467_a,playEntitySound,2,"If a sound is already playing from the given entity, update the position and velocity of that sound to match the entity. Otherwise, start playing a sound from that entity. Setting the last flag to true will prevent other sounds from overriding this one. Args: The sound name, the entity, the volume, the pitch, priority"
 func_82468_a,setEntitySoundVolume,2,"Sets the volume of the sound associated with the given entity, if one is playing. The volume is scaled by the global sound volume. Args: the entity, the volume (from 0 to 1)"
 func_82469_c,stopEntitySound,2,Stops playing the sound associated with the given entity
 func_82482_a,dispense,2,Dispenses the specified ItemStack from a dispenser.
@@ -3891,6 +3904,7 @@ func_82486_a,doDispense,2,
 func_82487_b,dispenseStack,2,"Dispense the specified stack, play the dispense sound and spawn particles."
 func_82489_a,spawnDispenseParticles,2,Order clients to display dispense particles from the specified block and facing.
 func_82499_a,getProjectileEntity,2,Return the projectile entity spawned by this dispense behavior.
+func_82505_u_,isFlowerPot,2,Returns true only if block is flowerPot
 func_82519_a_,onFinishFalling,2,Called when the falling block entity for this block hits the ground and turns back into a block
 func_82520_a,onStartFalling,2,Called when the falling block entity for this block is created
 func_82524_c,isRedstoneRepeaterBlockID,2,
@@ -4118,6 +4132,7 @@ func_85173_a,playSoundToNearExcept,2,Plays sound to all near players except the
 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,2,
+func_85182_a,sameToolAndBlock,2,
 func_85187_a,drawString,2,"Draws the specified string. Args: string, x, y, color, dropShadow"
 func_85188_a,makePortal,2,
 func_85189_a,removeStalePortalLocations,2,called periodically to remove out-of-date portal locations from the cache list. Argument par1 is a WorldServer.getTotalWorldTime() value.
@@ -4144,12 +4159,18 @@ func_92058_a,setEntityItemStack,2,Sets the ItemStack for this entity
 func_92059_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)"
 func_92062_k,sendChatMsg,2,Sends the given string to every player as chat message.
 func_92085_d,getIsBlank,2,
+func_92087_a,causeThornsDamage,2,Returns the EntityDamageSource of the Thorns enchantment
+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_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_94049_a,setCustomName,2,
 func_94052_a,setParticleIcon,2,
 func_94053_h,nextTextureIndexX,2,
+func_94064_a,displayGUIHopper,2,
 func_94065_a,drawTexturedModelRectFromIcon,2,
+func_94083_c,getTntPlacedBy,2,returns null or the entityliving it was placed or ignited by
 func_94085_r,getDefaultDisplayTileOffset,2,
 func_94086_l,setDisplayTileOffset,2,
 func_94087_l,getMinecartType,2,
@@ -4170,12 +4191,14 @@ func_94103_c,explodeCart,2,Makes the minecart explode.
 func_94105_c,ignite,2,Ignites this TNT cart.
 func_94107_f,setMinecartPowered,2,
 func_94108_c,isMinecartPowered,2,
+func_94114_a,areItemStacksEqualItem,2,
 func_94116_j,insertItemToInventory,2,Inserts one item from the hopper into the inventory the hopper is pointing at.
 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,getSizeInventorySide,2,Get the size of the side inventory.
+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_94140_a,registerDestroyBlockIcons,2,
 func_94143_a,updateIcons,2,
+func_94144_a,renderBlockInMinecart,2,Renders the block that is inside the minecart.
 func_94148_a,renderItemOverlayIntoGUI,2,
 func_94149_a,renderIcon,2,
 func_94152_c,refreshTextureMaps,2,
@@ -4268,7 +4291,11 @@ func_94352_a,getSensitiveAABB,2,
 func_94355_d,getMetaFromWeight,2,Argument is weight (0-15). Return the metadata to be set because of it.
 func_94434_o,getIconSideOverlay,2,
 func_94442_h_,getInventory,2,"Gets the inventory of the chest at the specified coords, accounting for blocks or ocelots on top of the chest, and double chests."
+func_94444_j_,updateLightLevel,2,
+func_94446_i,getBeaconIcon,2,
+func_94448_e,getBrewingStandIcon,2,
 func_94451_c,getDirectionFromMetadata,2,
+func_94452_d,getIsBlockNotPoweredFromMetadata,2,
 func_94453_b,getHopperIcon,2,
 func_94501_a,getRailLogic,2,
 func_94502_a,isMinecartTrack,2,
@@ -4280,6 +4307,8 @@ func_94507_b,canConnectTo,2,
 func_94508_a,isRailChunkPositionCorrect,2,Checks if the rail is at the chunk position it is expected to be.
 func_94509_b,refreshConnectedTracks,2,
 func_94510_b,isPartOfTrack,2,
+func_94520_b,containsTranslateKey,2,
+func_94526_b,calcRedstoneFromInventory,2,
 func_94539_a,setExplosionSource,2,
 func_94540_d,setExplosion,2,
 func_94541_c,isExplosion,2,
@@ -4292,18 +4321,27 @@ func_94576_a,getEntitiesWithinAABBExcludingEntity,2,
 func_94577_B,getBlockPowerInput,2,"Returns the highest redstone signal strength powering the given block. Args: X, Y, Z."
 func_94578_a,destroyBlock,2,"Destroys a block and optionally drops items. Args: X, Y, Z, dropItems"
 func_94581_a,registerIcons,2,
+func_94599_c,getItemIconForUseDuration,2,"used to cycle through icons based on their used duration, i.e. for the bow"
 func_94608_d,getItemSpriteNumber,2,
 func_94609_a,callTileEntityID,2,
 func_94611_a,callTileEntityDataInfo,2,
 func_94901_k,getSpriteNumber,2,"Returns 0 for /terrain.png, 1 for /gui/items.png"
+func_96090_ax,getTranslatedEntityName,2,Returns the translated name of the entity.
 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_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.
 func_96109_aB,getYPos,2,Gets the world Y position for this hopper entity.
 func_96110_f,setBlocked,2,Set whether this hopper minecart is being blocked by an activator rail.
 func_96111_ay,getBlocked,2,Get whether this hopper minecart is being blocked by an activator rail.
+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_96123_co,getWorldScoreboard,2,
+func_96124_cp,getTeam,2,
+func_96125_a,displayGUIHopperMinecart,2,
 func_96334_d,getScoreboardFromWorldServer,2,
 func_96335_a,getScoreObjectivesList,2,"If the parameter is true, does not return read-only entries."
 func_96336_d,getObjectivesList,2,Handler for the 'scoreboard objectives list' command.
@@ -4335,8 +4373,13 @@ func_96447_a,renderBlockHopperMetadata,2,
 func_96448_c,getMissingIcon,2,
 func_96455_e,getMissingIcon,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.
 func_96475_a_,getTileEntityComparator,2,Returns the blockTileEntity at given coordinates.
+func_96477_c,markOrGrowMarked,2,
+func_96478_d,setBlockBoundsForSnowDepth,2,"calls setBlockBounds based on the depth of the snow. Int is any values 0x0-0x7, usually this blocks metadata."
+func_96509_i,getPlayersTeam,2,Gets the ScorePlayerTeam object for the given username.
+func_96512_b,removePlayerFromTeam,2,Removes the given username from the given ScorePlayerTeam. If the player is not on the team then an IllegalStateException is thrown.
 func_96514_c,getScoreObjectives,2,
 func_96517_b,getObjectiveDisplaySlot,2,"Returns 'list' for 0, 'sidebar' for 1, 'belowName for 2, otherwise null."
 func_96518_b,getObjective,2,Returns a ScoreObjective for the objective name
@@ -4346,22 +4389,29 @@ func_96556_a,callServerMemoryStats,2,
 func_96557_a,callServerProfiler,2,
 func_96559_d,getFrontOffsetY,2,
 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_96670_d,getMembershipCollection,2,
 func_96678_d,getDisplayName,2,
 func_96679_b,getName,2,
 func_96680_c,getCriteria,2,
 func_96681_a,setDisplayName,2,
 func_96682_a,getScoreboard,2,
 func_98033_al,getLogAgent,2,
+func_98035_c,addNotRiddenEntityID,2,
 func_98042_n,setTransferTicker,2,"Sets the transfer ticker, used to determine the delay between transfers."
 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_98052_bS,canPickUpLoot,2,
 func_98053_h,setCanPickUpLoot,2,
 func_98076_a,getServerLogger,2,
 func_98145_a,createEmptyTexture,2,
 func_98146_d,getBasename,2,"Strips directory and file extension from the specified path, returning only the filename"
 func_98147_a,hasAnimationTxt,2,Returns true if specified texture pack contains animation data for the specified texture file
+func_98152_d,getAllUsernames,2,
+func_98179_a,computeLightValue,2,
 func_98180_V,getWorldLogAgent,2,
 func_98182_a,handleWorldParticles,2,Handle a world particles packet.
 func_98184_a,setupTextureExt,2,

fml/conf/packages.csv

@@ -1,4 +1,6 @@
 class,package
+GuiScreenOnlineServersSubscreen,net/minecraft/client/gui
+RunnableTitleScreen,net/minecraft/client/gui
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
 BlockBasePressurePlate,net/minecraft/block
@@ -245,13 +247,11 @@ ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
 SelectionListBase,net/minecraft/client/gui
 SelectionListInvited,net/minecraft/client/gui
-SelectionListLocation,net/minecraft/client/gui
 TaskLongRunning,net/minecraft/client/gui
 TaskOnlineConnect,net/minecraft/client/gui
 TaskResetWorld,net/minecraft/client/gui
 TaskWorldCreation,net/minecraft/client/gui
 ThreadConnectToOnlineServer,net/minecraft/client/gui
-ThreadCreateOnlineWorldScreen,net/minecraft/client/gui
 ThreadOnlineConnect,net/minecraft/client/gui
 ThreadOnlineScreen,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
@@ -285,8 +285,6 @@ SlotCreativeInventory,net/minecraft/client/gui/inventory
 ExceptionMcoHttp,net/minecraft/client/mco
 ExceptionMcoService,net/minecraft/client/mco
 ExceptionRetryCall,net/minecraft/client/mco
-Location,net/minecraft/client/mco
-Locations,net/minecraft/client/mco
 McoClient,net/minecraft/client/mco
 McoOption,net/minecraft/client/mco
 McoOptionNone,net/minecraft/client/mco

fml/conf/params.csv

@@ -10,15 +10,6 @@ p_101001_1_,par1,2
 p_101001_2_,par2,2
 p_101001_3_,par3,2
 p_101001_4_,par4,2
-p_101002_0_,par0GuiScreenOnlineServers,2
-p_101002_1_,par1McoServer,2
-p_101003_0_,par0GuiScreenOnlineServers,2
-p_101003_1_,par1,2
-p_101003_2_,par2,2
-p_101003_3_,par3,2
-p_101003_4_,par4,2
-p_101004_0_,par0GuiScreenOnlineServers,2
-p_101005_0_,par0GuiScreenOnlineServers,2
 p_101006_1_,par1,2
 p_101006_2_,par2,2
 p_101006_3_,par3,2
@@ -32,8 +23,6 @@ p_101009_1_,par1,2
 p_101009_2_,par2,2
 p_101009_3_,par3,2
 p_101009_4_,par4,2
-p_101011_0_,par0GuiScreenOnlineServers,2
-p_101011_1_,par1Str,2
 p_101012_0_,par0GuiScreenOnlineServers,2
 p_101012_1_,par1,2
 p_101012_2_,par2,2
@@ -78,6 +67,96 @@ p_102027_4_,par4,2
 p_102027_5_,par5,2
 p_102027_6_,par6,2
 p_102027_7_,par7,2
+p_104004_0_,par0GuiMainMenu,2
+p_104005_0_,par0GuiMainMenu,2
+p_104005_1_,par1Str,2
+p_104006_0_,par0GuiMainMenu,2
+p_104006_1_,par1,2
+p_104007_0_,par0GuiMainMenu,2
+p_104008_0_,par0GuiMainMenu,2
+p_104008_1_,par1,2
+p_104009_0_,par0GuiMainMenu,2
+p_104009_1_,par1,2
+p_104010_0_,par0,2
+p_104011_0_,par0GuiMainMenu,2
+p_104011_1_,par1,2
+p_104012_0_,par0GuiMainMenu,2
+p_104012_1_,par1,2
+p_104013_0_,par0GuiMainMenu,2
+p_104013_1_,par1Str,2
+p_104014_0_,par0GuiMainMenu,2
+p_104014_1_,par1,2
+p_104015_0_,par0GuiMainMenu,2
+p_104016_0_,par0GuiMainMenu,2
+p_104017_0_,par0GuiMainMenu,2
+p_104018_0_,par0GuiMainMenu,2
+p_104019_0_,par0GuiMainMenu,2
+p_104020_0_,par0GuiMainMenu,2
+p_104021_0_,par0GuiMainMenu,2
+p_104021_1_,par1StringTranslate,2
+p_104021_2_,par2,2
+p_104021_3_,par3,2
+p_104022_0_,par0GuiMainMenu,2
+p_104023_0_,par0GuiMainMenu,2
+p_104026_0_,par0GuiScreenOnlineServers,2
+p_104026_1_,par1Str,2
+p_104027_0_,par0GuiScreenOnlineServers,2
+p_104028_0_,par0GuiScreenOnlineServers,2
+p_104029_0_,par0GuiScreenOnlineServers,2
+p_104030_0_,par0GuiScreenOnlineServers,2
+p_104030_1_,par1,2
+p_104030_2_,par2,2
+p_104030_3_,par3,2
+p_104030_4_,par4,2
+p_104030_5_,par5,2
+p_104031_0_,par0GuiScreenOnlineServers,2
+p_104031_1_,par1,2
+p_104031_2_,par2,2
+p_104031_3_,par3,2
+p_104031_4_,par4,2
+p_104032_0_,par0GuiScreenOnlineServers,2
+p_104033_0_,par0GuiScreenOnlineServers,2
+p_104034_0_,par0GuiScreenOnlineServers,2
+p_104034_1_,par1McoServer,2
+p_104036_0_,par0GuiScreenOnlineServers,2
+p_104038_0_,par0GuiScreenOnlineServers,2
+p_104039_1_,par1,2
+p_104039_2_,par2,2
+p_104039_3_,par3,2
+p_104039_4_,par4,2
+p_104039_5_,par5,2
+p_104040_0_,par0GuiScreenOnlineServers,2
+p_104043_0_,par0GuiScreenOnlineServers,2
+p_104047_0_,par0GuiScreenCreateOnlineWorld,2
+p_104048_0_,par0GuiScreenCreateOnlineWorld,2
+p_104055_1_,par1,2
+p_104062_1_,par1,2
+p_104062_2_,par2,2
+p_104062_3_,par3Texture,2
+p_104064_0_,par0Str,2
+p_104064_1_,par1Str,2
+p_104064_2_,par2,2
+p_104064_3_,par3,2
+p_104069_1_,par1GuiButton,2
+p_104071_1_,par1GuiScreen,2
+p_104071_2_,par2FontRenderer,2
+p_104083_1_,par1,2
+p_104083_2_,par2,2
+p_104083_3_,par3,2
+p_104083_4_,par4,2
+p_104084_1_,par1,2
+p_104084_2_,par2,2
+p_104084_3_,par3,2
+p_104084_4_,par4,2
+p_104086_1_,par1,2
+p_104087_1_,par1,2
+p_104087_2_,par2,2
+p_104088_1_,par1,2
+p_104088_2_,par2,2
+p_104088_3_,par3Tessellator,2
+p_104089_1_,par1,2
+p_104089_2_,par2,2
+p_104145_0_,par0URL,2
 p_70000_1_,par1PlayerUsageSnooper,2
 p_70001_1_,par1PlayerUsageSnooper,2
 p_70003_1_,par1,2
@@ -7661,20 +7740,7 @@ p_96174_1_,par1McoServer,2
 p_96177_0_,par0GuiScreenOnlineServers,2
 p_96209_1_,par1Str,2
 p_96210_1_,par1Str,2
-p_96230_0_,par0GuiScreenSelectLocation,2
-p_96231_0_,par0GuiScreenSelectLocation,2
-p_96232_0_,par0GuiScreenSelectLocation,2
-p_96233_0_,par0GuiScreenSelectLocation,2
-p_96234_0_,par0GuiScreenSelectLocation,2
-p_96234_1_,par1Location,2
-p_96235_0_,par0GuiScreenSelectLocation,2
-p_96236_0_,par0GuiScreenSelectLocation,2
-p_96246_0_,par0GuiScreenCreateOnlineWorld,2
-p_96247_0_,par0GuiScreenCreateOnlineWorld,2
 p_96248_0_,par0GuiScreenCreateOnlineWorld,2
-p_96251_1_,par1Location,2
-p_96251_2_,par2Str,2
-p_96251_3_,par3Str,2
 p_96263_0_,par0GuiScreenConfigureWorld,2
 p_96264_1_,par1,2
 p_96265_0_,par0GuiScreenConfigureWorld,2
@@ -7763,6 +7829,7 @@ p_96363_0_,par0Str,2
 p_96363_1_,par1Str,2
 p_96374_1_,par1,2
 p_96376_1_,par1,2
+p_96376_3_,par3Str,2
 p_96377_1_,par1Request,2
 p_96378_1_,par1,2
 p_96380_1_,par1Str,2
@@ -7772,9 +7839,12 @@ p_96383_1_,par1,2
 p_96384_1_,par1,2
 p_96384_3_,par3Str,2
 p_96384_4_,par4Str,2
+p_96384_5_,par5,2
+p_96384_6_,par6,2
 p_96386_1_,par1Str,2
 p_96386_2_,par2Str,2
 p_96386_3_,par3Str,2
+p_96386_4_,par4Str,2
 p_96387_1_,par1,2
 p_96387_3_,par3Str,2
 p_96394_0_,par0Field,2
@@ -7961,43 +8031,25 @@ p_98046_1_,par1,2
 p_98053_1_,par1,2
 p_98054_1_,par1,2
 p_98055_1_,par1,2
-p_98058_0_,par0GuiMainMenu,2
-p_98059_0_,par0,2
 p_98060_1_,par1StringTranslate,2
 p_98060_2_,par2,2
 p_98060_3_,par3,2
-p_98061_0_,par0GuiMainMenu,2
-p_98061_1_,par1StringTranslate,2
-p_98061_2_,par2,2
-p_98061_3_,par3,2
 p_98062_1_,par1,2
 p_98063_1_,par1,2
 p_98072_0_,par0GuiScreenOnlineServers,2
-p_98074_0_,par0GuiScreenOnlineServers,2
 p_98075_0_,par0GuiScreenOnlineServers,2
 p_98076_0_,par0GuiScreenOnlineServers,2
 p_98078_0_,par0GuiScreenOnlineServers,2
 p_98078_1_,par1,2
-p_98079_0_,par0GuiScreenOnlineServers,2
 p_98081_0_,par0GuiScreenOnlineServers,2
 p_98081_1_,par1,2
-p_98084_0_,par0GuiScreenOnlineServers,2
 p_98086_1_,par1,2
-p_98087_0_,par0GuiScreenOnlineServers,2
 p_98089_0_,par0GuiScreenOnlineServers,2
 p_98089_1_,par1,2
-p_98091_0_,par0GuiScreenOnlineServers,2
 p_98092_0_,par0GuiScreenOnlineServers,2
 p_98094_0_,par0GuiScreenOnlineServers,2
 p_98096_0_,par0GuiConnecting,2
 p_98097_0_,par0GuiConnecting,2
-p_98099_0_,par0GuiScreenCreateOnlineWorld,2
-p_98100_0_,par0GuiScreenCreateOnlineWorld,2
-p_98100_1_,par1Location,2
-p_98101_0_,par0GuiScreenCreateOnlineWorld,2
-p_98102_0_,par0GuiScreenCreateOnlineWorld,2
-p_98102_1_,par1List,2
-p_98103_0_,par0GuiScreenCreateOnlineWorld,2
 p_98137_1_,par1Str,2
 p_98137_2_,par2,2
 p_98138_1_,par1Str,2
@@ -8025,12 +8077,8 @@ p_98162_0_,par0Str,2
 p_98163_0_,par0JsonNode,2
 p_98164_0_,par0List,2
 p_98165_0_,par0Str,2
-p_98167_0_,par0JsonNode,2
-p_98168_0_,par0JsonNode,2
-p_98168_1_,par1Str,2
 p_98169_0_,par0Str,2
 p_98172_0_,par0TaskOnlineConnect,2
-p_98174_0_,par0Str,2
 p_98176_1_,par1,2
 p_98177_1_,par1,2
 p_98179_1_,par1,2
@@ -8125,11 +8173,9 @@ p_i10003_1_,par1,2
 p_i10003_2_,par2,2
 p_i10004_1_,par1,2
 p_i10004_2_,par2,2
-p_i10005_1_,par1,2
-p_i10005_2_,par2,2
+p_i10005_1_,par1ScorePlayerTeam,2
+p_i10005_2_,par2Collection,2
 p_i10005_3_,par3,2
-p_i10005_4_,par4Str,2
-p_i10005_5_,par5Str,2
 p_i10006_1_,par1,2
 p_i10006_2_,par2,2
 p_i10007_1_,par1,2
@@ -8139,8 +8185,6 @@ p_i10008_3_,par3TaskLongRunning,2
 p_i10009_1_,par1GuiSlotOnlineServerList,2
 p_i10009_2_,par2McoServer,2
 p_i10010_1_,par1GuiScreen,2
-p_i10011_1_,par1GuiScreenResetWorld,2
-p_i10011_2_,par2,2
 p_i10012_1_,par1Minecraft,2
 p_i10012_2_,par2,2
 p_i10012_3_,par3,2
@@ -8152,10 +8196,6 @@ p_i10013_2_,par2GuiScreen,2
 p_i10013_3_,par3McoServer,2
 p_i10014_1_,par1GuiScreen,2
 p_i10014_2_,par2McoServer,2
-p_i10017_1_,par1GuiScreenCreateOnlineWorld,2
-p_i10017_2_,par2Str,2
-p_i10017_3_,par3Str,2
-p_i10017_4_,par4Str,2
 p_i10018_1_,par1TaskOnlineConnect,2
 p_i10018_2_,par2Str,2
 p_i10018_3_,par3,2
@@ -8257,7 +8297,6 @@ p_i11007_1_,par1GuiScreen,2
 p_i11007_2_,par2Str,2
 p_i11007_3_,par3Str,2
 p_i11007_4_,par4ArrayOfObj,2
-p_i11008_1_,par1GuiScreenCreateOnlineWorld,2
 p_i11011_1_,par1GuiScreenOnlineServers,2
 p_i11012_1_,par1Minecraft,2
 p_i11012_2_,par2Str,2
@@ -8417,6 +8456,29 @@ p_i22009_5_,par5,2
 p_i22009_6_,par6,2
 p_i22009_7_,par7,2
 p_i22009_8_,par8,2
+p_i23000_1_,par1,2
+p_i23000_2_,par2,2
+p_i23000_3_,par3,2
+p_i23000_4_,par4,2
+p_i23001_1_,par1Minecraft,2
+p_i23001_2_,par2,2
+p_i23001_3_,par3,2
+p_i23001_4_,par4,2
+p_i23001_5_,par5,2
+p_i23001_6_,par6,2
+p_i23002_1_,par1GuiScreenResetWorld,2
+p_i23002_2_,par2,2
+p_i23002_4_,par4Str,2
+p_i23003_1_,par1GuiScreenCreateOnlineWorld,2
+p_i23003_2_,par2Str,2
+p_i23003_3_,par3Str,2
+p_i23003_4_,par4Str,2
+p_i23003_5_,par5Str,2
+p_i23004_1_,par1GuiScreen,2
+p_i23004_2_,par2Str,2
+p_i23004_3_,par3,2
+p_i23004_4_,par4,2
+p_i23005_1_,par1GuiMainMenu,2
 p_i3000_1_,par1File,2
 p_i3000_2_,par2Minecraft,2
 p_i3001_1_,par1Map,2
@@ -8622,9 +8684,6 @@ p_i3101_1_,par1Minecraft,2
 p_i3101_2_,par2World,2
 p_i3101_3_,par3Session,2
 p_i3101_4_,par4NetClientHandler,2
-p_i3102_1_,par1GuiScreen,2
-p_i3102_2_,par2Str,2
-p_i3102_3_,par3,2
 p_i3103_1_,par1Minecraft,2
 p_i3103_2_,par2Str,2
 p_i3103_3_,par3,2

fml/conf/patches/minecraft_ff.patch

@@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Tue Mar 19 21:24:34 2013
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Tue Mar 19 21:26:27 2013
-@@ -531,9 +531,8 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Sat Apr 27 01:53:03 2013
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Apr 27 01:55:19 2013
+@@ -532,9 +532,8 @@
           return;
        }
  
@@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
                 if(this.field_71434_R && this.field_71433_S != null) {
                    this.func_71377_b(this.field_71433_S);
                    return;
-@@ -551,7 +550,6 @@
+@@ -552,7 +551,6 @@
                    this.func_71373_a(new GuiMemoryErrorScreen());
                    System.gc();
                 }
@@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
              }
           } catch (MinecraftError var12) {
              ;
-@@ -569,8 +567,6 @@
+@@ -570,8 +568,6 @@
              this.func_71405_e();
           }
  
@@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
  
     private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:55:19 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\CodecMus.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Apr 27 01:55:19 2013
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -73,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:55:19 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -87,9 +87,9 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
---- minecraft\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:26:27 2013
-@@ -206,7 +206,7 @@
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:55:19 2013
+@@ -207,7 +207,7 @@
        System.exit(0);
     }
  
@@ -99,8 +99,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        this.func_71333_ah();
     }
 diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
---- minecraft\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:24:36 2013
-+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:53:05 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:55:19 2013
 @@ -38,7 +38,7 @@
     private final String field_96304_B;
  
@@ -111,8 +111,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patch
  
     private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Tue Mar 19 21:24:36 2013
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\FontRenderer.java	Sat Apr 27 01:53:05 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Apr 27 01:55:19 2013
 @@ -621,8 +621,6 @@
           case 10:
              --var5;
@@ -132,8 +132,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	Tue Mar 19 21:24:37 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sat Apr 27 01:53:05 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Apr 27 01:55:19 2013
 @@ -101,7 +101,7 @@
        return true;
     }
@@ -144,8 +144,8 @@ 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\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
---- minecraft\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:55:19 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -186,8 +186,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	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\RenderBlocks.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sat Apr 27 01:55:19 2013
 @@ -1951,16 +1951,16 @@
        float var25 = (float)(p_78589_2_ + 1);
        float var26 = (float)(p_78589_4_ + 0);
@@ -219,8 +219,8 @@ 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	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Apr 27 01:55:19 2013
 @@ -1449,7 +1449,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_;
@@ -231,8 +231,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
              this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
           } else if(p_72726_1_.equals("largeexplode")) {
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:55:19 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -242,8 +242,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	Tue Mar 19 21:24:39 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:55:19 2013
 @@ -20,7 +20,8 @@
     }
  

fml/conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:25:52 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:54:18 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:56:15 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -20,8 +20,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:25:52 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:54:19 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:56:15 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -34,9 +34,9 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
---- minecraft_server\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:25:53 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:26:37 2013
-@@ -207,7 +207,7 @@
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:54:19 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:56:15 2013
+@@ -208,7 +208,7 @@
        System.exit(0);
     }
  
@@ -46,8 +46,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        this.func_71333_ah();
     }
 diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
---- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:25:53 2013
-+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:54:20 2013
++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:56:15 2013
 @@ -38,7 +38,7 @@
     private final String field_96304_B;
  
@@ -58,8 +58,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraf
  
     private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_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	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Sat Apr 27 01:54:20 2013
++++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sat Apr 27 01:56:15 2013
 @@ -2,6 +2,8 @@
  
  import java.net.InetSocketAddress;
@@ -91,8 +91,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_
        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	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:54:20 2013
++++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:56:15 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -133,8 +133,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	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:54:21 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:56:15 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -144,8 +144,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	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:54:21 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:56:15 2013
 @@ -20,7 +20,8 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.44
-ClientVersion = 1.5.1
-ServerVersion = 1.5.1
+MCPVersion = 7.51
+ClientVersion = 1.5.2
+ServerVersion = 1.5.2

fml/mc_versions.cfg

@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.5.1
+current_ver = 1.5.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
@@ -85,3 +85,12 @@ mcp_ver    = 7.44
 mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp744.zip
 mcp_md5    = 0b9047820bbcb7da32c5e18f60212832
 
+[1.5.2]
+client_url = http://s3.amazonaws.com/Minecraft.Download/versions/1.5.2/1.5.2.jar
+server_url = http://s3.amazonaws.com/Minecraft.Download/versions/1.5.2/minecraft_server.1.5.2.jar
+client_md5 = 6897c3287fb971c9f362eb3ab20f5ddd
+server_md5 = c4e1bf89e834bd3670c7bf8f13874bc6
+mcp_ver    = 7.44
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp751.zip
+mcp_md5    = 593238c1cc71f76c94738ff6a014d1a2
+

fml/mcp_merge.cfg

@@ -1 +1 @@
-!bjz #net/minecraft/src/CodecMus
+!bjy #net/minecraft/src/CodecMus

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

@@ -8,25 +8,17 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.image.BufferedImage;
-@@ -11,6 +13,7 @@
- import java.util.ArrayList;
- import java.util.Calendar;
- import java.util.Date;
-+import java.util.List;
- import java.util.Random;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.Tessellator;
-@@ -22,6 +25,9 @@
- import net.minecraft.world.storage.WorldInfo;
+@@ -24,6 +26,9 @@
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.util.glu.GLU;
-+
+ 
 +import com.google.common.base.Strings;
 +import com.google.common.collect.Lists;
- 
++
  @SideOnly(Side.CLIENT)
  public class GuiMainMenu extends GuiScreen
-@@ -45,6 +51,8 @@
+ {
+@@ -48,6 +53,8 @@
      private int field_92020_v;
      private int field_92019_w;
  
@@ -35,7 +27,7 @@
      public GuiMainMenu()
      {
          BufferedReader bufferedreader = null;
-@@ -143,6 +151,9 @@
+@@ -165,6 +172,9 @@
          {
              this.func_73969_a(i, 24, stringtranslate);
          }
@@ -45,7 +37,7 @@
  
          this.func_96137_a(stringtranslate, i, 24);
  
-@@ -197,7 +208,14 @@
+@@ -211,7 +221,14 @@
  
      private void func_98060_b(StringTranslate p_98060_1_, int p_98060_2_, int p_98060_3_)
      {
@@ -61,7 +53,7 @@
      }
  
      private void func_73969_a(int p_73969_1_, int p_73969_2_, StringTranslate p_73969_3_)
-@@ -249,6 +267,11 @@
+@@ -263,6 +280,11 @@
          if (p_73875_1_.field_73741_f == 4)
          {
              this.field_73882_e.func_71400_g();
@@ -73,7 +65,7 @@
          }
  
          if (p_73875_1_.field_73741_f == 11)
-@@ -487,7 +510,16 @@
+@@ -501,7 +523,16 @@
              s = s + " Demo";
          }
  

fml/patches/minecraft/net/minecraft/client/renderer/texture/Texture.java.patch

@@ -47,7 +47,7 @@
                      }
  
                      this.field_94302_r.put(l1 + 0, bytebuffer.get(i2 + 0));
-@@ -371,4 +380,13 @@
+@@ -378,4 +387,13 @@
      {
          return this.field_94302_r;
      }

fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch

@@ -19,24 +19,6 @@
      }
  
      public void func_94217_a(TextureStitched p_94217_1_)
-@@ -137,7 +143,7 @@
- 
-                 if (i != j && j >= 0 && j < this.field_94226_b.size())
-                 {
--                    this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(j), this.field_94227_c);
-+                    this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(j), false); //FML: We rotate the textures in init.
-                 }
-             }
-         }
-@@ -148,7 +154,7 @@
- 
-             if (k != this.field_94222_f)
-             {
--                this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(this.field_94222_f), this.field_94227_c);
-+                this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(this.field_94222_f), false); //FML: We rotate the textures in init.
-             }
-         }
-     }
 @@ -198,4 +204,12 @@
              this.field_94236_i = arraylist;
          }

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

@@ -9,7 +9,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.GraphicsEnvironment;
-@@ -351,7 +354,11 @@
+@@ -352,7 +355,11 @@
          {
              if (this.func_71197_b())
              {
@@ -21,7 +21,7 @@
  
                  for (long j = 0L; this.field_71317_u; this.field_71296_Q = true)
                  {
-@@ -390,6 +397,7 @@
+@@ -391,6 +398,7 @@
  
                      Thread.sleep(1L);
                  }
@@ -29,7 +29,7 @@
              }
              else
              {
-@@ -398,6 +406,10 @@
+@@ -399,6 +407,10 @@
          }
          catch (Throwable throwable)
          {
@@ -40,7 +40,7 @@
              throwable.printStackTrace();
              this.func_98033_al().func_98234_c("Encountered an unexpected exception " + throwable.getClass().getSimpleName(), throwable);
              CrashReport crashreport = null;
-@@ -428,6 +440,10 @@
+@@ -429,6 +441,10 @@
          {
              try
              {
@@ -51,7 +51,7 @@
                  this.func_71260_j();
                  this.field_71316_v = true;
              }
-@@ -437,6 +453,7 @@
+@@ -438,6 +454,7 @@
              }
              finally
              {
@@ -59,7 +59,7 @@
                  this.func_71240_o();
              }
          }
-@@ -453,8 +470,10 @@
+@@ -454,8 +471,10 @@
  
      public void func_71217_p()
      {
@@ -70,7 +70,7 @@
          ++this.field_71315_w;
  
          if (this.field_71295_T)
-@@ -500,6 +519,7 @@
+@@ -501,6 +520,7 @@
  
          this.field_71304_b.func_76319_b();
          this.field_71304_b.func_76319_b();
@@ -78,7 +78,7 @@
      }
  
      public void func_71190_q()
-@@ -527,6 +547,7 @@
+@@ -528,6 +548,7 @@
                  }
  
                  this.field_71304_b.func_76320_a("tick");
@@ -86,7 +86,7 @@
                  CrashReport crashreport;
  
                  try
-@@ -551,6 +572,7 @@
+@@ -552,6 +573,7 @@
                      throw new ReportedException(crashreport);
                  }
  
@@ -94,7 +94,7 @@
                  this.field_71304_b.func_76319_b();
                  this.field_71304_b.func_76320_a("tracker");
                  worldserver.func_73039_n().func_72788_a();
-@@ -678,7 +700,7 @@
+@@ -679,7 +701,7 @@
  
      public String getServerModName()
      {
@@ -103,7 +103,7 @@
      }
  
      public CrashReport func_71230_b(CrashReport p_71230_1_)
-@@ -1126,6 +1148,13 @@
+@@ -1137,6 +1159,13 @@
      @SideOnly(Side.SERVER)
      public static void main(String[] p_main_0_)
      {

fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -16,7 +16,7 @@
          this.func_98033_al().func_98233_a("Loading properties");
          this.field_71340_o = new PropertyManager(new File("server.properties"), this.func_98033_al());
  
-@@ -130,6 +133,8 @@
+@@ -131,6 +134,8 @@
              this.func_98033_al().func_98236_b("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
              this.func_98033_al().func_98236_b("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
          }
@@ -25,7 +25,7 @@
  
          this.func_71210_a(new DedicatedPlayerList(this));
          long j = System.nanoTime();
-@@ -172,6 +177,7 @@
+@@ -173,6 +178,7 @@
          this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
          this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
          this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
@@ -33,7 +33,7 @@
          this.func_98033_al().func_98233_a("Preparing level \"" + this.func_71270_I() + "\"");
          this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
          long i1 = System.nanoTime() - j;
-@@ -192,7 +198,7 @@
+@@ -193,7 +199,7 @@
              this.field_71339_n.func_72602_a();
          }
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/world/World.java
 +++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -1805,13 +1805,14 @@
+@@ -1806,13 +1806,14 @@
              }
          }
  
@@ -16,7 +16,7 @@
  
          this.field_72984_F.func_76318_c("pendingTileEntities");
  
-@@ -3639,7 +3640,7 @@
+@@ -3640,7 +3641,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {

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

@@ -11,7 +11,7 @@
  import net.minecraft.entity.Entity;
  import net.minecraft.entity.EntityList;
  import net.minecraft.nbt.CompressedStreamTools;
-@@ -246,10 +250,19 @@
+@@ -252,10 +256,19 @@
                  Entity entity = (Entity)iterator.next();
                  nbttagcompound1 = new NBTTagCompound();
  
@@ -35,7 +35,7 @@
                  }
              }
          }
-@@ -262,8 +275,17 @@
+@@ -268,8 +281,17 @@
          {
              TileEntity tileentity = (TileEntity)iterator.next();
              nbttagcompound1 = new NBTTagCompound();