diff --git a/mappings/net/minecraft/entity/Dismounting.mapping b/mappings/net/minecraft/entity/Dismounting.mapping
index 7b119adf93..0f522f9ab9 100644
--- a/mappings/net/minecraft/entity/Dismounting.mapping
+++ b/mappings/net/minecraft/entity/Dismounting.mapping
@@ -2,7 +2,22 @@ CLASS net/minecraft/class_5275 net/minecraft/entity/Dismounting
 	METHOD method_27932 canDismountInBlock (D)Z
 		ARG 0 height
 	METHOD method_27933 canPlaceEntityAt (Lnet/minecraft/class_1941;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Z
+		ARG 0 world
 		ARG 1 entity
 		ARG 2 targetBox
 	METHOD method_27934 getDismountOffsets (Lnet/minecraft/class_2350;)[[I
 		ARG 0 movementDirection
+	METHOD method_30341 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
+		ARG 0 world
+		ARG 1 pos
+	METHOD method_30342 findDismountPos (Lnet/minecraft/class_1941;DDDLnet/minecraft/class_1309;Lnet/minecraft/class_4050;)Lnet/minecraft/class_243;
+		ARG 0 world
+		ARG 1 x
+		ARG 3 height
+		ARG 5 z
+		ARG 7 entity
+		ARG 8 pose
+	METHOD method_30343 getCeilingHeight (Lnet/minecraft/class_2338;ILjava/util/function/Function;)D
+		ARG 0 pos
+		ARG 1 maxDistance
+		ARG 2 collisionShapeGetter
diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
index 89ac832250..83904eef52 100644
--- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
+++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
@@ -1,12 +1,15 @@
 CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEntity
+	FIELD field_24464 DISMOUNT_FREE_Y_SPACES_NEEDED Lcom/google/common/collect/ImmutableMap;
 	FIELD field_7655 clientYVelocity D
 	FIELD field_7656 clientZVelocity D
 	FIELD field_7657 clientPitch D
 	FIELD field_7658 clientXVelocity D
 	FIELD field_7659 clientYaw D
+	FIELD field_7660 yawFlipped Z
 	FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940;
 	FIELD field_7662 clientZ D
 	FIELD field_7663 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940;
+	FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map;
 	FIELD field_7665 clientX D
 	FIELD field_7666 clientY D
 	FIELD field_7667 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940;
@@ -22,23 +25,37 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 		ARG 7 z
 	METHOD method_18803 willHitBlockAt (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
+	METHOD method_22864 getAdjacentRailPositionsByShape (Lnet/minecraft/class_2768;)Lcom/mojang/datafixers/util/Pair;
+		ARG 0 shape
 	METHOD method_7504 getMaxOffRailSpeed ()D
+	METHOD method_7505 snapPositionToRailWithOffset (DDDD)Lnet/minecraft/class_243;
+		COMMENT This method is used to determine the minecart's render orientation, by computing a position along the rail slightly before and slightly after the minecart's actual position.
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+		ARG 7 offset
 	METHOD method_7506 onActivatorRail (IIIZ)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 powered
 	METHOD method_7507 getDamageWobbleTicks ()I
+	METHOD method_7508 snapPositionToRail (DDD)Lnet/minecraft/class_243;
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD method_7509 setDamageWobbleTicks (I)V
 		ARG 1 wobbleTicks
 	METHOD method_7510 hasCustomBlock ()Z
 	METHOD method_7511 setCustomBlockPresent (Z)V
+		ARG 1 present
 	METHOD method_7512 moveOffRail ()V
 	METHOD method_7513 moveOnRail (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
 	METHOD method_7514 getBlockOffset ()I
 	METHOD method_7515 setCustomBlockOffset (I)V
+		ARG 1 offset
 	METHOD method_7516 dropItems (Lnet/minecraft/class_1282;)V
 		ARG 1 damageSource
 	METHOD method_7517 getDefaultContainedBlock ()Lnet/minecraft/class_2680;
@@ -58,4 +75,5 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 	METHOD method_7525 applySlowdown ()V
 	METHOD method_7526 getDefaultBlockOffset ()I
 	METHOD method_7527 setCustomBlock (Lnet/minecraft/class_2680;)V
+		ARG 1 state
 	CLASS class_1689 Type
diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping
index 6744572eb2..a28c7bf1f3 100644
--- a/mappings/net/minecraft/world/BlockView.mapping
+++ b/mappings/net/minecraft/world/BlockView.mapping
@@ -11,6 +11,11 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView
 		ARG 3 pos
 		ARG 4 shape
 		ARG 5 state
+	METHOD method_30346 getDismountHeight (Lnet/minecraft/class_265;Ljava/util/function/Supplier;)D
+		ARG 1 blockCollisionShape
+		ARG 2 belowBlockCollisionShapeGetter
+	METHOD method_30347 getDismountHeight (Lnet/minecraft/class_2338;)D
+		ARG 1 pos
 	METHOD method_8315 getMaxLightLevel ()I
 	METHOD method_8316 getFluidState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3610;
 		ARG 1 pos