diff --git a/forge/conf/fields.csv b/forge/conf/fields.csv
index a8f3c8230..e1e7c8aae 100644
--- a/forge/conf/fields.csv
+++ b/forge/conf/fields.csv
@@ -61,7 +61,7 @@ field_1099_b,recipeItems,0,
 field_1100_a,recipePatterns,0,
 field_1102_a,mc,0,A reference to the Minecraft object.
 field_1103_d,connectingGui,0,A reference to the GuiConnecting object.
-field_1104_c,port,0,A reference to the Minecraft object.
+field_1104_c,port,0,The port used to connect.
 field_1105_b,valueEntry,0,The object stored in this entry
 field_1106_a,hashEntry,0,The hash code of this entry
 field_1107_d,slotHash,0,The id of the hash slot computed from the hash
@@ -76,7 +76,7 @@ field_1116_d,cursor,0,
 field_1117_c,windowComponent,0,
 field_1118_b,inventory,0,The inventory we want to extract a slot from.
 field_1119_a,slotIndex,0,The index of the slot in the inventory.
-field_1123_d,inventory,0,The inventory we want to extract a slot from.
+field_1123_d,parent,0,"The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner class."
 field_1124_c,armorType,0,"The armor type that can be placed on that slot, it uses the same values of armorType field on ItemArmor."
 field_1125_c,craftMatrix,0,The craft matrix inventory linked to this result slot.
 field_1126_b,iconIndex,0,
@@ -122,6 +122,7 @@ field_1189_d,permutations,0,
 field_1190_c,zCoord,0,
 field_1191_b,octaves,0,
 field_1192_a,generatorCollection,0,Collection of noise generation functions.  Output is combined to produce different octaves of noise.
+field_1193_a,osValues,0,List of OS values in ordinal form.
 field_1194_b,nVertices,0,
 field_1195_a,vertexPositions,0,
 field_1196_c,invertNormal,0,
@@ -465,9 +466,9 @@ field_1615_a,stackSize,0,Size of the stack.
 field_1616_d,itemDamage,0,Damage dealt to the item or number of use. Raise when using items.
 field_1617_c,itemID,0,ID of the item.
 field_1618_c,windowId,0,
-field_1619_b,craftResult,0,The crafting result.
+field_1619_b,craftResult,0,
 field_1620_a,craftMatrix,0,The crafting matrix inventory.
-field_1621_b,craftResult,0,"The crafting result, size 1."
+field_1621_b,craftResult,0,
 field_1622_a,craftMatrix,0,The crafting matrix inventory (3x3).
 field_1623_z,sizeX,0,
 field_1624_y,title,0,Painting Title.
@@ -644,6 +645,7 @@ field_20079_i,enumOptions,0,
 field_20083_l,allowedCharacters,0,This String is just a local copy of the characters allowed in text rendering of minecraft.
 field_20097_i,bipedCloak,0,
 field_20098_h,bipedEars,0,
+field_20099_f,equippedItemSlot,0,"The index of the currently held item (0-8, or -1 if not yet updated)"
 field_200_e,random,0,The RNG used in RenderItem (for bobbing itemstacks on the ground)
 field_20105_z,RENDER_DISTANCES,0,
 field_20106_A,DIFFICULTIES,0,
@@ -781,10 +783,10 @@ field_21908_b,playerLocation,0,The chunk coordinates of the bed the player is in
 field_219_q,shovelWood,0,
 field_22008_V,saveLoader,0,
 field_22009_h,renderViewEntity,0,"The Entity from which the renderer determines the render viewpoint. Currently is always the parent Minecraft class's 'thePlayer' instance. Modification of its location, rotation, or other settings at render time will modify the camera likewise, with the caveat of triggering chunk rebuilds as it moves, making it unsuitable for changing the viewpoint mid-render."
-field_22018_aZ,redstoneRepeater,0,Is the redstone repeater (diode) in item form.
-field_22019_aY,bed,0,Is the bed as item on the inventory.
-field_22020_bi,redstoneRepeaterActive,0,Is the redstone repeater (diode) when powered.
-field_22021_bh,redstoneRepeaterIdle,0,Is the redstone repeater (diode) when isn't powered.
+field_22018_aZ,redstoneRepeater,0,
+field_22019_aY,bed,0,
+field_22020_bi,redstoneRepeaterActive,0,
+field_22021_bh,redstoneRepeaterIdle,0,
 field_22023_b,repeaterState,0,The states in which the redstone repeater blocks can be.
 field_22024_a,repeaterTorchOffset,0,The offsets for the two torches in redstone repeater blocks.
 field_22025_c,isRepeaterPowered,0,Tells whether the repeater is powered or not
@@ -1003,10 +1005,10 @@ field_24900_bi,spawnChunk,0,Holds the last coordinate to spawn based on last bed
 field_249_L,hoeWood,0,
 field_25001_G,statFileWriter,0,Stat file writer
 field_25002_t,guiAchievement,0,Gui achievement
-field_25010_ba,cookie,0,The cookie inventory item.
+field_25010_ba,cookie,0,
 field_25013_bi,isWolfsFavoriteMeat,0,Whether wolves like this food (true for raw and cooked porkchop).
 field_25015_e,thePlayer,0,The player that is using the GUI where this slot resides.
-field_25017_bj,lockedChest,0,"Is the april fools secret locked chest, only spawn on new chunks on 1st April."
+field_25017_bj,lockedChest,0,"April fools secret locked chest, only spawns on new chunks on 1st April."
 field_25019_b,bedState,0,"Either 1 or 2. 1 indicates to begin raining, 2 indicates to stop raining."
 field_25020_a,bedChat,0,
 field_25022_a,particleScaleOverTime,0,
