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

Map LevelGeneratorOptions (#1175) 

* Map LevelGeneratorOptions

* Delete build.gradle

* FIX MESS

This reverts commit 1401dd2a73.

* FIX MESS 2

* 20w11a falseresync/levelgen (#1)

* Stuff around this level gen stuff

Signed-off-by: liach <liach@users.noreply.github.com>

* Another missed

* one more field

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

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: liach <liach@users.noreply.github.com>
This commit is contained in:
Mikhail Oleynikov 2020-03-13 16:55:03 +03:00 committed by GitHub
parent 666890b9d8
commit 2cd906df4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 115 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldScreen
FIELD field_18979 generatorOptionsTag Lnet/minecraft/class_4952;
FIELD field_18979 generatorOptions Lnet/minecraft/class_4952;
FIELD field_3178 hardcore Z
FIELD field_3179 tweakedCheats Z
FIELD field_3180 structures Z
@ -30,6 +30,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
ARG 1 parent
METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V
ARG 1 mode
METHOD method_25993 getLevelGeneratorType ()Lnet/minecraft/class_1942;
METHOD method_2710 setMoreOptionsOpen (Z)V
ARG 1 moreOptionsOpen
METHOD method_2721 toggleMoreOptions ()V

1
mappings/net/minecraft/datafixer/TypeReferences.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences
FIELD field_19224 POI_CHUNK Lcom/mojang/datafixers/DSL$TypeReference;
FIELD field_23067 CHUNK_GENERATOR_SETTINGS Lcom/mojang/datafixers/DSL$TypeReference;
FIELD field_5710 LEVEL Lcom/mojang/datafixers/DSL$TypeReference;
FIELD field_5711 RECIPE Lcom/mojang/datafixers/DSL$TypeReference;
FIELD field_5712 ITEM_STACK Lcom/mojang/datafixers/DSL$TypeReference;

1
mappings/net/minecraft/server/MinecraftServer.mapping
View File

@ -107,6 +107,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_21714 getFunctionPermissionLevel ()I
METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565;
METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567;
METHOD method_24307 getModdedStatusMessage ()Ljava/util/Optional;
METHOD method_24487 startMonitor (Lnet/minecraft/class_4758;)V
ARG 1 monitor
METHOD method_24488 isDebugRunning ()Z

4
mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping
View File

@ -1,15 +1,17 @@
CLASS net/minecraft/class_1969 net/minecraft/world/biome/source/BiomeSourceType
FIELD field_9398 CHECKERBOARD Lnet/minecraft/class_1969;
FIELD field_9399 THE_END Lnet/minecraft/class_1969;
FIELD field_9400 config Ljava/util/function/LongFunction;
FIELD field_9400 configFactory Ljava/util/function/LongFunction;
FIELD field_9401 FIXED Lnet/minecraft/class_1969;
FIELD field_9402 VANILLA_LAYERED Lnet/minecraft/class_1969;
FIELD field_9403 biomeSource Ljava/util/function/Function;
METHOD <init> (Ljava/util/function/Function;Ljava/util/function/LongFunction;)V
ARG 1 biomeSource
ARG 2 configFactory
METHOD method_8772 applyConfig (Lnet/minecraft/class_1970;)Lnet/minecraft/class_1966;
ARG 1 config
METHOD method_8773 register (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/LongFunction;)Lnet/minecraft/class_1969;
ARG 0 id
ARG 1 biomeSource
METHOD method_8774 getConfig (J)Lnet/minecraft/class_1970;
ARG 1 seed

12
mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping
View File

@ -1,9 +1,13 @@
CLASS net/minecraft/class_2084 net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig
FIELD field_20619 seed J
FIELD field_20620 generatorType Lnet/minecraft/class_1942;
FIELD field_9669 generatorSettings Lnet/minecraft/class_2906;
FIELD field_9669 generatorConfig Lnet/minecraft/class_2906;
METHOD <init> (J)V
ARG 1 seed
METHOD method_22355 getSeed ()J
METHOD method_22356 getGeneratorType ()Lnet/minecraft/class_1942;
METHOD method_9004 setGeneratorSettings (Lnet/minecraft/class_2906;)Lnet/minecraft/class_2084;
ARG 1 generatorSettings
METHOD method_9005 getGeneratorSettings ()Lnet/minecraft/class_2906;
METHOD method_25958 setGeneratorType (Lnet/minecraft/class_1942;)Lnet/minecraft/class_2084;
ARG 1 generatorType
METHOD method_9004 setGeneratorConfig (Lnet/minecraft/class_2906;)Lnet/minecraft/class_2084;
ARG 1 generatorConfig
METHOD method_9005 getGeneratorConfig ()Lnet/minecraft/class_2906;

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

@ -1,4 +1,5 @@
CLASS net/minecraft/class_2801 net/minecraft/world/gen/chunk/ChunkGeneratorFactory
METHOD create (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_2888;)Lnet/minecraft/class_2794;
ARG 1 world
ARG 2 biomeSource
ARG 3 config

10
mappings/net/minecraft/world/gen/chunk/ChunkGeneratorType.mapping
View File

@ -1,11 +1,15 @@
CLASS net/minecraft/class_2798 net/minecraft/world/gen/chunk/ChunkGeneratorType
FIELD field_12767 buffetScreenOption Z
FIELD field_12771 settingsSupplier Ljava/util/function/Supplier;
FIELD field_12771 configSupplier Ljava/util/function/Supplier;
FIELD field_12772 factory Lnet/minecraft/class_2801;
METHOD <init> (Lnet/minecraft/class_2801;ZLjava/util/function/Supplier;)V
ARG 1 factory
ARG 2 buffetScreenOption
ARG 3 settingsSupplier
ARG 3 configSupplier
METHOD method_12116 register (Ljava/lang/String;Lnet/minecraft/class_2801;Ljava/util/function/Supplier;Z)Lnet/minecraft/class_2798;
METHOD method_12117 createSettings ()Lnet/minecraft/class_2888;
ARG 0 id
ARG 1 factory
ARG 2 configSupplier
ARG 3 buffetScreenOption
METHOD method_12117 createConfig ()Lnet/minecraft/class_2888;
METHOD method_12118 isBuffetScreenOption ()Z

39
mappings/net/minecraft/world/level/LevelGeneratorOptions.mapping Normal file
View File

@ -0,0 +1,39 @@
CLASS net/minecraft/class_4952 net/minecraft/world/level/LevelGeneratorOptions
FIELD field_23085 type Lnet/minecraft/class_1942;
FIELD field_23086 dynamic Lcom/mojang/datafixers/Dynamic;
FIELD field_23087 chunkGeneratorFactory Ljava/util/function/Function;
METHOD <init> (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;Ljava/util/function/Function;)V
ARG 1 type
ARG 3 chunkGeneratorFactory
METHOD method_25963 getType ()Lnet/minecraft/class_1942;
METHOD method_25966 createChunkGenerator (Lnet/minecraft/class_1936;)Lnet/minecraft/class_2794;
ARG 1 world
METHOD method_25968 createDefault (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4952;
ARG 0 generatorType
ARG 1 dynamic
METHOD method_25971 loadOptions (Lnet/minecraft/class_2888;Lcom/mojang/datafixers/DynamicLike;)V
ARG 0 config
ARG 1 dynamic
METHOD method_25974 loadBiomeSourceFactory (Lcom/mojang/datafixers/DynamicLike;)Ljava/util/function/LongFunction;
ARG 0 dynamic
METHOD method_25975 loadChunkGeneratorFactory (Lcom/mojang/datafixers/DynamicLike;Lnet/minecraft/class_2798;Ljava/util/function/LongFunction;)Ljava/util/function/Function;
ARG 0 dynamic
ARG 1 type
ARG 2 biomeSourceFactory
METHOD method_25976 retrieveFromRegistry (Lcom/mojang/datafixers/DynamicLike;Lnet/minecraft/class_2378;Ljava/lang/Object;)Ljava/lang/Object;
ARG 0 dynamic
ARG 1 registry
ARG 2 fallback
METHOD method_25977 loadChunkGeneratorFactory (Lcom/mojang/datafixers/DynamicLike;Ljava/util/function/LongFunction;)Ljava/util/function/Function;
ARG 0 dynamic
ARG 1 biomeSourceFactory
METHOD method_25980 getDynamic ()Lcom/mojang/datafixers/Dynamic;
METHOD method_25982 createFlat (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4952;
ARG 0 generatorType
ARG 1 dynamic
METHOD method_25983 createBuffet (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4952;
ARG 0 type
ARG 1 dynamic
METHOD method_25984 createDebug (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4952;
ARG 0 type
ARG 1 dynamic

21
mappings/net/minecraft/world/level/LevelGeneratorType.mapping
View File

@ -1,4 +1,7 @@
CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType
FIELD field_23073 EMPTY_COMPOUND_NBT_DYNAMIC Lcom/mojang/datafixers/Dynamic;
FIELD field_23074 optionsLoader Ljava/util/function/Function;
FIELD field_23075 defaultOptions Lnet/minecraft/class_3528;
FIELD field_9265 DEFAULT Lnet/minecraft/class_1942;
FIELD field_9266 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_1942;
FIELD field_9267 AMPLIFIED Lnet/minecraft/class_1942;
@ -16,6 +19,24 @@ CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType
FIELD field_9279 TYPES [Lnet/minecraft/class_1942;
FIELD field_9280 version I
FIELD field_9281 id I
METHOD <init> (ILjava/lang/String;ILjava/util/function/BiFunction;)V
ARG 1 index
ARG 2 name
ARG 3 version
ARG 4 optionsFactory
METHOD <init> (ILjava/lang/String;Ljava/lang/String;ILjava/util/function/BiFunction;)V
ARG 1 index
ARG 2 name
ARG 3 storedName
ARG 4 version
ARG 5 optionsFactory
METHOD <init> (ILjava/lang/String;Ljava/util/function/BiFunction;)V
ARG 1 index
ARG 2 name
ARG 3 optionsFactory
METHOD method_25954 loadOptions (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4952;
ARG 1 dynamic
METHOD method_25957 getDefaultOptions ()Lnet/minecraft/class_4952;
METHOD method_8629 setHasInfo ()Lnet/minecraft/class_1942;
METHOD method_8630 getInfoTranslationKey ()Ljava/lang/String;
METHOD method_8631 setCustomizable (Z)Lnet/minecraft/class_1942;

7
mappings/net/minecraft/world/level/LevelInfo.mapping
View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo
FIELD field_23072 generatorOptions Lnet/minecraft/class_4952;
FIELD field_9257 gameMode Lnet/minecraft/class_1934;
FIELD field_9258 bonusChest Z
FIELD field_9259 commands Z
@ -7,12 +8,16 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo
FIELD field_9263 seed J
METHOD <init> (JLnet/minecraft/class_1934;ZZLnet/minecraft/class_4952;)V
ARG 1 seed
ARG 3 gameMode
ARG 4 structures
ARG 5 hardcore
ARG 6 generatorOptions
METHOD <init> (Lnet/minecraft/class_31;)V
ARG 1 properties
METHOD method_8573 allowCommands ()Z
METHOD method_8574 getGameMode ()Lnet/minecraft/class_1934;
METHOD method_8575 setBonusChest ()Lnet/minecraft/class_1940;
METHOD method_8576 getGeneratorType ()Lnet/minecraft/class_4952;
METHOD method_8576 getGeneratorOptions ()Lnet/minecraft/class_4952;
METHOD method_8577 getSeed ()J
METHOD method_8578 enableCommands ()Lnet/minecraft/class_1940;
METHOD method_8581 hasBonusChest ()Z

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

@ -44,12 +44,21 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
FIELD field_193 worldData Ljava/util/Map;
FIELD field_194 versionSnapshot Z
FIELD field_195 structures Z
FIELD field_196 playerWorldId I
FIELD field_196 dataVersion I
FIELD field_197 borderWarningBlocks I
FIELD field_198 timeOfDay J
FIELD field_199 borderSizeLerpTime J
FIELD field_21837 serverBrands Ljava/util/Set;
FIELD field_21838 modded Z
FIELD field_23089 generatorOptions Lnet/minecraft/class_4952;
METHOD <init> (Lnet/minecraft/class_1940;Ljava/lang/String;)V
ARG 1 info
ARG 2 levelName
METHOD <init> (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;)V
ARG 1 tag
ARG 2 dataFixer
ARG 3 dataVersion
ARG 4 playerData
METHOD method_139 getBorderCenterZ ()D
METHOD method_140 loadLevelInfo (Lnet/minecraft/class_1940;)V
ARG 1 levelInfo
@ -63,6 +72,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
ARG 1 thundering
METHOD method_150 getLevelName ()Ljava/lang/String;
METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V
ARG 1 section
METHOD method_152 isHardcore ()Z
METHOD method_153 getGeneratorType ()Lnet/minecraft/class_1942;
METHOD method_154 setSpawnZ (I)V
@ -77,6 +87,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_159 getBorderSizeLerpTarget ()D
METHOD method_160 setWorldData (Lnet/minecraft/class_2874;Lnet/minecraft/class_2487;)V
ARG 1 type
ARG 2 tag
METHOD method_161 getBorderWarningTime ()I
METHOD method_162 setBorderSize (D)V
ARG 1 borderSize
@ -92,6 +103,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_168 getVersion ()I
METHOD method_169 getGeneratorOptions ()Lnet/minecraft/class_4952;
METHOD method_170 getWorldData (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2487;
ARG 1 type
METHOD method_171 isVersionSnapshot ()Z
METHOD method_173 setThunderTime (I)V
ARG 1 thunderTime
@ -118,6 +130,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_186 setDifficultyLocked (Z)V
ARG 1 difficultyLocked
METHOD method_187 setSpawnPos (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_188 getTime ()J
METHOD method_189 borderCenterZ (D)V
ARG 1 borderCenterZ
@ -126,6 +139,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_192 setBorderWarningTime (I)V
ARG 1 borderWarningTime
METHOD method_193 setGameMode (Lnet/minecraft/class_1934;)V
ARG 1 gameMode
METHOD method_194 areCommandsAllowed ()Z
METHOD method_195 setBorderSizeLerpTime (J)V
ARG 1 borderSizeLerpTime
@ -144,6 +158,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_206 getBorderSize ()D
METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267;
METHOD method_208 setDifficulty (Lnet/minecraft/class_1267;)V
ARG 1 difficulty
METHOD method_209 getDisabledDataPacks ()Ljava/util/Set;
METHOD method_210 getGameMode ()Lnet/minecraft/class_1934;
METHOD method_211 setCommandsAllowed (Z)V
@ -170,3 +185,13 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487;
METHOD method_229 setBorderDamagePerBlock (D)V
ARG 1 borderDamagePerBlock
METHOD method_24285 addServerBrand (Ljava/lang/String;Z)V
ARG 1 brand
ARG 2 moddedMessagePresent
METHOD method_25989 updateGeneratorOptionsData (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;ILcom/mojang/datafixers/DataFixer;)Lcom/mojang/datafixers/Dynamic;
ARG 0 type
ARG 1 dynamic
ARG 2 dataVersion
ARG 3 dataFixer
METHOD method_25990 setGeneratorOptions (Lnet/minecraft/class_4952;)V
ARG 1 options