diff --git a/mappings/net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket.mapping
new file mode 100644
index 0000000000..3942167fbb
--- /dev/null
+++ b/mappings/net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket.mapping
@@ -0,0 +1,8 @@
+CLASS mn net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket
+	FIELD a chunkX I
+	FIELD b chunkZ I
+	METHOD <init> (II)V
+		ARG 1 x
+		ARG 2 z
+	METHOD b getChunkX ()I
+	METHOD c getChunkZ ()I
diff --git a/mappings/net/minecraft/client/network/packet/SetVillagerRecipesPacket.mapping b/mappings/net/minecraft/client/network/packet/SetVillagerRecipesPacket.mapping
index 2e6861700d..d530be2ab8 100644
--- a/mappings/net/minecraft/client/network/packet/SetVillagerRecipesPacket.mapping
+++ b/mappings/net/minecraft/client/network/packet/SetVillagerRecipesPacket.mapping
@@ -1,11 +1,17 @@
 CLASS lr net/minecraft/client/network/packet/SetVillagerRecipesPacket
 	FIELD a syncId I
 	FIELD b recipes Lbgc;
+	FIELD c levelProgress I
+	FIELD d experience I
 	FIELD e canLevel Z
 	METHOD <init> (ILbgc;IIZ)V
 		ARG 1 syncId
 		ARG 2 recipes
+		ARG 3 levelProgress
+		ARG 4 experience
 		ARG 5 canLevel
 	METHOD b getSyncId ()I
 	METHOD c getRecipes ()Lbgc;
+	METHOD d getLevelProgress ()I
+	METHOD e getExperience ()I
 	METHOD f canLevel ()Z
diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping
index 201755a419..e85f2f1913 100644
--- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping
+++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping
@@ -3,6 +3,8 @@ CLASS dgu net/minecraft/client/world/ClientChunkManager
 		FIELD b chunks Ljava/util/concurrent/atomic/AtomicReferenceArray;
 		FIELD c loadDistance I
 		FIELD d loadDiameter I
+		FIELD e centerChunkX I
+		FIELD f centerChunkZ I
 		METHOD <init> (Ldgu;I)V
 			ARG 2 loadDistance
 		METHOD a getChunk (I)Lbwz;
@@ -32,3 +34,6 @@ CLASS dgu net/minecraft/client/world/ClientChunkManager
 	METHOD c unload (II)V
 		ARG 1 chunkX
 		ARG 2 chunkZ
+	METHOD d setChunkMapCenter (II)V
+		ARG 1 x
+		ARG 2 z
diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping
index 5fcca102fb..387d6fee60 100644
--- a/mappings/net/minecraft/command/EntitySelector.mapping
+++ b/mappings/net/minecraft/command/EntitySelector.mapping
@@ -1,11 +1,13 @@
 CLASS ec net/minecraft/command/EntitySelector
 	FIELD a count I
-	FIELD b includesEntities Z
+	FIELD b includingNonPlayer Z
+	FIELD c localWorldOnly Z
 	FIELD d basePredicate Ljava/util/function/Predicate;
 	FIELD e distance Lbi$c;
 	FIELD f positionOffset Ljava/util/function/Function;
 	FIELD g box Lcrg;
 	FIELD h sorter Ljava/util/function/BiConsumer;
+	FIELD i senderOnly Z
 	FIELD j playerName Ljava/lang/String;
 	FIELD k entityId Ljava/util/UUID;
 	FIELD l type Laie;
@@ -15,8 +17,11 @@ CLASS ec net/minecraft/command/EntitySelector
 	METHOD a getPositionPredicate (Lcrl;)Ljava/util/function/Predicate;
 	METHOD a getEntities (Lcrl;Ljava/util/List;)Ljava/util/List;
 	METHOD a getNames (Ljava/util/List;)Ljm;
-	METHOD b includesEntities ()Z
+	METHOD a appendEntitiesFromWorld (Ljava/util/List;Lvf;Lcrl;Ljava/util/function/Predicate;)V
+	METHOD b isIncludingNonPlayer ()Z
 	METHOD b getEntities (Lcd;)Ljava/util/List;
+	METHOD c isSenderOnly ()Z
 	METHOD c getPlayer (Lcd;)Lvg;
+	METHOD d isLocalWorldOnly ()Z
 	METHOD d getPlayers (Lcd;)Ljava/util/List;
 	METHOD e check (Lcd;)V
diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping
index 236b86a554..ab9962083f 100644
--- a/mappings/net/minecraft/command/EntitySelectorReader.mapping
+++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping
@@ -1,8 +1,12 @@
 CLASS ed net/minecraft/command/EntitySelectorReader
 	FIELD A predicate Ljava/util/function/Predicate;
 	FIELD B sorter Ljava/util/function/BiConsumer;
+	FIELD C senderOnly Z
+	FIELD D playerName Ljava/lang/String;
+	FIELD F entityId Ljava/util/UUID;
 	FIELD G suggestions Ljava/util/function/BiFunction;
 	FIELD P type Laie;
+	FIELD T checkPermissions Z
 	FIELD a INVALID_ENTITY_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD b UNKNOWN_SELECTOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD c NOT_ALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
@@ -14,13 +18,20 @@ CLASS ed net/minecraft/command/EntitySelectorReader
 	FIELD i FURTHEST_FIRST Ljava/util/function/BiConsumer;
 	FIELD j RANDOM Ljava/util/function/BiConsumer;
 	FIELD l reader Lcom/mojang/brigadier/StringReader;
+	FIELD n count I
+	FIELD o includingNonPlayer Z
+	FIELD p localWorldOnly Z
+	FIELD q distance Lbi$c;
 	FIELD r experience Lbi$d;
 	FIELD y pitchRange Lbw;
 	FIELD z yawRange Lbw;
 	METHOD E hasEntityType ()Z
 	METHOD I buildPredicate ()V
 	METHOD a build ()Lec;
+	METHOD a setCount (I)V
 	METHOD a setEntityType (Laie;)V
+	METHOD a setDistance (Lbi$c;)V
+	METHOD a setExperience (Lbi$d;)V
 	METHOD a setPitchRange (Lbw;)V
 	METHOD a rotationPredicate (Lbw;Ljava/util/function/ToDoubleFunction;)Ljava/util/function/Predicate;
 	METHOD a suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V
