world, network work

mappings/net/minecraft/block/BlockFalling.mapping

@@ -1,4 +1,6 @@
 CLASS none/aml net/minecraft/block/BlockFalling
 	METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V
+	METHOD i canFallThrough (Lnone/asj;)Z
+		ARG 0 state
 	METHOD x getColor (Lnone/asj;)I
 		ARG 0 state

mappings/net/minecraft/block/state/BlockStateFactory.mapping

@@ -75,6 +75,9 @@ CLASS none/ask net/minecraft/block/state/BlockStateFactory
 		ARG 0 block
 		ARG 1 properties
 	METHOD a getValidStates ()Lcom/google/common/collect/ImmutableList;
+	METHOD a getProperty (Ljava/lang/String;)Lnone/asz;
+		ARG 0 name
 	METHOD b getDefaultState ()Lnone/asj;
 	METHOD c getBlock ()Lnone/akw;
 	METHOD d getProperties ()Ljava/util/Collection;
+	METHOD e getValueIterators ()Ljava/util/List;

mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping

@@ -36,6 +36,7 @@ CLASS none/art net/minecraft/block/tile/impl/TileEntitySign
 	FIELD a text [Lnone/fa;
 	METHOD C_ getUpdatePacket ()Lnone/fy;
 	METHOD a deserializeTag (Lnone/dt;)V
+	METHOD a (Z)V
 	METHOD b onLoad (Lnone/aiu;)V
 		ARG 0 world
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;

mappings/net/minecraft/entity/Entity.mapping

@@ -4,13 +4,16 @@ CLASS none/se net/minecraft/entity/Entity
 	FIELD S rand Ljava/util/Random;
 	FIELD Z dataTracker Lnone/km;
 	FIELD aB NAME_TRACKER Lnone/kj;
+	FIELD aC NAME_VISIBLE_TRACKER Lnone/kj;
 	FIELD aF invulnerable Z
+	FIELD aG commandStats Lnone/o;
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD aa flags Lnone/kj;
 	FIELD ac chunkX I
 	FIELD ad chunkY I
 	FIELD ae chunkZ I
 	FIELD ak portalCooldown I
+	FIELD al inPortal Z
 	FIELD an dimensionId I
 	FIELD ar uuid Ljava/util/UUID;
 	FIELD as uuidString Ljava/lang/String;
@@ -66,6 +69,8 @@ CLASS none/se net/minecraft/entity/Entity
 		ARG 4 power
 	METHOD a setWorld (Lnone/aiu;)V
 		ARG 0 world
+	METHOD a addCrashInformation (Lnone/c;)V
+		ARG 0 element
 	METHOD a setPositionAndAngles (Lnone/cn;FF)V
 		ARG 0 pos
 		ARG 1 yaw
@@ -94,10 +99,13 @@ CLASS none/se net/minecraft/entity/Entity
 		ARG 0 values
 	METHOD aG getItemsHand ()Ljava/lang/Iterable;
 	METHOD aH getItemsArmor ()Ljava/lang/Iterable;
+	METHOD aI getItemsEquipped ()Ljava/lang/Iterable;
+	METHOD aK hasVehicle ()Z
 	METHOD aL hasPassengers ()Z
 	METHOD aO isGlowing ()Z
 	METHOD aU getHeadPitch ()F
-	METHOD ab getSoundSwim ()Lnone/nk;
+	METHOD aa getSoundSwim ()Lnone/nk;
+	METHOD ab getSoundSplash ()Lnone/nk;
 	METHOD au isValid ()Z
 	METHOD b setPosition (DDD)V
 		ARG 0 x
@@ -133,6 +141,8 @@ CLASS none/se net/minecraft/entity/Entity
 	METHOD c getBlockPos ()Lnone/cn;
 	METHOD c changeDimension (I)Lnone/se;
 		ARG 0 dimensionId
+	METHOD c setCustomName (Ljava/lang/String;)V
+		ARG 0 value
 	METHOD c getSquaredDistanceTo (Lnone/cn;)D
 		ARG 0 pos
 	METHOD d getPos ()Lnone/bcs;
@@ -170,6 +180,8 @@ CLASS none/se net/minecraft/entity/Entity
 		ARG 0 entity
 	METHOD h_ getName ()Ljava/lang/String;
 	METHOD i_ getNameComponent ()Lnone/fa;
+	METHOD j setCustomNameVisible (Z)V
+		ARG 0 value
 	METHOD k getTrackedBoolean (I)Z
 		ARG 0 id
 	METHOD m update ()V

mappings/net/minecraft/entity/EntityRegistry.mapping

@@ -1,11 +1,16 @@
 CLASS none/sg net/minecraft/entity/EntityRegistry
 	FIELD a LIGHTNING_BOLT_ID Lnone/kp;
 	FIELD b CLASS_MAP Lnone/db;
-	FIELD d ID_LIST Ljava/util/Set;
+	FIELD d ID_SET Ljava/util/Set;
 	FIELD e PLAYER_ID Lnone/kp;
 	FIELD f LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD g NAME_LIST Ljava/util/List;
 	METHOD a getIdList ()Ljava/util/Set;
 	METHOD a registerEntity (ILjava/lang/String;Ljava/lang/Class;Ljava/lang/String;)V
+		ARG 0 rawId
+		ARG 1 id
+		ARG 2 entityClass
+		ARG 3 name
 	METHOD a getIdByClass (Ljava/lang/Class;)Lnone/kp;
 		ARG 0 entityClass
 	METHOD a create (Ljava/lang/Class;Lnone/aiu;)Lnone/se;
@@ -15,9 +20,13 @@ CLASS none/sg net/minecraft/entity/EntityRegistry
 	METHOD a deserializeTag (Lnone/dt;Lnone/aiu;)Lnone/se;
 		ARG 0 tag
 		ARG 1 world
+	METHOD a getName (Lnone/kp;)Ljava/lang/String;
+		ARG 0 id
 	METHOD a create (Lnone/kp;Lnone/aiu;)Lnone/se;
 		ARG 0 id
 		ARG 1 world
 	METHOD a getId (Lnone/se;)Lnone/kp;
 		ARG 0 entity
 	METHOD b init ()V
+	METHOD b getName (Lnone/se;)Ljava/lang/String;
+		ARG 0 entity

mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping

@@ -1,5 +1,9 @@
 CLASS none/yx net/minecraft/entity/impl/EntityFallingBlock
+	FIELD b dropItem Z
+	FIELD c tileData Lnone/dt;
+	FIELD d BLOCK_POS Lnone/kj;
 	FIELD e block Lnone/asj;
+	FIELD g hurtEntities Z
 	METHOD <init> (Lnone/aiu;)V
 		ARG 0 world
 	METHOD <init> (Lnone/aiu;DDDLnone/asj;)V
@@ -8,9 +12,17 @@ CLASS none/yx net/minecraft/entity/impl/EntityFallingBlock
 		ARG 2 y
 		ARG 3 z
 		ARG 4 block
+	METHOD a addCrashInformation (Lnone/c;)V
+		ARG 0 element
+	METHOD a setBlockPos (Lnone/cn;)V
+		ARG 0 pos
 	METHOD a deserializeEntityTag (Lnone/dt;)V
+	METHOD a setHurtEntities (Z)V
+		ARG 0 value
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD e handleFallDamage (FF)V
 		ARG 0 fallDistance
+	METHOD j getBlockPos ()Lnone/cn;
+	METHOD k getWorldClient ()Lnone/aiu;
 	METHOD l getBlockState ()Lnone/asj;
 	METHOD m update ()V

mappings/net/minecraft/entity/player/EntityPlayer.mapping

@@ -64,7 +64,8 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer
 	METHOD a dropSelectedItem (Z)Lnone/yy;
 	METHOD aG getItemsHand ()Ljava/lang/Iterable;
 	METHOD aH getItemsArmor ()Ljava/lang/Iterable;
-	METHOD ab getSoundSwim ()Lnone/nk;
+	METHOD aa getSoundSwim ()Lnone/nk;
+	METHOD ab getSoundSplash ()Lnone/nk;
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD b increaseStat (Lnone/nu;)V
 		ARG 0 stat

mappings/net/minecraft/network/NetworkThreadUtils.mapping

@@ -0,0 +1 @@
+CLASS none/fn net/minecraft/network/NetworkThreadUtils

mappings/net/minecraft/network/handler/INetworkQueryHandlerServer.mapping

@@ -0,0 +1,5 @@
+CLASS none/kf net/minecraft/network/handler/INetworkQueryHandlerServer
+	METHOD a onQueryPing (Lnone/kg;)V
+		ARG 0 packet
+	METHOD a onQueryRequest (Lnone/kh;)V
+		ARG 0 packet

mappings/net/minecraft/network/handler/impl/NetworkQueryHandlerServer.mapping

@@ -0,0 +1,14 @@
+CLASS none/mj net/minecraft/network/handler/impl/NetworkQueryHandlerServer
+	FIELD a SUCCESS_MESSAGE Lnone/fa;
+	FIELD b server Lnet/minecraft/server/MinecraftServer;
+	FIELD c connection Lnone/eq;
+	FIELD d responseSent Z
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnone/eq;)V
+		ARG 0 server
+		ARG 1 connection
+	METHOD a onConnectionLost (Lnone/fa;)V
+		ARG 0 reason
+	METHOD a onQueryPing (Lnone/kg;)V
+		ARG 0 packet
+	METHOD a onQueryRequest (Lnone/kh;)V
+		ARG 0 packet

mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping

@@ -1,5 +1,12 @@
 CLASS none/iv net/minecraft/network/packet/server/SPacketCustomPayload
+	FIELD a channel Ljava/lang/String;
+	FIELD b data Lnone/es;
+	METHOD <init> (Ljava/lang/String;Lnone/es;)V
+		ARG 0 channel
+		ARG 1 payload
+	METHOD a getChannel ()Ljava/lang/String;
 	METHOD a readPacket (Lnone/es;)V
 		ARG 0 packet
+	METHOD b getData ()Lnone/es;
 	METHOD b writePacket (Lnone/es;)V
 		ARG 0 packet

mappings/net/minecraft/network/packet/server/SPacketQueryRequest.mapping

@@ -1,4 +1,4 @@
-CLASS none/kh net/minecraft/network/packet/client/SPacketQueryRequest
+CLASS none/kh net/minecraft/network/packet/server/SPacketQueryRequest
 	METHOD a readPacket (Lnone/es;)V
 		ARG 0 packet
 	METHOD b writePacket (Lnone/es;)V

mappings/net/minecraft/reference/LootTables.mapping

@@ -0,0 +1,8 @@
+CLASS none/bbb net/minecraft/reference/LootTables
+	FIELD aw LOOT_TABLES Ljava/util/Set;
+	FIELD ax LOOT_TABLES_READ_ONLY Ljava/util/Set;
+	METHOD a getAll ()Ljava/util/Set;
+	METHOD a registerMinecraftLootTable (Ljava/lang/String;)Lnone/kp;
+		ARG 0 id
+	METHOD a registerLootTable (Lnone/kp;)Lnone/kp;
+		ARG 0 id

