diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping
index bc5c7db600..78c9cec7ad 100644
--- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping
+++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping
@@ -8,13 +8,21 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator
 	CLASS class_3381 DoubleZRoom
 	CLASS class_3382 Entry
 	CLASS class_3383 Penthouse
-	CLASS class_3384
+	CLASS class_3384 Piece
 		FIELD field_14471 SEA_LANTERN Lnet/minecraft/class_2680;
 		FIELD field_14472 ICE_BLOCKS Ljava/util/Set;
 		FIELD field_14473 PRISMARINE Lnet/minecraft/class_2680;
 		FIELD field_14474 DARK_PRISMARINE Lnet/minecraft/class_2680;
 		FIELD field_14475 WATER Lnet/minecraft/class_2680;
 		FIELD field_14476 PRISMARINE_BRICKS Lnet/minecraft/class_2680;
+		METHOD method_14773 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;IIIIII)V
+			ARG 1 world
+			ARG 3 x
+			ARG 4 y
+			ARG 5 z
+			ARG 6 width
+			ARG 7 height
+			ARG 8 depth
 	CLASS class_3385 SimpleRoom
 	CLASS class_3386 SimpleRoomTop
 	CLASS class_3387 WingRoom
diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping
index 75d58ec5b0..1e1ca22607 100644
--- a/mappings/net/minecraft/world/SpawnHelper.mapping
+++ b/mappings/net/minecraft/world/SpawnHelper.mapping
@@ -1,13 +1,36 @@
 CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 	FIELD field_9292 LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD method_8657 getSpawnPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;)Lnet/minecraft/class_2338;
+		ARG 0 world
+		ARG 1 chunk
+	METHOD method_8658 getEntitySpawnPos (Lnet/minecraft/class_1941;Lnet/minecraft/class_1299;II)Lnet/minecraft/class_2338;
+		ARG 0 world
+		ARG 1 entityType
+		ARG 2 x
+		ARG 3 z
+	METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338;)Z
+		ARG 0 chunkGenerator
+		ARG 1 entityCategory
+		ARG 3 pos
 	METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 entityType
 	METHOD method_8661 populateEntities (Lnet/minecraft/class_1936;Lnet/minecraft/class_1959;IILjava/util/Random;)V
 		ARG 0 world
 		ARG 2 chunkX
 		ARG 3 chunkZ
 	METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z
+		ARG 0 blockView
+		ARG 1 pos
+		ARG 2 state
 	METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;Lnet/minecraft/class_2338;)V
 		ARG 0 category
 		ARG 1 world
 		ARG 2 chunk
 		ARG 3 spawnPos
+	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964;
+		ARG 0 chunkGenerator
+		ARG 1 entityCategory
+		ARG 2 random
+		ARG 3 pos
diff --git a/mappings/net/minecraft/world/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/VersionedChunkStorage.mapping
index 2308a2b79c..63fcbb1159 100644
--- a/mappings/net/minecraft/world/VersionedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/VersionedChunkStorage.mapping
@@ -1,6 +1,9 @@
 CLASS net/minecraft/class_3977 net/minecraft/world/VersionedChunkStorage
 	FIELD field_17654 featureUpdater Lnet/minecraft/class_3360;
 	FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer;
+	METHOD <init> (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V
+		ARG 1 file
+		ARG 2 dataFixer
 	METHOD method_17907 updateChunkTag (Lnet/minecraft/class_2874;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
 		ARG 1 dimensionType
 		ARG 2 persistentStateManagerFactory