diff --git a/mappings/bqf.mapping b/mappings/bqf.mapping
deleted file mode 100644
index 944e57eba4..0000000000
--- a/mappings/bqf.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS bqf
-	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
diff --git a/mappings/net/minecraft/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/advancement/AdvancementTabType.mapping
new file mode 100644
index 0000000000..d78de08ffd
--- /dev/null
+++ b/mappings/net/minecraft/advancement/AdvancementTabType.mapping
@@ -0,0 +1,13 @@
+CLASS bkb net/minecraft/advancement/AdvancementTabType
+	METHOD a (I)I
+	METHOD a drawIcon (IIILbyc;Lahf;)V
+		ARG 0 x
+		ARG 1 y
+		ARG 3 itemRenderer
+		ARG 4 iconStack
+	METHOD a drawBackground (Lbhc;IIZI)V
+		ARG 0 drawable
+		ARG 1 x
+		ARG 2 y
+		ARG 3 selected
+	METHOD b (I)I
diff --git a/mappings/j.mapping b/mappings/net/minecraft/advancement/ClientAdvancementManager.mapping
similarity index 83%
rename from mappings/j.mapping
rename to mappings/net/minecraft/advancement/ClientAdvancementManager.mapping
index 2f9cfac734..2fd5ee8f4f 100644
--- a/mappings/j.mapping
+++ b/mappings/net/minecraft/advancement/ClientAdvancementManager.mapping
@@ -1,4 +1,4 @@
-CLASS j
+CLASS j net/minecraft/advancement/ClientAdvancementManager
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b advancements Ljava/util/Map;
 	METHOD a remove (Li;)V
diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping
index 5eb83b9ee5..ce1dfbd1b8 100644
--- a/mappings/net/minecraft/client/MinecraftGame.mapping
+++ b/mappings/net/minecraft/client/MinecraftGame.mapping
@@ -14,6 +14,7 @@ CLASS bgm net/minecraft/client/MinecraftGame
 	FIELD T fullscreen Z
 	FIELD V crashed Z
 	FIELD W crashReport Lb;
+	FIELD Y renderTickCounter Lbgs;
 	FIELD Z snooper Ltg;
 	FIELD aA metadataDeserializer Lcdm;
 	FIELD aB defaultResourcePacks Ljava/util/List;
@@ -133,6 +134,7 @@ CLASS bgm net/minecraft/client/MinecraftGame
 	METHOD ae getFirstPersonRenderer ()Lbtd;
 	METHOD af getCurrentFps ()I
 	METHOD ai getMigrationHandler ()Lqv;
+	METHOD aj getTickDelta ()F
 	METHOD ak getBlockColorMap ()Lbgv;
 	METHOD am hasReducedDebugInfo ()Z
 	METHOD an init ()V
@@ -143,6 +145,7 @@ CLASS bgm net/minecraft/client/MinecraftGame
 	METHOD as checkIs64Bit ()Z
 	METHOD at startTimerHackThread ()V
 	METHOD au enableFullscreen ()V
+	METHOD av render ()V
 	METHOD aw doAttack ()V
 	METHOD ax doItemUse ()V
 	METHOD az handleKeyboardEvents ()V
diff --git a/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping b/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping
index 69dbe359ad..61706c9e75 100644
--- a/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping
+++ b/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping
@@ -1,12 +1,12 @@
 CLASS bkl net/minecraft/client/gui/container/GuiBeacon
 	CLASS bkl$a WidgetButtonIconCancel
-		METHOD b pressed (II)V
+		METHOD b onHover (II)V
 	CLASS bkl$b WidgetButtonIconDone
-		METHOD b pressed (II)V
+		METHOD b onHover (II)V
 	CLASS bkl$c WidgetButtonIconEffect
 		FIELD p effect Ltu;
 		FIELD q level I
-		METHOD b pressed (II)V
+		METHOD b onHover (II)V
 	CLASS bkl$d WidgetButtonIcon
 		FIELD o iconTexture Lmd;
 		FIELD p iconU I
