diff --git a/mappings/none/qa.mapping b/mappings/net/minecraft/migration/impl/TagUpgraderPotion2.mapping
similarity index 57%
rename from mappings/none/qa.mapping
rename to mappings/net/minecraft/migration/impl/TagUpgraderPotion2.mapping
index 616fda0351..fcedbf8554 100644
--- a/mappings/none/qa.mapping
+++ b/mappings/net/minecraft/migration/impl/TagUpgraderPotion2.mapping
@@ -1,4 +1,4 @@
-CLASS none/qa
+CLASS none/qa net/minecraft/migration/impl/TagUpgraderPotion2
 	METHOD a getTargetVersion ()I
 	METHOD a upgradeTag (Lnone/dt;)Lnone/dt;
 		ARG 0 tag
diff --git a/mappings/net/minecraft/recipe/impl/RecipeMisc.mapping b/mappings/net/minecraft/recipe/impl/RecipeMisc.mapping
new file mode 100644
index 0000000000..b55d46d2e2
--- /dev/null
+++ b/mappings/net/minecraft/recipe/impl/RecipeMisc.mapping
@@ -0,0 +1,3 @@
+CLASS none/ahc net/minecraft/recipe/impl/RecipeMisc
+	METHOD a register (Lnone/agx;)V
+		ARG 0 registry
diff --git a/mappings/net/minecraft/reference/Blocks.mapping b/mappings/net/minecraft/reference/Blocks.mapping
index 787dcc0fc7..cc44def63a 100644
--- a/mappings/net/minecraft/reference/Blocks.mapping
+++ b/mappings/net/minecraft/reference/Blocks.mapping
@@ -164,7 +164,7 @@ CLASS none/akz net/minecraft/reference/Blocks
 	FIELD cd WOODEN_BUTTON Lnone/aky;
 	FIELD ce SKULL Lnone/apr;
 	FIELD cf ANVIL Lnone/aky;
-	FIELD cg TRAPPED_CHJEST Lnone/aky;
+	FIELD cg TRAPPED_CHEST Lnone/aky;
 	FIELD ch LIGHT_WEIGHTED_PRESSURE_PLATE Lnone/aky;
 	FIELD ci HEAVY_WEIGHTED_PRESSURE_PLATE Lnone/aky;
 	FIELD cj UNPOWERED_COMPARATOR Lnone/alr;
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index c63ad85ec4..09f8954259 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	CLASS net/minecraft/server/MinecraftServer$1
+		FIELD b lastProgressUpdate J
 		METHOD a finish ()V
 		METHOD a setProgress (I)V
 			ARG 0 percentage
@@ -9,15 +10,16 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 			ARG 0 title
 		METHOD c setTask (Ljava/lang/String;)V
 			ARG 0 task
-	FIELD A spawnAnimals Z
-	FIELD B spawnNpcs Z
-	FIELD C pvpEnabled Z
-	FIELD D flightEnabled Z
+	FIELD A preventProxyConnections Z
+	FIELD B spawnAnimals Z
+	FIELD C spawnNpcs Z
+	FIELD D pvpEnabled Z
+	FIELD E flightEnabled Z
 	FIELD F motd Ljava/lang/String;
 	FIELD G worldHeight I
 	FIELD H playerIdleTimeout I
 	FIELD I keyPair Ljava/security/KeyPair;
-	FIELD J levelName Ljava/lang/String;
+	FIELD K levelName Ljava/lang/String;
 	FIELD M demo Z
 	FIELD N bonusChest Z
 	FIELD S currentTaskName Ljava/lang/String;
@@ -37,6 +39,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	FIELD g currentOperationPercent I
 	FIELD j jobs Ljava/util/Queue;
 	FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD l levelStorage Lnone/bax;
 	FIELD m snooper Lnone/rl;
 	FIELD n gameDir Ljava/io/File;
 	FIELD o tickables Ljava/util/List;
