From 3e57ee1372265d8c22a1584b6e269841ae8c1cdb Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Thu, 4 Jun 2020 17:50:13 +0200 Subject: [PATCH] Structure and feature stuff (#1415) --- .../BastionRemnantFeatureConfig.mapping | 1 + .../feature/BlockPileFeatureConfig.mapping | 1 + .../BuriedTreasureFeatureConfig.mapping | 1 + .../gen/feature/ConfiguredFeature.mapping | 3 +- .../feature/DecoratedFeatureConfig.mapping | 1 + .../gen/feature/DefaultBiomeFeatures.mapping | 8 ++++- .../gen/feature/EndSpikeFeatureConfig.mapping | 1 + .../gen/feature/IcePatchFeatureConfig.mapping | 1 + .../feature/MineshaftFeatureConfig.mapping | 1 + .../RandomBooleanFeatureConfig.mapping | 1 + .../feature/RandomPatchFeatureConfig.mapping | 1 + .../feature/RuinedPortalFeatureConfig.mapping | 1 + .../feature/SeaPickleFeatureConfig.mapping | 1 + .../feature/ShipwreckFeatureConfig.mapping | 1 + .../feature/SimpleRandomFeatureConfig.mapping | 1 + .../feature/SingleStateFeatureConfig.mapping | 1 + .../gen/feature/StructureFeature.mapping | 1 + .../gen/feature/TreeFeatureConfig.mapping | 31 +++++++++++++++---- .../stateprovider/BlockStateProvider.mapping | 1 + 19 files changed, 50 insertions(+), 8 deletions(-) diff --git a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping index 5e3a61c7cb..d01a915db4 100644 --- a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5186 net/minecraft/world/gen/feature/BastionRemnantFeatureConfig FIELD field_24013 possibleConfigs Ljava/util/List; + FIELD field_24889 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;)V ARG 1 startPoolToSize METHOD method_27227 getRandom (Ljava/util/Random;)Lnet/minecraft/class_3812; diff --git a/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping index 251e46d65f..554f0a9c17 100644 --- a/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_4634 net/minecraft/world/gen/feature/BlockPileFeatureConfig FIELD field_21229 stateProvider Lnet/minecraft/class_4651; + FIELD field_24873 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping index ba9a54ae54..ebb6ddacf0 100644 --- a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2959 net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig FIELD field_13352 probability F + FIELD field_24875 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V ARG 1 probability diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 59a11f340a..36b31d03a6 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -1,7 +1,8 @@ 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; + FIELD field_21589 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_24833 CODEC Lcom/mojang/serialization/Codec; METHOD method_12862 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z METHOD method_23387 withChance (F)Lnet/minecraft/class_3226; ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping index bc656f082a..51e06b2eb7 100644 --- a/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_2986 net/minecraft/world/gen/feature/DecoratedFeatureConfig FIELD field_13398 decorator Lnet/minecraft/class_3243; FIELD field_13399 feature Lnet/minecraft/class_2975; + FIELD field_24880 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 76db0cd7b8..57d15dd83d 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -291,9 +291,15 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 biome METHOD method_17024 addExtraSavannaTrees (Lnet/minecraft/class_1959;)V ARG 0 biome - METHOD method_24382 addNetherOres (Lnet/minecraft/class_1959;)V + METHOD method_24382 addNetherMineables (Lnet/minecraft/class_1959;)V ARG 0 biome METHOD method_24383 addCrimsonForestVegetation (Lnet/minecraft/class_1959;)V ARG 0 biome METHOD method_24384 addWarpedForestVegetation (Lnet/minecraft/class_1959;)V ARG 0 biome + METHOD method_28438 addNetherOres (Lnet/minecraft/class_1959;II)V + ARG 0 biome + ARG 1 goldCount + ARG 2 quartzCount + METHOD method_28439 addAncientDebris (Lnet/minecraft/class_1959;)V + ARG 0 biome diff --git a/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping index feb91506f1..258f6e7375 100644 --- a/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3666 net/minecraft/world/gen/feature/EndSpikeFeatureCo FIELD field_16206 crystalBeamTarget Lnet/minecraft/class_2338; FIELD field_16207 crystalInvulnerable Z FIELD field_16208 spikes Ljava/util/List; + FIELD field_24911 CODEC Lcom/mojang/serialization/Codec; METHOD (ZLjava/util/List;Lnet/minecraft/class_2338;)V ARG 1 crystalInvulnerable ARG 2 spikes diff --git a/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping index 2bb7490d97..5d7ded87e3 100644 --- a/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3034 net/minecraft/world/gen/feature/IcePatchFeatureConfig FIELD field_13601 radius I + FIELD field_24884 CODEC Lcom/mojang/serialization/Codec; METHOD (I)V ARG 1 radius diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping index 26ea64ba0e..ed15524004 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3101 net/minecraft/world/gen/feature/MineshaftFeatureConfig FIELD field_13693 probability D FIELD field_13694 type Lnet/minecraft/class_3098$class_3100; + FIELD field_24888 CODEC Lcom/mojang/serialization/Codec; METHOD (DLnet/minecraft/class_3098$class_3100;)V ARG 1 probability ARG 3 type diff --git a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping index 6fad2c7d6d..b964e8e289 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3137 net/minecraft/world/gen/feature/RandomBooleanFeatureConfig FIELD field_13739 featureFalse Lnet/minecraft/class_2975; FIELD field_13740 featureTrue Lnet/minecraft/class_2975; + FIELD field_24900 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2975;Lnet/minecraft/class_2975;)V ARG 1 featureTrue ARG 2 featureFalse diff --git a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping index d2e35599d3..3ea79e615f 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/RandomPatchFeatur FIELD field_21245 canReplace Z FIELD field_21246 project Z FIELD field_21247 needsWater Z + FIELD field_24902 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4629;Ljava/util/Set;Ljava/util/Set;IIIIZZZ)V ARG 1 stateProvider ARG 2 blockPlacer diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping index 5051edd856..67c9c5ed4b 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5187 net/minecraft/world/gen/feature/RuinedPortalFeatureConfig FIELD field_24014 portalType Lnet/minecraft/class_5183$class_5185; + FIELD field_24906 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5183$class_5185;)V ARG 1 type diff --git a/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping index be68d725fa..0e38cfb678 100644 --- a/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2984 net/minecraft/world/gen/feature/SeaPickleFeatureConfig FIELD field_13385 count I + FIELD field_24878 CODEC Lcom/mojang/serialization/Codec; METHOD (I)V ARG 1 count diff --git a/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping index 94adaf4edc..69fc854bc4 100644 --- a/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3172 net/minecraft/world/gen/feature/ShipwreckFeatureConfig FIELD field_13803 isBeached Z + FIELD field_24908 CODEC Lcom/mojang/serialization/Codec; METHOD (Z)V ARG 1 isBeached diff --git a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping index f6cbdf20f2..ef8853dd25 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3179 net/minecraft/world/gen/feature/SimpleRandomFeatureConfig FIELD field_13827 features Ljava/util/List; + FIELD field_24910 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;)V ARG 1 features diff --git a/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping index 7be7940fb1..05ab99f592 100644 --- a/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2963 net/minecraft/world/gen/feature/SingleStateFeatureConfig FIELD field_13356 state Lnet/minecraft/class_2680; + FIELD field_24874 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 440a0968b4..44084738eb 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_24842 STRUCTURES Lcom/google/common/collect/BiMap; + FIELD field_24851 SWAMP_HUT Lnet/minecraft/class_3197; FIELD field_24862 STRUCTURE_TO_GENERATION_STEP Ljava/util/Map; METHOD method_13149 getMonsterSpawns ()Ljava/util/List; METHOD method_14015 locateStructure (Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;IZJLnet/minecraft/class_5314;)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 71c2348e20..e0ae0ff3fa 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -2,29 +2,48 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_21288 trunkProvider Lnet/minecraft/class_4651; FIELD field_21289 leavesProvider Lnet/minecraft/class_4651; FIELD field_21290 decorators Ljava/util/List; - FIELD field_21291 baseHeight I + FIELD field_21291 maxWaterDepth I FIELD field_21593 skipFluidCheck Z FIELD field_24135 foliagePlacer Lnet/minecraft/class_4647; FIELD field_24136 trunkPlacer Lnet/minecraft/class_5141; - FIELD field_24137 featureSize Lnet/minecraft/class_5201; + FIELD field_24137 minimumSize Lnet/minecraft/class_5201; FIELD field_24138 ignoreVines Z FIELD field_24139 heightmap Lnet/minecraft/class_2902$class_2903; + FIELD field_24921 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Lnet/minecraft/class_5201;Ljava/util/List;IZLnet/minecraft/class_2902$class_2903;)V ARG 1 trunkProvider ARG 2 leavesProvider ARG 3 foliagePlacer - ARG 9 heightmapType + ARG 4 trunkPlacer + ARG 5 minimumSize + ARG 6 decorators + ARG 7 maxWaterDepth + ARG 8 ignoreVines + ARG 9 heightmap METHOD method_23916 ignoreFluidCheck ()V METHOD method_27373 setTreeDecorators (Ljava/util/List;)Lnet/minecraft/class_4643; + ARG 1 decorators CLASS class_4644 Builder FIELD field_21292 trunkProvider Lnet/minecraft/class_4651; FIELD field_21293 leavesProvider Lnet/minecraft/class_4651; FIELD field_21294 decorators Ljava/util/List; - FIELD field_21295 baseHeight I + FIELD field_21295 maxWaterDepth I + FIELD field_24140 foliagePlacer Lnet/minecraft/class_4647; + FIELD field_24141 trunkPlacer Lnet/minecraft/class_5141; + FIELD field_24142 minimumSize Lnet/minecraft/class_5201; + FIELD field_24143 ignoreVines Z FIELD field_24144 heightmap Lnet/minecraft/class_2902$class_2903; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Lnet/minecraft/class_5201;)V ARG 1 trunkProvider ARG 2 leavesProvider + ARG 3 foliagePlacer + ARG 4 trunkPlacer + ARG 5 minimumSize METHOD method_23445 build ()Lnet/minecraft/class_4643; - METHOD method_23446 baseHeight (I)Lnet/minecraft/class_4643$class_4644; - ARG 1 baseHeight + METHOD method_23446 maxWaterDepth (I)Lnet/minecraft/class_4643$class_4644; + ARG 1 maxWaterDepth + METHOD method_27374 ignoreVines ()Lnet/minecraft/class_4643$class_4644; + METHOD method_27375 heightmap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_4643$class_4644; + ARG 1 heightmap + METHOD method_27376 decorators (Ljava/util/List;)Lnet/minecraft/class_4643$class_4644; + ARG 1 decorators diff --git a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping index 75cf686712..fea3c35fb2 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4651 net/minecraft/world/gen/stateprovider/BlockStateProvider + FIELD field_24937 CODEC Lcom/mojang/serialization/Codec; METHOD method_23455 getBlockState (Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 random ARG 2 pos