@@ -1154,7 +1156,7 @@ field_27061_b,childJsonNodeSelector,0,
 field_27062_a,parentJsonNodeSelector,0,
 field_27069_a,index,0,
 field_27079_v,enableRain,0,Is true (default) if the biome support rain (desert and nether can't have rain)
-field_27080_u,enableSnow,0,"If the biome have snowfall instead a rain, this field is true (tundra or taiga)"
+field_27080_u,enableSnow,0,Set to true if snow is enabled for this biome.
 field_27085_k,distanceStatType,0,
 field_27086_j,timeStatType,0,
 field_27087_i,simpleStatType,0,
@@ -1287,7 +1289,7 @@ field_278_ai,bootsDiamond,0,
 field_279_ah,legsDiamond,0,
 field_28004_R,hasCrashed,0,
 field_28005_H,hasPaidCheckTime,0,time in milliseconds when TheadCheckHasPaid determined you have not paid. 0 if you have paid. Used in GuiAchievement whether to display the nag text.
-field_28010_bb,map,0,ItemMap
+field_28010_bb,map,0,
 field_28016_bK,ignoreFrustumCheck,0,Render entity even if it is outside the camera frustum. Only true in EntityFish for now. Used in RenderGlobal: render if ignoreFrustumCheck or in frustum.
 field_28017_a,record,0,ID of record which is in Jukebox
 field_28019_h,inData,0,
@@ -1297,7 +1299,7 @@ field_28024_y,timeUntilPortal,0,
 field_28025_B,prevTimeInPortal,0,The amount of time an entity has been in a Portal the previous tick
 field_28026_A,timeInPortal,0,The amount of time an entity has been in a Portal
 field_28032_t,requiresSelfNotify,0,
-field_28033_bl,trapdoor,0,Trapdoor block.
+field_28033_bl,trapdoor,0,
 field_28035_a,random,0,
 field_28036_a,furnaceRand,0,Is the random generator used by furnace to drop the inventory contents in random directions.
 field_28037_c,keepFurnaceInventory,0,"This flag is used to prevent the furnace inventory to be dropped upon block removal, is used internally when the furnace block changes from idle to active and vice-versa."
@@ -1324,6 +1326,7 @@ field_28067_f,chunkList,0,A list of all the currently loaded chunks.
 field_28068_e,chunkMap,0,"A map of all the currently loaded chunks, uses the chunk id as the key."
 field_28069_d,chunkLoader,0,The IChunkLoader used by this ChunkProvider
 field_28070_c,chunkProvider,0,The parent IChunkProvider for this ChunkProvider.
+field_28098_a,updateTimer,0,"Timer, increases every tick."
 field_280_ag,plateDiamond,0,
 field_28108_z,mapStorage,0,
 field_28109_a,netManager,0,Reference to the NetworkManager object.
@@ -1475,10 +1478,17 @@ field_35001_ab,rightClickDelayTimer,0,"When you place a block, it's set to 6, de
 field_35024_g,boundingBox,0,
 field_35025_h,coordBaseMode,0,'switches the Coordinate System base off the Bounding Box'
 field_35026_i,componentType,0,The type ID of this component.
-field_35035_b,doorType,0,'randomly chosen opening type to use'
+field_35035_b,doorType,0,
 field_35044_a,doorType,0,
 field_35046_a,doorType,0,
+field_35048_b,expandsX,0,
+field_35049_c,expandsZ,0,
+field_35050_a,doorType,0,
 field_35054_a,doorType,0,
+field_35057_c,isLargeRoom,0,
+field_35058_a,doorType,0,
+field_35060_b,roomType,0,
+field_35061_c,chestLoot,0,
 field_35062_a,doorType,0,
 field_35064_a,doorType,0,
 field_35065_a,chidStructures,0,
@@ -1490,17 +1500,20 @@ field_35072_b,isMultipleFloors,0,
 field_35073_a,corridorDirection,0,
 field_35079_a,averageGroundLevel,0,
 field_35081_a,averageGroundLevel,0,
+field_35083_b,isRoofAccessible,0,
 field_35084_a,averageGroundLevel,0,
 field_35086_a,averageGroundLevel,0,
 field_35088_a,averageGroundLevel,0,
 field_35090_a,averageGroundLevel,0,
+field_35092_b,isTallHouse,0,
+field_35093_c,tablePosition,0,
 field_35094_a,averageGroundLevel,0,
 field_35096_a,averageGroundLevel,0,
 field_35098_a,averageGroundLevel,0,
 field_35100_a,averageGroundLevel,0,
 field_35102_a,averageGroundLevel,0,
 field_35103_b,averageGroundLevel,0,
-field_35107_d,structureVillageWeightedPieceList,0,"'Contains List of all spawnable Structure Piece Weights. If no more Pieces of a type can be spawned, they are removed from this list'"
+field_35107_d,structureVillageWeightedPieceList,0,"Contains List of all spawnable Structure Piece Weights. If no more Pieces of a type can be spawned, they are removed from this list"
 field_35109_b,terrainType,0,"World terrain type, 0 for normal, 1 for flap map"
 field_35110_c,structVillagePieceWeight,0,
 field_35111_a,worldChunkMngr,0,
@@ -1613,6 +1626,7 @@ field_35313_h,isScrolling,0,True if the scrollbar is being dragged
 field_35314_i,wasClicking,0,True if the left mouse button was held down last time drawScreen was called.
 field_35316_k,localizedGameModeText,0,The game mode text that is displayed with each world on the world selection list.
 field_35317_b,serverTextField,0,
+field_35318_c,serverListStorage,0,This GUI's instance to the server list's storage
 field_35319_a,guiScreen,0,Needed a change as a local variable was conflicting on construct
 field_35340_f,serverList,0,List of ServerNBTStorage objects
 field_35341_g,selectedServer,0,Index of the currently selected server
@@ -1624,13 +1638,16 @@ field_35346_k,deleteClicked,0,The 'Delete' button was clicked
 field_35347_h,buttonEdit,0,The 'Edit' button
 field_35348_i,buttonSelect,0,The 'Join Server' button
 field_35349_w,tempServer,0,Temporary ServerNBTStorage used by the Edit/Add/Direct Connect dialogs
+field_35350_v,lagTooltip,0,This GUI's lag tooltip text or null if no lag icon is being hovered.
 field_35351_u,directClicked,0,The 'Direct Connect' button was clicked
 field_35352_t,editClicked,0,The 'Edit' button was clicked
 field_35353_s,addClicked,0,The 'Add server' button was clicked
+field_35357_f,panoramaTimer,0,"Timer used to rotate the panorama, increases every tick."
 field_35358_g,viewportTexture,0,Texture allocated for the current viewport of the main menu's panorama background.
 field_35359_d,serverNBTStorage,0,
 field_35360_b,serverAddress,0,
 field_35361_c,serverName,0,
+field_35362_a,parentGui,0,This GUI's parent GUI.
 field_35364_f,gameMode,0,"'hardcore', 'creative' or 'survival'"
 field_35366_j,gameModeButton,0,The GUIButton that you click to change game modes.
 field_35367_k,moreWorldOptions,0,The GUIButton that you click to get to options like the seed when creating a world.
@@ -1663,6 +1680,9 @@ field_35404_c,chestKnob,0,The chest's knob in the chest model.
 field_35405_a,chestLid,0,The chest lid in the chest's model.
 field_35406_b,isAttacking,0,Is the enderman attacking an entity?
 field_35407_a,isCarrying,0,Is the enderman carrying a block?
+field_35408_l,mouseY,0,Y axis position of the mouse
+field_35409_k,mouseX,0,X axis position of the mouse
+field_35410_a,parentGui,0,Instance to the GUI this list is on.
 field_35415_bn,rottenFlesh,0,
 field_35416_bo,enderPearl,0,
 field_35417_bj,beefRaw,0,
@@ -1686,11 +1706,11 @@ field_35466_H,lightUpdateBlockList,0,"is a temporary list of blocks and light va
 field_35480_A,worldGenBigTree,0,
 field_35481_B,worldGenForest,0,
 field_35482_C,worldGenSwamp,0,
-field_35483_e,extremeHills,0,The Extreme Hills biome.
-field_35484_b,ocean,0,The ocean Biome.
-field_35485_c,plains,0,The plains Biome.
+field_35483_e,extremeHills,0,
+field_35484_b,ocean,0,
+field_35485_c,plains,0,
 field_35486_a,biomeList,0,"An array of all the biomes, indexed by biome id."
-field_35487_i,river,0,The River biome.
+field_35487_i,river,0,
 field_35488_u,biomeDecorator,0,
 field_35489_t,rainfall,0,The rainfall in this biome.
 field_35490_s,temperature,0,The temperature of this biome.
@@ -1812,7 +1832,7 @@ field_35752_c,minZ,0,The first z coordinate of a bounding box.
 field_35753_a,minX,0,The first x coordinate of a bounding box.
 field_35754_b,depthBits,0,Log base 2 of the chunk height (128); applied as a shift on Z coordinate
 field_35755_c,depthBitsPlusFour,0,Log base 2 of the chunk height (128) * width (16); applied as a shift on X coordinate
-field_35756_d,depleteBuckets,0,Used by ItemBucket to say if it should empty when used or not.
+field_35756_d,isCreativeMode,0,"Used to determine if creative mode is enabled, and therefore if items should be depleted on usage"
 field_35757_b,isFlying,0,Sets/indicates whether the player is flying.
 field_35758_c,allowFlying,0,whether or not to allow the player to fly when they double jump.
 field_35759_a,disableDamage,0,Disables player damage.
@@ -1867,7 +1887,7 @@ field_35870_b,offsetZ,0,
 field_35871_a,offsetX,0,
 field_35885_D,chunk_X,0,The X-coordinate of the chunk currently being decorated
 field_35886_E,chunk_Z,0,The Z-coordinate of the chunk currently being decorated
-field_35887_F,biome,0,The biome to generate trees for
+field_35887_F,biome,0,The biome generator object.
 field_35888_A,clayPerChunk,0,The number of clay patches to generate per chunk. Only generates when part of it is underwater.
 field_35889_B,currentWorld,0,The world the BiomeDecorator is currently decorating
 field_35890_C,randomGenerator,0,The Biome Decorator's random number generator.
@@ -1895,7 +1915,7 @@ field_35910_s,flowersPerChunk,0,"The number of yellow flower patches to generate
 field_35911_r,treesPerChunk,0,"The number of trees to attempt to generate per chunk. Up to 10 in forests, none in deserts."
 field_35912_q,cactusGen,0,Field that holds WorldGenCactus
 field_35913_p,reedGen,0,Field that holds WorldGenReed
-field_35914_z,sandPerChunk2,0,The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There appear to be two seperate fields for this.
+field_35914_z,sandPerChunk2,0,The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There appear to be two separate fields for this.
 field_35915_y,sandPerChunk,0,The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater.
 field_35916_x,cactiPerChunk,0,The number of cactus plants to generate per chunk. Cacti only work on sand.
 field_35919_q,mapFeaturesEnabled,0,are map structures going to be generated (e.g. strongholds)
@@ -1963,14 +1983,16 @@ field_393_F,sand,0,
 field_394_aw,redstoneWire,0,
 field_395_E,lavaStill,0,Stationary lava source block
 field_396_av,chest,0,
-field_397_D,lavaMoving,0,Flowing lava block
-field_399_C,waterStill,0,Stationary water source block
+field_397_D,lavaMoving,0,
+field_399_C,waterStill,0,
 field_40004_N,debugUpdateTime,0,Approximate time (in ms) of last update to debug string
 field_40005_O,fpsCounter,0,holds the current fps
 field_40006_ak,debugProfilerName,0,Profiler currently displayed in the debug screen pie chart
 field_40007_r,standardGalacticFontRenderer,0,
 field_40009_b,portalRoom,0,
 field_40011_b,doorType,0,
+field_40012_c,hasMadeChest,0,
+field_40013_a,chestLoot,0,
 field_40015_a,hasSpawner,0,
 field_40024_a,fillSeed,0,
 field_40027_a,hasSpawner,0,
@@ -2035,7 +2057,7 @@ field_40194_P,dummyRenderInt,0,Dummy render int
 field_40197_a,replaceID,0,The Block ID that the generator is allowed to replace while generating the terrain.
 field_40199_bz,mycelium,0,
 field_4019_aV,recordCat,0,
-field_401_B,waterMoving,0,Flowing water block
+field_401_B,waterMoving,0,
 field_40200_bA,waterlily,0,
 field_40201_bL,useNeighborBrightness,0,Flag if block ID should use the brightest neighbor light value as its own
 field_40202_bJ,endPortalFrame,0,
@@ -2043,7 +2065,7 @@ field_40203_bK,whiteStone,0,
 field_40204_bD,stairsNetherBrick,0,
 field_40205_bE,netherStalk,0,
 field_40206_bB,netherBrick,0,
-field_40207_bC,netherFence,0,The Block ID that the generator is allowed to replace while generating the terrain.
+field_40207_bC,netherFence,0,
 field_40208_bH,cauldron,0,
 field_40209_bI,endPortal,0,
 field_4020_aT,fishCooked,0,
@@ -2054,6 +2076,7 @@ field_40214_a,rand,0,
 field_40215_f,guiTop,0,Starting Y position for the Gui. Inconsistent use for Gui backgrounds.
 field_40216_e,guiLeft,0,Starting X position for the Gui. Inconsistent use for Gui backgrounds.
 field_4021_aS,fishRaw,0,
+field_40220_w,bookModel,0,The book model used on the GUI.
 field_40228_y,containerEnchantment,0,ContainerEnchantment object associated with this gui
 field_4022_aR,lightStoneDust,0,
 field_40231_d,is64bit,0,True if the system is 64-bit (using a simple indexOf test on a system property)
@@ -2073,6 +2096,9 @@ field_40246_a,damageModifier,0,Used to calculate the damage modifier (extra armo
 field_40247_b,entityLiving,0,Used as parameter to calculate the (magic) extra damage based on enchantments of current equipped player item.
 field_40248_a,livingModifier,0,Used to calculate the (magic) extra damage based on enchantments of current equipped player item.
 field_4024_aP,fishingRod,0,
+field_40251_b,rand,0,The RNG used to generate enchant names.
+field_40252_c,wordList,0,List of words used to generate an enchant name.
+field_40253_a,instance,0,The static instance of this class.
 field_40256_A,waterColorMultiplier,0,Color tint applied to water depending on biome
 field_40257_n,icePlains,0,
 field_40258_o,iceMountains,0,
@@ -2129,9 +2155,19 @@ field_40373_k,gunpowderEffect,0,
 field_40374_h,magmaCreamEffect,0,
 field_40375_i,redstoneEffect,0,
 field_40378_c,genNetherBridge,0,
+field_40382_f,noiseData4,0,
+field_40383_g,noiseData5,0,
+field_40384_d,noiseData2,0,
+field_40385_e,noiseData3,0,
+field_40386_b,noiseGen5,0,
+field_40387_c,noiseData1,0,
+field_40388_a,noiseGen4,0,
 field_40389_n,densities,0,
 field_40390_o,biomesForGeneration,0,The biomes that are used to generate the chunk
+field_40391_l,noiseGen3,0,
 field_40392_m,endWorld,0,
+field_40393_j,noiseGen1,0,
+field_40394_k,noiseGen2,0,
 field_40396_i,endRNG,0,
 field_403_A,bedrock,0,
 field_40408_bz,cauldron,0,
@@ -2171,7 +2207,7 @@ field_40456_c,useMultitextureARB,0,True if the renderer supports multitextures a
 field_40457_a,defaultTexUnit,0,"An OpenGL constant corresponding to GL_TEXTURE0, used when setting data pertaining to auxiliary OpenGL texture units."
 field_40458_D,enchantments,0,Is the 'Enchanter' achievement
 field_40459_E,overkill,0,
-field_4045_bg,pumpkinLantern,0,The Jack-O-Lantern
+field_4045_bg,pumpkinLantern,0,
 field_40460_F,bookcase,0,Is the 'Librarian' achievement
 field_40461_A,potion,0,Is the 'Local Brewery' achievement
 field_40462_B,theEnd,0,Is the 'The End?' achievement
@@ -2184,13 +2220,13 @@ field_4047_bf,portal,0,The purple teleport blocks inside the obsidian circle
 field_40486_a,spawnList,0,
 field_40498_f,projectileProtection,0,Protection against projectile entities (e.g. arrows)
 field_40499_g,respiration,0,Decreases the rate of air loss underwater; increases time between damage while suffocating
-field_4049_be,glowStone,0,a brittle glass like substance found only in the nether
+field_4049_be,glowStone,0,
 field_404_ar,torchWood,0,
 field_40500_d,featherFalling,0,Less fall damage
 field_40501_e,blastProtection,0,Protection against explosions
 field_40502_b,protection,0,Converts environmental damage to armour damage
 field_40503_c,fireProtection,0,Protection against fire
-field_40504_a,enchantmentsList,0,List of registered enchantments.
+field_40504_a,enchantmentsList,0,
 field_40505_n,looting,0,Mobs have a chance to drop more loot
 field_40506_o,efficiency,0,Faster resource gathering while in use
 field_40507_l,knockback,0,Knocks mob and players backwards upon hit
@@ -2218,11 +2254,12 @@ field_40527_z,thresholdEnchantability,0,"Used on the formula of base enchantabil
 field_40528_y,levelEnchantability,0,Holds how much each level increased the enchantability factor to be able to use this enchant.
 field_40529_x,baseEnchantability,0,Holds the base factor of enchantability needed to be able to use the enchant.
 field_40531_f,saveDirectoryName,0,The directory name of the world
-field_4053_bc,netherrack,0,"Red block, main part of the nether"
+field_40535_e,nameColor,0,The color given to the name of items with that rarity.
+field_4053_bc,netherrack,0,
 field_40548_r,projectile,0,This kind of damage is based on a projectile or not.
 field_40549_q,fireDamage,0,This kind of damage is based on fire or not.
 field_40558_d,hardcoreEnabled,0,True if hardcore mode is enabled
-field_4055_bb,pumpkin,0,A pumpkin
+field_4055_bb,pumpkin,0,
 field_40562_d,lock,0,Used to make threads queue to add packets
 field_40563_b,packetCountForID,0,A count of the total number of each packet sent grouped by IDs.
 field_40564_c,sizeCountForID,0,A count of the total size of each packet sent grouped by IDs.
@@ -2293,6 +2330,7 @@ field_40723_L,spikeGen,0,
 field_40725_r,hardcore,0,Hardcore mode flag
 field_4072_a,blockType,0,Boolean used to seperate different states of blocks
 field_40732_j,enchantability,0,Defines the natural enchantability factor of the material.
+field_40741_v,isGapLightingUpdated,0,
 field_40752_d,strongComponentType,0,
 field_407_ao,bookShelf,0,
 field_4082_a,blockInstance,0,
@@ -2318,6 +2356,7 @@ field_41031_b,health,0,
 field_41032_a,innerRotation,0,Used to create the rotation animation when rendering the crystal.
 field_41034_b,blockNames,0,
 field_41038_a,entityDragon,0,The entity instance of the dragon. Note: This is a static field in RenderDragon because there is only supposed to be one dragon
+field_41044_b,lines,0,List of lines on the ending poem and credits.
 field_41046_a,updateCounter,0,Counts the number of screen updates.
 field_41047_y,localizedNewWorldText,0,"E.g. New World, Neue Welt, Nieuwe wereld, Neuvo Mundo"
 field_41048_x,seed,0,The current textboxSeed text
@@ -2359,22 +2398,31 @@ field_4128_n,fishEntity,0,"An instance of a fishing rod's hook. If this isn't nu
 field_4129_m,dimension,0,"Which dimension the player is in (-1 = the Nether, 0 = normal world)"
 field_412_aj,blockSteel,0,
 field_413_ai,blockGold,0,
-field_414_ah,mushroomRed,0,Was mushroomFlyAgaric
+field_414_ah,mushroomRed,0,
 field_4157_a,liquidBlockId,0,The ID of the liquid block used in this liquid generator.
 field_4158_a,hellLavaID,0,Stores ID for WorldGenHellLava
 field_4159_s,netherCaveGenerator,0,
-field_415_ag,mushroomBrown,0,Was mushroomKingBolete
+field_415_ag,mushroomBrown,0,
 field_4160_r,netherrackExclusivityNoise,0,Holds the noise used to determine whether something other than netherrack can be generated at a location
 field_4161_q,gravelNoise,0,
 field_4162_p,slowsandNoise,0,Holds the noise used to determine whether slowsand can be generated at a location
 field_4164_n,worldObj,0,Is the world that the nether is getting generated.
 field_4165_m,netherrackExculsivityNoiseGen,0,Determines whether something other than nettherack can be generated at a location
 field_4166_l,slowsandGravelNoiseGen,0,Determines whether slowsand or gravel can be generated at a location
+field_4167_k,netherNoiseGen3,0,
+field_4168_j,netherNoiseGen2,0,
 field_4169_i,netherNoiseGen1,0,A NoiseGeneratorOctaves used in generating nether terrain
-field_416_af,plantRed,0,Was rose
+field_416_af,plantRed,0,
 field_4170_h,hellRNG,0,
+field_4171_g,noiseData5,0,
+field_4172_f,noiseData4,0,
+field_4173_e,noiseData3,0,
+field_4174_d,noiseData2,0,
+field_4175_c,noiseData1,0,
+field_4176_b,netherNoiseGen7,0,
+field_4177_a,netherNoiseGen6,0,
 field_4179_v,biomesForGeneration,0,The biomes that are used to generate the chunk
-field_417_ae,plantYellow,0,Was dandelion
+field_417_ae,plantYellow,0,
 field_4180_q,noiseArray,0,Holds the overall noise array used in chunk generation
 field_4181_h,noise6,0,A double array that holds terrain noise from noiseGen6
 field_4182_g,noise5,0,A double array that hold terrain noise from noiseGen5
@@ -2418,6 +2466,7 @@ field_4259_y,canBurn,0,Bool defining if the block can burn or not.
 field_425_aW,cactus,0,
 field_4260_x,portal,0,Material used for portals
 field_4261_w,pumpkin,0,pumpkin
+field_4262_q,unused,0,
 field_4263_o,glass,0,
 field_4264_k,cloth,0,
 field_4265_h,leaves,0,
@@ -2441,6 +2490,9 @@ field_432_aP,oreRedstoneGlowing,0,
 field_433_aO,oreRedstone,0,
 field_435_aM,doorSteel,0,
 field_44004_b,sheepTimer,0,Used to control movement as well as wool regrowth. Set to 40 on handleHealthUpdate and counts down with each tick.
+field_44007_b,updateTimer,0,"Timer used to update texture packs, decreases every tick and is reset to 20 and updates texture packs upon reaching 0."
+field_44008_c,languageList,0,This GUI's language list.
+field_44009_a,parentGui,0,This GUI's parent GUI.
 field_44010_b,length,0,Length of the data to be read
 field_44011_c,data,0,Any data
 field_44012_a,channel,0,Name of the 'channel' used to send data
@@ -2474,14 +2526,17 @@ field_455_a,signEntityClass,0,
 field_456_a,isActive,0,"True if this is an active furnace, false if idle"
 field_457_a,random,0,
 field_459_b,isOptimalFlowDirection,0,Indicates whether the flow direction is optimal. Each array index corresponds to one of the four cardinal directions.
-field_46015_bf,prevRotationYaw2,0,
-field_46016_bg,prevRotationYaw3,0,
+field_46001_c,hasMadeChest,0,
+field_46002_a,chestLoot,0,
+field_46015_bf,rotationYawHead,0,Entity head rotation yaw
+field_46016_bg,prevRotationYawHead,0,Entity head rotation yaw at previous tick
 field_46017_d,lookHelper,0,
 field_46018_e,moveHelper,0,
 field_46019_bU,tasks,0,
 field_46020_bQ,entityLivingToAttack,0,"is only being set, has no uses as of MC 1.1"
-field_46021_am,jumpHelper,0,
+field_46021_am,jumpHelper,0,Entity jumping helper
 field_46026_at,damage,0,
+field_46029_e,doneButton,0,This GUI's 'Done' button.
 field_46031_f,terrainType,0,
 field_46032_d,terrainType,0,
 field_46037_d,posZ,0,
@@ -2507,13 +2562,20 @@ field_46061_b,primaryColor,0,Base color of the egg
 field_46062_c,secondaryColor,0,Color of the egg spots
 field_46063_a,spawnedID,0,The entityID of the spawned mob
 field_46067_b,terrainType,0,
+field_46073_d,speed,0,
+field_46074_b,worldObj,0,
+field_46075_c,currentPath,0,The PathEntity being followed.
+field_46076_a,theEntity,0,
 field_46085_a,mutexBits,0,"A bitmask telling which other tasks may not run concurrently. The test is a simple bitwise AND - if it yields zero, the two tasks may run concurrently, if not - they must run exclusively from each other."
 field_46086_d,idleTime,0,A decrementing tick that stops the entity from being idle once it reaches 0.
+field_46087_b,lookX,0,X offset to look at
+field_46088_c,lookZ,0,Z offset to look at
 field_46089_a,idleEntity,0,The entity that is looking idle.
 field_46094_c,entityTarget,0,
 field_46095_a,worldObj,0,
 field_460_a,numAdjacentSources,0,Number of horizontally adjacent liquid source blocks. Diagonal doesn't count. Only source blocks of the same liquid as the block using the field are counted.
 field_46100_a,entity,0,
+field_46106_a,theEntity,0,
 field_46108_e,terrainType,0,
 field_46111_e,isUnicode,0,
 field_46112_b,priority,0,Priority of the EntityAIBase
@@ -2557,56 +2619,136 @@ field_48130_d,isPlayingFlag,0,
 field_48131_b,randomTickDivider,0,
 field_48132_c,isMatingFlag,0,
 field_48133_a,villageObj,0,
+field_48137_c,aiEatGrass,0,The eat grass AI task for this mob.
 field_48146_a,aiSit,0,
+field_48149_b,aiTempt,0,"The tempt AI task for this mob, used to prevent taming while it is fleeing."
+field_48154_a,cooldownTimer,0,"The cooldown timer for the buttons, increases every tick and enables all buttons when reaching 20."
+field_48159_b,headRotationYaw,0,
+field_48160_a,entityId,0,
+field_48161_f,customParam2,0,Custom parameter 2 passed to the tile entity on update.
+field_48162_g,customParam3,0,Custom parameter 3 passed to the tile entity on update.
+field_48163_d,actionType,0,The type of update to perform on the tile entity.
+field_48164_e,customParam1,0,Custom parameter 1 passed to the tile entity on update.
+field_48165_b,yPosition,0,The Y position of the tile entity to update.
+field_48166_c,zPosition,0,The Z position of the tile entity to update.
+field_48167_a,xPosition,0,The X position of the tile entity to update.
+field_48171_f,includeInitialize,0,Whether to initialize the Chunk before applying the effect of the Packet51MapChunk.
+field_48172_g,tempLength,0,The length of the compressed chunk data byte array.
+field_48173_d,yChMax,0,"The y-position of the highest chunk Section in the transmitted chunk, in chunk coordinates."
+field_48174_e,chunkData,0,"The transmitted chunk data, decompressed."
+field_48175_b,zCh,0,"The z-position of the transmitted chunk, in chunk coordinates."
+field_48176_c,yChMin,0,"The y-position of the lowest chunk Section in the transmitted chunk, in chunk coordinates."
+field_48177_a,xCh,0,"The x-position of the transmitted chunk, in chunk coordinates."
+field_48179_i,temp,0,A temporary storage for the compressed chunk data byte array.
 field_48193_b,woodMetadata,0,Sets the metadata for the wood blocks used
 field_48194_c,leavesMetadata,0,Sets the metadata for the leaves used in huge trees
 field_481_e,metadataArray,0,The metadata for each block changed.
 field_48207_bU,isBlockContainer,0,true if the Block contains a Tile Entity
 field_48208_bT,needsRandomTick,0,Flags whether or not this block is of a type that needs random ticking. Ref-counted by ExtendedBlockStorage in order to broadly cull a chunk from the random chunk update list for efficiency's sake.
-field_48209_bL,redstoneLampU,0,Redstone Lamp (unpowered state)
-field_48210_bM,redstoneLampP,0,Redstone Lamp (powered state)
+field_48209_bL,redstoneLampIdle,0,
+field_48210_bM,redstoneLampActive,0,
+field_48215_a,powered,0,Whether this lamp block is the powered version.
+field_48235_a,theEntity,0,
 field_48236_b,creeperAttackTarget,0,The creeper's attack target. This is used for the changing of the creeper's state.
 field_48237_a,swellingCreeper,0,The creeper that is swelling.
+field_48239_g,entityPathNavigate,0,The PathNavigate of our entity
+field_48244_a,theEntity,0,The entity we are attached to
+field_48245_h,targetEntityClass,0,The class of the entity we should avoid
+field_48247_b,parentAnimal,0,
 field_48249_a,childAnimal,0,The child that is following its parent.
 field_48250_b,leapTarget,0,The entity that the leaper is leaping towards.
 field_48251_c,leapMotionY,0,The entity's motionY after leaping.
 field_48252_a,leaper,0,The entity that is leaping.
+field_48253_d,insidePosZ,0,
+field_48254_b,doorInfo,0,
+field_48255_c,insidePosX,0,
 field_48256_a,entityObj,0,
+field_48259_d,theAnimal,0,
+field_48260_e,targetMate,0,
+field_48263_a,theWorld,0,
+field_48267_b,attacker,0,
+field_48268_h,classTarget,0,
 field_48277_a,temptedEntity,0,The entity using this AI that is tempted by the player.
 field_48278_l,scaredByPlayerMovement,0,Whether the entity using this AI will be scared by the tempter's sudden movement.
 field_48281_k,breedingFood,0,This field saves the ID of the items that can be used to breed entities with this behaviour.
 field_48282_h,temptingPlayer,0,The player that is tempting the entity that is using this AI.
 field_48283_i,delayTemptCounter,0,A counter that is decremented each time the shouldExecute method is called. The shouldExecute method will always return false if delayTemptCounter is greater than 0.
+field_48287_f,doorList,0,
+field_48288_d,doorInfo,0,
+field_48292_a,theEntity,0,
 field_48295_b,closestEntity,0,The closest entity which is being watched by this one.
+field_48297_f,theWorld,0,
+field_48298_d,shelterZ,0,
+field_48300_b,shelterX,0,
+field_48301_c,shelterY,0,
+field_48302_a,theCreature,0,
+field_48304_g,petPathfinder,0,
+field_48305_d,thePet,0,
+field_48306_e,theOwner,0,
+field_48307_b,maxDist,0,
+field_48308_c,minDist,0,
+field_48309_a,theWorld,0,
+field_48321_d,entityPosZ,0,
+field_48322_e,targetDoor,0,
+field_48323_b,entityPosX,0,
+field_48324_c,entityPosY,0,
+field_48325_a,theEntity,0,
+field_48332_d,movePosY,0,
+field_48333_e,movePosZ,0,
+field_48334_b,targetEntity,0,
+field_48335_c,movePosX,0,
+field_48336_a,theEntity,0,
 field_48340_d,worldObj,0,
 field_48341_e,matingTimeout,0,
 field_48342_b,villagerObj,0,
 field_48343_c,mate,0,
 field_48344_a,villageObj,0,
+field_48350_a,theWolf,0,
+field_48351_d,movePosZ,0,
+field_48353_b,movePosX,0,
+field_48354_c,movePosY,0,
+field_48355_a,theEntity,0,
 field_48357_b,targetVillager,0,
 field_48359_a,villagerObj,0,
+field_48361_b,theEntity,0,
+field_48363_a,theWorld,0,
 field_48364_b,frontDoor,0,
 field_48365_a,entityObj,0,
 field_48368_g,rangedAttackID,0,The ID of this ranged attack AI. This chooses which entity is to be used as a ranged attack.
 field_48369_d,rangedAttackTime,0,A decrementing tick that spawns a ranged attack once this value reaches 0. It is then set back to the maxRangedAttackTime.
 field_48371_b,entityHost,0,The entity the AI instance has been applied to
 field_48372_c,attackTarget,0,
+field_48373_a,worldObj,0,
 field_48374_h,maxRangedAttackTime,0,The maximum time the AI has to wait before peforming another ranged attack.
 field_48382_c,taskOwner,0,The entity that this task belongs to
 field_48384_b,villageAgressorTarget,0,The aggressor of the iron golem's village which is now the golem's attack target.
 field_48385_a,irongolem,0,
+field_48388_b,targetClass,0,
+field_48389_a,targetEntity,0,
+field_48397_b,theEntity,0,
+field_48398_c,theWorld,0,
 field_48399_a,eatGrassTick,0,A decrementing tick used for the sheep's head offset and animation.
-field_48416_w,jungle,0,
-field_48417_x,jungleHills,0,Jungle Hills biome
+field_48401_b,theGolem,0,
+field_48403_a,theVillager,0,
+field_48404_b,theVillager,0,
+field_48406_a,theGolem,0,
+field_48409_a,theEntity,0,
+field_48416_w,jungle,0,Jungle biome identifier
+field_48417_x,jungleHills,0,
 field_48438_bD,expBottle,0,Bottle o' Enchanting. Drops between 1 and 3 experience orbs when thrown.
 field_48439_bE,fireballCharge,0,Fire Charge. When used in a dispenser it fires a fireball similiar to a Ghast's.
 field_48448_d,chunkSaveLocation,0,Save directory for chunks using the Anvil format
 field_48465_A,villageCollectionObj,0,
 field_48466_O,villageSiegeObj,0,
+field_48468_r,redstoneLight,0,
+field_48470_b,theEntity,0,
+field_48471_a,parent,0,
+field_48479_b,ip,0,The IP address or domain used to connect.
 field_48482_b,canSeeCachePositive,0,
 field_48483_c,canSeeCacheNegative,0,
 field_48484_a,entityObj,0,
 field_484_b,xPosition,0,The X axis relative movement.
+field_48501_f,heightMap,0,
 field_48502_j,entityLists,0,Array of Lists containing the entities in this Chunk. Each List represents a 16 block subchunk.
 field_48503_s,queuedLightChecks,0,"Contains the current round-robin relight check index, and is implied as the relight check location as well."
 field_48504_q,blockBiomeArray,0,Contains a 16x16 mapping on the X/Z plane of the biome ID to which each colum belongs.
@@ -2618,6 +2760,8 @@ field_48511_a,data,0,
 field_48513_b,agressionTime,0,
 field_48514_c,villageObj,0,
 field_48515_a,agressor,0,
+field_48517_d,demoNotificationTime,0,"Counter used to show the demo expired message. Increases every tick, when a player action is performed and the counter is over 100, displays the demo expired message and resets to 0."
+field_48518_c,demoExpired,0,Whether the demo has expired.
 field_48542_f,lastAddDoorTimestamp,0,
 field_48543_g,tickCounter,0,
 field_48544_d,center,0,This is the actual village center.
@@ -2628,6 +2772,7 @@ field_48548_a,worldObj,0,
 field_48549_j,numIronGolems,0,
 field_48550_h,numVillagers,0,
 field_48551_i,villageAgressors,0,
+field_48552_a,parent,0,
 field_48566_d,villageList,0,
 field_48567_e,tickCounter,0,
 field_48568_b,villagerPositionsList,0,"This is a black hole. You can add data to this list through a public interface, but you can't query that information in any way and it's not used internally either."
@@ -2658,8 +2803,22 @@ field_48615_f,isMovementBlockAllowed,0,should the PathFinder disregard BlockMove
 field_48616_g,isPathingInWater,0,
 field_48617_e,isWoddenDoorAllowed,0,should the PathFinder go through wodden door blocks
 field_48618_h,canEntityDrown,0,tells the FathFinder to not stop pathing underwater
+field_48632_f,generatorVersion,0,The int version of the ChunkProvider that generated this world.
+field_48633_g,canBeCreated,0,Whether this world type can be generated. Normally true; set to false for out-of-date generator versions.
+field_48634_d,DEFAULT_1_1,0,Default (1.1) world type.
+field_48635_b,DEFAULT,0,Default world type.
+field_48636_c,FLAT,0,Flat world type.
+field_48637_a,worldTypes,0,List of world types.
 field_48649_b,currentPathIndex,0,PathEntity Array Index the Entity is currently targeting
 field_48681_f,noSunPathfind,0,
+field_48682_g,totalTicks,0,"Time, in number of ticks, following the current path"
+field_48683_e,pathSearchRange,0,The number of blocks (extra) +/- in each axis that get pulled out as cache for the pathfinder's search space
+field_48684_l,avoidsWater,0,If water blocks are avoided (at least by the pathfinder)
+field_48685_m,canSwim,0,If the entity can swim. Swimming AI enables this and the pathfinder will also cause the entity to swim straight upwards when underwater
+field_48686_j,canPassOpenWoodenDoors,0,"Specifically, if a wooden door block is even considered to be passable by the pathfinder"
+field_48687_k,canPassClosedWoodenDoors,0,If door blocks are considered passable even when closed
+field_48688_h,ticksAtLastPos,0,The time when the last position check was done (to detect successful movement)
+field_48689_i,lastPosCheck,0,Coordinates of the entity's position last time a check was done (part of monitoring getting 'stuck')
 field_486_g,rotating,0,Boolean set to true if the entity is rotating.
 field_48716_f,blockMetadataArray,0,Stores the metadata associated with blocks in this ExtendedBlockStorage.
 field_48717_g,blocklightArray,0,The NibbleArray containing a block of Block-light data.
@@ -2913,12 +3072,12 @@ field_672_a,flameScale,0,the scale of the flame FX
 field_673_a,reddustParticleScale,0,
 field_674_a,lavaParticleScale,0,
 field_675_a,entityToPickUp,0,
-field_676_r,yOffset,0,
+field_676_r,yOffs,0,renamed from yOffset to fix shadowing Entity.yOffset
 field_677_q,maxAge,0,
 field_678_p,age,0,
 field_679_o,entityPickingUp,0,
-field_680_i,ticksInAir,0,the amount of time an arrow has been in the air
-field_681_h,ticksInGround,0,the time until an arrow dies
+field_680_i,ticksInAir,0,
+field_681_h,ticksInGround,0,
 field_682_g,shootingEntity,0,The owner of this arrow.
 field_688_a,arrowShake,0,Seems to be some sort of timer for animating an arrow.
 field_689_a,fuse,0,How long the fuse is
@@ -2987,7 +3146,7 @@ field_845_f,inventoryChanged,0,Set true whenever the inventory changes. Nothing
 field_847_d,currentItem,0,The index of the currently held item (0-8).
 field_857_h,cargoItems,0,Array of item stacks stored in minecart (for storage minecarts).
 field_861_d,entityRiderPitchDelta,0,
-field_862_c,firstUpdate,0,Whether or not the entity is on its first update.
+field_862_c,firstUpdate,0,
 field_863_b,nextStepDistance,0,The distance that has to be exceeded in order to triger a new step sound and an onEntityWalking event on a block
 field_864_a,nextEntityID,0,
 field_866_b,numberOfBlocks,0,The number of blocks to generate.
@@ -3056,14 +3215,14 @@ field_9251_h,soundStoneFootstep,0,
 field_9252_g,soundGrassFootstep,0,
 field_9253_f,soundGravelFootstep,0,
 field_9254_e,soundWoodFootstep,0,
-field_9255_Z,pistonBase,0,Is the normal piston block.
-field_9256_Y,deadBush,0,BlockDeadBush
-field_9257_X,tallGrass,0,BlockTallGrass
-field_9258_W,web,0,Slows entities on collision.
-field_9259_V,pistonStickyBase,0,Is the sticky piston block.
-field_9260_U,railDetector,0,Minecart detector rail track.
-field_9261_T,railPowered,0,Powered rail track.
-field_9262_S,bed,0,Is the block that build the bed in the world.
+field_9255_Z,pistonBase,0,
+field_9256_Y,deadBush,0,
+field_9257_X,tallGrass,0,
+field_9258_W,web,0,
+field_9259_V,pistonStickyBase,0,
+field_9260_U,railDetector,0,
+field_9261_T,railPowered,0,
+field_9262_S,bed,0,
 field_9263_R,music,0,
 field_9264_Q,sandStone,0,
 field_9265_P,dispenser,0,
@@ -3086,7 +3245,7 @@ field_9288_aU,fallDistance,0,
 field_9290_aS,distanceWalkedModified,0,The distance walked multiplied by 0.6
 field_9291_aR,prevDistanceWalkedModified,0,The previous ticks distance walked multiplied by 0.6
 field_9292_aO,yOffset,0,
-field_9294_aL,velocityChanged,0,Not used by client. Server sends Packet28EntityVelocity if set
+field_9294_aL,velocityChanged,0,
 field_9295_aK,isCollided,0,True if after a move this entity has collided with something either vertically or horizontally
 field_9296_aJ,isCollidedVertically,0,True if after a move this entity has collided with something on Y-axis
 field_9297_aI,isCollidedHorizontally,0,True if after a move this entity has collided with something on X- or Z-axis
@@ -3452,7 +3611,7 @@ field_20097_a,slotIndex,1,The index of the slot in the inventory.
 field_20098_e,yDisplayPosition,1,display position of the inventory slot on the screen y axis
 field_20099_d,xDisplayPosition,1,display position of the inventory slot on the screen x axis
 field_20100_c,slotNumber,1,the id of the slot(also the index in the inventory arraylist)
-field_20101_b,inventory,1,The inventory we want to extract a slot from.
+field_20101_b,parent,1,"The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner class."
 field_20102_a,armorType,1,"The armor type that can be placed on that slot, it uses the same values of armorType field on ItemArmor."
 field_20103_a,craftMatrix,1,The craft matrix inventory linked to this result slot.
 field_20108_a,craftingManager,1,
@@ -3468,10 +3627,10 @@ field_20138_b,lastCookTime,1,
 field_20139_a,furnace,1,
 field_20140_h,lastItemBurnTime,1,
 field_20141_c,lastBurnTime,1,
-field_20142_b,craftResult,1,The crafting result.
+field_20142_b,craftResult,1,
 field_20143_a,craftMatrix,1,The crafting matrix inventory.
 field_20144_c,isLocalWorld,1,Determines if inventory manipulation should be handled.
-field_20145_b,craftResult,1,The crafting result.
+field_20145_b,craftResult,1,
 field_20146_a,craftMatrix,1,The crafting matrix inventory.
 field_20147_j,posZ,1,
 field_20148_i,posY,1,
@@ -3580,10 +3739,10 @@ field_21901_b,playerLocation,1,the current location of the player
 field_21902_c,sleepTimer,1,
 field_21_b,mcServer,1,Reference to the MinecraftServer object.
 field_22005_o,commandHandler,1,
-field_22007_aZ,redstoneRepeater,1,Is the redstone repeater (diode) in item form.
-field_22008_aY,bed,1,The bed as an inventory item.
-field_22010_bi,redstoneRepeaterActive,1,The redstone repeater (diode) block when powered.
-field_22011_bh,redstoneRepeaterIdle,1,The redstone repeater (diode) block when isn't powered.
+field_22007_aZ,redstoneRepeater,1,
+field_22008_aY,bed,1,
+field_22010_bi,redstoneRepeaterActive,1,
+field_22011_bh,redstoneRepeaterIdle,1,
 field_22013_b,repeaterState,1,The states in which the redstone repeater blocks can be.
 field_22014_a,repeaterTorchOffset,1,The offsets for the two torches in redstone repeater blocks.
 field_22015_c,isRepeaterPowered,1,Tells whether the repeater is powered or not
@@ -3649,7 +3808,7 @@ field_246_aG,clay,1,
 field_24900_d,spawnChunk,1,holds the spawn chunk of the player
 field_249_aD,leather,1,
 field_25004_e,thePlayer,1,The player that is using the GUI where this slot resides.
-field_25008_ba,cookie,1,The cookie inventory item.
+field_25008_ba,cookie,1,
 field_25011_bi,isWolfsFavoriteMeat,1,Whether wolves like this food (true for raw and cooked porkchop).
 field_25013_bj,lockedChest,1,"April fools secret locked chest, only spawns on new chunks on 1st April."
 field_25015_b,bedState,1,"Either 1 or 2. 1 indicates to begin raining, 2 indicates to stop raining."
@@ -3701,10 +3860,10 @@ field_25120_d,objectMineStats,1,Tracks the number of times a given block or item
 field_25121_c,itemStats,1,
 field_25122_b,generalStats,1,
 field_25123_a,allStats,1,
-field_25128_b,openInventory,1,The open inventory achievement
+field_25128_b,openInventory,1,Is the 'open inventory' achievement.
 field_25129_a,achievementList,1,The list holding all achievements
 field_25130_d,buildWorkBench,1,Is the 'benchmarking' achievement.
-field_25131_c,mineWood,1,The get wood achievement
+field_25131_c,mineWood,1,Is the 'getting wood' achievement.
 field_25133_b,guidMap,1,Maps a achievement id with it's unique GUID.
 field_25134_a,instance,1,Holds the singleton instance of AchievementMap.
 field_25137_a,localizedName,1,
@@ -3739,7 +3898,7 @@ field_27044_e,isLightningBolt,1,
 field_27045_d,posZ,1,
 field_27046_c,posY,1,
 field_27050_v,enableRain,1,Is true (default) if the biome support rain (desert and nether can't have rain)
-field_27051_u,enableSnow,1,"If the biome have snowfall instead a rain, this field is true (tundra or taiga)"
+field_27051_u,enableSnow,1,Set to true if snow is enabled for this biome.
 field_27054_k,distanceStatType,1,
 field_27055_j,timeStatType,1,
 field_27056_i,simpleStatType,1,
@@ -3802,9 +3961,9 @@ field_28012_a,doesArrowBelongToPlayer,1,
 field_28014_E,timeInPortal,1,The amount of time an entity has been in a Portal
 field_28015_D,inPortal,1,Whether the entity is inside a Portal
 field_28016_C,timeUntilPortal,1,
-field_28021_bb,map,1,The map item
+field_28021_bb,map,1,
 field_28029_t,requiresSelfNotify,1,
-field_28030_bl,trapdoor,1,Trapdoor block.
+field_28030_bl,trapdoor,1,
 field_28032_a,random,1,
 field_28033_a,furnaceRand,1,Is the random generator used by furnace to drop the inventory contents in random directions.
 field_28034_c,keepFurnaceInventory,1,"This flag is used to prevent the furnace inventory to be dropped upon block removal, is used internally when the furnace block changes from idle to active and vice-versa."
@@ -4048,7 +4207,7 @@ field_35258_D,chunk_X,1,The X-coordinate of the chunk currently being decorated
 field_35259_E,chunk_Z,1,The Z-coordinate of the chunk currently being decorated
 field_35260_F,biome,1,The biome generator object.
 field_35261_A,clayPerChunk,1,The number of clay patches to generate per chunk. Only generates when part of it is underwater.
-field_35262_B,currentWorld,1,The current world object.
+field_35262_B,currentWorld,1,The world the BiomeDecorator is currently decorating
 field_35263_C,randomGenerator,1,The Biome Decorator's random number generator.
 field_35264_f,coalGen,1,
 field_35265_g,ironGen,1,
@@ -4082,10 +4241,17 @@ field_35293_a,mushroomType,1,"The mushroom type. 0 for brown, 1 for red."
 field_35316_g,boundingBox,1,
 field_35317_h,coordBaseMode,1,'switches the Coordinate System base off the Bounding Box'
 field_35318_i,componentType,1,The type ID of this component.
-field_35326_b,doorType,1,randomly chosen opening type to use
+field_35326_b,doorType,1,
 field_35331_a,doorType,1,
 field_35333_a,doorType,1,
+field_35336_c,isLargeRoom,1,
+field_35337_a,doorType,1,
+field_35339_b,expandsX,1,
+field_35340_c,expandsZ,1,
+field_35341_a,doorType,1,
 field_35345_a,doorType,1,
+field_35347_b,roomType,1,
+field_35348_c,chestLoot,1,
 field_35349_a,doorType,1,
 field_35355_a,doorType,1,
 field_35356_a,chidStructures,1,
@@ -4107,9 +4273,12 @@ field_35388_d,structureVillageWeightedPieceList,1,"Contains List of all spawnabl
 field_35390_b,terrainType,1,"World terrain type, 0 for normal, 1 for flap map"
 field_35391_c,structVillagePieceWeight,1,
 field_35392_a,worldChunkMngr,1,
+field_35394_b,isTallHouse,1,
+field_35395_c,tablePosition,1,
 field_35396_a,averageGroundLevel,1,
 field_35398_a,averageGroundLevel,1,
 field_35400_a,averageGroundLevel,1,
+field_35402_b,isRoofAccessible,1,
 field_35403_a,averageGroundLevel,1,
 field_35409_bj,chickenCooked,1,
 field_35410_bk,rottenFlesh,1,
@@ -4168,11 +4337,11 @@ field_35503_p,gameType,1,"Indicates the type of the game. 0 for survival, 1 for
 field_35515_A,worldGenBigTree,1,The big tree generator.
 field_35516_B,worldGenForest,1,The forest generator.
 field_35517_C,worldGenSwamp,1,The swamp tree generator.
-field_35518_e,extremeHills,1,The extreme hills biome generator.
-field_35519_b,ocean,1,The ocean biome generator.
-field_35520_c,plains,1,The plains biome generator.
+field_35518_e,extremeHills,1,
+field_35519_b,ocean,1,
+field_35520_c,plains,1,
 field_35521_a,biomeList,1,"An array of all the biomes, indexed by biome id."
-field_35522_i,river,1,The river biome generator.
+field_35522_i,river,1,
 field_35523_u,biomeDecorator,1,The biome decorator.
 field_35524_t,rainfall,1,The rainfall in this biome.
 field_35525_s,temperature,1,The temperature of this biome.
@@ -4228,7 +4397,7 @@ field_35637_c,precipitationHeightMap,1,"A map, similar to heightMap, that tracks
 field_35654_b,duration,1,The duration of the potion effect
 field_35655_c,amplifier,1,The amplifier of the potion effect
 field_35656_a,potionID,1,ID value of the potion this effect matches.
-field_35657_d,depleteBuckets,1,Used by ItemBucket to say if it should empty when used or not.
+field_35657_d,isCreativeMode,1,"Used to determine if creative mode is enabled, and therefore if items should be depleted on usage"
 field_35658_b,isFlying,1,Sets/indicates whether the player is flying.
 field_35659_c,allowFlying,1,whether or not to allow the player to fly when they double jump.
 field_35660_a,disableDamage,1,Disables player damage.
@@ -4243,7 +4412,7 @@ field_35678_a,minX,1,The first x coordinate of a bounding box.
 field_35684_d,cache,1,The list of cached BiomeCacheBlocks
 field_35685_b,lastCleanupTime,1,"The last time this BiomeCache was cleaned, in milliseconds."
 field_35686_c,cacheMap,1,"The map of keys to BiomeCacheBlocks. Keys are based on the chunk x, z coordinates as (x | z << 32)."
-field_35687_a,chunkManager,1,The world chunk manager object.
+field_35687_a,chunkManager,1,Reference to the WorldChunkManager
 field_35699_c,gameType,1,"The game mode, 1 for creative, 0 for survival."
 field_35701_f,lastAccessTime,1,"The last time this BiomeCacheBlock was accessed, in milliseconds."
 field_35702_g,biomeCache,1,The BiomeCache object that contains this BiomeCacheBlock
@@ -4328,7 +4497,7 @@ field_40168_bK,whiteStone,1,
 field_40169_bD,stairsNetherBrick,1,
 field_40170_bE,netherStalk,1,
 field_40171_bB,netherBrick,1,
-field_40172_bC,netherFence,1,The Block ID that the generator is allowed to replace while generating the terrain.
+field_40172_bC,netherFence,1,
 field_40173_bH,cauldron,1,
 field_40174_bI,endPortal,1,
 field_40175_bF,enchantmentTable,1,
@@ -4336,9 +4505,19 @@ field_40176_bG,brewingStand,1,
 field_40178_b,canDropItself,1,"If this field is true, the pane block drops itself when destroyed (like the iron fences), otherwise, it's just destroyed (like glass panes)"
 field_40180_a,rand,1,
 field_40183_c,genNetherBridge,1,
+field_40187_f,noiseData4,1,
+field_40188_g,noiseData5,1,
+field_40189_d,noiseData2,1,
+field_40190_e,noiseData3,1,
+field_40191_b,noiseGen5,1,
+field_40192_c,noiseData1,1,
+field_40193_a,noiseGen4,1,
 field_40194_n,densities,1,
 field_40195_o,biomesForGeneration,1,The biomes that are used to generate the chunk
+field_40196_l,noiseGen3,1,
 field_40197_m,endWorld,1,
+field_40198_j,noiseGen1,1,
+field_40199_k,noiseGen2,1,
 field_40201_i,endRNG,1,
 field_40206_a,spawnList,1,
 field_40207_a,replaceID,1,The Block ID that the generator is allowed to replace while generating the terrain.
@@ -4387,6 +4566,8 @@ field_402_ae,slimeJumpDelay,1,ticks until this slime jumps again
 field_40302_a,fillSeed,1,
 field_40305_a,hasSpawner,1,
 field_40312_b,doorType,1,
+field_40313_c,hasMadeChest,1,
+field_40314_a,chestLoot,1,
 field_40316_a,hasSpawner,1,
 field_40317_b,portalRoom,1,
 field_40318_J,bigMushroomsPerChunk,1,Amount of big mushrooms per chunk
@@ -4409,19 +4590,19 @@ field_40351_f,blastProtection,1,Protection against explosions
 field_40352_g,projectileProtection,1,Protection against projectile entities (e.g. arrows)
 field_40353_d,fireProtection,1,Protection against fire
 field_40354_e,featherFalling,1,Less fall damage
-field_40355_b,enchantmentsList,1,List of all registered enchantments
+field_40355_b,enchantmentsList,1,
 field_40356_c,protection,1,Converts environmental damage to armour damage
 field_40357_a,weight,1,
 field_40358_n,fireAspect,1,Lights mobs on fire
 field_40359_o,looting,1,Mobs have a chance to drop more loot
 field_40360_l,baneOfArthropods,1,"Extra damage to spiders, cave spiders and silverfish"
-field_40361_m,knockback,1,Knocks mobs and players backwards upon hit
+field_40361_m,knockback,1,Knocks mob and players backwards upon hit
 field_40362_j,sharpness,1,Extra damage to mobs
 field_40363_k,smite,1,"Extra damage to zombies, zombie pigmen and skeletons"
 field_40364_h,respiration,1,Decreases the rate of air loss underwater; increases time between damage while suffocating
 field_40365_i,aquaAffinity,1,Increases underwater mining rate
-field_40366_v,name,1,Used in localisation and stats
-field_40367_u,type,1,The EnumEnchantmentType given to this Enchantment
+field_40366_v,name,1,Used in localisation and stats.
+field_40367_u,type,1,The EnumEnchantmentType given to this Enchantment.
 field_40368_t,effectId,1,
 field_40369_s,fortune,1,Can multiply the drop rate of items from blocks
 field_40370_r,unbreaking,1,"Sometimes, the tool's durability will not be spent when the tool is used"
@@ -4475,7 +4656,7 @@ field_40457_g,loggedIn,1,"True if the client has succefssfully logged into the R
 field_40458_j,rconPassword,1,The RCon password
 field_40459_h,clientSocket,1,The client's Socket connection
 field_40460_i,buffer,1,A buffer for incoming Socket data
-field_40461_A,waterColorMultiplier,1,color tint applied to water depending on biome
+field_40461_A,waterColorMultiplier,1,Color tint applied to water depending on biome
 field_40462_n,icePlains,1,
 field_40463_o,iceMountains,1,
 field_40464_l,frozenOcean,1,
@@ -4505,7 +4686,7 @@ field_40498_f,maxDamageFactor,1,"Holds the maximum damage factor (each piece mul
 field_40499_g,damageReductionAmountArray,1,"Holds the damage reduction (each 1 points is half a shield on gui) of each piece of armor (helmet, plate, legs and boots)"
 field_404_af,attackStrength,1,How much damage this mob's attacks deal
 field_40505_h,enchantability,1,Return the enchantability factor of the material
-field_4050_bc,netherrack,1,"Red block, main part of the nether"
+field_4050_bc,netherrack,1,
 field_40510_d,savedIOCounter,1,
 field_40511_e,isThreadWaiting,1,
 field_40512_b,threadedIOQueue,1,
@@ -4516,10 +4697,11 @@ field_40521_e,profilingMap,1,Profiling map
 field_40522_b,sectionList,1,List of parent sections
 field_40523_c,timestampList,1,List of timestamps (System.nanoTime)
 field_40524_a,profilingEnabled,1,Flag profiling enabled
-field_4052_bb,pumpkin,1,A pumpkin
+field_4052_bb,pumpkin,1,
 field_40539_b,secondaryComponents,1,
 field_40540_a,primaryComponents,1,
 field_40542_d,strongComponentType,1,
+field_40544_v,isGapLightingUpdated,1,
 field_40556_f,speckledMelonEffect,1,
 field_40557_g,blazePowderEffect,1,
 field_40558_d,spiderEyeEffect,1,
@@ -4555,11 +4737,11 @@ field_40647_a,enchantmentRand,1,Is the random seed of enchantment effects.
 field_4064_A,bedrock,1,
 field_4067_aj,blockSteel,1,
 field_4068_ai,blockGold,1,
-field_4069_ah,mushroomRed,1,Was mushroomFlyAgaric
+field_4069_ah,mushroomRed,1,
 field_406_a,timeSinceIgnited,1,The amount of time since the creeper was close enough to the player to ignite
-field_4070_ag,mushroomBrown,1,Was mushroomKingBolete
-field_4071_af,plantRed,1,Was rose
-field_4072_ae,plantYellow,1,Was dandelion
+field_4070_ag,mushroomBrown,1,
+field_4071_af,plantRed,1,
+field_4072_ae,plantYellow,1,
 field_4076_aV,blockSnow,1,
 field_4077_aU,ice,1,
 field_4082_aJ,signWall,1,
@@ -4595,7 +4777,7 @@ field_4126_f,zTile,1,"The tile this entity is on, Z position(unifying naming)"
 field_4128_e,entityRiderYawDelta,1,
 field_4129_aj,inGround,1,
 field_4130_d,entityRiderPitchDelta,1,
-field_4131_c,firstUpdate,1,this is true during the first update after this entity has spawned and false forever after that time
+field_4131_c,firstUpdate,1,
 field_4132_ai,inTile,1,
 field_4134_a,shake,1,
 field_4135_z,pickaxeDiamond,1,
@@ -4680,11 +4862,12 @@ field_4211_y,canBurn,1,Bool defining if the block can burn or not.
 field_4212_x,portal,1,Material used for portals
 field_4213_w,pumpkin,1,pumpkin
 field_4214_u,cactus,1,
+field_4215_q,unused,1,
 field_4216_o,glass,1,
 field_4217_k,cloth,1,
 field_4218_h,leaves,1,
 field_4223_v,biomesForGeneration,1,The biomes that are used to generate the chunk
-field_4224_q,noiseArray,1,
+field_4224_q,noiseArray,1,Holds the overall noise array used in chunk generation
 field_4225_h,noise6,1,A double array that holds terrain noise from noiseGen6
 field_4226_g,noise5,1,A double array that hold terrain noise from noiseGen5
 field_4227_f,noise2,1,A double array that hold terrain noise from noiseGen2
@@ -4692,14 +4875,23 @@ field_4228_e,noise1,1,A double array that hold terrain noise
 field_4229_d,noise3,1,A double array that hold terrain noise from noiseGen3
 field_422_ag,loadedChunks,1,LinkedList that holds loaded chunks
 field_4230_s,netherCaveGenerator,1,
-field_4231_r,netherrackExclusivityNoise,1,
+field_4231_r,netherrackExclusivityNoise,1,Holds the noise used to determine whether something other than netherrack can be generated at a location
 field_4232_q,gravelNoise,1,
-field_4233_p,slowsandNoise,1,
+field_4233_p,slowsandNoise,1,Holds the noise used to determine whether slowsand can be generated at a location
 field_4235_n,worldObj,1,Is the world that the nether is getting generated.
-field_4236_m,netherrackExculsivityNoiseGen,1,
-field_4237_l,slowsandGravelNoiseGen,1,
-field_4240_i,netherNoiseGen1,1,
+field_4236_m,netherrackExculsivityNoiseGen,1,Determines whether something other than nettherack can be generated at a location
+field_4237_l,slowsandGravelNoiseGen,1,Determines whether slowsand or gravel can be generated at a location
+field_4238_k,netherNoiseGen3,1,
+field_4239_j,netherNoiseGen2,1,
+field_4240_i,netherNoiseGen1,1,A NoiseGeneratorOctaves used in generating nether terrain
 field_4241_h,hellRNG,1,
+field_4242_g,noiseData5,1,
+field_4243_f,noiseData4,1,
+field_4244_e,noiseData3,1,
+field_4245_d,noiseData2,1,
+field_4246_c,noiseData1,1,
+field_4247_b,netherNoiseGen7,1,
+field_4248_a,netherNoiseGen6,1,
 field_4249_a,liquidBlockId,1,The ID of the liquid block used in this liquid generator.
 field_4250_a,hellLavaID,1,Stores the ID for WorldGenHellLava
 field_425_ad,itemInWorldManager,1,The ItemInWorldManager belonging to this player
@@ -4731,9 +4923,9 @@ field_430_ag,health,1,"The health of this EntityItem. (For example, damage for t
 field_4310_a,worldObj,1,
 field_4311_a,eligibleChunksForSpawning,1,The 17x17 area around the player where mobs can spawn
 field_433_ad,delayBeforeCanPickup,1,
-field_437_aj,ticksInAir,1,cant hit stuff first 5 ticks after you shoot it
-field_438_ai,ticksInGround,1,after so long in ground entity dies
-field_439_ah,shootingEntity,1,the entity that shot this arrow
+field_437_aj,ticksInAir,1,
+field_438_ai,ticksInGround,1,
+field_439_ah,shootingEntity,1,The owner of this arrow.
 field_44003_b,length,1,Length of the data to be read
 field_44004_c,data,1,Any data
 field_44005_a,channel,1,Name of the 'channel' used to send data
@@ -4747,14 +4939,19 @@ field_448_a,direction,1,the direction the painting faces
 field_452_ad,tickCounter1,1,
 field_46001_d,terrainType,1,
 field_46002_f,terrainType,1,
+field_46005_c,hasMadeChest,1,
+field_46006_a,chestLoot,1,
 field_46011_m,damage,1,
 field_46024_aI,entityLivingToAttack,1,"is only being set, has no uses as of MC 1.1"
 field_46025_aM,tasks,1,
-field_46026_Y,prevRotationYaw3,1,
-field_46027_X,prevRotationYaw2,1,
-field_46028_f,jumpHelper,1,
+field_46026_Y,prevRotationYawHead,1,Entity head rotation yaw at previous tick
+field_46027_X,rotationYawHead,1,Entity head rotation yaw
+field_46028_f,jumpHelper,1,Entity jumping helper
 field_46030_d,lookHelper,1,
 field_46031_e,moveHelper,1,
+field_46037_b,worldObj,1,
+field_46038_c,currentPath,1,The PathEntity being followed.
+field_46039_a,theEntity,1,
 field_46043_d,villageGen,1,
 field_46044_b,random,1,
 field_46045_c,useStructures,1,
@@ -4784,8 +4981,11 @@ field_46093_a,mutexBits,1,"A bitmask telling which other tasks may not run concu
 field_46098_c,entityTarget,1,
 field_46099_a,worldObj,1,
 field_46104_a,entity,1,
-field_46111_d,idleTime,1,
-field_46114_a,idleEntity,1,
+field_46105_a,theEntity,1,
+field_46111_d,idleTime,1,A decrementing tick that stops the entity from being idle once it reaches 0.
+field_46112_b,lookX,1,X offset to look at
+field_46113_c,lookZ,1,Z offset to look at
+field_46114_a,idleEntity,1,The entity that is looking idle.
 field_46117_b,isJumping,1,
 field_46118_a,entity,1,
 field_46120_b,terrainType,1,
@@ -4808,26 +5008,107 @@ field_48081_t,buildLimit,1,Maximum build height
 field_48096_A,villageCollectionObj,1,
 field_48097_O,villageSiegeObj,1,
 field_480_f,classToNameMap,1,A HashMap storing the classes and mapping to the string names (reverse of nameToClassMap).
-field_48128_bU,isBlockContainer,1,
+field_48103_f,includeInitialize,1,Whether to initialize the Chunk before applying the effect of the Packet51MapChunk.
+field_48104_g,tempLength,1,The length of the compressed chunk data byte array.
+field_48105_d,yChMax,1,"The y-position of the highest chunk Section in the transmitted chunk, in chunk coordinates."
+field_48106_e,chunkData,1,"The transmitted chunk data, decompressed."
+field_48107_b,zCh,1,"The z-position of the transmitted chunk, in chunk coordinates."
+field_48108_c,yChMin,1,"The y-position of the lowest chunk Section in the transmitted chunk, in chunk coordinates."
+field_48109_a,xCh,1,"The x-position of the transmitted chunk, in chunk coordinates."
+field_48111_i,temp,1,A temporary storage for the compressed chunk data byte array.
+field_48114_b,headRotationYaw,1,
+field_48115_a,entityId,1,
+field_48116_f,customParam2,1,Custom parameter 2 passed to the tile entity on update.
+field_48117_g,customParam3,1,Custom parameter 3 passed to the tile entity on update.
+field_48118_d,actionType,1,The type of update to perform on the tile entity.
+field_48119_e,customParam1,1,Custom parameter 1 passed to the tile entity on update.
+field_48120_b,yPosition,1,The Y position of the tile entity to update.
+field_48121_c,zPosition,1,The Z position of the tile entity to update.
+field_48122_a,xPosition,1,The X position of the tile entity to update.
+field_48128_bU,isBlockContainer,1,true if the Block contains a Tile Entity
 field_48129_bT,needsRandomTick,1,Flags whether or not this block is of a type that needs random ticking. Ref-counted by ExtendedBlockStorage in order to broadly cull a chunk from the random chunk update list for efficiency's sake.
-field_48130_bL,redstoneLampU,1,Redstone Lamp (unpowered state)
-field_48131_bM,redstoneLampP,1,Redstone Lamp (powered state)
-field_48141_a,childAnimal,1,
+field_48130_bL,redstoneLampIdle,1,
+field_48131_bM,redstoneLampActive,1,
+field_48137_a,powered,1,Whether this lamp block is the powered version.
+field_48139_b,parentAnimal,1,
+field_48141_a,childAnimal,1,The child that is following its parent.
+field_48147_a,theWolf,1,
+field_48148_d,movePosZ,1,
+field_48150_b,movePosX,1,
+field_48151_c,movePosY,1,
+field_48152_a,theEntity,1,
 field_48159_b,frontDoor,1,
 field_48160_a,entityObj,1,
-field_48161_b,leapTarget,1,
-field_48162_c,leapMotionY,1,
-field_48163_a,leaper,1,
+field_48161_b,leapTarget,1,The entity that the leaper is leaping towards.
+field_48162_c,leapMotionY,1,The entity's motionY after leaping.
+field_48163_a,leaper,1,The entity that is leaping.
 field_48165_b,targetVillager,1,
 field_48167_a,villagerObj,1,
+field_48169_b,theEntity,1,
+field_48171_a,theWorld,1,
+field_48172_d,insidePosZ,1,
+field_48173_b,doorInfo,1,
+field_48174_c,insidePosX,1,
 field_48175_a,entityObj,1,
+field_48178_g,rangedAttackID,1,The ID of this ranged attack AI. This chooses which entity is to be used as a ranged attack.
+field_48179_d,rangedAttackTime,1,A decrementing tick that spawns a ranged attack once this value reaches 0. It is then set back to the maxRangedAttackTime.
 field_48181_b,entityHost,1,The entity the AI instance has been applied to
 field_48182_c,attackTarget,1,
+field_48183_a,worldObj,1,
+field_48184_h,maxRangedAttackTime,1,The maximum time the AI has to wait before peforming another ranged attack.
+field_48188_d,entityPosZ,1,
+field_48189_e,targetDoor,1,
+field_48190_b,entityPosX,1,
+field_48191_c,entityPosY,1,
+field_48192_a,theEntity,1,
+field_48199_d,theAnimal,1,
 field_481_e,nameToClassMap,1,A HashMap storing string names of classes mapping to the actual java.lang.Class type.
-field_48268_a,temptedEntity,1,
-field_48269_l,scaredByPlayerMovement,1,
+field_48200_e,targetMate,1,
+field_48203_a,theWorld,1,
+field_48212_a,theEntity,1,
+field_48214_b,theGolem,1,
+field_48216_a,theVillager,1,
+field_48219_d,movePosY,1,
+field_48220_e,movePosZ,1,
+field_48221_b,targetEntity,1,
+field_48222_c,movePosX,1,
+field_48223_a,theEntity,1,
+field_48224_b,theVillager,1,
+field_48226_a,theGolem,1,
+field_48228_b,theEntity,1,
+field_48229_c,theWorld,1,
+field_48230_a,eatGrassTick,1,A decrementing tick used for the sheep's head offset and animation.
+field_48232_g,entityPathNavigate,1,The PathNavigate of our entity
+field_48237_a,theEntity,1,The entity we are attached to
+field_48238_h,targetEntityClass,1,The class of the entity we should avoid
+field_48239_a,theEntity,1,
+field_48242_b,closestEntity,1,The closest entity which is being watched by this one.
+field_48243_b,creeperAttackTarget,1,The creeper's attack target. This is used for the changing of the creeper's state.
+field_48244_a,swellingCreeper,1,The creeper that is swelling.
+field_48246_g,petPathfinder,1,
+field_48247_d,thePet,1,
+field_48248_e,theOwner,1,
+field_48249_b,maxDist,1,
+field_48250_c,minDist,1,
+field_48251_a,theWorld,1,
+field_48255_f,theWorld,1,
+field_48256_d,shelterZ,1,
+field_48258_b,shelterX,1,
+field_48259_c,shelterY,1,
+field_48260_a,theCreature,1,
+field_48268_a,temptedEntity,1,The entity using this AI that is tempted by the player.
+field_48269_l,scaredByPlayerMovement,1,Whether the entity using this AI will be scared by the tempter's sudden movement.
+field_48272_k,breedingFood,1,This field saves the ID of the items that can be used to breed entities with this behaviour.
+field_48273_h,temptingPlayer,1,The player that is tempting the entity that is using this AI.
+field_48274_i,delayTemptCounter,1,A counter that is decremented each time the shouldExecute method is called. The shouldExecute method will always return false if delayTemptCounter is greater than 0.
+field_48278_f,doorList,1,
+field_48279_d,doorInfo,1,
+field_48283_a,theEntity,1,
 field_48291_c,taskOwner,1,The entity that this task belongs to
+field_48297_b,targetClass,1,
+field_48298_a,targetEntity,1,
 field_482_d,zCoord,1,The z coordinate of the tile entity.
+field_48301_b,villageAgressorTarget,1,The aggressor of the iron golem's village which is now the golem's attack target.
 field_48302_a,irongolem,1,
 field_48308_d,worldObj,1,
 field_48309_e,matingTimeout,1,
@@ -4846,7 +5127,9 @@ field_48358_g,isPlayingFlag,1,
 field_48359_b,randomTickDivider,1,
 field_48360_c,isMatingFlag,1,
 field_48361_a,villageObj,1,
+field_48365_c,aiEatGrass,1,The eat grass AI task for this mob.
 field_48374_a,aiSit,1,
+field_48377_b,aiTempt,1,"The tempt AI task for this mob, used to prevent taming while it is fleeing."
 field_48387_a,villageObj,1,
 field_48388_bD,fireballCharge,1,Fire Charge. When used in a dispenser it fires a fireball similiar to a Ghast's.
 field_48389_bC,expBottle,1,Bottle o' Enchanting. Drops between 1 and 3 experience orbs when thrown.
@@ -4858,6 +5141,18 @@ field_48411_g,isPathingInWater,1,
 field_48412_e,isWoddenDoorAllowed,1,should the PathFinder go through wodden door blocks
 field_48413_h,canEntityDrown,1,tells the FathFinder to not stop pathing underwater
 field_48430_b,currentPathIndex,1,PathEntity Array Index the Entity is currently targeting
+field_48443_w,jungle,1,Jungle biome identifier
+field_48444_x,jungleHills,1,
+field_48454_f,generatorVersion,1,The int version of the ChunkProvider that generated this world.
+field_48455_g,canBeCreated,1,Whether this world type can be generated. Normally true; set to false for out-of-date generator versions.
+field_48456_d,DEFAULT_1_1,1,Default (1.1) world type.
+field_48457_b,DEFAULT,1,Default world type.
+field_48458_c,FLAT,1,Flat world type.
+field_48459_a,worldTypes,1,List of world types.
+field_48466_d,chunkSaveLocation,1,Save directory for chunks using the Anvil format
+field_48471_b,theEntity,1,
+field_48472_a,parent,1,
+field_48476_r,redstoneLight,1,
 field_48487_f,lastActivityTimestamp,1,
 field_48488_g,isDetachedFromVillageFlag,1,
 field_48489_d,insideDirectionX,1,
@@ -4880,11 +5175,16 @@ field_48545_i,villageAgressors,1,
 field_48548_b,canSeeCachePositive,1,
 field_48549_c,canSeeCacheNegative,1,
 field_48550_a,entityObj,1,
+field_48562_f,heightMap,1,
+field_48563_j,entityLists,1,Array of Lists containing the entities in this Chunk. Each List represents a 16 block subchunk.
+field_48564_s,queuedLightChecks,1,"Contains the current round-robin relight check index, and is implied as the relight check location as well."
+field_48565_q,blockBiomeArray,1,Contains a 16x16 mapping on the X/Z plane of the biome ID to which each colum belongs.
 field_48566_p,storageArrays,1,"Used to store block IDs, block MSBs, Sky-light maps, Block-light maps, and metadata. Each entry corresponds to a logical segment of 16x16x16 blocks, stacked vertically."
 field_48568_f,data,1,
 field_48569_g,blocks,1,
 field_48570_d,blockLight,1,
 field_48571_e,skyLight,1,
+field_48572_b,terrainPopulated,1,
 field_48573_c,heightmap,1,
 field_48574_a,lastUpdated,1,
 field_48575_l,z,1,
@@ -4894,11 +5194,13 @@ field_48578_h,entities,1,
 field_48579_i,tileEntities,1,
 field_48583_f,stringToIDMapping,1,Maps entity names to their numeric identifiers
 field_485_e,signText,1,An array of four strings storing the lines of text on the sign.
+field_48609_f,blockMetadataArray,1,Stores the metadata associated with blocks in this ExtendedBlockStorage.
 field_48610_g,blocklightArray,1,The NibbleArray containing a block of Block-light data.
 field_48611_d,blockLSBArray,1,Contains the least significant 8 bits of each block ID belonging to this block storage's parent Chunk.
 field_48612_e,blockMSBArray,1,Contains the most significant 4 bits of each block ID belonging to this block storage's parent Chunk.
 field_48613_b,blockRefCount,1,A total count of the number of non-air blocks in this block storage's Chunk.
 field_48614_c,tickRefCount,1,Contains the number of blocks in this block storage's parent chunk that require random ticking. Used to cull the Chunk from random tick updates for performance reasons.
+field_48615_a,yBase,1,Contains the bottom-most Y block represented by this ExtendedBlockStorage. Typically a multiple of 16.
 field_48616_h,skylightArray,1,The NibbleArray containing a block of Sky-light data.
 field_48619_b,depthBits,1,
 field_48620_c,depthBitsPlusFour,1,
@@ -4911,6 +5213,7 @@ field_48641_e,tickCounter,1,
 field_48642_b,villagerPositionsList,1,"This is a black hole. You can add data to this list through a public interface, but you can't query that information in any way and it's not used internally either."
 field_48643_c,newDoors,1,
 field_48644_a,worldObj,1,
+field_48645_a,parent,1,
 field_48670_f,noSunPathfind,1,
 field_486_h,furnaceCookTime,1,The number of ticks that the current item has been cooking for
 field_487_g,currentItemBurnTime,1,The number of ticks that a fresh copy of the currently-burning item would keep the furnace burning for
@@ -4991,10 +5294,10 @@ field_590_F,sand,1,
 field_591_aw,redstoneWire,1,
 field_592_E,lavaStill,1,Stationary lava source block
 field_593_av,chest,1,
-field_594_D,lavaMoving,1,Flowing lava block
-field_596_C,waterStill,1,Stationary water source block
+field_594_D,lavaMoving,1,
+field_596_C,waterStill,1,
 field_597_at,mobSpawner,1,
-field_598_B,waterMoving,1,Flowing water block
+field_598_B,waterMoving,1,
 field_599_as,fire,1,
 field_59_a,entityId,1,The entity ID.
 field_5_e,mcServer,1,Reference to the MinecraftServer object.
@@ -5020,7 +5323,7 @@ field_6044_a,entityId,1,
 field_6047_y,sapling,1,
 field_604_ao,bookShelf,1,
 field_605_an,tnt,1,
-field_6065_bd,glowStone,1,a brittle glass like substance found only in the nether
+field_6065_bd,glowStone,1,
 field_607_al,stairSingle,1,
 field_6084_a,localFlag,1,
 field_6088_a,graphicsLevel,1,"Used to determine how to display leaves based on the graphics level. May also be used in rendering for transparency, not sure."
@@ -5269,15 +5572,15 @@ field_9025_h,soundStoneFootstep,1,
 field_9026_g,soundGrassFootstep,1,
 field_9027_f,soundGravelFootstep,1,
 field_9028_e,soundWoodFootstep,1,
-field_9029_Z,pistonBase,1,Is the normal piston block.
-field_9030_Y,deadBush,1,BlockDeadBush
-field_9031_X,tallGrass,1,BlockTallGrass
-field_9032_W,web,1,Slows entities on collision.
-field_9033_V,pistonStickyBase,1,Is the sticky piston block.
-field_9034_U,railDetector,1,Minecart detector rail track.
-field_9035_bf,pumpkinLantern,1,The Jack-O-Lantern
-field_9036_T,railPowered,1,Powered rail track.
-field_9037_S,bed,1,the bed block's id
+field_9029_Z,pistonBase,1,
+field_9030_Y,deadBush,1,
+field_9031_X,tallGrass,1,
+field_9032_W,web,1,
+field_9033_V,pistonStickyBase,1,
+field_9034_U,railDetector,1,
+field_9035_bf,pumpkinLantern,1,
+field_9036_T,railPowered,1,
+field_9037_S,bed,1,
 field_9038_R,music,1,
 field_9039_Q,sandStone,1,
 field_9040_P,dispenser,1,
@@ -5310,7 +5613,7 @@ field_9072_N,fallDistance,1,
 field_9074_L,distanceWalkedModified,1,The distance walked multiplied by 0.6
 field_9075_K,prevDistanceWalkedModified,1,The previous ticks distance walked multiplied by 0.6
 field_9076_H,yOffset,1,
-field_9078_E,velocityChanged,1,EntityTrackerEntity sends Packet28EntityVelocity if set
+field_9078_E,velocityChanged,1,
 field_9079_ae,isImmuneToFire,1,
 field_9080_D,isCollided,1,True if after a move this entity has collided with something either vertically or horizontally
 field_9082_C,isCollidedVertically,1,True if after a move this entity has collided with something on Y-axis
diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv
index 16cd4d165..a2ba71391 100644
--- a/forge/conf/methods.csv
+++ b/forge/conf/methods.csv
@@ -68,12 +68,12 @@ func_1075_a,obtainImageData,0,"Return a ThreadDownloadImageData instance for the
 func_1076_b,bindTexture,0,
 func_1077_b,alphaBlend,0,"Uses the alpha of the two colors passed in to determine the contributions of each color.  If either of them has an alpha greater than 0 then the returned alpha is 255 otherwise its zero if they are both zero. Args: color1, color2"
 func_1078_a,deleteTexture,0,Deletes a single GL texture
-func_1079_a,createEntityInWorld,0,Creates an entity of the given name in the world.
+func_1079_a,createEntityByName,0,Create a new instance of an entity in the world by using the entity name.
 func_1080_a,addMapping,0,adds a mapping between Entity classes and both a string representation and an ID
 func_1081_a,createEntityFromNBT,0,create a new instance of an entity from NBT store
 func_1082_a,getEntityID,0,gets the entityID of a specific entity
-func_1083_b,getEntityString,0,gets the string representation of a specific entity
-func_1084_a,createEntity,0,create a new instance of an entity by using an entityID
+func_1083_b,getEntityString,0,Gets the string representation of a specific entity.
+func_1084_a,createEntityByID,0,Create a new instance of an entity in the world by using an entity ID.
 func_1085_a,splitStack,0,Remove the argument from the stack size. Return a new stack object with argument size.
 func_1086_a,writeToNBT,0,Write the stack fields to a NBT object. Return the new NBT object.
 func_1088_b,getIconIndex,0,Returns the icon index of the current stack.
@@ -117,7 +117,7 @@ func_1128_a,generateTextureNames,0,Generates texture names and stores them in th
 func_1129_a,addToPath,0,"Adds a path from start to end and returns the whole path (args: unused, start, end, unused, maxDistance)"
 func_1130_a,createEntityPathTo,0,Internal implementation of creating a path from an entity to a point
 func_1131_a,createEntityPathTo,0,Creates a path from an entity to a specified location within a minimum distance
-func_1132_a,getVerticalOffset,0,"Given an x y z, returns a vertical offset needed to search to find a block to stand on"
+func_1132_a,getVerticalOffset,0,"Checks if an entity collides with blocks at a position. Returns 1 if clear, 0 for colliding with any solid block, -1 for water(if avoiding water) but otherwise clear, -2 for lava, -3 for fence, -4 for closed trapdoor, 2 if otherwise clear except for open trapdoor or water(if not avoiding)"
 func_1133_b,findPathOptions,0,"populates pathOptions with available points and returns the number of options found (args: unused1, currentPoint, unused2, targetPoint, maxDistance)"
 func_1134_a,createEntityPath,0,Returns a new PathEntity for a given start and end point
 func_1135_a,getSafePoint,0,Returns a point that the entity can safely move to
@@ -332,7 +332,7 @@ func_20112_a,updateProgressBar,0,
 func_20114_a,updateCraftingResults,0,Updates crafting matrix; called from onCraftMatrixChanged. Args: none
 func_20115_a,putStacksInSlots,0,"places itemstacks in first x slots, x being aitemstack.lenght"
 func_20117_a,addSlot,0,adds the slot to the inventory it is in
-func_20118_a,getSlot,0,gets the nth slot
+func_20118_a,getSlot,0,
 func_20119_a,putStackInSlot,0,"args: slotID, itemStack to put in slot"
 func_20120_b,canInteractWith,0,
 func_20134_a,onInventoryChanged,0,Called by InventoryBasic.onInventoryChanged() on a array that is never filled.
@@ -367,8 +367,8 @@ func_21017_a,setContainerItem,0,
 func_21024_a,powerBlock,0,
 func_21025_b,damageDropped,0,Determines the damage on the item the block drops. Used in cloth and wood.
 func_21027_c_,fertilize,0,Apply bonemeal to the crops.
-func_21028_c,growTree,0,GrowSaplingIntoTree Attempts to grow a sapling into a tree
-func_21029_c,eatCakeSlice,0,"Heals the player and removes a slice from the cake. Args: world, x, y, z, entityPlayer"
+func_21028_c,growTree,0,Attempts to grow a sapling into a tree
+func_21029_c,eatCakeSlice,0,Heals the player and removes a slice from the cake.
 func_21030_a,calculateCurrentChanges,0,
 func_21032_h,setDispenserDefaultDirection,0,sets Dispenser block direction so that the front faces an non-opaque block; chooses west to be direction if all surrounding blocks are opaque.
 func_21033_c,dispenseItem,0,dispenses an item from a randomly selected item stack from the blocks inventory into the game world.
@@ -411,7 +411,7 @@ func_21111_d,canChunkExist,0,"Checks if the chunk coordinate could actually be s
 func_21114_a,setAllowedSpawnTypes,0,Set which types of mobs are allowed to spawn (peaceful vs hostile).
 func_21115_j,markBlockAsNeedsUpdate,0,calls the 'MarkBlockAsNeedsUpdate' in all block accesses in this world
 func_21116_c,playNoteAt,0,"plays a given note at x, y, z. args: x, y, z, instrument, note"
-func_21117_a,doChunksNearChunkExist,0,Checks if the chunks within (argument 4) chunks of the given block exist
+func_21117_a,doChunksNearChunkExist,0,Checks if any of the chunks within distance (argument 4) blocks of the given block exist
 func_21118_q,getChunkProvider,0,gets the IChunkProvider this world uses.
 func_21119_g,getProviderName,0,"Returns the name of the current chunk provider, by calling chunkprovider.makeString()"
 func_21124_a,addObject,0,"adds a new object to dataWatcher to watch, to update an already existing object see updateObject. Arguments: data Value Id, Object to add"
@@ -535,7 +535,7 @@ func_22144_v,getWorldInfo,0,Gets the World's WorldInfo instance
 func_22148_a,saveWorldInfoAndPlayer,0,saves level.dat and backs up the existing one to level.dat_old
 func_22149_a,getChunkLoader,0,Returns the chunk loader with the provided world provider
 func_22150_b,checkSessionLock,0,Checks the session lock to prevent save collisions
-func_22151_c,loadWorldInfo,0,Returns a freshly loaded worldInfo from the save
+func_22151_c,loadWorldInfo,0,Loads and returns the world info
 func_22152_a,saveWorldInfo,0,Saves the passed in world info.
 func_22153_a,getSaveDirectory,0,gets the File object corresponding to the base directory of this save (saves/404 for a save called 404 etc)
 func_22154_d,setSessionLock,0,Creates a session lock file for this process
@@ -616,7 +616,7 @@ func_22329_a,makeHash,0,
 func_22330_a,renderStandardBlockWithAmbientOcclusion,0,
 func_22331_p,renderBlockBed,0,render a bed at the given coordinates
 func_22332_q,renderBlockRepeater,0,render a redstone repeater at the given coordinates
-func_22393_a,compareChunkCoordinate,0,Compare the coordinate with another coordinate;
+func_22393_a,compareChunkCoordinate,0,Compare the coordinate with another coordinate
 func_223_g,canBlockStay,0,Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
 func_224_a,canCollideCheck,0,"Returns whether this block is collideable based on the arguments passed in Args: blockMetaData, unknownFlag"
 func_225_a,blockStrength,0,Defines whether or not a play can break the block with current tool.
@@ -642,6 +642,7 @@ func_245_h,isCollidable,0,"Returns if this block is collidable (only used by Fir
 func_246_f,getSelectedBoundingBoxFromPool,0,Returns the bounding box of the wired rectangular prism to render.
 func_247_b,randomDisplayTick,0,A randomly called display update to be able to add particles or other items for display
 func_249_b,isVecInsideXZBounds,0,Checks if a vector is within the X and Z bounds of the block.
+func_25004_a,getTailRotation,0,
 func_25005_a,renderWolf,0,
 func_25007_g,isDamageable,0,
 func_25008_a,onBlockDestroyed,0,
@@ -659,7 +660,7 @@ func_25030_F,getEntityToAttack,0,Returns current entities target
 func_25031_E,hasPath,0,Returns true if entity has a path to follow
 func_25032_c,setTarget,0,Sets entities target to attack
 func_25033_c,getInterestedAngle,0,
-func_25037_z,setTailRotation,0,
+func_25037_z,getTailRotation,0,
 func_25039_v,getWolfShaking,0,
 func_25040_C,isAngry,0,gets this wolf's angry state
 func_25041_c,setAngry,0,sets this wolf's angry state to true if the boolean argument is true
@@ -811,7 +812,7 @@ func_27161_C,isRaining,0,Returns true if the current rain strength is greater th
 func_27162_g,getRainStrength,0,Not sure about this actually. Reverting this one myself.
 func_27163_E,calculateInitialWeather,0,Called from World constructor to set rainingStrength and thunderingStrength
 func_27164_F,clearWeather,0,Stops all weather effects.
-func_27165_m,updateWeather,0,update's all weather states.
+func_27165_m,updateWeather,0,Updates all weather states.
 func_27166_f,getWeightedThunderStrength,0,
 func_27167_r,canLightningStrikeAt,0,
 func_27174_a,windowClick,0,
@@ -939,7 +940,7 @@ func_27463_a,parse,0,
 func_27464_d,aJsonValue,0,
 func_274_i,isWaterNearby,0,"returns true if there's water nearby (x-4 to x+4, y to y+1, k-4 to k+4)"
 func_275_h,isCropsNearby,0,"returns true if there is at least one cropblock nearby (x-1 to x+1, y+1, z-1 to z+1)"
-func_279_b,isPowerProviderOrWire,0,"Calls canProvidePower() on the specified block and returns the result, but bypasses the wiresProvidePower flag"
+func_279_b,isPowerProviderOrWire,0,"Returns true if the block coordinate passed can provide power, or is a redstone wire."
 func_28001_B,startThreadCheckHasPaid,0,
 func_28002_e,freeMemory,0,
 func_28003_b,onMinecraftCrash,0,
@@ -949,7 +950,7 @@ func_28011_a,updateMapData,0,
 func_28012_a,getMapData,0,
 func_28013_a,getMPMapData,0,
 func_28014_c,pushOutOfBlocks,0,"Adds velocity to push the entity out of blocks at the specified x, y, z position Args: x, y, z"
-func_28018_c,hasItemStack,0,Returns true if the specified itemstack exists in the inventory.
+func_28018_c,hasItemStack,0,Returns true if the specified ItemStack exists in the inventory.
 func_28021_c,getItemIcon,0,Gets the Icon Index of the item currently held
 func_28022_b,attackBlockedEntity,0,Used when an entity is close enough to attack but cannot be seen (Creeper de-fuse)
 func_28027_d,isBlockTranslucent,0,
@@ -1056,24 +1057,24 @@ func_31015_b,isExtending,0,Returns true if a piston is extending
 func_31016_a,getStoredBlockID,0,
 func_31017_b,getOffsetX,0,
 func_31026_E,updateWanderPath,0,Time remaining during which the Animal is sped up and flees.
-func_31027_a,dropBlockAsItem_do,0,drops the block as an item. Does nothing if a multiplayer world?
+func_31027_a,dropBlockAsItem_do,0,Spawns EntityItem in the world for the given ItemStack if the world is not remote.
 func_31028_l,setBlockUnbreakable,0,"This method will make the hardness of the block equals to -1, and the block is indestructible."
 func_31029_h,getMobilityFlag,0,"Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility and stop pistons"
 func_31030_b,getRenderColor,0,Returns the color this block should be rendered. Used by leaves.
 func_31031_m,getHardness,0,Returns the block hardness.
 func_31032_h,canPlaceTorchOn,0,Gets if we can place a torch on a block.
 func_31034_c,getTileEntityAtLocation,0,gets the piston tile entity at the specified location
-func_31035_a,getAxisAlignedBB,0,gets the axis-alignedbb of this piston
+func_31035_a,getAxisAlignedBB,0,
 func_31036_a,getTileEntity,0,gets a new TileEntityPiston created with the arguments provided.
 func_31039_c,determineOrientation,0,gets the way this piston should face for that entity that placed it.
 func_31040_i,getPistonExtensionTexture,0,Return the either 106 or 107 as the texture index depending on the isSticky flag. This will actually never get called by TileEntityRendererPiston.renderPiston() because TileEntityPiston.func_31012_k() will always return false.
 func_31041_f,isIndirectlyPowered,0,checks the block to that side to see if it is indirectly powered.
-func_31042_a,canPushBlock,0,Will determine if the block can be pushed by pistons
+func_31042_a,canPushBlock,0,returns true if the piston can push the specified block
 func_31043_h,updatePistonState,0,handles attempts to extend or retract the piston.
 func_31044_d,getOrientation,0,returns an int which describes the direction the piston faces
 func_31045_h,canExtend,0,checks to see if this piston could push the blocks in front of it.
 func_31046_e,isExtended,0,Determine if the metadata is related to something powered.
-func_31047_i,tryExtend,0,pushes the blocks in front of the piston (if possible)
+func_31047_i,tryExtend,0,attempts to extend the piston. returns false if impossible.
 func_31050_c,getDirectionMeta,0,
 func_31051_a,clearHeadTexture,0,
 func_31052_a_,setHeadTexture,0,
@@ -1155,7 +1156,7 @@ func_35023_a,addComponentParts,0,"'second Part of Structure generating, this for
 func_35027_a,findValidPlacement,0,Trys to find a valid place to put this component.
 func_35028_a,getNextComponentNormal,0,Gets the next component in any cardinal direction
 func_35029_c,getNextComponentZ,0,Gets the next component in the +/- Z direction
-func_35030_a,canStrongholdGoDeeper,0,'returns false if the Structure Bounding Box goes below 10'
+func_35030_a,canStrongholdGoDeeper,0,returns false if the Structure Bounding Box goes below 10
 func_35031_a,getRandomDoor,0,
 func_35032_b,getNextComponentX,0,Gets the next component in the +/- X direction
 func_35033_a,placeDoor,0,'builds a door of the enumerated types (empty opening is a door)'
@@ -1184,11 +1185,11 @@ func_35097_a,findValidPlacement,0,Trys to find a valid place to put this compone
 func_35099_a,findValidPlacement,0,Trys to find a valid place to put this component.
 func_350_p,updateRidden,0,Handles updating while being ridden by an entity
 func_35101_a,findValidPlacement,0,Trys to find a valid place to put this component.
-func_35105_a,getWorldChunkMngr,0,
-func_35112_o,setInWeb,0,Sets isInWeb to true
-func_35113_c,setSprinting,0,Sets the player's sprinting state.
+func_35105_a,getWorldChunkManager,0,
+func_35112_o,setInWeb,0,Sets the Entity inside a web block.
+func_35113_c,setSprinting,0,Set sprinting switch for Entity.
 func_35114_R,isEating,0,
-func_35115_a,getEntityBrightnessForRender,0,
+func_35115_a,getBrightnessForRender,0,
 func_35116_d,setEating,0,
 func_35117_Q,isSprinting,0,Get if the Entity is sprinting.
 func_35119_j_,getXpValue,0,Returns the XP value of this XP orb.
@@ -1199,7 +1200,7 @@ func_35142_x_,openChest,0,
 func_35143_b,onTileEntityPowered,0,
 func_35144_b,updateContainingBlockInfo,0,"causes the TileEntity to reset all it's cached values for it's container block, blockID, metaData and in the case of chests, the adjcacent chest check"
 func_35147_g,checkForAdjacentChests,0,performs the check for adjacent chests to determine if this chest is double or not.
-func_35157_d,hasItem,0,checks if item is in player inventory
+func_35157_d,hasItem,0,Get if a specifiied item id is inside the inventory.
 func_35158_d,onFinishedPotionEffect,0,
 func_35159_aC,getRenderSizeModifier,0,Returns render size modifier
 func_35160_a,isPotionActive,0,
@@ -1232,12 +1233,14 @@ func_35198_d,addExhaustion,0,increases exhaustion level by supplied amount
 func_35199_b,setItemInUse,0,"sets the itemInUse when the use item button is clicked. Args: itemstack, int maxItemUseDuration"
 func_351_a,moveFlying,0,Used in both water and by flying objects
 func_35200_b,onCriticalHit,0,is called when the player performs a critical hit on the Entity. Args: entity that was hit critically
+func_35201_a,updateItemUse,0,Plays sounds and makes particles for item in use state
 func_35202_aE,getSwingSpeedModifier,0,Returns the swing speed modifier
 func_35203_aG,increaseLevel,0,This method increases the player's experience level by one.
 func_35204_c,addExperience,0,This method increases the player's current amount of experience.
 func_35205_Y,getItemInUseCount,0,Returns the item in use count
 func_35206_ab,stopUsingItem,0,
 func_35207_ac,clearItemInUse,0,
+func_35208_ae,onItemUseFinish,0,"Used for when item use count runs out, ie: eating completed"
 func_35219_c,setXPStats,0,"Sets the current XP, total XP, and level number."
 func_35220_u_,getFOVMultiplier,0,Gets the player's field of view multiplier. (ex. when flying)
 func_35265_a,generateVines,0,Generates vines at the given position until it hits a block.
@@ -1248,7 +1251,7 @@ func_35275_c,getMixedBrightnessForBlock,0,"'Goes straight to getLightBrightnessF
 func_35276_e,getAmbientOcclusionLightValue,0,Returns the default ambient occlusion value based on block opacity
 func_35291_d,isFenceGateOpen,0,Returns if the fence gate is open according to its metadata.
 func_35293_c,fertilizeMushroom,0,Fertilize the mushroom.
-func_35294_i,fertilizeStem,0,Fertilizes a stem.
+func_35294_i,fertilizeStem,0,
 func_35295_j,getGrowthModifier,0,
 func_35298_d,canThisPaneConnectToThisBlockID,0,Gets passed in the blockID of the block adjacent and supposed to return true if its allowed to connect to the type of blockID passed in. Args: blockID
 func_35299_s,getSideTextureIndex,0,Returns the texture index of the thin side of the pane.
@@ -1268,6 +1271,7 @@ func_35322_a,joinServer,0,Join server by slot index
 func_35323_q,saveServerList,0,Save the server list to servers.dat
 func_35324_p,loadServerList,0,Load the server list from servers.dat
 func_35326_a,setSelectedServer,0,Set index of the currently selected server
+func_35327_a,setTooltipText,0,Sets a GUI's lag tooltip text.
 func_35328_b,pollServer,0,"Poll server for MOTD, lag, and player count/max"
 func_35329_c,getButtonSelect,0,Return buttonSelect GuiButton
 func_35330_a,joinServer,0,Join server by ServerNBTStorage
@@ -1416,7 +1420,7 @@ func_35713_a,markAvailableHeight,0,"'offsets the structure Bounding Boxes up to
 func_35714_b,updateBoundingBox,0,Calculates total bounding box based on components' bounding boxes and saves it to boundingBox
 func_35715_c,isSizeableStructure,0,"'currently only defined for Villages, returns true if Village has more than 2 non-road components'"
 func_35719_f,getGameType,0,
-func_35721_a,getChunkManager,0,Gives WorldChunkManager passed into BiomeChunk constructor.
+func_35721_a,getChunkManager,0,Get the world chunk manager object for a biome list.
 func_35723_d,getCachedBiomes,0,Returns the array of cached biome types in the BiomeCacheBlock at the given location.
 func_35724_a,cleanupCache,0,Removes BiomeCacheBlocks from this cache that haven't been accessed in at least 30 seconds.
 func_35725_a,getBiomeGenAt,0,"Returns the BiomeGenBase related to the x, z position from the cache."
@@ -1477,7 +1481,7 @@ func_35830_a,getKey,0,
 func_35835_b,setBrightness,0,
 func_35839_k,updateSkylight_do,0,Runs delayed skylight updates.
 func_35840_c,getPrecipitationHeight,0,Gets the height to which rain/snow will fall. Calculates it if not already stored.
-func_35841_j,updateSkylight,0,"Checks whether skylight needs updated; if it does, calls updateSkylight_do ( aka func_35839_k() )."
+func_35841_j,updateSkylight,0,"Checks whether skylight needs updated; if it does, calls updateSkylight_do"
 func_35842_d,updateSkylightNeighborHeight,0,
 func_35843_a,populateChunk,0,
 func_35847_b,getNextComponent,0,
@@ -1539,12 +1543,12 @@ func_373_s,getEyeHeight,0,
 func_374_q,preparePlayerToSpawn,0,Keeps moving the entity up so it isn't colliding with blocks and other requirements for this entity to be spawned (only actually used on players though its also on Entity)
 func_375_a,newDoubleNBTList,0,creates a NBT list from the array of doubles passed to this function
 func_376_c,setRotation,0,Sets the rotation of the entity
-func_377_a,newFloatNBTList,0,creates a NBT list from the array of floats passed to this function
+func_377_a,newFloatNBTList,0,Returns a new NBTTagList filled with the specified floats
 func_378_a,setPositionAndRotation2,0,"Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX, posY, posZ, yaw, pitch"
 func_379_d,getDistanceToEntity,0,Returns the distance to the entity. Args: entity
 func_380_f,applyEntityCollision,0,Applies a velocity to each of the entities pushing them away from each other. Args: entity
 func_381_o,isSneaking,0,Returns if this entity is sneaking.
-func_382_a,getEntityBrightness,0,Gets how bright this entity is.
+func_382_a,getBrightness,0,Gets how bright this entity is.
 func_383_b_,getCollisionBox,0,"Returns a boundingBox used to collide the entity with other entities and blocks. This enables the entity to be pushable on contact, like boats or minecarts."
 func_384_a,isInRangeToRenderDist,0,Checks if the entity is in range to render by using the past in distance and comparing it to its average edge length * 64 * renderDistanceWeight Args: distance
 func_385_d_,canBePushed,0,Returns true if this entity should push and be pushed by other entities when colliding.
@@ -1556,7 +1560,7 @@ func_391_y,onEntityUpdate,0,Gets called every tick from main Entity class
 func_392_h_,getShadowSize,0,
 func_393_a,isInsideOfMaterial,0,Checks if the current block the entity is within of the specified material type
 func_394_a,dropItemWithOffset,0,"Drops an item stack with a specified y offset. Args: itemID, count, yOffset"
-func_395_F,setEntityDead,0,Will get destroyed next tick
+func_395_F,setDead,0,Will get destroyed next tick.
 func_396_a,attackEntityFrom,0,Called when the entity is attacked.
 func_397_g_,handleWaterMovement,0,Returns if this entity is in water and will end up adding the waters velocity to the entity
 func_398_a,setWorld,0,Sets the reference to the World object.
@@ -1609,7 +1613,7 @@ func_400_c,fall,0,Called when the mob is falling. Calculates and applies fall da
 func_40100_q,getParticleTextureIndex,0,
 func_40112_aN,clearActivePotions,0,
 func_40113_j,setPositionAndUpdate,0,"Move the entity to the coordinates informed, but keep yaw/pitch values."
-func_40114_aH,getEntityHealth,0,
+func_40114_aH,getHealth,0,
 func_40115_d,applyArmorCalculations,0,"Reduces damage, depending on armor"
 func_40116_f,decreaseAirSupply,0,Decrements the entity's air supply when underwater
 func_40117_c,getMaxHealth,0,
@@ -1654,19 +1658,23 @@ func_4018_a,canHarvestBlock,0,Returns if the item (tool) can harvest results fro
 func_40195_b,copy,0,Creates a clone of the tag.
 func_40196_b,getTag,0,gets a generic tag with the specified name
 func_40198_a,quantityDroppedWithBonus,0,Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive).
-func_4019_b,useItemOnEntity,0,Called from ItemStack.useItemOnEntity
+func_4019_b,useItemOnEntity,0,Called when a player right clicks a entity with a item.
 func_401_c_,canBeCollidedWith,0,Returns true if other Entities should be prevented from moving through this Entity.
 func_4020_a,getDamageVsEntity,0,Returns the damage against a given entity.
 func_40212_d,isEnderEyeInserted,0,checks if an ender eye has been inserted into the frame block. parameters: metadata
+func_40218_g,displayDebuffEffects,0,Displays debuff/potion effects that are currently being applied to the player
 func_4021_a,hitEntity,0,Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack.
 func_4022_a,setIconIndex,0,Sets the icon index for this item. Returns the item.
 func_40233_a,enchantItem,0,enchants the item on the table using the specified slot; also deducts XP from player
 func_4023_b,shouldRotateAroundWhenRendering,0,Returns true if this item should be rotated by 180 degrees around the Y axis when being held in an entities hands.
 func_40244_a,calculateModifier,0,Generic method use to calculate modifiers of offensive or defensive enchantment values.
+func_40249_a,generateRandomEnchantName,0,Generates a random enchant name.
 func_4024_a,setStepSound,0,Sets the footstep sound for the block. Returns the object for convenience in constructing.
+func_40250_a,setRandSeed,0,Sets the seed for the enchant name RNG.
 func_4025_d,tickRate,0,How many world ticks before ticking
-func_4026_a,onBlockPlacedBy,0,"Called when a block is placed by using an ItemStack from inventory and passed in who placed it. Args: x,y,z,entityliving"
+func_4026_a,onBlockPlacedBy,0,Called when the block is placed in the world.
 func_40270_a,renderModel,0,Renders the model in RenderLiving
+func_40271_a,doRenderSheep,0,
 func_40274_a,scaleMagmaCube,0,
 func_40275_a,renderMagmaCube,0,
 func_40277_a,renderBlaze,0,
@@ -1707,7 +1715,7 @@ func_40403_e,hasEffect,0,
 func_40404_a,addInformation,0,allows items to add custom lines of information to the mouseover description
 func_40405_m,getPotionEffect,0,Returns a string representing what this item does to a potion.
 func_40406_n,isPotionIngredient,0,Returns true if this item serves as a potion ingredient (its ingredient information is not null).
-func_40407_b,setPotionEffect,0,gives this item the effects represented by the string for use in potion recipies
+func_40407_b,setPotionEffect,0,Sets the string representing this item's effect on a potion when used as an ingredient.
 func_4042_a,calculateVelocity,0,
 func_40431_c_,getEffects,0,Returns a list of effects for the specified potion damage value.
 func_40432_e,isEffectInstant,0,
@@ -1727,7 +1735,7 @@ func_40469_f,getEntrancePortalLocation,0,Gets the hard-coded portal location to
 func_40470_b,getMoonPhase,0,
 func_40471_p,isBlockHydratedDirectly,0,Checks if the block is hydrating itself.
 func_40472_j,getEntrancePortalLocation,0,Gets the hard-coded portal location to use when entering this dimension
-func_40473_b,getClosestVulnerablePlayer,0,"Returns the closest vulnerable player within the given radius, or null if none is found"
+func_40473_b,getClosestVulnerablePlayer,0,"Returns the closest vulnerable player within the given radius, or null if none is found."
 func_40474_a,getRandomMob,0,Gets a random mob for spawning in this world.
 func_40475_d,getMoonPhase,0,
 func_40476_b,isBlockHydrated,0,(I think)
@@ -1833,6 +1841,7 @@ func_40664_b,getProfilingData,0,Get profiling data
 func_4066_a,renderGameOverlay,0,"Render the ingame overlay with quick icon bar, ..."
 func_40670_a,render,0,Draw the six sided box defined by this ModelBox
 func_4067_a,parseIntWithDefault,0,
+func_40686_a,renderItemIn2D,0,Renders an item held in hand as a 2D texture with thickness
 func_40687_b,getSecondaryComponents,0,
 func_40688_a,createNextComponent,0,
 func_40689_a,getPrimaryComponents,0,
@@ -1910,6 +1919,7 @@ func_4102_a,canCoordinateBeSpawn,0,"Will check if the x, z position specified is
 func_41033_a,setBlockNames,0,sets the array of strings to be used for name lookups from item damage to metadata
 func_41039_c,renderBossHealth,0,Renders dragon's (boss) health on the HUD
 func_4103_a,onPickupFromSlot,0,Called when the player picks up an item from an inventory slot
+func_41041_e,respawnPlayer,0,Respawns the player.
 func_41049_c_,createStackedBlock,0,Returns an item stack containing a single instance of the current block type. 'i' is the block's subtype/damage and is ignored for blocks which do not support subtypes. Blocks which cannot be harvested should return null.
 func_4104_e,getSlotStackLimit,0,"Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case of armor slots)"
 func_41052_f,isValidSupportBlock,0,Checks if the block ID is a valid support block for the trap door to connect with. If it is not the trapdoor is dropped into the world.
@@ -1961,7 +1971,7 @@ func_4146_a,getFoliageColor,0,"Gets foliage color from temperature and humidity.
 func_4147_a,getGrassColor,0,"Gets grass color from temperature and humidity. Args: temperature, humidity"
 func_4148_a,saveScreenshot,0,Takes a screenshot and saves it to the screenshots directory. Returns the filename of the screenshot.
 func_4149_a,clearBoundingBoxPool,0,Sets the number of bounding boxes in use from the pool to 0 so they will be reused
-func_4150_a,isVecInside,0,Checks if the specified vector is within bounds of the bounding box. Args: vec3D
+func_4150_a,isVecInside,0,Returns if the supplied Vec3D is completely inside the bounding box
 func_4152_a,renderStandardBlockWithColorMultiplier,0,"Renders a standard cube block at the given coordinates, with a given color ratio.  Args: block, x, y, z, r, g, b"
 func_4153_a,getRandomSpawningPointInChunk,0,"Given a chunk, find a random position in it."
 func_4154_a,performSpawning,0,"The main spawning algorithm, spawns three random creatures of types in the subclass array"
@@ -1971,7 +1981,7 @@ func_417_b,updateRotation,0,"Arguments: current rotation, intended rotation, max
 func_418_b_,updateEntityActionState,0,
 func_419_b,onDeath,0,Called when the mob's health reaches 0.
 func_420_c,canEntityBeSeen,0,returns true if the entity provided in the argument can be seen. (Raytrace)
-func_421_b,getTalkInterval,0,"Get number of ticks, at least during which the living entity will be silent"
+func_421_b,getTalkInterval,0,"Get number of ticks, at least during which the living entity will be silent."
 func_422_g,getDropItemId,0,Returns the item ID for the item the mob drops on death.
 func_424_C,jump,0,"jump, Causes this entity to do an upwards motion (jumping)"
 func_425_j,onLivingUpdate,0,"Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons use this to react to sunlight and start to burn."
@@ -2030,6 +2040,7 @@ func_46034_a,onUpdateMoveHelper,0,
 func_46051_a,generate,0,
 func_46059_i,doesContainerItemLeaveCraftingGrid,0,"If this returns true, after a recipe involving this item is crafted the container item will be added to the player's inventory instead of remaining in the crafting grid."
 func_46064_i,getWorldHasNoSky,0,"returns true if there should be no sky, false otherwise"
+func_46065_j,getVoidFogYFactor,0,"Returns a double value representing the Y value relative to the top of the map at which void fog is at its maximum. The default factor of 0.03125 relative to 256, for example, means the void fog will be at its maximum at (256*0.03125), or 8."
 func_46066_g,getAverageGroundLevel,0,
 func_46068_G,getSeaLevel,0,Gets sea level for use in rendering the horizen.
 func_46069_a,onUpdateNavigation,0,
@@ -2056,6 +2067,7 @@ func_46129_a,setJumping,0,
 func_46130_b,doJump,0,Called to actually make the entity jump if isJumping is true.
 func_46133_t,getTerrainType,0,
 func_46135_a,parseWorldType,0,
+func_46136_a,getTranslateName,0,Gets the translation key for the name of this world type.
 func_46141_a,setLookPositionWithEntity,0,Sets position to look at using entity
 func_46142_a,onUpdateLook,0,Updates look
 func_46143_a,setLookPosition,0,Sets position to look at
@@ -2091,6 +2103,7 @@ func_48091_aU,getHomePosition,0,
 func_48092_c,setAttackTarget,0,Sets the active target the Task system uses for tracking
 func_48093_aT,isWithinHomeDistanceCurrentPosition,0,Returns true if entity is within home distance from current position
 func_48094_aS,getAttackTarget,0,Gets the active target the Task system uses for tracking
+func_48095_u,eatGrassBonus,0,This function applies the benefits of growing back wool and faster growing up to the acting entity. (This function is used in the AIEatGrass)
 func_48096_f,isWithinHomeDistance,0,
 func_48097_s_,updateAITick,0,"main AI tick function, replaces updateEntityActionState"
 func_48099_aV,getMaximumHomeDistance,0,
@@ -2104,6 +2117,8 @@ func_48126_w_,getIsMatingFlag,0,
 func_48127_b,setIsPlayingFlag,0,
 func_48128_a,setIsMatingFlag,0,
 func_48129_t,getProfession,0,
+func_48134_p_,resetInLove,0,
+func_48136_o_,isInLove,0,Returns if the entity is currently in 'love mode'.
 func_48138_b,setTamed,0,
 func_48139_F_,isTamed,0,
 func_48141_af,isSitting,0,
@@ -2111,13 +2126,21 @@ func_48143_a,setOwner,0,
 func_48144_ah,getOwner,0,
 func_48145_ag,getOwnerName,0,
 func_48151_a,dropPlayerItemWithRandomChoice,0,"Args: itemstack, flag"
-func_48153_a,dropPlayerItem,0,Args: itemstack
+func_48152_as,dropOneItem,0,Called when player presses the drop item key
+func_48153_a,dropPlayerItem,0,Args: itemstack - called when player drops an item stack that's not in his inventory (like items still placed in a workbench while the workbench'es GUI gets closed)
+func_48180_b,markBlockNeedsUpdate2,0,As of mc 1.2.3 this method has exactly the same signature and does exactly the same as markBlockNeedsUpdate
 func_48184_b,getSpeed,0,
+func_48187_a,setMoveTo,0,Sets the speed and location to move to
 func_481_b,writeToNBT,0,Writes a tile entity to NBT.
 func_48203_o,getTickRandomly,0,Returns whether or not this block is of a type that needs random ticking. Called for ref-counting purposes by ExtendedBlockStorage in order to broadly cull a chunk from the random chunk update list for efficiency's sake.
 func_48204_b,getBlocksMovement,0,
+func_48205_p,hasTileEntity,0,
 func_48206_g,isNormalCube,0,
+func_48211_a,tryToCatchBlockOnFire,0,
+func_48212_i,getFullMetadata,0,Returns the full metadata value created by combining the metadata of both blocks the door takes up.
 func_48214_g,getDoorOrientation,0,"Returns 0, 1, 2 or 3 depending on where the hinge is."
+func_48216_a,getDirection,0,Returns the orentation value from the specified metadata
+func_48296_h,findPossibleShelter,0,
 func_482_a,readFromNBT,0,Reads a tile entity from NBT.
 func_48337_h,checkSufficientDoorsPresentForNewVillager,0,
 func_48338_a,spawnHeartParticles,0,
@@ -2125,23 +2148,33 @@ func_48339_i,giveBirth,0,
 func_48366_h,doRangedAttack,0,Performs a ranged attack according to the AI's rangedAttackID.
 func_483_c,updateDelay,0,Sets the delay before a new spawn (base delay of 200 + random number up to 600).
 func_48411_i,getFloatTemperature,0,Gets a floating point representation of this biome's temperature
+func_48412_k,getBiomeFoliageColor,0,Provides the basic foliage color based on the biome temperature and rainfall
+func_48413_d,isHighHumidity,0,Checks to see if the rainfall level of the biome is extremely high
 func_48414_h,getFloatRainfall,0,Gets a floating point representation of this biome's rainfall
+func_48415_j,getBiomeGrassColor,0,Provides the basic grass color based on the biome temperature and rainfall
 func_48442_a,clamp_float,0,"Returns the value of the first parameter, clamped to be within the lower and upper limits given by the second and third parameters"
-func_48453_b,getWorldHeight,0,Returns current world height
+func_48453_b,getHeight,0,Returns current world height.
+func_48454_a,getBiomeGenForCoords,0,Gets the biome for a given set of x/z coordinates
+func_48455_z,isBlockHighHumidity,0,"Checks to see if the biome rainfall values for a given x,y,z coordinate set are extremely high"
 func_48459_a,findNearestEntityWithinAABB,0,
 func_48460_a,getEntityPathToXYZ,0,
 func_48463_a,getPathEntityToEntity,0,
 func_48480_a,canSee,0,"Checks, whether 'our' entity can see the entity given as argument (true) or not (false), caching the result."
-func_48481_a,clearSensingCache,0,Returns the squared distance between this door and the given coordinate.
+func_48481_a,clearSensingCache,0,Clears canSeeCachePositive and canSeeCacheNegative.
 func_48485_a,load,0,
 func_48486_a,convertToAnvilFormat,0,
+func_48488_a,handleEntityHeadRotation,0,
+func_48489_a,handleTileEntityData,0,
 func_48491_o,enqueueRelightChecks,0,"Called once-per-chunk-per-tick, and advances the round-robin relight check index by up to 8 blocks at a time. In a worst-case scenario, can potentially take up to 25.6 seconds, calculated via (4096/8)/20, to re-check all blocks in a chunk, which may explain lagging light updates on initial world generation."
+func_48492_c,getAreLevelsEmpty,0,Returns whether the ExtendedBlockStorages containing levels (in blocks) from arg 1 to arg 2 are fully empty (true) or not (false).
 func_48493_m,getBiomeArray,0,Returns an array containing a 16x16 mapping on the X/Z of block positions in this Chunk to biome IDs.
 func_48495_i,getBlockStorageArray,0,Returns the ExtendedBlockStorage array for this Chunk.
 func_48496_n,resetRelightChecks,0,Resets the relight check index to 0 for this Chunk.
 func_48497_a,setBiomeArray,0,Accepts a 256-entry array that contains a 16x16 mapping on the X/Z plane of block positions in this Chunk to biome IDs.
 func_48498_h,getTopFilledSegment,0,Returns the topmost ExtendedBlockStorage instance for this Chunk that actually contains a block.
+func_48499_b,getBlockLightOpacity,0,
 func_484_a,anyPlayerInRange,0,Returns true if there is a player in range (using World.getClosestPlayer)
+func_48500_a,setStorageArrays,0,
 func_48507_a,onCrafting,0,
 func_48508_a,get,0,
 func_48519_e,isBlockDoor,0,
@@ -2189,18 +2222,33 @@ func_48591_c,getInsidePosZ,0,
 func_48592_b,getInsidePosY,0,
 func_48593_b,getInsideDistanceSquare,0,Get the square of the distance from a location 2 blocks away from the door considered 'inside' and the given arguments
 func_485_a,isBurning,0,Returns true if the furnace is currently burning
+func_48614_a,isAllowedCharacter,0,
 func_48619_a,setTerrainType,0,
+func_48625_a,setCanBeCreated,0,"Sets canBeCreated to the provided value, and returns this."
+func_48627_d,getCanBeCreated,0,Gets whether this WorldType can be used to generate a new world.
+func_48630_c,getGeneratorVersion,0,Returns generatorVersion.
 func_48640_a,getCurrentNodeVec3d,0,returns the current PathEntity target node as Vec3D
 func_48641_b,setCurrentPathLength,0,
 func_48642_c,setCurrentPathIndex,0,
 func_48643_e,getCurrentPathIndex,0,
 func_48644_d,getCurrentPathLength,0,
 func_48645_c,getFinalPathPoint,0,returns the last PathPoint of the Array
+func_48646_a,getVectorFromIndex,0,Gets the vector of the PathPoint associated with the given index.
 func_48648_a,getPathPointFromIndex,0,"return the PathPoint located at the specified PathIndex, usually the current one"
 func_48655_c,getDistanceSquared,0,Returns the squared distance between this coordinates and the coordinates given as argument.
 func_48656_a,set,0,
 func_48659_j,canNavigate,0,If on ground or swimming and can swim
+func_48660_a,setSpeed,0,Sets the speed
+func_48661_h,getEntityPosition,0,
+func_48662_a,isDirectPathBetweenPoints,0,"Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: pos1, pos2, entityXSize, entityYSize, entityZSize"
+func_48668_i,getPathableYPos,0,Gets the safe pathing Y position for the entity depending on if it can path swim or not
+func_48670_c,getPath,0,gets the actively used PathEntity
+func_48671_a,getPathToXYZ,0,Returns the path to the given coordinates
+func_48672_f,clearPathEntity,0,sets active PathEntity to null
+func_48673_b,setBreakDoors,0,
 func_48674_g,pathFollow,0,
+func_48675_a,isSafeToStandAt,0,"Returns true when an entity could stand at a position, including solid blocks under the entire entity. Args: xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ"
+func_48676_b,isPositionClear,0,"Returns true if an entity does not collide with any solid blocks at the position. Args: xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ"
 func_48677_l,removeSunnyPath,0,Trims path data from the end to the first sun covered block
 func_48678_a,setPath,0,"sets the active path data if path is 100% unique compared to old path, checks to adjust path for sun avoiding ents and stores end coords"
 func_48690_b,setExtBlockMetadata,0,Sets the metadata of the Block at the given coordinates in this ExtendedBlockStorage to the given metadata.
@@ -2267,7 +2315,7 @@ func_534_a,populate,0,Populates chunk with ores etc etc
 func_535_a,saveChunks,0,"Two modes of operation: if passed true, save all Chunks in one go.  If passed false, save up to two chunks.  Return true if all chunks have been saved."
 func_536_b,canSave,0,Returns if the IChunkProvider supports saving.
 func_537_a,chunkExists,0,"Checks to see if a chunk exists at x, y"
-func_538_d,loadChunk,0,Creates an empty chunk ready to put data from the server in
+func_538_d,loadChunk,0,loads or generates the chunk at the chunk location specified
 func_540_b,saveChunk,0,"Save a given Chunk, recording the time in lastSaveTime"
 func_541_a,saveExtraChunkData,0,"Save extra data associated with this Chunk not normally saved during autosave, only during chunk unload.  Currently unused."
 func_547_b,drawString,0,Renders the specified text to the screen.
@@ -2389,7 +2437,7 @@ func_6372_a,addSound,0,"Adds a sounds with the name from the file. Args: name, f
 func_6373_b,addStreaming,0,Adds an audio file to the streaming SoundPool.
 func_6374_c,addMusic,0,Adds an audio file to the music SoundPool.
 func_6375_a,setVelocity,0,"Sets the velocity to the args. Args: x, y, z"
-func_6376_z,getEntityTexture,0,returns the directory and filename as a String
+func_6376_z,getTexture,0,Returns the texture's file path as a String.
 func_6377_h,mountEntity,0,"Called when a player mounts an entity. e.g. mounts a pig, mounts a boat."
 func_6378_b,onCollideWithPlayer,0,Called by a player entity when they collide with an entity
 func_6389_d,getLivingSound,0,Returns the sound this mob makes while it's alive.
@@ -2640,7 +2688,7 @@ func_900_a,setScheduledTime,0,Sets the scheduled time for this tick entry
 func_902_b,getScaledHeight,0,
 func_903_a,getScaledWidth,0,
 func_904_a,updateTimer,0,Updates all fields of the Timer using the current time
-func_905_b,setupOverlayRendering,0,setup overlay rendering
+func_905_b,setupOverlayRendering,0,Setup orthogonal projection for rendering GUI screen overlays
 func_908_a,setFogColorBuffer,0,Update and return fogColorBuffer with the RGBA values passed as arguments
 func_910_a,getMouseOver,0,Finds what block or object the mouse is over at the specified partial tick time. Args: partialTickTime
 func_911_a,updateRenderer,0,Updates the entity renderer
@@ -2715,11 +2763,11 @@ func_980_b,setNormal,0,Sets the normal for the current draw call.
 func_981_a,setTextureUV,0,Sets the texture coordinates.
 func_982_a,draw,0,Draws the data set up in this tessellator and resets the state to prepare for new drawing.
 func_983_a,addVertexWithUV,0,"Adds a vertex specifying both x,y,z and the texture u,v for it."
-func_984_b,setTranslationD,0,Sets the translation for all vertices in the current draw call. (D suffix indicates double parameters)
+func_984_b,setTranslation,0,Sets the translation for all vertices in the current draw call.
 func_985_d,reset,0,Clears the tessellator state in preparation for new drawing.
 func_986_a,setColorRGBA_F,0,"Sets the RGBA values for the color, converting from floats between 0 and 1 to integers from 0-255."
 func_987_a,setColorOpaque_F,0,"Sets the RGB values as specified, converting from floats between 0 and 1 to integers from 0-255."
-func_988_c,setTranslationF,0,Sets the translation for all vertices in the current draw call. (F suffix indicates float parameters)
+func_988_c,addTranslation,0,Offsets the translation for all vertices in the current draw call.
 func_989_c,disableColor,0,Disables colors for the current draw call.
 func_990_b,setColorOpaque_I,0,Sets the color to the given opaque value (stored as byte values packed in an integer).
 func_991_a,addVertex,0,"Adds a vertex with the specified x,y,z to the current draw call. It will trigger a draw() if the buffer gets full."
@@ -2738,7 +2786,7 @@ func_103_e,getDistance,1,"Gets the distance to the position. Args: x, y, z"
 func_104_p,getEyeHeight,1,
 func_106_b_,onUpdate,1,Called to update the entity's position/logic.
 func_107_c,setLocationAndAngles,1,Sets the location and Yaw/Pitch of an entity in the world
-func_108_b,getEntityBrightness,1,Gets how bright this entity is.
+func_108_b,getBrightness,1,Gets how bright this entity is.
 func_109_s,getEntityString,1,Returns the string that identifies this Entity's class
 func_110_a,isInsideOfMaterial,1,Checks if the current block the entity is within of the specified material type
 func_112_q,handleLavaMovement,1,Whether or not the current entity is in lava
@@ -2746,7 +2794,7 @@ func_113_a,setSize,1,"Sets the width and height of the entity. Args: width, heig
 func_114_a,fall,1,Called when the mob is falling. Calculates and applies fall damage.
 func_115_v,updateRidden,1,Handles updating while being ridden by an entity
 func_117_x,getYOffset,1,Returns the Y Offset of this entity.
-func_118_j,setEntityDead,1,Will get destroyed next tick
+func_118_j,setDead,1,Will get destroyed next tick.
 func_119_o,handleWaterMovement,1,Returns if this entity is in water and will end up adding the waters velocity to the entity
 func_11_a,handleBlockItemSwitch,1,
 func_12001_a,handleExplosion,1,
@@ -2869,11 +2917,11 @@ func_20116_b,isItemStackEqual,1,compares ItemStack argument to the instance Item
 func_20117_a,copyItemStack,1,"Creates a copy of a ItemStack, a null parameters will return a null."
 func_20118_a,splitStack,1,Remove the argument from the stack size. Return a new stack object with argument size.
 func_20119_a,areItemStacksEqual,1,compares ItemStack argument1 with ItemStack argument2; returns true if both ItemStacks are equal
-func_20120_a,getSlot,1,retrieve the slot from the crafting inventory
+func_20120_a,getSlot,1,
 func_20121_a,onCraftMatrixChanged,1,Callback for when the crafting matrix is changed.
 func_20122_a,addSlot,1,adds the slot to the inventory it is in
 func_20124_c,getCanCraft,1,gets whether or not the player can craft in this inventory or not
-func_20125_a,updateCraftingResults,1,update the crafting matrix
+func_20125_a,updateCraftingResults,1,Updates crafting matrix; called from onCraftMatrixChanged. Args: none
 func_20126_b,canInteractWith,1,
 func_20128_a,onCraftGuiOpened,1,
 func_20129_a,setCanCraft,1,sets whether the player can craft in this inventory or not
@@ -2900,7 +2948,7 @@ func_21003_a,handleEntityPainting,1,Packet handler
 func_21004_a,handlePlayNoteBlock,1,
 func_21024_a,powerBlock,1,
 func_21025_b,damageDropped,1,Determines the damage on the item the block drops. Used in cloth and wood.
-func_21027_b,growTree,1,grows a tree from a sapling block.
+func_21027_b,growTree,1,Attempts to grow a sapling into a tree
 func_21028_c,fertilize,1,Apply bonemeal to the crops.
 func_21030_c,eatCakeSlice,1,Heals the player and removes a slice from the cake.
 func_21031_a,calculateCurrentChanges,1,
@@ -2910,8 +2958,8 @@ func_21035_g,setDispenserDefaultDirection,1,sets Dispenser block direction so th
 func_21036_b,dispenseItem,1,dispenses an item from a randomly selected item stack from the blocks inventory into the game world.
 func_21039_p,getDataWatcher,1,
 func_21040_a,entityDropItem,1,Drops an item at the position of the entity.
-func_21041_a,setFlag,1,Sets the specified flag to the specified value in DataWatcher byte object 0
-func_21042_c,getFlag,1,Gets the specified flag from DataWatcher byte object 0
+func_21041_a,setFlag,1,"Enable or disable a entity flag, see getEntityFlag to read the know flags."
+func_21042_c,getFlag,1,Returns true if the flag is active for the entity. Known flags: 0) is burning; 1) is sneaking; 2) is riding something; 3) is sprinting; 4) is eating
 func_21043_b,setSneaking,1,Sets the sneaking flag.
 func_21044_a,entityInit,1,
 func_21046_d_,canBreatheUnderwater,1,
