map chunk generators and biome sources (#1352)

* map chunk generators and biome sources

* map more parameters and functions, and rename noise

* bikeshedding

* Apply suggestions from code review

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

* disambiguate depth noise

* Update mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
This commit is contained in:
SuperCoder79 2020-05-14 16:55:51 -04:00 committed by GitHub
parent 21ff19a1b9
commit bfbea641fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 167 additions and 4 deletions

View File

@ -1,3 +1,15 @@
CLASS net/minecraft/class_5284
FIELD field_24514 defaultBlock Lnet/minecraft/class_2680;
FIELD field_24515 defaultFluid Lnet/minecraft/class_2680;
FIELD field_24516 config Lnet/minecraft/class_2888;
METHOD <init> (Lnet/minecraft/class_2888;)V
ARG 1 config
METHOD method_16400 getBedrockCeilingY ()I
METHOD method_16401 getBedrockFloorY ()I
METHOD method_28003 setDefaultBlock (Lnet/minecraft/class_2680;)V
ARG 1 defaultBlock
METHOD method_28004 setDefaultFluid (Lnet/minecraft/class_2680;)V
ARG 1 defaultFluid
METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680;
METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680;
METHOD method_28007 getConfig ()Lnet/minecraft/class_2888;

View File

@ -11,6 +11,9 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers
FIELD field_16116 DEEP_FROZEN_OCEAN_ID I
METHOD method_15843 build (JZII)Lnet/minecraft/class_3642;
ARG 0 seed
ARG 2 old
ARG 3 biomeSize
ARG 4 riverSize
METHOD method_15844 areSimilar (II)Z
ARG 0 id1
ARG 1 id2
@ -19,6 +22,10 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers
METHOD method_15846 isShallowOcean (I)Z
ARG 0 id
METHOD method_15847 build (ZIILjava/util/function/LongFunction;)Lnet/minecraft/class_3627;
ARG 0 old
ARG 1 biomeSize
ARG 2 riverSize
ARG 3 contextProvider
METHOD method_15848 stack (JLnet/minecraft/class_3660;Lnet/minecraft/class_3627;ILjava/util/function/LongFunction;)Lnet/minecraft/class_3627;
ARG 0 seed
ARG 2 layer

View File

@ -21,3 +21,5 @@ CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/SetBaseBiomesLaye
FIELD field_16081 GIANT_TREE_TAIGA_ID I
FIELD field_16082 OLD_GROUP_1 [I
FIELD field_16083 PLAINS_ID I
METHOD <init> (Z)V
ARG 1 old

View File

@ -18,6 +18,10 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess
ARG 1 x
ARG 3 y
ARG 5 z
METHOD method_27344 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;
ARG 1 pos
METHOD method_27984 hashSeed (J)J
ARG 0 seed
CLASS class_4544 Storage
METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959;
ARG 1 biomeX

View File

@ -5,6 +5,7 @@ CLASS net/minecraft/class_4548 net/minecraft/world/biome/source/BiomeArray
FIELD field_20652 HORIZONTAL_SECTION_COUNT I
FIELD field_20653 VERTICAL_SECTION_COUNT I
FIELD field_20654 data [Lnet/minecraft/class_1959;
FIELD field_21813 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_1966;)V
ARG 1 pos
ARG 2 source
@ -12,6 +13,8 @@ CLASS net/minecraft/class_4548 net/minecraft/world/biome/source/BiomeArray
ARG 1 pos
ARG 2 source
ARG 3 rawIds
METHOD <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD <init> ([Lnet/minecraft/class_1959;)V
ARG 1 data
METHOD method_22401 toIntArray ()[I

View File

@ -5,9 +5,13 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource
FIELD field_9392 structureFeatures Ljava/util/Map;
METHOD <init> (Ljava/util/Set;)V
ARG 1 biomes
METHOD method_27985 create (J)Lnet/minecraft/class_1966;
ARG 1 seed
METHOD method_8754 hasStructureFeature (Lnet/minecraft/class_3195;)Z
ARG 1 feature
METHOD method_8757 getNoiseRange (II)F
METHOD method_8757 getNoiseAt (II)F
ARG 1 x
ARG 2 z
METHOD method_8759 getSpawnBiomes ()Ljava/util/List;
METHOD method_8761 getTopMaterials ()Ljava/util/Set;
METHOD method_8762 locateBiome (IIIILjava/util/List;Ljava/util/Random;)Lnet/minecraft/class_2338;

View File

@ -1,3 +1,6 @@
CLASS net/minecraft/class_1973 net/minecraft/world/biome/source/CheckerboardBiomeSource
FIELD field_9480 gridSize I
FIELD field_9481 biomeArray [Lnet/minecraft/class_1959;
METHOD <init> ([Lnet/minecraft/class_1959;I)V
ARG 1 biomes
ARG 2 size

View File

@ -5,3 +5,13 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS
FIELD field_22081 weirdnessNoise Lnet/minecraft/class_5216;
FIELD field_24115 biomePoints Ljava/util/List;
FIELD field_24116 threeDimensionalSampling Z
METHOD <init> (JLjava/util/List;)V
ARG 1 seed
ARG 3 biomePoints
METHOD method_27986 fromBiomes (JLjava/util/List;)Lnet/minecraft/class_4766;
ARG 0 seed
ARG 2 biomes
METHOD method_27987 (Lnet/minecraft/class_1959;)Ljava/util/stream/Stream;
ARG 0 biome
METHOD method_27988 (Lnet/minecraft/class_1959;Lnet/minecraft/class_1959$class_4762;)Lcom/mojang/datafixers/util/Pair;
ARG 1 point

View File

@ -1,3 +1,8 @@
CLASS net/minecraft/class_2908 net/minecraft/world/gen/chunk/CavesChunkGenerator
FIELD field_16569 noiseFalloff [D
FIELD field_24511 generatorConfig Lnet/minecraft/class_2900;
METHOD <init> (Lnet/minecraft/class_1966;JLnet/minecraft/class_2900;)V
ARG 1 biomeSource
ARG 2 seed
ARG 4 config
METHOD method_16403 buildNoiseFalloff ()[D

View File

@ -4,9 +4,14 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
COMMENT Biome placement starts here, however all vanilla and most modded chunk generators delegate this to a {@linkplain net.minecraft.world.biome.source.BiomeSource biome source}.
FIELD field_12761 biomeSource Lnet/minecraft/class_1966;
FIELD field_16567 config Lnet/minecraft/class_2888;
METHOD <init> (Lnet/minecraft/class_1966;Lnet/minecraft/class_2888;)V
ARG 1 biomeSource
ARG 2 config
METHOD method_12088 populateNoise (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config.
ARG 1 world
ARG 2 accessor
ARG 3 chunk
METHOD method_12097 hasStructure (Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;)Z
ARG 1 biome
ARG 2 feature
@ -17,26 +22,47 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
ARG 3 spawnAnimals
METHOD method_12100 getSpawnHeight ()I
METHOD method_12102 generateFeatures (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;)V
ARG 1 region
ARG 2 accessor
METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
ARG 1 world
ARG 2 id
ARG 3 center
ARG 4 radius
ARG 5 skipExistingChunks
METHOD method_12104 getMaxY ()I
METHOD method_12105 getStructureConfig (Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3037;
ARG 1 biome
ARG 2 feature
METHOD method_12106 populateBiomes (Lnet/minecraft/class_2791;)V
ARG 1 chunk
METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V
ARG 1 region
METHOD method_12108 carve (JLnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V
ARG 1 seed
ARG 3 access
ARG 4 chunk
ARG 5 carver
METHOD method_12109 getConfig ()Lnet/minecraft/class_2888;
METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V
ARG 1 region
ARG 2 chunk
METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1959;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List;
ARG 1 biome
ARG 2 accessor
ARG 3 group
ARG 4 pos
METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;J)V
ARG 1 accessor
ARG 2 biomeAccess
ARG 3 chunk
ARG 4 generator
ARG 5 manager
ARG 6 seed
METHOD method_16130 addStructureReferences (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
ARG 1 world
ARG 2 accessor
ARG 3 chunk
METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;)I
ARG 1 x
ARG 2 z
@ -53,7 +79,12 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
ARG 1 x
ARG 2 z
ARG 3 heightmapType
METHOD method_22404 (Lnet/minecraft/class_4543;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;
ARG 2 pos
METHOD method_26261 getColumnSample (II)Lnet/minecraft/class_1922;
ARG 1 x
ARG 2 z
METHOD method_27367 hasStructure (Lnet/minecraft/class_3195;)Z
ARG 1 feature
METHOD method_27997 create (J)Lnet/minecraft/class_2794;
ARG 1 seed

View File

@ -19,6 +19,8 @@ CLASS net/minecraft/class_2888 net/minecraft/world/gen/chunk/ChunkGeneratorConfi
FIELD field_23987 netherStructureSpacing I
FIELD field_23988 netherStructureSeparation I
FIELD field_23989 netherStructureSeedModifier I
FIELD field_24507 ruinedPortalSpacing I
FIELD field_24508 ruinedPortalSeparation I
METHOD method_12552 getMansionSeparation ()I
METHOD method_12553 getOceanMonumentSpacing ()I
METHOD method_12554 getEndCityDistance ()I

View File

@ -4,6 +4,7 @@ CLASS net/minecraft/class_2891 net/minecraft/world/gen/chunk/DebugChunkGenerator
FIELD field_13162 AIR Lnet/minecraft/class_2680;
FIELD field_13163 BLOCK_STATES Ljava/util/List;
FIELD field_13164 BARRIER Lnet/minecraft/class_2680;
FIELD field_24509 generator Lnet/minecraft/class_2794;
METHOD method_12578 getBlockState (II)Lnet/minecraft/class_2680;
ARG 0 x
ARG 1 z

View File

@ -2,5 +2,20 @@ CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator
FIELD field_13183 biome Lnet/minecraft/class_1959;
FIELD field_13184 phantomSpawner Lnet/minecraft/class_2910;
FIELD field_19180 catSpawner Lnet/minecraft/class_4274;
FIELD field_24510 generatorConfig Lnet/minecraft/class_3232;
METHOD <init> (Lnet/minecraft/class_3232;)V
ARG 1 config
METHOD method_12589 getBiome ()Lnet/minecraft/class_1959;
METHOD method_28002 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
ARG 0 state
CLASS class_2898 FlatChunkGeneratorBiome
METHOD <init> (Lnet/minecraft/class_2897;Lnet/minecraft/class_3504;Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_1959$class_1961;FFFFLnet/minecraft/class_4763;Ljava/lang/String;)V
ARG 2 surfaceBuilder
ARG 3 precipitation
ARG 4 category
ARG 5 depth
ARG 6 scale
ARG 7 temperature
ARG 8 downfall
ARG 9 effects
ARG 10 parent

View File

@ -25,7 +25,14 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC
FIELD field_14084 END_CITY Lnet/minecraft/class_2975;
FIELD field_14085 OCEAN_RUIN Lnet/minecraft/class_2975;
FIELD field_19182 PILLAGER_OUTPOST Lnet/minecraft/class_2975;
FIELD field_24017 RUINED_PORTAL Lnet/minecraft/class_2975;
FIELD field_24422 BASTION_REMNANT Lnet/minecraft/class_2975;
FIELD field_24560 config Lnet/minecraft/class_2888;
METHOD <init> (Lnet/minecraft/class_2888;)V
ARG 1 config
METHOD method_14309 getDefaultConfig ()Lnet/minecraft/class_3232;
METHOD method_14311 (Ljava/util/HashMap;)V
ARG 0 map
METHOD method_14312 getLayerBlocks ()[Lnet/minecraft/class_2680;
METHOD method_14313 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
ARG 1 dynamicOps
@ -37,6 +44,8 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC
METHOD method_14319 fromString (Ljava/lang/String;)Lnet/minecraft/class_3232;
ARG 0 string
METHOD method_14320 hasNoTerrain ()Z
METHOD method_14321 (Ljava/util/HashMap;)V
ARG 0 map
METHOD method_14323 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3232;
ARG 0 dynamic
METHOD method_14324 setStructureOption (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@ -46,8 +55,11 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC
METHOD method_14327 getLayers ()Ljava/util/List;
METHOD method_14328 parseLayersString (Ljava/lang/String;)Ljava/util/List;
ARG 0 string
METHOD method_14329 (Ljava/util/HashMap;)V
ARG 0 map
METHOD method_14330 updateLayerBlocks ()V
METHOD method_14333 getStructures ()Ljava/util/Map;
METHOD method_14334 parseBlock (Ljava/lang/String;)Lnet/minecraft/class_2248;
METHOD method_20314 removeLayerBlock (I)V
ARG 1 layer
METHOD method_28051 getConfig ()Lnet/minecraft/class_2888;

View File

@ -1 +1,6 @@
CLASS net/minecraft/class_2914 net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator
FIELD field_24519 generatorConfig Lnet/minecraft/class_5284;
METHOD <init> (Lnet/minecraft/class_1966;JLnet/minecraft/class_5284;)V
ARG 1 biomeSource
ARG 2 seed
ARG 4 config

View File

@ -1,10 +1,17 @@
CLASS net/minecraft/class_2912 net/minecraft/world/gen/chunk/OverworldChunkGenerator
FIELD field_13245 phantomSpawner Lnet/minecraft/class_2910;
FIELD field_13254 BIOME_WEIGHT_TABLE [F
FIELD field_16583 noiseSampler Lnet/minecraft/class_3537;
FIELD field_16583 depthNoiseSampler Lnet/minecraft/class_3537;
FIELD field_16650 pillagerSpawner Lnet/minecraft/class_3769;
FIELD field_19181 catSpawner Lnet/minecraft/class_4274;
FIELD field_19430 zombieSiegeManager Lnet/minecraft/class_1419;
METHOD method_16414 sampleNoise (II)D
FIELD field_24518 generatorConfig Lnet/minecraft/class_2906;
METHOD <init> (Lnet/minecraft/class_1966;JLnet/minecraft/class_2906;)V
ARG 1 biomeSource
ARG 2 seed
ARG 4 config
METHOD method_16414 sampleDepthNoise (II)D
ARG 1 x
ARG 2 y
METHOD method_16415 ([F)V
ARG 0 array

View File

@ -1 +1,6 @@
CLASS net/minecraft/class_2906 net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig
FIELD field_24517 old Z
METHOD <init> (Lnet/minecraft/class_2888;Z)V
ARG 1 config
ARG 2 old
METHOD method_28008 isOld ()Z

View File

@ -3,12 +3,25 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/SurfaceChunkGenerat
FIELD field_16571 surfaceDepthNoise Lnet/minecraft/class_3757;
FIELD field_16572 verticalNoiseResolution I
FIELD field_16573 defaultFluid Lnet/minecraft/class_2680;
FIELD field_16574 lowerInterpolatedNoise Lnet/minecraft/class_3537;
FIELD field_16575 interpolationNoise Lnet/minecraft/class_3537;
FIELD field_16576 defaultBlock Lnet/minecraft/class_2680;
FIELD field_16577 random Lnet/minecraft/class_2919;
FIELD field_16578 noiseSizeZ I
FIELD field_16579 noiseSizeY I
FIELD field_16580 noiseSizeX I
FIELD field_16581 upperInterpolatedNoise Lnet/minecraft/class_3537;
FIELD field_16648 AIR Lnet/minecraft/class_2680;
FIELD field_24512 bedrockFloorHeight I
FIELD field_24513 bedrockCeilingHeight I
METHOD <init> (Lnet/minecraft/class_1966;JLnet/minecraft/class_5284;IIIZ)V
ARG 1 biomeSource
ARG 2 seed
ARG 4 config
ARG 5 horizontalNoiseResolution
ARG 6 verticalNoiseResolution
ARG 7 worldHeight
ARG 8 useSimplexNoise
METHOD method_12090 computeNoiseRange (II)[D
ARG 1 x
ARG 2 z
@ -24,16 +37,38 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/SurfaceChunkGenerat
ARG 1 x
ARG 2 z
METHOD method_16408 getNoiseSizeY ()I
METHOD method_16409 topInterpolationStart ()D
METHOD method_16410 bottomInterpolationStart ()D
METHOD method_16411 sampleNoise (IIIDDDD)D
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 horizontalScale
ARG 6 verticalScale
ARG 8 horizontalStretch
ARG 10 verticalStretch
METHOD method_16412 buildBedrock (Lnet/minecraft/class_2791;Ljava/util/Random;)V
ARG 1 chunk
ARG 2 random
METHOD method_16413 sampleNoiseColumn ([DIIDDDDII)V
ARG 1 buffer
ARG 2 x
ARG 3 z
ARG 4 horizontalScale
ARG 6 verticalScale
ARG 8 horizontalStretch
ARG 10 verticalStretch
ARG 12 topInterpolationFactor
ARG 13 topEndValue
METHOD method_16573 ([F)V
ARG 0 array
METHOD method_26262 getBlockState (DI)Lnet/minecraft/class_2680;
ARG 1 density
ARG 3 y
METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;)I
ARG 1 x
ARG 2 z
ARG 3 states
ARG 4 predicate
METHOD method_26983 (Lnet/minecraft/class_1923;Lit/unimi/dsi/fastutil/objects/ObjectList;IILit/unimi/dsi/fastutil/objects/ObjectList;Lnet/minecraft/class_3449;)V
ARG 5 start

View File

@ -7,4 +7,4 @@ CLASS net/minecraft/class_4650 net/minecraft/world/gen/foliage/SpruceFoliagePlac
ARG 3 offset
ARG 4 randomOffset
ARG 5 trunkHeight
ARG 6 randomChunkHeight
ARG 6 randomTrunkHeight