20w20a

build.gradle

@@ -7,7 +7,7 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "cuchaz:enigma:0.16.0+build.171"
+		classpath "cuchaz:enigma:0.16.0+build.172"
 		classpath "net.fabricmc:stitch:0.4.6+build.74"
 		classpath "commons-io:commons-io:2.6"
 		classpath 'de.undercouch:gradle-download-task:4.0.4'
@@ -23,7 +23,7 @@ plugins {
 	id 'java' // for jd gen
 }
 
-def minecraft_version = "20w19a"
+def minecraft_version = "20w20a"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins
@@ -50,7 +50,7 @@ configurations {
 }
 
 dependencies {
-	enigmaRuntime "cuchaz:enigma:0.16.0+build.171"
+	enigmaRuntime "cuchaz:enigma:0.16.0+build.172"
 	enigmaRuntime "net.fabricmc:stitch:0.4.6+build.74"
 	javadocClasspath "net.fabricmc:fabric-loader:0.8.2+build.194"
 	javadocClasspath "com.google.code.findbugs:jsr305:3.0.2"

mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping

@@ -1,7 +1,5 @@
 CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/BlockUsedCriterion
 	FIELD field_21576 id Lnet/minecraft/class_2960;
-	METHOD <init> (Lnet/minecraft/class_2960;)V
-		ARG 1 id
 	METHOD method_23888 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_4711$class_4712;)Z
 		ARG 4 conditions
 	METHOD method_23889 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
@@ -9,18 +7,7 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/BlockUsedCrit
 		ARG 2 pos
 		ARG 3 stack
 	CLASS class_4712 Conditions
-		FIELD field_21577 block Lnet/minecraft/class_4550;
-		FIELD field_21578 state Lnet/minecraft/class_4559;
 		FIELD field_21579 item Lnet/minecraft/class_2073;
