From b3ce1dd168fb51a87e4cb5cba6ae215af99823da Mon Sep 17 00:00:00 2001 From: valoeghese <46117728+valoeghese@users.noreply.github.com> Date: Tue, 26 Nov 2019 21:42:27 +1300 Subject: [PATCH] more world gen mappings, fix some names, refactor some biome source related stuff (#983) * more world gen mappings and fix some names * update pr. refactor some stuff --- .../world/biome/ColdOceanBiome.mapping | 1 + .../world/biome/DeepColdOceanBiome.mapping | 1 + .../world/biome/DeepFrozenOceanBiome.mapping | 2 + .../biome/DeepLukewarmOceanBiome.mapping | 1 + .../world/biome/DeepWarmOceanBiome.mapping | 1 + .../world/biome/DefaultBiomeFeatures.mapping | 26 +++++++++ .../HorizontalVoronoiBiomeAccessType.mapping | 1 - .../world/biome/LukewarmOceanBiome.mapping | 1 + .../world/biome/OceanColdBiome.mapping | 1 - .../world/biome/OceanDeepColdBiome.mapping | 1 - .../world/biome/OceanDeepFrozenBiome.mapping | 1 - .../biome/OceanDeepLukewarmBiome.mapping | 1 - .../world/biome/OceanDeepWarmBiome.mapping | 1 - .../world/biome/OceanLukewarmBiome.mapping | 1 - .../world/biome/OceanWarmBiome.mapping | 1 - .../minecraft/world/biome/SeedMixer.mapping | 4 -- .../world/biome/WarmOceanBiome.mapping | 1 + .../IdentityCoordinateTransformer.mapping | 1 - .../biome/layer/IdentitySamplingLayer.mapping | 4 -- .../world/biome/layer/LayerFactory.mapping | 1 - .../world/biome/layer/LayerOperator.mapping | 4 -- .../world/biome/layer/LayerSampler.mapping | 4 -- .../NorthWestCoordinateTransformer.mapping | 1 - .../layer/SouthEastSamplingLayer.mapping | 4 -- .../{ => type}/CrossSamplingLayer.mapping | 2 +- .../DiagonalCrossSamplingLayer.mapping | 2 +- .../layer/type/IdentitySamplingLayer.mapping | 4 ++ .../biome/layer/{ => type}/InitLayer.mapping | 2 +- .../layer/{ => type}/MergingLayer.mapping | 2 +- .../layer/{ => type}/ParentedLayer.mapping | 2 +- .../layer/type/SouthEastSamplingLayer.mapping | 4 ++ .../layer/{ => util}/BiomeLayers.mapping | 4 +- .../{ => util}/CachingLayerContext.mapping | 2 +- .../{ => util}/CachingLayerSampler.mapping | 2 +- .../{ => util}/CoordinateTransformer.mapping | 2 +- .../IdentityCoordinateTransformer.mapping | 1 + .../biome/layer/util/LayerFactory.mapping | 1 + .../biome/layer/util/LayerOperator.mapping | 4 ++ .../{ => util}/LayerRandomnessSource.mapping | 2 +- .../{ => util}/LayerSampleContext.mapping | 2 +- .../biome/layer/util/LayerSampler.mapping | 4 ++ .../NorthWestCoordinateTransformer.mapping | 1 + .../biome/{ => source}/BiomeAccess.mapping | 4 +- .../{ => source}/BiomeAccessType.mapping | 2 +- .../biome/{ => source}/BiomeArray.mapping | 2 +- .../BiomeLayerSampler.mapping | 2 +- .../HorizontalVoronoiBiomeAccessType.mapping | 1 + .../world/biome/source/SeedMixer.mapping | 4 ++ .../source/VanillaLayeredBiomeSource.mapping | 2 +- .../VoronoiBiomeAccessType.mapping | 2 +- ...ator.mapping => LavaLakeDecorator.mapping} | 2 +- .../gen/feature/ConfiguredFeature.mapping | 3 + .../gen/feature/FlowerFeatureConfig.mapping | 2 - .../gen/feature/RandomFeatureEntry.mapping | 3 + .../feature/RandomPatchFeatureConfig.mapping | 56 +++++++++++++++++++ .../gen/foliage/BlobFoliagePlacer.mapping | 3 + .../world/gen/foliage/FoliagePlacer.mapping | 8 +++ 57 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 mappings/net/minecraft/world/biome/ColdOceanBiome.mapping create mode 100644 mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping create mode 100644 mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping create mode 100644 mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping create mode 100644 mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType.mapping create mode 100644 mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanColdBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/OceanWarmBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/SeedMixer.mapping create mode 100644 mappings/net/minecraft/world/biome/WarmOceanBiome.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/LayerFactory.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/LayerOperator.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/LayerSampler.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping rename mappings/net/minecraft/world/biome/layer/{ => type}/CrossSamplingLayer.mapping (60%) rename mappings/net/minecraft/world/biome/layer/{ => type}/DiagonalCrossSamplingLayer.mapping (59%) create mode 100644 mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping rename mappings/net/minecraft/world/biome/layer/{ => type}/InitLayer.mapping (77%) rename mappings/net/minecraft/world/biome/layer/{ => type}/MergingLayer.mapping (81%) rename mappings/net/minecraft/world/biome/layer/{ => type}/ParentedLayer.mapping (77%) create mode 100644 mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping rename mappings/net/minecraft/world/biome/layer/{ => util}/BiomeLayers.mapping (88%) rename mappings/net/minecraft/world/biome/layer/{ => util}/CachingLayerContext.mapping (80%) rename mappings/net/minecraft/world/biome/layer/{ => util}/CachingLayerSampler.mapping (80%) rename mappings/net/minecraft/world/biome/layer/{ => util}/CoordinateTransformer.mapping (51%) create mode 100644 mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping create mode 100644 mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping create mode 100644 mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping rename mappings/net/minecraft/world/biome/layer/{ => util}/LayerRandomnessSource.mapping (55%) rename mappings/net/minecraft/world/biome/layer/{ => util}/LayerSampleContext.mapping (87%) create mode 100644 mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping create mode 100644 mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping rename mappings/net/minecraft/world/biome/{ => source}/BiomeAccess.mapping (77%) rename mappings/net/minecraft/world/biome/{ => source}/BiomeAccessType.mapping (64%) rename mappings/net/minecraft/world/biome/{ => source}/BiomeArray.mapping (90%) rename mappings/net/minecraft/world/biome/{layer => source}/BiomeLayerSampler.mapping (80%) create mode 100644 mappings/net/minecraft/world/biome/source/HorizontalVoronoiBiomeAccessType.mapping create mode 100644 mappings/net/minecraft/world/biome/source/SeedMixer.mapping rename mappings/net/minecraft/world/biome/{ => source}/VoronoiBiomeAccessType.mapping (72%) rename mappings/net/minecraft/world/gen/decorator/{LakeLakeDecorator.mapping => LavaLakeDecorator.mapping} (77%) delete mode 100644 mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping diff --git a/mappings/net/minecraft/world/biome/ColdOceanBiome.mapping b/mappings/net/minecraft/world/biome/ColdOceanBiome.mapping new file mode 100644 index 0000000000..8f8137ec69 --- /dev/null +++ b/mappings/net/minecraft/world/biome/ColdOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1975 net/minecraft/world/biome/ColdOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping new file mode 100644 index 0000000000..05e3e67870 --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1980 net/minecraft/world/biome/DeepColdOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping new file mode 100644 index 0000000000..05ecf99b3a --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1979 net/minecraft/world/biome/DeepFrozenOceanBiome + FIELD field_9484 noiseSampler Lnet/minecraft/class_3543; diff --git a/mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping new file mode 100644 index 0000000000..fa6acbc24a --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1982 net/minecraft/world/biome/DeepLukewarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping new file mode 100644 index 0000000000..1013202924 --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1984 net/minecraft/world/biome/DeepWarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping index b91828e2ec..018f643cfd 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping @@ -1,4 +1,20 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures + FIELD field_21093 SWEET_BERRY_BUSH_CONFIG Lnet/minecraft/class_4638; + FIELD field_21096 RED_MUSHROOM_CONFIG Lnet/minecraft/class_4638; + FIELD field_21097 BROWN_MUSHROOM_CONFIG Lnet/minecraft/class_4638; + FIELD field_21098 LILAC_CONFIG Lnet/minecraft/class_4638; + FIELD field_21099 ROSE_BUSH_CONFIG Lnet/minecraft/class_4638; + FIELD field_21100 PEONY_CONFIG Lnet/minecraft/class_4638; + FIELD field_21101 SUNFLOWER_CONFIG Lnet/minecraft/class_4638; + FIELD field_21102 TALL_GRASS_CONFIG Lnet/minecraft/class_4638; + FIELD field_21103 LARGE_FERN_CONFIG Lnet/minecraft/class_4638; + FIELD field_21104 CACTUS_CONFIG Lnet/minecraft/class_4638; + FIELD field_21105 SUGAR_CANE_CONFIG Lnet/minecraft/class_4638; + FIELD field_21106 HAY_PILE_CONFIG Lnet/minecraft/class_4634; + FIELD field_21107 SNOW_PILE_CONFIG Lnet/minecraft/class_4634; + FIELD field_21108 MELON_PILE_CONFIG Lnet/minecraft/class_4634; + FIELD field_21109 PUMPKIN_PILE_CONFIG Lnet/minecraft/class_4634; + FIELD field_21110 BLUE_ICE_PILE_CONFIG Lnet/minecraft/class_4634; FIELD field_21114 IRON_ORE Lnet/minecraft/class_2680; FIELD field_21115 GOLD_ORE Lnet/minecraft/class_2680; FIELD field_21116 REDSTONE_ORE Lnet/minecraft/class_2680; @@ -49,6 +65,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_21164 DIORITE Lnet/minecraft/class_2680; FIELD field_21165 ANDESITE Lnet/minecraft/class_2680; FIELD field_21166 COAL_ORE Lnet/minecraft/class_2680; + FIELD field_21167 JUNGLE_TREE_CONFIG Lnet/minecraft/class_4640; FIELD field_21168 DEAD_BUSH Lnet/minecraft/class_2680; FIELD field_21169 MELON Lnet/minecraft/class_2680; FIELD field_21170 PUMPKIN Lnet/minecraft/class_2680; @@ -64,11 +81,18 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_21180 RED_MUSHROOM_BLOCK Lnet/minecraft/class_2680; FIELD field_21181 BROWN_MUSHROOM_BLOCK Lnet/minecraft/class_2680; FIELD field_21182 MUSHROOM_BLOCK Lnet/minecraft/class_2680; + FIELD field_21183 JUNGLE_SAPLING_TREE_CONFIG Lnet/minecraft/class_4640; + FIELD field_21184 PINE_TREE_CONFIG Lnet/minecraft/class_4640; + FIELD field_21185 SPRUCE_TREE_CONFIG Lnet/minecraft/class_4640; FIELD field_21186 ACACIA_TREE_CONFIG Lnet/minecraft/class_4640; FIELD field_21187 BIRCH_TREE_CONFIG Lnet/minecraft/class_4640; FIELD field_21188 LARGE_BIRCH_TREE_CONFIG Lnet/minecraft/class_4640; + FIELD field_21189 SWAMP_TREE_CONFIG Lnet/minecraft/class_4640; FIELD field_21190 FANCY_TREE_CONFIG Lnet/minecraft/class_4640; + FIELD field_21191 OAK_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21192 FANCY_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; FIELD field_21196 JUNGLE_GROUND_BUSH_CONFIG Lnet/minecraft/class_4643; + FIELD field_21200 MEGA_JUNGLE_TREE_CONFIG Lnet/minecraft/class_4636; METHOD method_16957 addMountainTrees (Lnet/minecraft/class_1959;)V ARG 0 biome METHOD method_16958 addExtraMountainTrees (Lnet/minecraft/class_1959;)V @@ -205,3 +229,5 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures ARG 0 biome METHOD method_17024 addExtraSavannaTrees (Lnet/minecraft/class_1959;)V ARG 0 biome + METHOD method_20826 addEndCities (Lnet/minecraft/class_1959;)V + ARG 0 biome diff --git a/mappings/net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType.mapping b/mappings/net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType.mapping deleted file mode 100644 index 5c7d5b3a7f..0000000000 --- a/mappings/net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4547 net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType diff --git a/mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping new file mode 100644 index 0000000000..6ac2b3f82d --- /dev/null +++ b/mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2042 net/minecraft/world/biome/LukewarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/OceanColdBiome.mapping b/mappings/net/minecraft/world/biome/OceanColdBiome.mapping deleted file mode 100644 index 7ab7919215..0000000000 --- a/mappings/net/minecraft/world/biome/OceanColdBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1975 net/minecraft/world/biome/OceanColdBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping deleted file mode 100644 index 50cb6e5978..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1980 net/minecraft/world/biome/OceanDeepColdBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping deleted file mode 100644 index 53e75f2de2..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1979 net/minecraft/world/biome/OceanDeepFrozenBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping deleted file mode 100644 index 0c3d139d48..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1982 net/minecraft/world/biome/OceanDeepLukewarmBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping deleted file mode 100644 index b4a51fd07b..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1984 net/minecraft/world/biome/OceanDeepWarmBiome diff --git a/mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping deleted file mode 100644 index 9e6382dc46..0000000000 --- a/mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2042 net/minecraft/world/biome/OceanLukewarmBiome diff --git a/mappings/net/minecraft/world/biome/OceanWarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanWarmBiome.mapping deleted file mode 100644 index 73d30ce9a5..0000000000 --- a/mappings/net/minecraft/world/biome/OceanWarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2174 net/minecraft/world/biome/OceanWarmBiome diff --git a/mappings/net/minecraft/world/biome/SeedMixer.mapping b/mappings/net/minecraft/world/biome/SeedMixer.mapping deleted file mode 100644 index 125d2a88bc..0000000000 --- a/mappings/net/minecraft/world/biome/SeedMixer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4540 net/minecraft/world/biome/SeedMixer - METHOD method_22372 mixSeed (JJ)J - ARG 0 one - ARG 2 two diff --git a/mappings/net/minecraft/world/biome/WarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/WarmOceanBiome.mapping new file mode 100644 index 0000000000..0177f3e447 --- /dev/null +++ b/mappings/net/minecraft/world/biome/WarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2174 net/minecraft/world/biome/WarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping deleted file mode 100644 index bfd5ae9f90..0000000000 --- a/mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3740 net/minecraft/world/biome/layer/IdentityCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping deleted file mode 100644 index 73daff71ce..0000000000 --- a/mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3661 net/minecraft/world/biome/layer/IdentitySamplingLayer - METHOD method_15866 sample (Lnet/minecraft/class_3630;I)I - ARG 1 context - ARG 2 value diff --git a/mappings/net/minecraft/world/biome/layer/LayerFactory.mapping b/mappings/net/minecraft/world/biome/layer/LayerFactory.mapping deleted file mode 100644 index 85e726c735..0000000000 --- a/mappings/net/minecraft/world/biome/layer/LayerFactory.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3627 net/minecraft/world/biome/layer/LayerFactory diff --git a/mappings/net/minecraft/world/biome/layer/LayerOperator.mapping b/mappings/net/minecraft/world/biome/layer/LayerOperator.mapping deleted file mode 100644 index 9d6f37251f..0000000000 --- a/mappings/net/minecraft/world/biome/layer/LayerOperator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4 net/minecraft/world/biome/layer/LayerOperator - METHOD apply (II)I - ARG 1 x - ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/LayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/LayerSampler.mapping deleted file mode 100644 index dcd76d981b..0000000000 --- a/mappings/net/minecraft/world/biome/layer/LayerSampler.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3625 net/minecraft/world/biome/layer/LayerSampler - METHOD method_15825 sample (II)I - ARG 1 x - ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping deleted file mode 100644 index 0de8104404..0000000000 --- a/mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3739 net/minecraft/world/biome/layer/NorthWestCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping deleted file mode 100644 index b4b587eb4a..0000000000 --- a/mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3664 net/minecraft/world/biome/layer/SouthEastSamplingLayer - METHOD method_15869 sample (Lnet/minecraft/class_3630;I)I - ARG 1 context - ARG 2 se diff --git a/mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/CrossSamplingLayer.mapping similarity index 60% rename from mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/CrossSamplingLayer.mapping index 1b942dccae..a986586583 100644 --- a/mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/CrossSamplingLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3663 net/minecraft/world/biome/layer/CrossSamplingLayer +CLASS net/minecraft/class_3663 net/minecraft/world/biome/layer/type/CrossSamplingLayer METHOD method_15868 sample (Lnet/minecraft/class_3630;IIIII)I ARG 1 context ARG 2 n diff --git a/mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer.mapping similarity index 59% rename from mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer.mapping index ffb1311da4..dc0e7e9074 100644 --- a/mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3662 net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer +CLASS net/minecraft/class_3662 net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer METHOD method_15867 sample (Lnet/minecraft/class_3630;IIIII)I ARG 1 context ARG 2 sw diff --git a/mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping new file mode 100644 index 0000000000..f8a26bf260 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3661 net/minecraft/world/biome/layer/type/IdentitySamplingLayer + METHOD method_15866 sample (Lnet/minecraft/class_3630;I)I + ARG 1 context + ARG 2 value diff --git a/mappings/net/minecraft/world/biome/layer/InitLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/InitLayer.mapping similarity index 77% rename from mappings/net/minecraft/world/biome/layer/InitLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/InitLayer.mapping index c510881211..8073a6dff4 100644 --- a/mappings/net/minecraft/world/biome/layer/InitLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/InitLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3658 net/minecraft/world/biome/layer/InitLayer +CLASS net/minecraft/class_3658 net/minecraft/world/biome/layer/type/InitLayer METHOD method_15854 create (Lnet/minecraft/class_3628;)Lnet/minecraft/class_3627; ARG 1 context METHOD method_15855 sample (Lnet/minecraft/class_3630;II)I diff --git a/mappings/net/minecraft/world/biome/layer/MergingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping similarity index 81% rename from mappings/net/minecraft/world/biome/layer/MergingLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping index c5f315460e..aeb97195b0 100644 --- a/mappings/net/minecraft/world/biome/layer/MergingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3659 net/minecraft/world/biome/layer/MergingLayer +CLASS net/minecraft/class_3659 net/minecraft/world/biome/layer/type/MergingLayer METHOD method_15860 create (Lnet/minecraft/class_3628;Lnet/minecraft/class_3627;Lnet/minecraft/class_3627;)Lnet/minecraft/class_3627; ARG 1 context ARG 2 layer1 diff --git a/mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping similarity index 77% rename from mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping index b2c93f4bab..8523c7e68e 100644 --- a/mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3660 net/minecraft/world/biome/layer/ParentedLayer +CLASS net/minecraft/class_3660 net/minecraft/world/biome/layer/type/ParentedLayer METHOD method_15862 create (Lnet/minecraft/class_3628;Lnet/minecraft/class_3627;)Lnet/minecraft/class_3627; ARG 1 context ARG 2 parent diff --git a/mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping new file mode 100644 index 0000000000..1e8b782a09 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3664 net/minecraft/world/biome/layer/type/SouthEastSamplingLayer + METHOD method_15869 sample (Lnet/minecraft/class_3630;I)I + ARG 1 context + ARG 2 se diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping b/mappings/net/minecraft/world/biome/layer/util/BiomeLayers.mapping similarity index 88% rename from mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping rename to mappings/net/minecraft/world/biome/layer/util/BiomeLayers.mapping index 00dc6737fe..9a5f1e2c96 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/BiomeLayers.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers +CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/util/BiomeLayers FIELD field_16107 DEEP_COLD_OCEAN_ID I FIELD field_16108 DEEP_OCEAN_ID I FIELD field_16109 DEEP_LUKEWARM_OCEAN_ID I @@ -30,3 +30,5 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers ARG 3 parent ARG 4 count ARG 5 contextProvider + METHOD method_15849 (JJ)Lnet/minecraft/class_3631; + ARG 2 salt diff --git a/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping b/mappings/net/minecraft/world/biome/layer/util/CachingLayerContext.mapping similarity index 80% rename from mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping rename to mappings/net/minecraft/world/biome/layer/util/CachingLayerContext.mapping index 1cc7f6a3a6..6e121e1b26 100644 --- a/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/CachingLayerContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3631 net/minecraft/world/biome/layer/CachingLayerContext +CLASS net/minecraft/class_3631 net/minecraft/world/biome/layer/util/CachingLayerContext FIELD field_16044 cacheCapacity I FIELD field_16045 cache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; FIELD field_16729 localSeed J diff --git a/mappings/net/minecraft/world/biome/layer/CachingLayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/util/CachingLayerSampler.mapping similarity index 80% rename from mappings/net/minecraft/world/biome/layer/CachingLayerSampler.mapping rename to mappings/net/minecraft/world/biome/layer/util/CachingLayerSampler.mapping index 03bd6d553f..38ba64f55a 100644 --- a/mappings/net/minecraft/world/biome/layer/CachingLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/CachingLayerSampler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3626 net/minecraft/world/biome/layer/CachingLayerSampler +CLASS net/minecraft/class_3626 net/minecraft/world/biome/layer/util/CachingLayerSampler FIELD field_16035 operator Lnet/minecraft/class_4; FIELD field_16036 cacheCapacity I FIELD field_16038 cache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; diff --git a/mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/util/CoordinateTransformer.mapping similarity index 51% rename from mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping rename to mappings/net/minecraft/world/biome/layer/util/CoordinateTransformer.mapping index 69c536ec9f..a88403e422 100644 --- a/mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/CoordinateTransformer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3741 net/minecraft/world/biome/layer/CoordinateTransformer +CLASS net/minecraft/class_3741 net/minecraft/world/biome/layer/util/CoordinateTransformer METHOD method_16342 transformX (I)I ARG 1 x METHOD method_16343 transformZ (I)I diff --git a/mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping new file mode 100644 index 0000000000..e28191ee98 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3740 net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping new file mode 100644 index 0000000000..2b4d627f00 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3627 net/minecraft/world/biome/layer/util/LayerFactory diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping new file mode 100644 index 0000000000..747196f0c5 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4 net/minecraft/world/biome/layer/util/LayerOperator + METHOD apply (II)I + ARG 1 x + ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerRandomnessSource.mapping similarity index 55% rename from mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping rename to mappings/net/minecraft/world/biome/layer/util/LayerRandomnessSource.mapping index e5e066345b..4f4c771a3f 100644 --- a/mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/LayerRandomnessSource.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3630 net/minecraft/world/biome/layer/LayerRandomnessSource +CLASS net/minecraft/class_3630 net/minecraft/world/biome/layer/util/LayerRandomnessSource METHOD method_15834 nextInt (I)I ARG 1 bound METHOD method_15835 getNoiseSampler ()Lnet/minecraft/class_3756; diff --git a/mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping similarity index 87% rename from mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping rename to mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping index 23aaa5c892..38aa6834c4 100644 --- a/mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3628 net/minecraft/world/biome/layer/LayerSampleContext +CLASS net/minecraft/class_3628 net/minecraft/world/biome/layer/util/LayerSampleContext METHOD method_15828 createSampler (Lnet/minecraft/class_4;Lnet/minecraft/class_3625;Lnet/minecraft/class_3625;)Lnet/minecraft/class_3625; ARG 1 operator METHOD method_15830 initSeed (JJ)V diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping new file mode 100644 index 0000000000..a466acdaf0 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3625 net/minecraft/world/biome/layer/util/LayerSampler + METHOD method_15825 sample (II)I + ARG 1 x + ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping new file mode 100644 index 0000000000..b71a45c9cd --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3739 net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping similarity index 77% rename from mappings/net/minecraft/world/biome/BiomeAccess.mapping rename to mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index 78a202fe50..8007e59944 100644 --- a/mappings/net/minecraft/world/biome/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_4543 net/minecraft/world/biome/BiomeAccess +CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess CLASS class_4544 Storage - METHOD method_16359 getStoredBiome (III)Lnet/minecraft/class_1959; + METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959; ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ diff --git a/mappings/net/minecraft/world/biome/BiomeAccessType.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccessType.mapping similarity index 64% rename from mappings/net/minecraft/world/biome/BiomeAccessType.mapping rename to mappings/net/minecraft/world/biome/source/BiomeAccessType.mapping index ba4e9579c1..4f308bcdf1 100644 --- a/mappings/net/minecraft/world/biome/BiomeAccessType.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccessType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4545 net/minecraft/world/biome/BiomeAccessType +CLASS net/minecraft/class_4545 net/minecraft/world/biome/source/BiomeAccessType METHOD method_22396 getBiome (JIIILnet/minecraft/class_4543$class_4544;)Lnet/minecraft/class_1959; ARG 1 seed ARG 3 x diff --git a/mappings/net/minecraft/world/biome/BiomeArray.mapping b/mappings/net/minecraft/world/biome/source/BiomeArray.mapping similarity index 90% rename from mappings/net/minecraft/world/biome/BiomeArray.mapping rename to mappings/net/minecraft/world/biome/source/BiomeArray.mapping index 761f55b8f4..e3328ac903 100644 --- a/mappings/net/minecraft/world/biome/BiomeArray.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeArray.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4548 net/minecraft/world/biome/BiomeArray +CLASS net/minecraft/class_4548 net/minecraft/world/biome/source/BiomeArray FIELD field_20649 DEFAULT_LENGTH I FIELD field_20650 HORIZONTAL_BIT_MASK I FIELD field_20651 VERTICAL_BIT_MASK I diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping similarity index 80% rename from mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping rename to mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping index 66763db9ce..048701a654 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3642 net/minecraft/world/biome/layer/BiomeLayerSampler +CLASS net/minecraft/class_3642 net/minecraft/world/biome/source/BiomeLayerSampler FIELD field_16516 sampler Lnet/minecraft/class_3626; FIELD field_16592 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_3627;)V diff --git a/mappings/net/minecraft/world/biome/source/HorizontalVoronoiBiomeAccessType.mapping b/mappings/net/minecraft/world/biome/source/HorizontalVoronoiBiomeAccessType.mapping new file mode 100644 index 0000000000..0f647db4fa --- /dev/null +++ b/mappings/net/minecraft/world/biome/source/HorizontalVoronoiBiomeAccessType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4547 net/minecraft/world/biome/source/HorizontalVoronoiBiomeAccessType diff --git a/mappings/net/minecraft/world/biome/source/SeedMixer.mapping b/mappings/net/minecraft/world/biome/source/SeedMixer.mapping new file mode 100644 index 0000000000..bbe376bf1e --- /dev/null +++ b/mappings/net/minecraft/world/biome/source/SeedMixer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4540 net/minecraft/world/biome/source/SeedMixer + METHOD method_22372 mixSeed (JJ)J + ARG 0 seed + ARG 2 salt diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping index a54fe67844..8f44ad933e 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource FIELD field_9677 BIOMES Ljava/util/Set; - FIELD field_9680 noiseLayer Lnet/minecraft/class_3642; + FIELD field_9680 biomeSampler Lnet/minecraft/class_3642; METHOD (Lnet/minecraft/class_2084;)V ARG 1 config diff --git a/mappings/net/minecraft/world/biome/VoronoiBiomeAccessType.mapping b/mappings/net/minecraft/world/biome/source/VoronoiBiomeAccessType.mapping similarity index 72% rename from mappings/net/minecraft/world/biome/VoronoiBiomeAccessType.mapping rename to mappings/net/minecraft/world/biome/source/VoronoiBiomeAccessType.mapping index fb0dd18674..65709becba 100644 --- a/mappings/net/minecraft/world/biome/VoronoiBiomeAccessType.mapping +++ b/mappings/net/minecraft/world/biome/source/VoronoiBiomeAccessType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4546 net/minecraft/world/biome/VoronoiBiomeAccessType +CLASS net/minecraft/class_4546 net/minecraft/world/biome/source/VoronoiBiomeAccessType METHOD method_22397 sqr (D)D ARG 0 d METHOD method_22398 distribute (J)D diff --git a/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping similarity index 77% rename from mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping rename to mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping index 6bdf2b23f8..523fa18366 100644 --- a/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LakeLakeDecorator +CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LavaLakeDecorator diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 961b61b713..b3ca8cc657 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_13375 config Lnet/minecraft/class_3037; FIELD field_13376 feature Lnet/minecraft/class_3031; + FIELD field_21589 log Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_3031;Lcom/mojang/datafixers/Dynamic;)V ARG 1 feature METHOD (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V @@ -14,4 +15,6 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature ARG 3 random METHOD method_16584 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; ARG 1 ops + METHOD method_23387 withChance (F)Lnet/minecraft/class_3226; + ARG 1 chance METHOD method_23388 createDecoratedFeature (Lnet/minecraft/class_3243;)Lnet/minecraft/class_2975; diff --git a/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping deleted file mode 100644 index 03413fe75d..0000000000 --- a/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/FlowerFeatureConfig - CLASS class_4639 Builder diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index af16d6754f..3e2c2f8e04 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntry FIELD field_14011 chance F FIELD field_14013 feature Lnet/minecraft/class_2975; + METHOD (Lnet/minecraft/class_2975;F)V + ARG 1 feature + ARG 2 chance METHOD method_14270 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3226; ARG 0 dynamic METHOD method_14271 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping new file mode 100644 index 0000000000..f20bf7f13b --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping @@ -0,0 +1,56 @@ +CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/RandomPatchFeatureConfig + CLASS class_4639 Builder + FIELD field_21248 stateProvider Lnet/minecraft/class_4651; + FIELD field_21249 blockPlacer Lnet/minecraft/class_4629; + FIELD field_21250 whitelist Ljava/util/Set; + FIELD field_21251 blacklist Ljava/util/Set; + FIELD field_21252 tries I + FIELD field_21253 spreadX I + FIELD field_21254 spreadY I + FIELD field_21255 spreadZ I + FIELD field_21256 canReplace Z + FIELD field_21257 project Z + FIELD field_21258 needsWater Z + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4629;)V + ARG 1 stateProvider + ARG 2 blockPlacer + METHOD method_23416 canReplace ()Lnet/minecraft/class_4638$class_4639; + METHOD method_23417 tries (I)Lnet/minecraft/class_4638$class_4639; + ARG 1 tries + METHOD method_23418 whitelist (Ljava/util/Set;)Lnet/minecraft/class_4638$class_4639; + ARG 1 whitelist + METHOD method_23419 cannotProject ()Lnet/minecraft/class_4638$class_4639; + METHOD method_23420 spreadX (I)Lnet/minecraft/class_4638$class_4639; + ARG 1 spreadX + METHOD method_23421 blacklist (Ljava/util/Set;)Lnet/minecraft/class_4638$class_4639; + ARG 1 blacklist + METHOD method_23422 needsWater ()Lnet/minecraft/class_4638$class_4639; + METHOD method_23423 spreadY (I)Lnet/minecraft/class_4638$class_4639; + ARG 1 spreadY + METHOD method_23424 build ()Lnet/minecraft/class_4638; + METHOD method_23425 spreadZ (I)Lnet/minecraft/class_4638$class_4639; + ARG 1 spreadZ + FIELD field_21237 stateProvider Lnet/minecraft/class_4651; + FIELD field_21238 blockPlacer Lnet/minecraft/class_4629; + FIELD field_21239 whitelist Ljava/util/Set; + FIELD field_21240 blacklist Ljava/util/Set; + FIELD field_21241 tries I + FIELD field_21242 spreadX I + FIELD field_21243 spreadY I + FIELD field_21244 spreadZ I + FIELD field_21245 canReplace Z + FIELD field_21246 project Z + FIELD field_21247 needsWater Z + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4629;Ljava/util/Set;Ljava/util/Set;IIIIZZZ)V + ARG 1 stateProvider + ARG 2 blockPlacer + ARG 3 whitelist + ARG 4 blacklist + ARG 5 tries + ARG 6 spreadX + ARG 7 spreadY + ARG 8 spreadZ + ARG 9 canReplace + ARG 10 project + ARG 11 needsWater + METHOD method_23413 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4638; diff --git a/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping index 86d67590a7..55c8ff6d97 100644 --- a/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_4646 net/minecraft/world/gen/foliage/BlobFoliagePlacer + METHOD (II)V + ARG 1 radius + ARG 2 radiusRandom diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index 59a8efc946..26d49d2be0 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -6,3 +6,11 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 1 radius ARG 2 randomRadius ARG 3 type + METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;IIILnet/minecraft/class_2338;Ljava/util/Set;)V + ARG 1 world + ARG 3 config + ARG 7 pos + ARG 8 positions + METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;ILnet/minecraft/class_2338;IILjava/util/Set;)V + METHOD method_23452 getRadius (Ljava/util/Random;IILnet/minecraft/class_4640;)I + ARG 4 config