From b4efaeadd2a5659ae5db8dfdf079d7747e1459eb Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Sun, 5 Apr 2020 09:53:26 -0500 Subject: [PATCH] trunk placer and tree generation mappings (#1261) Signed-off-by: liach Co-authored-by: liach --- .../world/biome/DefaultBiomeFeatures.mapping | 1 + .../gen/feature/AbstractTreeFeature.mapping | 14 ++++++++ .../gen/feature/BranchedTreeFeature.mapping | 5 +++ .../feature/BranchedTreeFeatureConfig.mapping | 12 +++++-- .../world/gen/feature/Feature.mapping | 5 +++ .../gen/foliage/AcaciaFoliagePlacer.mapping | 7 ++++ .../gen/foliage/BlobFoliagePlacer.mapping | 9 ++++++ .../world/gen/foliage/FoliagePlacer.mapping | 32 +++++++++++++++++-- .../gen/foliage/PineFoliagePlacer.mapping | 4 +++ .../gen/trunk/ForkingTrunkPlacer.mapping | 7 ++++ .../gen/trunk/StraightTrunkPlacer.mapping | 7 ++++ .../world/gen/trunk/TrunkPlacer.mapping | 27 ++++++++++++++++ .../world/gen/trunk/TrunkPlacerType.mapping | 9 ++++++ 13 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping create mode 100644 mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping create mode 100644 mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping create mode 100644 mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping index 8e05e6eabb..ed599ab272 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping @@ -138,6 +138,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_22063 SOUL_FIRE Lnet/minecraft/class_2680; FIELD field_22064 SOUL_SOIL Lnet/minecraft/class_2680; FIELD field_22065 CRIMSON_ROOTS Lnet/minecraft/class_2680; + FIELD field_23076 NETHER_GOLD_ORE Lnet/minecraft/class_2680; 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/feature/AbstractTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping index 3b2e26b9d4..8c8e56c38d 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeature METHOD method_12773 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3341;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 box METHOD method_12774 setBlockStateWithoutUpdatingNeighbors (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 0 world + ARG 1 pos + ARG 2 state METHOD method_12775 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z ARG 1 world ARG 2 random @@ -59,8 +66,15 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu METHOD method_23381 (Lnet/minecraft/class_1936;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4662;)V ARG 6 decorator METHOD method_23382 setLogBlockState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z + ARG 0 world + ARG 1 random + ARG 2 pos + ARG 3 trunkPositions + ARG 4 box + ARG 5 config METHOD method_23383 setLeavesBlockState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z ARG 1 world + ARG 2 random ARG 3 pos ARG 4 leavesPositions ARG 5 box diff --git a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping index f201db327c..a129b5ac42 100644 --- a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_4626 net/minecraft/world/gen/feature/BranchedTreeFeature METHOD method_23378 findPositionToGenerate (Lnet/minecraft/class_3747;IILnet/minecraft/class_2338;Lnet/minecraft/class_4640;)Ljava/util/Optional; + ARG 1 world + ARG 2 trunkHeight + ARG 3 baseHeight + ARG 4 pos + ARG 5 config diff --git a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping index f989ecb6f7..50cd4aaec4 100644 --- a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping @@ -2,22 +2,30 @@ CLASS net/minecraft/class_4640 net/minecraft/world/gen/feature/BranchedTreeFeatu FIELD field_21259 foliagePlacer Lnet/minecraft/class_4647; FIELD field_21268 maxFluidDepth I FIELD field_21269 noVines Z + FIELD field_23750 trunkPlacer Lnet/minecraft/class_5141; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Ljava/util/List;IZ)V ARG 1 trunkProvider ARG 2 leavesProvider ARG 3 foliagePlacer + ARG 4 trunkPlacer + ARG 5 decorators ARG 6 heightRandA + ARG 7 noVines METHOD method_23426 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4640; - ARG 0 dynamic + ARG 0 data CLASS class_4641 Builder FIELD field_21270 foliagePlacer Lnet/minecraft/class_4647; FIELD field_21271 treeDecorators Ljava/util/List; - FIELD field_21281 maxWaterDepth I + FIELD field_21281 maxFluidDepth I FIELD field_21282 noVines Z + FIELD field_23751 trunkPlacer Lnet/minecraft/class_5141; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;)V ARG 1 trunkProvider ARG 2 leavesProvider + ARG 3 foliagePlacer + ARG 4 trunkPlacer METHOD method_23427 noVines ()Lnet/minecraft/class_4640$class_4641; METHOD method_23429 treeDecorators (Ljava/util/List;)Lnet/minecraft/class_4640$class_4641; ARG 1 treeDecorators METHOD method_23439 maxFluidDepth (I)Lnet/minecraft/class_4640$class_4641; + ARG 1 maxFluidDepth diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 0d17903a36..f599147c5e 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -30,6 +30,11 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 1 feature METHOD method_13151 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z ARG 1 world + ARG 2 accessor + ARG 3 generator + ARG 4 random + ARG 5 pos + ARG 6 config METHOD method_13152 (Lcom/google/common/collect/HashBiMap;)V ARG 0 map METHOD method_13153 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping index 41bb97b913..2013a53a28 100644 --- a/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_4645 net/minecraft/world/gen/foliage/AcaciaFoliagePlacer + METHOD (IIII)V + ARG 1 radius + ARG 2 randomRadius + ARG 3 offset + ARG 4 randomOffset + METHOD (Lcom/mojang/datafixers/Dynamic;)V + ARG 1 data diff --git a/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping index 86d67590a7..d63810b394 100644 --- a/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping @@ -1 +1,10 @@ CLASS net/minecraft/class_4646 net/minecraft/world/gen/foliage/BlobFoliagePlacer + FIELD field_23752 height I + METHOD (IIIII)V + ARG 1 radius + ARG 2 randomRadius + ARG 3 offset + ARG 4 randomOffset + ARG 5 height + METHOD (Lcom/mojang/datafixers/Dynamic;)V + ARG 1 data diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index 23355ecfa0..f1dd25ba03 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -2,9 +2,14 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer FIELD field_21296 radius I FIELD field_21297 randomRadius I FIELD field_21298 type Lnet/minecraft/class_4648; + FIELD field_23753 offset I + FIELD field_23754 randomOffset I METHOD (IIIILnet/minecraft/class_4648;)V ARG 1 radius ARG 2 randomRadius + ARG 3 offset + ARG 4 randomOffset + ARG 5 type METHOD method_23447 getRadiusForPlacement (III)I COMMENT This method is used to ensure that a tree can place foliage when it generates. COMMENT @@ -17,7 +22,23 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer COMMENT the radius of the foliage METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;ILnet/minecraft/class_2338;IILjava/util/Set;)V COMMENT This is the main method used to generate foliage. + ARG 1 world + ARG 2 random + ARG 3 config + ARG 4 trunkHeight + ARG 5 pos + ARG 6 foliageHeight + ARG 7 radius + ARG 8 leaves METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;Lnet/minecraft/class_2338;IIILjava/util/Set;)V + ARG 1 world + ARG 2 random + ARG 3 config + ARG 4 pos + ARG 5 baseHeight + ARG 6 y + ARG 7 radius + ARG 8 leaves METHOD method_23450 placeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4640;Ljava/util/Set;)V ARG 1 world ARG 2 random @@ -26,9 +47,14 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 5 leaves METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIII)Z ARG 2 baseHeight - ARG 3 x - ARG 4 y - ARG 5 z + ARG 3 dx + ARG 4 dy + ARG 5 dz ARG 6 radius METHOD method_23452 getRadius (Ljava/util/Random;ILnet/minecraft/class_4640;)I + ARG 1 random ARG 2 baseHeight + ARG 3 config + METHOD method_26989 getHeight (Ljava/util/Random;I)I + ARG 1 random + ARG 2 trunkHeight diff --git a/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping index aba4172767..84f527f076 100644 --- a/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_4649 net/minecraft/world/gen/foliage/PineFoliagePlacer + FIELD field_23755 height I + FIELD field_23756 randomHeight I + METHOD (Lcom/mojang/datafixers/Dynamic;)V + ARG 1 data diff --git a/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping new file mode 100644 index 0000000000..18d68cc0bc --- /dev/null +++ b/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5139 net/minecraft/world/gen/trunk/ForkingTrunkPlacer + METHOD (III)V + ARG 1 baseHeight + ARG 2 firstRandomHeight + ARG 3 secondRandomHeight + METHOD (Lcom/mojang/datafixers/Dynamic;)V + ARG 1 data diff --git a/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping new file mode 100644 index 0000000000..01b96986af --- /dev/null +++ b/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5140 net/minecraft/world/gen/trunk/StraightTrunkPlacer + METHOD (III)V + ARG 1 baseHeight + ARG 2 firstRandomHeight + ARG 3 secondRandomHeight + METHOD (Lcom/mojang/datafixers/Dynamic;)V + ARG 1 data diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping new file mode 100644 index 0000000000..e43ccfc577 --- /dev/null +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer + FIELD field_23759 type Lnet/minecraft/class_5142; + FIELD field_23760 baseHeight I + FIELD field_23761 firstRandomHeight I + FIELD field_23762 secondRandomHeight I + METHOD (IIILnet/minecraft/class_5142;)V + ARG 1 baseHeight + ARG 2 firstRandomHeight + ARG 3 secondRandomHeight + ARG 4 type + METHOD method_26990 getBaseHeight ()I + METHOD method_26991 generate (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)Ljava/util/Map; + COMMENT Generates the trunk blocks and return a map from branch tops to the + COMMENT radius allowed for foliage generation on that branch top. + ARG 1 world + ARG 2 random + ARG 3 trunkHeight + ARG 4 pos + ARG 5 foliageRadius + ARG 6 logs + ARG 7 box + ARG 8 config + METHOD method_26992 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; + ARG 1 ops + METHOD method_26993 getHeight (Ljava/util/Random;Lnet/minecraft/class_4640;)I + ARG 1 random + ARG 2 config diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping new file mode 100644 index 0000000000..5e39bbc1b9 --- /dev/null +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_5142 net/minecraft/world/gen/trunk/TrunkPlacerType + FIELD field_23765 deserializer Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;)V + ARG 1 deserializer + METHOD method_26994 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5141; + ARG 1 data + METHOD method_26995 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_5142; + ARG 0 id + ARG 1 deserializer