@@ -2936,8 +2984,8 @@ func_21083_d,storePartialItemStack,1,This function stores as many items of an It
 func_21084_a,getStackInRowAndColumn,1,"Returns the itemstack in the slot specified (Top left is 0, 0). Args: row, column"
 func_21086_c,setMaxStackSize,1,
 func_21087_f,getContainerItem,1,
-func_21088_g,hasContainerItem,1,returns wether the item has a containerItem
-func_21089_a,getMetadata,1,"returns the argument if the item has metadata, 0 otherwise"
+func_21088_g,hasContainerItem,1,True if this Item has a container item (a.k.a. crafting result)
+func_21089_a,getMetadata,1,Returns the metadata of the block which this Item (ItemBlock) can place
 func_21090_d,setMaxDamage,1,set max damage of an Item
 func_21091_a,setHasSubtypes,1,
 func_21092_c,getHasSubtypes,1,
@@ -2950,7 +2998,7 @@ func_21105_a,getCreatureClass,1,
 func_21114_a,getRandomWorldGenForTrees,1,Gets a WorldGen appropriate for this biome.
 func_21116_a,setAllowedSpawnTypes,1,first boolean for hostile mobs and second for peaceful mobs
 func_21117_c,playNoteAt,1,"plays a given note at x, y, z. args: x, y, z, instrument, note"
