From 8f383fa15ea840a0cf4c64cf81df33bd11419799 Mon Sep 17 00:00:00 2001 From: mschae23 <46165762+mschae23@users.noreply.github.com> Date: Sun, 26 Sep 2021 18:34:16 +0200 Subject: [PATCH] Biome generation mappings for 21w37a (#2690) * Biome generation mappings for 21w37a * Fixed new blockstate providers not being in the right package and added mappings in SurfaceRelativeThresholdDecoratorConfig * Remove mappings for Range, remove "2D" from block state provider names * Removed empty mapping file (Range) * Fixed merge conflicts * Renamed NoiseCutoffBlockStateProvider -> NoiseThresholdBlockStateProvider --- mappings/net/minecraft/class_6568.mapping | 10 ++++- .../net/minecraft/util/dynamic/Codecs.mapping | 8 ++++ .../net/minecraft/util/math/Spline.mapping | 11 ++++++ .../noise/DoublePerlinNoiseSampler.mapping | 3 ++ .../world/biome/source/BiomeSource.mapping | 8 ++++ .../source/MultiNoiseBiomeSource.mapping | 9 +++++ .../source/VanillaLayeredBiomeSource.mapping | 2 - .../biome/source/util/MultiNoiseUtil.mapping | 38 +++++++++++++++++++ .../source/util/TerrainNoisePoint.mapping | 7 ++++ .../util/VanillaBiomeParameters.mapping | 30 +++++++++++++++ .../util/VanillaTerrainParameters.mapping | 25 +++++++++--- .../world/gen/MultiNoiseParameters.mapping | 21 ++++++++++ .../world/gen/NoiseColumnSampler.mapping | 16 ++++++++ ...ceRelativeThresholdDecoratorConfig.mapping | 7 ++++ .../AbstractNoiseBlockStateProvider.mapping | 14 +++++++ .../DualNoiseBlockStateProvider.mapping | 16 ++++++++ .../NoiseBlockStateProvider.mapping | 17 +++++++++ .../NoiseThresholdBlockStateProvider.mapping | 16 ++++++++ 18 files changed, 249 insertions(+), 9 deletions(-) delete mode 100644 mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping create mode 100644 mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping create mode 100644 mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping create mode 100644 mappings/net/minecraft/world/gen/stateprovider/AbstractNoiseBlockStateProvider.mapping create mode 100644 mappings/net/minecraft/world/gen/stateprovider/DualNoiseBlockStateProvider.mapping create mode 100644 mappings/net/minecraft/world/gen/stateprovider/NoiseBlockStateProvider.mapping create mode 100644 mappings/net/minecraft/world/gen/stateprovider/NoiseThresholdBlockStateProvider.mapping diff --git a/mappings/net/minecraft/class_6568.mapping b/mappings/net/minecraft/class_6568.mapping index ef676c8e13..b2661b117e 100644 --- a/mappings/net/minecraft/class_6568.mapping +++ b/mappings/net/minecraft/class_6568.mapping @@ -17,6 +17,9 @@ CLASS net/minecraft/class_6568 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 @@ -33,5 +36,8 @@ CLASS net/minecraft/class_6568 METHOD method_34293 createBuffer (II)[[D METHOD method_38363 sampleNoise (D)V ARG 1 deltaZ - CLASS class_6572 - METHOD calculateNoise sample (III)D + CLASS class_6572 ColumnSampler + METHOD calculateNoise (III)D + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 4f01788ff0..6f38043a80 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs COMMENT {@link #nonEmptyList(Codec)}. FIELD field_33441 NONNEGATIVE_INT Lcom/mojang/serialization/Codec; FIELD field_33442 POSITIVE_INT Lcom/mojang/serialization/Codec; + FIELD field_34387 POSITIVE_FLOAT Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -49,6 +50,13 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 supplier METHOD method_37351 createPresentValuesChecker ()Ljava/util/function/Function; METHOD method_37352 createPresentValueChecker ()Ljava/util/function/Function; + METHOD method_37931 createCodecForPairObject (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 codec + ARG 1 leftFieldName + ARG 2 rightFieldName + ARG 3 combineFunction + ARG 4 leftFunction + ARG 5 rightFunction CLASS class_5839 Xor COMMENT An xor codec that only permits exactly one of the two data choices to be COMMENT present. diff --git a/mappings/net/minecraft/util/math/Spline.mapping b/mappings/net/minecraft/util/math/Spline.mapping index 2f14cb6736..a8e888477b 100644 --- a/mappings/net/minecraft/util/math/Spline.mapping +++ b/mappings/net/minecraft/util/math/Spline.mapping @@ -3,10 +3,21 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline FIELD field_34379 locations [F FIELD field_34380 values Ljava/util/List; FIELD field_34381 derivatives [F + METHOD (Lnet/minecraft/class_6501;[FLjava/util/List;[F)V + ARG 1 locationFunction + ARG 2 locations + ARG 3 values + ARG 4 derivatives + METHOD method_37914 getLocationFunction ()Lnet/minecraft/class_6501; + METHOD method_37917 getValue (I)Lnet/minecraft/class_6501; + ARG 1 index METHOD method_37918 builder (Lnet/minecraft/class_6501;)Lnet/minecraft/class_6492$class_6493; ARG 0 locationFunction METHOD method_37919 getListAsString ([F)Ljava/lang/String; ARG 1 locations + METHOD method_37921 getLocations ()Ljava/util/List; + METHOD method_37922 getDerivative (I)F + ARG 1 index CLASS class_6493 Builder FIELD field_34382 locationFunction Lnet/minecraft/class_6501; FIELD field_34383 locations Lit/unimi/dsi/fastutil/floats/FloatList; diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index fab34ed712..7a9f786722 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -21,6 +21,9 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa ARG 0 random ARG 1 offset ARG 2 octaves + METHOD method_38476 create (Lnet/minecraft/class_5819;Lnet/minecraft/class_5216$class_5487;)Lnet/minecraft/class_5216; + ARG 0 random + ARG 1 parameters CLASS class_5487 NoiseParameters FIELD field_26438 CODEC Lcom/mojang/serialization/Codec; FIELD field_26439 firstOctave I diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 46af0ae59d..b14d5adbe3 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -9,13 +9,20 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 4 radius ARG 6 predicate ARG 7 random + ARG 9 noiseSampler METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966; ARG 1 seed METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_28443 getBiomes ()Ljava/util/List; + METHOD method_38109 getBiome (IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 noiseSampler METHOD method_38114 addDebugInfo (Ljava/util/List;Lnet/minecraft/class_2338;Lnet/minecraft/class_6544$class_6552;)V ARG 1 info ARG 2 pos + ARG 3 noiseSampler METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Ljava/util/Random;Lnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_2338; ARG 1 x ARG 2 y @@ -23,6 +30,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 4 radius ARG 5 predicate ARG 6 random + ARG 7 noiseSampler METHOD method_8763 getBiomesInArea (IIIILnet/minecraft/class_6544$class_6552;)Ljava/util/Set; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index e7c3657b19..8bed56c225 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -4,8 +4,16 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_24719 CODEC Lcom/mojang/serialization/Codec; FIELD field_24721 instance Ljava/util/Optional; FIELD field_34498 biomeEntries Lnet/minecraft/class_6544$class_6547; + METHOD (Lnet/minecraft/class_6544$class_6547;)V + ARG 1 entries + METHOD (Lnet/minecraft/class_6544$class_6547;Ljava/util/Optional;)V + ARG 1 biomeEntries + ARG 2 instance METHOD method_31085 getInstance ()Ljava/util/Optional; + METHOD method_38167 getBiomeAtPoint (Lnet/minecraft/class_6544$class_6553;)Lnet/minecraft/class_1959; + ARG 1 point METHOD method_38168 matchesInstance (Lnet/minecraft/class_4766$class_5305;)Z + ARG 1 instance CLASS class_5305 Preset FIELD field_24723 NETHER Lnet/minecraft/class_4766$class_5305; FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; @@ -14,6 +22,7 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_34499 OVERWORLD Lnet/minecraft/class_4766$class_5305; METHOD (Lnet/minecraft/class_2960;Ljava/util/function/BiFunction;)V ARG 1 id + ARG 2 biomeSourceFunction METHOD method_28469 getBiomeSource (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; ARG 1 biomeRegistry METHOD method_31088 (Lnet/minecraft/class_4766$class_5305;Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping deleted file mode 100644 index 3716e3ef34..0000000000 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource - FIELD field_24727 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index d8caa3405b..6da51cfe04 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -84,9 +84,28 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD comp_104 max ()J METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_38119 getMin ()F + METHOD method_38120 of (F)Lnet/minecraft/class_6544$class_6546; + ARG 0 point + METHOD method_38121 of (FF)Lnet/minecraft/class_6544$class_6546; + ARG 0 min + ARG 1 max METHOD method_38122 getDistance (Lnet/minecraft/class_6544$class_6546;)J ARG 1 other + METHOD method_38123 combine (Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_6544$class_6546; + COMMENT Creates a new {@link MultiNoiseUtil.ParameterRange} that combines the parameters. + COMMENT + COMMENT @return the created parameter range. + ARG 0 min + COMMENT this will be used for the created range's minimum value + ARG 1 max + COMMENT this will be used for the created range's maximum value + METHOD method_38124 (Ljava/lang/Float;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult; + ARG 0 min + ARG 1 max + METHOD method_38125 getMax ()F METHOD method_38126 getDistance (J)J + ARG 1 noise METHOD method_38127 combine (Lnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_6544$class_6546; ARG 1 other CLASS class_6547 Entries @@ -109,6 +128,9 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU CLASS class_6548 SearchTree FIELD field_34486 MAX_NODES_FOR_SIMPLE_TREE I FIELD field_34487 firstNode Lnet/minecraft/class_6544$class_6548$class_6550; + FIELD field_34488 previousResultNode Ljava/lang/ThreadLocal; + METHOD (Lnet/minecraft/class_6544$class_6548$class_6550;)V + ARG 1 firstNode METHOD method_38146 (ILnet/minecraft/class_6544$class_6548$class_6550;)J ARG 1 node METHOD method_38147 (ILnet/minecraft/class_6544$class_6548$class_6551;)Lnet/minecraft/class_6544$class_6548$class_6550; @@ -116,6 +138,11 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD method_38148 createNode (ILjava/util/List;)Lnet/minecraft/class_6544$class_6548$class_6550; ARG 0 parameterNumber ARG 1 subTree + METHOD method_38149 createNodeComparator (IZ)Ljava/util/Comparator; + ARG 0 currentParameter + ARG 1 abs + METHOD method_38150 (IZLnet/minecraft/class_6544$class_6548$class_6550;)D + ARG 2 node METHOD method_38151 get (Lnet/minecraft/class_6544$class_6553;Lnet/minecraft/class_6544$class_6545;)Ljava/lang/Object; ARG 1 point ARG 2 distanceFunction @@ -125,6 +152,9 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU ARG 0 entries METHOD method_38154 sortTree (Ljava/util/List;IIZ)V ARG 0 subTree + ARG 1 parameterNumber + ARG 2 currentParameter + ARG 3 abs METHOD method_38155 getRangeLengthSum ([Lnet/minecraft/class_6544$class_6546;)J ARG 0 parameters METHOD method_38156 getBatchedTree (Ljava/util/List;)Ljava/util/List; @@ -141,13 +171,21 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD (Ljava/util/List;)V ARG 1 subTree METHOD method_38158 getResultingNode ([JLnet/minecraft/class_6544$class_6548$class_6549;Lnet/minecraft/class_6544$class_6545;)Lnet/minecraft/class_6544$class_6548$class_6549; + ARG 1 otherParameters + ARG 2 alternative + ARG 3 distanceFunction METHOD method_38159 getSquaredDistance ([J)J + ARG 1 otherParameters CLASS class_6551 TreeBranchNode FIELD field_34491 subTree [Lnet/minecraft/class_6544$class_6548$class_6550; METHOD (Ljava/util/List;Ljava/util/List;)V ARG 1 parameters ARG 2 subTree CLASS class_6552 MultiNoiseSampler + METHOD sample (III)Lnet/minecraft/class_6544$class_6553; + ARG 1 x + ARG 2 y + ARG 3 z CLASS class_6553 NoiseValuePoint FIELD comp_112 temperatureNoise J FIELD comp_113 humidityNoise J diff --git a/mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping b/mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping new file mode 100644 index 0000000000..e3afd9852d --- /dev/null +++ b/mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_6576 net/minecraft/world/biome/source/util/TerrainNoisePoint + FIELD comp_77 offset D + FIELD comp_78 factor D + FIELD comp_79 peaks D + METHOD comp_77 offset ()D + METHOD comp_78 factor ()D + METHOD comp_79 peaks ()D diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping index 61695b57c0..e0770ea0a4 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping @@ -22,17 +22,30 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom METHOD method_38179 getWeirdnessDescription (D)Ljava/lang/String; ARG 0 weirdness METHOD method_38180 getNoiseRangeIndex (D[Lnet/minecraft/class_6544$class_6546;)Ljava/lang/String; + ARG 0 noisePoint + ARG 2 noiseRanges + METHOD method_38181 getShoreBiome (II)Lnet/minecraft/class_5321; + ARG 1 temperature + ARG 2 humidity METHOD method_38182 getRegularBiome (IILnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_5321; ARG 1 temperature ARG 2 humidity ARG 3 weirdness + METHOD method_38183 getBiomeOrShatteredSavanna (IILnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 1 temperature + ARG 2 humidity + ARG 3 weirdness + ARG 4 biome METHOD method_38184 getBadlandsBiome (ILnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_5321; ARG 1 humidity ARG 2 weirdness METHOD method_38185 writeVanillaBiomeParameters (Ljava/util/function/Consumer;)V + ARG 1 parameters METHOD method_38186 writeMountainousBiomes (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;)V + ARG 1 parameters ARG 2 weirdness METHOD method_38187 writeBiomeParameters (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;FLnet/minecraft/class_5321;)V + ARG 1 parameters ARG 2 temperature ARG 3 humidity ARG 4 continentalness @@ -47,9 +60,12 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom ARG 2 humidity ARG 3 weirdness METHOD method_38190 writeOceanBiomes (Ljava/util/function/Consumer;)V + ARG 1 parameters METHOD method_38191 writePlainBiomes (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;)V + ARG 1 parameters ARG 2 weirdness METHOD method_38192 writeCaveBiomeParameters (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;FLnet/minecraft/class_5321;)V + ARG 1 parameters ARG 2 temperature ARG 3 humidity ARG 4 continentalness @@ -59,13 +75,25 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom ARG 8 biome METHOD method_38193 getErosionDescription (D)Ljava/lang/String; ARG 1 erosion + METHOD method_38194 getMountainStartBiome (IILnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_5321; + ARG 1 temperature + ARG 2 humidity + ARG 3 weirdness METHOD method_38195 writeLandBiomes (Ljava/util/function/Consumer;)V + ARG 1 parameters METHOD method_38196 writeMixedBiomes (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;)V + ARG 1 parameters ARG 2 weirdness METHOD method_38197 getTemperatureDescription (D)Ljava/lang/String; ARG 1 temperature + METHOD method_38198 getFlatShoreBiome (IILnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_5321; + ARG 1 temperature + ARG 2 humidity + ARG 3 weirdness METHOD method_38199 writeCaveBiomes (Ljava/util/function/Consumer;)V + ARG 1 parameters METHOD method_38200 writeBiomesNearRivers (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;)V + ARG 1 parameters ARG 2 weirdness METHOD method_38201 getHumidityDescription (D)Ljava/lang/String; ARG 1 humidity @@ -74,6 +102,8 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom ARG 2 humidity ARG 3 weirdness METHOD method_38203 writeRiverBiomes (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;)V + ARG 1 parameters + ARG 2 weirdness METHOD method_38204 getPeakBiome (IILnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_5321; ARG 1 temperature ARG 2 humidity diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index 028b7ce69d..38af407ace 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -1,18 +1,28 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerrainParameters + FIELD field_34524 CONTINENTALNESS Lnet/minecraft/class_6501; + FIELD field_34525 EROSION Lnet/minecraft/class_6501; + FIELD field_34526 WEIRDNESS Lnet/minecraft/class_6501; + FIELD field_34527 NORMALIZED_WEIRDNESS Lnet/minecraft/class_6501; FIELD field_34528 offsetSpline Lnet/minecraft/class_6492; FIELD field_34529 factorSpline Lnet/minecraft/class_6492; + FIELD field_34530 peakSpline Lnet/minecraft/class_6492; FIELD field_34531 OFFSET_VALUE_OFFSET F + METHOD method_38207 getOffsetSpline ()Lnet/minecraft/class_6492; METHOD method_38208 getNormalizedWeirdness (F)F ARG 0 weirdness - METHOD method_38209 createTerrainNoisePoint (FFF)Lnet/minecraft/class_6555$class_6556; + METHOD method_38209 createNoisePoint (FFF)Lnet/minecraft/class_6555$class_6556; ARG 1 continentalnessNoise ARG 2 erosionNoise ARG 3 weirdnessNoise METHOD method_38211 createFlatOffsetSpline (FFFFFF)Lnet/minecraft/class_6492; METHOD method_38212 createLandSpline (FFFFFFZZ)Lnet/minecraft/class_6492; METHOD method_38213 buildErosionFactorSpline (FZ)Lnet/minecraft/class_6492; + ARG 0 value METHOD method_38214 getOffset (Lnet/minecraft/class_6555$class_6556;)F ARG 1 point + METHOD method_38215 writeDebugBiomes (Ljava/util/function/Consumer;)V + ARG 1 parameters + METHOD method_38216 getFactorSpline ()Lnet/minecraft/class_6492; METHOD method_38217 (F)F ARG 0 continentalness METHOD method_38218 getOffsetValue (FFF)F @@ -21,14 +31,19 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr ARG 2 weirdnessThreshold METHOD method_38220 getFactor (Lnet/minecraft/class_6555$class_6556;)F ARG 1 point - CLASS class_6556 TerrainNoisePoint + METHOD method_38221 getPeak (Lnet/minecraft/class_6555$class_6556;)F + ARG 1 point + CLASS class_6556 NoisePoint FIELD field_34532 continentalnessNoise F FIELD field_34533 erosionNoise F - FIELD field_34534 weirdnessNoise F + FIELD field_34534 normalizedWeirdness F + FIELD field_34535 weirdnessNoise F METHOD (FFFF)V ARG 1 continentalnessNoise ARG 2 erosionNoise - ARG 3 weirdnessNoise + ARG 3 normalizedWeirdness + ARG 4 weirdnessNoise METHOD method_38226 getContinentalnessNoise ()F METHOD method_38227 getErosionNoise ()F - METHOD method_38228 getWeirdnessNoise ()F + METHOD method_38228 getNormalizedWeirdness ()F + METHOD method_38229 getWeirdnessNoise ()F diff --git a/mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping b/mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping new file mode 100644 index 0000000000..c2ec580a7a --- /dev/null +++ b/mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_2088 net/minecraft/world/gen/MultiNoiseParameters + FIELD field_24727 CODEC Lcom/mojang/serialization/Codec; + FIELD field_34626 temperature Lnet/minecraft/class_5216$class_5487; + FIELD field_34627 humidity Lnet/minecraft/class_5216$class_5487; + FIELD field_34628 continentalness Lnet/minecraft/class_5216$class_5487; + FIELD field_34629 erosion Lnet/minecraft/class_5216$class_5487; + FIELD field_34630 weirdness Lnet/minecraft/class_5216$class_5487; + FIELD field_34631 shift Lnet/minecraft/class_5216$class_5487; + METHOD (Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;)V + ARG 1 temperature + ARG 2 humidity + ARG 3 continentalness + ARG 4 erosion + ARG 5 weirdness + ARG 6 shift + METHOD method_38365 temperature ()Lnet/minecraft/class_5216$class_5487; + METHOD method_38367 humidity ()Lnet/minecraft/class_5216$class_5487; + METHOD method_38368 continentalness ()Lnet/minecraft/class_5216$class_5487; + METHOD method_38369 erosion ()Lnet/minecraft/class_5216$class_5487; + METHOD method_38370 weirdness ()Lnet/minecraft/class_5216$class_5487; + METHOD method_38371 shift ()Lnet/minecraft/class_5216$class_5487; diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index 8231f44764..640519e387 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -6,15 +6,31 @@ 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_34649 temperatureNoise Lnet/minecraft/class_5216; + FIELD field_34650 humidityNoise Lnet/minecraft/class_5216; + FIELD field_34651 continentalnessNoise Lnet/minecraft/class_5216; + FIELD field_34652 erosionNoise Lnet/minecraft/class_5216; + 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_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 4 config + ARG 5 noiseParameters + 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_38373 getDepth (D)D + METHOD method_38376 createTerrainNoisePoint (IIFFF)Lnet/minecraft/class_6576; + ARG 1 x + ARG 2 z + ARG 3 continentalness + ARG 4 weirdness + ARG 5 erosion CLASS class_5841 CaveScaler METHOD method_33835 scaleCaves (D)D ARG 0 value diff --git a/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecoratorConfig.mapping index 7544dff217..d12e5612e3 100644 --- a/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecoratorConfig.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_6584 net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecoratorConfig FIELD field_34721 CODEC Lcom/mojang/serialization/Codec; + FIELD field_34722 heightmap Lnet/minecraft/class_2902$class_2903; + FIELD field_34723 min I + FIELD field_34724 max I + METHOD (Lnet/minecraft/class_2902$class_2903;II)V + ARG 1 heightmap + ARG 2 min + ARG 3 max diff --git a/mappings/net/minecraft/world/gen/stateprovider/AbstractNoiseBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/AbstractNoiseBlockStateProvider.mapping new file mode 100644 index 0000000000..d973d86cc2 --- /dev/null +++ b/mappings/net/minecraft/world/gen/stateprovider/AbstractNoiseBlockStateProvider.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_6579 net/minecraft/world/gen/stateprovider/AbstractNoiseBlockStateProvider + FIELD field_34707 seed J + FIELD field_34708 noiseParameters Lnet/minecraft/class_5216$class_5487; + FIELD field_34709 scale F + FIELD field_34710 noiseSampler Lnet/minecraft/class_5216; + METHOD (JLnet/minecraft/class_5216$class_5487;F)V + ARG 1 seed + ARG 3 noiseParameters + ARG 4 scale + METHOD method_38439 fillCodecFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P3; + ARG 0 instance + METHOD method_38441 getNoiseValue (Lnet/minecraft/class_2338;D)D + ARG 1 pos + ARG 2 scale diff --git a/mappings/net/minecraft/world/gen/stateprovider/DualNoiseBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/DualNoiseBlockStateProvider.mapping new file mode 100644 index 0000000000..04426fa494 --- /dev/null +++ b/mappings/net/minecraft/world/gen/stateprovider/DualNoiseBlockStateProvider.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_6578 net/minecraft/world/gen/stateprovider/DualNoiseBlockStateProvider + FIELD field_34702 DUAL_CODEC Lcom/mojang/serialization/Codec; + FIELD field_34703 variety Lnet/minecraft/class_6497; + FIELD field_34704 slowNoiseParameters Lnet/minecraft/class_5216$class_5487; + FIELD field_34705 slowScale F + FIELD field_34706 slowNoiseSampler Lnet/minecraft/class_5216; + METHOD (Lnet/minecraft/class_6497;Lnet/minecraft/class_5216$class_5487;FJLnet/minecraft/class_5216$class_5487;FLjava/util/List;)V + ARG 1 variety + ARG 2 slowNoiseParameters + ARG 3 slowScale + ARG 4 seed + ARG 6 noiseParameters + ARG 7 scale + ARG 8 states + METHOD method_38435 getSlowNoiseValue (Lnet/minecraft/class_2338;)D + ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/stateprovider/NoiseBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/NoiseBlockStateProvider.mapping new file mode 100644 index 0000000000..d0442033da --- /dev/null +++ b/mappings/net/minecraft/world/gen/stateprovider/NoiseBlockStateProvider.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_6580 net/minecraft/world/gen/stateprovider/NoiseBlockStateProvider + FIELD field_34711 CODEC Lcom/mojang/serialization/Codec; + FIELD field_34712 states Ljava/util/List; + METHOD (JLnet/minecraft/class_5216$class_5487;FLjava/util/List;)V + ARG 1 seed + ARG 3 noiseParameters + ARG 4 scale + ARG 5 states + METHOD method_38445 getStateAtValue (Ljava/util/List;D)Lnet/minecraft/class_2680; + ARG 1 states + ARG 2 value + METHOD method_38446 getStateFromList (Ljava/util/List;Lnet/minecraft/class_2338;D)Lnet/minecraft/class_2680; + ARG 1 states + ARG 2 pos + ARG 3 scale + METHOD method_38447 fillNoiseCodecFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P4; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/stateprovider/NoiseThresholdBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/NoiseThresholdBlockStateProvider.mapping new file mode 100644 index 0000000000..c19e26d1c0 --- /dev/null +++ b/mappings/net/minecraft/world/gen/stateprovider/NoiseThresholdBlockStateProvider.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_6581 net/minecraft/world/gen/stateprovider/NoiseThresholdBlockStateProvider + FIELD field_34713 CODEC Lcom/mojang/serialization/Codec; + FIELD field_34714 threshold F + FIELD field_34715 highChance F + FIELD field_34716 defaultState Lnet/minecraft/class_2680; + FIELD field_34717 lowStates Ljava/util/List; + FIELD field_34718 highStates Ljava/util/List; + METHOD (JLnet/minecraft/class_5216$class_5487;FFFLnet/minecraft/class_2680;Ljava/util/List;Ljava/util/List;)V + ARG 1 seed + ARG 3 noiseParameters + ARG 4 scale + ARG 5 threshold + ARG 6 highChance + ARG 7 defaultState + ARG 8 lowStates + ARG 9 highStates