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
This commit is contained in:
valoeghese 2019-11-26 21:42:27 +13:00 committed by modmuss50
parent d0f836da8e
commit b3ce1dd168
57 changed files with 152 additions and 52 deletions

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_1975 net/minecraft/world/biome/ColdOceanBiome

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_1980 net/minecraft/world/biome/DeepColdOceanBiome

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_1979 net/minecraft/world/biome/DeepFrozenOceanBiome
FIELD field_9484 noiseSampler Lnet/minecraft/class_3543;

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_1982 net/minecraft/world/biome/DeepLukewarmOceanBiome

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_1984 net/minecraft/world/biome/DeepWarmOceanBiome

View File

@ -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

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_4547 net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_2042 net/minecraft/world/biome/LukewarmOceanBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_1975 net/minecraft/world/biome/OceanColdBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_1980 net/minecraft/world/biome/OceanDeepColdBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_1979 net/minecraft/world/biome/OceanDeepFrozenBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_1982 net/minecraft/world/biome/OceanDeepLukewarmBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_1984 net/minecraft/world/biome/OceanDeepWarmBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_2042 net/minecraft/world/biome/OceanLukewarmBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_2174 net/minecraft/world/biome/OceanWarmBiome

View File

@ -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

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_2174 net/minecraft/world/biome/WarmOceanBiome

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_3740 net/minecraft/world/biome/layer/IdentityCoordinateTransformer

View File

@ -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

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_3627 net/minecraft/world/biome/layer/LayerFactory

View File

@ -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

View File

@ -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

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_3739 net/minecraft/world/biome/layer/NorthWestCoordinateTransformer

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_3740 net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_3627 net/minecraft/world/biome/layer/util/LayerFactory

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_3739 net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <init> (Lnet/minecraft/class_3627;)V

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_4547 net/minecraft/world/biome/source/HorizontalVoronoiBiomeAccessType

View File

@ -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

View File

@ -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 <init> (Lnet/minecraft/class_2084;)V
ARG 1 config

View File

@ -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

View File

@ -1 +1 @@
CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LakeLakeDecorator
CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LavaLakeDecorator

View File

@ -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 <init> (Lnet/minecraft/class_3031;Lcom/mojang/datafixers/Dynamic;)V
ARG 1 feature
METHOD <init> (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;

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/FlowerFeatureConfig
CLASS class_4639 Builder

View File

@ -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 <init> (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

View File

@ -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 <init> (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 <init> (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;

View File

@ -1 +1,4 @@
CLASS net/minecraft/class_4646 net/minecraft/world/gen/foliage/BlobFoliagePlacer
METHOD <init> (II)V
ARG 1 radius
ARG 2 radiusRandom

View File

@ -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