Merge MC 1.5.1 branch to master.

fml/common/fml_at.cfg

@@ -1,6 +1,6 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public aqj.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public aqp.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
 public mv.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
 public mv.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
@@ -9,24 +9,24 @@ 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 bfy.g #FD:RenderEngine/field_78366_k #texturePack
+public bgf.g #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bgs.q #FD:RenderManager/field_78729_o #renderers
+public bgz.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bfz.* #FD:RenderBlocks/*
+public bgg.* #FD:RenderBlocks/*
-public bfz.*() #MD:RenderBlocks/*
+public bgg.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bhn.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bhu.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bha.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bhh.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 bix.m #FD:TileEntityRenderer/field_76966_m
+public bje.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public ye.a(Lwg;[Ljava/lang/Object;)Lyh; #MD:CraftingManager/func_92103_a
+public yk.a(Lwm;[Ljava/lang/Object;)Lyn; #MD:CraftingManager/func_92103_a
-public ye.b(Lwg;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+public yk.b(Lwm;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
 public lo.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
@@ -40,34 +40,34 @@ public jf.g #FD:NetLoginHandler/field_72543_h #userName
 public jc.cr()V #MD:EntityPlayerMP/func_71117_bO
 public jc.cu #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public oi #CL:EntityAITaskEntry
+public oo #CL:EntityAITaskEntry
 # EntityAITasks
-public oh.a #FD:EntityAITasks/field_75782_a #taskList
+public on.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public alh.m(Lzv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public aln.m(Laab;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
 public ng.aU #FD:EntityLiving/field_70736_aM #carryoverDamage
 public ng.bo #FD:EntityLiving/field_70714_bg #tasks
 public ng.bG #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected ou.a(Lzv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected pa.a(Laab;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected ou.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected pa.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public c #CL:CallableMinecraftVersion
 public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public qb.d #FD:EntityAnimal/field_70881_d #inLove
+public qh.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public aaf.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public aal.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public aaf.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
+public aal.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public ahj #CL:ComponentVillage
+public ahp #CL:ComponentVillage
 # EntityVillager - minmax lists
-public sg.a(Lzl;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public sm.a(Lzr;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public sg.b(Lzl;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public sm.b(Lzr;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public sg.bP #FD:EntityVillager/field_70958_bB
+public sm.bP #FD:EntityVillager/field_70958_bB
-public sg.bQ #FD:EntityVillager/field_70960_bC
+public sm.bQ #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public azc #CL:GuiButtonMerchant
+public azi #CL:GuiButtonMerchant
 
-protected awe.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected awk.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
-sk cpw/mods/fml/common/network/Player
+sq cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aou cpw/mods/fml/common/registry/BlockProxy
+apa cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-we cpw/mods/fml/common/registry/ItemProxy
+wk cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy

fml/common/mcpmod.info

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

fml/conf/fields.csv

@@ -1,4 +1,5 @@
 searge,name,side,desc
+field_100010_b,iconArray,2,
 field_70009_b,chatBuffer,2,
 field_70010_a,consoleBuffer,2,only ever used by MinecraftServer.executeCommand
 field_70116_cv,serverPosZ,2,
@@ -185,15 +186,6 @@ field_70378_a,tickCount,2,Used by the render to make the book 'bounce'
 field_70379_j,bookRotation,2,
 field_70380_h,bookRotation2,2,
 field_70381_i,bookRotationPrev,2,
-field_70388_f,minSpawnDelay,2,
-field_70389_g,maxSpawnDelay,2,
-field_70390_d,mobID,2,"The string ID of the mobs being spawned from this spawner. Defaults to pig, apparently."
-field_70391_e,spawnerTags,2,The extra NBT data to add to spawned entities
-field_70392_b,yaw,2,
-field_70393_c,yaw2,2,
-field_70394_a,delay,2,The stored delay before a new spawn.
-field_70395_h,spawnCount,2,
-field_70396_i,spawnedMob,2,
 field_70404_d,furnaceItemStacks,2,The ItemStacks that hold the items currently being used in the furnace
 field_70405_b,currentItemBurnTime,2,The number of ticks that a fresh copy of the currently-burning item would keep the furnace burning for
 field_70406_c,furnaceCookTime,2,The number of ticks that the current item has been cooking for
@@ -240,11 +232,6 @@ field_70484_a,container,2,The brewing stand this slot belongs to.
 field_70488_a,associatedChest,2,
 field_70499_f,isInReverse,2,
 field_70500_g,matrix,2,Minecart rotational logic matrix
-field_70501_d,cargoItems,2,Array of item stacks stored in minecart (for storage minecarts).
-field_70502_e,fuel,2,
-field_70503_b,pushX,2,
-field_70504_c,pushZ,2,
-field_70505_a,minecartType,2,"The type of minecart, 2 for powered, 1 for storage."
 field_70506_as,velocityZ,2,
 field_70507_ar,velocityY,2,
 field_70508_aq,velocityX,2,
@@ -463,7 +450,6 @@ field_71078_a,theInventoryEnderChest,2,
 field_71080_cy,prevTimeInPortal,2,The amount of time an entity has been in a Portal the previous tick
 field_71081_bT,playerLocation,2,The chunk coordinates of the bed the player is in (null if player isn't in a bed).
 field_71083_bS,sleeping,2,Boolean value indicating weather a player is sleeping or not
-field_71084_cw,playerCloakUrl,2,
 field_71086_bY,timeInPortal,2,The amount of time an entity has been in a Portal
 field_71087_bX,inPortal,2,Whether the entity is inside a Portal
 field_71088_bW,timeUntilPortal,2,
@@ -550,7 +536,6 @@ field_71302_d,currentTask,2,The task the server is currently working on(and will
 field_71303_e,percentDone,2,The percentage of the current task finished so far.
 field_71304_b,theProfiler,2,
 field_71305_c,worldServers,2,The server world instances.
-field_71306_a,logger,2,The logging system.
 field_71307_n,usageSnooper,2,The PlayerUsageSnooper instance.
 field_71308_o,anvilFile,2,
 field_71309_l,mcServer,2,Instance of Minecraft Server.
@@ -643,8 +628,6 @@ field_71467_ac,rightClickDelayTimer,2,"When you place a block, it's set to 6, de
 field_71468_ad,refreshTexturePacksScheduled,2,"Checked in Minecraft's while(running) loop, if true it's set to false and the textures refreshed."
 field_71469_aa,saveLoader,2,
 field_71470_ab,debugFPS,2,"This is set to fpsCounter every debug screen update, and is shown on the debug screen. It's also sent as part of the usage snooping."
-field_71471_ag,textureWaterFX,2,
-field_71472_ah,textureLavaFX,2,
 field_71473_z,mcApplet,2,
 field_71474_y,gameSettings,2,The game settings that currently hold effect.
 field_71475_ae,serverName,2,
@@ -839,7 +822,6 @@ field_71743_a,theDecitatedServer,2,Reference to the DecitatedServer object.
 field_71748_d,connections,2,
 field_71749_b,isListening,2,Whether the network listener object is listening.
 field_71750_c,mcServer,2,Reference to the MinecraftServer object.
-field_71751_a,logger,2,Reference to the logger.
 field_71757_g,myServerListenThread,2,
 field_71758_d,theMemoryConnection,2,
 field_71760_c,netMemoryConnection,2,
@@ -850,7 +832,6 @@ field_71773_d,connectionCounter,2,
 field_71774_e,myServerSocket,2,
 field_71775_b,pendingConnections,2,
 field_71776_c,recentConnections,2,This map stores a list of InetAddresses and the last time which they connected at
-field_71777_a,logger,2,
 field_71778_h,myPort,2,
 field_71781_b,parameters,2,
 field_71782_a,iv,2,
@@ -934,7 +915,6 @@ field_71979_v,dirt,2,
 field_71980_u,grass,2,
 field_71981_t,stone,2,
 field_71982_s,useNeighborBrightness,2,Flag if block ID should use the brightest neighbor light value as its own
-field_71983_r,requiresSelfNotify,2,
 field_71984_q,lightValue,2,Amount of light emitted
 field_71985_p,canBlockGrass,2,Array of booleans that tells if a block can grass
 field_71986_z,bedrock,2,
@@ -946,7 +926,7 @@ field_71991_bz,waterlily,2,
 field_71992_bw,stairsBrick,2,
 field_71993_bv,fenceGate,2,
 field_71994_by,mycelium,2,
-field_71995_bx,stairsStoneBrickSmooth,2,
+field_71995_bx,stairsStoneBrick,2,
 field_71996_bs,pumpkinStem,2,
 field_71997_br,melon,2,
 field_71998_bu,vine,2,
@@ -1008,13 +988,12 @@ field_72053_aD,signPost,2,
 field_72054_aE,doorWood,2,
 field_72055_aF,ladder,2,
 field_72056_aG,rail,2,
-field_72057_aH,stairCompactCobblestone,2,
+field_72057_aH,stairsCobblestone,2,
 field_72058_az,crops,2,
-field_72059_bZ,blockIndexInTexture,2,"The index of the texture to be displayed for this block. May vary based on graphics settings. Mostly seems to come from terrain.png, and the index is 0-based (grass is 0)."
 field_72060_ay,workbench,2,
 field_72061_ba,pumpkin,2,
 field_72062_bU,tripWire,2,
-field_72063_at,stairCompactPlanks,2,
+field_72063_at,stairsWoodOak,2,
 field_72064_bT,tripWireSource,2,
 field_72065_as,mobSpawner,2,
 field_72066_bS,enderChest,2,
@@ -1066,7 +1045,6 @@ field_72123_a,headTexture,2,The texture for the 'head' of the piston. Sticky or
 field_72129_b,redstoneUpdateInfoCache,2,Map of ArrayLists of RedstoneUpdateInfo. Key of map is World.
 field_72130_a,torchActive,2,Whether the redstone torch is currently active or not.
 field_72131_c,graphicsLevel,2,"Used to determine how to display leaves based on the graphics level. May also be used in rendering for transparency, not sure."
-field_72134_cr,baseIndexInPNG,2,The base index in terrain.png corresponding to the fancy version of the leaf texture. This is stored so we can switch the displayed version between fancy and fast graphics (fast is this index + 1).
 field_72135_b,adjacentTreeBlocks,2,
 field_72136_a,LEAF_TYPES,2,
 field_72142_a,woodType,2,The type of tree this log came from.
@@ -1143,7 +1121,6 @@ field_72402_d,viewDistance,2,
 field_72403_e,dateFormat,2,
 field_72404_b,playerEntityList,2,A list of player entities that exist on this server.
 field_72405_c,maxPlayers,2,The maximum number of players that can be connected at a time.
-field_72406_a,logger,2,Reference to the logger.
 field_72407_n,commandsAllowedForAll,2,True if all players are allowed to use commands (cheats).
 field_72408_o,playerPingIndex,2,"index into playerEntities of player to ping, updated every tick; currently hardcoded to max at 200 players"
 field_72409_l,whiteListEnforced,2,Server setting to only allow OPs and whitelisted players to join the server.
@@ -1167,7 +1144,6 @@ field_72536_d,verifyToken,2,The 4 byte verify token read from a Packet252SharedK
 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_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
 field_72543_h,clientUsername,2,
@@ -1187,7 +1163,6 @@ field_72573_d,mcServer,2,Reference to the MinecraftServer object.
 field_72574_e,playerEntity,2,Reference to the EntityPlayerMP object.
 field_72575_b,netManager,2,The underlying network manager for this server handler.
 field_72576_c,connectionClosed,2,This is set to true whenever a player disconnects from the server.
-field_72577_a,logger,2,The logging system.
 field_72578_n,creativeItemCreationSpamThresholdTally,2,
 field_72579_o,lastPosX,2,The last known x position for this connection.
 field_72580_l,ticksOfLastKeepAlive,2,
@@ -1312,7 +1287,6 @@ field_72987_B,findingSpawnPoint,2,Boolean that is set to true when trying to fin
 field_72988_C,mapStorage,2,
 field_72989_L,scanningTileEntities,2,
 field_72990_M,ambientTickCountdown,2,number of ticks until the next random ambients play
-field_72991_N,entitiesWithinAABBExcludingEntity,2,"entities within AxisAlignedBB excluding one, set and returned in getEntitiesWithinAABBExcludingEntity(Entity var1, AxisAlignedBB var2)"
 field_72992_H,spawnPeacefulMobs,2,A flag indicating whether we should spawn peaceful mobs.
 field_72993_I,activeChunkSet,2,Positions to update
 field_72994_J,lightUpdateBlockList,2,"is a temporary list of blocks and light values used when updating light levels. Holds up to 32x32x32 blocks (the maximum influence of a light source.) Every element is a packed bit value: 0000000000LLLLzzzzzzyyyyyyxxxxxx. The 4-bit L is a light level used when darkening blocks. 6-bit numbers x, y and z represent the block's offset from the original block, plus 32 (i.e. value of 31 would mean a -1 offset"
@@ -1335,7 +1309,6 @@ field_73010_i,playerEntities,2,Array list of players in the world.
 field_73011_w,provider,2,The WorldProvider instance that World uses.
 field_73012_v,rand,2,RNG for World.
 field_73013_u,difficultySetting,2,Option > Difficulty setting (0 - 3)
-field_73014_t,editingBlocks,2,true while the world is editing blocks
 field_73016_r,lastLightningBolt,2,Set to 2 whenever a lightning bolt is generated in SSP. Decrements if > 0 in updateWeather(). Value appears to be unused.
 field_73017_q,thunderingStrength,2,
 field_73018_p,prevThunderingStrength,2,
@@ -1760,13 +1733,6 @@ field_73637_a,windowId,2,The window which is being updated. 0 for player invento
 field_73638_b,food,2,
 field_73639_c,foodSaturation,2,Players logging on get a saturation of 5.0. Eating food increases the saturation as well as the food bar.
 field_73640_a,healthMP,2,Variable used for incoming health packets
-field_73653_f,isPoweredRail,2,"A boolean value that is true if the rail is powered, and false if its not."
-field_73654_g,connectedTracks,2,
-field_73655_d,trackY,2,
-field_73656_e,trackZ,2,
-field_73657_b,worldObj,2,Reference to the World object.
-field_73658_c,trackX,2,
-field_73659_a,rail,2,
 field_73661_d,updateTime,2,
 field_73662_b,y,2,
 field_73663_c,z,2,
@@ -1778,10 +1744,8 @@ field_73692_f,banEndDate,2,
 field_73693_g,reason,2,
 field_73694_d,banStartDate,2,
 field_73695_e,bannedBy,2,
-field_73696_b,loggerBanEntry,2,Creates Ban Entry in the logger.
 field_73697_c,username,2,
 field_73698_a,dateFormat,2,
-field_73700_a,loggerLogManager,2,Log manager of Minecraft.
 field_73701_b,sender,2,
 field_73702_a,command,2,The command string.
 field_73713_b,fileName,2,
@@ -1919,7 +1883,6 @@ field_73990_a,updateCounter,2,Counts the number of screen updates.
 field_73991_d,serverTextField,2,
 field_73992_b,guiScreen,2,Needed a change as a local variable was conflicting on construct
 field_73993_c,theServerData,2,Instance of ServerData.
-field_73994_a,lastServerName,2,Remembers the last hostname or IP address entered into text field between invocations of the GUI.
 field_73995_a,cooldownTimer,2,"The cooldown timer for the buttons, increases every tick and enables all buttons when reaching 20."
 field_73996_d,newServerData,2,ServerData to be modified by this GUI
 field_73997_b,serverAddress,2,
@@ -1933,7 +1896,6 @@ field_74025_c,parentScreen,2,A reference to the screen object that created this.
 field_74026_B,listofLanServers,2,
 field_74027_a,threadsPending,2,Number of outstanding ThreadPollServers threads
 field_74028_n,selectedServer,2,Index of the currently selected server
-field_74029_o,buttonEdit,2,The 'Edit' button
 field_74030_m,internetServerList,2,
 field_74031_w,theServerData,2,Instance of ServerData.
 field_74032_v,lagTooltip,2,This GUI's lag tooltip text or null if no lag icon is being hovered.
@@ -2068,7 +2030,6 @@ field_74263_b,workingMessage,2,
 field_74264_c,currentProgress,2,
 field_74265_a,progressMessage,2,
 field_74267_a,mcServer,2,Reference to the MinecraftServer object.
-field_74268_a,dateFormat,2,The date format to use in the console log.
 field_74270_a,mcServer,2,Reference to the MinecraftServer object.
 field_74272_a,mcServer,2,Reference to the MinecraftServer object.
 field_74274_a,mcServer,2,Reference to the MinecraftServer object.
@@ -2083,7 +2044,6 @@ field_74283_j,timeSyncAdjustment,2,"A ratio used to sync the high-resolution clo
 field_74284_h,lastSyncHRClock,2,"The time reported by the high-resolution clock at the last sync, in milliseconds"
 field_74286_b,username,2,
 field_74287_c,sessionId,2,
-field_74288_a,registeredBlocksList,2,
 field_74295_a,dateFormat,2,
 field_74310_D,keyBindChat,2,
 field_74311_E,keyBindSneak,2,
@@ -2731,7 +2691,6 @@ field_75768_d,mapDataDir,2,
 field_75769_e,initializationTime,2,The time in milliseconds when this field was initialized. Stored in the session lock file.
 field_75770_b,worldDirectory,2,The directory in which to save world data.
 field_75771_c,playersDirectory,2,The directory in which to save player data.
-field_75772_a,logger,2,Reference to the logger.
 field_75780_b,executingTaskEntries,2,A list of EntityAITaskEntrys that are currently being executed.
 field_75781_c,theProfiler,2,Instance of Profiler.
 field_75782_a,taskEntries,2,A list of EntityAITaskEntrys in EntityAITasks.
@@ -3026,7 +2985,6 @@ field_76371_c,lava,2,
 field_76372_a,inFire,2,
 field_76373_n,damageType,2,
 field_76374_o,isUnblockable,2,This kind of damage can be blocked or not.
-field_76375_l,explosion2,2,
 field_76376_m,magic,2,
 field_76377_j,generic,2,
 field_76378_k,explosion,2,
@@ -3275,25 +3233,6 @@ field_76841_d,cache,2,The list of cached BiomeCacheBlocks
 field_76842_b,lastCleanupTime,2,"The last time this BiomeCache was cleaned, in milliseconds."
 field_76843_c,cacheMap,2,"The map of keys to BiomeCacheBlocks. Keys are based on the chunk x, z coordinates as (x | z << 32)."
 field_76844_a,chunkManager,2,Reference to the WorldChunkManager
-field_76847_f,tileImage,2,
-field_76848_d,textureId,2,Texture ID
-field_76849_e,tileSize,2,
-field_76850_b,iconIndex,2,
-field_76851_c,anaglyphEnabled,2,
-field_76852_a,imageData,2,
-field_76853_g,portalTickCounter,2,Portal tick counter
-field_76854_h,portalTextureData,2,Portal texture data
-field_76855_g,red,2,red RGB value for water texture
-field_76856_j,alpha,2,alpha RGB value for water texture
-field_76857_k,tickCounter,2,
-field_76858_h,green,2,green RGB value for water texture
-field_76859_i,blue,2,blue RGB value for water texture
-field_76860_g,mc,2,Holds the game instance to retrieve information like world provider and time.
-field_76863_h,watchIconImageData,2,Holds the image of the watch from items.png in rgb format.
-field_76864_i,dialImageData,2,Holds the image of the dial.png in rgb format.
-field_76865_g,mc,2,A reference to the Minecraft object.
-field_76867_h,compassIconImageData,2,Holds the image of the compass from items.png in rgb format.
-field_76882_k,tickCounter,2,
 field_76886_f,lastAccessTime,2,"The last time this BiomeCacheBlock was accessed, in milliseconds."
 field_76887_g,theBiomeCache,2,The BiomeCache object that contains this BiomeCacheBlock
 field_76888_d,xPosition,2,The x coordinate of the BiomeCacheBlock.
@@ -3308,7 +3247,6 @@ field_76904_a,blockRenderer,2,instance of RenderBlocks used to draw the piston b
 field_76910_a,modelSign,2,The ModelSign instance used by the TileEntitySignRenderer
 field_76912_c,largeChestModel,2,The large double chest model.
 field_76913_a,chestModel,2,The normal small chest model.
-field_76915_a,waterBuffer,2,
 field_76922_f,eventParameter,2,"Different for each blockID, eventID"
 field_76923_d,blockID,2,
 field_76924_e,eventID,2,Different for each blockID
@@ -3352,6 +3290,7 @@ field_77004_a,sandRenderBlocks,2,
 field_77013_a,modelMinecart,2,instance of ModelMinecart for rendering
 field_77022_g,itemRenderBlocks,2,
 field_77023_b,zLevel,2,Defines the zLevel of rendering of item on GUI.
+field_77024_a,renderWithColor,2,
 field_77025_h,random,2,The RNG used in RenderItem (for bobbing itemstacks on the ground)
 field_77027_a,itemIconIndex,2,"Have the icon index (in items.png) that will be used to render the image. Currently, eggs and snowballs uses this classes."
 field_77045_g,mainModel,2,
@@ -3543,7 +3482,6 @@ field_77526_d,isStopping,2,
 field_77527_e,address,2,
 field_77528_b,motd,2,
 field_77529_c,socket,2,The socket we're using to send packets on.
-field_77530_a,logger,2,
 field_77542_f,texturePackFileName,2,"The name of the texture pack's zip file/directory or ""Default"" for the builtin texture pack. Shown in the GUI."
 field_77543_g,thumbnailTextureName,2,The texture id for this pcak's thumbnail image.
 field_77544_d,thumbnailImage,2,The texture pack's thumbnail image loaded from the /pack.png file.
@@ -3981,20 +3919,17 @@ field_78251_c,posZ1,2,Z vertex coordinate of lower box corner
 field_78252_a,posX1,2,X vertex coordinate of lower box corner
 field_78253_h,vertexPositions,2,"The (x,y,z) vertex positions and (u,v) texture coordinates for each of the 8 points on a cube"
 field_78254_i,quadList,2,"An array of 6 TexturedQuads, one for each face of a cube"
-field_78284_f,glyphTextureName,2,Array of GL texture ids for loaded glyph_XX.png images. Indexed by Unicode block (group of 256 chars).
 field_78285_g,colorCode,2,Array of RGB triplets defining the 16 standard chat colors followed by 16 darker version of the same colors for drop shadows.
 field_78286_d,charWidth,2,Array of width of all the characters in default.png
 field_78287_e,glyphWidth,2,Array of the start/end column (in upper/lower nibble) for every glyph in the /font directory.
 field_78288_b,FONT_HEIGHT,2,the height in pixels of default text
 field_78289_c,fontRandom,2,
-field_78290_a,fontTextureName,2,
 field_78291_n,red,2,Used to specify new red value for the current color.
 field_78292_o,blue,2,Used to specify new blue value for the current color.
 field_78293_l,unicodeFlag,2,"If true, strings should be rendered with Unicode fonts instead of the default.png font"
 field_78294_m,bidiFlag,2,"If true, the Unicode Bidirectional Algorithm should be run before rendering any string."
 field_78295_j,posX,2,Current X coordinate at which to draw the next character.
 field_78296_k,posY,2,Current Y coordinate at which to draw the next character.
-field_78297_h,boundTextureName,2,The currently bound GL texture ID. Avoids unnecessary glBindTexture() for the same texture if it's already bound.
 field_78298_i,renderEngine,2,The RenderEngine used to load and setup glyph textures.
 field_78299_w,strikethroughStyle,2,"Set if the ""m"" style (strikethrough) is active in currently rendering string"
 field_78300_v,underlineStyle,2,"Set if the ""n"" style (underlined) is active in currently rendering string"
@@ -4023,17 +3958,13 @@ field_78335_b,slotStatsBlockGUI,2,
 field_78336_a,statsGUI,2,
 field_78338_b,slotStatsItemGUI,2,
 field_78339_a,statsGUI,2,
-field_78357_f,singleIntBuffer,2,An IntBuffer storing 1 int used as scratch space in RenderEngine
 field_78358_g,imageData,2,Stores the image data for the texture.
 field_78359_d,textureContentsMap,2,"Texture contents map (key: texture name, value: int[] contents)"
 field_78360_e,textureNameToImageMap,2,A mapping from GL texture names (integers) to BufferedImage instances
-field_78361_b,blurTexture,2,Flag set when a texture should use blurry resizing
 field_78362_c,textureMap,2,
-field_78363_a,clampTexture,2,Flag set when a texture should not be repeated
 field_78364_l,missingTextureImage,2,Missing texture image
 field_78365_j,options,2,Reference to the GameSettings object
 field_78366_k,texturePack,2,Texture pack
-field_78367_h,textureList,2,
 field_78368_i,urlToImageDataMap,2,A mapping from image URLs to ThreadDownloadImageData instances
 field_78387_D,vboCount,2,Number of vertex buffer objects allocated for use.
 field_78388_E,bufferSize,2,The size of the buffers used (in integers).
@@ -4260,7 +4191,6 @@ field_78736_p,fontRenderer,2,Renders fonts
 field_78741_b,secondaryComponents,2,
 field_78742_a,primaryComponents,2,
 field_78770_f,curBlockDamageMP,2,Current block damage (MP)
-field_78771_g,prevBlockDamageMP,2,Previous block damage (MP)
 field_78772_d,currentBlockY,2,PosY of the current block being destroyed
 field_78773_e,currentblockZ,2,PosZ of the current block being destroyed
 field_78774_b,netClientHandler,2,
@@ -4363,7 +4293,6 @@ field_78949_a,entityPosX,2,Entity position X
 field_79002_a,mc,2,The Minecraft instance.
 field_79008_b,serverGuiInitialized,2,This is set to true after server GUI window has been initialized.
 field_79009_c,serverInstance,2,
-field_79010_a,logger,2,Reference to the logger.
 field_79011_b,updateCounter,2,Counts the number of updates.
 field_79012_a,mcServer,2,Reference to the MinecraftServer object.
 field_79016_d,displayStrings,2,An array containing the strings displayed in this stats component.
@@ -4437,7 +4366,6 @@ field_82303_q,theTextField,2,
 field_82304_p,theButton,2,
 field_82305_a,presetIconRenderer,2,RenderItem instance used to render preset icons.
 field_82307_o,theFlatPresetsListSlot,2,
-field_82310_a,mcServer,2,Reference to the MinecraftServer object.
 field_82316_w,buttonRecreate,2,
 field_82317_b,commandBlock,2,Command block being edited.
 field_82318_a,commandTextField,2,Text field containing the command block's command.
@@ -4451,9 +4379,6 @@ field_82332_a,hangingDirection,2,
 field_82337_e,itemDropChance,2,Chance for this item frame's item to drop from the frame.
 field_82339_as,particleAlpha,2,Particle alpha
 field_82346_a,theContainer,2,Container of this anvil's block.
-field_82348_s,spawnRange,2,Range for spawning new entities with mob spawners
-field_82349_r,requiredPlayerRange,2,Required player range for mob spawning to occur
-field_82350_j,maxNearbyEntities,2,Maximum number of entities for limiting mob spawning
 field_82354_a,command,2,The command this block will execute when powered.
 field_82365_a,difficulties,2,
 field_82373_c,directions,2,
@@ -4461,10 +4386,10 @@ field_82374_e,facings,2,
 field_82387_b,intListPattern,2,"This matches things like ""-1,,4"", and is used for getting x,y,z,range from the token's argument list."
 field_82388_c,keyValueListPattern,2,"This matches things like ""rm=4,c=2"" and is used for handling named token arguments."
 field_82389_a,tokenPattern,2,"This matches the at-tokens introduced for command blocks, including their arguments, if any."
-field_82391_c,instance,2,
 field_82397_a,skullRenderer,2,
 field_82401_a,skeletonHeadModel,2,The Skeleton's head model.
 field_82405_a,renderBlocksInstance,2,
+field_82407_g,renderInFrame,2,
 field_82424_k,bipedArmorFilenamePrefix,2,List of armor texture filenames.
 field_82446_a,renderedBatSize,2,"not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and it seems a good match for a bats size"
 field_82453_b,createFlatWorldGui,2,
@@ -4482,18 +4407,6 @@ field_82479_k,minecartSpeed,2,
 field_82480_h,minecartSoundPitch,2,
 field_82481_i,minecartMoveSoundVolume,2,
 field_82483_a,itemDispenseBehaviorProvider,2,
-field_82484_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
-field_82490_b,mcServer,2,
-field_82492_b,mcServer,2,
-field_82493_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
-field_82494_b,mcServer,2,Reference to the MinecraftServer object.
-field_82495_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
-field_82496_b,mcServer,2,
-field_82497_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
-field_82501_b,potionStackToDispense,2,
-field_82502_c,potionDispenseBehavior,2,Reference to the BehaviorPotionDispense object.
-field_82503_b,mcServer,2,
-field_82504_b,mcServer,2,
 field_82507_n,soundLadderFootstep,2,
 field_82508_o,soundAnvilFootstep,2,
 field_82509_m,soundSnowFootstep,2,
@@ -4511,9 +4424,6 @@ field_82527_a,dispenseBehaviorRegistry,2,Registry for all dispense behaviors.
 field_82537_a,sensible,2,"Whether this button is sensible to arrows, used by wooden buttons."
 field_82539_a,types,2,The types of the wall.
 field_82548_a,theChunkCoordinates,2,
-field_82552_a,mcServer,2,
-field_82555_a,mcServer,2,
-field_82557_a,mcServer,2,Reference to the MinecraftServer object.
 field_82564_f,showCape,2,
 field_82575_g,totalTime,2,Total time for this world.
 field_82576_c,generatorOptions,2,
@@ -4554,6 +4464,8 @@ field_82664_a,layerCount,2,Amount of layers for this set of layers.
 field_82668_f,scatteredFeatureSpawnList,2,contains possible spawns for scattered features
 field_82669_g,maxDistanceBetweenScatteredFeatures,2,the maximum distance between scattered features
 field_82670_h,minDistanceBetweenScatteredFeatures,2,the minimum distance between scattered features
+field_82675_b,cropTypeA,2,First crop type for this field.
+field_82676_c,cropTypeB,2,Second crop type for this field.
 field_82678_d,cropTypeC,2,Third crop type for this field.
 field_82679_b,cropTypeA,2,First crop type for this field.
 field_82680_c,cropTypeB,2,Second crop type for this field.
@@ -4637,6 +4549,7 @@ field_82902_i,witchHat,2,
 field_82909_b,presetName,2,Name for this preset.
 field_82910_c,presetData,2,Data for this preset.
 field_82911_a,iconId,2,ID for the item used as icon for this preset.
+field_82912_p,heightMapMinimum,2,Lowest value in the heightmap.
 field_82914_M,spawnableCaveCreatureList,2,
 field_82915_S,theWorldGenerator,2,
 field_83001_bt,invulnerable,2,
@@ -4651,13 +4564,23 @@ field_83026_h,renderMaxX,2,The maximum X value for rendering (default 1.0).
 field_83027_i,renderMinY,2,The minimum Y value for rendering (default 0.0).
 field_85037_d,aiArrowAttack,2,
 field_85038_e,aiAttackOnCollide,2,
+field_85042_b,eventButton,2,
 field_85045_v,returningStack,2,Used when touchscreen is enabled
 field_85046_u,returningStackTime,2,
 field_85047_t,returningStackDestSlot,2,
 field_85050_q,draggedStack,2,Used when touchscreen is enabled
 field_85051_p,clickedSlot,2,Used when touchscreen is enabled
 field_85053_h,throwerName,2,
+field_85065_b,blockYCoord,2,
+field_85066_c,blockZCoord,2,
+field_85067_a,blockXCoord,2,
 field_85075_d,stackTrace,2,
+field_85078_a,theCrashReport,2,
+field_85080_a,blockID,2,
+field_85082_a,theSuspiciousClasses,2,
+field_85084_a,theCrashReport,2,
+field_85086_a,theCrashReport,2,
+field_85098_d,globalRenderer,2,
 field_85109_a,worldInfoInstance,2,
 field_85111_a,worldInfoInstance,2,
 field_85113_a,worldInfoInstance,2,
@@ -4667,29 +4590,223 @@ field_85137_a,worldInfoInstance,2,
 field_85139_a,worldInfoInstance,2,
 field_85141_a,worldInfoInstance,2,
 field_85143_a,worldInfoInstance,2,
+field_85146_a,theTileEntity,2,
+field_85155_a,theEntity,2,
+field_85161_a,theMapStructureGenerator,2,
+field_85164_c,theMapStructureGenerator,2,
+field_85168_c,theMapStructureGenerator,2,
+field_85171_a,theDedicatedServer,2,
 field_85180_cf,recordWait,2,
 field_85185_A,touchscreen,2,
 field_85192_a,worldServerInstance,2,
 field_90017_e,isMacOs,2,
 field_90018_r,isRightMouseClick,2,Used when touchscreen is enabled
+field_90025_c,theEntityRenderer,2,
+field_90028_b,theEntityRenderer,2,
+field_90029_a,theScaledResolution,2,
+field_90032_a,entityRender,2,
 field_90044_b,records,2,List of all record items and their names.
-field_92009_j,explosionStrength,2,The explosion radius of spawned fireballs.
+field_90046_a,theMinecraft,2,
-field_92010_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes.
+field_90048_a,theMinecraft,2,
-field_92011_a,fireworkAge,2,The age of the firework in ticks.
+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_92017_j,spawnedMob,2,
 field_92039_az,fireworkExplosions,2,
-field_92039_k,thorns,2,
-field_92052_bU,firework,2,
-field_92053_bW,enchantedBook,2,
-field_92054_bV,fireworkCharge,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.
 field_92061_d,isChristmas,2,"If true, chests will be rendered with the Christmas present textures."
 field_92086_a,isBlank,2,When isBlank is true the DataWatcher is not watching any objects
+field_92091_k,thorns,2,
 field_92104_bU,firework,2,
 field_92105_bW,enchantedBook,2,
 field_92106_bV,fireworkCharge,2,
 field_92117_D,heldItemTooltips,2,
 field_92118_B,overrideWidth,2,
 field_92119_C,overrideHeight,2,
+field_94054_b,particleTextureIndexX,2,
+field_94055_c,particleTextureIndexY,2,
+field_94084_b,tntPlacedBy,2,
+field_94106_a,minecartTNTFuse,2,
+field_94113_a,minecartContainerItems,2,
+field_94123_d,inventoryName,2,The name that is displayed if the hopper was renamed
+field_94141_F,destroyBlockIcons,2,
+field_94153_n,boundTexture,2,
+field_94154_l,textureMapBlocks,2,
+field_94155_m,textureMapItems,2,
+field_94161_d,rectHeight,2,
+field_94162_b,rectY,2,
+field_94163_c,rectWidth,2,
+field_94164_a,rectX,2,
+field_94177_n,minecraftRB,2,
+field_94187_f,holder,2,
+field_94188_d,height,2,
+field_94189_e,subSlots,2,
+field_94190_b,originY,2,
+field_94191_c,width,2,
+field_94192_a,originX,2,
+field_94201_d,height,2,
+field_94202_e,rotated,2,
+field_94204_c,width,2,
+field_94205_a,scaleFactor,2,
+field_94222_f,frameCounter,2,
+field_94223_g,tickCounter,2,
+field_94224_d,originX,2,x position of this icon on the texture sheet in pixels
+field_94225_e,originY,2,y position of this icon on the texture sheet in pixels
+field_94226_b,textureList,2,
+field_94227_c,rotated,2,
+field_94228_a,textureSheet,2,texture sheet containing this texture
+field_94229_n,minV,2,
+field_94230_o,maxV,2,
+field_94231_l,minU,2,
+field_94232_m,maxU,2,
+field_94233_j,width,2,width of this icon in pixels
+field_94234_k,height,2,height of this icon in pixels
+field_94235_h,textureName,2,
+field_94236_i,listAnimationTuples,2,
+field_94237_q,heightNorm,2,
+field_94238_p,widthNorm,2,
+field_94242_j,angleDelta,2,Speed and direction of compass rotation
+field_94243_h,compassTexture,2,
+field_94244_i,currentAngle,2,Current compass heading in radians
+field_94249_f,missingImage,2,
+field_94250_g,missingTextureStiched,2,
+field_94251_d,textureExt,2,
+field_94252_e,mapTexturesStiched,2,
+field_94253_b,textureName,2,
+field_94254_c,basePath,2,
+field_94255_a,textureType,2,"0 = terrain.png, 1 = items.png"
+field_94256_j,textureStichedMap,2,
+field_94257_h,atlasTexture,2,
+field_94258_i,listTextureStiched,2,
+field_94268_d,mapNameToId,2,
+field_94269_b,nextTextureID,2,
+field_94270_c,texturesMap,2,
+field_94271_a,instance,2,
+field_94287_f,textureDepth,2,
+field_94288_g,textureFormat,2,
+field_94289_d,width,2,Width of this texture in pixels.
+field_94290_e,height,2,Height of this texture in pixels.
+field_94291_b,textureId,2,
+field_94292_c,textureType,2,
+field_94293_a,glTextureId,2,
+field_94294_n,textureRect,2,
+field_94295_o,transferred,2,
+field_94296_l,mipmapActive,2,
+field_94297_m,textureName,2,
+field_94298_j,textureMagFilter,2,
+field_94299_k,textureWrap,2,
+field_94300_h,textureTarget,2,
+field_94301_i,textureMinFilter,2,
+field_94302_r,textureData,2,
+field_94303_q,textureCreated,2,
+field_94304_p,autoCreate,2,
+field_94313_f,maxHeight,2,
+field_94314_g,forcePowerOf2,2,
+field_94315_d,currentHeight,2,
+field_94316_e,maxWidth,2,
+field_94317_b,stitchSlots,2,
+field_94318_c,currentWidth,2,
+field_94319_a,setStitchHolders,2,
+field_94320_l,textureName,2,
+field_94322_k,atlasTexture,2,
+field_94323_h,maxTileDimension,2,Max size (width or height) of a single tile
+field_94336_cN,blockIcon,2,
+field_94337_cv,railActivator,2,
+field_94338_cu,stairCompactNetherQuartz,2,
+field_94339_ct,blockNetherQuartz,2,
+field_94340_cs,hopperBlock,2,
+field_94341_cq,blockRedstone,2,
+field_94342_cr,oreNetherQuartz,2,
+field_94343_co,redstoneComparatorActive,2,
+field_94344_cp,daylightSensor,2,
+field_94345_cm,pressurePlateIron,2,
+field_94346_cn,redstoneComparatorIdle,2,
+field_94347_ck,chestTrapped,2,
+field_94348_cl,pressurePlateGold,2,
+field_94349_a,iconArray,2,
+field_94359_b,theIcon,2,
+field_94362_b,theIcon,2,
+field_94363_a,iconArray,2,
+field_94364_a,iconArray,2,
+field_94365_a,iconArray,2,
+field_94366_b,iconArray,2,
+field_94367_a,grassTypes,2,
+field_94369_b,theIcon,2,
+field_94372_b,iconArray,2,
+field_94386_b,woodTextureTypes,2,
+field_94387_c,iconArray,2,
+field_94388_cO,tree_top,2,
+field_94389_b,treeTextureTypes,2,
+field_94390_c,iconArray,2,
+field_94395_cQ,iconArray,2,
+field_94401_cO,theIcon,2,
+field_94414_cO,quartzblock_chiseled_top,2,
+field_94415_cP,quartzblock_lines_top,2,
+field_94416_cQ,quartzblock_top,2,
+field_94417_cR,quartzblock_bottom,2,
+field_94418_b,quartzBlockTextureTypes,2,
+field_94419_c,quartzblockIcons,2,
+field_94420_a,quartzBlockTypes,2,
+field_94423_a,theIcon,2,
+field_94425_a,theIcon,2,
+field_94428_c,iconArray,2,
+field_94432_cP,iconArray,2,
+field_94433_b,theIcon,2,
+field_94435_b,iconSnowSide,2,
+field_94436_c,iconGrassSideOverlay,2,
+field_94437_a,iconGrassTop,2,
+field_94439_c,iconArray,2,
+field_94445_a,iconArray,2,
+field_94447_a,theIcon,2,
+field_94449_b,theIcon,2,
+field_94450_a,theIcon,2,
+field_94466_c,iconArray,2,
+field_94469_b,iconArray,2,
+field_94582_cb,tntMinecart,2,
+field_94593_a,theIcon,2,
+field_94596_a,theIcon,2,
+field_94598_a,theIcon,2,
+field_94600_b,iconArray,2,
+field_94601_a,bowPullIconNameArray,2,
+field_94610_a,theTileEntity,2,
+field_94612_a,theTileEntity,2,
+field_96093_i,entityUniqueID,2,
+field_96291_i,pointedEntityLiving,2,
+field_96442_D,worldScoreboard,2,
+field_96452_b,flipU,2,
+field_96453_c,flipV,2,
+field_96454_a,baseIcon,2,
+field_96458_b,defaultDispenserItemBehavior,2,
+field_96459_b,defaultDispenserItemBehavior,2,
+field_96460_b,defaultDispenserItemBehavior,2,
+field_96462_b,potionItemStack,2,
+field_96463_c,dispenserPotionBehavior,2,
+field_96464_b,defaultDispenserItemBehavior,2,
+field_96469_cy,dropper,2,
+field_96564_a,theEntity,2,
+field_96569_b,theEntityTracker,2,
+field_96600_cc,hopperMinecart,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_96685_c,objectiveCriteria,2,The ScoreObjectiveCriteria for this objetive
+field_96686_a,theScoreboard,2,
+field_96691_E,chatScale,2,
+field_96692_F,chatWidth,2,
+field_96693_G,chatHeightUnfocused,2,
+field_96694_H,chatHeightFocused,2,
+field_98051_e,fallingBlockTileEntityData,2,
+field_98130_m,serverLogAgent,2,
+field_98151_a,theTexture,2,
+field_98189_n,partialRenderBounds,2,
+field_98219_c,entityAvoiderAI,2,
+field_98226_b,theNetServerHandler,2,
+field_98227_a,thePacket,2,
+field_98244_b,theNetServerHandler,2,
+field_98245_a,thePacket,2,
+field_98288_a,mobID,2,
+field_98303_au,AMBIENT_OCCLUSIONS,2,
+field_98307_f,fontTextureName,2,

fml/conf/joined.exc

@@ -1558,6 +1558,12 @@ net/minecraft/src/CallableChunkPosHash.<init>(Lnet/minecraft/src/MapGenStructure
 net/minecraft/src/CallableClientMemoryStats.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i5000_1_
 net/minecraft/src/CallableClientProfiler.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3017_1_
 net/minecraft/src/CallableCrashMemoryReport.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i6000_1_
+net/minecraft/src/CallableEffectAmplifier.<init>(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/PotionEffect;)V=|p_i22006_1_,p_i22006_2_
+net/minecraft/src/CallableEffectDuration.<init>(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/PotionEffect;)V=|p_i22005_1_,p_i22005_2_
+net/minecraft/src/CallableEffectID.<init>(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/PotionEffect;)V=|p_i22004_1_,p_i22004_2_
+net/minecraft/src/CallableEffectIsAmbient.<init>(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/PotionEffect;)V=|p_i22008_1_,p_i22008_2_
+net/minecraft/src/CallableEffectIsSplash.<init>(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/PotionEffect;)V=|p_i22007_1_,p_i22007_2_
+net/minecraft/src/CallableEffectName.<init>(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/PotionEffect;)V=|p_i22003_1_,p_i22003_2_
 net/minecraft/src/CallableEntityName.<init>(Lnet/minecraft/src/Entity;)V=|p_i10048_1_
 net/minecraft/src/CallableEntityTracker.<init>(Lnet/minecraft/src/EntityTracker;I)V=|p_i10045_1_,p_i10045_2_
 net/minecraft/src/CallableEntityType.<init>(Lnet/minecraft/src/Entity;)V=|p_i6811_1_
@@ -1655,7 +1661,7 @@ net/minecraft/src/Chunk.func_76627_f(III)V=|p_76627_1_,p_76627_2_,p_76627_3_
 net/minecraft/src/Chunk.func_76628_c(III)I=|p_76628_1_,p_76628_2_,p_76628_3_
 net/minecraft/src/Chunk.func_76629_c(IIII)I=|p_76629_1_,p_76629_2_,p_76629_3_,p_76629_4_
 net/minecraft/src/Chunk.func_76633_a(Lnet/minecraft/src/EnumSkyBlock;IIII)V=|p_76633_1_,p_76633_2_,p_76633_3_,p_76633_4_,p_76633_5_
-net/minecraft/src/ChunkCache.<init>(Lnet/minecraft/src/World;IIIIII)V=|p_i3740_1_,p_i3740_2_,p_i3740_3_,p_i3740_4_,p_i3740_5_,p_i3740_6_,p_i3740_7_
+net/minecraft/src/ChunkCache.<init>(Lnet/minecraft/src/World;IIIIIII)V=|p_i22009_1_,p_i22009_2_,p_i22009_3_,p_i22009_4_,p_i22009_5_,p_i22009_6_,p_i22009_7_,p_i22009_8_
 net/minecraft/src/ChunkCache.func_72796_p(III)Lnet/minecraft/src/TileEntity;=|p_72796_1_,p_72796_2_,p_72796_3_
 net/minecraft/src/ChunkCache.func_72797_t(III)Z=|p_72797_1_,p_72797_2_,p_72797_3_
 net/minecraft/src/ChunkCache.func_72798_a(III)I=|p_72798_1_,p_72798_2_,p_72798_3_
@@ -3887,6 +3893,7 @@ net/minecraft/src/GuiConnecting.func_74257_b(Lnet/minecraft/src/GuiConnecting;)Z
 net/minecraft/src/GuiConnecting.func_98096_h(Lnet/minecraft/src/GuiConnecting;)Lnet/minecraft/client/Minecraft;=|p_98096_0_
 net/minecraft/src/GuiConnecting.func_98097_e(Lnet/minecraft/src/GuiConnecting;)Lnet/minecraft/src/GuiScreen;=|p_98097_0_
 net/minecraft/src/GuiContainer.<init>(Lnet/minecraft/src/Container;)V=|p_i3079_1_
+net/minecraft/src/GuiContainer.func_102021_a(Ljava/util/List;II)V=|p_102021_1_,p_102021_2_,p_102021_3_
 net/minecraft/src/GuiContainer.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiContainer.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiContainer.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
@@ -4166,7 +4173,7 @@ net/minecraft/src/GuiScreenEditOnlineWorld.func_73863_a(IIF)V=|p_73863_1_,p_7386
 net/minecraft/src/GuiScreenEditOnlineWorld.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiScreenEditOnlineWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenEditOnlineWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiScreenInvite.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/McoServer;)V=|p_i10015_1_,p_i10015_2_,p_i10015_3_
+net/minecraft/src/GuiScreenInvite.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/GuiScreenConfigureWorld;Lnet/minecraft/src/McoServer;)V=|p_i22002_1_,p_i22002_2_,p_i22002_3_
 net/minecraft/src/GuiScreenInvite.func_101015_a(Ljava/lang/String;)V=|p_101015_1_
 net/minecraft/src/GuiScreenInvite.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenInvite.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -4190,6 +4197,7 @@ net/minecraft/src/GuiScreenOnlineServers.func_101008_c(IIII)V=|p_101008_1_,p_101
 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_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_
@@ -5069,8 +5077,6 @@ net/minecraft/src/McoOption.func_98153_a(Ljava/lang/Object;)Lnet/minecraft/src/M
 net/minecraft/src/McoOptionSome.<init>(Ljava/lang/Object;)V=|p_i11017_1_
 net/minecraft/src/McoPair.<init>(Ljava/lang/Object;Ljava/lang/Object;)V=|p_i11018_1_,p_i11018_2_
 net/minecraft/src/McoPair.func_98157_a(Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/src/McoPair;=|p_98157_0_,p_98157_1_
-net/minecraft/src/McoServer.compareTo(Ljava/lang/Object;)I=|p_compareTo_1_
-net/minecraft/src/McoServer.func_101017_b(Lnet/minecraft/src/McoServer;)I=|p_101017_1_
 net/minecraft/src/McoServer.func_96399_a(Ljava/lang/String;)V=|p_96399_1_
 net/minecraft/src/McoServer.func_96400_b(Ljava/lang/String;)V=|p_96400_1_
 net/minecraft/src/McoServer.func_96401_a(Lnet/minecraft/src/McoServer;)V=|p_96401_1_
@@ -6192,6 +6198,7 @@ net/minecraft/src/RenderBlaze.func_76986_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_
 net/minecraft/src/RenderBlaze.func_77031_a(Lnet/minecraft/src/EntityLiving;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RenderBlaze.func_77067_a(Lnet/minecraft/src/EntityBlaze;DDDFF)V=|p_77067_1_,p_77067_2_,p_77067_4_,p_77067_6_,p_77067_8_,p_77067_9_
 net/minecraft/src/RenderBlocks.<init>(Lnet/minecraft/src/IBlockAccess;)V=|p_i3187_1_
+net/minecraft/src/RenderBlocks.func_102027_b(Lnet/minecraft/src/Block;IIIFFF)Z=|p_102027_1_,p_102027_2_,p_102027_3_,p_102027_4_,p_102027_5_,p_102027_6_,p_102027_7_
 net/minecraft/src/RenderBlocks.func_78565_t(Lnet/minecraft/src/BlockStairs;III)Z=|p_78565_1_,p_78565_2_,p_78565_3_,p_78565_4_
 net/minecraft/src/RenderBlocks.func_78566_o(Lnet/minecraft/src/Block;III)Z=|p_78566_1_,p_78566_2_,p_78566_3_,p_78566_4_
 net/minecraft/src/RenderBlocks.func_78567_v(Lnet/minecraft/src/BlockEndPortalFrame;III)Z=|p_78567_1_,p_78567_2_,p_78567_3_,p_78567_4_
@@ -6791,7 +6798,6 @@ net/minecraft/src/ServerList.func_78857_a(II)V=|p_78857_1_,p_78857_2_
 net/minecraft/src/ServerListenThread.<init>(Lnet/minecraft/src/NetworkListenThread;Ljava/net/InetAddress;I)V=java/io/IOException|p_i3384_1_,p_i3384_2_,p_i3384_3_
 net/minecraft/src/ServerListenThread.func_71764_a(Lnet/minecraft/src/NetLoginHandler;)V=|p_71764_1_
 net/minecraft/src/ServerListenThread.func_71769_a(Ljava/net/InetAddress;)V=|p_71769_1_
-net/minecraft/src/ServerListenThread.func_71770_b(Ljava/net/InetAddress;)Z=|p_71770_0_
 net/minecraft/src/ServerScoreboard.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i10044_1_
 net/minecraft/src/ServerScoreboard.func_96512_b(Ljava/lang/String;Lnet/minecraft/src/ScorePlayerTeam;)V=|p_96512_1_,p_96512_2_
 net/minecraft/src/ServerScoreboard.func_96513_c(Lnet/minecraft/src/ScorePlayerTeam;)V=|p_96513_1_
@@ -7221,6 +7227,8 @@ net/minecraft/src/TileEntityBeacon.func_94041_b(ILnet/minecraft/src/ItemStack;)Z
 net/minecraft/src/TileEntityBeacon.func_94047_a(Ljava/lang/String;)V=|p_94047_1_
 net/minecraft/src/TileEntityBeaconRenderer.func_76894_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_76894_1_,p_76894_2_,p_76894_4_,p_76894_6_,p_76894_8_
 net/minecraft/src/TileEntityBeaconRenderer.func_82398_a(Lnet/minecraft/src/TileEntityBeacon;DDDF)V=|p_82398_1_,p_82398_2_,p_82398_4_,p_82398_6_,p_82398_8_
+net/minecraft/src/TileEntityBrewingStand.func_102007_a(ILnet/minecraft/src/ItemStack;I)Z=|p_102007_1_,p_102007_2_,p_102007_3_
+net/minecraft/src/TileEntityBrewingStand.func_102008_b(ILnet/minecraft/src/ItemStack;I)Z=|p_102008_1_,p_102008_2_,p_102008_3_
 net/minecraft/src/TileEntityBrewingStand.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
 net/minecraft/src/TileEntityBrewingStand.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_
 net/minecraft/src/TileEntityBrewingStand.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_
@@ -7231,8 +7239,7 @@ net/minecraft/src/TileEntityBrewingStand.func_70310_b(Lnet/minecraft/src/NBTTagC
 net/minecraft/src/TileEntityBrewingStand.func_70352_b(ILnet/minecraft/src/ItemStack;)I=|p_70352_1_,p_70352_2_
 net/minecraft/src/TileEntityBrewingStand.func_70354_c(I)V=|p_70354_1_
 net/minecraft/src/TileEntityBrewingStand.func_94041_b(ILnet/minecraft/src/ItemStack;)Z=|p_94041_1_,p_94041_2_
-net/minecraft/src/TileEntityBrewingStand.func_94127_c(I)I=|p_94127_1_
+net/minecraft/src/TileEntityBrewingStand.func_94128_d(I)[I=|p_94128_1_
-net/minecraft/src/TileEntityBrewingStand.func_94128_d(I)I=|p_94128_1_
 net/minecraft/src/TileEntityBrewingStand.func_94131_a(Ljava/lang/String;)V=|p_94131_1_
 net/minecraft/src/TileEntityChest.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
 net/minecraft/src/TileEntityChest.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_
@@ -7277,6 +7284,8 @@ net/minecraft/src/TileEntityEnderChest.func_70315_b(II)Z=|p_70315_1_,p_70315_2_
 net/minecraft/src/TileEntityEnderChest.func_70365_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70365_1_
 net/minecraft/src/TileEntityEnderChestRenderer.func_76894_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_76894_1_,p_76894_2_,p_76894_4_,p_76894_6_,p_76894_8_
 net/minecraft/src/TileEntityEnderChestRenderer.func_76899_a(Lnet/minecraft/src/TileEntityEnderChest;DDDF)V=|p_76899_1_,p_76899_2_,p_76899_4_,p_76899_6_,p_76899_8_
+net/minecraft/src/TileEntityFurnace.func_102007_a(ILnet/minecraft/src/ItemStack;I)Z=|p_102007_1_,p_102007_2_,p_102007_3_
+net/minecraft/src/TileEntityFurnace.func_102008_b(ILnet/minecraft/src/ItemStack;I)Z=|p_102008_1_,p_102008_2_,p_102008_3_
 net/minecraft/src/TileEntityFurnace.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
 net/minecraft/src/TileEntityFurnace.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_
 net/minecraft/src/TileEntityFurnace.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_
@@ -7289,9 +7298,12 @@ net/minecraft/src/TileEntityFurnace.func_70398_a(Lnet/minecraft/src/ItemStack;)I
 net/minecraft/src/TileEntityFurnace.func_70401_b(Lnet/minecraft/src/ItemStack;)Z=|p_70401_0_
 net/minecraft/src/TileEntityFurnace.func_70403_d(I)I=|p_70403_1_
 net/minecraft/src/TileEntityFurnace.func_94041_b(ILnet/minecraft/src/ItemStack;)Z=|p_94041_1_,p_94041_2_
-net/minecraft/src/TileEntityFurnace.func_94127_c(I)I=|p_94127_1_
+net/minecraft/src/TileEntityFurnace.func_94128_d(I)[I=|p_94128_1_
-net/minecraft/src/TileEntityFurnace.func_94128_d(I)I=|p_94128_1_
 net/minecraft/src/TileEntityFurnace.func_94129_a(Ljava/lang/String;)V=|p_94129_1_
+net/minecraft/src/TileEntityHopper.func_102012_a(Lnet/minecraft/src/Hopper;Lnet/minecraft/src/IInventory;II)Z=|p_102012_0_,p_102012_1_,p_102012_2_,p_102012_3_
+net/minecraft/src/TileEntityHopper.func_102013_b(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/ItemStack;II)Z=|p_102013_0_,p_102013_1_,p_102013_2_,p_102013_3_
+net/minecraft/src/TileEntityHopper.func_102014_c(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/ItemStack;II)Lnet/minecraft/src/ItemStack;=|p_102014_0_,p_102014_1_,p_102014_2_,p_102014_3_
+net/minecraft/src/TileEntityHopper.func_102015_a(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/ItemStack;II)Z=|p_102015_0_,p_102015_1_,p_102015_2_,p_102015_3_
 net/minecraft/src/TileEntityHopper.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
 net/minecraft/src/TileEntityHopper.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_
 net/minecraft/src/TileEntityHopper.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_
@@ -7301,7 +7313,6 @@ net/minecraft/src/TileEntityHopper.func_70307_a(Lnet/minecraft/src/NBTTagCompoun
 net/minecraft/src/TileEntityHopper.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_
 net/minecraft/src/TileEntityHopper.func_94041_b(ILnet/minecraft/src/ItemStack;)Z=|p_94041_1_,p_94041_2_
 net/minecraft/src/TileEntityHopper.func_94114_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/ItemStack;)Z=|p_94114_1_,p_94114_2_
-net/minecraft/src/TileEntityHopper.func_94115_a(Lnet/minecraft/src/IInventory;I)I=|p_94115_1_,p_94115_2_
 net/minecraft/src/TileEntityHopper.func_94117_a(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/ItemStack;I)Lnet/minecraft/src/ItemStack;=|p_94117_1_,p_94117_2_,p_94117_3_
 net/minecraft/src/TileEntityHopper.func_96114_a(Lnet/minecraft/src/IInventory;Lnet/minecraft/src/EntityItem;)Z=|p_96114_0_,p_96114_1_
 net/minecraft/src/TileEntityHopper.func_96115_a(Ljava/lang/String;)V=|p_96115_1_
@@ -7364,6 +7375,10 @@ net/minecraft/src/Timer.<init>(F)V=|p_i3005_1_
 net/minecraft/src/TimerTaskMcoServerListUpdate.<init>(Lnet/minecraft/src/McoServerList;)V=|p_i11000_1_
 net/minecraft/src/TimerTaskMcoServerListUpdate.<init>(Lnet/minecraft/src/McoServerList;Lnet/minecraft/src/McoServerListINNER1;)V=|p_i11001_1_,p_i11001_2_
 net/minecraft/src/TimerTaskMcoServerListUpdate.func_101018_a(Ljava/util/List;)V=|p_101018_1_
+net/minecraft/src/TimerTaskMcoServerListUpdateComparator.<init>(Lnet/minecraft/src/TimerTaskMcoServerListUpdate;Ljava/lang/String;)V=|p_i22000_1_,p_i22000_2_
+net/minecraft/src/TimerTaskMcoServerListUpdateComparator.<init>(Lnet/minecraft/src/TimerTaskMcoServerListUpdate;Ljava/lang/String;Lnet/minecraft/src/McoServerListINNER1;)V=|p_i22001_1_,p_i22001_2_,p_i22001_3_
+net/minecraft/src/TimerTaskMcoServerListUpdateComparator.compare(Ljava/lang/Object;Ljava/lang/Object;)I=|p_compare_1_,p_compare_2_
+net/minecraft/src/TimerTaskMcoServerListUpdateComparator.func_102023_a(Lnet/minecraft/src/McoServer;Lnet/minecraft/src/McoServer;)I=|p_102023_1_,p_102023_2_
 net/minecraft/src/Tuple.<init>(Ljava/lang/Object;Ljava/lang/Object;)V=|p_i3422_1_,p_i3422_2_
 net/minecraft/src/ValueObject.func_96394_a(Ljava/lang/reflect/Field;)Z=|p_96394_0_
 net/minecraft/src/ValueObjectList.func_98161_a(Ljava/lang/String;)Lnet/minecraft/src/ValueObjectList;=|p_98161_0_
@@ -7445,6 +7460,7 @@ net/minecraft/src/WeightedRandomMinecart.<init>(Lnet/minecraft/src/MobSpawnerBas
 net/minecraft/src/WeightedRandomMinecart.<init>(Lnet/minecraft/src/MobSpawnerBaseLogic;Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i11042_1_,p_i11042_2_,p_i11042_3_
 net/minecraft/src/World.<init>(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/Profiler;Lnet/minecraft/src/ILogAgent;)V=|p_i11043_1_,p_i11043_2_,p_i11043_3_,p_i11043_4_,p_i11043_5_,p_i11043_6_
 net/minecraft/src/World.<init>(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/Profiler;Lnet/minecraft/src/ILogAgent;)V=|p_i11044_1_,p_i11044_2_,p_i11044_3_,p_i11044_4_,p_i11044_5_,p_i11044_6_
+net/minecraft/src/World.func_102026_a(Lnet/minecraft/src/Block;I)Z=|p_102026_1_,p_102026_2_
 net/minecraft/src/World.func_72796_p(III)Lnet/minecraft/src/TileEntity;=|p_72796_1_,p_72796_2_,p_72796_3_
 net/minecraft/src/World.func_72797_t(III)Z=|p_72797_1_,p_72797_2_,p_72797_3_
 net/minecraft/src/World.func_72798_a(III)I=|p_72798_1_,p_72798_2_,p_72798_3_

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  = fd11cbc5b01aae1d62cff0145171f3d9
+MD5Client  = dcee28c1b1cea2b36816a60e8adafea4
-MD5Server  = 00035b7842554bdbff95a48169420525
+MD5Server  = 9d31b969c3f197a1d40381d5620717ea
 
 [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           = 101000
+RGIndex           = 102000
-ParamIndex        = 21000
+ParamIndex        = 22000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

fml/conf/methods.csv

@@ -1,4 +1,5 @@
 searge,name,side,desc
+func_100009_j_,getFacing,2,
 func_70000_a,addServerStatsToSnooper,2,
 func_70001_b,addServerTypeToSnooper,2,
 func_70002_Q,isSnooperEnabled,2,Returns whether snooping is enabled or not.
@@ -183,12 +184,6 @@ func_70361_i,getRandomStackFromInventory,2,
 func_70364_a,openChest,2,
 func_70365_a,isUseableByPlayer,2,
 func_70366_b,closeChest,2,
-func_70382_c,getMobEntity,2,will create the entity from the internalID the first time it is accessed
-func_70383_a,writeNBTTagsTo,2,
-func_70384_a,getMobID,2,
-func_70385_a,setMobID,2,
-func_70386_b,anyPlayerInRange,2,Returns true if there is a player in range (using World.getClosestPlayer)
-func_70387_f,updateDelay,2,Sets the delay before a new spawn (base delay of 200 + random number up to 600).
 func_70397_c,getCookProgressScaled,2,Returns an integer between 0 and the passed value representing how close the current item is to being completely cooked
 func_70398_a,getItemBurnTime,2,"Returns the number of ticks that the supplied fuel item will keep the furnace burning, or 0 if the item isn't fuel"
 func_70399_k,smeltItem,2,Turn one item from the furnace source stack into the appropriate smelted item in the furnace result stack
@@ -235,14 +230,12 @@ func_70471_c,setCurrentRecipeIndex,2,
 func_70485_a,setAssociatedChest,2,
 func_70486_a,loadInventoryFromNBT,2,
 func_70487_g,saveInventoryToNBT,2,
-func_70490_h,isMinecartPowered,2,Is this minecart powered (Fuel > 0)
 func_70491_i,getDamage,2,Gets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over 40.
 func_70492_c,setDamage,2,Sets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over 40.
 func_70493_k,getRollingDirection,2,Gets the rolling direction the cart rolls while being attacked. Can be 1 or -1.
 func_70494_i,setRollingDirection,2,Sets the rolling direction the cart rolls while being attacked. Can be 1 or -1.
 func_70496_j,getRollingAmplitude,2,Gets the rolling amplitude the cart rolls while being attacked.
 func_70497_h,setRollingAmplitude,2,Sets the rolling amplitude the cart rolls while being attacked.
-func_70498_d,setMinecartPowered,2,Set if this minecart is powered (Fuel > 0)
 func_70515_d,explode,2,
 func_70518_d,onValidSurface,2,checks to make sure painting can be placed there
 func_70526_d,getXpValue,2,Returns the XP value of this XP orb.
@@ -254,7 +247,6 @@ func_70536_a,setParticleTextureIndex,2,Public method to set private field partic
 func_70537_b,getFXLayer,2,
 func_70538_b,setRBGColorF,2,
 func_70539_a,renderParticle,2,
-func_70540_h,getParticleTextureIndex,2,
 func_70541_f,multipleParticleScaleBy,2,
 func_70542_f,getGreenColorF,2,
 func_70543_e,multiplyVelocity,2,
@@ -470,7 +462,6 @@ func_70999_a,wakeUpPlayer,2,Wake up the player if they're sleeping.
 func_71000_j,addMovementStat,2,"Adds a value to a movement statistic field - like run, walk, swin or climb."
 func_71001_a,onItemPickup,2,"Called whenever an item is picked up from walking over it. Args: pickedUpEntity, stackSize"
 func_71002_c,displayGUIEnchantment,2,
-func_71003_h,isPVPEnabled,2,returns if pvp is enabled or not
 func_71004_bE,respawnPlayer,2,
 func_71005_bN,getInventoryEnderChest,2,Returns the InventoryEnderChest of this player.
 func_71006_a,displayGUIDispenser,2,Displays the dipsenser GUI for the passed in dispenser entity. Args: TileEntityDispenser
@@ -674,7 +665,6 @@ func_71364_i,setIngameNotInFocus,2,"Resets the player keystate, disables the ing
 func_71365_K,screenshotListener,2,checks if keys are down
 func_71366_a,displayDebugInfo,2,
 func_71367_a,setServer,2,
-func_71368_v,isDebugInfoEnabled,2,
 func_71369_N,getGLMaximumTextureSize,2,Used in the usage snooper.
 func_71370_a,resize,2,Called to resize the current screen.
 func_71371_a,launchIntegratedServer,2,"Arguments: World foldername,  World ingame name, WorldSettings"
@@ -848,7 +838,7 @@ func_71860_a,onBlockPlacedBy,2,Called when the block is placed in the world.
 func_71861_g,onBlockAdded,2,"Called whenever the block is added into the world. Args: world, x, y, z"
 func_71862_a,randomDisplayTick,2,A randomly called display update to be able to add particles or other items for display
 func_71863_a,onNeighborBlockChange,2,"Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are their own) Args: x, y, z, neighbor blockID"
-func_71864_b,setUnlocalizedName,2,"Sets the unlocalized name of the block to the string passed as a parameter, prefixed by ""tile."""
+func_71864_b,setUnlocalizedName,2,
 func_71865_a,isProvidingWeakPower,2,"Returns true if the block is emitting indirect/weak redstone power on the specified side. If isBlockNormalCube returns true, standard redstone propagation rules will apply instead and this will not be called. Args: World, X, Y, Z, side. Note that the side is reversed - eg it is 1 (up) when checking the bottom of the block."
 func_71866_a,onFallenUpon,2,Block's chance to react to an entity falling on it.
 func_71867_k,onBlockDestroyedByExplosion,2,Called upon the block being destroyed by an explosion
@@ -895,7 +885,6 @@ func_71907_b,setTickRandomly,2,Sets whether this block type will receive random
 func_71908_a,getPlayerRelativeBlockHardness,2,"Gets the hardness of block at the given coordinates in the given world, relative to the ability of the given EntityPlayer."
 func_71910_a,quantityDroppedWithBonus,2,Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive).
 func_71911_a_,getSelectedBoundingBoxFromPool,2,Returns the bounding box of the wired rectangular prism to render.
-func_71912_p,setRequiresSelfNotify,2,Blocks with this attribute will not notify all near blocks when it's metadata change. The default behavior is always notify every neightbor block when anything changes.
 func_71913_a,canCollideCheck,2,"Returns whether this block is collideable based on the arguments passed in Args: blockMetaData, unknownFlag"
 func_71914_a,dropBlockAsItemWithChance,2,Drops the block items with a specified chance of dropping the specified items
 func_71915_e,getMobilityFlag,2,"Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility and stop pistons"
@@ -963,13 +952,10 @@ func_72172_n,notifyWireNeighborsOfNeighborChange,2,"Calls World.notifyBlocksOfNe
 func_72173_e,isPowerProviderOrWire,2,"Returns true if redstone wire can connect to the specified block. Params: World, X, Y, Z, side (not a normal notch-side, this can be 0, 1, 2, 3 or -1)"
 func_72176_l,glow,2,The redstone ore glows.
 func_72177_n,sparkle,2,The redstone ore sparkles.
-func_72179_a,isPoweredBlockRail,2,Return true if the blocks passed is a power related rail.
 func_72180_d_,isRailBlockAt,2,"Returns true if the block at the coordinates of world passed is a valid rail block (current is rail, powered or detector)."
 func_72181_a,refreshTrackShape,2,Completely recalculates the track shape based on neighboring tracks
-func_72182_a,isNeighborRailPowered,2,"Powered minecart rail is conductive like wire, so check for powered neighbors"
 func_72183_n,isPowered,2,Returns true if the block is power related rail.
 func_72184_d,isRailBlock,2,"Return true if the parameter is a blockID for a valid rail block (current is rail, powered or detector)."
-func_72185_a,isRailPassingPower,2,Returns true if the specified rail is passing power to its neighbor
 func_72187_e,setStateIfMinecartInteractsWithRail,2,"Update the detector rail power state if a minecart enter, stays or leave the block."
 func_72190_l,tryToFall,2,If there is space to fall below will start this block falling
 func_72191_e_,canFallBelow,2,Checks to see if the sand can fall into the block below it
@@ -993,7 +979,7 @@ func_72211_e,getSmallestFlowDecay,2,"getSmallestFlowDecay(World world, intx, int
 func_72215_l,setNotStationary,2,Changes the block ID to that of an updating fluid.
 func_72216_n,isFlammable,2,Checks to see if the block is flammable.
 func_72217_d,getDirection,2,Returns the orentation value from the specified metadata
-func_72220_e,ignoreTick,2,
+func_72220_e,getInputStrength,2,"Returns the signal strength at one input of the block. Args: world, X, Y, Z, side"
 func_72224_c,isFenceGateOpen,2,Returns if the fence gate is open according to its metadata.
 func_72225_b_,isBedOccupied,2,Return whether or not the bed is occupied.
 func_72226_b,getNearestEmptyChunkCoordinates,2,Gets the nearest empty chunk coordinates for the player to wake up from a bed into.
@@ -1361,7 +1347,6 @@ func_72813_a,getLightValueExt,2,Get light value with flag
 func_72819_i,getWeightedThunderStrength,2,
 func_72820_D,getWorldTime,2,
 func_72821_m,notifyBlockOfNeighborChange,2,"Notifies a block that one of its neighbor change to the specified type Args: x, y, z, blockID"
-func_72822_b,setBlock,2,"Sets the block to the specified blockID at the block coordinates Args x, y, z, blockID"
 func_72823_a,setItemData,2,"Assigns the given String id to the given MapDataBase using the MapStorage, removing any existing ones of the same id."
 func_72824_f,getCloudColour,2,
 func_72825_h,getTopSolidOrLiquidBlock,2,"Finds the highest block on the x, z coordinate that is solid and returns its y coord. Args x, z"
@@ -1371,7 +1356,7 @@ func_72828_b,unloadEntities,2,Adds a list of entities to be unloaded on the next
 func_72829_c,isAABBNonEmpty,2,Returns true if there are any blocks in the region constrained by an AxisAlignedBB
 func_72830_b,isAABBInMaterial,2,checks if the given AABB is in the material given. Used while swimming.
 func_72831_a,rayTraceBlocks_do_do,2,
-func_72832_d,setBlockAndMetadataWithNotify,2,"Sets the block ID and metadata, then notifies neighboring blocks of the change Params: x, y, z, BlockID, Metadata"
+func_72832_d,setBlock,2,"Sets the block ID and metadata at a given location. Args: X, Y, Z, new block ID, new metadata, flags. Flag 0x02 will trigger a block update both on server and on client, flag 0x04, if used with 0x02, will prevent a block update on client worlds. Flag 0x01 will pass the original block ID when notifying adjacent blocks, otherwise it will pass 0."
 func_72833_a,getSkyColor,2,Calculates the color for the skybox
 func_72834_c,canBlockFreeze,2,"checks to see if a given block is both water, and cold enough to freeze - if the par4 boolean is set, this will only return true if there is a non-water block immediately adjacent to the specified block"
 func_72835_b,tick,2,Runs a single tick for the world
@@ -1398,10 +1383,8 @@ func_72855_b,checkIfAABBIsClear,2,"Returns true if there are no solid, live enti
 func_72856_b,getClosestVulnerablePlayerToEntity,2,"Returns the closest vulnerable player to this entity within the given radius, or null if none is found"
 func_72857_a,findNearestEntityWithinAABB,2,
 func_72858_w,canSnowAt,2,Tests whether or not snow can be placed at a given location
-func_72859_e,setBlockWithNotify,2,"Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID"
 func_72860_G,getSaveHandler,2,Returns this world's current save handler
 func_72861_E,getSpawnPoint,2,Returns the coordinates of the spawn point
-func_72862_i,markBlockForRenderUpdate2,2,"On the client, re-renders this block. On the server, does nothing. Appears to be redundant."
 func_72863_F,getChunkProvider,2,gets the IChunkProvider this world uses.
 func_72864_z,isBlockIndirectlyGettingPowered,2,"Used to see if one of the blocks next to you or your block is getting power from a neighboring block. Used by items like TNT or Doors so they don't have redstone going straight into them.  Args: x, y, z"
 func_72865_a,getPathEntityToEntity,2,
@@ -1410,17 +1393,15 @@ func_72867_j,getRainStrength,2,Not sure about this actually. Reverting this one
 func_72868_a,addLoadedEntities,2,"adds entities to the loaded entities list, and loads thier skins."
 func_72869_a,spawnParticle,2,"Spawns a particle.  Args particleName, x, y, z, velX, velY, velZ"
 func_72870_g,updateEntity,2,Will update the entity in the world if the chunk the entity is in is currently loaded. Args: entity
-func_72871_y,isBlockGettingPowered,2,"Whether one of the neighboring blocks is putting power into this block. Args: x, y, z"
 func_72872_a,getEntitiesWithinAABB,2,"Returns all entities of the specified class type which intersect with the AABB. Args: entityClass, aabb"
 func_72873_a,doChunksNearChunkExist,2,Checks if any of the chunks within distance (argument 4) blocks of the given block exist
 func_72874_g,getPrecipitationHeight,2,Gets the height to which rain/snow will fall. Calculates it if not already stored.
 func_72875_a,isMaterialInBB,2,Returns true if the given bounding box contains the given material
 func_72876_a,createExplosion,2,"Creates an explosion. Args: entity, x, y, z, strength"
 func_72877_b,setWorldTime,2,Sets the world time.
-func_72878_l,isBlockIndirectlyProvidingPowerTo,2,"Is a block next to you getting powered (if its an attachable block) or is it providing power directly to you.  Args: x, y, z, direction"
+func_72878_l,getIndirectPowerLevelTo,2,"Gets the power level from a certain block face.  Args: x, y, z, direction"
 func_72879_k,isBlockProvidingPowerTo,2,"Is this block powering in the specified direction Args: x, y, z, direction"
 func_72880_h,getStarBrightness,2,How bright are stars in the sky
-func_72881_d,setBlockMetadata,2,Set the metadata of a block in global coordinates
 func_72882_A,sendQuittingDisconnectingPacket,2,"If on MP, sends a quitting packet."
 func_72883_k,getFullBlockLightValue,2,Does the same as getBlockLightValue_do but without checking if its not a normal block
 func_72884_u,isBlockFreezable,2,checks to see if a given block is both water and is cold enough to freeze
@@ -1434,7 +1415,6 @@ func_72891_a,setAllowedSpawnTypes,2,Set which types of mobs are allowed to spawn
 func_72892_b,scheduleBlockUpdateFromLoad,2,Schedules a block update from the saved information in a chunk. Called when the chunk is loaded.
 func_72893_g,tickBlocksAndAmbiance,2,plays random cave ambient sounds and runs updateTick on random blocks within each chunk in the vacinity of a player
 func_72894_k,setRainStrength,2,
-func_72895_f,computeBlockLightValue,2,
 func_72896_J,isRaining,2,Returns true if the current rain strength is greater than 0.2
 func_72897_h,joinEntityInSurroundings,2,spwans an entity and loads surrounding chunks
 func_72898_h,notifyBlocksOfNeighborChange,2,"Notifies neighboring blocks that this specified block changed  Args: x, y, z, blockID"
@@ -1460,7 +1440,7 @@ func_72917_a,checkIfAABBIsClearExcludingEntity,2,"Returns true if there are no s
 func_72918_a,handleMaterialAcceleration,2,handles the acceleration of an object whilst in water. Not sure if it is used elsewhere.
 func_72919_O,getHorizon,2,Returns horizon height for use in rendering the sky.
 func_72920_a,getPendingBlockUpdates,2,
-func_72921_c,setBlockMetadataWithNotify,2,"Sets the blocks metadata and if set will then notify blocks that this block changed. Args: x, y, z, metadata"
+func_72921_c,setBlockMetadataWithNotify,2,"Sets the blocks metadata and if set will then notify blocks that this block changed, depending on the flag. Args: x, y, z, metadata, flag. See setBlock for flag description"
 func_72922_b,getFirstUncoveredBlock,2,"Returns the block ID of the first block at this (x,z) location with air above it, searching from sea level upwards."
 func_72923_a,obtainEntitySkin,2,"Start the skin for this entity downloading, if necessary, and increment its reference counter"
 func_72924_a,getPlayerEntityByName,2,Find a player by name in this world.
@@ -1469,7 +1449,6 @@ func_72926_e,playAuxSFX,2,See description for func_72706_a.
 func_72927_d,blockHasTileEntity,2,Checks if a block at a given position should have a tile entity.
 func_72928_a,markTileEntityForDespawn,2,adds tile entity to despawn list (renamed from markEntityForDespawn)
 func_72929_e,getCelestialAngleRadians,2,Return getCelestialAngle()*2*PI
-func_72930_a,setBlockAndMetadataWithUpdate,2,"Sets the block ID and metadata of a block, optionally marking it as needing update. Args: X,Y,Z, blockID, metadata, needsUpdate"
 func_72931_a,canPlaceEntityOnSide,2,Returns true if the given Entity can be placed on the given side of the given block position.
 func_72932_q,removeBlockTileEntity,2,"Removes the TileEntity for a given block in X,Y,Z coordinates"
 func_72933_a,rayTraceBlocks,2,"ray traces all blocks, including non-collideable ones"
@@ -1488,10 +1467,8 @@ func_72945_a,getCollidingBoundingBoxes,2,"Returns a list of bounding boxes that
 func_72946_b,findClosestStructure,2,Returns the location of the closest structure of the specified type. If not found returns null.
 func_72947_a,calculateInitialWeather,2,Called from World constructor to set rainingStrength and thunderingStrength
 func_72948_g,getFogColor,2,Returns vector(ish) with R/G/B for fog
-func_72949_a,computeSkyLightValue,2,
 func_72950_A,setSpawnLocation,2,
 func_72951_B,canLightningStrikeAt,2,
-func_72952_b,getBlockLightOpacity,2,
 func_72953_d,isAnyLiquid,2,Returns if any of the blocks within the aabb are liquids. Args: aabb
 func_72954_a,addWorldAccess,2,Adds a IWorldAccess to the list of worldAccesses
 func_72955_a,tickUpdates,2,Runs through the list of updates to run and ticks them
@@ -1500,7 +1477,6 @@ func_72957_l,getBlockLightValue,2,Gets the light value of a block location
 func_72958_C,isBlockHighHumidity,2,"Checks to see if the biome rainfall values for a given x,y,z coordinate set are extremely high"
 func_72959_q,getWorldChunkManager,2,
 func_72960_a,setEntityState,2,sends a Packet 38 (Entity Status) to all tracked players of that entity
-func_72961_c,setBlockAndMetadata,2,Sets the block ID and metadata of a block in global coordinates
 func_72962_a,canMineBlock,2,Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here.
 func_72963_a,initialize,2,
 func_72964_e,getChunkFromChunkCoords,2,"Returns back a chunk looked up by chunk coordinates Args: x, y"
@@ -1682,18 +1658,6 @@ func_73581_d,getNumberOfChunkInPacket,2,
 func_73582_a,getChunkPosX,2,
 func_73583_c,getChunkCompressedData,2,
 func_73594_a,getMapChunkData,2,
-func_73641_d,connectToNeighbor,2,"The specified neighbor has just formed a new connection, so update accordingly"
-func_73642_a,isMinecartTrack,2,
-func_73643_c,canConnectFrom,2,Determines whether or not the target rail can connect to this rail
-func_73644_a,refreshConnectedTracks,2,"Neighboring tracks have potentially been broken, so prune the connected track list"
-func_73645_a,setConnections,2,
-func_73646_c,canConnectTo,2,Determines whether or not the track can bend to meet the specified rail
-func_73647_b,isConnectedTo,2,
-func_73648_a,getMinecartTrackLogic,2,
-func_73649_b,isInTrack,2,Returns true if the specified block is in the same railway.
-func_73650_a,getAdjacentTrackCount,2,Get the number of adjacent tracks.
-func_73651_b,getAdjacentTracks,2,
-func_73652_a,refreshTrackShape,2,Completely recalculates the track shape based on neighboring tracks and power state
 func_73660_a,update,2,Updates the JList with a new model.
 func_73665_c,getPropertiesFile,2,Returns this PropertyManager's file object used for property saving.
 func_73666_a,logMessageAndSave,2,logs an info message then calls saveSettingsToFile Yes this appears to be a potential stack overflow - these 2 functions call each other repeatdly if an exception occurs.
@@ -1714,7 +1678,6 @@ func_73688_c,parse,2,
 func_73689_b,setBanReason,2,
 func_73690_c,getBannedBy,2,
 func_73691_b,setBanEndDate,2,
-func_73699_a,init,2,Initialises the console logger.
 func_73703_b,saveToFile,2,par1: include header
 func_73704_a,isBanned,2,
 func_73705_d,removeExpiredBans,2,
@@ -2883,7 +2846,6 @@ func_76594_o,enqueueRelightChecks,2,"Called once-per-chunk-per-tick, and advance
 func_76595_e,propagateSkylightOcclusion,2,Propagates a given sky-visible block's light value downward and upward to neighboring blocks as necessary.
 func_76596_b,getBlockLightOpacity,2,
 func_76597_e,getChunkBlockTileEntity,2,Gets the TileEntity for a given block in this chunk
-func_76598_a,setBlockID,2,"Sets a blockID for a position in the chunk. Args: x, y, z, blockID"
 func_76599_g,checkSkylightNeighborHeight,2,Checks the height of a block next to a sky-visible block and schedules a lighting update as necessary.
 func_76600_a,isAtLocation,2,Checks whether the chunk is at the X/Z location specified
 func_76601_a,needsSaving,2,Returns true if this Chunk needs to be saved
@@ -2988,8 +2950,6 @@ func_76837_b,getBiomeGenAt,2,"Returns the BiomeGenBase related to the x, z posit
 func_76838_a,cleanupCache,2,Removes BiomeCacheBlocks from this cache that haven't been accessed in at least 30 seconds.
 func_76839_e,getCachedBiomes,2,Returns the array of cached biome types in the BiomeCacheBlock at the given location.
 func_76840_a,getBiomeCacheBlock,2,Returns a biome cache block at location specified.
-func_76845_a,bindImage,2,
-func_76846_a,onTick,2,
 func_76885_a,getBiomeGenAt,2,"Returns the BiomeGenBase related to the x, z position from the cache block."
 func_76893_a,setTileEntityRenderer,2,Associate a TileEntityRenderer with this TileEntitySpecialRenderer
 func_76894_a,renderTileEntityAt,2,
@@ -3003,7 +2963,6 @@ func_76905_a,renderTileEntityMobSpawner,2,
 func_76906_a,renderEndPortalTileEntity,2,Renders the End Portal.
 func_76909_a,renderTileEntitySignAt,2,
 func_76911_a,renderTileEntityChestAt,2,Renders the TileEntity for the chest at a position.
-func_76914_a,setWaterBiomeColorizer,2,
 func_76916_f,getBlockID,2,Gets the BlockID for this BlockEventData
 func_76917_e,getEventParameter,2,"Get the Event Parameter (different for each BlockID,EventID)"
 func_76918_d,getEventID,2,Get the Event ID (different for each BlockID)
@@ -3055,8 +3014,8 @@ func_77009_a,renderThePainting,2,
 func_77012_a,renderTheMinecart,2,Renders the Minecart.
 func_77014_a,doRenderItem,2,Renders the item
 func_77015_a,renderItemIntoGUI,2,Renders the item's icon or block into the UI at the specified position.
-func_77016_a,renderTexturedQuad,2,"Adds a textured quad to the tesselator at the specified position with the specified texture coords, width and height.  Args: x, y, u, v, width, height"
 func_77017_a,renderQuad,2,"Adds a quad to the tesselator at the specified position with the set width and height and color.  Args: tessellator, x, y, width, height, color"
+func_77018_a,renderGlint,2,
 func_77020_a,renderDroppedItem,2,Renders a dropped item
 func_77021_b,renderItemOverlayIntoGUI,2,Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the specified position.
 func_77028_a,doRenderLightningBolt,2,Actually renders the lightning bolt. This method is called through the doRender method.
@@ -3083,7 +3042,6 @@ func_77051_a,renderVillagerEquipedItems,2,
 func_77052_b,preRenderVillager,2,
 func_77053_a,shouldVillagerRenderPass,2,Determines wether Villager Render pass or not.
 func_77054_a,renderVillager,2,
-func_77055_a,passVillagerSpecialRender,2,Passes the Villager special render.
 func_77057_a,getTailRotation,2,
 func_77059_a,renderCow,2,
 func_77060_a,updateCreeperScale,2,Updates creeper scale in prerender callback
@@ -3116,7 +3074,6 @@ func_77099_a,renderSaddledPig,2,
 func_77100_a,renderSpecials,2,Method for adding special render rules
 func_77101_a,renderPlayer,2,
 func_77102_a,rotatePlayer,2,Rotates the player if the player is sleeping. This method is called in rotateCorpse.
-func_77103_a,renderName,2,Used to render a player's name above their head
 func_77104_b,renderPlayerScale,2,
 func_77105_b,renderPlayerSleep,2,Renders player with sleeping offset if sleeping
 func_77107_a,setArmorModel,2,"Set the specified armor model as the player model. Args: player, armorSlot, partialTick"
@@ -3199,6 +3156,7 @@ func_77296_a,requestDownloadOfTexture,2,filename must end in .zip
 func_77297_a,downloadTexture,2,
 func_77298_g,getAcceptsTextures,2,
 func_77299_i,getTexturePackDirContents,2,Return a List<File> of file/directories in the texture pack directory.
+func_77301_a,isDownloading,2,
 func_77302_a,generateTexturePackID,2,"Generate an internal texture pack ID from the file/directory name, last modification time, and file size. Returns null if the file/directory is not a texture pack."
 func_77303_a,setSelectedTexturePack,2,Set the selectedTexturePack field (Inner class static accessor method).
 func_77304_b,onDownloadFinished,2,Called from Minecraft.loadWorld() if getIsDownloading() returned true to prepare the downloaded texture for usage.
@@ -3295,7 +3253,6 @@ func_77525_a,getPingResponse,2,
 func_77531_d,getFirstDescriptionLine,2,Get the first line of the texture pack description (read from the pack.txt file)
 func_77532_a,getResourceAsStream,2,Gives a texture resource as InputStream.
 func_77533_a,deleteTexturePack,2,"Delete the OpenGL texture id of the pack's thumbnail image, and close the zip file in case of TexturePackCustom."
-func_77534_f,getTexturePackResolution,2,Return the texture pack's resolution (16 by default). Used only by PlayerUsageSnooper. Presumably meant to be overriden by HD texture mods.
 func_77535_b,bindThumbnailTexture,2,"Bind the texture id of the pack's thumbnail image, loading it if necessary."
 func_77536_b,getTexturePackID,2,Get the texture pack ID
 func_77537_e,getSecondDescriptionLine,2,Get the second line of the texture pack description (read from the pack.txt file)
@@ -3369,7 +3326,6 @@ func_77648_a,onItemUse,2,"Callback for item usage. If the item does something sp
 func_77649_a,getDamageVsEntity,2,Returns the damage against a given entity.
 func_77650_f,getIconIndex,2,Returns the icon index of the stack given as argument.
 func_77651_p,getShareTag,2,"If this function returns true (or the item is damageable), the ItemStack's NBT tag will be sent to the client."
-func_77652_b,setIconCoord,2,
 func_77654_b,onEaten,2,
 func_77655_b,setUnlocalizedName,2,"Sets the unlocalized name of this item to the string passed as the parameter, prefixed by ""item."""
 func_77656_e,setMaxDamage,2,set max damage of an Item
@@ -3381,7 +3337,6 @@ func_77661_b,getItemUseAction,2,returns the action that specifies what animation
 func_77662_d,isFull3D,2,Returns True is the item is renderer in full 3D when hold.
 func_77663_a,onUpdate,2,Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and update it's contents.
 func_77664_n,setFull3D,2,Sets bFull3D to True and return the object.
-func_77665_c,setIconIndex,2,Sets the icon index for this item. Returns the item.
 func_77666_t,getPotionEffect,2,Returns a string representing what this item does to a potion.
 func_77667_c,getUnlocalizedName,2,Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have different names based on their damage or NBT.
 func_77668_q,getContainerItem,2,
@@ -3558,8 +3513,6 @@ func_78350_a,getTextureForDownloadableImage,2,"Takes a URL of a downloadable ima
 func_78351_a,setupTexture,2,Copy the supplied image onto the specified OpenGL texture
 func_78352_b,refreshTextures,2,Call setupTexture on all currently-loaded textures again to account for changes in rendering options
 func_78353_a,allocateAndSetupTexture,2,"Copy the supplied image onto a newly-allocated OpenGL texture, returning the allocated texture name"
-func_78354_c,unwrapImageByColumns,2,Takes an image with multiple 16-pixel-wide columns and creates a new 16-pixel-wide image where the columns are stacked vertically
-func_78355_a,registerTextureFX,2,
 func_78356_a,obtainImageData,2,"Return a ThreadDownloadImageData instance for the given URL.  If it does not already exist, it is created and uses the passed ImageBuffer.  If it does, its reference count is incremented."
 func_78369_a,setColorRGBA_F,2,"Sets the RGBA values for the color, converting from floats between 0 and 1 to integers from 0-255."
 func_78370_a,setColorRGBA,2,Sets the RGBA values for the color. Also clamps them to 0-255.
@@ -3798,6 +3751,7 @@ func_80006_f,getUniqueID,2,
 func_80007_l,getDimensionName,2,"Returns the dimension's name, e.g. ""The End"", ""Nether"", or ""Overworld""."
 func_82011_an,enableGui,2,
 func_82114_b,getPlayerCoordinates,2,Return the position for this command sender.
+func_82115_m,getMaxRenderDistanceSquared,2,
 func_82116_a,setSkullRotation,2,Set the skull's rotation
 func_82117_a,getSkullType,2,Get the entity type for the skull
 func_82118_a,setSkullType,2,Set the entity type for the skull
@@ -3817,6 +3771,7 @@ func_82145_z,getMaxInPortalTime,2,Return the amount of time this entity should s
 func_82147_ab,getPortalCooldown,2,Return the amount of cooldown before this entity can use a portal again.
 func_82150_aj,getHasActivePotion,2,
 func_82154_e,setIsAnvil,2,
+func_82159_b,getArmorPosition,2,
 func_82160_b,dropEquipment,2,Drop the equipment for this entity.
 func_82161_a,getArmorItemForSlot,2,"Params: Armor slot, Item tier"
 func_82163_bD,initCreature,2,Initialize this creature.
@@ -3903,7 +3858,6 @@ func_82383_a,hasTheseArguments,2,Returns whether the given token (parameter 1) h
 func_82384_c,getDefaultMinimumRange,2,Gets the default minimum range (argument rm).
 func_82385_b,matchPlayersAsString,2,Returns a nicely-formatted string listing the matching players.
 func_82386_a,matchOnePlayer,2,Returns the one player that matches the given at-token.  Returns null if more than one player matches.
-func_82390_a,drawNeedle,2,Draws the compass needle
 func_82392_a,bindTextureByURL,2,"Binds a texture that Minecraft will attempt to load from the given URL.  (arguments: url, localFallback)"
 func_82394_a,renderTileEntitySkullAt,2,Render a skull tile entity.
 func_82398_a,renderTileEntityBeaconAt,2,Render a beacon tile entity.
@@ -3930,7 +3884,6 @@ func_82489_a,spawnDispenseParticles,2,Order clients to display dispense particle
 func_82499_a,getProjectileEntity,2,Return the projectile entity spawned by this dispense behavior.
 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_82523_e,isLockedByAnotherRepeater,2,
 func_82524_c,isRedstoneRepeaterBlockID,2,
 func_82525_a,getIPositionFromBlockSource,2,
 func_82526_n,dispense,2,
@@ -3961,6 +3914,8 @@ func_82615_a,getX,2,
 func_82616_c,getZ,2,
 func_82617_b,getY,2,
 func_82618_k,getWorld,2,
+func_82619_j,getBlockTileEntity,2,
+func_82620_h,getBlockMetadata,2,
 func_82621_f,getZInt,2,
 func_82622_e,getYInt,2,
 func_82623_d,getXInt,2,
@@ -4008,6 +3963,7 @@ func_82725_o,isMagicDamage,2,Returns true if the damage is magic based.
 func_82726_p,setMagicDamage,2,Define the damage type as magic based.
 func_82732_R,getWorldVec3Pool,2,Return the Vec3Pool object for this world.
 func_82733_a,selectEntitiesWithinAABB,2,
+func_82734_g,getChunkHeightMapMinimum,2,"Gets the heightMapMinimum field of the given chunk, or 0 if the chunk is not loaded. Coords are in blocks. Args: X, Z"
 func_82736_K,getGameRules,2,Gets the GameRules instance.
 func_82737_E,getTotalWorldTime,2,
 func_82742_i,resetUpdateEntityTick,2,Resets the updateEntityTick field to 0
@@ -4027,7 +3983,6 @@ func_82767_a,getGameRuleStringValue,2,Gets the string Game Rule value.
 func_82768_a,readGameRulesFromNBT,2,Set defined game rules from NBT.
 func_82769_a,addGameRule,2,Define a game rule and its default value.
 func_82770_a,writeGameRulesToNBT,2,Return the defined game rules as NBT.
-func_82772_a,updateDynamicTexture,2,Updates a single dynamic texture
 func_82773_c,hasImageData,2,Checks if urlToImageDataMap has image data for the given key
 func_82774_a,setOverrideBlockTexture,2,Sets overrideBlockTexture
 func_82775_a,renderBlockAnvil,2,Renders anvil
@@ -4101,19 +4056,49 @@ func_85054_d,searchForOtherItemsNearby,2,Looks for other itemstacks nearby and t
 func_85055_a,makeCrashReport,2,Creates a crash report for the exception
 func_85057_a,makeCategoryDepth,2,Creates a CrashReportCategory for the given stack trace depth
 func_85058_a,makeCategory,2,Creates a CrashReportCategory
+func_85062_a,callBlockDataValue,2,
+func_85064_a,callBlockLocationInfo,2,
+func_85079_a,callBlockType,2,
+func_85085_a,callSuspiciousClasses,2,
 func_85093_e,renderArrowsStuckInEntity,2,"renders arrows the Entity has been attacked with, attached to it"
 func_85096_a,renderBlockAnvilMetadata,2,Renders anvil block with metadata
+func_85097_a,callParticlePositionInfo,2,
 func_85102_a,playSoundToNearExcept,2,Plays sound to all near players except the player reference given
 func_85103_a,canDropFromExplosion,2,Return whether this block can drop from an explosion.
 func_85104_a,onBlockPlaced,2,"Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata"
 func_85105_g,onPostBlockPlaced,2,Called after a block is placed
 func_85106_a,insertRecord,2,Insert the specified music disc in the jukebox at the given coordinates
 func_85107_d,updateLadderBounds,2,Update the ladder block bounds based on the given metadata value.
+func_85108_a,callLevelGameModeInfo,2,
+func_85110_a,callLevelWeatherInfo,2,
+func_85112_a,callLevelStorageFormat,2,
+func_85114_a,callLevelDimension,2,
+func_85116_n,getThundering,2,Returns wether it's thundering or not.
 func_85118_a,addToCrashReport,2,Adds this WorldInfo instance to the crash report.
+func_85119_k,getRainTime,2,
+func_85120_o,getGameType,2,
+func_85121_j,getSaveVersion,2,
+func_85123_f,getSpawnZCoordinate,2,
+func_85124_e,getSpawnYCoordinate,2,
+func_85125_d,getSpawnXCoordinate,2,
+func_85127_l,getRaining,2,Returns wether it's raining or not.
 func_85128_b,getMapFeaturesEnabled,2,Return the map feautures enabled of a world
+func_85129_h,getWorldTime,2,
+func_85130_c,getWorldGeneratorOptions,2,
 func_85132_a,getTerrainTypeOfWorld,2,Return the terrain type of a world
+func_85133_m,getThunderTime,2,
+func_85134_a,callLevelSpawnLocation,2,
+func_85136_a,callLevelTime,2,
+func_85138_a,callLevelGeneratorInfo,2,
+func_85140_a,callLevelGeneratorOptions,2,
+func_85142_a,callLevelSeed,2,
+func_85145_a,callTileEntityName,2,
 func_85151_d,getLowerChestInventory,2,Return this chest container's lower chest inventory.
+func_85154_a,callEntityType,2,
 func_85156_a,removeTask,2,removes the indicated task from the entity's AI tasks.
+func_85160_a,callStructureType,2,
+func_85162_a,callChunkPositionHash,2,
+func_85170_a,callServerType,2,
 func_85173_a,playSoundToNearExcept,2,Plays sound to all near players except the player reference given
 func_85175_e,blockGetRenderType,2,Returns the render type of the block at the given coordinate.
 func_85176_s,getDefaultTeleporter,2,
@@ -4124,20 +4109,171 @@ func_90010_a,isPartOfLargeChest,2,Return whether the given inventory is part of
 func_90011_a,createChild,2,
 func_90019_g,applyRenderColor,2,Creates a new EntityDiggingFX with the block render color applied to the base particle color
 func_90022_d,getListOfPlayers,2,
+func_90023_a,callMouseLocation,2,
+func_90027_a,callScreenSize,2,
 func_90030_a,getRendererMinecraft,2,Get minecraft reference from the EntityRenderer
+func_90031_a,callScreenName,2,
 func_90033_f,canLoadWorld,2,Return whether the given world can be loaded.
 func_90035_a,getClassFromID,2,Return the class assigned to this entity ID.
 func_90036_a,getFireAspectModifier,2,
 func_90042_d,getRecord,2,Return the record item corresponding to the given name.
 func_90043_g,getRecordTitle,2,Return the title for this record.
+func_90045_a,callClientProfilerInfo,2,
+func_90047_a,callClientMemoryStats,2,
+func_90050_a,callTexturePack,2,
+func_90052_a,callParticleScreenName,2,
+func_90054_a,callUpdatingScreenName,2,
 func_90999_ad,canRenderOnFire,2,Return whether this entity should be rendered as on fire.
-func_92013_a,setEntityItem,2,Sets the ItemStack corresponding to this Entity (and updates the DataWatcher for it)
-func_92014_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_92015_a,getMobID,2,
-func_92027_k,sendChatMsg,2,Sends the given string to every player as chat message.
-func_92051_a,addRecipe,2,
 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_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_94053_h,nextTextureIndexX,2,
+func_94065_a,drawTexturedModelRectFromIcon,2,
+func_94127_c,getStartInventorySide,2,Get the start of the side inventory.
+func_94128_d,getSizeInventorySide,2,Get the size of the side inventory.
+func_94140_a,registerDestroyBlockIcons,2,
+func_94143_a,updateIcons,2,
+func_94148_a,renderItemStack,2,
+func_94149_a,renderIcon,2,
+func_94152_c,refreshTextureMaps,2,
+func_94156_a,intersection,2,
+func_94157_d,getRectHeight,2,
+func_94158_a,getRectX,2,
+func_94159_c,getRectWidth,2,
+func_94160_b,getRectY,2,
+func_94165_a,getBlockIconFromSideAndMetadata,2,
+func_94167_b,hasOverrideBlockTexture,2,
+func_94170_a,getBlockIcon,2,
+func_94171_a,renderBlockComparator,2,
+func_94172_a,renderBlockHopper,2,
+func_94173_a,getBlockIconFromSide,2,
+func_94174_a,renderBlockRedstoneLogicMetadata,2,
+func_94175_b,getBlockIcon,2,
+func_94176_a,renderBlockRedstoneLogic,2,
+func_94178_a,updateIcons,2,
+func_94179_g,isCompatible,2,
+func_94183_a,getStitchHolder,2,
+func_94184_a,getAllStitchSlots,2,Gets the slot and all its subslots
+func_94185_c,getOriginY,2,
+func_94186_b,getOriginX,2,
+func_94193_b,ceil16,2,
+func_94194_d,rotate,2,
+func_94195_e,isRotated,2,
+func_94196_a,setNewDimension,2,
+func_94197_a,getWidth,2,
+func_94198_a,compareToStitchHolder,2,See Comparable.compareTo.
+func_94199_b,getHeight,2,
+func_94206_g,getMinV,2,Returns the minimum V coordinate to use when rendering with this icon.
+func_94207_b,getInterpolatedV,2,Gets a V coordinate on the icon. 0 returns vMin and 16 returns vMax. Other arguments return in-between values.
+func_94208_k,getSheetHeight,2,"Returns the height of the texture sheet this icon is on, in pixels."
+func_94209_e,getMinU,2,Returns the minimum U coordinate to use when rendering with this icon.
+func_94210_h,getMaxV,2,Returns the maximum V coordinate to use when rendering with this icon.
+func_94211_a,getOriginX,2,"Returns the X position of this icon on its texture sheet, in pixels."
+func_94212_f,getMaxU,2,Returns the maximum U coordinate to use when rendering with this icon.
+func_94213_j,getSheetWidth,2,"Returns the width of the texture sheet this icon is on, in pixels."
+func_94214_a,getInterpolatedU,2,Gets a U coordinate on the icon. 0 returns uMin and 16 returns uMax. Other arguments return in-between values.
+func_94215_i,getIconName,2,
+func_94216_b,getOriginY,2,"Returns the Y position of this icon on its texture sheet, in pixels."
+func_94217_a,copyFrom,2,
+func_94218_a,init,2,
+func_94219_l,updateAnimation,2,
+func_94220_a,makeTextureStitched,2,
+func_94221_a,readAnimationInfo,2,
+func_94241_a,updateCompass,2,"Updates the compass based on the given x,z coords and camera direction"
+func_94245_a,registerIcon,2,
+func_94246_d,getTexture,2,
+func_94247_b,refreshTextures,2,
+func_94248_c,updateAnimations,2,
+func_94259_a,registerTexture,2,
+func_94261_a,makeTexture,2,
+func_94262_d,createStitcher,2,
+func_94263_a,init,2,
+func_94264_a,registerTexture,2,
+func_94265_c,getNextTextureId,2,
+func_94266_e,createTexture,2,
+func_94267_b,instance,2,
+func_94272_a,fillRect,2,
+func_94273_h,getTextureData,2,
+func_94274_a,getTextureRect,2,
+func_94275_d,getWidth,2,
+func_94276_e,getHeight,2,
+func_94277_a,bindTexture,2,
+func_94278_a,transferFromImage,2,
+func_94279_c,writeImage,2,
+func_94280_f,getTextureName,2,
+func_94281_a,copyFrom,2,
+func_94282_c,getGlTextureId,2,
+func_94284_b,getTextureId,2,
+func_94285_g,createTexture,2,
+func_94305_f,doStitch,2,
+func_94306_e,getTexture,2,
+func_94308_a,getCeilPowerOf2,2,Returns power of 2 >= the specified value
+func_94309_g,getStichSlots,2,
+func_94310_b,allocateSlot,2,Attempts to find space for specified tile
+func_94311_c,expandAndAllocateSlot,2,Expand stitched texture in order to make space for specified tile
+func_94312_a,addStitchHolder,2,
+func_94328_b_,getComparatorInputOverride,2,"If hasComparatorInputOverride returns true, the return value from this is used instead of the redstone signal strength when this block inputs to a comparator."
+func_94329_b,isAssociatedBlockID,2,Static version of isAssociatedBlockID.
+func_94330_A,getUnlocalizedName2,2,Returns the unlocalized name without the tile. prefix. Caution: client-only.
+func_94331_a,canPlaceBlockOnSide,2,
+func_94332_a,registerIcons,2,"When this method is called, your block should register all the icons it needs with the given IconRegister. This is the only chance you get to register icons."
+func_94334_h,isAssociatedBlockID,2,"Returns true if the given block ID is equivalent to this one. Example: redstoneTorchOn matches itself and redstoneTorchOff, and vice versa. Most blocks only match themselves."
+func_94434_o,getIconSideOverlay,2,
+func_94539_a,setExplosionSource,2,
+func_94540_d,setExplosion,2,
+func_94541_c,isExplosion,2,
+func_94571_i,setBlockToAir,2,"Sets a block to 0 and notifies relevant systems with the block change  Args: x, y, z"
+func_94572_D,getStrongestIndirectPower,2,
+func_94573_a,isBlockTickScheduled,2,"Returns true if the given block will receive a scheduled tick in the future. Args: X, Y, Z, blockID"
+func_94574_k,getIndirectPowerOutput,2,"Returns the indirect signal strength being outputted by the given block in the *opposite* of the given direction. Args: X, Y, Z, direction"
+func_94575_c,setBlock,2,"Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID"
+func_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,updateIcons,2,
+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_96439_d,notifyBlocksOfNeighborChange,2,"Calls notifyBlockOfNeighborChange on adjacent blocks, except the one on the given side. Args: X, Y, Z, changingBlockID, side"
+func_96441_U,getScoreboard,2,
+func_96444_a,mixAoBrightness,2,
+func_96445_r,renderBlockQuartz,2,
+func_96446_b,getIconSafe,2,
+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_96556_a,callServerMemoryStats,2,
+func_96557_a,callServerProfiler,2,
+func_96559_d,getFrontOffsetY,2,
+func_96563_a,callEntityName,2,
+func_96632_a,callItemDisplayName,2,
+func_98033_al,getLogAgent,2,
+func_98052_bS,canPickUpLoot,2,
+func_98053_h,setCanPickUpLoot,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_98180_V,getWorldLogAgent,2,
+func_98184_a,setupTextureExt,2,
+func_98185_a,resetBoundTexture,2,
+func_98186_a,colorToAnaglyph,2,
+func_98187_b,bindTexture,2,
+func_98225_a,getPacketClass,2,
+func_98233_a,logInfo,2,
+func_98236_b,logWarning,2,
+func_98243_a,callPacketID,2,
+func_98266_d,getSpawnerZ,2,
+func_98271_a,getSpawnerWorld,2,
+func_98272_a,setMobID,2,
+func_98274_c,getSpawnerY,2,
+func_98275_b,getSpawnerX,2,
+func_98278_g,updateSpawner,2,
+func_98279_f,canRun,2,Returns true if there's a player close enough to this mob spawner to activate it.
+func_98304_a,readFontData,2,
+func_98305_c,readFontTexture,2,
+func_98306_d,readGlyphSizes,2,

fml/conf/packages.csv

@@ -302,6 +302,7 @@ RequestGet,net/minecraft/client/mco
 RequestPost,net/minecraft/client/mco
 RequestPut,net/minecraft/client/mco
 TimerTaskMcoServerListUpdate,net/minecraft/client/mco
+TimerTaskMcoServerListUpdateComparator,net/minecraft/client/mco
 ValueObjectList,net/minecraft/client/mco
 ValueObjectSubscription,net/minecraft/client/mco
 ModelBase,net/minecraft/client/model
@@ -644,6 +645,12 @@ EnchantmentUntouching,net/minecraft/enchantment
 EnchantmentWaterWorker,net/minecraft/enchantment
 EnumEnchantmentType,net/minecraft/enchantment
 IEnchantmentModifier,net/minecraft/enchantment
+CallableEffectAmplifier,net/minecraft/entity
+CallableEffectDuration,net/minecraft/entity
+CallableEffectID,net/minecraft/entity
+CallableEffectIsAmbient,net/minecraft/entity
+CallableEffectIsSplash,net/minecraft/entity
+CallableEffectName,net/minecraft/entity
 CallableEntityName,net/minecraft/entity
 CallableEntityTracker,net/minecraft/entity
 CallableEntityType,net/minecraft/entity

fml/conf/params.csv

@@ -40,8 +40,44 @@ p_101012_2_,par2,2
 p_101012_3_,par3,2
 p_101012_4_,par4,2
 p_101015_1_,par1Str,2
-p_101017_1_,par1McoServer,2
 p_101018_1_,par1List,2
+p_102007_1_,par1,2
+p_102007_2_,par2ItemStack,2
+p_102007_3_,par3,2
+p_102008_1_,par1,2
+p_102008_2_,par2ItemStack,2
+p_102008_3_,par3,2
+p_102012_0_,par0Hopper,2
+p_102012_1_,par1IInventory,2
+p_102012_2_,par2,2
+p_102012_3_,par3,2
+p_102013_0_,par0IInventory,2
+p_102013_1_,par1ItemStack,2
+p_102013_2_,par2,2
+p_102013_3_,par3,2
+p_102014_0_,par0IInventory,2
+p_102014_1_,par1ItemStack,2
+p_102014_2_,par2,2
+p_102014_3_,par3,2
+p_102015_0_,par0IInventory,2
+p_102015_1_,par1ItemStack,2
+p_102015_2_,par2,2
+p_102015_3_,par3,2
+p_102018_1_,par1,2
+p_102021_1_,par1List,2
+p_102021_2_,par2,2
+p_102021_3_,par3,2
+p_102023_1_,par1McoServer,2
+p_102023_2_,par2McoServer,2
+p_102026_1_,par1Block,2
+p_102026_2_,par2,2
+p_102027_1_,par1Block,2
+p_102027_2_,par2,2
+p_102027_3_,par3,2
+p_102027_4_,par4,2
+p_102027_5_,par5,2
+p_102027_6_,par6,2
+p_102027_7_,par7,2
 p_70000_1_,par1PlayerUsageSnooper,2
 p_70001_1_,par1PlayerUsageSnooper,2
 p_70003_1_,par1,2
@@ -685,7 +721,6 @@ p_71754_2_,par2Str,2
 p_71761_1_,par1InetAddress,2
 p_71764_1_,par1NetLoginHandler,2
 p_71769_1_,par1InetAddress,2
-p_71770_0_,par0InetAddress,2
 p_71789_1_,par1,2
 p_71790_1_,par1ArrayOfByte,2
 p_71790_2_,par2,2
@@ -7256,12 +7291,9 @@ p_94103_1_,par1,2
 p_94107_1_,par1,2
 p_94114_1_,par1ItemStack,2
 p_94114_2_,par2ItemStack,2
-p_94115_1_,par1IInventory,2
-p_94115_2_,par2,2
 p_94117_1_,par1IInventory,2
 p_94117_2_,par2ItemStack,2
 p_94117_3_,par3,2
-p_94127_1_,par1,2
 p_94128_1_,par1,2
 p_94129_1_,par1Str,2
 p_94131_1_,par1Str,2
@@ -8120,9 +8152,6 @@ p_i10013_2_,par2GuiScreen,2
 p_i10013_3_,par3McoServer,2
 p_i10014_1_,par1GuiScreen,2
 p_i10014_2_,par2McoServer,2
-p_i10015_1_,par1GuiScreen,2
-p_i10015_2_,par2GuiScreen,2
-p_i10015_3_,par3McoServer,2
 p_i10017_1_,par1GuiScreenCreateOnlineWorld,2
 p_i10017_2_,par2Str,2
 p_i10017_3_,par3Str,2
@@ -8360,6 +8389,34 @@ p_i11045_1_,par1Str,2
 p_i11046_1_,par1TileEntityMobSpawner,2
 p_i20000_1_,par1Session,2
 p_i20001_1_,par1Session,2
+p_i22000_1_,par1TimerTaskMcoServerListUpdate,2
+p_i22000_2_,par2Str,2
+p_i22001_1_,par1TimerTaskMcoServerListUpdate,2
+p_i22001_2_,par2Str,2
+p_i22001_3_,par3McoServerListINNER1,2
+p_i22002_1_,par1GuiScreen,2
+p_i22002_2_,par2GuiScreenConfigureWorld,2
+p_i22002_3_,par3McoServer,2
+p_i22003_1_,par1EntityLiving,2
+p_i22003_2_,par2PotionEffect,2
+p_i22004_1_,par1EntityLiving,2
+p_i22004_2_,par2PotionEffect,2
+p_i22005_1_,par1EntityLiving,2
+p_i22005_2_,par2PotionEffect,2
+p_i22006_1_,par1EntityLiving,2
+p_i22006_2_,par2PotionEffect,2
+p_i22007_1_,par1EntityLiving,2
+p_i22007_2_,par2PotionEffect,2
+p_i22008_1_,par1EntityLiving,2
+p_i22008_2_,par2PotionEffect,2
+p_i22009_1_,par1World,2
+p_i22009_2_,par2,2
+p_i22009_3_,par3,2
+p_i22009_4_,par4,2
+p_i22009_5_,par5,2
+p_i22009_6_,par6,2
+p_i22009_7_,par7,2
+p_i22009_8_,par8,2
 p_i3000_1_,par1File,2
 p_i3000_2_,par2Minecraft,2
 p_i3001_1_,par1Map,2
@@ -9990,13 +10047,6 @@ p_i3738_3_,par3,2
 p_i3739_1_,par1Str,2
 p_i3739_2_,par2,2
 p_i3739_3_,par3,2
-p_i3740_1_,par1World,2
-p_i3740_2_,par2,2
-p_i3740_3_,par3,2
-p_i3740_4_,par4,2
-p_i3740_5_,par5,2
-p_i3740_6_,par6,2
-p_i3740_7_,par7,2
 p_i3741_1_,par1,2
 p_i3741_2_,par2,2
 p_i3741_3_,par3,2

fml/conf/patches/minecraft_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Fri Mar 08 22:39:55 2013
+--- minecraft\net\minecraft\client\Minecraft.java	Tue Mar 19 21:24:34 2013
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Tue Mar 19 21:26:27 2013
 @@ -531,9 +531,8 @@
           return;
        }
@@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
  
     private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Fri Mar 08 22:39:56 2013
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:39:56 2013
+--- minecraft\net\minecraft\src\CodecMus.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:39:56 2013
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:26:27 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -87,8 +87,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
---- minecraft\net\minecraft\src\DedicatedServer.java	Fri Mar 08 22:39:56 2013
+--- minecraft\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:26:27 2013
 @@ -206,7 +206,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	Fri Mar 08 22:39:57 2013
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:24:36 2013
-+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:39:57 2013
+--- minecraft\net\minecraft\src\FontRenderer.java	Tue Mar 19 21:24:36 2013
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:39:58 2013
+--- minecraft\net\minecraft\src\IntegratedServer.java	Tue Mar 19 21:24:37 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:39:59 2013
+--- minecraft\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Fri Mar 08 22:44:06 2013
++++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:26:27 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -186,9 +186,9 @@ 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	Fri Mar 08 22:39:59 2013
+--- minecraft\net\minecraft\src\RenderBlocks.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Tue Mar 19 21:26:27 2013
-@@ -1967,16 +1967,16 @@
+@@ -1951,16 +1951,16 @@
        float var25 = (float)(p_78589_2_ + 1);
        float var26 = (float)(p_78589_4_ + 0);
        float var27 = (float)(p_78589_4_ + 1);
@@ -209,7 +209,7 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
           int var29 = 0;
           int var30 = 0;
           int var31 = 16;
-@@ -2022,7 +2022,7 @@
+@@ -2006,7 +2006,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));
@@ -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	Fri Mar 08 22:39:59 2013
+--- minecraft\net\minecraft\src\RenderGlobal.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:39:59 2013
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:40:00 2013
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:24:39 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Mar 08 22:41:28 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:26:27 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	Fri Mar 08 22:41:11 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:25:52 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:26:37 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	Fri Mar 08 22:41:11 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:25:52 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:26:37 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -34,8 +34,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
---- minecraft_server\net\minecraft\src\DedicatedServer.java	Fri Mar 08 22:41:11 2013
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:25:53 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:26:37 2013
 @@ -207,7 +207,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	Fri Mar 08 22:41:12 2013
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:25:53 2013
-+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:26:37 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	Fri Mar 08 22:41:12 2013
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Tue Mar 19 21:26:37 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	Fri Mar 08 22:41:13 2013
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Fri Mar 08 22:44:07 2013
++++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:26:37 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	Fri Mar 08 22:41:13 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:26:37 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	Fri Mar 08 22:41:13 2013
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Mar 08 22:41:30 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:26:37 2013
 @@ -20,7 +20,8 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.42
+MCPVersion = 7.44
-ClientVersion = 1.5
+ClientVersion = 1.5.1
-ServerVersion = 1.5
+ServerVersion = 1.5.1

fml/mc_versions.cfg

@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.5
+current_ver = 1.5.1
 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
@@ -76,3 +76,12 @@ mcp_ver    = 7.42
 mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp742.zip
 mcp_md5    = ad1a2b86916dd5f71e832181e01bd91a
 
+[1.5.1]
+client_url = http://assets.minecraft.net/1_5_1/minecraft.jar
+server_url = http://assets.minecraft.net/1_5_1/minecraft_server.jar
+client_md5 = 5c1219d869b87d233de3033688ec7567
+server_md5 = 9d31b969c3f197a1d40381d5620717ea
+mcp_ver    = 7.44
+mcp_url    = http://files.minecraftforge.net/mcpmirror/mcp744.zip
+mcp_md5    = 0b9047820bbcb7da32c5e18f60212832
+

fml/mcp_merge.cfg

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

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

@@ -21,7 +21,7 @@
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
  {
-@@ -298,6 +306,8 @@
+@@ -299,6 +307,8 @@
          this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
          this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
  
@@ -30,7 +30,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab, false);
-@@ -333,6 +343,8 @@
+@@ -334,6 +344,8 @@
          GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
  
@@ -39,7 +39,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -361,6 +373,8 @@
+@@ -362,6 +374,8 @@
          {
              this.func_71352_k();
          }
@@ -48,7 +48,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -722,9 +736,11 @@
+@@ -723,9 +737,11 @@
  
              if (!this.field_71454_w)
              {
@@ -60,7 +60,7 @@
              }
  
              GL11.glFlush();
-@@ -1254,10 +1270,14 @@
+@@ -1255,10 +1271,14 @@
  
      public void func_71407_l()
      {
@@ -75,7 +75,7 @@
  
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
-@@ -1715,6 +1735,8 @@
+@@ -1716,6 +1736,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -84,7 +84,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1753,8 +1775,27 @@
+@@ -1754,8 +1776,27 @@
          }
  
          this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
@@ -112,7 +112,7 @@
          this.field_71455_al = true;
          this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel"));
  
-@@ -1976,6 +2017,12 @@
+@@ -1977,6 +2018,12 @@
  
      public static void main(String[] p_main_0_)
      {

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

@@ -8,59 +8,60 @@
  import net.minecraft.util.Direction;
  import net.minecraft.util.Icon;
  import net.minecraft.util.MathHelper;
-@@ -235,7 +236,50 @@
+@@ -222,7 +223,51 @@
-         int l = p_78612_1_.func_71857_b();
+         {
-         p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
+             p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
-         this.func_83018_a(p_78612_1_);
+             this.func_83018_a(p_78612_1_);
--        return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 39 ? this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 36 ? this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 37 ? this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 38 ? this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))))))));
+-            return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 39 ? this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 36 ? this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 37 ? this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 38 ? this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))))))));
-+        switch (l)
++            
-+        {
++            switch (l)
-+        // regex: \(l == ([\d]+) \? (.*) replace: case \1: return \2; ::: IMPORTANT: REMEMBER THIS ON FIRST line!
++            {
-+        case 0 : return this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
++                //regex: ' : \(l == ([\d]+) \?' replace: ';\ncase \1: return' ::: IMPORTANT: REMEMBER THIS ON FIRST line!
-+        case 31: return this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 0: return this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 39: return this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 4: return this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 4: return this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 31: return this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 13: return this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 1: return this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 1: return this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 2: return this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 19: return this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 20: return this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 23: return this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 11: return this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 6: return this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 39: return this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 2: return this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 5: return this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 3: return this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 13: return this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 5: return this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 9: return this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 8: return this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 19: return this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 7: return this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 23: return this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 9: return this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 6: return this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 10: return this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 3: return this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 27: return this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 8: return this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 11: return this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 7: return this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 32: return this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 10: return this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 12: return this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 27: return this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 29: return this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 32: return this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 30: return this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 12: return this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 14: return this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 29: return this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 15: return this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 30: return this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 36: return this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 14: return this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 37: return this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 15: return this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 16: return this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) ;
++                case 36: return this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 17: return this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) ;
++                case 37: return this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 18: return this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 16: return this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false);
-+        case 20: return this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 17: return this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true);
-+        case 21: return this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 18: return this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 24: return this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 21: return this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 33: return this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 24: return this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 35: return this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 33: return this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 25: return this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 35: return this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 26: return this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 25: return this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 28: return this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 26: return this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 34: return this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 28: return this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        case 38: return this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ;
++                case 34: return this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        default: return FMLRenderAccessLibrary.renderWorldBlock(this, field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_, p_78612_1_, l);
++                case 38: return this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+        }
++                default: return false;
++            }
+         }
      }
  