mappings/net/minecraft/util/math/BoundingBox.mapping

@@ -24,6 +24,18 @@ CLASS none/bcp net/minecraft/util/math/BoundingBox
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD a contains (DDDDDD)Z
+		ARG 0 minX
+		ARG 1 minY
+		ARG 2 minZ
+		ARG 3 maxX
+		ARG 4 maxY
+		ARG 5 maxZ
+	METHOD a contains (Lnone/bcs;)Z
+		ARG 0 point
+	METHOD a contains (Lnone/bcs;Lnone/bcs;)Z
+		ARG 0 a
+		ARG 1 b
 	METHOD a offset (Lnone/cn;)Lnone/bcp;
 		ARG 0 pos
 	METHOD b isValid ()Z
@@ -31,6 +43,8 @@ CLASS none/bcp net/minecraft/util/math/BoundingBox
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD b contains (Lnone/bcp;)Z
+		ARG 0 box
 	METHOD c getCenter ()Lnone/bcs;
 	METHOD c offset (DDD)Lnone/bcp;
 		ARG 0 x

mappings/net/minecraft/util/thread/IThreadContainer.mapping

@@ -1,4 +1,4 @@
-CLASS none/qp net/minecraft/sortme/IMultiThreadedObject
+CLASS none/qp net/minecraft/util/thread/IThreadContainer
 	METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
 		ARG 0 runnable
 	METHOD aE isMainThread ()Z

