close #59

build.gradle

@@ -32,7 +32,7 @@ def minecraft_version = "b1.7.3"
 
 def ENV = System.getenv()
 //def build_number = ENV.BUILD_NUMBER ?: "local"
-def build_number = 15
+def build_number = 16
 
 def yarnVersion = "${minecraft_version}+build.$build_number"
 

mappings/net/minecraft/level/Level.mapping

@@ -14,6 +14,7 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 	FIELD field_214 rand Ljava/util/Random;
 	FIELD field_215 generating Z
 	FIELD field_216 dimension Lnet/minecraft/class_50;
+	FIELD field_217 listeners Ljava/util/List;
 	FIELD field_218 cache Lnet/minecraft/class_51;
 	FIELD field_219 dimensionData Lnet/minecraft/class_52;
 	FIELD field_220 properties Lnet/minecraft/class_7;
@@ -43,15 +44,24 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 		ARG 2 y
 		ARG 3 z
 	METHOD method_159 setLevelTime (J)V
+		ARG 1 time
 	METHOD method_160 raycast (Lnet/minecraft/class_26;Lnet/minecraft/class_26;)Lnet/minecraft/class_27;
 	METHOD method_161 raycast (Lnet/minecraft/class_26;Lnet/minecraft/class_26;Z)Lnet/minecraft/class_27;
 	METHOD method_162 raycast (Lnet/minecraft/class_26;Lnet/minecraft/class_26;ZZ)Lnet/minecraft/class_27;
+	METHOD method_164 getLightLevel (Lnet/minecraft/class_56;III)I
+	METHOD method_165 setLightLevel (Lnet/minecraft/class_56;IIII)V
 	METHOD method_168 canSpawnEntity (Lnet/minecraft/class_25;)Z
 		ARG 1 box
 	METHOD method_173 playLevelEvent (Lnet/minecraft/class_54;IIIII)V
 	METHOD method_175 getEntities (Ljava/lang/Class;Lnet/minecraft/class_25;)Ljava/util/List;
