mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Map worldgen stuff (#2387) 

* Map worldgen stuff

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
enbrain 2021-05-12 22:01:09 +09:00 committed by GitHub
parent a27c5b3aad
commit 42e3aafffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 92 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mappings/net/minecraft/world/gen/CatSpawner.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_4274 net/minecraft/world/gen/CatSpawner
FIELD field_19171 ticksUntilNextSpawn I
FIELD field_30601 SPAWN_COOLDOWN I
METHOD method_20260 spawnInSwampHut (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I
ARG 1 world
ARG 2 pos

1
mappings/net/minecraft/world/gen/ChunkRandom.mapping
View File

@ -71,5 +71,6 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom
ARG 3 x
ARG 4 y
ARG 5 z
METHOD method_35335 getSampleCount ()I
METHOD next (I)I
ARG 1 count

3
mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping
View File

@ -3,8 +3,11 @@ CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateBlockSource
FIELD field_28910 seed J
FIELD field_28911 defaultBlock Lnet/minecraft/class_2680;
FIELD field_28912 deepslateState Lnet/minecraft/class_2680;
FIELD field_31468 DEFAULT_MIN_Y I
FIELD field_31469 MAX_Y I
FIELD field_33513 settings Lnet/minecraft/class_5284;
METHOD <init> (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_5284;)V
ARG 1 seed
ARG 3 defaultBlock
ARG 4 deepslateState
ARG 5 settings

9
mappings/net/minecraft/world/gen/carver/Carver.mapping
View File

@ -7,6 +7,7 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver
FIELD field_13302 alwaysCarvableBlocks Ljava/util/Set;
FIELD field_13305 WATER Lnet/minecraft/class_3610;
FIELD field_24831 codec Lcom/mojang/serialization/Codec;
FIELD field_33614 STONE_SOURCE Lnet/minecraft/class_5840;
METHOD <init> (Lcom/mojang/serialization/Codec;)V
ARG 1 configCodec
METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Ljava/util/BitSet;)Z
@ -37,6 +38,7 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver
ARG 1 state
METHOD method_12710 getBranchFactor ()I
METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z
ARG 1 context
ARG 2 config
ARG 3 chunk
ARG 4 posToBiome
@ -77,6 +79,13 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver
ARG 19 skipPredicate
METHOD method_33980 isDebug (Lnet/minecraft/class_5871;)Z
ARG 0 config
METHOD method_36417 getDebugState (Lnet/minecraft/class_5871;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
ARG 0 config
ARG 1 state
METHOD method_36418 getState (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2338;Lnet/minecraft/class_6350;)Lnet/minecraft/class_2680;
ARG 1 context
ARG 2 config
ARG 3 pos
CLASS class_5874 SkipPredicate
METHOD shouldSkip (Lnet/minecraft/class_5873;DDDI)Z
ARG 1 context

3
mappings/net/minecraft/world/gen/carver/CarverConfig.mapping
View File

@ -4,8 +4,11 @@ CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig
FIELD field_31488 y Lnet/minecraft/class_6122;
FIELD field_31489 yScale Lnet/minecraft/class_5863;
FIELD field_31490 lavaLevel Lnet/minecraft/class_5843;
FIELD field_33610 aquifers Z
METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;)V
ARG 1 probability
ARG 2 y
ARG 3 yScale
ARG 4 lavaLevel
ARG 5 aquifers
ARG 6 debugConfig

26
mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping
View File

@ -2,12 +2,32 @@ CLASS net/minecraft/class_5872 net/minecraft/world/gen/carver/CarverDebugConfig
FIELD field_29055 DEFAULT Lnet/minecraft/class_5872;
FIELD field_29056 CODEC Lcom/mojang/serialization/Codec;
FIELD field_29057 debugMode Z
FIELD field_29058 debugState Lnet/minecraft/class_2680;
FIELD field_29058 airState Lnet/minecraft/class_2680;
FIELD field_33611 waterState Lnet/minecraft/class_2680;
FIELD field_33612 lavaState Lnet/minecraft/class_2680;
FIELD field_33613 barrierState Lnet/minecraft/class_2680;
METHOD <init> (ZLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V
ARG 1 debugMode
ARG 2 debugState
ARG 2 airState
ARG 3 waterState
ARG 4 lavaState
ARG 5 barrierState
METHOD method_33970 isDebugMode ()Z
METHOD method_33972 create (ZLnet/minecraft/class_2680;)Lnet/minecraft/class_5872;
ARG 0 debugMode
ARG 1 debugState
METHOD method_33973 getDebugState ()Lnet/minecraft/class_2680;
METHOD method_33973 getAirState ()Lnet/minecraft/class_2680;
METHOD method_36412 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Lnet/minecraft/class_5872;
ARG 0 airState
ARG 1 waterState
ARG 2 lavaState
ARG 3 barrierState
METHOD method_36413 create (ZLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Lnet/minecraft/class_5872;
ARG 0 debugMode
ARG 1 airState
ARG 2 waterState
ARG 3 lavaState
ARG 4 barrierState
METHOD method_36414 getWaterState ()Lnet/minecraft/class_2680;
METHOD method_36415 getLavaState ()Lnet/minecraft/class_2680;
METHOD method_36416 getBarrierState ()Lnet/minecraft/class_2680;

10
mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping
View File

@ -8,12 +8,22 @@ CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig
ARG 2 y
ARG 3 yScale
ARG 4 lavaLevel
ARG 5 aquifers
ARG 6 horizontalRadiusMultiplier
ARG 7 verticalRadiusMultiplier
ARG 8 floorLevel
METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
ARG 1 probability
ARG 2 y
ARG 3 yScale
ARG 4 lavaLevel
ARG 5 aquifers
ARG 6 debugConfig
ARG 7 horizontalRadiusMultiplier
ARG 8 verticalRadiusMultiplier
ARG 9 floorLevel
METHOD <init> (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
ARG 1 config
ARG 2 horizontalRadiusMultiplier
ARG 3 verticalRadiusMultiplier
ARG 4 floorLevel

5
mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping
View File

@ -7,7 +7,12 @@ CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig
ARG 2 y
ARG 3 yScale
ARG 4 lavaLevel
ARG 5 aquifers
ARG 6 debugConfig
ARG 7 verticalRotation
ARG 8 shape
METHOD <init> (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V
ARG 1 config
ARG 2 verticalRotation
ARG 3 shape
CLASS class_6107 Shape

1
mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping
View File

@ -33,6 +33,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti
ARG 10 aquifers
ARG 11 noiseCaves
ARG 12 deepslate
ARG 13 oreVeins
METHOD method_16400 getBedrockCeilingY ()I
COMMENT Returns the Y level of the bedrock ceiling.
COMMENT

1
mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer.mapping
View File

@ -1,6 +1,7 @@
CLASS net/minecraft/class_3229 net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer
FIELD field_14028 thickness I
FIELD field_24974 CODEC Lcom/mojang/serialization/Codec;
FIELD field_29566 block Lnet/minecraft/class_2248;
METHOD <init> (ILnet/minecraft/class_2248;)V
ARG 1 thickness
ARG 2 block

6
mappings/net/minecraft/world/gen/decorator/Decoratable.mapping
View File

@ -26,3 +26,9 @@ CLASS net/minecraft/class_5432 net/minecraft/world/gen/decorator/Decoratable
COMMENT the maximum repetition count
METHOD method_33838 range (Lnet/minecraft/class_2997;)Ljava/lang/Object;
ARG 1 config
METHOD method_36296 uniformRange (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Ljava/lang/Object;
ARG 1 min
ARG 2 max
METHOD method_36297 triangleRange (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Ljava/lang/Object;
ARG 1 min
ARG 2 max

3
mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping
View File

@ -1,2 +1,5 @@
CLASS net/minecraft/class_2997 net/minecraft/world/gen/decorator/RangeDecoratorConfig
FIELD field_24879 CODEC Lcom/mojang/serialization/Codec;
FIELD field_33519 heightProvider Lnet/minecraft/class_6122;
METHOD <init> (Lnet/minecraft/class_6122;)V
ARG 1 heightProvider

1
mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping
View File

@ -1,2 +1,3 @@
CLASS net/minecraft/class_2956 net/minecraft/world/gen/feature/BuriedTreasureFeature
FIELD field_31500 SALT I
CLASS class_2957 Start

7
mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping
View File

@ -12,6 +12,9 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature
FIELD field_29512 RANDOM_AGE_CAVE_VINES_HEAD_PROVIDER Lnet/minecraft/class_5929;
FIELD field_29529 FOSSIL_STRUCTURES Lcom/google/common/collect/ImmutableList;
FIELD field_29530 FOSSIL_OVERLAY_STRUCTURES Lcom/google/common/collect/ImmutableList;
FIELD field_33634 EMERALD_ORE_TARGETS Lcom/google/common/collect/ImmutableList;
FIELD field_33635 COPPER_ORE_TARGETS Lcom/google/common/collect/ImmutableList;
FIELD field_33636 COAL_ORE_TARGETS Lcom/google/common/collect/ImmutableList;
METHOD method_30590 register (Ljava/lang/String;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2975;
ARG 0 id
ARG 1 configuredFeature
@ -161,3 +164,7 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature
FIELD field_29651 BIG_DRIPLEAF_WEST Lnet/minecraft/class_2680;
FIELD field_29652 BIG_DRIPLEAF_NORTH Lnet/minecraft/class_2680;
FIELD field_29653 BIG_DIRPLEAF_SOUTH Lnet/minecraft/class_2680;
FIELD field_33144 DEEPSLATE Lnet/minecraft/class_2680;
FIELD field_33637 DEEPSLATE_COAL_ORE Lnet/minecraft/class_2680;
FIELD field_33638 DEEPSLATE_COPPER_ORE Lnet/minecraft/class_2680;
FIELD field_33639 DEEPSLATE_EMERALD_ORE Lnet/minecraft/class_2680;

6
mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
View File

@ -140,7 +140,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu
ARG 1 zombieWeight
ARG 2 zombieVillagerWeight
ARG 3 skeletonWeight
METHOD method_30579 addBats (Lnet/minecraft/class_5483$class_5496;)V
METHOD method_30579 addCaveMobs (Lnet/minecraft/class_5483$class_5496;)V
ARG 0 builder
METHOD method_30580 addFarmAnimals (Lnet/minecraft/class_5483$class_5496;)V
ARG 0 builder
@ -175,3 +175,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu
ARG 0 builder
METHOD method_34664 addClayOre (Lnet/minecraft/class_5485$class_5495;)V
ARG 0 builder
METHOD method_35924 addCaveWaterMobs (Lnet/minecraft/class_5483$class_5496;)V
ARG 0 builder
METHOD method_36453 addMineables (Lnet/minecraft/class_5485$class_5495;)V
ARG 0 builder

7
mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping
View File

@ -11,6 +11,9 @@ CLASS net/minecraft/class_5589 net/minecraft/world/gen/feature/GeodeFeatureConfi
FIELD field_27329 maxGenOffset I
FIELD field_27330 noiseMultiplier D
FIELD field_29062 invalidBlocksThreshold I
FIELD field_33516 outerWallDistance Lnet/minecraft/class_6017;
FIELD field_33517 distributionPoints Lnet/minecraft/class_6017;
FIELD field_33518 pointOffset Lnet/minecraft/class_6017;
METHOD <init> (Lnet/minecraft/class_5585;Lnet/minecraft/class_5587;Lnet/minecraft/class_5586;DDZLnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;IIDI)V
ARG 1 layerConfig
ARG 2 layerThicknessConfig
@ -18,6 +21,10 @@ CLASS net/minecraft/class_5589 net/minecraft/world/gen/feature/GeodeFeatureConfi
ARG 4 usePotentialPlacementsChance
ARG 6 useAlternateLayer0Chance
ARG 8 placementsRequireLayer0Alternate
ARG 9 outerWallDistance
ARG 10 distributionPoints
ARG 11 pointOffset
ARG 12 maxDistributionPoints
ARG 13 minPointOffset
ARG 14 noiseMultiplier
ARG 16 maxGenOffset

2
mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping
View File

@ -19,7 +19,7 @@ CLASS net/minecraft/class_3124 net/minecraft/world/gen/feature/OreFeatureConfig
ARG 2 state
ARG 3 size
ARG 4 discardOnAirChance
METHOD method_33994 create (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3124$class_5876;
METHOD method_33994 createTarget (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3124$class_5876;
ARG 0 test
ARG 1 state
CLASS class_5436 Rules

2
mappings/net/minecraft/world/gen/feature/util/CaveSurface.mapping
View File

@ -29,6 +29,8 @@ CLASS net/minecraft/class_5721 net/minecraft/world/gen/feature/util/CaveSurface
ARG 4 mutablePos
ARG 5 y
ARG 6 direction
METHOD method_35328 withCeiling (Ljava/util/OptionalInt;)Lnet/minecraft/class_5721;
ARG 1 ceiling
CLASS class_5722 Empty
FIELD field_28197 INSTANCE Lnet/minecraft/class_5721$class_5722;
CLASS class_5723 Bounded

3
mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping
View File

@ -1,4 +1,7 @@
CLASS net/minecraft/class_4631 net/minecraft/world/gen/placer/ColumnPlacer
FIELD field_24867 CODEC Lcom/mojang/serialization/Codec;
FIELD field_33515 size Lnet/minecraft/class_6017;
METHOD <init> (Lnet/minecraft/class_6017;)V
ARG 1 size
METHOD method_28676 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance