diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping
index b2ee6d0435..cb973f1c03 100644
--- a/mappings/net/minecraft/entity/AnimationState.mapping
+++ b/mappings/net/minecraft/entity/AnimationState.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_kxntavoz net/minecraft/entity/AnimationState
-	FIELD f_mynxnfft INVALID_TIME I
+	FIELD f_mynxnfft STOPPED I
+	FIELD f_slrycntl startTick I
 	METHOD m_cpvhojvm fastForward (IF)V
 		ARG 1 seconds
 		ARG 2 speedMultiplier
@@ -7,6 +8,10 @@ CLASS net/minecraft/unmapped/C_kxntavoz net/minecraft/entity/AnimationState
 	METHOD m_eyncnhvh animateIf (ZI)V
 		ARG 1 condition
 		ARG 2 start
+	METHOD m_fjeaaddd copyFrom (Lnet/minecraft/unmapped/C_kxntavoz;)V
+		ARG 1 state
+	METHOD m_hbqomwtk getTimeMillis (F)J
+		ARG 1 ticks
 	METHOD m_ipvmrdzh stop ()V
 	METHOD m_nbtuouwc restart (I)V
 		ARG 1 start
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index d886ace66b..e311b0600c 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -57,6 +57,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	FIELD f_llpiaiql fireTicks I
 	FIELD f_lnfbdcex firstUpdate Z
 	FIELD f_ltxgrrxv noClip Z
+	FIELD f_lwsftgrz queuedCollisionChecks Ljava/util/List;
 	FIELD f_metfcppr velocityDirty Z
 	FIELD f_mhlwwcep POSE Lnet/minecraft/unmapped/C_rinmcaxy;
 	FIELD f_mnnqnavj glowing Z
@@ -72,6 +73,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	FIELD f_pfezymmj prevYaw F
 	FIELD f_pfgaedzm MIN_TICKS_TO_FREEZE I
 	FIELD f_qazqhmfv SNEAKING_FLAG_INDEX I
+	FIELD f_qckvmvwz collidingBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet;
 	FIELD f_qriixkyh SWIMMING_FLAG_INDEX I
 	FIELD f_qtxalbwz SAFE_FALL_DISTANCE I
 	FIELD f_qxfvmjxc lastRenderX D
@@ -91,6 +93,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	FIELD f_ssljujsr LOGGER Lorg/slf4j/Logger;
 	FIELD f_tigrjjuw DEFAULT_BOUNDING_BOX_WIDTH F
 	FIELD f_tklhtpht entityChangeListener Lnet/minecraft/unmapped/C_ylpvpknw;
+	FIELD f_ujgsyoqm collidingBlocks Ljava/util/Set;
 	FIELD f_ujsjgylb fallDistance F
 	FIELD f_vdsiqqmt prevPitch F
 	FIELD f_vettyvgp hasVisualFire Z
@@ -132,6 +135,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 1 pose
 	METHOD m_ahglzvvg getBodyY (D)D
 		ARG 1 heightScale
+	METHOD m_ahrprint getPitch ()F
 	METHOD m_ajnomikh getEffectiveExplosionResistance (Lnet/minecraft/unmapped/C_aahhrzpf;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xqketiuf;F)F
 		ARG 1 explosion
 		ARG 2 world
@@ -159,7 +163,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 2 type
 	METHOD m_bikcqssn setInsidePortal (Lnet/minecraft/unmapped/C_teerivzm;Lnet/minecraft/unmapped/C_hynzadkk;)V
 		ARG 1 portal
-	METHOD m_bjibgujk onRemoved ()V
+	METHOD m_bjibgujk onRemovedClient ()V
 	METHOD m_bmjmwuig setBoundingBox (Lnet/minecraft/unmapped/C_hbcjzgoe;)V
 		ARG 1 boundingBox
 	METHOD m_bqujtsnz isSubmergedInWater ()Z
@@ -169,6 +173,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 0 entity
 		ARG 2 expectedCollisions
 		ARG 3 entityBoundingBox
