From 1c509d58602a28e3a2a0f69060d33042c89a167e Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Fri, 16 Apr 2021 10:19:52 -0400 Subject: [PATCH] 21w15a worldgen (#2336) --- mappings/net/minecraft/util/math/BlockBox.mapping | 4 ++++ mappings/net/minecraft/util/math/MathHelper.mapping | 2 ++ .../util/math/noise/DoublePerlinNoiseSampler.mapping | 1 + .../util/math/noise/OctavePerlinNoiseSampler.mapping | 10 ++++++++++ .../util/math/noise/PerlinNoiseSampler.mapping | 11 +++++++++++ .../minecraft/world/gen/BlockInterpolator.mapping | 5 ----- mappings/net/minecraft/world/gen/BlockSource.mapping | 7 +++++++ ...rpolator.mapping => DeepslateBlockSource.mapping} | 4 +++- .../minecraft/world/gen/DefaultBlockSource.mapping | 4 ++++ .../minecraft/world/gen/chunk/ChunkGenerator.mapping | 12 ++++++++++++ .../world/gen/chunk/NoiseChunkGenerator.mapping | 2 +- 11 files changed, 55 insertions(+), 7 deletions(-) delete mode 100644 mappings/net/minecraft/world/gen/BlockInterpolator.mapping create mode 100644 mappings/net/minecraft/world/gen/BlockSource.mapping rename mappings/net/minecraft/world/gen/{DeepslateInterpolator.mapping => DeepslateBlockSource.mapping} (82%) create mode 100644 mappings/net/minecraft/world/gen/DefaultBlockSource.mapping diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping index 3025fa74b1..ed0790fcdb 100644 --- a/mappings/net/minecraft/util/math/BlockBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -91,8 +91,12 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox ARG 0 box METHOD method_35410 expand (I)Lnet/minecraft/class_3341; ARG 1 offset + METHOD method_35411 encompass (Ljava/lang/Iterable;)Ljava/util/Optional; + ARG 0 positions METHOD method_35412 intersection (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; ARG 1 box + METHOD method_35413 intersect (Ljava/lang/Iterable;)Ljava/util/Optional; + ARG 0 boxes METHOD method_35414 getBlockCountX ()I METHOD method_35415 getMinX ()I METHOD method_35416 getMinY ()I diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index c393ab8d2a..de4a61878e 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -277,3 +277,5 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 x ARG 1 y ARG 3 z + METHOD method_34956 perlinFadeDerivative (D)D + ARG 0 value diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index c7e2c20c6d..10a4a47cba 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa FIELD field_24175 amplitude D FIELD field_24176 firstSampler Lnet/minecraft/class_3537; FIELD field_24177 secondSampler Lnet/minecraft/class_3537; + FIELD field_31702 DOMAIN_SCALE D METHOD (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)V ARG 1 random ARG 2 offset diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index 32193ebd63..919be33e33 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -6,9 +6,17 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;)V ARG 1 random ARG 2 offsetAndAmplitudes + METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;Ljava/util/function/LongFunction;)V + ARG 1 random + ARG 2 octaves + ARG 3 randomFunction METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V ARG 1 random ARG 2 octaves + METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;Ljava/util/function/LongFunction;)V + ARG 1 random + ARG 2 octaves + ARG 3 randomFunction METHOD (Lnet/minecraft/class_5819;Ljava/util/List;)V ARG 1 random ARG 2 octaves @@ -36,3 +44,5 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa ARG 2 amplitudes METHOD method_30848 calculateAmplitudes (Lit/unimi/dsi/fastutil/ints/IntSortedSet;)Lcom/mojang/datafixers/util/Pair; ARG 0 octaves + METHOD method_34401 skipCalls (Lnet/minecraft/class_5819;)V + ARG 0 random diff --git a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping index 2dda034397..d639e411eb 100644 --- a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping @@ -30,3 +30,14 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler ARG 1 x ARG 3 y ARG 5 z + METHOD method_35477 sampleDerivative (DDD[D)D + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_35478 sampleDerivative (IIIDDD[D)D + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + ARG 4 localX + ARG 6 localY + ARG 8 localZ diff --git a/mappings/net/minecraft/world/gen/BlockInterpolator.mapping b/mappings/net/minecraft/world/gen/BlockInterpolator.mapping deleted file mode 100644 index b2f5601e75..0000000000 --- a/mappings/net/minecraft/world/gen/BlockInterpolator.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5840 net/minecraft/world/gen/BlockInterpolator - METHOD method_33831 sample (III)Lnet/minecraft/class_2680; - ARG 1 x - ARG 2 y - ARG 3 z diff --git a/mappings/net/minecraft/world/gen/BlockSource.mapping b/mappings/net/minecraft/world/gen/BlockSource.mapping new file mode 100644 index 0000000000..a485b97fd4 --- /dev/null +++ b/mappings/net/minecraft/world/gen/BlockSource.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5840 net/minecraft/world/gen/BlockSource + METHOD method_33831 sample (III)Lnet/minecraft/class_2680; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_36295 get (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping b/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping similarity index 82% rename from mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping rename to mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping index f6b2b85805..e9d6a9dc5c 100644 --- a/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping +++ b/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping @@ -1,9 +1,11 @@ -CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateInterpolator +CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateBlockSource FIELD field_28909 random Lnet/minecraft/class_2919; FIELD field_28910 seed J FIELD field_28911 defaultBlock Lnet/minecraft/class_2680; FIELD field_28912 deepslateState Lnet/minecraft/class_2680; + FIELD field_33513 settings Ljava/util/function/Supplier; METHOD (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Ljava/util/function/Supplier;)V ARG 1 seed ARG 3 defaultBlock ARG 4 deepslateState + ARG 5 settings diff --git a/mappings/net/minecraft/world/gen/DefaultBlockSource.mapping b/mappings/net/minecraft/world/gen/DefaultBlockSource.mapping new file mode 100644 index 0000000000..5c77621113 --- /dev/null +++ b/mappings/net/minecraft/world/gen/DefaultBlockSource.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_6341 net/minecraft/world/gen/DefaultBlockSource + FIELD field_33514 state Lnet/minecraft/class_2680; + METHOD (Lnet/minecraft/class_2680;)V + ARG 1 state diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 55303a19c7..4e90f1a539 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator FIELD field_24747 biomeSource Lnet/minecraft/class_1966; FIELD field_24748 worldSeed J FIELD field_24749 strongholds Ljava/util/List; + FIELD field_33512 blockSource Lnet/minecraft/class_5840; METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;J)V ARG 1 populationSource ARG 2 biomeSource @@ -26,6 +27,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 3 chunk METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966; METHOD method_12100 getSpawnHeight (Lnet/minecraft/class_5539;)I + ARG 1 world METHOD method_12102 generateFeatures (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;)V ARG 1 region ARG 2 accessor @@ -68,6 +70,10 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 4 pos METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V COMMENT Determines which structures should start in the given chunk and creates their starting points. + ARG 1 registryManager + ARG 2 accessor + ARG 3 chunk + ARG 4 structureManager ARG 5 worldSeed METHOD method_16130 addStructureReferences (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Finds all structures that the given chunk intersects, and adds references to their starting chunks to it. @@ -103,7 +109,13 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_28507 isStrongholdStartingChunk (Lnet/minecraft/class_1923;)Z ARG 1 pos METHOD method_28508 setStructureStart (Lnet/minecraft/class_5312;Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;JLnet/minecraft/class_1959;)V + ARG 1 feature + ARG 2 registryManager + ARG 3 accessor ARG 4 chunk + ARG 5 structureManager ARG 6 worldSeed + ARG 8 biome METHOD method_28509 generateStrongholdPositions ()V METHOD method_33730 getMinimumY ()I + METHOD method_36294 getBlockSource ()Lnet/minecraft/class_5840; diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index db24249648..003df1cdaf 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_28843 edgeDensityNoise Lnet/minecraft/class_5216; FIELD field_28844 waterLevelNoise Lnet/minecraft/class_5216; FIELD field_28845 hasAquifers Z - FIELD field_28913 blockInterpolator Lnet/minecraft/class_5840; + FIELD field_28913 deepslateSource Lnet/minecraft/class_5840; METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 1 biomeSource ARG 2 seed