-     public boolean func_78567_v(BlockEndPortalFrame p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
+@@ -7618,6 +7663,10 @@
-@@ -6904,6 +6948,10 @@
                  this.func_96447_a((BlockHopper)p_78600_1_, 0, 0, 0, 0, true);
                  GL11.glTranslatef(0.5F, 0.5F, 0.5F);
              }
@@ -71,7 +72,7 @@
          }
          else
          {
-@@ -6962,7 +7010,25 @@
+@@ -7676,7 +7725,25 @@
  
      public static boolean func_78597_b(int p_78597_0_)
      {

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

@@ -9,7 +9,7 @@
  import net.minecraft.entity.boss.EntityDragon;
  import net.minecraft.entity.item.EntityBoat;
  import net.minecraft.entity.item.EntityEnderCrystal;
-@@ -354,6 +356,14 @@
+@@ -357,6 +359,14 @@
                      this.field_73138_k = this.field_73132_a.field_70181_x;
                      this.field_73135_l = this.field_73132_a.field_70179_y;
  
@@ -24,7 +24,7 @@
                      if (this.field_73143_t && !(packet instanceof Packet24MobSpawn))
                      {
                          p_73117_1_.field_71135_a.func_72567_b(new Packet28EntityVelocity(this.field_73132_a.field_70157_k, this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
-@@ -426,6 +436,13 @@
+@@ -429,6 +439,13 @@
          if (this.field_73132_a.field_70128_L)
          {
              this.field_73132_a.field_70170_p.func_98180_V().func_98236_b("Fetching addPacket for removed entity");

fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import net.minecraft.block.Block;
-@@ -308,7 +309,15 @@
+@@ -311,7 +312,15 @@
                  }
              }
  

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

@@ -16,7 +16,7 @@
  
          this.field_72984_F.func_76318_c("pendingTileEntities");
  
-@@ -3634,7 +3635,7 @@
+@@ -3639,7 +3640,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {