diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index a0746f1949..82ab133f34 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -142,6 +142,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_35758 PLACED_FEATURE_KEY Lnet/minecraft/class_5321; FIELD field_35759 PLACEMENT_MODIFIER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_35760 PLACEMENT_MODIFIER_TYPE Lnet/minecraft/class_2378; + FIELD field_36466 STRUCTURE_PLACEMENT_KEY Lnet/minecraft/class_5321; + FIELD field_36467 STRUCTURE_PLACEMENT Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index afe5c78930..1f243a682a 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -116,3 +116,5 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_39301 getCodecKey ()Ljava/util/Optional; METHOD method_39462 getBlockBoxForChunk (Lnet/minecraft/class_2791;)Lnet/minecraft/class_3341; ARG 0 chunk + METHOD method_40147 getConcentricRingsStartChunks (Lnet/minecraft/class_6871;)Ljava/util/List; + METHOD method_40154 getSeed ()J diff --git a/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping new file mode 100644 index 0000000000..b960e74417 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_6871 net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement + FIELD field_36419 CODEC Lcom/mojang/serialization/Codec; + METHOD method_40167 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping new file mode 100644 index 0000000000..92679362dd --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_6872 net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement + FIELD field_36420 CODEC Lcom/mojang/serialization/Codec; + METHOD (IILnet/minecraft/class_6873;I)V + ARG 1 spacing + ARG 2 separation + ARG 3 spreadType + ARG 4 salt + METHOD method_40169 getStartChunk (JII)Lnet/minecraft/class_1923; + ARG 1 seed + ARG 3 x + ARG 4 z + METHOD method_40170 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_40171 (Lnet/minecraft/class_6872;)Lcom/mojang/serialization/DataResult; + ARG 0 placement diff --git a/mappings/net/minecraft/world/gen/chunk/placement/SpreadType.mapping b/mappings/net/minecraft/world/gen/chunk/placement/SpreadType.mapping new file mode 100644 index 0000000000..2dac814a35 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/placement/SpreadType.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_6873 net/minecraft/world/gen/chunk/placement/SpreadType + FIELD field_36423 CODEC Lcom/mojang/serialization/Codec; + FIELD field_36424 VALUES [Lnet/minecraft/class_6873; + FIELD field_36425 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_40173 get (Lnet/minecraft/class_5819;I)I + ARG 1 random + ARG 2 bound + METHOD method_40174 byName (Ljava/lang/String;)Lnet/minecraft/class_6873; + ARG 0 name diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping new file mode 100644 index 0000000000..4178774405 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/StructurePlacement + FIELD field_36428 TYPE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_40166 getType ()Lnet/minecraft/class_6875; + METHOD method_40168 isStartChunk (Lnet/minecraft/class_2794;II)Z + ARG 1 chunkGenerator + ARG 2 x + ARG 3 z diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping new file mode 100644 index 0000000000..bed83b23ac --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6875 net/minecraft/world/gen/chunk/placement/StructurePlacementType + METHOD method_40177 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_6875; + ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping similarity index 69% rename from mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping rename to mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping index b9ee349c70..bb6058f490 100644 --- a/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping @@ -1,18 +1,19 @@ -CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/StructuresConfig +CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/placement/StructuresConfig COMMENT Contains the configuration for placement of each structure type during chunk generation. FIELD field_24821 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24822 DEFAULT_STRUCTURES Lcom/google/common/collect/ImmutableMap; - COMMENT Default placement settings for each known structure type. + FIELD field_24822 DEFAULT_PLACEMENTS Lcom/google/common/collect/ImmutableMap; + COMMENT Default {@linkplain StructurePlacement structure placements} for each known structure type. COMMENT At startup, Minecraft validates that each registered structure has a default - COMMENT configuration in this map. If mods register structures after this class + COMMENT placement in this map. If mods register structures after this class COMMENT has been initialized, the check will already have been made and a COMMENT bad default configuration will be used instead (see below). - FIELD field_24823 DEFAULT_STRONGHOLD Lnet/minecraft/class_6871; - COMMENT Default placement settings for the stronghold. - FIELD field_24824 structures Ljava/util/Map; + FIELD field_24823 STRONGHOLD_PLACEMENT Lnet/minecraft/class_6871; + COMMENT Default structure placement for the stronghold. + FIELD field_24824 placements Ljava/util/Map; FIELD field_34696 configuredStructures Lcom/google/common/collect/ImmutableMap; + FIELD field_36413 DEFAULT_PLACEMENTS_WITH_STRONGHOLD Lcom/google/common/collect/ImmutableMap; METHOD (Ljava/util/Map;)V - ARG 1 structures + ARG 1 placements METHOD (Z)V COMMENT Creates a new structure placement configuration with default values. ARG 1 withStronghold @@ -21,7 +22,7 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/StructuresConfig METHOD method_28599 (Lnet/minecraft/class_5311;)Ljava/util/Map; ARG 0 config METHOD method_28600 getForType (Lnet/minecraft/class_3195;)Lnet/minecraft/class_6874; - COMMENT Gets the placement configuration for a specific structure type, or + COMMENT Gets the structure placement for a specific structure type, or COMMENT a default placement if placement for the structure was not explicitly configured. ARG 1 structureType METHOD method_28601 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;