MCP compilation works

fml/common/fml_at.cfg

@@ -1,73 +1,73 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public aox.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public apy.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public ma.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public ma.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public ma.b #FD:EntityList/field_75625_b #nameToClassMap
-public ma.c #FD:EntityList/field_75626_c #classToNameMap
-public ma.d #FD:EntityList/field_75623_d #idToClassMap
+public mp.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public mp.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public mp.b #FD:EntityList/field_75625_b #nameToClassMap
+public mp.c #FD:EntityList/field_75626_c #classToNameMap
+public mp.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 #public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
-public bcd.j #FD:RenderEngine/field_78366_k #texturePack
+public bfd.j #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bcx.p #FD:RenderManager/field_78729_o #renderers
+public bfx.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bce.* #FD:RenderBlocks/*
-public bce.*() #MD:RenderBlocks/*
+public bfe.* #FD:RenderBlocks/*
+public bfe.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bdr.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bgr.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bdf.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bgf.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
-public bn.b #FD:StringTranslate/field_74815_b
-public bn.e #FD:StringTranslate/field_74813_d
+public bo.b #FD:StringTranslate/field_74815_b
+public bo.e #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bfa.m #FD:TileEntityRenderer/field_76966_m
+public bia.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public wy.a(Lvc;[Ljava/lang/Object;)Lxb; #MD:CraftingManager/func_92103_a
-public wy.b(Lvc;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+public xv.a(Lvx;[Ljava/lang/Object;)Lxy; #MD:CraftingManager/func_92103_a
+public xv.b(Lvx;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
-public kv.a #FD:WeightedRandomItem/field_76292_a #probability
+public li.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
 #public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public jl.a #FD:StatBase/field_75978_a #statName
+public jy.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public it.a(Lit;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public it.h #FD:NetLoginHandler/field_72543_h #userName
+public jf.a(Ljf;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public jf.h #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public iq.cl()V #MD:EntityPlayerMP/func_71117_bO
-public iq.cu #FD:EntityPlayerMP/field_71139_cq
+public jc.cq()V #MD:EntityPlayerMP/func_71117_bO
+public jc.cu #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public nk #CL:EntityAITaskEntry
+public ob #CL:EntityAITaskEntry
 # EntityAITasks
-public nj.a #FD:EntityAITasks/field_75782_a #taskList
+public oa.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public ajy.m(Lyn;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public akw.m(Lzk;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public mj.aT #FD:EntityLiving/field_70736_aM #carryoverDamage
-public mj.bn #FD:EntityLiving/field_70714_bg #tasks
-public mj.bG #FD:EntityLiving/field_70703_bu #isJumping
+public na.aT #FD:EntityLiving/field_70736_aM #carryoverDamage
+public na.bn #FD:EntityLiving/field_70714_bg #tasks
+public na.bG #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected nw.a(Lyn;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected nw.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected on.a(Lzk;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected on.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
-public b #CL:CallableMinecraftVersion
-public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
+public c #CL:CallableMinecraftVersion
+public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public pd.d #FD:EntityAnimal/field_70881_d #inLove
+public pu.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public yx.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public yx.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
+public zu.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public zu.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public agc #CL:ComponentVillage
+public agz #CL:ComponentVillage
 # EntityVillager - minmax lists
-public re.a(Lyf;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public re.b(Lyf;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public re.bP #FD:EntityVillager/field_70958_bB
-public re.bQ #FD:EntityVillager/field_70960_bC
+public rx.a(Lzc;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public rx.b(Lzc;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public rx.bP #FD:EntityVillager/field_70958_bB
+public rx.bQ #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public axd #CL:GuiButtonMerchant
+public ayp #CL:GuiButtonMerchant
 
-protected aug.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected avr.a #FD:GuiYesNo/field_73942_a #guiScreen

fml/common/fml_marker.cfg

@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-rh cpw/mods/fml/common/network/Player
+sb cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-ank cpw/mods/fml/common/registry/BlockProxy
+aoj cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-va cpw/mods/fml/common/registry/ItemProxy
+vv cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy

fml/conf/fields.csv

@@ -1,5 +1,5 @@
 searge,name,side,desc
-field_70009_b,chatBuffer,2,
+field_70009_b,buffer,2,RCon string buffer for log
 field_70010_a,consoleBuffer,2,only ever used by MinecraftServer.executeCommand
 field_70116_cv,serverPosZ,2,
 field_70117_cu,serverPosY,2,
@@ -572,7 +572,7 @@ field_71324_y,canSpawnAnimals,2,True if the server has animals turned on.
 field_71325_x,onlineMode,2,True if the server is in online mode.
 field_71335_s,guiIsEnabled,2,
 field_71336_r,networkThread,2,
-field_71337_q,gameType,2,
+field_71337_q,theGameType,2,The Game Type.
 field_71338_p,canSpawnStructures,2,
 field_71339_n,theRConThreadMain,2,
 field_71340_o,settings,2,
@@ -1161,11 +1161,11 @@ field_72449_c,zCoord,2,Z coordinate of Vec3D
 field_72450_a,xCoord,2,X coordinate of Vec3D
 field_72451_a,theDecitatedServer,2,Instance of the DecitatedServer.
 field_72534_f,mcServer,2,Reference to the MinecraftServer object.
-field_72535_g,connectionTimer,2,
+field_72535_g,loginTimer,2,"While waiting to login, if this field ++'s to 600 it will kick you."
 field_72536_d,verifyToken,2,The 4 byte verify token read from a Packet252SharedKey
 field_72537_e,rand,2,The Random object used to generate serverId hex strings.
 field_72538_b,myTCPConnection,2,
-field_72539_c,connectionComplete,2,
+field_72539_c,finishedProcessing,2,Returns if the login handler is finished and can be removed. It is set to true on either error or successful login.
 field_72540_a,logger,2,The Minecraft logger.
 field_72541_j,loginServerId,2,server ID that is randomly generated by this login handler.
 field_72542_k,sharedKey,2,Secret AES key obtained from the client's Packet252SharedKey
@@ -1192,7 +1192,7 @@ field_72579_o,lastPosX,2,The last known x position for this connection.
 field_72580_l,ticksOfLastKeepAlive,2,
 field_72581_m,chatSpamThresholdCount,2,
 field_72582_j,keepAliveTimeSent,2,
-field_72583_k,randomGenerator,2,
+field_72583_k,rndmObj,2,The Java Random object.
 field_72585_i,keepAliveRandomID,2,
 field_72587_r,hasMoved,2,is true when the player has moved since his last movement packet
 field_72588_q,lastPosZ,2,The last known z position for this connection.
@@ -1294,8 +1294,8 @@ field_72781_x,glSkyList2,2,OpenGL sky list 2
 field_72782_b,theWorldServer,2,The WorldServer object.
 field_72783_a,mcServer,2,Reference to the MinecraftServer object.
 field_72792_d,entityViewDistance,2,
-field_72793_b,trackedEntities,2,
-field_72794_c,trackedEntityIDs,2,
+field_72793_b,trackedEntitySet,2,"List of tracked entities, used for iteration operations on tracked entities."
+field_72794_c,trackedEntityHashTable,2,Used for identity lookup of tracked entities.
 field_72795_a,theWorld,2,
 field_72814_d,hasExtendedLevels,2,set by !chunk.getAreLevelsEmpty
 field_72815_e,worldObj,2,Reference to the World object.
@@ -1381,20 +1381,20 @@ field_73112_e,partialBlockProgress,2,damage ranges from 1 to 10. -1 causes the c
 field_73113_b,partialBlockX,2,
 field_73114_c,partialBlockY,2,
 field_73115_a,miningPlayerEntId,2,"entity ID of the player associated with this partially destroyed Block. Used to identify the Blocks in the client Renderer, max 1 per player on a server"
-field_73126_f,lastScaledZPosition,2,
-field_73127_g,lastYaw,2,
-field_73128_d,lastScaledXPosition,2,
-field_73129_e,lastScaledYPosition,2,
+field_73126_f,encodedPosZ,2,The encoded entity Z position.
+field_73127_g,encodedRotationYaw,2,The encoded entity yaw rotation.
+field_73128_d,encodedPosX,2,The encoded entity X position.
+field_73129_e,encodedPosY,2,The encoded entity Y position.
 field_73130_b,blocksDistanceThreshold,2,
 field_73131_c,updateFrequency,2,check for sync when ticks % updateFrequency==0
-field_73132_a,myEntity,2,
+field_73132_a,trackedEntity,2,The entity that this EntityTrackerEntry tracks.
 field_73133_n,playerEntitiesUpdated,2,
 field_73134_o,trackedPlayers,2,
 field_73135_l,motionZ,2,
 field_73136_m,ticks,2,
 field_73137_j,motionX,2,
 field_73138_k,motionY,2,
-field_73139_h,lastPitch,2,
+field_73139_h,encodedRotationPitch,2,The encoded entity pitch rotation.
 field_73140_i,lastHeadMotion,2,
 field_73141_v,ridingEntity,2,
 field_73142_u,ticksSinceLastForcedTeleport,2,"every 400 ticks a  full teleport packet is sent, rather than just a ""move me +x"" command, so that position remains fully synced."
@@ -1468,17 +1468,17 @@ field_73235_d,worldObj,2,Reference to the World object.
 field_73236_b,chunkMapping,2,The mapping between ChunkCoordinates and Chunks that ChunkProviderClient maintains.
 field_73237_c,chunkListing,2,"This may have been intended to be an iterable version of all currently loaded chunks (MultiplayerChunkCache), with identical contents to chunkMapping's values. However it is never actually added to."
 field_73238_a,blankChunk,2,The completely empty chunk used by ChunkProviderClient when field_73236_b doesn't contain the requested coordinates.
-field_73244_f,loadedChunkHashMap,2,
+field_73244_f,id2ChunkMap,2,map of chunk Id's to Chunk instances
 field_73245_g,loadedChunks,2,
-field_73246_d,currentChunkProvider,2,
+field_73246_d,serverChunkGenerator,2,chunk generator object. Calls to load nonexistent chunks are forwarded to this object.
 field_73247_e,currentChunkLoader,2,
 field_73248_b,chunksToUnload,2,"used by unload100OldestChunks to iterate the loadedChunkHashMap for unload (underlying assumption, first in, first out)"
-field_73249_c,defaultEmptyChunk,2,
+field_73249_c,dummyChunk,2,"a dummy chunk, returned in place of an actual chunk."
 field_73250_a,loadChunkOnProvideRequest,2,"if this is false, the defaultEmptyChunk will be returned by the provider"
 field_73251_h,worldObj,2,
-field_73261_d,locationOfBlockChange,2,
-field_73262_e,numberOfTilesToUpdate,2,
-field_73263_b,playersInChunk,2,
+field_73261_d,blocksToUpdate,2,array of blocks to update this tick
+field_73262_e,numBlocksToUpdate,2,the number of blocks that need to be updated next tick
+field_73263_b,players,2,the list of all players in this instance (chunk)
 field_73264_c,chunkLocation,2,note: this is final
 field_73265_a,myManager,2,
 field_73286_b,clientPacketIdList,2,List of the client's packet IDs.
@@ -1770,8 +1770,8 @@ field_73661_d,updateTime,2,
 field_73662_b,y,2,
 field_73663_c,z,2,
 field_73664_a,x,2,
-field_73672_b,properties,2,
-field_73673_c,associatedFile,2,
+field_73672_b,serverProperties,2,The server properties object.
+field_73673_c,serverPropertiesFile,2,The server properties file.
 field_73674_a,logger,2,Reference to the logger.
 field_73692_f,banEndDate,2,
 field_73693_g,reason,2,
@@ -3688,7 +3688,7 @@ field_77781_bS,record11,2,
 field_77782_ar,porkCooked,2,
 field_77783_bR,recordWard,2,
 field_77784_aq,porkRaw,2,
-field_77785_bY,potionEffect,2,
+field_77785_bY,potionEffect,2,The string representing this item's effect on a potion when used as an ingredient.
 field_77786_ax,bucketWater,2,
 field_77787_bX,hasSubtypes,2,"Some items (like dyes) have multiple subtypes on same item, this is field define this behavior"
 field_77788_aw,bucketEmpty,2,
@@ -4562,7 +4562,7 @@ field_82724_e,isAmbient,2,Whether the potion effect came from a beacon
 field_82727_n,wither,2,
 field_82728_o,anvil,2,
 field_82729_p,fallingBlock,2,
-field_82730_x,magicDamage,2,
+field_82730_x,magicDamage,2,Whether the damage is magic based.
 field_82731_v,wither,2,The wither Potion object.
 field_82741_K,vecPool,2,The world-local pool of vectors
 field_82745_f,createdAtCloudUpdateTick,2,keeps track of how many ticks this PartiallyDestroyedBlock already exists

fml/conf/mcp.cfg

@@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 13891f6610b6739ac79f40147cca31d5
-MD5Server  = b2200cfa5d6535f177d291066d2ed3a8
+MD5Client  = 496002660846f2eb455cba407cd26818
+MD5Server  = e317f8f4f62d0603a8eacbfb2e33549c
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -96,7 +96,7 @@ ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJa
 ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
 ClientFixes     = %(DirConf)s/patches
 FixStart        = Start
-IgnorePkg       = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml,org/bouncycastle,argo
+IgnorePkg       = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml,com/fasterxml,javax/ws,org/bouncycastle,argo
 
 [REOBF]
 MD5Client         = %(DirTemp)s/client.md5
@@ -123,8 +123,8 @@ LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
 UpdateUrl         = 
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 94000
-ParamIndex        = 9000
+RGIndex           = 96000
+ParamIndex        = 10000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

fml/conf/methods.csv

@@ -7,7 +7,7 @@ func_70004_a,translateString,2,Translates and formats the given string key with
 func_70005_c_,getCommandSenderName,2,"Gets the name of this command sender (usually username, but possibly ""Rcon"")"
 func_70006_a,sendChatToPlayer,2,
 func_70007_b,resetLog,2,Clears the RCon log
-func_70008_c,getChatBuffer,2,
+func_70008_c,getLogContents,2,Gets the contents of the RCon log
 func_70011_f,getDistance,2,"Gets the distance to the position. Args: x, y, z"
 func_70012_b,setLocationAndAngles,2,Sets the location and Yaw/Pitch of an entity in the world
 func_70013_c,getBrightness,2,Gets how bright this entity is.
@@ -32,7 +32,7 @@ func_70031_b,setSprinting,2,Set sprinting switch for Entity.
 func_70032_d,getDistanceToEntity,2,Returns the distance to the entity. Args: entity
 func_70033_W,getYOffset,2,Returns the Y Offset of this entity.
 func_70034_d,setHeadRotationYaw,2,Sets the head's yaw rotation of the entity.
-func_70035_c,getLastActiveItems,2,
+func_70035_c,getInventory,2,returns the inventory of this entity (only used in EntityPlayerMP it seems)
 func_70036_a,playStepSound,2,"Plays step sound at given x, y, z for the entity"
 func_70037_a,readEntityFromNBT,2,(abstract) Protected helper method to read subclass entity data from NBT.
 func_70038_c,isOffsetPositionInLiquid,2,"Checks if the offset position from the entity's current position is inside of liquid. Args: x, y, z"
@@ -527,13 +527,13 @@ func_71062_b,canHarvestBlock,2,Checks if the player has the ability to harvest a
 func_71063_a,setSpawnChunk,2,Defines a spawn coordinate to player spawn. Used by bed after the player sleep on it.
 func_71064_a,addStat,2,Adds a value to a statistic field.
 func_71065_l,isInBed,2,Checks if the player is currently in a bed
-func_71110_a,sendContainerAndContentsToPlayer,2,
+func_71110_a,updateCraftingInventory,2,update the crafting window inventory with the items in the list
 func_71111_a,sendSlotContents,2,"Sends the contents of an inventory slot to the client-side Container. This doesn't have to match the actual contents of that slot. Args: Container, slot number, slot contents"
 func_71112_a,sendProgressBarUpdate,2,"Sends two ints to the client-side Container. Used for furnace burning time, smelting progress, brewing progress, and enchanting level. Normally the first int identifies which variable to update, and the second contains the new value. Both are truncated to shorts in non-local SMP."
 func_71113_k,updateHeldItem,2,updates item held by mouse
 func_71115_a,requestTexturePackLoad,2,on recieving this message the client (if permission is given) will download the requested textures
 func_71116_b,addSelfToInternalCraftingInventory,2,
-func_71117_bO,incrementWindowID,2,
+func_71117_bO,getNextWindowId,2,get the next window id to use
 func_71118_n,setPlayerHealthUpdated,2,"this function is called when a players inventory is sent to him, lastHealth is updated on any dimension transitions, then reset."
 func_71119_a,sendTileEntityToPlayer,2,called from onUpdate for all tileEntity in specific chunks
 func_71120_a,sendContainerToPlayer,2,
@@ -544,7 +544,7 @@ func_71124_b,getCurrentItemOrArmor,2,"0 = item, 1-n is armor"
 func_71125_a,updateClientInfo,2,
 func_71126_v,getChatVisibility,2,
 func_71127_g,onUpdateEntity,2,
-func_71128_l,closeInventory,2,
+func_71128_l,closeCraftingGui,2,close the current crafting gui
 func_71150_b,setHealth,2,Updates health locally.
 func_71151_f,getFOVMultiplier,2,Gets the player's field of view multiplier. (ex. when flying)
 func_71152_a,setXPStats,2,"Sets the current XP, total XP, and level number."
@@ -617,7 +617,7 @@ func_71248_a,getPossibleCompletions,2,"If par2Str begins with /, then it searche
 func_71249_w,getMinecraftVersion,2,Returns the server's Minecraft version as string.
 func_71250_E,getKeyPair,2,Gets KeyPair instanced in MinecraftServer.
 func_71251_e,setCanSpawnAnimals,2,
-func_71252_i,executeCommand,2,
+func_71252_i,handleRConCommand,2,Handle a command received by an RCon instance
 func_71253_a,setKeyPair,2,
 func_71254_M,getActiveAnvilConverter,2,
 func_71255_r,getAllowNether,2,
@@ -1075,12 +1075,12 @@ func_72352_l,getMaxPlayers,2,Returns the maximum number of players allowed on th
 func_72353_e,areCommandsAllowed,2,Returns true if the specific player is allowed to use commands.
 func_72354_b,updateTimeAndWeatherForPlayer,2,Updates the time and weather for the given player to those of the given world
 func_72355_a,initializeConnectionToPlayer,2,
-func_72356_a,transferPlayerToDimension,2,
+func_72356_a,transferPlayerToDimension,2,moves provided player from overworld to nether or vice versa
 func_72357_a,setGameType,2,
 func_72358_d,serverUpdateMountedMovingPlayer,2,"using player's dimension, update their movement when in a vehicle (e.g. cart, boat)"
 func_72359_h,addToWhiteList,2,Add the specified player to the white list.
 func_72360_c,removeOp,2,"This removes a username from the ops list, then saves the op list"
-func_72361_f,getPlayerForUsername,2,
+func_72361_f,getPlayerEntity,2,gets the player entity for the player with the name specified
 func_72362_j,loadWhiteList,2,"Either does nothing, or calls readWhiteList."
 func_72363_f,getBannedIPs,2,
 func_72364_a,setPlayerManager,2,Sets the NBT manager to the one for the WorldServer given.
@@ -1214,7 +1214,7 @@ func_72523_a,handleWindowClick,2,
 func_72524_a,handleAnimation,2,
 func_72525_c,getSharedKey,2,Return the secret AES sharedKey
 func_72526_a,getServerId,2,Returns the server Id randomly generated by this login handler.
-func_72527_a,raiseErrorAndDisconnect,2,
+func_72527_a,kickUser,2,Disconnects the user with the given reason.
 func_72528_e,getUsernameAndAddress,2,
 func_72529_d,initializePlayerConnection,2,"on success the specified username is connected to the minecraftInstance, otherwise they are packet255'd"
 func_72530_b,getLoginMinecraftServer,2,Returns the reference to Minecraft Server.
@@ -1229,7 +1229,7 @@ func_72550_a,sendSessionRequest,2,Send request to http://session.minecraft.net w
 func_72551_d,processReadPackets,2,Processes the packets that have been read since the last call to this function.
 func_72552_c,addToSendQueue,2,Adds the packet to the send queue
 func_72553_e,disconnect,2,Disconnects the network connection.
-func_72565_c,kickPlayerFromServer,2,
+func_72565_c,kickPlayer,2,Kick the offending player and give a reason why
 func_72566_d,handleSlashCommand,2,Processes a / command
 func_72567_b,sendPacketToPlayer,2,"addToSendQueue. if it is a chat packet, check before sending it"
 func_72568_e,packetSize,2,returns 0 for memoryMapped connections
@@ -1287,9 +1287,9 @@ func_72683_a,addPlayer,2,Adds an EntityPlayerMP to the PlayerManager.
 func_72685_d,updateMountedMovingPlayer,2,"update chunks around a player being moved by server logic (e.g. cart, boat)"
 func_72686_a,getFurthestViewableBlock,2,Get the furthest viewable block given player's view distance
 func_72687_a,flagChunkForUpdate,2,"the ""PlayerInstance""/ chunkWatcher will send this chunk to all players who are in line of sight"
-func_72688_a,getWorldServer,2,
+func_72688_a,getMinecraftServer,2,Returns the MinecraftServer associated with the PlayerManager.
 func_72689_b,getChunkWatchers,2,
-func_72690_a,getOrCreateChunkWatcher,2,
+func_72690_a,getPlayerInstance,2,passi n the chunk x and y and a flag as to whether or not the instance should be made if it doesnt exist
 func_72691_b,filterChunkLoadQueue,2,Removes all chunks from the given player's chunk load queue that are not in viewing range of the player.
 func_72692_a,getWorldServer,2,
 func_72693_b,updatePlayerInstances,2,updates all the player instances that need to be updated
@@ -1450,7 +1450,7 @@ func_72909_d,markBlockRangeForRenderUpdate,2,"On the client, re-renders all bloc
 func_72910_y,getLoadedEntityList,2,Accessor for world Loaded Entity List
 func_72911_I,isThundering,2,Returns true if the current thunder strength (weighted with the rain strength) is greater than 0.9
 func_72912_H,getWorldInfo,2,Gets the World's WorldInfo instance
-func_72913_w,toggleRain,2,
+func_72913_w,commandToggleDownfall,2,start precipitation in this world (2 ticks after command posted)
 func_72914_a,addWorldInfoToCrashReport,2,Adds some basic stats of the world to the given crash report.
 func_72915_b,setLightValue,2,"Sets the light value either into the sky map or block map depending on if enumSkyBlock is set to sky or block. Args: enumSkyBlock, x, y, z, lightValue"
 func_72916_c,chunkExists,2,"Returns whether a chunk exists at chunk coordinates x, y"
@@ -1570,7 +1570,7 @@ func_73119_a,informAllAssociatedPlayersOfItemDestruction,2,
 func_73120_a,sendPacketToAllTrackingPlayers,2,"if this is a player, then it is not informed"
 func_73121_d,isPlayerWatchingThisChunk,2,
 func_73122_a,sendLocationToAllClients,2,"also sends velocity, rotation, and riding info."
-func_73123_c,removePlayerFromTracker,2,
+func_73123_c,removeTrackedPlayerSymmetric,2,Remove a tracked player from our list and tell the tracked player to destroy us from their world.
 func_73124_b,getPacketForThisEntity,2,
 func_73125_b,sendEventsToPlayers,2,
 func_73148_d,makeString,2,Converts the instance data to a readable string.
@@ -1599,14 +1599,14 @@ func_73240_a,unloadAllChunks,2,"marks all chunks for unload, ignoring those near
 func_73241_b,unloadChunksIfNotNearSpawn,2,"marks chunk for unload by ""unload100OldestChunks""  if there is no spawn point, or if the center of the chunk is outside 200 blocks (x or z) of the spawn"
 func_73242_b,safeSaveChunk,2,"used by saveChunks, but catches any exceptions if the save fails."
 func_73243_a,safeSaveExtraChunkData,2,"used by saveChunks, but catches any exceptions if the save fails."
-func_73252_b,sendThisChunkToPlayer,2,
+func_73252_b,removePlayer,2,remove player from this instance
 func_73253_a,getChunkLocation,2,
 func_73254_a,sendChunkUpdate,2,
 func_73255_a,addPlayerToChunkWatchingList,2,called for all chunks within the visible radius of the player
-func_73256_a,sendToAllPlayersWatchingChunk,2,
-func_73257_a,sendTileToAllPlayersWatchingChunk,2,
+func_73256_a,sendPacketToPlayersInInstance,2,sends the packet to all players in the current instance
+func_73257_a,updateTileEntity,2,sends players update packet about the given entity
 func_73258_b,getPlayersInChunk,2,
-func_73259_a,flagChunkForUpdate,2,
+func_73259_a,markBlockNeedsUpdate,2,mark the block as changed so that it will update clients who need to know about it
 func_73266_a,writePacket,2,"Writes a packet, prefixed by its ID, to the data stream."
 func_73267_a,readPacketData,2,Abstract. Reads the raw packet data from the data stream.
 func_73268_a,containsSameEntityIDAs,2,eg return packet30entity.entityId == entityId; WARNING : will throw if you compare a packet to a different packet class
@@ -2457,7 +2457,7 @@ func_75680_a,writeObjectsInListToStream,2,"writes every object in passed list to
 func_75681_e,getWatchableObjectString,2,gets a watchable object and returns it as a String
 func_75682_a,addObject,2,"adds a new object to dataWatcher to watch, to update an already existing object see updateObject. Arguments: data Value Id, Object to add"
 func_75683_a,getWatchableObjectByte,2,gets the bytevalue of a watchable object
-func_75684_a,hasChanges,2,
+func_75684_a,hasObjectChanged,2,true if one or more object was changed
 func_75686_a,readWatchableObjects,2,
 func_75687_a,updateWatchedObjectsFromList,2,
 func_75688_b,unwatchAndReturnAllWatched,2,
@@ -2563,7 +2563,7 @@ func_75887_a,decryptSharedKey,2,Decrypt shared secret AES key using RSA private
 func_75888_a,decryptInputStream,2,
 func_75889_b,decryptData,2,Decrypt byte[] data with RSA private key
 func_75890_a,createNewSharedKey,2,Generate a new shared secret AES key from a secure random source
-func_75891_b,createNewKeyPair,2,
+func_75891_b,generateKeyPair,2,Generates RSA KeyPair
 func_75892_a,createBufferedBlockCipher,2,Create a new BufferedBlockCipher instance
 func_75893_a,digestOperation,2,Compute a message digest on arbitrary byte[] data
 func_75894_a,encryptData,2,Encrypt byte[] data with RSA public key
@@ -2668,7 +2668,7 @@ func_76126_a,sin,2,sin looked up in a table
 func_76127_a,average,2,
 func_76128_c,floor_double,2,Returns the greatest integer less than or equal to the double argument
 func_76129_c,sqrt_float,2,
-func_76130_a,abs_int,2,
+func_76130_a,abs,2,Returns the unsigned value of an int.
 func_76131_a,clamp_float,2,"Returns the value of the first parameter, clamped to be within the lower and upper limits given by the second and third parameters"
 func_76132_a,abs_max,2,Maximum of the absolute value of two numbers.
 func_76133_a,sqrt_double,2,

fml/conf/packages.csv

@@ -32,6 +32,7 @@ BlockDirt,net/minecraft/block
 BlockDispenser,net/minecraft/block
 BlockDoor,net/minecraft/block
 BlockDragonEgg,net/minecraft/block
+BlockDropper,net/minecraft/block
 BlockEnchantmentTable,net/minecraft/block
 BlockEndPortal,net/minecraft/block
 BlockEndPortalFrame,net/minecraft/block
@@ -178,6 +179,7 @@ FontRenderer,net/minecraft/client/gui
 Gui,net/minecraft/client/gui
 GuiButton,net/minecraft/client/gui
 GuiButtonLanguage,net/minecraft/client/gui
+GuiButtonLink,net/minecraft/client/gui
 GuiButtonMerchant,net/minecraft/client/gui
 GuiButtonNextPage,net/minecraft/client/gui
 GuiChat,net/minecraft/client/gui
@@ -214,7 +216,16 @@ GuiRepair,net/minecraft/client/gui
 GuiScreen,net/minecraft/client/gui
 GuiScreenAddServer,net/minecraft/client/gui
 GuiScreenBook,net/minecraft/client/gui
+GuiScreenConfigureWorld,net/minecraft/client/gui
+GuiScreenConfirmation,net/minecraft/client/gui
+GuiScreenCreateOnlineWorld,net/minecraft/client/gui
 GuiScreenDemo,net/minecraft/client/gui
+GuiScreenEditOnlineWorld,net/minecraft/client/gui
+GuiScreenInvite,net/minecraft/client/gui
+GuiScreenLongRunningTask,net/minecraft/client/gui
+GuiScreenOnlineServers,net/minecraft/client/gui
+GuiScreenResetWorld,net/minecraft/client/gui
+GuiScreenSelectLocation,net/minecraft/client/gui
 GuiScreenServerList,net/minecraft/client/gui
 GuiSelectWorld,net/minecraft/client/gui
 GuiShareToLan,net/minecraft/client/gui
@@ -222,6 +233,7 @@ GuiSleepMP,net/minecraft/client/gui
 GuiSlider,net/minecraft/client/gui
 GuiSlot,net/minecraft/client/gui
 GuiSlotLanguage,net/minecraft/client/gui
+GuiSlotOnlineServerList,net/minecraft/client/gui
 GuiSlotServer,net/minecraft/client/gui
 GuiSmallButton,net/minecraft/client/gui
 GuiSnooper,net/minecraft/client/gui
@@ -237,6 +249,15 @@ Particle,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
 ScreenHopper,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
+ThreadOnlineConnect,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
 GuiAchievement,net/minecraft/client/gui/achievement
 GuiAchievements,net/minecraft/client/gui/achievement
@@ -366,6 +387,7 @@ EntityRenderer,net/minecraft/client/renderer
 EntitySorter,net/minecraft/client/renderer
 GLAllocation,net/minecraft/client/renderer
 IImageBuffer,net/minecraft/client/renderer
+IconFlipped,net/minecraft/client/renderer
 ImageBufferDownload,net/minecraft/client/renderer
 InventoryEffectRenderer,net/minecraft/client/renderer
 ItemRenderer,net/minecraft/client/renderer
@@ -468,6 +490,7 @@ EnumOptions,net/minecraft/client/settings
 EnumOptionsHelper,net/minecraft/client/settings
 GameSettings,net/minecraft/client/settings
 KeyBinding,net/minecraft/client/settings
+StatPlaceholder,net/minecraft/client/stats
 GuiTexturePackSlot,net/minecraft/client/texturepacks
 GuiTexturePacks,net/minecraft/client/texturepacks
 ITexturePack,net/minecraft/client/texturepacks
@@ -477,6 +500,23 @@ TexturePackDownloadSuccess,net/minecraft/client/texturepacks
 TexturePackFolder,net/minecraft/client/texturepacks
 TexturePackImplementation,net/minecraft/client/texturepacks
 TexturePackList,net/minecraft/client/texturepacks
+ExceptionMcoHttp,net/minecraft/client/util
+ExceptionMcoService,net/minecraft/client/util
+ExceptionRetryCall,net/minecraft/client/util
+Location,net/minecraft/client/util
+Locations,net/minecraft/client/util
+McoClient,net/minecraft/client/util
+McoClientTypeRef,net/minecraft/client/util
+McoServer,net/minecraft/client/util
+McoServerAddress,net/minecraft/client/util
+McoServerList,net/minecraft/client/util
+McoServerListDummy,net/minecraft/client/util
+McoServerListUpdateThread,net/minecraft/client/util
+Request,net/minecraft/client/util
+RequestDelete,net/minecraft/client/util
+RequestGet,net/minecraft/client/util
+RequestPost,net/minecraft/client/util
+RequestPut,net/minecraft/client/util
 CommandBase,net/minecraft/command
 CommandClearInventory,net/minecraft/command
 CommandDebug,net/minecraft/command
@@ -517,6 +557,7 @@ CommandToggleDownfall,net/minecraft/command
 CommandWeather,net/minecraft/command
 CommandXP,net/minecraft/command
 EntitySelectorAlive,net/minecraft/command
+EntitySelectorInventory,net/minecraft/command
 IAdminCommand,net/minecraft/command
 ICommand,net/minecraft/command
 ICommandManager,net/minecraft/command
@@ -566,7 +607,6 @@ BehaviorDispenseBoat,net/minecraft/dispenser
 BehaviorDispenseFireball,net/minecraft/dispenser
 BehaviorDispenseFirework,net/minecraft/dispenser
 BehaviorDispenseItemProvider,net/minecraft/dispenser
-BehaviorDispenseMinecart,net/minecraft/dispenser
 BehaviorEggDispense,net/minecraft/dispenser
 BehaviorExpBottleDispense,net/minecraft/dispenser
 BehaviorMobEggDispense,net/minecraft/dispenser
@@ -574,6 +614,22 @@ BehaviorPotionDispense,net/minecraft/dispenser
 BehaviorPotionDispenseLogic,net/minecraft/dispenser
 BehaviorProjectileDispense,net/minecraft/dispenser
 BehaviorSnowballDispense,net/minecraft/dispenser
+DispenserBehaviorArrow,net/minecraft/dispenser
+DispenserBehaviorBoat,net/minecraft/dispenser
+DispenserBehaviorDye,net/minecraft/dispenser
+DispenserBehaviorEgg,net/minecraft/dispenser
+DispenserBehaviorEmptyBucket,net/minecraft/dispenser
+DispenserBehaviorExperience,net/minecraft/dispenser
+DispenserBehaviorFilledBucket,net/minecraft/dispenser
+DispenserBehaviorFire,net/minecraft/dispenser
+DispenserBehaviorFireball,net/minecraft/dispenser
+DispenserBehaviorFireworks,net/minecraft/dispenser
+DispenserBehaviorMobEgg,net/minecraft/dispenser
+DispenserBehaviorPotion,net/minecraft/dispenser
+DispenserBehaviorPotionProjectile,net/minecraft/dispenser
+DispenserBehaviorSnowball,net/minecraft/dispenser
+DispenserBehaviorTNT,net/minecraft/dispenser
+DispenserBehaviors,net/minecraft/dispenser
 IBehaviorDispenseItem,net/minecraft/dispenser
 IBlockSource,net/minecraft/dispenser
 ILocatableSource,net/minecraft/dispenser
@@ -606,6 +662,8 @@ EnchantmentUntouching,net/minecraft/enchantment
 EnchantmentWaterWorker,net/minecraft/enchantment
 EnumEnchantmentType,net/minecraft/enchantment
 IEnchantmentModifier,net/minecraft/enchantment
+CallableEntityName,net/minecraft/entity
+CallableEntityTracker,net/minecraft/entity
 CallableEntityType,net/minecraft/entity
 DataWatcher,net/minecraft/entity
 Entity,net/minecraft/entity
@@ -618,9 +676,12 @@ EntityHanging,net/minecraft/entity
 EntityList,net/minecraft/entity
 EntityLiving,net/minecraft/entity
 EntityMinecartChest,net/minecraft/entity
+EntityMinecartContainer,net/minecraft/entity
 EntityMinecartEmpty,net/minecraft/entity
 EntityMinecartFurnace,net/minecraft/entity
+EntityMinecartHopper,net/minecraft/entity
 EntityMinecartTNT,net/minecraft/entity
+EntitySelectorArmoredMob,net/minecraft/entity
 EntityTracker,net/minecraft/entity
 EntityTrackerEntry,net/minecraft/entity
 EnumCreatureAttribute,net/minecraft/entity
@@ -749,6 +810,7 @@ EntityVillager,net/minecraft/entity/passive
 EntityWaterMob,net/minecraft/entity/passive
 EntityWolf,net/minecraft/entity/passive
 IAnimals,net/minecraft/entity/passive
+CallableItemName,net/minecraft/entity/player
 EntityPlayer,net/minecraft/entity/player
 EntityPlayerMP,net/minecraft/entity/player
 EnumStatus,net/minecraft/entity/player
@@ -800,6 +862,8 @@ SlotEnchantmentTable,net/minecraft/inventory
 SlotFurnace,net/minecraft/inventory
 SlotMerchantResult,net/minecraft/inventory
 SlotRepair,net/minecraft/inventory
+BehaviorDispenseArmor,net/minecraft/item
+BehaviorDispenseMinecart,net/minecraft/item
 EnumAction,net/minecraft/item
 EnumArmorMaterial,net/minecraft/item
 EnumRarity,net/minecraft/item
@@ -811,6 +875,7 @@ ItemArmor,net/minecraft/item
 ItemAxe,net/minecraft/item
 ItemBed,net/minecraft/item
 ItemBlock,net/minecraft/item
+ItemBlockWithMetadata,net/minecraft/item
 ItemBoat,net/minecraft/item
 ItemBook,net/minecraft/item
 ItemBow,net/minecraft/item
@@ -860,6 +925,7 @@ ItemSign,net/minecraft/item
 ItemSimpleFoiled,net/minecraft/item
 ItemSkull,net/minecraft/item
 ItemSlab,net/minecraft/item
+ItemSnow,net/minecraft/item
 ItemSnowball,net/minecraft/item
 ItemSoup,net/minecraft/item
 ItemSpade,net/minecraft/item
@@ -943,6 +1009,10 @@ Packet202PlayerAbilities,net/minecraft/network/packet
 Packet203AutoComplete,net/minecraft/network/packet
 Packet204ClientInfo,net/minecraft/network/packet
 Packet205ClientCommand,net/minecraft/network/packet
+Packet206SetObjective,net/minecraft/network/packet
+Packet207SetScore,net/minecraft/network/packet
+Packet208SetDisplayObjective,net/minecraft/network/packet
+Packet209SetPlayerTeam,net/minecraft/network/packet
 Packet20NamedEntitySpawn,net/minecraft/network/packet
 Packet21PickupSpawn,net/minecraft/network/packet
 Packet22Collect,net/minecraft/network/packet
@@ -1013,6 +1083,18 @@ PlayerUsageSnooper,net/minecraft/profiler
 PlayerUsageSnooperThread,net/minecraft/profiler
 Profiler,net/minecraft/profiler
 ProfilerResult,net/minecraft/profiler
+Score,net/minecraft/scoreboard
+ScoreComparator,net/minecraft/scoreboard
+ScoreDummyCriteria,net/minecraft/scoreboard
+ScoreHealthCriteria,net/minecraft/scoreboard
+ScoreObjective,net/minecraft/scoreboard
+ScoreObjectiveCriteria,net/minecraft/scoreboard
+ScorePlayerTeam,net/minecraft/scoreboard
+Scoreboard,net/minecraft/scoreboard
+ScoreboardSaveData,net/minecraft/scoreboard
+ServerCommandScoreboard,net/minecraft/scoreboard
+ServerCommandTestFor,net/minecraft/scoreboard
+ServerScoreboard,net/minecraft/scoreboard
 CallableIsServerModded,net/minecraft/server
 CallableServerMemoryStats,net/minecraft/server
 CallableServerProfiler,net/minecraft/server
@@ -1073,13 +1155,17 @@ CallableTileEntityID,net/minecraft/tileentity
 CallableTileEntityName,net/minecraft/tileentity
 EntitySelectorHasInventory,net/minecraft/tileentity
 EntitySelectorHopperInventory,net/minecraft/tileentity
+Hopper,net/minecraft/tileentity
 TileEntity,net/minecraft/tileentity
+TileEntityBase,net/minecraft/tileentity
 TileEntityBeacon,net/minecraft/tileentity
 TileEntityBrewingStand,net/minecraft/tileentity
 TileEntityChest,net/minecraft/tileentity
 TileEntityCommandBlock,net/minecraft/tileentity
+TileEntityComparator,net/minecraft/tileentity
 TileEntityDaylightDetector,net/minecraft/tileentity
 TileEntityDispenser,net/minecraft/tileentity
+TileEntityDropper,net/minecraft/tileentity
 TileEntityEnchantmentTable,net/minecraft/tileentity
 TileEntityEndPortal,net/minecraft/tileentity
 TileEntityEnderChest,net/minecraft/tileentity
@@ -1105,6 +1191,7 @@ EnchantmentNameParts,net/minecraft/util
 EntityDamageSource,net/minecraft/util
 EntityDamageSourceIndirect,net/minecraft/util
 EnumArt,net/minecraft/util
+EnumChatFormatting,net/minecraft/util
 EnumFacing,net/minecraft/util
 EnumMovingObjectType,net/minecraft/util
 EnumOS,net/minecraft/util
@@ -1136,6 +1223,7 @@ StringUtils,net/minecraft/util
 ThreadDownloadResources,net/minecraft/util
 Timer,net/minecraft/util
 Tuple,net/minecraft/util
+ValueObject,net/minecraft/util
 Vec3,net/minecraft/util
 Vec3Pool,net/minecraft/util
 WeightedRandom,net/minecraft/util

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	Sat Jan 12 02:17:55 2013
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Jan 12 02:24:09 2013
-@@ -532,9 +532,8 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Sat Feb 02 03:24:33 2013
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Feb 02 03:26:25 2013
+@@ -533,9 +533,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;
-@@ -552,7 +551,6 @@
+@@ -553,7 +552,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) {
              ;
-@@ -570,8 +568,6 @@
+@@ -571,8 +569,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	Sat Jan 12 02:17:56 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sat Feb 02 03:24:34 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Feb 02 03:26:25 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	Sat Jan 12 02:17:56 2013
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\CodecMus.java	Sat Feb 02 03:24:34 2013
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Feb 02 03:26:25 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	Sat Jan 12 02:17:57 2013
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Feb 02 03:24:35 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Feb 02 03:26:25 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	Sat Jan 12 02:17:57 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Jan 12 02:24:09 2013
-@@ -202,7 +202,7 @@
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sat Feb 02 03:24:35 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Feb 02 03:26:25 2013
+@@ -205,7 +205,7 @@
        System.exit(0);
     }
  
@@ -98,9 +98,21 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        super.func_71190_q();
        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	Sat Feb 02 03:24:36 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sat Feb 02 03:29:58 2013
+@@ -38,7 +38,7 @@
+    private final String field_96304_B;
+ 
+    private EnumChatFormatting(char p_i10000_3_) {
+-      this(p_i10000_1_, p_i10000_2_, p_i10000_3_, false);
++      this(p_i10000_3_, false);
+    }
+ 
+    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	Sat Jan 12 02:17:58 2013
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\FontRenderer.java	Sat Feb 02 03:24:36 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Feb 02 03:26:25 2013
 @@ -611,8 +611,6 @@
           case 10:
              --var5;
@@ -120,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	Sat Jan 12 02:17:58 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sat Feb 02 03:24:36 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Feb 02 03:26:25 2013
 @@ -98,7 +98,7 @@
        return true;
     }
@@ -131,10 +143,23 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
        boolean var1 = this.field_71348_o;
        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\McoClientTypeRef.java minecraft_patched\net\minecraft\src\McoClientTypeRef.java
+--- minecraft\net\minecraft\src\McoClientTypeRef.java	Sat Feb 02 03:24:37 2013
++++ minecraft_patched\net\minecraft\src\McoClientTypeRef.java	Sat Feb 02 03:29:30 2013
+@@ -11,4 +11,9 @@
+    McoClientTypeRef(McoClient p_i10028_1_) {
+       this.field_96089_a = p_i10028_1_;
+    }
++
++   @Override
++   public int compareTo(Object arg0) {
++      return 0;
++   }
+ }
 diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
---- minecraft\net\minecraft\src\RenderBlocks.java	Sat Jan 12 02:17:59 2013
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sun Jan 13 14:47:53 2013
-@@ -1960,16 +1960,16 @@
+--- minecraft\net\minecraft\src\RenderBlocks.java	Sat Feb 02 03:24:37 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sat Feb 02 03:26:25 2013
+@@ -1962,16 +1962,16 @@
        float var25 = (float)(p_78589_2_ + 1);
        float var26 = (float)(p_78589_4_ + 0);
        float var27 = (float)(p_78589_4_ + 1);
@@ -155,7 +180,7 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
           int var29 = 0;
           int var30 = 0;
           int var31 = 16;
-@@ -2015,7 +2015,7 @@
+@@ -2017,7 +2017,7 @@
           var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var31), (double)var9.func_94207_b((double)var30));
           var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var30));
           var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var32));
@@ -165,9 +190,9 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
           var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
           var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Sat Jan 12 02:17:59 2013
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Jan 12 02:24:09 2013
-@@ -1450,7 +1450,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sat Feb 02 03:24:38 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Feb 02 03:26:25 2013
+@@ -1451,7 +1451,7 @@
           double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
           double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
           double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@@ -177,8 +202,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	Sat Jan 12 02:18:00 2013
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Feb 02 03:24:38 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Feb 02 03:26:25 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -188,8 +213,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	Sat Jan 12 02:18:00 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Jan 12 02:24:09 2013
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Feb 02 03:24:38 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Feb 02 03:26:25 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	Sat Jan 12 02:19:06 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jan 12 02:24:29 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sat Feb 02 03:25:51 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Feb 02 03:26:28 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	Sat Jan 12 02:19:06 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jan 12 02:24:29 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Feb 02 03:25:51 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Feb 02 03:26:28 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	Sat Jan 12 02:19:06 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Jan 12 02:24:29 2013
-@@ -203,7 +203,7 @@
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Feb 02 03:25:51 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Feb 02 03:26:28 2013
+@@ -206,7 +206,7 @@
        System.exit(0);
     }
  
@@ -45,9 +45,21 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        super.func_71190_q();
        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	Sat Feb 02 03:25:52 2013
++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sat Feb 02 03:28:15 2013
+@@ -38,7 +38,7 @@
+    private final String field_96304_B;
+ 
+    private EnumChatFormatting(char p_i10000_3_) {
+-      this(p_i10000_1_, p_i10000_2_, p_i10000_3_, false);
++      this(p_i10000_3_, false);
+    }
+ 
+    private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
 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	Sat Jan 12 02:19:08 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Jan 12 02:24:29 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Feb 02 03:25:53 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Feb 02 03:26:28 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -57,8 +69,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	Sat Jan 12 02:19:08 2013
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Jan 12 02:24:29 2013
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Feb 02 03:25:53 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Feb 02 03:26:28 2013
 @@ -20,7 +20,8 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.30
-ClientVersion = 13w02b
-ServerVersion = 13w02b
+MCPVersion = 7.34
+ClientVersion = 13w05b
+ServerVersion = 13w05b

fml/mc_versions.cfg

@@ -1,5 +1,5 @@
 [default]
-current_ver = s13w02b
+current_ver = s13w05b
 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
@@ -46,6 +46,15 @@ server_url = http://assets.minecraft.net/13w02b/minecraft_server.jar
 client_md5 = 13891f6610b6739ac79f40147cca31d5
 server_md5 = b2200cfa5d6535f177d291066d2ed3a8
 mcp_ver    = 7.30c
-mcp_url    = http://files.minecraftforge.net/mcpmirror/mcp730c.zip
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp730c.zip
 mcp_md5    = b25479ba38ca583bb8223c0a0553defe
 
+[s13w05b]
+client_url = http://assets.minecraft.net/13w05b/minecraft.jar
+server_url = http://assets.minecraft.net/13w05b/minecraft_server.jar
+client_md5 = 496002660846f2eb455cba407cd26818
+server_md5 = e317f8f4f62d0603a8eacbfb2e33549c
+mcp_ver    = 7.34
+mcp_url    = http://files.minecraftforge.net/mcpmirror/mcp734.zip
+mcp_md5    = 522dc1a7b66f8265291e1cc2f8f5d247
+

fml/mcp_merge.cfg

@@ -1 +1 @@
-!bfv #net/minecraft/src/CodecMus
+!biv #net/minecraft/src/CodecMus