-		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_4550;Lnet/minecraft/class_4559;Lnet/minecraft/class_2073;)V
-			ARG 1 id
-			ARG 2 player
-			ARG 3 block
-			ARG 4 state
-			ARG 5 item
-		METHOD method_23891 create (Lnet/minecraft/class_4550$class_4710;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712;
-			ARG 0 blockPredicateBuilder
-			ARG 1 itemPredicateBuilder
 		METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z
 			ARG 1 state
 			ARG 2 world

mappings/net/minecraft/advancement/criterion/Criteria.mapping

@@ -35,7 +35,6 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
 	FIELD field_1213 BREWED_POTION Lnet/minecraft/class_1996;
 	FIELD field_19250 HERO_OF_THE_VILLAGE Lnet/minecraft/class_2092;
 	FIELD field_19251 VOLUNTARY_EXILE Lnet/minecraft/class_2092;
-	FIELD field_21627 SAFELY_HARVEST_HONEY Lnet/minecraft/class_4711;
 	FIELD field_21628 SLIDE_DOWN_BLOCK Lnet/minecraft/class_4713;
 	FIELD field_21629 BEE_NEST_DESTROYED Lnet/minecraft/class_4708;
 	FIELD field_22450 TARGET_HIT Lnet/minecraft/class_4851;

mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping

@@ -13,9 +13,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit
 			ARG 2 item
 			ARG 3 durability
 			ARG 4 delta
-		METHOD method_8967 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071;
+		METHOD method_8967 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071;
-			ARG 0 item
-			ARG 1 durability
 		METHOD method_8968 matches (Lnet/minecraft/class_1799;I)Z
 			ARG 1 stack
 			ARG 2 damage

mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping

@@ -12,7 +12,7 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit
 			ARG 1 player
 			ARG 2 signalStrength
 			ARG 3 projectile
-		METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4851$class_4852;
+		METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_4851$class_4852;
 			ARG 0 signalStrength
 		METHOD method_24952 test (Lnet/minecraft/class_47;Lnet/minecraft/class_243;I)Z
 			ARG 1 projectileContext

mappings/net/minecraft/block/CampfireBlock.mapping

@@ -11,9 +11,8 @@ CLASS net/minecraft/class_3922 net/minecraft/block/CampfireBlock
 		ARG 3 lotsOfSmoke
 	METHOD method_17456 doesBlockCauseSignalFire (Lnet/minecraft/class_2680;)Z
 		ARG 1 state
-	METHOD method_23895 isLitCampfireInRange (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)Z
+	METHOD method_23895 isLitCampfireInRange (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-		ARG 2 range
 	METHOD method_23896 isLitCampfire (Lnet/minecraft/class_2680;)Z
 		ARG 0 state

mappings/net/minecraft/block/InfestedBlock.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2384 net/minecraft/block/InfestedBlock
 	FIELD field_11178 regularBlock Lnet/minecraft/class_2248;
 	FIELD field_11179 REGULAR_TO_INFESTED Ljava/util/Map;
-	METHOD <init> <init> (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V
+	METHOD <init> (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V
 		COMMENT Creates an infested block
 		ARG 1 regularBlock
 			COMMENT the block this infested block should mimic

mappings/net/minecraft/class_5217.mapping

@@ -3,16 +3,13 @@ CLASS net/minecraft/class_5217
 	METHOD method_146 getGameRules ()Lnet/minecraft/class_1928;
 	METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V
 	METHOD method_152 isHardcore ()Z
-	METHOD method_153 getGeneratorType ()Lnet/minecraft/class_1942;
 	METHOD method_156 isRaining ()Z
 	METHOD method_157 setRaining (Z)V
 		ARG 1 raining
 	METHOD method_166 getSpawnZ ()I
-	METHOD method_184 getSeed ()J
 	METHOD method_188 getTime ()J
 	METHOD method_197 isDifficultyLocked ()Z
 	METHOD method_203 isThundering ()Z
 	METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267;
 	METHOD method_215 getSpawnX ()I
 	METHOD method_217 getTimeOfDay ()J
-	METHOD method_27421 getGeneratorOptions ()Lnet/minecraft/class_4952;

mappings/net/minecraft/class_5219.mapping

@@ -9,7 +9,6 @@ CLASS net/minecraft/class_5219
 	METHOD method_171 isVersionSnapshot ()Z
 	METHOD method_179 getEnabledDataPacks ()Ljava/util/Set;
 	METHOD method_180 getVersionId ()I
-	METHOD method_184 getSeed ()J
 	METHOD method_186 setDifficultyLocked (Z)V
 		ARG 1 locked
 	METHOD method_191 getLastPlayed ()J

mappings/net/minecraft/class_5268.mapping

@@ -30,4 +30,3 @@ CLASS net/minecraft/class_5268
 	METHOD method_222 isInitialized ()Z
 	METHOD method_223 setInitialized (Z)V
 		ARG 1 initialized
-	METHOD method_27420 hasStructures ()Z

mappings/net/minecraft/class_5281.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_5281
+	METHOD method_8412 getSeed ()J

mappings/net/minecraft/class_5284.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_5284
+	METHOD method_16400 getBedrockCeilingY ()I
+	METHOD method_16401 getBedrockFloorY ()I

mappings/net/minecraft/client/font/TextHandler.mapping

@@ -109,7 +109,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler
 		METHOD method_27510 getText ()Lnet/minecraft/class_5250;
 	CLASS class_5229 LineWrappingConsumer
 		COMMENT A consumer of the line-breaking information.
-		METHOD accept accept (Lnet/minecraft/class_2583;II)V
+		METHOD accept (Lnet/minecraft/class_2583;II)V
 			COMMENT Accepts the information on a line-wrap segment.
 			ARG 1 style
 				COMMENT the style of this line segment
@@ -126,7 +126,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler
 		METHOD method_27514 resetLength ()V
 	CLASS class_5231 WidthRetriever
 		COMMENT A retriever of character width.
-		METHOD getWidth getWidth (ILnet/minecraft/class_2583;)F
+		METHOD getWidth (ILnet/minecraft/class_2583;)F
 			COMMENT Returns the width of a character.
 			ARG 1 codePoint
 				COMMENT the character's code point

mappings/net/minecraft/client/font/TextVisitFactory.mapping

@@ -93,7 +93,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
 			COMMENT the visitor
 	CLASS class_5224 CharacterVisitor
 		COMMENT A visitor for single characters in a string.
-		METHOD onChar onChar (ILnet/minecraft/class_2583;I)Z
+		METHOD onChar (ILnet/minecraft/class_2583;I)Z
 			COMMENT Visits a single character.
 			COMMENT
 			COMMENT <p>Multiple surrogate characters are converted into one single {@code

mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping

@@ -1,17 +1,7 @@
 CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen
-	FIELD field_19098 generatorOptionsTag Lnet/minecraft/class_2487;
-	FIELD field_2436 CHUNK_GENERATOR_TYPES Ljava/util/List;
-	FIELD field_2437 parent Lnet/minecraft/class_525;
 	FIELD field_2438 confirmButton Lnet/minecraft/class_4185;
 	FIELD field_2439 biomeListLength I
 	FIELD field_2441 biomeSelectionList Lnet/minecraft/class_415$class_4190;
-	METHOD <init> (Lnet/minecraft/class_525;Lnet/minecraft/class_4952;)V
-		ARG 1 parent
 	METHOD method_2151 refreshConfirmButton ()V
-	METHOD method_2153 getGeneratorTag ()Lnet/minecraft/class_2487;
-	METHOD method_2161 initListSelectLogic ()V
 	CLASS class_4190 BuffetBiomesListWidget
 		CLASS class_4191 BuffetBiomeItem
-			FIELD field_19099 biome Lnet/minecraft/class_2960;
-			METHOD <init> (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_2960;)V
-				ARG 2 biome

mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping

@@ -2,11 +2,9 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel
 	FIELD field_2418 tileText Lnet/minecraft/class_2561;
 	FIELD field_2419 config Lnet/minecraft/class_3232;
 	FIELD field_2421 widgetButtonRemoveLayer Lnet/minecraft/class_4185;
-	FIELD field_2422 parent Lnet/minecraft/class_525;
+	FIELD field_2422 parent Lnet/minecraft/class_437;
 	FIELD field_2424 layers Lnet/minecraft/class_413$class_4192;
 	FIELD field_2425 heightText Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_525;Lnet/minecraft/class_4952;)V
-		ARG 1 parent
 	METHOD method_2138 getConfigString ()Ljava/lang/String;
 	METHOD method_2139 setConfigString (Ljava/lang/String;)V
 		ARG 1 config

mappings/net/minecraft/client/gui/screen/Screen.mapping

@@ -77,7 +77,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 child
 	METHOD method_25430 handleTextClick (Lnet/minecraft/class_2561;)Z
 		ARG 1 text
-	METHOD method_25431 tick ()V
 	METHOD method_25432 removed ()V
 	METHOD method_25433 renderBackground (Lnet/minecraft/class_4587;I)V
 		COMMENT Renders the background of this screen.

mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping

@@ -1,45 +1,32 @@
 CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldScreen
-	FIELD field_18979 generatorOptions Lnet/minecraft/class_4952;
 	FIELD field_24287 gameRulesButton Lnet/minecraft/class_4185;
 	FIELD field_24288 gameRules Lnet/minecraft/class_1928;
 	FIELD field_3178 hardcore Z
 	FIELD field_3179 tweakedCheats Z
-	FIELD field_3180 structures Z
-	FIELD field_3181 seed Ljava/lang/String;
 	FIELD field_3182 enableCheatsButton Lnet/minecraft/class_4185;
-	FIELD field_3184 seedField Lnet/minecraft/class_342;
 	FIELD field_3185 lastMode Lnet/minecraft/class_525$class_4539;
 	FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_4185;
 	FIELD field_3187 parent Lnet/minecraft/class_437;
 	FIELD field_3188 levelNameField Lnet/minecraft/class_342;
-	FIELD field_3189 mapTypeSwitchButton Lnet/minecraft/class_4185;
 	FIELD field_3190 creatingLevel Z
-	FIELD field_3191 bonusChest Z
 	FIELD field_3192 cheatsEnabled Z
 	FIELD field_3193 moreOptionsButton Lnet/minecraft/class_4185;
 	FIELD field_3194 firstGameModeDescriptionLine Lnet/minecraft/class_2561;
 	FIELD field_3195 levelName Ljava/lang/String;
 	FIELD field_3196 saveDirectoryName Ljava/lang/String;
-	FIELD field_3197 generateBonusChestButton Lnet/minecraft/class_4185;
-	FIELD field_3198 customizeTypeButton Lnet/minecraft/class_4185;
 	FIELD field_3199 secondGameModeDescriptionLine Lnet/minecraft/class_2561;
 	FIELD field_3201 currentMode Lnet/minecraft/class_525$class_4539;
 	FIELD field_3202 moreOptionsOpen Z
-	FIELD field_3203 generateStructuresButton Lnet/minecraft/class_4185;
-	FIELD field_3204 generatorType I
 	FIELD field_3205 createLevelButton Lnet/minecraft/class_4185;
 	METHOD <init> (Lnet/minecraft/class_437;)V
 		ARG 1 parent
 	METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V
-	METHOD method_25993 getLevelGeneratorType ()Lnet/minecraft/class_1942;
 	METHOD method_2710 setMoreOptionsOpen (Z)V
 		ARG 1 moreOptionsOpen
 	METHOD method_2721 toggleMoreOptions ()V
 	METHOD method_2722 updateSettingsLabels ()V
-	METHOD method_2723 isGeneratorTypeValid ()Z
 	METHOD method_2727 updateSaveFolderName ()V
 	METHOD method_2736 createLevel ()V
-	METHOD method_2737 recreateLevel (Lnet/minecraft/class_5219;)V
 	CLASS class_4539 Mode
 		FIELD field_20628 translationSuffix Ljava/lang/String;
 		FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934;

mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping

@@ -59,7 +59,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
 		ARG 4 actionType
 		ARG 5 player
 	METHOD method_2907 setGameMode (Lnet/minecraft/class_1934;)V
-		ARG 1 gameMode
 	METHOD method_2908 hasStatusBars ()Z
 	METHOD method_2909 clickCreativeStack (Lnet/minecraft/class_1799;I)V
 		ARG 1 stack

mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping

@@ -77,9 +77,9 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked
 		METHOD method_3453 deserializeAmbientOcclusion (Lcom/google/gson/JsonObject;)Z
 			ARG 1 json
 	CLASS class_4751 GuiLight
-		FIELD field_21858 field_21858 Lnet/minecraft/class_793$class_4751;
+		FIELD field_21858 Lnet/minecraft/class_793$class_4751;
 			COMMENT The model will be shaded from the front, like a basic item
-		FIELD field_21859 field_21859 Lnet/minecraft/class_793$class_4751;
+		FIELD field_21859 Lnet/minecraft/class_793$class_4751;
 			COMMENT The model will be shaded from the side, like a block.
 		FIELD field_21860 name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V

mappings/net/minecraft/client/world/ClientWorld.mapping

@@ -9,8 +9,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	FIELD field_3727 netHandler Lnet/minecraft/class_634;
 	FIELD field_3729 client Lnet/minecraft/class_310;
 	FIELD field_3733 scoreboard Lnet/minecraft/class_269;
-	METHOD <init> (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;)V
+	METHOD <init> (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V
-		ARG 2 levelInfo
 		ARG 4 chunkLoadDistance
 	METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V
 		ARG 1 id
@@ -47,7 +46,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	METHOD method_23784 reloadColor ()V
 	METHOD method_23785 getCloudsColor (F)Lnet/minecraft/class_243;
 		ARG 1 tickDelta
-	METHOD method_23788 getSkyDarknessHeight ()D
 	METHOD method_23789 getLightningTicksLeft ()I
 	METHOD method_27873 setSpawnPos (Lnet/minecraft/class_2338;)V
 		ARG 1 pos

mappings/net/minecraft/data/SnbtProvider.mapping

@@ -18,7 +18,7 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider
 		FIELD field_20538 name Ljava/lang/String;
 		FIELD field_20539 bytes [B
 		FIELD field_20540 sha1 Ljava/lang/String;
-		METHOD <init> (Ljava/lang/String;[BLjava/lang/String;)V
+		METHOD <init> (Ljava/lang/String;[BLjava/lang/String;Ljava/lang/String;)V
 			ARG 1 name
 			ARG 2 bytes
 			ARG 3 sha1

mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping

@@ -2,4 +2,4 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement
 	FIELD field_11293 BIOMES [Lnet/minecraft/class_1959;
 	FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299;
 	METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
-	METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
+	METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;[Lnet/minecraft/class_1959;)Lnet/minecraft/class_161$class_162;

mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_3843 net/minecraft/data/validate/StructureValidatorProvider
-	METHOD method_16878 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+	METHOD method_16878 update (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
-		ARG 0 nbt
 	METHOD method_16880 addDataVersion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
 		ARG 0 nbt

mappings/net/minecraft/entity/mob/PiglinBrain.mapping

@@ -4,7 +4,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 	FIELD field_22390 RIDE_TARGET_MEMORY_DURATION Lnet/minecraft/class_4801;
 	FIELD field_22391 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801;
 	FIELD field_22392 FOOD Ljava/util/Set;
-	FIELD field_22395 GOLDEN_ITEMS Ljava/util/Set;
 	FIELD field_23826 BARTERING_ITEM Lnet/minecraft/class_1792;
 	METHOD method_24713 hasZombifiedPiglinNearby (Lnet/minecraft/class_4836;)Z
 		ARG 0 piglin

mappings/net/minecraft/entity/raid/RaidManager.mapping

@@ -8,8 +8,7 @@ CLASS net/minecraft/class_3767 net/minecraft/entity/raid/RaidManager
 	METHOD method_16532 getOrCreateRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3765;
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_16533 nameFor (Lnet/minecraft/class_2869;)Ljava/lang/String;
+	METHOD method_16533 nameFor (Lnet/minecraft/class_2874;)Ljava/lang/String;
-		ARG 0 dimension
 	METHOD method_16534 nextId ()I
 	METHOD method_16539 tick ()V
 	METHOD method_16540 startRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765;

mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2CPacket
-	FIELD field_12277 generatorType Lnet/minecraft/class_1942;
 	FIELD field_12278 reducedDebugInfo Z
 	FIELD field_12279 maxPlayers I
 	FIELD field_12280 playerEntityId I
@@ -9,20 +8,15 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD field_19145 chunkLoadDistance I
 	FIELD field_20665 seed J
 	FIELD field_20666 showsDeathScreen Z
-	METHOD <init> (ILnet/minecraft/class_1934;JZLnet/minecraft/class_2874;ILnet/minecraft/class_1942;IZZ)V
+	METHOD <init> (ILnet/minecraft/class_1934;JZLnet/minecraft/class_2874;IIZZZZ)V
 		ARG 1 playerEntityId
 		ARG 2 gameMode
 		ARG 3 seed
 		ARG 5 hardcore
 		ARG 6 dimensionType
 		ARG 7 maxPlayers
-		ARG 8 levelGeneratorType
-		ARG 9 chunkLoadDistance
-		ARG 10 reducedDebugInfo
-		ARG 11 showsDeathScreen
 	METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_11562 hasReducedDebugInfo ()Z
-	METHOD method_11563 getGeneratorType ()Lnet/minecraft/class_1942;
 	METHOD method_11564 getEntityId ()I
 	METHOD method_11565 getDimension ()Lnet/minecraft/class_2874;
 	METHOD method_11568 isHardcore ()Z

mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping

@@ -1,14 +1,10 @@
 CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket
 	FIELD field_12431 dimension Lnet/minecraft/class_2874;
-	FIELD field_12432 generatorType Lnet/minecraft/class_1942;
 	FIELD field_12434 gameMode Lnet/minecraft/class_1934;
 	FIELD field_20667 sha256Seed J
-	METHOD <init> (Lnet/minecraft/class_2874;JLnet/minecraft/class_1942;Lnet/minecraft/class_1934;Z)V
+	METHOD <init> (Lnet/minecraft/class_2874;JLnet/minecraft/class_1934;ZZZ)V
 		ARG 1 dimension
 		ARG 2 sha256Seed
-		ARG 4 generatorType
-		ARG 5 gameMode
 	METHOD method_11779 getDimension ()Lnet/minecraft/class_2874;
 	METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934;
-	METHOD method_11781 getGeneratorType ()Lnet/minecraft/class_1942;
 	METHOD method_22425 getSha256Seed ()J

mappings/net/minecraft/predicate/BlockPredicate.mapping

@@ -21,6 +21,4 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate
 		FIELD field_21574 state Lnet/minecraft/class_4559;
 		FIELD field_21575 nbt Lnet/minecraft/class_2105;
 		METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710;
-		METHOD method_23881 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_4550$class_4710;
-			ARG 1 tag
 		METHOD method_23882 build ()Lnet/minecraft/class_4550;

mappings/net/minecraft/predicate/entity/EntityPredicate.mapping

@@ -11,7 +11,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 	FIELD field_9599 ANY Lnet/minecraft/class_2048;
 	FIELD field_9600 nbt Lnet/minecraft/class_2105;
 	FIELD field_9601 distance Lnet/minecraft/class_2025;
-	METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Ljava/lang/String;Lnet/minecraft/class_2960;)V
+	METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;Lnet/minecraft/class_2960;)V
 		ARG 1 type
 		ARG 2 distance
 		ARG 3 location
@@ -21,8 +21,6 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 		ARG 7 equipment
 		ARG 8 player
 		ARG 9 fishingHook
-		ARG 10 team
-		ARG 11 catType
 	METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47;
 		ARG 0 player
 		ARG 1 target

mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

@@ -9,16 +9,13 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate
 	FIELD field_9685 ANY Lnet/minecraft/class_2090;
 	FIELD field_9686 dimension Lnet/minecraft/class_2874;
 	FIELD field_9687 feature Lnet/minecraft/class_3195;
-	METHOD <init> (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;Lnet/minecraft/class_2874;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V
+	METHOD <init> (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;Lnet/minecraft/class_2874;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 biome
 		ARG 5 feature
 		ARG 6 dimension
-		ARG 7 light
-		ARG 8 block
-		ARG 9 fluid
 	METHOD method_9016 dimension (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2090;
 		ARG 0 dimension
 	METHOD method_9017 feature (Lnet/minecraft/class_3195;)Lnet/minecraft/class_2090;

mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHandler
 	FIELD field_16801 resourcePack Ljava/lang/String;
 	FIELD field_16802 broadcastConsoleToOps Z
-	FIELD field_16803 levelType Lnet/minecraft/class_1942;
 	FIELD field_16804 whiteList Lnet/minecraft/class_3808$class_3809;
 	FIELD field_16805 enforceWhitelist Z
 	FIELD field_16806 enableCommandBlock Z
@@ -20,11 +19,9 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 	FIELD field_16819 enableQuery Z
 	FIELD field_16820 levelName Ljava/lang/String;
 	FIELD field_16821 resourcePackSha1 Ljava/lang/String;
-	FIELD field_16822 generatorSettings Ljava/lang/String;
 	FIELD field_16823 rconPassword Ljava/lang/String;
 	FIELD field_16824 broadcastRconToOps Z
 	FIELD field_16825 motd Ljava/lang/String;
-	FIELD field_16826 generateStructures Z
 	FIELD field_16827 forceGameMode Z
 	FIELD field_16828 rconPort I
 	FIELD field_16829 serverIp Ljava/lang/String;
@@ -41,7 +38,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 	FIELD field_16840 difficulty Lnet/minecraft/class_1267;
 	FIELD field_16841 gameMode Lnet/minecraft/class_1934;
 	FIELD field_16842 networkCompressionThreshold I
-	FIELD field_16843 levelSeed Ljava/lang/String;
 	FIELD field_16844 viewDistance I
 	FIELD field_16845 opPermissionLevel I
 	FIELD field_20324 functionPermissionLevel I

mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping

@@ -13,8 +13,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract
 	FIELD field_20331 blockBreakingProgress I
 	METHOD <init> (Lnet/minecraft/class_3218;)V
 		ARG 1 world
-	METHOD method_14256 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
+	METHOD method_14256 interactItem (Lnet/minecraft/class_3222;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
-		ARG 1 player
 		ARG 2 world
 		ARG 3 stack
 		ARG 4 hand
@@ -23,8 +22,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract
 		ARG 1 world
 	METHOD method_14260 setGameModeIfNotPresent (Lnet/minecraft/class_1934;)V
 	METHOD method_14261 setGameMode (Lnet/minecraft/class_1934;)V
-	METHOD method_14262 interactBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269;
+	METHOD method_14262 interactBlock (Lnet/minecraft/class_3222;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269;
-		ARG 1 player
 		ARG 2 world
 		ARG 3 stack
 		ARG 4 hand

mappings/net/minecraft/server/world/ServerChunkManager.mapping

@@ -21,6 +21,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 		ARG 5 workerExecutor
 		ARG 6 chunkGenerator
 		ARG 7 viewDistance
+	METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794;
 	METHOD method_14096 updateCameraPosition (Lnet/minecraft/class_3222;)V
 		ARG 1 player

mappings/net/minecraft/server/world/ServerWorld.mapping

@@ -19,8 +19,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	FIELD field_18264 inEntityTick Z
 	FIELD field_18811 raidManager Lnet/minecraft/class_3767;
 	FIELD field_23787 structureAccessor Lnet/minecraft/class_5138;
-	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJ)V
-		ARG 1 server
 		ARG 2 workerExecutor
 		ARG 4 properties
 		ARG 5 dimensionType

mappings/net/minecraft/structure/StructureFeatures.mapping

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_3420 net/minecraft/structure/StructureFeatures
 	FIELD field_15262 LOGGER Lorg/apache/logging/log4j/Logger;
-	METHOD method_14842 readStructureStart (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3449;
+	METHOD method_14842 readStructureStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449;
-		ARG 0 chunkGenerator
-		ARG 1 structureManager
 	METHOD method_14846 register (Ljava/lang/String;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3195;
 		ARG 0 name
 		ARG 1 feature

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -67,8 +67,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 6 z
 		ARG 7 facing
 		ARG 8 lootTbaleId
-	METHOD method_14931 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z
+	METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
 		ARG 4 random

mappings/net/minecraft/structure/StructureStart.mapping

@@ -25,8 +25,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
 	METHOD method_14972 toTag (II)Lnet/minecraft/class_2487;
 		ARG 1 chunkX
 		ARG 2 chunkZ
-	METHOD method_14974 generateStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
+	METHOD method_14974 generateStructure (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
-		ARG 1 world
 	METHOD method_14979 isInExistingChunk ()Z
 	METHOD method_16655 init (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;)V
 		ARG 1 chunkGenerator

mappings/net/minecraft/structure/pool/StructurePoolElement.mapping

@@ -4,9 +4,8 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement
 		ARG 1 projection
 	METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786;
 	METHOD method_16625 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
-	METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;Z)Z
+	METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;Z)Z
 		ARG 1 structureManager
-		ARG 2 world
 	METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List;
 		ARG 1 structureManager
 		ARG 2 pos

mappings/net/minecraft/text/Text.mapping

@@ -14,7 +14,7 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text
 		COMMENT
 		COMMENT @see Visitor#accept(String)
 		COMMENT @see StyledVisitor#accept(Style, String)
-	METHOD getString getString ()Ljava/lang/String;
+	METHOD getString ()Ljava/lang/String;
 		COMMENT Returns the full string representation of this text, including siblings.
 		COMMENT
 		COMMENT {@inheritDoc}
@@ -109,7 +109,7 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text
 			ARG 3 context
 	CLASS class_5245 Visitor
 		COMMENT A visitor for text content.
-		METHOD accept accept (Ljava/lang/String;)Ljava/util/Optional;
+		METHOD accept (Ljava/lang/String;)Ljava/util/Optional;
 			COMMENT Visits a text's {@link Text#asString() asString result}.
 			COMMENT
 			COMMENT <p>When a {@link Optional#isPresent() present optional} is returned,
@@ -118,7 +118,7 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text
 			ARG 1 asString
 	CLASS class_5246 StyledVisitor
 		COMMENT A visitor for text content and a contextual {@link Style}.
-		METHOD accept accept (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional;
+		METHOD accept (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional;
 			COMMENT Visits a text's contextual style and {@link Text#asString() asString
 			COMMENT result}.
 			COMMENT

mappings/net/minecraft/util/Util.mapping

@@ -7,7 +7,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 	METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional;
 	METHOD method_18349 getServerWorkerExecutor ()Ljava/util/concurrent/Executor;
 	METHOD method_18350 shutdownServerWorkerExecutor ()V
-	METHOD method_18351 createServerWorkerExecutor ()Ljava/util/concurrent/ExecutorService;
 	METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable;
 		ARG 0 runnable
 		ARG 1 messageSupplier

mappings/net/minecraft/world/ChunkRegion.mapping

@@ -7,7 +7,6 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion
 	FIELD field_14092 LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD field_14093 world Lnet/minecraft/class_3218;
 	FIELD field_14094 fluidTickScheduler Lnet/minecraft/class_1951;
-	FIELD field_14095 generatorSettings Lnet/minecraft/class_2888;
 	FIELD field_14096 dimension Lnet/minecraft/class_2869;
 	FIELD field_14097 levelProperties Lnet/minecraft/class_5217;
 	FIELD field_14098 chunks Ljava/util/List;

mappings/net/minecraft/world/ChunkSerializer.mapping

@@ -12,9 +12,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer
 	METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map;
 		ARG 0 pos
 		ARG 1 tag
-	METHOD method_12392 readStructureStarts (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)Ljava/util/Map;
+	METHOD method_12392 readStructureStarts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;J)Ljava/util/Map;
-		ARG 0 chunkGenerator
-		ARG 1 structureManager
 	METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499;
 		ARG 0 lists
 	METHOD method_12395 deserialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_4153;Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2839;

mappings/net/minecraft/world/IWorld.mapping

@@ -35,7 +35,6 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld
 		ARG 2 block
 	METHOD method_8409 getRandom ()Ljava/util/Random;
 	METHOD method_8410 getWorld ()Lnet/minecraft/class_1937;
-	METHOD method_8412 getSeed ()J
 	METHOD method_8444 syncWorldEvent (Lnet/minecraft/class_1657;ILnet/minecraft/class_2338;I)V
 		ARG 1 player
 		ARG 2 eventId

mappings/net/minecraft/world/SpawnHelper.mapping

@@ -51,12 +51,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 1 entityType
 		ARG 2 x
 		ARG 3 z
-	METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338;)Z
+	METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338;)Z
-		ARG 0 structureAccessor
-		ARG 1 chunkGenerator
-		ARG 2 group
-		ARG 3 spawnEntry
-		ARG 4 pos
 	METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
 		ARG 0 location
 		ARG 1 world
@@ -78,12 +73,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 2 chunk
 		ARG 3 checker
 		ARG 4 runner
-	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964;
+	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964;
-		ARG 0 structureAccessor
-		ARG 1 chunkGenerator
-		ARG 2 group
-		ARG 3 random
-		ARG 4 pos
 	CLASS class_5259 Runner
 		METHOD run (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V
 			ARG 1 entity

mappings/net/minecraft/world/World.mapping

@@ -17,17 +17,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	FIELD field_9241 pendingBlockEntities Ljava/util/List;
 	FIELD field_9246 tickingBlockEntities Ljava/util/List;
 	FIELD field_9247 dimension Lnet/minecraft/class_2869;
-	FIELD field_9248 chunkManager Lnet/minecraft/class_2802;
 	FIELD field_9249 iteratingTickingBlockEntities Z
 	FIELD field_9251 thunderGradientPrev F
 	FIELD field_9253 rainGradientPrev F
 	FIELD field_9256 lcgBlockSeed I
-	METHOD <init> (Lnet/minecraft/class_5269;Lnet/minecraft/class_2874;Ljava/util/function/BiFunction;Ljava/util/function/Supplier;Z)V
-		ARG 1 levelProperties
-		ARG 2 dimensionType
-		ARG 3 chunkManagerProvider
-		ARG 4 profiler
-		ARG 5 isClient
 	METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695;
 	METHOD method_16109 checkBlockRerender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
@@ -237,7 +230,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	METHOD method_8526 setBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2586;)V
 		ARG 1 pos
 		ARG 2 blockEntity
-	METHOD method_8527 getGeneratorType ()Lnet/minecraft/class_1942;
 	METHOD method_8530 isDay ()Z
 	METHOD method_8532 getTimeOfDay ()J
 	METHOD method_8533 calculateAmbientDarkness ()V

mappings/net/minecraft/world/biome/Biome.mapping

@@ -66,11 +66,10 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 	METHOD method_8698 getFoliageColor ()I
 	METHOD method_8700 getEntitySpawnList (Lnet/minecraft/class_1311;)Ljava/util/List;
 		ARG 1 group
-	METHOD method_8702 generateFeatureStep (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1936;JLnet/minecraft/class_2919;Lnet/minecraft/class_2338;)V
+	METHOD method_8702 generateFeatureStep (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5281;JLnet/minecraft/class_2919;Lnet/minecraft/class_2338;)V
 		ARG 1 step
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
-		ARG 4 world
 		ARG 5 populationSeed
 		ARG 7 chunkRandom
 		ARG 8 pos

mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping

@@ -9,10 +9,8 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers
 	FIELD field_16114 LUKEWARM_OCEAN_ID I
 	FIELD field_16115 WARM_OCEAN_ID I
 	FIELD field_16116 DEEP_FROZEN_OCEAN_ID I
-	METHOD method_15843 build (JLnet/minecraft/class_1942;Lnet/minecraft/class_2906;)Lnet/minecraft/class_3642;
+	METHOD method_15843 build (JZII)Lnet/minecraft/class_3642;
 		ARG 0 seed
-		ARG 2 generatorType
-		ARG 3 settings
 	METHOD method_15844 areSimilar (II)Z
 		ARG 0 id1
 		ARG 1 id2
@@ -20,10 +18,7 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers
 		ARG 0 id
 	METHOD method_15846 isShallowOcean (I)Z
 		ARG 0 id
-	METHOD method_15847 build (Lnet/minecraft/class_1942;Lnet/minecraft/class_2906;Ljava/util/function/LongFunction;)Lnet/minecraft/class_3627;
+	METHOD method_15847 build (ZIILjava/util/function/LongFunction;)Lnet/minecraft/class_3627;
-		ARG 0 generatorType
-		ARG 1 settings
-		ARG 2 contextProvider
 	METHOD method_15848 stack (JLnet/minecraft/class_3660;Lnet/minecraft/class_3627;ILjava/util/function/LongFunction;)Lnet/minecraft/class_3627;
 		ARG 0 seed
 		ARG 2 layer

mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping

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

mappings/net/minecraft/world/biome/source/BiomeSourceConfig.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_1970 net/minecraft/world/biome/source/BiomeSourceConfig

mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping

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

mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping

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

mappings/net/minecraft/world/biome/source/CheckerboardBiomeSourceConfig.mapping

@@ -1,9 +0,0 @@
-CLASS net/minecraft/class_1976 net/minecraft/world/biome/source/CheckerboardBiomeSourceConfig
-	FIELD field_9482 size I
-	FIELD field_9483 biomes [Lnet/minecraft/class_1959;
-	METHOD method_8777 setBiomes ([Lnet/minecraft/class_1959;)Lnet/minecraft/class_1976;
-		ARG 1 biomes
-	METHOD method_8778 getSize ()I
-	METHOD method_8779 getBiomes ()[Lnet/minecraft/class_1959;
-	METHOD method_8780 setSize (I)Lnet/minecraft/class_1976;
-		ARG 1 size

mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping

@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_1992 net/minecraft/world/biome/source/FixedBiomeSource
 	FIELD field_9486 biome Lnet/minecraft/class_1959;
-	METHOD <init> (Lnet/minecraft/class_1991;)V
-		ARG 1 config

mappings/net/minecraft/world/biome/source/FixedBiomeSourceConfig.mapping

@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_1991 net/minecraft/world/biome/source/FixedBiomeSourceConfig
-	FIELD field_9485 biome Lnet/minecraft/class_1959;
-	METHOD method_8781 getBiome ()Lnet/minecraft/class_1959;
-	METHOD method_8782 setBiome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_1991;
-		ARG 1 biome

mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping

@@ -5,5 +5,3 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS
 	FIELD field_22081 weirdnessNoise Lnet/minecraft/class_5216;
 	FIELD field_24115 biomePoints Ljava/util/List;
 	FIELD field_24116 threeDimensionalSampling Z
-	METHOD <init> (Lnet/minecraft/class_4767;)V
-		ARG 1 config

mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceConfig.mapping

@@ -1,21 +0,0 @@
-CLASS net/minecraft/class_4767 net/minecraft/world/biome/source/MultiNoiseBiomeSourceConfig
-	FIELD field_22082 seed J
-	FIELD field_22083 temperatureOctaves Lcom/google/common/collect/ImmutableList;
-	FIELD field_22084 humidityOctaves Lcom/google/common/collect/ImmutableList;
-	FIELD field_22085 altitudeOctaves Lcom/google/common/collect/ImmutableList;
-	FIELD field_22086 weirdnessOctaves Lcom/google/common/collect/ImmutableList;
-	FIELD field_24117 threeDimensionalSampling Z
-	FIELD field_24118 biomePoints Ljava/util/List;
-	METHOD <init> (J)V
-		ARG 1 seed
-	METHOD method_24404 withBiomes (Ljava/util/List;)Lnet/minecraft/class_4767;
-		ARG 1 biomes
-	METHOD method_24405 getSeed ()J
-	METHOD method_24406 getTemperatureOctaves ()Lcom/google/common/collect/ImmutableList;
-	METHOD method_24407 getHumidityOctaves ()Lcom/google/common/collect/ImmutableList;
-	METHOD method_24408 getAltitudeOctaves ()Lcom/google/common/collect/ImmutableList;
-	METHOD method_24409 getWeirdnessOctaves ()Lcom/google/common/collect/ImmutableList;
-	METHOD method_27347 getBiomePoints ()Ljava/util/List;
-	METHOD method_27350 withBiomePoints (Ljava/util/List;)Lnet/minecraft/class_4767;
-		ARG 1 biomePoints
-	METHOD method_27351 useThreeDimensionalSampling ()Z

mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping

@@ -1,6 +1,3 @@
 CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource
-	FIELD field_9829 random Lnet/minecraft/class_2919;
 	FIELD field_9830 BIOMES Ljava/util/Set;
 	FIELD field_9831 noise Lnet/minecraft/class_3541;
-	METHOD <init> (Lnet/minecraft/class_2167;)V
-		ARG 1 config

mappings/net/minecraft/world/biome/source/TheEndBiomeSourceConfig.mapping

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_2167 net/minecraft/world/biome/source/TheEndBiomeSourceConfig
-	FIELD field_9814 seed J
-	METHOD method_9204 getSeed ()J

mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource
 	FIELD field_9677 BIOMES Ljava/util/Set;
 	FIELD field_9680 biomeSampler Lnet/minecraft/class_3642;
-	METHOD <init> (Lnet/minecraft/class_2084;)V
-		ARG 1 config

mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping

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

mappings/net/minecraft/world/chunk/ChunkManager.mapping

@@ -17,8 +17,6 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager
 		ARG 1 chunkX
 		ARG 2 chunkZ
 		ARG 3 create
-	METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V
-		ARG 1 shouldKeepTicking
 	METHOD method_12128 setMobSpawnOptions (ZZ)V
 		ARG 1 spawnMonsters
 		ARG 2 spawnAnimals

mappings/net/minecraft/world/dimension/Dimension.mapping

@@ -1,42 +1,17 @@
 CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension
 	FIELD field_13053 lightLevelToBrightness [F
-	FIELD field_13054 backgroundColor [F
 	FIELD field_13055 type Lnet/minecraft/class_2874;
-	FIELD field_13056 isNether Z
-	FIELD field_13057 waterVaporizes Z
 	FIELD field_13058 world Lnet/minecraft/class_1937;
 	FIELD field_13059 MOON_PHASE_TO_SIZE [F
 	METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2874;F)V
 		ARG 1 world
 		ARG 2 type
-	METHOD method_12443 createChunkGenerator ()Lnet/minecraft/class_2794;
+	METHOD method_12444 getTopSpawningBlockPosition (JIIZ)Lnet/minecraft/class_2338;
-	METHOD method_12444 getTopSpawningBlockPosition (IIZ)Lnet/minecraft/class_2338;
-		ARG 1 x
-		ARG 2 z
-		ARG 3 checkMobSpawnValidity
-	METHOD method_12445 modifyFogColor (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243;
-		COMMENT Modify the fog color offered (usually by the biome).
-		COMMENT
-		COMMENT <p>The overworld slightly whiteshifts and blueshifts this color; the
-		COMMENT nether doesn't touch it; the end significantly blackshifts this color.
-		ARG 2 tickDelta
-	METHOD method_12446 getBackgroundColor (FF)[F
-		ARG 1 skyAngle
-		ARG 2 tickDelta
 	METHOD method_12448 canPlayersSleep ()Z
-	METHOD method_12449 hasGround ()Z
 	METHOD method_12450 saveWorldData (Lnet/minecraft/class_5268;)V
-	METHOD method_12451 hasSkyLight ()Z
+	METHOD method_12452 getSpawningBlockInChunk (JLnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338;
-	METHOD method_12452 getSpawningBlockInChunk (Lnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338;
-		ARG 1 chunkPos
-		ARG 2 checkMobSpawnValidity
-	METHOD method_12453 isFogThick (II)Z
-		ARG 1 x
-		ARG 2 z
 	METHOD method_12454 getMoonPhase (J)I
 		ARG 1 time
-	METHOD method_12455 getCloudHeight ()F
-	METHOD method_12459 getHorizonShadingRatio ()D
 	METHOD method_12460 getType ()Lnet/minecraft/class_2874;
 	METHOD method_12461 update ()V
 	METHOD method_12462 hasVisibleSky ()Z
@@ -44,8 +19,6 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension
 	METHOD method_12464 getSkyAngle (JF)F
 		ARG 1 timeOfDay
 		ARG 3 tickDelta
-	METHOD method_12465 doesWaterVaporize ()Z
 	METHOD method_12466 getForcedSpawnPoint ()Lnet/minecraft/class_2338;
-	METHOD method_12467 isNether ()Z
 	METHOD method_23759 getBrightness (I)F
 		ARG 1 lightLevel

mappings/net/minecraft/world/dimension/DimensionType.mapping

@@ -5,13 +5,12 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	FIELD field_13077 suffix Ljava/lang/String;
 	FIELD field_13079 saveDir Ljava/lang/String;
 	FIELD field_20658 biomeAccessType Lnet/minecraft/class_4545;
-	METHOD <init> (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZLnet/minecraft/class_4545;)V
+	METHOD <init> (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZZZLnet/minecraft/class_4545;)V
 		ARG 1 dimensionId
 		ARG 2 suffix
 		ARG 3 saveDir
 		ARG 4 factory
 		ARG 5 hasSkylight
-		ARG 6 biomeAccessType
 	METHOD method_12482 getAll ()Ljava/lang/Iterable;
 	METHOD method_12483 byId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2874;
 		ARG 0 identifier

mappings/net/minecraft/world/gen/StructureAccessor.mapping

@@ -4,10 +4,9 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
 		ARG 2 feature
 		ARG 3 reference
 		ARG 5 holder
-	METHOD method_26974 getStructuresWithChildren (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_1936;)Ljava/util/stream/Stream;
+	METHOD method_26974 getStructuresWithChildren (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/stream/Stream;
 		ARG 1 pos
 		ARG 2 feature
-		ARG 3 world
 	METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449;
 		ARG 1 pos
 		ARG 2 feature

mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping

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

mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping

@@ -2,14 +2,8 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	COMMENT In charge of shaping, adding biome specific surface blocks, and carving chunks,
 	COMMENT as well as populating the generated chunks with {@linkplain net.minecraft.world.gen.feature.Feature features} and {@linkplain net.minecraft.entity.Entity entities}.
 	COMMENT Biome placement starts here, however all vanilla and most modded chunk generators delegate this to a {@linkplain net.minecraft.world.biome.source.BiomeSource biome source}.
-	FIELD field_12759 seed J
-	FIELD field_12760 world Lnet/minecraft/class_1936;
 	FIELD field_12761 biomeSource Lnet/minecraft/class_1966;
 	FIELD field_16567 config Lnet/minecraft/class_2888;
-	METHOD <init> (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_2888;)V
-		ARG 1 world
-		ARG 2 biomeSource
-		ARG 3 config
 	METHOD method_12088 populateNoise (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
 		COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config.
 		ARG 1 world
@@ -22,7 +16,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 2 spawnMonsters
 		ARG 3 spawnAnimals
 	METHOD method_12100 getSpawnHeight ()I
-	METHOD method_12101 getSeed ()J
 	METHOD method_12102 generateFeatures (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;)V
 	METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
 		ARG 2 id
@@ -35,14 +28,13 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 1 chunk
 	METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V
 		ARG 1 region
-	METHOD method_12108 carve (Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V
+	METHOD method_12108 carve (JLnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V
-		ARG 3 carver
 	METHOD method_12109 getConfig ()Lnet/minecraft/class_2888;
 	METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V
 		ARG 1 region
 		ARG 2 chunk
-	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List;
+	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1959;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List;
-	METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;)V
+	METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;J)V
 	METHOD method_16130 addStructureReferences (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
 		ARG 1 world
 	METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;)I
@@ -64,5 +56,4 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	METHOD method_26261 getColumnSample (II)Lnet/minecraft/class_1922;
 		ARG 1 x
 		ARG 2 z
-	METHOD method_27192 getDimensionType ()Lnet/minecraft/class_2874;
 	METHOD method_27367 hasStructure (Lnet/minecraft/class_3195;)Z

mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_2888 net/minecraft/world/gen/chunk/ChunkGeneratorConfig
 	FIELD field_13137 templeSeparation I
-	FIELD field_13138 defaultBlock Lnet/minecraft/class_2680;
 	FIELD field_13139 templeDistance I
 	FIELD field_13140 strongholdSpread I
 	FIELD field_13141 strongholdCount I
@@ -16,15 +15,10 @@ CLASS net/minecraft/class_2888 net/minecraft/world/gen/chunk/ChunkGeneratorConfi
 	FIELD field_13151 endCitySeparation I
 	FIELD field_13152 endCityDistance I
 	FIELD field_13153 shipwreckSeparation I
-	FIELD field_13154 defaultFluid Lnet/minecraft/class_2680;
 	FIELD field_13155 shipwreckSpacing I
 	FIELD field_23987 netherStructureSpacing I
 	FIELD field_23988 netherStructureSeparation I
 	FIELD field_23989 netherStructureSeedModifier I
-	FIELD field_23990 ruinedPortalSpacing I
-	FIELD field_23991 ruinedPortalSeparation I
-	FIELD field_23992 netherRuinedPortalSpacing I
-	FIELD field_23993 netherRuinedPortalSeparation I
 	METHOD method_12552 getMansionSeparation ()I
 	METHOD method_12553 getOceanMonumentSpacing ()I
 	METHOD method_12554 getEndCityDistance ()I
@@ -42,22 +36,8 @@ CLASS net/minecraft/class_2888 net/minecraft/world/gen/chunk/ChunkGeneratorConfi
 	METHOD method_12566 getShipwreckSpacing ()I
 	METHOD method_12567 getTempleDistance ()I
 	METHOD method_12568 getTempleSeparation ()I
-	METHOD method_12569 getDefaultBlock ()Lnet/minecraft/class_2680;
-	METHOD method_12570 getDefaultFluid ()Lnet/minecraft/class_2680;
-	METHOD method_12571 setDefaultBlock (Lnet/minecraft/class_2680;)V
-		ARG 1 state
-	METHOD method_12572 setDefaultFluid (Lnet/minecraft/class_2680;)V
-		ARG 1 state
-	METHOD method_16400 getBedrockCeilingY ()I
-		COMMENT Returns the Y level of the bedrock ceiling, or {@code 0} if the bedrock
-		COMMENT ceiling should not be generated.
-	METHOD method_16401 getBedrockFloorY ()I
-		COMMENT Returns the Y level of the bedrock floor, or {@code 256} if the bedrock
-		COMMENT floor should not be generated.
 	METHOD method_27193 getNetherStructureSpacing ()I
-	METHOD method_27194 getRuinedPortalSpacing (Z)I
+	METHOD method_27194 getRuinedPortalSpacing ()I
-		ARG 1 inNether
 	METHOD method_27195 getNetherStructureSeparation ()I
-	METHOD method_27196 getRuinedPortalSeparation (Z)I
+	METHOD method_27196 getRuinedPortalSeparation ()I
-		ARG 1 inNether
 	METHOD method_27197 getNetherStructureSeedModifier ()I

mappings/net/minecraft/world/gen/chunk/ChunkGeneratorFactory.mapping

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

mappings/net/minecraft/world/gen/chunk/ChunkGeneratorType.mapping

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

mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping

@@ -4,10 +4,6 @@ CLASS net/minecraft/class_2891 net/minecraft/world/gen/chunk/DebugChunkGenerator
 	FIELD field_13162 AIR Lnet/minecraft/class_2680;
 	FIELD field_13163 BLOCK_STATES Ljava/util/List;
 	FIELD field_13164 BARRIER Lnet/minecraft/class_2680;
-	METHOD <init> (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_2892;)V
-		ARG 1 world
-		ARG 2 biomeSource
-		ARG 3 config
 	METHOD method_12578 getBlockState (II)Lnet/minecraft/class_2680;
 		ARG 0 x
 		ARG 1 z

mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorConfig.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_2892 net/minecraft/world/gen/chunk/DebugChunkGeneratorConfig

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

@@ -2,9 +2,5 @@ CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator
 	FIELD field_13183 biome Lnet/minecraft/class_1959;
 	FIELD field_13184 phantomSpawner Lnet/minecraft/class_2910;
 	FIELD field_19180 catSpawner Lnet/minecraft/class_4274;
-	METHOD <init> (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_3232;)V
-		ARG 1 world
-		ARG 2 biomeSource
-		ARG 3 config
 	METHOD method_12589 getBiome ()Lnet/minecraft/class_1959;
 	CLASS class_2898 FlatChunkGeneratorBiome

mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping

@@ -40,8 +40,6 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC
 	METHOD method_14323 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3232;
 		ARG 0 dynamic
 	METHOD method_14324 setStructureOption (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-		ARG 1 structure
-		ARG 2 key
 		ARG 3 value
 	METHOD method_14325 setBiome (Lnet/minecraft/class_1959;)V
 	METHOD method_14326 getBiome ()Lnet/minecraft/class_1959;

mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping

@@ -1,2 +1 @@
 CLASS net/minecraft/class_2914 net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator
-	FIELD field_13268 center Lnet/minecraft/class_2338;

mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorConfig.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_2916 net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorConfig
-	FIELD field_13272 center Lnet/minecraft/class_2338;
-	METHOD method_12651 withCenter (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2916;
-	METHOD method_12652 getCenter ()Lnet/minecraft/class_2338;

mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping

@@ -1,15 +1,10 @@
 CLASS net/minecraft/class_2912 net/minecraft/world/gen/chunk/OverworldChunkGenerator
 	FIELD field_13245 phantomSpawner Lnet/minecraft/class_2910;
 	FIELD field_13254 BIOME_WEIGHT_TABLE [F
-	FIELD field_16582 amplified Z
 	FIELD field_16583 noiseSampler Lnet/minecraft/class_3537;
 	FIELD field_16650 pillagerSpawner Lnet/minecraft/class_3769;
 	FIELD field_19181 catSpawner Lnet/minecraft/class_4274;
 	FIELD field_19430 zombieSiegeManager Lnet/minecraft/class_1419;
-	METHOD <init> (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_2906;)V
-		ARG 1 world
-		ARG 2 biomeSource
-		ARG 3 config
 	METHOD method_16414 sampleNoise (II)D
 		ARG 1 x
 		ARG 2 y

mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping

@@ -1,5 +1 @@
 CLASS net/minecraft/class_2906 net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig
-	FIELD field_13222 forcedBiome I
-	METHOD method_12614 getBiomeSize ()I
-	METHOD method_12615 getForcedBiome ()I
-	METHOD method_12616 getRiverSize ()I

mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping

@@ -9,14 +9,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/SurfaceChunkGenerat
 	FIELD field_16579 noiseSizeY I
 	FIELD field_16580 noiseSizeX I
 	FIELD field_16648 AIR Lnet/minecraft/class_2680;
-	METHOD <init> (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;IIILnet/minecraft/class_2888;Z)V
-		ARG 1 world
-		ARG 2 biomeSource
-		ARG 3 verticalNoiseResolution
-		ARG 4 horizontalNoiseResolution
-		ARG 5 worldHeight
-		ARG 6 config
-		ARG 7 useSimplexNoise
 	METHOD method_12090 computeNoiseRange (II)[D
 		ARG 1 x
 		ARG 2 z

mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping

@@ -5,8 +5,7 @@ CLASS net/minecraft/class_3243 net/minecraft/world/gen/decorator/ConfiguredDecor
 		ARG 1 decorator
 	METHOD <init> (Lnet/minecraft/class_3284;Lnet/minecraft/class_2998;)V
 		ARG 1 decorator
-	METHOD method_14358 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2975;)Z
+	METHOD method_14358 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2975;)Z
-		ARG 1 world
 	METHOD method_14359 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3243;
 		ARG 0 dynamic
 	METHOD method_16641 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;

mappings/net/minecraft/world/gen/decorator/Decorator.mapping

@@ -12,6 +12,5 @@ CLASS net/minecraft/class_3284 net/minecraft/world/gen/decorator/Decorator
 		ARG 3 random
 		ARG 4 config
 		ARG 5 pos
-	METHOD method_15927 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2998;Lnet/minecraft/class_2975;)Z
+	METHOD method_15927 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2998;Lnet/minecraft/class_2975;)Z
-		ARG 1 world
 	METHOD method_23475 configure (Lnet/minecraft/class_2998;)Lnet/minecraft/class_3243;

mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature
 		ARG 2 config
 	METHOD method_12861 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2975;
 		ARG 0 dynamic
-	METHOD method_12862 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_12862 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
 	METHOD method_16584 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
 		ARG 1 ops
 	METHOD method_23387 withChance (F)Lnet/minecraft/class_3226;

mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_3310 net/minecraft/world/gen/feature/EndSpikeFeature
 	FIELD field_14309 CACHE Lcom/google/common/cache/LoadingCache;
-	METHOD method_14506 getSpikes (Lnet/minecraft/class_1936;)Ljava/util/List;
+	METHOD method_14506 getSpikes (Lnet/minecraft/class_5281;)Ljava/util/List;
-		ARG 0 world
 	METHOD method_15888 generateSpike (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_3666;Lnet/minecraft/class_3310$class_3181;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/world/gen/feature/Feature.mapping

@@ -30,8 +30,7 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature
 	METHOD method_13150 register (Ljava/lang/String;Lnet/minecraft/class_3031;)Lnet/minecraft/class_3031;
 		ARG 0 name
 		ARG 1 feature
-	METHOD method_13151 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z
+	METHOD method_13151 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z
-		ARG 1 world
 		ARG 2 accessor
 		ARG 3 generator
 		ARG 4 random

mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping

@@ -6,6 +6,6 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntr
 		ARG 2 chance
 	METHOD method_14270 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3226;
 		ARG 0 dynamic
-	METHOD method_14271 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
 	METHOD method_16599 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
 		ARG 1 dynamic

mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature
 	FIELD field_13852 startPositions [Lnet/minecraft/class_1923;
 	FIELD field_13853 starts Ljava/util/List;
 	FIELD field_13854 lastSeed J
-	METHOD method_13985 initialize (Lnet/minecraft/class_2794;)V
+	METHOD method_13985 initialize (Lnet/minecraft/class_2794;J)V
 		ARG 1 chunkGenerator
 	METHOD method_13986 invalidateState ()V
 	CLASS class_3189 Start

mappings/net/minecraft/world/gen/feature/StructureFeature.mapping

@@ -1,26 +1,18 @@
 CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 	FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger;
-	METHOD method_13773 getSpacing (Lnet/minecraft/class_2874;Lnet/minecraft/class_2888;)I
+	METHOD method_13773 getSpacing (Lnet/minecraft/class_2888;)I
-		ARG 1 dimensionType
-		ARG 2 chunkGeneratorConfig
 	METHOD method_13774 getSeedModifier (Lnet/minecraft/class_2888;)I
 		ARG 1 chunkGeneratorConfig
-	METHOD method_13775 getSeparation (Lnet/minecraft/class_2874;Lnet/minecraft/class_2888;)I
+	METHOD method_13775 getSeparation (Lnet/minecraft/class_2888;)I
-		ARG 1 dimensionType
-		ARG 2 chunkGenerationConfig
 	METHOD method_14015 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
 		ARG 5 skipExistingChunks
 	METHOD method_14016 getStructureStartFactory ()Lnet/minecraft/class_3195$class_3774;
 	METHOD method_14019 getName ()Ljava/lang/String;
 	METHOD method_14021 getRadius ()I
-	METHOD method_14023 isApproximatelyInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z
+	METHOD method_14023 isApproximatelyInsideStructure (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
+	METHOD method_14024 isInsideStructure (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z
-	METHOD method_14024 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z
+	METHOD method_14025 isInsideStructure (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3449;
-		ARG 1 world
+	METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;JLnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;)Z
-	METHOD method_14025 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3449;
-	METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;Lnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;)Z
-		ARG 4 chunkX
-		ARG 5 chunkZ
 	CLASS class_3774 StructureStartFactory
 		METHOD create (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449;
 			ARG 1 feature

mappings/net/minecraft/world/gen/feature/TreeFeature.mapping

@@ -44,7 +44,7 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 		ARG 2 box
 		ARG 3 logs
 		ARG 4 leaves
-	METHOD method_23381 (Lnet/minecraft/class_1936;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4662;)V
+	METHOD method_23381 (Lnet/minecraft/class_5281;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4662;)V
 		ARG 6 decorator
 	METHOD method_23384 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state

mappings/net/minecraft/world/level/LevelGeneratorOptions.mapping

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

mappings/net/minecraft/world/level/LevelGeneratorType.mapping

@@ -1,59 +0,0 @@
-CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType
-	FIELD field_23073 EMPTY_COMPOUND_NBT_DYNAMIC Lcom/mojang/datafixers/Dynamic;
-	FIELD field_23074 optionsLoader Ljava/util/function/Function;
-	FIELD field_23075 defaultOptions Lnet/minecraft/class_3528;
-	FIELD field_9265 DEFAULT Lnet/minecraft/class_1942;
-	FIELD field_9266 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_1942;
-	FIELD field_9267 AMPLIFIED Lnet/minecraft/class_1942;
-	FIELD field_9268 DEFAULT_1_1 Lnet/minecraft/class_1942;
-	FIELD field_9269 name Ljava/lang/String;
-	FIELD field_9270 customizable Z
-	FIELD field_9271 info Z
-	FIELD field_9272 storedName Ljava/lang/String;
-	FIELD field_9273 versioned Z
-	FIELD field_9274 visible Z
-	FIELD field_9275 BUFFET Lnet/minecraft/class_1942;
-	FIELD field_9276 LARGE_BIOMES Lnet/minecraft/class_1942;
-	FIELD field_9277 FLAT Lnet/minecraft/class_1942;
-	FIELD field_9278 CUSTOMIZED Lnet/minecraft/class_1942;
-	FIELD field_9279 TYPES [Lnet/minecraft/class_1942;
-	FIELD field_9280 version I
-	FIELD field_9281 id I
-	METHOD <init> (ILjava/lang/String;ILjava/util/function/BiFunction;)V
-		ARG 1 index
-		ARG 2 name
-		ARG 3 version
-		ARG 4 optionsFactory
-	METHOD <init> (ILjava/lang/String;Ljava/lang/String;ILjava/util/function/BiFunction;)V
-		ARG 1 index
-		ARG 2 name
-		ARG 3 storedName
-		ARG 4 version
-		ARG 5 optionsFactory
-	METHOD <init> (ILjava/lang/String;Ljava/util/function/BiFunction;)V
-		ARG 1 index
-		ARG 2 name
-		ARG 3 optionsFactory
-	METHOD method_25954 loadOptions (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4952;
-		ARG 1 dynamic
-	METHOD method_25957 getDefaultOptions ()Lnet/minecraft/class_4952;
-	METHOD method_8629 setHasInfo ()Lnet/minecraft/class_1942;
-	METHOD method_8630 getInfoTranslationKey ()Lnet/minecraft/class_2561;
-	METHOD method_8631 setCustomizable (Z)Lnet/minecraft/class_1942;
-		ARG 1 customizable
-	METHOD method_8632 getTypeForVersion (I)Lnet/minecraft/class_1942;
-		ARG 1 version
-	METHOD method_8633 setVisible (Z)Lnet/minecraft/class_1942;
-		ARG 1 visible
-	METHOD method_8634 setVersioned ()Lnet/minecraft/class_1942;
-	METHOD method_8635 getName ()Ljava/lang/String;
-	METHOD method_8636 getVersion ()I
-	METHOD method_8637 getId ()I
-	METHOD method_8638 getStoredName ()Ljava/lang/String;
-	METHOD method_8639 getTypeFromName (Ljava/lang/String;)Lnet/minecraft/class_1942;
-		ARG 0 name
-	METHOD method_8640 getTranslationKey ()Lnet/minecraft/class_2561;
-	METHOD method_8641 isCustomizable ()Z
-	METHOD method_8642 isVisible ()Z
-	METHOD method_8643 isVersioned ()Z
-	METHOD method_8644 hasInfo ()Z

mappings/net/minecraft/world/level/LevelInfo.mapping

@@ -1,40 +1,17 @@
 CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo
-	FIELD field_23072 generatorOptions Lnet/minecraft/class_4952;
+	FIELD field_23072 generatorOptions Lnet/minecraft/class_5285;
 	FIELD field_24105 name Ljava/lang/String;
 	FIELD field_24106 difficulty Lnet/minecraft/class_1267;
 	FIELD field_24107 gameRules Lnet/minecraft/class_1928;
 	FIELD field_9257 gameMode Lnet/minecraft/class_1934;
-	FIELD field_9258 bonusChest Z
-	FIELD field_9259 commands Z
 	FIELD field_9261 hardcore Z
 	FIELD field_9262 structures Z
-	FIELD field_9263 seed J
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_1934;ZLnet/minecraft/class_1267;ZLnet/minecraft/class_1928;Lnet/minecraft/class_5285;)V
-	METHOD <init> (Ljava/lang/String;JLnet/minecraft/class_1934;ZZLnet/minecraft/class_1267;Lnet/minecraft/class_4952;)V
 		ARG 1 name
-		ARG 2 seed
-		ARG 4 gameMode
-		ARG 5 structures
-		ARG 6 hardcore
-		ARG 7 difficulty
-		ARG 8 generatorOptions
-	METHOD <init> (Ljava/lang/String;JLnet/minecraft/class_1934;ZZLnet/minecraft/class_1267;Lnet/minecraft/class_4952;Lnet/minecraft/class_1928;)V
-		ARG 1 name
-		ARG 2 seed
-		ARG 4 gameMode
-		ARG 5 structures
-		ARG 6 hardcore
-		ARG 7 difficulty
-		ARG 8 generatorOptions
-		ARG 9 gameRules
 	METHOD method_27339 getLevelName ()Ljava/lang/String;
 	METHOD method_27340 getDifficulty ()Lnet/minecraft/class_1267;
 	METHOD method_27341 getGameRules ()Lnet/minecraft/class_1928;
-	METHOD method_8573 allowCommands ()Z
 	METHOD method_8574 getGameMode ()Lnet/minecraft/class_1934;
-	METHOD method_8575 setBonusChest ()Lnet/minecraft/class_1940;
+	METHOD method_8576 getGeneratorOptions ()Lnet/minecraft/class_5285;
-	METHOD method_8576 getGeneratorOptions ()Lnet/minecraft/class_4952;
-	METHOD method_8577 getSeed ()J
-	METHOD method_8578 enableCommands ()Lnet/minecraft/class_1940;
-	METHOD method_8581 hasBonusChest ()Z
 	METHOD method_8582 isHardcore ()Z
 	METHOD method_8583 hasStructures ()Z

mappings/net/minecraft/world/level/LevelProperties.mapping

@@ -1,7 +1,5 @@
 CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
 	FIELD field_151 spawnX I
-	FIELD field_152 legacyCustomOptions Ljava/lang/String;
-	FIELD field_153 randomSeed J
 	FIELD field_154 gameRules Lnet/minecraft/class_1928;
 	FIELD field_155 disabledDataPacks Ljava/util/Set;
 	FIELD field_156 customBossEvents Lnet/minecraft/class_2487;
@@ -35,13 +33,11 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
 	FIELD field_192 rainTime I
 	FIELD field_193 worldData Ljava/util/Map;
 	FIELD field_194 versionSnapshot Z
-	FIELD field_195 structures Z
 	FIELD field_196 dataVersion I
 	FIELD field_198 timeOfDay J
 	FIELD field_21837 serverBrands Ljava/util/Set;
 	FIELD field_21838 modded Z
-	FIELD field_23089 generatorOptions Lnet/minecraft/class_4952;
+	FIELD field_23089 generatorOptions Lnet/minecraft/class_5285;
-	FIELD field_24192 bonusChest Z
 	METHOD <init> (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;)V
 		ARG 1 tag
 		ARG 2 dataFixer
@@ -51,8 +47,3 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
 		ARG 1 levelTag
 		ARG 2 playerTag
 	METHOD method_185 loadPlayerData ()V
-	METHOD method_25989 updateGeneratorOptionsData (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;ILcom/mojang/datafixers/DataFixer;)Lcom/mojang/datafixers/Dynamic;
-		ARG 0 type
-		ARG 1 dynamic
-		ARG 2 dataVersion
-		ARG 3 dataFixer

mappings/net/minecraft/world/level/storage/LevelSummary.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
 	FIELD field_205 name Ljava/lang/String;
 	FIELD field_206 commandsAllowed Z
 	FIELD field_207 hardcore Z
-	FIELD field_208 generatorType Lnet/minecraft/class_1942;
+	FIELD field_208 generatorType Lnet/minecraft/class_5285;
 	FIELD field_209 requiresConversion Z
 	FIELD field_210 getSizeOnDisk J
 	FIELD field_211 lastPlayed J