diff --git a/mappings/net/minecraft/client/item/TooltipType.mapping b/mappings/net/minecraft/client/item/TooltipConfig.mapping
similarity index 98%
rename from mappings/net/minecraft/client/item/TooltipType.mapping
rename to mappings/net/minecraft/client/item/TooltipConfig.mapping
index 372731ccfd..d5a4010edc 100644
--- a/mappings/net/minecraft/client/item/TooltipType.mapping
+++ b/mappings/net/minecraft/client/item/TooltipConfig.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/unmapped/C_taebrtdw net/minecraft/client/item/TooltipType
+CLASS net/minecraft/unmapped/C_taebrtdw net/minecraft/client/item/TooltipConfig
 	FIELD f_yceowjjc HIDE_ADVANCED_DETAILS Lnet/minecraft/unmapped/C_taebrtdw$C_vsiqutyg;
 	FIELD f_zuchejxz SHOW_ADVANCED_DETAILS Lnet/minecraft/unmapped/C_taebrtdw$C_vsiqutyg;
 	METHOD m_ecuysqaa shouldShowAdvancedDetails ()Z
diff --git a/mappings/net/minecraft/component/DataComponentType.mapping b/mappings/net/minecraft/component/DataComponentType.mapping
index 96641ff2bc..712e638922 100644
--- a/mappings/net/minecraft/component/DataComponentType.mapping
+++ b/mappings/net/minecraft/component/DataComponentType.mapping
@@ -5,6 +5,8 @@ CLASS net/minecraft/unmapped/C_pscqxfcs net/minecraft/component/DataComponentTyp
 	METHOD m_dxcqrmbb getPacketCodec ()Lnet/minecraft/unmapped/C_qsrmwluu;
 	METHOD m_lmuzailu isTransient ()Z
 	METHOD m_nuhzpkbr builder ()Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+	METHOD m_phmolumw (Lnet/minecraft/unmapped/C_pscqxfcs;)Lcom/mojang/serialization/DataResult;
+		ARG 0 type
 	METHOD m_vuiayjln getCodecOrThrow ()Lcom/mojang/serialization/Codec;
 	METHOD m_xbswjdjj getCodec ()Lcom/mojang/serialization/Codec;
 	CLASS C_pevyyrle Builder
diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping
index 036dc4b062..5696b9331a 100644
--- a/mappings/net/minecraft/item/Item.mapping
+++ b/mappings/net/minecraft/item/Item.mapping
@@ -170,7 +170,7 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item
 		ARG 1 stack
 		ARG 2 context
 		ARG 3 tooltip
-		ARG 4 type
+		ARG 4 config
 	METHOD m_vptgdmsr getDrinkSound ()Lnet/minecraft/unmapped/C_avavozay;
 	METHOD m_wanuqhiu isUsedOnRelease (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 1 stack
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index 85a927d0b3..f09877de2c 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -117,7 +117,7 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 		ARG 1 state
 	METHOD m_hdopgosb appendTooltip (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_taebrtdw;)V
 		ARG 1 componentType
-		ARG 4 type
+		ARG 4 config
 	METHOD m_hmrpegvi onClickedOnOther (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_qcuteihm;Lnet/minecraft/unmapped/C_jzrpycqo;)Z
 		COMMENT Called when the stack is placed on another {@link ItemStack} in a slot.
 		COMMENT
@@ -296,7 +296,7 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 	METHOD m_ywdqmcbk getTooltip (Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_taebrtdw;)Ljava/util/List;
 		ARG 1 context
 		ARG 2 player
-		ARG 3 type
+		ARG 3 config
 	METHOD m_zakagwqa set (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Ljava/lang/Object;
 	METHOD m_zpjrlkav onCraftByPlayer (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;I)V
 		ARG 1 world
diff --git a/mappings/net/minecraft/item/TooltipAppender.mapping b/mappings/net/minecraft/item/TooltipAppender.mapping
index bbd635748f..f3148e9da8 100644
--- a/mappings/net/minecraft/item/TooltipAppender.mapping
+++ b/mappings/net/minecraft/item/TooltipAppender.mapping
@@ -2,4 +2,4 @@ CLASS net/minecraft/unmapped/C_lcgmmrzz net/minecraft/item/TooltipAppender
 	METHOD m_eqoeoqpg appendToTooltip (Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_taebrtdw;)V
 		ARG 1 context
 		ARG 2 tooltipConsumer
-		ARG 3 type
+		ARG 3 config