-func_21118_a,doChunksNearChunkExist,1,Checks if the chunks within (argument 4) chunks of the given block exist
+func_21118_a,doChunksNearChunkExist,1,Checks if any of the chunks within distance (argument 4) blocks of the given block exist
 func_21119_h,markBlockAsNeedsUpdate,1,calls the 'MarkBlockAsNeedsUpdate' in all block accesses in this world
 func_21125_h,getItemDamage,1,gets the damage of an itemstack
 func_21126_d,isItemStackDamageable,1,true if this itemStack is damageable
@@ -3032,12 +3080,12 @@ func_22083_p,wakeUpAllPlayers,1,Wakes up all players in the world.
 func_22084_q,isAllPlayersFullyAsleep,1,Returns whether or not all players in the world are fully asleep.
 func_22085_d,setEntityDead,1,"Dismounts the entity (and anything riding the entity), sets the dead flag, and removes the player entity from the player entity list. Called by the playerLoggedOut function."
 func_22086_b,createChunkProvider,1,Creates the chunk provider for this world. Called in the constructor. Retrieves provider from worldProvider?
-func_22090_d,getPlayerNBTManager,1,does exactly what it says on the tin
+func_22090_d,getPlayerNBTManager,1,
 func_22091_b,checkSessionLock,1,Checks the session lock to prevent save collisions
 func_22092_a,getChunkLoader,1,initializes and returns the chunk loader for the specified world provider
 func_22094_a,saveWorldInfo,1,used to update level.dat from old format to MCRegion format
 func_22095_a,saveWorldInfoAndPlayer,1,saves level.dat and backs up the existing one to level.dat_old
