work in entities, network, server, Minecraft client

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

@@ -1,5 +1,9 @@
 CLASS none/are net/minecraft/block/tile/impl/TileEntityCommandBlock
 	CLASS none/are$1
+		METHOD c getBlockPos ()Lnone/cn;
+		METHOD d getPos ()Lnone/bcs;
+		METHOD e getWorld ()Lnone/aiu;
+		METHOD f getEntity ()Lnone/se;
 		METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
 	CLASS none/are$a Type
 		FIELD a CHAIN Lnone/are$a;

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

@@ -1,8 +1,20 @@
 CLASS none/art net/minecraft/block/tile/impl/TileEntitySign
 	CLASS none/art$1
+		METHOD c getBlockPos ()Lnone/cn;
+		METHOD d getPos ()Lnone/bcs;
+		METHOD e getWorld ()Lnone/aiu;
+		METHOD f getEntity ()Lnone/se;
 		METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
+		METHOD h_ getName ()Ljava/lang/String;
+		METHOD i_ getNameComponent ()Lnone/fa;
 	CLASS none/art$2
+		METHOD c getBlockPos ()Lnone/cn;
+		METHOD d getPos ()Lnone/bcs;
+		METHOD e getWorld ()Lnone/aiu;
+		METHOD f getEntity ()Lnone/se;
 		METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
