diff --git a/conf/fields.csv b/conf/fields.csv
index 3109de3c9a..4b56d7dd4f 100644
--- a/conf/fields.csv
+++ b/conf/fields.csv
@@ -323,6 +323,8 @@ field_70717_bb,attackingPlayer,2,The most recent player that has attacked this e
 field_70718_bc,recentlyHit,2,"Set to 60 when hit by the player or the player's wolf, then decrements. Used to determine whether the entity should drop items on death."
 field_70719_bd,arrowHitTempCounter,2,"Set to 60 when hit by the player or the player's wolf, then decrements. Used to determine whether the entity should drop items on death."
 field_70720_be,arrowHitTimer,2,
+field_70721_aZ,legYaw,2,
+field_70722_aY,prevLegYaw,2,
 field_70723_bA,senses,2,
 field_70724_aR,attackTime,2,
 field_70725_aQ,deathTime,2,"The amount of time remaining this entity should act 'dead', i.e. have a corpse in the world."
@@ -481,7 +483,7 @@ field_71129_f,chunksToLoad,2,
 field_71130_g,destroyedItemsNetCache,2,entities added to this list will  be packet29'd to the player
 field_71131_d,managedPosX,2,player X position as seen by PlayerManager
 field_71132_e,managedPosZ,2,player Z position as seen by PlayerManager
-field_71133_b,minecraftInstance,2,
+field_71133_b,mcServer,2,Reference to the MinecraftServer object.
 field_71134_c,theItemInWorldManager,2,The ItemInWorldManager belonging to this player
 field_71135_a,serverForThisPlayer,2,set by the NetServerHandler or the ServerConfigurationManager
 field_71136_j,playerHasConqueredTheEnd,2,set to true when the player is leaving the End after success.
@@ -529,7 +531,7 @@ field_71281_E,lastSentPacketID,2,
 field_71282_F,lastSentPacketSize,2,
 field_71283_G,lastRecievedID,2,
 field_71284_A,pvpEnabled,2,Indicates whether PvP is active on the server or not.
-field_71285_B,allowFlight,2,Determines if flight is Allowed or not.
+field_71285_B,allowFlight,2,Determines if flight is allowed or not.
 field_71286_C,motd,2,The server MOTD string.
 field_71287_L,worldName,2,
 field_71288_M,isDemo,2,
@@ -549,7 +551,7 @@ field_71301_g,sentPacketSizeArray,2,
 field_71302_d,currentTask,2,The task the server is currently working on(and will output on outputPercentRemaining).
 field_71303_e,percentDone,2,The percentage of the current task finished so far.
 field_71304_b,theProfiler,2,
-field_71305_c,dimensionServerList,2,
+field_71305_c,theWorldServer,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,
@@ -930,11 +932,11 @@ field_72348_e,maximumSizeSinceLastTruncation,2,
 field_72349_b,minimumSize,2,
 field_72350_c,vec3Cache,2,items at and above nextFreeSpace are assumed to be available
 field_72351_a,truncateArrayResetThreshold,2,
-field_72400_f,minecraftServerInstance,2,
+field_72400_f,mcServer,2,Reference to the MinecraftServer object.
 field_72401_g,bannedPlayers,2,
 field_72402_d,viewDistance,2,
 field_72403_e,dateFormat,2,
-field_72404_b,playerList,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,myLogger,2,
 field_72407_n,commandsAllowedForAll,2,True if all players are allowed to use commands (cheats).
@@ -944,7 +946,7 @@ field_72410_m,gameType,2,
 field_72411_j,whiteListIPs,2,
 field_72412_k,playerNBTManagerObj,2,Reference to the PlayerNBTManager object.
 field_72413_h,bannedIPs,2,
-field_72414_i,whiteListNames,2,the list of names on the whiteList
+field_72414_i,ops,2,A set containing the OPs.
 field_72416_e,tagsForLastWrittenPlayer,2,
 field_72422_f,whiteList,2,
 field_72423_e,opsList,2,
@@ -953,7 +955,7 @@ field_72447_d,myVec3LocalPool,2,
 field_72448_b,yCoord,2,Y coordinate of Vec3D
 field_72449_c,zCoord,2,Z coordinate of Vec3D
 field_72450_a,xCoord,2,X coordinate of Vec3D
-field_72534_f,minecraftInstance,2,
+field_72534_f,mcServer,2,Reference to the MinecraftServer object.
 field_72535_g,connectionTimer,2,
 field_72537_e,rand,2,The Random object used to generate serverId hex strings.
 field_72538_b,myTCPConnection,2,
@@ -1132,7 +1134,7 @@ field_73033_b,clientChunkProvider,2,The ChunkProviderClient instance
 field_73034_c,entityHashSet,2,The hash set of entities handled by this client. Uses the entity's ID as the hash set's key.
 field_73035_a,sendQueue,2,The packets that need to be sent to the server.
 field_73036_L,entitySpawnQueue,2,Contains all entities for this client that were not spawned due to a non-present chunk. The game will attempt to spawn up to 10 pending entities with each subsequent tick until the spawn queue is empty.
-field_73037_M,minecraftInstance,2,
+field_73037_M,mc,2,
 field_73038_N,previousActiveChunkSet,2,
 field_73058_d,canNotSave,2,"set by CommandServerSave{all,Off,On}"
 field_73059_b,theChunkProviderServer,2,
@@ -1595,6 +1597,7 @@ field_73826_p,selectionEnd,2,"other selection position, maybe the same as the cu
 field_73837_f,updateCounter,2,
 field_73838_g,recordPlaying,2,The string specifying which record music is playing
 field_73839_d,mc,2,
+field_73840_e,persistantChatGUI,2,ChatGUI instance that retains all previous chat data
 field_73841_b,itemRenderer,2,
 field_73842_c,rand,2,
 field_73843_a,prevVignetteBrightness,2,Previous frame vignette brightness (slowly changes by 1% each frame)
@@ -1899,6 +1902,9 @@ field_74522_a,colorBuffer,2,Float buffer used to set OpenGL material colors
 field_74532_a,mc,2,A reference to the Minecraft object.
 field_74536_a,mc,2,Minecraft instance
 field_74537_a,logo,2,BufferedImage object containing the Majong logo.
+field_74541_b,lineString,2,
+field_74542_c,chatLineID,2,"int value to refer to existing Chat Lines, can be 0 which means unreferrable"
+field_74543_a,updateCounterCreated,2,GUI Update Counter value this Line was created at
 field_74568_d,lastCharacterWasCarriageReturn,2,
 field_74569_b,characterCount,2,
 field_74570_c,lineCount,2,