@@ -79,6 +82,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD S getLevelName ()Ljava/lang/String;
 	METHOD U isMonsterSpawningEnabled ()Z
 	METHOD V isDemo ()Z
+	METHOD W getLevelStorage ()Lnone/bax;
 	METHOD Z isSnooperEnabled ()Z
 	METHOD a getWorld (I)Lnone/lu;
 		ARG 0 dimensionId
@@ -88,6 +92,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
 		ARG 0 runnable
 	METHOD a convertSave (Ljava/lang/String;)V
+		ARG 0 levelName
 	METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/ajb;Ljava/lang/String;)V
 		ARG 0 levelName
 		ARG 3 generatorType
@@ -105,7 +110,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 		ARG 0 gameMode
 	METHOD a (Lnone/aiu;Z)Ljava/lang/String;
 		ARG 0 gameMode
-	METHOD a (Lnone/aiw;Lnone/cn;Lnone/aam;)Z
+	METHOD a canModifyBlock (Lnone/aiw;Lnone/cn;Lnone/aam;)Z
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 player
@@ -144,17 +149,21 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD a_ setResourcePack (Ljava/lang/String;Ljava/lang/String;)V
 	METHOD aa isDedicated ()Z
 	METHOD ab isOnlineMode ()Z
-	METHOD ac shouldSpawnAnimals ()Z
-	METHOD ad shouldSpawnNpcs ()Z
-	METHOD ag isFlightEnabled ()Z
+	METHOD ac shouldPreventProxyConnections ()Z
+	METHOD ad shouldSpawnAnimals ()Z
+	METHOD ae shouldSpawnNpcs ()Z
+	METHOD ag isPvpEnabled ()Z
+	METHOD ah isFlightEnabled ()Z
 	METHOD ai areCommandBlocksEnabled ()Z
 	METHOD aj getMotd ()Ljava/lang/String;
+	METHOD ak getWorldHeight ()I
 	METHOD al isStopped ()Z
 	METHOD am getConfigManager ()Lnone/mr;
 	METHOD an getNetworkManager ()Lnone/mf;
 	METHOD ap hasGui ()Z
 	METHOD aq getTicks ()I
 	METHOD as getSnooper ()Lnone/rl;
+	METHOD at getSpawnProtectionRadius ()I
 	METHOD au shouldForceGameMode ()Z
 	METHOD av getProxy ()Ljava/net/Proxy;
 	METHOD aw getCurrentTimeMillis ()J
@@ -172,6 +181,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD b setDemo (Z)V
 		ARG 0 value
 	METHOD c getBlockPos ()Lnone/cn;
+	METHOD c setWorldHeight (I)V
+		ARG 0 value
 	METHOD c setServerIp (Ljava/lang/String;)V
 		ARG 0 serverIp
 	METHOD c setBonusChest (Z)V
@@ -186,23 +197,27 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD e getWorld ()Lnone/aiw;
 	METHOD e info (Ljava/lang/String;)V
 		ARG 0 msg
-	METHOD e setSpawnAnimals (Z)V
+	METHOD e setPreventProxyConnections (Z)V
 		ARG 0 value
 	METHOD f getEntity ()Lnone/sg;
 	METHOD f warn (Ljava/lang/String;)V
 		ARG 0 msg
-	METHOD f setSpawnNpcs (Z)V
+	METHOD f setSpawnAnimals (Z)V
 		ARG 0 value
 	METHOD g shouldEchoCommandFeedback ()Z
 	METHOD g logError (Ljava/lang/String;)V
 		ARG 0 message
+	METHOD g setSpawnNpcs (Z)V
+		ARG 0 value
 	METHOD getServerModName getServerModName ()Ljava/lang/String;
 	METHOD h log (Ljava/lang/String;)V
 		ARG 0 message
-	METHOD h setFlightEnabled (Z)V
+	METHOD h setPvpEnabled (Z)V
 		ARG 0 value
 	METHOD h_ getName ()Ljava/lang/String;
 	METHOD i createCommandManager ()Lnone/bc;
