more work

mappings/net/minecraft/biome/BiomeGenerator.mapping

@@ -1 +0,0 @@
-CLASS none/ajk net/minecraft/biome/BiomeGenerator

mappings/net/minecraft/block/impl/BlockAnvil.mapping

@@ -8,7 +8,7 @@ CLASS none/akn net/minecraft/block/impl/BlockAnvil
 		METHOD h_ getName ()Ljava/lang/String;
 		METHOD i_ getNameComponent ()Lnone/fa;
 		METHOD k getId ()Ljava/lang/String;
-		METHOD n_ hasCustomNam ()Z
+		METHOD n_ hasCustomName ()Z
 	FIELD a FACING Lnone/asw;
 	FIELD b DAMAGE Lnone/asy;
 	FIELD c NORTH_SOUTH_BOX Lnone/bcp;

mappings/net/minecraft/block/impl/BlockCraftingTable.mapping

@@ -3,5 +3,5 @@ CLASS none/alq net/minecraft/block/impl/BlockCraftingTable
 		METHOD h_ getName ()Ljava/lang/String;
 		METHOD i_ getNameComponent ()Lnone/fa;
 		METHOD k getId ()Ljava/lang/String;
-		METHOD n_ hasCustomNam ()Z
+		METHOD n_ hasCustomName ()Z
 	METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z

mappings/net/minecraft/block/tile/TileEntity.mapping

@@ -2,10 +2,15 @@ CLASS none/arb net/minecraft/block/tile/TileEntity
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b world Lnone/aiu;
 	FIELD c pos Lnone/cn;
+	FIELD d invalid Z
 	FIELD e block Lnone/akw;
 	FIELD f REGISTRY Lnone/db;
 	FIELD g blockMetadata I
 	METHOD D getWorld ()Lnone/aiu;
+	METHOD a getRenderDistance (DDD)D
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
 	METHOD a getIdFromTileEntity (Ljava/lang/Class;)Lnone/kp;
 		ARG 0 tileClass
 	METHOD a register (Ljava/lang/String;Ljava/lang/Class;)V
@@ -16,6 +21,8 @@ CLASS none/arb net/minecraft/block/tile/TileEntity
 	METHOD a createTileFromTag (Lnone/aiu;Lnone/dt;)Lnone/arb;
 		ARG 0 world
 		ARG 1 tag
+	METHOD a setPos (Lnone/cn;)V
+		ARG 0 pos
 	METHOD a deserializeTag (Lnone/dt;)V
 		ARG 0 tag
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
@@ -24,7 +31,11 @@ CLASS none/arb net/minecraft/block/tile/TileEntity
 	METHOD c serializeTileData (Lnone/dt;)Lnone/dt;
 		ARG 0 tag
 	METHOD i_ ()Lnone/fa;
+	METHOD s getSquaredRenderDistance ()D
 	METHOD t hasWorld ()Z
 	METHOD u getBlockMetadata ()I
 	METHOD v getPos ()Lnone/cn;
 	METHOD w getBlock ()Lnone/akw;
+	METHOD x isInvalid ()Z
+	METHOD y invalidate ()V
+	METHOD z validate ()V

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

@@ -14,4 +14,7 @@ CLASS none/ara net/minecraft/block/tile/impl/TileEntityBeacon
 	METHOD c writeToTag ()Lnone/dt;
 	METHOD f getPotionEffectById (I)Lnone/rx;
 		ARG 0 id
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD n_ hasCustomName ()Z
+	METHOD s getSquaredRenderDistance ()D
 	METHOD t_ getInventorySize ()I

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

@@ -16,8 +16,8 @@ CLASS none/arc net/minecraft/block/tile/impl/TileEntityBrewingStand
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;
 	METHOD l clearInventory ()V
-	METHOD n_ ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I
 	METHOD v_ getMaxStackSize ()I

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

@@ -19,6 +19,7 @@ CLASS none/ard net/minecraft/block/tile/impl/TileEntityChest
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;
-	METHOD n_ ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I
+	METHOD y invalidate ()V

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

@@ -17,3 +17,4 @@ CLASS none/are net/minecraft/block/tile/impl/TileEntityCommandBlock
 	METHOD g isPowered ()Z
 	METHOD h isAuto ()Z
 	METHOD i isConditionMet ()Z
+	METHOD z validate ()V

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

@@ -8,7 +8,7 @@ CLASS none/arh net/minecraft/block/tile/impl/TileEntityDispenser
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;
-	METHOD n_ ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I
 	METHOD v_ getMaxStackSize ()I

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

@@ -1,2 +1,2 @@
 CLASS none/ari net/minecraft/block/tile/impl/TileEntityDropper
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;

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

@@ -6,7 +6,7 @@ CLASS none/arj net/minecraft/block/tile/impl/TileEntityEnchantingTable
 		ARG 0 name
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;
-	METHOD i_ ()Lnone/fa;
+	METHOD i_ getNameComponent ()Lnone/fa;
 	METHOD k getId ()Ljava/lang/String;
-	METHOD n_ ()Z
+	METHOD n_ hasCustomName ()Z

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

@@ -5,3 +5,4 @@ CLASS none/arw net/minecraft/block/tile/impl/TileEntityEndGateway
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
 	METHOD c writeToTag ()Lnone/dt;
+	METHOD s getSquaredRenderDistance ()D

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

@@ -1,2 +1,3 @@
 CLASS none/ark net/minecraft/block/tile/impl/TileEntityEnderChest
 	METHOD D_ update ()V
+	METHOD y invalidate ()V

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

@@ -22,9 +22,9 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace
 	METHOD b getFuelTime (Lnone/aeq;)I
 		ARG 0 stack
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;
 	METHOD l clearInventory ()V
 	METHOD m isBurning ()Z
-	METHOD n_ ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I
 	METHOD v_ getMaxStackSize ()I

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

@@ -13,8 +13,8 @@ CLASS none/aro net/minecraft/block/tile/impl/TileEntityHopper
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD h_ ()Ljava/lang/String;
+	METHOD h_ getName ()Ljava/lang/String;
 	METHOD l clearInventory ()V
-	METHOD n_ ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I
 	METHOD v_ getMaxStackSize ()I

mappings/net/minecraft/client/GameSettings.mapping

@@ -57,6 +57,14 @@ CLASS none/bdq net/minecraft/client/GameSettings
 	FIELD P showSubtitles Z
 	FIELD Q realmsNotifications Z
 	FIELD R autoJump Z
+	FIELD S keyForward Lnone/bdl;
+	FIELD T keyLeft Lnone/bdl;
+	FIELD U keyBack Lnone/bdl;
+	FIELD V keyRight Lnone/bdl;
+	FIELD W keyJump Lnone/bdl;
+	FIELD X keySneak Lnone/bdl;
+	FIELD Y keySprint Lnone/bdl;
+	FIELD Z keyInventory Lnone/bdl;
 	FIELD aA gamma F
 	FIELD aB saturation F
 	FIELD aC guiScale I
