From 9ff1824815ec87a8c2169809db742f2e023c552d Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Sun, 26 Jul 2020 17:39:03 +0300 Subject: [PATCH] Decorators and other small world gen mappings (#1610) --- .../net/minecraft/world/biome/DefaultBiomeCreator.mapping | 2 ++ .../world/gen/decorator/ConfiguredDecorator.mapping | 4 ++++ .../net/minecraft/world/gen/decorator/Decoratable.mapping | 2 +- .../world/gen/decorator/DecoratedDecoratorConfig.mapping | 7 +++++++ .../world/gen/decorator/RangeDecoratorConfig.mapping | 6 +++--- .../minecraft/world/gen/feature/ConfiguredFeatures.mapping | 3 +++ 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping index a6b6bb6a35..d2b4c7d76e 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping @@ -155,3 +155,5 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator METHOD method_30729 createBasaltDeltas ()Lnet/minecraft/class_1959; METHOD method_30730 createCrimsonForest ()Lnet/minecraft/class_1959; METHOD method_30731 createWarpedForest ()Lnet/minecraft/class_1959; + METHOD method_30932 getSkyColor (F)I + ARG 0 temperature diff --git a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping index 7e5cac1138..d835432065 100644 --- a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping @@ -5,4 +5,8 @@ CLASS net/minecraft/class_3243 net/minecraft/world/gen/decorator/ConfiguredDecor METHOD (Lnet/minecraft/class_3284;Lnet/minecraft/class_2998;)V ARG 1 decorator ARG 2 config + METHOD method_30444 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; + ARG 1 context + ARG 2 random + ARG 3 pos METHOD method_30445 getConfig ()Lnet/minecraft/class_2998; diff --git a/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping b/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping index 7589cf4a45..17d8c159ca 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_5432 net/minecraft/world/gen/decorator/Decoratable COMMENT Applies the {@code minecraft:square} decorator, which spreads positions COMMENT horizontally a random amount between 0 and 15 blocks on both horizontal axes. METHOD method_30372 applyChance (I)Ljava/lang/Object; - COMMENT Applies the {@code minecraft:chance} decorators, which only + COMMENT Applies the {@code minecraft:chance} decorator, which only COMMENT allows positions with a {@code 1 / count} chance, COMMENT e.g. a count of 2 would give approximately half of the input positions. ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping index a8a1bff471..f3e2ed7005 100644 --- a/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_5443 net/minecraft/world/gen/decorator/DecoratedDecoratorConfig FIELD field_25854 CODEC Lcom/mojang/serialization/Codec; + FIELD field_25855 outer Lnet/minecraft/class_3243; + FIELD field_25856 inner Lnet/minecraft/class_3243; + METHOD (Lnet/minecraft/class_3243;Lnet/minecraft/class_3243;)V + ARG 1 outer + ARG 2 inner + METHOD method_30455 getOuter ()Lnet/minecraft/class_3243; + METHOD method_30457 getInner ()Lnet/minecraft/class_3243; diff --git a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping index 35d011e5db..2579c0e80c 100644 --- a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_2997 net/minecraft/world/gen/decorator/RangeDecoratorC FIELD field_13434 bottomOffset I FIELD field_24879 CODEC Lcom/mojang/serialization/Codec; METHOD (III)V - ARG 1 count - ARG 2 bottomOffset - ARG 3 topOffset + ARG 1 bottomOffset + ARG 2 topOffset + ARG 3 maximum diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping index e2987b12cf..1700ff5314 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping @@ -29,6 +29,9 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_26162 NETHER_ORE Lnet/minecraft/class_3243; FIELD field_26163 NETHER_SPRING Lnet/minecraft/class_3243; FIELD field_26164 SPREAD_32_ABOVE Lnet/minecraft/class_3243; + FIELD field_26165 SQUARE_HEIGHTMAP Lnet/minecraft/class_3243; + FIELD field_26166 SQUARE_HEIGHTMAP_SPREAD_DOUBLE Lnet/minecraft/class_3243; + FIELD field_26167 SQUARE_TOP_SOLID_HEIGHTMAP Lnet/minecraft/class_3243; CLASS class_5467 States FIELD field_26168 RED_MUSHROOM Lnet/minecraft/class_2680; FIELD field_26169 PACKED_ICE Lnet/minecraft/class_2680;