+	METHOD m_bujlfnum dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_uqpzijng;
+	METHOD m_bxezczwg dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng;
+		ARG 3 yOffset
 	METHOD m_bzrtaquy getVehicle ()Lnet/minecraft/unmapped/C_astfners;
 	METHOD m_bzveerey collides ()Z
 	METHOD m_cckfyxyf fall (DZLnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V
@@ -337,6 +344,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	METHOD m_fzshfvfl isSprinting ()Z
 	METHOD m_gakqenyv getLerpTargetPitch ()F
 	METHOD m_gavkvalj hasWings ()Z
+	METHOD m_gbjymqob onRemoved (Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V
+		ARG 1 reason
 	METHOD m_ggpcigyk addVelocityInternal (Lnet/minecraft/unmapped/C_vgpupfxx;)V
 		ARG 1 velocity
 	METHOD m_ghqcprlw onPlayerCollision (Lnet/minecraft/unmapped/C_jzrpycqo;)V
@@ -540,6 +549,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 1 widthScale
 	METHOD m_ncryhhth copyPositionAndRotation (Lnet/minecraft/unmapped/C_astfners;)V
 		ARG 1 entity
+	METHOD m_ndosmusf getYaw ()F
 	METHOD m_ngysbrcu getSwimSound ()Lnet/minecraft/unmapped/C_avavozay;
 	METHOD m_nhuepqoa getOppositeRotationVector (FF)Lnet/minecraft/unmapped/C_vgpupfxx;
 		ARG 1 pitch
@@ -702,6 +712,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	METHOD m_shlbgxdt saveSelfNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
 		ARG 1 nbt
 	METHOD m_smbujbsa discard ()V
+	METHOD m_smqilrfl dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_uqpzijng;
 	METHOD m_spboarji isTouchingWater ()Z
 		COMMENT {@return whether this entity's hitbox is touching water}
 	METHOD m_spnjhgke resetFallDistance ()V
@@ -880,6 +891,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 1 tickDelta
 	METHOD m_xpuekaoa setUuid (Ljava/util/UUID;)V
 		ARG 1 uuid
+	METHOD m_xrhuexzc dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_uqpzijng;
 	METHOD m_xrvghdnl getLandingBlockStateLegacy ()Lnet/minecraft/unmapped/C_txtbiemp;
 	METHOD m_xthhawdp onStartedTrackingBy (Lnet/minecraft/unmapped/C_mxrobsgg;)V
 		ARG 1 player
@@ -894,6 +906,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 1 entity
 		ARG 2 dimensions
 		ARG 3 scaleFactor
+	METHOD m_xxnsgkmf queueCollisionCheck (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)V
 	METHOD m_xyjymteg getVehicleAttachmentPos (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx;
 		ARG 1 entity
 	METHOD m_xyqhaexi playCombinationStepSounds (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)V
@@ -955,6 +968,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 		ARG 2 interpolationSteps
 	METHOD m_zoivpnyj getAttachments ()Lnet/minecraft/unmapped/C_pubtmkke;
 	METHOD m_zrismnrd checkWaterState ()V
+	CLASS C_aipuagbw Movement
 	CLASS C_aobkcgmf PositionUpdater
 		METHOD accept (Lnet/minecraft/unmapped/C_astfners;DDD)V
 			ARG 1 entity
diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping
index f4914f01cf..3f3f0dd27a 100644
--- a/mappings/net/minecraft/entity/EntityStatuses.mapping
+++ b/mappings/net/minecraft/entity/EntityStatuses.mapping
@@ -23,6 +23,7 @@ CLASS net/minecraft/unmapped/C_vuauwont net/minecraft/entity/EntityStatuses
 	FIELD f_hgeveagl SET_OP_LEVEL_4 B
 	FIELD f_hlhbecen ADD_PORTAL_PARTICLES B
 	FIELD f_iujagjoa BREAK_OFFHAND B
+	FIELD f_jahbxxhy PROTECTED_FROM_DEATH B
 	FIELD f_jfcmyval ADD_WITCH_PARTICLES B
 	FIELD f_jkvfmfoj TAME_OCELOT_SUCCESS B
 	FIELD f_jogsmdtm ADD_POSITIVE_PLAYER_REACTION_PARTICLES B
@@ -32,6 +33,7 @@ CLASS net/minecraft/unmapped/C_vuauwont net/minecraft/entity/EntityStatuses
 	FIELD f_lbkmphzf PLAY_ATTACK_SOUND B
 	FIELD f_lzgaeuhp PREPARE_RAM B
 	FIELD f_mfslguzv USE_REDUCED_DEBUG_INFO B
+	FIELD f_nerpufry SHAKE B
 	FIELD f_nfcguorg BREAK_CHEST B
 	FIELD f_olioudok ADD_DEATH_PARTICLES B
 	FIELD f_oorwyirf BREAK_BODY B
diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
index 12004673f2..8dd559c436 100644
--- a/mappings/net/minecraft/entity/EntityType.mapping
+++ b/mappings/net/minecraft/entity/EntityType.mapping
@@ -114,9 +114,11 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
 		FIELD f_lwhqlwvm factory Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;
 		FIELD f_nmmzrtfm saveable Z
 		FIELD f_qcebxifq spawnDimensionsScale F
+		FIELD f_qdlfxewu translationKey Lnet/minecraft/unmapped/C_jquyxssk;
 		FIELD f_rpsdjoxa trackingTickInterval I
 		FIELD f_rzcfynrt attachmentType Lnet/minecraft/unmapped/C_pubtmkke$C_qexjibym;
 		FIELD f_tntzkbun spawnableFarFromPlayer Z
+		FIELD f_uuowbxbh lootTable Lnet/minecraft/unmapped/C_jquyxssk;
 		FIELD f_xtndxyps spawnGroup Lnet/minecraft/unmapped/C_ormqdxci;
 		METHOD <init> (Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;Lnet/minecraft/unmapped/C_ormqdxci;)V
 			ARG 1 factory
@@ -162,6 +164,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
 		METHOD m_onnfrfmf spawnableFarFromPlayer ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
 		METHOD m_phyefhwa setEyeHeight (F)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
 			ARG 1 eyeHeight
+		METHOD m_qgatngvl emptyLootTable ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
 		METHOD m_qzcjtflv disableSaving ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
 		METHOD m_tfrskfvg create (Lnet/minecraft/unmapped/C_ormqdxci;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
 			ARG 0 spawnGroup
diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping
index 441dd7ab48..49e5bb9b98 100644
--- a/mappings/net/minecraft/entity/EquipmentSlot.mapping
+++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping
@@ -15,6 +15,8 @@ CLASS net/minecraft/unmapped/C_yuycoehb net/minecraft/entity/EquipmentSlot
 	METHOD m_egyjjxnq getType ()Lnet/minecraft/unmapped/C_yuycoehb$C_vkdieima;
 	METHOD m_fyvngtoz (Lnet/minecraft/unmapped/C_yuycoehb;)I
 		ARG 0 slot
+	METHOD m_jjdtlure offsetId (I)I
+		ARG 1 offset
 	METHOD m_omjerill isArmorSlot ()Z
 	METHOD m_ovklkqiy getName ()Ljava/lang/String;
 	METHOD m_sybtfyce getEntitySlotId ()I
diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
index 9a341c9f71..2ea64e06ff 100644
--- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
+++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
@@ -59,6 +59,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta
 		ARG 1 value
 		ARG 2 bitField
 		ARG 3 set
+	METHOD m_fjamjtjb showsArms ()Z
 	METHOD m_foqjlatj setLeftLegRotation (Lnet/minecraft/unmapped/C_eocijcdh;)V
 		ARG 1 angle
 	METHOD m_fqivefvy isMarker ()Z
@@ -68,6 +69,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta
 		ARG 3 amount
 	METHOD m_kkoccwlu setMarker (Z)V
 		ARG 1 marker
+	METHOD m_kruazguc showsBasePlate ()Z
 	METHOD m_ldbykolm poseToNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
 	METHOD m_lvksyjqf isSlotDisabled (Lnet/minecraft/unmapped/C_yuycoehb;)Z
 		ARG 1 slot
diff --git a/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping
new file mode 100644
index 0000000000..4ca211cfb1
--- /dev/null
+++ b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/unmapped/C_sfpofsgc net/minecraft/entity/vehicle/AbstractBoatEntity
+	METHOD <init> (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;Ljava/util/function/Supplier;)V
+		ARG 1 type
diff --git a/mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping
new file mode 100644
index 0000000000..ef4648753e
--- /dev/null
+++ b/mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/unmapped/C_cyjxgxrb net/minecraft/entity/vehicle/AbstractChestBoatEntity
+	FIELD f_dehvsldw lootTable Lnet/minecraft/unmapped/C_xhhleach;
+	FIELD f_lfxympdn inventory Lnet/minecraft/unmapped/C_rnrfftze;
+	FIELD f_nxvmtoei lootTableSeed J
+	FIELD f_vfvcqxxr INVENTORY_SIZE I
+	METHOD m_jhidwmsn generateLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
diff --git a/mappings/net/minecraft/entity/vehicle/RaftEntity.mapping b/mappings/net/minecraft/entity/vehicle/RaftEntity.mapping
new file mode 100644
index 0000000000..370f2c3360
--- /dev/null
+++ b/mappings/net/minecraft/entity/vehicle/RaftEntity.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/unmapped/C_spthrjmn net/minecraft/entity/vehicle/RaftEntity
diff --git a/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping b/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping
index c69cf7f0d7..916b55aeed 100644
--- a/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping
+++ b/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_srvkmyvp net/minecraft/entity/vehicle/StorageVehi
 	METHOD m_ctcqgnek openScreen (Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 1 player
 	METHOD m_elbjzlaw isRemoved ()Z
-	METHOD m_ggolaweo generateLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
+	METHOD m_ggolaweo generateContainerLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
 		ARG 1 player
 	METHOD m_huzqbykz clearInventory ()V
 	METHOD m_iemddgjw writeStorage (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
diff --git a/mappings/net/minecraft/registry/KeyedValue.mapping b/mappings/net/minecraft/registry/KeyedValue.mapping
new file mode 100644
index 0000000000..d8a4aa34eb
--- /dev/null
+++ b/mappings/net/minecraft/registry/KeyedValue.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/unmapped/C_jquyxssk net/minecraft/registry/KeyedValue
+	METHOD fixed (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jquyxssk;
+		ARG 0 value
+	METHOD get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object;
+		ARG 1 key
diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping
index b0738611db..48301a920c 100644
--- a/mappings/net/minecraft/util/math/Direction.mapping
+++ b/mappings/net/minecraft/util/math/Direction.mapping
@@ -14,10 +14,18 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
 	FIELD f_xnopevsr id I
 	FIELD f_yxdvzmgt vec3i Lnet/minecraft/unmapped/C_ceivtqhh;
 	FIELD f_zbhygcbw CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc;
+	METHOD m_aceixrsp getFacing (DDD)Lnet/minecraft/unmapped/C_xpuuihxf;
+		ARG 0 x
+		ARG 2 y
+		ARG 4 z
 	METHOD m_arokrhof validateVertical (Lnet/minecraft/unmapped/C_xpuuihxf;)Lcom/mojang/serialization/DataResult;
 		ARG 0 direction
 	METHOD m_atdyqmtg getId ()I
 	METHOD m_buxxiflp getOpposite ()Lnet/minecraft/unmapped/C_xpuuihxf;
+	METHOD m_ckfxacqi getFacing (FFF)Lnet/minecraft/unmapped/C_xpuuihxf;
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
 	METHOD m_cmaqxlom byId (I)Lnet/minecraft/unmapped/C_xpuuihxf;
 		ARG 0 id
 	METHOD m_dfjhoqwe fromHorizontal (I)Lnet/minecraft/unmapped/C_xpuuihxf;
@@ -30,12 +38,20 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
 	METHOD m_hntyvpnl get (Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf;
 		ARG 0 direction
 		ARG 1 axis
+	METHOD m_icbobqmt getFacing (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_xpuuihxf;
+		ARG 0 vec
 	METHOD m_iuvhambs getAxis ()Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;
 	METHOD m_iztsoygw getUnitVector ()Lorg/joml/Vector3f;
 	METHOD m_lxrgvhbm getOffsetY ()I
+	METHOD m_nmryvhog asVec3d ()Lnet/minecraft/unmapped/C_vgpupfxx;
 	METHOD m_nyqvqnqv transform (Lorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
 		ARG 0 position
 		ARG 1 direction
+	METHOD m_obcinsgd fromVec (IIILnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
+		ARG 3 fallback
 	METHOD m_oqyobyjy getOffsetX ()I
 	METHOD m_osvadcjw rotateYClockwise ()Lnet/minecraft/unmapped/C_xpuuihxf;
 	METHOD m_pbuextkm rotateCounterclockwise (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf;
@@ -51,6 +67,8 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
 	METHOD m_qnbvkhac getLookDirectionForAxis (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf;
 		ARG 0 entity
 		ARG 1 axis
+	METHOD m_rgctwylt fromVec (Lnet/minecraft/unmapped/C_ceivtqhh;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
+		ARG 0 vec
 	METHOD m_rybsiiha getName ()Ljava/lang/String;
 	METHOD m_rzedosik from (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;)Lnet/minecraft/unmapped/C_xpuuihxf;
 		ARG 0 axis
@@ -59,6 +77,7 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
 		ARG 0 entity
 	METHOD m_ucwgyusq getShuffledDirections (Lnet/minecraft/unmapped/C_rlomrsco;)Ljava/util/Collection;
 		ARG 0 random
+	METHOD m_uinacubi asVec3i ()Lnet/minecraft/unmapped/C_ceivtqhh;
 	METHOD m_veocfmwg pointsTo (F)Z
 		COMMENT {@return whether the given yaw points to the direction}
 		COMMENT
@@ -67,6 +86,8 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
 		COMMENT <p>This always returns {@code false} for vertical directions.
 		ARG 1 yaw
 	METHOD m_vyhskrab getOffsetZ ()I
+	METHOD m_vzfadujr getHorizontalDegrees (Lnet/minecraft/unmapped/C_xpuuihxf;)F
+		COMMENT Gets the degrees of the {@code direction}, relative to {@link Direction#SOUTH}
 	METHOD m_wstyzrap (Lnet/minecraft/unmapped/C_xpuuihxf;)I
 		ARG 0 direction
 	METHOD m_xwgdebbi getRotationQuaternion ()Lorg/joml/Quaternionf;
@@ -103,10 +124,13 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
 			ARG 0 name
 		METHOD m_jwnubmio isVertical ()Z
 		METHOD m_qewftacv getName ()Ljava/lang/String;
+		METHOD m_symjvdwr getDirections ()[Lnet/minecraft/unmapped/C_xpuuihxf;
+		METHOD m_uhgjjbza getPositive ()Lnet/minecraft/unmapped/C_xpuuihxf;
 		METHOD m_vfobospg choose (III)I
 			ARG 1 x
 			ARG 2 y
 			ARG 3 z
+		METHOD m_wxwlsnud getNegative ()Lnet/minecraft/unmapped/C_xpuuihxf;
 		METHOD m_xfsvouev isHorizontal ()Z
 		METHOD m_xipigoyp pickRandomAxis (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;
 			ARG 0 random
diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping
index ef33707049..951b6538e4 100644
--- a/mappings/net/minecraft/util/shape/VoxelShape.mapping
+++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape
 	FIELD f_uodkcxwt voxels Lnet/minecraft/unmapped/C_bipoyzjn;
 	METHOD <init> (Lnet/minecraft/unmapped/C_bipoyzjn;)V
 		ARG 1 voxels
+	METHOD m_afxwtvim offset (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_zscvhwbd;
+		ARG 1 vec
 	METHOD m_ebbqnisg raycast (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;
 		ARG 1 start
 		ARG 2 end
@@ -11,6 +13,7 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape
 		ARG 1 axis
 	METHOD m_evzrivct forEachBox (Lnet/minecraft/unmapped/C_dodusopt$C_spddrqcv;)V
 		ARG 1 consumer
+	METHOD m_eziwunlj isSquareOn (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Z
 	METHOD m_fbshlppi getFace (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_zscvhwbd;
 		ARG 1 facing
 	METHOD m_glpbrbos (Lnet/minecraft/unmapped/C_dodusopt$C_spddrqcv;IIIIII)V
@@ -28,8 +31,13 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape
 		ARG 1 axis
 		ARG 2 from
 		ARG 4 to
+	METHOD m_ktlmojoe isCube ()Z
 	METHOD m_mltevqes getPointPositions (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lit/unimi/dsi/fastutil/doubles/DoubleList;
 		ARG 1 axis
+	METHOD m_nxfuxmhj offset (DDD)Lnet/minecraft/unmapped/C_zscvhwbd;
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD m_nzndbnrv calculateMaxDistance (Lnet/minecraft/unmapped/C_ryiuicpl;Lnet/minecraft/unmapped/C_hbcjzgoe;D)D
 		ARG 1 axisCycle
 		ARG 2 box