mappings/net/minecraft/util/thread/ThreadNotMainException.mapping

@@ -0,0 +1,2 @@
+CLASS none/kz net/minecraft/util/thread/ThreadNotMainException
+	FIELD a INSTANCE Lnone/kz;

mappings/net/minecraft/world/GameRules.mapping

@@ -19,6 +19,7 @@ CLASS none/air net/minecraft/world/GameRules
 		FIELD b BOOLEAN Lnone/air$b;
 		FIELD c INTEGER Lnone/air$b;
 	FIELD a rules Ljava/util/TreeMap;
+	METHOD a serializeToTag ()Lnone/dt;
 	METHOD a getString (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 name
 	METHOD a set (Ljava/lang/String;Ljava/lang/String;)V
@@ -28,6 +29,11 @@ CLASS none/air net/minecraft/world/GameRules
 		ARG 0 name
 		ARG 1 value
 		ARG 2 type
+	METHOD a (Ljava/lang/String;Lnone/air$b;)Z
+		ARG 0 name
+		ARG 1 type
+	METHOD a deserializeFromTag (Lnone/dt;)V
+		ARG 0 tag
 	METHOD b getNames ()[Ljava/lang/String;
 	METHOD b getBoolean (Ljava/lang/String;)Z
 		ARG 0 name

mappings/net/minecraft/world/IWorldListener.mapping

@@ -9,5 +9,5 @@ CLASS none/aiw net/minecraft/world/IWorldListener
 		ARG 5 z
 		ARG 6 volume
 		ARG 7 pitch
-	METHOD a onEntitySpawn (Lnone/se;)V
+	METHOD a onSpawnEntity (Lnone/se;)V
 		ARG 0 entity

mappings/net/minecraft/world/WorldServer.mapping

@@ -1,6 +1,6 @@
 CLASS none/lu net/minecraft/world/WorldServer
 	FIELD I server Lnet/minecraft/server/MinecraftServer;
-	FIELD J entityTracker Lnone/lr;
+	FIELD J entityTrackingManager Lnone/lr;
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b disableAutoSave Z
 	METHOD a isChunkLoaded (IIZ)Z
@@ -30,4 +30,4 @@ CLASS none/lu net/minecraft/world/WorldServer
 	METHOD n createChunkProvider ()Lnone/ath;
 	METHOD r getServerChunkProvider ()Lnone/lt;
 	METHOD t updateWeather ()V
-	METHOD v getEntityTracker ()Lnone/lr;
+	METHOD v getEntityTrackingManager ()Lnone/lr;

mappings/net/minecraft/world/chunk/Chunk.mapping

@@ -73,8 +73,12 @@ CLASS none/atm net/minecraft/world/chunk/Chunk
 	METHOD f isEmpty ()Z
 	METHOD g getLevelOfTopSection ()I
 	METHOD h getSections ()[Lnone/atn;
+	METHOD k getPos ()Lnone/ain;
 	METHOD l getBiomeMap ()[B
 	METHOD q getWorld ()Lnone/aiu;
 	METHOD r getHeightMap ()[I
 	METHOD s getTileEntityMap ()Ljava/util/Map;
+	METHOD t getEntitySets ()[Lnone/od;
+	METHOD u isTerrainPopulated ()Z
+	METHOD v isLightPopulated ()Z
 	METHOD y getTopSection ()Lnone/atn;

mappings/net/minecraft/world/entity/WorldEntityTracker.mapping

@@ -1,11 +1,17 @@
-CLASS none/lr net/minecraft/world/entity/WorldEntityTracker
+CLASS none/ly net/minecraft/world/entity/WorldEntityTracker
-	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD b world Lnone/lu;
+	FIELD d entity Lnone/se;
-	METHOD <init> (Lnone/lu;)V
+	FIELD e trackingRange I
-		ARG 0 world
+	FIELD g updateInterval I
-	METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V
+	METHOD <init> (Lnone/se;IIIZ)V
 		ARG 0 entity
-		ARG 1 packet
+		ARG 1 trackingRange
-	METHOD b sendToAllTrackingAndSelf (Lnone/se;Lnone/fl;)V
+		ARG 3 updateInterval
-		ARG 0 entity
+	METHOD a sendToAllTracking (Lnone/fl;)V
-		ARG 1 packet
+		ARG 0 packet
+	METHOD b getEntity ()Lnone/se;
+	METHOD b sendToAllTrackingAndSelf (Lnone/fl;)V
+		ARG 0 packet
+	METHOD e getSpawnPacket ()Lnone/fl;
+	METHOD equals (Ljava/lang/Object;)Z
+		ARG 0 other

mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping

@@ -0,0 +1,25 @@
+CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b world Lnone/lu;
+	FIELD c TRACKERS Ljava/util/Set;
+	FIELD d TRACKERS_BY_ID Lnone/om;
+	METHOD <init> (Lnone/lu;)V
+		ARG 0 world
+	METHOD a startTracking (Lnone/se;)V
+		ARG 0 entity
+	METHOD a startTracking (Lnone/se;II)V
+		ARG 0 entity
+		ARG 1 trackingRange
+		ARG 2 updateInterval
+	METHOD a startTracking (Lnone/se;IIZ)V
+		ARG 0 entity
+		ARG 1 trackingRange
+		ARG 2 updateInterval
+	METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V
+		ARG 0 entity
+		ARG 1 packet
+	METHOD b stopTracking (Lnone/se;)V
+		ARG 0 entity
+	METHOD b sendToAllTrackingAndSelf (Lnone/se;Lnone/fl;)V
+		ARG 0 entity
+		ARG 1 packet

mappings/net/minecraft/world/explosion/Explosion.mapping

@@ -1,4 +1,4 @@
-CLASS none/aip net/minecraft/sortme/Explosion
+CLASS none/aip net/minecraft/world/explosion/Explosion
 	FIELD a createFire Z
 	FIELD b destroyBlocks Z
 	FIELD c rand Ljava/util/Random;

mappings/none/boy.mapping

@@ -12,5 +12,5 @@ CLASS none/boy
 		ARG 7 pitch
 	METHOD a onResourceReload (Lnone/bya;)V
 		ARG 0 container
-	METHOD a onEntitySpawn (Lnone/se;)V
+	METHOD a onSpawnEntity (Lnone/se;)V
 		ARG 0 entity

mappings/none/lv.mapping

@@ -11,5 +11,5 @@ CLASS none/lv
 		ARG 5 z
 		ARG 6 volume
 		ARG 7 pitch
-	METHOD a onEntitySpawn (Lnone/se;)V
+	METHOD a onSpawnEntity (Lnone/se;)V
 		ARG 0 entity

mappings/none/ly.mapping

@@ -1,7 +0,0 @@
-CLASS none/ly
-	FIELD d entity Lnone/se;
-	FIELD z tracking Ljava/util/Set;
-	METHOD a sendToAllTracking (Lnone/fl;)V
-		ARG 0 packet
-	METHOD b sendToAllTrackingAndSelf (Lnone/fl;)V
-		ARG 0 packet

mappings/none/mj.mapping

@@ -1,3 +0,0 @@
-CLASS none/mj
-	METHOD a onConnectionLost (Lnone/fa;)V
-		ARG 0 reason

mappings/none/om.mapping

@@ -1,2 +1,4 @@
 CLASS none/om
-	METHOD a (I)Ljava/lang/Object;
+	METHOD a get (I)Ljava/lang/Object;
+	METHOD a put (ILjava/lang/Object;)V
+	METHOD b containsKey (I)Z

mappings/none/vv.mapping

@@ -9,5 +9,5 @@ CLASS none/vv
 		ARG 5 z
 		ARG 6 volume
 		ARG 7 pitch
-	METHOD a onEntitySpawn (Lnone/se;)V
+	METHOD a onSpawnEntity (Lnone/se;)V
 		ARG 0 entity

mappings/none/zo.mapping

@@ -2,6 +2,7 @@ CLASS none/zo
 	METHOD a damage (Lnone/rp;F)Z
 		ARG 0 source
 		ARG 1 damage
-	METHOD ab getSoundSwim ()Lnone/nk;
+	METHOD aa getSoundSwim ()Lnone/nk;
+	METHOD ab getSoundSplash ()Lnone/nk;
 	METHOD bC getSoundCategory ()Lnone/nm;
 	METHOD m update ()V