From 89d7a1679cbf11343587c5c021cad6bdbf40109b Mon Sep 17 00:00:00 2001 From: mschae23 <46165762+mschae23@users.noreply.github.com> Date: Fri, 1 Oct 2021 20:09:33 +0200 Subject: [PATCH] Terrain generation mappings for 21w37a (#2697) * Terrain generation mappings for 21w37a * Added more terrain generation mappings Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: modmuss50 --- mappings/net/minecraft/class_6568.mapping | 43 ----- mappings/net/minecraft/class_6574.mapping | 7 + .../net/minecraft/world/chunk/Chunk.mapping | 13 ++ .../world/chunk/ChunkSection.mapping | 9 + .../minecraft/world/gen/BlockSource.mapping | 6 + .../world/gen/ChainedBlockSource.mapping | 4 + .../world/gen/DeepslateBlockSource.mapping | 2 + .../world/gen/NoiseColumnSampler.mapping | 147 +++++++++++++++- .../world/gen/chunk/AquiferSampler.mapping | 12 +- .../world/gen/chunk/ChunkGenerator.mapping | 7 + .../gen/chunk/ChunkGeneratorSettings.mapping | 6 +- .../world/gen/chunk/ChunkNoiseSampler.mapping | 166 ++++++++++++++++++ .../gen/chunk/NoiseChunkGenerator.mapping | 25 +++ 13 files changed, 396 insertions(+), 51 deletions(-) delete mode 100644 mappings/net/minecraft/class_6568.mapping create mode 100644 mappings/net/minecraft/class_6574.mapping create mode 100644 mappings/net/minecraft/world/gen/BlockSource.mapping create mode 100644 mappings/net/minecraft/world/gen/ChainedBlockSource.mapping create mode 100644 mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping diff --git a/mappings/net/minecraft/class_6568.mapping b/mappings/net/minecraft/class_6568.mapping deleted file mode 100644 index b2661b117e..0000000000 --- a/mappings/net/minecraft/class_6568.mapping +++ /dev/null @@ -1,43 +0,0 @@ -CLASS net/minecraft/class_6568 - CLASS class_5917 NoiseInterpolator - FIELD field_29227 startNoiseBuffer [[D - FIELD field_29228 endNoiseBuffer [[D - FIELD field_29233 x0y0z0 D - FIELD field_29234 x0y0z1 D - FIELD field_29235 x1y0z0 D - FIELD field_29236 x1y0z1 D - FIELD field_29237 x0y1z0 D - FIELD field_29238 x0y1z1 D - FIELD field_29239 x1y1z0 D - FIELD field_29240 x1y1z1 D - FIELD field_29241 x0z0 D - FIELD field_29242 x1z0 D - FIELD field_29243 x0z1 D - FIELD field_29244 x1z1 D - FIELD field_29245 z0 D - FIELD field_29246 z1 D - FIELD field_34623 columnSampler Lnet/minecraft/class_6568$class_6572; - FIELD field_34624 result D - METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6568$class_6572;)V - ARG 2 columnSampler - METHOD method_34286 sampleStartNoise ()V - METHOD method_34287 sampleNoiseY (D)V - ARG 1 deltaY - METHOD method_34288 sampleEndNoise (I)V - ARG 1 x - METHOD method_34289 sampleNoiseCorners (II)V - ARG 1 noiseY - ARG 2 noiseZ - METHOD method_34290 sampleNoise ([[DI)V - ARG 2 noiseX - METHOD method_34291 swapBuffers ()V - METHOD method_34292 sampleNoiseX (D)V - ARG 1 deltaX - METHOD method_34293 createBuffer (II)[[D - METHOD method_38363 sampleNoise (D)V - ARG 1 deltaZ - CLASS class_6572 ColumnSampler - METHOD calculateNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z diff --git a/mappings/net/minecraft/class_6574.mapping b/mappings/net/minecraft/class_6574.mapping new file mode 100644 index 0000000000..60d5b3c91a --- /dev/null +++ b/mappings/net/minecraft/class_6574.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_6574 + METHOD method_38418 (III)Lnet/minecraft/class_5820; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38419 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_5820; + ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 295a9ea0af..ad9c9342a0 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk COMMENT Represents a scoped, modifiable view of biomes, block states, fluid states and block entities. + FIELD field_34539 chunkNoiseSampler Lnet/minecraft/class_6568; FIELD field_34536 postProcessingLists [Lit/unimi/dsi/fastutil/shorts/ShortList; FIELD field_34537 needsSaving Z FIELD field_34538 pos Lnet/minecraft/class_1923; @@ -89,6 +90,18 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 ySectionCoord METHOD method_35319 sampleMaxHeightMap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2338; ARG 1 type + METHOD method_38255 getOrCreateChunkNoiseSampler (IIIIIILnet/minecraft/class_5818;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6568; + ARG 1 minimumY + ARG 2 height + ARG 3 x + ARG 4 z + ARG 5 horizontalNoiseResolution + ARG 6 verticalNoiseResolutuion + ARG 7 noiseColumnSampler + ARG 9 settings + METHOD method_38257 (Lnet/minecraft/class_1966;Lnet/minecraft/class_6544$class_6552;)V + ARG 1 source + ARG 2 sampler METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V ARG 0 world ARG 1 biome diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index a396f76cd8..7a27ccd5c9 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -43,4 +43,13 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 2 count METHOD method_31729 blockCoordFromChunkCoord (I)I ARG 0 chunkPos + METHOD method_38291 (Lnet/minecraft/class_1966;Lnet/minecraft/class_6544$class_6552;II)V + ARG 1 source + ARG 2 sampler + ARG 3 x + ARG 4 z METHOD method_38292 isEmpty ()Z + METHOD method_38293 (III)Lnet/minecraft/class_1959; + 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..4aaa3db9cf --- /dev/null +++ b/mappings/net/minecraft/world/gen/BlockSource.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_6583 net/minecraft/world/gen/BlockSource + METHOD apply (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_2680; + ARG 1 sampler + ARG 2 x + ARG 3 y + ARG 4 z diff --git a/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping b/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping new file mode 100644 index 0000000000..3ed95c8638 --- /dev/null +++ b/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_6582 net/minecraft/world/gen/ChainedBlockSource + FIELD field_34719 samplers Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 samplers diff --git a/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping b/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping index 535f514541..1e13c331b0 100644 --- a/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping +++ b/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateBlockSource FIELD field_31468 DEFAULT_MIN_Y I FIELD field_31469 MAX_Y I FIELD field_34588 deepslateState Lnet/minecraft/class_2680; + METHOD (Lnet/minecraft/class_6574;Lnet/minecraft/class_2680;)V + ARG 2 deepslateState diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index 640519e387..4713e9a887 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_28756 islandNoise Lnet/minecraft/class_3541; FIELD field_28764 densityFactor D FIELD field_28765 densityOffset D + FIELD field_34632 noiseSampler Lnet/minecraft/class_3757; FIELD field_34649 temperatureNoise Lnet/minecraft/class_5216; FIELD field_34650 humidityNoise Lnet/minecraft/class_5216; FIELD field_34651 continentalnessNoise Lnet/minecraft/class_5216; @@ -13,24 +14,166 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_34653 weirdnessNoise Lnet/minecraft/class_5216; FIELD field_34654 shiftNoise Lnet/minecraft/class_5216; FIELD field_34655 terrainParameters Lnet/minecraft/class_6555; + FIELD field_34657 intialNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34659 oreFrequencyNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34660 firstOrePlacementNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34661 secondOrePlacementNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34663 noodleCavesFrequencyNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34664 noodleCavesWeightReducingNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34665 noodleCavesFirstWeightNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34666 noodleCavesSecondWeightNoiseSampler Lnet/minecraft/class_6568$class_6571; + FIELD field_34667 hasNoiseCaves Z FIELD field_34680 noise Lnet/minecraft/class_6568$class_6572; METHOD (IIILnet/minecraft/class_5309;Lnet/minecraft/class_2088;ZJ)V - ARG 2 horizontalNoiseResolution - ARG 3 verticalNoiseResolution + ARG 1 horizontalNoiseResolution + ARG 2 verticalNoiseResolution + ARG 3 noiseSizeY ARG 4 config ARG 5 noiseParameters + ARG 6 hasNoiseCaves ARG 7 seed METHOD method_33645 applySlides (DI)D COMMENT Interpolates the noise at the top and bottom of the world. ARG 1 noise ARG 3 y + METHOD method_38372 getNoiseSampler ()Lnet/minecraft/class_3757; METHOD method_38373 getDepth (D)D + METHOD method_38374 shouldPlaceOreVeinBlock (DD)Z + ARG 1 firstOrePlacementNoise + ARG 3 secondOrePlacementNoise + METHOD method_38375 sampleTemperatureNoise (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_38376 createTerrainNoisePoint (IIFFF)Lnet/minecraft/class_6576; ARG 1 x ARG 2 z ARG 3 continentalness ARG 4 weirdness ARG 5 erosion + METHOD method_38377 sampleShiftNoise (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38378 (IIIDDFFFD)Lnet/minecraft/class_6544$class_6553; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 noiseX + ARG 6 noiseZ + ARG 8 continentalness + ARG 9 erosion + ARG 10 weirdness + ARG 11 offset + METHOD method_38379 createNoiseSamplerFactory (IIIDLnet/minecraft/class_5819;I[D)Lnet/minecraft/class_6568$class_6571; + ARG 0 minY + ARG 1 maxY + ARG 2 alternative + ARG 3 noiseScale + ARG 5 random + ARG 6 offset + ARG 7 octaves + METHOD method_38380 sampleNoiseColumn (IIILnet/minecraft/class_6576;)D + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 point + METHOD method_38381 sampleNoiseColumn (IIILnet/minecraft/class_6576;DZ)D + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 point + ARG 5 noise + ARG 7 hasNoNoiseCaves + METHOD method_38382 (IIILnet/minecraft/class_5216;DIII)D + ARG 6 x + ARG 7 y + ARG 8 z + METHOD method_38383 (IILnet/minecraft/class_6576;)I + ARG 1 x + ARG 2 z + ARG 3 point + METHOD method_38385 (Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_2680;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;III)Lnet/minecraft/class_2680; + ARG 5 x + ARG 6 y + ARG 7 z + METHOD method_38386 (Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6572;Lnet/minecraft/class_6568;III)Lnet/minecraft/class_2680; + ARG 7 x + ARG 8 y + ARG 9 z + METHOD method_38387 (Lnet/minecraft/class_6568;)Lnet/minecraft/class_6568$class_6573; + ARG 1 chunkNoiseSampler + METHOD method_38388 (Lnet/minecraft/class_6568;III)D + ARG 2 x + ARG 3 y + ARG 4 z + METHOD method_38389 createAquiferSampler (Lnet/minecraft/class_6568;IIIILnet/minecraft/class_6350$class_6565;Z)Lnet/minecraft/class_6350; + ARG 1 chunkNoiseSampler + ARG 2 x + ARG 3 z + ARG 4 minimumY + ARG 5 height + ARG 6 fluidLevelSampler + ARG 7 hasAquifers + METHOD method_38390 createInitialNoiseBlockStateSampler (Lnet/minecraft/class_6568;Lnet/minecraft/class_6568$class_6572;Z)Lnet/minecraft/class_6568$class_6569; + ARG 1 chunkNoiseSampler + ARG 2 columnSampler + ARG 3 hasNoodleCaves + METHOD method_38391 createOreVeinSampler (Lnet/minecraft/class_6568;Z)Lnet/minecraft/class_6568$class_6569; + ARG 1 chunkNoiseSampler + ARG 2 hasOreVeins + METHOD method_38393 sample (Lnet/minecraft/class_5216;DDDD)D + ARG 0 sampler + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_38396 sampleHumidityNoise (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_38397 getVeinType (DI)Lnet/minecraft/class_5818$class_6354; + ARG 1 oreFrequencyNoise + ARG 3 y + METHOD method_38398 (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38401 sampleContinentalnessNoise (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_38402 (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38404 sampleErosionNoise (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_38405 (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38407 sampleWeirdnessNoise (DDD)D + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_38408 (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38410 (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38411 (III)D + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38412 (III)Lnet/minecraft/class_2680; + ARG 0 x + ARG 1 y + ARG 2 z CLASS class_5841 CaveScaler METHOD method_33835 scaleCaves (D)D ARG 0 value diff --git a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping index 98506af983..e1b6735b36 100644 --- a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping @@ -3,8 +3,9 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler METHOD method_36381 seaLevel (Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;Lnet/minecraft/class_5818;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; METHOD method_38317 apply (IIIDD)Lnet/minecraft/class_2680; - ARG 2 x - ARG 3 y + ARG 1 x + ARG 2 y + ARG 3 z CLASS class_5832 Impl FIELD field_28813 edgeDensityNoise Lnet/minecraft/class_5216; FIELD field_28814 fluidLevelNoise Lnet/minecraft/class_5216; @@ -46,5 +47,10 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler METHOD (ILnet/minecraft/class_2680;)V ARG 1 y ARG 2 state - CLASS class_6565 + METHOD method_38318 getBlockState (I)Lnet/minecraft/class_2680; + ARG 1 y + CLASS class_6565 FluidLevelSampler METHOD computeFluid getFluidLevel (III)Lnet/minecraft/class_6350$class_6351; + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 1e389d50d0..7d3249d339 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -49,6 +49,8 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 region METHOD method_12108 carve (Lnet/minecraft/class_3233;JLnet/minecraft/class_4543;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V COMMENT Generates caves for the given chunk. + ARG 6 chunk + ARG 7 generationStep METHOD method_12109 getStructuresConfig ()Lnet/minecraft/class_5311; METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Places the surface blocks of the biomes after the noise has been generated. @@ -98,4 +100,9 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 pos METHOD method_28509 generateStrongholdPositions ()V METHOD method_33730 getMinimumY ()I + METHOD method_38266 canPlaceStrongholdInBiome (Lnet/minecraft/class_1959;)Z + ARG 0 biome METHOD method_38275 populateBiomes (Ljava/util/concurrent/Executor;Lnet/minecraft/class_2378;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 2 biomeRegistry + ARG 4 chunk + METHOD method_38276 getMultiNoiseSampler ()Lnet/minecraft/class_6544$class_6552; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index a1f1fb6775..ad6b7daa2e 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -21,11 +21,11 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_28914 deepslate Z FIELD field_33587 oreVeins Z FIELD field_33651 noodleCaves Z - FIELD field_34625 biomeSource Lnet/minecraft/class_2088; + FIELD field_34625 multiNoiseParameters Lnet/minecraft/class_2088; METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2088;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZZZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig - ARG 3 biomeSource + ARG 3 multiNoiseParameters ARG 4 defaultBlock ARG 5 defaultFluid ARG 6 bedrockFloorY @@ -78,4 +78,4 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_33839 hasDeepslate ()Z METHOD method_36396 hasOreVeins ()Z METHOD method_36468 hasNoodleCaves ()Z - METHOD method_38364 getBiomeSource ()Lnet/minecraft/class_2088; + METHOD method_38364 getMultiNoiseParameters ()Lnet/minecraft/class_2088; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping new file mode 100644 index 0000000000..f3de8ba158 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -0,0 +1,166 @@ +CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler + FIELD field_34596 horizontalNoiseResolution I + FIELD field_34597 verticalNoiseResolution I + FIELD field_34598 height I + FIELD field_34599 horizontalSize I + FIELD field_34600 minimumY I + FIELD field_34601 x I + FIELD field_34602 z I + FIELD field_34603 biomeX I + FIELD field_34604 biomeZ I + FIELD field_34605 interpolators Ljava/util/List; + FIELD field_34606 noiseX [[D + FIELD field_34607 noiseZ [[D + FIELD field_34608 continentalness [[D + FIELD field_34609 weirdness [[D + FIELD field_34610 erosion [[D + FIELD field_34611 terrainNoisePoint [[Lnet/minecraft/class_6576; + FIELD field_34612 terrainNoisePoints Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; + FIELD field_34614 initialNoiseBlockStateSampler Lnet/minecraft/class_6568$class_6569; + FIELD field_34615 oreVeinSampler Lnet/minecraft/class_6568$class_6569; + METHOD (IIIIILnet/minecraft/class_5818;IILnet/minecraft/class_6568$class_6572;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;)V + ARG 1 horizontalNoiseResolution + ARG 2 verticalNoiseResolution + ARG 3 horizontalSize + ARG 4 height + ARG 5 minimumY + ARG 6 noiseColumnSampler + ARG 7 x + ARG 8 z + ARG 9 columnSampler + ARG 10 settings + ARG 11 fluidLevelSampler + METHOD method_38336 sampleStartNoise ()V + METHOD method_38337 sampleNoiseY (D)V + ARG 1 deltaY + METHOD method_38338 (DLnet/minecraft/class_6568$class_5917;)V + ARG 2 interpolator + METHOD method_38339 sampleEndNoise (I)V + ARG 1 x + METHOD method_38340 getNoiseX (II)D + ARG 1 x + ARG 2 z + METHOD method_38341 sampleInitialNoiseBlockState (III)Lnet/minecraft/class_2680; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38342 (IILnet/minecraft/class_6568$class_5917;)V + ARG 2 interpolator + METHOD method_38343 (ILnet/minecraft/class_6568$class_5917;)V + ARG 1 interpolator + METHOD method_38344 createNoiseInterpolator (Lnet/minecraft/class_6568$class_6572;)Lnet/minecraft/class_6568$class_5917; + ARG 1 columnSampler + METHOD method_38345 (Lnet/minecraft/class_6568$class_5917;)V + ARG 0 interpolator + METHOD method_38346 createMultiNoisePoint (Lnet/minecraft/class_5818;II)Lnet/minecraft/class_6568$class_6570; + ARG 0 noiseColumnSampler + ARG 1 x + ARG 2 z + METHOD method_38347 (Lnet/minecraft/class_5818;J)Lnet/minecraft/class_6576; + ARG 1 pos + METHOD method_38348 swapBuffers ()V + METHOD method_38349 sampleNoiseX (D)V + ARG 1 deltaX + METHOD method_38350 (DLnet/minecraft/class_6568$class_5917;)V + ARG 2 interpolator + METHOD method_38351 getNoiseZ (II)D + ARG 1 x + ARG 2 z + METHOD method_38352 sampleOreVeins (III)Lnet/minecraft/class_2680; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38353 getTerrainNoisePoint (Lnet/minecraft/class_5818;II)Lnet/minecraft/class_6576; + ARG 1 columnSampler + ARG 2 x + ARG 3 z + METHOD method_38354 getAquiferSampler ()Lnet/minecraft/class_6350; + METHOD method_38355 sampleNoise (D)V + ARG 1 deltaZ + METHOD method_38356 (DLnet/minecraft/class_6568$class_5917;)V + ARG 2 interpolator + METHOD method_38357 getContinentalness (II)D + ARG 1 x + ARG 2 z + METHOD method_38358 getWeirdness (II)D + ARG 1 x + ARG 2 z + METHOD method_38359 getErosion (II)D + ARG 1 x + ARG 2 z + METHOD method_38360 getTerrainNoisePoint (II)Lnet/minecraft/class_6576; + ARG 1 x + ARG 2 z + METHOD method_38361 getInterpolatedTerrainNoisePoint (II)Lnet/minecraft/class_6576; + ARG 1 x + ARG 2 z + METHOD method_38362 sampleNoiseCorners (II)V + ARG 1 noiseY + ARG 2 noiseZ + CLASS class_5917 NoiseInterpolator + FIELD field_29227 startNoiseBuffer [[D + FIELD field_29228 endNoiseBuffer [[D + FIELD field_29233 x0y0z0 D + FIELD field_29234 x0y0z1 D + FIELD field_29235 x1y0z0 D + FIELD field_29236 x1y0z1 D + FIELD field_29237 x0y1z0 D + FIELD field_29238 x0y1z1 D + FIELD field_29239 x1y1z0 D + FIELD field_29240 x1y1z1 D + FIELD field_29241 x0z0 D + FIELD field_29242 x1z0 D + FIELD field_29243 x0z1 D + FIELD field_29244 x1z1 D + FIELD field_29245 z0 D + FIELD field_29246 z1 D + FIELD field_34623 columnSampler Lnet/minecraft/class_6568$class_6572; + FIELD field_34624 result D + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6568$class_6572;)V + ARG 2 columnSampler + METHOD method_34286 sampleStartNoise ()V + METHOD method_34287 sampleNoiseY (D)V + ARG 1 deltaY + METHOD method_34288 sampleEndNoise (I)V + ARG 1 x + METHOD method_34289 sampleNoiseCorners (II)V + ARG 1 noiseY + ARG 2 noiseZ + METHOD method_34290 sampleNoise ([[DI)V + ARG 1 buffer + ARG 2 noiseX + METHOD method_34291 swapBuffers ()V + METHOD method_34292 sampleNoiseX (D)V + ARG 1 deltaX + METHOD method_34293 createBuffer (II)[[D + ARG 1 sizeZ + ARG 2 sizeX + METHOD method_38363 sampleNoise (D)V + ARG 1 deltaZ + CLASS class_6569 BlockStateSampler + METHOD calculate sample (III)Lnet/minecraft/class_2680; + ARG 1 x + ARG 2 y + ARG 3 z + CLASS class_6570 MultiNoisePoint + FIELD field_34616 terrainNoisePoint Lnet/minecraft/class_6576; + FIELD field_34617 noiseX D + FIELD field_34618 noiseZ D + FIELD field_34619 continentalness D + FIELD field_34620 weirdness D + FIELD field_34621 erosion D + METHOD (Lnet/minecraft/class_5818;II)V + ARG 1 noiseColumnSampler + ARG 2 x + ARG 3 z + CLASS class_6571 ValueSamplerFactory + METHOD instantiate create (Lnet/minecraft/class_6568;)Lnet/minecraft/class_6568$class_6573; + ARG 1 chunkNoiseSampler + CLASS class_6572 ColumnSampler + METHOD calculateNoise (III)D + ARG 1 x + ARG 2 y + ARG 3 z + CLASS class_6573 ValueSampler + METHOD sample sample ()D diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index d3448a0489..4bbd01020d 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_28746 EMPTY [Lnet/minecraft/class_2680; FIELD field_28747 noiseSizeY I FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; + FIELD field_34590 blockStateSampler Lnet/minecraft/class_6583; + FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 1 biomeSource ARG 2 seed @@ -29,6 +31,8 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 z ARG 3 states ARG 4 predicate + ARG 5 minimumY + ARG 6 height METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z ARG 1 seed ARG 3 settingsKey @@ -39,3 +43,24 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 chunk ARG 3 startY ARG 4 noiseSizeY + METHOD method_38323 (IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 y + ARG 2 x + ARG 3 z + ARG 4 block + METHOD method_38325 (Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;III)Lnet/minecraft/class_6350$class_6351; + ARG 3 x + ARG 4 y + ARG 5 z + METHOD method_38326 (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_6544$class_6553; + ARG 2 x + ARG 3 y + ARG 4 z + METHOD method_38327 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V + ARG 1 biomeRegistry + ARG 2 world + ARG 3 chunk + METHOD method_38329 (III)D + ARG 0 x + ARG 1 y + ARG 2 z