@@ -28,11 +39,13 @@ CLASS ed net/minecraft/command/EntitySelectorReader
 	METHOD a setOrdering (Ljava/util/function/BiConsumer;)V
 	METHOD a setSuggestionProvider (Ljava/util/function/BiFunction;)V
 	METHOD a setPredicate (Ljava/util/function/Predicate;)V
+	METHOD a setIncludingNonPlayer (Z)V
 	METHOD b setYawRange (Lbw;)V
 	METHOD e suggestOpen (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;
 	METHOD f suggestOptionOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;
 	METHOD g getReader ()Lcom/mojang/brigadier/StringReader;
 	METHOD g suggestOption (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;
+	METHOD h setLocalWorldOnly ()V
 	METHOD h suggestEndNext (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;
 	METHOD k getPitchRange ()Lbw;
 	METHOD l getYawRange ()Lbw;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index fbfba20efd..895ba9ee9a 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -125,6 +125,7 @@ CLASS aia net/minecraft/entity/Entity
 	METHOD a getSize (Lait;)Laib;
 	METHOD a getEyeHeight (Lait;Laib;)F
 	METHOD a onStruckByLightning (Latc;)V
+		ARG 1 lightning
 	METHOD a interactAt (Lavo;Lcrl;Lagu;)Lagv;
 		ARG 1 player
 		ARG 2 hitPos
@@ -170,11 +171,13 @@ CLASS aia net/minecraft/entity/Entity
 		ARG 3 pitch
 	METHOD a playStepSound (Lev;Lbuz;)V
 		ARG 1 pos
+		ARG 2 state
 	METHOD a readCustomDataFromTag (Lib;)V
 		ARG 1 tag
 	METHOD a addScoreboardTag (Ljava/lang/String;)Z
 	METHOD a setUuid (Ljava/util/UUID;)V
 	METHOD a onTrackedDataSet (Lqh;)V
+		ARG 1 data
 	METHOD a playSound (Lyi;FF)V
 		ARG 1 sound
 		ARG 2 volume
@@ -277,6 +280,7 @@ CLASS aia net/minecraft/entity/Entity
 	METHOD bT getPassengerList ()Ljava/util/List;
 	METHOD bU getPassengersDeep ()Ljava/util/Collection;
 	METHOD bW getTopmostRiddenEntity ()Laia;
+	METHOD bX isLogicalSideForUpdatingMovement ()Z
 	METHOD bY getRiddenEntity ()Laia;
 	METHOD bZ getSoundCategory ()Lyk;
 	METHOD ba isOnFire ()Z
@@ -305,6 +309,7 @@ CLASS aia net/minecraft/entity/Entity
 		ARG 5 z
 	METHOD c getVectorFromRotation (FF)Lcrl;
 		ARG 1 pitch
+		ARG 2 yaw
 	METHOD c canSeePlayer (Lavo;)Z
 	METHOD c squaredDistanceTo (Lcrl;)D
 	METHOD c setInPortal (Lev;)V
@@ -320,6 +325,8 @@ CLASS aia net/minecraft/entity/Entity
 		ARG 1 offsetX
 		ARG 3 offsetY
 		ARG 5 offsetZ
+	METHOD d playSwimSound (F)V
+		ARG 1 volume
 	METHOD d getEyeHeight (Lait;)F
 		ARG 1 pose
 	METHOD d setVelocity (Lcrl;)V
@@ -337,6 +344,7 @@ CLASS aia net/minecraft/entity/Entity
 		ARG 3 deltaY
 		ARG 5 deltaZ
 	METHOD f getRotationVec (F)Lcrl;
+		ARG 1 tickDelta
 	METHOD f setOnFireFor (I)V
 	METHOD f fromTag (Lib;)V
 	METHOD f setSprinting (Z)V
@@ -345,6 +353,7 @@ CLASS aia net/minecraft/entity/Entity
 		ARG 3 y
 		ARG 5 z
 	METHOD g getPitch (F)F
+		ARG 1 tickDelta
 	METHOD g burn (I)V
 	METHOD g distanceTo (Laia;)F
 	METHOD g setSwimming (Z)V
@@ -355,6 +364,7 @@ CLASS aia net/minecraft/entity/Entity
 		ARG 3 y
 		ARG 5 z
 	METHOD h getYaw (F)F
+		ARG 1 tickDelta
 	METHOD h getFlag (I)Z
 	METHOD h squaredDistanceTo (Laia;)D
 	METHOD h setGlowing (Z)V
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 30ebe9354e..d83b749bb7 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -186,6 +186,7 @@ CLASS aij net/minecraft/entity/LivingEntity
 	METHOD d setSleepingPosition (Lev;)V
 	METHOD da doPushLogic ()V
 	METHOD db isUsingRiptide ()Z
+	METHOD dc canMoveVoluntarily ()Z
 	METHOD dd getAbsorptionAmount ()F
 	METHOD df getMainHand ()Laii;
 	METHOD dg isUsingItem ()Z
diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping
index c97be3402b..23b9c3adba 100644
--- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping
+++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping
@@ -22,6 +22,7 @@ CLASS alr net/minecraft/entity/ai/control/LookControl
 		ARG 2 yawSpeed
 		ARG 3 pitchSpeed
 	METHOD b isActive ()Z
+	METHOD b getLookingHeightFor (Laia;)D
 	METHOD c getLookX ()D
 	METHOD d getLookY ()D
 	METHOD e getLookZ ()D
diff --git a/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping
index fd74ac6ca9..2467040ed3 100644
--- a/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping
@@ -12,4 +12,5 @@ CLASS alz net/minecraft/entity/ai/goal/AnimalMateGoal
 	METHOD <init> (Laqi;DLjava/lang/Class;)V
 		ARG 2 chance
 		ARG 4 entityClass
+	METHOD g breed ()V
 	METHOD h findMate ()Laqi;
diff --git a/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping
deleted file mode 100644
index a9ff7f981d..0000000000
--- a/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS aog net/minecraft/entity/ai/goal/AvoidGoal
-	FIELD a VALID_AVOIDABLES_PREDICATE Lapq;
-	FIELD i avoidedEntities [Ljava/lang/Class;
-	METHOD a setMobEntityTarget (Laik;Laij;)V
-	METHOD a setAvoidedEntities ([Ljava/lang/Class;)Laog;
diff --git a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping
index 1fb3bc87c2..c96ba16c82 100644
--- a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping
@@ -10,3 +10,4 @@ CLASS ang net/minecraft/entity/ai/goal/EscapeDangerGoal
 	METHOD a locateClosestWater (Lbgi;Laia;II)Lev;
 		ARG 3 rangeX
 		ARG 4 rangeY
+	METHOD g tryFindRandomTarget ()Z
diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping
index e586b50516..9ec0d544d4 100644
--- a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping
@@ -1,14 +1,28 @@
 CLASS ana net/minecraft/entity/ai/goal/MoveToTargetPosGoal
 	FIELD a owner Laiq;
 	FIELD b speed D
-	FIELD c counter I
+	FIELD c cooldown I
 	FIELD d tryingTime I
 	FIELD e targetPos Lev;
+	FIELD f lowestY I
 	FIELD g safeWaitingTime I
 	FIELD h reached Z
+	FIELD i range I
 	FIELD j maxYDifference I
+	METHOD <init> (Laiq;DI)V
+		ARG 1 owner
+		ARG 2 speed
+		ARG 4 range
+	METHOD <init> (Laiq;DII)V
+		ARG 1 owner
+		ARG 2 speed
+		ARG 4 range
+		ARG 5 maxYDifference
 	METHOD a getInterval (Laiq;)I
+		ARG 1 mob
 	METHOD a isTargetPos (Lbha;Lev;)Z
+		ARG 1 world
+		ARG 2 pos
 	METHOD g startMovingToTarget ()V
 	METHOD h getDesiredSquaredDistanceToTarget ()D
 	METHOD j shouldResetPath ()Z
diff --git a/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping b/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping
index 2d616b8899..3c43e32339 100644
--- a/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping
@@ -1 +1,4 @@
 CLASS aoj net/minecraft/entity/ai/goal/RaidGoal
+	FIELD i cooldown I
+	METHOD h getCooldown ()I
+	METHOD j decreaseCooldown ()V
diff --git a/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping b/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping
new file mode 100644
index 0000000000..b3d5d4570d
--- /dev/null
+++ b/mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping
@@ -0,0 +1,10 @@
+CLASS aog net/minecraft/entity/ai/goal/RevengeGoal
+	FIELD a VALID_AVOIDABLES_PREDICATE Lapq;
+	FIELD b groupRevenge Z
+	FIELD c lastAttackedTime I
+	FIELD d noRevengeTypes [Ljava/lang/Class;
+	FIELD i noHelpTypes [Ljava/lang/Class;
+	METHOD a setMobEntityTarget (Laik;Laij;)V
+	METHOD a setGroupRevenge ([Ljava/lang/Class;)Laog;
+		ARG 1 noHelpTypes
+	METHOD g callSameTypeForRevenge ()V
diff --git a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping
index 21bb7ea1a5..7acc07d58e 100644
--- a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping
@@ -2,6 +2,18 @@ CLASS anp net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal
 	FIELD g targetBlock Lbmb;
 	FIELD h owner Laik;
 	FIELD i counter I
+	METHOD <init> (Lbmb;Laiq;DI)V
+		ARG 1 targetBlock
+		ARG 2 owner
+		ARG 3 speed
+		ARG 5 maxYDifference
 	METHOD a onDestroyBlock (Lbgx;Lev;)V
+		ARG 1 world
+		ARG 2 pos
 	METHOD a tickStepping (Lbgy;Lev;)V
+		ARG 1 world
+		ARG 2 pos
 	METHOD a tweakToProperPos (Lev;Lbgi;)Lev;
+		ARG 1 pos
+		ARG 2 view
+	METHOD m hasAvailableTarget ()Z
diff --git a/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping
index be2ad8f30f..da0c5f4d90 100644
--- a/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping
@@ -5,6 +5,7 @@ CLASS ank net/minecraft/entity/ai/goal/WanderAroundGoal
 	FIELD d targetZ D
 	FIELD e speed D
 	FIELD f chance I
+	FIELD g ignoringChance Z
 	METHOD <init> (Laiq;D)V
 		ARG 1 owner
 		ARG 2 speed
@@ -15,3 +16,4 @@ CLASS ank net/minecraft/entity/ai/goal/WanderAroundGoal
 	METHOD a setChance (I)V
 		ARG 1 chance
 	METHOD g getWanderTarget ()Lcrl;
+	METHOD h ignoreChanceOnce ()V
diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping
index 5a0772eb55..ff73d89040 100644
--- a/mappings/net/minecraft/entity/data/DataTracker.mapping
+++ b/mappings/net/minecraft/entity/data/DataTracker.mapping
@@ -1,29 +1,48 @@
 CLASS qk net/minecraft/entity/data/DataTracker
 	CLASS qk$a Entry
+		FIELD a data Lqh;
 		FIELD b value Ljava/lang/Object;
 		FIELD c dirty Z
+		METHOD <init> (Lqh;Ljava/lang/Object;)V
+			ARG 1 data
+			ARG 2 value
+		METHOD a getData ()Lqh;
 		METHOD a set (Ljava/lang/Object;)V
+			ARG 1 value
 		METHOD a setDirty (Z)V
+			ARG 1 dirty
 		METHOD b get ()Ljava/lang/Object;
 		METHOD c isDirty ()Z
+		METHOD d copy ()Lqk$a;
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b trackedEntities Ljava/util/Map;
 	FIELD c trackedEntity Laia;
 	FIELD d entries Ljava/util/Map;
 	FIELD e lock Ljava/util/concurrent/locks/ReadWriteLock;
+	FIELD f empty Z
 	FIELD g dirty Z
 	METHOD a isDirty ()Z
 	METHOD a registerData (Ljava/lang/Class;Lqi;)Lqh;
 		ARG 0 entityClass
 		ARG 1 dataHandler
-	METHOD a serializePacket (Ljava/util/List;Ljc;)V
-	METHOD a serializePacket (Ljc;)V
+	METHOD a writeUpdatedEntries (Ljava/util/List;)V
+	METHOD a entriesToPacket (Ljava/util/List;Ljc;)V
+	METHOD a toPacketByteBuf (Ljc;)V
+	METHOD a entryFromPacket (Ljc;ILqi;)Lqk$a;
+	METHOD a writeEntryToPacket (Ljc;Lqk$a;)V
 	METHOD a get (Lqh;)Ljava/lang/Object;
 	METHOD a startTracking (Lqh;Ljava/lang/Object;)V
 		ARG 1 key
+		ARG 2 initialValue
+	METHOD a copyToFrom (Lqk$a;Lqk$a;)V
+		ARG 1 destination
+		ARG 2 origin
 	METHOD b getDirtyEntries ()Ljava/util/List;
 	METHOD b deserializePacket (Ljc;)Ljava/util/List;
+	METHOD b getEntry (Lqh;)Lqk$a;
 	METHOD b set (Lqh;Ljava/lang/Object;)V
 		ARG 1 key
 	METHOD c getAllEntries ()Ljava/util/List;
+	METHOD c addTrackedData (Lqh;Ljava/lang/Object;)V
+	METHOD d isEmpty ()Z
 	METHOD e clearDirty ()V
diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
index 0de1b4360d..e203726f12 100644
--- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
+++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
@@ -1,5 +1,6 @@
 CLASS ast net/minecraft/entity/decoration/ArmorStandEntity
 	FIELD bA DEFAULT_RIGHT_LEG_ROTATION Lfn;
+	FIELD bB RIDEABLE_MINECART_PREDICATE Ljava/util/function/Predicate;
 	FIELD bC heldItems Lfj;
 	FIELD bD armorItems Lfj;
 	FIELD bF disabledSlots I
@@ -21,6 +22,7 @@ CLASS ast net/minecraft/entity/decoration/ArmorStandEntity
 	FIELD e TRACKER_LEFT_ARM_ROTATION Lqh;
 	FIELD f TRACKER_RIGHT_ARM_ROTATION Lqh;
 	FIELD g TRACKER_LEFT_LEG_ROTATION Lqh;
+	METHOD A canClip ()Z
 	METHOD B serializePose ()Lib;
 	METHOD a setBitField (BIZ)B
 		ARG 1 value
diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
index d91ac15682..fb19254ad7 100644
--- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
@@ -14,6 +14,7 @@ CLASS atw net/minecraft/entity/mob/GuardianEntity
 	FIELD bA spikesExtensionRate F
 	FIELD bB tailAngle F
 	FIELD bC prevTailAngle F
+	FIELD bD wanderGoal Lank;
 	FIELD bE BEAM_TARGET_ID Lqh;
 	FIELD bF cachedBeamTarget Laij;
 	FIELD bG beamTicks I
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index cbf4fda812..6ba407ef03 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -36,7 +36,6 @@ CLASS aik net/minecraft/entity/mob/MobEntity
 	METHOD J sendAiDebugData ()V
 	METHOD K mobTick ()V
 	METHOD L getLookPitchSpeed ()I
-	METHOD M getLookYawSpeed ()I
 	METHOD a changeAngle (FFF)F
 		ARG 1 oldAngle
 		ARG 2 newAngle
@@ -54,6 +53,7 @@ CLASS aik net/minecraft/entity/mob/MobEntity
 	METHOD a loot (Latf;)V
 		ARG 1 item
 	METHOD a canBeLeashedBy (Lavo;)Z
+		ARG 1 player
 	METHOD a interactMob (Lavo;Lagu;)Z
 		ARG 1 player
 		ARG 2 hand
@@ -82,11 +82,13 @@ CLASS aik net/minecraft/entity/mob/MobEntity
 		ARG 0 slot
 		ARG 1 item
 	METHOD b createNavigation (Lbgx;)Laoy;
+		ARG 1 world
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
 	METHOD c spawnsTooManyForEachTry (I)Z
 		ARG 1 count
 	METHOD d getDropChance (Laif;)F
+	METHOD dA canBeControlledByRider ()Z
 	METHOD dB setPersistent ()V
 	METHOD dC canPickUpLoot ()Z
 	METHOD dD isPersistent ()Z
@@ -102,6 +104,7 @@ CLASS aik net/minecraft/entity/mob/MobEntity
 	METHOD dO isAttacking ()Z
 	METHOD dP isInDaylight ()Z
 	METHOD dQ deserializeLeashTag ()V
+	METHOD dy getLookYawSpeed ()I
 	METHOD dz getLimitPerChunk ()I
 	METHOD e (FF)F
 		ARG 1 yaw
@@ -130,3 +133,4 @@ CLASS aik net/minecraft/entity/mob/MobEntity
 	METHOD u getNavigation ()Laoy;
 	METHOD v getVisibilityCache ()Lapk;
 	METHOD w getTarget ()Laij;
+	METHOD z onEatingGrass ()V
diff --git a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping
index 45385c7ed7..f5405ae94f 100644
--- a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping
@@ -2,6 +2,8 @@ CLASS aiq net/minecraft/entity/mob/MobEntityWithAi
 	METHOD <init> (Laie;Lbgx;)V
 		ARG 1 type
 	METHOD a getPathfindingFavor (Lev;Lbha;)F
+		ARG 1 pos
+		ARG 2 world
 	METHOD dQ isNavigating ()Z
 	METHOD dR getRunFromLeashSpeed ()D
 	METHOD f getPathfindingFavor (Lev;)F
diff --git a/mappings/net/minecraft/entity/mob/WitchEntity.mapping b/mappings/net/minecraft/entity/mob/WitchEntity.mapping
index 9c6c0b48f6..8ed6b0f094 100644
--- a/mappings/net/minecraft/entity/mob/WitchEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/WitchEntity.mapping
@@ -1,4 +1,10 @@
 CLASS aur net/minecraft/entity/mob/WitchEntity
+	FIELD bA DRINKING_SPEED_PENALTY_MODIFIER Lajb;
 	FIELD bB DRINKING Lqh;
+	FIELD bC drinkTimeLeft I
+	FIELD bD raidGoal Laoj;
+	FIELD bE attackPlayerGoal Laoi;
+	FIELD b DRINKING_SPEED_PENALTY_MODIFIER_ID Ljava/util/UUID;
 	METHOD l isDrinking ()Z
 	METHOD s setDrinking (Z)V
+		ARG 1 drinking
diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping
index e3b2474fbb..36e21ba492 100644
--- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping
@@ -16,5 +16,6 @@ CLASS aqi net/minecraft/entity/passive/AnimalEntity
 	METHOD f lovePlayer (Lavo;)V
 		ARG 1 player
 	METHOD i isBreedingItem (Lbbr;)Z
+		ARG 1 stack
 	METHOD q setLoveTicks (I)V
 		ARG 1 loveTicks
diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping
index 2df0cd3688..3a04386d87 100644
--- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping
@@ -2,12 +2,20 @@ CLASS ahy net/minecraft/entity/passive/PassiveEntity
 	FIELD bA CHILD Lqh;
 	FIELD b breedingAge I
 	FIELD c forcedAge I
+	FIELD d happyTicksRemaining I
 	METHOD <init> (Laie;Lbgx;)V
 		ARG 1 type
+	METHOD a growUp (I)V
+		ARG 1 age
+	METHOD a growUp (IZ)V
+		ARG 1 age
+		ARG 2 overGrow
 	METHOD a createChild (Lahy;)Lahy;
 		ARG 1 mate
 	METHOD a onPlayerSpawnedChild (Lavo;Lahy;)V
 		ARG 1 player
 		ARG 2 child
 	METHOD b_ setBreedingAge (I)V
+		ARG 1 age
 	METHOD i getBreedingAge ()I
+	METHOD l onGrowUp ()V
diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping
index b7d9a19fd6..d98ea1d660 100644
--- a/mappings/net/minecraft/entity/passive/PigEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping
@@ -3,3 +3,4 @@ CLASS aqv net/minecraft/entity/passive/PigEntity
 	FIELD bC BREEDING_INGREDIENT Lbdw;
 	METHOD dS isSaddled ()Z
 	METHOD r setSaddled (Z)V
+		ARG 1 saddled
diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping
index d92260acf9..0e65f4e0fd 100644
--- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping
@@ -1 +1,12 @@
 CLASS ard net/minecraft/entity/passive/SquidEntity
+	CLASS ard$a EscapeAttackerGoal
+		FIELD b timer I
+	CLASS ard$b SwimInOneDirectionGoal
+		FIELD b owner Lard;
+	FIELD bF constantVelocityRate F
+	FIELD bI constantVelocityX F
+	FIELD bJ constantVelocityY F
+	FIELD bK constantVelocityZ F
+	METHOD a setConstantVelocity (FFF)V
+	METHOD dS squirt ()V
+	METHOD l hasConstantVelocity ()Z
diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
index cbb80b1754..f87634da8c 100644
--- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
@@ -2,6 +2,7 @@ CLASS are net/minecraft/entity/passive/TropicalFishEntity
 	CLASS are$a Variety
 		FIELD m shape I
 		FIELD n pattern I
+		FIELD o VALUES [Lare$a;
 		METHOD <init> (Ljava/lang/String;III)V
 			ARG 3 shape
 			ARG 4 pattern
diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
index 30ea456e24..52be2191d6 100644
--- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
@@ -1,20 +1,85 @@
 CLASS arf net/minecraft/entity/passive/TurtleEntity
-	CLASS arf$a TurtleMateGoal
-		FIELD d turtleEntity Larf;
+	CLASS arf$a MateGoal
+		FIELD d turtle Larf;
+		METHOD <init> (Larf;D)V
+			ARG 1 owner
+			ARG 2 speed
+	CLASS arf$b GoHomeGoal
+		FIELD a owner Larf;
+		FIELD b speed D
+		FIELD c noPath Z
+		FIELD d homeReachingTryTicks I
+		METHOD <init> (Larf;D)V
+			ARG 1 owner
+			ARG 2 speed
+	CLASS arf$c WanderInWaterGoal
+		FIELD g turtle Larf;
+		METHOD <init> (Larf;D)V
+			ARG 1 turtle
+			ARG 2 speed
+	CLASS arf$d LayEggGoal
+		FIELD g turtle Larf;
+		METHOD <init> (Larf;D)V
+			ARG 1 turtle
+			ARG 2 speed
 	CLASS arf$e TurtleMoveControl
 		FIELD i turtle Larf;
+		METHOD <init> (Larf;)V
+			ARG 1 owner
+		METHOD g updateVelocity ()V
+	CLASS arf$f TurtleEscapeDangerGoal
+		METHOD <init> (Larf;D)V
+			ARG 1 owner
+			ARG 2 speed
 	CLASS arf$g TurtleSwimNavigation
-	CLASS arf$i
-		FIELD a CLOSE_PLAYER_PREDICATE Lapq;
-		FIELD b turtleEntity Larf;
+		METHOD <init> (Larf;Lbgx;)V
+			ARG 1 owner
+			ARG 2 world
+	CLASS arf$h WanderOnLandGoal
+		FIELD h turtle Larf;
+	CLASS arf$i ApproachFoodHoldingPlayerGoal
+		FIELD a CLOSE_ENTITY_PREDICATE Lapq;
+		FIELD b owner Larf;
+		FIELD c speed D
 		FIELD d targetPlayer Lavo;
+		FIELD e cooldown I
+		FIELD f attractiveItems Ljava/util/Set;
+		METHOD <init> (Larf;DLbbm;)V
+			ARG 1 owner
+			ARG 2 speed
+			ARG 4 attractiveItem
+		METHOD a isAttractive (Lbbr;)Z
+			ARG 1 stack
+	CLASS arf$j TravelGoal
+		FIELD a owner Larf;
+		FIELD b speed D
+		FIELD c noPath Z
+		METHOD <init> (Larf;D)V
+			ARG 1 turtle
+			ARG 2 speed
 	FIELD bA BABY_TURTLE_ON_LAND_FILTER Ljava/util/function/Predicate;
 	FIELD bB HOME_POS Lqh;
 	FIELD bC HAS_EGG Lqh;
+	FIELD bE DIGGING_SAND Lqh;
 	FIELD bF TRAVEL_POS Lqh;
-	METHOD dS getHasEgg ()Z
+	FIELD bG LAND_BOUND Lqh;
+	FIELD bH ACTIVELY_TRAVELLING Lqh;
+	FIELD bI sandDiggingCounter I
+	METHOD dS hasEgg ()Z
+	METHOD dT isDiggingSand ()Z
 	METHOD dU getHomePos ()Lev;
 	METHOD dV getTravelPos ()Lev;
+	METHOD dW isLandBound ()Z
+	METHOD eb isActivelyTravelling ()Z
 	METHOD g setHomePos (Lev;)V
+		ARG 1 pos
 	METHOD h setTravelPos (Lev;)V
+		ARG 1 pos
 	METHOD r setHasEgg (Z)V
+		ARG 1 hasEgg
+	METHOD s setDiggingSand (Z)V
+		ARG 1 diggingSand
+	METHOD t setLandBound (Z)V
+		ARG 1 landBound
+	METHOD u setActivelyTravelling (Z)V
+		ARG 1 travelling
diff --git a/mappings/net/minecraft/entity/raid/Raid.mapping b/mappings/net/minecraft/entity/raid/Raid.mapping
index 6404ba09b9..5b41de1ec8 100644
--- a/mappings/net/minecraft/entity/raid/Raid.mapping
+++ b/mappings/net/minecraft/entity/raid/Raid.mapping
@@ -37,6 +37,7 @@ CLASS aws net/minecraft/entity/raid/Raid
 	FIELD w waveCount I
 	FIELD x status Laws$a;
 	FIELD y finishCooldown I
+	FIELD z preCalculatedRavagerSpawnLocation Ljava/util/Optional;
 	METHOD <init> (ILvf;Lev;)V
 		ARG 1 id
 	METHOD A hasSpawnedFinalWave ()Z
@@ -48,7 +49,9 @@ CLASS aws net/minecraft/entity/raid/Raid
 	METHOD G markDirty ()V
 	METHOD H getIllagerBanner ()Lbbr;
 	METHOD a isFinished ()Z
-	METHOD a getPillagerSpawnLocation (II)Lev;
+	METHOD a getRavagerSpawnLocation (II)Lev;
+		ARG 1 proximity
+		ARG 2 tries
 	METHOD a setRaidLeader (ILawt;)V
 		ARG 1 wave
 	METHOD a addRaider (ILawt;Lev;Z)V
@@ -62,6 +65,7 @@ CLASS aws net/minecraft/entity/raid/Raid
 	METHOD a getMaxWaves (Lags;)I
 	METHOD a addHero (Laia;)V
 	METHOD a start (Lavo;)V
+		ARG 1 player
 	METHOD a getCount (Laws$b;IZ)I
 		ARG 2 wave
 		ARG 3 extra
@@ -74,6 +78,7 @@ CLASS aws net/minecraft/entity/raid/Raid
 	METHOD a toTag (Lib;)Lib;
 	METHOD b isPreRaid ()Z
 	METHOD b getLeader (I)Lawt;
+		ARG 1 wave
 	METHOD b addToWave (ILawt;)Z
 		ARG 1 wave
 	METHOD b spawnNextWave (Lev;)V
@@ -81,6 +86,8 @@ CLASS aws net/minecraft/entity/raid/Raid
 	METHOD c removeLeader (I)V
 		ARG 1 wave
 	METHOD d hasStopped ()Z
+	METHOD d preCalculateRavagerSpawnLocation (I)Ljava/util/Optional;
+		ARG 1 proximity
 	METHOD e hasWon ()Z
 	METHOD f hasLost ()Z
 	METHOD i getWorld ()Lbgx;
diff --git a/mappings/net/minecraft/entity/raid/RaidManager.mapping b/mappings/net/minecraft/entity/raid/RaidManager.mapping
index ae6a6672f5..5ac1c09226 100644
--- a/mappings/net/minecraft/entity/raid/RaidManager.mapping
+++ b/mappings/net/minecraft/entity/raid/RaidManager.mapping
@@ -5,6 +5,7 @@ CLASS awu net/minecraft/entity/raid/RaidManager
 	FIELD d currentTime I
 	METHOD a tick ()V
 	METHOD a getRaid (I)Laws;
+		ARG 1 id
 	METHOD a isLivingAroundVillage (Laij;Lev;I)Z
 	METHOD a isValidRaiderFor (Lawt;Laws;)Z
 	METHOD a nameFor (Lbxs;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
index 1eef73633f..79c19c2ad9 100644
--- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
+++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
@@ -43,4 +43,5 @@ CLASS awt net/minecraft/entity/raid/RaiderEntity
 	METHOD ek isCelebrating ()Z
 	METHOD el getOutOfRaidCounter ()I
 	METHOD t setAbleToJoinRaid (Z)V
+		ARG 1 ableToJoinRaid
 	METHOD u setCelebrating (Z)V
diff --git a/mappings/net/minecraft/item/SpawnEggItem.mapping b/mappings/net/minecraft/item/SpawnEggItem.mapping
index b5390c973d..3c2d71219a 100644
--- a/mappings/net/minecraft/item/SpawnEggItem.mapping
+++ b/mappings/net/minecraft/item/SpawnEggItem.mapping
@@ -12,7 +12,7 @@ CLASS bcp net/minecraft/item/SpawnEggItem
 		ARG 1 num
 	METHOD a forEntity (Laie;)Lbcp;
 		ARG 0 type
-	METHOD a (Lib;Laie;)Z
+	METHOD a isOfSameEntityType (Lib;Laie;)Z
 		ARG 1 tag
 		ARG 2 type
 	METHOD b entityTypeFromTag (Lib;)Laie;
diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
index 8bf076fa73..55daed145a 100644
--- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
@@ -121,6 +121,8 @@ CLASS kd net/minecraft/network/listener/ClientPlayPacketListener
 		ARG 1 packet
 	METHOD a onHeldItemChange (Lmm;)V
 		ARG 1 packet
+	METHOD a handleChunkRenderDistanceCenter (Lmn;)V
+		ARG 1 packet
 	METHOD a handleChunkLoadDistance (Lmo;)V
 		ARG 1 packet
 	METHOD a onScoreboardDisplay (Lmp;)V
diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping
index 82c0b3191f..28dc0f07bb 100644
--- a/mappings/net/minecraft/server/world/ChunkHolder.mapping
+++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping
@@ -58,7 +58,7 @@ CLASS ur net/minecraft/server/world/ChunkHolder
 		ARG 1 type
 		ARG 2 y
 	METHOD a getFuture (Lbws;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 status
+		ARG 1 leastStatus
 	METHOD a createFuture (Lbws;Lus;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 targetStatus
 		ARG 2 chunkStorage
@@ -74,7 +74,7 @@ CLASS ur net/minecraft/server/world/ChunkHolder
 	METHOD b getTargetGenerationStatus (I)Lbws;
 		ARG 0 level
 	METHOD b getFutureChecked (Lbws;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 status
+		ARG 1 leastStatus
 	METHOD c getWorldChunk ()Lbwz;
 	METHOD c getLevelType (I)Lur$b;
 		ARG 0 distance
diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping
index 41730b7e6c..fc85d9785b 100644
--- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping
+++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping
@@ -35,7 +35,7 @@ CLASS vd net/minecraft/server/world/ServerChunkManager
 	METHOD b getChunkFutureSyncOnMainThread (IILbws;Z)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 chunkX
 		ARG 2 chunkZ
-		ARG 3 status
+		ARG 3 leastStatus
 		ARG 4 create
 	METHOD b unloadEntity (Laia;)V
 	METHOD b sendToOtherNearbyPlayers (Laia;Lka;)V
@@ -46,7 +46,7 @@ CLASS vd net/minecraft/server/world/ServerChunkManager
 	METHOD c getChunkFuture (IILbws;Z)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 chunkX
 		ARG 2 chunkZ
-		ARG 3 status
+		ARG 3 leastStatus
 		ARG 4 create
 	METHOD c loadEntity (Laia;)V
 	METHOD d executeQueuedTasks ()Z
diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping
index ce512ceffb..726485b74e 100644
--- a/mappings/net/minecraft/server/world/ServerWorld.mapping
+++ b/mappings/net/minecraft/server/world/ServerWorld.mapping
@@ -35,6 +35,7 @@ CLASS vf net/minecraft/server/world/ServerWorld
 		ARG 2 z
 		ARG 3 create
 	METHOD a tickEntity (Laia;)V
+	METHOD a getEntities (Laie;Ljava/util/function/Predicate;)Ljava/util/List;
 	METHOD a handleInteraction (Lapu;Laia;Laiu;)V
 		ARG 1 interaction
 		ARG 3 observer
@@ -52,6 +53,16 @@ CLASS vf net/minecraft/server/world/ServerWorld
 		ARG 2 maxDistance
 	METHOD a getOccupiedPointOfInterestDistance (Lfo;)I
 		ARG 1 pos
+	METHOD a spawnParticles (Lgd;DDDIDDDD)I
+		ARG 1 particle
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 count
+		ARG 9 deltaX
+		ARG 11 deltaY
+		ARG 13 deltaZ
+		ARG 15 speed
 	METHOD a getEntity (Ljava/util/UUID;)Laia;
 	METHOD a tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD a getPlayers (Ljava/util/function/Predicate;)Ljava/util/List;
diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping
index aa7fd3e7f0..ea9e5eb74e 100644
--- a/mappings/net/minecraft/util/Identifier.mapping
+++ b/mappings/net/minecraft/util/Identifier.mapping
@@ -1,5 +1,5 @@
 CLASS qs net/minecraft/util/Identifier
-	CLASS qs$a DeSerializer
+	CLASS qs$a Serializer
 	FIELD a namespace Ljava/lang/String;
 	FIELD b path Ljava/lang/String;
 	FIELD c EXCEPTION_INVALID Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
@@ -13,6 +13,9 @@ CLASS qs net/minecraft/util/Identifier
 		ARG 0 str
 		ARG 1 chr
 	METHOD b getNamespace ()Ljava/lang/String;
+	METHOD b isValidIdentifier (Ljava/lang/String;)Z
 	METHOD b split (Ljava/lang/String;C)[Ljava/lang/String;
+	METHOD c isValidPath (Ljava/lang/String;)Z
+	METHOD d isValidNamespace (Ljava/lang/String;)Z
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping
index a4df63cf05..0ae36f5179 100644
--- a/mappings/net/minecraft/util/math/MathHelper.mapping
+++ b/mappings/net/minecraft/util/math/MathHelper.mapping
@@ -1,24 +1,25 @@
 CLASS zr net/minecraft/util/math/MathHelper
 	FIELD a SQUARE_ROOT_OF_TWO F
-	FIELD b sinTable [F
+	FIELD b SINE_TABLE [F
 	FIELD c RANDOM Ljava/util/Random;
 	FIELD d MULTIPLY_DE_BRUJIN_BIT_POSITION [I
 	FIELD e SMALLEST_FRACTION_FREE_DOUBLE D
-	FIELD f asinTable [D
-	FIELD g cosTable [D
+	FIELD f ARCSINE_TABLE [D
+	FIELD g COSINE_TABLE [D
 	METHOD a randomUUID ()Ljava/util/UUID;
 	METHOD a sqrt (D)F
 	METHOD a absMax (DD)D
 	METHOD a clamp (DDD)D
 		ARG 0 value
 		ARG 2 min
+		ARG 4 max
 	METHOD a lerp2 (DDDDDD)D
-		ARG 0 partialX
-		ARG 2 partialY
+		ARG 0 deltaX
+		ARG 2 deltaY
 	METHOD a lerp3 (DDDDDDDDDDD)D
-		ARG 0 partialX
-		ARG 2 partialY
-		ARG 4 partialZ
+		ARG 0 deltaX
+		ARG 2 deltaY
+		ARG 4 deltaZ
 	METHOD a sin (F)F
 	METHOD a equalsApproximate (FF)Z
 	METHOD a clamp (FFF)F
@@ -55,6 +56,7 @@ CLASS zr net/minecraft/util/math/MathHelper
 	METHOD a nextDouble (Ljava/util/Random;DD)D
 		ARG 0 random
 		ARG 1 min
+		ARG 3 max
 	METHOD a nextFloat (Ljava/util/Random;FF)F
 		ARG 0 random
 		ARG 1 min
@@ -67,11 +69,16 @@ CLASS zr net/minecraft/util/math/MathHelper
 		ARG 0 array
 	METHOD b fastFloor (D)I
 	METHOD b floorMod (DD)D
-	METHOD b lerpClamped (DDD)D
+	METHOD b clampedLerp (DDD)D
 		ARG 0 first
 		ARG 2 second
+		ARG 4 delta
 	METHOD b cos (F)F
 	METHOD b floorMod (FF)F
+	METHOD b (FFF)F
+		ARG 0 start
+		ARG 1 end
+		ARG 2 speed
 	METHOD b wrapDegrees (I)I
 	METHOD b floorMod (II)I
 	METHOD b packRgb (III)I
@@ -80,8 +87,14 @@ CLASS zr net/minecraft/util/math/MathHelper
 		ARG 2 b
 	METHOD c floor (D)I
 	METHOD c atan2 (DD)D
+	METHOD c minusDiv (DDD)D
+		ARG 0 numerator
+		ARG 2 delta
+		ARG 4 denominator
 	METHOD c sqrt (F)F
 	METHOD c subtractAngles (FF)F
+		ARG 0 start
+		ARG 1 end
 	METHOD c smallestEncompassingPowerOfTwo (I)I
 		ARG 0 value
 	METHOD c roundUp (II)I
@@ -91,11 +104,13 @@ CLASS zr net/minecraft/util/math/MathHelper
 		ARG 2 z
 	METHOD d lfloor (D)J
 	METHOD d lerp (DDD)D
-		ARG 0 partial
+		ARG 0 delta
 		ARG 2 first
 		ARG 4 second
 	METHOD d floor (F)I
 	METHOD d angleBetween (FF)F
+		ARG 0 first
+		ARG 1 second
 	METHOD d log2DeBrujin (I)I
 	METHOD d multiplyColors (II)I
 		ARG 0 first
@@ -116,7 +131,7 @@ CLASS zr net/minecraft/util/math/MathHelper
 	METHOD g wrapDegrees (D)D
 	METHOD g wrapDegrees (F)F
 	METHOD g lerp (FFF)F
-		ARG 0 partial
+		ARG 0 delta
 		ARG 1 first
 		ARG 2 second
 	METHOD g isPowerOfTwo (I)Z
@@ -125,4 +140,4 @@ CLASS zr net/minecraft/util/math/MathHelper
 	METHOD i fastInverseSqrt (D)D
 		ARG 0 value
 	METHOD j ease (D)D
-	METHOD k sgn (D)I
+	METHOD k sign (D)I
diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping
index 100371caa9..628542dd24 100644
--- a/mappings/net/minecraft/world/ViewableWorld.mapping
+++ b/mappings/net/minecraft/world/ViewableWorld.mapping
@@ -1,5 +1,6 @@
 CLASS bha net/minecraft/world/ViewableWorld
 	METHOD A isBlockLoaded (Lev;)Z
+	METHOD O getLeastChunkStatusForCollisionCalculation ()Lbws;
 	METHOD a getChunk (II)Lbwn;
 		ARG 1 chunkX
 		ARG 2 chunkZ
@@ -15,7 +16,7 @@ CLASS bha net/minecraft/world/ViewableWorld
 	METHOD a getChunk (IILbws;Z)Lbwn;
 		ARG 1 chunkX
 		ARG 2 chunkZ
-		ARG 3 status
+		ARG 3 leastStatus
 		ARG 4 create
 	METHOD a doesNotCollide (Laia;Lcrg;Ljava/util/Set;)Z
 		ARG 1 entity
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index 3e65a240dd..bcd4d1f669 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -85,6 +85,10 @@ CLASS bgx net/minecraft/world/World
 		ARG 3 x
 		ARG 5 y
 		ARG 7 z
+	METHOD a getEntities (Laie;Lcrg;Ljava/util/function/Predicate;)Ljava/util/List;
+		ARG 1 type
+		ARG 2 box
+		ARG 3 predicate
 	METHOD a playSound (Lavo;DDDLyi;Lyk;FF)V
 		ARG 1 player
 		ARG 2 x
diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping
index fd7d6750d7..0960a794d9 100644
--- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping
+++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping
@@ -5,7 +5,7 @@ CLASS bwr net/minecraft/world/chunk/ChunkManager
 	METHOD a getChunk (IILbws;Z)Lbwn;
 		ARG 1 x
 		ARG 2 z
-		ARG 3 status
+		ARG 3 leastStatus
 		ARG 4 create
 	METHOD a getWorldChunk (IIZ)Lbwz;
 	METHOD a shouldTickEntity (Laia;)Z
diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping
index 79c9e103be..7e10f69a28 100644
--- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping
+++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping
@@ -26,6 +26,8 @@ CLASS bws net/minecraft/world/chunk/ChunkStatus
 	FIELD k SPAWN Lbws;
 	FIELD l HEIGHTMAPS Lbws;
 	FIELD m FULL Lbws;
+	FIELD n PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet;
+	FIELD o POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet;
 	FIELD p DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List;
 	FIELD q STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList;
 	FIELD r name Ljava/lang/String;
@@ -38,6 +40,9 @@ CLASS bws net/minecraft/world/chunk/ChunkStatus
 	METHOD <init> (Ljava/lang/String;Lbws;ILjava/util/EnumSet;Lbws$b;Lbws$a;)V
 		ARG 1 name
 		ARG 2 previous
+		ARG 3 taskMargin
+		ARG 4 surfaceGenerated
+		ARG 5 type
 		ARG 6 task
 	METHOD a createOrderedList ()Ljava/util/List;
 	METHOD a getTargetGenerationStatus (I)Lbws;
diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping
index 2f7596d72f..d4ceb5c4e5 100644
--- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping
+++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping
@@ -35,6 +35,11 @@ CLASS bwz net/minecraft/world/chunk/WorldChunk
 		ARG 1 except
 		ARG 2 box
 		ARG 3 entityList
+	METHOD a appendEntities (Laie;Lcrg;Ljava/util/List;Ljava/util/function/Predicate;)V
+		ARG 1 type
+		ARG 2 box
+		ARG 3 list
+		ARG 4 predicate
 	METHOD a addBlockEntity (Lbtc;)V
 	METHOD a getLightLevel (Lev;I)I
 	METHOD a getBlockEntity (Lev;Lbwz$a;)Lbtc;