+	METHOD i setFlightEnabled (Z)V
+		ARG 0 value
 	METHOD i_ getNameComponent ()Lnone/fa;
 	METHOD j ()Z
 	METHOD j setLevelName (Ljava/lang/String;)V
diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping
index 96195c284d..ffb5ce5c8f 100644
--- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping
+++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping
@@ -2,11 +2,12 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
 	FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD n queryHandler Lnone/ng;
 	FIELD o commandSender Lnone/nd;
+	FIELD p rconServer Lnone/ni;
 	FIELD q serverProps Lnone/lc;
 	FIELD r eulaReader Lnone/kw;
 	FIELD s generateStructures Z
 	FIELD t gameMode Lnone/aiu;
-	FIELD u gui Z
+	FIELD u guiPresent Z
 	METHOD <init> (Ljava/io/File;Lnone/pf;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V
 		ARG 1 migrationHandler
 		ARG 2 authService
@@ -32,7 +33,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
 		ARG 0 gameMode
 	METHOD a (Lnone/aiu;Z)Ljava/lang/String;
 		ARG 0 gameMode
-	METHOD a (Lnone/aiw;Lnone/cn;Lnone/aam;)Z
+	METHOD a canModifyBlock (Lnone/aiw;Lnone/cn;Lnone/aam;)Z
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 player
@@ -43,6 +44,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
 	METHOD aN getConfigManager ()Lnone/le;
 	METHOD aO startGui ()V
 	METHOD aQ getMaximumTickTime ()J
+	METHOD aS sleepFiveSeconds ()V
 	METHOD a_ executeCommand (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 command
 	METHOD aa isDedicated ()Z
@@ -50,7 +52,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
 	METHOD ai areCommandBlocksEnabled ()Z
 	METHOD am getConfigManager ()Lnone/mr;
 	METHOD ap hasGui ()Z
-	METHOD at isSpawnProtectionEnabled ()I
+	METHOD at getSpawnProtectionRadius ()I
 	METHOD ay shouldAnnouncePlayerAchievements ()Z
 	METHOD b getPropertiesFilename ()Ljava/lang/String;
 	METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
diff --git a/mappings/none/qu.mapping b/mappings/net/minecraft/sortme/LockableContainerDoubleChest.mapping
similarity index 78%
rename from mappings/none/qu.mapping
rename to mappings/net/minecraft/sortme/LockableContainerDoubleChest.mapping
index dd534373c7..47177eaba9 100644
--- a/mappings/none/qu.mapping
+++ b/mappings/net/minecraft/sortme/LockableContainerDoubleChest.mapping
@@ -1,4 +1,11 @@
-CLASS none/qu
+CLASS none/qu net/minecraft/sortme/LockableContainerDoubleChest
+	FIELD a customName Ljava/lang/String;
+	FIELD b first Lnone/rh;
+	FIELD c second Lnone/rh;
+	METHOD <init> (Ljava/lang/String;Lnone/rh;Lnone/rh;)V
+		ARG 0 customName
+		ARG 1 first
+		ARG 2 second
 	METHOD a getInvStack (I)Lnone/aes;
 		ARG 0 slot
 	METHOD a takeInvStack (II)Lnone/aes;
@@ -12,6 +19,8 @@ CLASS none/qu
 		ARG 1 player
 	METHOD a canPlayerUseInv (Lnone/aam;)Z
 		ARG 0 player
+	METHOD a isPart (Lnone/qv;)Z
+		ARG 0 inv
 	METHOD a setContainerLock (Lnone/rg;)V
 		ARG 0 lock
 	METHOD b removeInvStack (I)Lnone/aes;
diff --git a/mappings/none/ahc.mapping b/mappings/none/ahc.mapping
deleted file mode 100644
index e2b7be1d1e..0000000000
--- a/mappings/none/ahc.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS none/ahc
-	METHOD a register (Lnone/agx;)V