From ed7e60a9fb23f313488c0eff75e16ee0c1d9b43e Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Wed, 23 Dec 2020 13:37:43 -0500 Subject: [PATCH] Random misc world gen mappings (#1908) * Random misc world gen mappings * Apply suggestions from code review Co-authored-by: YanisBft Co-authored-by: YanisBft --- .../net/minecraft/util/math/BlockBox.mapping | 1 + .../util/math/BlockPointerImpl.mapping | 1 + .../util/math/ChunkSectionPos.mapping | 3 +++ .../net/minecraft/util/math/IntRange.mapping | 1 + .../util/math/noise/NoiseSampler.mapping | 2 ++ .../noise/OctavePerlinNoiseSampler.mapping | 14 +++++++++++++- .../noise/OctaveSimplexNoiseSampler.mapping | 12 ++++++++++++ .../util/math/noise/PerlinNoiseSampler.mapping | 2 ++ .../math/noise/SimplexNoiseSampler.mapping | 7 ++++++- .../world/biome/DefaultBiomeCreator.mapping | 1 + .../biome/layer/AddEdgeBiomesLayer.mapping | 2 ++ .../world/biome/layer/AddHillsLayer.mapping | 3 +++ .../world/biome/layer/BiomeLayers.mapping | 7 +++++++ .../biome/layer/EaseBiomeEdgeLayer.mapping | 12 ++++++++++++ .../world/biome/layer/ScaleLayer.mapping | 4 ++++ .../biome/layer/type/MergingLayer.mapping | 3 +++ .../biome/layer/type/ParentedLayer.mapping | 3 +++ .../layer/util/LayerSampleContext.mapping | 2 ++ .../biome/source/BiomeLayerSampler.mapping | 3 +++ .../source/VanillaLayeredBiomeSource.mapping | 2 ++ .../minecraft/world/gen/carver/Carver.mapping | 8 ++++++++ .../world/gen/carver/CaveCarver.mapping | 2 +- .../gen/carver/UnderwaterCaveCarver.mapping | 2 ++ ... => SpreadDoubleHeightmapDecorator.mapping} | 2 +- ... => WorldSurfaceHeightmapDecorator.mapping} | 2 +- .../gen/feature/DefaultBiomeFeatures.mapping | 2 ++ .../world/gen/feature/TreeFeature.mapping | 7 +++++++ .../gen/feature/TwistingVinesFeature.mapping | 18 ++++++++++++++++++ .../world/gen/feature/size/FeatureSize.mapping | 7 ++++++- .../gen/tree/AlterGroundTreeDecorator.mapping | 12 ++++++++++++ ...mapping => LeavesVineTreeDecorator.mapping} | 2 +- .../world/gen/trunk/GiantTrunkPlacer.mapping | 11 +++++++++++ .../gen/trunk/LargeOakTrunkPlacer.mapping | 1 + 33 files changed, 154 insertions(+), 7 deletions(-) rename mappings/net/minecraft/world/gen/decorator/{HeightmapSpreadDoubleDecorator.mapping => SpreadDoubleHeightmapDecorator.mapping} (66%) rename mappings/net/minecraft/world/gen/decorator/{HeightmapWorldSurfaceDecorator.mapping => WorldSurfaceHeightmapDecorator.mapping} (66%) rename mappings/net/minecraft/world/gen/tree/{LeaveVineTreeDecorator.mapping => LeavesVineTreeDecorator.mapping} (96%) diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping index 8c6f9e7d41..5620d783d1 100644 --- a/mappings/net/minecraft/util/math/BlockBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -64,3 +64,4 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox COMMENT @implNote Biased toward the minimum bound corner of the box. METHOD method_27234 infinite ()Lnet/minecraft/class_3341; METHOD method_29299 move (Lnet/minecraft/class_2382;)V + ARG 1 vec diff --git a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping index 2efb4e4f52..dbddf432e8 100644 --- a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping +++ b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping @@ -2,4 +2,5 @@ CLASS net/minecraft/class_2345 net/minecraft/util/math/BlockPointerImpl FIELD field_11011 world Lnet/minecraft/class_3218; FIELD field_11012 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index c2f6398fc9..34cadfd3d9 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -127,6 +127,9 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos COMMENT Gets the world position of the given local position within this chunk section. COMMENT @see #packLocal ARG 1 packedLocalPos + METHOD method_32205 getOffsetPos (II)I + ARG 0 chunkCoord + ARG 1 offset CLASS 1 FIELD field_19263 iterator Lnet/minecraft/class_3980; METHOD tryAdvance (Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/util/math/IntRange.mapping b/mappings/net/minecraft/util/math/IntRange.mapping index 68803fd2c1..2329d91588 100644 --- a/mappings/net/minecraft/util/math/IntRange.mapping +++ b/mappings/net/minecraft/util/math/IntRange.mapping @@ -10,5 +10,6 @@ CLASS net/minecraft/class_4801 net/minecraft/util/math/IntRange ARG 0 min ARG 1 max METHOD method_24503 choose (Ljava/util/Random;)I + ARG 1 random METHOD method_29492 getMin ()I METHOD method_29493 getMax ()I diff --git a/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping index 0567a59733..80cde99157 100644 --- a/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_3757 net/minecraft/util/math/noise/NoiseSampler METHOD method_16454 sample (DDDD)D ARG 1 x ARG 3 y + ARG 5 yScale + ARG 7 yMax diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index c6fc365ae4..51df9228a7 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -1,5 +1,11 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSampler FIELD field_15744 octaveSamplers [Lnet/minecraft/class_3756; + FIELD field_20659 persistence D + FIELD field_20660 lacunarity D + FIELD field_26445 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; + METHOD (Lnet/minecraft/class_2919;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 random + ARG 2 offsetAndAmplitudes METHOD (Lnet/minecraft/class_2919;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V ARG 1 random ARG 2 octaves @@ -14,13 +20,19 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa ARG 3 y ARG 5 z METHOD method_16452 maintainPrecision (D)D + ARG 0 value METHOD method_16453 sample (DDDDDZ)D ARG 1 x ARG 3 y ARG 5 z + ARG 7 yScale + ARG 9 yMax + ARG 11 useOrigin METHOD method_16668 getOctave (I)Lnet/minecraft/class_3756; ARG 1 octave METHOD method_30847 create (Lnet/minecraft/class_2919;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_3537; ARG 0 random ARG 1 offset - ARG 2 octaves + ARG 2 amplitudes + METHOD method_30848 calculateAmplitudes (Lit/unimi/dsi/fastutil/ints/IntSortedSet;)Lcom/mojang/datafixers/util/Pair; + ARG 0 octaves diff --git a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping index 9d5e7227b1..c16050375f 100644 --- a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping @@ -1,5 +1,17 @@ CLASS net/minecraft/class_3543 net/minecraft/util/math/noise/OctaveSimplexNoiseSampler FIELD field_15770 octaveSamplers [Lnet/minecraft/class_3541; + FIELD field_20661 persistence D + FIELD field_20662 lacunarity D + METHOD (Lnet/minecraft/class_2919;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V + ARG 1 random + ARG 2 octaves + METHOD (Lnet/minecraft/class_2919;Ljava/util/List;)V + ARG 1 random + ARG 2 octaves + METHOD (Lnet/minecraft/class_2919;Ljava/util/stream/IntStream;)V + ARG 1 random + ARG 2 octaves METHOD method_16451 sample (DDZ)D ARG 1 x ARG 3 y + ARG 5 useOrigin diff --git a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping index c0662fdcfe..74ebdf0672 100644 --- a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler ARG 1 x ARG 3 y ARG 5 z + ARG 7 yScale + ARG 9 yMax METHOD method_16448 grad (IDDD)D ARG 0 hash ARG 1 x diff --git a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping index a9bd119680..e9b742be72 100644 --- a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler FIELD field_15763 originX D FIELD field_15764 SQRT_3 D FIELD field_15765 permutations [I - FIELD field_15766 gradients [[I + FIELD field_15766 GRADIENTS [[I FIELD field_15767 UNSKEW_FACTOR_2D D FIELD field_15768 SKEW_FACTOR_2D D METHOD (Ljava/util/Random;)V @@ -22,5 +22,10 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler ARG 2 x ARG 4 y ARG 6 z + ARG 8 distance METHOD method_16456 getGradient (I)I ARG 1 hash + METHOD method_22416 sample (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping index 7e3a3bd40f..3dc44d966f 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping @@ -124,3 +124,4 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 2 temperature METHOD method_31068 createSavannaSpawnSettings ()Lnet/minecraft/class_5483$class_5496; METHOD method_31069 createForestSpawnSettings ()Lnet/minecraft/class_5483$class_5496; + METHOD method_33132 createDripstoneCaves ()Lnet/minecraft/class_1959; diff --git a/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping index a6d1495aea..7effd8b343 100644 --- a/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_3655 net/minecraft/world/biome/layer/AddEdgeBiomesLayer + FIELD field_26728 SNOWY_IDS Lit/unimi/dsi/fastutil/ints/IntSet; + FIELD field_26729 FOREST_IDS Lit/unimi/dsi/fastutil/ints/IntSet; METHOD method_15851 isWooded (I)Z ARG 0 id METHOD method_15852 isBadlands (I)Z diff --git a/mappings/net/minecraft/world/biome/layer/AddHillsLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddHillsLayer.mapping index a4f3c25d0a..4951198719 100644 --- a/mappings/net/minecraft/world/biome/layer/AddHillsLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddHillsLayer.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3648 net/minecraft/world/biome/layer/AddHillsLayer FIELD field_16128 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_26727 MUTATED_BIOMES Lit/unimi/dsi/fastutil/ints/Int2IntMap; + METHOD method_31118 (Lit/unimi/dsi/fastutil/ints/Int2IntOpenHashMap;)V + ARG 0 map diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping b/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping index 7ac116f6c0..24e7282550 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping +++ b/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers + FIELD field_26709 BY_CATEGORY Lit/unimi/dsi/fastutil/ints/Int2IntMap; METHOD method_15843 build (JZII)Lnet/minecraft/class_3642; ARG 0 seed ARG 2 old @@ -24,4 +25,10 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers ARG 5 contextProvider METHOD method_15849 (JJ)Lnet/minecraft/class_3631; ARG 2 salt + METHOD method_31116 (Lit/unimi/dsi/fastutil/ints/Int2IntOpenHashMap;)V + ARG 0 map + METHOD method_31117 putCategory (Lit/unimi/dsi/fastutil/ints/Int2IntOpenHashMap;Lnet/minecraft/class_3645$class_5503;I)V + ARG 0 map + ARG 1 category + ARG 2 id CLASS class_5503 Category diff --git a/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping b/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping index c6f2acafa1..ca6d6d9225 100644 --- a/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping @@ -1 +1,13 @@ CLASS net/minecraft/class_3641 net/minecraft/world/biome/layer/EaseBiomeEdgeLayer + METHOD method_15840 areEdgesSimilar ([IIIIIIII)Z + ARG 1 ids + ARG 2 n + ARG 3 e + ARG 4 s + ARG 5 w + ARG 6 center + ARG 7 id1 + ARG 8 id2 + METHOD method_15841 isMountain ([II)Z + ARG 1 ids + ARG 2 id diff --git a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping index b9bf129d6e..01663a3a6b 100644 --- a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_3656 net/minecraft/world/biome/layer/ScaleLayer METHOD method_15853 sample (Lnet/minecraft/class_3628;IIII)I ARG 1 context + ARG 2 tl + ARG 3 tr + ARG 4 bl + ARG 5 br diff --git a/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping index aeb97195b0..334e4799ec 100644 --- a/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_3659 net/minecraft/world/biome/layer/type/MergingLayer + METHOD method_15858 (Lnet/minecraft/class_3628;Lnet/minecraft/class_3625;Lnet/minecraft/class_3625;II)I + ARG 4 x + ARG 5 z METHOD method_15860 create (Lnet/minecraft/class_3628;Lnet/minecraft/class_3627;Lnet/minecraft/class_3627;)Lnet/minecraft/class_3627; ARG 1 context ARG 2 layer1 diff --git a/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping index 8523c7e68e..9af86912f3 100644 --- a/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping @@ -7,3 +7,6 @@ CLASS net/minecraft/class_3660 net/minecraft/world/biome/layer/type/ParentedLaye ARG 2 parent ARG 3 x ARG 4 z + METHOD method_15864 (Lnet/minecraft/class_3628;Lnet/minecraft/class_3625;II)I + ARG 3 x + ARG 4 z diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping index 38aa6834c4..67ef08544e 100644 --- a/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_3628 net/minecraft/world/biome/layer/util/LayerSampleContext METHOD method_15828 createSampler (Lnet/minecraft/class_4;Lnet/minecraft/class_3625;Lnet/minecraft/class_3625;)Lnet/minecraft/class_3625; ARG 1 operator + ARG 2 firstParent + ARG 3 secondParent METHOD method_15830 initSeed (JJ)V ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping index 085c97704a..ba5e783668 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_3642 net/minecraft/world/biome/source/BiomeLayerSample METHOD (Lnet/minecraft/class_3627;)V ARG 1 layerFactory METHOD method_16341 sample (Lnet/minecraft/class_2378;II)Lnet/minecraft/class_1959; + ARG 1 biomeRegistry + ARG 2 x + ARG 3 z diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping index 1445148dfa..fa367988e5 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBi ARG 3 legacyBiomeInitLayer ARG 4 largeBiomes ARG 5 biomeRegistry + METHOD method_31103 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/function/Supplier; + ARG 1 key diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 2163aba50f..4bd9c4c2ab 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -20,10 +20,13 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 7 mainChunkX ARG 8 mainChunkZ ARG 9 carvingMask + ARG 10 config METHOD method_12703 canCarveBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 1 state ARG 2 stateAbove METHOD method_12704 register (Ljava/lang/String;Lnet/minecraft/class_2939;)Lnet/minecraft/class_2939; + ARG 0 name + ARG 1 carver METHOD method_12705 shouldCarve (Ljava/util/Random;IILnet/minecraft/class_2920;)Z ARG 1 random ARG 2 chunkX @@ -74,6 +77,10 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 1 chunk ARG 2 posToBiome ARG 3 carvingMask + ARG 4 random + ARG 5 currentPos + ARG 6 upperPos + ARG 7 lowerPos ARG 8 seaLevel ARG 9 mainChunkX ARG 10 mainChunkZ @@ -82,6 +89,7 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 13 relativeX ARG 14 y ARG 15 relativeZ + ARG 16 visitedSurface METHOD method_16582 isPositionExcluded (DDDI)Z ARG 1 scaledRelativeX ARG 3 scaledRelativeY diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index 21b6d8268b..f85d150113 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver ARG 17 carvingMask METHOD method_12675 carveTunnels (Lnet/minecraft/class_2791;Ljava/util/function/Function;JIIIDDDFFFIIDLjava/util/BitSet;)V ARG 1 chunk - ARG 2 postToBiome + ARG 2 posToBiome ARG 3 seed ARG 5 seaLevel ARG 6 mainChunkX diff --git a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping index 09af1e39b3..af33e0bb1e 100644 --- a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_2936 net/minecraft/world/gen/carver/UnderwaterCaveCarver + METHOD (Lcom/mojang/serialization/Codec;)V + ARG 1 configCodec METHOD method_16138 carveAtPoint (Lnet/minecraft/class_2939;Lnet/minecraft/class_2791;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;IIIIIIII)Z ARG 0 carver ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping similarity index 66% rename from mappings/net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator.mapping rename to mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping index 1a83edd0d2..6d4cf123f7 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_5448 net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator +CLASS net/minecraft/class_5448 net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapWorldSurfaceDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/WorldSurfaceHeightmapDecorator.mapping similarity index 66% rename from mappings/net/minecraft/world/gen/decorator/HeightmapWorldSurfaceDecorator.mapping rename to mappings/net/minecraft/world/gen/decorator/WorldSurfaceHeightmapDecorator.mapping index 98f9c31803..cee764cd0c 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapWorldSurfaceDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/WorldSurfaceHeightmapDecorator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_5446 net/minecraft/world/gen/decorator/HeightmapWorldSurfaceDecorator +CLASS net/minecraft/class_5446 net/minecraft/world/gen/decorator/WorldSurfaceHeightmapDecorator diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 511ca45862..1a43d51a60 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -87,3 +87,5 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 2 squidMaxGroupSize ARG 3 codWeight METHOD method_30680 addPlainsMobs (Lnet/minecraft/class_5483$class_5496;)V + METHOD method_32236 addAmethystGeodes (Lnet/minecraft/class_5485$class_5495;)V + METHOD method_33131 addDripstone (Lnet/minecraft/class_5485$class_5495;)V diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 03f7af6803..9a4b55d64f 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -51,3 +51,10 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos + METHOD method_27372 (Lnet/minecraft/class_4643;Lnet/minecraft/class_5281;Ljava/util/Random;IIILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4647$class_5208;)V + ARG 8 node + METHOD method_29963 getTopPosition (Lnet/minecraft/class_3746;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)I + ARG 1 world + ARG 2 height + ARG 3 pos + ARG 4 config diff --git a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping index 3de38c87d1..d7d94a9c9a 100644 --- a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeature METHOD method_25986 isNotSuitable (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos METHOD method_25987 generateVineColumn (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V ARG 0 world ARG 1 random @@ -8,3 +10,19 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeat ARG 4 minAge ARG 5 maxAge METHOD method_25988 generateVinesInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;III)V + ARG 0 world + ARG 1 random + ARG 2 pos + ARG 3 horizontalSpread + ARG 4 verticalSpread + ARG 5 length + METHOD method_26265 tryGenerateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;III)Z + ARG 0 world + ARG 1 random + ARG 2 pos + ARG 3 horizontalSpread + ARG 4 verticalSpread + ARG 5 length + METHOD method_27220 canGenerate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338$class_2339;)Z + ARG 0 world + ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping index 18fc572edd..11be171b0b 100644 --- a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping @@ -1,8 +1,13 @@ CLASS net/minecraft/class_5201 net/minecraft/world/gen/feature/size/FeatureSize + COMMENT In charge of determining the amount of space needed by a tree to generate. FIELD field_24146 minClippedHeight Ljava/util/OptionalInt; FIELD field_24922 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/OptionalInt;)V ARG 1 minClippedHeight METHOD method_27377 getMinClippedHeight ()Ljava/util/OptionalInt; - METHOD method_28820 createCodecBuilder ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; + METHOD method_27378 getRadius (II)I + COMMENT The radius that the tree needs to be empty or replaceable in order for it to generate. + ARG 1 height + ARG 2 y + METHOD method_28820 createCodec ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; METHOD method_28824 getType ()Lnet/minecraft/class_5202; diff --git a/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping index e38d7b4dd8..4181e4f6f0 100644 --- a/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping @@ -3,3 +3,15 @@ CLASS net/minecraft/class_4658 net/minecraft/world/gen/tree/AlterGroundTreeDecor FIELD field_24957 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_4651;)V ARG 1 provider + METHOD method_23460 (ILnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_23461 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)V + ARG 3 pos + METHOD method_23462 setArea (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 random + ARG 3 pos + METHOD method_23463 setColumn (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 random + ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/tree/LeaveVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/tree/LeavesVineTreeDecorator.mapping similarity index 96% rename from mappings/net/minecraft/world/gen/tree/LeaveVineTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/tree/LeavesVineTreeDecorator.mapping index 8352a56101..5b2fb0a58a 100644 --- a/mappings/net/minecraft/world/gen/tree/LeaveVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/tree/LeavesVineTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4661 net/minecraft/world/gen/tree/LeaveVineTreeDecorator +CLASS net/minecraft/class_4661 net/minecraft/world/gen/tree/LeavesVineTreeDecorator FIELD field_24960 CODEC Lcom/mojang/serialization/Codec; FIELD field_24961 INSTANCE Lnet/minecraft/class_4661; METHOD method_23467 placeVines (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/Set;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping index 53df8dc4e9..d52e434193 100644 --- a/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping @@ -1,2 +1,13 @@ CLASS net/minecraft/class_5214 net/minecraft/world/gen/trunk/GiantTrunkPlacer FIELD field_24969 CODEC Lcom/mojang/serialization/Codec; + METHOD method_27399 setLog (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;III)V + ARG 0 world + ARG 1 random + ARG 2 mutable + ARG 3 placedStates + ARG 4 box + ARG 5 config + ARG 6 pos + ARG 7 x + ARG 8 y + ARG 9 z diff --git a/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping index 67cb5cc746..87dc29dc3a 100644 --- a/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_5212 net/minecraft/world/gen/trunk/LargeOakTrunkPlacer ARG 8 config METHOD method_27393 makeOrCheckBranch (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z ARG 1 world + ARG 2 random ARG 3 start ARG 4 end ARG 5 make