@@ -68,9 +76,25 @@ CLASS none/bdq net/minecraft/client/GameSettings
 	FIELD aJ GUI_SCALES [Ljava/lang/String;
 	FIELD aK PARTICLE_SETTINGS [Ljava/lang/String;
 	FIELD aL AO_SETTINGS [Ljava/lang/String;
+	FIELD a COLON_SPLITTER Lcom/google/common/base/Splitter;
 	FIELD aM GRAPHICS_SETTINGS [Ljava/lang/String;
 	FIELD aN ATTACK_INDICATOR_SETTINGS [Ljava/lang/String;
 	FIELD aQ optionsFile Ljava/io/File;
+	FIELD aa keySwapHands Lnone/bdl;
+	FIELD ab keyDrop Lnone/bdl;
+	FIELD ac keyUse Lnone/bdl;
+	FIELD ad keyAttack Lnone/bdl;
+	FIELD ae keyPickItem Lnone/bdl;
+	FIELD af keyChat Lnone/bdl;
+	FIELD ag keyPlayerList Lnone/bdl;
+	FIELD ah keyCommand Lnone/bdl;
+	FIELD ai keyScreenshot Lnone/bdl;
+	FIELD aj keyTogglePerspective Lnone/bdl;
+	FIELD ak keySmoothCamera Lnone/bdl;
+	FIELD al keyFullscreen Lnone/bdl;
+	FIELD am keySpectatorOutlines Lnone/bdl;
+	FIELD an keysHotbar [Lnone/bdl;
+	FIELD ao keysAll [Lnone/bdl;
 	FIELD aq difficulty Lnone/qx;
 	FIELD aw lastServer Ljava/lang/String;
 	FIELD az fov F

mappings/net/minecraft/client/render/VertexBuffer.mapping

@@ -1,6 +1,12 @@
 CLASS none/bok net/minecraft/client/render/VertexBuffer
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b bufByte Ljava/nio/ByteBuffer;
+	FIELD c bufInt Ljava/nio/IntBuffer;
+	FIELD d bufShort Ljava/nio/ShortBuffer;
+	FIELD e bufFloat Ljava/nio/FloatBuffer;
 	METHOD a texture (DD)Lnone/bok;
 	METHOD a color (FFFF)Lnone/bok;
 	METHOD a begin (ILnone/bxl;)V
 	METHOD b pos (DDD)Lnone/bok;
+	METHOD b (IIII)Lnone/bok;
 	METHOD d end ()V

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

@@ -4,3 +4,5 @@ CLASS none/ah net/minecraft/command/impl/CommandDifficulty
 	METHOD a getTabCompletionList (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;Lnone/cn;)Ljava/util/List;
 	METHOD b getUsage (Lnone/n;)Ljava/lang/String;
 	METHOD c getName ()Ljava/lang/String;
+	METHOD e parseDifficulty (Ljava/lang/String;)Lnone/qx;
+		ARG 0 arg

mappings/net/minecraft/entity/tracker/DataTracker.mapping

@@ -1,4 +1,4 @@
-CLASS none/km net/minecraft/sortme/DataTracker
+CLASS none/km net/minecraft/entity/tracker/DataTracker
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b trackedEntities Ljava/util/Map;
 	FIELD c trackedEntity Lnone/se;

mappings/net/minecraft/entity/tracker/TrackedData.mapping

@@ -0,0 +1,2 @@
+CLASS none/kj net/minecraft/entity/tracker/TrackedData
+	FIELD b dataType Lnone/kk;

mappings/net/minecraft/entity/tracker/TrackedDataHandler.mapping

@@ -0,0 +1,4 @@
+CLASS none/kk net/minecraft/entity/tracker/TrackedDataHandler
+	METHOD a (I)Lnone/kj;
+	METHOD a (Lnone/es;)Ljava/lang/Object;
+	METHOD a (Lnone/es;Ljava/lang/Object;)V

mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping

@@ -0,0 +1,68 @@
+CLASS none/kl net/minecraft/entity/tracker/TrackedDataHandlerRegistry
+	CLASS none/kl$1
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$2
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$3
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$4
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$5
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$6
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$7
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$8
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$9
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$10
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$11
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$12
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	CLASS none/kl$13
+		METHOD a (I)Lnone/kj;
+		METHOD a (Lnone/es;)Ljava/lang/Object;
+		METHOD a (Lnone/es;Ljava/lang/Object;)V
+	FIELD a BYTE Lnone/kk;
+	FIELD b INTEGER Lnone/kk;
+	FIELD c FLOAT Lnone/kk;
+	FIELD d STRING Lnone/kk;
+	FIELD e TEXT_COMPONENT Lnone/kk;
+	FIELD f ITEM_STACK Lnone/kk;
+	FIELD g OPTIONAL_BLOCK_STATE Lnone/kk;
+	FIELD h BOOLEAN Lnone/kk;
+	FIELD j BLOCK_POS Lnone/kk;
+	FIELD k OPTIONAL_BLOCK_POS Lnone/kk;
+	FIELD l FACING Lnone/kk;
+	FIELD m OPTIONAL_UUID Lnone/kk;
+	FIELD n REGISTRY Lnone/of;
+	METHOD a register (Lnone/kk;)V
+		ARG 0 handler

mappings/net/minecraft/inventory/InventoryCrafting.mapping

@@ -17,5 +17,5 @@ CLASS none/acc net/minecraft/inventory/InventoryCrafting
 		ARG 1 y
 	METHOD h_ getName ()Ljava/lang/String;
 	METHOD i_ getNameComponent ()Lnone/fa;
-	METHOD n_ hasCustomNam ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I

mappings/net/minecraft/item/Item.mapping

@@ -1,4 +1,14 @@
 CLASS none/aeo net/minecraft/item/Item
+	CLASS none/aeo$a ToolMaterial
+		FIELD a WOOD Lnone/aeo$a;
+		FIELD b COBBLESTONE Lnone/aeo$a;
+		FIELD c IRON Lnone/aeo$a;
+		FIELD d DIAMOND Lnone/aeo$a;
+		FIELD e GOLD Lnone/aeo$a;
+		FIELD f miningLevel I
+		FIELD g durability I
+		METHOD a getDurability ()I
+		METHOD d getMiningLevel ()I
 	FIELD a BLOCK_ITEM_MAP Ljava/util/Map;
 	FIELD g REGISTRY Lnone/db;
 	FIELD j rand Ljava/util/Random;

mappings/net/minecraft/item/ItemArmor.mapping

@@ -13,3 +13,4 @@ CLASS none/acw net/minecraft/item/ItemArmor
 	FIELD p material Lnone/acw$a;
 	METHOD <init> (Lnone/acw$a;ILnone/sj;)V
 		ARG 0 material
+	METHOD d getMaterial ()Lnone/acw$a;

mappings/net/minecraft/item/tool/ItemTool.mapping

@@ -0,0 +1,5 @@
+CLASS none/adr net/minecraft/item/tool/ItemTool
+	FIELD d material Lnone/aeo$a;
+	METHOD <init> (FFLnone/aeo$a;Ljava/util/Set;)V
+		ARG 2 toolMaterial
+	METHOD g getMaterial ()Lnone/aeo$a;

mappings/net/minecraft/server/IntegratedServer.mapping

@@ -2,5 +2,6 @@ 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 aa isDedicated ()Z
 	METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
 	METHOD u stop ()V

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -1,18 +1,60 @@
 CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
+	FIELD A spawnAnimals Z
+	FIELD B spawnNpcs Z
+	FIELD C pvpEnabled Z
+	FIELD D flightEnabled Z
+	FIELD E motd Ljava/lang/String;
+	FIELD G playerIdleTimeout I
+	FIELD T forceGamemode Z
 	FIELD a userCacheFile Ljava/io/File;
+	FIELD c profiler Lnone/os;
 	FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD t serverIp Ljava/lang/String;
+	FIELD u serverPort I
+	FIELD z onlineMode Z
 	METHOD A getRunDirectory ()Ljava/io/File;
 	METHOD G getVersion ()Ljava/lang/String;
+	METHOD P getServerPort ()I
 	METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
 	METHOD a loadServerIcon (Lnone/ke;)V
 	METHOD aE isMainThread ()Z
+	METHOD aa isDedicated ()Z
+	METHOD ab isOnlineMode ()Z
+	METHOD ac shouldSpawnAnimals ()Z
+	METHOD ad shouldSpawnNpcs ()Z
+	METHOD af isPvpEnabled ()Z
+	METHOD ag isFlightEnabled ()Z
+	METHOD ai getMotd ()Ljava/lang/String;
+	METHOD at shouldForceGamemode ()Z
+	METHOD aw getPlayerIdleTimeout ()I
+	METHOD b setServerPort (I)V
+		ARG 0 port
 	METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
 		ARG 0 report
+	METHOD c setServerIp (Ljava/lang/String;)V
+	METHOD d setPlayerIdleTimeout (I)V
+		ARG 0 value
 	METHOD d getFile (Ljava/lang/String;)Ljava/io/File;
 		ARG 0 name
+	METHOD d setOnlineMode (Z)V
+		ARG 0 value
+	METHOD e setSpawnAnimals (Z)V
+		ARG 0 value
 	METHOD f warn (Ljava/lang/String;)V
 		ARG 0 msg
+	METHOD f setSpawnNpcs (Z)V
+		ARG 0 value
+	METHOD g setPvpEnabled (Z)V
+		ARG 0 value
 	METHOD getServerModName getServerModName ()Ljava/lang/String;
 	METHOD h getServer ()Lnet/minecraft/server/MinecraftServer;
+	METHOD h setFlightEnabled (Z)V
+		ARG 0 value
+	METHOD i setForceGamemode (Z)V
+		ARG 0 value
+	METHOD l setMotd (Ljava/lang/String;)V
+		ARG 0 value
 	METHOD run run ()V
 	METHOD u stop ()V
+	METHOD v getServerIp ()Ljava/lang/String;
+	METHOD z getIconFile ()Ljava/io/File;

mappings/net/minecraft/server/ServerMetadata.mapping

@@ -0,0 +1,33 @@
+CLASS none/ke net/minecraft/server/ServerMetadata
+	CLASS none/ke$a PlayerInfo
+		FIELD a maxPlayers I
+		FIELD b onlinePlayers I
+		METHOD <init> (II)V
+			ARG 0 maxPlayers
+			ARG 1 onlinePlayers
+		METHOD a getMaxPlayers ()I
+		METHOD b getOnlinePlayers ()I
+	CLASS none/ke$c VersionInfo
+		FIELD a name Ljava/lang/String;
+		FIELD b protocolVersion I
+		METHOD <init> (Ljava/lang/String;I)V
+			ARG 0 name
+			ARG 1 protocolVersion
+		METHOD a getName ()Ljava/lang/String;
+		METHOD b getProtocolVersion ()I
+	FIELD a description Lnone/fa;
+	FIELD b playerInfo Lnone/ke$a;
+	FIELD c versionInfo Lnone/ke$c;
+	FIELD d iconData Ljava/lang/String;
+	METHOD a getDescription ()Lnone/fa;
+	METHOD a setIconData (Ljava/lang/String;)V
+		ARG 0 value
+	METHOD a setDescription (Lnone/fa;)V
+		ARG 0 value
+	METHOD a setPlayerInfo (Lnone/ke$a;)V
+		ARG 0 value
+	METHOD a setVersionInfo (Lnone/ke$c;)V
+		ARG 0 value
+	METHOD b getPlayerInfo ()Lnone/ke$a;
+	METHOD c getVersionInfo ()Lnone/ke$c;
+	METHOD d getIconData ()Ljava/lang/String;

mappings/net/minecraft/server/dedicated/DedicatedServer.mapping

@@ -1,2 +1,4 @@
 CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
 	FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD aa isDedicated ()Z
+	METHOD d setPlayerIdleTimeout (I)V

mappings/net/minecraft/sortme/Difficulty.mapping

@@ -0,0 +1,13 @@
+CLASS none/qx net/minecraft/sortme/Difficulty
+	FIELD a PEACEFUL Lnone/qx;
+	FIELD b EASY Lnone/qx;
+	FIELD c NORMAL Lnone/qx;
+	FIELD d HARD Lnone/qx;
+	FIELD e VALUES [Lnone/qx;
+	FIELD f id I
+	FIELD g translationKey Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
+	METHOD a getId ()I
+	METHOD a byId (I)Lnone/qx;
+		ARG 0 id
+	METHOD b getTranslationKey ()Ljava/lang/String;

mappings/net/minecraft/sortme/Snooper.mapping

@@ -0,0 +1,5 @@
+CLASS none/rj net/minecraft/sortme/Snooper
+	FIELD c token Ljava/lang/String;
+	FIELD d url Ljava/net/URL;
+	FIELD f timer Ljava/util/Timer;
+	METHOD f getToken ()Ljava/lang/String;

mappings/net/minecraft/sortme/TrackedData.mapping

@@ -1,2 +0,0 @@
-CLASS none/kj net/minecraft/sortme/TrackedData
-	FIELD b dataType Lnone/kk;

mappings/net/minecraft/sound/Sound.mapping

@@ -1,10 +1,10 @@
 CLASS none/nk net/minecraft/sound/Sound
 	FIELD a REGISTRY Lnone/db;
-	FIELD b soundIdentifier Lnone/kp;
+	FIELD b soundId Lnone/kp;
 	FIELD c amountRegistered I
 	METHOD <init> (Lnone/kp;)V
-		ARG 0 soundIdentifier
+		ARG 0 soundId
-	METHOD a getSoundIdentifier ()Lnone/kp;
+	METHOD a getSoundId ()Lnone/kp;
 	METHOD a registerSound (Ljava/lang/String;)V
 		ARG 0 name
 	METHOD b init ()V

mappings/net/minecraft/text/event/ClickEvent.mapping

@@ -1,4 +1,4 @@
-CLASS none/ez net/minecraft/text/ClickEvent
+CLASS none/ez net/minecraft/text/event/ClickEvent
 	CLASS none/ez$a Action
 		FIELD a OPEN_URL Lnone/ez$a;
 		FIELD b OPEN_FILE Lnone/ez$a;

mappings/net/minecraft/text/event/HoverEvent.mapping

@@ -1,4 +1,4 @@
-CLASS none/fc net/minecraft/text/HoverEvent
+CLASS none/fc net/minecraft/text/event/HoverEvent
 	CLASS none/fc$a Action
 		FIELD a SHOW_TEXT Lnone/fc$a;
 		FIELD b SHOW_ACHIEVEMENT Lnone/fc$a;

mappings/net/minecraft/util/INameable.mapping

@@ -1,4 +1,4 @@
 CLASS none/rg net/minecraft/util/INameable
 	METHOD h_ getName ()Ljava/lang/String;
 	METHOD i_ getNameComponent ()Lnone/fa;
-	METHOD n_ hasCustomNam ()Z
+	METHOD n_ hasCustomName ()Z

mappings/net/minecraft/util/MapColor.mapping

@@ -41,4 +41,5 @@ CLASS none/ayp net/minecraft/util/MapColor
 	METHOD <init> (II)V
 		ARG 0 id
 		ARG 1 color
-	METHOD a (I)I
+	METHOD a getRenderColor (I)I
+		ARG 0 shade

mappings/net/minecraft/util/crash/CrashReport.mapping

@@ -17,6 +17,7 @@ CLASS none/b net/minecraft/util/crash/CrashReport
 	FIELD b message Ljava/lang/String;
 	FIELD c cause Ljava/lang/Throwable;
 	FIELD d element Lnone/c;
+	FIELD e elementList Ljava/util/List;
 	FIELD f file Ljava/io/File;
 	FIELD h stacktrace [Ljava/lang/StackTraceElement;
 	METHOD <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
@@ -25,14 +26,19 @@ CLASS none/b net/minecraft/util/crash/CrashReport
 	METHOD a getMessage ()Ljava/lang/String;
 	METHOD a writeToFile (Ljava/io/File;)Z
 		ARG 0 file
+	METHOD a addElement (Ljava/lang/String;)Lnone/c;
+		ARG 0 name
+	METHOD a addElement (Ljava/lang/String;I)Lnone/c;
+		ARG 0 name
 	METHOD a addStackTrace (Ljava/lang/StringBuilder;)V
 		ARG 0 builder
 	METHOD a create (Ljava/lang/Throwable;Ljava/lang/String;)Lnone/b;
 		ARG 0 cause
 		ARG 1 title
 	METHOD b getCause ()Ljava/lang/Throwable;
+	METHOD d printThrowable ()Ljava/lang/String;
 	METHOD e create ()Ljava/lang/String;
 	METHOD f getFile ()Ljava/io/File;
 	METHOD g getElement ()Lnone/c;
 	METHOD h addInfo ()V
-	METHOD i getWittyComment ()Ljava/lang/String;
+	METHOD i generateWittyComment ()Ljava/lang/String;

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

@@ -12,11 +12,29 @@ CLASS none/bcp net/minecraft/util/math/BoundingBox
 		ARG 3 x2
 		ARG 4 y2
 		ARG 5 z2
+	METHOD <init> (Lnone/bcs;Lnone/bcs;)V
+		ARG 0 min
+		ARG 1 max
+	METHOD <init> (Lnone/cn;)V
+		ARG 0 pos
+	METHOD <init> (Lnone/cn;Lnone/cn;)V
+		ARG 0 min
+		ARG 1 max
+	METHOD a (DDD)Lnone/bcp;
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
 	METHOD a offset (Lnone/cn;)Lnone/bcp;
 		ARG 0 pos
 	METHOD b isValid ()Z
+	METHOD b expand (DDD)Lnone/bcp;
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
 	METHOD c getCenter ()Lnone/bcs;
 	METHOD c offset (DDD)Lnone/bcp;
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD e setY (D)Lnone/bcp;
+		ARG 0 y

mappings/net/minecraft/world/biome/Biome.mapping

@@ -1,4 +1,4 @@
-CLASS none/ajh net/minecraft/biome/Biome
+CLASS none/ajh net/minecraft/world/biome/Biome
 	CLASS none/ajh$a BiomeConfiguration
 		FIELD d temperature F
 		FIELD i name Ljava/lang/String;

mappings/net/minecraft/world/biome/BiomeGenerator.mapping

@@ -0,0 +1 @@
+CLASS none/ajk net/minecraft/world/biome/BiomeGenerator

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

@@ -1,2 +1,21 @@
 CLASS none/atm net/minecraft/world/chunk/Chunk
 	FIELD e LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD g biomeMap [B
+	FIELD k world Lnone/aiu;
+	FIELD l heightMap [I
+	FIELD n tileEntityMap Ljava/util/Map;
+	METHOD a getBlockState (III)Lnone/asj;
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
+	METHOD a getBlockState (Lnone/cn;)Lnone/asj;
+		ARG 0 pos
+	METHOD a (Lnone/cn;Lnone/ajl;)Lnone/ajh;
+		ARG 0 pos
+	METHOD a setBiomeMap ([B)V
+		ARG 0 biomeMap
+	METHOD a setHeightMap ([I)V
+		ARG 0 heightMap
+	METHOD l getBiomeMap ()[B
+	METHOD q getWorld ()Lnone/aiu;
+	METHOD r getHeightMap ()[I

mappings/none/aaj.mapping

@@ -3,4 +3,7 @@ CLASS none/aaj
 	METHOD a setInventoryStack (ILnone/aeq;)V
 	METHOD b (I)Lnone/aeq;
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I

mappings/none/acn.mapping

@@ -3,4 +3,7 @@ CLASS none/acn
 	METHOD a setInventoryStack (ILnone/aeq;)V
 	METHOD b (I)Lnone/aeq;
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I

mappings/none/acr.mapping

@@ -3,4 +3,7 @@ CLASS none/acr
 	METHOD a setInventoryStack (ILnone/aeq;)V
 	METHOD b (I)Lnone/aeq;
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I

mappings/none/arp.mapping

@@ -1,4 +1,4 @@
 CLASS none/arp
 	METHOD a deserializeTag (Lnone/dt;)V
 	METHOD b serializeTag (Lnone/dt;)Lnone/dt;
-	METHOD i_ ()Lnone/fa;
+	METHOD i_ getNameComponent ()Lnone/fa;

mappings/none/atj.mapping

@@ -0,0 +1,2 @@
+CLASS none/atj
+	METHOD a getBlockState (Lnone/cn;)Lnone/asj;

mappings/none/bog.mapping

@@ -1,2 +1,5 @@
 CLASS none/bog
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
 	METHOD k getId ()Ljava/lang/String;
+	METHOD n_ hasCustomName ()Z

mappings/none/qs.mapping

@@ -4,5 +4,5 @@ CLASS none/qs
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
 	METHOD h_ getName ()Ljava/lang/String;
 	METHOD i_ getNameComponent ()Lnone/fa;
-	METHOD n_ hasCustomNam ()Z
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I

mappings/none/ri.mapping

@@ -3,4 +3,7 @@ CLASS none/ri
 	METHOD a setInventoryStack (ILnone/aeq;)V
 	METHOD b (I)Lnone/aeq;
 	METHOD b isValidInventoryStack (ILnone/aeq;)Z
+	METHOD h_ getName ()Ljava/lang/String;
+	METHOD i_ getNameComponent ()Lnone/fa;
+	METHOD n_ hasCustomName ()Z
 	METHOD t_ getInventorySize ()I