-func_22096_c,loadWorldInfo,1,"Attempts to load first level.dat, then level.dat_old from disk. Called when the server first starts."
+func_22096_c,loadWorldInfo,1,Loads and returns the world info
 func_22097_a,getWorldDirectory,1,Gets the File object corresponding to the base directory of this world.
 func_22098_f,setSessionLock,1,Creates a session lock file for this process
 func_220_f,canBlockStay,1,Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
@@ -3109,7 +3157,7 @@ func_230_a,velocityToAddToEntity,1,"Can add to the passed in vector for a moveme
 func_231_a,setTickRandomly,1,Sets whether this block type will receive random update ticks
 func_232_b,setResistance,1,Sets the the blocks resistance to explosions. Returns the object for convenience in constructing.
 func_233_a,setBlockBoundsBasedOnState,1,"Updates the blocks bounds based on its current state. Args: world, x, y, z"
-func_234_b,onNeighborBlockChange,1,"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, blockID"
+func_234_b,onNeighborBlockChange,1,"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_235_b,onBlockClicked,1,"Called when the block is clicked by a player. Args: x, y, z, entityPlayer"
 func_236_c,isVecInsideXYBounds,1,Checks if a vector is within the X and Y bounds of the block.
 func_237_c,setHardness,1,Sets how many hits it takes to break a block.
@@ -3193,7 +3241,7 @@ func_262_a,collisionRayTrace,1,"Ray traces through the blocks collision from sta
 func_263_a,onEntityCollidedWithBlock,1,"Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity"
 func_264_a,getCollidingBoundingBoxes,1,"Adds to the supplied array any colliding bounding boxes with the passed in bounding box. Args: world, x, y, z, axisAlignedBB, arrayList"
 func_265_f,getChanceToEncourageFire,1,"Retrieves a specified block's chance to encourage their neighbors to burn and if the number is greater than the current number passed in it will return its number instead of the passed in one.  Args: world, x, y, z, curChanceToEncourageFire"