+		METHOD h_ getName ()Ljava/lang/String;
+		METHOD i_ getNameComponent ()Lnone/fa;
 	FIELD a text [Lnone/fa;
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;

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

@@ -2,8 +2,12 @@ CLASS none/aru net/minecraft/block/tile/impl/TileEntitySkull
 	FIELD a type I
 	FIELD f rotation I
 	FIELD g owner Lcom/mojang/authlib/GameProfile;
+	FIELD j userCache Lnone/mn;
+	FIELD k sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	METHOD D_ update ()V
+	METHOD a setSessionService (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V
 	METHOD a deserializeTag (Lnone/dt;)V
+	METHOD a setUserCache (Lnone/mn;)V
 	METHOD b setRotation (I)V
 		ARG 0 otation
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;

mappings/net/minecraft/client/GameSettings.mapping

@@ -13,6 +13,7 @@ CLASS none/bdq net/minecraft/client/GameSettings
 		FIELD K SHOW_SUBTITLES Lnone/bdq$a;
 		FIELD L REALMS_NOTIFICATIONS Lnone/bdq$a;
 		FIELD M AUTO_JUMP Lnone/bdq$a;
+		FIELD P key Ljava/lang/String;
 		FIELD a INVERT_MOUSE Lnone/bdq$a;
 		FIELD b SENSETIVITY Lnone/bdq$a;
 		FIELD c FOV Lnone/bdq$a;
@@ -39,6 +40,7 @@ CLASS none/bdq net/minecraft/client/GameSettings
 		FIELD x VBO Lnone/bdq$a;
 		FIELD y TOUCHSCREEN Lnone/bdq$a;
 		FIELD z CHAT_SCALE Lnone/bdq$a;
+		METHOD d getTranslationKey ()Ljava/lang/String;
 	FIELD A touchscreen Z
 	FIELD B mainHand Lnone/sm;
 	FIELD C overrideWidth I
@@ -127,3 +129,5 @@ CLASS none/bdq net/minecraft/client/GameSettings
 	METHOD a parseFloat (Ljava/lang/String;)F
 		ARG 0 s
 	METHOD b write ()V
+	METHOD c getTranslatedName (Lnone/bdq$a;)Ljava/lang/String;
+		ARG 0 option

mappings/net/minecraft/client/Minecraft.mapping

@@ -4,18 +4,27 @@ CLASS none/bdo net/minecraft/client/Minecraft
 	FIELD L DISPLAY_MODES Ljava/util/List;
 	FIELD Q textureManager Lnone/bxc;
 	FIELD R instance Lnone/bdo;
+	FIELD Z snooper Lnone/rj;
 	FIELD aP thread Ljava/lang/Thread;
 	FIELD aj server Lnone/caj;
 	FIELD av isDemo Z
 	FIELD f world Lnone/bme;
 	FIELD h player Lnone/boe;
 	FIELD k fontRenderer Lnone/bec;
+	FIELD r guiInGame Lnone/bed;
 	FIELD u settings Lnone/bdq;
 	FIELD w runDirectory Ljava/io/File;
+	METHOD F getServer ()Lnone/caj;
+	METHOD G onShutdown ()V
+	METHOD H getSnooper ()Lnone/rj;
 	METHOD I getCurrentTimeMillis ()J
 	METHOD N getTextureManager ()Lnone/bxc;
+	METHOD a start ()V
 	METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
 	METHOD a (Ljava/lang/String;)V
+	METHOD aC doItemPick ()V
 	METHOD aE isMainThread ()Z
+	METHOD aw doAttack ()V
+	METHOD ax doItemUse ()V
 	METHOD u isDemo ()Z
 	METHOD z getInstance ()Lnone/bdo;

mappings/net/minecraft/client/gui/impl/GuiInGame.mapping

@@ -2,3 +2,4 @@ CLASS none/bed net/minecraft/client/gui/impl/GuiInGame
 	FIELD f VIGNETTE_TEX Lnone/kp;
 	FIELD g WIDGETS_TEX Lnone/kp;
 	FIELD h PUMPKIN_BLUR Lnone/kp;
+	METHOD d getChatWidget ()Lnone/bej;

mappings/net/minecraft/client/network/INetworkHandlerClient.mapping

@@ -0,0 +1 @@
+CLASS none/fo net/minecraft/client/network/INetworkHandlerClient

mappings/net/minecraft/network/handler/LoginHandlerClient.mapping → mappings/net/minecraft/client/network/LoginhandlerClient.mapping

@@ -1,3 +1,3 @@
-CLASS none/bmb net/minecraft/network/handler/LoginHandlerClient
+CLASS none/bmb net/minecraft/client/network/LoginhandlerClient
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b mc Lnone/bdo;

mappings/net/minecraft/client/network/NetworkHandlerClient.mapping

@@ -0,0 +1,9 @@
+CLASS none/bmc net/minecraft/client/network/NetworkHandlerClient
+	CLASS none/bmc$1
+		CLASS none/bmc$1$1
+			METHOD a handle (ZI)V
+	FIELD a maxPlayers I
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c connection Lnone/eq;
+	FIELD f mc Lnone/bdo;
+	FIELD k rand Ljava/util/Random;

mappings/net/minecraft/client/world/WorldClient.mapping

@@ -1,24 +1,5 @@
-CLASS none/aiu net/minecraft/client/world/WorldClient
-	FIELD C profiler Lnone/os;
-	FIELD E isRemote Z
-	FIELD r rand Ljava/util/Random;
-	METHOD E isValidHeight (Lnone/cn;)Z
-		ARG 0 pos
-	METHOD U getGameRules ()Lnone/air;
+CLASS none/bme net/minecraft/client/world/WorldClient
+	FIELD K mc Lnone/bdo;
 	METHOD a getEntityById (I)Lnone/se;
-	METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcp;)Ljava/util/List;
-	METHOD a (Ljava/lang/Class;Lnone/bcp;Lcom/google/common/base/Predicate;)Ljava/util/List;
-	METHOD a isValidPos (Lnone/cn;)Z
-		ARG 0 pos
-	METHOD a setBlockState (Lnone/cn;Lnone/asj;I)Z
-		ARG 0 pos
-		ARG 1 state
-		ARG 2 flags
 	METHOD a createEntity (Lnone/se;)Z
-	METHOD b getBiome (Lnone/cn;)Lnone/ajh;
-	METHOD d isAir (Lnone/cn;)Z
-	METHOD k updateEntities ()V
-	METHOD o getBlockState (Lnone/cn;)Lnone/asj;
-		ARG 0 pos
-	METHOD r getTileEntity (Lnone/cn;)Lnone/arb;
-	METHOD u getServer ()Lnet/minecraft/server/MinecraftServer;
+	METHOD c getMinecraft (Lnone/bme;)Lnone/bdo;

mappings/net/minecraft/command/ICommandSender.mapping

@@ -0,0 +1,8 @@
+CLASS none/n net/minecraft/command/ICommandSender
+	METHOD c getBlockPos ()Lnone/cn;
+	METHOD d getPos ()Lnone/bcs;
+	METHOD e getWorld ()Lnone/aiu;
+	METHOD f getEntity ()Lnone/se;
+	METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;

mappings/net/minecraft/command/impl/CommandExecute.mapping

@@ -1,6 +1,12 @@
 CLASS none/ae net/minecraft/command/impl/CommandExecute
 	CLASS none/ae$1
+		METHOD c getBlockPos ()Lnone/cn;
+		METHOD d getPos ()Lnone/bcs;
+		METHOD e getWorld ()Lnone/aiu;
+		METHOD f getEntity ()Lnone/se;
 		METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
+		METHOD h_ getName ()Ljava/lang/String;
+		METHOD i_ getNameComponent ()Lnone/fa;
 	METHOD a getMinPermissionLevel ()I
 	METHOD a execute (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;)V
 	METHOD a getTabCompletionList (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;Lnone/cn;)Ljava/util/List;

mappings/net/minecraft/entity/Entity.mapping

@@ -7,6 +7,7 @@ CLASS none/se net/minecraft/entity/Entity
 	FIELD ak portalCooldown I
 	FIELD an dimensionId I
 	FIELD ar uuid Ljava/util/UUID;
+	FIELD as uuidString Ljava/lang/String;
 	FIELD at isGlowing Z
 	FIELD au passengerList Ljava/util/List;
 	FIELD c NULL_BOX Lnone/bcp;
@@ -23,6 +24,8 @@ CLASS none/se net/minecraft/entity/Entity
 	FIELD z onGround Z
 	METHOD O getEntityId ()I
 	METHOD R getDataTracker ()Lnone/km;
+	METHOD a setUuid (Ljava/util/UUID;)V
+		ARG 0 uuid
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 		ARG 0 tagCompound
 	METHOD a onTrackedDataSet (Lnone/kj;)V
@@ -32,12 +35,22 @@ CLASS none/se net/minecraft/entity/Entity
 		ARG 1 playerHand
 	METHOD b serializeEntityTag (Lnone/dt;)V
 		ARG 0 tagCompound
+	METHOD bB getVehicle ()Lnone/se;
 	METHOD bC getSoundCategory ()Lnone/nm;
-	METHOD be getUUID ()Ljava/util/UUID;
+	METHOD be getUuid ()Ljava/util/UUID;
 	METHOD bi getCustomName ()Ljava/lang/String;
 	METHOD bj isCustomNameVisible ()Z
 	METHOD bx getPasengerList ()Ljava/util/List;
+	METHOD c getBlockPos ()Lnone/cn;
+	METHOD d getPos ()Lnone/bcs;
+	METHOD e getWorld ()Lnone/aiu;
+	METHOD f getEntity ()Lnone/se;
 	METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
+	METHOD h setEntityId (I)V
+		ARG 0 value
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
 	METHOD m update ()V
+	METHOD o_ getPistonBehavior ()Lnone/ayr;
 	METHOD w hasPassenger (Lnone/se;)Z
 		ARG 0 entity

mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping

@@ -2,3 +2,4 @@ CLASS none/yl net/minecraft/entity/decoration/impl/EntityArmorStand
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD m update ()V
+	METHOD o_ getPistonBehavior ()Lnone/ayr;

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

@@ -3,3 +3,4 @@ CLASS none/sc net/minecraft/entity/impl/EntityAreaEffectCloud
 	METHOD a onTrackedDataSet (Lnone/kj;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD m update ()V
+	METHOD o_ getPistonBehavior ()Lnone/ayr;

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

@@ -8,6 +8,7 @@ CLASS none/yy net/minecraft/entity/impl/EntityItem
 	METHOD a (Lnone/yy;)Z
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD e setThrower (Ljava/lang/String;)V
+	METHOD h_ getName ()Ljava/lang/String;
 	METHOD l getOwner ()Ljava/lang/String;
 	METHOD m update ()V
 	METHOD n getThrower ()Ljava/lang/String;

mappings/net/minecraft/entity/passive/impl/EntityOcelot.mapping

@@ -1,3 +1,4 @@
 CLASS none/wq net/minecraft/entity/passive/impl/EntityOcelot
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
+	METHOD h_ getName ()Ljava/lang/String;

mappings/net/minecraft/entity/passive/impl/EntityVillager.mapping

@@ -1,3 +1,4 @@
 CLASS none/aaf net/minecraft/entity/passive/impl/EntityVillager
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
+	METHOD i_ getNameComponent ()Lnone/fa;

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

@@ -3,10 +3,24 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayerAbstract
 		FIELD a FULL Lnone/aak$b;
 		FIELD b COMMANDS Lnone/aak$b;
 		FIELD c HIDDEN Lnone/aak$b;
+		FIELD e id I
+		FIELD f key Ljava/lang/String;
+		METHOD a getId ()I
+		METHOD b getTranslationKey ()Ljava/lang/String;
+	FIELD bL abilities Lnone/aai;
+	FIELD bM experience I
+	FIELD bN experienceLevel I
+	FIELD bO experienceBarProgress F
 	FIELD bT gameProfile Lcom/mojang/authlib/GameProfile;
 	FIELD bv container Lnone/abv;
+	METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID;
+		ARG 0 profile
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD bC getSoundCategory ()Lnone/nm;
 	METHOD cP getGameProfile ()Lcom/mojang/authlib/GameProfile;
+	METHOD d getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID;
+		ARG 0 nickname
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
 	METHOD m update ()V

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

@@ -1,4 +1,5 @@
 CLASS none/boe net/minecraft/entity/player/EntityPlayerClient
 	FIELD d networkHandler Lnone/bmc;
 	METHOD a onTrackedDataSet (Lnone/kj;)V
+	METHOD c getBlockPos ()Lnone/cn;
 	METHOD m update ()V

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

@@ -2,4 +2,5 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer
 	FIELD a networkHandler Lnone/mg;
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
+	METHOD c getBlockPos ()Lnone/cn;
 	METHOD m update ()V

mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping

@@ -1,5 +1,9 @@
 CLASS none/abk net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart
 	CLASS none/abk$1
+		METHOD c getBlockPos ()Lnone/cn;
+		METHOD d getPos ()Lnone/bcs;
+		METHOD e getWorld ()Lnone/aiu;
+		METHOD f getEntity ()Lnone/se;
 		METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD a onTrackedDataSet (Lnone/kj;)V

mappings/net/minecraft/network/NetworkEncryptionUtils.mapping

@@ -1,2 +1,3 @@
 CLASS none/og net/minecraft/network/NetworkEncryptionUtils
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD b generateServerKeyPair ()Ljava/security/KeyPair;

mappings/net/minecraft/network/handler/NetworkHandlerServer.mapping → mappings/net/minecraft/network/NetworkHandlerServer.mapping

@@ -1,6 +1,8 @@
-CLASS none/mg net/minecraft/network/handler/NetworkHandlerServer
+CLASS none/mg net/minecraft/network/NetworkHandlerServer
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD d server Lnet/minecraft/server/MinecraftServer;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnone/eq;Lnone/lw;)V
 		ARG 0 server
 	METHOD D_ update ()V
+	METHOD a sendPacket (Lnone/fl;)V
+		ARG 0 packet

mappings/net/minecraft/network/packet/client/CPacketExperienceBarUpdate.mapping

@@ -1,12 +1,12 @@
 CLASS none/hv net/minecraft/network/packet/client/CPacketExperienceBarUpdate
-	FIELD a barLevel F
+	FIELD a barProgress F
 	FIELD b experienceLevel I
 	FIELD c experience I
 	METHOD <init> (FII)V
-		ARG 0 barLevel
+		ARG 0 barProgress
 		ARG 1 experienceLevel
 		ARG 2 experience
-	METHOD a getBarLevel ()F
+	METHOD a getBarProgress ()F
 	METHOD a readPacket (Lnone/es;)V
 		ARG 0 packet
 	METHOD b getExperienceLevel ()I

mappings/net/minecraft/reference/Bootstrap.mapping

@@ -5,4 +5,5 @@ CLASS none/ks net/minecraft/reference/Bootstrap
 	METHOD a isInitialized ()Z
 	METHOD a printStdout (Ljava/lang/String;)V
 	METHOD b initDispenserBehaviors ()V
+	METHOD c init ()V
 	METHOD d redirectOutputStreams ()V

mappings/net/minecraft/server/IntegratedServer.mapping

@@ -2,7 +2,10 @@ CLASS none/caj net/minecraft/server/IntegratedServer
 	FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD l mc Lnone/bdo;
 	METHOD A getRunDirectory ()Ljava/io/File;
+	METHOD a (Lnone/qx;)V
 	METHOD aa isDedicated ()Z
 	METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
+	METHOD n getGameMode ()Lnone/ais;
+	METHOD o getDifficulty ()Lnone/qx;
 	METHOD u shutdown ()V
 	METHOD x stop ()V