+	METHOD method_176 getOrCreateMapStorage (Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/class_58;
+		ARG 1 clazz
+		ARG 2 name
 	METHOD method_177 getPlayerByName (Ljava/lang/String;)Lnet/minecraft/class_54;
 	METHOD method_178 addParticle (Ljava/lang/String;DDDDDD)V
+	METHOD method_180 putMapStorage (Ljava/lang/String;Lnet/minecraft/class_58;)V
+		ARG 1 name
+	METHOD method_183 addListener (Lnet/minecraft/class_59;)V
 	METHOD method_186 getClosestPlayerTo (Lnet/minecraft/class_57;D)Lnet/minecraft/class_54;
 	METHOD method_187 createExplosion (Lnet/minecraft/class_57;DDDF)Lnet/minecraft/class_60;
 		ARG 1 cause
@@ -66,9 +76,11 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 		ARG 6 z
 		ARG 8 power
 	METHOD method_191 playSound (Lnet/minecraft/class_57;Ljava/lang/String;FF)V
+		ARG 1 entity
 	METHOD method_195 saveLevel (ZLnet/minecraft/class_62;)V
 		ARG 2 listener
 	METHOD method_197 createLevelSource ()Lnet/minecraft/class_51;
+	METHOD method_199 getChunk (II)Lnet/minecraft/class_43;
 	METHOD method_200 setTileInChunk (IIII)Z
 		ARG 1 x
 		ARG 2 y
@@ -79,6 +91,7 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 	METHOD method_211 getEntities (Lnet/minecraft/class_57;Lnet/minecraft/class_25;)Ljava/util/List;
 	METHOD method_212 computeSpawnPosition ()V
 	METHOD method_213 getThunderGradient (F)F
+		ARG 1 tickProgress
 	METHOD method_214 getChunkFromCache (II)Lnet/minecraft/class_43;
 		ARG 1 x
 		ARG 2 z
@@ -93,14 +106,20 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 	METHOD method_222 getHeight (II)I
 		ARG 1 x
 		ARG 2 z
+	METHOD method_228 getOceanFloorHeight (II)I
+		ARG 1 x
+		ARG 2 z
 	METHOD method_229 setTile (IIII)Z
 	METHOD method_230 playLevelEvent (IIIII)V
 	METHOD method_231 removeEntity (Lnet/minecraft/class_57;)V
-		ARG 1 entity
+	METHOD method_233 getSurfaceHeight (II)I
+		ARG 1 x
+		ARG 2 z
 	METHOD method_234 isAir (III)Z
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
+	METHOD method_236 removeEntityFromChunk (Lnet/minecraft/class_57;)V
 	METHOD method_238 isChunkLoaded (II)Z
 		ARG 1 chunkX
 		ARG 2 chunkY
@@ -109,6 +128,7 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
+	METHOD method_251 checkSessionLock ()V
 	METHOD method_254 getSeed ()J
 	METHOD method_255 getLightLevel (III)I
 	METHOD method_256 getLevelTime ()J
@@ -130,12 +150,15 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level
 		ARG 2 y
 		ARG 3 z
 	METHOD method_268 canSkipNight ()Z
+	METHOD method_269 thundering ()Z
 	METHOD method_270 raining ()Z
+	METHOD method_271 prepareSaveLevel ()V
 	METHOD method_272 initWeatherGradients ()V
 	METHOD method_273 resetWeather ()V
 	METHOD method_276 setSpawnPosition (Lnet/minecraft/class_63;)V
 	METHOD method_277 addPlayer (Lnet/minecraft/class_54;)V
 		ARG 1 player
+	METHOD method_281 removeListener (Lnet/minecraft/class_59;)V
 	METHOD method_284 getSkyColour (F)Lnet/minecraft/class_26;
 	METHOD method_289 setRainGradient (F)V
 		ARG 1 gradient

mappings/net/minecraft/level/LevelData.mapping

@@ -2,6 +2,7 @@ CLASS net/minecraft/class_53 net/minecraft/level/LevelData
 	FIELD field_550 dimensionData Lnet/minecraft/class_52;
 	FIELD field_551 mapStorages Ljava/util/Map;
 	FIELD field_552 mapStorageValues Ljava/util/List;
+	FIELD field_553 idCounts Ljava/util/Map;
 	METHOD <init> (Lnet/minecraft/class_52;)V
 		ARG 1 data
 	METHOD method_523 flush ()V
@@ -10,6 +11,8 @@ CLASS net/minecraft/class_53 net/minecraft/level/LevelData
 	METHOD method_525 getOrCreateMapStorage (Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/class_58;
 		ARG 1 mapStorageClass
 		ARG 2 name
-	METHOD method_527 setMapStorage (Ljava/lang/String;Lnet/minecraft/class_58;)V
+	METHOD method_526 writeIdCount (Ljava/lang/String;)I
+	METHOD method_527 putMapStorage (Ljava/lang/String;Lnet/minecraft/class_58;)V
 		ARG 1 key
 		ARG 2 storage
+	METHOD method_528 readIdCounts ()V

mappings/net/minecraft/level/LightCalculator.mapping

@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_417 net/minecraft/level/LightCalculator
+	FIELD field_1673 type Lnet/minecraft/class_56;
+	METHOD method_1401 propagateLight (IIIIII)Z
+	METHOD method_1402 calculateLight (Lnet/minecraft/class_18;)V

mappings/net/minecraft/level/chunk/ChunkCache.mapping

@@ -1 +1,3 @@
-CLASS net/minecraft/class_390 net/minecraft/level/chunk/ChunkCache
+CLASS net/minecraft/class_326 net/minecraft/level/chunk/ChunkCache
+	METHOD <init> (Lnet/minecraft/class_18;Lnet/minecraft/class_243;Lnet/minecraft/class_51;)V
+		ARG 1 level

mappings/net/minecraft/level/chunk/ClientChunkCache.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_390 net/minecraft/level/chunk/ClientChunkCache

mappings/net/minecraft/level/dimension/DimensionData.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_52 net/minecraft/level/dimension/DimensionData
 	METHOD method_1732 (Lnet/minecraft/class_7;)V
 		ARG 1 properties
-	METHOD method_1733 (Lnet/minecraft/class_7;Ljava/util/List;)V
+	METHOD method_1733 writeProperties (Lnet/minecraft/class_7;Ljava/util/List;)V
 		ARG 1 properties
 		ARG 2 list
 	METHOD method_1734 getChunkIO (Lnet/minecraft/class_50;)Lnet/minecraft/class_243;

mappings/net/minecraft/level/source/LevelSource.mapping

@@ -6,8 +6,9 @@ CLASS net/minecraft/class_51 net/minecraft/level/source/LevelSource
 		ARG 1 levelSource
 		ARG 2 chunkX
 		ARG 3 chunkZ
-	METHOD method_1804 (ZLnet/minecraft/class_62;)Z
+	METHOD method_1804 saveChunks (ZLnet/minecraft/class_62;)Z
 		ARG 2 listener
+	METHOD method_1805 isClean ()Z
 	METHOD method_1806 getChunk (II)Lnet/minecraft/class_43;
 		ARG 1 x
 		ARG 2 z

mappings/net/minecraft/level/source/NetherLevelSource.mapping

@@ -1,3 +1,8 @@
 CLASS net/minecraft/class_359 net/minecraft/level/source/NetherLevelSource
 	FIELD field_1344 rand Ljava/util/Random;
 	FIELD field_1350 level Lnet/minecraft/class_18;
+	FIELD field_1355 cave Lnet/minecraft/class_105;
+	METHOD method_1180 shapeChunk (II[B)V
+	METHOD method_1181 calculateNoise ([DIIIIII)[D
+		ARG 1 noiseArray
+	METHOD method_1182 buildSurface (II[B)V

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -1,11 +1,9 @@
 CLASS net/minecraft/server/MinecraftServer
-	CLASS class_643 ServerThread
-	CLASS class_645 ConsoleInputThread
-	CLASS class_646 MagicalTimingHelperThread
 	FIELD field_2837 logger Ljava/util/logging/Logger;
 	FIELD field_2839 pendingConnectionManager Lnet/minecraft/class_9;
 	FIELD field_2840 serverProperties Lnet/minecraft/class_391;
 	FIELD field_2841 levels [Lnet/minecraft/class_73;
+	FIELD field_2842 playerConnectionManager Lnet/minecraft/class_166;
 	FIELD field_2848 onlineMode Z
 	FIELD field_2849 spawnAnimals Z
 	FIELD field_2850 allowPvp Z
@@ -15,6 +13,7 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_2855 pendingCommands Ljava/util/List;
 	METHOD main ([Ljava/lang/String;)V
 		ARG 0 args
+	METHOD method_2159 loadLevels (Lnet/minecraft/class_182;Ljava/lang/String;J)V
 	METHOD method_2160 getFile (Ljava/lang/String;)Ljava/io/File;
 		ARG 1 location
 	METHOD method_2162 queueCommand (Ljava/lang/String;Lnet/minecraft/class_39;)V
@@ -26,3 +25,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_2169 saveChunks ()V
 	METHOD method_2170 stopServer ()V
 	METHOD method_2171 tick ()V
+	CLASS class_643 ServerThread
+	CLASS class_645 ConsoleInputThread
+	CLASS class_646 MagicalTimingHelperThread

mappings/net/minecraft/server/level/ServerLevelSource.mapping → mappings/net/minecraft/server/level/ServerChunkCache.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_79 net/minecraft/server/level/ServerLevelSource
+CLASS net/minecraft/class_79 net/minecraft/server/level/ServerChunkCache
 	FIELD field_934 chunkPositions Ljava/util/Set;
 	FIELD field_935 chunk Lnet/minecraft/class_43;
 	FIELD field_936 parentLevelSource Lnet/minecraft/class_51;

mappings/net/minecraft/tile/DoorTile.mapping

@@ -1 +1,3 @@
 CLASS net/minecraft/class_252 net/minecraft/tile/DoorTile
+	METHOD method_838 setBoundingBox (I)V
+		ARG 1 meta

mappings/net/minecraft/tile/FireTile.mapping

@@ -1 +1,9 @@
 CLASS net/minecraft/class_474 net/minecraft/tile/FireTile
+	FIELD field_2307 flammabilities [I
+	FIELD field_2308 spreadabilities [I
+	METHOD <init> (II)V
+		ARG 1 id
+	METHOD method_1822 setFlammability (III)V
+		ARG 1 tileId
+		ARG 2 flammability
+		ARG 3 spreadabilities

mappings/net/minecraft/tile/Tile.mapping

@@ -58,8 +58,8 @@ CLASS net/minecraft/class_17 net/minecraft/tile/Tile
 	FIELD field_1877 MOVING_PISTON Lnet/minecraft/class_469;
 	FIELD field_1878 DANDELION Lnet/minecraft/class_473;
 	FIELD field_1879 ROSE Lnet/minecraft/class_473;
-	FIELD field_1880 MUSHROOM_1 Lnet/minecraft/class_473;
-	FIELD field_1881 MUSHROOM_2 Lnet/minecraft/class_473;
+	FIELD field_1880 BROWN_MUSHROOM Lnet/minecraft/class_473;
+	FIELD field_1881 RED_MUSHROOM Lnet/minecraft/class_473;
 	FIELD field_1882 BLOCK_GOLD Lnet/minecraft/class_17;
 	FIELD field_1883 BLOCK_IRON Lnet/minecraft/class_17;
 	FIELD field_1884 DOUBLE_STONE_SLAB Lnet/minecraft/class_17;
@@ -95,6 +95,7 @@ CLASS net/minecraft/class_17 net/minecraft/tile/Tile
 	FIELD field_1915 id I
 	FIELD field_1916 hardness F
 	FIELD field_1917 resistance F
+	FIELD field_1919 opaque Z
 	FIELD field_1920 minX D
 	FIELD field_1921 minY D
 	FIELD field_1922 minZ D
@@ -115,6 +116,9 @@ CLASS net/minecraft/class_17 net/minecraft/tile/Tile
 	FIELD field_1938 TICKS_RANDOMLY [Z
 	FIELD field_1939 FULL_OPAQUE [Z
 	FIELD field_1940 HAS_TILE_ENTITY [Z
+	FIELD field_1942 IS_AIR [Z
+	FIELD field_1943 LUMINANCES [I
+	FIELD field_1944 MULTIPLE_STATES [Z
 	FIELD field_1945 STONE Lnet/minecraft/class_17;
 	FIELD field_1946 GRASS Lnet/minecraft/class_476;
 	FIELD field_1947 DIRT Lnet/minecraft/class_17;
@@ -134,12 +138,17 @@ CLASS net/minecraft/class_17 net/minecraft/tile/Tile
 		ARG 3 y
 		ARG 4 z
 		ARG 5 meta
+	METHOD method_1562 intersectsInLevel (Lnet/minecraft/class_18;IIILnet/minecraft/class_25;Ljava/util/ArrayList;)V
+		ARG 6 intersections
 	METHOD method_1563 onTileAction (Lnet/minecraft/class_18;IIIII)V
 		ARG 2 x
 		ARG 3 y
 		ARG 4 z
 		ARG 5 blockMeta
 	METHOD method_1564 raycast (Lnet/minecraft/class_18;IIILnet/minecraft/class_26;Lnet/minecraft/class_26;)Lnet/minecraft/class_27;
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
 	METHOD method_1565 getTickrate ()I
 	METHOD method_1566 isValidPosition (Lnet/minecraft/class_18;III)Z
 	METHOD method_1567 canPlaceAt (Lnet/minecraft/class_18;III)Z
@@ -149,6 +158,8 @@ CLASS net/minecraft/class_17 net/minecraft/tile/Tile
 		ARG 4 z
 	METHOD method_1569 emitsRedstonePower ()Z
 	METHOD method_1574 getPistonPushMode ()I
+	METHOD method_1577 luminance (F)Lnet/minecraft/class_17;
+		ARG 1 luminance
 	METHOD method_1578 setBoundingBox (FFFFFF)V
 		ARG 1 minX
 		ARG 2 minY
@@ -163,22 +174,26 @@ CLASS net/minecraft/class_17 net/minecraft/tile/Tile
 		ARG 2 x
 		ARG 3 y
 		ARG 4 z
-	METHOD method_1583 setName (Ljava/lang/String;)Lnet/minecraft/class_17;
+	METHOD method_1583 name (Ljava/lang/String;)Lnet/minecraft/class_17;
 	METHOD method_1584 setTicksRandomly (Z)Lnet/minecraft/class_17;
 		ARG 1 ticksRandomly
-	METHOD method_1585 setBlastResistance (F)Lnet/minecraft/class_17;
+	METHOD method_1585 blastResistance (F)Lnet/minecraft/class_17;
 		ARG 1 resistance
-	METHOD method_1587 setHardness (F)Lnet/minecraft/class_17;
+	METHOD method_1587 hardness (F)Lnet/minecraft/class_17;
 		ARG 1 hardness
+	METHOD method_1591 multipleStates ()Lnet/minecraft/class_17;
 	METHOD method_1592 drop (Lnet/minecraft/class_18;IIII)V
 		ARG 1 level
 		ARG 2 x
 		ARG 3 y
 		ARG 4 z
 		ARG 5 meta
+	METHOD method_1593 afterTileItemCreated ()V
 	METHOD method_1594 setUnbreakable ()Lnet/minecraft/class_17;
 	METHOD method_1595 getHardness ()F
 	METHOD method_1596 getName ()Ljava/lang/String;
+	METHOD method_1598 isOpaque ()Z
+	METHOD method_1599 nonOpaque ()Lnet/minecraft/class_17;
 	METHOD method_1600 getTint (Lnet/minecraft/class_14;III)I
 	METHOD method_1601 getDropId (ILjava/util/Random;)I
 		ARG 1 meta

mappings/net/minecraft/util/maths/Box.mapping

@@ -19,6 +19,7 @@ CLASS net/minecraft/class_25 net/minecraft/util/maths/Box
 		ARG 6 x1
 		ARG 8 y1
 		ARG 10 z1
+	METHOD method_90 intersects (Lnet/minecraft/class_25;)Z
 	METHOD method_93 expand (DDD)Lnet/minecraft/class_25;
 		ARG 1 x
 		ARG 3 y