diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index cfdfcdcb07..17004c59f8 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -5,8 +5,9 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_22081 weirdnessNoise Lnet/minecraft/class_5216; FIELD field_24115 biomePoints Ljava/util/List; FIELD field_24116 threeDimensionalSampling Z - FIELD field_24718 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_24719 INSTANCE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_24718 CUSTOM_CODEC Lcom/mojang/serialization/MapCodec; + COMMENT Used to parse a custom biome source, when a preset hasn't been provided. + FIELD field_24719 CODEC Lcom/mojang/serialization/Codec; FIELD field_24720 seed J FIELD field_24721 instance Ljava/util/Optional; FIELD field_26433 DEFAULT_NOISE_PARAMETERS Lnet/minecraft/class_4766$class_5487; @@ -33,6 +34,8 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS ARG 6 altitudeNoiseParameters ARG 7 weirdnessNoiseParameters ARG 8 instance + METHOD method_28462 matchesInstance (J)Z + ARG 1 seed METHOD method_31085 getInstance ()Ljava/util/Optional; CLASS class_5305 Preset FIELD field_24723 NETHER Lnet/minecraft/class_4766$class_5305; diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index 0a2c2c780a..97054523f3 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -19,6 +19,6 @@ CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSourc ARG 6 midlandsBiome ARG 7 smallIslandsBiome ARG 8 barrensBiome - METHOD method_28479 isSeedEqual (J)Z + METHOD method_28479 matches (J)Z ARG 1 seed METHOD method_8757 getNoiseAt (Lnet/minecraft/class_3541;II)F diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 7f19811c25..c7e89927a7 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -2,13 +2,23 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT In charge of shaping, adding biome specific surface blocks, and carving chunks, COMMENT as well as populating the generated chunks with {@linkplain net.minecraft.world.gen.feature.Feature features} and {@linkplain net.minecraft.entity.Entity entities}. COMMENT Biome placement starts here, however all vanilla and most modded chunk generators delegate this to a {@linkplain net.minecraft.world.biome.source.BiomeSource biome source}. - FIELD field_12761 biomeSource Lnet/minecraft/class_1966; + FIELD field_12761 populationSource Lnet/minecraft/class_1966; + COMMENT Used to control the population step without replacing the actual biome that comes from the original {@link biomeSource}. + COMMENT + COMMENT

This is used by {@link FlatChunkGenerator} to overwrite biome properties like whether lakes generate, while preserving the original biome ID. FIELD field_16567 structuresConfig Lnet/minecraft/class_5311; FIELD field_24746 CODEC Lcom/mojang/serialization/Codec; + FIELD field_24747 biomeSource Lnet/minecraft/class_1966; FIELD field_24748 worldSeed J FIELD field_24749 strongholds Ljava/util/List; METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;J)V + ARG 1 populationSource + ARG 2 biomeSource + ARG 3 structuresConfig ARG 4 worldSeed + METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;)V + ARG 1 biomeSource + ARG 2 structuresConfig METHOD method_12088 populateNoise (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config. ARG 1 world @@ -33,8 +43,10 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT This is ignored for strongholds. ARG 5 skipExistingChunks COMMENT whether only structures that are not referenced by generated chunks (chunks past the STRUCTURE_STARTS stage) are returned, excluding strongholds - METHOD method_12104 getMaxY ()I + METHOD method_12104 getWorldHeight ()I METHOD method_12106 populateBiomes (Lnet/minecraft/class_2378;Lnet/minecraft/class_2791;)V + ARG 1 biomeRegistry + ARG 2 chunk METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V ARG 1 region METHOD method_12108 carve (JLnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V @@ -57,6 +69,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_16130 addStructureReferences (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Finds all structures that the given chunk intersects, and adds references to their starting chunks to it. COMMENT A radius of 8 chunks around the given chunk will be searched for structure starts. + ARG 1 world ARG 2 accessor ARG 3 chunk METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;)I diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index d34e73e074..155a7ca636 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -18,13 +18,17 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_24775 BIOME_WEIGHT_TABLE [F FIELD field_24776 densityNoise Lnet/minecraft/class_3537; FIELD field_24777 islandNoise Lnet/minecraft/class_3541; - FIELD field_24778 worldSeed J + FIELD field_24778 seed J FIELD field_24779 worldHeight I METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 1 biomeSource - ARG 2 worldSeed + ARG 2 seed + ARG 4 settings METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V - ARG 3 worldSeed + ARG 1 populationSource + ARG 2 biomeSource + ARG 3 seed + ARG 5 settings METHOD method_16405 sampleNoiseColumn ([DII)V ARG 1 buffer ARG 2 x @@ -63,6 +67,9 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 4 predicate METHOD method_26983 (Lnet/minecraft/class_1923;Lit/unimi/dsi/fastutil/objects/ObjectList;IILit/unimi/dsi/fastutil/objects/ObjectList;Lnet/minecraft/class_3449;)V ARG 5 start + METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z + ARG 1 seed + ARG 3 settingsKey METHOD method_28553 getRandomDensityAt (II)D ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index bc1de1afaf..92f8e1475f 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -66,3 +66,12 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 3 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V METHOD method_185 loadPlayerData ()V + METHOD method_29029 readProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31; + ARG 0 dynamic + ARG 1 dataFixer + ARG 2 dataVersion + ARG 3 playerData + ARG 4 levelInfo + ARG 5 saveVersionInfo + ARG 6 generatorOptions + ARG 7 lifecycle diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 33edf09b75..fb078865f7 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 0 path METHOD method_27002 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; ARG 1 directoryName + METHOD method_27004 getTimeFormatter ()Ljava/time/format/DateTimeFormatter; METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/datafixers/util/Pair; METHOD method_29014 createLevelDataParser (Ljava/io/File;Z)Ljava/util/function/BiFunction; ARG 2 locked @@ -57,4 +58,4 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_27428 (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 path METHOD method_29584 getLevelSummary ()Lnet/minecraft/class_34; - METHOD method_29585 getDatapackSettings ()Lnet/minecraft/class_5359; + METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_5359;