From 34808daff714c25e40b627ab0788289fdc234055 Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Thu, 4 Feb 2021 13:34:17 -0500 Subject: [PATCH] 21w05a worldgen mappings (#2016) * 21w05a worldgen mappings * consume -> skip Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> --- .../noise/DoublePerlinNoiseSampler.mapping | 3 ++ .../util/math/noise/InterpolatedNoise.mapping | 18 +++++++ .../noise/OctavePerlinNoiseSampler.mapping | 5 ++ .../noise/OctaveSimplexNoiseSampler.mapping | 3 ++ .../math/noise/PerlinNoiseSampler.mapping | 6 +++ .../math/noise/SimplexNoiseSampler.mapping | 2 + .../minecraft/util/thread/LockHelper.mapping | 6 +++ .../net/minecraft/world/ChunkRegion.mapping | 2 + .../minecraft/world/gen/ChunkRandom.mapping | 3 ++ .../world/gen/NoiseColumnSampler.mapping | 48 +++++++++++++++++++ .../minecraft/world/gen/SimpleRandom.mapping | 8 ++++ .../world/gen/StructureWeightSampler.mapping | 26 ++++++++++ .../world/gen/WorldGenRandom.mapping | 5 ++ .../world/gen/chunk/ChunkGenerator.mapping | 2 + .../gen/chunk/NoiseChunkGenerator.mapping | 15 ++++++ .../ConfiguredStructureFeature.mapping | 1 + .../gen/feature/util/FeatureContext.mapping | 17 +++++++ 17 files changed, 170 insertions(+) create mode 100644 mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping create mode 100644 mappings/net/minecraft/util/thread/LockHelper.mapping create mode 100644 mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping create mode 100644 mappings/net/minecraft/world/gen/SimpleRandom.mapping create mode 100644 mappings/net/minecraft/world/gen/StructureWeightSampler.mapping create mode 100644 mappings/net/minecraft/world/gen/WorldGenRandom.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/util/FeatureContext.mapping diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index 1b8d7c04da..c7e2c20c6d 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa FIELD field_24176 firstSampler Lnet/minecraft/class_3537; FIELD field_24177 secondSampler Lnet/minecraft/class_3537; METHOD (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)V + ARG 1 random ARG 2 offset ARG 3 octaves METHOD method_27406 sample (DDD)D @@ -12,8 +13,10 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa METHOD method_27407 createAmplitude (I)D ARG 0 octaves METHOD method_30846 create (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_5216; + ARG 0 random ARG 1 offset ARG 2 octaves METHOD method_31927 create (Lnet/minecraft/class_5819;I[D)Lnet/minecraft/class_5216; + ARG 0 random ARG 1 offset ARG 2 octaves diff --git a/mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping b/mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping new file mode 100644 index 0000000000..876cd393fe --- /dev/null +++ b/mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoise + FIELD field_28774 lowerInterpolatedNoise Lnet/minecraft/class_3537; + FIELD field_28775 upperInterpolatedNoise Lnet/minecraft/class_3537; + FIELD field_28776 interpolationNoise Lnet/minecraft/class_3537; + METHOD (Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;)V + ARG 1 lowerInterpolatedNoise + ARG 2 upperInterpolatedNoise + ARG 3 interpolationNoise + METHOD (Lnet/minecraft/class_5819;)V + ARG 1 random + METHOD method_33657 sample (IIIDDDD)D + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 horizontalScale + ARG 6 verticalScale + ARG 8 horizontalStretch + ARG 10 verticalStretch diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index d636108803..32193ebd63 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -4,12 +4,16 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa FIELD field_20660 lacunarity D FIELD field_26445 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 random ARG 2 offsetAndAmplitudes METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V + ARG 1 random ARG 2 octaves METHOD (Lnet/minecraft/class_5819;Ljava/util/List;)V + ARG 1 random ARG 2 octaves METHOD (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)V + ARG 1 random ARG 2 octaves METHOD method_15416 sample (DDD)D ARG 1 x @@ -27,6 +31,7 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa METHOD method_16668 getOctave (I)Lnet/minecraft/class_3756; ARG 1 octave METHOD method_30847 create (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_3537; + ARG 0 random ARG 1 offset ARG 2 amplitudes METHOD method_30848 calculateAmplitudes (Lit/unimi/dsi/fastutil/ints/IntSortedSet;)Lcom/mojang/datafixers/util/Pair; diff --git a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping index 95c8f1657c..c55a0244cd 100644 --- a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping @@ -3,10 +3,13 @@ CLASS net/minecraft/class_3543 net/minecraft/util/math/noise/OctaveSimplexNoiseS FIELD field_20661 persistence D FIELD field_20662 lacunarity D METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V + ARG 1 random ARG 2 octaves METHOD (Lnet/minecraft/class_5819;Ljava/util/List;)V + ARG 1 random ARG 2 octaves METHOD (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)V + ARG 1 random ARG 2 octaves METHOD method_16451 sample (DDZ)D ARG 1 x diff --git a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping index 3039862bf3..2dda034397 100644 --- a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler FIELD field_16589 originY D FIELD field_16590 permutations [B FIELD field_16591 originX D + METHOD (Lnet/minecraft/class_5819;)V + ARG 1 random METHOD method_16447 sample (DDDDD)D ARG 1 x ARG 3 y @@ -24,3 +26,7 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler ARG 6 localY ARG 8 localZ ARG 10 fadeLocalX + METHOD method_33658 sample (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z diff --git a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping index 78c999a152..cfc7d6a3eb 100644 --- a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler FIELD field_15766 GRADIENTS [[I FIELD field_15767 UNSKEW_FACTOR_2D D FIELD field_15768 SKEW_FACTOR_2D D + METHOD (Lnet/minecraft/class_5819;)V + ARG 1 random METHOD method_15431 dot ([IDDD)D ARG 0 gArr ARG 1 x diff --git a/mappings/net/minecraft/util/thread/LockHelper.mapping b/mappings/net/minecraft/util/thread/LockHelper.mapping new file mode 100644 index 0000000000..b34e80ffc4 --- /dev/null +++ b/mappings/net/minecraft/util/thread/LockHelper.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_5798 net/minecraft/util/thread/LockHelper + METHOD method_33564 crash (Ljava/lang/String;)Lnet/minecraft/class_148; + ARG 0 message + METHOD method_33566 checkLock (Ljava/util/concurrent/locks/ReentrantLock;Ljava/lang/String;)V + ARG 0 lock + ARG 1 message diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index a09d3ab92c..4c5e998d23 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_23788 lowerCorner Lnet/minecraft/class_1923; FIELD field_23789 upperCorner Lnet/minecraft/class_1923; FIELD field_26822 structureAccessor Lnet/minecraft/class_5138; + FIELD field_28557 centerPos Lnet/minecraft/class_1923; METHOD (Lnet/minecraft/class_3218;Ljava/util/List;)V ARG 1 world ARG 2 chunks @@ -22,3 +23,4 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion ARG 1 pos METHOD method_14340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1951; ARG 1 pos + METHOD method_33561 getCenterPos ()Lnet/minecraft/class_1923; diff --git a/mappings/net/minecraft/world/gen/ChunkRandom.mapping b/mappings/net/minecraft/world/gen/ChunkRandom.mapping index 3efb1f1057..09df230263 100644 --- a/mappings/net/minecraft/world/gen/ChunkRandom.mapping +++ b/mappings/net/minecraft/world/gen/ChunkRandom.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom + FIELD field_28768 sampleCount I METHOD (J)V ARG 1 seed METHOD method_12659 setTerrainSeed (II)J @@ -65,3 +66,5 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom ARG 3 regionX ARG 4 regionZ ARG 5 salt + METHOD next (I)I + ARG 1 count diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping new file mode 100644 index 0000000000..1ee194d419 --- /dev/null +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -0,0 +1,48 @@ +CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler + FIELD field_28749 BIOME_WEIGHT_TABLE [F + FIELD field_28750 biomeSource Lnet/minecraft/class_1966; + FIELD field_28751 horizontalNoiseResolution I + FIELD field_28752 verticalNoiseResolution I + FIELD field_28753 noiseSizeY I + FIELD field_28754 config Lnet/minecraft/class_5309; + FIELD field_28755 noise Lnet/minecraft/class_5822; + FIELD field_28756 islandNoise Lnet/minecraft/class_3541; + FIELD field_28757 densityNoise Lnet/minecraft/class_3537; + FIELD field_28758 topSlideTarget D + FIELD field_28759 topSlideSize D + FIELD field_28760 topSlideOffset D + FIELD field_28761 bottomSlideTarget D + FIELD field_28762 bottomSlideSize D + FIELD field_28763 bottomSlideOffset D + FIELD field_28764 denityFactor D + FIELD field_28765 densityOffset D + METHOD (Lnet/minecraft/class_1966;IIILnet/minecraft/class_5309;Lnet/minecraft/class_5822;Lnet/minecraft/class_3541;Lnet/minecraft/class_3537;)V + ARG 1 biomeSource + ARG 2 horizontalNoiseResolution + ARG 3 verticalNoiseResolution + ARG 4 noiseSizeY + ARG 5 config + ARG 6 noise + ARG 7 islandNoise + ARG 8 densityNoise + METHOD method_33645 applySlides (DI)D + ARG 1 noise + ARG 3 y + METHOD method_33646 getOffset (IDDD)D + ARG 1 y + ARG 2 depth + ARG 4 scale + ARG 6 randomDensityOffset + METHOD method_33647 getDensityNoise (II)D + ARG 1 x + ARG 2 z + METHOD method_33648 sampleNoiseColumn ([DIILnet/minecraft/class_5309;III)V + ARG 1 buffer + ARG 2 x + ARG 3 z + ARG 4 config + ARG 5 seaLevel + ARG 6 minY + ARG 7 noiseSizeY + METHOD method_33649 ([F)V + ARG 0 array diff --git a/mappings/net/minecraft/world/gen/SimpleRandom.mapping b/mappings/net/minecraft/world/gen/SimpleRandom.mapping new file mode 100644 index 0000000000..991a000022 --- /dev/null +++ b/mappings/net/minecraft/world/gen/SimpleRandom.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5820 net/minecraft/world/gen/SimpleRandom + FIELD field_28766 seed Ljava/util/concurrent/atomic/AtomicLong; + METHOD (J)V + ARG 1 seed + METHOD method_33651 next (I)I + ARG 1 bits + METHOD setSeed (J)V + ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping new file mode 100644 index 0000000000..135ba775d4 --- /dev/null +++ b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_5817 net/minecraft/world/gen/StructureWeightSampler + FIELD field_28740 INSTANCE Lnet/minecraft/class_5817; + FIELD field_28741 STRUCTURE_WEIGHT_TABLE [F + FIELD field_28742 pieces Lit/unimi/dsi/fastutil/objects/ObjectList; + FIELD field_28743 junctions Lit/unimi/dsi/fastutil/objects/ObjectList; + FIELD field_28744 pieceIterator Lit/unimi/dsi/fastutil/objects/ObjectListIterator; + FIELD field_28745 junctionIterator Lit/unimi/dsi/fastutil/objects/ObjectListIterator; + METHOD (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V + ARG 1 accessor + ARG 2 chunk + METHOD method_33638 getWeight (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_33639 (Lnet/minecraft/class_1923;IILnet/minecraft/class_3449;)V + ARG 4 start + METHOD method_33640 ([F)V + ARG 0 array + METHOD method_33641 getStructureWeight (III)D + ARG 0 x + ARG 1 y + ARG 2 z + METHOD method_33642 calculateStructureWeight (III)D + ARG 0 x + ARG 1 y + ARG 2 z diff --git a/mappings/net/minecraft/world/gen/WorldGenRandom.mapping b/mappings/net/minecraft/world/gen/WorldGenRandom.mapping new file mode 100644 index 0000000000..99259824c2 --- /dev/null +++ b/mappings/net/minecraft/world/gen/WorldGenRandom.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5819 net/minecraft/world/gen/WorldGenRandom + METHOD method_33650 skip (I)V + ARG 1 count + METHOD nextInt (I)I + ARG 1 bound diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 01563114f7..af82110041 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -76,6 +76,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 x ARG 2 z ARG 3 heightmapType + ARG 4 world METHOD method_16398 getSeaLevel ()I METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I ARG 1 x @@ -88,6 +89,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_26261 getColumnSample (IILnet/minecraft/class_5539;)Lnet/minecraft/class_4966; ARG 1 x ARG 2 z + ARG 3 world METHOD method_27997 withSeed (J)Lnet/minecraft/class_2794; ARG 1 seed METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 50428b647e..d285ceed63 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -12,6 +12,9 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_24774 settings Ljava/util/function/Supplier; FIELD field_24778 seed J FIELD field_24779 worldHeight I + FIELD field_28746 EMPTY [Lnet/minecraft/class_2680; + FIELD field_28747 noiseSizeY I + FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 1 biomeSource ARG 2 seed @@ -24,6 +27,8 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD method_16406 sampleNoiseColumn (IIII)[D ARG 1 x ARG 2 z + ARG 3 minY + ARG 4 noiseSizeY METHOD method_16412 buildBedrock (Lnet/minecraft/class_2791;Ljava/util/Random;)V ARG 1 chunk ARG 2 random @@ -32,6 +37,16 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 z ARG 3 states ARG 4 predicate + ARG 5 minY + ARG 6 noiseSizeY METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z ARG 1 seed ARG 3 settingsKey + METHOD method_33643 getBlockState (Lnet/minecraft/class_5817;IIID)Lnet/minecraft/class_2680; + ARG 1 structures + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 noise + METHOD method_33644 swapElements ([Ljava/lang/Object;)V + ARG 1 array diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping index a0095a404a..189ba1feb6 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu FIELD field_24835 feature Lnet/minecraft/class_3195; FIELD field_24836 config Lnet/minecraft/class_3037; FIELD field_25834 CODEC Lcom/mojang/serialization/Codec; + FIELD field_26757 REGISTRY_ELEMENT_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;)V ARG 1 feature ARG 2 config diff --git a/mappings/net/minecraft/world/gen/feature/util/FeatureContext.mapping b/mappings/net/minecraft/world/gen/feature/util/FeatureContext.mapping new file mode 100644 index 0000000000..23557c5f89 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/util/FeatureContext.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_5821 net/minecraft/world/gen/feature/util/FeatureContext + FIELD field_28769 world Lnet/minecraft/class_5281; + FIELD field_28770 generator Lnet/minecraft/class_2794; + FIELD field_28771 random Ljava/util/Random; + FIELD field_28772 pos Lnet/minecraft/class_2338; + FIELD field_28773 config Lnet/minecraft/class_3037; + METHOD (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)V + ARG 1 world + ARG 2 generator + ARG 3 random + ARG 4 pos + ARG 5 config + METHOD method_33652 getWorld ()Lnet/minecraft/class_5281; + METHOD method_33653 getGenerator ()Lnet/minecraft/class_2794; + METHOD method_33654 getRandom ()Ljava/util/Random; + METHOD method_33655 getPos ()Lnet/minecraft/class_2338; + METHOD method_33656 getConfig ()Lnet/minecraft/class_3037;