@@ -2098,7 +2104,7 @@ field_75222_d,slotNumber,2,the id of the slot(also the index in the inventory ar
 field_75223_e,xDisplayPosition,2,display position of the inventory slot on the screen x axis
 field_75224_c,inventory,2,The inventory we want to extract a slot from.
 field_75225_a,slotIndex,2,The index of the slot in the inventory.
-field_75226_a,container,2,The brewing stand this slot belongs to.
+field_75226_a,brewingStand,2,The brewing stand this slot belongs to.
 field_75227_a,container,2,The brewing stand this slot belongs to.
 field_75229_a,thePlayer,2,The player that is using the GUI where this slot resides.
 field_75235_b,parent,2,"The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner class."
@@ -2902,7 +2908,7 @@ 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,biomeCache,2,The BiomeCache objevt that contains this BiomeCacheBlock
+field_76887_g,theBiomeCache,2,The BiomeCache object that contains this BiomeCacheBlock
 field_76888_d,xPosition,2,The x coordinate of the BiomeCacheBlock.
 field_76889_e,zPosition,2,The z coordinate of the BiomeCacheBlock.
 field_76890_b,rainfallValues,2,An array of chunk rainfall values saved by this cache.
@@ -3124,7 +3130,7 @@ field_77486_a,syncher,2,
 field_77491_c,timeLastSeen,2,Last time this LanServer was seen.
 field_77494_b,entityLiving,2,Used as parameter to calculate the (magic) extra damage based on enchantments of current equipped player item.
 field_77495_a,livingModifier,2,Used to calculate the (magic) extra damage based on enchantments of current equipped player item.
-field_77496_b,damageSource,2,Used as parameter to calculate the damage modifier (extra armor) on enchantments that the player have on equipped armors.
+field_77496_b,source,2,Used as parameter to calculate the damage modifier (extra armor) on enchantments that the player have on equipped armors.
 field_77497_a,damageModifier,2,Used to calculate the damage modifier (extra armor) on enchantments that the player have on equipped armors.
 field_77520_b,enchantmentModifierDamage,2,Used to calculate the extra armor of enchantments on armors equipped on player.
 field_77521_c,enchantmentModifierLiving,2,Used to calculate the (magic) extra damage done by enchantments on current equipped item of player.
@@ -3148,6 +3154,7 @@ field_77591_a,recipeItems,2,
 field_77597_b,recipes,2,A list of all the recipes added
 field_77598_a,instance,2,The static instance of this class
 field_77604_b,smeltingList,2,The list of smelting results.
+field_77605_c,experienceList,2,
 field_77606_a,smeltingBase,2,
 field_77610_b,recipeItems,2,
 field_77611_a,recipePatterns,2,
@@ -3790,7 +3797,10 @@ field_78724_e,renderEngine,2,
 field_78725_b,renderPosX,2,
 field_78726_c,renderPosY,2,
 field_78727_a,instance,2,The static instance of RenderManager.
+field_78728_n,viewerPosZ,2,
 field_78729_o,entityRenderMap,2,A map of entity classes and the associated renderer.
+field_78730_l,viewerPosX,2,
+field_78731_m,viewerPosY,2,
 field_78732_j,playerViewX,2,
 field_78733_k,options,2,Reference to the GameSettings object.
 field_78734_h,livingPlayer,2,Rendermanager's variable for the player
@@ -3839,9 +3849,11 @@ field_78830_c,nameinLowerCase,2,Player name in lowercase.
 field_78831_a,name,2,The string value of the object
 field_78833_a,worldClientMPL1,2,Initialises the WorldClient for CallableMPL1.
 field_78835_a,worldClientMPL2,2,Initialises the WorldClient for CallableMPL2.
+field_78843_d,serverMOTD,2,
 field_78845_b,serverIP,2,
 field_78847_a,serverName,2,
 field_78848_h,acceptsTextures,2,
+field_78858_b,servers,2,List of ServerData instances.
 field_78859_a,mc,2,The Minecraft instance.
 field_78865_b,serverPort,2,
 field_78866_a,ipAddress,2,
diff --git a/conf/methods.csv b/conf/methods.csv
index e76613d598..5b2c880728 100644
--- a/conf/methods.csv
+++ b/conf/methods.csv
@@ -569,7 +569,7 @@ func_71206_a,shareToLAN,2,"does nothing on dedicated. on integrated, sets comman
 func_71207_Z,getBuildLimit,2,
 func_71208_b,setServerPort,2,
 func_71209_f,getFile,2,Returns a File object from the specified string.
-func_71210_a,setServerConfigManager,2,
+func_71210_a,setConfigurationManager,2,
 func_71211_k,getHostname,2,
 func_71212_ac,getNetworkThread,2,
 func_71213_z,getAllUsernames,2,
@@ -707,6 +707,7 @@ func_71410_x,getMinecraft,2,Return the singleton Minecraft instance for the game
 func_71411_J,runGameLoop,2,Called repeatedly from run()
 func_71479_a,startMainThread,2,
 func_71480_b,shutdown,2,Called when the applet window is closed.
+func_71495_a,getOsAsString,2,
 func_71497_f,getFile,2,Gets the file this crash report is saved into.
 func_71498_d,getCauseStackTraceOrString,2,"Gets the stack trace of the Throwable that caused this crash report, or if that fails, the cause .toString()."
 func_71499_a,addCrashSectionThrowable,2,Adds a Crashreport section with the given name with the given Throwable
@@ -737,6 +738,7 @@ func_71529_a,setAdminCommander,2,Sets the static IAdminCommander.
 func_71530_a,getListOfStringsMatchingLastWord,2,Returns a List of strings (chosen from the given strings) which the last word in the given string array is a beginning-match for. (Tab completion).
 func_71531_a,getListOfStringsFromIterableMatchingLastWord,2,Returns a List of strings (chosen from the given string iterable) which the last word in the given string array is a beginning-match for. (Tab completion).
 func_71532_a,parseIntBounded,2,Parses an int from the given string within a specified bound.
+func_71536_c,getPlayers,2,
 func_71539_b,getGameModeFromCommand,2,Gets the Game Mode specified in the command.
 func_71541_a,setGameType,2,
 func_71549_c,getWittyComment,2,"Returns a random ""witty"" comment."
@@ -1017,10 +1019,10 @@ func_72355_a,initializeConnectionToPlayer,2,
 func_72356_a,transferPlayerToDimension,2,
 func_72357_a,setGameType,2,
 func_72358_d,serverUpdateMountedMovingPlayer,2,"using player's dimension, update their movement when in a vehicle (e.g. cart, boat)"
-func_72359_h,addToIPWhitelist,2,
-func_72360_c,removeNameFromWhitelist,2,
+func_72359_h,addToWhiteList,2,Add the specified player to the white list.
+func_72360_c,removeOp,2,"This removes a username from the ops list, then saves the op list"
 func_72361_f,getPlayerForUsername,2,
-func_72362_j,loadWhiteList,2,"eithre does nothing, or calls readWhiteList"
+func_72362_j,loadWhiteList,2,"Either does nothing, or calls readWhiteList."
 func_72363_f,getBannedIPs,2,
 func_72364_a,setPlayerManager,2,Sets the NBT manager to the one for the worldserver given
 func_72365_p,getServerInstance,2,
@@ -1028,7 +1030,7 @@ func_72366_a,createPlayerForUser,2,also checks for multiple logins
 func_72367_e,playerLoggedOut,2,Called when a player disconnects from the game. Writes player data to disk and removes them from the world.
 func_72368_a,respawnPlayer,2,"creates and returns a respawned player based on the provided PlayerEntity. Args are the PlayerEntityMP to respawn, an INT for the dimension to respawn into (usually 0), and a boolean value that is true if the player beat the game rather than dying"
 func_72369_d,getAllUsernames,2,
-func_72370_d,isWhiteListed,2,
+func_72370_d,isAllowedToLogin,2,Determine if the player is allowed to connect based on current server settings.
 func_72371_a,setWhiteListEnabled,2,
 func_72372_a,getEntityViewDistance,2,
 func_72373_m,getAvailablePlayerDat,2,returns a list of usernames for which playerData is available
@@ -1036,13 +1038,13 @@ func_72374_b,sendPlayerInfoToAllPlayers,2,"sends 1 player per tick, but only sen
 func_72376_i,getNamesWhiteList,2,
 func_72377_c,playerLoggedIn,2,Called when a player successfully logs in. Reads player data from disk and inserts the player into the world.
 func_72378_q,getTagsFromLastWrite,2,gets the tags created in the last writePlayerData call
-func_72379_i,removeFromIPWhitelist,2,
+func_72379_i,removeFromWhitelist,2,Remove the specified player from the whitelist.
 func_72380_a,readPlayerDataFromFile,2,called during player login. reads the player information from disk.
 func_72382_j,getPlayerList,2,
 func_72383_n,isWhiteListEnabled,2,
 func_72384_a,sendPacketToAllPlayers,2,
 func_72385_f,syncPlayerInventory,2,sends the players inventory to himself
-func_72386_b,addNameToWhitelist,2,
+func_72386_b,addOp,2,"This adds a username to the ops list, then saves the op list"
 func_72387_b,setCommandsAllowedForAll,2,Sets whether all players are allowed to use commands (cheats) on the server.
 func_72388_h,getIPWhiteList,2,
 func_72389_g,saveAllPlayerData,2,
@@ -1059,9 +1061,9 @@ func_72399_a,allowUserToConnect,2,"checks ban-lists, then white-lists, then spac
 func_72415_s,getIntegratedServer,2,get the associated Integrated Server
 func_72417_t,loadOpsList,2,
 func_72418_v,readWhiteList,2,
-func_72419_u,saveOpsListOrWhitelist,2,
+func_72419_u,saveOpsList,2,
 func_72420_s,getDedicatedServerInstance,2,
-func_72421_w,saveOpsList,2,
+func_72421_w,saveWhiteList,2,
 func_72429_b,getIntermediateWithXValue,2,"Returns a new vector with x value equal to the second parameter, along the line between this vector and the passed in vector, or null if not possible."
 func_72430_b,dotProduct,2,
 func_72431_c,crossProduct,2,Returns a new vector with the result of this vector x the specified vector.
@@ -1079,6 +1081,7 @@ func_72442_b,rotateAroundY,2,Rotates the vector around the y axis by the specifi
 func_72443_a,createVectorHelper,2,"Static method for creating a new Vec3D given the three x,y,z values. This is only called from the other static method which creates and places it in the list."
 func_72444_a,subtract,2,Returns a new vector with the result of the specified vector minus this.
 func_72445_d,squareDistanceTo,2,"The square of the Euclidean distance between this and the vector of x,y,z components passed in."
+func_72446_c,rotateAroundZ,2,Rotates the vector around the z axis by the specified angle.
 func_72452_a,handleRemoveEntityEffect,2,Handle a remove entity effect packet.
 func_72453_a,handleMapChunks,2,
 func_72454_a,handleBlockEvent,2,
@@ -1243,6 +1246,7 @@ func_72713_a,renderEntities,2,"Renders all entities within range and within the
 func_72714_a,renderSky,2,Renders the sky with the partial tick time. Args: partialTickTime
 func_72715_a,drawOutlinedBoundingBox,2,Draws lines for the edges of the bounding box.
 func_72716_a,updateRenderers,2,Updates some of the renderers sorted by distance from the player
+func_72717_a,drawBlockDamageTexture,2,
 func_72718_b,renderClouds,2,
 func_72719_a,sortAndRender,2,"Sorts all renderers based on the passed in entity. Args: entityLiving, renderPass, partialTickTime"
 func_72720_a,checkOcclusionQueryResult,2,
@@ -1621,7 +1625,7 @@ func_73703_b,saveToFile,2,par1: include header
 func_73704_a,isBanned,2,
 func_73705_d,removeExpiredBans,2,
 func_73706_a,put,2,
-func_73707_e,loadBanList,2,"loads the ban list from the file (adds every entry, does not clear the current list)"
+func_73707_e,loadBanList,2,"Loads the ban list from the file (adds every entry, does not clear the current list)."
 func_73708_a,setListActive,2,
 func_73709_b,remove,2,
 func_73710_b,isListActive,2,
@@ -1645,6 +1649,9 @@ func_73738_a,getHoverState,2,"Returns 0 if the button is disabled, 1 if the mous
 func_73739_b,mouseDragged,2,Fired when the mouse button is dragged. Equivalent of MouseListener.mouseDragged(MouseEvent e).
 func_73740_a,mouseReleased,2,Fired when the mouse button is released. Equivalent of MouseListener.mouseReleased(MouseEvent e).
 func_73753_a,returnEnumOptions,2,
+func_73759_c,deleteChatLine,2,finds and deletes a Chat line by ID
+func_73763_a,printChatMessageWithOptionalDeletion,2,"prints the String to Chat. If the ID is not 0, deletes an existing Chat Line of that ID from the GUI"
+func_73765_a,printChatMessage,2,takes a String and prints it to chat
 func_73773_a,draw,2,
 func_73774_a,update,2,
 func_73777_b,deleteFromCursor,2,"delete the selected text, otherwsie deletes characters from either side of the cursor. params: delete num"
@@ -1672,12 +1679,14 @@ func_73805_d,setCanLoseFocus,2,if true the textbox can lose focus by clicking el
 func_73806_l,isFocused,2,getter for the focused field
 func_73807_c,getSelectedtext,2,@return returns the text between the cursor and selectionEnd
 func_73808_g,getMaxStringLength,2,returns the maximum number of character that can be contained in this textbox
+func_73827_b,getChatGUI,2,"returns a pointer to the persistant Chat GUI, containing all previous chat messages and such"
 func_73828_d,renderBossHealth,2,Renders dragon's (boss) health on the HUD
 func_73829_a,renderVignette,2,"Renders the vignette. Args: vignetteBrightness, width, height"
 func_73830_a,renderGameOverlay,2,"Render the ingame overlay with quick icon bar, ..."
 func_73831_a,updateTick,2,The update tick for the ingame UI
 func_73832_a,renderInventorySlot,2,"Renders the specified item of the inventory slot at the specified location. Args: slot, x, y, partialTick"
 func_73833_a,setRecordPlayingMessage,2,
+func_73834_c,getUpdateCounter,2,
 func_73835_b,renderPortalOverlay,2,"Renders the portal overlay. Args: portalStrength, width, height"
 func_73836_a,renderPumpkinBlur,2,
 func_73846_a,queueTakenAchievement,2,Queue a taken achievement to be displayed.
@@ -1771,6 +1780,7 @@ func_74229_i,getInventory,2,Returns the creative inventory
 func_74252_a,setNetClientHandler,2,Sets the NetClientHandler.
 func_74253_d,getNetClientHandler,2,Gets the NetClientHandler.
 func_74255_a,spawnNewServerThread,2,
+func_74257_b,isCancelled,2,
 func_74275_a,updateTimer,2,Updates all fields of the Timer using the current time
 func_74291_a,saveScreenshot,2,Takes a screenshot and saves it to the screenshots directory. Returns the filename of the screenshot.
 func_74296_a,getOptionFloatValue,2,
@@ -1844,6 +1854,9 @@ func_74527_f,createDirectIntBuffer,2,Creates and returns a direct int buffer wit
 func_74528_a,generateTextureNames,2,Generates texture names and stores them in the specified buffer.
 func_74529_h,createDirectFloatBuffer,2,Creates and returns a direct float buffer with the specified capacity. Applies native ordering to speed up access.
 func_74535_a,formatString,2,Formats the strings based on 'IStatStringFormat' interface.
+func_74538_a,getChatLineString,2,
+func_74539_c,getChatLineID,2,
+func_74540_b,getUpdatedCounter,2,
 func_74544_j,escapedStringChar,2,
 func_74545_d,aJsonValue,2,
 func_74546_g,possibleExponent,2,
@@ -2966,6 +2979,7 @@ func_77273_a,getCenterXPos,2,
 func_77274_b,getCenterZPosition,2,
 func_77278_a,doExplosionA,2,Does the first part of the explosion (destroy blocks)
 func_77279_a,doExplosionB,2,"Does the second part of the explosion (sound, particles, drop spawn)"
+func_77292_e,getSelectedTexturePack,2,
 func_77293_d,availableTexturePacks,2,Returns a list of the available texture packs.
 func_77294_a,setTexturePack,2,"Sets the new TexturePack to be used, returning true if it has actually changed, false if nothing changed."
 func_77296_a,requestDownloadOfTexture,2,filename must end in .zip
@@ -3034,6 +3048,7 @@ func_77474_a,initializeTextures,2,Initializes the texture constants to be used w
 func_77475_a,setLightmapTextureCoords,2,Sets the current coordinates of the given lightmap texture
 func_77479_a,setGrassBiomeColorizer,2,
 func_77480_a,getGrassColor,2,"Gets grass color from temperature and humidity. Args: temperature, humidity"
+func_77484_a,getWorldEntitiesAsString,2,
 func_77489_c,updateLastSeen,2,Updates the time this LanServer was last seen.
 func_77493_a,calculateModifier,2,Generic method use to calculate modifiers of offensive or defensive enchantment values.
 func_77501_a,getRespiration,2,Returns the 'Water Breathing' modifier of enchantments on player equipped armors.
@@ -3461,9 +3476,18 @@ func_78794_c,postRender,2,Allows the changing of Angles after a box has been ren
 func_78814_a,getNextComponent,2,
 func_78815_a,getRandomComponent,2,
 func_78817_b,getNextMineShaftComponent,2,
+func_78836_a,getNBTCompound,2,"Returns an NBTTagCompound with the server's name, IP and maybe acceptTextures."
 func_78837_a,getServerDataFromNBTCompound,2,"Takes an NBTTagCompound with 'name' and 'ip' keys, returns a ServerData instance."
 func_78838_a,setAcceptsTextures,2,
 func_78839_b,getAcceptsTextures,2,
+func_78849_a,addServerData,2,Adds the given ServerData instance to the list.
+func_78850_a,getServerData,2,Gets the ServerData instance stored for the given index in the list.
+func_78851_b,removeServerData,2,Removes the ServerData instance stored for the given index in the list.
+func_78853_a,loadServerList,2,"Loads a list of servers from servers.dat, by running ServerData.getServerDataFromNBTCompound on each NBT compound found in the ""servers"" tag list."
+func_78854_a,setServer,2,Sets the given index in the list to the given ServerData instance.
+func_78855_b,saveServerList,2,"Runs getNBTCompound on each ServerData instance, puts everything into a ""servers"" NBT list and writes it to servers.dat."
+func_78856_c,countServers,2,Counts the number of ServerData instances in the list.
+func_78857_a,swapServers,2,"Takes two list indexes, and swaps their order around."
 func_78861_a,getIP,2,
 func_78862_a,parseIntWithDefault,2,
 func_78864_b,getPort,2,
diff --git a/eclipse/FML-Client/.classpath b/eclipse/FML-Client/.classpath
index d4985f08de..f7f31e9e32 100644
--- a/eclipse/FML-Client/.classpath
+++ b/eclipse/FML-Client/.classpath
@@ -24,6 +24,6 @@
 	<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/asm-debug-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
+	<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/common/net/minecraft/server/MinecraftServer.java.patch
similarity index 74%
rename from patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
rename to patches/common/net/minecraft/server/MinecraftServer.java.patch
index c18a9bd698..3eb6631fa4 100644
--- a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
+++ b/patches/common/net/minecraft/server/MinecraftServer.java.patch
@@ -1,23 +1,19 @@
---- ../src-base/minecraft_server/net/minecraft/server/MinecraftServer.java
-+++ ../src-work/minecraft_server/net/minecraft/server/MinecraftServer.java
-@@ -11,6 +11,11 @@
+--- ../src-base/common/net/minecraft/server/MinecraftServer.java
++++ ../src-work/common/net/minecraft/server/MinecraftServer.java
+@@ -13,6 +13,9 @@
  import java.util.List;
  import java.util.logging.Level;
  import java.util.logging.Logger;
-+
 +import cpw.mods.fml.common.FMLCommonHandler;
 +import cpw.mods.fml.relauncher.ArgsWrapper;
 +import cpw.mods.fml.relauncher.FMLRelauncher;
-+import cpw.mods.fml.server.FMLServerHandler;
  import net.minecraft.src.AnvilSaveConverter;
  import net.minecraft.src.AxisAlignedBB;
  import net.minecraft.src.CallableIsServerModded;
-@@ -351,8 +356,12 @@
+@@ -362,8 +365,10 @@
      {
          try
          {
-+            FMLServerHandler.instance().beginServerLoading(this);
-+            FMLServerHandler.instance().finishServerLoading();
 +            FMLCommonHandler.instance().handleServerStarting(this);
              if (this.func_71197_b())
              {
@@ -25,7 +21,7 @@
                  long var1 = System.currentTimeMillis();
  
                  for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
-@@ -392,6 +401,7 @@
+@@ -403,6 +408,7 @@
  
                      Thread.sleep(1L);
                  }
@@ -33,12 +29,13 @@
              }
              else
              {
-@@ -580,6 +590,11 @@
- 
+@@ -593,6 +599,12 @@
+     @SideOnly(Side.SERVER)
      public static void main(String[] p_main_0_)
      {
 +        FMLRelauncher.handleServerRelaunch(new ArgsWrapper(p_main_0_));
 +    }
++    @SideOnly(Side.SERVER)
 +    public static void fmlReentry(ArgsWrapper wrap)
 +    {
 +        String[] p_main_0_ = wrap.args;
diff --git a/patches/minecraft/net/minecraft/src/ServerConfigurationManager.java.patch b/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch
similarity index 72%
rename from patches/minecraft/net/minecraft/src/ServerConfigurationManager.java.patch
rename to patches/common/net/minecraft/src/ServerConfigurationManager.java.patch
index 8d4e317508..43721e8c0d 100644
--- a/patches/minecraft/net/minecraft/src/ServerConfigurationManager.java.patch
+++ b/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch
@@ -1,6 +1,6 @@
---- ../src-base/minecraft/net/minecraft/src/ServerConfigurationManager.java
-+++ ../src-work/minecraft/net/minecraft/src/ServerConfigurationManager.java
-@@ -9,6 +9,9 @@
+--- ../src-base/common/net/minecraft/src/ServerConfigurationManager.java
++++ ../src-work/common/net/minecraft/src/ServerConfigurationManager.java
+@@ -11,6 +11,9 @@
  import java.util.List;
  import java.util.Set;
  import java.util.logging.Logger;
@@ -10,7 +10,7 @@
  import net.minecraft.server.MinecraftServer;
  
  public abstract class ServerConfigurationManager
-@@ -78,6 +81,7 @@
+@@ -80,6 +83,7 @@
          }
  
          p_72355_2_.func_71116_b();
diff --git a/patches/minecraft/net/minecraft/src/StringTranslate.java.patch b/patches/common/net/minecraft/src/StringTranslate.java.patch
similarity index 66%
rename from patches/minecraft/net/minecraft/src/StringTranslate.java.patch
rename to patches/common/net/minecraft/src/StringTranslate.java.patch
index 15ed00fba2..2874d4e663 100644
--- a/patches/minecraft/net/minecraft/src/StringTranslate.java.patch
+++ b/patches/common/net/minecraft/src/StringTranslate.java.patch
@@ -1,6 +1,6 @@
---- ../src-base/minecraft/net/minecraft/src/StringTranslate.java
-+++ ../src-work/minecraft/net/minecraft/src/StringTranslate.java
-@@ -7,6 +7,8 @@
+--- ../src-base/common/net/minecraft/src/StringTranslate.java
++++ ../src-work/common/net/minecraft/src/StringTranslate.java
+@@ -9,6 +9,8 @@
  import java.util.IllegalFormatException;
  import java.util.Properties;
  import java.util.TreeMap;
@@ -9,11 +9,11 @@
  
  public class StringTranslate
  {
-@@ -134,6 +136,7 @@
+@@ -136,6 +138,7 @@
              this.field_74813_d = p_74810_1_;
              this.field_74815_b = var2;
          }
 +        LanguageRegistry.instance().loadLanguageTable(this.field_74815_b, this.field_74813_d);
      }
  
-     public String func_74811_c()
+     @SideOnly(Side.CLIENT)
diff --git a/patches/minecraft/net/minecraft/src/TcpConnection.java.patch b/patches/common/net/minecraft/src/TcpConnection.java.patch
similarity index 73%
rename from patches/minecraft/net/minecraft/src/TcpConnection.java.patch
rename to patches/common/net/minecraft/src/TcpConnection.java.patch
index e7fdad6141..28d724f38d 100644
--- a/patches/minecraft/net/minecraft/src/TcpConnection.java.patch
+++ b/patches/common/net/minecraft/src/TcpConnection.java.patch
@@ -1,6 +1,6 @@
---- ../src-base/minecraft/net/minecraft/src/TcpConnection.java
-+++ ../src-work/minecraft/net/minecraft/src/TcpConnection.java
-@@ -14,6 +14,8 @@
+--- ../src-base/common/net/minecraft/src/TcpConnection.java
++++ ../src-work/common/net/minecraft/src/TcpConnection.java
+@@ -16,6 +16,8 @@
  import java.util.List;
  import java.util.concurrent.atomic.AtomicInteger;
  import javax.crypto.SecretKey;
@@ -9,7 +9,7 @@
  
  public class TcpConnection implements NetworkManager
  {
-@@ -373,6 +375,7 @@
+@@ -377,6 +379,7 @@
          if (this.field_74472_n && this.field_74473_o.isEmpty())
          {
              this.field_74485_r.func_72515_a(this.field_74481_v, this.field_74480_w);
diff --git a/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/patches/common/net/minecraft/src/TileEntityFurnace.java.patch
similarity index 86%
rename from patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch
rename to patches/common/net/minecraft/src/TileEntityFurnace.java.patch
index 832e5b9041..323ad686f2 100644
--- a/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch
+++ b/patches/common/net/minecraft/src/TileEntityFurnace.java.patch
@@ -1,13 +1,13 @@
---- ../src-base/minecraft/net/minecraft/src/TileEntityFurnace.java
-+++ ../src-work/minecraft/net/minecraft/src/TileEntityFurnace.java
+--- ../src-base/common/net/minecraft/src/TileEntityFurnace.java
++++ ../src-work/common/net/minecraft/src/TileEntityFurnace.java
 @@ -1,4 +1,6 @@
  package net.minecraft.src;
 +
 +import cpw.mods.fml.common.registry.GameRegistry;
  
- public class TileEntityFurnace extends TileEntity implements IInventory
- {
-@@ -268,8 +270,15 @@
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+@@ -273,8 +275,15 @@
                      return 300;
                  }
              }
diff --git a/patches/minecraft/net/minecraft/src/World.java.patch b/patches/common/net/minecraft/src/World.java.patch
similarity index 63%
rename from patches/minecraft/net/minecraft/src/World.java.patch
rename to patches/common/net/minecraft/src/World.java.patch
index 4b759defc3..c1a7aa60cf 100644
--- a/patches/minecraft/net/minecraft/src/World.java.patch
+++ b/patches/common/net/minecraft/src/World.java.patch
@@ -1,7 +1,7 @@
---- ../src-base/minecraft/net/minecraft/src/World.java
-+++ ../src-work/minecraft/net/minecraft/src/World.java
-@@ -3350,7 +3350,7 @@
- 
+--- ../src-base/common/net/minecraft/src/World.java
++++ ../src-work/common/net/minecraft/src/World.java
+@@ -3375,7 +3375,7 @@
+     @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {
 -        return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
diff --git a/patches/minecraft/net/minecraft/src/WorldProvider.java.patch b/patches/common/net/minecraft/src/WorldProvider.java.patch
similarity index 86%
rename from patches/minecraft/net/minecraft/src/WorldProvider.java.patch
rename to patches/common/net/minecraft/src/WorldProvider.java.patch
index d17bb64cbf..db9af1c6cb 100644
--- a/patches/minecraft/net/minecraft/src/WorldProvider.java.patch
+++ b/patches/common/net/minecraft/src/WorldProvider.java.patch
@@ -1,6 +1,6 @@
---- ../src-base/minecraft/net/minecraft/src/WorldProvider.java
-+++ ../src-work/minecraft/net/minecraft/src/WorldProvider.java
-@@ -32,19 +32,12 @@
+--- ../src-base/common/net/minecraft/src/WorldProvider.java
++++ ../src-work/common/net/minecraft/src/WorldProvider.java
+@@ -35,19 +35,12 @@
  
      protected void func_76572_b()
      {
@@ -22,7 +22,7 @@
      }
  
      public boolean func_76566_a(int p_76566_1_, int p_76566_2_)
-@@ -157,17 +150,17 @@
+@@ -165,19 +158,19 @@
  
      public int func_76557_i()
      {
@@ -30,16 +30,18 @@
 +        return this.field_76577_b.getMinimumSpawnHeight(this.field_76579_a);
      }
  
+     @SideOnly(Side.CLIENT)
      public boolean func_76564_j()
      {
 -        return this.field_76577_b != WorldType.field_77138_c && !this.field_76576_e;
 +        return this.field_76577_b.hasVoidParticles(this.field_76576_e);
      }
  
+     @SideOnly(Side.CLIENT)
      public double func_76565_k()
      {
 -        return this.field_76577_b == WorldType.field_77138_c ? 1.0D : 0.03125D;
 +        return this.field_76577_b.voidFadeMagnitude();
      }
  
-     public boolean func_76568_b(int p_76568_1_, int p_76568_2_)
+     @SideOnly(Side.CLIENT)
diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
deleted file mode 100644
index ee566e1967..0000000000
--- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
-+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
-@@ -11,6 +11,8 @@
- import java.util.List;
- import java.util.logging.Level;
- import java.util.logging.Logger;
-+
-+import cpw.mods.fml.common.FMLCommonHandler;
- import net.minecraft.src.AnvilSaveConverter;
- import net.minecraft.src.AxisAlignedBB;
- import net.minecraft.src.CallableIsServerModded;
-@@ -354,8 +356,10 @@
-     {
-         try
-         {
-+            FMLCommonHandler.instance().handleServerStarting(this);
-             if (this.func_71197_b())
-             {
-+                FMLCommonHandler.instance().handleServerStarted();
-                 long var1 = System.currentTimeMillis();
- 
-                 for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
-@@ -395,6 +399,7 @@
- 
-                     Thread.sleep(1L);
-                 }
-+                FMLCommonHandler.instance().handleServerStopping();
-             }
-             else
-             {
diff --git a/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
deleted file mode 100644
index a4e1a11989..0000000000
--- a/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../src-base/minecraft/net/minecraft/src/EntityPlayer.java
-+++ ../src-work/minecraft/net/minecraft/src/EntityPlayer.java
-@@ -2,6 +2,8 @@
- 
- import java.util.Iterator;
- import java.util.List;
-+
-+import cpw.mods.fml.common.network.FMLNetworkHandler;
- 
- public abstract class EntityPlayer extends EntityLiving implements ICommandSender
- {
-@@ -1593,4 +1595,10 @@
-     {
-         return this.field_71078_a;
-     }
-+    
-+    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)
-+    {
-+        FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
-+    }
-+
- }
diff --git a/patches/minecraft/net/minecraft/src/WorldType.java.patch b/patches/minecraft/net/minecraft/src/WorldType.java.patch
deleted file mode 100644
index 9d98bf0955..0000000000
--- a/patches/minecraft/net/minecraft/src/WorldType.java.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- ../src-base/minecraft/net/minecraft/src/WorldType.java
-+++ ../src-work/minecraft/net/minecraft/src/WorldType.java
-@@ -1,7 +1,20 @@
- package net.minecraft.src;
-+
-+import java.util.Arrays;
-+import java.util.List;
-+import java.util.Random;
-+import java.util.Set;
-+
-+import com.google.common.base.Objects;
-+import com.google.common.collect.Lists;
-+import com.google.common.collect.ObjectArrays;
-+import com.google.common.collect.Sets;
- 
- public class WorldType
- {
-+    public static final BiomeGenBase[] base11Biomes = new BiomeGenBase[] {BiomeGenBase.field_76769_d, BiomeGenBase.field_76767_f, BiomeGenBase.field_76770_e, BiomeGenBase.field_76780_h, BiomeGenBase.field_76772_c, BiomeGenBase.field_76768_g};
-+    public static final BiomeGenBase[] base12Biomes = ObjectArrays.concat(base11Biomes, BiomeGenBase.field_76782_w);
-+
-     public static final WorldType[] field_77139_a = new WorldType[16];
-     public static final WorldType field_77137_b = (new WorldType(0, "default", 1)).func_77129_f();
-     public static final WorldType field_77138_c = new WorldType(1, "flat");
-@@ -11,6 +24,9 @@
-     private final int field_77134_g;
-     private boolean field_77140_h;
-     private boolean field_77141_i;
-+
-+    protected BiomeGenBase[] biomesForWorldType;
-+
- 
-     private WorldType(int p_i3737_1_, String p_i3737_2_)
-     {
-@@ -23,6 +39,14 @@
-         this.field_77134_g = p_i3738_3_;
-         this.field_77140_h = true;
-         field_77139_a[p_i3738_1_] = this;
-+        switch (p_i3738_1_)
-+        {
-+        case 8:
-+            biomesForWorldType = base11Biomes;
-+            break;
-+        default:
-+            biomesForWorldType = base12Biomes;
-+        }
-     }
- 
-     public String func_77127_a()
-@@ -84,4 +108,63 @@
- 
-         return null;
-     }
-+
-+    public WorldChunkManager getChunkManager(World world)
-+    {
-+        return this == field_77138_c ? new WorldChunkManagerHell(BiomeGenBase.field_76772_c, 0.5F, 0.5F) : new WorldChunkManager(world);
-+    }
-+
-+    public IChunkProvider getChunkGenerator(World world)
-+    {
-+        return (this == field_77138_c ? new ChunkProviderFlat(world, world.func_72905_C(), world.func_72912_H().func_76089_r()) : new ChunkProviderGenerate(world, world.func_72905_C(), world.func_72912_H().func_76089_r()));
-+    }
-+
-+    public int getMinimumSpawnHeight(World world)
-+    {
-+        return this == field_77138_c ? 4 : 64;
-+    }
-+
-+    public double getHorizon(World world)
-+    {
-+        return this == field_77138_c ? 0.0D : 63.0D;
-+    }
-+
-+    public boolean hasVoidParticles(boolean var1)
-+    {
-+        return this != field_77138_c && !var1;
-+    }
-+
-+    public double voidFadeMagnitude()
-+    {
-+        return this == field_77138_c ? 1.0D : 0.03125D;
-+    }
-+
-+    public BiomeGenBase[] getBiomesForWorldType() {
-+        return biomesForWorldType;
-+    }
-+
-+    public void addNewBiome(BiomeGenBase biome)
-+    {
-+        Set<BiomeGenBase> newBiomesForWorld = Sets.newIdentityHashSet();
-+        newBiomesForWorld.addAll(Arrays.asList(biomesForWorldType));
-+        newBiomesForWorld.add(biome);
-+        biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
-+    }
-+
-+    public void removeBiome(BiomeGenBase biome)
-+    {
-+        Set<BiomeGenBase> newBiomesForWorld = Sets.newIdentityHashSet();
-+        newBiomesForWorld.addAll(Arrays.asList(biomesForWorldType));
-+        newBiomesForWorld.remove(biome);
-+        biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
-+    }
-+
-+    public boolean handleSlimeSpawnReduction(Random random, World world)
-+    {
-+        return this == field_77138_c ? random.nextInt(4) != 1 : false;
-+    }
-+    /**
-+     * Called when 'Create New World' button is pressed before starting game
-+     */
-+    public void onGUICreateWorldPress() { }
- }
diff --git a/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
deleted file mode 100644
index e061a9f510..0000000000
--- a/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/EntityPlayer.java
-+++ ../src-work/minecraft_server/net/minecraft/src/EntityPlayer.java
-@@ -2,6 +2,8 @@
- 
- import java.util.Iterator;
- import java.util.List;
-+
-+import cpw.mods.fml.common.network.FMLNetworkHandler;
- 
- public abstract class EntityPlayer extends EntityLiving implements ICommandSender
- {
-@@ -1480,4 +1482,9 @@
-     {
-         return this.field_71078_a;
-     }
-+
-+    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)
-+    {
-+        FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
-+    }
- }
diff --git a/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch b/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
deleted file mode 100644
index 76c555639b..0000000000
--- a/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/ServerConfigurationManager.java
-+++ ../src-work/minecraft_server/net/minecraft/src/ServerConfigurationManager.java
-@@ -9,6 +9,8 @@
- import java.util.List;
- import java.util.Set;
- import java.util.logging.Logger;
-+
-+import cpw.mods.fml.common.network.FMLNetworkHandler;
- import net.minecraft.server.MinecraftServer;
- 
- public abstract class ServerConfigurationManager
-@@ -54,6 +56,7 @@
-         ChunkCoordinates var5 = var4.func_72861_E();
-         this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, var4);
-         NetServerHandler var6 = new NetServerHandler(this.field_72400_f, p_72355_1_, p_72355_2_);
-+        FMLNetworkHandler.handlePlayerLogin(p_72355_2_, var6, p_72355_1_);
-         var6.func_72567_b(new Packet1Login(p_72355_2_.field_70157_k, var4.func_72912_H().func_76067_t(), p_72355_2_.field_71134_c.func_73081_b(), var4.func_72912_H().func_76093_s(), var4.field_73011_w.field_76574_g, var4.field_73013_u, var4.func_72800_K(), this.func_72352_l()));
-         var6.func_72567_b(new Packet6SpawnPosition(var5.field_71574_a, var5.field_71572_b, var5.field_71573_c));
-         var6.func_72567_b(new Packet202PlayerAbilities(p_72355_2_.field_71075_bZ));
diff --git a/patches/minecraft_server/net/minecraft/src/StringTranslate.java.patch b/patches/minecraft_server/net/minecraft/src/StringTranslate.java.patch
deleted file mode 100644
index 63dd37928c..0000000000
--- a/patches/minecraft_server/net/minecraft/src/StringTranslate.java.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/StringTranslate.java
-+++ ../src-work/minecraft_server/net/minecraft/src/StringTranslate.java
-@@ -7,6 +7,8 @@
- import java.util.IllegalFormatException;
- import java.util.Properties;
- import java.util.TreeMap;
-+
-+import cpw.mods.fml.common.registry.LanguageRegistry;
- 
- public class StringTranslate
- {
-@@ -134,6 +136,7 @@
-             this.field_74813_d = p_74810_1_;
-             this.field_74815_b = var2;
-         }
-+        LanguageRegistry.instance().loadLanguageTable(this.field_74815_b, this.field_74813_d);
-     }
- 
-     public String func_74805_b(String p_74805_1_)
diff --git a/patches/minecraft_server/net/minecraft/src/TcpConnection.java.patch b/patches/minecraft_server/net/minecraft/src/TcpConnection.java.patch
deleted file mode 100644
index 91a1da4542..0000000000
--- a/patches/minecraft_server/net/minecraft/src/TcpConnection.java.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/TcpConnection.java
-+++ ../src-work/minecraft_server/net/minecraft/src/TcpConnection.java
-@@ -14,6 +14,8 @@
- import java.util.List;
- import java.util.concurrent.atomic.AtomicInteger;
- import javax.crypto.SecretKey;
-+
-+import cpw.mods.fml.common.network.FMLNetworkHandler;
- 
- public class TcpConnection implements NetworkManager
- {
-@@ -345,6 +347,7 @@
-         if (this.field_74472_n && this.field_74473_o.isEmpty())
-         {
-             this.field_74485_r.func_72515_a(this.field_74481_v, this.field_74480_w);
-+            FMLNetworkHandler.onConnectionClosed(this);
-         }
-     }
- 
diff --git a/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
deleted file mode 100644
index 11517a9fda..0000000000
--- a/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/TileEntityFurnace.java
-+++ ../src-work/minecraft_server/net/minecraft/src/TileEntityFurnace.java
-@@ -1,4 +1,6 @@
- package net.minecraft.src;
-+
-+import cpw.mods.fml.common.registry.GameRegistry;
- 
- public class TileEntityFurnace extends TileEntity implements IInventory
- {
-@@ -254,7 +256,15 @@
-                 }
-             }
- 
--            return var2 instanceof ItemTool && ((ItemTool)var2).func_77861_e().equals("WOOD") ? 200 : (var2 instanceof ItemSword && ((ItemSword)var2).func_77825_f().equals("WOOD") ? 200 : (var2 instanceof ItemHoe && ((ItemHoe)var2).func_77842_f().equals("WOOD") ? 200 : (var1 == Item.field_77669_D.field_77779_bT ? 100 : (var1 == Item.field_77705_m.field_77779_bT ? 1600 : (var1 == Item.field_77775_ay.field_77779_bT ? 20000 : (var1 == Block.field_71987_y.field_71990_ca ? 100 : (var1 == Item.field_77731_bo.field_77779_bT ? 2400 : 0)))))));
-+            if (var2 instanceof ItemTool && ((ItemTool) var2).func_77861_e().equals("WOOD")) return 200;
-+            if (var2 instanceof ItemSword && ((ItemSword) var2).func_77825_f().equals("WOOD")) return 200;
-+            if (var2 instanceof ItemHoe && ((ItemHoe) var2).func_77842_f().equals("WOOD")) return 200;
-+            if (var1 == Item.field_77669_D.field_77779_bT) return 100;
-+            if (var1 == Item.field_77705_m.field_77779_bT) return 1600;
-+            if (var1 == Item.field_77775_ay.field_77779_bT) return 20000;
-+            if (var1 == Block.field_71987_y.field_71990_ca) return 100;
-+            if (var1 == Item.field_77731_bo.field_77779_bT) return 2400;
-+            return GameRegistry.getFuelValue(p_70398_0_);
-         }
-     }
- 
diff --git a/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch b/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
deleted file mode 100644
index 9da2c69190..0000000000
--- a/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/WorldProvider.java
-+++ ../src-work/minecraft_server/net/minecraft/src/WorldProvider.java
-@@ -32,19 +32,12 @@
- 
-     protected void func_76572_b()
-     {
--        if (this.field_76579_a.func_72912_H().func_76067_t() == WorldType.field_77138_c)
--        {
--            this.field_76578_c = new WorldChunkManagerHell(BiomeGenBase.field_76772_c, 0.5F, 0.5F);
--        }
--        else
--        {
--            this.field_76578_c = new WorldChunkManager(this.field_76579_a);
--        }
-+        this.field_76578_c = this.field_76577_b.getChunkManager(this.field_76579_a);
-     }
- 
-     public IChunkProvider func_76555_c()
-     {
--        return (IChunkProvider)(this.field_76577_b == WorldType.field_77138_c ? new ChunkProviderFlat(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r()) : new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r()));
-+        return this.field_76577_b.getChunkGenerator(this.field_76579_a);
-     }
- 
-     public boolean func_76566_a(int p_76566_1_, int p_76566_2_)
-@@ -96,6 +89,6 @@
- 
-     public int func_76557_i()
-     {
--        return this.field_76577_b == WorldType.field_77138_c ? 4 : 64;
-+        return this.field_76577_b.getMinimumSpawnHeight(this.field_76579_a);
-     }
- }
diff --git a/patches/minecraft_server/net/minecraft/src/WorldType.java.patch b/patches/minecraft_server/net/minecraft/src/WorldType.java.patch
deleted file mode 100644
index 6a81c83586..0000000000
--- a/patches/minecraft_server/net/minecraft/src/WorldType.java.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- ../src-base/minecraft_server/net/minecraft/src/WorldType.java
-+++ ../src-work/minecraft_server/net/minecraft/src/WorldType.java
-@@ -1,7 +1,19 @@
- package net.minecraft.src;
-+
-+import java.util.Arrays;
-+import java.util.List;
-+import java.util.Random;
-+import java.util.Set;
-+
-+import com.google.common.base.Objects;
-+import com.google.common.collect.Lists;
-+import com.google.common.collect.ObjectArrays;
-+import com.google.common.collect.Sets;
- 
- public class WorldType
- {
-+    public static final BiomeGenBase[] base11Biomes = new BiomeGenBase[] {BiomeGenBase.field_76769_d, BiomeGenBase.field_76767_f, BiomeGenBase.field_76770_e, BiomeGenBase.field_76780_h, BiomeGenBase.field_76772_c, BiomeGenBase.field_76768_g};
-+    public static final BiomeGenBase[] base12Biomes = ObjectArrays.concat(base11Biomes, BiomeGenBase.field_76782_w);
-     public static final WorldType[] field_77139_a = new WorldType[16];
-     public static final WorldType field_77137_b = (new WorldType(0, "default", 1)).func_77129_f();
-     public static final WorldType field_77138_c = new WorldType(1, "flat");
-@@ -11,6 +23,9 @@
-     private final int field_77134_g;
-     private boolean field_77140_h;
-     private boolean field_77141_i;
-+
-+    protected BiomeGenBase[] biomesForWorldType;
-+
- 
-     private WorldType(int p_i3737_1_, String p_i3737_2_)
-     {
-@@ -23,6 +38,14 @@
-         this.field_77134_g = p_i3738_3_;
-         this.field_77140_h = true;
-         field_77139_a[p_i3738_1_] = this;
-+        switch (p_i3738_1_)
-+        {
-+        case 8:
-+            biomesForWorldType = base11Biomes;
-+            break;
-+        default:
-+            biomesForWorldType = base12Biomes;
-+        }
-     }
- 
-     public String func_77127_a()
-@@ -74,4 +97,63 @@
- 
-         return null;
-     }
-+
-+    public WorldChunkManager getChunkManager(World world)
-+    {
-+        return this == field_77138_c ? new WorldChunkManagerHell(BiomeGenBase.field_76772_c, 0.5F, 0.5F) : new WorldChunkManager(world);
-+    }
-+
-+    public IChunkProvider getChunkGenerator(World world)
-+    {
-+        return (this == field_77138_c ? new ChunkProviderFlat(world, world.func_72905_C(), world.func_72912_H().func_76089_r()) : new ChunkProviderGenerate(world, world.func_72905_C(), world.func_72912_H().func_76089_r()));
-+    }
-+
-+    public int getMinimumSpawnHeight(World world)
-+    {
-+        return this == field_77138_c ? 4 : 64;
-+    }
-+
-+    public double getHorizon(World world)
-+    {
-+        return this == field_77138_c ? 0.0D : 63.0D;
-+    }
-+
-+    public boolean hasVoidParticles(boolean var1)
-+    {
-+        return this != field_77138_c && !var1;
-+    }
-+
-+    public double voidFadeMagnitude()
-+    {
-+        return this == field_77138_c ? 1.0D : 0.03125D;
-+    }
-+
-+    public BiomeGenBase[] getBiomesForWorldType() {
-+        return biomesForWorldType;
-+    }
-+
-+    public void addNewBiome(BiomeGenBase biome)
-+    {
-+        Set<BiomeGenBase> newBiomesForWorld = Sets.newIdentityHashSet();
-+        newBiomesForWorld.addAll(Arrays.asList(biomesForWorldType));
-+        newBiomesForWorld.add(biome);
-+        biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
-+    }
-+
-+    public void removeBiome(BiomeGenBase biome)
-+    {
-+        Set<BiomeGenBase> newBiomesForWorld = Sets.newIdentityHashSet();
-+        newBiomesForWorld.addAll(Arrays.asList(biomesForWorldType));
-+        newBiomesForWorld.remove(biome);
-+        biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
-+    }
-+
-+    public boolean handleSlimeSpawnReduction(Random random, World world)
-+    {
-+        return this == field_77138_c ? random.nextInt(4) != 1 : false;
-+    }
-+    /**
-+     * Called when 'Create New World' button is pressed before starting game
-+     */
-+    public void onGUICreateWorldPress() { }
- }