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

Worldgen again (#1672) 

* Worldgen again

* renaming

* BuiltIn -> Builtin

* avoid conflicts
This commit is contained in:
Yanis48 2020-08-12 09:20:28 +02:00 committed by GitHub
parent 097b138f62
commit ad77bf8c17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 82 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mappings/net/minecraft/structure/StructureStart.mapping
View File

@ -38,8 +38,13 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
METHOD method_14974 generateStructure (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
METHOD method_14979 isInExistingChunk ()Z
METHOD method_16655 init (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;Lnet/minecraft/class_3037;)V
ARG 1 registryManager
ARG 2 chunkGenerator
ARG 3 manager
ARG 4 chunkX
ARG 5 chunkZ
ARG 6 biome
ARG 7 config
METHOD method_16656 getFeature ()Lnet/minecraft/class_3195;
METHOD method_16657 hasChildren ()Z
METHOD method_23676 getReferences ()I

4
mappings/net/minecraft/world/SaveProperties.mapping
View File

@ -32,3 +32,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties
METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2487;
METHOD method_29037 setDragonFight (Lnet/minecraft/class_2487;)V
ARG 1 tag
METHOD method_29588 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
METHOD method_29589 getDataPackSettings ()Lnet/minecraft/class_5359;
METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_5359;)V
ARG 1 dataPackSettings

2
mappings/net/minecraft/world/biome/BuiltInBiomes.mapping → mappings/net/minecraft/world/biome/BuiltinBiomes.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_1972 net/minecraft/world/biome/BuiltInBiomes
CLASS net/minecraft/class_1972 net/minecraft/world/biome/BuiltinBiomes
METHOD method_8775 register (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 name

19
mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping
View File

@ -1,7 +1,24 @@
CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource
FIELD field_24730 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24731 seed J
FIELD field_26699 biomeRegistry Lnet/minecraft/class_2378;
FIELD field_26700 centerBiome Lnet/minecraft/class_1959;
FIELD field_26701 highlandsBiome Lnet/minecraft/class_1959;
FIELD field_26702 midlandsBiome Lnet/minecraft/class_1959;
FIELD field_26703 smallIslandsBiome Lnet/minecraft/class_1959;
FIELD field_26704 barrensBiome Lnet/minecraft/class_1959;
FIELD field_9831 noise Lnet/minecraft/class_3541;
METHOD <init> (Lnet/minecraft/class_2378;JLnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;)V
METHOD <init> (Lnet/minecraft/class_2378;J)V
ARG 1 biomeRegistry
ARG 2 seed
METHOD <init> (Lnet/minecraft/class_2378;JLnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;)V
ARG 1 biomeRegistry
ARG 2 seed
ARG 4 centerBiome
ARG 5 highlandsBiome
ARG 6 midlandsBiome
ARG 7 smallIslandsBiome
ARG 8 barrensBiome
METHOD method_28479 isSeedEqual (J)Z
ARG 1 seed
METHOD method_8757 getNoiseAt (Lnet/minecraft/class_3541;II)F

4
mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping
View File

@ -3,7 +3,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
COMMENT as well as populating the generated chunks with {@linkplain net.minecraft.world.gen.feature.Feature features} and {@linkplain net.minecraft.entity.Entity entities}.
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_5311;
FIELD field_16567 structuresConfig Lnet/minecraft/class_5311;
FIELD field_24746 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24748 worldSeed J
FIELD field_24749 strongholds Ljava/util/List;
@ -42,7 +42,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
ARG 3 access
ARG 4 chunk
ARG 5 carver
METHOD method_12109 getConfig ()Lnet/minecraft/class_5311;
METHOD method_12109 getStructuresConfig ()Lnet/minecraft/class_5311;
METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V
ARG 1 region
ARG 2 chunk

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

@ -41,6 +41,9 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti
METHOD method_28559 getGenerationShapeConfig ()Lnet/minecraft/class_5309;
METHOD method_28561 getSeaLevel ()I
METHOD method_28562 isMobGenerationDisabled ()Z
COMMENT Whether entities will be generated during chunk population.
COMMENT
COMMENT <p>It does not control whether spawns will occur during gameplay.
METHOD method_30641 createUndergroundSettings (Lnet/minecraft/class_5311;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5284;
ARG 0 structuresConfig
ARG 1 defaultBlock

3
mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping
View File

@ -1,7 +1,8 @@
CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator
FIELD field_24510 generatorConfig Lnet/minecraft/class_3232;
FIELD field_24510 config Lnet/minecraft/class_3232;
FIELD field_24769 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_3232;)V
ARG 1 config
METHOD method_28002 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
ARG 0 state
METHOD method_28545 getConfig ()Lnet/minecraft/class_3232;

24
mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping
View File

@ -5,12 +5,32 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC
FIELD field_14077 hasNoTerrain Z
FIELD field_14081 biome Ljava/util/function/Supplier;
FIELD field_14082 layerBlocks [Lnet/minecraft/class_2680;
FIELD field_24560 config Lnet/minecraft/class_5311;
FIELD field_24560 structuresConfig Lnet/minecraft/class_5311;
FIELD field_24975 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24976 hasFeatures Z
FIELD field_24977 hasLakes Z
FIELD field_26748 biomeRegistry Lnet/minecraft/class_2378;
METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_5311;Ljava/util/List;ZZLjava/util/Optional;)V
ARG 1 biomeRegistry
ARG 2 structuresConfig
ARG 3 layers
ARG 4 hasLakes
ARG 5 hasFeatures
ARG 6 biome
METHOD <init> (Lnet/minecraft/class_5311;Lnet/minecraft/class_2378;)V
ARG 1 structuresConfig
ARG 2 biomeRegistry
METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232;
ARG 0 biomeRegistry
METHOD method_14312 getLayerBlocks ()[Lnet/minecraft/class_2680;
METHOD method_14325 setBiome (Ljava/util/function/Supplier;)V
ARG 1 biome
METHOD method_14326 getBiome ()Lnet/minecraft/class_1959;
METHOD method_14327 getLayers ()Ljava/util/List;
METHOD method_14330 updateLayerBlocks ()V
METHOD method_28051 getConfig ()Lnet/minecraft/class_5311;
METHOD method_28051 getStructuresConfig ()Lnet/minecraft/class_5311;
METHOD method_28911 enableFeatures ()V
METHOD method_28912 withStructuresConfig (Lnet/minecraft/class_5311;)Lnet/minecraft/class_3232;
ARG 1 structuresConfig
METHOD method_28916 enableLakes ()V
METHOD method_28917 createBiome ()Lnet/minecraft/class_1959;

3
mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping
View File

@ -2,3 +2,6 @@ CLASS net/minecraft/class_2986 net/minecraft/world/gen/feature/DecoratedFeatureC
FIELD field_13398 decorator Lnet/minecraft/class_3243;
FIELD field_13399 feature Ljava/util/function/Supplier;
FIELD field_24880 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/util/function/Supplier;Lnet/minecraft/class_3243;)V
ARG 1 feature
ARG 2 decorator

4
mappings/net/minecraft/world/gen/feature/JigsawFeature.mapping
View File

@ -1,8 +1,10 @@
CLASS net/minecraft/class_5434 net/minecraft/world/gen/feature/JigsawFeature
FIELD field_25835 structureStartY I
FIELD field_25837 surface Z
METHOD <init> (Lcom/mojang/serialization/Codec;IZZ)V
ARG 1 codec
ARG 2 startY
ARG 2 structureStartY
ARG 4 surface
METHOD method_30386 (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449;
ARG 1 feature
ARG 2 chunkX

3
mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping
View File

@ -2,6 +2,9 @@ CLASS net/minecraft/class_3141 net/minecraft/world/gen/feature/RandomFeatureConf
FIELD field_13744 features Ljava/util/List;
FIELD field_13745 defaultFeature Ljava/util/function/Supplier;
FIELD field_24901 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/util/List;Ljava/util/function/Supplier;)V
ARG 1 features
ARG 2 defaultFeature
METHOD <init> (Ljava/util/List;Lnet/minecraft/class_2975;)V
ARG 1 features
ARG 2 defaultFeature

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

@ -1,2 +1,3 @@
CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature
CLASS class_3189 Start
FIELD field_24559 seed J

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

@ -2,8 +2,12 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_24842 STRUCTURES Lcom/google/common/collect/BiMap;
FIELD field_24851 SWAMP_HUT Lnet/minecraft/class_3197;
FIELD field_24861 JIGSAW_STRUCTURES Ljava/util/List;
FIELD field_24862 STRUCTURE_TO_GENERATION_STEP Ljava/util/Map;
FIELD field_24863 codec Lcom/mojang/serialization/Codec;
FIELD field_26362 JIGSAW_ID Lnet/minecraft/class_2960;
METHOD <init> (Lcom/mojang/serialization/Codec;)V
ARG 1 codec
METHOD method_13149 getMonsterSpawns ()Ljava/util/List;
METHOD method_14015 locateStructure (Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;IZJLnet/minecraft/class_5314;)Lnet/minecraft/class_2338;
COMMENT Tries to find the closest structure of this type near a given block.
@ -14,6 +18,8 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
COMMENT New chunks will only be generated up to the {@link net.minecraft.world.chunk.ChunkStatus#STRUCTURE_STARTS} phase by this method.
COMMENT
COMMENT @return {@code null} if no structure could be found within the given search radius
ARG 1 world
ARG 2 structureAccessor
ARG 3 searchStartPos
ARG 4 searchRadius
COMMENT The search radius in chunks around the chunk the given block position is in. A radius of 0 will only search in the given chunk.
@ -64,6 +70,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
METHOD method_28659 configure (Lnet/minecraft/class_3037;)Lnet/minecraft/class_5312;
ARG 1 config
METHOD method_28660 readStructureStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449;
ARG 0 manager
ARG 1 tag
ARG 2 worldSeed
METHOD method_28661 register (Ljava/lang/String;Lnet/minecraft/class_3195;Lnet/minecraft/class_2893$class_2895;)Lnet/minecraft/class_3195;

8
mappings/net/minecraft/world/level/LevelProperties.mapping
View File

@ -28,6 +28,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
FIELD field_25030 levelInfo Lnet/minecraft/class_1940;
FIELD field_25031 dragonFight Lnet/minecraft/class_2487;
FIELD field_25425 generatorOptions Lnet/minecraft/class_5285;
FIELD field_25426 lifecycle Lcom/mojang/serialization/Lifecycle;
FIELD field_26367 spawnAngle F
METHOD <init> (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/LinkedHashSet;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 dataFixer
@ -56,5 +57,12 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
ARG 26 scheduledEvents
ARG 27 customBossEvents
ARG 28 dragonFight
ARG 29 levelInfo
ARG 30 generatorOptions
ARG 31 lifecycle
METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 levelInfo
ARG 2 generatorOptions
ARG 3 lifecycle
METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V
METHOD method_185 loadPlayerData ()V