-func_267_a,setBurnRate,1,"Sets the burn rate for a block. The larger abilityToCatchFire the more easily it will catch on fire Args: blockID, unknown1, abilityToCatchFire"
+func_267_a,setBurnRate,1,"Sets the burn rate for a block. The larger abilityToCatchFire the more easily it will catch. The larger chanceToEncourageFire the faster it will burn and spread to other blocks. Args: blockID, chanceToEncourageFire, abilityToCatchFire"
 func_268_g,canNeighborBurn,1,Returns true if at least one block next to this one can burn.
 func_269_b,canBlockCatchFire,1,"Checks the specified block coordinate to see if it can catch fire.  Args: blockAccess, x, y, z"
 func_26_a,handleBlockDig,1,
@@ -3204,7 +3252,7 @@ func_27006_b,getHasStack,1,Returns if this slot contains a stack.
 func_27008_Y,isWet,1,Checks if this entity is either in water or on an open air block in rain (used in wolves).
 func_27009_a,onStruckByLightning,1,Called when a lightning bolt hits the entity.
 func_27010_a,onKillEntity,1,This method gets called when the entity kills another one.
-func_27011_Z,isInWater,1,Returns whether the entity is in water.
+func_27011_Z,isInWater,1,Checks if this entity is inside water (if inWater field is true as a result of handleWaterMovement() returning true)
 func_27013_Q,despawnEntity,1,Makes the entity despawn if requirements are reached
 func_27014_t,getPowered,1,Returns true if the creeper is powered by a lightning bolt.
 func_27015_h,addMountedMovementStat,1,"Adds a value to a mounted movement statistic field - by minecart, boat, or pig."
@@ -3276,10 +3324,10 @@ func_28020_c,onCreated,1,Called when item is crafted/smelted. Used only by maps
 func_28022_b,getUpdatePacket,1,
 func_28023_a,getMapData,1,
 func_28024_a,updateMapData,1,
-func_28025_b,renderAsNormalBlock,1,"If this block doesn't render as an ordinary block it will return false (examples: signs, buttons, stairs, etc)"
+func_28025_b,renderAsNormalBlock,1,"If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)"
 func_28026_e,canPlaceBlockOnSide,1,checks to see if you can place this block can be placed on that side of a block: BlockLever overrides
 func_28027_k,setRequiresSelfNotify,1,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_28028_f,initializeBlock,1,"called after adding all blocks, only implemented in BlockFire. Sets al the burn rates."
+func_28028_f,initializeBlock,1,This method is called on a block after all other blocks gets already created. You can use it to reference and configure something on the block that needs the others ones.
 func_28035_b_,ejectRecord,1,Ejects the current record inside of the jukebox.
 func_28038_d,isTrapdoorOpen,1,
 func_28039_c,setBlockBoundsForBlockRender,1,
@@ -3370,19 +3418,19 @@ func_31010_c,isExtending,1,Returns true if a piston is extending
 func_31011_k,clearPistonTileEntity,1,"removes a pistons tile entity (and if the piston is moving, stops it)"
 func_31012_a,getStoredBlockID,1,
 func_31021_B,updateWanderPath,1,Time remaining during which the Animal is sped up and flees.
-func_31024_a,dropBlockAsItem_do,1,drops the block as an item. Does nothing if a singleplayer world?
-func_31025_e,getMobilityFlag,1,returns the mobility flag of a block's material
-func_31026_j,getHardness,1,returns the hardness of a block.
+func_31024_a,dropBlockAsItem_do,1,Spawns EntityItem in the world for the given ItemStack if the world is not remote.
+func_31025_e,getMobilityFlag,1,"Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility and stop pistons"
+func_31026_j,getHardness,1,Returns the block hardness.
 func_31027_i,setBlockUnbreakable,1,"This method will make the hardness of the block equals to -1, and the block is indestructible."
 func_31028_g,canPlaceTorchOn,1,Gets if we can place a torch on a block.
-func_31030_a,getTileEntity,1,creates and returns a tile entity for the piston
+func_31030_a,getTileEntity,1,gets a new TileEntityPiston created with the arguments provided.
 func_31031_b,getTileEntityAtLocation,1,gets the piston tile entity at the specified location
-func_31032_a,getAxisAlignedBB,1,gets the AxisAlignedBB of this piston
+func_31032_a,getAxisAlignedBB,1,
 func_31035_d,isExtended,1,Determine if the metadata is related to something powered.
-func_31036_h,canExtend,1,checks whether a piston can extend
-func_31037_c,determineOrientation,1,determines the orientation of a piston. called upon placement
+func_31036_h,canExtend,1,checks to see if this piston could push the blocks in front of it.
+func_31037_c,determineOrientation,1,gets the way this piston should face for that entity that placed it.
 func_31038_i,tryExtend,1,attempts to extend the piston. returns false if impossible.
-func_31039_f,isIndirectlyPowered,1,returns true if a piston is powered.
+func_31039_f,isIndirectlyPowered,1,checks the block to that side to see if it is indirectly powered.
 func_31040_a,canPushBlock,1,returns true if the piston can push the specified block
 func_31041_g,updatePistonState,1,handles attempts to extend or retract the piston.
 func_31042_c,getOrientation,1,returns an int which describes the direction the piston faces
@@ -3454,7 +3502,7 @@ func_35060_c,getPosingIdByMetadata,1,Gets the blockID of the block this block is
 func_35061_d,getMetadataForBlockType,1,Returns the metadata to use when a Silverfish hides in the block. Sets the block to BlockSilverfish with this metadata. It changes the displayed texture client side to look like a normal block.
 func_35063_c,canThisPaneConnectToThisBlockID,1,Gets passed in the blockID of the block adjacent and supposed to return true if its allowed to connect to the type of blockID passed in. Args: blockID
 func_35065_b,fertilizeMushroom,1,Fertilize the mushroom.
-func_35066_f_,fertilizeStem,1,Fertilizes the stem.
+func_35066_f_,fertilizeStem,1,
 func_35067_h,getGrowthModifier,1,
 func_35070_c,isFenceGateOpen,1,Returns if the fence gate is open according to its metadata.
 func_35072_a,causeMobDamage,1,
@@ -3470,7 +3518,7 @@ func_35081_a,causeThrownDamage,1,
 func_35082_a,causeFireballDamage,1,returns EntityDamageSourceIndirect of a fireball
 func_35083_b,isUnblockable,1,
 func_35084_g,setDamageAllowedInCreativeMode,1,
-func_350_b,removeEntity,1,removes entity usint its y chunk coordinate as its index
+func_350_b,removeEntity,1,removes entity using its y chunk coordinate as its index
 func_35137_a,getBiomesToSpawnIn,1,Gets the list of valid biomes for the player to spawn in.
 func_35138_b,cleanupCache,1,Calls the WorldChunkManager's biomeCache.cleanupCache()
 func_35139_a,findBiomePosition,1,"Finds a valid position within a range, that is once of the listed biomes."
@@ -3505,6 +3553,7 @@ func_35195_d,addExperience,1,Add experience points to player.
 func_35196_E,stopUsingItem,1,
 func_35197_c,canEat,1,
 func_35198_b,addExhaustion,1,increases exhaustion level by supplied amount
+func_35199_C,onItemUseFinish,1,"Used for when item use count runs out, ie: eating completed"
 func_351_a,isAtLocation,1,Checks whether the chunk is at the X/Z location specified
 func_35200_c,canPlayerEdit,1,
 func_35201_a,setItemInUse,1,"sets the itemInUse when the use item button is clicked. Args: itemstack, int maxItemUseDuration"
@@ -3514,6 +3563,7 @@ func_35204_o,getSwingSpeedModifier,1,Returns the swing speed modifier
 func_35205_F,clearItemInUse,1,
 func_35206_W,shouldHeal,1,Checks if the player's health is not full and not zero.
 func_35207_V,getFoodStats,1,Returns the player's FoodStats object.
+func_35208_b,updateItemUse,1,Plays sounds and makes particles for item in use state
 func_35209_o_,isUsingItem,1,"checks if the entity is currently using an item (e.g., bow, food, sword) by holding down the useItemButton"
 func_35224_c,attackEntityAsMob,1,
 func_35225_x,getCarried,1,Get the id of the block an enderman carries
@@ -3530,7 +3580,7 @@ func_35240_d,computeSkyLightValue,1,
 func_35241_e,computeBlockLightValue,1,
 func_35242_p,updateAllLightTypes,1,
 func_35243_b,updateLightByType,1,
-func_35253_a,generateOres,1,facilitates the replacement of stone with ores during worldgen
+func_35253_a,generateOres,1,Generates ores in the current chunk
 func_35254_b,genStandardOre2,1,Standard ore generation helper. Generates Lapis Lazuli.
 func_35255_a,decorate,1,Decorates the world. Calls code that was formerly (pre-1.8) in ChunkProviderGenerate.populate
 func_35256_b,decorate,1,The method that does the work of actually decorating chunks
@@ -3578,15 +3628,15 @@ func_35362_a,findValidPlacement,1,
 func_35365_a,findValidPlacement,1,Trys to find a valid place to put this component.
 func_35366_a,canVillageGoDeeper,1,
 func_35367_b,getAverageGroundLevel,1,Discover the y coordinate that will serve as the ground level of the supplied BoundingBox. (A median of all the levels in the BB's horizontal rectangle).
-func_35368_a,getNextComponentNN,1,"Gets the next village component, with the bounding box shift -1 in the X and Z direction."
-func_35369_b,getNextComponentPP,1,"Gets the next village component, with the bounding box shift +1 in the X and Z direction."
+func_35368_a,getNextComponentNN,1,"Gets the next village component, with the bounding box shifted -1 in the X and Z direction."
+func_35369_b,getNextComponentPP,1,"Gets the next village component, with the bounding box shifted +1 in the X and Z direction."
 func_35370_a,findValidPlacement,1,Trys to find a valid place to put this component.
 func_35372_a,findValidPlacement,1,Trys to find a valid place to put this component.
 func_35374_a,findValidPlacement,1,Trys to find a valid place to put this component.
 func_35376_a,findValidPlacement,1,
 func_35380_a,findValidPlacement,1,Trys to find a valid place to put this component.
 func_35382_a,findValidPlacement,1,Trys to find a valid place to put this component.
-func_35386_a,getWorldChunkMngr,1,
+func_35386_a,getWorldChunkManager,1,
 func_35393_a,findValidPlacement,1,
 func_35397_a,findValidPlacement,1,Trys to find a valid place to put this component.
 func_35399_a,findValidPlacement,1,Trys to find a valid place to put this component.
@@ -3681,7 +3731,7 @@ func_35631_c,getPrecipitationHeight,1,Gets the height to which rain/snow will fa
 func_35632_a,populateChunk,1,
 func_35633_i,updateSkylight_do,1,Runs delayed skylight updates.
 func_35634_d,updateSkylightNeighborHeight,1,
-func_35635_h,updateSkylight,1,"Checks whether skylight needs updated; if it does, calls updateSkylight_do (aka func_35839_k)."
+func_35635_h,updateSkylight,1,"Checks whether skylight needs updated; if it does, calls updateSkylight_do"
 func_35639_a,getVillageComponentFromWeightedPiece,1,
 func_35640_a,getNextStructureComponent,1,'attempts to find a next Structure Component to be spawned'
 func_35641_d,getNextVillageStructureComponent,1,"'attempts to find a next Structure Component to be spawned, private Village function'"
@@ -3792,7 +3842,7 @@ func_40026_q,getBannedIPsList,1,Returns the list of ban
 func_4002_a,handleNamedEntitySpawn,1,
 func_40033_ax,isImmuneToFire,1,
 func_40034_j,setFire,1,"Sets entity to burn for x amount of seconds, cannot lower amount of existing fire."
-func_40035_z,isBurning,1,Returns true if the furnace is currently burning
+func_40035_z,isBurning,1,Returns true if the entity is on fire. Used by render to add the fire effect on rendering.
 func_40036_aw,extinguish,1,Removes fire from entity.
 func_40037_aF,getParts,1,Return the Entity parts making up this Entity (currently only for dragons)
 func_4003_a,handleVehicleSpawn,1,
@@ -3815,7 +3865,7 @@ func_40093_t,getCreatureAttribute,1,Get this Entity's EnumCreatureAttribute
 func_40094_f,decreaseAirSupply,1,Decrements the entity's air supply when underwater
 func_40095_c,getMaxHealth,1,
 func_40096_a,isPotionApplicable,1,
-func_40097_ai,getEntityHealth,1,
+func_40097_ai,getHealth,1,
 func_40098_a_,setPositionAndUpdate,1,Sets the position of the entity and updates the 'last' variables
 func_40099_b,applyPotionDamageCalculations,1,"Reduces damage, depending on potions"
 func_4009_a,handleKickDisconnect,1,
@@ -3886,7 +3936,7 @@ func_40274_l,getDamageType,1,Return the name of damage type.
 func_40275_b,isProjectile,1,Returns true if the damage is projectile based.
 func_40276_j,setFireDamage,1,Define the damage type as fire based.
 func_40279_c,getHardcoreEnabled,1,"Returns true if hardcore mode is enabled, otherwise false"
-func_4027_a,onBlockPlacedBy,1,"Called when a block is using an item and passed in who placed it. Args: x, y, z, entityLiving"
+func_4027_a,onBlockPlacedBy,1,Called when the block is placed in the world.
 func_40281_b_,getCenter,1,
 func_40282_a,getTotalWeight,1,
 func_40283_a,getNextComponent,1,Finds a random component to tack on to the bridge. Or builds the end.
@@ -3985,7 +4035,7 @@ func_40482_a,calculateModifier,1,Generic method use to calculate modifiers of of
 func_40487_e,getEnchantability,1,Return the natural enchantability factor of the material.
 func_4048_a,displayGUIEditSign,1,Displays the GUI for editing a sign. Args: tileEntitySign
 func_40495_b,getDamageReductionAmount,1,"Return the damage reduction (each 1 point is a half a shield on gui) of the piece index passed (0 = helmet, 1 = plate, 2 = legs and 3 = boots)"
-func_40496_a,getEnchantability,1,Return the enchantability factor of the material
+func_40496_a,getEnchantability,1,Return the enchantability factor of the material.
 func_40497_a,getDurability,1,Returns the durability for a armor slot of for this type.
 func_4049_a,setIconIndex,1,Sets the icon index for this item. Returns the item.
 func_404_e,getLong,1,"Retrieves a long value using the specified key, or 0 if no such key was stored."
@@ -4168,7 +4218,7 @@ func_430_c,leafNodeNeedsBase,1,Indicates whether or not a leaf node requires add
 func_431_a,layerSize,1,Gets the rough size of a layer of the tree.
 func_432_c,generateTrunk,1,Places the trunk for the big tree that is being generated. Able to generate double-sized trunks by changing a field that is always 1 to 2.
 func_433_b,pickMobSpawner,1,Randomly decides which spawner to use in a dungeon
-func_434_a,pickCheckLootItem,1,Picks potentially a random item to add to a dungeon chest
+func_434_a,pickCheckLootItem,1,Picks potentially a random item to add to a dungeon chest.
 func_435_a,update,1,Public static accessor to call updateStats.
 func_436_a,updateStats,1,Updates the stat values and calls paint to redraw the component.
 func_437_a,setLoadingProgress,1,Updates the progress bar on the loading screen to the specified amount. Args: loadProgress
@@ -4180,7 +4230,7 @@ func_44006_ak,isClientWorld,1,Returns whether the entity is in a local (client)
 func_44009_b,loadLanguageList,1,
 func_44010_a,setLanguage,1,
 func_44011_a,loadLanguage,1,
-func_44014_a,createEntity,1,create a new instance of an entity by using an entityID
+func_44014_a,createEntityByID,1,Create a new instance of an entity in the world by using an entity ID.
 func_443_c,getBlockMaterial,1,Returns the block's material.
 func_444_a,getBlockId,1,"Returns the block ID at coords x,y,z"
 func_445_d,isBlockNormalCube,1,"Returns true if the block at the specified coordinates is an opaque cube. Args: x, y, z"
@@ -4256,21 +4306,31 @@ func_477_b,getCelestialAngle,1,calls calculateCelestialAngle
 func_478_h,saveLevel,1,Saves the global data associated with this World
 func_479_b,obtainEntitySkin,1,"Start the skin for this entity downloading, if necessary, and increment its reference counter"
 func_47_d,getLogComponent,1,Returns a new JPanel with a new GuiStatsComponent inside.
+func_48071_a,handleTileEntityData,1,
+func_48072_a,handleEntityHeadRotation,1,
 func_48083_a,getPathEntityToEntity,1,
 func_48085_a,findNearestEntityWithinAABB,1,
 func_48088_a,getEntityPathToXYZ,1,
-func_48095_y,getWorldHeight,1,Returns current world height
+func_48091_a,getBiomeGenForCoords,1,Gets the biome for a given set of x/z coordinates
+func_48095_y,getHeight,1,Returns current world height.
+func_48124_n,hasTileEntity,1,
 func_48125_m,getTickRandomly,1,Returns whether or not this block is of a type that needs random ticking. Called for ref-counting purposes by ExtendedBlockStorage in order to broadly cull a chunk from the random chunk update list for efficiency's sake.
 func_48126_g,isNormalCube,1,
 func_48127_b,getBlocksMovement,1,
+func_48132_b,getDirection,1,Returns the orentation value from the specified metadata
+func_48133_a,tryToCatchBlockOnFire,1,
+func_48134_e,getFullMetadata,1,Returns the full metadata value created by combining the metadata of both blocks the door takes up.
 func_48136_c,getDoorOrientation,1,"Returns 0, 1, 2 or 3 depending on where the hinge is."
+func_48176_f,doRangedAttack,1,Performs a ranged attack according to the AI's rangedAttackID.
 func_481_a,getCollidingBoundingBoxes,1,"Returns a list of bounding boxes that collide with aabb excluding the passed in entity's collision. Args: entity, aabb"
+func_48254_f,findPossibleShelter,1,
 func_48305_f,checkSufficientDoorsPresentForNewVillager,1,
 func_48306_i,giveBirth,1,
 func_48307_a,spawnHeartParticles,1,
 func_48313_k_,canAttackWithItem,1,"If returns false, the item will not inflict any damage against entities."
 func_48315_b,getStackInSlotOnClosing,1,"When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - like when you close a workbench GUI."
 func_48317_b,setHomeArea,1,
+func_48319_z,eatGrassBonus,1,This function applies the benefits of growing back wool and faster growing up to the acting entity. (This function is used in the AIEatGrass)
 func_48321_b,dropRareDrop,1,
 func_48322_aw,detachHome,1,
 func_48323_au,getHomePosition,1,
@@ -4285,6 +4345,7 @@ func_48331_as,getAttackTarget,1,Gets the active target the Task system uses for
 func_48333_ak,getNavigator,1,
 func_48334_a,setRevengeTarget,1,
 func_48335_g,setLastAttackingEntity,1,
+func_48347_R,dropOneItem,1,Called when player presses the drop item key
 func_48348_b,dropPlayerItem,1,Args: itemstack
 func_48349_a,dropPlayerItemWithRandomChoice,1,"Args: itemstack, flag"
 func_48350_c,setGrowingAge,1,"The age value may be negative or positive or zero. If it's negative, it get's incremented on each tick, if it's positive, it get's decremented each tick. With a negative value the Entity is considered a child."
@@ -4295,6 +4356,8 @@ func_48354_b,setIsPlayingFlag,1,
 func_48355_A,getIsMatingFlag,1,
 func_48356_a,setIsMatingFlag,1,
 func_48357_f_,setProfession,1,
+func_48363_r_,isInLove,1,Returns if the entity is currently in 'love mode'.
+func_48364_s_,resetInLove,1,
 func_48366_b,setTamed,1,
 func_48367_A,getOwnerName,1,
 func_48368_w_,getOwner,1,
@@ -4302,15 +4365,22 @@ func_48371_v_,isSitting,1,
 func_48372_a,setOwner,1,
 func_48373_u_,isTamed,1,
 func_48380_l_,getVillage,1,
+func_48392_a,setTerrainType,1,
+func_48409_a,isAllowedCharacter,1,
+func_48414_b,markBlockNeedsUpdate2,1,As of mc 1.2.3 this method has exactly the same signature and does exactly the same as markBlockNeedsUpdate
 func_48420_a,getPosition,1,returns the current PathEntity target node as Vec3D
 func_48421_b,setCurrentPathLength,1,
 func_48422_c,setCurrentPathIndex,1,
 func_48423_e,getCurrentPathIndex,1,
 func_48424_d,getCurrentPathLength,1,
 func_48425_c,getFinalPathPoint,1,returns the last PathPoint of the Array
+func_48428_a,getVectorFromIndex,1,Gets the vector of the PathPoint associated with the given index.
 func_48429_a,getPathPointFromIndex,1,"return the PathPoint located at the specified PathIndex, usually the current one"
 func_48436_b,getSpeed,1,
+func_48439_a,setMoveTo,1,Sets the speed and location to move to
 func_48442_h,getFloatTemperature,1,Gets a floating point representation of this biome's temperature
+func_48450_a,setCanBeCreated,1,"Sets canBeCreated to the provided value, and returns this."
+func_48452_b,getGeneratorVersion,1,Returns generatorVersion.
 func_48473_c,getDistanceSquared,1,Returns the squared distance between this coordinates and the coordinates given as argument.
 func_48474_a,set,1,
 func_48478_d,resetDoorOpeningRestrictionCounter,1,
@@ -4347,13 +4417,29 @@ func_48533_b,findNearestDoor,1,
 func_48534_b,findNearestVillageAggressor,1,
 func_48535_h,updateNumIronGolems,1,
 func_48546_a,canSee,1,"Checks, whether 'our' entity can see the entity given as argument (true) or not (false), caching the result."
-func_48547_a,clearSensingCache,1,Returns the squared distance between this door and the given coordinate.
+func_48547_a,clearSensingCache,1,Clears canSeeCachePositive and canSeeCacheNegative.
+func_48552_l,getBiomeArray,1,Returns an array containing a 16x16 mapping on the X/Z of block positions in this Chunk to biome IDs.
+func_48553_h,getBlockStorageArray,1,Returns the ExtendedBlockStorage array for this Chunk.
+func_48554_m,resetRelightChecks,1,Resets the relight check index to 0 for this Chunk.
+func_48555_b,getBlockLightOpacity,1,
+func_48556_c,getAreLevelsEmpty,1,Returns whether the ExtendedBlockStorages containing levels (in blocks) from arg 1 to arg 2 are fully empty (true) or not (false).
+func_48557_n,enqueueRelightChecks,1,"Called once-per-chunk-per-tick, and advances the round-robin relight check index by up to 8 blocks at a time. In a worst-case scenario, can potentially take up to 25.6 seconds, calculated via (4096/8)/20, to re-check all blocks in a chunk, which may explain lagging light updates on initial world generation."
+func_48558_a,setStorageArrays,1,
+func_48559_a,setBiomeArray,1,Accepts a 256-entry array that contains a 16x16 mapping on the X/Z plane of block positions in this Chunk to biome IDs.
+func_48561_g,getTopFilledSegment,1,Returns the topmost ExtendedBlockStorage instance for this Chunk that actually contains a block.
+func_48582_a,getIDFromString,1,Finds the ID using stringToIDMapping
 func_48584_a,onCrafting,1,
+func_48585_b,setExtBlockMetadata,1,Sets the metadata of the Block at the given coordinates in this ExtendedBlockStorage to the given metadata.
+func_48586_b,setBlockMetadataArray,1,Sets the NibbleArray of block metadata (blockMetadataArray) for this ExtendedBlockStorage.
 func_48588_a,setExtBlockID,1,"Sets the extended block ID for a location in a chunk, splitting bits 11..8 into a NibbleArray and bits 7..0 into a byte array. Also performs reference counting to determine whether or not to broadly cull this Chunk from the random-update tick list."
 func_48589_d,setSkylightArray,1,Sets the NibbleArray instance used for Sky-light values in this particular storage block.
 func_48591_a,getExtBlockID,1,"Returns the extended block ID for a location in a chunk, merged from a byte array and a NibbleArray to form a full 12-bit block ID."
 func_48592_c,setExtSkylightValue,1,Sets the saved Sky-light value in the extended block storage structure.
+func_48593_a,setBlockMSBArray,1,Sets the array of blockID most significant bits (blockMSBArray) for this ExtendedBlockStorage.
 func_48595_a,getIsEmpty,1,"Returns whether or not this block storage's Chunk is fully empty, based on its internal reference count."
+func_48596_a,setBlockLSBArray,1,Sets the array of block ID least significant bits for this ExtendedBlockStorage.
+func_48597_c,getYLocation,1,Returns the Y location of this ExtendedBlockStorage.
+func_48598_b,getExtBlockMetadata,1,Returns the metadata associated with the block at the given coordinates in this ExtendedBlockStorage.
 func_485_a,saveWorld,1,"Saves the data for this World. If passed true, then only save up to 2 chunks, otherwise, save all chunks."
 func_48600_j,getBlocklightArray,1,Returns the NibbleArray instance containing Block-light data.
 func_48601_h,getBlockMSBArray,1,Returns the block ID MSB (bits 11..8) array for this storage array's Chunk.
@@ -4379,8 +4465,13 @@ func_48638_b,getVillageDoorAt,1,
 func_48639_a,addVillagerPosition,1,"This is a black hole. You can add data to this list through a public interface, but you can't query that information in any way and it's not used internally either."
 func_48647_a,setPath,1,"sets the active path data if path is 100% unique compared to old path, checks to adjust path for sun avoiding ents and stores end coords"
 func_48651_j,canNavigate,1,If on ground or swimming and can swim
+func_48659_i,getPathableYPos,1,Gets the safe pathing Y position for the entity depending on if it can path swim or not
+func_48662_f,clearPathEntity,1,sets active PathEntity to null
+func_48663_b,setBreakDoors,1,
 func_48664_g,pathFollow,1,
+func_48665_h,getEntityPosition,1,
 func_48667_l,removeSunnyPath,1,Trims path data from the end to the first sun covered block
+func_48668_c,getPath,1,gets the actively used PathEntity
 func_486_a,rayTraceBlocks,1,"ray traces all blocks, including non-collideable ones"
 func_487_a,countEntities,1,Counts how many entities of an entity class exist in the world. Args: entityClass
 func_488_c,getHeightValue,1,"Returns the y coordinate with a block in it at this x, z coordinate"
@@ -4450,10 +4541,10 @@ func_559_a,getHash,1,Returns the hash code for this entry
 func_561_a,set,1,"Arguments are x, y, z, val. Sets the nibble of data at x << 11 | z << 7 | y to val."
 func_562_a,get,1,"Returns the nibble of data corresponding to the passed in x, y, z. y is at most 6 bits, z is at most 4."
 func_563_a,addMapping,1,adds a mapping between Entity classes and both a string representation and an ID
-func_564_b,getEntityString,1,gets the string representation of a specific entity
+func_564_b,getEntityString,1,Gets the string representation of a specific entity.
 func_565_a,getEntityID,1,gets the entityID of a specific entity
 func_566_a,createEntityFromNBT,1,create a new instance of an entity from NBT store
-func_567_a,createEntityInWorld,1,Creates an entity of the given name in the world.
+func_567_a,createEntityByName,1,Create a new instance of an entity in the world by using the entity name.
 func_569_a,getItem,1,Returns the object corresponding to the stack.
 func_570_a,writeToNBT,1,Write the stack fields to a NBT object. Return the new NBT object.
 func_571_c,getMaxDamage,1,Returns the max damage an item in the stack can take.
@@ -4512,7 +4603,7 @@ func_607_a,updateTrackedEntities,1,
 func_6091_h,removeLeaves,1,
 func_6092_a,interact,1,"Called when a player interacts with a mob. e.g. gets milk from a cow, gets into the saddle on a pig."
 func_6093_b,onCollideWithPlayer,1,Called by a player entity when they collide with an entity
-func_6094_e,mountEntity,1,set entity to null to unmount
+func_6094_e,mountEntity,1,"Called when a player mounts an entity. e.g. mounts a pig, mounts a boat."
 func_6095_b,setPositionAndRotation,1,"Sets the entity's position and rotation. Args: posX, posY, posZ, yaw, pitch"
 func_6096_b,setRotation,1,Sets the rotation of the entity
 func_6097_d,getLivingSound,1,Returns the sound this mob makes while it's alive.
diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
index bc4382d88..fa9d49882 100644
--- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
@@ -117,7 +117,7 @@ public class ForgeHooksClient
         {
             renderTextures.add(key);
             tess.startDrawingQuads();
-            tess.setTranslationD(defaultTessellator.xOffset, defaultTessellator.yOffset, defaultTessellator.zOffset);
+            tess.setTranslation(defaultTessellator.xOffset, defaultTessellator.yOffset, defaultTessellator.zOffset);
         }
         Tessellator.instance = tess;
     }
diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch
index d708db025..40d51372f 100644
--- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch
@@ -7,16 +7,16 @@
  import java.util.ArrayList;
  import java.util.Random;
  
-@@ -449,7 +450,7 @@
+@@ -397,7 +398,7 @@
  
-     public boolean func_48205_p()
+     public boolean hasTileEntity()
      {
 -        return this.isBlockContainer;
-+	return hasTileEntity(0);
++        return hasTileEntity(0);
      }
  
      /**
-@@ -470,7 +471,7 @@
+@@ -418,7 +419,7 @@
       */
      public float getBlockBrightness(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
      {
@@ -25,7 +25,7 @@
      }
  
      /**
-@@ -478,7 +479,7 @@
+@@ -426,7 +427,7 @@
       */
      public int getMixedBrightnessForBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
      {
@@ -34,7 +34,7 @@
      }
  
      /**
-@@ -635,11 +636,14 @@
+@@ -583,11 +584,14 @@
      }
  
      /**
@@ -51,7 +51,7 @@
      }
  
      /**
-@@ -659,16 +663,12 @@
+@@ -607,16 +611,12 @@
          {
              int var8 = this.quantityDroppedWithBonus(par7, par1World.rand);
  
@@ -71,7 +71,7 @@
                  }
              }
          }
-@@ -981,7 +981,7 @@
+@@ -929,7 +929,7 @@
          par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
          par2EntityPlayer.addExhaustion(0.025F);
  
@@ -80,7 +80,7 @@
          {
              ItemStack var8 = this.createStackedBlock(par6);
  
-@@ -1099,6 +1099,376 @@
+@@ -1046,6 +1046,376 @@
       */
      public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {}
  
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch
index 84a595e31..348e49bbf 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
-@@ -497,23 +497,23 @@
+@@ -496,23 +496,23 @@
          {
              return true;
          }
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch
index e4fc9122e..0358fa55f 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch
@@ -57,12 +57,12 @@
                      var9 = -50;
                  }
  
--                this.func_48211_a(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7);
--                this.func_48211_a(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7);
--                this.func_48211_a(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7);
--                this.func_48211_a(par1World, par2, par3 + 1, par4, 250 + var9, par5Random, var7);
--                this.func_48211_a(par1World, par2, par3, par4 - 1, 300 + var9, par5Random, var7);
--                this.func_48211_a(par1World, par2, par3, par4 + 1, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3 + 1, par4, 250 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3, par4 - 1, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3, par4 + 1, 300 + var9, par5Random, var7);
 +                this.tryToCatchBlockOnFire(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7, 4);
 +                this.tryToCatchBlockOnFire(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7, 5);
 +                this.tryToCatchBlockOnFire(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7, 1);
@@ -72,18 +72,20 @@
  
                  for (int var10 = par2 - 1; var10 <= par2 + 1; ++var10)
                  {
-@@ -204,9 +204,21 @@
+@@ -203,10 +203,22 @@
+             }
          }
      }
- 
+-
++    
 +    /** Deprecated for a side-sensitive version */
 +    @Deprecated
-     private void func_48211_a(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7)
+     private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7)
      {
 -        int var8 = this.abilityToCatchFire[par1World.getBlockId(par2, par3, par4)];
 +        tryToCatchBlockOnFire(par1World, par2, par3, par4, par5, par6Random, par7, 0);
 +    }
-+
++    
 +    private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7, int face)
 +    {
 +        int var8 = 0;
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch
index 5e635a046..562a29472 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/BlockPistonBase.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/BlockPistonBase.java	0000-00-00 00:00:00.000000000 -0000
-@@ -370,7 +370,7 @@
+@@ -369,7 +369,7 @@
                  return false;
              }
  
diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
index 49fd32f42..4ae432b42 100644
--- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
@@ -54,22 +54,24 @@
                  {
                      TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
  
-@@ -830,33 +821,31 @@
+@@ -829,34 +820,33 @@
+     {
          ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
          TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
- 
++        
 +        if (var5 != null && var5.isInvalid())
 +        {
 +            chunkTileEntityMap.remove(var4);
 +            var5 = null;
 +        }
-+        
+ 
          if (var5 == null)
          {
              int var6 = this.getBlockID(par1, par2, par3);
 -
--            if (var6 <= 0 || !Block.blocksList[var6].func_48205_p())
+-            if (var6 <= 0 || !Block.blocksList[var6].hasTileEntity())
 +            int meta = getBlockMetadata(par1, par2, par3);
++            
 +            if (var6 <= 0 || Block.blocksList[var6] == null || !Block.blocksList[var6].hasTileEntity(meta))
              {
                  return null;
@@ -98,7 +100,7 @@
      }
  
      /**
-@@ -871,7 +860,7 @@
+@@ -871,7 +861,7 @@
  
          if (this.isChunkLoaded)
          {
@@ -107,7 +109,7 @@
          }
      }
  
-@@ -886,8 +875,14 @@
+@@ -886,8 +876,14 @@
          par4TileEntity.yCoord = par2;
          par4TileEntity.zCoord = this.zPosition * 16 + par3;
  
@@ -123,7 +125,7 @@
              par4TileEntity.validate();
              this.chunkTileEntityMap.put(var5, par4TileEntity);
          }
-@@ -1201,6 +1196,16 @@
+@@ -1205,6 +1201,16 @@
  
      public void func_48494_a(byte[] par1ArrayOfByte, int par2, int par3, boolean par4)
      {
@@ -140,7 +142,7 @@
          int var5 = 0;
          int var6;
  
-@@ -1304,6 +1309,29 @@
+@@ -1308,6 +1314,29 @@
              TileEntity var9 = (TileEntity)var10.next();
              var9.updateContainingBlockInfo();
          }
@@ -170,7 +172,7 @@
      }
  
      public BiomeGenBase func_48490_a(int par1, int par2, WorldChunkManager par3WorldChunkManager)
-@@ -1407,4 +1435,18 @@
+@@ -1411,4 +1440,18 @@
              }
          }
      }
diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
index f9729bd5f..a841b7262 100644
--- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
@@ -50,7 +50,7 @@
 +                    {
 +                        continue;
 +                    }
-                     var10.setBrightness(var12.getEntityBrightnessForRender(par2));
+                     var10.setBrightness(var12.getBrightnessForRender(par2));
                      var12.renderParticle(var10, par2, var3, var7, var4, var5, var6);
                  }
  
@@ -65,7 +65,7 @@
 +                for (int y = 0; y < entry.effects.size(); y++)
 +                {
 +                    EntityFX entryfx = (EntityFX)entry.effects.get(y);
-+                    tessallator.setBrightness(entryfx.getEntityBrightnessForRender(par2));
++                    tessallator.setBrightness(entryfx.getBrightnessForRender(par2));
 +                    entryfx.renderParticle(tessallator, par2, var3, var7, var4, var5, var6);
 +                }
 +                tessallator.draw();
diff --git a/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch b/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch
index 8634641d7..4b9d4dfad 100644
--- a/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/Enchantment.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/Enchantment.java	0000-00-00 00:00:00.000000000 -0000
-@@ -192,4 +192,14 @@
+@@ -191,4 +191,14 @@
          String var2 = StatCollector.translateToLocal(this.getName());
          return var2 + " " + StatCollector.translateToLocal("enchantment.level." + par1);
      }
diff --git a/forge/patches/minecraft/net/minecraft/src/Entity.java.patch b/forge/patches/minecraft/net/minecraft/src/Entity.java.patch
index d3e63c82f..2f1348690 100644
--- a/forge/patches/minecraft/net/minecraft/src/Entity.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Entity.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/Entity.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/Entity.java	0000-00-00 00:00:00.000000000 -0000
-@@ -177,6 +177,9 @@
+@@ -173,6 +173,9 @@
       */
      public boolean ignoreFrustumCheck;
      public boolean isAirBorne;
@@ -10,7 +10,7 @@
  
      public Entity(World par1World)
      {
-@@ -218,6 +221,20 @@
+@@ -214,6 +217,20 @@
      }
  
      protected abstract void entityInit();
@@ -31,7 +31,7 @@
  
      public DataWatcher getDataWatcher()
      {
-@@ -1290,6 +1307,10 @@
+@@ -1286,6 +1303,10 @@
          par1NBTTagCompound.setShort("Fire", (short)this.fire);
          par1NBTTagCompound.setShort("Air", (short)this.getAir());
          par1NBTTagCompound.setBoolean("OnGround", this.onGround);
@@ -42,7 +42,7 @@
          this.writeEntityToNBT(par1NBTTagCompound);
      }
  
-@@ -1331,6 +1352,10 @@
+@@ -1327,6 +1348,10 @@
          this.onGround = par1NBTTagCompound.getBoolean("OnGround");
          this.setPosition(this.posX, this.posY, this.posZ);
          this.setRotation(this.rotationYaw, this.rotationPitch);
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityItem.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityItem.java.patch
index 7d884fbd3..f4173d677 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntityItem.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntityItem.java.patch
@@ -21,7 +21,7 @@
 +                par1EntityPlayer.onItemPickup(this, var2);
 +                if (item.stackSize <= 0)
 +                {
-+                    setEntityDead();
++                    setDead();
 +                }
 +                return;
 +            }
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch
index c586382a9..38298aec5 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/src/EntityLiving.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java	0000-00-00 00:00:00.000000000 -0000
-@@ -55,7 +55,7 @@
+@@ -59,7 +59,7 @@
       * in each step in the damage calculations, this is set to the 'carryover' that would result if someone was damaged
       * .25 hearts (for example), and added to the damage in the next step
       */
@@ -9,7 +9,7 @@
  
      /** Number of ticks since this EntityLiving last produced its sound */
      private int livingSoundTime;
-@@ -1320,7 +1320,7 @@
+@@ -1330,7 +1330,7 @@
          int var2 = MathHelper.floor_double(this.boundingBox.minY);
          int var3 = MathHelper.floor_double(this.posZ);
          int var4 = this.worldObj.getBlockId(var1, var2, var3);
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch
index 5414c3aa2..eb58543a9 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch
@@ -117,7 +117,7 @@
 @@ -120,48 +160,7 @@
                  }
  
-                 this.setEntityDead();
+                 this.setDead();
 -                this.dropItemWithOffset(Item.minecartEmpty.shiftedIndex, 1, 0.0F);
 -
 -                if (this.minecartType == 1)
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch
index 61b8c38f4..207b2446c 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch
@@ -18,14 +18,14 @@
          }
 -        else if (var2 != null && var2.itemID == Item.shears.shiftedIndex && this.getGrowingAge() >= 0)
 -        {
--            this.setEntityDead();
+-            this.setDead();
 -            this.worldObj.spawnParticle("largeexplode", this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, 0.0D, 0.0D, 0.0D);
 -
 -            if (!this.worldObj.isRemote)
 -            {
 -                EntityCow var3 = new EntityCow(this.worldObj);
 -                var3.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch);
--                var3.setEntityHealth(this.getEntityHealth());
+-                var3.setEntityHealth(this.getHealth());
 -                var3.renderYawOffset = this.renderYawOffset;
 -                this.worldObj.spawnEntityInWorld(var3);
 -
@@ -54,10 +54,10 @@
 +    @Override
 +    public ArrayList<ItemStack> onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) 
 +    {
-+        setEntityDead();
++        setDead();
 +        EntityCow entitycow = new EntityCow(worldObj);
 +        entitycow.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
-+        entitycow.setEntityHealth(getEntityHealth());
++        entitycow.setEntityHealth(getHealth());
 +        entitycow.renderYawOffset = renderYawOffset;
 +        worldObj.spawnEntityInWorld(entitycow);
 +        worldObj.spawnParticle("largeexplode", posX, posY + (double)(height / 2.0F), posZ, 0.0D, 0.0D, 0.0D);
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
index 4201b9c53..1061c7fe3 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
@@ -16,10 +16,10 @@
 +                itemInUse.getItem().onUsingItemTick(itemInUse, this, itemInUseCount);
                  if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0)
                  {
-                     this.func_35201_a(var1, 5);
-@@ -609,7 +612,16 @@
- 
-     public EntityItem func_48152_as()
+                     this.updateItemUse(var1, 5);
+@@ -618,7 +621,16 @@
+      */
+     public EntityItem dropOneItem()
      {
 -        return this.dropPlayerItemWithRandomChoice(this.inventory.decrStackSize(this.inventory.currentItem, 1), false);
 +        ItemStack stack = inventory.getCurrentItem();
@@ -35,7 +35,7 @@
      }
  
      /**
-@@ -674,14 +686,22 @@
+@@ -684,14 +696,22 @@
  
      /**
       * Returns how strong the player is against the specified block at this moment
@@ -60,7 +60,7 @@
          {
              var3 = var2 + (float)(var4 * var4 + 1);
          }
-@@ -973,7 +993,11 @@
+@@ -983,7 +1003,11 @@
              par2 = 1 + par2 >> 1;
          }
  
@@ -73,7 +73,7 @@
          par2 = this.applyPotionDamageCalculations(par1DamageSource, par2);
          this.addExhaustion(par1DamageSource.getHungerDamage());
          this.health -= par2;
-@@ -1004,6 +1028,10 @@
+@@ -1014,6 +1038,10 @@
       */
      public void useCurrentItemOnEntity(Entity par1Entity)
      {
@@ -84,7 +84,7 @@
          if (!par1Entity.interact(this))
          {
              ItemStack var2 = this.getCurrentEquippedItem();
-@@ -1034,7 +1062,9 @@
+@@ -1044,7 +1072,9 @@
       */
      public void destroyCurrentEquippedItem()
      {
@@ -94,7 +94,7 @@
      }
  
      /**
-@@ -1063,6 +1093,15 @@
+@@ -1073,6 +1103,15 @@
       */
      public void attackTargetEntityWithCurrentItem(Entity par1Entity)
      {
@@ -110,7 +110,7 @@
          if (par1Entity.canAttackWithItem())
          {
              int var2 = this.inventory.getDamageVsEntity(par1Entity);
-@@ -1205,6 +1244,12 @@
+@@ -1215,6 +1254,12 @@
       */
      public EnumStatus sleepInBedAt(int par1, int par2, int par3)
      {
@@ -123,7 +123,7 @@
          if (!this.worldObj.isRemote)
          {
              if (this.isPlayerSleeping() || !this.isEntityAlive())
-@@ -1687,6 +1732,7 @@
+@@ -1697,6 +1742,7 @@
                      return 101;
                  }
              }
@@ -131,7 +131,7 @@
          }
  
          return var3;
-@@ -1857,4 +1903,30 @@
+@@ -1867,4 +1913,30 @@
      {
          return !this.capabilities.isFlying;
      }
diff --git a/forge/patches/minecraft/net/minecraft/src/EntitySheep.java.patch b/forge/patches/minecraft/net/minecraft/src/EntitySheep.java.patch
index c0b48fe8d..47a484a3e 100644
--- a/forge/patches/minecraft/net/minecraft/src/EntitySheep.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/EntitySheep.java.patch
@@ -13,7 +13,7 @@
  {
      /**
       * Holds the RGB table of the sheep colors - in OpenGL glColor3f values - used to render the sheep colored fleece.
-@@ -127,27 +130,6 @@
+@@ -129,27 +132,6 @@
       */
      public boolean interact(EntityPlayer par1EntityPlayer)
      {
@@ -41,7 +41,7 @@
          return super.interact(par1EntityPlayer);
      }
  
-@@ -276,4 +258,23 @@
+@@ -282,4 +264,23 @@
              this.setGrowingAge(var1);
          }
      }
diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch
index 6f3e7108a..7062be909 100644
--- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch
@@ -7,7 +7,7 @@
  import java.util.List;
  import java.util.Random;
  
-@@ -196,7 +197,10 @@
+@@ -188,7 +189,10 @@
  
      /** full name of item from language file */
      private String itemName;
@@ -19,7 +19,7 @@
      protected Item(int par1)
      {
          this.shiftedIndex = 256 + par1;
-@@ -559,7 +563,7 @@
+@@ -551,7 +555,7 @@
          float var17 = MathHelper.sin(-var5 * 0.017453292F);
          float var18 = var15 * var16;
          float var20 = var14 * var16;
@@ -28,7 +28,7 @@
          Vec3D var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21);
          MovingObjectPosition var24 = par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3);
          return var24;
-@@ -587,4 +591,149 @@
+@@ -579,4 +583,149 @@
      {
          StatList.initStats();
      }
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBow.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBow.java.patch
index 9e99dfa16..a7bb61ae4 100644
--- a/forge/patches/minecraft/net/minecraft/src/ItemBow.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/ItemBow.java.patch
@@ -17,7 +17,7 @@
 +            return;
 +        }
 +        
-         boolean var5 = par3EntityPlayer.capabilities.depleteBuckets || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, par1ItemStack) > 0;
+         boolean var5 = par3EntityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, par1ItemStack) > 0;
  
          if (var5 || par3EntityPlayer.inventory.hasItem(Item.arrow.shiftedIndex))
 @@ -103,6 +110,12 @@
@@ -30,6 +30,6 @@
 +            return stack;
 +        }
 +        
-         if (par3EntityPlayer.capabilities.depleteBuckets || par3EntityPlayer.inventory.hasItem(Item.arrow.shiftedIndex))
+         if (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.arrow.shiftedIndex))
          {
              par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack));
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
index 5485ab066..e3fbd88ba 100644
--- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
@@ -13,7 +13,7 @@
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.opengl.GL12;
  
-@@ -33,21 +39,35 @@
+@@ -35,21 +41,35 @@
      public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3)
      {
          GL11.glPushMatrix();
@@ -30,7 +30,7 @@
 +        else if (customRendererOld != null)
 +        {
 +            GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture(ForgeHooksClient.getTexture("/terrain.png", par2ItemStack.getItem())));
-+            ForgeHooksClient.renderCustomItem(customRendererOld, renderBlocksInstance, par2ItemStack.itemID,  par2ItemStack.getItemDamage(), par1EntityLiving.getEntityBrightness(1.0F)); 
++            ForgeHooksClient.renderCustomItem(customRendererOld, renderBlocksInstance, par2ItemStack.itemID,  par2ItemStack.getItemDamage(), par1EntityLiving.getBrightness(1.0F)); 
 +        }
 +        //Deprecation End
 +        else if (par2ItemStack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType()))
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch
index 5fcdeddac..d263aa62b 100644
--- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch
@@ -84,7 +84,7 @@
 +                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / 0.5F,
 +                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / 0.5F);
 +                }
-+                ForgeHooksClient.renderCustomItem(customRendererOld, renderBlocks, var10.itemID, var10.getItemDamage(), par1EntityItem.getEntityBrightness(par9));
++                ForgeHooksClient.renderCustomItem(customRendererOld, renderBlocks, var10.itemID, var10.getItemDamage(), par1EntityItem.getBrightness(par9));
 +                GL11.glPopMatrix();
 +            }
 +        }
diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch
index facbbab75..852dc8b75 100644
--- a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch
@@ -16,11 +16,11 @@
 -
 +            ForgeHooksClient.beforeBlockRender(var9, blockRenderer);
              var10.startDrawingQuads();
-             var10.setTranslationD((double)((float)par2 - (float)par1TileEntityPiston.xCoord + par1TileEntityPiston.getOffsetX(par8)), (double)((float)par4 - (float)par1TileEntityPiston.yCoord + par1TileEntityPiston.getOffsetY(par8)), (double)((float)par6 - (float)par1TileEntityPiston.zCoord + par1TileEntityPiston.getOffsetZ(par8)));
+             var10.setTranslation((double)((float)par2 - (float)par1TileEntityPiston.xCoord + par1TileEntityPiston.getOffsetX(par8)), (double)((float)par4 - (float)par1TileEntityPiston.yCoord + par1TileEntityPiston.getOffsetY(par8)), (double)((float)par6 - (float)par1TileEntityPiston.zCoord + par1TileEntityPiston.getOffsetZ(par8)));
              var10.setColorOpaque(1, 1, 1);
 @@ -53,6 +55,7 @@
  
-             var10.setTranslationD(0.0D, 0.0D, 0.0D);
+             var10.setTranslation(0.0D, 0.0D, 0.0D);
              var10.draw();
 +            ForgeHooksClient.afterBlockRender(var9, blockRenderer);
              RenderHelper.enableStandardItemLighting();
diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch
index beec7bb4a..e6a9bd4fe 100644
--- a/forge/patches/minecraft/net/minecraft/src/World.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch
@@ -18,7 +18,7 @@
  
      /** Option > Difficulty setting (0 - 3) */
      public int difficultySetting;
-@@ -556,7 +558,8 @@
+@@ -559,7 +561,8 @@
       */
      public boolean isAirBlock(int par1, int par2, int par3)
      {
@@ -28,7 +28,7 @@
      }
  
      /**
-@@ -2063,7 +2066,7 @@
+@@ -2066,7 +2069,7 @@
  
                      if (var7 != null)
                      {
@@ -37,7 +37,7 @@
                      }
                  }
              }
-@@ -2093,18 +2096,18 @@
+@@ -2096,18 +2099,18 @@
                      {
                          this.loadedTileEntityList.add(var8);
                      }
@@ -60,7 +60,7 @@
                  }
              }
  
-@@ -2117,13 +2120,13 @@
+@@ -2120,13 +2123,13 @@
  
      public void addTileEntity(Collection par1Collection)
      {
@@ -80,7 +80,7 @@
          }
      }
  
-@@ -2322,7 +2325,14 @@
+@@ -2325,7 +2328,14 @@
                          if (var11 == Block.fire.blockID || var11 == Block.lavaMoving.blockID || var11 == Block.lavaStill.blockID)
                          {
                              return true;
@@ -96,7 +96,7 @@
                      }
                  }
              }
-@@ -2626,25 +2636,19 @@
+@@ -2629,25 +2639,19 @@
       */
      public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity)
      {
@@ -134,7 +134,7 @@
          }
      }
  
-@@ -2653,27 +2657,10 @@
+@@ -2656,27 +2660,10 @@
       */
      public void removeBlockTileEntity(int par1, int par2, int par3)
      {
@@ -165,7 +165,7 @@
          }
      }
  
