diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping
index 37ace26477..7641253799 100644
--- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping
+++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping
@@ -12,6 +12,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries
 	FIELD field_25933 BIOME Lnet/minecraft/class_2378;
 	FIELD field_25934 DEFAULT_VALUE_SUPPLIERS Ljava/util/Map;
 	FIELD field_25935 ROOT Lnet/minecraft/class_2385;
+	FIELD field_26375 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_2378;
 	METHOD method_30559 init ()V
 	METHOD method_30560 set (Lnet/minecraft/class_2378;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 0 registry
diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping
new file mode 100644
index 0000000000..d9fa212ea2
--- /dev/null
+++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping
@@ -0,0 +1,55 @@
+CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSettings
+	FIELD field_24514 defaultBlock Lnet/minecraft/class_2680;
+	FIELD field_24515 defaultFluid Lnet/minecraft/class_2680;
+	FIELD field_24516 structuresConfig Lnet/minecraft/class_5311;
+	FIELD field_24780 CODEC Lcom/mojang/serialization/MapCodec;
+	FIELD field_24781 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_24782 generationShapeConfig Lnet/minecraft/class_5309;
+	FIELD field_24783 bedrockCeilingY I
+	FIELD field_24784 bedrockFloorY I
+	FIELD field_24785 seaLevel I
+	FIELD field_24786 mobGenerationDisabled Z
+	FIELD field_24787 id Ljava/util/Optional;
+	FIELD field_26355 OVERWORLD Lnet/minecraft/class_5284;
+	FIELD field_26356 AMPLIFIED Lnet/minecraft/class_5284;
+	FIELD field_26357 NETHER Lnet/minecraft/class_5284;
+	FIELD field_26358 END Lnet/minecraft/class_5284;
+	FIELD field_26359 CAVES Lnet/minecraft/class_5284;
+	FIELD field_26360 FLOATING_ISLANDS Lnet/minecraft/class_5284;
+	METHOD <init> (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZ)V
+		ARG 1 structuresConfig
+		ARG 2 generationShapeConfig
+		ARG 3 defaultBlock
+		ARG 4 defaultFluid
+		ARG 5 bedrockCeilingY
+		ARG 6 bedrockFloorY
+		ARG 7 seaLevel
+		ARG 8 mobGenerationDisabled
+	METHOD <init> (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZLjava/util/Optional;)V
+		ARG 1 structuresConfig
+		ARG 2 generationShapeConfig
+		ARG 3 defaultBlock
+		ARG 4 defaultFluid
+		ARG 5 bedrockCeilingY
+		ARG 6 bedrockFloorY
+		ARG 7 seaLevel
+		ARG 8 mobGenerationDisabled
+		ARG 9 id
+	METHOD method_16400 getBedrockCeilingY ()I
+		COMMENT Returns the Y level of the bedrock ceiling.
+		COMMENT
+		COMMENT <p>If a number less than 1 is returned, the ceiling will not be generated.
+	METHOD method_16401 getBedrockFloorY ()I
+		COMMENT Returns the Y level of the bedrock floor.
+		COMMENT
+		COMMENT <p>If a number greater than 255 is returned, the floor will not be generated.
+	METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680;
+	METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680;
+	METHOD method_28007 getStructuresConfig ()Lnet/minecraft/class_5311;
+	METHOD method_28555 isIdEqual (Lnet/minecraft/class_5284;)Z
+		ARG 1 settings
+	METHOD method_28559 getGenerationShapeConfig ()Lnet/minecraft/class_5309;
+	METHOD method_28561 getSeaLevel ()I
+	METHOD method_28562 isMobGenerationDisabled ()Z
+	METHOD method_30644 register (Lnet/minecraft/class_5284;)Lnet/minecraft/class_5284;
+		ARG 0 settings
diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorType.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorType.mapping
deleted file mode 100644
index 0177e11b26..0000000000
--- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorType.mapping
+++ /dev/null
@@ -1,33 +0,0 @@
-CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorType
-	FIELD field_24514 defaultBlock Lnet/minecraft/class_2680;
-	FIELD field_24515 defaultFluid Lnet/minecraft/class_2680;
-	FIELD field_24516 config Lnet/minecraft/class_5311;
-	FIELD field_24782 noiseConfig Lnet/minecraft/class_5309;
-	FIELD field_24783 bedrockCeilingY I
-	FIELD field_24784 bedrockFloorY I
-	FIELD field_24785 seaLevel I
-	METHOD <init> (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZ)V
-		ARG 1 config
-		ARG 2 noiseConfig
-		ARG 3 defaultBlock
-		ARG 4 defaultFluid
-		ARG 7 seaLevel
-	METHOD <init> (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZLjava/util/Optional;)V
-		ARG 1 config
-		ARG 2 noiseConfig
-		ARG 3 defaultBlock
-		ARG 4 defaultFluid
-		ARG 7 seaLevel
-	METHOD method_16400 getBedrockCeilingY ()I
-		COMMENT Returns the Y level of the bedrock ceiling.
-		COMMENT
-		COMMENT <p>If a number less than 1 is returned, the ceiling will not be generated.
-	METHOD method_16401 getBedrockFloorY ()I
-		COMMENT Returns the Y level of the bedrock floor.
-		COMMENT
-		COMMENT <p>If a number greater than 255 is returned, the floor will not be generated.
-	METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680;
-	METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680;
-	METHOD method_28007 getConfig ()Lnet/minecraft/class_5311;
-	METHOD method_28559 getNoiseConfig ()Lnet/minecraft/class_5309;
-	METHOD method_28561 getSeaLevel ()I
diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping
similarity index 94%
rename from mappings/net/minecraft/world/gen/chunk/NoiseConfig.mapping
rename to mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping
index d9d1f7e9fb..a085c0b9f8 100644
--- a/mappings/net/minecraft/world/gen/chunk/NoiseConfig.mapping
+++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/NoiseConfig
+CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConfig
 	FIELD field_24804 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24805 height I
 	FIELD field_24806 sampling Lnet/minecraft/class_5308;