diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping
new file mode 100644
index 0000000000..18c88ff4c8
--- /dev/null
+++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping
@@ -0,0 +1,11 @@
+CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipComponent
+	FIELD field_27995 inventory Lnet/minecraft/class_2371;
+	FIELD field_27996 hasSpace Z
+	METHOD method_32658 drawSlot (Lnet/minecraft/class_4587;IIILnet/minecraft/class_1060;Z)V
+		ARG 1 matrices
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
+		ARG 6 plusSlot
+	METHOD method_32659 getStackCount ()I
+	METHOD method_32660 getDisplayColumns ()I
diff --git a/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping
new file mode 100644
index 0000000000..58b5cb8bf0
--- /dev/null
+++ b/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_5683 net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent
+	FIELD field_27997 text Lnet/minecraft/class_5481;
diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping
new file mode 100644
index 0000000000..b171c6aab5
--- /dev/null
+++ b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping
@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_5684 net/minecraft/client/gui/tooltip/TooltipComponent
+	METHOD method_32661 getHeight ()I
+	METHOD method_32662 createOrderedTextTooltipComponent (Lnet/minecraft/class_5481;)Lnet/minecraft/class_5684;
+	METHOD method_32663 createTooltipComponent (Lnet/minecraft/class_5632;)Lnet/minecraft/class_5684;
+	METHOD method_32664 getWidth (Lnet/minecraft/class_327;)I
+	METHOD method_32665 drawText (Lnet/minecraft/class_327;IILnet/minecraft/class_1159;Lnet/minecraft/class_4597$class_4598;)V
+		ARG 2 x
+		ARG 3 y
+	METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_4587;Lnet/minecraft/class_918;ILnet/minecraft/class_1060;)V
+		ARG 2 x
+		ARG 3 y
+		ARG 4 matrices
+		ARG 6 z
diff --git a/mappings/net/minecraft/client/item/BundleTooltipData.mapping b/mappings/net/minecraft/client/item/BundleTooltipData.mapping
new file mode 100644
index 0000000000..b2e6c3519b
--- /dev/null
+++ b/mappings/net/minecraft/client/item/BundleTooltipData.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_5631 net/minecraft/client/item/BundleTooltipData
+	FIELD field_27874 inventory Lnet/minecraft/class_2371;
+	FIELD field_27875 hasSpace Z
+	METHOD <init> (Lnet/minecraft/class_2371;Z)V
+		ARG 1 inventory
+		ARG 2 hasSpace
+	METHOD method_32340 getInventory ()Lnet/minecraft/class_2371;
+	METHOD method_32341 hasSpace ()Z
diff --git a/mappings/net/minecraft/client/item/TooltipData.mapping b/mappings/net/minecraft/client/item/TooltipData.mapping
new file mode 100644
index 0000000000..b6f4208c9d
--- /dev/null
+++ b/mappings/net/minecraft/client/item/TooltipData.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_5632 net/minecraft/client/item/TooltipData
diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping
index 7e7fc00af3..98f5f214e7 100644
--- a/mappings/net/minecraft/item/Item.mapping
+++ b/mappings/net/minecraft/item/Item.mapping
@@ -38,6 +38,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		ARG 1 stack
 	METHOD method_31571 getItemBarColor (Lnet/minecraft/class_1799;)I
 		ARG 1 stack
+	METHOD method_32346 getTooltipData (Lnet/minecraft/class_1799;)Ljava/util/Optional;
+		ARG 1 stack
 	METHOD method_7836 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271;
 		COMMENT Called when an item is used by a player.
 		COMMENT The use action, by default, is bound to the right mouse button.
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index a5249c0bb9..7129f0d85e 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -47,6 +47,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	METHOD method_31578 isItemBarVisible ()Z
 	METHOD method_31579 getItemBarStep ()I
 	METHOD method_31580 getItemBarColor ()I
+	METHOD method_32347 getTooltipData ()Ljava/util/Optional;
 	METHOD method_7909 getItem ()Lnet/minecraft/class_1792;
 	METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799;
 		ARG 1 world