diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 23700967b3..6a7691b35a 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -3,7 +3,8 @@ CLASS ahc net/minecraft/entity/Entity
 	FIELD B verticalCollision Z
 	FIELD C collided Z
 	FIELD D velocityModified Z
-	FIELD E movementMultiplierSet Z
+	FIELD E applyMovementMultiplier Z
+	FIELD F movementMultiplier Lcmr;
 	FIELD G invalid Z
 	FIELD K fallDistance F
 	FIELD L prevRenderX D
@@ -25,6 +26,8 @@ CLASS ahc net/minecraft/entity/Entity
 	FIELD aH NO_GRAVITY Lps;
 	FIELD aI invulnerable Z
 	FIELD aJ scoreboardTags Ljava/util/Set;
+	FIELD aL pistonMovementDelta [D
+	FIELD aM pistonMovementTick J
 	FIELD aa ENTITY_FLAGS Lps;
 	FIELD ac chunkX I
 	FIELD ad chunkY I
@@ -52,6 +55,7 @@ CLASS ahc net/minecraft/entity/Entity
 	FIELD g type Lahg;
 	FIELD h LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD j ridingCooldown I
+	FIELD k teleporting Z
 	FIELD l world Lbcl;
 	FIELD m prevX D
 	FIELD n prevY D
@@ -130,6 +134,7 @@ CLASS ahc net/minecraft/entity/Entity
 	METHOD a onBlockCollision (Lbqk;)V
 	METHOD a slowMovement (Lbqk;Lcmr;)V
 		ARG 1 state
+		ARG 2 multipliers
 	METHOD a changeDimension (Lbtd;)Lahc;
 	METHOD a populateCrashReport (Lc;)V
 	METHOD a lookAt (Lch$a;Lcmr;)V
@@ -179,6 +184,8 @@ CLASS ahc net/minecraft/entity/Entity
 	METHOD ab setOnFireFromLava ()V
 	METHOD ac extinguish ()V
 	METHOD ad destroy ()V
+	METHOD af moveToBoundingBoxCenter ()V
+		ARG 1 boundingBox
 	METHOD ag getSoundSwim ()Lxr;
 	METHOD ah getSoundSplash ()Lxr;
 	METHOD aj checkBlockCollision ()V
diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
index d9615f41af..ac95ee72b9 100644
--- a/mappings/net/minecraft/entity/EntityType.mapping
+++ b/mappings/net/minecraft/entity/EntityType.mapping
@@ -4,7 +4,12 @@ CLASS ahg net/minecraft/entity/EntityType
 		FIELD b function Ljava/util/function/Function;
 		FIELD c saveable Z
 		FIELD d summonable Z
+		FIELD e width F
+		FIELD f height F
 		METHOD a disableSummon ()Lahg$a;
+		METHOD a setSize (FF)Lahg$a;
+			ARG 1 width
+			ARG 2 height
 		METHOD a create (Ljava/lang/Class;)Lahg$a;
 		METHOD a create (Ljava/lang/Class;Ljava/util/function/Function;)Lahg$a;
 		METHOD a build (Ljava/lang/String;)Lahg;
@@ -93,6 +98,8 @@ CLASS ahg net/minecraft/entity/EntityType
 	FIELD bb textComponent Ljc;
 	FIELD bc lootTableId Lqd;
 	FIELD bd dataFixerType Lcom/mojang/datafixers/types/Type;
+	FIELD be width F
+	FIELD bf height F
 	FIELD c ARROW Lahg;
 	FIELD d BAT Lahg;
 	FIELD e BLAZE Lahg;
@@ -124,7 +131,11 @@ CLASS ahg net/minecraft/entity/EntityType
 		ARG 4 summonable
 		ARG 5 dataFixerType
 	METHOD a isSaveable ()Z
+	METHOD a createSimpleBoundingBox (DDD)Lcmm;
 	METHOD a createInstanceFromId (ILbcl;)Lahc;
+	METHOD a spawnEntityWithPassengers (Lahc;Lbcm;)V
+		ARG 0 entity
+		ARG 1 world
 	METHOD a getId (Lahg;)Lqd;
 	METHOD a create (Lbcl;)Lahc;
 	METHOD a newInstance (Lbcl;Lahg;)Lahc;
@@ -133,12 +144,38 @@ CLASS ahg net/minecraft/entity/EntityType
 	METHOD a loadFromEntityTag (Lbcl;Larj;Lahc;Lhr;)V
 	METHOD a spawnFromItemStack (Lbcl;Laxd;Larj;Let;Laho;ZZ)Lahc;
 	METHOD a spawn (Lbcl;Lhr;Ljc;Larj;Let;Laho;ZZ)Lahc;
-	METHOD a fromTag (Lhr;Lbcl;)Ljava/util/Optional;
+	METHOD a fromTag (Lhr;)Ljava/util/Optional;
+		ARG 0 compoundTag
+	METHOD a getEntityFromTag (Lhr;Lbcl;)Ljava/util/Optional;
+	METHOD a loadEntityWithPassengersAtPosition (Lhr;Lbcl;DDDZ)Lahc;
+		ARG 0 compoundTag
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 spawn
+	METHOD a spawnEntityInChunk (Lhr;Lbcl;Lbsk;)Lahc;
+		ARG 0 compoundTag
+		ARG 1 world
+		ARG 2 worldChunk
+	METHOD a loadEntityWithPassengers (Lhr;Lbcl;Ljava/util/function/Function;)Lahc;
+		ARG 0 compoundTag
+		ARG 1 world
+		ARG 2 entityProcessor
+	METHOD a loadEntityWithPassengers (Lhr;Lbcl;Z)Lahc;
+		ARG 0 compoundTag
+		ARG 1 world
+		ARG 2 spawn
 	METHOD a get (Ljava/lang/String;)Ljava/util/Optional;
 	METHOD a register (Ljava/lang/String;Lahg$a;)Lahg;
 	METHOD b isSummonable ()Z
 	METHOD b create (Lbcl;Lhr;Ljc;Larj;Let;Laho;ZZ)Lahc;
+	METHOD b loadEntityFromTag (Lhr;Lbcl;)Ljava/util/Optional;
+		ARG 0 compoundTag
+		ARG 1 world
 	METHOD c getEntityClass ()Ljava/lang/Class;
 	METHOD d getTranslationKey ()Ljava/lang/String;
 	METHOD e getTextComponent ()Ljc;
 	METHOD f getLootTableId ()Lqd;
+	METHOD g getWidth ()F
+	METHOD h getHeight ()F
diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
index aa73b2cd34..14a766cc08 100644
--- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
@@ -15,3 +15,7 @@ CLASS aqu net/minecraft/entity/mob/ZombieEntity
 	METHOD r setArmsRaised (Z)V
 	METHOD s setBreakDoors (Z)V
 	METHOD t setChild (Z)V
+	METHOD u setChildSize (Z)V
+		ARG 1 isChild
+		ARG 2 sizeRatio
+		ARG 3 entityType
diff --git a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping
index 15e575592a..9770f6ec45 100644
--- a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping
+++ b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping
@@ -6,6 +6,7 @@ CLASS bbt net/minecraft/sortme/MobSpawnerLogic
 	FIELD g minSpawnDelay I
 	FIELD h maxSpawnDelay I
 	FIELD i spawnCount I
+	FIELD j renderedEntity Lahc;
 	FIELD k maxNearbyEntities I
 	FIELD l requiredPlayerRange I
 	FIELD m spawnRange I
diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping
index 097c438eac..fa6ee01839 100644
--- a/mappings/net/minecraft/util/math/BlockPos.mapping
+++ b/mappings/net/minecraft/util/math/BlockPos.mapping
@@ -1,4 +1,8 @@
 CLASS et net/minecraft/util/math/BlockPos
+	CLASS et$1
+		FIELD a connector Let$a;
+		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
+			ARG 1 consumer
 	CLASS et$2
 		FIELD b minX I
 		FIELD c minY I
@@ -6,6 +10,22 @@ CLASS et net/minecraft/util/math/BlockPos
 		FIELD e maxX I
 		FIELD f maxY I
 		FIELD g maxZ I
+	CLASS et$a CuboidBlockIterator
+		FIELD a startX I
+		FIELD b startY I
+		FIELD c startZ I
+		FIELD d endX I
+		FIELD e endY I
+		FIELD f endZ I
+		FIELD g position Let$b;
+		METHOD <init> (IIIIII)V
+			ARG 1 startX
+			ARG 2 startY
+			ARG 3 startZ
+			ARG 4 endX
+			ARG 5 endY
+			ARG 6 endZ
+		METHOD a step ()Z
 	CLASS et$b Mutable
 		FIELD b xMut I
 		FIELD c yMut I
@@ -34,6 +54,7 @@ CLASS et net/minecraft/util/math/BlockPos
 		METHOD d setOffset (Ley;I)Let$c;
 		METHOD e set (DDD)Let$c;
 		METHOD f get (III)Let$c;
+		METHOD g set (III)Let$c;
 		METHOD h setOffset (III)Let$c;
 		METHOD j set (Lfn;)Let$c;
 		METHOD r get ()Let$c;
@@ -60,6 +81,13 @@ CLASS et net/minecraft/util/math/BlockPos
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD a getBlocksInCuboid (IIIIII)Ljava/util/stream/Stream;
+		ARG 0 minX
+		ARG 1 minY
+		ARG 2 minZ
+		ARG 3 maxX
+		ARG 4 maxY
+		ARG 5 maxZ
 	METHOD a toChunkSectionOrigin (J)J
 	METHOD a add (JIII)J
 		ARG 0 value
diff --git a/mappings/net/minecraft/util/math/BoundingBox.mapping b/mappings/net/minecraft/util/math/BoundingBox.mapping
index 96a528af91..4634bd106c 100644
--- a/mappings/net/minecraft/util/math/BoundingBox.mapping
+++ b/mappings/net/minecraft/util/math/BoundingBox.mapping
@@ -11,33 +11,96 @@ CLASS cmm net/minecraft/util/math/BoundingBox
 		ARG 5 z1
 	METHOD <init> (Lcmr;Lcmr;)V
 		ARG 1 min
+		ARG 2 max
 	METHOD <init> (Let;Let;)V
 		ARG 1 min
 	METHOD a averageDimension ()D
+		ARG 1 dx
+		ARG 3 dy
+		ARG 5 dz
+	METHOD a shrink (DDD)Lcmm;
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+		ARG 7 minX
+		ARG 9 minY
+		ARG 11 minZ
+		ARG 13 maxX
+		ARG 15 maxY
+		ARG 17 maxZ
 	METHOD a intersects (DDDDDD)Z
 		ARG 1 minX
 		ARG 3 minY
 		ARG 5 minZ
+		ARG 7 maxX
+		ARG 9 maxY
+		ARG 11 maxZ
+	METHOD a intersection (Lcmm;)Lcmm;
+		ARG 2 minX
+		ARG 4 minY
+		ARG 6 minZ
+		ARG 8 maxX
+		ARG 10 maxY
+		ARG 12 maxZ
 	METHOD a offset (Lcmr;)Lcmm;
+		ARG 1 vec3d
 	METHOD a intersects (Lcmr;Lcmr;)Z
-		ARG 1 a
 	METHOD a offset (Let;)Lcmm;
+		ARG 1 blockPos
+	METHOD a ([DLey;DDDDDDDDLey;DDD)Ley;
+		ARG 18 maxZ
+	METHOD b getXSize ()D
 	METHOD b stretch (DDD)Lcmm;
 		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+		ARG 7 minX
+		ARG 9 minY
+		ARG 11 minZ
+		ARG 13 maxX
+		ARG 15 maxY
+		ARG 17 maxZ
 	METHOD b union (Lcmm;)Lcmm;
+		ARG 2 minX
+		ARG 4 minY
+		ARG 6 minZ
+		ARG 8 maxX
+		ARG 10 maxY
+		ARG 12 maxZ
 	METHOD b contains (Lcmr;)Z
+		ARG 1 vec
 	METHOD b rayTrace (Lcmr;Lcmr;)Ljava/util/Optional;
+	METHOD c getYSize ()D
 	METHOD c expand (DDD)Lcmm;
 		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+		ARG 7 minX
+		ARG 9 minY
+		ARG 11 minZ
+		ARG 13 maxX
+		ARG 15 maxY
+		ARG 17 maxZ
 	METHOD c intersects (Lcmm;)Z
+		ARG 1 boundingBox
+	METHOD d getZSize ()D
 	METHOD d offset (DDD)Lcmm;
 		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD e isValid ()Z
 	METHOD e contains (DDD)Z
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD f getCenter ()Lcmr;
 	METHOD f contract (DDD)Lcmm;
 		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD g expand (D)Lcmm;
+		ARG 1 value
 	METHOD h contract (D)Lcmm;
+		ARG 1 value
diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping
index e69ed521a2..c16f2ef763 100644
--- a/mappings/net/minecraft/util/registry/Registry.mapping
+++ b/mappings/net/minecraft/util/registry/Registry.mapping
@@ -45,5 +45,6 @@ CLASS fk net/minecraft/util/registry/Registry
 	METHOD a get (Lqd;)Ljava/lang/Object;
 	METHOD b keys ()Ljava/util/Set;
 	METHOD b getId (Ljava/lang/Object;)Lqd;
+	METHOD b getOptional (Lqd;)Ljava/util/Optional;
 	METHOD c contains (Lqd;)Z
 	METHOD d stream ()Ljava/util/stream/Stream;
diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping
index 00efb677ac..6c9263429c 100644
--- a/mappings/net/minecraft/world/ViewableWorld.mapping
+++ b/mappings/net/minecraft/world/ViewableWorld.mapping
@@ -27,6 +27,20 @@ CLASS bcp net/minecraft/world/ViewableWorld
 		ARG 3 status
 		ARG 4 create
 	METHOD a getClosestPlayer (Lahc;D)Larj;
+	METHOD a isEntityColliding (Lahc;Lcmm;Ljava/util/Set;)Z
+		ARG 1 entity
+		ARG 2 entityBoundingBox
+		ARG 3 other
+		ARG 4 entityVertical
+	METHOD a getCollidingBoundingBoxesForEntity (Lahc;Lcnl;Lcnl;Ljava/util/Set;Lcmw;)Ljava/util/stream/Stream;
+		ARG 1 entity
+		ARG 2 entityBoundingBox
+		ARG 4 otherEntities
+		ARG 5 verticalEntityPosition
+	METHOD a getCollidingEntityBoundingBoxesForEntity (Lahc;Lcnl;Ljava/util/Set;)Ljava/util/stream/Stream;
+		ARG 1 entity
+		ARG 2 entityBoundingBox
+		ARG 3 otherEntities
 	METHOD a getTop (Lbtq$a;II)I
 		ARG 1 type
 		ARG 2 x
@@ -40,7 +54,15 @@ CLASS bcp net/minecraft/world/ViewableWorld
 		ARG 1 pos
 	METHOD b isChunkLoaded (II)Z
 	METHOD b getClosestSurvivalPlayer (Lahc;D)Larj;
+	METHOD b getCollidingBoundingBoxesForEntity (Lahc;Lcmm;)Ljava/util/stream/Stream;
+		ARG 1 entity
+		ARG 2 entityBoundingBox
+		ARG 3 entityVertical
 	METHOD c getAmbientDarkness ()I
+	METHOD c isEntityColliding (Lahc;Lcmm;)Z
+		ARG 1 entity
+		ARG 2 entityBoundingBox
+	METHOD c isInFluid (Lcmm;)Z
 	METHOD d (Let;I)I
 		ARG 2 darkness
 	METHOD i getSeaLevel ()I
diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping
index bbc2467091..42cf2c8a30 100644
--- a/mappings/net/minecraft/world/border/WorldBorder.mapping
+++ b/mappings/net/minecraft/world/border/WorldBorder.mapping
@@ -35,6 +35,7 @@ CLASS brw net/minecraft/world/border/WorldBorder
 	FIELD g centerZ D
 	FIELD h maxWorldBorderRadius I
 	FIELD i area Lbrw$a;
+	METHOD a asVoxelShape ()Lcnl;
 	METHOD a setSize (D)V
 		ARG 1 size
 	METHOD a (DDJ)V