diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 6c3e6e509d..0e87ee6aeb 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -326,10 +326,11 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 		COMMENT Gets the amount of health this entity has in half-hearts.
 		COMMENT
 		COMMENT @return the amount of health of this entity
+	METHOD m_kobcxaqs getJumpStrength ()F
 	METHOD m_ktkvypgf enterCombat ()V
 	METHOD m_kwjgylty swimUpward (Lnet/minecraft/unmapped/C_ednuhnnn;)V
 		ARG 1 tag
-	METHOD m_kzhoqled (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+	METHOD m_kzhoqled equipStack (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 		ARG 1 slot
 	METHOD m_lagxpcmk onStatusEffectRemoved (Lnet/minecraft/unmapped/C_wpfizwve;)V
 		ARG 1 effect
@@ -367,6 +368,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 		COMMENT
 		COMMENT <p>This checks both the entity's main and off hand.
 		ARG 1 predicate
+	METHOD m_msbyrsaa getAllArmorItems ()Ljava/lang/Iterable;
 	METHOD m_mzepiaxw getControlledMovementInput (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx;
 		COMMENT Returns the movement input when this entity is controlled by a player.
 		COMMENT
@@ -426,11 +428,14 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_pwoagvwv getArmorInSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk;
 		ARG 1 slot
 	METHOD m_qhbjdevp getMaxRelativeHeadRotation ()F
+	METHOD m_qjxxiksy getHandItems ()Ljava/lang/Iterable;
 	METHOD m_qlumoklh onDismounted (Lnet/minecraft/unmapped/C_astfners;)V
 		ARG 1 vehicle
 	METHOD m_qlwogvxq spawnItemParticles (Lnet/minecraft/unmapped/C_sddaxwyk;I)V
 		ARG 1 stack
 		ARG 2 count
+	METHOD m_qmfzkten getJumpStrength (F)F
+		ARG 1 multiplier
 	METHOD m_qrjyiaeu getScaleFactor ()F
 	METHOD m_qsbhsxhz isAffectedBySplashPotions ()Z
 	METHOD m_qsfhmwnj getAttributeBaseValue (Lnet/minecraft/unmapped/C_cjzoxshv;)D
@@ -576,7 +581,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_wsbfbafs getAbsorptionAmount ()F
 	METHOD m_wslmhwgl getAttacker ()Lnet/minecraft/unmapped/C_usxaxydn;
 	METHOD m_wunuznfv isInCreativeMode ()Z
-	METHOD m_xcvctlld (Lnet/minecraft/unmapped/C_yuycoehb;)Z
+	METHOD m_xcvctlld canUseSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Z
 		ARG 1 slot
 	METHOD m_xgwxqkgb swingHand (Lnet/minecraft/unmapped/C_laxmzoqs;)V
 		ARG 1 hand
@@ -585,11 +590,16 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_xotweprj indicateDamage (DD)V
 		ARG 1 x
 		ARG 3 z
+	METHOD m_xqeoerfz getArmorItems ()Ljava/lang/Iterable;
 	METHOD m_xuirzakp getEquippedStack (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk;
 		ARG 1 slot
 	METHOD m_xusebikf wouldNotSuffocateInPose (Lnet/minecraft/unmapped/C_ufdjspmk;)Z
 		ARG 1 pose
 	METHOD m_xuxedegf isBaby ()Z
+	METHOD m_xvjkmxro getEquippedItems ()Ljava/lang/Iterable;
+		COMMENT Gets all equipped items on this entity, including all armor and items in hand.
+		COMMENT @see #getAllArmorItems
+		COMMENT @see #getHandItems
 	METHOD m_xvjtogym setAbsorptionAmountInternal (F)V
 		ARG 1 absorptionAmount
 	METHOD m_xzvpzpbu removeStatusEffect (Lnet/minecraft/unmapped/C_cjzoxshv;)Z
@@ -637,6 +647,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_zgpfruit getAttributeInstance (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_lzukavpx;
 		ARG 1 attribute
 	METHOD m_zhwrgbmx getPoses ()Lcom/google/common/collect/ImmutableList;
+	METHOD m_zjpztqou lerpHeadYaw (ID)V
+		ARG 1 headTrackingIncrements
+		ARG 2 serverHeadYaw
 	METHOD m_zrgxyjwv hasStatusEffect (Lnet/minecraft/unmapped/C_cjzoxshv;)Z
 		ARG 1 effect
 	METHOD m_ztpokzjz getDamageTiltStrength ()F
diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
index b88261cb48..d93a74a97f 100644
--- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
+++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
@@ -15,6 +15,7 @@ CLASS net/minecraft/unmapped/C_lzukavpx net/minecraft/entity/attribute/EntityAtt
 		ARG 1 uuid
 	METHOD m_gbtcpwti hasModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)Z
 		ARG 1 modifier
+	METHOD m_gktfmzhg addIfAbsent (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/util/Map;
 	METHOD m_gtfjwrju readNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)V
 		ARG 1 nbt
 	METHOD m_hzjnirrj getModifiers ()Ljava/util/Set;
@@ -30,6 +31,7 @@ CLASS net/minecraft/unmapped/C_lzukavpx net/minecraft/entity/attribute/EntityAtt
 		ARG 1 modifier
 	METHOD m_mgkvtsyq clearModifiers ()V
 	METHOD m_mrmrewks updateModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)V
+		ARG 1 modifier
 	METHOD m_mxlwhbkp getAttribute ()Lnet/minecraft/unmapped/C_cjzoxshv;
 	METHOD m_oczhaipt computeValue ()D
 		COMMENT Computes this attribute's value, taking modifiers into account.
diff --git a/mappings/net/minecraft/entity/boss/BossBarManager.mapping b/mappings/net/minecraft/entity/boss/BossBarManager.mapping
index d5ba1ba13f..fa5cae6e0c 100644
--- a/mappings/net/minecraft/entity/boss/BossBarManager.mapping
+++ b/mappings/net/minecraft/entity/boss/BossBarManager.mapping
@@ -10,9 +10,11 @@ CLASS net/minecraft/unmapped/C_xtwgkoiw net/minecraft/entity/boss/BossBarManager
 		ARG 1 player
 	METHOD m_orrnpvup readNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
 		ARG 1 nbt
+		ARG 2 lookupProvider
 	METHOD m_sdqhvakq add (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_izahjvwf;
 		ARG 1 id
 		ARG 2 displayName
 	METHOD m_tlvnkkxf remove (Lnet/minecraft/unmapped/C_izahjvwf;)V
 		ARG 1 bossBar
 	METHOD m_yslgusfr toNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 1 lookupProvider
diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping
index e85d9e0009..b120b5645b 100644
--- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping
+++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping
@@ -16,9 +16,11 @@ CLASS net/minecraft/unmapped/C_izahjvwf net/minecraft/entity/boss/CommandBossBar
 	METHOD m_qkafyrxa (Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
 		ARG 1 style
 	METHOD m_qnxyeypi toNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 1 lookupProvider
 	METHOD m_sayczpmf fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_izahjvwf;
 		ARG 0 nbt
 		ARG 1 id
+		ARG 2 lookupProvider
 	METHOD m_shcbnoqq getMaxValue ()I
 	METHOD m_sjepyxhx getValue ()I
 	METHOD m_udwgbkwv onPlayerConnect (Lnet/minecraft/unmapped/C_mxrobsgg;)V
diff --git a/mappings/net/minecraft/entity/damage/DamageTracker.mapping b/mappings/net/minecraft/entity/damage/DamageTracker.mapping
index db4b06ecb6..0c88268f55 100644
--- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping
+++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping
@@ -18,11 +18,14 @@ CLASS net/minecraft/unmapped/C_xkhemiqp net/minecraft/entity/damage/DamageTracke
 	METHOD m_hhqevfbq onDamage (Lnet/minecraft/unmapped/C_sbxfkpyv;F)V
 		ARG 1 damageSource
 		ARG 2 originalHealth
-	METHOD m_lagkuzok (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+	METHOD m_lagkuzok formatDeathMessage (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
 		ARG 1 entity
+		ARG 2 displayName
+		ARG 3 customItemTranslationKey
+		ARG 4 baseTranslationKey
 	METHOD m_lwhoscrp getBiggestFall ()Lnet/minecraft/unmapped/C_opjrpnsy;
 	METHOD m_ufintojk isAttackerLiving (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z
 		ARG 0 damageSource
-	METHOD m_xfvrnbnv (Lnet/minecraft/unmapped/C_opjrpnsy;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+	METHOD m_xfvrnbnv getFallingDeathMessage (Lnet/minecraft/unmapped/C_opjrpnsy;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_rdaqiwdt;
 		ARG 1 damage
 	METHOD m_xmrbfkiy getDeathMessage ()Lnet/minecraft/unmapped/C_rdaqiwdt;
diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
index f0125ee8bf..6585db9c02 100644
--- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
+++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/unmapped/C_fegtripb net/minecraft/entity/data/TrackedDataHan
 	FIELD f_izuxtjlv FIREWORK_DATA Lnet/minecraft/unmapped/C_xrzqxzbg;
 	FIELD f_jkldjhwk LONG Lnet/minecraft/unmapped/C_xrzqxzbg;
 	FIELD f_jymqxprw WOLF_VARIANT Lnet/minecraft/unmapped/C_xrzqxzbg;
+	FIELD f_kolazbza PARTICLES Lnet/minecraft/unmapped/C_xrzqxzbg;
 	FIELD f_kpwqpgno TAG_COMPOUND Lnet/minecraft/unmapped/C_xrzqxzbg;
 	FIELD f_kyenxrse QUATERNIONF Lnet/minecraft/unmapped/C_xrzqxzbg;
 	FIELD f_mzinrkcd INTEGER Lnet/minecraft/unmapped/C_xrzqxzbg;
diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
index 614bfd72d8..8678134bc6 100644
--- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
+++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
@@ -72,6 +72,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta
 	METHOD m_ldbykolm poseToNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
 	METHOD m_lvksyjqf isSlotDisabled (Lnet/minecraft/unmapped/C_yuycoehb;)Z
 		ARG 1 slot
+	METHOD m_nendfomc createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
 	METHOD m_npsgczto playBreakSound ()V
 	METHOD m_pgcyrpjv spawnBreakParticles ()V
 	METHOD m_phaftboj getLeftLegRotation ()Lnet/minecraft/unmapped/C_eocijcdh;
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 4401ab3dff..7678cf98db 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
 	FIELD f_irlmhwzh navigation Lnet/minecraft/unmapped/C_atbvfjwi;
 	FIELD f_iymvakla LEASH_KEY Ljava/lang/String;
 	FIELD f_kfwdpftf positionTargetRange F
+	FIELD f_mhavoyoi bodyArmor Lnet/minecraft/unmapped/C_sddaxwyk;
 	FIELD f_mxvsbror armorItems Lnet/minecraft/unmapped/C_rnrfftze;
 	FIELD f_nwzksedo goalSelector Lnet/minecraft/unmapped/C_qospjrjn;
 	FIELD f_nzzqwalu pathfindingPenalties Ljava/util/Map;
@@ -62,6 +63,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
 		ARG 1 pos
 	METHOD m_erwclnrx setLeftHanded (Z)V
 		ARG 1 leftHanded
+	METHOD m_faldjosq getBodyArmor ()Lnet/minecraft/unmapped/C_sddaxwyk;
 	METHOD m_fgmsyatf canBeLeashedBy (Lnet/minecraft/unmapped/C_jzrpycqo;)Z
 		ARG 1 player
 	METHOD m_fisapugx getJumpControl ()Lnet/minecraft/unmapped/C_tmduotiw;
@@ -125,6 +127,8 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
 	METHOD m_mbyporyt createBodyControl ()Lnet/minecraft/unmapped/C_vofymfgv;
 	METHOD m_mowaxfbl isLeftHanded ()Z
 	METHOD m_mrbrckqf isDisallowedInPeaceful ()Z
+	METHOD m_msbyrsaa ()Ljava/lang/Iterable;
+		COMMENT Gets armor items on this entity, taking into account body armor items.
 	METHOD m_mufhzdfi isInWalkTargetRange ()Z
 	METHOD m_mztbwniz movesIndependently ()Z
 		COMMENT When true, causes this entity to take over pathfinding for its controlling passenger.
@@ -161,6 +165,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
 	METHOD m_swfiqufm prefersNewEquipment (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 1 newStack
 		ARG 2 oldStack
+	METHOD m_szhnkfyu canWearBodyArmour ()Z
 	METHOD m_tjejbxzp canUseRangedWeapon (Lnet/minecraft/unmapped/C_axrfhndl;)Z
 		ARG 1 weapon
 	METHOD m_todoiyds clearGoalsAndTasks (Ljava/util/function/Predicate;)V
diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping
index 322b489c48..a9f3579eb9 100644
--- a/mappings/net/minecraft/text/Text.mapping
+++ b/mappings/net/minecraft/text/Text.mapping
@@ -140,18 +140,28 @@ CLASS net/minecraft/unmapped/C_rdaqiwdt net/minecraft/text/Text
 		COMMENT the supplied {@code length}.
 		ARG 1 length
 			COMMENT the max length allowed for the string representation of the text
-	CLASS C_iyijrxyu Serializer
-		COMMENT Represents a JSON serializer for {@link Text}.
+	CLASS C_iyijrxyu SerializationUtil
 		FIELD f_avuxccfb GSON Lcom/google/gson/Gson;
 		METHOD m_avvlujlm fromLenientJson (Ljava/lang/String;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
 			ARG 0 json
+		METHOD m_caetnclp fromJsonNullable (Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
 		METHOD m_eorwnzsk toJson (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/lang/String;
 			ARG 0 text
-		METHOD m_fsepqjma (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lcom/google/gson/JsonElement;
+		METHOD m_fsepqjma toJsonElement (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lcom/google/gson/JsonElement;
 			ARG 0 text
-	CLASS C_poyaemhx
+			ARG 1 lookupProvider
+		METHOD m_npeyudcr fromJson (Ljava/lang/String;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
+		METHOD m_rjdnjbxy fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
+			ARG 0 json
+			ARG 1 lookupProvider
+	CLASS C_poyaemhx Serializer
+		COMMENT Represents a JSON serializer for {@link Text}.
+		FIELD f_utvsiwsp lookupProvider Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
 		METHOD deserialize deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 jsonElement
 			ARG 2 type
+			ARG 3 context
 		METHOD serialize serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 text
 			ARG 2 type
+			ARG 3 context