-@@ -2699,7 +2686,8 @@
+@@ -2702,7 +2689,8 @@
       */
      public boolean isBlockNormalCube(int par1, int par2, int par3)
      {
@@ -175,7 +175,7 @@
      }
  
      /**
-@@ -2980,6 +2968,7 @@
+@@ -2983,6 +2971,7 @@
                  }
              }
          }
@@ -183,7 +183,7 @@
  
          Profiler.endSection();
  
-@@ -3302,7 +3291,7 @@
+@@ -3305,7 +3294,7 @@
  
      private int computeBlockLightValue(int par1, int par2, int par3, int par4, int par5, int par6)
      {
@@ -192,7 +192,7 @@
          int var8 = this.getSavedLightValue(EnumSkyBlock.Block, par2 - 1, par3, par4) - par6;
          int var9 = this.getSavedLightValue(EnumSkyBlock.Block, par2 + 1, par3, par4) - par6;
          int var10 = this.getSavedLightValue(EnumSkyBlock.Block, par2, par3 - 1, par4) - par6;
-@@ -3834,7 +3823,10 @@
+@@ -3837,7 +3826,10 @@
              {
                  var8 = null;
              }
@@ -204,9 +204,9 @@
              return par1 > 0 && var8 == null && var9.canPlaceBlockOnSide(this, par2, par3, par4, par6);
          }
      }
-@@ -4435,4 +4427,39 @@
+@@ -4441,4 +4433,39 @@
      {
-         return this.worldInfo.getTerrainType() == WorldType.field_48636_c ? 0.0D : 63.0D;
+         return this.worldInfo.getTerrainType() == WorldType.FLAT ? 0.0D : 63.0D;
      }
 +    
 +
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldProvider.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldProvider.java.patch
index e0bbace63..6d71d2d31 100644
--- a/forge/patches/minecraft/net/minecraft/src/WorldProvider.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/WorldProvider.java.patch
@@ -17,7 +17,7 @@
      }
  
      /**
-@@ -227,4 +229,36 @@
+@@ -232,4 +234,36 @@
      {
          return false;
      }
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch
index 2e206c91b..c7002c974 100644
--- a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch
@@ -23,13 +23,13 @@
                                          GL11.glScalef(var19, var19, var19);
                                          GL11.glTranslatef(8.0F, 8.0F, 8.0F);
 -                                        tessellator.startDrawingQuads();
--                                        tessellator.setTranslationD((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ));
+-                                        tessellator.setTranslation((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ));
 +                                        ForgeHooksClient.beforeRenderPass(var11);
 +                                        Tessellator.instance.startDrawingQuads();
-+                                        Tessellator.instance.setTranslationD((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ));
++                                        Tessellator.instance.setTranslation((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ));
                                      }
  
--                                    if (var11 == 0 && Block.blocksList[var18].func_48205_p())
+-                                    if (var11 == 0 && Block.blocksList[var18].hasTileEntity())
 +                                    if (var11 == 0 && Block.blocksList[var18] != null && Block.blocksList[var18].hasTileEntity(var9.getBlockMetadata(var17, var15, var16)))
                                      {
                                          TileEntity var23 = var9.getBlockTileEntity(var17, var15, var16);
@@ -64,8 +64,8 @@
 +                        this.bytesDrawn += Tessellator.instance.draw();
                          GL11.glPopMatrix();
                          GL11.glEndList();
--                        tessellator.setTranslationD(0.0D, 0.0D, 0.0D);
-+                        Tessellator.instance.setTranslationD(0.0D, 0.0D, 0.0D);
+-                        tessellator.setTranslation(0.0D, 0.0D, 0.0D);
++                        Tessellator.instance.setTranslation(0.0D, 0.0D, 0.0D);
                      }
                      else
                      {
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
index 70e23e9f8..b2825a966 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
@@ -9,16 +9,16 @@
  public class Block
  {
      public static final StepSound soundPowderFootstep = new StepSound("stone", 1.0F, 1.0F);
-@@ -446,7 +448,7 @@
+@@ -397,7 +399,7 @@
  
-     public boolean func_48124_n()
+     public boolean hasTileEntity()
      {
 -        return this.isBlockContainer;
-+	return hasTileEntity(0);
++        return hasTileEntity(0);
      }
  
      /**
-@@ -585,12 +587,16 @@
+@@ -536,12 +538,16 @@
          return this.blockID;
      }
  
@@ -37,7 +37,7 @@
      }
  
      /**
-@@ -609,17 +615,13 @@
+@@ -560,17 +566,13 @@
          if (!par1World.isRemote)
          {
              int var8 = this.quantityDroppedWithBonus(par7, par1World.rand);
@@ -59,7 +59,7 @@
                  }
              }
          }
-@@ -902,7 +904,7 @@
+@@ -853,7 +855,7 @@
          par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
          par2EntityPlayer.addExhaustion(0.025F);
  
@@ -68,7 +68,7 @@
          {
              ItemStack var8 = this.createStackedBlock(par6);
  
-@@ -1010,6 +1012,376 @@
+@@ -962,6 +964,376 @@
       */
      public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {}
  
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
index fe65ff2d2..17bd54dd7 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
@@ -16,7 +16,7 @@
  
      protected BlockFire(int par1, int par2)
      {
-@@ -42,8 +42,7 @@
+@@ -44,8 +44,7 @@
       */
      private void setBurnRate(int par1, int par2, int par3)
      {
@@ -26,7 +26,7 @@
      }
  
      /**
-@@ -101,7 +100,8 @@
+@@ -103,7 +102,8 @@
       */
      public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
      {
@@ -36,7 +36,7 @@
  
          if (par1World.worldProvider instanceof WorldProviderEnd && par1World.getBlockId(par2, par3 - 1, par4) == Block.bedrock.blockID)
          {
-@@ -130,12 +130,12 @@
+@@ -132,12 +132,12 @@
  
              if (!var6 && !this.canNeighborBurn(par1World, par2, par3, par4))
              {
@@ -51,16 +51,16 @@
              {
                  par1World.setBlockWithNotify(par2, par3, par4, 0);
              }
-@@ -149,12 +149,12 @@
+@@ -151,12 +151,12 @@
                      var9 = -50;
                  }
  
--                this.func_48133_a(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7);
--                this.func_48133_a(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7);
--                this.func_48133_a(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7);
--                this.func_48133_a(par1World, par2, par3 + 1, par4, 250 + var9, par5Random, var7);
--                this.func_48133_a(par1World, par2, par3, par4 - 1, 300 + var9, par5Random, var7);
--                this.func_48133_a(par1World, par2, par3, par4 + 1, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3 + 1, par4, 250 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3, par4 - 1, 300 + var9, par5Random, var7);
+-                this.tryToCatchBlockOnFire(par1World, par2, par3, par4 + 1, 300 + var9, par5Random, var7);
 +                this.tryToCatchBlockOnFire(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7, 4);
 +                this.tryToCatchBlockOnFire(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7, 5);
 +                this.tryToCatchBlockOnFire(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7, 1);
@@ -70,13 +70,13 @@
  
                  for (int var10 = par2 - 1; var10 <= par2 + 1; ++var10)
                  {
-@@ -202,9 +202,21 @@
+@@ -204,9 +204,21 @@
          }
      }
  
 +    /** Deprecated for a side-sensitive version */
 +    @Deprecated
-     private void func_48133_a(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7)
+     private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7)
      {
 -        int var8 = this.abilityToCatchFire[par1World.getBlockId(par2, par3, par4)];
 +        tryToCatchBlockOnFire(par1World, par2, par3, par4, par5, par6Random, par7, 0);
@@ -93,7 +93,7 @@
  
          if (par6Random.nextInt(par5) < var8)
          {
-@@ -238,7 +250,12 @@
+@@ -240,7 +252,12 @@
       */
      private boolean canNeighborBurn(World par1World, int par2, int par3, int par4)
      {
@@ -107,7 +107,7 @@
      }
  
      /**
-@@ -254,15 +271,15 @@
+@@ -256,15 +273,15 @@
          }
          else
          {
@@ -130,7 +130,7 @@
  
      /**
       * Returns if this block is collidable (only used by Fire). Args: x, y, z
-@@ -274,21 +291,24 @@
+@@ -276,21 +293,24 @@
  
      /**
       * Checks the specified block coordinate to see if it can catch fire.  Args: blockAccess, x, y, z
@@ -158,7 +158,7 @@
      }
  
      /**
-@@ -296,7 +316,7 @@
+@@ -298,7 +318,7 @@
       */
      public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
      {
@@ -167,7 +167,7 @@
      }
  
      /**
-@@ -305,7 +325,7 @@
+@@ -307,7 +327,7 @@
       */
      public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
      {
@@ -176,7 +176,7 @@
          {
              par1World.setBlockWithNotify(par2, par3, par4, 0);
          }
-@@ -318,7 +338,7 @@
+@@ -320,7 +340,7 @@
      {
          if (par1World.worldProvider.worldType > 0 || par1World.getBlockId(par2, par3 - 1, par4) != Block.obsidian.blockID || !Block.portal.tryToCreatePortal(par1World, par2, par3, par4))
          {
@@ -185,7 +185,7 @@
              {
                  par1World.setBlockWithNotify(par2, par3, par4, 0);
              }
-@@ -328,4 +348,46 @@
+@@ -330,4 +350,46 @@
              }
          }
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch
index 049d7c6b4..c9941f72c 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch
@@ -88,7 +88,7 @@
              {
                  var8 = true;
              }
-@@ -395,10 +408,120 @@
+@@ -396,10 +409,120 @@
      }
  
      /**
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
index d8792aac6..4d106e25c 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
-@@ -511,7 +511,7 @@
+@@ -529,7 +529,7 @@
                  {
                      Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12);
                  }
@@ -9,7 +9,7 @@
                  {
                      this.worldObj.removeBlockTileEntity(var11, par2, var12);
                  }
-@@ -549,31 +549,23 @@
+@@ -567,31 +567,23 @@
                      Block.blocksList[par4].onBlockAdded(this.worldObj, var11, par2, var12);
                  }
  
@@ -44,30 +44,31 @@
  
              this.isModified = true;
              return true;
-@@ -605,7 +597,7 @@
-                 var5.func_48585_b(par1, par2 & 15, par3, par4);
+@@ -623,7 +615,7 @@
+                 var5.setExtBlockMetadata(par1, par2 & 15, par3, par4);
                  int var7 = var5.getExtBlockID(par1, par2 & 15, par3);
  
 -                if (var7 > 0 && Block.blocksList[var7] instanceof BlockContainer)
-+                if (var7 > 0 && Block.blocksList[var7] != null && Block.blocksList[var7].hasTileEntity(var5.func_48598_b(par1, par2 & 15, par3)))
++                if (var7 > 0 && Block.blocksList[var7] != null && Block.blocksList[var7].hasTileEntity(var5.getExtBlockMetadata(par1, par2 & 15, par3)))
                  {
                      TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
  
-@@ -772,33 +764,30 @@
+@@ -789,34 +781,31 @@
+     {
          ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
          TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
- 
++        
 +        if (var5 != null && var5.isInvalid())
 +        {
 +            chunkTileEntityMap.remove(var4);
 +            var5 = null;
 +        }
-+
+ 
          if (var5 == null)
          {
              int var6 = this.getBlockID(par1, par2, par3);
 -
--            if (var6 <= 0 || !Block.blocksList[var6].func_48124_n())
+-            if (var6 <= 0 || !Block.blocksList[var6].hasTileEntity())
 +            int meta = getBlockMetadata(par1, par2, par3);
 +            if (var6 <= 0 || Block.blocksList[var6] == null || !Block.blocksList[var6].hasTileEntity(meta))
              {
@@ -97,7 +98,7 @@
      }
  
      /**
-@@ -813,7 +802,7 @@
+@@ -831,7 +820,7 @@
  
          if (this.isChunkLoaded)
          {
@@ -106,7 +107,7 @@
          }
      }
  
-@@ -828,8 +817,14 @@
+@@ -846,8 +835,14 @@
          par4TileEntity.yCoord = par2;
          par4TileEntity.zCoord = this.zPosition * 16 + par3;
  
@@ -122,7 +123,7 @@
              par4TileEntity.validate();
              this.chunkTileEntityMap.put(var5, par4TileEntity);
          }
-@@ -1227,4 +1222,18 @@
+@@ -1264,4 +1259,18 @@
              }
          }
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch
index 8f49b9a6d..bcd0656e6 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/Enchantment.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/Enchantment.java	0000-00-00 00:00:00.000000000 -0000
-@@ -175,4 +175,14 @@
+@@ -174,4 +174,14 @@
          this.name = par1Str;
          return this;
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch
index 96852f7b4..0a8a70427 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/Entity.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/Entity.java	0000-00-00 00:00:00.000000000 -0000
-@@ -171,6 +171,9 @@
+@@ -165,6 +165,9 @@
      public boolean ignoreFrustumCheck;
      public boolean isAirBorne;
  
@@ -10,7 +10,7 @@
      public Entity(World par1World)
      {
          this.entityId = nextEntityID++;
-@@ -212,6 +215,20 @@
+@@ -206,6 +209,20 @@
  
      protected abstract void entityInit();
  
@@ -31,7 +31,7 @@
      public DataWatcher getDataWatcher()
      {
          return this.dataWatcher;
-@@ -1188,6 +1205,10 @@
+@@ -1183,6 +1200,10 @@
          par1NBTTagCompound.setShort("Fire", (short)this.fire);
          par1NBTTagCompound.setShort("Air", (short)this.getAir());
          par1NBTTagCompound.setBoolean("OnGround", this.onGround);
@@ -42,7 +42,7 @@
          this.writeEntityToNBT(par1NBTTagCompound);
      }
  
-@@ -1229,6 +1250,10 @@
+@@ -1224,6 +1245,10 @@
          this.onGround = par1NBTTagCompound.getBoolean("OnGround");
          this.setPosition(this.posX, this.posY, this.posZ);
          this.setRotation(this.rotationYaw, this.rotationPitch);
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
index e8d251f1d..5e0f5eebd 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
@@ -20,7 +20,7 @@
 +                par1EntityPlayer.onItemPickup(this, var2);
 +                if (item.stackSize <= 0)
 +                {
-+                    setEntityDead();
++                    setDead();
 +                }
 +                return;
 +            }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch
index 4c3ac8a28..bf9d98649 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch
@@ -1,6 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java	0000-00-00 00:00:00.000000000 -0000
-@@ -55,7 +55,7 @@
+@@ -59,7 +59,7 @@
       * in each step in the damage calculations, this is set to the 'carryover' that would result if someone was damaged
       * .25 hearts (for example), and added to the damage in the next step
       */
@@ -9,7 +9,7 @@
  
      /** Number of ticks since this EntityLiving last produced its sound */
      private int livingSoundTime;
-@@ -1288,7 +1288,7 @@
+@@ -1298,7 +1298,7 @@
          int var2 = MathHelper.floor_double(this.boundingBox.minY);
          int var3 = MathHelper.floor_double(this.posZ);
          int var4 = this.worldObj.getBlockId(var1, var2, var3);
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
index ded48afd3..c67bdee17 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
@@ -113,10 +113,10 @@
      }
  
      public EntityMinecart(World par1World, double par2, double par4, double par6, int par8)
-@@ -117,48 +162,8 @@
+@@ -117,48 +162,7 @@
                  }
  
-                 this.setEntityDead();
+                 this.setDead();
 -                this.dropItemWithOffset(Item.minecartEmpty.shiftedIndex, 1, 0.0F);
 -
 -                if (this.minecartType == 1)
@@ -159,12 +159,11 @@
 -                {
 -                    this.dropItemWithOffset(Block.stoneOvenIdle.blockID, 1, 0.0F);
 -                }
-+                
 +                dropCartAsItem();
              }
  
              return true;
-@@ -230,7 +235,7 @@
+@@ -230,7 +234,7 @@
              this.func_41018_e_(this.func_41020_o() - 1);
          }
  
@@ -173,7 +172,7 @@
          {
              this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D);
          }
-@@ -285,25 +290,20 @@
+@@ -285,25 +289,20 @@
              double var6 = 0.0078125D;
              int var8 = this.worldObj.getBlockId(var1, var2, var3);
  
@@ -202,7 +201,7 @@
                  if (var10 >= 2 && var10 <= 5)
                  {
                      this.posY = (double)(var2 + 1);
-@@ -346,7 +346,7 @@
+@@ -346,7 +345,7 @@
                  this.motionZ = var22 * var16 / var18;
                  double var24;
  
@@ -211,7 +210,7 @@
                  {
                      var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
  
-@@ -396,36 +396,8 @@
+@@ -396,36 +395,8 @@
                  this.posX = var26 + var14 * var24;
                  this.posZ = var28 + var16 * var24;
                  this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ);
@@ -250,7 +249,7 @@
  
                  if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var1 == var13[0][0] && MathHelper.floor_double(this.posZ) - var3 == var13[0][2])
                  {
-@@ -436,41 +408,7 @@
+@@ -436,41 +407,7 @@
                      this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ);
                  }
  
@@ -293,7 +292,7 @@
  
                  Vec3D var52 = this.func_182_g(this.posX, this.posY, this.posZ);
  
-@@ -499,30 +437,15 @@
+@@ -499,30 +436,15 @@
                  }
  
                  double var41;
@@ -330,7 +329,7 @@
                  {
                      var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
  
-@@ -558,41 +481,7 @@
+@@ -558,41 +480,7 @@
              }
              else
              {
@@ -373,7 +372,7 @@
              }
  
              this.rotationPitch = 0.0F;
-@@ -628,7 +517,18 @@
+@@ -628,7 +516,18 @@
              }
  
              this.setRotation(this.rotationYaw, this.rotationPitch);
@@ -393,7 +392,7 @@
  
              if (var15 != null && var15.size() > 0)
              {
-@@ -653,17 +553,8 @@
+@@ -653,17 +552,8 @@
                  this.riddenByEntity = null;
              }
  
@@ -413,7 +412,7 @@
          }
      }
  
-@@ -682,14 +573,9 @@
+@@ -682,14 +572,9 @@
  
          if (BlockRail.isRailBlock(var10))
          {
@@ -429,7 +428,7 @@
              if (var11 >= 2 && var11 <= 5)
              {
                  par3 = (double)(var8 + 1);
-@@ -754,13 +640,13 @@
+@@ -754,13 +639,13 @@
      {
          par1NBTTagCompound.setInteger("Type", this.minecartType);
  
@@ -446,7 +445,7 @@
          {
              NBTTagList var2 = new NBTTagList();
  
-@@ -786,13 +672,13 @@
+@@ -786,13 +671,13 @@
      {
          this.minecartType = par1NBTTagCompound.getInteger("Type");
  
@@ -463,7 +462,7 @@
          {
              NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
              this.cargoItems = new ItemStack[this.getSizeInventory()];
-@@ -815,11 +701,18 @@
+@@ -815,11 +700,18 @@
       */
      public void applyEntityCollision(Entity par1Entity)
      {
@@ -483,7 +482,7 @@
                  {
                      par1Entity.mountEntity(this);
                  }
-@@ -865,7 +758,7 @@
+@@ -865,7 +757,7 @@
                          double var18 = par1Entity.motionX + this.motionX;
                          double var20 = par1Entity.motionZ + this.motionZ;
  
@@ -492,7 +491,7 @@
                          {
                              this.motionX *= 0.20000000298023224D;
                              this.motionZ *= 0.20000000298023224D;
-@@ -873,7 +766,7 @@
+@@ -873,7 +765,7 @@
                              par1Entity.motionX *= 0.949999988079071D;
                              par1Entity.motionZ *= 0.949999988079071D;
                          }
@@ -501,7 +500,7 @@
                          {
                              par1Entity.motionX *= 0.20000000298023224D;
                              par1Entity.motionZ *= 0.20000000298023224D;
-@@ -908,7 +801,7 @@
+@@ -908,7 +800,7 @@
       */
      public int getSizeInventory()
      {
@@ -510,7 +509,7 @@
      }
  
      /**
-@@ -1011,7 +904,12 @@
+@@ -1011,7 +903,12 @@
       */
      public boolean interact(EntityPlayer par1EntityPlayer)
      {
@@ -524,7 +523,7 @@
          {
              if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer)
              {
-@@ -1023,14 +921,14 @@
+@@ -1023,14 +920,14 @@
                  par1EntityPlayer.mountEntity(this);
              }
          }
@@ -541,7 +540,7 @@
          {
              ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem();
  
-@@ -1062,7 +960,7 @@
+@@ -1062,7 +959,7 @@
      /**
       * Is this minecart powered (Fuel > 0)
       */
@@ -550,7 +549,7 @@
      {
          return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0;
      }
-@@ -1115,4 +1013,348 @@
+@@ -1115,4 +1012,348 @@
      {
          return this.dataWatcher.getWatchableObjectInt(18);
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch
index 139b7623c..08f2bf119 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch
@@ -18,14 +18,14 @@
          }
 -        else if (var2 != null && var2.itemID == Item.shears.shiftedIndex && this.getGrowingAge() >= 0)
 -        {
--            this.setEntityDead();
+-            this.setDead();
 -            this.worldObj.spawnParticle("largeexplode", this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, 0.0D, 0.0D, 0.0D);
 -
 -            if (!this.worldObj.isRemote)
 -            {
 -                EntityCow var3 = new EntityCow(this.worldObj);
 -                var3.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch);
--                var3.setEntityHealth(this.getEntityHealth());
+-                var3.setEntityHealth(this.getHealth());
 -                var3.renderYawOffset = this.renderYawOffset;
 -                this.worldObj.spawnEntityInWorld(var3);
 -
@@ -54,10 +54,10 @@
 +    @Override
 +    public ArrayList<ItemStack> onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) 
 +    {
-+        setEntityDead();
++        setDead();
 +        EntityCow entitycow = new EntityCow(worldObj);
 +        entitycow.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
-+        entitycow.setEntityHealth(getEntityHealth());
++        entitycow.setEntityHealth(getHealth());
 +        entitycow.renderYawOffset = renderYawOffset;
 +        worldObj.spawnEntityInWorld(entitycow);
 +        worldObj.spawnParticle("largeexplode", posX, posY + (double)(height / 2.0F), posZ, 0.0D, 0.0D, 0.0D);
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
index e27339573..e2e6dde5d 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
@@ -18,8 +18,8 @@
 +                itemInUse.getItem().onUsingItemTick(itemInUse, this, itemInUseCount);
                  if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0)
                  {
-                     this.func_35208_b(var1, 5);
-@@ -355,6 +360,10 @@
+                     this.updateItemUse(var1, 5);
+@@ -361,6 +366,10 @@
       */
      protected void closeScreen()
      {
@@ -30,9 +30,9 @@
          this.craftingInventory = this.inventorySlots;
      }
  
-@@ -535,7 +544,16 @@
- 
-     public EntityItem func_48347_R()
+@@ -544,7 +553,16 @@
+      */
+     public EntityItem dropOneItem()
      {
 -        return this.dropPlayerItemWithRandomChoice(this.inventory.decrStackSize(this.inventory.currentItem, 1), false);
 +        ItemStack stack = inventory.getCurrentItem();
@@ -48,7 +48,7 @@
      }
  
      /**
-@@ -600,10 +618,18 @@
+@@ -609,10 +627,18 @@
  
      /**
       * Returns how strong the player is against the specified block at this moment
@@ -68,7 +68,7 @@
          float var3 = var2;
          int var4 = EnchantmentHelper.getEfficiencyModifier(this.inventory);
  
-@@ -899,7 +925,11 @@
+@@ -908,7 +934,11 @@
              par2 = 1 + par2 >> 1;
          }
  
@@ -81,7 +81,7 @@
          par2 = this.applyPotionDamageCalculations(par1DamageSource, par2);
          this.addExhaustion(par1DamageSource.getHungerDamage());
          this.health -= par2;
-@@ -930,6 +960,10 @@
+@@ -939,6 +969,10 @@
       */
      public void useCurrentItemOnEntity(Entity par1Entity)
      {
@@ -92,7 +92,7 @@
          if (!par1Entity.interact(this))
          {
              ItemStack var2 = this.getCurrentEquippedItem();
-@@ -960,7 +994,9 @@
+@@ -969,7 +1003,9 @@
       */
      public void destroyCurrentEquippedItem()
      {
@@ -102,7 +102,7 @@
      }
  
      /**
-@@ -989,6 +1025,16 @@
+@@ -998,6 +1034,16 @@
       */
      public void attackTargetEntityWithCurrentItem(Entity par1Entity)
      {
@@ -119,7 +119,7 @@
          if (par1Entity.canAttackWithItem())
          {
              int var2 = this.inventory.getDamageVsEntity(par1Entity);
-@@ -1127,6 +1173,12 @@
+@@ -1136,6 +1182,12 @@
       */
      public EnumStatus sleepInBedAt(int par1, int par2, int par3)
      {
@@ -132,7 +132,7 @@
          if (!this.worldObj.isRemote)
          {
              if (this.isPlayerSleeping() || !this.isEntityAlive())
-@@ -1708,4 +1760,16 @@
+@@ -1717,4 +1769,16 @@
      {
          return !this.capabilities.isFlying;
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch
index c0a8d97a3..a64092b7e 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch
@@ -59,7 +59,7 @@
          this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 5, par1TileEntityBrewingStand.getInvName(), par1TileEntityBrewingStand.getSizeInventory()));
          this.craftingInventory = new ContainerBrewingStand(this.inventory, par1TileEntityBrewingStand);
          this.craftingInventory.windowId = this.currentWindowId;
-@@ -794,4 +804,38 @@
+@@ -797,4 +807,38 @@
          EntityTracker var2 = this.mcServer.getEntityTracker(this.dimension);
          var2.sendPacketToTrackedPlayersAndTrackedEntity(this, new Packet18Animation(par1Entity, 7));
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch
index 181c1f412..9ebe44a8d 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch
@@ -13,7 +13,7 @@
  {
      /**
       * Holds the RGB table of the sheep colors - in OpenGL glColor3f values - used to render the sheep colored fleece.
-@@ -97,27 +100,6 @@
+@@ -99,27 +102,6 @@
       */
      public boolean interact(EntityPlayer par1EntityPlayer)
      {
@@ -41,7 +41,7 @@
          return super.interact(par1EntityPlayer);
      }
  
-@@ -246,4 +228,23 @@
+@@ -252,4 +234,23 @@
              this.setGrowingAge(var1);
          }
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
index 912426f0c..f9b8e277d 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
@@ -7,7 +7,7 @@
  import java.util.Random;
  
  public class Item
-@@ -199,6 +200,9 @@
+@@ -191,6 +192,9 @@
  
      /** full name of item from language file */
      private String itemName;
@@ -17,7 +17,7 @@
  
      protected Item(int par1)
      {
-@@ -500,6 +504,10 @@
+@@ -492,6 +496,10 @@
          float var18 = var15 * var16;
          float var20 = var14 * var16;
          double var21 = 5.0D;
@@ -28,7 +28,7 @@
          Vec3D var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21);
          MovingObjectPosition var24 = par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3);
          return var24;
-@@ -517,4 +525,149 @@
+@@ -509,4 +517,149 @@
      {
          StatList.initStats();
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch
index 5fe502827..5b4b4b511 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch
@@ -8,7 +8,7 @@
  public class ItemBow extends Item
  {
      public ItemBow(int par1)
-@@ -14,6 +16,10 @@
+@@ -14,6 +16,11 @@
       */
      public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4)
      {
@@ -16,10 +16,11 @@
 +        {
 +            return;
 +        }
-         boolean var5 = par3EntityPlayer.capabilities.depleteBuckets || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, par1ItemStack) > 0;
++        
+         boolean var5 = par3EntityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, par1ItemStack) > 0;
  
          if (var5 || par3EntityPlayer.inventory.hasItem(Item.arrow.shiftedIndex))
-@@ -103,6 +109,12 @@
+@@ -103,6 +110,12 @@
       */
      public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
      {
@@ -29,6 +30,6 @@
 +            return stack;
 +        }
 +        
-         if (par3EntityPlayer.capabilities.depleteBuckets || par3EntityPlayer.inventory.hasItem(Item.arrow.shiftedIndex))
+         if (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.arrow.shiftedIndex))
          {
              par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack));
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
index 15e77db3b..e350e8020 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
@@ -74,7 +74,7 @@
          WorldServer var4 = this.mcServer.getWorldManager(par1EntityPlayerMP.dimension);
          par1EntityPlayerMP.dimension = par2;
 @@ -292,33 +301,14 @@
-         par1EntityPlayerMP.playerNetServerHandler.sendPacket(new Packet9Respawn(par1EntityPlayerMP.dimension, (byte)par1EntityPlayerMP.worldObj.difficultySetting, var5.getWorldInfo().getTerrainType(), var5.getWorldHeight(), par1EntityPlayerMP.itemInWorldManager.getGameType()));
+         par1EntityPlayerMP.playerNetServerHandler.sendPacket(new Packet9Respawn(par1EntityPlayerMP.dimension, (byte)par1EntityPlayerMP.worldObj.difficultySetting, var5.getWorldInfo().getTerrainType(), var5.getHeight(), par1EntityPlayerMP.itemInWorldManager.getGameType()));
          var4.removePlayer(par1EntityPlayerMP);
          par1EntityPlayerMP.isDead = false;
 -        double var6 = par1EntityPlayerMP.posX;
diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
index 7830af598..610ac1fd5 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
@@ -18,7 +18,7 @@
  
      /** Whether monsters are enabled or not. (1 = on, 0 = off) */
      public int difficultySetting;
-@@ -349,7 +351,8 @@
+@@ -352,7 +354,8 @@
       */
      public boolean isAirBlock(int par1, int par2, int par3)
      {
@@ -28,7 +28,7 @@
      }
  
      public boolean func_48084_h(int par1, int par2, int par3)
-@@ -1595,7 +1598,7 @@
+@@ -1598,7 +1601,7 @@
  
                      if (var7 != null)
                      {
@@ -37,7 +37,7 @@
                      }
                  }
              }
-@@ -1625,14 +1628,16 @@
+@@ -1628,14 +1631,16 @@
                      {
                          this.loadedTileEntityList.add(var8);
                      }
@@ -56,7 +56,7 @@
                          }
                      }
  
-@@ -1649,13 +1654,13 @@
+@@ -1652,13 +1657,13 @@
  
      public void addTileEntity(Collection par1Collection)
      {
@@ -76,7 +76,7 @@
          }
      }
  
-@@ -1900,6 +1905,13 @@
+@@ -1903,6 +1908,13 @@
                          if (var11 == Block.fire.blockID || var11 == Block.lavaMoving.blockID || var11 == Block.lavaStill.blockID)
                          {
                              return true;
@@ -90,7 +90,7 @@
                          }
                      }
                  }
-@@ -2183,25 +2195,21 @@
+@@ -2186,25 +2198,21 @@
       */
      public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity)
      {
@@ -129,7 +129,7 @@
          }
      }
  
-@@ -2210,27 +2218,10 @@
+@@ -2213,27 +2221,10 @@
       */
      public void removeBlockTileEntity(int par1, int par2, int par3)
      {
@@ -160,7 +160,7 @@
          }
      }
  
-@@ -2256,7 +2247,8 @@
+@@ -2259,7 +2250,8 @@
       */
      public boolean isBlockNormalCube(int par1, int par2, int par3)
      {
@@ -170,7 +170,7 @@
      }
  
      /**
-@@ -2531,6 +2523,7 @@
+@@ -2534,6 +2526,7 @@
                  }
              }
          }
@@ -178,7 +178,7 @@
  
          Profiler.endSection();
  
-@@ -2853,7 +2846,7 @@
+@@ -2856,7 +2849,7 @@
  
      private int computeBlockLightValue(int par1, int par2, int par3, int par4, int par5, int par6)
      {
@@ -187,7 +187,7 @@
          int var8 = this.getSavedLightValue(EnumSkyBlock.Block, par2 - 1, par3, par4) - par6;
          int var9 = this.getSavedLightValue(EnumSkyBlock.Block, par2 + 1, par3, par4) - par6;
          int var10 = this.getSavedLightValue(EnumSkyBlock.Block, par2, par3 - 1, par4) - par6;
-@@ -3339,6 +3332,11 @@
+@@ -3342,6 +3335,11 @@
              {
                  var8 = null;
              }
@@ -199,7 +199,7 @@
  
              return par1 > 0 && var8 == null && var9.canPlaceBlockOnSide(this, par2, par3, par4, par6);
          }
-@@ -3846,4 +3844,38 @@
+@@ -3849,4 +3847,38 @@
      {
          return this.getChunkProvider().findClosestStructure(this, par1Str, par2, par3, par4);
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
index e3aeefdc8..27351a651 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
@@ -19,7 +19,7 @@
      /**
 @@ -139,4 +141,36 @@
      {
-         return this.terrainType == WorldType.field_48458_c ? 4 : 64;
+         return this.terrainType == WorldType.FLAT ? 4 : 64;
      }
 +    
 +    /**