diff --git a/mappings/net/minecraft/client/gui/menu/GuiAdvancements.mapping b/mappings/net/minecraft/client/gui/menu/GuiAdvancements.mapping
index bcec264d90..7fe247cb3e 100644
--- a/mappings/net/minecraft/client/gui/menu/GuiAdvancements.mapping
+++ b/mappings/net/minecraft/client/gui/menu/GuiAdvancements.mapping
@@ -1,8 +1,30 @@
 CLASS bke net/minecraft/client/gui/menu/GuiAdvancements
+	FIELD a ADVANCEMENTS_LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD f WINDOW_TEX Lmd;
 	FIELD g TABS_TEX Lmd;
+	FIELD h advancementHandler Lbqf;
+	FIELD i widgetMap Ljava/util/Map;
+	FIELD s selectedWidget Lbka;
+	FIELD t mouseDragX I
+	FIELD u mouseDragY I
+	FIELD v mouseDrag Z
+	METHOD <init> (Lbqf;)V
+		ARG 0 advancementHandler
 	METHOD a onKeyPressed (CI)V
 	METHOD a draw (IIF)V
 	METHOD a onMousePressed (III)V
 	METHOD b init ()V
+	METHOD b drawWidgets (II)V
+		ARG 0 x
+		ARG 1 y
+	METHOD c drawAdvancementTree (IIII)V
+		ARG 0 mouseX
+		ARG 1 mouseY
+		ARG 2 x
+		ARG 3 y
+	METHOD d drawWidgetTooltip (IIII)V
+		ARG 0 mouseX
+		ARG 1 mouseY
+		ARG 2 x
+		ARG 3 y
 	METHOD m onClosed ()V
diff --git a/mappings/net/minecraft/client/gui/widget/WidgetAdvancementTree.mapping b/mappings/net/minecraft/client/gui/widget/WidgetAdvancementTree.mapping
index f930c1cbc8..4acdcd43bb 100644
--- a/mappings/net/minecraft/client/gui/widget/WidgetAdvancementTree.mapping
+++ b/mappings/net/minecraft/client/gui/widget/WidgetAdvancementTree.mapping
@@ -1,5 +1,6 @@
 CLASS bka net/minecraft/client/gui/widget/WidgetAdvancementTree
 	FIELD a mc Lbgm;
+	FIELD f tabType Lbkb;
 	FIELD h rootAdvancement Li;
 	FIELD m widgets Ljava/util/Map;
 	METHOD <init> (Lbgm;Lbkb;ILi;Lr;)V
@@ -8,5 +9,17 @@ CLASS bka net/minecraft/client/gui/widget/WidgetAdvancementTree
 	METHOD a draw (II)V
 		ARG 0 mouseX
 		ARG 1 mouseY
+	METHOD a drawIcon (IILbyc;)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 itemRenderer
+	METHOD a drawBackground (IIZ)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 selected
+	METHOD a create (Lbgm;ILi;)Lbka;
+		ARG 0 minecraft
+	METHOD a add (Li;)V
+		ARG 0 advancement
 	METHOD b getWidgetForAdvancement (Li;)Lbkc;
 		ARG 0 advancement
diff --git a/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping b/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping
index 926b060266..aed0d13227 100644
--- a/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping
+++ b/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping
@@ -8,7 +8,7 @@ CLASS bhk net/minecraft/client/gui/widget/WidgetButton
 	FIELD k id I
 	FIELD l enabled Z
 	FIELD m visible Z
-	FIELD n pressed Z
+	FIELD n hovered Z
 	METHOD <init> (IIIIILjava/lang/String;)V
 		ARG 0 id
 		ARG 1 x
@@ -21,7 +21,7 @@ CLASS bhk net/minecraft/client/gui/widget/WidgetButton
 		ARG 1 x
 		ARG 2 y
 		ARG 3 text
-	METHOD a isPressed ()Z
+	METHOD a isHovered ()Z
 	METHOD a setWidth (I)V
 		ARG 0 width
 	METHOD a onReleased (II)V
@@ -41,7 +41,7 @@ CLASS bhk net/minecraft/client/gui/widget/WidgetButton
 	METHOD a getTextureId (Z)I
 		ARG 0 pressed
 	METHOD b getWidth ()I
-	METHOD b pressed (II)V
+	METHOD b onHover (II)V
 		ARG 0 mouseX
 		ARG 1 mouseY
 	METHOD b isWithinBounds (Lbgm;II)Z
