diff --git a/mappings/net/minecraft/client/render/AllocationManager.mapping b/mappings/net/minecraft/client/render/AllocationManager.mapping
index 2fb93d68fa..bdde0d76d5 100644
--- a/mappings/net/minecraft/client/render/AllocationManager.mapping
+++ b/mappings/net/minecraft/client/render/AllocationManager.mapping
@@ -83,7 +83,7 @@ CLASS net/minecraft/class_1_291 net/minecraft/client/render/AllocationManager
 		METHOD method_1_2165 getBlockSize ()J
 		METHOD method_1_2166 isFreed ()Z
 	CLASS class_1_293 Block
-		FIELD field_1_1753 USED I
+		FIELD field_1_1753 FREE I
 		FIELD field_1_1754 parentAllocationInfo Lnet/minecraft/class_1_291$class_1_294;
 		FIELD field_1_1755 next Lnet/minecraft/class_1_291$class_1_293;
 		FIELD field_1_1756 right Lnet/minecraft/class_1_291$class_1_293;
diff --git a/mappings/net/minecraft/datafixer/fix/ResetSpectatorsGenerateChunksRuleInHardcoreFix.mapping b/mappings/net/minecraft/datafixer/fix/ResetSpectatorsGenerateChunksRuleInHardcoreFix.mapping
new file mode 100644
index 0000000000..daa33cbab5
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/ResetSpectatorsGenerateChunksRuleInHardcoreFix.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_1_1037 net/minecraft/datafixer/fix/ResetSpectatorsGenerateChunksRuleInHardcoreFix
+	METHOD method_1_6420 (Lnet/minecraft/class_1_233;)Lnet/minecraft/class_1_228$class_1_230;
+		ARG 0 tracker
+	METHOD method_1_6421 (Lnet/minecraft/class_1_203;Lnet/minecraft/class_1_203;Lnet/minecraft/class_1_27;)V
+		ARG 2 worldUpdateProgress
+	METHOD method_1_6422 (Lnet/minecraft/class_1_207;Lcom/mojang/serialization/Dynamic;)V
+		ARG 1 fixedNbt
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 05e10f41fa..080bfd1ac9 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -263,6 +263,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 3 world
 		ARG 4 additionalCollisions
 	METHOD method_1_6352 isImmuneToPiercing ()Z
+	METHOD method_1_6424 obstructsTargetingFromInside ()Z
 	METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
 		COMMENT Called when this entity's collision box intersects {@code state}.
 		COMMENT
diff --git a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping b/mappings/net/minecraft/util/hit/Raycasts.mapping
similarity index 97%
rename from mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping
rename to mappings/net/minecraft/util/hit/Raycasts.mapping
index e470c7106e..3fb461a416 100644
--- a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping
+++ b/mappings/net/minecraft/util/hit/Raycasts.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
+CLASS net/minecraft/class_1675 net/minecraft/util/hit/Raycasts
 	FIELD field_46654 DEFAULT_MARGIN F
 	METHOD method_7484 setRotationFromVelocity (Lnet/minecraft/class_1297;F)V
 		ARG 0 entity
@@ -83,3 +83,5 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
 		ARG 4 box
 		ARG 5 hitPredicate
 		ARG 6 hitboxMargin
+		ARG 7 shapeType
+		ARG 8 skipRaycast