diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index d93a03bfae..34dbd36924 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -49,6 +49,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
+	METHOD m_enfnjurp (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 1 codecBuilder
 	METHOD m_ewcsdntg asBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
 	METHOD m_fjkbizwn isRedstonePowerSource (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 1 state
@@ -133,7 +135,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 3 pos
 	METHOD m_qjdjbqgu onExplosion (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V
 		ARG 4 explosion
-		ARG 5 biConsumer
+		ARG 5 dropConsumer
 	METHOD m_qjteufci onStacksDropped (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;Z)V
 		ARG 1 state
 		ARG 2 world
@@ -153,6 +155,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 5 moved
 	METHOD m_rhslbcpd getSoundGroup (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_aevintex;
 	METHOD m_rmjjhoiz getRandomTicks (Lnet/minecraft/unmapped/C_txtbiemp;)Z
+	METHOD m_rwctfady canPathfindThrough (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z
+		ARG 2 navigationType
 	METHOD m_sdymngiw randomTick (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)V
 		ARG 1 state
 		ARG 2 world
@@ -526,7 +530,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		METHOD m_yvamjply getBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
 		METHOD m_yylpqepz onExplosion (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V
 			ARG 3 explosion
-			ARG 4 biConsumer
+			ARG 4 dropConsumer
 		METHOD m_zntvpiao getLuminance ()I
 			COMMENT {@return the light level emitted by this block state}
 		METHOD m_zrpxtrfo isToolRequired ()Z
@@ -681,7 +685,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			ARG 0 state
 			ARG 1 world
 			ARG 2 pos
-		METHOD m_shyyftwz requiresTool ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
+		METHOD m_shyyftwz toolRequired ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
 		METHOD m_tzpskyoo (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
 			ARG 0 state
 			ARG 1 world
diff --git a/mappings/net/minecraft/component/DataComponentTypes.mapping b/mappings/net/minecraft/component/DataComponentTypes.mapping
index 872be53171..a9cabb1902 100644
--- a/mappings/net/minecraft/component/DataComponentTypes.mapping
+++ b/mappings/net/minecraft/component/DataComponentTypes.mapping
@@ -18,6 +18,8 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
 		ARG 0 builder
 	METHOD m_buiujako (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_dibhblmp (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_dvuwuczw (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_eczrcxxo (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
@@ -28,10 +30,14 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
 		ARG 0 builder
 	METHOD m_gdbeaumi (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_gfnpfgmn (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_gpfilwpt (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_hfdkpwbt (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_hffqmrwj (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_hgaesrgo (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_hievveyc (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
@@ -57,12 +63,16 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
 		ARG 0 builder
 	METHOD m_ntvmrhwv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_plgvcwty (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_pxuiiira (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_rokrjsrj (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_rzcmsvar (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_sdxwugjv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_skgfwypo (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_skjsaedy (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
@@ -77,10 +87,14 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
 		ARG 0 builder
 	METHOD m_udlsqygz (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_udrgvsnp (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_ufwmhtmy (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_ujwzlzjr (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_upfeasuy (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_upyzgvcu (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
 	METHOD m_uqxvcjsr (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
@@ -93,7 +107,11 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
 		ARG 0 builder
 	METHOD m_ysadelqv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_zclgmqbs (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_zexslagx (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
+	METHOD m_zfatupgv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+		ARG 0 builder
 	METHOD m_zrnmazhh (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
 		ARG 0 builder
diff --git a/mappings/net/minecraft/component/type/ToolComponent.mapping b/mappings/net/minecraft/component/type/ToolComponent.mapping
new file mode 100644
index 0000000000..2059603509
--- /dev/null
+++ b/mappings/net/minecraft/component/type/ToolComponent.mapping
@@ -0,0 +1,25 @@
+CLASS net/minecraft/unmapped/C_uippejmz net/minecraft/component/type/ToolComponent
+	METHOD m_bxeisvxb getSpeed (Lnet/minecraft/unmapped/C_txtbiemp;)F
+	METHOD m_quryfiwy isCorrectForDrops (Lnet/minecraft/unmapped/C_txtbiemp;)Z
+	METHOD m_zpgfztks (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 codecBuilder
+	CLASS C_xaqghtin Rule
+		METHOD m_ffzafwjh (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 0 codecBuilder
+		METHOD m_fwyltyoj of (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 0 blocks
+		METHOD m_mlqvtcbj ofSpeedWithDrops (Lnet/minecraft/unmapped/C_ednuhnnn;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 0 blocks
+			ARG 1 speed
+		METHOD m_nwyzmeet of (Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 0 blocks
+		METHOD m_pagfzxcb ofDeniesDrops (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 0 blocks
+		METHOD m_pgdfxdeg ofSpeedWithDrops (Ljava/util/List;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 0 blocks
+			ARG 1 speed
+		METHOD m_wkcxqaup ofSpeed (Ljava/util/List;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 1 speed
+		METHOD m_yimopssh ofSpeed (Lnet/minecraft/unmapped/C_ednuhnnn;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
+			ARG 0 blocks
+			ARG 1 speed
diff --git a/mappings/net/minecraft/enchantment/BreachEnchantment.mapping b/mappings/net/minecraft/enchantment/BreachEnchantment.mapping
index 9f8bc953b4..8bc03016e5 100644
--- a/mappings/net/minecraft/enchantment/BreachEnchantment.mapping
+++ b/mappings/net/minecraft/enchantment/BreachEnchantment.mapping
@@ -1,2 +1,4 @@
 CLASS net/minecraft/unmapped/C_byhxpaqf net/minecraft/enchantment/BreachEnchantment
 	METHOD m_avspyipr getArmorBreach (FF)F
+		ARG 0 level
+		ARG 1 baseArmorBreach
diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping
index 74ab90cf6a..4dc8b13ae6 100644
--- a/mappings/net/minecraft/enchantment/Enchantment.mapping
+++ b/mappings/net/minecraft/enchantment/Enchantment.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
 	FIELD f_cbjwrotz registryEntry Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
+	FIELD f_cytkilek properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
 	FIELD f_idonjvqd translationKey Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)V
 		ARG 1 properties
@@ -35,11 +36,15 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
 		ARG 1 user
 		ARG 2 target
 		ARG 3 level
-	METHOD m_rtwmhoyh getMinPower (I)I
+	METHOD m_rtwmhoyh getMinCost (I)I
 		COMMENT {@return the minimum level required to by the player for the enchantment to be shown in the enchantment table.}
 		COMMENT It is not a 1:1 ratio. The majority of enchantments return something similar to `10 * level`, often with different scales depending on the maximum level and rarity of the enchantment.
 		ARG 1 level
-	METHOD m_rwnmjikl properties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+	METHOD m_rwnmjikl createProperties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+	METHOD m_sclzujte postHit (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;I)V
+		ARG 1 attacker
+		ARG 2 target
+		ARG 3 level
 	METHOD m_smaihzzt isAvailableForEnchantedBookOffer ()Z
 		COMMENT {@return whether this enchantment will appear in the enchanted book trade
 		COMMENT offers of librarian villagers}
@@ -59,18 +64,20 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
 	METHOD m_vjzmieep cost (I)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
 	METHOD m_vssdpxdz getTranslationKey ()Ljava/lang/String;
 		COMMENT {@return gets key for translating the enchant in the lang files}
-	METHOD m_whhririh properties (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+	METHOD m_whhririh createProperties (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+		ARG 1 primaryItems
 	METHOD m_xaezlmue getAnvilCost ()I
 	METHOD m_ygnxsicw cost (II)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
 	METHOD m_zfqdifee getName (I)Lnet/minecraft/unmapped/C_rdaqiwdt;
 		COMMENT {@return a translation key that is formatted to a specific color}
 		COMMENT By default this method changes enchantments that return {@code true} from {@code isCursed()} to have red names.
 		ARG 1 level
-	METHOD m_zrsimmxr properties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;ILnet/minecraft/unmapped/C_czxxrbcp;[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+	METHOD m_znzmqxec isPrimaryItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+	METHOD m_zrsimmxr createProperties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;ILnet/minecraft/unmapped/C_czxxrbcp;[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
 	METHOD m_ztiddpby isAvailableForRandomSelection ()Z
 		COMMENT {@return whether this enchantment will appear in the enchanting table or
 		COMMENT loots with random enchant function}
-	METHOD m_ztycenho getMaxPower (I)I
+	METHOD m_ztycenho getMaxCost (I)I
 		COMMENT {@return the maximum level a Player is allowed before the enchant is not shown in the enchantment table}
 		COMMENT The default return is the minimum power level + 5.
 		ARG 1 level
@@ -79,4 +86,6 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
 		ARG 1 level
 		ARG 2 source
 	CLASS C_jkttgiwc Cost
+		METHOD m_lpzheldf forLevel (I)I
+			ARG 1 level
 	CLASS C_ryljcnwe Properties
diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
index 09b5cf0809..c608ecbf7a 100644
--- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
+++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
@@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 		COMMENT Gets the level of an enchantment on an item stack.
 		ARG 0 enchantment
 		ARG 1 stack
+	METHOD m_cvzymgsw getSweepingEdgeMultiplier (Lnet/minecraft/unmapped/C_usxaxydn;)F
 	METHOD m_cwzufrfa hasFrostWalker (Lnet/minecraft/unmapped/C_usxaxydn;)Z
 		ARG 0 entity
 	METHOD m_ebcyaldp getLoyalty (Lnet/minecraft/unmapped/C_sddaxwyk;)I
@@ -15,12 +16,15 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 		COMMENT {@code existing} enchantments}
 		ARG 0 existing
 		ARG 1 candidate
+	METHOD m_fbcdwuju getComponentType (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_pscqxfcs;
 	METHOD m_gfmalqgf onUserDamaged (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;)V
 		COMMENT This method is called when the user of the Item with the enchantment is damaged.
 		ARG 0 user
 		ARG 1 attacker
 	METHOD m_iaspatfp getRespiration (Lnet/minecraft/unmapped/C_usxaxydn;)I
 		ARG 0 entity
+	METHOD m_iefpfmdo updateEnchantments (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_qlclfxvn;
+		ARG 1 updater
 	METHOD m_jewispmg forEachEnchantment (Lnet/minecraft/unmapped/C_jakrppis$C_jdhxivxn;Ljava/lang/Iterable;)V
 		ARG 0 consumer
 		ARG 1 stacks
@@ -34,11 +38,18 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 		ARG 0 stack
 	METHOD m_kkmhqorr hasVanishingCurse (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 0 stack
+	METHOD m_knbmveqv (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
+		ARG 2 enchantment
+		ARG 3 level
 	METHOD m_knenpeym getFireAspect (Lnet/minecraft/unmapped/C_usxaxydn;)I
 		ARG 0 entity
+	METHOD m_koeurtnx hasEnchantments (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 	METHOD m_ktvqzwtx getKnockback (Lnet/minecraft/unmapped/C_usxaxydn;)I
 		ARG 0 entity
 	METHOD m_leiaofyl hasSilkTouch (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+	METHOD m_lsxqaewb (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
+		ARG 2 enchantment
+		ARG 3 level
 	METHOD m_mieewhwi chooseEquipmentWith (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_usxaxydn;Ljava/util/function/Predicate;)Ljava/util/Map$Entry;
 		COMMENT {@return a pair of an equipment slot and the item stack in the supplied
 		COMMENT entity's slot} It indicates the item stack has the enchantment supplied
@@ -52,12 +63,15 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 			COMMENT the entity to choose equipments from
 		ARG 2 condition
 			COMMENT extra conditions for the item stack to pass for selection
+	METHOD m_mimuzvcl canStoreEnchantments (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 	METHOD m_mnatputa forEachEnchantment (Lnet/minecraft/unmapped/C_jakrppis$C_jdhxivxn;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 		ARG 0 consumer
 		ARG 1 stack
 	METHOD m_mvsjkilb getArmorBreach (Lnet/minecraft/unmapped/C_astfners;F)F
+		ARG 0 entity
 	METHOD m_naelqumb enchant (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;IZ)Lnet/minecraft/unmapped/C_sddaxwyk;
 		COMMENT Enchants the {@code target} item stack and returns it.
+		ARG 0 features
 		ARG 2 target
 			COMMENT the item stack to enchant
 		ARG 3 level
@@ -66,6 +80,9 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 			COMMENT whether treasure enchantments may appear
 	METHOD m_nmfzbmmv hasBindingCurse (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 0 stack
+	METHOD m_nrticzny (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
+		ARG 2 enchantment
+		ARG 3 level
 	METHOD m_ogntvpbr getRiptide (Lnet/minecraft/unmapped/C_sddaxwyk;)I
 		ARG 0 stack
 	METHOD m_pcunrpng calculateRequiredExperienceLevel (Lnet/minecraft/unmapped/C_rlomrsco;IILnet/minecraft/unmapped/C_sddaxwyk;)I
@@ -91,6 +108,7 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 	METHOD m_pngonrhw getPossibleEntries (Lnet/minecraft/unmapped/C_czxxrbcp;ILnet/minecraft/unmapped/C_sddaxwyk;Z)Ljava/util/List;
 		COMMENT Gets all the possible entries for enchanting the {@code stack} at the
 		COMMENT given {@code power}.
+		ARG 0 features
 		ARG 1 power
 		ARG 2 stack
 		ARG 3 treasureAllowed
@@ -102,19 +120,30 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
 		ARG 0 entity
 	METHOD m_udfcqeza generateEnchantments (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;IZ)Ljava/util/List;
 		COMMENT Generate the enchantments for enchanting the {@code stack}.
+		ARG 0 features
 		ARG 2 stack
 		ARG 3 level
 		ARG 4 treasureAllowed
+	METHOD m_uyoiclvv getComponent (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_qlclfxvn;
 	METHOD m_vonozfhq hasSoulSpeed (Lnet/minecraft/unmapped/C_usxaxydn;)Z
 		ARG 0 entity
 	METHOD m_wfidublc getEnchantmentLevel (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_usxaxydn;)I
 		ARG 0 enchantment
+	METHOD m_wodwsbra (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
+		ARG 2 enchantment
+		ARG 3 level
 	METHOD m_ybhxtwqv set (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_qlclfxvn;)V
 		COMMENT Sets the enchantments on an item stack.
 		COMMENT
 		COMMENT <p>For enchanted books, it sets the enchantments to the item stack's
 		COMMENT stored enchantments than regular enchantments.
 		ARG 0 stack
+	METHOD m_yhaevnqm postHit (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_qlclfxvn;)V
+		ARG 0 attacker
+		ARG 1 target
+		ARG 2 component
+	METHOD m_yivqyckp getSweepingEdgeMultiplier (I)F
+		ARG 0 level
 	METHOD m_ymaphuvh chooseEquipmentWith (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/Map$Entry;
 		COMMENT {@return a pair of an equipment slot and the item stack in the supplied
 		COMMENT entity's slot} It indicates the item stack has the enchantment supplied.
diff --git a/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping b/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping
index 9b0a061538..d4f31c3362 100644
--- a/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping
+++ b/mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping
@@ -1,2 +1,3 @@
 CLASS net/minecraft/unmapped/C_ffoohmik net/minecraft/enchantment/WindBurstEnchantment
 	CLASS C_boyqzujk WindBurstExplosionBehavior
+		FIELD f_otbqmmcr knockbackMultiplier F
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 499843a5b9..095a87b20f 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -115,6 +115,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_armeddpk getDamageTracker ()Lnet/minecraft/unmapped/C_xkhemiqp;
 	METHOD m_astmyzdc getHand (Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_yuycoehb;
 		ARG 0 hand
+	METHOD m_atmwnkdy (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
+		ARG 1 brainElement
 	METHOD m_awmtskvv getMovementSpeed (F)F
 		ARG 1 slipperiness
 	METHOD m_axkhmdzu getDeathSound ()Lnet/minecraft/unmapped/C_avavozay;
@@ -301,6 +303,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_itkmziir getMainArm ()Lnet/minecraft/unmapped/C_njjnizsa;
 	METHOD m_jclvfrxe tickItemStackUsage (Lnet/minecraft/unmapped/C_sddaxwyk;)V
 		ARG 1 stack
+	METHOD m_jdwmkavq (Ljava/util/List;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 2 slot
 	METHOD m_jeizdffm getPreferredEquipmentSlot (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_yuycoehb;
 		ARG 0 stack
 	METHOD m_jeuoijmu getStatusEffect (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_wpfizwve;
@@ -540,6 +544,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_unmnupmt applyDamage (Lnet/minecraft/unmapped/C_sbxfkpyv;F)V
 		ARG 1 source
 		ARG 2 amount
+		ARG 9 unabsorbedAmount
 	METHOD m_upnmcubv getEatSound (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_avavozay;
 		ARG 1 stack
 	METHOD m_urjobhnr tickHandSwing ()V
diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
index 78ced67110..8147df3c20 100644
--- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
@@ -94,6 +94,8 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
 		ARG 1 resetSleepTimer
 		ARG 2 updateSleepingPlayers
 	METHOD m_dxttgpbs getShoulderEntityRight ()Lnet/minecraft/unmapped/C_hhlwcnih;
+	METHOD m_dxwrvwbv (Lnet/minecraft/unmapped/C_astfners;)V
+		ARG 1 shoulderEntity
 	METHOD m_ebadcaln lockRecipes (Ljava/util/Collection;)I
 		ARG 1 recipes
 	METHOD m_ejxhxqyb clipAtLedge ()Z
@@ -262,6 +264,10 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
 		ARG 1 pos
 		ARG 2 facing
 		ARG 3 stack
+	METHOD m_wbynhygu hasSpaceBelow (DDF)Z
+		ARG 1 xOffset
+		ARG 3 zOffset
+		ARG 5 spaceBelow
 	METHOD m_whbjjnjc startFallFlying ()V
 	METHOD m_wjlgxwvh canHarvest (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		COMMENT Determines whether the player is able to harvest drops from the specified block state.
@@ -269,7 +275,7 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
 		COMMENT whether the held item is effective for that block, otherwise
 		COMMENT it returns {@code true}.
 		COMMENT
-		COMMENT @see net.minecraft.item.Item#isSuitableFor(ItemStack, BlockState)
+		COMMENT @see net.minecraft.item.Item#isCorrectForDrops(ItemStack, BlockState)
 		ARG 1 state
 	METHOD m_wkrnfehf addExperience (I)V
 		ARG 1 experience
@@ -280,6 +286,8 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
 	METHOD m_xjswonqp resetStat (Lnet/minecraft/unmapped/C_sibrxbfy;)V
 		ARG 1 stat
 	METHOD m_xnugqgdd getHungerManager ()Lnet/minecraft/unmapped/C_lvaukqjj;
+	METHOD m_xqgqqttg (Ljava/lang/String;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
+		ARG 2 style
 	METHOD m_xsfrgoea getSculkShriekerWarningManager ()Ljava/util/Optional;
 	METHOD m_xuqwdmei setLastDeathPos (Ljava/util/Optional;)V
 		ARG 1 lastDeathPos
@@ -303,8 +311,11 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
 		ARG 1 recipe
 		ARG 2 ingredients
 	METHOD m_zkeljpmf isAboveGround (F)Z
+		ARG 1 stepHeight
 	METHOD m_zlrabaci getScore ()I
 	METHOD m_znrmlhap shouldCancelInteraction ()Z
+	METHOD m_zsswkqfl (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
+		ARG 1 pos
 	CLASS C_wdhcnmsn SleepFailureReason
 		FIELD f_xgwynlaa text Lnet/minecraft/unmapped/C_rdaqiwdt;
 		METHOD <init> (Ljava/lang/String;ILnet/minecraft/unmapped/C_rdaqiwdt;)V
diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping
index 5696b9331a..aab6363fe5 100644
--- a/mappings/net/minecraft/item/Item.mapping
+++ b/mappings/net/minecraft/item/Item.mapping
@@ -9,9 +9,13 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item
 	FIELD f_lfoqoljh recipeRemainder Lnet/minecraft/unmapped/C_vorddnax;
 	FIELD f_oajedmeb ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID;
 	FIELD f_rxraouwr builtInRegistryHolder Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
+	FIELD f_vmipucxo ABSOLUTE_MAX_COUNT I
+	FIELD f_vwakrgmw DEFAULT_MAX_COUNT I
 	METHOD <init> (Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)V
 		ARG 1 settings
 	METHOD m_bdsymcbv getName ()Lnet/minecraft/unmapped/C_rdaqiwdt;
+	METHOD m_bhfktmca getBonusAttackDamage (Lnet/minecraft/unmapped/C_jzrpycqo;F)F
+		ARG 2 baseAttackDamage
 	METHOD m_ckolblsl onCraft (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;)V
 		COMMENT Called when the item is made by crafting, smelting, smithing, etc.
 	METHOD m_cnsoybmp postMine (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_usxaxydn;)Z
@@ -25,7 +29,7 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item
 	METHOD m_dgdssmij fromBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_vorddnax;
 		COMMENT @deprecated Please use {@link Block#asItem}
 		ARG 0 block
-	METHOD m_dnwybntd isSuitableFor (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_txtbiemp;)Z
+	METHOD m_dnwybntd isCorrectForDrops (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		COMMENT Determines whether this item can be used as a suitable tool for mining the specified block.
 		COMMENT Depending on block implementation, when combined together, the correct item and block may achieve a better mining speed and yield
 		COMMENT drops that would not be obtained when mining otherwise.
@@ -120,6 +124,7 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item
 		ARG 5 player
 		ARG 6 cursorStackReference
 	METHOD m_plxsgnqi postHit (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z
+		COMMENT @return {@code true} if the hit should count as a usage of the item, or {@code false} otherwise
 		ARG 1 stack
 		ARG 2 target
 		ARG 3 attacker
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index f09877de2c..6e3d5304a6 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -167,17 +167,20 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 	METHOD m_kmktysli getBreakSound ()Lnet/minecraft/unmapped/C_avavozay;
 	METHOD m_kshgvahz matches (Ljava/util/function/Predicate;)Z
 		ARG 1 predicate
+	METHOD m_lwxbsyxh damage (ILnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/lang/Runnable;)V
+		ARG 1 damage
+		ARG 4 onBreak
 	METHOD m_mhrovmoq itemsMatch (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 0 stack1
 		ARG 1 stack2
-	METHOD m_msofzvly isSuitableFor (Lnet/minecraft/unmapped/C_txtbiemp;)Z
+	METHOD m_msofzvly isCorrectForDrops (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		COMMENT Determines whether this item can be used as a suitable tool for mining the specified block.
 		COMMENT <p>
 		COMMENT Depending on block implementation, when combined together, the correct item and block may achieve a better mining speed and yield
 		COMMENT drops that would not be obtained when mining otherwise.
 		COMMENT
-		COMMENT @return values consistent with calls to {@link Item#isSuitableFor}
-		COMMENT @see Item#isSuitableFor(ItemStack, BlockState)
+		COMMENT @return values consistent with calls to {@link Item#isCorrectForDrops}
+		COMMENT @see Item#isCorrectForDrops(ItemStack, BlockState)
 		ARG 1 state
 	METHOD m_mwcbjbmu getTooltipData ()Ljava/util/Optional;
 	METHOD m_mwztqdza getEatSound ()Lnet/minecraft/unmapped/C_avavozay;
@@ -211,7 +214,8 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 		ARG 1 patch
 	METHOD m_qxfxfsuy getItem ()Lnet/minecraft/unmapped/C_vorddnax;
 	METHOD m_qxooancw applyPatch (Lnet/minecraft/unmapped/C_jqyoylib;)V
-	METHOD m_rcukuoag (ILnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)V
+	METHOD m_rcukuoag damageEquipment (ILnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)V
+		ARG 1 damage
 		ARG 2 entity
 		ARG 3 slot
 	METHOD m_rghjmiwl setDamage (I)V
@@ -284,6 +288,8 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 		ARG 1 holder
 	METHOD m_xvzvtufo getName ()Lnet/minecraft/unmapped/C_rdaqiwdt;
 	METHOD m_yawcimjo getEntityHolder ()Lnet/minecraft/unmapped/C_astfners;
+	METHOD m_yprgpdac takesDamageFrom (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z
+		ARG 1 damageSource
 	METHOD m_yqsxbejh copyComponentsToNewStack (Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_sddaxwyk;
 		COMMENT {@return a new item stack with the components copied from this stack}
 		COMMENT
diff --git a/mappings/net/minecraft/item/MaceItem.mapping b/mappings/net/minecraft/item/MaceItem.mapping
index c4707e5efc..ceda08e7dc 100644
--- a/mappings/net/minecraft/item/MaceItem.mapping
+++ b/mappings/net/minecraft/item/MaceItem.mapping
@@ -1 +1,24 @@
 CLASS net/minecraft/unmapped/C_dromlfke net/minecraft/item/MaceItem
+	FIELD f_iwezuyjb SMASH_ATTACK_RANGE F
+	FIELD f_pvnkxqyz MIN_HEAVY_SMASH_ATTACK_FALL_DISTANCE F
+	FIELD f_sxpbvvce MIN_SMASH_ATTACK_FALL_DISTANCE F
+	FIELD f_txhcwmgq SMASH_ATTACK_KNOCKBACK_MULTIPLIER F
+	FIELD f_uehcwcxb ATTACK_DAMAGE_MODIFIER I
+	FIELD f_uhysbuth SMASH_ATTACK_FALL_DISTANCE_MULTIPLIER F
+	FIELD f_ztxhqkle ATTACK_SPEED_MODIFIER F
+	METHOD m_iesmadnb (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_usxaxydn;)V
+		ARG 2 opponent
+	METHOD m_jcuowukf createToolComponent ()Lnet/minecraft/unmapped/C_uippejmz;
+	METHOD m_kqoarywc getKnockbackMagnitude (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_vgpupfxx;)D
+		ARG 1 opponent
+		ARG 2 opponentToTarget
+	METHOD m_mkgopfsx createAttributes ()Lnet/minecraft/unmapped/C_azfkqhlm;
+	METHOD m_ogiezrtc (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_usxaxydn;)Z
+		ARG 2 entity
+	METHOD m_pxzxqsww getKnockbackNearbyPredicate (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_astfners;)Ljava/util/function/Predicate;
+		ARG 0 attacker
+		ARG 1 target
+	METHOD m_tazjgygw knockbackNearbyEntities (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_astfners;)V
+		ARG 1 attacker
+		ARG 2 target
+	METHOD m_yidgbebs canSmashAttack (Lnet/minecraft/unmapped/C_jzrpycqo;)Z
diff --git a/mappings/net/minecraft/item/MiningToolItem.mapping b/mappings/net/minecraft/item/MiningToolItem.mapping
index 63887c07e4..0a6e17cb79 100644
--- a/mappings/net/minecraft/item/MiningToolItem.mapping
+++ b/mappings/net/minecraft/item/MiningToolItem.mapping
@@ -3,3 +3,5 @@ CLASS net/minecraft/unmapped/C_suicvzxy net/minecraft/item/MiningToolItem
 		ARG 3 settings
 	METHOD m_rlfnjhgj createAttributes (Lnet/minecraft/unmapped/C_vymwvkjh;FF)Lnet/minecraft/unmapped/C_azfkqhlm;
 		ARG 0 material
+		ARG 1 baseAttackDamageModifier
+		ARG 2 attackSpeedModifier
diff --git a/mappings/net/minecraft/item/ShearsItem.mapping b/mappings/net/minecraft/item/ShearsItem.mapping
index d366c53eda..0803c66c49 100644
--- a/mappings/net/minecraft/item/ShearsItem.mapping
+++ b/mappings/net/minecraft/item/ShearsItem.mapping
@@ -1 +1,2 @@
 CLASS net/minecraft/unmapped/C_ygkoglfh net/minecraft/item/ShearsItem
+	METHOD m_zrikmapr createToolComponent ()Lnet/minecraft/unmapped/C_uippejmz;
diff --git a/mappings/net/minecraft/item/SwordItem.mapping b/mappings/net/minecraft/item/SwordItem.mapping
index 02e4cfe88c..e58687a306 100644
--- a/mappings/net/minecraft/item/SwordItem.mapping
+++ b/mappings/net/minecraft/item/SwordItem.mapping
@@ -1,3 +1,6 @@
 CLASS net/minecraft/unmapped/C_kahxulcc net/minecraft/item/SwordItem
 	METHOD m_ictbzbvj createAttributes (Lnet/minecraft/unmapped/C_vymwvkjh;IF)Lnet/minecraft/unmapped/C_azfkqhlm;
 		ARG 0 material
+		ARG 1 baseAttackDamageModifier
+		ARG 2 attackSpeedModifier
+	METHOD m_vblngiin createToolComponent ()Lnet/minecraft/unmapped/C_uippejmz;
diff --git a/mappings/net/minecraft/item/ToolMaterial.mapping b/mappings/net/minecraft/item/ToolMaterial.mapping
index 1f26f93ccc..fbb37228c7 100644
--- a/mappings/net/minecraft/item/ToolMaterial.mapping
+++ b/mappings/net/minecraft/item/ToolMaterial.mapping
@@ -1,6 +1,9 @@
 CLASS net/minecraft/unmapped/C_vymwvkjh net/minecraft/item/ToolMaterial
 	METHOD m_asmietvx getDurability ()I
 	METHOD m_atzlfmwa getEnchantability ()I
+	METHOD m_gexbxbth createToolComponent (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_uippejmz;
+		ARG 1 blocks
 	METHOD m_kixnfbjm getRepairIngredient ()Lnet/minecraft/unmapped/C_tcpsydrv;
 	METHOD m_niryxwaq getMiningSpeedMultiplier ()F
+	METHOD m_pemjdawp getIncorrectForDropsBlocks ()Lnet/minecraft/unmapped/C_ednuhnnn;
 	METHOD m_zccyxrky getAttackDamage ()F
diff --git a/mappings/net/minecraft/item/ToolMaterials.mapping b/mappings/net/minecraft/item/ToolMaterials.mapping
index b5255f2edd..e5b78ef749 100644
--- a/mappings/net/minecraft/item/ToolMaterials.mapping
+++ b/mappings/net/minecraft/item/ToolMaterials.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_ebukueho net/minecraft/item/ToolMaterials
+	FIELD f_dhsxfxgt incorrectForDropsBlocks Lnet/minecraft/unmapped/C_ednuhnnn;
 	FIELD f_knxetuhw itemDurability I
 	FIELD f_ntqzhglk repairIngredient Ljava/util/function/Supplier;
 	FIELD f_pbmoigea attackDamage F
diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping
index f244d0772b..f1c1a6860b 100644
--- a/mappings/net/minecraft/item/TridentItem.mapping
+++ b/mappings/net/minecraft/item/TridentItem.mapping
@@ -2,3 +2,4 @@ CLASS net/minecraft/unmapped/C_zmjbcbkb net/minecraft/item/TridentItem
 	FIELD f_ccetqhqn BASE_DAMAGE F
 	FIELD f_doufocix THROW_THRESHOLD_TIME I
 	FIELD f_pnjscbup SHOOT_POWER F
+	METHOD m_hboahwmr createToolComponent ()Lnet/minecraft/unmapped/C_uippejmz;
diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
index 275bd92237..5eb81f7b06 100644
--- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
+++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
@@ -32,6 +32,7 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye
 		COMMENT @see #getWatchedSection()
 		COMMENT @see #setWatchedSection(ChunkSectionPos)
 	FIELD f_ldmwjyxg requestedViewDistance I
+	FIELD f_mfajmfxx spawnExtraParticlesOnFall Z
 	FIELD f_onahzxmm interactionManager Lnet/minecraft/unmapped/C_egnasquq;
 	FIELD f_oxxbizze syncedExperience I
 	FIELD f_qcackqxh enteredLavaOnVehiclePos Lnet/minecraft/unmapped/C_vgpupfxx;
@@ -173,6 +174,8 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye
 	METHOD m_rxryenyl isBedTooFarAway (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
 		ARG 1 pos
 		ARG 2 direction
+	METHOD m_sdoikewn setSpawnExtraParticlesOnFall (Z)V
+		ARG 1 spawn
 	METHOD m_smuclzej isSpawnPointSet ()Z
 	METHOD m_taedfzyx shouldFilterMessagesSentTo (Lnet/minecraft/unmapped/C_mxrobsgg;)Z
 		ARG 1 player
diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping
index 85293c4afd..f2cafd6342 100644
--- a/mappings/net/minecraft/world/explosion/Explosion.mapping
+++ b/mappings/net/minecraft/world/explosion/Explosion.mapping
@@ -42,10 +42,14 @@ CLASS net/minecraft/unmapped/C_aahhrzpf net/minecraft/world/explosion/Explosion
 		ARG 10 createFire
 		ARG 11 destructionType
 		ARG 12 affectedBlocks
+	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_dmexlawk;DDDFZLnet/minecraft/unmapped/C_aahhrzpf$C_bhnzljtn;Lnet/minecraft/unmapped/C_nqucohct;Lnet/minecraft/unmapped/C_nqucohct;Lnet/minecraft/unmapped/C_cjzoxshv;)V
+		ARG 3 source
+		ARG 4 behavior
 	METHOD m_btdrawgr chooseBehavior (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_dmexlawk;
 		ARG 1 entity
 	METHOD m_dhpfcxja getEntity ()Lnet/minecraft/unmapped/C_astfners;
 	METHOD m_ditilhwv clearAffectedBlocks ()V
+	METHOD m_gdcrqnny getSmallParticles ()Lnet/minecraft/unmapped/C_nqucohct;
 	METHOD m_hyeznwfn getExposure (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;)F
 		ARG 0 source
 		ARG 1 entity
@@ -59,9 +63,14 @@ CLASS net/minecraft/unmapped/C_aahhrzpf net/minecraft/world/explosion/Explosion
 		ARG 0 from
 	METHOD m_ounmsbmr (Ljava/util/List;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_hynzadkk;)V
 		ARG 1 stack
+	METHOD m_oxcyztzx getLargeParticles ()Lnet/minecraft/unmapped/C_nqucohct;
 	METHOD m_pjedevud getAffectedBlocks ()Ljava/util/List;
 	METHOD m_scvsetyy getAffectedPlayers ()Ljava/util/Map;
 	METHOD m_tcdjmset isDestructive ()Z
+	METHOD m_txuvunda getSound ()Lnet/minecraft/unmapped/C_cjzoxshv;
+	METHOD m_vcpjnikm mergeOrAddStack (Ljava/util/List;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_hynzadkk;)V
+		ARG 0 stacks
+	METHOD m_vsvasiko getDestructionType ()Lnet/minecraft/unmapped/C_aahhrzpf$C_bhnzljtn;
 	METHOD m_yxczltpy affectWorld (Z)V
 		ARG 1 particles
 			COMMENT whether this explosion should emit explosion or explosion emitter particles around the source of the explosion
diff --git a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
index ee2b1c96b2..c5bcaeaf2c 100644
--- a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
+++ b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
@@ -15,6 +15,7 @@ CLASS net/minecraft/unmapped/C_dmexlawk net/minecraft/world/explosion/ExplosionB
 		ARG 4 state
 		ARG 5 power
 	METHOD m_vcortgkd getKnockbackMultiplier (Lnet/minecraft/unmapped/C_astfners;)F
+		ARG 1 target
 	METHOD m_vuqczogj shouldDamage (Lnet/minecraft/unmapped/C_aahhrzpf;Lnet/minecraft/unmapped/C_astfners;)Z
 		ARG 1 explosion
 		ARG 2 entity