diff --git a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping
index 7d706b37a2..dc1b9618e7 100644
--- a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping
+++ b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping
@@ -7,6 +7,7 @@ CLASS bqi net/minecraft/client/network/handler/NetworkGameHandlerClient
 	FIELD c connection Lfz;
 	FIELD f game Lbgm;
 	FIELD g world Lbqk;
+	FIELD k advancementHandler Lbqf;
 	FIELD l rand Ljava/util/Random;
 	METHOD a getClientConnection ()Lfz;
 	METHOD a onConnectionLost (Lgk;)V
@@ -163,4 +164,5 @@ CLASS bqi net/minecraft/client/network/handler/NetworkGameHandlerClient
 		ARG 0 packet
 	METHOD b validateResourcePackUrl (Ljava/lang/String;)Z
 		ARG 0 url
+	METHOD f getAdvancementHandler ()Lbqf;
 	METHOD g getResourcePackDownloadCallback ()Lcom/google/common/util/concurrent/FutureCallback;
diff --git a/mappings/net/minecraft/client/render/RenderTickCounter.mapping b/mappings/net/minecraft/client/render/RenderTickCounter.mapping
new file mode 100644
index 0000000000..2cf4891c80
--- /dev/null
+++ b/mappings/net/minecraft/client/render/RenderTickCounter.mapping
@@ -0,0 +1,13 @@
+CLASS bgs net/minecraft/client/render/RenderTickCounter
+	FIELD a ticksPerSecond F
+	FIELD b ticksThisFrame I
+	FIELD c tickDelta F
+	FIELD d timeScale F
+	FIELD f realTimeSeconds D
+	FIELD g prevTimeMillis J
+	FIELD h prevRealTimeMillis J
+	FIELD i timeMillis J
+	FIELD j clockSyncFactor D
+	METHOD <init> (F)V
+		ARG 0 ticksPerSecond
+	METHOD a onRender ()V
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
index e74697254d..68ce21684e 100644
--- a/mappings/net/minecraft/client/render/WorldRenderer.mapping
+++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -9,6 +9,9 @@ CLASS bsz net/minecraft/client/render/WorldRenderer
 	METHOD <init> (Lbgm;Lccv;)V
 		ARG 0 game
 		ARG 1 resourceContainer
+	METHOD a draw (FJ)V
+		ARG 0 tickDelta
+		ARG 1 nanoTime
 	METHOD a onResourceReload (Lccv;)V
 		ARG 0 container
 	METHOD a onSetCameraEntity (Lub;)V
diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping
index 51e680907c..d247396e3f 100644
--- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping
+++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping
@@ -37,6 +37,9 @@ CLASS byc net/minecraft/client/render/item/ItemRenderer
 		ARG 1 xPosition
 		ARG 2 yPosition
 	METHOD a renderItem (Lahf;IILcee;F)V
+		ARG 0 itemStack
+		ARG 1 x
+		ARG 2 y
 	METHOD a getPropertyOverrideModel (Lahf;Lali;Luk;)Lcee;
 		ARG 0 stack
 		ARG 1 world
@@ -94,7 +97,14 @@ CLASS byc net/minecraft/client/render/item/ItemRenderer
 	METHOD a renderModelColored (Lcee;IF)V
 	METHOD a renderItemModelColored (Lcee;ILahf;F)V
 	METHOD a renderItemModel (Lcee;Lahf;F)V
+	METHOD a renderItemInGui (Luk;Lahf;II)V
+		ARG 1 itemStack
+		ARG 2 x
+		ARG 3 y
 	METHOD a renderItemInGui (Luk;Lahf;IIF)V
+		ARG 1 itemStack
+		ARG 2 x
+		ARG 3 y
 	METHOD b registerItemModels ()V
 	METHOD b renderItemAndGlowInGui (Lahf;II)V
 		ARG 0 stack
diff --git a/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping b/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping
new file mode 100644
index 0000000000..1ed9347031
--- /dev/null
+++ b/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping
@@ -0,0 +1,4 @@
+CLASS bqf net/minecraft/client/sortme/AdvancementHandler
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD a setGui (Lbqf$a;)V
+	METHOD a onAdvancements (Lju;)V