diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index 07a222a498..c582f4d83a 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -30,6 +30,8 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V ARG 0 gameVersion METHOD method_36208 createGameVersion ()V + METHOD method_37896 isOutsideGenerationArea (Lnet/minecraft/class_1923;)Z + ARG 0 pos METHOD method_43250 enableDataFixerOptimization ()V METHOD method_44355 stripInvalidChars (Ljava/lang/String;Z)Ljava/lang/String; COMMENT {@return {@code s} with {@linkplain #isValidChar invalid characters} stripped} diff --git a/mappings/net/minecraft/util/math/EightWayDirection.mapping b/mappings/net/minecraft/util/math/EightWayDirection.mapping index b4ac47dce1..29cf2c91e7 100644 --- a/mappings/net/minecraft/util/math/EightWayDirection.mapping +++ b/mappings/net/minecraft/util/math/EightWayDirection.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_2355 net/minecraft/util/math/EightWayDirection FIELD field_11078 directions Ljava/util/Set; + FIELD field_37995 offset Lnet/minecraft/class_2382; METHOD (Ljava/lang/String;I[Lnet/minecraft/class_2350;)V ARG 3 directions METHOD method_10186 getDirections ()Ljava/util/Set; + METHOD method_42015 getOffsetX ()I + METHOD method_42016 getOffsetZ ()I diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping index 111e0c41b4..51867617f2 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom 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 diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index f934736cc6..90da3cdb24 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -88,7 +88,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568; - ARG 1 chunkNoiseSamplerGetter + ARG 1 chunkNoiseSamplerCreator METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V ARG 0 world ARG 1 biome @@ -116,5 +116,5 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_39460 getHeightLimitView ()Lnet/minecraft/class_5539; METHOD method_39461 hasBelowZeroRetrogen ()Z METHOD method_44214 getOrCreateGenerationSettings (Ljava/util/function/Supplier;)Lnet/minecraft/class_5485; - ARG 1 generationSettingsSupplier + ARG 1 generationSettingsCreator CLASS class_6745 TickSchedulers diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index d9598c7cbc..6d1b9566b8 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 7 biomeRegistry ARG 8 blendingData METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643; - ARG 1 carver + ARG 1 step METHOD method_12295 getEntities ()Ljava/util/List; METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S @@ -34,7 +34,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 1 chunkSliceRel ARG 2 sectionY METHOD method_12307 setCarvingMask (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_6643;)V - ARG 1 carver + ARG 1 step ARG 2 carvingMask METHOD method_12308 setStatus (Lnet/minecraft/class_2806;)V ARG 1 status @@ -49,7 +49,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V ARG 1 lightingProvider METHOD method_28510 getOrCreateCarvingMask (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643; - ARG 1 carver + ARG 1 step METHOD method_39307 getBlockProtoTickScheduler ()Lnet/minecraft/class_6755; METHOD method_39308 getFluidProtoTickScheduler ()Lnet/minecraft/class_6755; METHOD method_39309 setBelowZeroRetrogen (Lnet/minecraft/class_6746;)V diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index ed273f5ce9..d28620b268 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -46,12 +46,19 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 3 skipExistingChunk METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V ARG 1 structureStart + METHOD method_41032 acceptStructureStarts (Lnet/minecraft/class_3195;Lit/unimi/dsi/fastutil/longs/LongSet;Ljava/util/function/Consumer;)V + ARG 1 structure + ARG 2 structureStartPositions + ARG 3 consumer METHOD method_41033 structureContains (Lnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z ARG 1 pos ARG 2 structureStart METHOD method_41034 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3449; ARG 1 pos ARG 2 structure + METHOD method_41035 getStructureStarts (Lnet/minecraft/class_1923;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 1 pos + ARG 2 predicate METHOD method_41036 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_41037 getStructureReferences (Lnet/minecraft/class_2338;)Ljava/util/Map; ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping index b7643c8601..d8b84fb45d 100644 --- a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping +++ b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping @@ -20,3 +20,13 @@ CLASS net/minecraft/class_5817 net/minecraft/world/gen/StructureWeightSampler ARG 0 x ARG 1 y ARG 2 z + METHOD method_42694 (Lnet/minecraft/class_1923;Lit/unimi/dsi/fastutil/objects/ObjectList;IILit/unimi/dsi/fastutil/objects/ObjectList;Lnet/minecraft/class_3449;)V + ARG 0 pos + ARG 2 startX + ARG 3 startZ + ARG 5 start + METHOD method_42695 createStructureWeightSampler (Lnet/minecraft/class_5138;Lnet/minecraft/class_1923;)Lnet/minecraft/class_5817; + ARG 0 world + ARG 1 pos + METHOD method_42696 (Lnet/minecraft/class_3195;)Z + ARG 0 structure diff --git a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping index daf1c30aaf..3e553047ef 100644 --- a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping @@ -5,7 +5,14 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6953;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; ARG 0 chunkNoiseSampler ARG 1 chunkPos + ARG 2 noiseRouter + ARG 3 randomSplitter + ARG 4 minimumY + ARG 5 height + ARG 6 fluidLevelSampler METHOD method_38317 apply (Lnet/minecraft/class_6910$class_6912;D)Lnet/minecraft/class_2680; + ARG 1 pos + ARG 2 density CLASS class_5832 Impl FIELD field_28813 barrierNoise Lnet/minecraft/class_6910; FIELD field_28816 waterLevels [Lnet/minecraft/class_6350$class_6351; @@ -22,12 +29,21 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler FIELD field_34580 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; FIELD field_35122 fluidLevelFloodednessNoise Lnet/minecraft/class_6910; FIELD field_35123 fluidLevelSpreadNoise Lnet/minecraft/class_6910; + FIELD field_36221 NEEDS_FLUID_TICK_DISTANCE_THRESHOLD D + FIELD field_38246 erosionDensityFunction Lnet/minecraft/class_6910; + FIELD field_38247 depthDensityFunction Lnet/minecraft/class_6910; METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6953;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)V ARG 1 chunkNoiseSampler ARG 2 chunkPos + ARG 3 noiseRouter + ARG 4 randomSplitter + ARG 5 minimumY + ARG 6 height + ARG 7 fluidLevelSampler METHOD method_33734 getLocalX (I)I ARG 1 x METHOD method_33735 calculateDensity (Lnet/minecraft/class_6910$class_6912;Lorg/apache/commons/lang3/mutable/MutableDouble;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;)D + ARG 1 pos METHOD method_33736 maxDistance (II)D ARG 1 a METHOD method_33738 getWaterLevel (J)Lnet/minecraft/class_6350$class_6351; @@ -40,6 +56,16 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler ARG 3 z METHOD method_33743 getLocalZ (I)I ARG 1 z + METHOD method_40463 (III)Lnet/minecraft/class_6350$class_6351; + ARG 1 blockX + ARG 2 blockY + ARG 3 blockZ + METHOD method_42354 (IIILnet/minecraft/class_6350$class_6351;IZ)I + ARG 1 blockX + ARG 2 blockY + ARG 3 blockZ + ARG 4 fluidLevel + ARG 5 surfaceHeightEstimate CLASS class_6351 FluidLevel FIELD field_33576 y I FIELD field_33577 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/chunk/Blender.mapping b/mappings/net/minecraft/world/gen/chunk/Blender.mapping index 3332703504..1e684e8305 100644 --- a/mappings/net/minecraft/world/gen/chunk/Blender.mapping +++ b/mappings/net/minecraft/world/gen/chunk/Blender.mapping @@ -1,11 +1,46 @@ CLASS net/minecraft/class_6748 net/minecraft/world/gen/chunk/Blender FIELD field_35501 NO_BLENDING Lnet/minecraft/class_6748; + FIELD field_35502 BLENDING_BIOME_DISTANCE_THRESHOLD I + FIELD field_35503 BLENDING_CHUNK_DISTANCE_THRESHOLD I + FIELD field_35505 CLOSE_BLENDING_DISTANCE_THRESHOLD I + FIELD field_35681 OFFSET_NOISE Lnet/minecraft/class_5216; + FIELD field_36343 blendingData Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD field_36344 closeBlendingData Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + METHOD (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V + ARG 1 blendingData + ARG 2 closeBlendingData METHOD method_39336 getNoBlending ()Lnet/minecraft/class_6748; + METHOD method_39337 getBlendOffset (D)D + ARG 0 height + METHOD method_39338 applyBlendDensity (Lnet/minecraft/class_6910$class_6912;D)D + ARG 1 pos + ARG 2 density + METHOD method_39339 (IIILorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;IIID)V + ARG 6 biomeX + ARG 7 halfSectionY + ARG 8 biomeZ + ARG 9 collidableBlockDensity + METHOD method_39340 calculate (II)Lnet/minecraft/class_6748$class_6956; + ARG 1 blockX + ARG 2 blockZ + METHOD method_39341 (IILorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;IID)V + ARG 5 biomeX + ARG 6 biomeZ + ARG 7 height METHOD method_39342 getBlender (Lnet/minecraft/class_3233;)Lnet/minecraft/class_6748; ARG 0 chunkRegion + METHOD method_39560 (IIILorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/lang/Long;Lnet/minecraft/class_6749;)V + ARG 5 chunkPos + ARG 6 data METHOD method_39561 blendBiome (III)Lnet/minecraft/class_6880; ARG 1 x ARG 2 y + ARG 3 z + METHOD method_39562 sampleClosest (IIILnet/minecraft/class_6748$class_6781;)D + ARG 1 biomeX + ARG 2 biomeY + ARG 3 biomeZ + ARG 4 sampler METHOD method_39563 getBiomeSupplier (Lnet/minecraft/class_6780;)Lnet/minecraft/class_6780; ARG 1 biomeSupplier METHOD method_39564 (Lnet/minecraft/class_6780;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_6880; @@ -13,9 +48,71 @@ CLASS net/minecraft/class_6748 net/minecraft/world/gen/chunk/Blender ARG 3 y ARG 4 z ARG 5 noise + METHOD method_39565 sample (Lnet/minecraft/class_6748$class_6781;IIIII)D + ARG 1 sampler + ARG 2 chunkX + ARG 3 chunkZ + ARG 4 biomeX + ARG 5 biomeY + ARG 6 biomeZ METHOD method_39772 tickLeavesAndFluids (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V ARG 0 chunkRegion ARG 1 chunk METHOD method_39773 tickLeavesAndFluids (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)V ARG 0 chunk ARG 1 pos + METHOD method_39807 (DDDDDDD)D + ARG 8 offsetX + ARG 10 y + ARG 12 offsetZ + METHOD method_39808 getDistance (DDDDDD)D + ARG 0 x1 + ARG 2 y1 + ARG 4 z1 + ARG 6 x2 + ARG 8 y2 + ARG 10 z2 + METHOD method_39809 createCarvingMasks (Lnet/minecraft/class_5281;Lnet/minecraft/class_2839;)V + ARG 0 world + ARG 1 chunk + METHOD method_39810 (Lnet/minecraft/class_6643$class_6828;Lnet/minecraft/class_6643;)V + ARG 1 mask + METHOD method_39811 (Lnet/minecraft/class_6748$class_6831;III)Z + ARG 1 offsetX + ARG 2 y + ARG 3 offsetZ + METHOD method_39812 createDistanceFunction (Lnet/minecraft/class_2355;Lnet/minecraft/class_6749;)Lnet/minecraft/class_6748$class_6831; + ARG 0 direction + ARG 1 data + METHOD method_39813 (Ljava/util/List;DDD)D + ARG 1 offsetX + ARG 3 y + ARG 5 offsetZ + METHOD method_39814 (Ljava/util/List;Lnet/minecraft/class_2355;Lnet/minecraft/class_6749;)V + ARG 1 direction + ARG 2 data + METHOD method_39815 createClosestDistanceFunction (Lnet/minecraft/class_6749;Ljava/util/Map;)Lnet/minecraft/class_6748$class_6831; + ARG 0 data + ARG 1 neighborData + METHOD method_40025 (IILorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableObject;IILnet/minecraft/class_6880;)V + ARG 4 biomeX + ARG 5 biomeZ + ARG 6 biome + METHOD method_40026 (IIILorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;Ljava/lang/Long;Lnet/minecraft/class_6749;)V + ARG 6 chunkPos + ARG 7 data + METHOD method_40027 (IILorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;Lorg/apache/commons/lang3/mutable/MutableDouble;Ljava/lang/Long;Lnet/minecraft/class_6749;)V + ARG 5 chunkPos + ARG 6 data + CLASS class_6781 BlendingSampler + METHOD get (Lnet/minecraft/class_6749;III)D + ARG 1 data + ARG 2 biomeX + ARG 3 biomeY + ARG 4 biomeZ + CLASS class_6831 DistanceFunction + METHOD getDistance (DDD)D + ARG 1 offsetX + ARG 3 y + ARG 5 offsetZ + CLASS class_6956 BlendResult diff --git a/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping b/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping index c842c05708..e0e15b8c67 100644 --- a/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping +++ b/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping @@ -1,22 +1,135 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData - FIELD field_35515 OLD_HEIGHT_LIMIT Lnet/minecraft/class_5539; + FIELD field_35515 oldHeightLimit Lnet/minecraft/class_5539; + FIELD field_35518 HORIZONTAL_BIOME_COUNT I FIELD field_35519 SURFACE_BLOCKS Ljava/util/List; FIELD field_35682 CODEC Lcom/mojang/serialization/Codec; - FIELD field_35692 heights [D - METHOD method_39347 (ILnet/minecraft/class_2791;II)V + FIELD field_35683 BIOMES_PER_CHUNK I + FIELD field_35684 LAST_CHUNK_BIOME_INDEX I + FIELD field_35685 CHUNK_BIOME_END_INDEX I + FIELD field_35686 NORTH_WEST_END_INDEX I + FIELD field_35687 SOUTH_EAST_END_INDEX_PART I + FIELD field_35690 initializedBlendingData Z + FIELD field_35692 surfaceHeights [D + FIELD field_35693 collidableBlockDensities [[D + FIELD field_35695 DOUBLE_ARRAY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_36345 biomes Ljava/util/List; + METHOD (IILjava/util/Optional;)V + ARG 1 oldBottomSectionY + ARG 2 oldTopSectionY + ARG 3 heights + METHOD method_39343 getX (I)I + ARG 0 index + METHOD method_39344 getHeight (III)D + ARG 1 biomeX + ARG 2 biomeY + ARG 3 biomeZ + METHOD method_39345 getCollidableBlockDensity (III)D + ARG 1 chunkBiomeX + ARG 2 halfSectionY + ARG 3 chunkBiomeZ + METHOD method_39346 acceptCollidableBlockDensities (IIIILnet/minecraft/class_6749$class_6750;)V + ARG 1 biomeX + ARG 2 biomeZ + ARG 3 minHalfSectionY + ARG 4 maxHalfSectionY + ARG 5 consumer + METHOD method_39347 initBlockColumn (ILnet/minecraft/class_2791;II)V ARG 1 index - ARG 3 x - ARG 4 z - METHOD method_39349 getSurfaceHeight (Lnet/minecraft/class_2791;II)I + ARG 2 chunk + ARG 3 chunkBlockX + ARG 4 chunkBlockZ + METHOD method_39349 getSurfaceBlockY (Lnet/minecraft/class_2791;II)I + ARG 1 chunk + ARG 2 blockX + ARG 3 blockZ METHOD method_39350 isCollidableAndNotTreeAt (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z ARG 0 chunk ARG 1 pos + METHOD method_39351 acceptHeights (IILnet/minecraft/class_6749$class_6751;)V + ARG 1 biomeX + ARG 2 biomeZ + ARG 3 consumer + METHOD method_39352 getZ (I)I + ARG 0 index + METHOD method_39354 calculateCollidableBlockDensityColumn (Lnet/minecraft/class_2791;III)[D + ARG 1 chunk + ARG 2 chunkBlockX + ARG 3 chunkBlockZ + ARG 4 surfaceHeight METHOD method_39570 getBlendingData (Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749; ARG 0 chunkRegion ARG 1 chunkX ARG 2 chunkZ + METHOD method_39572 initChunkBlendingData (Lnet/minecraft/class_2791;Ljava/util/Set;)V + ARG 1 chunk + ARG 2 newNoiseChunkDirections + METHOD method_39573 validate (Lnet/minecraft/class_6749;)Lcom/mojang/serialization/DataResult; + ARG 0 data + METHOD method_39575 getCollidableBlockDensity ([DI)D + ARG 1 collidableBlockDensityColumn + ARG 2 halfSectionY + METHOD method_39576 getVerticalHalfSectionCount ()I + METHOD method_39578 getNorthWestIndex (II)I + COMMENT Gets the north east index for the given chunk-local biome coordinates. + COMMENT At least one of these coordinates must be {@code 0} for this method to work properly. + COMMENT + COMMENT @return the north west index + ARG 0 chunkBiomeX + COMMENT the chunk-local biome X coordinate + ARG 1 chunkBiomeZ + COMMENT the chunk-local biome Z coordinate METHOD method_39579 getAdjacentChunksWithNoise (Lnet/minecraft/class_5281;IIZ)Ljava/util/Set; ARG 0 access ARG 1 chunkX ARG 2 chunkZ - ARG 3 newNoise + ARG 3 oldNoise + METHOD method_39581 getOneAboveBottomHalfSectionY ()I + METHOD method_39582 getSouthEastIndex (II)I + COMMENT Gets the south east index for the given chunk-local biome coordinates. + COMMENT At least one of these coordinates must be {@code CHUNK_BIOME_END_INDEX} ({@code 4}) + COMMENT for this method to work properly. + COMMENT + COMMENT @return the south east index + ARG 0 chunkBiomeX + COMMENT the chunk-local biome X coordinate + ARG 1 chunkBiomeZ + COMMENT the chunk-local biome Z coordinate + METHOD method_39583 getBottomHalfSectionY ()I + METHOD method_39905 getAboveCollidableBlockValue (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338$class_2339;)D + COMMENT {@return {@code 1.0} if there is a collidable block below, otherwise {@code -1}.} + ARG 0 chunk + ARG 1 mutablePos + COMMENT will be moved down by one block by this method + METHOD method_39906 getCollidableBlockDensityBelow (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338$class_2339;)D + ARG 0 chunk + ARG 1 mutablePos + COMMENT will be moved down by seven blocks by this method + METHOD method_40028 acceptBiomes (IIILnet/minecraft/class_6749$class_6853;)V + ARG 1 biomeX + ARG 2 biomeY + ARG 3 biomeZ + ARG 4 consumer + METHOD method_41564 getOldHeightLimit ()Lnet/minecraft/class_5539; + METHOD method_41565 getHalfSectionHeight (I)I + ARG 1 halfSectionY + METHOD method_41566 getVerticalBiomeSections (Lnet/minecraft/class_2791;II)Ljava/util/List; + ARG 1 chunk + ARG 2 chunkBlockX + ARG 3 chunkBlockZ + METHOD method_41567 getVerticalBiomeCount ()I + CLASS class_6750 CollidableBlockDensityConsumer + METHOD consume (IIID)V + ARG 1 biomeX + ARG 2 halfSectionY + ARG 3 biomeZ + ARG 4 collidableBlockDensity + CLASS class_6751 HeightConsumer + METHOD consume (IID)V + ARG 1 biomeX + ARG 2 biomeZ + ARG 3 height + CLASS class_6853 BiomeConsumer + METHOD consume (IILnet/minecraft/class_6880;)V + ARG 1 biomeX + ARG 2 biomeZ + ARG 3 biome diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 19badf23cc..3a822fca48 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 chunkRegion ARG 2 seed ARG 4 noiseConfig - ARG 5 world + ARG 5 biomeAccess ARG 6 structureAccessor ARG 7 chunk ARG 8 carverStep diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 7d2e55c9b5..65450a413b 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -1,43 +1,104 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler - 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_34598 cellHeight I + FIELD field_34599 horizontalCellCount I + FIELD field_34600 minimumCellY I + FIELD field_34601 startCellX I + FIELD field_34602 startCellZ I FIELD field_34603 biomeX I FIELD field_34604 biomeZ I FIELD field_34605 interpolators Ljava/util/List; FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; FIELD field_35487 blender Lnet/minecraft/class_6748; FIELD field_35674 generationShapeConfig Lnet/minecraft/class_5309; + FIELD field_36273 surfaceHeightEstimateCache Lit/unimi/dsi/fastutil/longs/Long2IntMap; + FIELD field_36572 startBlockY I + FIELD field_36573 startBlockZ I + FIELD field_36574 cellBlockX I + FIELD field_36575 cellBlockY I + FIELD field_36576 cellBlockZ I + FIELD field_36577 sampleUniqueIndex J + FIELD field_36578 cacheOnceUniqueIndex J + FIELD field_36579 index I + FIELD field_36580 eachApplier Lnet/minecraft/class_6910$class_6911; + FIELD field_36581 caches Ljava/util/List; + FIELD field_36582 actualDensityFunctionCache Ljava/util/Map; + FIELD field_36583 initialDensityWithoutJaggedness Lnet/minecraft/class_6910; FIELD field_36584 blockStateSampler Lnet/minecraft/class_6568$class_6569; + FIELD field_36585 cachedBlendAlphaDensityFunction Lnet/minecraft/class_6568$class_6951; + FIELD field_36586 cachedBlendOffsetDensityFunction Lnet/minecraft/class_6568$class_6951; + FIELD field_36587 lastBlendingColumnPos J + FIELD field_36588 lastBlendingResult Lnet/minecraft/class_6748$class_6956; + FIELD field_36589 biomeHorizontalEnd I FIELD field_36590 horizontalBlockSize I FIELD field_36591 verticalBlockSize I + FIELD field_36592 isInInterpolationLoop Z + FIELD field_36593 isSamplingNoise Z + FIELD field_36594 startBlockX I + FIELD field_37113 beardifying Lnet/minecraft/class_6916$class_7050; METHOD (ILnet/minecraft/class_7138;IILnet/minecraft/class_5309;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V - ARG 1 horizontalSize + ARG 1 horizontalCellCount + ARG 2 noiseConfig + ARG 3 startX + ARG 4 startZ + ARG 5 generationShapeConfig + ARG 6 beardifying + ARG 7 chunkGeneratorSettings + ARG 8 fluidLevelSampler + ARG 9 blender METHOD method_38336 sampleStartNoise ()V METHOD method_38337 sampleNoiseY (ID)V + ARG 1 blockY + ARG 2 cellDeltaY METHOD method_38338 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38339 sampleEndNoise (I)V - ARG 1 x + ARG 1 cellX METHOD method_38342 (IILnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38348 swapBuffers ()V METHOD method_38349 sampleNoiseX (ID)V + ARG 1 blockX + ARG 2 cellDeltaX METHOD method_38350 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38354 getAquiferSampler ()Lnet/minecraft/class_6350; METHOD method_38355 sampleNoiseZ (ID)V + ARG 1 blockZ + ARG 2 cellDeltaZ METHOD method_38356 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38362 sampleNoiseCorners (II)V - ARG 1 noiseY - ARG 2 noiseZ + ARG 1 cellY + ARG 2 cellZ METHOD method_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_7138;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; ARG 0 chunk + ARG 1 noiseConfig + ARG 2 beardifying + ARG 3 chunkGeneratorSettings + ARG 4 fluidLevelSampler + ARG 5 blender + METHOD method_39899 calculateSurfaceHeightEstimate (J)I + ARG 1 columnPos + METHOD method_39900 estimateSurfaceHeight (II)I + ARG 1 blockX + ARG 2 blockZ + METHOD method_40529 getActualDensityFunction (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; + ARG 1 densityFunction + METHOD method_40530 (Lnet/minecraft/class_6910;Lnet/minecraft/class_6910$class_6912;)Lnet/minecraft/class_2680; + ARG 2 pos METHOD method_40531 createMultiNoiseSampler (Lnet/minecraft/class_6953;Ljava/util/List;)Lnet/minecraft/class_6544$class_6552; + ARG 1 noiseRouter + ARG 2 spawnTarget + METHOD method_40532 sampleNoise (ZI)V + ARG 1 start + ARG 2 nextCellX + METHOD method_40533 getActualDensityFunctionImpl (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; + ARG 1 densityFunction + METHOD method_40535 caclculateBlendResult (II)Lnet/minecraft/class_6748$class_6956; + ARG 1 blockX + ARG 2 blockZ METHOD method_40536 sampleBlockState ()Lnet/minecraft/class_2680; + METHOD method_40537 stopInterpolation ()V METHOD method_42361 getHorizontalBlockSize ()I METHOD method_42362 getVerticalBlockSize ()I CLASS class_5917 NoiseInterpolator @@ -77,4 +138,31 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler CLASS class_6569 BlockStateSampler METHOD calculate sample (Lnet/minecraft/class_6910$class_6912;)Lnet/minecraft/class_2680; ARG 1 pos + CLASS class_6946 BlendAlphaDensityFunction + CLASS class_6947 BlendOffsetDensityFunction + CLASS class_6948 Cache2D + FIELD field_36599 delegate Lnet/minecraft/class_6910; + FIELD field_36600 lastSamplingColumnPos J + FIELD field_36601 lastSamplingResult D + METHOD (Lnet/minecraft/class_6910;)V + ARG 1 delegate + CLASS class_6949 CellCache + FIELD field_36603 delegate Lnet/minecraft/class_6910; + FIELD field_36604 cache [D + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;)V + ARG 2 delegate + CLASS class_6950 CacheOnce + FIELD field_36606 delegate Lnet/minecraft/class_6910; + FIELD field_36607 sampleUniqueIndex J + FIELD field_36608 cacheOnceUniqueIndex J + FIELD field_36609 lastSamplingResult D + FIELD field_36610 cache [D + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;)V + ARG 2 delegate + CLASS class_6951 FlatCacheDensityFunction + FIELD field_36612 delegate Lnet/minecraft/class_6910; + FIELD field_36613 cache [[D + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;Z)V + ARG 2 delegate + ARG 3 sample CLASS class_6952 ParentedNoiseType diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index aa461aaf82..2fa3a9ccd1 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -9,7 +9,14 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 1 structureSetRegistry ARG 2 noiseRegistry ARG 3 populationSource + ARG 4 settings METHOD method_26263 sampleHeightmap (Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;IILorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/function/Predicate;)Ljava/util/OptionalInt; + ARG 1 world + ARG 2 noiseConfig + ARG 3 x + ARG 4 z + ARG 5 columnSample + ARG 6 stopPredicate METHOD method_28548 matchesSettings (Lnet/minecraft/class_5321;)Z ARG 1 settings METHOD method_28549 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_6880; @@ -23,6 +30,12 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 structureAccessor ARG 3 noiseConfig ARG 4 chunk + ARG 5 minimumCellY + ARG 6 cellHeight + METHOD method_38322 (Lnet/minecraft/class_7138;III)Lnet/minecraft/class_6880; + ARG 2 biomeX + ARG 3 biomeY + ARG 4 biomeZ METHOD method_38323 getBlockState (Lnet/minecraft/class_6568;IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 chunkNoiseSampler ARG 2 x @@ -40,6 +53,25 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 4 chunk METHOD method_39172 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_2378; ARG 0 generator + METHOD method_41535 (Lnet/minecraft/class_5138;Lnet/minecraft/class_3233;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; + ARG 4 chunk METHOD method_41536 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; ARG 4 chunk + METHOD method_41537 createChunkNoiseSampler (Lnet/minecraft/class_2791;Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;)Lnet/minecraft/class_6568; + ARG 1 chunk + ARG 2 world + ARG 3 blender + ARG 4 noiseConfig + METHOD method_41538 buildSurface (Lnet/minecraft/class_2791;Lnet/minecraft/class_5868;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2378;Lnet/minecraft/class_6748;)V + ARG 1 chunk + ARG 2 heightContext + ARG 3 noiseConfig + ARG 4 structureAccessor + ARG 5 biomeAccess + ARG 6 biomeRegistry + ARG 7 blender + METHOD method_41539 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; + ARG 4 chunk + METHOD method_41540 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; + ARG 4 chunk METHOD method_41541 getSettings ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping b/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping index e7c5d16d1f..d03c329f86 100644 --- a/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping +++ b/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig FIELD field_38259 surfaceBuilder Lnet/minecraft/class_6724; FIELD field_38260 aquiferRandomDeriver Lnet/minecraft/class_6574; FIELD field_38261 oreRandomDeriver Lnet/minecraft/class_6574; + FIELD field_38262 noises Ljava/util/Map; FIELD field_38263 randomDerivers Ljava/util/Map; METHOD (Lnet/minecraft/class_5284;Lnet/minecraft/class_2378;J)V ARG 1 chunkGeneratorSettings @@ -34,3 +35,9 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig METHOD method_42372 getSurfaceBuilder ()Lnet/minecraft/class_6724; METHOD method_42373 getAquiferRandomDeriver ()Lnet/minecraft/class_6574; METHOD method_42374 getOreRandomDeriver ()Lnet/minecraft/class_6574; + CLASS class_7271 LegacyNoiseDensityFunctionVisitor + FIELD field_38267 cache Ljava/util/Map; + METHOD method_42375 createRandom (J)Lnet/minecraft/class_5819; + ARG 1 seed + METHOD method_42376 applyNotCached (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; + ARG 1 densityFunction diff --git a/mappings/net/minecraft/world/gen/noise/NoiseRouter.mapping b/mappings/net/minecraft/world/gen/noise/NoiseRouter.mapping index a034febb84..6a792bec1c 100644 --- a/mappings/net/minecraft/world/gen/noise/NoiseRouter.mapping +++ b/mappings/net/minecraft/world/gen/noise/NoiseRouter.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_6953 net/minecraft/world/gen/noise/NoiseRouter FIELD field_37683 CODEC Lcom/mojang/serialization/Codec; + METHOD method_41544 apply (Lnet/minecraft/class_6910$class_6915;)Lnet/minecraft/class_6953; + ARG 1 visitor + METHOD method_41545 field (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + ARG 0 name + ARG 1 getter diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 7542dddce9..c504a1abf7 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -95,14 +95,14 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35605 chunk Lnet/minecraft/class_2791; FIELD field_35606 posToBiome Ljava/util/function/Function; FIELD field_35608 uniqueHorizontalPosValue J - FIELD field_35609 x I - FIELD field_35610 z I + FIELD field_35609 blockX I + FIELD field_35610 blockZ I FIELD field_35611 runDepth I FIELD field_35612 uniquePosValue J FIELD field_35613 pos Lnet/minecraft/class_2338$class_2339; FIELD field_35614 biomeSupplier Ljava/util/function/Supplier; FIELD field_35616 surfaceMinY I - FIELD field_35617 y I + FIELD field_35617 blockY I FIELD field_35618 fluidHeight I FIELD field_35619 stoneDepthBelow I FIELD field_35620 stoneDepthAbove I @@ -116,15 +116,15 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu ARG 5 posToBiome ARG 7 heightContext METHOD method_39072 initHorizontalContext (II)V - ARG 1 x - ARG 2 z + ARG 1 blockX + ARG 2 blockZ METHOD method_39073 initVerticalContext (IIIIII)V ARG 1 stoneDepthAbove ARG 2 stoneDepthBelow ARG 3 fluidHeight - ARG 4 x - ARG 5 y - ARG 6 z + ARG 4 blockX + ARG 5 blockY + ARG 6 blockZ CLASS class_6695 NegativeRunDepthPredicate CLASS class_6696 SteepSlopePredicate CLASS class_6771 SurfacePredicate