Skip to content

Commit

Permalink
map some world and generation stuff (#452)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Jun 26, 2023
1 parent 8a45631 commit 9441667
Show file tree
Hide file tree
Showing 15 changed files with 262 additions and 0 deletions.
7 changes: 7 additions & 0 deletions mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CLASS net/minecraft/unmapped/C_hxzjzvro net/minecraft/entity/boss/dragon/EnderDr
METHOD m_ifpnrmna updateFight (Lnet/minecraft/unmapped/C_bsmypcfq;)V
ARG 1 dragon
METHOD m_kijgsayl respawnDragon ()V
METHOD m_kpmmjgfp getDragonUuid ()Ljava/util/UUID;
METHOD m_lxgqgdqj createDragon ()Lnet/minecraft/unmapped/C_bsmypcfq;
METHOD m_nzfapxlu updatePlayers ()V
METHOD m_qffvyptj worldContainsEndPortal ()Z
Expand All @@ -53,3 +54,9 @@ CLASS net/minecraft/unmapped/C_hxzjzvro net/minecraft/entity/boss/dragon/EnderDr
ARG 2 source
METHOD m_uzlusufn setSpawnState (Lnet/minecraft/unmapped/C_ubwoswoy;)V
ARG 1 spawnState
CLASS C_tunbvwoo State
FIELD f_rimhawtz dragonUuid Ljava/util/Optional;
FIELD f_tepqsaqc DEFAULT Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;
METHOD m_yukjnqjs (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_zjbirpju dragonUuid ()Ljava/util/Optional;
22 changes: 22 additions & 0 deletions mappings/net/minecraft/util/dynamic/Codecs.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
FIELD f_wqiemdiy NON_EMPTY_STRING Lcom/mojang/serialization/Codec;
FIELD f_xprfobkx AXISANGLE4F Lcom/mojang/serialization/Codec;
FIELD f_zhwzaxnp VECTOR3F Lcom/mojang/serialization/Codec;
METHOD m_azdhwdid (IILjava/lang/Integer;)Ljava/lang/String;
ARG 2 i
METHOD m_ceqposdb (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 0 string
METHOD m_ceufsyxl withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
Expand All @@ -35,6 +37,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
ARG 2 coApplyFunction
METHOD m_cjkdnnjx (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult;
ARG 0 json
METHOD m_dotsxqei (FFLjava/util/function/Function;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult;
ARG 3 f
METHOD m_dujfhivb orElsePartial (Ljava/lang/Object;)Lcom/mojang/serialization/Codec$ResultFunction;
ARG 0 partial
METHOD m_fdwgadxq mapProfileToIdName (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/serialization/DataResult;
Expand Down Expand Up @@ -76,10 +80,16 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
ARG 0 min
ARG 1 max
ARG 2 messageFactory
METHOD m_ljxipwty validate (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
ARG 0 codec
ARG 1 validator
METHOD m_lruqlezz asOptionalLong (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
ARG 0 codec
METHOD m_lybgbxfe createEqualTypeChecker (Ljava/util/function/Function;)Ljava/util/function/Function;
ARG 0 typeGetter
METHOD m_lytzwisw validate (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 0 codec
ARG 1 validator
METHOD m_mcwzjvkz (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lcom/mojang/serialization/DataResult;
ARG 0 text
METHOD m_mfpnjepb (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
Expand All @@ -100,6 +110,10 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
ARG 5 rightFunction
METHOD m_pqmgxbkr (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lcom/mojang/serialization/DataResult;
ARG 0 text
METHOD m_pvuukvln (Lnet/minecraft/unmapped/C_odfnijdo;)Lcom/mojang/serialization/DataResult;
ARG 0 set
METHOD m_qettqsix (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
ARG 0 list
METHOD m_sltnwzrc createRangedFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 0 min
ARG 1 max
Expand All @@ -112,8 +126,16 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
ARG 1 max
METHOD m_vlowicum (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/Dynamic;
ARG 0 json
METHOD m_wdeaaxop (Ljava/util/function/Function;Ljava/util/Collection;)Lcom/mojang/serialization/DataResult;
ARG 1 collection
METHOD m_whsvwgtf (Ljava/time/format/DateTimeFormatter;Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 1 string
METHOD m_xamlcvip (IILjava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 2 string
METHOD m_yxbdjpqp createLazy (Ljava/util/function/Supplier;)Lcom/mojang/serialization/Codec;
ARG 0 supplier
METHOD m_zpetktsx (IILjava/util/function/Function;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
ARG 3 i
CLASS C_cuphesbl Xor
COMMENT An xor codec that only permits exactly one of the two data choices to be
COMMENT present.
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/world/FeatureUpdater.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_qpbbnpoq net/minecraft/world/FeatureUpdater
FIELD f_upqojzup legacyKeys Ljava/util/List;
FIELD f_yqklsxrc featureIdToChunkNbt Ljava/util/Map;
METHOD <init> (Lnet/minecraft/unmapped/C_hsdphpvz;Ljava/util/List;Ljava/util/List;)V
ARG 1 persistentStateManager
ARG 2 legacyKeys
ARG 3 currentKeys
METHOD m_acxralbo getUpdatedReferences (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;
Expand All @@ -17,16 +18,21 @@ CLASS net/minecraft/unmapped/C_qpbbnpoq net/minecraft/world/FeatureUpdater
ARG 2 chunkZ
ARG 3 id
METHOD m_gjhutapw markResolved (J)V
ARG 1 pos
METHOD m_idttwzqh (Ljava/util/HashMap;)V
ARG 0 map
METHOD m_kcdoagao (Ljava/util/HashMap;)V
ARG 0 map
METHOD m_nugknkab (Ljava/lang/String;)Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
ARG 0 id
METHOD m_omvaanki getUpdatedStarts (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_ynrszrtu;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 nbt
ARG 2 pos
METHOD m_tveuxsde needsUpdate (II)Z
ARG 1 chunkX
ARG 2 chunkZ
METHOD m_xxmtoexq init (Lnet/minecraft/unmapped/C_hsdphpvz;)V
ARG 1 persistentStateManager
METHOD m_ydpszauk create (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_hsdphpvz;)Lnet/minecraft/unmapped/C_qpbbnpoq;
ARG 0 world
ARG 1 persistentStateManager
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/MobSpawnerEntry.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ CLASS net/minecraft/unmapped/C_edcjbljn net/minecraft/world/MobSpawnerEntry
ARG 0 instance
METHOD m_hqvizrhc (Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;)Lnet/minecraft/unmapped/C_uydqwobg;
ARG 0 rules
METHOD m_onmagaow validate (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;
ARG 0 id
METHOD m_onzhgifd validate (Lnet/minecraft/unmapped/C_uydqwobg;)Lcom/mojang/serialization/DataResult;
ARG 0 lightRange
METHOD m_wqssitpr skyLightLimit ()Lnet/minecraft/unmapped/C_uydqwobg;
15 changes: 15 additions & 0 deletions mappings/net/minecraft/world/PersistentStateManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,29 @@ CLASS net/minecraft/unmapped/C_hsdphpvz net/minecraft/world/PersistentStateManag
ARG 2 dataFixer
METHOD m_cedahrux save ()V
METHOD m_gqqspvok get (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/unmapped/C_uuhisnem;
ARG 1 reader
COMMENT reads the state from NBT, returning the read state object
ARG 2 id
METHOD m_jacratca getOrCreate (Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/unmapped/C_uuhisnem;
ARG 1 reader
COMMENT reads the state from NBT, returning the read state object
ARG 2 defaultState
COMMENT supplies the state if it is not already stored in NBT
ARG 3 id
METHOD m_kuhqzpxi readNbt (Ljava/lang/String;I)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 id
ARG 2 dataVersion
METHOD m_nnxihiob isCompressed (Ljava/io/PushbackInputStream;)Z
ARG 1 inputStream
METHOD m_qipmtwag getFile (Ljava/lang/String;)Ljava/io/File;
ARG 1 id
METHOD m_qvqicwbq readFromFile (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/unmapped/C_uuhisnem;
ARG 1 reader
COMMENT reads the state from NBT, returning the read state object
ARG 2 id
METHOD m_ualjjfem (Ljava/lang/String;Lnet/minecraft/unmapped/C_uuhisnem;)V
ARG 1 id
ARG 2 state
METHOD m_whuuilcw set (Ljava/lang/String;Lnet/minecraft/unmapped/C_uuhisnem;)V
ARG 1 id
ARG 2 state
5 changes: 5 additions & 0 deletions mappings/net/minecraft/world/SaveProperties.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CLASS net/minecraft/unmapped/C_jkevluio net/minecraft/world/SaveProperties
METHOD m_ghcafcfc isDifficultyLocked ()Z
METHOD m_gvluntuu setDifficultyLocked (Z)V
ARG 1 locked
METHOD m_hgxsrhud getDragonFightState ()Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;
METHOD m_iktkysbz getVersion ()I
METHOD m_jmqkuqhe setFeatureAndDataSettings (Lnet/minecraft/unmapped/C_yknpgzdr;)V
ARG 1 settings
Expand All @@ -32,11 +33,15 @@ CLASS net/minecraft/unmapped/C_jkevluio net/minecraft/world/SaveProperties
METHOD m_oewbipwe isModded ()Z
METHOD m_phiwwied getWorldInfo ()Lnet/minecraft/unmapped/C_tmnkpzlg;
METHOD m_qucbceol getEnabledFlags ()Lnet/minecraft/unmapped/C_czxxrbcp;
METHOD m_qwkmrjrh getRemovedFeatureFlags ()Ljava/util/Set;
METHOD m_qyxytalo areCommandsAllowed ()Z
METHOD m_rabnvpan getFeatureAndDataSettings ()Lnet/minecraft/unmapped/C_yknpgzdr;
METHOD m_ruodywwf getGameRules ()Lnet/minecraft/unmapped/C_xmldumst;
METHOD m_vzluryjf setDifficulty (Lnet/minecraft/unmapped/C_mpbjgxic;)V
ARG 1 difficulty
METHOD m_wqctpfjr isHardcore ()Z
METHOD m_ycrrmmel getGeneratorOptions ()Lnet/minecraft/unmapped/C_naismckd;
METHOD m_zrleygwi setCustomBossEvents (Lnet/minecraft/unmapped/C_hhlwcnih;)V
ARG 1 nbt
METHOD m_zucuhnzk setDragonFightState (Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;)V
ARG 1 state
40 changes: 40 additions & 0 deletions mappings/net/minecraft/world/WorldSaveProperties.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/unmapped/C_jmmczzpb net/minecraft/world/WorldSaveProperties
FIELD f_cpwcrhlr worldType Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin;
FIELD f_ecsjtqgc dataVersion I
FIELD f_guunwqfj removedFeatureFlags Ljava/util/Set;
FIELD f_iholqjdh clearWeatherTime I
FIELD f_ijauhqup spawnY I
FIELD f_ijykcegw spawnAngle F
Expand All @@ -20,6 +21,7 @@ CLASS net/minecraft/unmapped/C_jmmczzpb net/minecraft/world/WorldSaveProperties
FIELD f_pskdtagu scheduledEvents Lnet/minecraft/unmapped/C_sboqtqtk;
FIELD f_qqwedtfz spawnZ I
FIELD f_rauimzzj serverBrands Ljava/util/Set;
FIELD f_rtkplitb dragonFightState Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;
FIELD f_ryspwxox raining Z
FIELD f_tlzpcrwu LOGGER Lorg/slf4j/Logger;
FIELD f_urierpec PLAYER_KEY Ljava/lang/String;
Expand All @@ -28,11 +30,44 @@ CLASS net/minecraft/unmapped/C_jmmczzpb net/minecraft/world/WorldSaveProperties
FIELD f_vsxsobkx timeOfDay J
FIELD f_wajebgsy playerData Lnet/minecraft/unmapped/C_hhlwcnih;
FIELD f_wkcdalie rainTime I
FIELD f_yjrgeypv worldGenOptions Lnet/minecraft/unmapped/C_naismckd;
FIELD f_ykdrqhbw customBossEvents Lnet/minecraft/unmapped/C_hhlwcnih;
FIELD f_zcocotov levelInfo Lnet/minecraft/unmapped/C_tmnkpzlg;
FIELD f_zuihjfvz dataFixer Lcom/mojang/datafixers/DataFixer;
METHOD <init> (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/unmapped/C_hhlwcnih;ZIIIFJJIIIZIZZZLnet/minecraft/unmapped/C_pneibfez$C_koayjdos;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/unmapped/C_sboqtqtk;Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;Lnet/minecraft/unmapped/C_tmnkpzlg;Lnet/minecraft/unmapped/C_naismckd;Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin;Lcom/mojang/serialization/Lifecycle;)V
ARG 2 dataVersion
ARG 3 playerData
ARG 4 modded
ARG 5 spawnX
ARG 6 spawnY
ARG 7 spawnZ
ARG 8 spawnAngle
ARG 9 time
ARG 11 timeOfDay
ARG 13 version
ARG 14 clearWeatherTime
ARG 15 rainTime
ARG 16 raining
ARG 17 thunderTime
ARG 18 thundering
ARG 19 initialized
ARG 20 difficultyLocked
ARG 21 worldBorder
ARG 22 wanderingTraderSpawnDelay
ARG 23 wanderingTraderSpawnChance
ARG 24 wanderingTraderId
ARG 25 serverBrands
ARG 26 removedFeatureFlags
ARG 27 scheduledEvents
ARG 28 customBossEvents
ARG 29 dragonFightState
ARG 30 levelInfo
ARG 31 worldGenOptions
ARG 32 worldTime
ARG 33 lifecycle
METHOD <init> (Lnet/minecraft/unmapped/C_tmnkpzlg;Lnet/minecraft/unmapped/C_naismckd;Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 info
ARG 2 worldGenOptions
ARG 3 worldType
ARG 4 lifecycle
METHOD m_jiidkhzg loadPlayerData ()V
Expand All @@ -44,7 +79,12 @@ CLASS net/minecraft/unmapped/C_jmmczzpb net/minecraft/world/WorldSaveProperties
ARG 4 levelInfo
ARG 5 saveVersionInfo
ARG 6 worldType
ARG 7 worldGenOptions
ARG 8 lifecycle
METHOD m_qaixgccn withAll (Ljava/util/Set;)Lnet/minecraft/unmapped/C_hqhtfwlr;
ARG 0 strings
METHOD m_qbtdktse (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 settings
METHOD m_xkdnykbi updateProperties (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_hhlwcnih;)V
ARG 1 registryManager
ARG 2 levelNbt
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/WorldView.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CLASS net/minecraft/unmapped/C_eemzphbi net/minecraft/world/WorldView
ARG 2 minZ
ARG 3 maxX
ARG 4 maxZ
METHOD m_jwglzkvy getPathfindingCostFromLight (Lnet/minecraft/unmapped/C_hynzadkk;)F
METHOD m_lbecvxcw getDimension ()Lnet/minecraft/unmapped/C_oxijnccf;
METHOD m_lhpibwaq getChunk (II)Lnet/minecraft/unmapped/C_lwzmmmqr;
ARG 1 chunkX
Expand Down
15 changes: 15 additions & 0 deletions mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
CLASS net/minecraft/unmapped/C_pzazgvmh net/minecraft/world/biome/source/MultiNoiseBiomeSource
FIELD f_borqgmzj biomePoints Lcom/mojang/datafixers/util/Either;
FIELD f_mhsxjemq PRESET_CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_ndsbnbor CODEC Lcom/mojang/serialization/Codec;
FIELD f_tlkkbmpe CUSTOM_CODEC Lcom/mojang/serialization/MapCodec;
COMMENT Used to parse a custom biome source, when a preset hasn't been provided.
FIELD f_yjklltax BIOME_CODEC Lcom/mojang/serialization/MapCodec;
METHOD <init> (Lcom/mojang/datafixers/util/Either;)V
ARG 1 biomePoints
METHOD m_alpsnlmz (Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;)Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;
ARG 0 biome
METHOD m_alygfddu matchesInstance (Lnet/minecraft/unmapped/C_xhhleach;)Z
METHOD m_ebnxdixg create (Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;)Lnet/minecraft/unmapped/C_pzazgvmh;
ARG 0 biomes
METHOD m_jcrgvqny (Lnet/minecraft/unmapped/C_pzazgvmh;)Lcom/mojang/datafixers/util/Either;
ARG 0 source
METHOD m_odasfqpo getBiomeAtPoint (Lnet/minecraft/unmapped/C_ohqwadgy$C_dytvikps;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 1 point
METHOD m_qvploows create (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_pzazgvmh;
ARG 0 biomes
METHOD m_rdnncpro getBiomeEntries ()Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;
METHOD m_uwqbagrp (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;
ARG 0 parameterList
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ CLASS net/minecraft/unmapped/C_ohqwadgy net/minecraft/world/biome/source/util/Mu
METHOD m_gpicvkfv findValue (Lnet/minecraft/unmapped/C_ohqwadgy$C_dytvikps;)Ljava/lang/Object;
ARG 1 point
METHOD m_isbhmmtf getEntries ()Ljava/util/List;
METHOD m_kionsqps (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 1 instance
METHOD m_outtfyey findValueUsingTree (Lnet/minecraft/unmapped/C_ohqwadgy$C_dytvikps;)Ljava/lang/Object;
ARG 1 point
METHOD m_ybidbzcm findValueUsingBruteForce (Lnet/minecraft/unmapped/C_ohqwadgy$C_dytvikps;)Ljava/lang/Object;
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/world/biome/source/util/OverworldBiomeParameters.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,21 @@ CLASS net/minecraft/unmapped/C_onndvydg net/minecraft/world/biome/source/util/Ov
METHOD m_bzmoilwg getContinentalnessDescription (D)Ljava/lang/String;
ARG 1 continentalness
METHOD m_clfnjipm getPeaksAndValleysThresholds ()[Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;
METHOD m_crjshpgc (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;FLnet/minecraft/unmapped/C_xhhleach;)V
ARG 1 parameters
ARG 2 temperature
ARG 3 humidity
ARG 4 continentialness
ARG 5 erosion
ARG 6 depth
ARG 7 weirdness
METHOD m_cumhdlyb pickPeakBiome (IILnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 1 temperature
ARG 2 humidity
ARG 3 weirdness
METHOD m_cwnxypdy getContinentalnessThresholds ()[Lnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;
METHOD m_dbdvfqhy addDebugBiomesTo (Ljava/util/function/Consumer;)V
ARG 1 biomeEntryConsumer
METHOD m_eerroula addBiomesTo (Ljava/util/function/Consumer;)V
ARG 1 biomeEntryConsumer
METHOD m_etnigbtn addInlandBiomesTo (Ljava/util/function/Consumer;)V
Expand Down
44 changes: 44 additions & 0 deletions mappings/net/minecraft/world/dimension/WorldDimensions.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
CLASS net/minecraft/unmapped/C_oiwekzxo net/minecraft/world/dimension/WorldDimensions
FIELD f_bmwbfdtq CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_dborluog VANILLA_DIMENSION_COUNT I
FIELD f_txffzdje VANILLA_DIMENSION_KEYS Ljava/util/Set;
METHOD m_auxddlni isNetherVanilla (Lnet/minecraft/unmapped/C_alziuayn;)Z
ARG 0 options
METHOD m_avkwtbzc getOverworldChunkGenerator ()Lnet/minecraft/unmapped/C_kgfalbim;
METHOD m_awegwhiy (Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_alziuayn;)V
ARG 2 dimension
METHOD m_fdrgiipp withOverworldGenerator (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_kgfalbim;)Lnet/minecraft/unmapped/C_tqxyjqsk;
ARG 0 dimensionTypeRegistry
ARG 1 dimensionOptionRegistry
ARG 2 generator
METHOD m_fmldpiqa (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_fybdlich getSpecialProperty (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin;
METHOD m_iduqyeyv replaceOverworldGenerator (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_kgfalbim;)Lnet/minecraft/unmapped/C_oiwekzxo;
ARG 2 generator
METHOD m_joncvkus isOverworldVanilla (Lnet/minecraft/unmapped/C_alziuayn;)Z
ARG 0 options
METHOD m_kmgkzhht isEndVanilla (Lnet/minecraft/unmapped/C_alziuayn;)Z
ARG 0 options
METHOD m_mflvjtrh streamInOrder (Ljava/util/stream/Stream;)Ljava/util/stream/Stream;
ARG 0 dimensionStream
METHOD m_ngyfnwyr getLifecycle (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_alziuayn;)Lcom/mojang/serialization/Lifecycle;
ARG 1 dimension
METHOD m_pkwubvhk isDebug ()Z
METHOD m_pqnovmjd (Lnet/minecraft/unmapped/C_alziuayn;)Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin;
ARG 0 dimension
METHOD m_qrljwitr getWorldKeys ()Lcom/google/common/collect/ImmutableSet;
METHOD m_skajvlst get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
METHOD m_udnciizs isVanilla (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_alziuayn;)Z
ARG 1 dimension
METHOD m_xiunuxre bake (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_oiwekzxo$C_djwmjrji;
METHOD m_ztnvzsav withOverworldGenerator (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_kgfalbim;)Lnet/minecraft/unmapped/C_tqxyjqsk;
ARG 1 dimensionType
ARG 2 generator
METHOD m_zzejycps (Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_oiwekzxo$C_ddnnhray;)V
ARG 1 entry
CLASS C_ddnnhray
METHOD m_kmaxtchp getLifecycle ()Lcom/mojang/serialization/Lifecycle;
CLASS C_djwmjrji Baked
METHOD m_isteaavn getLifecycle ()Lcom/mojang/serialization/Lifecycle;
METHOD m_jyxiyrye toRegistryManager ()Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
Loading

3 comments on commit 9441667

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 9441667, 54 file(s) were updated with 549 line(s) added and 495 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/client/font/BitmapFont.java namedSrc/net/minecraft/client/font/BitmapFont.java
--- namedTargetSrc/net/minecraft/client/font/BitmapFont.java	2023-06-26 16:11:54.187092190 +0000
+++ namedSrc/net/minecraft/client/font/BitmapFont.java	2023-06-26 16:10:23.685591236 +0000
@@ -176,7 +176,7 @@
        * @mapping {@literal hashed f_khrhgvcl Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;f_khrhgvcl:Lcom/mojang/serialization/Codec;}
        * @mapping {@literal named CODEC Lnet/minecraft/client/font/BitmapFont$C_qoeqnynz;CODEC:Lcom/mojang/serialization/Codec;}
        */
-      private static final Codec<int[][]> CODEC = Codecs.m_lytzwisw(Codec.STRING.listOf().xmap(list -> {
+      private static final Codec<int[][]> CODEC = Codecs.validate(Codec.STRING.listOf().xmap(list -> {
          int i = list.size();
          int[][] is = new int[i][];
 
@@ -197,7 +197,7 @@
       /**
        * Mapping not found
        */
-      public static final MapCodec<BitmapFont.C_qoeqnynz> f_cgyvixla = Codecs.m_ljxipwty(
+      public static final MapCodec<BitmapFont.C_qoeqnynz> f_cgyvixla = Codecs.validate(
          RecordCodecBuilder.mapCodec(
             instance -> instance.group(
                      Identifier.CODEC.fieldOf("file").forGetter(BitmapFont.C_qoeqnynz::file),
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2023-06-26 16:11:54.231092933 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2023-06-26 16:10:23.733592029 +0000
@@ -175,7 +175,7 @@
                   }
 
                   lv = new ClientConnection(NetworkSide.C2S);
-                  ConnectScreen.this.f_unvbqcut = ClientConnection.m_apccqkse(inetSocketAddress, client.options.shouldUseNativeTransport(), lv);
+                  ConnectScreen.this.f_unvbqcut = ClientConnection.connect(inetSocketAddress, client.options.shouldUseNativeTransport(), lv);
                }
 
                ConnectScreen.this.f_unvbqcut.syncUninterruptibly();
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2023-06-26 16:11:54.167091853 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2023-06-26 16:10:23.661590840 +0000
@@ -74,7 +74,7 @@
       this.onDone = onDone;
       this.biomeRegistry = worldCreationContext.getWorldgenRegistryManager().get(RegistryKeys.BIOME);
       Holder<Biome> lv = (Holder)this.biomeRegistry.getHolder(Biomes.PLAINS).or(() -> this.biomeRegistry.holders().findAny()).orElseThrow();
-      this.biome = (Holder)worldCreationContext.selectedDimensions().m_avkwtbzc().getBiomeSource().getBiomes().stream().findFirst().orElse(lv);
+      this.biome = (Holder)worldCreationContext.selectedDimensions().getOverworldChunkGenerator().getBiomeSource().getBiomes().stream().findFirst().orElse(lv);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-06-26 16:11:54.111090907 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-06-26 16:10:23.597589784 +0000
@@ -65,7 +65,6 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -78,6 +77,7 @@
 import net.minecraft.world.SaveProperties;
 import net.minecraft.world.WorldInfo;
 import net.minecraft.world.WorldSaveProperties;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.GeneratorOptions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 import net.minecraft.world.storage.WorldSaveStorage;
@@ -354,8 +354,8 @@
     */
    private void createLevel() {
       WorldCreationContext lv = this.worldCreator.getContext();
-      C_oiwekzxo.C_djwmjrji lv2 = lv.selectedDimensions().m_xiunuxre(lv.datapackDimensions());
-      LayeredRegistryManager<ServerRegistryLayer> lv3 = lv.worldgenRegistries().withReplacedLayers(ServerRegistryLayer.DIMENSIONS, lv2.m_jyxiyrye());
+      WorldDimensions.Baked lv2 = lv.selectedDimensions().bake(lv.datapackDimensions());
+      LayeredRegistryManager<ServerRegistryLayer> lv3 = lv.worldgenRegistries().withReplacedLayers(ServerRegistryLayer.DIMENSIONS, lv2.toRegistryManager());
       Lifecycle lifecycle = FeatureFlags.containsDefault(lv.dataConfiguration().enabledFeatures()) ? Lifecycle.experimental() : Lifecycle.stable();
       Lifecycle lifecycle2 = lv3.getCompositeManager().getLifecycleForAllRegistries();
       Lifecycle lifecycle3 = lifecycle2.add(lifecycle);
@@ -563,7 +563,7 @@
                } else {
                   WorldCreationContext lvx = this.worldCreator.getContext();
                   DynamicOps<JsonElement> dynamicOps = RegistryOps.create(JsonOps.INSTANCE, lvx.getWorldgenRegistryManager());
-                  DataResult<JsonElement> dataResult = GeneratorOptions.m_msnxrvnu(dynamicOps, lvx.options(), lvx.selectedDimensions())
+                  DataResult<JsonElement> dataResult = GeneratorOptions.encode(dynamicOps, lvx.options(), lvx.selectedDimensions())
                      .setLifecycle(Lifecycle.stable());
                   DynamicOps<JsonElement> dynamicOps2 = RegistryOps.create(JsonOps.INSTANCE, arg.datapackWorldgen());
                   GeneratorOptions lv2 = dataResult.<GeneratorOptions>flatMap(jsonElement -> GeneratorOptions.CODEC.parse(dynamicOps2, jsonElement))
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java namedSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java	2023-06-26 16:11:54.259093406 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java	2023-06-26 16:10:23.765592557 +0000
@@ -40,7 +40,7 @@
    Map<Optional<RegistryKey<GeneratorType>>, WorldScreenProvider> WORLD_PRESET_TO_SCREEN_PROVIDER = Map.of(
       Optional.of(GeneratorTypes.FLAT),
       (WorldScreenProvider)(screen, worldCreationContext) -> {
-         ChunkGenerator lv = worldCreationContext.selectedDimensions().m_avkwtbzc();
+         ChunkGenerator lv = worldCreationContext.selectedDimensions().getOverworldChunkGenerator();
          DynamicRegistryManager lv2 = worldCreationContext.getWorldgenRegistryManager();
          HolderProvider<Biome> lv3 = lv2.getLookupOrThrow(RegistryKeys.BIOME);
          HolderProvider<StructureSet> lv4 = lv2.getLookupOrThrow(RegistryKeys.STRUCTURE_SET);
@@ -70,7 +70,7 @@
    private static WorldCreationContext.C_iucotkie createFlatWorldModifier(FlatChunkGeneratorConfig flatGeneratorConfig) {
       return (registryManager, arg3) -> {
          ChunkGenerator lv = new FlatChunkGenerator(flatGeneratorConfig);
-         return arg3.m_iduqyeyv(registryManager, lv);
+         return arg3.replaceOverworldGenerator(registryManager, lv);
       };
    }
 
@@ -84,7 +84,7 @@
          Holder<ChunkGeneratorSettings> lv2 = lv.getHolderOrThrow(ChunkGeneratorSettings.OVERWORLD);
          BiomeSource lv3 = new FixedBiomeSource(biome);
          ChunkGenerator lv4 = new NoiseChunkGenerator(lv3, lv2);
-         return arg3.m_iduqyeyv(registryManager, lv4);
+         return arg3.replaceOverworldGenerator(registryManager, lv4);
       };
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/option/Option.java namedSrc/net/minecraft/client/option/Option.java
--- namedTargetSrc/net/minecraft/client/option/Option.java	2023-06-26 16:11:54.155091650 +0000
+++ namedSrc/net/minecraft/client/option/Option.java	2023-06-26 16:10:23.641590510 +0000
@@ -530,7 +530,7 @@
        */
       @Override
       public Codec<Integer> codec() {
-         return Codecs.m_lytzwisw(
+         return Codecs.validate(
             Codec.INT,
             integer -> {
                int i = this.encodableMaxInclusive + 1;
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorType.java namedSrc/net/minecraft/client/world/GeneratorType.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorType.java	2023-06-26 16:11:54.207092528 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorType.java	2023-06-26 16:10:23.705591566 +0000
@@ -12,10 +12,10 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.SimpleRegistry;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.dynamic.Codecs;
 import net.minecraft.util.dynamic.RegistryElementCodec;
 import net.minecraft.world.dimension.DimensionOptions;
+import net.minecraft.world.dimension.WorldDimensions;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_uejfhynd}
@@ -26,7 +26,7 @@
     * @mapping {@literal hashed f_wfksduhk Lnet/minecraft/unmapped/C_uejfhynd;f_wfksduhk:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named DIRECT_CODEC Lnet/minecraft/client/world/GeneratorType;DIRECT_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<GeneratorType> DIRECT_CODEC = Codecs.m_lytzwisw(
+   public static final Codec<GeneratorType> DIRECT_CODEC = Codecs.validate(
       RecordCodecBuilder.create(
          instance -> instance.group(
                   Codec.unboundedMap(RegistryKey.codec(RegistryKeys.DIMENSION), DimensionOptions.CODEC)
@@ -62,7 +62,7 @@
     */
    private Registry<DimensionOptions> createDimensionOptionsRegistry() {
       MutableRegistry<DimensionOptions> lv = new SimpleRegistry<>(RegistryKeys.DIMENSION, Lifecycle.experimental());
-      C_oiwekzxo.m_mflvjtrh(this.dimensions.keySet().stream()).forEach(dimension -> {
+      WorldDimensions.streamInOrder(this.dimensions.keySet().stream()).forEach(dimension -> {
          DimensionOptions lvx = (DimensionOptions)this.dimensions.get(dimension);
          if (lvx != null) {
             lv.register(dimension, lvx, Lifecycle.stable());
@@ -74,8 +74,8 @@
    /**
     * Mapping not found
     */
-   public C_oiwekzxo m_tpfjotrl() {
-      return new C_oiwekzxo(this.createDimensionOptionsRegistry());
+   public WorldDimensions m_tpfjotrl() {
+      return new WorldDimensions(this.createDimensionOptionsRegistry());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorTypes.java namedSrc/net/minecraft/client/world/GeneratorTypes.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorTypes.java	2023-06-26 16:11:54.255093338 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorTypes.java	2023-06-26 16:10:23.761592491 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
@@ -21,6 +20,7 @@
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.dimension.DimensionTypes;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.BootstrapContext;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
@@ -100,9 +100,9 @@
 
    /**
     * @mapping {@literal hashed m_grmkvtyw Lnet/minecraft/unmapped/C_ogomnjoy;m_grmkvtyw(Lnet/minecraft/unmapped/C_wqxmvzdq;)Lnet/minecraft/unmapped/C_oiwekzxo;}
-    * @mapping {@literal named m_grmkvtyw Lnet/minecraft/client/world/GeneratorTypes;m_grmkvtyw(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/unmapped/C_oiwekzxo;}
+    * @mapping {@literal named m_grmkvtyw Lnet/minecraft/client/world/GeneratorTypes;m_grmkvtyw(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/world/dimension/WorldDimensions;}
     */
-   public static C_oiwekzxo m_grmkvtyw(DynamicRegistryManager registryManager) {
+   public static WorldDimensions m_grmkvtyw(DynamicRegistryManager registryManager) {
       return registryManager.get(RegistryKeys.GENERATOR_TYPE).getHolderOrThrow(NORMAL).value().m_tpfjotrl();
    }
 
@@ -177,7 +177,7 @@
          Holder<DimensionType> lv2 = lv.getHolderOrThrow(DimensionTypes.THE_NETHER);
          Holder<ChunkGeneratorSettings> lv3 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.NETHER);
          Holder.Reference<MultiNoiseBiomeSourceParameterList> lv4 = this.f_hnemzeja.getHolderOrThrow(MultiNoiseBiomeSourceParameterLists.NETHER);
-         this.netherDimension = new DimensionOptions(lv2, new NoiseChunkGenerator(MultiNoiseBiomeSource.m_qvploows(lv4), lv3));
+         this.netherDimension = new DimensionOptions(lv2, new NoiseChunkGenerator(MultiNoiseBiomeSource.create(lv4), lv3));
          Holder<DimensionType> lv5 = lv.getHolderOrThrow(DimensionTypes.THE_END);
          Holder<ChunkGeneratorSettings> lv6 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.END);
          this.endDimension = new DimensionOptions(lv5, new NoiseChunkGenerator(TheEndBiomeSource.create(this.biome), lv6));
@@ -234,7 +234,7 @@
        */
       public void m_gfaqqwev() {
          Holder.Reference<MultiNoiseBiomeSourceParameterList> lv = this.f_hnemzeja.getHolderOrThrow(MultiNoiseBiomeSourceParameterLists.OVERWORLD);
-         this.m_bmunbwen(MultiNoiseBiomeSource.m_qvploows(lv));
+         this.m_bmunbwen(MultiNoiseBiomeSource.create(lv));
          Holder<ChunkGeneratorSettings> lv2 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.OVERWORLD);
          Holder.Reference<Biome> lv3 = this.biome.getHolderOrThrow(Biomes.PLAINS);
          this.addDimensionGenerator(GeneratorTypes.SINGLE_BIOME_SURFACE, this.overworld(new FixedBiomeSource(lv3), lv2));
diff -bur namedTargetSrc/net/minecraft/client/world/WorldCreationContext.java namedSrc/net/minecraft/client/world/WorldCreationContext.java
--- namedTargetSrc/net/minecraft/client/world/WorldCreationContext.java	2023-06-26 16:11:54.203092460 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreationContext.java	2023-06-26 16:10:23.701591500 +0000
@@ -11,8 +11,8 @@
 import net.minecraft.registry.ServerRegistryLayer;
 import net.minecraft.server.ServerReloadableResources;
 import net.minecraft.server.world.FeatureAndDataSettings;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.world.dimension.DimensionOptions;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.GeneratorOptions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 
@@ -24,7 +24,7 @@
 public record WorldCreationContext(
    WorldGeneratorOptions options,
    Registry<DimensionOptions> datapackDimensions,
-   C_oiwekzxo selectedDimensions,
+   WorldDimensions selectedDimensions,
    LayeredRegistryManager<ServerRegistryLayer> worldgenRegistries,
    ServerReloadableResources resources,
    FeatureAndDataSettings dataConfiguration
@@ -44,11 +44,11 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_njsjipmy;<init>(Lnet/minecraft/unmapped/C_naismckd;Lnet/minecraft/unmapped/C_oiwekzxo;Lnet/minecraft/unmapped/C_bcpxdrik;Lnet/minecraft/unmapped/C_migzkpst;Lnet/minecraft/unmapped/C_yknpgzdr;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/world/WorldCreationContext;<init>(Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/unmapped/C_oiwekzxo;Lnet/minecraft/registry/LayeredRegistryManager;Lnet/minecraft/server/ServerReloadableResources;Lnet/minecraft/server/world/FeatureAndDataSettings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/world/WorldCreationContext;<init>(Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/world/dimension/WorldDimensions;Lnet/minecraft/registry/LayeredRegistryManager;Lnet/minecraft/server/ServerReloadableResources;Lnet/minecraft/server/world/FeatureAndDataSettings;)V}
     */
    public WorldCreationContext(
       WorldGeneratorOptions arg,
-      C_oiwekzxo arg2,
+      WorldDimensions arg2,
       LayeredRegistryManager<ServerRegistryLayer> arg3,
       ServerReloadableResources resources,
       FeatureAndDataSettings arg5
@@ -66,7 +66,7 @@
    /**
     * Mapping not found
     */
-   public WorldCreationContext m_ptgdwbnf(WorldGeneratorOptions arg, C_oiwekzxo arg2) {
+   public WorldCreationContext m_ptgdwbnf(WorldGeneratorOptions arg, WorldDimensions arg2) {
       return new WorldCreationContext(arg, this.datapackDimensions, arg2, this.worldgenRegistries, this.resources, this.dataConfiguration);
    }
 
@@ -91,7 +91,7 @@
       return new WorldCreationContext(
          this.options,
          this.datapackDimensions,
-         (C_oiwekzxo)arg.apply(this.getWorldgenRegistryManager(), this.selectedDimensions),
+         (WorldDimensions)arg.apply(this.getWorldgenRegistryManager(), this.selectedDimensions),
          this.worldgenRegistries,
          this.resources,
          this.dataConfiguration
@@ -112,7 +112,7 @@
     */
    @FunctionalInterface
    @Environment(EnvType.CLIENT)
-   public interface C_iucotkie extends BiFunction<DynamicRegistryManager.Frozen, C_oiwekzxo, C_oiwekzxo> {
+   public interface C_iucotkie extends BiFunction<DynamicRegistryManager.Frozen, WorldDimensions, WorldDimensions> {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/world/WorldCreator.java namedSrc/net/minecraft/client/world/WorldCreator.java
--- namedTargetSrc/net/minecraft/client/world/WorldCreator.java	2023-06-26 16:11:54.103090772 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreator.java	2023-06-26 16:10:23.585589585 +0000
@@ -345,7 +345,7 @@
     * Mapping not found
     */
    public boolean m_lxkbugsk() {
-      return this.context.selectedDimensions().m_pkwubvhk();
+      return this.context.selectedDimensions().isDebug();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2023-06-26 16:11:54.111090907 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2023-06-26 16:10:23.597589784 +0000
@@ -372,7 +372,7 @@
          World i = this.getWorld();
          if (i instanceof ServerWorld lv) {
             EnderDragonFight lv2 = lv.m_gqdupsiz();
-            if (lv2 != null && this.getUuid().equals(lv2.m_kpmmjgfp())) {
+            if (lv2 != null && this.getUuid().equals(lv2.getDragonUuid())) {
                this.fight = lv2;
             }
          }
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java	2023-06-26 16:11:54.119091042 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java	2023-06-26 16:10:23.605589916 +0000
@@ -213,23 +213,23 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hxzjzvro;<init>(Lnet/minecraft/unmapped/C_bdwnwhiu;JLnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/boss/dragon/EnderDragonFight;<init>(Lnet/minecraft/server/world/ServerWorld;JLnet/minecraft/entity/boss/dragon/EnderDragonFight$C_tunbvwoo;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/boss/dragon/EnderDragonFight;<init>(Lnet/minecraft/server/world/ServerWorld;JLnet/minecraft/entity/boss/dragon/EnderDragonFight$State;)V}
     */
-   public EnderDragonFight(ServerWorld world, long l, EnderDragonFight.C_tunbvwoo arg2) {
+   public EnderDragonFight(ServerWorld world, long l, EnderDragonFight.State arg2) {
       this(world, l, arg2, BlockPos.ORIGIN);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hxzjzvro;<init>(Lnet/minecraft/unmapped/C_bdwnwhiu;JLnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;Lnet/minecraft/unmapped/C_hynzadkk;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/boss/dragon/EnderDragonFight;<init>(Lnet/minecraft/server/world/ServerWorld;JLnet/minecraft/entity/boss/dragon/EnderDragonFight$C_tunbvwoo;Lnet/minecraft/util/math/BlockPos;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/boss/dragon/EnderDragonFight;<init>(Lnet/minecraft/server/world/ServerWorld;JLnet/minecraft/entity/boss/dragon/EnderDragonFight$State;Lnet/minecraft/util/math/BlockPos;)V}
     */
-   public EnderDragonFight(ServerWorld world, long l, EnderDragonFight.C_tunbvwoo arg2, BlockPos pos) {
+   public EnderDragonFight(ServerWorld world, long l, EnderDragonFight.State arg2, BlockPos pos) {
       this.world = world;
       this.f_tcqxzkfm = pos;
       this.f_bnqjwejj = EntityPredicates.VALID_ENTITY
          .and(EntityPredicates.maxDistance((double)pos.getX(), (double)(128 + pos.getY()), (double)pos.getZ(), 192.0));
       this.doLegacyCheck = arg2.needsStateScanning;
-      this.dragonUuid = (UUID)arg2.dragonUUID.orElse(null);
+      this.dragonUuid = (UUID)arg2.dragonUuid.orElse(null);
       this.dragonKilled = arg2.dragonKilled;
       this.previouslyKilled = arg2.previouslyKilled;
       if (arg2.isRespawning) {
@@ -264,8 +264,8 @@
    /**
     * Mapping not found
     */
-   public EnderDragonFight.C_tunbvwoo m_kgnlaawg() {
-      return new EnderDragonFight.C_tunbvwoo(
+   public EnderDragonFight.State m_kgnlaawg() {
+      return new EnderDragonFight.State(
          this.doLegacyCheck,
          this.dragonKilled,
          this.previouslyKilled,
@@ -757,46 +757,48 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kpmmjgfp Lnet/minecraft/unmapped/C_hxzjzvro;m_kpmmjgfp()Ljava/util/UUID;}
+    * @mapping {@literal named getDragonUuid Lnet/minecraft/entity/boss/dragon/EnderDragonFight;getDragonUuid()Ljava/util/UUID;}
     */
    @Nullable
-   public UUID m_kpmmjgfp() {
+   public UUID getDragonUuid() {
       return this.dragonUuid;
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo}
-    * @mapping {@literal named net/minecraft/entity/boss/dragon/EnderDragonFight$C_tunbvwoo}
+    * @mapping {@literal named net/minecraft/entity/boss/dragon/EnderDragonFight$State}
     */
-   public static record C_tunbvwoo(
+   public static record State(
       boolean needsStateScanning,
       boolean dragonKilled,
       boolean previouslyKilled,
       boolean isRespawning,
-      Optional<UUID> dragonUUID,
+      Optional<UUID> dragonUuid,
       Optional<BlockPos> exitPortalLocation,
       Optional<List<Integer>> gateways
    ) {
       /**
        * @mapping {@literal hashed f_dtpdmrmn Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;f_dtpdmrmn:Lcom/mojang/serialization/Codec;}
-       * @mapping {@literal named CODEC Lnet/minecraft/entity/boss/dragon/EnderDragonFight$C_tunbvwoo;CODEC:Lcom/mojang/serialization/Codec;}
+       * @mapping {@literal named CODEC Lnet/minecraft/entity/boss/dragon/EnderDragonFight$State;CODEC:Lcom/mojang/serialization/Codec;}
        */
-      public static final Codec<EnderDragonFight.C_tunbvwoo> CODEC = RecordCodecBuilder.create(
+      public static final Codec<EnderDragonFight.State> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codec.BOOL.fieldOf("NeedsStateScanning").orElse(true).forGetter(EnderDragonFight.C_tunbvwoo::needsStateScanning),
-                  Codec.BOOL.fieldOf("DragonKilled").orElse(false).forGetter(EnderDragonFight.C_tunbvwoo::dragonKilled),
-                  Codec.BOOL.fieldOf("PreviouslyKilled").orElse(false).forGetter(EnderDragonFight.C_tunbvwoo::previouslyKilled),
-                  Codec.BOOL.optionalFieldOf("IsRespawning", Boolean.valueOf(false)).forGetter(EnderDragonFight.C_tunbvwoo::isRespawning),
-                  UuidUtil.INT_STREAM_CODEC.optionalFieldOf("Dragon").forGetter(EnderDragonFight.C_tunbvwoo::dragonUUID),
-                  BlockPos.CODEC.optionalFieldOf("ExitPortalLocation").forGetter(EnderDragonFight.C_tunbvwoo::exitPortalLocation),
-                  Codec.list(Codec.INT).optionalFieldOf("Gateways").forGetter(EnderDragonFight.C_tunbvwoo::gateways)
+                  Codec.BOOL.fieldOf("NeedsStateScanning").orElse(true).forGetter(EnderDragonFight.State::needsStateScanning),
+                  Codec.BOOL.fieldOf("DragonKilled").orElse(false).forGetter(EnderDragonFight.State::dragonKilled),
+                  Codec.BOOL.fieldOf("PreviouslyKilled").orElse(false).forGetter(EnderDragonFight.State::previouslyKilled),
+                  Codec.BOOL.optionalFieldOf("IsRespawning", Boolean.valueOf(false)).forGetter(EnderDragonFight.State::isRespawning),
+                  UuidUtil.INT_STREAM_CODEC.optionalFieldOf("Dragon").forGetter(EnderDragonFight.State::dragonUuid),
+                  BlockPos.CODEC.optionalFieldOf("ExitPortalLocation").forGetter(EnderDragonFight.State::exitPortalLocation),
+                  Codec.list(Codec.INT).optionalFieldOf("Gateways").forGetter(EnderDragonFight.State::gateways)
                )
-               .apply(instance, EnderDragonFight.C_tunbvwoo::new)
+               .apply(instance, EnderDragonFight.State::new)
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_tepqsaqc Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;f_tepqsaqc:Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;}
+       * @mapping {@literal named DEFAULT Lnet/minecraft/entity/boss/dragon/EnderDragonFight$State;DEFAULT:Lnet/minecraft/entity/boss/dragon/EnderDragonFight$State;}
        */
-      public static final EnderDragonFight.C_tunbvwoo f_tepqsaqc = new EnderDragonFight.C_tunbvwoo(
+      public static final EnderDragonFight.State DEFAULT = new EnderDragonFight.State(
          true, false, false, false, Optional.empty(), Optional.empty(), Optional.empty()
       );
    }
diff -bur namedTargetSrc/net/minecraft/entity/mob/GiantEntity.java namedSrc/net/minecraft/entity/mob/GiantEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/GiantEntity.java	2023-06-26 16:11:54.111090907 +0000
+++ namedSrc/net/minecraft/entity/mob/GiantEntity.java	2023-06-26 16:10:23.593589718 +0000
@@ -45,6 +45,6 @@
     */
    @Override
    public float getPathfindingFavor(BlockPos pos, WorldView world) {
-      return world.m_jwglzkvy(pos);
+      return world.getPathfindingCostFromLight(pos);
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/mob/GuardianEntity.java namedSrc/net/minecraft/entity/mob/GuardianEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/GuardianEntity.java	2023-06-26 16:11:54.219092730 +0000
+++ namedSrc/net/minecraft/entity/mob/GuardianEntity.java	2023-06-26 16:10:23.721591831 +0000
@@ -321,7 +321,7 @@
     */
    @Override
    public float getPathfindingFavor(BlockPos pos, WorldView world) {
-      return world.getFluidState(pos).isIn(FluidTags.WATER) ? 10.0F + world.m_jwglzkvy(pos) : super.getPathfindingFavor(pos, world);
+      return world.getFluidState(pos).isIn(FluidTags.WATER) ? 10.0F + world.getPathfindingCostFromLight(pos) : super.getPathfindingFavor(pos, world);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/HostileEntity.java namedSrc/net/minecraft/entity/mob/HostileEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/HostileEntity.java	2023-06-26 16:11:54.203092460 +0000
+++ namedSrc/net/minecraft/entity/mob/HostileEntity.java	2023-06-26 16:10:23.701591500 +0000
@@ -119,7 +119,7 @@
     */
    @Override
    public float getPathfindingFavor(BlockPos pos, WorldView world) {
-      return -world.m_jwglzkvy(pos);
+      return -world.getPathfindingCostFromLight(pos);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/AnimalEntity.java namedSrc/net/minecraft/entity/passive/AnimalEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AnimalEntity.java	2023-06-26 16:11:54.183092123 +0000
+++ namedSrc/net/minecraft/entity/passive/AnimalEntity.java	2023-06-26 16:10:23.677591104 +0000
@@ -112,7 +112,7 @@
     */
    @Override
    public float getPathfindingFavor(BlockPos pos, WorldView world) {
-      return world.getBlockState(pos.down()).isOf(Blocks.GRASS_BLOCK) ? 10.0F : world.m_jwglzkvy(pos);
+      return world.getBlockState(pos.down()).isOf(Blocks.GRASS_BLOCK) ? 10.0F : world.getPathfindingCostFromLight(pos);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/MooshroomEntity.java namedSrc/net/minecraft/entity/passive/MooshroomEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/MooshroomEntity.java	2023-06-26 16:11:54.099090705 +0000
+++ namedSrc/net/minecraft/entity/passive/MooshroomEntity.java	2023-06-26 16:10:23.577589453 +0000
@@ -86,7 +86,7 @@
     */
    @Override
    public float getPathfindingFavor(BlockPos pos, WorldView world) {
-      return world.getBlockState(pos.down()).isOf(Blocks.MYCELIUM) ? 10.0F : world.m_jwglzkvy(pos);
+      return world.getBlockState(pos.down()).isOf(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLight(pos);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/TurtleEntity.java namedSrc/net/minecraft/entity/passive/TurtleEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/TurtleEntity.java	2023-06-26 16:11:54.227092865 +0000
+++ namedSrc/net/minecraft/entity/passive/TurtleEntity.java	2023-06-26 16:10:23.729591963 +0000
@@ -452,7 +452,7 @@
       if (!this.isLandBound() && world.getFluidState(pos).isIn(FluidTags.WATER)) {
          return 10.0F;
       } else {
-         return TurtleEggBlock.isSandBelow(world, pos) ? 10.0F : world.m_jwglzkvy(pos);
+         return TurtleEggBlock.isSandBelow(world, pos) ? 10.0F : world.getPathfindingCostFromLight(pos);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/network/ClientConnection.java namedSrc/net/minecraft/network/ClientConnection.java
--- namedTargetSrc/net/minecraft/network/ClientConnection.java	2023-06-26 16:11:54.191092258 +0000
+++ namedSrc/net/minecraft/network/ClientConnection.java	2023-06-26 16:10:23.685591236 +0000
@@ -195,10 +195,11 @@
     */
    private boolean errored;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wfrrroev Lnet/minecraft/unmapped/C_oasmcckk;f_wfrrroev:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named pendingDisconnectReason Lnet/minecraft/network/ClientConnection;pendingDisconnectReason:Lnet/minecraft/text/Text;}
     */
    @Nullable
-   private volatile Text f_wfrrroev;
+   private volatile Text pendingDisconnectReason;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oasmcckk;<init>(Lnet/minecraft/unmapped/C_exeqxqdd;)V}
@@ -224,8 +225,8 @@
          LOGGER.error(LogUtils.FATAL_MARKER, "Failed to change protocol to handshake", var3);
       }
 
-      if (this.f_wfrrroev != null) {
-         this.disconnect(this.f_wfrrroev);
+      if (this.pendingDisconnectReason != null) {
+         this.disconnect(this.pendingDisconnectReason);
       }
    }
 
@@ -470,7 +471,7 @@
     */
    public void disconnect(Text disconnectReason) {
       if (this.channel == null) {
-         this.f_wfrrroev = disconnectReason;
+         this.pendingDisconnectReason = disconnectReason;
       }
 
       if (this.isOpen()) {
@@ -515,18 +516,19 @@
     */
    public static ClientConnection connect(InetSocketAddress address, boolean useEpoll) {
       ClientConnection lv = new ClientConnection(NetworkSide.C2S);
-      ChannelFuture channelFuture = m_apccqkse(address, useEpoll, lv);
+      ChannelFuture channelFuture = connect(address, useEpoll, lv);
       channelFuture.syncUninterruptibly();
       return lv;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_apccqkse Lnet/minecraft/unmapped/C_oasmcckk;m_apccqkse(Ljava/net/InetSocketAddress;ZLnet/minecraft/unmapped/C_oasmcckk;)Lio/netty/channel/ChannelFuture;}
+    * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/net/InetSocketAddress;ZLnet/minecraft/network/ClientConnection;)Lio/netty/channel/ChannelFuture;}
     */
-   public static ChannelFuture m_apccqkse(InetSocketAddress inetSocketAddress, boolean bl, ClientConnection arg) {
+   public static ChannelFuture connect(InetSocketAddress address, boolean useEpoll, ClientConnection connection) {
       Class<? extends SocketChannel> lv;
       Lazy<? extends EventLoopGroup> lv2;
-      if (Epoll.isAvailable() && bl) {
+      if (Epoll.isAvailable() && useEpoll) {
          lv = EpollSocketChannel.class;
          lv2 = EPOLL_CLIENT_IO_GROUP;
       } else {
@@ -548,9 +550,9 @@
 
             ChannelPipeline channelPipeline = channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30));
             ClientConnection.addHandlers(channelPipeline, NetworkSide.C2S);
-            channelPipeline.addLast("packet_handler", arg);
+            channelPipeline.addLast("packet_handler", connection);
          }
-      }).channel(lv).connect(inetSocketAddress.getAddress(), inetSocketAddress.getPort());
+      }).channel(lv).connect(address.getAddress(), address.getPort());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/LegacyQueryHandler.java namedSrc/net/minecraft/network/LegacyQueryHandler.java
--- namedTargetSrc/net/minecraft/network/LegacyQueryHandler.java	2023-06-26 16:11:54.195092325 +0000
+++ namedSrc/net/minecraft/network/LegacyQueryHandler.java	2023-06-26 16:10:23.693591368 +0000
@@ -10,7 +10,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.ServerNetworkIo;
+import net.minecraft.server.network.ServerNetworkIo;
 import org.slf4j.Logger;
 
 /**
@@ -30,13 +30,13 @@
    public static final int LEGACY_FAKE_PROTOCOL_VERSION = 127;
    /**
     * @mapping {@literal hashed f_ukmmwxsz Lnet/minecraft/unmapped/C_avdfsszh;f_ukmmwxsz:Lnet/minecraft/unmapped/C_mitbewqx;}
-    * @mapping {@literal named networkIo Lnet/minecraft/network/LegacyQueryHandler;networkIo:Lnet/minecraft/server/ServerNetworkIo;}
+    * @mapping {@literal named networkIo Lnet/minecraft/network/LegacyQueryHandler;networkIo:Lnet/minecraft/server/network/ServerNetworkIo;}
     */
    private final ServerNetworkIo networkIo;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_avdfsszh;<init>(Lnet/minecraft/unmapped/C_mitbewqx;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/network/LegacyQueryHandler;<init>(Lnet/minecraft/server/ServerNetworkIo;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/LegacyQueryHandler;<init>(Lnet/minecraft/server/network/ServerNetworkIo;)V}
     */
    public LegacyQueryHandler(ServerNetworkIo networkIo) {
       this.networkIo = networkIo;
diff -bur namedTargetSrc/net/minecraft/resource/HolderSetCodec.java namedSrc/net/minecraft/resource/HolderSetCodec.java
--- namedTargetSrc/net/minecraft/resource/HolderSetCodec.java	2023-06-26 16:11:54.107090840 +0000
+++ namedSrc/net/minecraft/resource/HolderSetCodec.java	2023-06-26 16:10:23.589589651 +0000
@@ -49,7 +49,7 @@
     * @mapping {@literal named homogeneousList Lnet/minecraft/resource/HolderSetCodec;homogeneousList(Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/Codec;}
     */
    private static <E> Codec<List<Holder<E>>> homogeneousList(Codec<Holder<E>> elementCodec, boolean alwaysSerializeAsList) {
-      Codec<List<Holder<E>>> codec2 = Codecs.m_lytzwisw(elementCodec.listOf(), Codecs.createEqualTypeChecker(Holder::getKind));
+      Codec<List<Holder<E>>> codec2 = Codecs.validate(elementCodec.listOf(), Codecs.createEqualTypeChecker(Holder::getKind));
       return alwaysSerializeAsList
          ? codec2
          : Codec.either(codec2, elementCodec)
diff -bur namedTargetSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java namedSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java
--- namedTargetSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java	2023-06-26 16:11:54.139091380 +0000
+++ namedSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java	2023-06-26 16:10:23.625590246 +0000
@@ -30,12 +30,12 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.GameMode;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 import net.minecraft.world.gen.chunk.FlatChunkGenerator;
 import net.minecraft.world.gen.chunk.FlatChunkGeneratorConfig;
@@ -442,9 +442,9 @@
 
    /**
     * @mapping {@literal hashed m_eailtpbb Lnet/minecraft/unmapped/C_kefepfwh;m_eailtpbb(Lnet/minecraft/unmapped/C_wqxmvzdq;)Lnet/minecraft/unmapped/C_oiwekzxo;}
-    * @mapping {@literal named m_eailtpbb Lnet/minecraft/server/dedicated/ServerPropertiesHandler;m_eailtpbb(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/unmapped/C_oiwekzxo;}
+    * @mapping {@literal named m_eailtpbb Lnet/minecraft/server/dedicated/ServerPropertiesHandler;m_eailtpbb(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/world/dimension/WorldDimensions;}
     */
-   public C_oiwekzxo m_eailtpbb(DynamicRegistryManager registryManager) {
+   public WorldDimensions m_eailtpbb(DynamicRegistryManager registryManager) {
       return this.worldGenerationProperties.m_rpbmageg(registryManager);
    }
 
@@ -463,9 +463,9 @@
 
       /**
        * @mapping {@literal hashed m_rpbmageg Lnet/minecraft/unmapped/C_kefepfwh$C_fjprapmv;m_rpbmageg(Lnet/minecraft/unmapped/C_wqxmvzdq;)Lnet/minecraft/unmapped/C_oiwekzxo;}
-       * @mapping {@literal named m_rpbmageg Lnet/minecraft/server/dedicated/ServerPropertiesHandler$WorldGenerationProperties;m_rpbmageg(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/unmapped/C_oiwekzxo;}
+       * @mapping {@literal named m_rpbmageg Lnet/minecraft/server/dedicated/ServerPropertiesHandler$WorldGenerationProperties;m_rpbmageg(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/world/dimension/WorldDimensions;}
        */
-      public C_oiwekzxo m_rpbmageg(DynamicRegistryManager registryManager) {
+      public WorldDimensions m_rpbmageg(DynamicRegistryManager registryManager) {
          Registry<GeneratorType> lv = registryManager.get(RegistryKeys.GENERATOR_TYPE);
          Holder.Reference<GeneratorType> lv2 = (Holder.Reference)lv.getHolder(GeneratorTypes.NORMAL)
             .or(() -> lv.holders().findAny())
@@ -478,14 +478,14 @@
                ServerPropertiesHandler.LOGGER.warn("Failed to parse level-type {}, defaulting to {}", this.generatorTypeId, lv2.getRegistryKey().getValue());
                return lv2;
             });
-         C_oiwekzxo lv4 = lv3.value().m_tpfjotrl();
+         WorldDimensions lv4 = lv3.value().m_tpfjotrl();
          if (lv3.isRegistryKey(GeneratorTypes.FLAT)) {
             RegistryOps<JsonElement> lv5 = RegistryOps.create(JsonOps.INSTANCE, registryManager);
             Optional<FlatChunkGeneratorConfig> optional = FlatChunkGeneratorConfig.CODEC
                .parse(new Dynamic<>(lv5, this.generatorSettings()))
                .resultOrPartial(ServerPropertiesHandler.LOGGER::error);
             if (optional.isPresent()) {
-               return lv4.m_iduqyeyv(registryManager, new FlatChunkGenerator((FlatChunkGeneratorConfig)optional.get()));
+               return lv4.replaceOverworldGenerator(registryManager, new FlatChunkGenerator((FlatChunkGeneratorConfig)optional.get()));
             }
          }
 
diff -bur namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java
--- namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2023-06-26 16:11:54.207092528 +0000
+++ namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2023-06-26 16:10:23.709591632 +0000
@@ -40,7 +40,6 @@
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.InvalidSymlinkException;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
@@ -48,6 +47,7 @@
 import net.minecraft.world.WorldInfo;
 import net.minecraft.world.WorldSaveProperties;
 import net.minecraft.world.dimension.DimensionOptions;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 import net.minecraft.world.storage.WorldSaveStorage;
 import org.jetbrains.annotations.Nullable;
@@ -98,7 +98,7 @@
     * @mapping {@literal hashed m_lrueasex Lnet/minecraft/unmapped/C_phqvxqun;m_lrueasex(Ljava/lang/String;Lnet/minecraft/unmapped/C_tmnkpzlg;Lnet/minecraft/unmapped/C_naismckd;Ljava/util/function/Function;)V}
     * @mapping {@literal named createAndStart Lnet/minecraft/server/integrated/IntegratedServerLoader;createAndStart(Ljava/lang/String;Lnet/minecraft/world/WorldInfo;Lnet/minecraft/world/gen/WorldGeneratorOptions;Ljava/util/function/Function;)V}
     */
-   public void createAndStart(String worldName, WorldInfo levelInfo, WorldGeneratorOptions arg2, Function<DynamicRegistryManager, C_oiwekzxo> function) {
+   public void createAndStart(String worldName, WorldInfo levelInfo, WorldGeneratorOptions arg2, Function<DynamicRegistryManager, WorldDimensions> function) {
       WorldSaveStorage.Session lv = this.createStorageSession(worldName);
       if (lv != null) {
          ResourcePackManager lv2 = VanillaDataPackProvider.createDataPackManager(lv);
@@ -109,10 +109,10 @@
             WorldStem lv5 = this.m_ocpkzrtb(
                lv4,
                arg3 -> {
-                  C_oiwekzxo.C_djwmjrji lvx = ((C_oiwekzxo)function.apply(arg3.datapackWorldgen()))
-                     .m_xiunuxre(arg3.datapackDimensions().get(RegistryKeys.DIMENSION));
+                  WorldDimensions.Baked lvx = ((WorldDimensions)function.apply(arg3.datapackWorldgen()))
+                     .bake(arg3.datapackDimensions().get(RegistryKeys.DIMENSION));
                   return new WorldLoader.DataLoadOutput<>(
-                     new WorldSaveProperties(levelInfo, arg2, lvx.specialWorldProperty(), lvx.m_isteaavn()), lvx.m_jyxiyrye()
+                     new WorldSaveProperties(levelInfo, arg2, lvx.specialWorldProperty(), lvx.getLifecycle()), lvx.toRegistryManager()
                   );
                },
                WorldStem::new
@@ -171,13 +171,13 @@
          arg2 -> {
             DynamicOps<NbtElement> dynamicOps = RegistryOps.create(NbtOps.INSTANCE, arg2.datapackWorldgen());
             Registry<DimensionOptions> lvx = arg2.datapackDimensions().get(RegistryKeys.DIMENSION);
-            Pair<SaveProperties, C_oiwekzxo.C_djwmjrji> pair = storageSession.readWorldSaveProperties(
+            Pair<SaveProperties, WorldDimensions.Baked> pair = storageSession.readWorldSaveProperties(
                dynamicOps, arg2.dataConfiguration(), lvx, arg2.datapackWorldgen().getLifecycleForAllRegistries()
             );
             if (pair == null) {
                throw new IllegalStateException("Failed to load world");
             } else {
-               return new WorldLoader.DataLoadOutput<>(pair.getFirst(), pair.getSecond().m_jyxiyrye());
+               return new WorldLoader.DataLoadOutput<>(pair.getFirst(), pair.getSecond().toRegistryManager());
             }
          },
          WorldStem::new
@@ -195,14 +195,15 @@
          arg2 -> {
             DynamicOps<NbtElement> dynamicOps = RegistryOps.create(NbtOps.INSTANCE, arg2.datapackWorldgen());
             Registry<DimensionOptions> lvx = new SimpleRegistry<>(RegistryKeys.DIMENSION, Lifecycle.stable()).freeze();
-            Pair<SaveProperties, C_oiwekzxo.C_djwmjrji> pair = arg.readWorldSaveProperties(
+            Pair<SaveProperties, WorldDimensions.Baked> pair = arg.readWorldSaveProperties(
                dynamicOps, arg2.dataConfiguration(), lvx, arg2.datapackWorldgen().getLifecycleForAllRegistries()
             );
             if (pair == null) {
                throw new IllegalStateException("Failed to load world");
             } else {
                return new WorldLoader.DataLoadOutput<>(
-                  new C_tattaqxb(pair.getFirst().getWorldInfo(), pair.getFirst().m_ycrrmmel(), pair.getSecond().dimensions()), arg2.datapackDimensions()
+                  new C_tattaqxb(pair.getFirst().getWorldInfo(), pair.getFirst().getGeneratorOptions(), pair.getSecond().dimensions()),
+                  arg2.datapackDimensions()
                );
             }
          },
@@ -210,7 +211,9 @@
             resourceManager.close();
             return Pair.of(
                arg4.levelSettings,
-               new WorldCreationContext(arg4.options, new C_oiwekzxo(arg4.existingDimensions), arg3, resources, arg4.levelSettings.getFeatureAndDataSettings())
+               new WorldCreationContext(
+                  arg4.options, new WorldDimensions(arg4.existingDimensions), arg3, resources, arg4.levelSettings.getFeatureAndDataSettings()
+               )
             );
          }
       );
@@ -290,7 +293,7 @@
          }
 
          SaveProperties lv5 = lv3.saveProperties();
-         boolean bl3 = lv5.m_ycrrmmel().hasLegacyCustomOptions();
+         boolean bl3 = lv5.getGeneratorOptions().hasLegacyCustomOptions();
          boolean bl4 = lv5.getLifecycle() != Lifecycle.stable();
          if (!requireBackup || !bl3 && !bl4) {
             this.client.getRemoteResourcePackProvider().loadServerPack(lv).thenApply(arg -> true).exceptionallyComposeAsync(throwable -> {
diff -bur namedTargetSrc/net/minecraft/server/Main.java namedSrc/net/minecraft/server/Main.java
--- namedTargetSrc/net/minecraft/server/Main.java	2023-06-26 16:11:54.223092798 +0000
+++ namedSrc/net/minecraft/server/Main.java	2023-06-26 16:10:23.725591897 +0000
@@ -42,7 +42,6 @@
 import net.minecraft.server.dedicated.ServerPropertiesLoader;
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.Util;
 import net.minecraft.util.WorldSavePath;
 import net.minecraft.util.crash.CrashReport;
@@ -55,6 +54,7 @@
 import net.minecraft.world.WorldInfo;
 import net.minecraft.world.WorldSaveProperties;
 import net.minecraft.world.dimension.DimensionOptions;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 import net.minecraft.world.storage.WorldSaveStorage;
 import net.minecraft.world.storage.WorldSaveSummary;
@@ -166,15 +166,15 @@
                         arg3x -> {
                            Registry<DimensionOptions> lvx = arg3x.datapackDimensions().get(RegistryKeys.DIMENSION);
                            DynamicOps<NbtElement> dynamicOps = RegistryOps.create(NbtOps.INSTANCE, arg3x.datapackWorldgen());
-                           Pair<SaveProperties, C_oiwekzxo.C_djwmjrji> pair = lv5.readWorldSaveProperties(
+                           Pair<SaveProperties, WorldDimensions.Baked> pair = lv5.readWorldSaveProperties(
                               dynamicOps, arg3x.dataConfiguration(), lvx, arg3x.datapackWorldgen().getLifecycleForAllRegistries()
                            );
                            if (pair != null) {
-                              return new WorldLoader.DataLoadOutput<>(pair.getFirst(), pair.getSecond().m_jyxiyrye());
+                              return new WorldLoader.DataLoadOutput<>(pair.getFirst(), pair.getSecond().toRegistryManager());
                            } else {
                               WorldInfo lv6x;
                               WorldGeneratorOptions lv7x;
-                              C_oiwekzxo lv4;
+                              WorldDimensions lv4;
                               if (optionSet.has(optionSpec3)) {
                                  lv6x = MinecraftServer.DEMO_LEVEL_INFO;
                                  lv7x = WorldGeneratorOptions.DEFAULT;
@@ -188,10 +188,10 @@
                                  lv4 = lv5x.m_eailtpbb(arg3x.datapackWorldgen());
                               }
          
-                              C_oiwekzxo.C_djwmjrji var14x = lv4.m_xiunuxre(lvx);
-                              Lifecycle lifecycle = var14x.m_isteaavn().add(arg3x.datapackWorldgen().getLifecycleForAllRegistries());
+                              WorldDimensions.Baked var14x = lv4.bake(lvx);
+                              Lifecycle lifecycle = var14x.getLifecycle().add(arg3x.datapackWorldgen().getLifecycleForAllRegistries());
                               return new WorldLoader.DataLoadOutput<>(
-                                 new WorldSaveProperties(lv6x, lv7x, var14x.specialWorldProperty(), lifecycle), var14x.m_jyxiyrye()
+                                 new WorldSaveProperties(lv6x, lv7x, var14x.specialWorldProperty(), lifecycle), var14x.toRegistryManager()
                               );
                            }
                         },
diff -bur namedTargetSrc/net/minecraft/server/MinecraftServer.java namedSrc/net/minecraft/server/MinecraftServer.java
--- namedTargetSrc/net/minecraft/server/MinecraftServer.java	2023-06-26 16:11:54.223092798 +0000
+++ namedSrc/net/minecraft/server/MinecraftServer.java	2023-06-26 16:10:23.725591897 +0000
@@ -86,6 +86,7 @@
 import net.minecraft.server.filter.TextStream;
 import net.minecraft.server.function.CommandFunctionManager;
 import net.minecraft.server.network.DemoServerPlayerInteractionManager;
+import net.minecraft.server.network.ServerNetworkIo;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.network.ServerPlayerInteractionManager;
 import net.minecraft.server.network.SpawnLocating;
@@ -320,7 +321,7 @@
    private boolean needsDebugSetup;
    /**
     * @mapping {@literal hashed f_xpelegwm Lnet/minecraft/server/MinecraftServer;f_xpelegwm:Lnet/minecraft/unmapped/C_mitbewqx;}
-    * @mapping {@literal named networkIo Lnet/minecraft/server/MinecraftServer;networkIo:Lnet/minecraft/server/ServerNetworkIo;}
+    * @mapping {@literal named networkIo Lnet/minecraft/server/MinecraftServer;networkIo:Lnet/minecraft/server/network/ServerNetworkIo;}
     */
    private final ServerNetworkIo networkIo;
    /**
@@ -686,7 +687,7 @@
       ServerWorldProperties lv = this.saveProperties.getMainWorldProperties();
       boolean bl = this.saveProperties.isDebug();
       Registry<DimensionOptions> lv2 = this.layeredRegistryManager.getCompositeManager().get(RegistryKeys.DIMENSION);
-      WorldGeneratorOptions lv3 = this.saveProperties.m_ycrrmmel();
+      WorldGeneratorOptions lv3 = this.saveProperties.getGeneratorOptions();
       long l = lv3.getSeed();
       long m = BiomeAccess.hashSeed(l);
       List<Spawner> list = ImmutableList.of(
@@ -1986,7 +1987,7 @@
 
    /**
     * @mapping {@literal hashed m_hfghaotl Lnet/minecraft/server/MinecraftServer;m_hfghaotl()Lnet/minecraft/unmapped/C_mitbewqx;}
-    * @mapping {@literal named getNetworkIo Lnet/minecraft/server/MinecraftServer;getNetworkIo()Lnet/minecraft/server/ServerNetworkIo;}
+    * @mapping {@literal named getNetworkIo Lnet/minecraft/server/MinecraftServer;getNetworkIo()Lnet/minecraft/server/network/ServerNetworkIo;}
     */
    @Nullable
    public ServerNetworkIo getNetworkIo() {
diff -bur namedTargetSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java namedSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java	2023-06-26 16:11:54.231092933 +0000
+++ namedSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java	2023-06-26 16:10:23.737592095 +0000
@@ -13,7 +13,7 @@
  * <p>A local connection is one between a Minecraft client and the
  * Integrated Server it is running.
  * 
- * @see net.minecraft.server.ServerNetworkIo#bindLocal()
+ * @see ServerNetworkIo#bindLocal()
  * 
  * @mapping {@literal hashed net/minecraft/unmapped/C_lvasmajl}
  * @mapping {@literal named net/minecraft/server/network/LocalServerHandshakeNetworkHandler}
Only in namedSrc/net/minecraft/server/network: ServerNetworkIo.java
Only in namedTargetSrc/net/minecraft/server: ServerNetworkIo.java
diff -bur namedTargetSrc/net/minecraft/server/world/ServerWorld.java namedSrc/net/minecraft/server/world/ServerWorld.java
--- namedTargetSrc/net/minecraft/server/world/ServerWorld.java	2023-06-26 16:11:54.239093068 +0000
+++ namedSrc/net/minecraft/server/world/ServerWorld.java	2023-06-26 16:10:23.745592227 +0000
@@ -392,7 +392,7 @@
          arg2.setGameMode(minecraftServer.getDefaultGameMode());
       }
 
-      long m = minecraftServer.getSaveProperties().m_ycrrmmel().getSeed();
+      long m = minecraftServer.getSaveProperties().getGeneratorOptions().getSeed();
       this.structureChecker = new StructureChecker(
          this.chunkManager.getChunkNbtScanner(),
          this.getRegistryManager(),
@@ -405,9 +405,9 @@
          m,
          dataFixer
       );
-      this.structureManager = new StructureManager(this, minecraftServer.getSaveProperties().m_ycrrmmel(), this.structureChecker);
+      this.structureManager = new StructureManager(this, minecraftServer.getSaveProperties().getGeneratorOptions(), this.structureChecker);
       if (this.getRegistryKey() == World.END && this.getDimensionHolder().isRegistryKey(DimensionTypes.THE_END)) {
-         this.enderDragonFight = new EnderDragonFight(this, m, minecraftServer.getSaveProperties().m_hgxsrhud());
+         this.enderDragonFight = new EnderDragonFight(this, m, minecraftServer.getSaveProperties().getDragonFightState());
       } else {
          this.enderDragonFight = null;
       }
@@ -1020,7 +1020,7 @@
     */
    private void saveWorld() {
       if (this.enderDragonFight != null) {
-         this.server.getSaveProperties().m_zucuhnzk(this.enderDragonFight.m_kgnlaawg());
+         this.server.getSaveProperties().setDragonFightState(this.enderDragonFight.m_kgnlaawg());
       }
 
       this.getChunkManager().getPersistentStateManager().save();
@@ -1618,7 +1618,7 @@
     */
    @Nullable
    public BlockPos findFirstPos(TagKey<StructureFeature> structures, BlockPos pos, int range, boolean bl) {
-      if (!this.server.getSaveProperties().m_ycrrmmel().hasFeatureGeneration()) {
+      if (!this.server.getSaveProperties().getGeneratorOptions().hasFeatureGeneration()) {
          return null;
       } else {
          Optional<HolderSet.NamedSet<StructureFeature>> optional = this.getRegistryManager().get(RegistryKeys.STRUCTURE_FEATURE).getTag(structures);
@@ -2096,7 +2096,7 @@
     */
    @Override
    public long getSeed() {
-      return this.server.getSaveProperties().m_ycrrmmel().getSeed();
+      return this.server.getSaveProperties().getGeneratorOptions().getSeed();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/structure/RandomSpreadStructurePlacement.java namedSrc/net/minecraft/structure/RandomSpreadStructurePlacement.java
--- namedTargetSrc/net/minecraft/structure/RandomSpreadStructurePlacement.java	2023-06-26 16:11:54.139091380 +0000
+++ namedSrc/net/minecraft/structure/RandomSpreadStructurePlacement.java	2023-06-26 16:10:23.625590246 +0000
@@ -19,7 +19,7 @@
     * @mapping {@literal hashed f_yrxcucab Lnet/minecraft/unmapped/C_cznbjngb;f_yrxcucab:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/structure/RandomSpreadStructurePlacement;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<RandomSpreadStructurePlacement> CODEC = Codecs.m_ljxipwty(
+   public static final Codec<RandomSpreadStructurePlacement> CODEC = Codecs.validate(
          RecordCodecBuilder.mapCodec(
             instance -> placementCodec(instance)
                   .<int, int, RandomSpreadType>and(
diff -bur namedTargetSrc/net/minecraft/test/TestServer.java namedSrc/net/minecraft/test/TestServer.java
--- namedTargetSrc/net/minecraft/test/TestServer.java	2023-06-26 16:11:54.167091853 +0000
+++ namedSrc/net/minecraft/test/TestServer.java	2023-06-26 16:10:23.657590774 +0000
@@ -31,7 +31,6 @@
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_oiwekzxo;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.SystemDetails;
 import net.minecraft.util.Util;
@@ -43,6 +42,7 @@
 import net.minecraft.world.WorldInfo;
 import net.minecraft.world.WorldSaveProperties;
 import net.minecraft.world.dimension.DimensionOptions;
+import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 import net.minecraft.world.storage.WorldSaveStorage;
 import org.jetbrains.annotations.Nullable;
@@ -124,14 +124,14 @@
                         lv4,
                         arg2x -> {
                            Registry<DimensionOptions> lvx = new SimpleRegistry<>(RegistryKeys.DIMENSION, Lifecycle.stable()).freeze();
-                           C_oiwekzxo.C_djwmjrji lv2x = arg2x.datapackWorldgen()
+                           WorldDimensions.Baked lv2x = arg2x.datapackWorldgen()
                               .get(RegistryKeys.GENERATOR_TYPE)
                               .getHolderOrThrow(GeneratorTypes.FLAT)
                               .value()
                               .m_tpfjotrl()
-                              .m_xiunuxre(lvx);
+                              .bake(lvx);
                            return new WorldLoader.DataLoadOutput<>(
-                              new WorldSaveProperties(lv2, WORLD_GENERATOR_OPTIONS, lv2x.specialWorldProperty(), lv2x.m_isteaavn()), lv2x.m_jyxiyrye()
+                              new WorldSaveProperties(lv2, WORLD_GENERATOR_OPTIONS, lv2x.specialWorldProperty(), lv2x.getLifecycle()), lv2x.toRegistryManager()
                            );
                         },
                         WorldStem::new,
Only in namedTargetSrc/net/minecraft/unmapped: C_oiwekzxo.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_pxvlatlk.java namedSrc/net/minecraft/unmapped/C_pxvlatlk.java
--- namedTargetSrc/net/minecraft/unmapped/C_pxvlatlk.java	2023-06-26 16:11:54.207092528 +0000
+++ namedSrc/net/minecraft/unmapped/C_pxvlatlk.java	2023-06-26 16:10:23.709591632 +0000
@@ -724,7 +724,7 @@
       /**
        * Mapping not found
        */
-      public static final Codec<C_pxvlatlk.C_ssqqjezl> f_lsurehab = Codecs.m_lytzwisw(
+      public static final Codec<C_pxvlatlk.C_ssqqjezl> f_lsurehab = Codecs.validate(
          f_lzodltcs, arg -> arg.from >= arg.to ? DataResult.error(() -> "Invalid range: [" + arg.from + ";" + arg.to + "]") : DataResult.success(arg)
       );
    }

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/util/dynamic/Codecs.java namedSrc/net/minecraft/util/dynamic/Codecs.java
--- namedTargetSrc/net/minecraft/util/dynamic/Codecs.java	2023-06-26 16:11:54.251093271 +0000
+++ namedSrc/net/minecraft/util/dynamic/Codecs.java	2023-06-26 16:10:23.757592425 +0000
@@ -290,7 +290,7 @@
     * @mapping {@literal hashed f_wqiemdiy Lnet/minecraft/unmapped/C_tyjpezxh;f_wqiemdiy:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named NON_EMPTY_STRING Lnet/minecraft/util/dynamic/Codecs;NON_EMPTY_STRING:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<String> NON_EMPTY_STRING = m_lytzwisw(
+   public static final Codec<String> NON_EMPTY_STRING = validate(
       Codec.STRING, string -> string.isEmpty() ? DataResult.error(() -> "Expected non-empty string") : DataResult.success(string)
    );
    /**
@@ -499,17 +499,18 @@
 
    /**
     * @mapping {@literal hashed m_lytzwisw Lnet/minecraft/unmapped/C_tyjpezxh;m_lytzwisw(Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;}
-    * @mapping {@literal named m_lytzwisw Lnet/minecraft/util/dynamic/Codecs;m_lytzwisw(Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named validate Lnet/minecraft/util/dynamic/Codecs;validate(Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;}
     */
-   public static <T> Codec<T> m_lytzwisw(Codec<T> codec, Function<T, DataResult<T>> function) {
-      return codec.flatXmap(function, function);
+   public static <T> Codec<T> validate(Codec<T> codec, Function<T, DataResult<T>> validator) {
+      return codec.flatXmap(validator, validator);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ljxipwty Lnet/minecraft/unmapped/C_tyjpezxh;m_ljxipwty(Lcom/mojang/serialization/MapCodec;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named validate Lnet/minecraft/util/dynamic/Codecs;validate(Lcom/mojang/serialization/MapCodec;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;}
     */
-   public static <T> MapCodec<T> m_ljxipwty(MapCodec<T> mapCodec, Function<T, DataResult<T>> function) {
-      return mapCodec.flatXmap(function, function);
+   public static <T> MapCodec<T> validate(MapCodec<T> codec, Function<T, DataResult<T>> validator) {
+      return codec.flatXmap(validator, validator);
    }
 
    /**
@@ -517,11 +518,8 @@
     * @mapping {@literal named createRangedInt Lnet/minecraft/util/dynamic/Codecs;createRangedInt(IILjava/util/function/Function;)Lcom/mojang/serialization/Codec;}
     */
    private static Codec<Integer> createRangedInt(int min, int max, Function<Integer, String> messageFactory) {
-      return m_lytzwisw(
-         Codec.INT,
-         integer -> integer.compareTo(min) >= 0 && integer.compareTo(max) <= 0
-               ? DataResult.success(integer)
-               : DataResult.error(() -> (String)messageFactory.apply(integer))
+      return validate(
+         Codec.INT, i -> i.compareTo(min) >= 0 && i.compareTo(max) <= 0 ? DataResult.success(i) : DataResult.error(() -> (String)messageFactory.apply(i))
       );
    }
 
@@ -530,7 +528,7 @@
     * @mapping {@literal named createRangedInt Lnet/minecraft/util/dynamic/Codecs;createRangedInt(II)Lcom/mojang/serialization/Codec;}
     */
    public static Codec<Integer> createRangedInt(int min, int max) {
-      return createRangedInt(min, max, integer -> "Value must be within range [" + min + ";" + max + "]: " + integer);
+      return createRangedInt(min, max, i -> "Value must be within range [" + min + ";" + max + "]: " + i);
    }
 
    /**
@@ -538,9 +536,8 @@
     * @mapping {@literal named createRangedFloat Lnet/minecraft/util/dynamic/Codecs;createRangedFloat(FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec;}
     */
    private static Codec<Float> createRangedFloat(float min, float max, Function<Float, String> messageFactory) {
-      return m_lytzwisw(
-         Codec.FLOAT,
-         arg -> arg.compareTo(min) > 0 && arg.compareTo(max) <= 0 ? DataResult.success(arg) : DataResult.error(() -> (String)messageFactory.apply(arg))
+      return validate(
+         Codec.FLOAT, f -> f.compareTo(min) > 0 && f.compareTo(max) <= 0 ? DataResult.success(f) : DataResult.error(() -> (String)messageFactory.apply(f))
       );
    }
 
@@ -549,7 +546,7 @@
     * @mapping {@literal named withNonEmptyList Lnet/minecraft/util/dynamic/Codecs;withNonEmptyList(Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;}
     */
    public static <T> Codec<List<T>> withNonEmptyList(Codec<List<T>> originalCodec) {
-      return m_lytzwisw(originalCodec, list -> list.isEmpty() ? DataResult.error(() -> "List must have contents") : DataResult.success(list));
+      return validate(originalCodec, list -> list.isEmpty() ? DataResult.error(() -> "List must have contents") : DataResult.success(list));
    }
 
    /**
@@ -557,9 +554,9 @@
     * @mapping {@literal named withNonEmptyHolderSet Lnet/minecraft/util/dynamic/Codecs;withNonEmptyHolderSet(Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;}
     */
    public static <T> Codec<HolderSet<T>> withNonEmptyHolderSet(Codec<HolderSet<T>> codec) {
-      return m_lytzwisw(
+      return validate(
          codec,
-         arg -> arg.getTagOrContents().right().filter(List::isEmpty).isPresent() ? DataResult.error(() -> "List must have contents") : DataResult.success(arg)
+         set -> set.getTagOrContents().right().filter(List::isEmpty).isPresent() ? DataResult.error(() -> "List must have contents") : DataResult.success(set)
       );
    }
 
@@ -713,7 +710,7 @@
     * @mapping {@literal named sizeLimitedString Lnet/minecraft/util/dynamic/Codecs;sizeLimitedString(II)Lcom/mojang/serialization/Codec;}
     */
    public static Codec<String> sizeLimitedString(int min, int max) {
-      return m_lytzwisw(
+      return validate(
          Codec.STRING,
          string -> {
             int k = string.length();
diff -bur namedTargetSrc/net/minecraft/util/math/Direction.java namedSrc/net/minecraft/util/math/Direction.java
--- namedTargetSrc/net/minecraft/util/math/Direction.java	2023-06-26 16:11:54.139091380 +0000
+++ namedSrc/net/minecraft/util/math/Direction.java	2023-06-26 16:10:23.625590246 +0000
@@ -66,7 +66,7 @@
     * @mapping {@literal hashed f_aeejwnnb Lnet/minecraft/unmapped/C_xpuuihxf;f_aeejwnnb:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named VERTICAL_CODEC Lnet/minecraft/util/math/Direction;VERTICAL_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Direction> VERTICAL_CODEC = Codecs.m_lytzwisw(CODEC, Direction::validateVertical);
+   public static final Codec<Direction> VERTICAL_CODEC = Codecs.validate(CODEC, Direction::validateVertical);
    /**
     * @mapping {@literal hashed f_xnopevsr Lnet/minecraft/unmapped/C_xpuuihxf;f_xnopevsr:I}
     * @mapping {@literal named id Lnet/minecraft/util/math/Direction;id:I}
diff -bur namedTargetSrc/net/minecraft/util/math/float_provider/FloatProvider.java namedSrc/net/minecraft/util/math/float_provider/FloatProvider.java
--- namedTargetSrc/net/minecraft/util/math/float_provider/FloatProvider.java	2023-06-26 16:11:54.251093271 +0000
+++ namedSrc/net/minecraft/util/math/float_provider/FloatProvider.java	2023-06-26 16:10:23.757592425 +0000
@@ -32,7 +32,7 @@
     * @mapping {@literal named createValidatedCodec Lnet/minecraft/util/math/float_provider/FloatProvider;createValidatedCodec(FF)Lcom/mojang/serialization/Codec;}
     */
    public static Codec<FloatProvider> createValidatedCodec(float min, float max) {
-      return Codecs.m_lytzwisw(
+      return Codecs.validate(
          VALUE_CODEC,
          arg -> {
             if (arg.getMin() < min) {
diff -bur namedTargetSrc/net/minecraft/util/math/int_provider/IntProvider.java namedSrc/net/minecraft/util/math/int_provider/IntProvider.java
--- namedTargetSrc/net/minecraft/util/math/int_provider/IntProvider.java	2023-06-26 16:11:54.143091447 +0000
+++ namedSrc/net/minecraft/util/math/int_provider/IntProvider.java	2023-06-26 16:10:23.629590312 +0000
@@ -51,7 +51,7 @@
     * @mapping {@literal named create Lnet/minecraft/util/math/int_provider/IntProvider;create(IILcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;}
     */
    public static <T extends IntProvider> Codec<T> create(int min, int max, Codec<T> codec) {
-      return Codecs.m_lytzwisw(
+      return Codecs.validate(
          codec,
          provider -> {
             if (provider.getMin() < min) {
diff -bur namedTargetSrc/net/minecraft/util/math/Range.java namedSrc/net/minecraft/util/math/Range.java
--- namedTargetSrc/net/minecraft/util/math/Range.java	2023-06-26 16:11:54.147091515 +0000
+++ namedSrc/net/minecraft/util/math/Range.java	2023-06-26 16:10:23.633590378 +0000
@@ -43,7 +43,7 @@
     * @mapping {@literal named createBoundedCodec Lnet/minecraft/util/math/Range;createBoundedCodec(Lcom/mojang/serialization/Codec;Ljava/lang/Comparable;Ljava/lang/Comparable;)Lcom/mojang/serialization/Codec;}
     */
    public static <T extends Comparable<T>> Codec<Range<T>> createBoundedCodec(Codec<T> codec, T min, T max) {
-      return Codecs.m_lytzwisw(
+      return Codecs.validate(
          createCodec(codec),
          arg -> {
             if (arg.min().compareTo(min) < 0) {
diff -bur namedTargetSrc/net/minecraft/util/math/Vec3i.java namedSrc/net/minecraft/util/math/Vec3i.java
--- namedTargetSrc/net/minecraft/util/math/Vec3i.java	2023-06-26 16:11:54.143091447 +0000
+++ namedSrc/net/minecraft/util/math/Vec3i.java	2023-06-26 16:10:23.629590312 +0000
@@ -51,7 +51,7 @@
     * @mapping {@literal named offsetCodec Lnet/minecraft/util/math/Vec3i;offsetCodec(I)Lcom/mojang/serialization/Codec;}
     */
    public static Codec<Vec3i> offsetCodec(int maxAbsValue) {
-      return Codecs.m_lytzwisw(
+      return Codecs.validate(
          CODEC,
          arg -> Math.abs(arg.getX()) < maxAbsValue && Math.abs(arg.getY()) < maxAbsValue && Math.abs(arg.getZ()) < maxAbsValue
                ? DataResult.success(arg)
diff -bur namedTargetSrc/net/minecraft/world/biome/source/MultiNoiseBiomeSource.java namedSrc/net/minecraft/world/biome/source/MultiNoiseBiomeSource.java
--- namedTargetSrc/net/minecraft/world/biome/source/MultiNoiseBiomeSource.java	2023-06-26 16:11:54.127091177 +0000
+++ namedSrc/net/minecraft/world/biome/source/MultiNoiseBiomeSource.java	2023-06-26 16:10:23.613590048 +0000
@@ -24,29 +24,31 @@
  */
 public class MultiNoiseBiomeSource extends BiomeSource {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yjklltax Lnet/minecraft/unmapped/C_pzazgvmh;f_yjklltax:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named BIOME_CODEC Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;BIOME_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   private static final MapCodec<Holder<Biome>> f_yjklltax = Biome.REGISTRY_CODEC.fieldOf("biome");
+   private static final MapCodec<Holder<Biome>> BIOME_CODEC = Biome.REGISTRY_CODEC.fieldOf("biome");
    /**
     * Used to parse a custom biome source, when a preset hasn't been provided.
     * 
     * @mapping {@literal hashed f_tlkkbmpe Lnet/minecraft/unmapped/C_pzazgvmh;f_tlkkbmpe:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CUSTOM_CODEC Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;CUSTOM_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   public static final MapCodec<MultiNoiseUtil.ParameterRangeList<Holder<Biome>>> CUSTOM_CODEC = MultiNoiseUtil.ParameterRangeList.m_mxbtnhyd(f_yjklltax)
+   public static final MapCodec<MultiNoiseUtil.ParameterRangeList<Holder<Biome>>> CUSTOM_CODEC = MultiNoiseUtil.ParameterRangeList.m_mxbtnhyd(BIOME_CODEC)
       .fieldOf("biomes");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mhsxjemq Lnet/minecraft/unmapped/C_pzazgvmh;f_mhsxjemq:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named PRESET_CODEC Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;PRESET_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   private static final MapCodec<Holder<MultiNoiseBiomeSourceParameterList>> f_mhsxjemq = MultiNoiseBiomeSourceParameterList.REGISTRY_CODEC
+   private static final MapCodec<Holder<MultiNoiseBiomeSourceParameterList>> PRESET_CODEC = MultiNoiseBiomeSourceParameterList.REGISTRY_CODEC
       .fieldOf("preset")
       .withLifecycle(Lifecycle.stable());
    /**
     * @mapping {@literal hashed f_ndsbnbor Lnet/minecraft/unmapped/C_pzazgvmh;f_ndsbnbor:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<MultiNoiseBiomeSource> CODEC = Codec.mapEither(CUSTOM_CODEC, f_mhsxjemq)
-      .<MultiNoiseBiomeSource>xmap(MultiNoiseBiomeSource::new, arg -> arg.biomePoints)
+   public static final Codec<MultiNoiseBiomeSource> CODEC = Codec.mapEither(CUSTOM_CODEC, PRESET_CODEC)
+      .<MultiNoiseBiomeSource>xmap(MultiNoiseBiomeSource::new, source -> source.biomePoints)
       .codec();
    /**
     * @mapping {@literal hashed f_borqgmzj Lnet/minecraft/unmapped/C_pzazgvmh;f_borqgmzj:Lcom/mojang/datafixers/util/Either;}
@@ -55,31 +57,35 @@
    private final Either<MultiNoiseUtil.ParameterRangeList<Holder<Biome>>, Holder<MultiNoiseBiomeSourceParameterList>> biomePoints;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pzazgvmh;<init>(Lcom/mojang/datafixers/util/Either;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;<init>(Lcom/mojang/datafixers/util/Either;)V}
     */
-   private MultiNoiseBiomeSource(Either<MultiNoiseUtil.ParameterRangeList<Holder<Biome>>, Holder<MultiNoiseBiomeSourceParameterList>> either) {
-      this.biomePoints = either;
+   private MultiNoiseBiomeSource(Either<MultiNoiseUtil.ParameterRangeList<Holder<Biome>>, Holder<MultiNoiseBiomeSourceParameterList>> biomePoints) {
+      this.biomePoints = biomePoints;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ebnxdixg Lnet/minecraft/unmapped/C_pzazgvmh;m_ebnxdixg(Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;)Lnet/minecraft/unmapped/C_pzazgvmh;}
+    * @mapping {@literal named create Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;create(Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRangeList;)Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;}
     */
-   public static MultiNoiseBiomeSource m_ebnxdixg(MultiNoiseUtil.ParameterRangeList<Holder<Biome>> arg) {
-      return new MultiNoiseBiomeSource(Either.left(arg));
+   public static MultiNoiseBiomeSource create(MultiNoiseUtil.ParameterRangeList<Holder<Biome>> biomes) {
+      return new MultiNoiseBiomeSource(Either.left(biomes));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qvploows Lnet/minecraft/unmapped/C_pzazgvmh;m_qvploows(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_pzazgvmh;}
+    * @mapping {@literal named create Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;create(Lnet/minecraft/registry/Holder;)Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;}
     */
-   public static MultiNoiseBiomeSource m_qvploows(Holder<MultiNoiseBiomeSourceParameterList> arg) {
-      return new MultiNoiseBiomeSource(Either.right(arg));
+   public static MultiNoiseBiomeSource create(Holder<MultiNoiseBiomeSourceParameterList> biomes) {
+      return new MultiNoiseBiomeSource(Either.right(biomes));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rdnncpro Lnet/minecraft/unmapped/C_pzazgvmh;m_rdnncpro()Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;}
+    * @mapping {@literal named getBiomeEntries Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;getBiomeEntries()Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRangeList;}
     */
-   private MultiNoiseUtil.ParameterRangeList<Holder<Biome>> m_rdnncpro() {
-      return this.biomePoints.map(arg -> arg, arg -> ((MultiNoiseBiomeSourceParameterList)arg.value()).getRangeList());
+   private MultiNoiseUtil.ParameterRangeList<Holder<Biome>> getBiomeEntries() {
+      return this.biomePoints.map(biome -> biome, parameterList -> ((MultiNoiseBiomeSourceParameterList)parameterList.value()).getRangeList());
    }
 
    /**
@@ -87,7 +93,7 @@
     */
    @Override
    protected Stream<Holder<Biome>> getBiomesAsStream() {
-      return this.m_rdnncpro().getEntries().stream().map(Pair::getSecond);
+      return this.getBiomeEntries().getEntries().stream().map(Pair::getSecond);
    }
 
    /**
@@ -121,7 +127,7 @@
     */
    @Debug
    public Holder<Biome> getBiomeAtPoint(MultiNoiseUtil.NoiseValuePoint point) {
-      return this.m_rdnncpro().findValue(point);
+      return this.getBiomeEntries().findValue(point);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/biome/source/util/OverworldBiomeParameters.java namedSrc/net/minecraft/world/biome/source/util/OverworldBiomeParameters.java
--- namedTargetSrc/net/minecraft/world/biome/source/util/OverworldBiomeParameters.java	2023-06-26 16:11:54.143091447 +0000
+++ namedSrc/net/minecraft/world/biome/source/util/OverworldBiomeParameters.java	2023-06-26 16:10:23.629590312 +0000
@@ -280,7 +280,7 @@
     */
    protected void addBiomesTo(Consumer<Pair<MultiNoiseUtil.NoiseHypercube, RegistryKey<Biome>>> biomeEntryConsumer) {
       if (SharedConstants.generateSquareTerrainWithoutNoise) {
-         this.m_dbdvfqhy(biomeEntryConsumer);
+         this.addDebugBiomesTo(biomeEntryConsumer);
       } else {
          this.addOffCoastBiomesTo(biomeEntryConsumer);
          this.addInlandBiomesTo(biomeEntryConsumer);
@@ -289,15 +289,16 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dbdvfqhy Lnet/minecraft/unmapped/C_onndvydg;m_dbdvfqhy(Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named addDebugBiomesTo Lnet/minecraft/world/biome/source/util/OverworldBiomeParameters;addDebugBiomesTo(Ljava/util/function/Consumer;)V}
     */
-   private void m_dbdvfqhy(Consumer<Pair<MultiNoiseUtil.NoiseHypercube, RegistryKey<Biome>>> consumer) {
+   private void addDebugBiomesTo(Consumer<Pair<MultiNoiseUtil.NoiseHypercube, RegistryKey<Biome>>> biomeEntryConsumer) {
       HolderLookup.Provider lv = VanillaDynamicRegistries.createLookup();
       HolderProvider<DensityFunction> lv2 = lv.getLookupOrThrow(RegistryKeys.DENSITY_FUNCTION);
-      DensityFunctions.Spline.C_eljbykfw lv3 = new DensityFunctions.Spline.C_eljbykfw(lv2.getHolderOrThrow(NoiseRouterData.CONTINENTS_OVERWORLD));
-      DensityFunctions.Spline.C_eljbykfw lv4 = new DensityFunctions.Spline.C_eljbykfw(lv2.getHolderOrThrow(NoiseRouterData.EROSION_OVERWORLD));
-      DensityFunctions.Spline.C_eljbykfw lv5 = new DensityFunctions.Spline.C_eljbykfw(lv2.getHolderOrThrow(NoiseRouterData.RIDGES_FOLDED_OVERWORLD));
-      consumer.accept(
+      DensityFunctions.Spline.FunctionWrapper lv3 = new DensityFunctions.Spline.FunctionWrapper(lv2.getHolderOrThrow(NoiseRouterData.CONTINENTS_OVERWORLD));
+      DensityFunctions.Spline.FunctionWrapper lv4 = new DensityFunctions.Spline.FunctionWrapper(lv2.getHolderOrThrow(NoiseRouterData.EROSION_OVERWORLD));
+      DensityFunctions.Spline.FunctionWrapper lv5 = new DensityFunctions.Spline.FunctionWrapper(lv2.getHolderOrThrow(NoiseRouterData.RIDGES_FOLDED_OVERWORLD));
+      biomeEntryConsumer.accept(
          Pair.of(
             MultiNoiseUtil.createNoiseHypercube(
                this.fullRange, this.fullRange, this.fullRange, this.fullRange, MultiNoiseUtil.ParameterRange.of(0.0F), this.fullRange, 0.01F
@@ -310,7 +311,7 @@
          RegistryKey<Biome> lv8 = Biomes.DESERT;
 
          for (float f : lv7.locations()) {
-            consumer.accept(
+            biomeEntryConsumer.accept(
                Pair.of(
                   MultiNoiseUtil.createNoiseHypercube(
                      this.fullRange,
@@ -331,7 +332,7 @@
       Spline<?, ?> lv9 = VanillaTerrainParametersCreator.m_xfxhjplz(lv3, lv4, lv5, false);
       if (lv9 instanceof Spline.Multipoint lv10) {
          for (float g : lv10.locations()) {
-            consumer.accept(
+            biomeEntryConsumer.accept(
                Pair.of(
                   MultiNoiseUtil.createNoiseHypercube(
                      this.fullRange,
@@ -1207,16 +1208,21 @@
     * @mapping {@literal named m_crjshpgc Lnet/minecraft/world/biome/source/util/OverworldBiomeParameters;m_crjshpgc(Ljava/util/function/Consumer;Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRange;Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRange;Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRange;Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRange;Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRange;FLnet/minecraft/registry/RegistryKey;)V}
     */
    private void m_crjshpgc(
-      Consumer<Pair<MultiNoiseUtil.NoiseHypercube, RegistryKey<Biome>>> consumer,
-      MultiNoiseUtil.ParameterRange arg,
-      MultiNoiseUtil.ParameterRange arg2,
-      MultiNoiseUtil.ParameterRange arg3,
-      MultiNoiseUtil.ParameterRange arg4,
-      MultiNoiseUtil.ParameterRange arg5,
-      float f,
+      Consumer<Pair<MultiNoiseUtil.NoiseHypercube, RegistryKey<Biome>>> parameters,
+      MultiNoiseUtil.ParameterRange temperature,
+      MultiNoiseUtil.ParameterRange humidity,
+      MultiNoiseUtil.ParameterRange continentialness,
+      MultiNoiseUtil.ParameterRange erosion,
+      MultiNoiseUtil.ParameterRange depth,
+      float weirdness,
       RegistryKey<Biome> registryKey
    ) {
-      consumer.accept(Pair.of(MultiNoiseUtil.createNoiseHypercube(arg, arg2, arg3, arg4, MultiNoiseUtil.ParameterRange.of(1.1F), arg5, f), registryKey));
+      parameters.accept(
+         Pair.of(
+            MultiNoiseUtil.createNoiseHypercube(temperature, humidity, continentialness, erosion, MultiNoiseUtil.ParameterRange.of(1.1F), depth, weirdness),
+            registryKey
+         )
+      );
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/biome/SpawnSettings.java namedSrc/net/minecraft/world/biome/SpawnSettings.java
--- namedTargetSrc/net/minecraft/world/biome/SpawnSettings.java	2023-06-26 16:11:54.215092663 +0000
+++ namedSrc/net/minecraft/world/biome/SpawnSettings.java	2023-06-26 16:10:23.717591765 +0000
@@ -233,7 +233,7 @@
        * @mapping {@literal hashed f_byovjgve Lnet/minecraft/unmapped/C_ypgfhxmz$C_jmaqgdih;f_byovjgve:Lcom/mojang/serialization/Codec;}
        * @mapping {@literal named CODEC Lnet/minecraft/world/biome/SpawnSettings$SpawnEntry;CODEC:Lcom/mojang/serialization/Codec;}
        */
-      public static final Codec<SpawnSettings.SpawnEntry> CODEC = Codecs.m_lytzwisw(
+      public static final Codec<SpawnSettings.SpawnEntry> CODEC = Codecs.validate(
          RecordCodecBuilder.create(
             instance -> instance.group(
                      Registries.ENTITY_TYPE.getCodec().fieldOf("type").forGetter(arg -> arg.type),
diff -bur namedTargetSrc/net/minecraft/world/chunk/ChunkStatus.java namedSrc/net/minecraft/world/chunk/ChunkStatus.java
--- namedTargetSrc/net/minecraft/world/chunk/ChunkStatus.java	2023-06-26 16:11:54.167091853 +0000
+++ namedSrc/net/minecraft/world/chunk/ChunkStatus.java	2023-06-26 16:10:23.661590840 +0000
@@ -80,7 +80,7 @@
       PRE_CARVER_HEIGHTMAPS,
       ChunkStatus.ChunkType.PROTOCHUNK,
       (targetStatus, executor, world, chunkGenerator, arg4, lightingProvider, function, chunks, chunk) -> {
-         if (world.getServer().getSaveProperties().m_ycrrmmel().hasFeatureGeneration()) {
+         if (world.getServer().getSaveProperties().getGeneratorOptions().hasFeatureGeneration()) {
             chunkGenerator.setStructureStarts(world.getRegistryManager(), world.getChunkManager().m_arxeyeod(), world.getStructureManager(), chunk, arg4);
          }
    
Only in namedSrc/net/minecraft/world/dimension: WorldDimensions.java
diff -bur namedTargetSrc/net/minecraft/world/FeatureUpdater.java namedSrc/net/minecraft/world/FeatureUpdater.java
--- namedTargetSrc/net/minecraft/world/FeatureUpdater.java	2023-06-26 16:11:54.239093068 +0000
+++ namedSrc/net/minecraft/world/FeatureUpdater.java	2023-06-26 16:10:23.741592161 +0000
@@ -105,10 +105,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qpbbnpoq;<init>(Lnet/minecraft/unmapped/C_hsdphpvz;Ljava/util/List;Ljava/util/List;)V}
     * @mapping {@literal named <init> Lnet/minecraft/world/FeatureUpdater;<init>(Lnet/minecraft/world/PersistentStateManager;Ljava/util/List;Ljava/util/List;)V}
     */
-   public FeatureUpdater(@Nullable PersistentStateManager arg, List<String> legacyKeys, List<String> currentKeys) {
+   public FeatureUpdater(@Nullable PersistentStateManager persistentStateManager, List<String> legacyKeys, List<String> currentKeys) {
       this.legacyKeys = legacyKeys;
       this.currentKeys = currentKeys;
-      this.init(arg);
+      this.init(persistentStateManager);
       boolean bl = false;
 
       for (String string : this.currentKeys) {
@@ -122,11 +122,11 @@
     * @mapping {@literal hashed m_gjhutapw Lnet/minecraft/unmapped/C_qpbbnpoq;m_gjhutapw(J)V}
     * @mapping {@literal named markResolved Lnet/minecraft/world/FeatureUpdater;markResolved(J)V}
     */
-   public void markResolved(long l) {
+   public void markResolved(long pos) {
       for (String string : this.legacyKeys) {
          ChunkUpdateState lv = (ChunkUpdateState)this.updateStates.get(string);
-         if (lv != null && lv.isRemaining(l)) {
-            lv.markResolved(l);
+         if (lv != null && lv.isRemaining(pos)) {
+            lv.markResolved(pos);
             lv.markDirty();
          }
       }
@@ -234,13 +234,13 @@
     * @mapping {@literal hashed m_xxmtoexq Lnet/minecraft/unmapped/C_qpbbnpoq;m_xxmtoexq(Lnet/minecraft/unmapped/C_hsdphpvz;)V}
     * @mapping {@literal named init Lnet/minecraft/world/FeatureUpdater;init(Lnet/minecraft/world/PersistentStateManager;)V}
     */
-   private void init(@Nullable PersistentStateManager arg) {
-      if (arg != null) {
+   private void init(@Nullable PersistentStateManager persistentStateManager) {
+      if (persistentStateManager != null) {
          for (String string : this.legacyKeys) {
             NbtCompound lv = new NbtCompound();
 
             try {
-               lv = arg.readNbt(string, 1493).getCompound("data").getCompound("Features");
+               lv = persistentStateManager.readNbt(string, 1493).getCompound("data").getCompound("Features");
                if (lv.isEmpty()) {
                   continue;
                }
@@ -260,11 +260,11 @@
                }
 
                String string5 = lv2.getString("id");
-               ((Long2ObjectMap)this.featureIdToChunkNbt.computeIfAbsent(string5, stringx -> new Long2ObjectOpenHashMap())).put(l, lv2);
+               ((Long2ObjectMap)this.featureIdToChunkNbt.computeIfAbsent(string5, id -> new Long2ObjectOpenHashMap())).put(l, lv2);
             }
 
             String string6 = string + "_index";
-            ChunkUpdateState lv4 = arg.getOrCreate(ChunkUpdateState::fromNbt, ChunkUpdateState::new, string6);
+            ChunkUpdateState lv4 = persistentStateManager.getOrCreate(ChunkUpdateState::fromNbt, ChunkUpdateState::new, string6);
             if (!lv4.getAll().isEmpty()) {
                this.updateStates.put(string, lv4);
             } else {
@@ -286,19 +286,19 @@
     * @mapping {@literal hashed m_ydpszauk Lnet/minecraft/unmapped/C_qpbbnpoq;m_ydpszauk(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_hsdphpvz;)Lnet/minecraft/unmapped/C_qpbbnpoq;}
     * @mapping {@literal named create Lnet/minecraft/world/FeatureUpdater;create(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/world/PersistentStateManager;)Lnet/minecraft/world/FeatureUpdater;}
     */
-   public static FeatureUpdater create(RegistryKey<World> world, @Nullable PersistentStateManager arg2) {
+   public static FeatureUpdater create(RegistryKey<World> world, @Nullable PersistentStateManager persistentStateManager) {
       if (world == World.OVERWORLD) {
          return new FeatureUpdater(
-            arg2,
+            persistentStateManager,
             ImmutableList.of("Monument", "Stronghold", "Village", "Mineshaft", "Temple", "Mansion"),
             ImmutableList.of("Village", "Mineshaft", "Mansion", "Igloo", "Desert_Pyramid", "Jungle_Pyramid", "Swamp_Hut", "Stronghold", "Monument")
          );
       } else if (world == World.NETHER) {
          List<String> list = ImmutableList.of("Fortress");
-         return new FeatureUpdater(arg2, list, list);
+         return new FeatureUpdater(persistentStateManager, list, list);
       } else if (world == World.END) {
          List<String> list2 = ImmutableList.of("EndCity");
-         return new FeatureUpdater(arg2, list2, list2);
+         return new FeatureUpdater(persistentStateManager, list2, list2);
       } else {
          throw new RuntimeException(String.format(Locale.ROOT, "Unknown dimension type : %s", world));
       }
diff -bur namedTargetSrc/net/minecraft/world/gen/DensityFunction.java namedSrc/net/minecraft/world/gen/DensityFunction.java
--- namedTargetSrc/net/minecraft/world/gen/DensityFunction.java	2023-06-26 16:11:54.191092258 +0000
+++ namedSrc/net/minecraft/world/gen/DensityFunction.java	2023-06-26 16:10:23.689591302 +0000
@@ -29,7 +29,8 @@
     * @mapping {@literal named HOLDER_HELPER_CODEC Lnet/minecraft/world/gen/DensityFunction;HOLDER_HELPER_CODEC:Lcom/mojang/serialization/Codec;}
     */
    Codec<DensityFunction> HOLDER_HELPER_CODEC = CODEC.xmap(
-      DensityFunctions.HolderHolder::new, arg -> (Holder)(arg instanceof DensityFunctions.HolderHolder lv ? lv.holder() : new Holder.Direct<>(arg))
+      DensityFunctions.HolderHolder::new,
+      holderHolder -> (Holder)(holderHolder instanceof DensityFunctions.HolderHolder lv ? lv.holder() : new Holder.Direct<>(holderHolder))
    );
 
    /**
@@ -125,40 +126,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_kzwapyud$C_jnszknql}
-    * @mapping {@literal named net/minecraft/world/gen/DensityFunction$C_jnszknql}
-    */
-   public static record C_jnszknql(Holder<DoublePerlinNoiseSampler.NoiseParameters> noiseData, @Nullable DoublePerlinNoiseSampler noise) {
-      /**
-       * @mapping {@literal hashed f_ldkomniq Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;f_ldkomniq:Lcom/mojang/serialization/Codec;}
-       * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunction$C_jnszknql;CODEC:Lcom/mojang/serialization/Codec;}
-       */
-      public static final Codec<DensityFunction.C_jnszknql> CODEC = DoublePerlinNoiseSampler.NoiseParameters.CODEC
-         .xmap(arg -> new DensityFunction.C_jnszknql(arg, null), DensityFunction.C_jnszknql::noiseData);
-
-      /**
-       * Mapping not found
-       */
-      public C_jnszknql(Holder<DoublePerlinNoiseSampler.NoiseParameters> arg) {
-         this(arg, null);
-      }
-
-      /**
-       * Mapping not found
-       */
-      public double m_cnnuqxta(double d, double e, double f) {
-         return this.noise == null ? 0.0 : this.noise.sample(d, e, f);
-      }
-
-      /**
-       * Mapping not found
-       */
-      public double m_ddevyukk() {
-         return this.noise == null ? 2.0 : this.noise.getMaxValue();
-      }
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_kzwapyud$C_rznisoqn}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunction$ContextProvider}
     */
@@ -209,6 +176,47 @@
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_kzwapyud$C_jnszknql}
+    * @mapping {@literal named net/minecraft/world/gen/DensityFunction$NoiseHolder}
+    */
+   public static record NoiseHolder(Holder<DoublePerlinNoiseSampler.NoiseParameters> noiseData, @Nullable DoublePerlinNoiseSampler noise) {
+      /**
+       * @mapping {@literal hashed f_ldkomniq Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;f_ldkomniq:Lcom/mojang/serialization/Codec;}
+       * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;CODEC:Lcom/mojang/serialization/Codec;}
+       */
+      public static final Codec<DensityFunction.NoiseHolder> CODEC = DoublePerlinNoiseSampler.NoiseParameters.CODEC
+         .xmap(parameters -> new DensityFunction.NoiseHolder(parameters, null), DensityFunction.NoiseHolder::noiseData);
+
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;<init>(Lnet/minecraft/registry/Holder;)V}
+       */
+      public NoiseHolder(Holder<DoublePerlinNoiseSampler.NoiseParameters> parameters) {
+         this(parameters, null);
+      }
+
+      /**
+       * Samples the noise, or returns {@code 0.0} if {@code noise} is null.
+       * 
+       * @mapping {@literal hashed m_cnnuqxta Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;m_cnnuqxta(DDD)D}
+       * @mapping {@literal named sample Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;sample(DDD)D}
+       */
+      public double sample(double x, double y, double z) {
+         return this.noise == null ? 0.0 : this.noise.sample(x, y, z);
+      }
+
+      /**
+       * Returns the noise's max value, or returns {@code 0.0} if {@code noise} is null.
+       * 
+       * @mapping {@literal hashed m_ddevyukk Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;m_ddevyukk()D}
+       * @mapping {@literal named getMaxValue Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;getMaxValue()D}
+       */
+      public double getMaxValue() {
+         return this.noise == null ? 2.0 : this.noise.getMaxValue();
+      }
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_kzwapyud$C_fntlxgzz}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunction$SimpleFunction}
     */
@@ -243,15 +251,17 @@
     */
    public interface Visitor {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed apply Lnet/minecraft/unmapped/C_kzwapyud$C_zdlfgpyk;apply(Lnet/minecraft/unmapped/C_kzwapyud;)Lnet/minecraft/unmapped/C_kzwapyud;}
+       * @mapping {@literal named apply Lnet/minecraft/world/gen/DensityFunction$Visitor;apply(Lnet/minecraft/world/gen/DensityFunction;)Lnet/minecraft/world/gen/DensityFunction;}
        */
-      DensityFunction apply(DensityFunction arg);
+      DensityFunction apply(DensityFunction function);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ivzzknqa Lnet/minecraft/unmapped/C_kzwapyud$C_zdlfgpyk;m_ivzzknqa(Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;)Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;}
+       * @mapping {@literal named visitNoise Lnet/minecraft/world/gen/DensityFunction$Visitor;visitNoise(Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;)Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;}
        */
-      default DensityFunction.C_jnszknql m_ivzzknqa(DensityFunction.C_jnszknql arg) {
-         return arg;
+      default DensityFunction.NoiseHolder visitNoise(DensityFunction.NoiseHolder noise) {
+         return noise;
       }
    }
 }

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/world/gen/DensityFunctions.java namedSrc/net/minecraft/world/gen/DensityFunctions.java
--- namedTargetSrc/net/minecraft/world/gen/DensityFunctions.java	2023-06-26 16:11:54.239093068 +0000
+++ namedSrc/net/minecraft/world/gen/DensityFunctions.java	2023-06-26 16:10:23.745592227 +0000
@@ -37,7 +37,9 @@
     * @mapping {@literal hashed f_ofybcvpy Lnet/minecraft/unmapped/C_mdkmcezi;f_ofybcvpy:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunctions;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<DensityFunction> CODEC = Registries.DENSITY_FUNCTION.getCodec().dispatch(arg -> arg.codec().codec(), Function.identity());
+   private static final Codec<DensityFunction> CODEC = Registries.DENSITY_FUNCTION
+      .getCodec()
+      .dispatch(codecHolder -> codecHolder.codec().codec(), Function.identity());
    /**
     * @mapping {@literal hashed f_ikpluaeq Lnet/minecraft/unmapped/C_mdkmcezi;f_ikpluaeq:D}
     * @mapping {@literal named MAX_REASONABLE_NOISE_VALUE Lnet/minecraft/world/gen/DensityFunctions;MAX_REASONABLE_NOISE_VALUE:D}
@@ -55,7 +57,7 @@
    public static final Codec<DensityFunction> DIRECT_CODEC = Codec.either(NOISE_VALUE_CODEC, CODEC)
       .xmap(
          either -> either.map(DensityFunctions::constant, Function.identity()),
-         arg -> arg instanceof DensityFunctions.Constant lv ? Either.left(lv.value()) : Either.right(arg)
+         function -> function instanceof DensityFunctions.Constant lv ? Either.left(lv.value()) : Either.right(function)
       );
 
    /**
@@ -101,9 +103,9 @@
     * @mapping {@literal named register Lnet/minecraft/world/gen/DensityFunctions;register(Lnet/minecraft/registry/Registry;Ljava/lang/String;Lnet/minecraft/util/dynamic/CodecHolder;)Lcom/mojang/serialization/Codec;}
     */
    private static Codec<? extends DensityFunction> register(
-      Registry<Codec<? extends DensityFunction>> registry, String id, CodecHolder<? extends DensityFunction> arg2
+      Registry<Codec<? extends DensityFunction>> registry, String id, CodecHolder<? extends DensityFunction> functionCodec
    ) {
-      return Registry.register(registry, id, arg2.codec());
+      return Registry.register(registry, id, functionCodec.codec());
    }
 
    /**
@@ -198,32 +200,36 @@
     * @mapping {@literal hashed m_qwccqgbn Lnet/minecraft/unmapped/C_mdkmcezi;m_qwccqgbn(Lnet/minecraft/unmapped/C_cjzoxshv;DDDD)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named mappedNoise Lnet/minecraft/world/gen/DensityFunctions;mappedNoise(Lnet/minecraft/registry/Holder;DDDD)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction mappedNoise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, @Deprecated double d, double e, double f, double g) {
-      return mapFromUnitToValue(new DensityFunctions.Noise(new DensityFunction.C_jnszknql(noise), d, e), f, g);
+   public static DensityFunction mappedNoise(
+      Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, @Deprecated double horizontalScale, double verticalScale, double min, double max
+   ) {
+      return mapFromUnitToValue(new DensityFunctions.Noise(new DensityFunction.NoiseHolder(noise), horizontalScale, verticalScale), min, max);
    }
 
    /**
     * @mapping {@literal hashed m_lwuiythu Lnet/minecraft/unmapped/C_mdkmcezi;m_lwuiythu(Lnet/minecraft/unmapped/C_cjzoxshv;DDD)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named mappedNoise Lnet/minecraft/world/gen/DensityFunctions;mappedNoise(Lnet/minecraft/registry/Holder;DDD)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction mappedNoise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, double d, double e, double f) {
-      return mappedNoise(noise, 1.0, d, e, f);
+   public static DensityFunction mappedNoise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, double verticalScale, double min, double max) {
+      return mappedNoise(noise, 1.0, verticalScale, min, max);
    }
 
    /**
     * @mapping {@literal hashed m_icmhodbz Lnet/minecraft/unmapped/C_mdkmcezi;m_icmhodbz(Lnet/minecraft/unmapped/C_cjzoxshv;DD)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named mappedNoise Lnet/minecraft/world/gen/DensityFunctions;mappedNoise(Lnet/minecraft/registry/Holder;DD)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction mappedNoise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, double d, double e) {
-      return mappedNoise(noise, 1.0, 1.0, d, e);
+   public static DensityFunction mappedNoise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, double min, double max) {
+      return mappedNoise(noise, 1.0, 1.0, min, max);
    }
 
    /**
     * @mapping {@literal hashed m_diiubzxc Lnet/minecraft/unmapped/C_mdkmcezi;m_diiubzxc(Lnet/minecraft/unmapped/C_kzwapyud;Lnet/minecraft/unmapped/C_kzwapyud;DLnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named shiftedNoise2d Lnet/minecraft/world/gen/DensityFunctions;shiftedNoise2d(Lnet/minecraft/world/gen/DensityFunction;Lnet/minecraft/world/gen/DensityFunction;DLnet/minecraft/registry/Holder;)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction shiftedNoise2d(DensityFunction arg, DensityFunction arg2, double d, Holder<DoublePerlinNoiseSampler.NoiseParameters> arg3) {
-      return new DensityFunctions.ShiftedNoise(arg, zero(), arg2, d, 0.0, new DensityFunction.C_jnszknql(arg3));
+   public static DensityFunction shiftedNoise2d(
+      DensityFunction shiftX, DensityFunction shiftZ, double scale, Holder<DoublePerlinNoiseSampler.NoiseParameters> noise
+   ) {
+      return new DensityFunctions.ShiftedNoise(shiftX, zero(), shiftZ, scale, 0.0, new DensityFunction.NoiseHolder(noise));
    }
 
    /**
@@ -238,8 +244,8 @@
     * @mapping {@literal hashed m_okrngdwc Lnet/minecraft/unmapped/C_mdkmcezi;m_okrngdwc(Lnet/minecraft/unmapped/C_cjzoxshv;DD)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named noise Lnet/minecraft/world/gen/DensityFunctions;noise(Lnet/minecraft/registry/Holder;DD)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction noise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, double d, double e) {
-      return new DensityFunctions.Noise(new DensityFunction.C_jnszknql(noise), d, e);
+   public static DensityFunction noise(Holder<DoublePerlinNoiseSampler.NoiseParameters> noise, double horizontalScale, double verticalScale) {
+      return new DensityFunctions.Noise(new DensityFunction.NoiseHolder(noise), horizontalScale, verticalScale);
    }
 
    /**
@@ -264,24 +270,24 @@
     * @mapping {@literal hashed m_khwsifkt Lnet/minecraft/unmapped/C_mdkmcezi;m_khwsifkt(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named shiftX Lnet/minecraft/world/gen/DensityFunctions;shiftX(Lnet/minecraft/registry/Holder;)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction shiftX(Holder<DoublePerlinNoiseSampler.NoiseParameters> arg) {
-      return new DensityFunctions.ShiftX(new DensityFunction.C_jnszknql(arg));
+   public static DensityFunction shiftX(Holder<DoublePerlinNoiseSampler.NoiseParameters> noiseParameters) {
+      return new DensityFunctions.ShiftX(new DensityFunction.NoiseHolder(noiseParameters));
    }
 
    /**
     * @mapping {@literal hashed m_fezycrnr Lnet/minecraft/unmapped/C_mdkmcezi;m_fezycrnr(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named shiftZ Lnet/minecraft/world/gen/DensityFunctions;shiftZ(Lnet/minecraft/registry/Holder;)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction shiftZ(Holder<DoublePerlinNoiseSampler.NoiseParameters> arg) {
-      return new DensityFunctions.ShiftZ(new DensityFunction.C_jnszknql(arg));
+   public static DensityFunction shiftZ(Holder<DoublePerlinNoiseSampler.NoiseParameters> noiseParameters) {
+      return new DensityFunctions.ShiftZ(new DensityFunction.NoiseHolder(noiseParameters));
    }
 
    /**
     * @mapping {@literal hashed m_bnrcnkgf Lnet/minecraft/unmapped/C_mdkmcezi;m_bnrcnkgf(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named shift Lnet/minecraft/world/gen/DensityFunctions;shift(Lnet/minecraft/registry/Holder;)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction shift(Holder<DoublePerlinNoiseSampler.NoiseParameters> arg) {
-      return new DensityFunctions.Shift(new DensityFunction.C_jnszknql(arg));
+   public static DensityFunction shift(Holder<DoublePerlinNoiseSampler.NoiseParameters> noiseParameters) {
+      return new DensityFunctions.Shift(new DensityFunction.NoiseHolder(noiseParameters));
    }
 
    /**
@@ -305,9 +311,9 @@
     * @mapping {@literal named weirdScaledSampler Lnet/minecraft/world/gen/DensityFunctions;weirdScaledSampler(Lnet/minecraft/world/gen/DensityFunction;Lnet/minecraft/registry/Holder;Lnet/minecraft/world/gen/DensityFunctions$WeirdScaledSampler$Type;)Lnet/minecraft/world/gen/DensityFunction;}
     */
    public static DensityFunction weirdScaledSampler(
-      DensityFunction arg, Holder<DoublePerlinNoiseSampler.NoiseParameters> arg2, DensityFunctions.WeirdScaledSampler.Type arg3
+      DensityFunction function, Holder<DoublePerlinNoiseSampler.NoiseParameters> noiseParameters, DensityFunctions.WeirdScaledSampler.Type samplerType
    ) {
-      return new DensityFunctions.WeirdScaledSampler(arg, new DensityFunction.C_jnszknql(arg2), arg3);
+      return new DensityFunctions.WeirdScaledSampler(function, new DensityFunction.NoiseHolder(noiseParameters), samplerType);
    }
 
    /**
@@ -343,10 +349,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qomtwyfo Lnet/minecraft/unmapped/C_mdkmcezi;m_qomtwyfo(Lnet/minecraft/unmapped/C_cjntsjzo;)Lnet/minecraft/unmapped/C_kzwapyud;}
+    * @mapping {@literal named copySpline Lnet/minecraft/world/gen/DensityFunctions;copySpline(Lnet/minecraft/util/math/Spline;)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   public static DensityFunction m_qomtwyfo(net.minecraft.util.math.Spline<DensityFunctions.Spline.C_igtkgmnu, DensityFunctions.Spline.C_eljbykfw> arg) {
-      return new DensityFunctions.Spline(arg);
+   public static DensityFunction copySpline(net.minecraft.util.math.Spline<DensityFunctions.Spline.Point, DensityFunctions.Spline.FunctionWrapper> spline) {
+      return new DensityFunctions.Spline(spline);
    }
 
    /**
@@ -385,9 +392,9 @@
     * @mapping {@literal hashed m_sswjlstj Lnet/minecraft/unmapped/C_mdkmcezi;m_sswjlstj(Lnet/minecraft/unmapped/C_kzwapyud;DD)Lnet/minecraft/unmapped/C_kzwapyud;}
     * @mapping {@literal named mapFromUnitToValue Lnet/minecraft/world/gen/DensityFunctions;mapFromUnitToValue(Lnet/minecraft/world/gen/DensityFunction;DD)Lnet/minecraft/world/gen/DensityFunction;}
     */
-   private static DensityFunction mapFromUnitToValue(DensityFunction value, double d, double e) {
-      double f = (d + e) * 0.5;
-      double g = (e - d) * 0.5;
+   private static DensityFunction mapFromUnitToValue(DensityFunction value, double min, double max) {
+      double f = (min + max) * 0.5;
+      double g = (max - min) * 0.5;
       return add(constant(f), multiply(constant(g), value));
    }
 
@@ -502,8 +509,8 @@
        * Mapping not found
        */
       @Override
-      public double transform(DensityFunction.FunctionContext functionContext, double d) {
-         return functionContext.getBlender().blendDensity(functionContext, d);
+      public double transform(DensityFunction.FunctionContext functionContext, double density) {
+         return functionContext.getBlender().blendDensity(functionContext, density);
       }
 
       /**
@@ -844,9 +851,10 @@
          MapCodec.unit(new DensityFunctions.EndIslandDensityFunction(0L))
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_eggmxdqk Lnet/minecraft/unmapped/C_mdkmcezi$C_lhdfeucz;f_eggmxdqk:F}
+       * @mapping {@literal named ISLAND_THRESHOLD Lnet/minecraft/world/gen/DensityFunctions$EndIslandDensityFunction;ISLAND_THRESHOLD:F}
        */
-      private static final float f_eggmxdqk = -0.9F;
+      private static final float ISLAND_THRESHOLD = -0.9F;
       /**
        * @mapping {@literal hashed f_fmwzwyui Lnet/minecraft/unmapped/C_mdkmcezi$C_lhdfeucz;f_fmwzwyui:Lnet/minecraft/unmapped/C_mnmvtskp;}
        * @mapping {@literal named islandNoise Lnet/minecraft/world/gen/DensityFunctions$EndIslandDensityFunction;islandNoise:Lnet/minecraft/util/math/noise/SimplexNoiseSampler;}
@@ -864,21 +872,22 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_nlhbeile Lnet/minecraft/unmapped/C_mdkmcezi$C_lhdfeucz;m_nlhbeile(Lnet/minecraft/unmapped/C_mnmvtskp;II)F}
+       * @mapping {@literal named sample Lnet/minecraft/world/gen/DensityFunctions$EndIslandDensityFunction;sample(Lnet/minecraft/util/math/noise/SimplexNoiseSampler;II)F}
        */
-      private static float m_nlhbeile(SimplexNoiseSampler arg, int i, int j) {
-         int k = i / 2;
-         int l = j / 2;
-         int m = i % 2;
-         int n = j % 2;
-         float f = 100.0F - MathHelper.sqrt((float)(i * i + j * j)) * 8.0F;
+      private static float sample(SimplexNoiseSampler sampler, int x, int z) {
+         int k = x / 2;
+         int l = z / 2;
+         int m = x % 2;
+         int n = z % 2;
+         float f = 100.0F - MathHelper.sqrt((float)(x * x + z * z)) * 8.0F;
          f = MathHelper.clamp(f, -100.0F, 80.0F);
 
          for (int o = -12; o <= 12; ++o) {
             for (int p = -12; p <= 12; ++p) {
                long q = (long)(k + o);
                long r = (long)(l + p);
-               if (q * q + r * r > 4096L && arg.sample((double)q, (double)r) < -0.9F) {
+               if (q * q + r * r > 4096L && sampler.sample((double)q, (double)r) < -0.9F) {
                   float g = (MathHelper.abs((float)q) * 3439.0F + MathHelper.abs((float)r) * 147.0F) % 13.0F + 9.0F;
                   float h = (float)(m - o * 2);
                   float s = (float)(n - p * 2);
@@ -897,7 +906,7 @@
        */
       @Override
       public double compute(DensityFunction.FunctionContext context) {
-         return ((double)m_nlhbeile(this.islandNoise, context.blockX() / 8, context.blockZ() / 8) - 8.0) / 128.0;
+         return ((double)sample(this.islandNoise, context.blockX() / 8, context.blockZ() / 8) - 8.0) / 128.0;
       }
 
       /**
@@ -1003,15 +1012,15 @@
        * @mapping {@literal hashed m_ziaqmozi Lnet/minecraft/unmapped/C_mdkmcezi$C_ucbebgzr;m_ziaqmozi(Lnet/minecraft/unmapped/C_mdkmcezi$C_ucbebgzr$C_vgrinicv;D)D}
        * @mapping {@literal named transform Lnet/minecraft/world/gen/DensityFunctions$Mapped;transform(Lnet/minecraft/world/gen/DensityFunctions$Mapped$Type;D)D}
        */
-      private static double transform(DensityFunctions.Mapped.Type type, double d) {
+      private static double transform(DensityFunctions.Mapped.Type type, double density) {
          return switch (type) {
-            case ABS -> Math.abs(d);
-            case SQUARE -> d * d;
-            case CUBE -> d * d * d;
-            case HALF_NEGATIVE -> d > 0.0 ? d : d * 0.5;
-            case QUARTER_NEGATIVE -> d > 0.0 ? d : d * 0.25;
+            case ABS -> Math.abs(density);
+            case SQUARE -> density * density;
+            case CUBE -> density * density * density;
+            case HALF_NEGATIVE -> density > 0.0 ? density : density * 0.5;
+            case QUARTER_NEGATIVE -> density > 0.0 ? density : density * 0.25;
             case SQUEEZE -> {
-               double e = MathHelper.clamp(d, -1.0, 1.0);
+               double e = MathHelper.clamp(density, -1.0, 1.0);
                yield e / 2.0 - e * e * e / 24.0;
             }
          };
@@ -1087,7 +1096,7 @@
           * @mapping {@literal named codec Lnet/minecraft/world/gen/DensityFunctions$Mapped$Type;codec:Lnet/minecraft/util/dynamic/CodecHolder;}
           */
          final CodecHolder<DensityFunctions.Mapped> codec = DensityFunctions.singleFunctionArgumentCodec(
-            arg -> DensityFunctions.Mapped.create(this, arg), DensityFunctions.Mapped::input
+            function -> DensityFunctions.Mapped.create(this, function), DensityFunctions.Mapped::input
          );
 
          /**
@@ -1194,7 +1203,7 @@
           * @mapping {@literal named codec Lnet/minecraft/world/gen/DensityFunctions$Marker$Type;codec:Lnet/minecraft/util/dynamic/CodecHolder;}
           */
          final CodecHolder<DensityFunctions.MarkerOrMarked> codec = DensityFunctions.singleFunctionArgumentCodec(
-            arg -> new DensityFunctions.Marker(this, arg), DensityFunctions.MarkerOrMarked::wrapped
+            function -> new DensityFunctions.Marker(this, function), DensityFunctions.MarkerOrMarked::wrapped
          );
 
          /**
@@ -1339,14 +1348,14 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_onodflli}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Noise}
     */
-   protected static record Noise(DensityFunction.C_jnszknql noise, @Deprecated double horizontalScale, double verticalScale) implements DensityFunction {
+   protected static record Noise(DensityFunction.NoiseHolder noise, @Deprecated double horizontalScale, double verticalScale) implements DensityFunction {
       /**
        * @mapping {@literal hashed f_jwvphzby Lnet/minecraft/unmapped/C_mdkmcezi$C_onodflli;f_jwvphzby:Lcom/mojang/serialization/MapCodec;}
        * @mapping {@literal named DATA_CODEC Lnet/minecraft/world/gen/DensityFunctions$Noise;DATA_CODEC:Lcom/mojang/serialization/MapCodec;}
        */
       public static final MapCodec<DensityFunctions.Noise> DATA_CODEC = RecordCodecBuilder.mapCodec(
          instance -> instance.group(
-                  DensityFunction.C_jnszknql.CODEC.fieldOf("noise").forGetter(DensityFunctions.Noise::noise),
+                  DensityFunction.NoiseHolder.CODEC.fieldOf("noise").forGetter(DensityFunctions.Noise::noise),
                   Codec.DOUBLE.fieldOf("xz_scale").forGetter(DensityFunctions.Noise::horizontalScale),
                   Codec.DOUBLE.fieldOf("y_scale").forGetter(DensityFunctions.Noise::verticalScale)
                )
@@ -1364,7 +1373,7 @@
       @Override
       public double compute(DensityFunction.FunctionContext context) {
          return this.noise
-            .m_cnnuqxta(
+            .sample(
                (double)context.blockX() * this.horizontalScale, (double)context.blockY() * this.verticalScale, (double)context.blockZ() * this.horizontalScale
             );
       }
@@ -1382,7 +1391,7 @@
        */
       @Override
       public DensityFunction mapAll(DensityFunction.Visitor visitor) {
-         return visitor.apply(new DensityFunctions.Noise(visitor.m_ivzzknqa(this.noise), this.horizontalScale, this.verticalScale));
+         return visitor.apply(new DensityFunctions.Noise(visitor.visitNoise(this.noise), this.horizontalScale, this.verticalScale));
       }
 
       /**
@@ -1398,7 +1407,7 @@
        */
       @Override
       public double maxValue() {
-         return this.noise.m_ddevyukk();
+         return this.noise.getMaxValue();
       }
 
       /**
@@ -1541,13 +1550,13 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_jqsjvrgl}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Shift}
     */
-   protected static record Shift(DensityFunction.C_jnszknql offsetNoise) implements DensityFunctions.ShiftNoise {
+   protected static record Shift(DensityFunction.NoiseHolder offsetNoise) implements DensityFunctions.ShiftNoise {
       /**
        * @mapping {@literal hashed f_pupingrd Lnet/minecraft/unmapped/C_mdkmcezi$C_jqsjvrgl;f_pupingrd:Lnet/minecraft/unmapped/C_ircwepir;}
        * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunctions$Shift;CODEC:Lnet/minecraft/util/dynamic/CodecHolder;}
        */
       static final CodecHolder<DensityFunctions.Shift> CODEC = DensityFunctions.singleArgumentCodec(
-         DensityFunction.C_jnszknql.CODEC, DensityFunctions.Shift::new, DensityFunctions.Shift::offsetNoise
+         DensityFunction.NoiseHolder.CODEC, DensityFunctions.Shift::new, DensityFunctions.Shift::offsetNoise
       );
 
       /**
@@ -1563,7 +1572,7 @@
        */
       @Override
       public DensityFunction mapAll(DensityFunction.Visitor visitor) {
-         return visitor.apply(new DensityFunctions.Shift(visitor.m_ivzzknqa(this.offsetNoise)));
+         return visitor.apply(new DensityFunctions.Shift(visitor.visitNoise(this.offsetNoise)));
       }
 
       /**
@@ -1582,9 +1591,9 @@
    interface ShiftNoise extends DensityFunction {
       /**
        * @mapping {@literal hashed m_rchzodfe Lnet/minecraft/unmapped/C_mdkmcezi$C_pzgsokuu;m_rchzodfe()Lnet/minecraft/unmapped/C_kzwapyud$C_jnszknql;}
-       * @mapping {@literal named offsetNoise Lnet/minecraft/world/gen/DensityFunctions$ShiftNoise;offsetNoise()Lnet/minecraft/world/gen/DensityFunction$C_jnszknql;}
+       * @mapping {@literal named offsetNoise Lnet/minecraft/world/gen/DensityFunctions$ShiftNoise;offsetNoise()Lnet/minecraft/world/gen/DensityFunction$NoiseHolder;}
        */
-      DensityFunction.C_jnszknql offsetNoise();
+      DensityFunction.NoiseHolder offsetNoise();
 
       /**
        * Mapping not found
@@ -1599,7 +1608,7 @@
        */
       @Override
       default double maxValue() {
-         return this.offsetNoise().m_ddevyukk() * 4.0;
+         return this.offsetNoise().getMaxValue() * 4.0;
       }
 
       /**
@@ -1607,7 +1616,7 @@
        * @mapping {@literal named compute Lnet/minecraft/world/gen/DensityFunctions$ShiftNoise;compute(DDD)D}
        */
       default double compute(double x, double y, double z) {
-         return this.offsetNoise().m_cnnuqxta(x * 0.25, y * 0.25, z * 0.25) * 4.0;
+         return this.offsetNoise().sample(x * 0.25, y * 0.25, z * 0.25) * 4.0;
       }
 
       /**
@@ -1623,13 +1632,13 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_tqzpquta}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$ShiftX}
     */
-   protected static record ShiftX(DensityFunction.C_jnszknql offsetNoise) implements DensityFunctions.ShiftNoise {
+   protected static record ShiftX(DensityFunction.NoiseHolder offsetNoise) implements DensityFunctions.ShiftNoise {
       /**
        * @mapping {@literal hashed f_kptqnpkm Lnet/minecraft/unmapped/C_mdkmcezi$C_tqzpquta;f_kptqnpkm:Lnet/minecraft/unmapped/C_ircwepir;}
        * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunctions$ShiftX;CODEC:Lnet/minecraft/util/dynamic/CodecHolder;}
        */
       static final CodecHolder<DensityFunctions.ShiftX> CODEC = DensityFunctions.singleArgumentCodec(
-         DensityFunction.C_jnszknql.CODEC, DensityFunctions.ShiftX::new, DensityFunctions.ShiftX::offsetNoise
+         DensityFunction.NoiseHolder.CODEC, DensityFunctions.ShiftX::new, DensityFunctions.ShiftX::offsetNoise
       );
 
       /**
@@ -1645,7 +1654,7 @@
        */
       @Override
       public DensityFunction mapAll(DensityFunction.Visitor visitor) {
-         return visitor.apply(new DensityFunctions.ShiftX(visitor.m_ivzzknqa(this.offsetNoise)));
+         return visitor.apply(new DensityFunctions.ShiftX(visitor.visitNoise(this.offsetNoise)));
       }
 
       /**
@@ -1661,13 +1670,13 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_ozjfswew}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$ShiftZ}
     */
-   protected static record ShiftZ(DensityFunction.C_jnszknql offsetNoise) implements DensityFunctions.ShiftNoise {
+   protected static record ShiftZ(DensityFunction.NoiseHolder offsetNoise) implements DensityFunctions.ShiftNoise {
       /**
        * @mapping {@literal hashed f_egmarlwv Lnet/minecraft/unmapped/C_mdkmcezi$C_ozjfswew;f_egmarlwv:Lnet/minecraft/unmapped/C_ircwepir;}
        * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunctions$ShiftZ;CODEC:Lnet/minecraft/util/dynamic/CodecHolder;}
        */
       static final CodecHolder<DensityFunctions.ShiftZ> CODEC = DensityFunctions.singleArgumentCodec(
-         DensityFunction.C_jnszknql.CODEC, DensityFunctions.ShiftZ::new, DensityFunctions.ShiftZ::offsetNoise
+         DensityFunction.NoiseHolder.CODEC, DensityFunctions.ShiftZ::new, DensityFunctions.ShiftZ::offsetNoise
       );
 
       /**
@@ -1683,7 +1692,7 @@
        */
       @Override
       public DensityFunction mapAll(DensityFunction.Visitor visitor) {
-         return visitor.apply(new DensityFunctions.ShiftZ(visitor.m_ivzzknqa(this.offsetNoise)));
+         return visitor.apply(new DensityFunctions.ShiftZ(visitor.visitNoise(this.offsetNoise)));
       }
 
       /**
@@ -1700,7 +1709,7 @@
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$ShiftedNoise}
     */
    protected static record ShiftedNoise(
-      DensityFunction shiftX, DensityFunction shiftY, DensityFunction shiftZ, double horizontalScale, double verticalScale, DensityFunction.C_jnszknql noise
+      DensityFunction shiftX, DensityFunction shiftY, DensityFunction shiftZ, double horizontalScale, double verticalScale, DensityFunction.NoiseHolder noise
    ) implements DensityFunction {
       /**
        * @mapping {@literal hashed f_xfkrjbqk Lnet/minecraft/unmapped/C_mdkmcezi$C_mnzzrhuq;f_xfkrjbqk:Lcom/mojang/serialization/MapCodec;}
@@ -1713,7 +1722,7 @@
                   DensityFunction.HOLDER_HELPER_CODEC.fieldOf("shift_z").forGetter(DensityFunctions.ShiftedNoise::shiftZ),
                   Codec.DOUBLE.fieldOf("xz_scale").forGetter(DensityFunctions.ShiftedNoise::horizontalScale),
                   Codec.DOUBLE.fieldOf("y_scale").forGetter(DensityFunctions.ShiftedNoise::verticalScale),
-                  DensityFunction.C_jnszknql.CODEC.fieldOf("noise").forGetter(DensityFunctions.ShiftedNoise::noise)
+                  DensityFunction.NoiseHolder.CODEC.fieldOf("noise").forGetter(DensityFunctions.ShiftedNoise::noise)
                )
                .apply(instance, DensityFunctions.ShiftedNoise::new)
       );
@@ -1731,7 +1740,7 @@
          double d = (double)context.blockX() * this.horizontalScale + this.shiftX.compute(context);
          double e = (double)context.blockY() * this.verticalScale + this.shiftY.compute(context);
          double f = (double)context.blockZ() * this.horizontalScale + this.shiftZ.compute(context);
-         return this.noise.m_cnnuqxta(d, e, f);
+         return this.noise.sample(d, e, f);
       }
 
       /**
@@ -1754,7 +1763,7 @@
                this.shiftZ.mapAll(visitor),
                this.horizontalScale,
                this.verticalScale,
-               visitor.m_ivzzknqa(this.noise)
+               visitor.visitNoise(this.noise)
             )
          );
       }
@@ -1772,7 +1781,7 @@
        */
       @Override
       public double maxValue() {
-         return this.noise.m_ddevyukk();
+         return this.noise.getMaxValue();
       }
 
       /**
@@ -1788,14 +1797,14 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_reffwscv}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Spline}
     */
-   public static record Spline(net.minecraft.util.math.Spline<DensityFunctions.Spline.C_igtkgmnu, DensityFunctions.Spline.C_eljbykfw> spline)
+   public static record Spline(net.minecraft.util.math.Spline<DensityFunctions.Spline.Point, DensityFunctions.Spline.FunctionWrapper> spline)
       implements DensityFunction {
       /**
        * @mapping {@literal hashed f_nibtqpmf Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv;f_nibtqpmf:Lcom/mojang/serialization/Codec;}
        * @mapping {@literal named SPLINE_CODEC Lnet/minecraft/world/gen/DensityFunctions$Spline;SPLINE_CODEC:Lcom/mojang/serialization/Codec;}
        */
-      private static final Codec<net.minecraft.util.math.Spline<DensityFunctions.Spline.C_igtkgmnu, DensityFunctions.Spline.C_eljbykfw>> SPLINE_CODEC = net.minecraft.util.math.Spline.codec(
-         DensityFunctions.Spline.C_eljbykfw.CODEC
+      private static final Codec<net.minecraft.util.math.Spline<DensityFunctions.Spline.Point, DensityFunctions.Spline.FunctionWrapper>> SPLINE_CODEC = net.minecraft.util.math.Spline.codec(
+         DensityFunctions.Spline.FunctionWrapper.CODEC
       );
       /**
        * @mapping {@literal hashed f_billgkqm Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv;f_billgkqm:Lcom/mojang/serialization/MapCodec;}
@@ -1814,7 +1823,7 @@
        */
       @Override
       public double compute(DensityFunction.FunctionContext context) {
-         return (double)this.spline.apply(new DensityFunctions.Spline.C_igtkgmnu(context));
+         return (double)this.spline.apply(new DensityFunctions.Spline.Point(context));
       }
 
       /**
@@ -1846,7 +1855,7 @@
        */
       @Override
       public DensityFunction mapAll(DensityFunction.Visitor visitor) {
-         return visitor.apply(new DensityFunctions.Spline(this.spline.mapAll(arg2 -> arg2.m_gegqglbk(visitor))));
+         return visitor.apply(new DensityFunctions.Spline(this.spline.mapAll(functionWrapper -> functionWrapper.mapAll(visitor))));
       }
 
       /**
@@ -1859,15 +1868,15 @@
 
       /**
        * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_eljbykfw}
-       * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Spline$C_eljbykfw}
+       * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Spline$FunctionWrapper}
        */
-      public static record C_eljbykfw(Holder<DensityFunction> function) implements ToFloatFunction<DensityFunctions.Spline.C_igtkgmnu> {
+      public static record FunctionWrapper(Holder<DensityFunction> function) implements ToFloatFunction<DensityFunctions.Spline.Point> {
          /**
           * @mapping {@literal hashed f_bufplwrf Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_eljbykfw;f_bufplwrf:Lcom/mojang/serialization/Codec;}
-          * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunctions$Spline$C_eljbykfw;CODEC:Lcom/mojang/serialization/Codec;}
+          * @mapping {@literal named CODEC Lnet/minecraft/world/gen/DensityFunctions$Spline$FunctionWrapper;CODEC:Lcom/mojang/serialization/Codec;}
           */
-         public static final Codec<DensityFunctions.Spline.C_eljbykfw> CODEC = DensityFunction.CODEC
-            .xmap(DensityFunctions.Spline.C_eljbykfw::new, DensityFunctions.Spline.C_eljbykfw::function);
+         public static final Codec<DensityFunctions.Spline.FunctionWrapper> CODEC = DensityFunction.CODEC
+            .xmap(DensityFunctions.Spline.FunctionWrapper::new, DensityFunctions.Spline.FunctionWrapper::function);
 
          /**
           * Mapping not found
@@ -1898,9 +1907,9 @@
 
          /**
           * @mapping {@literal hashed m_lnunvkos Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_eljbykfw;m_lnunvkos(Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_igtkgmnu;)F}
-          * @mapping {@literal named apply Lnet/minecraft/world/gen/DensityFunctions$Spline$C_eljbykfw;apply(Lnet/minecraft/world/gen/DensityFunctions$Spline$C_igtkgmnu;)F}
+          * @mapping {@literal named apply Lnet/minecraft/world/gen/DensityFunctions$Spline$FunctionWrapper;apply(Lnet/minecraft/world/gen/DensityFunctions$Spline$Point;)F}
           */
-         public float apply(DensityFunctions.Spline.C_igtkgmnu arg) {
+         public float apply(DensityFunctions.Spline.Point arg) {
             return (float)this.function.value().compute(arg.context());
          }
 
@@ -1921,18 +1930,19 @@
          }
 
          /**
-          * Mapping not found
+          * @mapping {@literal hashed m_gegqglbk Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_eljbykfw;m_gegqglbk(Lnet/minecraft/unmapped/C_kzwapyud$C_zdlfgpyk;)Lnet/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_eljbykfw;}
+          * @mapping {@literal named mapAll Lnet/minecraft/world/gen/DensityFunctions$Spline$FunctionWrapper;mapAll(Lnet/minecraft/world/gen/DensityFunction$Visitor;)Lnet/minecraft/world/gen/DensityFunctions$Spline$FunctionWrapper;}
           */
-         public DensityFunctions.Spline.C_eljbykfw m_gegqglbk(DensityFunction.Visitor arg) {
-            return new DensityFunctions.Spline.C_eljbykfw(new Holder.Direct<>(this.function.value().mapAll(arg)));
+         public DensityFunctions.Spline.FunctionWrapper mapAll(DensityFunction.Visitor visitor) {
+            return new DensityFunctions.Spline.FunctionWrapper(new Holder.Direct<>(this.function.value().mapAll(visitor)));
          }
       }
 
       /**
        * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_reffwscv$C_igtkgmnu}
-       * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Spline$C_igtkgmnu}
+       * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$Spline$Point}
        */
-      public static record C_igtkgmnu(DensityFunction.FunctionContext context) {
+      public static record Point(DensityFunction.FunctionContext context) {
       }
    }
 
@@ -2035,7 +2045,7 @@
        * @mapping {@literal hashed m_okdrvarc Lnet/minecraft/unmapped/C_mdkmcezi$C_neaittdk;m_okdrvarc(Lnet/minecraft/unmapped/C_kzwapyud$C_rbrbrmhy;D)D}
        * @mapping {@literal named transform Lnet/minecraft/world/gen/DensityFunctions$TransformerWithContext;transform(Lnet/minecraft/world/gen/DensityFunction$FunctionContext;D)D}
        */
-      double transform(DensityFunction.FunctionContext functionContext, double d);
+      double transform(DensityFunction.FunctionContext functionContext, double density);
    }
 
    /**
@@ -2166,7 +2176,7 @@
           * @mapping {@literal named codec Lnet/minecraft/world/gen/DensityFunctions$TwoArgumentSimpleFunction$Type;codec:Lnet/minecraft/util/dynamic/CodecHolder;}
           */
          final CodecHolder<DensityFunctions.TwoArgumentSimpleFunction> codec = DensityFunctions.doubleFunctionArgumentCodec(
-            (arg, arg2) -> DensityFunctions.TwoArgumentSimpleFunction.create(this, arg, arg2),
+            (function1, function2) -> DensityFunctions.TwoArgumentSimpleFunction.create(this, function1, function2),
             DensityFunctions.TwoArgumentSimpleFunction::argument1,
             DensityFunctions.TwoArgumentSimpleFunction::argument2
          );
@@ -2198,7 +2208,7 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_mdkmcezi$C_ufxlyrzf}
     * @mapping {@literal named net/minecraft/world/gen/DensityFunctions$WeirdScaledSampler}
     */
-   protected static record WeirdScaledSampler(DensityFunction input, DensityFunction.C_jnszknql noise, DensityFunctions.WeirdScaledSampler.Type rarityMapper)
+   protected static record WeirdScaledSampler(DensityFunction input, DensityFunction.NoiseHolder noise, DensityFunctions.WeirdScaledSampler.Type rarityMapper)
       implements DensityFunctions.TransformerWithContext {
       /**
        * @mapping {@literal hashed f_zgnjzonn Lnet/minecraft/unmapped/C_mdkmcezi$C_ufxlyrzf;f_zgnjzonn:Lcom/mojang/serialization/MapCodec;}
@@ -2207,7 +2217,7 @@
       private static final MapCodec<DensityFunctions.WeirdScaledSampler> DATA_CODEC = RecordCodecBuilder.mapCodec(
          instance -> instance.group(
                   DensityFunction.HOLDER_HELPER_CODEC.fieldOf("input").forGetter(DensityFunctions.WeirdScaledSampler::input),
-                  DensityFunction.C_jnszknql.CODEC.fieldOf("noise").forGetter(DensityFunctions.WeirdScaledSampler::noise),
+                  DensityFunction.NoiseHolder.CODEC.fieldOf("noise").forGetter(DensityFunctions.WeirdScaledSampler::noise),
                   DensityFunctions.WeirdScaledSampler.Type.CODEC.fieldOf("rarity_value_mapper").forGetter(DensityFunctions.WeirdScaledSampler::rarityMapper)
                )
                .apply(instance, DensityFunctions.WeirdScaledSampler::new)
@@ -2222,10 +2232,10 @@
        * Mapping not found
        */
       @Override
-      public double transform(DensityFunction.FunctionContext functionContext, double d) {
-         double e = this.rarityMapper.f_haaysyqc.get(d);
+      public double transform(DensityFunction.FunctionContext functionContext, double density) {
+         double e = this.rarityMapper.scaleFunction.get(density);
          return e
-            * Math.abs(this.noise.m_cnnuqxta((double)functionContext.blockX() / e, (double)functionContext.blockY() / e, (double)functionContext.blockZ() / e));
+            * Math.abs(this.noise.sample((double)functionContext.blockX() / e, (double)functionContext.blockY() / e, (double)functionContext.blockZ() / e));
       }
 
       /**
@@ -2233,7 +2243,7 @@
        */
       @Override
       public DensityFunction mapAll(DensityFunction.Visitor visitor) {
-         return visitor.apply(new DensityFunctions.WeirdScaledSampler(this.input.mapAll(visitor), visitor.m_ivzzknqa(this.noise), this.rarityMapper));
+         return visitor.apply(new DensityFunctions.WeirdScaledSampler(this.input.mapAll(visitor), visitor.visitNoise(this.noise), this.rarityMapper));
       }
 
       /**
@@ -2249,7 +2259,7 @@
        */
       @Override
       public double maxValue() {
-         return this.rarityMapper.f_mbdsmgcv * this.noise.m_ddevyukk();
+         return this.rarityMapper.maxRarity * this.noise.getMaxValue();
       }
 
       /**
@@ -2289,22 +2299,24 @@
           */
          private final String type;
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_haaysyqc Lnet/minecraft/unmapped/C_mdkmcezi$C_ufxlyrzf$C_edgplzwm;f_haaysyqc:Lit/unimi/dsi/fastutil/doubles/Double2DoubleFunction;}
+          * @mapping {@literal named scaleFunction Lnet/minecraft/world/gen/DensityFunctions$WeirdScaledSampler$Type;scaleFunction:Lit/unimi/dsi/fastutil/doubles/Double2DoubleFunction;}
           */
-         final Double2DoubleFunction f_haaysyqc;
+         final Double2DoubleFunction scaleFunction;
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_mbdsmgcv Lnet/minecraft/unmapped/C_mdkmcezi$C_ufxlyrzf$C_edgplzwm;f_mbdsmgcv:D}
+          * @mapping {@literal named maxRarity Lnet/minecraft/world/gen/DensityFunctions$WeirdScaledSampler$Type;maxRarity:D}
           */
-         final double f_mbdsmgcv;
+         final double maxRarity;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mdkmcezi$C_ufxlyrzf$C_edgplzwm;<init>(Ljava/lang/String;ILjava/lang/String;Lit/unimi/dsi/fastutil/doubles/Double2DoubleFunction;D)V}
           * @mapping {@literal named <init> Lnet/minecraft/world/gen/DensityFunctions$WeirdScaledSampler$Type;<init>(Ljava/lang/String;ILjava/lang/String;Lit/unimi/dsi/fastutil/doubles/Double2DoubleFunction;D)V}
           */
-         private Type(String type, Double2DoubleFunction double2DoubleFunction, double d) {
+         private Type(String type, Double2DoubleFunction scaleFunction, double maxRarity) {
             this.type = type;
-            this.f_haaysyqc = double2DoubleFunction;
-            this.f_mbdsmgcv = d;
+            this.scaleFunction = scaleFunction;
+            this.maxRarity = maxRarity;
          }
 
          /**
diff -bur namedTargetSrc/net/minecraft/world/gen/feature/JigsawFeature.java namedSrc/net/minecraft/world/gen/feature/JigsawFeature.java
--- namedTargetSrc/net/minecraft/world/gen/feature/JigsawFeature.java	2023-06-26 16:11:54.183092123 +0000
+++ namedSrc/net/minecraft/world/gen/feature/JigsawFeature.java	2023-06-26 16:10:23.677591104 +0000
@@ -30,7 +30,7 @@
     * @mapping {@literal hashed f_gvqdmfuv Lnet/minecraft/unmapped/C_vdwtfnar;f_gvqdmfuv:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/world/gen/feature/JigsawFeature;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<JigsawFeature> CODEC = Codecs.m_ljxipwty(
+   public static final Codec<JigsawFeature> CODEC = Codecs.validate(
          RecordCodecBuilder.mapCodec(
             instance -> instance.group(
                      settingsCodec(instance),
diff -bur namedTargetSrc/net/minecraft/world/gen/GeneratorOptions.java namedSrc/net/minecraft/world/gen/GeneratorOptions.java
--- namedTargetSrc/net/minecraft/world/gen/GeneratorOptions.java	2023-06-26 16:11:54.131091245 +0000
+++ namedSrc/net/minecraft/world/gen/GeneratorOptions.java	2023-06-26 16:10:23.617590114 +0000
@@ -6,45 +6,45 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_oiwekzxo;
+import net.minecraft.world.dimension.WorldDimensions;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_oxnufhsj}
  * @mapping {@literal named net/minecraft/world/gen/GeneratorOptions}
  */
-public record GeneratorOptions(WorldGeneratorOptions options, C_oiwekzxo dimensions) {
+public record GeneratorOptions(WorldGeneratorOptions options, WorldDimensions dimensions) {
    /**
     * @mapping {@literal hashed f_ujragqqq Lnet/minecraft/unmapped/C_oxnufhsj;f_ujragqqq:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/world/gen/GeneratorOptions;CODEC:Lcom/mojang/serialization/Codec;}
     */
    public static final Codec<GeneratorOptions> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
-               WorldGeneratorOptions.CODEC.forGetter(GeneratorOptions::options), C_oiwekzxo.f_bmwbfdtq.forGetter(GeneratorOptions::getDimensions)
+               WorldGeneratorOptions.CODEC.forGetter(GeneratorOptions::options), WorldDimensions.CODEC.forGetter(GeneratorOptions::getDimensions)
             )
             .apply(instance, instance.stable(GeneratorOptions::new))
    );
 
    /**
     * @mapping {@literal hashed m_msnxrvnu Lnet/minecraft/unmapped/C_oxnufhsj;m_msnxrvnu(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_naismckd;Lnet/minecraft/unmapped/C_oiwekzxo;)Lcom/mojang/serialization/DataResult;}
-    * @mapping {@literal named m_msnxrvnu Lnet/minecraft/world/gen/GeneratorOptions;m_msnxrvnu(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/unmapped/C_oiwekzxo;)Lcom/mojang/serialization/DataResult;}
+    * @mapping {@literal named encode Lnet/minecraft/world/gen/GeneratorOptions;encode(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/world/dimension/WorldDimensions;)Lcom/mojang/serialization/DataResult;}
     */
-   public static <T> DataResult<T> m_msnxrvnu(DynamicOps<T> ops, WorldGeneratorOptions arg, C_oiwekzxo arg2) {
-      return CODEC.encodeStart(ops, new GeneratorOptions(arg, arg2));
+   public static <T> DataResult<T> encode(DynamicOps<T> ops, WorldGeneratorOptions worldGenOptions, WorldDimensions dimensions) {
+      return CODEC.encodeStart(ops, new GeneratorOptions(worldGenOptions, dimensions));
    }
 
    /**
     * @mapping {@literal hashed m_atvrlufu Lnet/minecraft/unmapped/C_oxnufhsj;m_atvrlufu(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_naismckd;Lnet/minecraft/unmapped/C_wqxmvzdq;)Lcom/mojang/serialization/DataResult;}
-    * @mapping {@literal named m_atvrlufu Lnet/minecraft/world/gen/GeneratorOptions;m_atvrlufu(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/registry/DynamicRegistryManager;)Lcom/mojang/serialization/DataResult;}
+    * @mapping {@literal named encode Lnet/minecraft/world/gen/GeneratorOptions;encode(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/registry/DynamicRegistryManager;)Lcom/mojang/serialization/DataResult;}
     */
-   public static <T> DataResult<T> m_atvrlufu(DynamicOps<T> ops, WorldGeneratorOptions arg, DynamicRegistryManager registryManager) {
-      return m_msnxrvnu(ops, arg, new C_oiwekzxo(registryManager.get(RegistryKeys.DIMENSION)));
+   public static <T> DataResult<T> encode(DynamicOps<T> ops, WorldGeneratorOptions worldGenOptions, DynamicRegistryManager registryManager) {
+      return encode(ops, worldGenOptions, new WorldDimensions(registryManager.get(RegistryKeys.DIMENSION)));
    }
 
    /**
     * @mapping {@literal hashed m_smtjtqti Lnet/minecraft/unmapped/C_oxnufhsj;m_smtjtqti()Lnet/minecraft/unmapped/C_oiwekzxo;}
-    * @mapping {@literal named getDimensions Lnet/minecraft/world/gen/GeneratorOptions;getDimensions()Lnet/minecraft/unmapped/C_oiwekzxo;}
+    * @mapping {@literal named getDimensions Lnet/minecraft/world/gen/GeneratorOptions;getDimensions()Lnet/minecraft/world/dimension/WorldDimensions;}
     */
-   public C_oiwekzxo getDimensions() {
+   public WorldDimensions getDimensions() {
       return this.dimensions;
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/gen/noise/NoiseRouterData.java namedSrc/net/minecraft/world/gen/noise/NoiseRouterData.java
--- namedTargetSrc/net/minecraft/world/gen/noise/NoiseRouterData.java	2023-06-26 16:11:54.135091312 +0000
+++ namedSrc/net/minecraft/world/gen/noise/NoiseRouterData.java	2023-06-26 16:10:23.621590180 +0000
@@ -347,26 +347,26 @@
       RegistryKey<DensityFunction> arg10,
       boolean bl
    ) {
-      DensityFunctions.Spline.C_eljbykfw lv = new DensityFunctions.Spline.C_eljbykfw(arg4);
-      DensityFunctions.Spline.C_eljbykfw lv2 = new DensityFunctions.Spline.C_eljbykfw(arg5);
-      DensityFunctions.Spline.C_eljbykfw lv3 = new DensityFunctions.Spline.C_eljbykfw(arg2.getHolderOrThrow(RIDGES_OVERWORLD));
-      DensityFunctions.Spline.C_eljbykfw lv4 = new DensityFunctions.Spline.C_eljbykfw(arg2.getHolderOrThrow(RIDGES_FOLDED_OVERWORLD));
+      DensityFunctions.Spline.FunctionWrapper lv = new DensityFunctions.Spline.FunctionWrapper(arg4);
+      DensityFunctions.Spline.FunctionWrapper lv2 = new DensityFunctions.Spline.FunctionWrapper(arg5);
+      DensityFunctions.Spline.FunctionWrapper lv3 = new DensityFunctions.Spline.FunctionWrapper(arg2.getHolderOrThrow(RIDGES_OVERWORLD));
+      DensityFunctions.Spline.FunctionWrapper lv4 = new DensityFunctions.Spline.FunctionWrapper(arg2.getHolderOrThrow(RIDGES_FOLDED_OVERWORLD));
       DensityFunction lv5 = m_pkjtpogk(
          arg,
          arg6,
          splineWithBlending(
             DensityFunctions.add(
-               DensityFunctions.constant(-0.50375F), DensityFunctions.m_qomtwyfo(VanillaTerrainParametersCreator.m_xfxhjplz(lv, lv2, lv4, bl))
+               DensityFunctions.constant(-0.50375F), DensityFunctions.copySpline(VanillaTerrainParametersCreator.m_xfxhjplz(lv, lv2, lv4, bl))
             ),
             DensityFunctions.getBlendOffset()
          )
       );
       DensityFunction lv6 = m_pkjtpogk(
-         arg, arg7, splineWithBlending(DensityFunctions.m_qomtwyfo(VanillaTerrainParametersCreator.m_bsbyllcx(lv, lv2, lv3, lv4, bl)), BLENDING_FACTOR)
+         arg, arg7, splineWithBlending(DensityFunctions.copySpline(VanillaTerrainParametersCreator.m_bsbyllcx(lv, lv2, lv3, lv4, bl)), BLENDING_FACTOR)
       );
       DensityFunction lv7 = m_pkjtpogk(arg, arg9, DensityFunctions.add(DensityFunctions.clampedGradientY(-64, 320, 1.5, -1.5), lv5));
       DensityFunction lv8 = m_pkjtpogk(
-         arg, arg8, splineWithBlending(DensityFunctions.m_qomtwyfo(VanillaTerrainParametersCreator.m_pnsfnice(lv, lv2, lv3, lv4, bl)), BLENDING_JAGGEDNESS)
+         arg, arg8, splineWithBlending(DensityFunctions.copySpline(VanillaTerrainParametersCreator.m_pnsfnice(lv, lv2, lv3, lv4, bl)), BLENDING_JAGGEDNESS)
       );
       DensityFunction lv9 = DensityFunctions.multiply(lv8, arg3.halfNegative());
       DensityFunction lv10 = noiseGradientDensity(lv6, DensityFunctions.add(lv7, lv9));
diff -bur namedTargetSrc/net/minecraft/world/gen/RandomState.java namedSrc/net/minecraft/world/gen/RandomState.java
--- namedTargetSrc/net/minecraft/world/gen/RandomState.java	2023-06-26 16:11:54.131091245 +0000
+++ namedSrc/net/minecraft/world/gen/RandomState.java	2023-06-26 16:10:23.617590114 +0000
@@ -124,35 +124,35 @@
           * Mapping not found
           */
          @Override
-         public DensityFunction.C_jnszknql m_ivzzknqa(DensityFunction.C_jnszknql arg) {
-            Holder<DoublePerlinNoiseSampler.NoiseParameters> lv = arg.noiseData();
+         public DensityFunction.NoiseHolder visitNoise(DensityFunction.NoiseHolder noise) {
+            Holder<DoublePerlinNoiseSampler.NoiseParameters> lv = noise.noiseData();
             if (bl) {
                if (lv.isRegistryKey(NoiseParametersKeys.TEMPERATURE)) {
                   DoublePerlinNoiseSampler lv2 = DoublePerlinNoiseSampler.createLegacy(
                      this.m_houdlxxz(0L), new DoublePerlinNoiseSampler.NoiseParameters(-7, 1.0, 1.0)
                   );
-                  return new DensityFunction.C_jnszknql(lv, lv2);
+                  return new DensityFunction.NoiseHolder(lv, lv2);
                }
 
                if (lv.isRegistryKey(NoiseParametersKeys.VEGETATION)) {
                   DoublePerlinNoiseSampler lv3 = DoublePerlinNoiseSampler.createLegacy(
                      this.m_houdlxxz(1L), new DoublePerlinNoiseSampler.NoiseParameters(-7, 1.0, 1.0)
                   );
-                  return new DensityFunction.C_jnszknql(lv, lv3);
+                  return new DensityFunction.NoiseHolder(lv, lv3);
                }
 
                if (lv.isRegistryKey(NoiseParametersKeys.OFFSET)) {
                   DoublePerlinNoiseSampler lv4 = DoublePerlinNoiseSampler.m_opixytcc(
                      RandomState.this.randomFactory.create(NoiseParametersKeys.OFFSET.getValue()), new DoublePerlinNoiseSampler.NoiseParameters(0, 0.0)
                   );
-                  return new DensityFunction.C_jnszknql(lv, lv4);
+                  return new DensityFunction.NoiseHolder(lv, lv4);
                }
             }
 
             DoublePerlinNoiseSampler lv5 = RandomState.this.getOrCreateNoiseSampler(
                (RegistryKey<DoublePerlinNoiseSampler.NoiseParameters>)lv.getKey().orElseThrow()
             );
-            return new DensityFunction.C_jnszknql(lv, lv5);
+            return new DensityFunction.NoiseHolder(lv, lv5);
          }
 
          /**
diff -bur namedTargetSrc/net/minecraft/world/gen/trunk/CherryTrunkPlacer.java namedSrc/net/minecraft/world/gen/trunk/CherryTrunkPlacer.java
--- namedTargetSrc/net/minecraft/world/gen/trunk/CherryTrunkPlacer.java	2023-06-26 16:11:54.183092123 +0000
+++ namedSrc/net/minecraft/world/gen/trunk/CherryTrunkPlacer.java	2023-06-26 16:10:23.677591104 +0000
@@ -28,7 +28,7 @@
     * @mapping {@literal hashed f_pslmsawu Lnet/minecraft/unmapped/C_mwlpxetp;f_pslmsawu:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named VALIDATION_CODEC Lnet/minecraft/world/gen/trunk/CherryTrunkPlacer;VALIDATION_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<UniformIntProvider> VALIDATION_CODEC = Codecs.m_lytzwisw(
+   private static final Codec<UniformIntProvider> VALIDATION_CODEC = Codecs.validate(
       UniformIntProvider.CODEC,
       arg -> arg.getMax() - arg.getMin() < 1
             ? DataResult.error(() -> "Need at least 2 blocks variation for the branch starts to fit both branches")
diff -bur namedTargetSrc/net/minecraft/world/MobSpawnerEntry.java namedSrc/net/minecraft/world/MobSpawnerEntry.java
--- namedTargetSrc/net/minecraft/world/MobSpawnerEntry.java	2023-06-26 16:11:54.243093136 +0000
+++ namedSrc/net/minecraft/world/MobSpawnerEntry.java	2023-06-26 16:10:23.745592227 +0000
@@ -95,8 +95,7 @@
        */
       public static final Codec<MobSpawnerEntry.CustomSpawnRules> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  m_onmagaow("block_light_limit").forGetter(rules -> rules.blockLightLimit),
-                  m_onmagaow("sky_light_limit").forGetter(rules -> rules.skyLightLimit)
+                  validate("block_light_limit").forGetter(rules -> rules.blockLightLimit), validate("sky_light_limit").forGetter(rules -> rules.skyLightLimit)
                )
                .apply(instance, MobSpawnerEntry.CustomSpawnRules::new)
       );
@@ -112,10 +111,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_onmagaow Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;m_onmagaow(Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;}
+       * @mapping {@literal named validate Lnet/minecraft/world/MobSpawnerEntry$CustomSpawnRules;validate(Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;}
        */
-      private static MapCodec<Range<Integer>> m_onmagaow(String string) {
-         return Codecs.m_ljxipwty(Range.INT_CODEC.optionalFieldOf(string, LIGHT_RANGE), MobSpawnerEntry.CustomSpawnRules::validate);
+      private static MapCodec<Range<Integer>> validate(String id) {
+         return Codecs.validate(Range.INT_CODEC.optionalFieldOf(id, LIGHT_RANGE), MobSpawnerEntry.CustomSpawnRules::validate);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/PersistentStateManager.java namedSrc/net/minecraft/world/PersistentStateManager.java
--- namedTargetSrc/net/minecraft/world/PersistentStateManager.java	2023-06-26 16:11:54.143091447 +0000
+++ namedSrc/net/minecraft/world/PersistentStateManager.java	2023-06-26 16:10:23.633590378 +0000
@@ -63,29 +63,34 @@
    }
 
    /**
+    * @param reader reads the state from NBT, returning the read state object
+    * @param defaultState supplies the state if it is not already stored in NBT
+    * 
     * @mapping {@literal hashed m_jacratca Lnet/minecraft/unmapped/C_hsdphpvz;m_jacratca(Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/unmapped/C_uuhisnem;}
     * @mapping {@literal named getOrCreate Lnet/minecraft/world/PersistentStateManager;getOrCreate(Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/world/PersistentState;}
     */
-   public <T extends PersistentState> T getOrCreate(Function<NbtCompound, T> function, Supplier<T> supplier, String string) {
-      T lv = this.get(function, string);
+   public <T extends PersistentState> T getOrCreate(Function<NbtCompound, T> reader, Supplier<T> defaultState, String id) {
+      T lv = this.get(reader, id);
       if (lv != null) {
          return lv;
       } else {
-         T lv2 = (T)supplier.get();
-         this.set(string, lv2);
+         T lv2 = (T)defaultState.get();
+         this.set(id, lv2);
          return lv2;
       }
    }
 
    /**
+    * @param reader reads the state from NBT, returning the read state object
+    * 
     * @mapping {@literal hashed m_gqqspvok Lnet/minecraft/unmapped/C_hsdphpvz;m_gqqspvok(Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/unmapped/C_uuhisnem;}
     * @mapping {@literal named get Lnet/minecraft/world/PersistentStateManager;get(Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/world/PersistentState;}
     */
    @Nullable
-   public <T extends PersistentState> T get(Function<NbtCompound, T> function, String id) {
+   public <T extends PersistentState> T get(Function<NbtCompound, T> reader, String id) {
       PersistentState lv = (PersistentState)this.loadedStates.get(id);
       if (lv == null && !this.loadedStates.containsKey(id)) {
-         lv = this.readFromFile(function, id);
+         lv = this.readFromFile(reader, id);
          this.loadedStates.put(id, lv);
       }
 
@@ -93,16 +98,18 @@
    }
 
    /**
+    * @param reader reads the state from NBT, returning the read state object
+    * 
     * @mapping {@literal hashed m_qvqicwbq Lnet/minecraft/unmapped/C_hsdphpvz;m_qvqicwbq(Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/unmapped/C_uuhisnem;}
     * @mapping {@literal named readFromFile Lnet/minecraft/world/PersistentStateManager;readFromFile(Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/world/PersistentState;}
     */
    @Nullable
-   private <T extends PersistentState> T readFromFile(Function<NbtCompound, T> function, String id) {
+   private <T extends PersistentState> T readFromFile(Function<NbtCompound, T> reader, String id) {
       try {
          File file = this.getFile(id);
          if (file.exists()) {
             NbtCompound lv = this.readNbt(id, SharedConstants.getGameVersion().getWorldVersionData().getDataVersion());
-            return (T)function.apply(lv.getCompound("data"));
+            return (T)reader.apply(lv.getCompound("data"));
          }
       } catch (Exception var5) {
          LOGGER.error("Error loading saved data: {}", id, var5);
@@ -115,8 +122,8 @@
     * @mapping {@literal hashed m_whuuilcw Lnet/minecraft/unmapped/C_hsdphpvz;m_whuuilcw(Ljava/lang/String;Lnet/minecraft/unmapped/C_uuhisnem;)V}
     * @mapping {@literal named set Lnet/minecraft/world/PersistentStateManager;set(Ljava/lang/String;Lnet/minecraft/world/PersistentState;)V}
     */
-   public void set(String string, PersistentState arg) {
-      this.loadedStates.put(string, arg);
+   public void set(String id, PersistentState state) {
+      this.loadedStates.put(id, state);
    }
 
    /**
@@ -184,10 +191,10 @@
     * @mapping {@literal hashed m_nnxihiob Lnet/minecraft/unmapped/C_hsdphpvz;m_nnxihiob(Ljava/io/PushbackInputStream;)Z}
     * @mapping {@literal named isCompressed Lnet/minecraft/world/PersistentStateManager;isCompressed(Ljava/io/PushbackInputStream;)Z}
     */
-   private boolean isCompressed(PushbackInputStream pushbackInputStream) throws IOException {
+   private boolean isCompressed(PushbackInputStream inputStream) throws IOException {
       byte[] bs = new byte[2];
       boolean bl = false;
-      int i = pushbackInputStream.read(bs, 0, 2);
+      int i = inputStream.read(bs, 0, 2);
       if (i == 2) {
          int j = (bs[1] & 255) << 8 | bs[0] & 255;
          if (j == 35615) {
@@ -196,7 +203,7 @@
       }
 
       if (i != 0) {
-         pushbackInputStream.unread(bs, 0, i);
+         inputStream.unread(bs, 0, i);
       }
 
       return bl;
@@ -207,9 +214,9 @@
     * @mapping {@literal named save Lnet/minecraft/world/PersistentStateManager;save()V}
     */
    public void save() {
-      this.loadedStates.forEach((string, arg) -> {
-         if (arg != null) {
-            arg.save(this.getFile(string));
+      this.loadedStates.forEach((id, state) -> {
+         if (state != null) {
+            state.save(this.getFile(id));
          }
       });
    }
diff -bur namedTargetSrc/net/minecraft/world/SaveProperties.java namedSrc/net/minecraft/world/SaveProperties.java
--- namedTargetSrc/net/minecraft/world/SaveProperties.java	2023-06-26 16:11:54.167091853 +0000
+++ namedSrc/net/minecraft/world/SaveProperties.java	2023-06-26 16:10:23.657590774 +0000
@@ -54,9 +54,10 @@
    Set<String> getServerBrands();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qwkmrjrh Lnet/minecraft/unmapped/C_jkevluio;m_qwkmrjrh()Ljava/util/Set;}
+    * @mapping {@literal named getRemovedFeatureFlags Lnet/minecraft/world/SaveProperties;getRemovedFeatureFlags()Ljava/util/Set;}
     */
-   Set<String> m_qwkmrjrh();
+   Set<String> getRemovedFeatureFlags();
 
    /**
     * @mapping {@literal hashed m_ntkonzzr Lnet/minecraft/unmapped/C_jkevluio;m_ntkonzzr(Ljava/lang/String;Z)V}
@@ -70,7 +71,7 @@
     */
    default void populateCrashReport(CrashReportSection crashReport) {
       crashReport.add("Known server brands", (CrashCallable<String>)(() -> String.join(", ", this.getServerBrands())));
-      crashReport.add("Removed feature flags", (CrashCallable<String>)(() -> String.join(", ", this.m_qwkmrjrh())));
+      crashReport.add("Removed feature flags", (CrashCallable<String>)(() -> String.join(", ", this.getRemovedFeatureFlags())));
       crashReport.add("Level was modded", (CrashCallable<String>)(() -> Boolean.toString(this.isModded())));
       crashReport.add("Level storage version", (CrashCallable<String>)(() -> {
          int i = this.getVersion();
@@ -198,19 +199,22 @@
    NbtCompound getPlayerData();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hgxsrhud Lnet/minecraft/unmapped/C_jkevluio;m_hgxsrhud()Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;}
+    * @mapping {@literal named getDragonFightState Lnet/minecraft/world/SaveProperties;getDragonFightState()Lnet/minecraft/entity/boss/dragon/EnderDragonFight$State;}
     */
-   EnderDragonFight.C_tunbvwoo m_hgxsrhud();
+   EnderDragonFight.State getDragonFightState();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zucuhnzk Lnet/minecraft/unmapped/C_jkevluio;m_zucuhnzk(Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;)V}
+    * @mapping {@literal named setDragonFightState Lnet/minecraft/world/SaveProperties;setDragonFightState(Lnet/minecraft/entity/boss/dragon/EnderDragonFight$State;)V}
     */
-   void m_zucuhnzk(EnderDragonFight.C_tunbvwoo arg);
+   void setDragonFightState(EnderDragonFight.State state);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ycrrmmel Lnet/minecraft/unmapped/C_jkevluio;m_ycrrmmel()Lnet/minecraft/unmapped/C_naismckd;}
+    * @mapping {@literal named getGeneratorOptions Lnet/minecraft/world/SaveProperties;getGeneratorOptions()Lnet/minecraft/world/gen/WorldGeneratorOptions;}
     */
-   WorldGeneratorOptions m_ycrrmmel();
+   WorldGeneratorOptions getGeneratorOptions();
 
    /**
     * @mapping {@literal hashed m_fpvkhhkf Lnet/minecraft/unmapped/C_jkevluio;m_fpvkhhkf()Z}


The remaining diff is too long!

Please sign in to comment.