From 8545f0443804371be24fde26bf799b4ca9c35f8e Mon Sep 17 00:00:00 2001 From: valoeghese <46117728+valoeghese@users.noreply.github.com> Date: Tue, 3 Dec 2019 02:48:38 +1300 Subject: [PATCH] Finish DefaultBiomeFeatures mappings and some other stuff (#993) --- .../world/biome/DefaultBiomeFeatures.mapping | 29 +++++++++++++++++-- .../decorator/BeehiveTreeDecorator.mapping | 3 ++ .../world/gen/decorator/TreeDecorator.mapping | 3 ++ .../gen/feature/HugeMushroomFeature.mapping | 4 +++ .../feature/HugeMushroomFeatureConfig.mapping | 6 ++++ .../gen/feature/MegaTreeFeatureConfig.mapping | 1 + .../gen/feature/SpringFeatureConfig.mapping | 12 ++++++++ ...ping => PlainsFlowerStateProvider.mapping} | 2 +- 8 files changed, 57 insertions(+), 3 deletions(-) rename mappings/net/minecraft/world/gen/stateprovider/{PlainFlowerStateProvider.mapping => PlainsFlowerStateProvider.mapping} (88%) diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping index 018f643cfd..94136a4ed8 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping @@ -1,5 +1,12 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures + FIELD field_21088 PLAINS_FLOWER_CONFIG Lnet/minecraft/class_4638; + FIELD field_21089 FOREST_FLOWER_CONFIG Lnet/minecraft/class_4638; + FIELD field_21090 DEAD_BUSH_CONFIG Lnet/minecraft/class_4638; + FIELD field_21091 MELON_PATCH_CONFIG Lnet/minecraft/class_4638; + FIELD field_21092 PUMPKIN_PATCH_CONFIG Lnet/minecraft/class_4638; FIELD field_21093 SWEET_BERRY_BUSH_CONFIG Lnet/minecraft/class_4638; + FIELD field_21094 NETHER_FIRE_CONFIG Lnet/minecraft/class_4638; + FIELD field_21095 LILY_PAD_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; @@ -15,6 +22,9 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures 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_21111 WATER_SPRING_CONFIG Lnet/minecraft/class_4642; + FIELD field_21112 LAVA_SPRING_CONFIG Lnet/minecraft/class_4642; + FIELD field_21113 NETHER_SPRING_CONFIG Lnet/minecraft/class_4642; 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; @@ -42,6 +52,9 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_21138 BLUE_ORCHID Lnet/minecraft/class_2680; FIELD field_21139 POPPY Lnet/minecraft/class_2680; FIELD field_21140 DANDELION Lnet/minecraft/class_2680; + FIELD field_21141 ENCLOSED_NETHER_SPRING_CONFIG Lnet/minecraft/class_4642; + FIELD field_21142 HUGE_RED_MUSHROOM_CONFIG Lnet/minecraft/class_4635; + FIELD field_21143 HUGE_BROWN_MUSHROOM_CONFIG Lnet/minecraft/class_4635; FIELD field_21144 GRASS Lnet/minecraft/class_2680; FIELD field_21145 FERN Lnet/minecraft/class_2680; FIELD field_21146 PODZOL Lnet/minecraft/class_2680; @@ -89,10 +102,22 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures 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_21191 OAK_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21192 FANCY_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21193 OAK_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21194 FANCY_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21195 BIRCH_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; FIELD field_21196 JUNGLE_GROUND_BUSH_CONFIG Lnet/minecraft/class_4643; + FIELD field_21197 DARK_OAK_TREE_CONFIG Lnet/minecraft/class_4636; + FIELD field_21198 MEGA_SPRUCE_TREE_CONFIG Lnet/minecraft/class_4636; + FIELD field_21199 MEGA_PINE_TREE_CONFIG Lnet/minecraft/class_4636; FIELD field_21200 MEGA_JUNGLE_TREE_CONFIG Lnet/minecraft/class_4636; + FIELD field_21201 GRASS_CONFIG Lnet/minecraft/class_4638; + FIELD field_21202 TAIGA_GRASS_CONFIG Lnet/minecraft/class_4638; + FIELD field_21203 LUSH_GRASS_CONFIG Lnet/minecraft/class_4638; + FIELD field_21204 LILY_OF_THE_VALLEY_CONFIG Lnet/minecraft/class_4638; + FIELD field_21205 BLUE_ORCHID_CONFIG Lnet/minecraft/class_4638; + FIELD field_21206 DEFAULT_FLOWER_CONFIG Lnet/minecraft/class_4638; METHOD method_16957 addMountainTrees (Lnet/minecraft/class_1959;)V ARG 0 biome METHOD method_16958 addExtraMountainTrees (Lnet/minecraft/class_1959;)V diff --git a/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping index dfc128ecd9..aed9b130fe 100644 --- a/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_4659 net/minecraft/world/gen/decorator/BeehiveTreeDecorator + FIELD field_21317 chance F + METHOD (F)V + ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping index 21384cf91e..68558e9a95 100644 --- a/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/decorator/TreeDecorator METHOD method_23469 generate (Lnet/minecraft/class_1936;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;)V + ARG 1 world + ARG 2 random + ARG 6 box diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping index 8006cd7383..23d61ee0ab 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeature + METHOD method_23375 generate (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4635;)V + ARG 1 world + ARG 5 pos + ARG 6 config diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping index 5e2393fe10..c9d8c2cc52 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping @@ -1,3 +1,9 @@ CLASS net/minecraft/class_4635 net/minecraft/world/gen/feature/HugeMushroomFeatureConfig FIELD field_21230 capProvider Lnet/minecraft/class_4651; FIELD field_21231 stemProvider Lnet/minecraft/class_4651; + FIELD field_21232 capSize I + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;I)V + ARG 1 capProvider + ARG 2 stemProvider + ARG 3 capSize + METHOD method_23407 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4635; diff --git a/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping index 438e716e8e..e9b78ea429 100644 --- a/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4636 net/minecraft/world/gen/feature/MegaTreeFeatureCo CLASS class_4637 Builder FIELD field_21236 heightInterval I FIELD field_21592 crownHeight I + METHOD method_23411 treeDecorators (Ljava/util/List;)Lnet/minecraft/class_4636$class_4637; METHOD method_23412 heightInterval (I)Lnet/minecraft/class_4636$class_4637; ARG 1 heightInterval METHOD method_23915 crownHeight (I)Lnet/minecraft/class_4636$class_4637; diff --git a/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping index 559ef82242..25eef9858b 100644 --- a/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping @@ -1 +1,13 @@ CLASS net/minecraft/class_4642 net/minecraft/world/gen/feature/SpringFeatureConfig + FIELD field_21283 state Lnet/minecraft/class_3610; + FIELD field_21284 requiresBlockBelow Z + FIELD field_21285 rockCount I + FIELD field_21286 holeCount I + FIELD field_21287 validBlocks Ljava/util/Set; + METHOD (Lnet/minecraft/class_3610;ZIILjava/util/Set;)V + ARG 1 state + ARG 2 requiresBlockBelow + ARG 3 rockCount + ARG 4 holeCount + ARG 5 validBlocks + METHOD method_23440 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4642; diff --git a/mappings/net/minecraft/world/gen/stateprovider/PlainFlowerStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerStateProvider.mapping similarity index 88% rename from mappings/net/minecraft/world/gen/stateprovider/PlainFlowerStateProvider.mapping rename to mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerStateProvider.mapping index f376f9e759..81b6a67679 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/PlainFlowerStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerStateProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4654 net/minecraft/world/gen/stateprovider/PlainFlowerStateProvider +CLASS net/minecraft/class_4654 net/minecraft/world/gen/stateprovider/PlainsFlowerStateProvider FIELD field_21311 tulips [Lnet/minecraft/class_2680; FIELD field_21312 flowers [Lnet/minecraft/class_2680; METHOD (Lcom/mojang/datafixers/Dynamic;)V