22w11a

build.gradle

@@ -27,7 +27,7 @@ plugins {
 	id 'net.fabricmc.filament' version '0.3.0'
 }
 
-def minecraft_version = "1.18.2"
+def minecraft_version = "22w11a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

mappings/net/minecraft/block/AbstractLichenBlock.mapping

@@ -17,13 +17,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock
 		ARG 1 direction
 		ARG 2 pos
 		ARG 3 state
-	METHOD method_33359 addDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Z
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 direction
-		ARG 4 postProcess
-	METHOD method_33360 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_2350;)Z
-		ARG 5 to
 	METHOD method_33361 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680;
 		ARG 4 direction
 	METHOD method_33362 withDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680;
@@ -31,20 +24,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 direction
-	METHOD method_33363 trySpreadTo (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Z)Z
-		ARG 1 state
-		ARG 2 world
-		ARG 3 pos
-		ARG 4 from
-		ARG 5 to
-		ARG 6 postProcess
-	METHOD method_33364 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/Random;Z)Z
-		ARG 1 state
-		ARG 2 world
-		ARG 3 pos
-		ARG 4 from
-		ARG 5 random
-		ARG 6 postProcess
 	METHOD method_33365 disableDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2746;)Lnet/minecraft/class_2680;
 		ARG 0 state
 		ARG 1 direction
@@ -60,44 +39,21 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock
 		ARG 1 direction
 	METHOD method_33370 (Ljava/util/EnumMap;)V
 		ARG 0 shapes
-	METHOD method_33371 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;ZLnet/minecraft/class_2350;)Z
-		ARG 6 to
 	METHOD method_33372 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z
 		ARG 1 direction
 	METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746;
 		ARG 0 direction
-	METHOD method_33375 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
-		ARG 1 state
-		ARG 2 world
-		ARG 3 pos
-		ARG 4 random
 	METHOD method_33376 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z
 		ARG 1 direction
-	METHOD method_33377 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z
-		ARG 1 from
 	METHOD method_33378 isWaterlogged ()Z
-	METHOD method_33379 canGrowIn (Lnet/minecraft/class_2680;)Z
-		ARG 1 state
 	METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
 		ARG 0 state
 	METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_33382 isNotFullBlock (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_34728 canSpreadTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
+	METHOD method_41438 canGrowWithDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
 		ARG 1 world
-		ARG 2 pos
+		ARG 2 state
-		ARG 3 direction
-	METHOD method_34729 getSpreadLocation (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Ljava/util/Optional;
-		ARG 1 state
-		ARG 2 world
 		ARG 3 pos
-		ARG 4 from
+		ARG 4 direction
-		ARG 5 to
-	METHOD method_34730 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z
-		ARG 5 to
-	METHOD method_34731 canSpread (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
-		ARG 1 state
-		ARG 2 world
-		ARG 3 pos
-		ARG 4 from

mappings/net/minecraft/block/AbstractRailBlock.mapping

@@ -7,8 +7,6 @@ CLASS net/minecraft/class_2241 net/minecraft/block/AbstractRailBlock
 		ARG 1 allowCurves
 		ARG 2 settings
 	METHOD method_24417 updateCurves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_2680;
-		ARG 1 state
-		ARG 2 world
 		ARG 3 pos
 		ARG 4 notify
 	METHOD method_27935 shouldDropRail (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_2768;)Z

mappings/net/minecraft/block/Block.mapping

@@ -102,6 +102,11 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
 		ARG 1 itemEntitySupplier
 		ARG 2 stack
 	METHOD method_40142 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883;
+	METHOD method_41420 dropExperienceWhenMined (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_6017;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 tool
+		ARG 4 experience
 	METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/Blocks.mapping

@@ -149,6 +149,18 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
 		ARG 0 state
 	METHOD method_36458 (Lnet/minecraft/class_2680;)I
 		ARG 0 state
+	METHOD method_36460 (Lnet/minecraft/class_2680;)I
+		ARG 0 state
+	METHOD method_36461 (Lnet/minecraft/class_2680;)I
+		ARG 0 state
+	METHOD method_38230 (Lnet/minecraft/class_2680;)I
+		ARG 0 state
+	METHOD method_39537 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
+		ARG 0 state
+		ARG 1 world
+		ARG 2 pos
+	METHOD method_41424 (Lnet/minecraft/class_2680;)I
+		ARG 0 state
 	METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248;
 		ARG 0 id
 		ARG 1 block

mappings/net/minecraft/block/OreBlock.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2431 net/minecraft/block/OreBlock
-	FIELD field_27195 experienceDropped Lnet/minecraft/class_6019;
+	FIELD field_27195 experienceDropped Lnet/minecraft/class_6017;
-	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_6019;)V
+	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_6017;)V
 		ARG 1 settings
-		ARG 2 experienceDropped
+		ARG 2 experience

mappings/net/minecraft/block/SculkBlock.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7125 net/minecraft/block/SculkBlock

mappings/net/minecraft/block/SculkCatalystBlock.mapping

@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_7126 net/minecraft/block/SculkCatalystBlock
+	FIELD field_37604 BLOOM Lnet/minecraft/class_2746;
+	FIELD field_37605 experience Lnet/minecraft/class_6017;
+	METHOD method_41477 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 random

mappings/net/minecraft/block/SculkShriekerBlock.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_7127 net/minecraft/block/SculkShriekerBlock
+	FIELD field_37606 SHAPE Lnet/minecraft/class_265;
+	FIELD field_37607 SHRIEKING Lnet/minecraft/class_2746;

mappings/net/minecraft/block/SculkVeinBlock.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_7130 net/minecraft/block/SculkVeinBlock
+	FIELD field_37631 WATERLOGGED Lnet/minecraft/class_2746;

mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping

@@ -36,20 +36,20 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
 			ARG 3 filledBottleStack
 		METHOD method_27900 (Lnet/minecraft/class_4970$class_4971;)Z
 			ARG 0 state
-	CLASS 21
+	CLASS 22 21
 		METHOD method_17199 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1681;)V
 			ARG 1 entity
-	CLASS 22
+	CLASS 23 22
 		METHOD method_17200 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1680;)V
 			ARG 1 entity
-	CLASS 23
+	CLASS 24 23
 		METHOD method_17201 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1683;)V
 			ARG 1 entity
-	CLASS 24
+	CLASS 25 24
 		CLASS 1
 			METHOD method_17203 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V
 				ARG 1 entity
-	CLASS 25
+	CLASS 26 25
 		CLASS 1
 			METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V
 				ARG 1 entity

mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEntity
+	FIELD field_37649 positionSource Lnet/minecraft/class_5707;
+	FIELD field_37650 spreadManager Lnet/minecraft/class_7128;
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 pos
+		ARG 2 state
+	METHOD method_41517 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_7132;)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 blockEntity
+	METHOD method_41519 getSpreadManager ()Lnet/minecraft/class_7128;

mappings/net/minecraft/class_7237.mapping

@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_7237
+	CLASS class_6906 FunctionLoaderConfig
+		FIELD comp_361 commandEnvironment Lnet/minecraft/class_2170$class_5364;
+		FIELD comp_362 functionPermissionLevel I
+		METHOD comp_361 commandEnvironment ()Lnet/minecraft/class_2170$class_5364;
+		METHOD comp_362 functionPermissionLevel ()I
+	CLASS class_6907 SavePropertiesSupplier
+		METHOD get (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
+			ARG 1 resourceManager
+			ARG 2 dataPackSettings

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -381,34 +381,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		COMMENT them.
 		ARG 1 sender
 	METHOD method_29043 isMultiplayerEnabled ()Z
-	METHOD method_29597 (Lnet/minecraft/class_1940;Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6905;
-		ARG 1 session
-	METHOD method_29600 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V
-		ARG 3 shouldBackup
-		ARG 4 eraseCache
-	METHOD method_29601 showExperimentalWarning (Lnet/minecraft/class_310$class_5366;Ljava/lang/String;ZLjava/lang/Runnable;)V
-		ARG 1 worldLoadAction
-		ARG 2 levelName
-		ARG 3 legacyCustomized
-		ARG 4 onConfirm
 	METHOD method_29603 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132;
 		ARG 1 thread
 		ARG 3 resourceManager
-	METHOD method_29605 (Ljava/lang/Runnable;Ljava/lang/String;Z)V
+	METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;)V
-		ARG 3 confirmed
-	METHOD method_29606 startIntegratedServer (Ljava/lang/String;)V
-		ARG 1 worldName
-	METHOD method_29607 createWorld (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V
-		ARG 1 worldName
-		ARG 2 levelInfo
-		ARG 3 dynamicRegistryManager
-		ARG 4 generatorOptions
-	METHOD method_29610 startIntegratedServer (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;ZLnet/minecraft/class_310$class_5366;)V
-		ARG 1 worldName
-		ARG 2 dataPackSettingsSupplierGetter
-		ARG 3 savePropertiesSupplierGetter
-		ARG 4 safeMode
-		ARG 5 worldLoadAction
 	METHOD method_29611 isFabulousGraphicsOrBetter ()Z
 	METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V
 		ARG 1 screen
@@ -482,26 +458,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 2 path
 	METHOD method_38736 createTelemetrySender ()Lnet/minecraft/class_6628;
 	METHOD method_38932 loadBlockList ()V
-	METHOD method_40183 createSaveLoader (Lnet/minecraft/class_3283;ZLnet/minecraft/class_6904$class_6905;Lnet/minecraft/class_6904$class_6907;)Lnet/minecraft/class_6904;
-		ARG 1 dataPackManager
-		ARG 2 safeMode
-		ARG 3 dataPackSettingsSupplier
-		ARG 4 savePropertiesSupplier
-	METHOD method_40184 (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult;
-		ARG 1 json
-	METHOD method_40185 createServerDataManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283;
-		ARG 0 session
-	METHOD method_40186 createSaveLoader (Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_6904;
-		ARG 1 session
-		ARG 2 safeMode
-	METHOD method_40187 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_1940;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-		ARG 3 resourceManager
-		ARG 4 dataPackSettings
-	METHOD method_40188 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_1940;Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6907;
-		ARG 3 session
 	METHOD method_40189 isCountrySetTo (Ljava/lang/Object;)Z
 		ARG 0 country
-	CLASS class_5366 WorldLoadAction
 	CLASS class_5859 ChatRestriction
 		COMMENT Represents the restrictions on chat on a Minecraft client.
 		COMMENT

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

@@ -24,14 +24,14 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/BitmapFont
 			ARG 4 charPosX
 			ARG 5 charPosY
 	CLASS class_388 BitmapFontGlyph
-		FIELD field_2291 ascent I
+		FIELD comp_603 scaleFactor F
-		FIELD field_2292 advance I
+		FIELD comp_604 image Lnet/minecraft/class_1011;
-		FIELD field_2293 height I
+		FIELD comp_605 x I
-		FIELD field_2294 image Lnet/minecraft/class_1011;
+		FIELD comp_606 y I
-		FIELD field_2295 width I
+		FIELD comp_607 width I
-		FIELD field_2296 scaleFactor F
+		FIELD comp_608 height I
-		FIELD field_2297 y I
+		FIELD comp_609 advance I
-		FIELD field_2298 x I
+		FIELD comp_610 ascent I
 		METHOD <init> (FLnet/minecraft/class_1011;IIIIII)V
 			ARG 1 scaleFactor
 			ARG 2 image
@@ -41,3 +41,11 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/BitmapFont
 			ARG 6 height
 			ARG 7 advance
 			ARG 8 ascent
+		METHOD comp_603 scaleFactor ()F
+		METHOD comp_604 image ()Lnet/minecraft/class_1011;
+		METHOD comp_605 x ()I
+		METHOD comp_606 y ()I
+		METHOD comp_607 width ()I
+		METHOD comp_608 height ()I
+		METHOD comp_609 advance ()I
+		METHOD comp_610 ascent ()I

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

@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_385 net/minecraft/client/font/BlankGlyph
-	FIELD field_2281 IMAGE Lnet/minecraft/class_1011;
-	FIELD field_32228 WIDTH I
-	FIELD field_32229 HEIGHT I
-	METHOD method_2036 (Lnet/minecraft/class_1011;)V
-		ARG 0 image

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_390 net/minecraft/client/font/Font
-	METHOD method_2040 getGlyph (I)Lnet/minecraft/class_383;
+	METHOD method_2040 getGlyph (I)Lnet/minecraft/class_379;
 		ARG 1 codePoint
 	METHOD method_27442 getProvidedGlyphs ()Lit/unimi/dsi/fastutil/ints/IntSet;
 		COMMENT {@return the set of code points for which this font can provide glyphs}

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

@@ -18,8 +18,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	METHOD method_27542 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
 		ARG 1 id
 	CLASS 1
-		METHOD method_18633 (Ljava/lang/String;)Z
-			ARG 0 fileName
 		METHOD method_18637 (Lnet/minecraft/class_2960;)Ljava/util/List;
 			ARG 0 id
 		METHOD method_27543 (Ljava/util/List;I)V

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

@@ -4,26 +4,16 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 	FIELD field_2247 fonts Ljava/util/List;
 	FIELD field_2248 textureManager Lnet/minecraft/class_1060;
 	FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-	FIELD field_2250 EMPTY_GLYPH_RENDERER Lnet/minecraft/class_384;
-	FIELD field_2251 SPACE Lnet/minecraft/class_379;
 	FIELD field_2252 RANDOM Ljava/util/Random;
 	FIELD field_2253 glyphRendererCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_2254 glyphAtlases Ljava/util/List;
 	FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382;
 	FIELD field_2257 glyphCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-	FIELD field_36363 ZERO_WIDTH_NON_JOINER Lnet/minecraft/class_379;
-	FIELD field_36364 ZERO_WIDTH_NON_JOINER_CODE_POINT I
 	METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
 		ARG 1 textureManager
 		ARG 2 id
 	METHOD method_2004 setFonts (Ljava/util/List;)V
 		ARG 1 fonts
-	METHOD method_2005 (I)Lnet/minecraft/class_379;
-		ARG 1 codePoint
-	METHOD method_2008 getRenderableGlyph (I)Lnet/minecraft/class_383;
-		ARG 1 codePoint
-	METHOD method_2009 (I)Lnet/minecraft/class_382;
-		ARG 1 codePoint
 	METHOD method_2010 closeGlyphAtlases ()V
 	METHOD method_2011 getGlyph (I)Lnet/minecraft/class_379;
 		ARG 1 codePoint

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

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_379 net/minecraft/client/font/Glyph
-	METHOD method_15976 getAscent ()F
-	METHOD method_16797 getBearingX ()F
 	METHOD method_16798 getAdvance (Z)F
 		ARG 1 bold
 	METHOD method_16799 getBoldOffset ()F

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

@@ -27,14 +27,15 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont
 		METHOD method_37431 getLegacyUnicodeTemplate (Lcom/google/gson/JsonObject;)Ljava/lang/String;
 			ARG 0 json
 	CLASS class_393 UnicodeTextureGlyph
-		FIELD field_2306 unpackSkipRows I
+		FIELD comp_611 unpackSkipPixels I
-		FIELD field_2307 unpackSkipPixels I
+		FIELD comp_612 unpackSkipRows I
-		FIELD field_2308 height I
+		FIELD comp_613 width I
-		FIELD field_2309 width I
+		FIELD comp_614 height I
-		FIELD field_2310 image Lnet/minecraft/class_1011;
+		FIELD comp_615 image Lnet/minecraft/class_1011;
 		METHOD <init> (IIIILnet/minecraft/class_1011;)V
-			ARG 1 unpackSkipPixels
-			ARG 2 unpackSkipRows
-			ARG 3 width
-			ARG 4 height
 			ARG 5 image
+		METHOD comp_611 unpackSkipPixels ()I
+		METHOD comp_612 unpackSkipRows ()I
+		METHOD comp_613 width ()I
+		METHOD comp_614 height ()I
+		METHOD comp_615 image ()Lnet/minecraft/class_1011;

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

@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_4591 net/minecraft/client/font/WhiteRectangleGlyph
-	FIELD field_20913 IMAGE Lnet/minecraft/class_1011;
-	FIELD field_32230 WIDTH I
-	FIELD field_32231 HEIGHT I
-	METHOD method_22945 (Lnet/minecraft/class_1011;)V
-		ARG 0 image

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

@@ -6,9 +6,8 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev
 	FIELD field_25040 biome Lnet/minecraft/class_6880;
 	FIELD field_25888 biomeRegistry Lnet/minecraft/class_2378;
 	FIELD field_26535 BUFFET_BIOME_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_5455;Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)V
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/function/Consumer;)V
 		ARG 1 parent
-		ARG 2 registryManager
 		ARG 3 onDone
 	METHOD method_19801 (Lnet/minecraft/class_4185;)V
 		ARG 1 button

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

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen
 	FIELD field_25043 LOGGER Lorg/slf4j/Logger;
 	FIELD field_25044 config Lnet/minecraft/class_3232;
-	FIELD field_2518 PRESETS Ljava/util/List;
 	FIELD field_2519 parent Lnet/minecraft/class_413;
 	FIELD field_2520 shareText Lnet/minecraft/class_2561;
 	FIELD field_2521 listWidget Lnet/minecraft/class_430$class_4196;
@@ -22,14 +21,6 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen
 		ARG 1 button
 	METHOD method_20102 updateSelectButton (Z)V
 		ARG 1 hasSelected
-	METHOD method_2195 addPreset (Lnet/minecraft/class_2561;Lnet/minecraft/class_1935;Lnet/minecraft/class_5321;Ljava/util/Set;ZZ[Lnet/minecraft/class_3229;)V
-		ARG 0 presetName
-		ARG 1 icon
-		ARG 2 presetBiome
-		ARG 3 structureKeys
-		ARG 4 generateStronghold
-		ARG 5 generateFeatures
-		ARG 6 layers
 	METHOD method_29058 parsePresetLayersString (Ljava/lang/String;)Ljava/util/List;
 		COMMENT Parse a string like {@code "minecraft:bedrock,3*minecraft:dirt,minecraft:grass_block"}
 		COMMENT to a list of {@link FlatChunkGeneratorLayer}.
@@ -45,23 +36,10 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen
 		ARG 3 generatorConfig
 	METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String;
 		ARG 0 config
-	METHOD method_31127 (Ljava/util/Set;ZZ[Lnet/minecraft/class_3229;Lnet/minecraft/class_5321;Lnet/minecraft/class_5455;)Lnet/minecraft/class_3232;
-		ARG 5 dynamicRegistryManager
-	METHOD method_41156 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/stream/Stream;
-		ARG 1 structureKey
-	CLASS class_431 SuperflatPreset
-		FIELD field_25045 generatorConfigProvider Ljava/util/function/Function;
-		FIELD field_2527 icon Lnet/minecraft/class_1792;
-		FIELD field_2528 name Lnet/minecraft/class_2561;
-		METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Ljava/util/function/Function;)V
-			ARG 1 icon
-			ARG 2 name
-			ARG 3 generatorConfigProvider
-		METHOD method_27571 getName ()Lnet/minecraft/class_2561;
 	CLASS class_4196 SuperflatPresetsListWidget
 		CLASS class_432 SuperflatPresetEntry
-			FIELD field_33812 preset Lnet/minecraft/class_430$class_431;
+			FIELD field_33812 preset Lnet/minecraft/class_7142;
-			METHOD <init> (Lnet/minecraft/class_430$class_4196;Lnet/minecraft/class_430$class_431;)V
+			METHOD <init> (Lnet/minecraft/class_430$class_4196;Lnet/minecraft/class_6880;)V
 				ARG 2 preset
 			METHOD method_19389 setPreset ()V
 			METHOD method_2198 drawIconBackground (Lnet/minecraft/class_4587;II)V

mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen
-	FIELD field_18730 OPTIONS [Lnet/minecraft/class_316;
 	FIELD field_32235 GUIDE_URL Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent

mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/option/ChatOptionsScreen
-	FIELD field_2352 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 options

mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptionsScreen
 	FIELD field_19246 buttonList Lnet/minecraft/class_353;
-	FIELD field_19247 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 gameOptions

mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping

@@ -3,7 +3,6 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre
 	FIELD field_2501 parent Lnet/minecraft/class_437;
 	FIELD field_2502 settings Lnet/minecraft/class_315;
 	FIELD field_2503 lockDifficultyButton Lnet/minecraft/class_347;
-	FIELD field_2504 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 gameOptions

mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping

@@ -8,12 +8,9 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption
 	FIELD field_25687 NEWLINE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_25688 warningManager Lnet/minecraft/class_5407;
 	FIELD field_2639 list Lnet/minecraft/class_353;
-	FIELD field_2640 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 options
-	METHOD method_19865 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
 	METHOD method_30052 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_30053 (Lnet/minecraft/class_4185;)V

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

@@ -61,8 +61,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	METHOD method_28084 setMoreOptionsOpen ()V
 	METHOD method_29682 applyDataPacks (Lnet/minecraft/class_3283;)V
 		ARG 1 dataPackManager
-	METHOD method_29684 (Ljava/nio/file/Path;)Z
-		ARG 1 path
 	METHOD method_29685 copyDataPack (Ljava/nio/file/Path;Lnet/minecraft/class_310;)Ljava/nio/file/Path;
 		ARG 0 srcFolder
 		ARG 1 client
@@ -76,8 +74,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 		ARG 2 dataPackFile
 	METHOD method_29689 (Ljava/nio/file/Path;)V
 		ARG 0 path
-	METHOD method_29690 (Ljava/nio/file/Path;Ljava/nio/file/Path;)V
-		ARG 2 path
 	METHOD method_29691 (Z)V
 		ARG 1 confirmed
 	METHOD method_29692 (Lnet/minecraft/class_4185;)V
@@ -85,14 +81,11 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	METHOD method_29693 getDataPackTempDir ()Ljava/nio/file/Path;
 	METHOD method_29694 openPackScreen ()V
 	METHOD method_29695 clearDataPackTempDir ()V
-	METHOD method_29696 copyTempDirDataPacks ()Z
 	METHOD method_29983 (Ljava/util/List;Ljava/lang/String;)Z
 		ARG 1 name
 	METHOD method_30296 getScannedPack ()Lcom/mojang/datafixers/util/Pair;
 	METHOD method_30297 onCloseScreen ()V
-	METHOD method_30298 clearTempResources ()V
+	METHOD method_31130 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V
-	METHOD method_31130 create (Lnet/minecraft/class_437;)Lnet/minecraft/class_525;
-		ARG 0 parent
 	METHOD method_32667 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250;
 		ARG 0 button
 	METHOD method_32668 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V
@@ -107,8 +100,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	METHOD method_32671 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250;
 		ARG 1 button
 	METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267;
-	METHOD method_37088 (Lnet/minecraft/class_5359;Lnet/minecraft/class_6904;)V
-		ARG 2 saveLoader
 	METHOD method_37089 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object;
 		ARG 1 v
 		ARG 2 throwable
@@ -131,6 +122,3 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 			ARG 3 translationSuffix
 			ARG 4 defaultGameMode
 		METHOD method_32673 asText ()Lnet/minecraft/class_2561;
-	CLASS class_5376 WorldCreationException
-		METHOD <init> (Ljava/lang/Throwable;)V
-			ARG 1 throwable

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

@@ -6,64 +6,48 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions
 	FIELD field_24595 mapFeaturesButton Lnet/minecraft/class_5676;
 	FIELD field_24596 mapTypeButton Lnet/minecraft/class_5676;
 	FIELD field_24597 customizeTypeButton Lnet/minecraft/class_4185;
-	FIELD field_24598 generatorOptions Lnet/minecraft/class_5285;
+	FIELD field_24598 generatorOptions Lnet/minecraft/class_7193;
 	FIELD field_24600 seed Ljava/util/OptionalLong;
 	FIELD field_25046 LOGGER Lorg/slf4j/Logger;
 	FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561;
 	FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185;
 	FIELD field_25049 generatorType Ljava/util/Optional;
-	FIELD field_25483 registryManager Lnet/minecraft/class_5455$class_6890;
 	FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561;
 	FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_28001 unchangeableMapTypeButton Lnet/minecraft/class_4185;
 	FIELD field_35754 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561;
 	FIELD field_35755 amplifiedInfoText Lnet/minecraft/class_5489;
-	METHOD <init> (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;Ljava/util/Optional;Ljava/util/OptionalLong;)V
+	METHOD <init> (Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V
 		ARG 1 registryManager
-		ARG 2 generatorOptions
-		ARG 3 generatorType
-		ARG 4 seed
 	METHOD method_28085 isDebugWorld ()Z
-	METHOD method_28086 setGeneratorOptions (Lnet/minecraft/class_5285;)V
+	METHOD method_28086 setGeneratorOptions (Lnet/minecraft/class_7193;)V
-		ARG 1 generatorOptions
 	METHOD method_28087 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V
 		ARG 3 button
 	METHOD method_28092 init (Lnet/minecraft/class_525;Lnet/minecraft/class_310;Lnet/minecraft/class_327;)V
 		ARG 1 parent
 		ARG 2 client
 		ARG 3 textRenderer
-	METHOD method_28096 getGeneratorOptions (Z)Lnet/minecraft/class_5285;
+	METHOD method_28096 getGeneratorOptions (Z)Lnet/minecraft/class_7193;
 		ARG 1 hardcore
 	METHOD method_28100 (Ljava/lang/String;)V
 		ARG 1 seedText
 	METHOD method_28101 setVisible (Z)V
 		ARG 1 visible
-	METHOD method_29069 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_5285;Z)V
+	METHOD method_29071 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V
-		ARG 5 confirmed
-	METHOD method_29070 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_5455$class_6893;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5285;)V
-		ARG 5 generatorOptions
-	METHOD method_29071 (Lnet/minecraft/class_525;Lnet/minecraft/class_310;Lnet/minecraft/class_4185;)V
 		ARG 3 button
-	METHOD method_29073 importOptions (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)V
+	METHOD method_29073 importOptions (Lnet/minecraft/class_5285;)V
-		ARG 1 registryManager
-		ARG 2 generatorOptions
 	METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455;
 	METHOD method_30510 seedToString (Ljava/util/OptionalLong;)Ljava/lang/String;
 		ARG 0 seed
-	METHOD method_31132 loadDatapacks (Lnet/minecraft/class_6904;)V
 	METHOD method_32676 (Lnet/minecraft/class_4185;)V
 		ARG 0 button
 	METHOD method_32678 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V
 		ARG 1 button
 		ARG 2 bonusChest
-	METHOD method_32679 (Lnet/minecraft/class_525;Lnet/minecraft/class_5676;Lnet/minecraft/class_5317;)V
+	METHOD method_32679 (Lnet/minecraft/class_525;Lnet/minecraft/class_5676;Lnet/minecraft/class_6880;)V
 		ARG 2 button
-		ARG 3 generatorType
 	METHOD method_32680 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250;
 		ARG 0 button
-	METHOD method_32681 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V
-		ARG 1 button
-		ARG 2 generateStructures
 	METHOD method_32682 disableBonusItems ()V
 	METHOD method_32683 setMapTypeButtonVisible (Z)V
 		ARG 1 visible

mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping

@@ -8,9 +8,9 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 	FIELD field_27967 valueToText Ljava/util/function/Function;
 	FIELD field_27968 narrationMessageFactory Ljava/util/function/Function;
 	FIELD field_27969 callback Lnet/minecraft/class_5676$class_5678;
-	FIELD field_27970 tooltipFactory Lnet/minecraft/class_5676$class_5679;
+	FIELD field_27970 tooltipFactory Lnet/minecraft/class_316$class_5679;
 	FIELD field_27971 optionTextOmitted Z
-	METHOD <init> (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILjava/lang/Object;Lnet/minecraft/class_5676$class_5680;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5676$class_5678;Lnet/minecraft/class_5676$class_5679;Z)V
+	METHOD <init> (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILjava/lang/Object;Lnet/minecraft/class_5676$class_5680;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5676$class_5678;Lnet/minecraft/class_316$class_5679;Z)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 width
@@ -82,7 +82,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 		FIELD field_27972 initialIndex I
 		FIELD field_27973 value Ljava/lang/Object;
 		FIELD field_27974 valueToText Ljava/util/function/Function;
-		FIELD field_27975 tooltipFactory Lnet/minecraft/class_5676$class_5679;
+		FIELD field_27975 tooltipFactory Lnet/minecraft/class_316$class_5679;
 		FIELD field_27976 narrationMessageFactory Ljava/util/function/Function;
 		FIELD field_27977 values Lnet/minecraft/class_5676$class_5680;
 		FIELD field_27978 optionTextOmitted Z
@@ -105,7 +105,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 			ARG 4 height
 			ARG 5 optionText
 			ARG 6 callback
-		METHOD method_32618 tooltip (Lnet/minecraft/class_5676$class_5679;)Lnet/minecraft/class_5676$class_5677;
+		METHOD method_32618 tooltip (Lnet/minecraft/class_316$class_5679;)Lnet/minecraft/class_5676$class_5677;
 			COMMENT Sets the tooltip factory that provides tooltips for any of the values.
 			COMMENT
 			COMMENT <p>If this is not called, the values simply won't have tooltips.
@@ -119,9 +119,8 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 			COMMENT <p>If this is not called, the initial value defaults to the first
 			COMMENT value in the values list supplied.
 			ARG 1 value
-		METHOD method_32620 values (Ljava/util/List;)Lnet/minecraft/class_5676$class_5677;
+		METHOD method_32620 values (Ljava/util/Collection;)Lnet/minecraft/class_5676$class_5677;
 			COMMENT Sets the option values for this button.
-			ARG 1 values
 		METHOD method_32621 values (Ljava/util/List;Ljava/util/List;)Lnet/minecraft/class_5676$class_5677;
 			COMMENT Sets the option values for this button.
 			COMMENT
@@ -165,11 +164,9 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg
 		METHOD onValueChange (Lnet/minecraft/class_5676;Ljava/lang/Object;)V
 			ARG 1 button
 			ARG 2 value
-	CLASS class_5679 TooltipFactory
 	CLASS class_5680 Values
 		METHOD method_32626 getCurrent ()Ljava/util/List;
-		METHOD method_32627 of (Ljava/util/List;)Lnet/minecraft/class_5676$class_5680;
+		METHOD method_32627 of (Ljava/util/Collection;)Lnet/minecraft/class_5676$class_5680;
-			ARG 0 values
 		METHOD method_32628 of (Ljava/util/function/BooleanSupplier;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/class_5676$class_5680;
 			ARG 0 alternativeToggle
 			ARG 1 defaults

mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping

@@ -1,11 +1,10 @@
 CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSliderWidget
 	FIELD field_18012 option Lnet/minecraft/class_4067;
-	FIELD field_27984 orderedTooltip Ljava/util/List;
+	FIELD field_27984 orderedTooltip Lnet/minecraft/class_316$class_5679;
-	METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;Ljava/util/List;)V
+	METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;Lnet/minecraft/class_316$class_5679;)V
 		ARG 1 gameOptions
 		ARG 2 x
 		ARG 3 y
 		ARG 4 width
 		ARG 5 height
 		ARG 6 option
-		ARG 7 orderedTooltip

mappings/net/minecraft/client/model/ModelPart.mapping

@@ -8,6 +8,10 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
 	FIELD field_3665 visible Z
 	FIELD field_3674 roll F
 	FIELD field_3675 yaw F
+	FIELD field_37938 xScale F
+	FIELD field_37939 yScale F
+	FIELD field_37940 zScale F
+	FIELD field_37941 defaultTransform Lnet/minecraft/class_5603;
 	METHOD <init> (Ljava/util/List;Ljava/util/Map;)V
 		ARG 1 cuboids
 		ARG 2 children
@@ -65,6 +69,18 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
 	METHOD method_35747 (Lnet/minecraft/class_4587;Lnet/minecraft/class_630$class_6229;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_630;)V
 		ARG 3 name
 		ARG 4 part
+	METHOD method_41918 setDefaultTransform (Lnet/minecraft/class_5603;)V
+		ARG 1 transform
+	METHOD method_41919 hasChild (Ljava/lang/String;)Z
+		ARG 1 child
+	METHOD method_41920 translate (Lnet/minecraft/class_1160;)V
+		ARG 1 vec3f
+	METHOD method_41921 getDefaultTransform ()Lnet/minecraft/class_5603;
+	METHOD method_41922 rotate (Lnet/minecraft/class_1160;)V
+		ARG 1 vec3f
+	METHOD method_41923 resetTransform ()V
+	METHOD method_41924 scale (Lnet/minecraft/class_1160;)V
+		ARG 1 vec3f
 	CLASS class_593 Quad
 		FIELD field_21618 direction Lnet/minecraft/class_1160;
 		FIELD field_3502 vertices [Lnet/minecraft/class_630$class_618;

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

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteractionManager
 	FIELD field_20316 LOGGER Lorg/slf4j/Logger;
-	FIELD field_20317 unacknowledgedPlayerActions Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;
 	FIELD field_24608 previousGameMode Lnet/minecraft/class_1934;
-	FIELD field_32647 MAX_UNACKNOWLEDGED_PLAYER_ACTIONS I
 	FIELD field_3712 client Lnet/minecraft/class_310;
 	FIELD field_3713 blockBreakingSoundCooldown F
 	FIELD field_3714 currentBreakingPos Lnet/minecraft/class_2338;
@@ -16,23 +14,10 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_634;)V
 		ARG 1 client
 		ARG 2 networkHandler
-	METHOD method_21705 processPlayerActionResponse (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2846$class_2847;Z)V
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 state
-		ARG 4 action
-		ARG 5 approved
-	METHOD method_21706 sendPlayerAction (Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
-		ARG 1 action
-		ARG 2 pos
-		ARG 3 direction
 	METHOD method_28107 getPreviousGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_2895 hasRidingInventory ()Z
-	METHOD method_2896 interactBlock (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269;
+	METHOD method_2896 interactBlock (Lnet/minecraft/class_746;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269;
 		ARG 1 player
-		ARG 2 world
-		ARG 3 hand
-		ARG 4 hitResult
 	METHOD method_2897 stopUsingItem (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_2899 breakBlock (Lnet/minecraft/class_2338;)Z
@@ -70,7 +55,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
 		ARG 1 stack
 		ARG 2 slotId
 	METHOD method_2910 attackBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
-		ARG 1 pos
 		ARG 2 direction
 	METHOD method_2911 syncSelectedSlot ()V
 	METHOD method_2912 clickRecipe (ILnet/minecraft/class_1860;Z)V
@@ -91,10 +75,8 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
 	METHOD method_2918 attackEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)V
 		ARG 1 player
 		ARG 2 target
-	METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
+	METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
 		ARG 1 player
-		ARG 2 world
-		ARG 3 hand
 	METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_2922 isCurrentlyBreaking (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos

mappings/net/minecraft/client/option/CyclingOption.mapping

@@ -8,13 +8,9 @@ CLASS net/minecraft/class_4064 net/minecraft/client/option/CyclingOption
 		ARG 2 getter
 		ARG 3 setter
 		ARG 4 buttonBuilderFactory
-	METHOD method_32518 (Lnet/minecraft/class_310;)Lnet/minecraft/class_5676$class_5679;
-		ARG 0 client
 	METHOD method_32519 (Lnet/minecraft/class_315;Lnet/minecraft/class_5676;Ljava/lang/Object;)V
 		ARG 2 button
 		ARG 3 value
-	METHOD method_32520 (Ljava/lang/Object;)Ljava/util/List;
-		ARG 0 value
 	METHOD method_32521 create (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/function/BooleanSupplier;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
 		ARG 0 key
 		ARG 1 defaults
@@ -54,7 +50,7 @@ CLASS net/minecraft/class_4064 net/minecraft/client/option/CyclingOption
 		ARG 1 value
 	METHOD method_32528 tooltip (Ljava/util/function/Function;)Lnet/minecraft/class_4064;
 		ARG 1 tooltips
-	METHOD method_32532 (Lnet/minecraft/class_2561;Lnet/minecraft/class_310;)Lnet/minecraft/class_5676$class_5679;
+	METHOD method_32532 (Lnet/minecraft/class_2561;Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
 		ARG 1 client
 	METHOD method_35694 create (Ljava/lang/String;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
 		ARG 0 key

mappings/net/minecraft/client/option/DoubleOption.mapping

@@ -40,5 +40,3 @@ CLASS net/minecraft/class_4067 net/minecraft/client/option/DoubleOption
 		ARG 1 value
 	METHOD method_18619 getDisplayString (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561;
 		ARG 1 options
-	METHOD method_32597 (Lnet/minecraft/class_310;)Ljava/util/List;
-		ARG 0 client

mappings/net/minecraft/client/option/FullscreenOption.mapping

@@ -1,16 +0,0 @@
-CLASS net/minecraft/class_4454 net/minecraft/client/option/FullscreenOption
-	METHOD <init> (Lnet/minecraft/class_1041;)V
-		ARG 1 window
-	METHOD <init> (Lnet/minecraft/class_1041;Lnet/minecraft/class_313;)V
-		ARG 1 window
-		ARG 2 monitor
-	METHOD method_21588 (Lnet/minecraft/class_313;Lnet/minecraft/class_319;)Ljava/lang/Double;
-		ARG 1 videoMode
-	METHOD method_21589 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 2 options
-	METHOD method_21590 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 2 options
-		ARG 3 newValue
-	METHOD method_27464 (Lnet/minecraft/class_313;Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 1 options
-		ARG 2 option

mappings/net/minecraft/client/option/GameOptions.mapping

@@ -15,8 +15,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1824 togglePerspectiveKey Lnet/minecraft/class_304;
 		COMMENT A key binding for toggling perspective.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_F5 the F5 key} by default.
-	FIELD field_1825 chatHeightUnfocused D
+	FIELD field_1825 chatHeightUnfocused Lnet/minecraft/class_7172;
-	FIELD field_1826 fov D
+	FIELD field_1826 fov Lnet/minecraft/class_7172;
 	FIELD field_1827 advancedItemTooltips Z
 	FIELD field_1828 fullscreenResolution Ljava/lang/String;
 	FIELD field_1829 mainArm Lnet/minecraft/class_1306;
@@ -38,7 +38,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT A key binding for toggling fullscreen.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_F11 the F11 key} by default.
 	FIELD field_1837 pauseOnLostFocus Z
-	FIELD field_1838 chatHeightFocused D
+	FIELD field_1838 chatHeightFocused Lnet/minecraft/class_7172;
 	FIELD field_1839 allKeys [Lnet/minecraft/class_304;
 		COMMENT An array of all key bindings.
 		COMMENT
@@ -46,7 +46,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT {@linkplain net.minecraft.client.gui.screen.option.ControlsOptionsScreen
 		COMMENT the controls options screen}.
 	FIELD field_1840 gamma D
-	FIELD field_1841 ao Lnet/minecraft/class_4060;
+	FIELD field_1841 ao Lnet/minecraft/class_7172;
 	FIELD field_1842 hudHidden Z
 	FIELD field_1843 mouseSensitivity D
 	FIELD field_1844 advancementsKey Lnet/minecraft/class_304;
@@ -102,7 +102,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1875 tutorialStep Lnet/minecraft/class_1157;
 	FIELD field_1876 useNativeTransport Z
 	FIELD field_1877 chatVisibility Lnet/minecraft/class_1659;
-	FIELD field_1878 biomeBlendRadius I
+	FIELD field_1878 biomeBlendRadius Lnet/minecraft/class_7172;
 	FIELD field_1879 saveToolbarActivatorKey Lnet/minecraft/class_304;
 		COMMENT A key binding for saving the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_C the C key} by default.
@@ -119,7 +119,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_LEFT the left mouse button} by default.
 	FIELD field_1887 resourcePacks Ljava/util/List;
 	FIELD field_1888 entityShadows Z
-	FIELD field_1889 mouseWheelSensitivity D
+	FIELD field_1889 mouseWheelSensitivity Lnet/minecraft/class_7172;
 	FIELD field_1890 chatKey Lnet/minecraft/class_304;
 		COMMENT A key binding for opening {@linkplain net.minecraft.client.gui.screen.ChatScreen the chat screen}.
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_T the T key} by default.
@@ -158,7 +158,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1915 chatWidth D
 	FIELD field_1916 soundVolumeLevels Lit/unimi/dsi/fastutil/objects/Object2FloatMap;
 	FIELD field_19244 discreteMouseScroll Z
-	FIELD field_20308 rawMouseInput Z
+	FIELD field_20308 rawMouseInput Lnet/minecraft/class_7172;
 	FIELD field_21332 sneakToggled Z
 	FIELD field_21333 sprintToggled Z
 	FIELD field_21840 skipMultiplayerWarning Z
@@ -176,11 +176,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_P the P key} by default.
 	FIELD field_26926 hideMatchedNames Z
 	FIELD field_28777 hideBundleTutorial Z
-	FIELD field_32156 monochromeLogo Z
+	FIELD field_32156 monochromeLogo Lnet/minecraft/class_7172;
 	FIELD field_34783 soundDevice Ljava/lang/String;
 	FIELD field_34784 serverViewDistance I
-	FIELD field_34786 hideLightningFlashes Z
+	FIELD field_34786 hideLightningFlashes Lnet/minecraft/class_7172;
-	FIELD field_34787 chunkBuilderMode Lnet/minecraft/class_6597;
+	FIELD field_34787 chunkBuilderMode Lnet/minecraft/class_7172;
 	FIELD field_34959 simulationDistance I
 	FIELD field_35426 showAutosaveIndicator Z
 	FIELD field_35637 allowServerListing Z

mappings/net/minecraft/client/option/LogarithmicOption.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_4287 net/minecraft/client/option/LogarithmicOption

mappings/net/minecraft/client/option/Option.mapping

@@ -4,9 +4,7 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	FIELD field_18186 REALMS_NOTIFICATIONS Lnet/minecraft/class_4064;
 	FIELD field_18187 REDUCED_DEBUG_INFO Lnet/minecraft/class_4064;
 	FIELD field_18188 SUBTITLES Lnet/minecraft/class_4064;
-	FIELD field_18189 BIOME_BLEND_RADIUS Lnet/minecraft/class_4067;
 	FIELD field_18190 MIPMAP_LEVELS Lnet/minecraft/class_4067;
-	FIELD field_18191 MOUSE_WHEEL_SENSITIVITY Lnet/minecraft/class_4067;
 	FIELD field_18192 ATTACK_INDICATOR Lnet/minecraft/class_4064;
 	FIELD field_18193 MAIN_HAND Lnet/minecraft/class_4064;
 	FIELD field_18194 NARRATOR Lnet/minecraft/class_4064;
@@ -21,7 +19,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	FIELD field_1922 GUI_SCALE Lnet/minecraft/class_4064;
 	FIELD field_1923 VISIBILITY Lnet/minecraft/class_4064;
 	FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4064;
-	FIELD field_1924 AO Lnet/minecraft/class_4064;
 	FIELD field_1925 CHAT_LINKS_PROMPT Lnet/minecraft/class_4064;
 	FIELD field_1927 VSYNC Lnet/minecraft/class_4064;
 	FIELD field_1930 TOUCHSCREEN Lnet/minecraft/class_4064;
@@ -31,16 +28,12 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	FIELD field_1935 FRAMERATE_LIMIT Lnet/minecraft/class_4067;
 	FIELD field_1937 CLOUDS Lnet/minecraft/class_4064;
 	FIELD field_1938 GRAPHICS Lnet/minecraft/class_4064;
-	FIELD field_1939 SATURATION Lnet/minecraft/class_4067;
-	FIELD field_1940 CHAT_HEIGHT_FOCUSED Lnet/minecraft/class_4067;
 	FIELD field_1941 CHAT_WIDTH Lnet/minecraft/class_4067;
 	FIELD field_1944 SENSITIVITY Lnet/minecraft/class_4067;
 	FIELD field_1945 GAMMA Lnet/minecraft/class_4067;
 	FIELD field_1946 CHAT_SCALE Lnet/minecraft/class_4067;
 	FIELD field_1963 INVERT_MOUSE Lnet/minecraft/class_4064;
-	FIELD field_1964 FOV Lnet/minecraft/class_4067;
 	FIELD field_1966 key Lnet/minecraft/class_2561;
-	FIELD field_20307 RAW_MOUSE_INPUT Lnet/minecraft/class_4064;
 	FIELD field_21330 SNEAK_TOGGLED Lnet/minecraft/class_4064;
 	FIELD field_21331 SPRINT_TOGGLED Lnet/minecraft/class_4064;
 	FIELD field_23930 CHAT_LINE_SPACING Lnet/minecraft/class_4067;
@@ -57,17 +50,9 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	FIELD field_26925 HIDE_MATCHED_NAMES_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_27956 TOGGLE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_27957 HOLD_TEXT Lnet/minecraft/class_2561;
-	FIELD field_32146 MONOCHROME_LOGO Lnet/minecraft/class_4064;
-	FIELD field_32148 MONOCHROME_LOGO_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_34779 AUDIO_DEVICE Lnet/minecraft/class_4064;
-	FIELD field_34780 HIDE_LIGHTNING_FLASHES Lnet/minecraft/class_4064;
-	FIELD field_34781 HIDE_LIGHTNING_FLASHES_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_34782 CHUNK_BUILDER_MODE Lnet/minecraft/class_4064;
 	FIELD field_34958 SIMULATION_DISTANCE Lnet/minecraft/class_4067;
 	FIELD field_35425 SHOW_AUTOSAVE_INDICATOR Lnet/minecraft/class_4064;
-	FIELD field_35553 CHUNK_BUILDER_THREADED_TEXT Lnet/minecraft/class_2561;
-	FIELD field_35554 CHUNK_BUILDER_SEMI_BLOCKING_TEXT Lnet/minecraft/class_2561;
-	FIELD field_35555 CHUNK_BUILDER_FULLY_BLOCKING_TEXT Lnet/minecraft/class_2561;
 	FIELD field_35635 ALLOW_SERVER_LISTING Lnet/minecraft/class_4064;
 	FIELD field_35636 ALLOW_SERVER_LISTING_TOOLTIP Lnet/minecraft/class_2561;
 	METHOD <init> (Ljava/lang/String;)V
@@ -76,12 +61,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 0 gameOptions
 	METHOD method_18514 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
-	METHOD method_18515 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18516 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
-	METHOD method_18517 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
 	METHOD method_18518 getDisplayPrefix ()Lnet/minecraft/class_2561;
 	METHOD method_18520 createButton (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339;
 		ARG 1 options
@@ -108,16 +87,10 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	METHOD method_18530 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
 		ARG 0 gameOptions
 		ARG 1 viewDistance
-	METHOD method_18533 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
 	METHOD method_18534 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 touchscreen
-	METHOD method_18535 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 mouseWheelSensitivity
 	METHOD method_18539 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
 		ARG 0 gameOptions
 		ARG 1 option
@@ -148,16 +121,10 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	METHOD method_18559 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
 		ARG 0 gameOptions
 		ARG 1 maxFps
-	METHOD method_18563 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
 	METHOD method_18564 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 invertYMouse
-	METHOD method_18565 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 fov
 	METHOD method_18569 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
 		ARG 0 gameOptions
 		ARG 1 option
@@ -188,36 +155,18 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	METHOD method_18580 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
 		ARG 0 gameOptions
 		ARG 1 chatOpacity
-	METHOD method_18582 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
 	METHOD method_18583 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 chatLinksPrompt
-	METHOD method_18584 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatHeightUnfocused
-	METHOD method_18586 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
 	METHOD method_18587 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 chatLinks
-	METHOD method_18588 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 chatHeightFocused
-	METHOD method_18590 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
-		ARG 0 gameOptions
-		ARG 1 option
 	METHOD method_18591 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 chatColors
-	METHOD method_18592 (Lnet/minecraft/class_315;Ljava/lang/Double;)V
-		ARG 0 gameOptions
-		ARG 1 biomeBlendRadius
 	METHOD method_18594 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
@@ -230,16 +179,12 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 0 gameOptions
 	METHOD method_18599 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
-	METHOD method_18600 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
 	METHOD method_18601 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
 	METHOD method_18602 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
 	METHOD method_18604 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
-	METHOD method_18605 (Lnet/minecraft/class_315;)Ljava/lang/Double;
-		ARG 0 gameOptions
 	METHOD method_18606 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
 	METHOD method_19339 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561;
@@ -250,10 +195,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 1 textBackgroundOpacity
 	METHOD method_19342 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
-	METHOD method_21669 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 rawMouseInput
 	METHOD method_27140 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
 	METHOD method_27141 (Lnet/minecraft/class_315;)Ljava/lang/Double;
@@ -278,16 +219,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 1 simulationDistance
 	METHOD method_27469 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
-	METHOD method_30500 getPixelLabel (I)Lnet/minecraft/class_2561;
-		ARG 1 pixel
-	METHOD method_30501 getGenericLabel (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 1 value
-	METHOD method_30502 getPercentAdditionLabel (I)Lnet/minecraft/class_2561;
-		ARG 1 percentage
-	METHOD method_30503 getPercentLabel (D)Lnet/minecraft/class_2561;
-		ARG 1 proportion
-	METHOD method_30504 getGenericLabel (I)Lnet/minecraft/class_2561;
-		ARG 1 value
 	METHOD method_31037 (Lnet/minecraft/class_315;)Ljava/lang/Double;
 		ARG 0 gameOptions
 	METHOD method_31038 (Lnet/minecraft/class_315;)Ljava/lang/Double;
@@ -306,23 +237,17 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 0 gameOptions
 	METHOD method_32535 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4061;
 		ARG 0 gameOptions
-	METHOD method_32536 (Lnet/minecraft/class_315;)Lnet/minecraft/class_6597;
-		ARG 0 gameOptions
 	METHOD method_32537 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1659;
 		ARG 0 gameOptions
-	METHOD method_32538 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
 	METHOD method_32539 (Lnet/minecraft/class_1659;)Lnet/minecraft/class_2561;
 		ARG 0 chatVisibility
-	METHOD method_32540 (Lnet/minecraft/class_4060;)Lnet/minecraft/class_2561;
-		ARG 0 aoMode
 	METHOD method_32541 (Lnet/minecraft/class_4061;)Lnet/minecraft/class_2561;
 		ARG 0 attackIndicator
 	METHOD method_32542 (Lnet/minecraft/class_4063;)Lnet/minecraft/class_2561;
 		ARG 0 cloudRenderMode
 	METHOD method_32543 (Lnet/minecraft/class_5365;)Lnet/minecraft/class_2561;
 		ARG 0 graphicsMode
-	METHOD method_32544 (Lnet/minecraft/class_310;)Lnet/minecraft/class_5676$class_5679;
+	METHOD method_32544 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679;
 		ARG 0 client
 	METHOD method_32545 (Lnet/minecraft/class_4065;)Lnet/minecraft/class_2561;
 		ARG 0 narrator
@@ -336,14 +261,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 attackIndicator
-	METHOD method_32549 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4060;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 aoMode
-	METHOD method_32550 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_6597;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 chunkBuilderMode
 	METHOD method_32551 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4063;)V
 		ARG 0 gameOptions
 		ARG 1 option
@@ -372,12 +289,8 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 3 graphicsMode
 	METHOD method_32560 (Lnet/minecraft/class_5365;)Z
 		ARG 0 graphicsMode
-	METHOD method_32561 (Lnet/minecraft/class_310;)Ljava/util/List;
-		ARG 0 client
 	METHOD method_32562 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
 		ARG 0 gameOptions
-	METHOD method_32564 (Lnet/minecraft/class_310;)Ljava/util/List;
-		ARG 0 client
 	METHOD method_32565 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
 		ARG 0 gameOptions
 	METHOD method_32566 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
@@ -440,32 +353,16 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 0 gameOptions
 	METHOD method_32593 (Lnet/minecraft/class_315;)Ljava/lang/Integer;
 		ARG 0 gameOptions
-	METHOD method_35708 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
-	METHOD method_35709 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 monochromeLogo
 	METHOD method_38511 (Lnet/minecraft/class_315;)Ljava/lang/String;
 		ARG 0 gameOptions
-	METHOD method_38512 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4060;
-		ARG 0 gameOptions
-	METHOD method_38513 (Lnet/minecraft/class_315;)Ljava/lang/Boolean;
-		ARG 0 gameOptions
 	METHOD method_38514 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_1659;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 chatVisibility
-	METHOD method_38515 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
-		ARG 0 gameOptions
-		ARG 1 option
-		ARG 2 hideLightningFlashes
 	METHOD method_38516 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/String;)V
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 audioDevice
-	METHOD method_38517 (Lnet/minecraft/class_6597;)Lnet/minecraft/class_2561;
-		ARG 0 chunkBuilderMode
 	METHOD method_38518 (Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 device
 	METHOD method_38737 (Lnet/minecraft/class_315;)Ljava/lang/Double;
@@ -484,8 +381,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 2 showAutosaveIndicator
 	METHOD method_39416 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1306;
 		ARG 0 gameOptions
-	METHOD method_39417 (Lnet/minecraft/class_310;Lnet/minecraft/class_6597;)Ljava/util/List;
-		ARG 1 chunkBuilderMode
 	METHOD method_39419 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V
 		ARG 0 gameOptions
 		ARG 1 option
@@ -496,3 +391,4 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 		ARG 0 gameOptions
 		ARG 1 option
 		ARG 2 allowServerListing
+	CLASS class_5679 TooltipFactory

mappings/net/minecraft/client/particle/SculkChargeParticle.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_7206 net/minecraft/client/particle/SculkChargeParticle
+	FIELD field_37959 spriteProvider Lnet/minecraft/class_4002;
+	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+		ARG 14 spriteProvider
+	CLASS class_7207 Factory

mappings/net/minecraft/client/particle/SculkChargePopParticle.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_7208 net/minecraft/client/particle/SculkChargePopParticle
+	FIELD field_37960 spriteProvider Lnet/minecraft/class_4002;
+	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+		ARG 14 spriteProvider
+	CLASS class_7209 Factory

mappings/net/minecraft/client/particle/SoulParticle.mapping

@@ -13,3 +13,4 @@ CLASS net/minecraft/class_4956 net/minecraft/client/particle/SoulParticle
 		FIELD field_23092 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
 			ARG 1 spriteProvider
+	CLASS class_7210 SculkSoulFactory

mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping

@@ -204,8 +204,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		ARG 0 id
 	METHOD method_23765 loadImages (Lnet/minecraft/class_3300;)V
 		ARG 0 manager
-	METHOD method_23766 (Ljava/lang/String;)Z
-		ARG 0 filename
 	METHOD method_24985 openPendingInvitesScreen (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_24987 drawExpiring (Lnet/minecraft/class_4587;IIIII)V

mappings/net/minecraft/client/render/BackgroundRenderer.mapping

@@ -6,10 +6,16 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer
 	FIELD field_4041 nextWaterFogColor I
 	FIELD field_4042 lastWaterFogColorUpdateTime J
 	METHOD method_23792 clearFog ()V
+	METHOD method_24873 (Lnet/minecraft/class_638;Lnet/minecraft/class_4543;FIII)Lnet/minecraft/class_243;
+		ARG 3 x
+		ARG 4 y
+		ARG 5 z
 	METHOD method_3210 render (Lnet/minecraft/class_4184;FLnet/minecraft/class_638;IF)V
 		ARG 0 camera
 		ARG 1 tickDelta
 		ARG 2 world
+		ARG 3 viewDistance
+		ARG 4 skyDarkness
 	METHOD method_3211 applyFog (Lnet/minecraft/class_4184;Lnet/minecraft/class_758$class_4596;FZ)V
 		ARG 0 camera
 		ARG 1 fogType

mappings/net/minecraft/client/render/entity/animation/Animation.mapping

@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_7184 net/minecraft/client/render/entity/animation/Animation
+	CLASS class_7185 Builder
+		FIELD field_37889 lengthInSeconds F
+		FIELD field_37890 transformations Ljava/util/Map;
+		FIELD field_37891 looping Z
+		METHOD <init> (F)V
+			ARG 1 lengthInSeconds
+		METHOD method_41817 looping ()Lnet/minecraft/class_7184$class_7185;
+		METHOD method_41818 create (F)Lnet/minecraft/class_7184$class_7185;
+			ARG 0 lengthInSeconds
+		METHOD method_41819 (Ljava/lang/String;)Ljava/util/List;
+			ARG 0 name
+		METHOD method_41820 addBoneAnimation (Ljava/lang/String;Lnet/minecraft/class_7179;)Lnet/minecraft/class_7184$class_7185;
+			ARG 1 name
+			ARG 2 transformation
+		METHOD method_41821 build ()Lnet/minecraft/class_7184;

mappings/net/minecraft/client/render/entity/animation/Keyframe.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7186 net/minecraft/client/render/entity/animation/Keyframe

mappings/net/minecraft/client/render/entity/animation/Transformation.mapping

@@ -0,0 +1,25 @@
+CLASS net/minecraft/class_7179 net/minecraft/client/render/entity/animation/Transformation
+	CLASS class_7180 Interpolation
+		METHOD apply (Lnet/minecraft/class_1160;F[Lnet/minecraft/class_7186;IIF)Lnet/minecraft/class_1160;
+			ARG 2 delta
+			ARG 3 keyframes
+			ARG 4 start
+			ARG 5 end
+	CLASS class_7181 Interpolations
+		METHOD method_41815 (Lnet/minecraft/class_1160;F[Lnet/minecraft/class_7186;IIF)Lnet/minecraft/class_1160;
+			ARG 1 delta
+			ARG 2 keyframes
+			ARG 3 start
+			ARG 4 end
+		METHOD method_41816 (Lnet/minecraft/class_1160;F[Lnet/minecraft/class_7186;IIF)Lnet/minecraft/class_1160;
+			ARG 1 delta
+			ARG 2 keyframes
+			ARG 3 start
+			ARG 4 end
+	CLASS class_7182 Target
+		METHOD apply (Lnet/minecraft/class_630;Lnet/minecraft/class_1160;)V
+			ARG 1 modelPart
+	CLASS class_7183 Targets
+		FIELD field_37886 TRANSLATE Lnet/minecraft/class_7179$class_7182;
+		FIELD field_37887 ROTATE Lnet/minecraft/class_7179$class_7182;
+		FIELD field_37888 SCALE Lnet/minecraft/class_7179$class_7182;

mappings/net/minecraft/client/render/model/ModelLoader.mapping

@@ -79,8 +79,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	METHOD method_4733 (Lnet/minecraft/class_2960;)V
 		ARG 1 id
 	METHOD method_4734 getBakedModelMap ()Ljava/util/Map;
-	METHOD method_4737 (Lnet/minecraft/class_3298;)Lcom/mojang/datafixers/util/Pair;
-		ARG 1 resource
 	METHOD method_4739 (Lnet/minecraft/class_2248;Ljava/util/Map;Lnet/minecraft/class_2680;)Z
 		ARG 2 state
 	CLASS class_1089 ModelLoaderException

mappings/net/minecraft/client/resource/DirectResourceIndex.mapping

@@ -4,8 +4,6 @@ CLASS net/minecraft/class_1067 net/minecraft/client/resource/DirectResourceIndex
 		ARG 1 assetDir
 	METHOD method_23844 (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2960;
 		ARG 2 path
-	METHOD method_23845 (Ljava/util/function/Predicate;Ljava/nio/file/Path;)Z
-		ARG 1 path
 	METHOD method_4644 (Ljava/nio/file/Path;)Z
 		ARG 0 path
 	METHOD method_4646 (Ljava/nio/file/Path;)Z

mappings/net/minecraft/client/resource/ResourceIndex.mapping

@@ -11,8 +11,6 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex
 		ARG 1 identifier
 	METHOD method_4631 findFile (Ljava/lang/String;)Ljava/io/File;
 		ARG 1 path
-	METHOD method_4632 getFilesRecursively (Ljava/lang/String;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;
+	METHOD method_4632 getFilesRecursively (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;
 		ARG 1 prefix
 		ARG 2 namespace
-		ARG 3 maxDepth
-		ARG 4 pathFilter

mappings/net/minecraft/client/resource/language/TranslationStorage.mapping

@@ -8,6 +8,4 @@ CLASS net/minecraft/class_1078 net/minecraft/client/resource/language/Translatio
 	METHOD method_4675 load (Lnet/minecraft/class_3300;Ljava/util/List;)Lnet/minecraft/class_1078;
 		ARG 0 resourceManager
 		ARG 1 definitions
-	METHOD method_4676 load (Ljava/util/List;Ljava/util/Map;)V
+	METHOD method_4676 load (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)V
-		ARG 0 resources
-		ARG 1 translationMap

mappings/net/minecraft/client/sound/SoundEngine.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine
 	FIELD field_19185 staticSources Lnet/minecraft/class_4225$class_4276;
 	FIELD field_34946 disconnectExtensionPresent Z
 	FIELD field_34947 deviceSpecifier Ljava/lang/String;
-	METHOD method_19661 init (Ljava/lang/String;)V
+	METHOD method_19661 init (Ljava/lang/String;Z)V
 		ARG 1 deviceSpecifier
 	METHOD method_19662 release (Lnet/minecraft/class_4224;)V
 		ARG 1 source

mappings/net/minecraft/client/util/ParticleUtil.mapping

@@ -1,14 +1,15 @@
 CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil
-	METHOD method_34681 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2394;)V
+	METHOD method_34681 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2394;Lnet/minecraft/class_243;D)V
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 direction
 		ARG 3 effect
-	METHOD method_34682 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_6019;)V
+		ARG 4 velocity
+	METHOD method_34682 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_6017;)V
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 effect
-		ARG 3 range
+		ARG 3 count
 	METHOD method_34683 spawnParticle (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;DLnet/minecraft/class_2394;Lnet/minecraft/class_6019;)V
 		ARG 0 axis
 		ARG 1 world
@@ -16,3 +17,12 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil
 		ARG 3 variance
 		ARG 5 effect
 		ARG 6 range
+	METHOD method_41305 spawnParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_6017;Lnet/minecraft/class_2350;Ljava/util/function/Supplier;D)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 effect
+		ARG 3 count
+		ARG 4 direction
+		ARG 5 velocity
+	METHOD method_41306 getRandomVelocity (Ljava/util/Random;)Lnet/minecraft/class_243;
+		ARG 0 random

mappings/net/minecraft/client/util/PngFile.mapping

@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile
 	FIELD field_5226 height I
 	FIELD field_5227 width I
-	METHOD <init> (Ljava/lang/String;Ljava/io/InputStream;)V
+	METHOD <init> (Ljava/util/function/Supplier;Ljava/io/InputStream;)V
-		ARG 1 name
 		ARG 2 in
 	METHOD method_4542 createReader (Ljava/io/InputStream;)Lnet/minecraft/class_1050$class_1051;
 		ARG 0 is

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

@@ -18,7 +18,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	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_5321;Lnet/minecraft/class_6880;IILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V
-		ARG 1 netHandler
 		ARG 2 properties
 		ARG 3 registryRef
 		ARG 5 loadDistance
@@ -83,9 +82,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 		ARG 7 maxZ
 		ARG 9 y
 		ARG 11 parameters
-	METHOD method_2937 setBlockStateWithoutNeighborUpdates (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
-		ARG 1 pos
-		ARG 2 state
 	METHOD method_2938 addParticle (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2394;Z)V
 		ARG 1 pos
 		ARG 2 state

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

@@ -1,42 +1,9 @@
 CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType
-	FIELD field_25050 DEFAULT Lnet/minecraft/class_5317;
+	FIELD field_25050 DEFAULT Lnet/minecraft/class_5321;
-	FIELD field_25052 VALUES Ljava/util/List;
+	FIELD field_25054 FLAT Lnet/minecraft/class_5321;
-	FIELD field_25053 SCREEN_PROVIDERS Ljava/util/Map;
+	FIELD field_25056 SINGLE_BIOME_SURFACE Lnet/minecraft/class_5321;
-	FIELD field_25054 FLAT Lnet/minecraft/class_5317;
+	FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5321;
-	FIELD field_25056 SINGLE_BIOME_SURFACE Lnet/minecraft/class_5317;
+	FIELD field_35756 LARGE_BIOMES Lnet/minecraft/class_5321;
-	FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5317;
+	FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5321;
-	FIELD field_25060 displayName Lnet/minecraft/class_2561;
-	FIELD field_35756 LARGE_BIOMES Lnet/minecraft/class_5317;
-	FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5317;
-	METHOD <init> (Ljava/lang/String;)V
-		ARG 1 translationKeySuffix
-	METHOD method_29075 getDisplayName ()Lnet/minecraft/class_2561;
-	METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2794;
-		ARG 1 registryManager
-		ARG 2 seed
 	METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455;JZZ)Lnet/minecraft/class_5285;
-		ARG 1 registryManager
-		ARG 2 seed
 		ARG 4 generateStructures
-		ARG 5 bonusChest
-	METHOD method_29078 fromGeneratorOptions (Lnet/minecraft/class_5285;)Ljava/util/Optional;
-		ARG 0 generatorOptions
-	METHOD method_29079 createFixedBiomeOptions (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5285;
-		ARG 0 registryManager
-		ARG 1 generatorOptions
-	METHOD method_29086 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437;
-		ARG 0 screen
-		ARG 1 generatorOptions
-	METHOD method_29088 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437;
-		ARG 0 screen
-		ARG 1 generatorOptions
-	METHOD method_32685 isNotDebug (Lnet/minecraft/class_5317;)Z
-		ARG 0 generatorType
-	METHOD method_39194 createNoiseChunkGenerator (Lnet/minecraft/class_5455;JLnet/minecraft/class_5321;)Lnet/minecraft/class_3754;
-		ARG 0 registryManager
-		ARG 1 seed
-		ARG 3 settingsKey
-	CLASS class_5293 ScreenProvider
-		METHOD createEditScreen (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437;
-			ARG 1 screen
-			ARG 2 generatorOptions

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

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_5293 net/minecraft/client/world/ScreenProvider
+	METHOD createEditScreen (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437;
+		ARG 1 screen

mappings/net/minecraft/command/argument/ArgumentTypes.mapping

@@ -1,44 +1,7 @@
 CLASS net/minecraft/class_2316 net/minecraft/command/argument/ArgumentTypes
 	FIELD field_10921 CLASS_MAP Ljava/util/Map;
-	FIELD field_10922 ID_MAP Ljava/util/Map;
+	METHOD method_10015 register (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2314;
-	FIELD field_10923 LOGGER Lorg/slf4j/Logger;
+	METHOD method_10017 register (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Class;Lnet/minecraft/class_2314;)Lnet/minecraft/class_2314;
-	METHOD method_10013 byClass (Lcom/mojang/brigadier/arguments/ArgumentType;)Lnet/minecraft/class_2316$class_2317;
-		ARG 0 type
-	METHOD method_10014 fromPacket (Lnet/minecraft/class_2540;)Lcom/mojang/brigadier/arguments/ArgumentType;
-		ARG 0 buf
-	METHOD method_10015 register ()V
-	METHOD method_10016 toJson (Lcom/mojang/brigadier/CommandDispatcher;Lcom/mojang/brigadier/tree/CommandNode;)Lcom/google/gson/JsonObject;
-		ARG 0 dispatcher
-		ARG 1 commandNode
-	METHOD method_10017 register (Ljava/lang/String;Ljava/lang/Class;Lnet/minecraft/class_2314;)V
 		COMMENT Registers an argument type's serializer.
-		ARG 0 id
-			COMMENT the id of the argument type
-		ARG 1 argClass
-		ARG 2 serializer
-	METHOD method_10018 byId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2316$class_2317;
-		ARG 0 id
-	METHOD method_10019 toPacket (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/arguments/ArgumentType;)V
-		ARG 0 buf
-		ARG 1 type
-	METHOD method_10020 toJson (Lcom/google/gson/JsonObject;Lcom/mojang/brigadier/arguments/ArgumentType;)V
-		ARG 0 json
-		ARG 1 type
-	METHOD method_30923 hasClass (Lcom/mojang/brigadier/arguments/ArgumentType;)Z
-		ARG 0 type
-	METHOD method_30924 getAllArgumentTypes (Lcom/mojang/brigadier/tree/CommandNode;)Ljava/util/Set;
-		ARG 0 node
-	METHOD method_30925 getAllArgumentTypes (Lcom/mojang/brigadier/tree/CommandNode;Ljava/util/Set;Ljava/util/Set;)V
-		ARG 0 node
-		ARG 1 argumentTypes
-		ARG 2 ignoredNodes
-	METHOD method_30926 (Ljava/util/Set;Ljava/util/Set;Lcom/mojang/brigadier/tree/CommandNode;)V
-		ARG 2 node
 	METHOD method_41181 upcast (Ljava/lang/Class;)Ljava/lang/Class;
 		ARG 0 clazz
-	CLASS class_2317 Entry
-		FIELD field_10925 id Lnet/minecraft/class_2960;
-		FIELD field_10926 serializer Lnet/minecraft/class_2314;
-		METHOD <init> (Lnet/minecraft/class_2314;Lnet/minecraft/class_2960;)V
-			ARG 1 serializer
-			ARG 2 id

mappings/net/minecraft/command/argument/BlockArgumentParser.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParser
-	FIELD field_10681 tagId Lnet/minecraft/class_6862;
+	FIELD field_10681 tagId Lnet/minecraft/class_6885;
-	FIELD field_10682 SUGGEST_DEFAULT Ljava/util/function/BiFunction;
+	FIELD field_10682 SUGGEST_DEFAULT Ljava/util/function/Function;
 	FIELD field_10683 INVALID_PROPERTY_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;
 	FIELD field_10684 UNCLOSED_PROPERTIES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_10685 tagProperties Ljava/util/Map;
@@ -12,9 +12,8 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse
 	FIELD field_10691 DISALLOWED_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_10692 DUPLICATE_PROPERTY_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
 	FIELD field_10693 data Lnet/minecraft/class_2487;
-	FIELD field_10694 cursorPos I
 	FIELD field_10695 UNKNOWN_PROPERTY_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
-	FIELD field_10696 suggestions Ljava/util/function/BiFunction;
+	FIELD field_10696 suggestions Ljava/util/function/Function;
 	FIELD field_10697 blockId Lnet/minecraft/class_2960;
 	FIELD field_10698 reader Lcom/mojang/brigadier/StringReader;
 	FIELD field_10699 blockProperties Ljava/util/Map;
@@ -24,11 +23,6 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse
 	FIELD field_32803 PROPERTY_DEFINER C
 	FIELD field_32804 PROPERTY_SEPARATOR C
 	FIELD field_32805 TAG_PREFIX C
-	METHOD <init> (Lcom/mojang/brigadier/StringReader;Z)V
-		ARG 1 reader
-		ARG 2 allowTag
-	METHOD method_29383 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 builder
 	METHOD method_9659 parseBlockProperties ()V
 	METHOD method_9660 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 block
@@ -44,60 +38,53 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse
 		ARG 0 builder
 		ARG 1 property
 		ARG 2 value
-	METHOD method_9664 getTagId ()Lnet/minecraft/class_6862;
+	METHOD method_9665 suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_9665 suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9666 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9666 getSuggestions (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;ZZ)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9667 suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9667 suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9668 parsePropertyValue (Lnet/minecraft/class_2769;Ljava/lang/String;I)V
 		ARG 1 property
 		ARG 2 value
 		ARG 3 cursor
-	METHOD method_9669 getBlockState ()Lnet/minecraft/class_2680;
+	METHOD method_9670 suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_9670 suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9671 suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9671 suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9672 parseSnbt ()V
-	METHOD method_9673 suggestBlockOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9673 suggestBlockOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9674 suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9674 suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9675 parseBlockId ()V
-	METHOD method_9676 hasBlockEntity (Lnet/minecraft/class_2378;)Z
+	METHOD method_9676 hasBlockEntity ()Z
 	METHOD method_9677 parseTagId ()V
-	METHOD method_9678 parse (Z)Lnet/minecraft/class_2259;
+	METHOD method_9678 parse ()V
-		ARG 1 allowNbt
+	METHOD method_9679 suggestSnbtOrTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_9679 suggestSnbtOrTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9680 parseTagProperties ()V
-	METHOD method_9681 suggestSnbtOrBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9681 suggestSnbtOrBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9682 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 block
-	METHOD method_9683 (Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9683 (Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 2 builder
-	METHOD method_9684 (Lnet/minecraft/class_2769;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9684 (Lnet/minecraft/class_2769;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9685 stringifyBlockState (Lnet/minecraft/class_2680;)Ljava/lang/String;
 		ARG 0 state
 	METHOD method_9686 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 block
 		ARG 1 property
-	METHOD method_9687 suggestSnbt (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9687 suggestSnbt (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9688 getProperties ()Ljava/util/Map;
+	METHOD method_9689 suggestCommaOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_9689 suggestCommaOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9690 suggestTagPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9690 suggestTagPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-		ARG 3 propertyName
 	METHOD method_9691 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 block
 		ARG 1 property
-	METHOD method_9692 getBlockProperties ()Ljava/util/Map;
+	METHOD method_9693 suggestEqualsCharacter (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_9693 suggestEqualsCharacter (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9694 getNbtData ()Lnet/minecraft/class_2487;

mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping

@@ -1,18 +1,13 @@
 CLASS net/minecraft/class_2252 net/minecraft/command/argument/BlockPredicateArgumentType
-	FIELD field_10671 UNKNOWN_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_10672 EXAMPLES Ljava/util/Collection;
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
-		ARG 2 builder
-	METHOD method_9643 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD method_9644 getBlockPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate;
 		ARG 0 context
 		ARG 1 name
-	METHOD method_9645 blockPredicate ()Lnet/minecraft/class_2252;
+	METHOD method_9645 blockPredicate (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2252;
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
-	CLASS 2
 	CLASS class_2253 StatePredicate
 		FIELD field_10673 properties Ljava/util/Set;
 		FIELD field_10674 state Lnet/minecraft/class_2680;
@@ -21,19 +16,15 @@ CLASS net/minecraft/class_2252 net/minecraft/command/argument/BlockPredicateArgu
 			ARG 1 state
 			ARG 2 properties
 			ARG 3 nbt
-		METHOD method_38562 hasNbt ()Z
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 context
 	CLASS class_2254 BlockPredicate
 		METHOD method_38559 hasNbt ()Z
-		METHOD method_38560 create (Lnet/minecraft/class_2378;)Ljava/util/function/Predicate;
-			ARG 1 blockRegistry
 	CLASS class_2255 TagPredicate
-		FIELD field_10676 tag Lnet/minecraft/class_6862;
+		FIELD field_10676 tag Lnet/minecraft/class_6885;
 		FIELD field_10677 nbt Lnet/minecraft/class_2487;
 		FIELD field_10678 properties Ljava/util/Map;
-		METHOD <init> (Lnet/minecraft/class_6862;Ljava/util/Map;Lnet/minecraft/class_2487;)V
+		METHOD <init> (Lnet/minecraft/class_6885;Ljava/util/Map;Lnet/minecraft/class_2487;)V
-			ARG 1 tag
 			ARG 2 properties
 			ARG 3 nbt
 		METHOD test (Ljava/lang/Object;)Z

mappings/net/minecraft/command/argument/BlockStateArgumentType.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_2257 net/minecraft/command/argument/BlockStateArgument
 	FIELD field_10679 EXAMPLES Ljava/util/Collection;
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
-		ARG 2 builder
+	METHOD method_9653 blockState (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2257;
-	METHOD method_9653 blockState ()Lnet/minecraft/class_2257;
 	METHOD method_9655 getBlockState (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2247;
 		ARG 0 context
 		ARG 1 name

mappings/net/minecraft/command/argument/BrigadierArgumentTypes.mapping

@@ -1,11 +0,0 @@
-CLASS net/minecraft/class_2324 net/minecraft/command/argument/BrigadierArgumentTypes
-	FIELD field_33081 HAS_MIN_MASK B
-	FIELD field_33082 HAS_MAX_MASK B
-	METHOD method_10037 createFlag (ZZ)B
-		ARG 0 hasMin
-		ARG 1 hasMax
-	METHOD method_10038 hasMax (B)Z
-		ARG 0 rangeFlag
-	METHOD method_10039 hasMin (B)Z
-		ARG 0 rangeFlag
-	METHOD method_10040 register ()V

mappings/net/minecraft/command/argument/EntityArgumentType.mapping

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_2186 net/minecraft/command/argument/EntityArgumentType
-	FIELD field_32098 SINGLE_TARGET_MASK B
-	FIELD field_32099 PLAYERS_ONLY_MASK B
 	FIELD field_9856 PLAYER_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_9857 playersOnly Z
 	FIELD field_9858 singleTarget Z

mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping

@@ -1,35 +1,11 @@
 CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType
-	FIELD field_10811 UNKNOWN_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_10812 EXAMPLES Ljava/util/Collection;
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
-		ARG 2 builder
+	METHOD method_9801 itemPredicate (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2293;
-	METHOD method_9801 itemPredicate ()Lnet/minecraft/class_2293;
-	METHOD method_9802 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD method_9804 getItemPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate;
 		ARG 0 context
 		ARG 1 name
-	METHOD method_9805 (Lnet/minecraft/class_2293$class_2294;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate;
-		ARG 1 context
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
-	CLASS class_2294 ItemPredicate
-		FIELD field_10813 item Lnet/minecraft/class_1792;
-		FIELD field_10814 nbt Lnet/minecraft/class_2487;
-		METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_2487;)V
-			ARG 1 item
-			ARG 2 nbt
-		METHOD test (Ljava/lang/Object;)Z
-			ARG 1 context
 	CLASS class_2295 ItemPredicateArgument
-		METHOD create (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate;
-			ARG 1 context
-	CLASS class_2296 TagPredicate
-		FIELD field_10815 tag Lnet/minecraft/class_6862;
-		FIELD field_10816 compound Lnet/minecraft/class_2487;
-		METHOD <init> (Lnet/minecraft/class_6862;Lnet/minecraft/class_2487;)V
-			ARG 1 tag
-			ARG 2 nbt
-		METHOD test (Ljava/lang/Object;)Z
-			ARG 1 context

mappings/net/minecraft/command/argument/ItemStackArgument.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_2290 net/minecraft/command/argument/ItemStackArgument
-	FIELD field_10796 item Lnet/minecraft/class_1792;
+	FIELD field_10796 item Lnet/minecraft/class_6880;
 	FIELD field_10797 OVERSTACKED_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
 	FIELD field_10798 nbt Lnet/minecraft/class_2487;
-	METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_2487;)V
+	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)V
-		ARG 1 item
 		ARG 2 nbt
 	METHOD method_9781 createStack (IZ)Lnet/minecraft/class_1799;
 		ARG 1 amount

mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_2287 net/minecraft/command/argument/ItemStackArgumentT
 	FIELD field_10790 EXAMPLES Ljava/util/Collection;
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
-		ARG 2 builder
+	METHOD method_9776 itemStack (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2287;
-	METHOD method_9776 itemStack ()Lnet/minecraft/class_2287;
 	METHOD method_9777 getItemStackArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2290;
 		ARG 0 context
 		ARG 1 name

mappings/net/minecraft/command/argument/ItemStringReader.mapping

@@ -2,34 +2,23 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
 	FIELD field_10799 ID_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_10800 TAG_DISALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_10802 reader Lcom/mojang/brigadier/StringReader;
-	FIELD field_10803 item Lnet/minecraft/class_1792;
 	FIELD field_10804 allowTag Z
-	FIELD field_10805 suggestions Ljava/util/function/BiFunction;
+	FIELD field_10805 suggestions Ljava/util/function/Function;
-	FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction;
+	FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/Function;
 	FIELD field_10807 nbt Lnet/minecraft/class_2487;
-	FIELD field_10808 id Lnet/minecraft/class_6862;
-	FIELD field_10809 cursor I
 	FIELD field_33066 LEFT_CURLY_BRACKET C
 	FIELD field_33067 HASH_SIGN C
-	METHOD <init> (Lcom/mojang/brigadier/StringReader;Z)V
-		ARG 1 reader
-		ARG 2 allowTag
-	METHOD method_29394 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 builder
-	METHOD method_9786 getItem ()Lnet/minecraft/class_1792;
 	METHOD method_9787 readTag ()V
 	METHOD method_9788 readNbt ()V
-	METHOD method_9789 consume ()Lnet/minecraft/class_2291;
+	METHOD method_9789 consume ()V
-	METHOD method_9790 getId ()Lnet/minecraft/class_6862;
+	METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9792 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9793 getSuggestions (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Z)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	METHOD method_9795 readItem ()V
-	METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
-	METHOD method_9797 getNbt ()Lnet/minecraft/class_2487;

mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_2233 net/minecraft/command/argument/ScoreHolderArgumentType
-	FIELD field_32470 MULTIPLE_TYPE_MASK B
 	FIELD field_9948 EXAMPLES Ljava/util/Collection;
 	FIELD field_9949 multiple Z
 	FIELD field_9950 EMPTY_SCORE_HOLDER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;

mappings/net/minecraft/command/argument/serialize/ArgumentSerializer.mapping

@@ -1,10 +1,8 @@
 CLASS net/minecraft/class_2314 net/minecraft/command/argument/serialize/ArgumentSerializer
 	COMMENT Serializes an argument type to be sent to the client.
-	METHOD method_10005 fromPacket (Lnet/minecraft/class_2540;)Lcom/mojang/brigadier/arguments/ArgumentType;
+	METHOD method_10005 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2314$class_7217;
 		ARG 1 buf
-	METHOD method_10006 toJson (Lcom/mojang/brigadier/arguments/ArgumentType;Lcom/google/gson/JsonObject;)V
+	METHOD method_10006 toJson (Lnet/minecraft/class_2314$class_7217;Lcom/google/gson/JsonObject;)V
-		ARG 1 type
 		ARG 2 json
-	METHOD method_10007 toPacket (Lcom/mojang/brigadier/arguments/ArgumentType;Lnet/minecraft/class_2540;)V
+	METHOD method_10007 toPacket (Lnet/minecraft/class_2314$class_7217;Lnet/minecraft/class_2540;)V
-		ARG 1 type
 		ARG 2 buf

mappings/net/minecraft/command/argument/serialize/ConstantArgumentSerializer.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_2319 net/minecraft/command/argument/serialize/ConstantArgumentSerializer
-	FIELD field_10928 supplier Ljava/util/function/Supplier;
-	METHOD <init> (Ljava/util/function/Supplier;)V
-		ARG 1 supplier

mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping

@@ -125,11 +125,9 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 1 fence
 		ARG 2 higherOrEqualModelId
 		ARG 3 lowerModelId
-	METHOD method_25572 fillDoorVariantMap (Lnet/minecraft/class_4926$class_4930;Lnet/minecraft/class_2756;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4926$class_4930;
+	METHOD method_25572 fillDoorVariantMap (Lnet/minecraft/class_4926$class_4930;Lnet/minecraft/class_2756;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4926$class_4930;
 		ARG 0 variantMap
 		ARG 1 targetHalf
-		ARG 2 regularModel
-		ARG 3 hingeModel
 	METHOD method_25576 registerRandomHorizontalRotations (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V
 		ARG 1 modelFactory
 		ARG 2 blocks
@@ -172,12 +170,10 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	METHOD method_25605 registerNorthDefaultHorizontalRotated (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V
 		ARG 1 block
 		ARG 2 modelFactory
-	METHOD method_25609 createDoorBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917;
+	METHOD method_25609 createDoorBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917;
 		ARG 0 doorBlock
 		ARG 1 bottomModelId
 		ARG 2 bottomHingeModelId
-		ARG 3 topModelId
-		ARG 4 topHingeModelId
 	METHOD method_25614 registerSouthDefaultHorizontalFacing (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V
 		ARG 1 modelFactory
 		ARG 2 blocks

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

@@ -17,6 +17,3 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement
 	METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406;
 		ARG 0 range
 		ARG 1 entity
-	METHOD method_39492 getOverworldBiomes ()Ljava/util/List;
-	METHOD method_40361 (Lnet/minecraft/class_6880;)Ljava/util/stream/Stream;
-		ARG 0 biomeEntry

mappings/net/minecraft/entity/AnimationState.mapping

@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState
+	FIELD field_37418 startedAt J
+	METHOD method_41322 start ()V
+	METHOD method_41323 run (Ljava/util/function/Consumer;)V
+		ARG 1 consumer
+	METHOD method_41324 startIfNotRunning ()V
+	METHOD method_41325 stop ()V
+	METHOD method_41326 getStartTime ()J
+	METHOD method_41327 isRunning ()Z

mappings/net/minecraft/entity/Entity.mapping

@@ -317,6 +317,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 4 worldBorder
 	METHOD method_30331 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;)Lnet/minecraft/class_5454;
 		ARG 2 rect
+	METHOD method_30332 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z
+		ARG 2 pos
 	METHOD method_30632 collidesWithStateAtPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 pos
 		ARG 2 state
@@ -454,6 +456,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_40071 shouldEscapePowderSnow ()Z
 	METHOD method_40123 getHandPosOffset (Lnet/minecraft/class_1792;)Lnet/minecraft/class_243;
 		ARG 1 item
+	METHOD method_41328 isInPose (Lnet/minecraft/class_4050;)Z
+		ARG 1 pose
 	METHOD method_5621 getMountedHeightOffset ()D
 	METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
 		ARG 1 state

mappings/net/minecraft/entity/EntityType.mapping

@@ -97,9 +97,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 6 spawnReason
 		ARG 7 alignPosition
 		ARG 8 invertY
-	METHOD method_5889 createInstanceFromId (ILnet/minecraft/class_1937;)Lnet/minecraft/class_1297;
-		ARG 0 type
-		ARG 1 world
 	METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960;
 		ARG 0 type
 	METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311;

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -12,6 +12,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_30065 OFF_HAND_ACTIVE_FLAG I
 	FIELD field_30066 USING_RIPTIDE_FLAG I
 	FIELD field_30082 noDrag Z
+	FIELD field_37421 experienceDroppingDisabled Z
 	FIELD field_6210 bodyTrackingIncrements I
 	FIELD field_6211 lastLimbDistance F
 	FIELD field_6212 sidewaysSpeed F
@@ -220,6 +221,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 			COMMENT the source entity or {@code null} for non-entity sources
 	METHOD method_26084 (Lnet/minecraft/class_1309;)V
 		ARG 0 player
+	METHOD method_26317 applyFluidMovingSpeed (DZLnet/minecraft/class_243;)Lnet/minecraft/class_243;
+		ARG 1 gravity
+		ARG 3 falling
+		ARG 4 motion
 	METHOD method_26318 applyMovementInput (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243;
 		ARG 1 movementInput
 		ARG 2 slipperiness
@@ -320,6 +325,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 stack
 	METHOD method_37416 getJumpBoostVelocityModifier ()D
 	METHOD method_39760 getFallSounds ()Lnet/minecraft/class_1309$class_6823;
+	METHOD method_41329 disableExperienceDropping ()V
+	METHOD method_41330 isExperienceDroppingDisabled ()Z
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type
 	METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960;
@@ -545,7 +552,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6107 getSoundVolume ()F
 	METHOD method_6108 updatePostDeath ()V
 	METHOD method_6109 isBaby ()Z
-	METHOD method_6110 getXpToDrop (Lnet/minecraft/class_1657;)I
+	METHOD method_6110 getXpToDrop ()I
 		COMMENT Called when this entity is killed and returns the amount of experience
 		COMMENT to drop.
 		COMMENT
@@ -555,8 +562,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		COMMENT @see #dropXp()
 		COMMENT @see #shouldAlwaysDropXp()
 		COMMENT @see #shouldDropXp()
-		ARG 1 player
-			COMMENT the attacking player
 	METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293;
 		COMMENT Removes a status effect from this entity without calling any listener.
 		COMMENT

mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask
 	FIELD field_30141 maxRange F
 	FIELD field_30142 targets Ljava/util/List;
 	FIELD field_30143 lastPos Ljava/util/Optional;
-	FIELD field_30144 lastTarget Ljava/util/Optional;
+	FIELD field_30144 lastTarget Lnet/minecraft/class_243;
 	FIELD field_30145 cooldown I
 	FIELD field_30146 targetTime J
 	FIELD field_33460 entityToSound Ljava/util/function/Function;
@@ -19,10 +19,10 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask
 		ARG 3 horizontalRange
 		ARG 4 maxRange
 		ARG 5 entityToSound
-	METHOD method_35078 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Ljava/util/Optional;
+	METHOD method_35078 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
 		ARG 1 entity
 		ARG 2 pos
-	METHOD method_35079 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;I)Ljava/util/Optional;
+	METHOD method_35079 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;I)Lnet/minecraft/class_243;
 		ARG 1 entity
 		ARG 2 pos
 		ARG 3 range
@@ -30,14 +30,8 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask
 		ARG 1 entity
 		ARG 2 startPos
 		ARG 3 endPos
-	METHOD method_35081 (Lnet/minecraft/class_2338;DLnet/minecraft/class_243;)V
-		ARG 4 vel
 	CLASS class_6031 Target
 		FIELD field_30147 pos Lnet/minecraft/class_2338;
-		FIELD field_30148 ramVelocity Lnet/minecraft/class_243;
+		METHOD <init> (Lnet/minecraft/class_2338;I)V
-		METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_243;I)V
 			ARG 1 pos
-			ARG 2 ramVelocity
-			ARG 3 weight
 		METHOD method_35084 getPos ()Lnet/minecraft/class_2338;
-		METHOD method_35085 getRammingVelocity ()Lnet/minecraft/class_243;

mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping

@@ -6,6 +6,10 @@ CLASS net/minecraft/class_4824 net/minecraft/entity/ai/brain/task/UpdateAttackTa
 	METHOD <init> (Ljava/util/function/Predicate;Ljava/util/function/Function;)V
 		ARG 1 startCondition
 		ARG 2 targetGetter
+	METHOD method_24611 (Lnet/minecraft/class_1308;)Z
+		ARG 0 entity
 	METHOD method_24612 updateAttackTarget (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V
 		ARG 1 entity
 		ARG 2 target
+	METHOD method_24615 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V
+		ARG 2 target

mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping

@@ -13,6 +13,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 	FIELD field_5895 duration I
 	FIELD field_5896 type Lnet/minecraft/class_1291;
 	FIELD field_5897 LOGGER Lorg/slf4j/Logger;
+	METHOD <init> (Lnet/minecraft/class_1291;)V
+		ARG 1 type
 	METHOD <init> (Lnet/minecraft/class_1291;I)V
 		ARG 1 type
 		ARG 2 duration
@@ -41,6 +43,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 5 showParticles
 		ARG 6 showIcon
 		ARG 7 hiddenEffect
+	METHOD <init> (Lnet/minecraft/class_1293;)V
+		ARG 1 statusEffectInstance
 	METHOD compareTo (Ljava/lang/Object;)I
 		ARG 1 that
 	METHOD equals (Ljava/lang/Object;)Z

mappings/net/minecraft/entity/passive/AxolotlBrain.mapping

@@ -72,8 +72,6 @@ CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain
 		ARG 0 entity
 	METHOD method_33249 addFightActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
-	METHOD method_33250 hasBreedTarget (Lnet/minecraft/class_5762;)Z
-		ARG 0 axolotl
 	METHOD method_33251 addCoreActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	METHOD method_33252 addIdleActivities (Lnet/minecraft/class_4095;)V

mappings/net/minecraft/entity/passive/VillagerEntity.mapping

@@ -24,6 +24,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 	METHOD method_16917 setOffers (Lnet/minecraft/class_1916;)V
 		ARG 1 offers
 	METHOD method_16918 levelUp ()V
+	METHOD method_19172 (Lnet/minecraft/class_1277;Ljava/util/Map$Entry;)I
+		ARG 1 item
 	METHOD method_19174 initBrain (Lnet/minecraft/class_4095;)V
 		ARG 1 brain
 	METHOD method_19176 releaseTicketFor (Lnet/minecraft/class_4140;)V

mappings/net/minecraft/item/BlockPredicatesChecker.mapping

@@ -8,7 +8,6 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker
 	COMMENT
 	COMMENT @apiNote This is used to implement checks for restrictions specified
 	COMMENT using {@code CanPlaceOn} or {@code CanDestroy}.
-	FIELD field_34448 BLOCK_PREDICATE Lnet/minecraft/class_2252;
 	FIELD field_34449 key Ljava/lang/String;
 	FIELD field_34450 cachedPos Lnet/minecraft/class_2694;
 	FIELD field_34451 lastResult Z

mappings/net/minecraft/item/ItemStack.mapping

@@ -170,8 +170,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	METHOD method_32347 getTooltipData ()Ljava/util/Optional;
 	METHOD method_33262 onItemEntityDestroyed (Lnet/minecraft/class_1542;)V
 		ARG 1 entity
-	METHOD method_40132 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5250;
-		ARG 0 entry
 	METHOD method_40133 streamTags ()Ljava/util/stream/Stream;
 	METHOD method_7909 getItem ()Lnet/minecraft/class_1792;
 	METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799;
@@ -294,8 +292,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 1 nbt
 			COMMENT the NBT compound to write to
 	METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561;
-	METHOD method_7955 (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250;
-		ARG 0 text
 	METHOD method_7956 damage (ILnet/minecraft/class_1309;Ljava/util/function/Consumer;)V
 		ARG 1 amount
 		ARG 2 entity

mappings/net/minecraft/item/Items.mapping

@@ -290,6 +290,10 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
 	FIELD field_33505 RAW_IRON_BLOCK Lnet/minecraft/class_1792;
 	FIELD field_33506 RAW_COPPER_BLOCK Lnet/minecraft/class_1792;
 	FIELD field_33507 RAW_GOLD_BLOCK Lnet/minecraft/class_1792;
+	FIELD field_37523 SCULK Lnet/minecraft/class_1792;
+	FIELD field_37524 SCULK_VEIN Lnet/minecraft/class_1792;
+	FIELD field_37525 SCULK_CATALYST Lnet/minecraft/class_1792;
+	FIELD field_37538 SCULK_SHRIEKER Lnet/minecraft/class_1792;
 	FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792;
 	FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792;
 	FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;

mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_2846 net/minecraft/network/packet/c2s/play/PlayerActio
 	FIELD field_12967 pos Lnet/minecraft/class_2338;
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
+	METHOD <init> (Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)V
 		ARG 1 action
 		ARG 2 pos
 		ARG 3 direction

mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket
 	FIELD field_13134 hand Lnet/minecraft/class_1268;
 	FIELD field_17602 blockHitResult Lnet/minecraft/class_3965;
-	METHOD <init> (Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)V
+	METHOD <init> (Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;I)V
 		ARG 1 hand
 		ARG 2 blockHitResult
 	METHOD <init> (Lnet/minecraft/class_2540;)V

mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_2886 net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket
 	FIELD field_13136 hand Lnet/minecraft/class_1268;
-	METHOD <init> (Lnet/minecraft/class_1268;)V
+	METHOD <init> (Lnet/minecraft/class_1268;I)V
 		ARG 1 hand
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf

mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping

@@ -1,10 +1,7 @@
 CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket
-	FIELD field_13049 secondaryEffectId I
+	FIELD field_13049 secondaryEffectId Lnet/minecraft/class_1291;
-	FIELD field_13050 primaryEffectId I
+	FIELD field_13050 primaryEffectId Lnet/minecraft/class_1291;
-	METHOD <init> (II)V
-		ARG 1 primaryEffectId
-		ARG 2 secondaryEffectId
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_12435 getSecondaryEffectId ()I
+	METHOD method_12435 getSecondaryEffectId ()Lnet/minecraft/class_1291;
-	METHOD method_12436 getPrimaryEffectId ()I
+	METHOD method_12436 getPrimaryEffectId ()Lnet/minecraft/class_1291;

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

@@ -41,8 +41,6 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData
 			ARG 2 y
 			ARG 3 type
 			ARG 4 nbt
-		METHOD <init> (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
 		METHOD method_38596 of (Lnet/minecraft/class_2586;)Lnet/minecraft/class_6603$class_6604;
 			ARG 0 blockEntity
 		METHOD method_38597 write (Lnet/minecraft/class_2540;)V

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

@@ -1,16 +1,8 @@
 CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket
-	FIELD field_12123 commandTree Lcom/mojang/brigadier/tree/RootCommandNode;
+	METHOD method_11401 writeNode (Lcom/mojang/brigadier/tree/CommandNode;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/class_2641$class_2642;
-	METHOD <init> (Lcom/mojang/brigadier/tree/RootCommandNode;)V
+	METHOD method_11402 readArgumentBuilder (Lnet/minecraft/class_2540;B)Lnet/minecraft/class_2641$class_7235;
-		ARG 1 commandTree
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_11401 writeNode (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/tree/CommandNode;Ljava/util/Map;)V
 		ARG 0 buf
-		ARG 1 node
+	METHOD method_11403 getCommandTree (Lnet/minecraft/class_7157;)Lcom/mojang/brigadier/tree/RootCommandNode;
-		ARG 2 nodeToIndex
-	METHOD method_11402 readArgumentBuilder (Lnet/minecraft/class_2540;B)Lcom/mojang/brigadier/builder/ArgumentBuilder;
-		ARG 0 buf
-	METHOD method_11403 getCommandTree ()Lcom/mojang/brigadier/tree/RootCommandNode;
 	METHOD method_11405 readCommandNode (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2641$class_2642;
 		ARG 0 buf
 	METHOD method_30944 traverse (Lcom/mojang/brigadier/tree/RootCommandNode;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
@@ -19,21 +11,10 @@ CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTree
 		ARG 0 nodes
 	METHOD method_30946 build (Ljava/util/List;)V
 		ARG 0 nodeDatas
-	METHOD method_34119 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_2540;Lcom/mojang/brigadier/tree/CommandNode;)V
-		ARG 2 node
-	METHOD method_34120 (Ljava/util/List;Lnet/minecraft/class_2641$class_2642;)Z
-		ARG 1 nodeData
 	CLASS class_2642 CommandNodeData
-		FIELD field_12124 flags B
+		FIELD field_12124 flags I
 		FIELD field_12125 childNodeIndices [I
 		FIELD field_12126 redirectNodeIndex I
-		FIELD field_12127 argumentBuilder Lcom/mojang/brigadier/builder/ArgumentBuilder;
+		METHOD <init> (Lnet/minecraft/class_2641$class_7235;II[I)V
-		FIELD field_12128 node Lcom/mojang/brigadier/tree/CommandNode;
-		METHOD <init> (Lcom/mojang/brigadier/builder/ArgumentBuilder;BI[I)V
-			ARG 1 argumentBuilder
-			ARG 2 flags
 			ARG 3 redirectNodeIndex
 			ARG 4 childNodeIndices
-		METHOD method_11406 build (Ljava/util/List;)Z
-		METHOD method_11408 (Lcom/mojang/brigadier/context/CommandContext;)I
-			ARG 0 context

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket
-	FIELD field_12725 effectId I
+	FIELD field_12725 effectId Lnet/minecraft/class_1291;
 	FIELD field_12726 duration I
 	FIELD field_12727 entityId I
 	FIELD field_12728 flags B
@@ -16,7 +16,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu
 	METHOD method_11943 getEntityId ()I
 	METHOD method_11944 getDuration ()I
 	METHOD method_11945 getAmplifier ()B
-	METHOD method_11946 getEffectId ()I
+	METHOD method_11946 getEffectId ()Lnet/minecraft/class_1291;
 	METHOD method_11947 isPermanent ()Z
 	METHOD method_11949 shouldShowParticles ()Z
 	METHOD method_11950 isAmbient ()Z

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

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_2610 net/minecraft/network/packet/s2c/play/MobSpawnS2C
 	FIELD field_11991 velocityZ I
 	FIELD field_11992 velocityY I
 	FIELD field_11993 velocityX I
-	FIELD field_11995 entityTypeId I
+	FIELD field_11995 entityTypeId Lnet/minecraft/class_1299;
 	FIELD field_11996 id I
 	FIELD field_11997 uuid Ljava/util/UUID;
 	FIELD field_11998 headYaw B
@@ -20,7 +20,7 @@ CLASS net/minecraft/class_2610 net/minecraft/network/packet/s2c/play/MobSpawnS2C
 	METHOD method_11206 getPitch ()B
 	METHOD method_11207 getId ()I
 	METHOD method_11209 getVelocityZ ()I
-	METHOD method_11210 getEntityTypeId ()I
+	METHOD method_11210 getEntityTypeId ()Lnet/minecraft/class_1299;
 	METHOD method_11211 getVelocityY ()I
 	METHOD method_11212 getVelocityX ()I
 	METHOD method_11213 getUuid ()Ljava/util/UUID;

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket
 	FIELD field_17436 syncId I
-	FIELD field_17437 screenHandlerId I
+	FIELD field_17437 screenHandlerId Lnet/minecraft/class_3917;
 	FIELD field_17438 name Lnet/minecraft/class_2561;
 	METHOD <init> (ILnet/minecraft/class_3917;Lnet/minecraft/class_2561;)V
 		ARG 1 syncId

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2612 net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket
 	FIELD field_12008 pos Lnet/minecraft/class_2338;
 	FIELD field_12009 uuid Ljava/util/UUID;
-	FIELD field_12010 motiveId I
+	FIELD field_12010 motiveId Lnet/minecraft/class_1535;
 	FIELD field_12011 facing Lnet/minecraft/class_2350;
 	FIELD field_12012 id I
 	METHOD <init> (Lnet/minecraft/class_1534;)V

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

@@ -1,23 +1,3 @@
 CLASS net/minecraft/class_4463 net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket
-	FIELD comp_84 pos Lnet/minecraft/class_2338;
-	FIELD comp_85 state Lnet/minecraft/class_2680;
-	FIELD comp_86 action Lnet/minecraft/class_2846$class_2847;
-	FIELD comp_87 approved Z
-	FIELD field_20320 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2846$class_2847;Z)V
-		ARG 1 pos
-		ARG 2 state
-		ARG 3 action
-		ARG 4 approved
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2846$class_2847;ZLjava/lang/String;)V
-		ARG 1 pos
-		ARG 2 state
-		ARG 3 action
-		ARG 4 approved
-		ARG 5 reason
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD comp_84 pos ()Lnet/minecraft/class_2338;
-	METHOD comp_85 state ()Lnet/minecraft/class_2680;
-	METHOD comp_86 action ()Lnet/minecraft/class_2846$class_2847;
-	METHOD comp_87 approved ()Z

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

@@ -5,13 +5,3 @@ CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_11273 getStatMap ()Ljava/util/Map;
-	METHOD method_34085 getStatNetworkId (Lnet/minecraft/class_3445;)I
-		ARG 1 stat
-	METHOD method_34086 getStat (Lnet/minecraft/class_3448;I)Lnet/minecraft/class_3445;
-		ARG 0 statType
-		ARG 1 id
-	METHOD method_34087 (Lnet/minecraft/class_2540;Lnet/minecraft/class_3445;)V
-		ARG 1 buf
-		ARG 2 stat
-	METHOD method_34088 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3445;
-		ARG 0 buf

mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping

@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_7227 net/minecraft/particle/SculkChargeParticleEffect
+	FIELD field_38005 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_38006 FACTORY Lnet/minecraft/class_2394$class_2395;
+	METHOD method_42025 (Lnet/minecraft/class_7227;)Ljava/lang/Float;
+		ARG 0 particleEffect

mappings/net/minecraft/resource/DefaultResourcePack.mapping

@@ -13,13 +13,7 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 		ARG 2 id
 	METHOD method_14417 getInputStream (Ljava/lang/String;)Ljava/io/InputStream;
 		ARG 1 path
-	METHOD method_14418 getIdentifiers (Ljava/util/Collection;ILjava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V
+	METHOD method_14418 getIdentifiers (Ljava/util/Collection;Ljava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V
-		ARG 0 results
-		ARG 1 maxDepth
-		ARG 2 namespace
-		ARG 3 root
-		ARG 4 prefix
-		ARG 5 pathFilter
 	METHOD method_20728 isValidUrl (Ljava/lang/String;Ljava/net/URL;)Z
 		ARG 0 fileName
 		ARG 1 url
@@ -28,8 +22,6 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 		ARG 1 id
 	METHOD method_23857 (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2960;
 		ARG 2 path
-	METHOD method_23858 (Ljava/util/function/Predicate;Ljava/nio/file/Path;)Z
-		ARG 1 path
 	METHOD method_37454 getPath (Ljava/net/URI;)Ljava/nio/file/Path;
 		ARG 0 uri
 	CLASS 1

mappings/net/minecraft/resource/DirectoryResourcePack.mapping

@@ -2,13 +2,8 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack
 	FIELD field_14185 BACKSLASH_MATCHER Lcom/google/common/base/CharMatcher;
 	FIELD field_14186 IS_WINDOWS Z
 	FIELD field_14187 LOGGER Lorg/slf4j/Logger;
-	METHOD method_14400 findFiles (Ljava/io/File;ILjava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/function/Predicate;)V
+	METHOD method_14400 findFiles (Ljava/io/File;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/function/Predicate;)V
 		ARG 1 file
-		ARG 2 maxDepth
-		ARG 3 namespace
-		ARG 4 found
-		ARG 5 prefix
-		ARG 6 pathFilter
 	METHOD method_14401 getFile (Ljava/lang/String;)Ljava/io/File;
 		ARG 1 name
 	METHOD method_14402 isValidPath (Ljava/io/File;Ljava/lang/String;)Z

mappings/net/minecraft/resource/JsonDataLoader.mapping

@@ -9,5 +9,3 @@ CLASS net/minecraft/class_4309 net/minecraft/resource/JsonDataLoader
 	METHOD <init> (Lcom/google/gson/Gson;Ljava/lang/String;)V
 		ARG 1 gson
 		ARG 2 dataType
-	METHOD method_20730 (Ljava/lang/String;)Z
-		ARG 0 path

mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping

@@ -10,5 +10,3 @@ CLASS net/minecraft/class_6861 net/minecraft/resource/LifecycledResourceManagerI
 	METHOD <init> (Lnet/minecraft/class_3264;Ljava/util/List;)V
 		ARG 1 type
 		ARG 2 packs
-	METHOD method_40086 (Lnet/minecraft/class_3264;Ljava/lang/String;)Lnet/minecraft/class_3294;
-		ARG 1 namespace

mappings/net/minecraft/resource/ResourceImpl.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_3306 net/minecraft/resource/ResourceImpl
 	FIELD field_14296 packName Ljava/lang/String;
-	FIELD field_14297 readMetadata Z
 	FIELD field_14298 inputStream Ljava/io/InputStream;
 	FIELD field_14299 id Lnet/minecraft/class_2960;
 	FIELD field_14300 metaInputStream Ljava/io/InputStream;
@@ -10,5 +9,3 @@ CLASS net/minecraft/class_3306 net/minecraft/resource/ResourceImpl
 		ARG 2 id
 		ARG 3 inputStream
 		ARG 4 metaInputStream
-	METHOD equals (Ljava/lang/Object;)Z
-		ARG 1 o

mappings/net/minecraft/resource/ResourceManager.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager
 	COMMENT Provides resource loading capabilities to Minecraft.
 	METHOD method_14487 getAllNamespaces ()Ljava/util/Set;
 		COMMENT Gets a set of all namespaces offered by the resource packs loaded by this manager.
-	METHOD method_14488 findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;
+	METHOD method_14488 findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Map;
 		COMMENT Returns a sorted list of identifiers matching a path predicate.
 		COMMENT
 		COMMENT <p>Scanning begins in {@code startingPath} and each candidate file present under that directory

mappings/net/minecraft/resource/ResourcePack.mapping

@@ -14,12 +14,10 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack
 		ARG 1 type
 	METHOD method_14407 parseMetadata (Lnet/minecraft/class_3270;)Ljava/lang/Object;
 		ARG 1 metaReader
-	METHOD method_14408 findResources (Lnet/minecraft/class_3264;Ljava/lang/String;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;
+	METHOD method_14408 findResources (Lnet/minecraft/class_3264;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;
 		ARG 1 type
 		ARG 2 namespace
 		ARG 3 prefix
-		ARG 4 maxDepth
-		ARG 5 pathFilter
 	METHOD method_14409 getName ()Ljava/lang/String;
 	METHOD method_14410 openRoot (Ljava/lang/String;)Ljava/io/InputStream;
 		ARG 1 fileName

mappings/net/minecraft/screen/BeaconScreenHandler.mapping

@@ -11,9 +11,7 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler
 		ARG 2 inventory
 		ARG 3 propertyDelegate
 		ARG 4 context
-	METHOD method_17372 setEffects (II)V
+	METHOD method_17372 setEffects (Lnet/minecraft/class_1291;Lnet/minecraft/class_1291;)V
-		ARG 1 primaryEffectId
-		ARG 2 secondaryEffectId
 	METHOD method_17373 getProperties ()I
 	METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291;
 	METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291;

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -93,7 +93,6 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 2 session
 		ARG 3 dataPackManager
 		ARG 4 saveLoader
-		ARG 5 proxy
 		ARG 6 dataFixer
 		ARG 7 sessionService
 		ARG 8 gameProfileRepo

mappings/net/minecraft/server/SaveLoader.mapping

@@ -5,34 +5,5 @@ CLASS net/minecraft/class_6904 net/minecraft/server/SaveLoader
 	METHOD comp_357 dataPackContents ()Lnet/minecraft/class_5350;
 	METHOD comp_358 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890;
 	METHOD comp_359 saveProperties ()Lnet/minecraft/class_5219;
-	METHOD method_40428 refresh ()V
+	METHOD method_40431 ofLoaded (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
-	METHOD method_40429 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5219;Lnet/minecraft/class_5350;)Lnet/minecraft/class_6904;
-		ARG 3 dataPackContents
-	METHOD method_40430 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V
-		ARG 1 dataPackContents
-		ARG 2 throwable
-	METHOD method_40431 ofLoaded (Lnet/minecraft/class_6904$class_6906;Lnet/minecraft/class_6904$class_6905;Lnet/minecraft/class_6904$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 functionLoaderConfig
-		ARG 1 dataPackSettingsSupplier
-		ARG 2 savePropertiesSupplier
 		ARG 3 prepareExecutor
-		ARG 4 applyExecutor
-	CLASS class_6905 DataPackSettingsSupplier
-		METHOD loadFromWorld (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6905;
-			ARG 0 session
-	CLASS class_6906 FunctionLoaderConfig
-		FIELD comp_360 dataPackManager Lnet/minecraft/class_3283;
-		FIELD comp_361 commandEnvironment Lnet/minecraft/class_2170$class_5364;
-		FIELD comp_362 functionPermissionLevel I
-		METHOD comp_360 dataPackManager ()Lnet/minecraft/class_3283;
-		METHOD comp_361 commandEnvironment ()Lnet/minecraft/class_2170$class_5364;
-		METHOD comp_362 functionPermissionLevel ()I
-	CLASS class_6907 SavePropertiesSupplier
-		METHOD get (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-			ARG 1 resourceManager
-			ARG 2 dataPackSettings
-		METHOD loadFromWorld (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6907;
-			ARG 0 session
-		METHOD method_40433 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-			ARG 1 resourceManager
-			ARG 2 dataPackSettings

mappings/net/minecraft/server/command/ClearCommand.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_3020 net/minecraft/server/command/ClearCommand
 		ARG 0 context
 	METHOD method_13075 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 playerName
-	METHOD method_13076 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13076 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13077 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Ljava/util/function/Predicate;I)I
 		ARG 0 source

mappings/net/minecraft/server/command/CloneCommand.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand
 		ARG 0 context
 	METHOD method_13088 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13089 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13089 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13090 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Lnet/minecraft/class_3023$class_3025;)I
 		ARG 0 source

mappings/net/minecraft/server/command/CommandManager.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
 	FIELD field_9832 dispatcher Lcom/mojang/brigadier/CommandDispatcher;
 	FIELD field_9833 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Lnet/minecraft/class_2170$class_5364;)V
+	METHOD <init> (Lnet/minecraft/class_2170$class_5364;Lnet/minecraft/class_7157;)V
 		ARG 1 environment
 	METHOD method_23917 getException (Lcom/mojang/brigadier/ParseResults;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
 		ARG 0 parse
@@ -13,11 +13,6 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
 	METHOD method_9235 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD method_9236 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
 		ARG 1 style
-	METHOD method_9237 (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/tree/CommandNode;Ljava/util/Collection;)V
-		ARG 1 parent
-		ARG 2 child
-		ARG 3 sibling
-		ARG 4 inputs
 	METHOD method_9238 getCommandValidator (Lnet/minecraft/class_2170$class_2171;)Ljava/util/function/Predicate;
 		ARG 0 parser
 	METHOD method_9239 makeTreeForSource (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/tree/CommandNode;Lnet/minecraft/class_2168;Ljava/util/Map;)V

mappings/net/minecraft/server/command/ExecuteCommand.mapping

@@ -62,7 +62,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 1 context
 	METHOD method_13270 (ZLnet/minecraft/class_3050$class_3052;Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 2 context
-	METHOD method_13271 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13271 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13272 testBlocksCondition (Lcom/mojang/brigadier/context/CommandContext;Z)Ljava/util/OptionalInt;
 		ARG 0 context
@@ -129,7 +129,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 1 bossBar
 		ARG 2 storeInValue
 		ARG 3 requestResult
-	METHOD method_13298 addConditionArguments (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;Z)Lcom/mojang/brigadier/builder/ArgumentBuilder;
+	METHOD method_13298 addConditionArguments (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;ZLnet/minecraft/class_7157;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
 		ARG 0 root
 		ARG 1 argumentBuilder
 		ARG 2 positive

mappings/net/minecraft/server/command/FillCommand.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand
 		ARG 0 context
 	METHOD method_13346 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13347 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13347 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13348 (Lnet/minecraft/class_2694;)Z
 		ARG 0 pos

mappings/net/minecraft/server/command/GiveCommand.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_3068 net/minecraft/server/command/GiveCommand
 		ARG 1 item
 		ARG 2 targets
 		ARG 3 count
-	METHOD method_13402 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13402 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13403 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context

mappings/net/minecraft/server/command/ItemCommand.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand
 	METHOD method_32706 getStackInSlot (Lnet/minecraft/class_1297;I)Lnet/minecraft/class_1799;
 		ARG 0 entity
 		ARG 1 slotId
-	METHOD method_32707 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_32707 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_32708 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context

mappings/net/minecraft/server/command/LootCommand.mapping

@@ -45,7 +45,7 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand
 		ARG 0 context
 		ARG 1 stacks
 		ARG 2 messageSender
-	METHOD method_13193 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13193 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13195 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 entityName
@@ -74,9 +74,6 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand
 		ARG 0 context
 		ARG 1 stacks
 		ARG 2 messageSender
-	METHOD method_13203 (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3039$class_3041;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
-		ARG 0 builder
-		ARG 1 constructor
 	METHOD method_13204 (Lnet/minecraft/class_3039$class_3041;Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 1 context
 	METHOD method_13205 (Lnet/minecraft/class_3039$class_3041;Lcom/mojang/brigadier/context/CommandContext;)I

mappings/net/minecraft/server/command/SetBlockCommand.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_3119 net/minecraft/server/command/SetBlockCommand
 		ARG 0 context
 	METHOD method_13622 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13623 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13623 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13624 (Lnet/minecraft/class_2694;)Z
 		ARG 0 pos

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

@@ -58,7 +58,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 	METHOD method_27905 (Ljava/lang/Integer;)Ljava/lang/Integer;
 		ARG 0 percentage
 	METHOD method_37371 getGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
-		ARG 1 registryManager
 	METHOD method_41005 (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 type
 	METHOD method_41186 (Ljava/lang/String;)Lcom/google/gson/JsonObject;

mappings/net/minecraft/server/function/FunctionLoader.mapping

@@ -26,18 +26,12 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader
 		ARG 1 level
 		ARG 2 commandDispatcher
 	METHOD method_29447 getFunctions ()Ljava/util/Map;
-	METHOD method_29449 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Collection;)Ljava/util/concurrent/CompletionStage;
+	METHOD method_29450 readLines (Lnet/minecraft/class_7086;)Ljava/util/List;
-		ARG 3 ids
-	METHOD method_29450 readLines (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Ljava/util/List;
-		ARG 0 resourceManager
-		ARG 1 id
 	METHOD method_29452 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 id
 		ARG 2 functionFuture
 	METHOD method_29453 (Lcom/mojang/datafixers/util/Pair;)V
 		ARG 1 intermediate
-	METHOD method_29454 (Ljava/lang/String;)Z
-		ARG 0 path
 	METHOD method_29455 (Ljava/util/Map;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/util/Map;
 		ARG 1 unused
 		ARG 2 ex

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

@@ -33,7 +33,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	FIELD field_14148 server Lnet/minecraft/server/MinecraftServer;
 	FIELD field_29778 KEEP_ALIVE_INTERVAL I
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V
-		ARG 1 server
 		ARG 2 connection
 		ARG 3 player
 	METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V

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

@@ -31,9 +31,8 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract
 		ARG 3 stack
 		ARG 4 hand
 		ARG 5 hitResult
-	METHOD method_14263 processBlockBreakingAction (Lnet/minecraft/class_2338;Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2350;I)V
+	METHOD method_14263 processBlockBreakingAction (Lnet/minecraft/class_2338;Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2350;II)V
 		ARG 1 pos
-		ARG 2 action
 		ARG 3 direction
 		ARG 4 worldHeight
 	METHOD method_14264 update ()V
@@ -44,9 +43,8 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract
 	METHOD method_21716 continueMining (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;I)F
 		ARG 1 state
 		ARG 2 pos
-	METHOD method_21717 finishMining (Lnet/minecraft/class_2338;Lnet/minecraft/class_2846$class_2847;Ljava/lang/String;)V
+	METHOD method_21717 finishMining (Lnet/minecraft/class_2338;ILjava/lang/String;)V
 		ARG 1 pos
-		ARG 2 action
 		ARG 3 reason
 	METHOD method_30118 changeGameMode (Lnet/minecraft/class_1934;)Z
 		COMMENT Checks if current game mode is different to {@code gameMode}, and change it if so.

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

@@ -29,18 +29,13 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	FIELD field_35565 blockEventQueue Ljava/util/List;
 	FIELD field_36208 structureLocator Lnet/minecraft/class_6832;
 	FIELD field_36317 duringListenerUpdate Z
-	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;Z)V
 		ARG 1 server
 		ARG 2 workerExecutor
 		ARG 3 session
 		ARG 4 properties
 		ARG 5 worldKey
 		ARG 7 worldGenerationProgressListener
-		ARG 8 chunkGenerator
-		ARG 9 debugWorld
-		ARG 10 seed
-		ARG 12 spawners
-		ARG 13 shouldTickTime
 	METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z
 		COMMENT Spawns a particle visible to {@code viewer}, if the viewer is near the provided
 		COMMENT coordinates.

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

@@ -38,7 +38,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 		ARG 3 dataFixer
 		ARG 4 structureManager
 		ARG 5 executor
-		ARG 6 mainThreadExecutor
 		ARG 7 chunkProvider
 		ARG 8 chunkGenerator
 		ARG 9 worldGenerationProgressListener

mappings/net/minecraft/sound/BlockSoundGroup.mapping

@@ -82,6 +82,10 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup
 	FIELD field_29034 DEEPSLATE_BRICKS Lnet/minecraft/class_2498;
 	FIELD field_29035 DEEPSLATE_TILES Lnet/minecraft/class_2498;
 	FIELD field_29036 POLISHED_DEEPSLATE Lnet/minecraft/class_2498;
+	FIELD field_37643 SCULK_CATALYST Lnet/minecraft/class_2498;
+	FIELD field_37644 SCULK Lnet/minecraft/class_2498;
+	FIELD field_37645 SCULK_VEIN Lnet/minecraft/class_2498;
+	FIELD field_37646 SCULK_SHRIEKER Lnet/minecraft/class_2498;
 	METHOD <init> (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
 		ARG 1 volume
 		ARG 2 pitch

mappings/net/minecraft/state/property/Properties.mapping

@@ -226,6 +226,8 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties
 	FIELD field_31401 AGE_25_MAX I
 	FIELD field_31402 DISTANCE_1_7_MAX I
 	FIELD field_33723 LEVEL_15_MAX I
+	FIELD field_37651 BLOOM Lnet/minecraft/class_2746;
+	FIELD field_37652 SHRIEKING Lnet/minecraft/class_2746;
 	METHOD method_11813 (Lnet/minecraft/class_2768;)Z
 		ARG 0 shape
 	METHOD method_11814 (Lnet/minecraft/class_2350;)Z

mappings/net/minecraft/structure/OceanRuinGenerator.mapping

@@ -10,32 +10,29 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator
 	METHOD method_14821 getRoomPositions (Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/List;
 		ARG 0 random
 		ARG 1 pos
-	METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3114;ZF)V
+	METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3411;ZF)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
 		ARG 4 random
-		ARG 5 config
 		ARG 6 large
 		ARG 7 integrity
 	METHOD method_14824 getRandomWarmRuin (Ljava/util/Random;)Lnet/minecraft/class_2960;
 		ARG 0 random
-	METHOD method_14825 (Lnet/minecraft/class_3485;Ljava/util/Random;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3114;Lnet/minecraft/class_6130;)V
+	METHOD method_14825 (Lnet/minecraft/class_3485;Ljava/util/Random;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3411;Lnet/minecraft/class_6130;)V
 		ARG 0 manager
 		ARG 1 random
 		ARG 2 rotation
 		ARG 3 pos
-		ARG 4 config
 	METHOD method_14826 getRandomBigWarmRuin (Ljava/util/Random;)Lnet/minecraft/class_2960;
 		ARG 0 random
-	METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3114;)V
+	METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3411;)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
 		ARG 4 random
-		ARG 5 config
 	CLASS class_3410 Piece
 		FIELD field_14524 integrity F
 		FIELD field_14525 large Z

mappings/net/minecraft/structure/ShipwreckGenerator.mapping

@@ -3,13 +3,12 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator
 	FIELD field_14535 REGULAR_TEMPLATES [Lnet/minecraft/class_2960;
 	FIELD field_14536 DEFAULT_POSITION Lnet/minecraft/class_2338;
 	FIELD field_34939 LOOT_TABLES Ljava/util/Map;
-	METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3172;)V
+	METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Z)V
 		ARG 0 structureManager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
 		ARG 4 random
-		ARG 5 config
 	CLASS class_3416 Piece
 		FIELD field_14538 grounded Z
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V

mappings/net/minecraft/structure/StructureGeneratorFactory.mapping

@@ -15,13 +15,5 @@ CLASS net/minecraft/class_6834 net/minecraft/structure/StructureGeneratorFactory
 		FIELD comp_314 registryManager Lnet/minecraft/class_5455;
 		METHOD comp_311 world ()Lnet/minecraft/class_5539;
 		METHOD comp_314 registryManager ()Lnet/minecraft/class_5455;
-		METHOD method_39846 getMinCornerHeight (II)I
-			ARG 1 width
-			ARG 2 height
-		METHOD method_39847 getCornerHeights (IIII)[I
-			ARG 1 x
-			ARG 2 width
-			ARG 3 z
-			ARG 4 height
 		METHOD method_39848 isBiomeValid (Lnet/minecraft/class_2902$class_2903;)Z
 			ARG 1 heightmapType

mappings/net/minecraft/structure/StructureSet.mapping

@@ -11,5 +11,3 @@ CLASS net/minecraft/class_7059 net/minecraft/structure/StructureSet
 		ARG 1 weight
 	CLASS class_7060 WeightedEntry
 		FIELD field_37197 CODEC Lcom/mojang/serialization/Codec;
-		METHOD method_41148 matches (Ljava/util/function/Predicate;)Z
-			ARG 1 predicate

mappings/net/minecraft/structure/StructureStart.mapping

@@ -11,12 +11,13 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
 		COMMENT is created in such chunks (when they enter the corresponding chunk generation
 		COMMENT phase).
 	FIELD field_16713 DEFAULT Lnet/minecraft/class_3449;
-	FIELD field_16714 feature Lnet/minecraft/class_5312;
+	FIELD field_16714 feature Lnet/minecraft/class_3195;
 	FIELD field_29070 pos Lnet/minecraft/class_1923;
 	FIELD field_31662 INVALID Ljava/lang/String;
 	FIELD field_31663 boundingBox Lnet/minecraft/class_3341;
 	FIELD field_34940 children Lnet/minecraft/class_6624;
-	METHOD <init> (Lnet/minecraft/class_5312;Lnet/minecraft/class_1923;ILnet/minecraft/class_6624;)V
+	METHOD <init> (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;ILnet/minecraft/class_6624;)V
+		ARG 1 feature
 		ARG 2 pos
 		ARG 3 references
 		ARG 4 children
@@ -35,7 +36,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
 		ARG 5 chunkBox
 		ARG 6 chunkPos
 	METHOD method_14979 isInExistingChunk ()Z
-	METHOD method_16656 getFeature ()Lnet/minecraft/class_5312;
+	METHOD method_16656 getFeature ()Lnet/minecraft/class_3195;
 	METHOD method_16657 hasChildren ()Z
 	METHOD method_23676 getReferences ()I
 	METHOD method_34000 getPos ()Lnet/minecraft/class_1923;

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGenerator
 	FIELD field_16665 LOGGER Lorg/slf4j/Logger;
-	METHOD method_27230 generate (Lnet/minecraft/class_5455;Lnet/minecraft/class_3790;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_5539;)V
+	METHOD method_27230 generate (Lnet/minecraft/class_5455;Lnet/minecraft/class_3790;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V
 		ARG 0 registryManager
 		ARG 1 piece
 		ARG 2 maxDepth
@@ -10,9 +10,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		ARG 6 results
 		ARG 7 random
 		ARG 8 world
-	METHOD method_30419 generate (Lnet/minecraft/class_6834$class_6835;Lnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2338;ZZ)Ljava/util/Optional;
+	METHOD method_30419 generate (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6880;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2338;ZLjava/util/Optional;)Ljava/util/Optional;
-		ARG 1 pieceFactory
-		ARG 2 pos
 	CLASS class_3779 PieceFactory
 		METHOD create (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;Lnet/minecraft/class_2338;ILnet/minecraft/class_2470;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3790;
 			ARG 1 structureManager
@@ -46,7 +44,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 			ARG 5 structureManager
 			ARG 6 children
 			ARG 7 random
-		METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;)V
+		METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V
 			ARG 1 piece
 			ARG 2 pieceShape
 			ARG 3 minY

mappings/net/minecraft/unused/packageinfo/PackageInfo7112.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7112 net/minecraft/unused/packageinfo/PackageInfo7112

mappings/net/minecraft/unused/packageinfo/PackageInfo7156.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7156 net/minecraft/unused/packageinfo/PackageInfo7156

mappings/net/minecraft/unused/packageinfo/PackageInfo7189.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7189 net/minecraft/unused/packageinfo/PackageInfo7189

mappings/net/minecraft/unused/packageinfo/PackageInfo7190.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7190 net/minecraft/unused/packageinfo/PackageInfo7190

mappings/net/minecraft/unused/packageinfo/PackageInfo7205.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7205 net/minecraft/unused/packageinfo/PackageInfo7205

mappings/net/minecraft/util/Util.mapping

@@ -203,13 +203,13 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 	METHOD method_666 (Ljava/lang/String;)Z
 		ARG 0 runtimeArg
 	METHOD method_668 getOperatingSystem ()Lnet/minecraft/class_156$class_158;
-	CLASS 2
+	CLASS 2 9
+		FIELD field_29655 cache Ljava/util/Map;
+	CLASS 3 2
 		FIELD field_29657 cache Ljava/util/Map;
-	CLASS 3
+	CLASS 4 3
 		METHOD onTermination (Ljava/lang/Throwable;)V
 			ARG 1 throwable
-	CLASS 9
-		FIELD field_29655 cache Ljava/util/Map;
 	CLASS class_157 IdentityHashStrategy
 	CLASS class_158 OperatingSystem
 		FIELD field_34894 name Ljava/lang/String;

mappings/net/minecraft/util/dynamic/EntryLoader.mapping

@@ -1,26 +1,15 @@
 CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader
 	METHOD method_31154 resourceBacked (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5506;
 		ARG 0 resourceManager
-	METHOD method_31155 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Decoder;)Ljava/util/Optional;
+	METHOD method_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Map;
-		ARG 1 json
-		ARG 2 registryId
-		ARG 3 entryId
-		ARG 4 decoder
-	METHOD method_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Collection;
 		COMMENT @return A collection of file Identifiers of all known entries of the given registry.
 		COMMENT Note that these are file Identifiers for use in a resource manager, not the logical names of the entries.
 		ARG 1 key
 	CLASS 1
 		FIELD field_36186 JSON Ljava/lang/String;
-		METHOD method_31158 (Ljava/lang/String;)Z
+		METHOD method_39746 createId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960;
-			ARG 0 name
-		METHOD method_39745 (Ljava/lang/String;Ljava/util/Set;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)V
-			ARG 3 id
-		METHOD method_39746 createId (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960;
 			ARG 0 rootKey
-			ARG 1 key
+		METHOD method_39747 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
-		METHOD method_39747 getPath (Lnet/minecraft/class_5321;)Ljava/lang/String;
-			ARG 0 registryKey
 	CLASS class_5507 Impl
 		FIELD field_26741 values Ljava/util/Map;
 		FIELD field_36187 LOGGER Lorg/slf4j/Logger;
@@ -31,10 +20,6 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader
 			ARG 4 rawId
 			ARG 5 entry
 			ARG 6 lifecycle
-		METHOD method_39748 (Lnet/minecraft/class_5506$class_5507$class_6821;Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822;
-			ARG 1 value
-		METHOD method_39749 (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Ljava/util/stream/Stream;
-			ARG 1 registryKey
 		CLASS class_6821 Element
 	CLASS class_6822 Entry
 		METHOD method_39750 of (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822;

mappings/net/minecraft/util/dynamic/RegistryLoader.mapping

@@ -22,7 +22,7 @@ CLASS net/minecraft/class_6900 net/minecraft/util/dynamic/RegistryLoader
 		ARG 5 ops
 	METHOD method_40406 getOrCreateValueHolder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6900$class_6902;
 		ARG 1 registryRef
-	METHOD method_40407 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2385;)Lcom/mojang/serialization/DataResult;
+	METHOD method_40407 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Ljava/util/Map$Entry;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2385;)Lcom/mojang/serialization/DataResult;
 		ARG 5 reg
 	METHOD method_40408 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6900$class_6902;
 		ARG 0 ref

mappings/net/minecraft/util/function/ToFloatFunction.mapping

@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_6501 net/minecraft/util/function/ToFloatFunction
-	METHOD apply (Ljava/lang/Object;)F
+	METHOD comp_532 min ()F
+	METHOD comp_533 max ()F
+	METHOD method_41296 apply (Ljava/lang/Object;)F
 		ARG 1 x

mappings/net/minecraft/util/math/Direction.mapping

@@ -111,6 +111,9 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 	METHOD method_35838 rotateZCounterclockwise ()Lnet/minecraft/class_2350;
 	METHOD method_38940 validateVertical (Lnet/minecraft/class_2350;)Lcom/mojang/serialization/DataResult;
 		ARG 0 direction
+	METHOD method_42013 stream ()Ljava/util/stream/Stream;
+	METHOD method_42014 shuffle (Ljava/util/Random;)Ljava/util/Collection;
+		ARG 0 random
 	CLASS class_2351 Axis
 		FIELD field_11050 BY_NAME Ljava/util/Map;
 		FIELD field_11053 name Ljava/lang/String;

mappings/net/minecraft/util/math/Spline.mapping

@@ -30,8 +30,6 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline
 	METHOD method_39502 builder (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;)Lnet/minecraft/class_6492$class_6493;
 		ARG 0 locationFunction
 		ARG 1 amplifier
-	METHOD method_40435 min ()F
-	METHOD method_40436 max ()F
 	CLASS class_6493 Builder
 		FIELD field_34382 locationFunction Lnet/minecraft/class_6501;
 		FIELD field_34383 locations Lit/unimi/dsi/fastutil/floats/FloatList;
@@ -52,8 +50,6 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline
 			ARG 1 location
 			ARG 2 value
 			ARG 3 derivative
-		METHOD method_39503 (Ljava/lang/Float;)F
-			ARG 0 value
 	CLASS class_6494 FixedFloatFunction
 		FIELD comp_228 value F
 		METHOD <init> (F)V
@@ -62,11 +58,11 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline
 	CLASS class_6737 Serialized
 	CLASS class_6738 Implementation
 		FIELD comp_229 locationFunction Lnet/minecraft/class_6501;
+		FIELD comp_532 min F
+		FIELD comp_533 max F
 		METHOD comp_229 locationFunction ()Lnet/minecraft/class_6501;
 		METHOD method_39236 (D)Ljava/lang/String;
 			ARG 0 value
-		METHOD method_39237 (FI)Z
-			ARG 2 index
 		METHOD method_39238 format ([F)Ljava/lang/String;
 			ARG 1 values
 		METHOD method_39239 ([FI)D

mappings/net/minecraft/util/registry/Registry.mapping

@@ -323,7 +323,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 		ARG 0 registry
 	METHOD method_34041 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3773;
 		ARG 0 registry
-	METHOD method_34042 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3195;
+	METHOD method_34042 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7151;
 		ARG 0 registry
 	METHOD method_34043 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3031;
 		ARG 0 registry

mappings/net/minecraft/util/registry/RegistryKey.mapping

@@ -14,11 +14,6 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey
 		ARG 1 registry
 		ARG 2 value
 	METHOD method_29177 getValue ()Lnet/minecraft/class_2960;
-	METHOD method_29178 createKeyFactory (Lnet/minecraft/class_5321;)Ljava/util/function/Function;
-		COMMENT Creates a function that converts an identifier to a registry key for the
-		COMMENT registry that {@code registry} refers to in the root registry.
-		ARG 0 registry
-			COMMENT the reference to the value-holding registry in the root registry
 	METHOD method_29179 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
 		COMMENT Creates a registry key for a value in a registry with a registry key for
 		COMMENT the value-holding registry in the root registry and an identifier of the
@@ -47,8 +42,6 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey
 		ARG 1 value
 	METHOD method_29182 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 2 id
-	METHOD method_29183 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
-		ARG 1 id
 	METHOD method_31163 isOf (Lnet/minecraft/class_5321;)Z
 		COMMENT Returns whether this registry key belongs to the given registry (according to its type, not whether the registry actually contains this key).
 		ARG 1 registry

mappings/net/minecraft/world/StructureHolder.mapping

@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder
 	METHOD method_12179 getStructureReferences ()Ljava/util/Map;
-	METHOD method_12180 getStructureReferences (Lnet/minecraft/class_5312;)Lit/unimi/dsi/fastutil/longs/LongSet;
+	METHOD method_12180 getStructureReferences (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet;
-	METHOD method_12181 getStructureStart (Lnet/minecraft/class_5312;)Lnet/minecraft/class_3449;
+	METHOD method_12181 getStructureStart (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449;
-	METHOD method_12182 addStructureReference (Lnet/minecraft/class_5312;J)V
+	METHOD method_12182 addStructureReference (Lnet/minecraft/class_3195;J)V
 		ARG 2 reference
 	METHOD method_12183 setStructureReferences (Ljava/util/Map;)V
 		ARG 1 structureReferences
-	METHOD method_12184 setStructureStart (Lnet/minecraft/class_5312;Lnet/minecraft/class_3449;)V
+	METHOD method_12184 setStructureStart (Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V
 		ARG 2 start

mappings/net/minecraft/world/StructureLocator.mapping

@@ -14,49 +14,52 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator
 	FIELD field_36237 cachedFeaturesByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
 	FIELD field_36238 generationPossibilityByFeature Ljava/util/Map;
 	FIELD field_36418 configuredStructureFeatureRegistry Lnet/minecraft/class_2378;
-	METHOD <init> (Lnet/minecraft/class_6830;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_5321;Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_1966;JLcom/mojang/datafixers/DataFixer;)V
+	METHOD <init> (Lnet/minecraft/class_6830;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_5321;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Lnet/minecraft/class_5539;Lnet/minecraft/class_1966;JLcom/mojang/datafixers/DataFixer;)V
 		ARG 1 chunkIoWorker
 		ARG 2 registryManager
 		ARG 3 structureManager
 		ARG 4 worldKey
 		ARG 5 chunkGenerator
-		ARG 6 world
-		ARG 7 biomeSource
-		ARG 8 seed
-		ARG 10 dataFixer
 	METHOD method_39827 (JLit/unimi/dsi/fastutil/longs/Long2BooleanMap;)V
 		ARG 2 generationPossibilityByChunkPos
 	METHOD method_39828 cache (JLit/unimi/dsi/fastutil/objects/Object2IntMap;)V
 		ARG 1 pos
 		ARG 3 referencesByStructure
-	METHOD method_39829 isGenerationPossible (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;)Z
+	METHOD method_39829 isGenerationPossible (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)Z
 		COMMENT {@return whether {@code feature} is able to generate in {@code pos}}
 		COMMENT
 		COMMENT <p>This method only performs simple checks like biomes.
 		ARG 1 pos
 		ARG 2 feature
-	METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;)V
+	METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)V
 		ARG 1 pos
-	METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;Z)Lnet/minecraft/class_6833;
+		ARG 2 feature
+	METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833;
 		ARG 3 skipExistingChunk
-	METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;ZJ)Lnet/minecraft/class_6833;
+	METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833;
 		ARG 1 pos
+		ARG 2 feature
 		ARG 3 skipExistingChunk
 		ARG 4 posLong
 	METHOD method_39833 cache (Lnet/minecraft/class_1923;Ljava/util/Map;)V
 		ARG 1 pos
 		ARG 2 structureStarts
-	METHOD method_39836 (Lnet/minecraft/class_5312;Ljava/lang/Integer;)Ljava/lang/Integer;
+	METHOD method_39834 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/Long2BooleanMap;
+		ARG 0 feature
+	METHOD method_39836 (Lnet/minecraft/class_3195;Ljava/lang/Integer;)Ljava/lang/Integer;
+		ARG 0 feature
 		ARG 1 references
-	METHOD method_39837 (Lnet/minecraft/class_5312;Ljava/lang/Long;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	METHOD method_39837 (Lnet/minecraft/class_3195;Ljava/lang/Long;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 		ARG 1 pos
 		ARG 2 referencesByStructure
 	METHOD method_39838 createMapIfEmpty (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 		ARG 0 map
-	METHOD method_39839 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5312;Lnet/minecraft/class_3449;)V
+	METHOD method_39839 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V
 		ARG 0 feature
-	METHOD method_39840 getStructurePresence (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5312;Z)Lnet/minecraft/class_6833;
+		ARG 1 start
+	METHOD method_39840 getStructurePresence (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833;
 		ARG 1 referencesByStructure
+		ARG 2 feature
 		ARG 3 skipExistingChunk
 	METHOD method_39842 collectStructuresAndReferences (Lnet/minecraft/class_2487;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 		ARG 1 nbt

mappings/net/minecraft/world/World.mapping

@@ -136,6 +136,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	METHOD method_39425 shouldTickBlocksInChunk (J)Z
 		COMMENT {@return whether the blocks in the specified chunk should get ticked}
 		ARG 1 chunkPos
+	METHOD method_41411 shouldTickBlockPos (Lnet/minecraft/class_2338;)Z
+		ARG 1 pos
 	METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V
 		ARG 1 pos
 		ARG 2 oldState
@@ -313,9 +315,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		COMMENT for the one in {@code direction} direction.
 		COMMENT
 		COMMENT @see #updateNeighborsAlways(BlockPos, Block)
-		ARG 1 pos
 		ARG 2 sourceBlock
-		ARG 3 direction
 	METHOD method_8509 setLightningTicksLeft (I)V
 		ARG 1 lightningTicksLeft
 	METHOD method_8510 getTime ()J

mappings/net/minecraft/world/WorldEvents.mapping

@@ -348,3 +348,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
 		COMMENT <p>Called by {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock},
 		COMMENT an anonymous class in {@link net.minecraft.block.dispenser.DispenserBehavior#registerDefaults() DispenserBehavior#registerDefaults},
 		COMMENT and {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning}
+	FIELD field_37586 SCULK_CHARGE I
+		COMMENT Sculk... charges? Sculk is weird.
+		COMMENT <br>Spawns sculk charge particles.
+		COMMENT <br>Called by {@link net.minecraft.block.entity.SculkSpreadManager#tick(net.minecraft.world.World, net.minecraft.util.math.BlockPos, java.util.Random) SculkSpreadManager#tick}

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

@@ -8,14 +8,9 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 	FIELD field_26395 spawnSettings Lnet/minecraft/class_5483;
 	FIELD field_26635 generationSettings Lnet/minecraft/class_5485;
 	FIELD field_9324 FOLIAGE_NOISE Lnet/minecraft/class_3543;
-	FIELD field_9329 category Lnet/minecraft/class_1959$class_1961;
 	FIELD field_9335 TEMPERATURE_NOISE Lnet/minecraft/class_3543;
-	METHOD <init> (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_1959$class_1961;Lnet/minecraft/class_4763;Lnet/minecraft/class_5485;Lnet/minecraft/class_5483;)V
+	METHOD <init> (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_4763;Lnet/minecraft/class_5485;Lnet/minecraft/class_5483;)V
 		ARG 1 weather
-		ARG 2 category
-		ARG 3 effects
-		ARG 4 generationSettings
-		ARG 5 spawnSettings
 	METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F
 		ARG 1 blockPos
 	METHOD method_24376 getFogColor ()I
@@ -33,8 +28,6 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 		ARG 0 biome
 	METHOD method_28421 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_4763;
 		ARG 0 biome
-	METHOD method_28422 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959$class_1961;
-		ARG 0 biome
 	METHOD method_28423 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959$class_5482;
 		ARG 0 biome
 	METHOD method_30773 getDefaultGrassColor ()I
@@ -42,17 +35,13 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 	METHOD method_30776 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_30966 getSpawnSettings ()Lnet/minecraft/class_5483;
-	METHOD method_30969 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959$class_1961;
-		ARG 0 biome
 	METHOD method_30970 getGenerationSettings ()Lnet/minecraft/class_5485;
 	METHOD method_30971 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_4763;
 		ARG 0 biome
 	METHOD method_33599 isCold (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_38103 (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_1959$class_1961;Lnet/minecraft/class_4763;)Lnet/minecraft/class_1959;
+	METHOD method_38103 (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_4763;)Lnet/minecraft/class_1959;
 		ARG 0 weather
-		ARG 1 category
-		ARG 2 effects
 	METHOD method_38104 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_39927 doesNotSnow (Lnet/minecraft/class_2338;)Z
@@ -61,14 +50,11 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 		ARG 1 pos
 	METHOD method_39929 isHot (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_40136 getCategory (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1959$class_1961;
-		ARG 0 biomeEntry
 	METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 doWaterCheck
 	METHOD method_8687 getWaterColor ()I
-	METHOD method_8688 getCategory ()Lnet/minecraft/class_1959$class_1961;
 	METHOD method_8694 getPrecipitation ()Lnet/minecraft/class_1959$class_1963;
 	METHOD method_8696 canSetSnow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
@@ -92,7 +78,6 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 		FIELD field_26396 temperatureModifier Lnet/minecraft/class_1959$class_5484;
 		FIELD field_26636 spawnSettings Lnet/minecraft/class_5483;
 		FIELD field_26637 generationSettings Lnet/minecraft/class_5485;
-		FIELD field_9345 category Lnet/minecraft/class_1959$class_1961;
 		FIELD field_9346 precipitation Lnet/minecraft/class_1959$class_1963;
 		FIELD field_9349 temperature Ljava/lang/Float;
 		FIELD field_9351 downfall Ljava/lang/Float;
@@ -111,21 +96,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
 			ARG 1 downfall
 		METHOD method_8735 precipitation (Lnet/minecraft/class_1959$class_1963;)Lnet/minecraft/class_1959$class_1960;
 			ARG 1 precipitation
-		METHOD method_8738 category (Lnet/minecraft/class_1959$class_1961;)Lnet/minecraft/class_1959$class_1960;
-			ARG 1 category
 		METHOD method_8747 temperature (F)Lnet/minecraft/class_1959$class_1960;
 			ARG 1 temperature
-	CLASS class_1961 Category
-		FIELD field_24678 CODEC Lcom/mojang/serialization/Codec;
-		FIELD field_9359 BY_NAME Ljava/util/Map;
-		FIELD field_9372 name Ljava/lang/String;
-		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
-			ARG 3 name
-		METHOD method_28424 byName (Ljava/lang/String;)Lnet/minecraft/class_1959$class_1961;
-			ARG 0 name
-		METHOD method_8748 (Lnet/minecraft/class_1959$class_1961;)Lnet/minecraft/class_1959$class_1961;
-			ARG 0 category
-		METHOD method_8749 getName ()Ljava/lang/String;
 	CLASS class_1963 Precipitation
 		FIELD field_24680 CODEC Lcom/mojang/serialization/Codec;
 		FIELD field_9381 BY_NAME Ljava/util/Map;

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

@@ -65,23 +65,9 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator
 	METHOD method_38577 createStonyPeaks ()Lnet/minecraft/class_1959;
 	METHOD method_38578 createSnowySlopes ()Lnet/minecraft/class_1959;
 	METHOD method_38579 createGrove ()Lnet/minecraft/class_1959;
-	METHOD method_39151 createBiome (Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_1959$class_1961;FFIILnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959;
+	METHOD method_39151 createBiome (Lnet/minecraft/class_1959$class_1963;FFIILnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959;
 		ARG 0 precipitation
-		ARG 1 category
+	METHOD method_39152 createBiome (Lnet/minecraft/class_1959$class_1963;FFLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959;
-		ARG 2 temperature
-		ARG 3 downfall
-		ARG 4 waterColor
-		ARG 5 waterFogColor
-		ARG 6 spawnSettings
-		ARG 7 generationSettings
-		ARG 8 music
-	METHOD method_39152 createBiome (Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_1959$class_1961;FFLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959;
 		ARG 0 precipitation
-		ARG 1 category
-		ARG 2 temperature
-		ARG 3 downfall
-		ARG 4 spawnSettings
-		ARG 5 generationSettings
-		ARG 6 music
 	METHOD method_39153 addBasicFeatures (Lnet/minecraft/class_5485$class_5495;)V
 		ARG 0 generationSettings

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

@@ -14,8 +14,6 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource
 		ARG 5 blockCheckInterval
 		ARG 7 random
 		ARG 9 noiseSampler
-	METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966;
-		ARG 1 seed
 	METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec;
 	METHOD method_28443 getBiomes ()Ljava/util/Set;
 	METHOD method_38114 addDebugInfo (Ljava/util/List;Lnet/minecraft/class_2338;Lnet/minecraft/class_6544$class_6552;)V

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

@@ -1,17 +1,11 @@
 CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource
 	FIELD field_24730 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_24731 seed J
 	FIELD field_26700 centerBiome Lnet/minecraft/class_6880;
 	FIELD field_26701 highlandsBiome Lnet/minecraft/class_6880;
 	FIELD field_26702 midlandsBiome Lnet/minecraft/class_6880;
 	FIELD field_26703 smallIslandsBiome Lnet/minecraft/class_6880;
 	FIELD field_26704 barrensBiome Lnet/minecraft/class_6880;
-	FIELD field_9831 noise Lnet/minecraft/class_3541;
+	METHOD <init> (Lnet/minecraft/class_2378;)V
-	METHOD <init> (Lnet/minecraft/class_2378;J)V
 		ARG 1 biomeRegistry
-		ARG 2 seed
-	METHOD method_28479 matches (J)Z
-		ARG 1 seed
 	METHOD method_31105 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_8757 getNoiseAt (Lnet/minecraft/class_3541;II)F

mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping

@@ -39,7 +39,6 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom
 		ARG 1 humidity
 		ARG 2 weirdness
 	METHOD method_38185 writeVanillaBiomeParameters (Ljava/util/function/Consumer;)V
-		ARG 1 parameters
 	METHOD method_38186 writeMountainousBiomes (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;)V
 		ARG 1 parameters
 		ARG 2 weirdness

mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping

@@ -1,57 +0,0 @@
-CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerrainParameters
-	FIELD comp_464 offsetSpline Lnet/minecraft/class_6492;
-	FIELD comp_465 factorSpline Lnet/minecraft/class_6492;
-	FIELD comp_466 peakSpline Lnet/minecraft/class_6492;
-	FIELD field_34531 OFFSET_VALUE_OFFSET F
-	FIELD field_35456 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;)V
-		ARG 1 offsetSpline
-		ARG 2 factorSpline
-		ARG 3 peakSpline
-	METHOD comp_464 offsetSpline ()Lnet/minecraft/class_6492;
-	METHOD comp_465 factorSpline ()Lnet/minecraft/class_6492;
-	METHOD comp_466 peakSpline ()Lnet/minecraft/class_6492;
-	METHOD method_38208 getNormalizedWeirdness (F)F
-		ARG 0 weirdness
-	METHOD method_38209 createNoisePoint (FFF)Lnet/minecraft/class_6555$class_6556;
-	METHOD method_38211 createFlatOffsetSpline (FFFFFFLnet/minecraft/class_6501;)Lnet/minecraft/class_6492;
-	METHOD method_38212 createLandSpline (FFFFFFZZLnet/minecraft/class_6501;)Lnet/minecraft/class_6492;
-	METHOD method_38213 buildErosionFactorSpline (FZLnet/minecraft/class_6501;)Lnet/minecraft/class_6492;
-		ARG 0 value
-	METHOD method_38214 getOffset (Lnet/minecraft/class_6555$class_6556;)F
-		ARG 1 point
-	METHOD method_38215 writeDebugBiomes (Ljava/util/function/Consumer;)V
-		ARG 1 parameters
-	METHOD method_38217 (F)F
-		ARG 0 continentalness
-	METHOD method_38218 getOffsetValue (FFF)F
-		ARG 0 weirdness
-		ARG 1 continentalness
-		ARG 2 weirdnessThreshold
-	METHOD method_38220 getFactor (Lnet/minecraft/class_6555$class_6556;)F
-		ARG 1 point
-	METHOD method_38221 getPeak (Lnet/minecraft/class_6555$class_6556;)F
-		ARG 1 point
-	METHOD method_39457 createSurfaceParameters (Z)Lnet/minecraft/class_6555;
-		ARG 0 amplified
-	CLASS class_6556 NoisePoint
-		FIELD comp_235 continentalnessNoise F
-		FIELD comp_236 erosionNoise F
-		FIELD comp_237 normalizedWeirdness F
-		FIELD comp_238 weirdnessNoise F
-		METHOD <init> (FFFF)V
-			ARG 1 continentalnessNoise
-			ARG 2 erosionNoise
-			ARG 3 normalizedWeirdness
-			ARG 4 weirdnessNoise
-		METHOD comp_235 continentalnessNoise ()F
-		METHOD comp_236 erosionNoise ()F
-		METHOD comp_237 normalizedWeirdness ()F
-		METHOD comp_238 weirdnessNoise ()F
-	CLASS class_6744 LocationFunction
-		FIELD field_35463 CODEC Lcom/mojang/serialization/Codec;
-		FIELD field_35465 noiseFunction Lnet/minecraft/class_6501;
-		FIELD field_35466 id Ljava/lang/String;
-		METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_6501;Ljava/lang/String;)V
-			ARG 3 noiseFunction
-			ARG 4 id

mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping

@@ -1,7 +1 @@
 CLASS net/minecraft/class_6765 net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator
-	METHOD method_39421 createSurfaceParameters (Z)Lnet/minecraft/class_6555;
-		ARG 0 amplified
-	METHOD method_39422 createNetherParameters ()Lnet/minecraft/class_6555;
-	METHOD method_39423 createEndParameters ()Lnet/minecraft/class_6555;
-	METHOD method_39923 createCavesParameters ()Lnet/minecraft/class_6555;
-	METHOD method_39924 createFloatingIslandsParameters ()Lnet/minecraft/class_6555;

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

@@ -87,12 +87,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
 		ARG 1 pos
 	METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713;
 		ARG 1 ySectionCoord
-	METHOD method_38255 getOrCreateChunkNoiseSampler (Lnet/minecraft/class_6953;Ljava/util/function/Supplier;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568;
+	METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568;
-		ARG 1 noiseColumnSampler
-		ARG 2 columnSampler
-		ARG 3 chunkGeneratorSettings
-		ARG 4 fluidLevelSampler
-		ARG 5 blender
 	METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V
 		ARG 0 world
 		ARG 1 biome

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

@@ -9,8 +9,7 @@ CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions
 	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)V
 		ARG 2 chunkGenerator
 	METHOD method_29566 getDimensionTypeSupplier ()Lnet/minecraft/class_6880;
-	METHOD method_29567 hasDefaultSettings (JLnet/minecraft/class_2378;)Z
+	METHOD method_29567 hasDefaultSettings (Lnet/minecraft/class_2378;)Z
-		ARG 0 seed
 	METHOD method_29568 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_29571 getChunkGenerator ()Lnet/minecraft/class_2794;

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

@@ -3,9 +3,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	FIELD field_24504 hasCeiling Z
 	FIELD field_24505 ultrawarm Z
 	FIELD field_24752 MOON_SIZES [F
-	FIELD field_24753 OVERWORLD_REGISTRY_KEY Lnet/minecraft/class_5321;
-	FIELD field_24754 THE_NETHER_REGISTRY_KEY Lnet/minecraft/class_5321;
-	FIELD field_24755 THE_END_REGISTRY_KEY Lnet/minecraft/class_5321;
 	FIELD field_24756 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24757 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24761 fixedTime Ljava/util/OptionalLong;
@@ -13,11 +10,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	FIELD field_24764 hasEnderDragonFight Z
 	FIELD field_24766 ambientLight F
 	FIELD field_24767 brightnessByLightLevel [F
-	FIELD field_25407 OVERWORLD Lnet/minecraft/class_2874;
-	FIELD field_25408 THE_NETHER Lnet/minecraft/class_2874;
-	FIELD field_25409 THE_END Lnet/minecraft/class_2874;
-	FIELD field_25610 OVERWORLD_CAVES_REGISTRY_KEY Lnet/minecraft/class_5321;
-	FIELD field_25611 OVERWORLD_CAVES Lnet/minecraft/class_2874;
 	FIELD field_25612 piglinSafe Z
 	FIELD field_25613 bedWorks Z
 	FIELD field_25614 respawnAnchorWorks Z
@@ -26,9 +18,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	FIELD field_25617 infiniburn Lnet/minecraft/class_6862;
 	FIELD field_26706 coordinateScale D
 	FIELD field_26751 effects Lnet/minecraft/class_2960;
-	FIELD field_26752 OVERWORLD_ID Lnet/minecraft/class_2960;
-	FIELD field_26753 THE_NETHER_ID Lnet/minecraft/class_2960;
-	FIELD field_26754 THE_END_ID Lnet/minecraft/class_2960;
 	FIELD field_28131 height I
 	FIELD field_28132 logicalHeight I
 	FIELD field_28133 SIZE_BITS_Y I
@@ -78,15 +67,10 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 		ARG 0 ambientLight
 	METHOD method_28516 getBrightness (I)F
 		ARG 1 lightLevel
-	METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_5455;JZ)Lnet/minecraft/class_2378;
-		ARG 0 registryManager
-		ARG 1 seed
 	METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult;
 		ARG 0 nbt
 	METHOD method_28522 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_6893;)Lnet/minecraft/class_5455$class_6893;
-		ARG 0 registryManager
 	METHOD method_28528 getSkyAngle (J)F
 		ARG 1 time
 	METHOD method_28531 getMoonPhase (J)I
@@ -133,6 +117,3 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 		ARG 0 type
 	METHOD method_32924 getHeight ()I
 	METHOD method_32925 getLogicalHeight ()I
-	METHOD method_39540 createDefaultDimensionOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2378;
-		ARG 0 registryManager
-		ARG 1 seed

mappings/net/minecraft/world/event/EntityPositionSource.mapping

@@ -6,4 +6,6 @@ CLASS net/minecraft/class_5709 net/minecraft/world/event/EntityPositionSource
 		ARG 1 entityId
 	METHOD method_32932 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
+	METHOD method_32933 (Lnet/minecraft/class_5709;)Ljava/lang/Integer;
+		ARG 0 positionSource
 	CLASS class_5710 Type

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
-	FIELD field_24525 LOGGER Lorg/slf4j/Logger;
 	FIELD field_24526 seed J
 	FIELD field_24527 generateStructures Z
 	FIELD field_24528 bonusChest Z
@@ -17,14 +16,8 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
 		ARG 4 bonusChest
 		ARG 5 options
 		ARG 6 legacyCustomOptions
-	METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
-		ARG 0 registryManager
-	METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_3806$class_7044;)Lnet/minecraft/class_5285;
-		ARG 0 registryManager
-		ARG 1 worldGenProperties
 	METHOD method_28024 withHardcore (ZLjava/util/OptionalLong;)Lnet/minecraft/class_5285;
 		ARG 1 hardcore
-		ARG 2 seed
 	METHOD method_28028 getSeed ()J
 	METHOD method_28029 shouldGenerateStructures ()Z
 	METHOD method_28030 hasBonusChest ()Z
@@ -35,9 +28,6 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
 	METHOD method_28036 withBonusChest ()Lnet/minecraft/class_5285;
 	METHOD method_28037 toggleGenerateStructures ()Lnet/minecraft/class_5285;
 	METHOD method_28038 toggleBonusChest ()Lnet/minecraft/class_5285;
-	METHOD method_28604 createOverworldGenerator (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_3754;
-		ARG 0 registryManager
-		ARG 1 seed
 	METHOD method_28606 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_28608 getRegistryWithReplacedOverworldGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378;
@@ -52,22 +42,9 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
 		ARG 0 options
 		ARG 1 dimensionType
 		ARG 2 overworldGenerator
-	METHOD method_31112 createDemo (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
-		ARG 0 registryManager
 	METHOD method_39334 toWorldKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321;
 		ARG 0 dimensionOptionsKey
 	METHOD method_39335 toDimensionOptionsKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321;
 		ARG 0 worldKey
-	METHOD method_39556 createGenerator (Lnet/minecraft/class_5455;JLnet/minecraft/class_5321;)Lnet/minecraft/class_3754;
-		ARG 0 registryManager
-		ARG 1 seed
-		ARG 3 settings
-	METHOD method_39557 createGenerator (Lnet/minecraft/class_5455;JLnet/minecraft/class_5321;Z)Lnet/minecraft/class_3754;
-		ARG 0 registryManager
-		ARG 1 seed
-		ARG 3 settings
-	METHOD method_39558 createOverworldGenerator (Lnet/minecraft/class_5455;JZ)Lnet/minecraft/class_3754;
-		ARG 0 registryManager
-		ARG 1 seed
 	METHOD method_40024 parseSeed (Ljava/lang/String;)Ljava/util/OptionalLong;
 		ARG 0 seed

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

@@ -6,35 +6,35 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
 		ARG 1 world
 		ARG 2 options
 		ARG 3 locator
-	METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;JLnet/minecraft/class_2810;)V
+	METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V
 		ARG 1 pos
 		ARG 3 reference
 		ARG 5 holder
-	METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449;
+	METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449;
 		ARG 1 pos
 		ARG 3 holder
-	METHOD method_26976 setStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;Lnet/minecraft/class_3449;Lnet/minecraft/class_2810;)V
+	METHOD method_26976 setStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;Lnet/minecraft/class_2810;)V
 		ARG 1 pos
 		ARG 3 structureStart
 		ARG 4 holder
 	METHOD method_27834 shouldGenerateStructures ()Z
-	METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_5312;)Lnet/minecraft/class_3449;
+	METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449;
 		ARG 1 pos
 	METHOD method_29951 forRegion (Lnet/minecraft/class_3233;)Lnet/minecraft/class_5138;
 		ARG 1 region
 	METHOD method_38852 hasStructureReferences (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_38853 getStructureStarts (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;)Ljava/util/List;
+	METHOD method_38853 getStructureStarts (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/List;
 		COMMENT {@return a list of structure starts for this chunk} The structure starts
 		COMMENT are computed from the structure references of the given section's chunk.
 		ARG 1 sectionPos
-	METHOD method_38854 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_5312;)Lnet/minecraft/class_3449;
+	METHOD method_38854 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449;
 		COMMENT {@return a structure that contains the given {@code pos}} Compared to
 		COMMENT {@link #getStructureAt}, this does not return a structure if the given
 		COMMENT position is in the expanded bounding box of the structure but not in any
 		COMMENT child piece of it.
 		ARG 1 pos
-	METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;Z)Lnet/minecraft/class_6833;
+	METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833;
 		ARG 1 chunkPos
 		ARG 3 skipExistingChunk
 	METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V

mappings/net/minecraft/world/gen/carver/CarverContext.mapping

@@ -1,12 +1,8 @@
 CLASS net/minecraft/class_5873 net/minecraft/world/gen/carver/CarverContext
-	FIELD field_35298 chunkGenerator Lnet/minecraft/class_3754;
 	FIELD field_35299 registryManager Lnet/minecraft/class_5455;
 	FIELD field_35703 chunkNoiseSampler Lnet/minecraft/class_6568;
-	METHOD <init> (Lnet/minecraft/class_3754;Lnet/minecraft/class_5455;Lnet/minecraft/class_5539;Lnet/minecraft/class_6568;)V
+	METHOD <init> (Lnet/minecraft/class_3754;Lnet/minecraft/class_5455;Lnet/minecraft/class_5539;Lnet/minecraft/class_6568;Lnet/minecraft/class_7138;Lnet/minecraft/class_6686$class_6708;)V
-		ARG 1 chunkGenerator
-		ARG 2 registryManager
 		ARG 3 heightLimitView
-		ARG 4 chunkNoiseSampler
 	METHOD method_39114 applyMaterialRule (Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional;
 		ARG 1 posToBiome
 		ARG 2 chunk

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

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_6748 net/minecraft/world/gen/chunk/Blender
 	METHOD method_39336 getNoBlending ()Lnet/minecraft/class_6748;
 	METHOD method_39342 getBlender (Lnet/minecraft/class_3233;)Lnet/minecraft/class_6748;
 		ARG 0 chunkRegion
-	METHOD method_39561 blendBiome (II)Lnet/minecraft/class_6880;
+	METHOD method_39561 blendBiome (III)Lnet/minecraft/class_6880;
 		ARG 1 x
 		ARG 2 y
 	METHOD method_39563 getBiomeSupplier (Lnet/minecraft/class_6780;)Lnet/minecraft/class_6780;

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

@@ -2,27 +2,15 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData
 	FIELD field_35515 OLD_HEIGHT_LIMIT Lnet/minecraft/class_5539;
 	FIELD field_35519 SURFACE_BLOCKS Ljava/util/List;
 	FIELD field_35682 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_35689 oldNoise Z
 	FIELD field_35692 heights [D
-	METHOD <init> (ZLjava/util/Optional;)V
-		ARG 1 oldNoise
 	METHOD method_39347 (ILnet/minecraft/class_2791;II)V
 		ARG 1 index
-		ARG 2 chunk
 		ARG 3 x
 		ARG 4 z
 	METHOD method_39349 getSurfaceHeight (Lnet/minecraft/class_2791;II)I
-		ARG 0 chunk
-		ARG 1 x
-		ARG 2 z
 	METHOD method_39350 isCollidableAndNotTreeAt (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z
 		ARG 0 chunk
 		ARG 1 pos
-	METHOD method_39354 (Lnet/minecraft/class_2791;III)[D
-		ARG 0 chunk
-		ARG 1 x
-		ARG 2 z
-	METHOD method_39566 usesOldNoise ()Z
 	METHOD method_39570 getBlendingData (Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749;
 		ARG 0 chunkRegion
 		ARG 1 chunkX

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

@@ -9,12 +9,11 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	FIELD field_24746 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24747 biomeSource Lnet/minecraft/class_1966;
 	FIELD field_37254 LOGGER Lorg/slf4j/Logger;
-	METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config.
 		ARG 1 executor
 		ARG 2 blender
 		ARG 3 structureAccessor
-		ARG 4 chunk
 	METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966;
 	METHOD method_12100 getSpawnHeight (Lnet/minecraft/class_5539;)I
 		ARG 1 world
@@ -38,85 +37,65 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	METHOD method_12104 getWorldHeight ()I
 	METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V
 		ARG 1 region
-	METHOD method_12108 carve (Lnet/minecraft/class_3233;JLnet/minecraft/class_4543;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V
+	METHOD method_12108 carve (Lnet/minecraft/class_3233;JLnet/minecraft/class_7138;Lnet/minecraft/class_4543;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V
 		COMMENT Generates caves for the given chunk.
 		ARG 1 chunkRegion
 		ARG 2 seed
-		ARG 4 biomeAccess
+	METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)V
-		ARG 5 structureAccessor
-		ARG 6 chunk
-		ARG 7 generationStep
-	METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
 		COMMENT Places the surface blocks of the biomes after the noise has been generated.
 		ARG 1 region
 		ARG 2 structures
-		ARG 3 chunk
 	METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_6880;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6012;
 		ARG 1 biome
 		ARG 2 accessor
 		ARG 3 group
 		ARG 4 pos
-	METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V
+	METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V
 		COMMENT Determines which structures should start in the given chunk and creates their starting points.
 		ARG 1 registryManager
-		ARG 2 world
-		ARG 3 chunk
-		ARG 4 structureManager
-		ARG 5 worldSeed
 	METHOD method_16130 addStructureReferences (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
 		COMMENT Finds all structures that the given chunk intersects, and adds references to their starting chunks to it.
 		COMMENT A radius of 8 chunks around the given chunk will be searched for structure starts.
 		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunk
-	METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I
+	METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
 		COMMENT Returns the raw noise height of a column for use in structure generation.
 		ARG 1 x
 		ARG 2 z
 		ARG 3 heightmap
 		ARG 4 world
 	METHOD method_16398 getSeaLevel ()I
-	METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I
+	METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
 		ARG 1 x
 		ARG 2 z
 		ARG 3 heightmap
 		ARG 4 world
-	METHOD method_20402 getHeightOnGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I
+	METHOD method_20402 getHeightOnGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
 		ARG 1 x
 		ARG 2 z
 		ARG 3 heightmap
 		ARG 4 world
-	METHOD method_26261 getColumnSample (IILnet/minecraft/class_5539;)Lnet/minecraft/class_4966;
+	METHOD method_26261 getColumnSample (IILnet/minecraft/class_5539;Lnet/minecraft/class_7138;)Lnet/minecraft/class_4966;
 		COMMENT Returns a sample of all the block states in a column for use in structure generation.
 		ARG 1 x
 		ARG 2 z
 		ARG 3 world
-	METHOD method_27997 withSeed (J)Lnet/minecraft/class_2794;
-		ARG 1 seed
 	METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec;
-	METHOD method_28509 generateStrongholdPositions (Lnet/minecraft/class_6880;Lnet/minecraft/class_6871;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_28509 generateStrongholdPositions (Lnet/minecraft/class_6880;Lnet/minecraft/class_7138;Lnet/minecraft/class_6871;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 strongholdSet
-		ARG 2 placement
 	METHOD method_33730 getMinimumY ()I
-	METHOD method_38264 getStructureReferences (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;)I
+	METHOD method_38264 getStructureReferences (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)I
 		ARG 0 structureAccessor
 		ARG 1 chunk
 		ARG 2 sectionPos
-	METHOD method_38275 populateBiomes (Lnet/minecraft/class_2378;Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_38275 populateBiomes (Lnet/minecraft/class_2378;Ljava/util/concurrent/Executor;Lnet/minecraft/class_7138;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 biomeRegistry
-		ARG 3 blender
-		ARG 4 structureAccessor
-		ARG 5 chunk
-	METHOD method_38276 getMultiNoiseSampler ()Lnet/minecraft/class_6544$class_6552;
 	METHOD method_39301 getCodecKey ()Ljava/util/Optional;
 	METHOD method_39462 getBlockBoxForChunk (Lnet/minecraft/class_2791;)Lnet/minecraft/class_3341;
 		ARG 0 chunk
-	METHOD method_40147 getConcentricRingsStartChunks (Lnet/minecraft/class_6871;)Ljava/util/List;
+	METHOD method_40147 getConcentricRingsStartChunks (Lnet/minecraft/class_6871;Lnet/minecraft/class_7138;)Ljava/util/List;
 		ARG 1 structurePlacement
 	METHOD method_40149 filterBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880;
 		ARG 1 biome
-	METHOD method_40450 getDebugHudText (Ljava/util/List;Lnet/minecraft/class_2338;)V
+	METHOD method_40450 getDebugHudText (Ljava/util/List;Lnet/minecraft/class_7138;Lnet/minecraft/class_2338;)V
 		ARG 1 text
-		ARG 2 pos
-	METHOD method_40451 (Lnet/minecraft/class_7059$class_7060;)Ljava/util/stream/Stream;
-		ARG 0 entry

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

@@ -17,13 +17,8 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti
 	FIELD field_26359 CAVES Lnet/minecraft/class_5321;
 	FIELD field_26360 FLOATING_ISLANDS Lnet/minecraft/class_5321;
 	FIELD field_35051 LARGE_BIOMES Lnet/minecraft/class_5321;
-	METHOD <init> (Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_7056;Lnet/minecraft/class_6686$class_6708;IZZZZ)V
+	METHOD <init> (Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6953;Lnet/minecraft/class_6686$class_6708;Ljava/util/List;IZZZZ)V
 		ARG 5 surfaceRule
-		ARG 6 seaLevel
-		ARG 7 mobGenerationDisabled
-		ARG 8 aquifers
-		ARG 9 noiseCaves
-		ARG 10 oreVeins
 	METHOD comp_474 generationShapeConfig ()Lnet/minecraft/class_5309;
 	METHOD comp_475 defaultBlock ()Lnet/minecraft/class_2680;
 	METHOD comp_476 defaultFluid ()Lnet/minecraft/class_2680;

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

@@ -13,17 +13,8 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler
 	FIELD field_36584 blockStateSampler Lnet/minecraft/class_6568$class_6569;
 	FIELD field_36590 horizontalBlockSize I
 	FIELD field_36591 verticalBlockSize I
-	METHOD <init> (IIILnet/minecraft/class_6953;IILnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V
+	METHOD <init> (ILnet/minecraft/class_5539;Lnet/minecraft/class_6953;IILnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;Lnet/minecraft/class_6574;Lnet/minecraft/class_6574;)V
 		ARG 1 horizontalSize
-		ARG 2 height
-		ARG 3 minimumY
-		ARG 4 noiseRouter
-		ARG 5 x
-		ARG 6 z
-		ARG 7 noiseType
-		ARG 8 chunkGeneratorSettings
-		ARG 9 fluidLevelSampler
-		ARG 10 blender
 	METHOD method_38336 sampleStartNoise ()V
 	METHOD method_38337 sampleNoiseY (ID)V
 	METHOD method_38338 (DLnet/minecraft/class_6568$class_5917;)V
@@ -43,23 +34,10 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler
 	METHOD method_38362 sampleNoiseCorners (II)V
 		ARG 1 noiseY
 		ARG 2 noiseZ
-	METHOD method_39542 create (IIIILnet/minecraft/class_6953;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6568;
+	METHOD method_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_6953;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;Lnet/minecraft/class_6574;Lnet/minecraft/class_6574;)Lnet/minecraft/class_6568;
-		ARG 0 x
-		ARG 1 z
-		ARG 2 minimumY
-		ARG 3 height
-		ARG 4 noiseRouter
-		ARG 5 chunkGeneratorSettings
-		ARG 6 fluidLevelSampler
-	METHOD method_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_6953;Ljava/util/function/Supplier;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568;
 		ARG 0 chunk
 		ARG 1 noiseRouter
-		ARG 2 noiseTypeSupplier
+	METHOD method_40531 createMultiNoiseSampler (Lnet/minecraft/class_6953;Ljava/util/List;)Lnet/minecraft/class_6544$class_6552;
-		ARG 3 chunkGeneratorSettings
-		ARG 4 fluidLevelSampler
-		ARG 5 blender
-	METHOD method_40531 createMultiNoiseSampler (Lnet/minecraft/class_6953;)Lnet/minecraft/class_6544$class_6552;
-		ARG 1 noiseRouter
 	METHOD method_40536 sampleBlockState ()Lnet/minecraft/class_2680;
 	CLASS class_5917 NoiseInterpolator
 		FIELD field_29227 startNoiseBuffer [[D

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

@@ -6,9 +6,8 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf
 	FIELD comp_177 bottomSlide Lnet/minecraft/class_5310;
 	FIELD comp_178 horizontalSize I
 	FIELD comp_179 verticalSize I
-	FIELD comp_247 terrainParameters Lnet/minecraft/class_6555;
 	FIELD field_24804 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IILnet/minecraft/class_6555;)V
+	METHOD <init> (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;II)V
 		ARG 1 minimumY
 		ARG 2 height
 		ARG 3 sampling
@@ -23,10 +22,9 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf
 	METHOD comp_177 bottomSlide ()Lnet/minecraft/class_5310;
 	METHOD comp_178 horizontalSize ()I
 	METHOD comp_179 verticalSize ()I
-	METHOD comp_247 terrainParameters ()Lnet/minecraft/class_6555;
 	METHOD method_28582 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IILnet/minecraft/class_6555;)Lnet/minecraft/class_5309;
+	METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;II)Lnet/minecraft/class_5309;
 		ARG 0 minimumY
 		ARG 1 height
 		ARG 2 sampling

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

@@ -3,48 +3,28 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
 	FIELD field_16648 AIR Lnet/minecraft/class_2680;
 	FIELD field_24773 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24774 settings Lnet/minecraft/class_6880;
-	FIELD field_24778 seed J
-	FIELD field_28746 EMPTY [Lnet/minecraft/class_2680;
-	FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_6544$class_6552;
 	FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565;
-	FIELD field_35183 surfaceBuilder Lnet/minecraft/class_6724;
 	FIELD field_35361 noiseRegistry Lnet/minecraft/class_2378;
-	FIELD field_36571 noiseRouter Lnet/minecraft/class_6953;
+	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)V
-	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V
-		ARG 1 noiseRegistry
-		ARG 2 structuresRegistry
-		ARG 3 biomeSource
-		ARG 4 seed
-		ARG 6 settings
-	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V
 		ARG 1 noiseRegistry
 		ARG 2 structuresRegistry
 		ARG 3 populationSource
 		ARG 4 biomeSource
-		ARG 5 seed
+	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)V
-		ARG 7 settings
+		ARG 1 noiseRegistry
-	METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt;
+		ARG 2 structuresRegistry
-		ARG 3 states
+		ARG 3 biomeSource
-		ARG 4 predicate
+	METHOD method_26263 sampleHeightmap (Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;IILorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/function/Predicate;)Ljava/util/OptionalInt;
-	METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z
+	METHOD method_28548 matchesSettings (Lnet/minecraft/class_5321;)Z
-		ARG 1 seed
-		ARG 3 settingsKey
 	METHOD method_28549 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_6880;
 		ARG 0 generator
 	METHOD method_28550 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_28552 (Lnet/minecraft/class_3754;)Ljava/lang/Long;
-		ARG 0 generator
 	METHOD method_28554 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_1966;
 		ARG 0 generator
-	METHOD method_33754 populateNoise (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791;
+	METHOD method_33754 populateNoise (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791;
 		ARG 1 blender
 		ARG 2 structureAccessor
-		ARG 3 chunk
-	METHOD method_38322 (III)Lnet/minecraft/class_6880;
-		ARG 1 x
-		ARG 2 y
-		ARG 3 z
 	METHOD method_38323 getBlockState (Lnet/minecraft/class_6568;IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
 		ARG 1 chunkNoiseSampler
 		ARG 2 x
@@ -55,17 +35,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
 		ARG 4 x
 		ARG 5 y
 		ARG 6 z
-	METHOD method_38327 populateBiomes (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
+	METHOD method_38327 populateBiomes (Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
 		ARG 1 blender
-		ARG 2 structureAccessor
-		ARG 3 chunk
-	METHOD method_39041 applyMaterialRule (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_2338;Z)Ljava/util/Optional;
-		ARG 1 context
-		ARG 2 posToBiome
-		ARG 3 chunk
-		ARG 4 chunkNoiseSampler
-		ARG 5 pos
-		ARG 6 hasFluid
 	METHOD method_39172 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_2378;
 		ARG 0 generator
-	METHOD method_40528 getNoiseRouter ()Lnet/minecraft/class_6953;

mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping

@@ -2,9 +2,7 @@ CLASS net/minecraft/class_6872 net/minecraft/world/gen/chunk/placement/RandomSpr
 	FIELD field_36420 CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (IILnet/minecraft/class_6873;I)V
 		ARG 1 spacing
-		ARG 2 separation
 		ARG 3 spreadType
-		ARG 4 salt
 	METHOD method_40169 getStartChunk (JII)Lnet/minecraft/class_1923;
 		ARG 1 seed
 		ARG 3 x

mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/StructurePlacement
 	FIELD field_36428 TYPE_CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_40166 getType ()Lnet/minecraft/class_6875;
-	METHOD method_40168 isStartChunk (Lnet/minecraft/class_2794;JII)Z
+	METHOD method_40168 isStartChunk (Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;JII)Z
 		ARG 1 chunkGenerator

mappings/net/minecraft/world/gen/densityfunction/DensityFunctionTypes.mapping

@@ -111,13 +111,6 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFu
 			ARG 7 noiseData
 	CLASS class_6941 Slide
 		FIELD field_37099 CODEC Lcom/mojang/serialization/Codec;
-	CLASS class_6942 TerrainShaperSpline
-		FIELD field_37100 CODEC Lcom/mojang/serialization/Codec;
-		CLASS class_7054 Spline
-			FIELD field_37105 CODEC Lcom/mojang/serialization/Codec;
-			FIELD field_37107 name Ljava/lang/String;
-			METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_6916$class_6942$class_7053;)V
-				ARG 3 name
 	CLASS class_6944 WeirdScaledSampler
 		FIELD field_37064 CODEC Lcom/mojang/serialization/Codec;
 		METHOD method_41073 create (Lnet/minecraft/class_6910;Lnet/minecraft/class_6880;Lnet/minecraft/class_6916$class_6944$class_7048;)Lnet/minecraft/class_6916$class_6944;

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

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_5175 net/minecraft/world/gen/feature/BastionRemnantFeature
-	FIELD field_31499 STRUCTURE_START_Y I
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec

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

@@ -1,9 +1,3 @@
 CLASS net/minecraft/class_2956 net/minecraft/world/gen/feature/BuriedTreasureFeature
-	FIELD field_31500 SALT I
+	METHOD method_38672 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_28619 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context
-	METHOD method_38672 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
 		ARG 0 collector
-		ARG 1 context

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

@@ -1,24 +0,0 @@
-CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructureFeature
-	FIELD field_24834 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_24835 feature Lnet/minecraft/class_3195;
-	FIELD field_24836 config Lnet/minecraft/class_3037;
-	FIELD field_25834 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_26757 REGISTRY_ELEMENT_CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_36629 biomes Lnet/minecraft/class_6885;
-	METHOD <init> (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;Lnet/minecraft/class_6885;ZLjava/util/Map;)V
-		ARG 1 feature
-		ARG 2 config
-		ARG 3 biomes
-	METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449;
-		COMMENT @see StructureFeature#tryPlaceStart
-		ARG 1 registryManager
-		ARG 2 chunkGenerator
-		ARG 3 biomeSource
-		ARG 5 worldSeed
-		ARG 7 chunkPos
-		ARG 8 structureReferences
-		ARG 9 world
-		ARG 10 biomePredicate
-	METHOD method_28623 (Lnet/minecraft/class_5312;)Lnet/minecraft/class_3195;
-		ARG 0 configuredStructureFeature
-	METHOD method_40549 getBiomes ()Lnet/minecraft/class_6885;

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

@@ -30,7 +30,7 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructu
 	FIELD field_26315 VILLAGE_TAIGA Lnet/minecraft/class_6880;
 	FIELD field_26316 RUINED_PORTAL Lnet/minecraft/class_6880;
 	FIELD field_26317 RUINED_PORTAL_DESERT Lnet/minecraft/class_6880;
-	METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5312;)Lnet/minecraft/class_6880;
+	METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_3195;)Lnet/minecraft/class_6880;
 		ARG 0 key
 		ARG 1 configuredStructureFeature
 	METHOD method_38569 getDefault ()Lnet/minecraft/class_6880;

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

@@ -1,8 +1 @@
 CLASS net/minecraft/class_3006 net/minecraft/world/gen/feature/DesertPyramidFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_38673 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context
-	METHOD method_39816 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context

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

@@ -1,13 +1,8 @@
 CLASS net/minecraft/class_3021 net/minecraft/world/gen/feature/EndCityFeature
 	FIELD field_31502 Z_SEED_MULTIPLIER I
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_13085 getGenerationHeight (Lnet/minecraft/class_1923;Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
-		ARG 1 configCodec
-	METHOD method_13085 getGenerationHeight (Lnet/minecraft/class_1923;Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;)I
 		ARG 0 pos
 		ARG 1 chunkGenerator
 		ARG 2 world
-	METHOD method_38674 addPieces (Lnet/minecraft/class_6834$class_6835;)Ljava/util/Optional;
+	METHOD method_39817 (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 0 context
-	METHOD method_39817 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
 		ARG 1 collector
-		ARG 2 context

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

@@ -7,13 +7,6 @@ CLASS net/minecraft/class_5780 net/minecraft/world/gen/feature/GlowLichenFeature
 	FIELD field_28434 spreadChance F
 	FIELD field_28435 canPlaceOn Lnet/minecraft/class_6885;
 	FIELD field_28436 directions Ljava/util/List;
-	METHOD <init> (IZZZFLnet/minecraft/class_6885;)V
-		ARG 1 searchRange
-		ARG 2 placeOnFloor
-		ARG 3 placeOnCeiling
-		ARG 4 placeOnWalls
-		ARG 5 spreadChance
-		ARG 6 canPlaceOn
 	METHOD method_33398 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_33399 (Lnet/minecraft/class_5780;)Lnet/minecraft/class_6885;

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

@@ -1,6 +1,2 @@
 CLASS net/minecraft/class_3071 net/minecraft/world/gen/feature/IglooFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_38675 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 1 configCodec
-	METHOD method_38675 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context

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

@@ -1,9 +1,3 @@
 CLASS net/minecraft/class_5434 net/minecraft/world/gen/feature/JigsawFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;IZZLjava/util/function/Predicate;)V
+	METHOD <init> (Lnet/minecraft/class_6885;Ljava/util/Map;Lnet/minecraft/class_2893$class_2895;ZLnet/minecraft/class_6880;ILnet/minecraft/class_6122;ZLnet/minecraft/class_2902$class_2903;)V
-		ARG 1 codec
-		ARG 2 structureStartY
-		ARG 3 modifyBoundingBox
 		ARG 4 surface
-		ARG 5 contextPredicate
-	METHOD method_38676 (Ljava/util/function/Predicate;IZZLnet/minecraft/class_6834$class_6835;)Ljava/util/Optional;
-		ARG 4 context

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

@@ -1,8 +1 @@
 CLASS net/minecraft/class_3076 net/minecraft/world/gen/feature/JungleTempleFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_38677 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context
-	METHOD method_39818 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context

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

@@ -1,11 +1,5 @@
 CLASS net/minecraft/class_3098 net/minecraft/world/gen/feature/MineshaftFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_38678 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 1 configCodec
-	METHOD method_28638 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context
-	METHOD method_38678 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context
 	CLASS class_3100 Type
 		FIELD field_13689 name Ljava/lang/String;
 		FIELD field_13690 BY_NAME Ljava/util/Map;

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

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_3101 net/minecraft/world/gen/feature/MineshaftFeatureConfig
-	FIELD field_13693 probability F
-	FIELD field_13694 type Lnet/minecraft/class_3098$class_3100;
-	FIELD field_24888 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (FLnet/minecraft/class_3098$class_3100;)V
-		ARG 1 probability
-		ARG 2 type
-	METHOD method_28728 (Lnet/minecraft/class_3101;)Lnet/minecraft/class_3098$class_3100;
-		ARG 0 config
-	METHOD method_28729 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance
-	METHOD method_28730 (Lnet/minecraft/class_3101;)Ljava/lang/Float;
-		ARG 0 config

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

@@ -1,9 +1,4 @@
 CLASS net/minecraft/class_3108 net/minecraft/world/gen/feature/NetherFortressFeature
 	FIELD field_13705 MONSTER_SPAWNS Lnet/minecraft/class_6012;
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_38679 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 1 configCodec
-	METHOD method_28640 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context
-	METHOD method_38679 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
 		ARG 0 collector
-		ARG 1 context

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

@@ -1,5 +1 @@
 CLASS net/minecraft/class_4785 net/minecraft/world/gen/feature/NetherFossilFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_38699 addPieces (Lnet/minecraft/class_6834$class_6835;)Ljava/util/Optional;
-		ARG 0 context

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

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_28642 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context
 	METHOD method_38680 modifyPiecesOnRead (Lnet/minecraft/class_1923;JLnet/minecraft/class_6624;)Lnet/minecraft/class_6624;
 		ARG 0 pos
 		ARG 1 worldSeed
@@ -10,6 +6,5 @@ CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeat
 	METHOD method_38681 createBasePiece (Lnet/minecraft/class_1923;Lnet/minecraft/class_2919;)Lnet/minecraft/class_3443;
 		ARG 0 pos
 		ARG 1 random
-	METHOD method_38683 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
+	METHOD method_38683 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
 		ARG 0 collector
-		ARG 1 context

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

@@ -1,9 +1,5 @@
 CLASS net/minecraft/class_3411 net/minecraft/world/gen/feature/OceanRuinFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_38700 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 1 configCodec
-	METHOD method_38700 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context
 	CLASS class_3413 BiomeType
 		FIELD field_14529 name Ljava/lang/String;
 		FIELD field_14530 BY_NAME Ljava/util/Map;

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

@@ -1,17 +0,0 @@
-CLASS net/minecraft/class_3114 net/minecraft/world/gen/feature/OceanRuinFeatureConfig
-	FIELD field_13707 clusterProbability F
-	FIELD field_13708 largeProbability F
-	FIELD field_13709 biomeType Lnet/minecraft/class_3411$class_3413;
-	FIELD field_24895 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_3411$class_3413;FF)V
-		ARG 1 biomeType
-		ARG 2 largeProbability
-		ARG 3 clusterProbability
-	METHOD method_28738 (Lnet/minecraft/class_3114;)Ljava/lang/Float;
-		ARG 0 config
-	METHOD method_28739 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance
-	METHOD method_28740 (Lnet/minecraft/class_3114;)Ljava/lang/Float;
-		ARG 0 config
-	METHOD method_28741 (Lnet/minecraft/class_3114;)Lnet/minecraft/class_3411$class_3413;
-		ARG 0 config

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

@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_3770 net/minecraft/world/gen/feature/PillagerOutpostFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_28644 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context

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

@@ -1,9 +0,0 @@
-CLASS net/minecraft/class_2997 net/minecraft/world/gen/feature/RangeFeatureConfig
-	FIELD field_24879 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_33519 heightProvider Lnet/minecraft/class_6122;
-	METHOD <init> (Lnet/minecraft/class_6122;)V
-		ARG 1 heightProvider
-	METHOD method_36304 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance
-	METHOD method_36305 (Lnet/minecraft/class_2997;)Lnet/minecraft/class_6122;
-		ARG 0 config

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

@@ -1,10 +1,6 @@
 CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeature
 	FIELD field_23998 RARE_PORTAL_STRUCTURE_IDS [Ljava/lang/String;
 	FIELD field_23999 COMMON_PORTAL_STRUCTURE_IDS [Ljava/lang/String;
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_27205 (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4966;
-		ARG 2 pos
 	METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z
 		ARG 0 pos
 		ARG 1 biome
@@ -12,7 +8,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu
 		ARG 0 random
 		ARG 1 min
 		ARG 2 max
-	METHOD method_27211 getFloorHeight (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;)I
+	METHOD method_27211 getFloorHeight (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
 		ARG 0 random
 		ARG 1 chunkGenerator
 		ARG 2 verticalPlacement
@@ -21,17 +17,3 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu
 		ARG 5 blockCountY
 		ARG 6 box
 		ARG 7 world
-	METHOD method_38684 addPieces (Lnet/minecraft/class_6834$class_6835;)Ljava/util/Optional;
-		ARG 0 context
-	METHOD method_39819 (Lnet/minecraft/class_5187;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2338;Lnet/minecraft/class_6834$class_6835;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 10 collector
-		ARG 11 context
-	CLASS class_5185 Type
-		FIELD field_24007 BY_NAME Ljava/util/Map;
-		FIELD field_24008 name Ljava/lang/String;
-		FIELD field_24840 CODEC Lcom/mojang/serialization/Codec;
-		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
-			ARG 3 name
-		METHOD method_27214 getName ()Ljava/lang/String;
-		METHOD method_27216 byName (Ljava/lang/String;)Lnet/minecraft/class_5183$class_5185;
-			ARG 0 name

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

@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_5187 net/minecraft/world/gen/feature/RuinedPortalFeatureConfig
-	FIELD field_24014 portalType Lnet/minecraft/class_5183$class_5185;
-	FIELD field_24906 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_5183$class_5185;)V
-		ARG 1 portalType
-	METHOD method_28778 (Lnet/minecraft/class_5187;)Lnet/minecraft/class_5183$class_5185;
-		ARG 0 config

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

@@ -1,8 +1,2 @@
 CLASS net/minecraft/class_3170 net/minecraft/world/gen/feature/ShipwreckFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_38685 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 1 configCodec
-	METHOD method_38685 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context
-	METHOD method_39820 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context

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

@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_3172 net/minecraft/world/gen/feature/ShipwreckFeatureConfig
-	FIELD field_13803 isBeached Z
-	FIELD field_24908 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Z)V
-		ARG 1 isBeached
-	METHOD method_28782 (Lnet/minecraft/class_3172;)Ljava/lang/Boolean;
-		ARG 0 config

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

@@ -1,8 +1 @@
 CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_28654 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z
-		ARG 0 context
-	METHOD method_38686 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 0 collector
-		ARG 1 context

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

@@ -1,56 +1,2 @@
 CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
-	FIELD field_13879 LOGGER Lorg/slf4j/Logger;
+	METHOD method_38694 postPlace (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_6624;)V
-	FIELD field_24851 SWAMP_HUT Lnet/minecraft/class_3195;
-	FIELD field_24862 STRUCTURE_TO_GENERATION_STEP Ljava/util/Map;
-	FIELD field_24863 codec Lcom/mojang/serialization/Codec;
-	FIELD field_34929 piecesGenerator Lnet/minecraft/class_6834;
-	FIELD field_34930 postProcessor Lnet/minecraft/class_6621;
-	METHOD <init> (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_6834;)V
-		ARG 1 configCodec
-		ARG 2 piecesGenerator
-	METHOD <init> (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_6834;Lnet/minecraft/class_6621;)V
-		ARG 1 configCodec
-		ARG 2 piecesGenerator
-		ARG 3 postPlacementProcessor
-	METHOD method_28659 configure (Lnet/minecraft/class_3037;Lnet/minecraft/class_6862;)Lnet/minecraft/class_5312;
-		ARG 1 config
-		ARG 2 biomeTag
-	METHOD method_28660 readStructureStart (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449;
-		ARG 0 context
-		ARG 1 nbt
-		ARG 2 worldSeed
-	METHOD method_28661 register (Ljava/lang/String;Lnet/minecraft/class_3195;Lnet/minecraft/class_2893$class_2895;)Lnet/minecraft/class_3195;
-		ARG 0 name
-		ARG 1 structureFeature
-		ARG 2 step
-	METHOD method_28663 getGenerationStep ()Lnet/minecraft/class_2893$class_2895;
-		COMMENT Gets the step during which this structure will participate in world generation.
-		COMMENT Structures will generate before other features in the same generation step.
-	METHOD method_28664 init ()V
-	METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec;
-	METHOD method_38671 getLocatedPos (Lnet/minecraft/class_6872;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2338;
-		COMMENT {@return a block position for feature location}
-		ARG 0 placement
-		ARG 1 chunkPos
-	METHOD method_38690 getPostProcessor ()Lnet/minecraft/class_6621;
-	METHOD method_39821 canGenerate (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Z
-		ARG 1 registryManager
-		ARG 2 chunkGenerator
-		ARG 3 biomeSource
-		ARG 4 structureManager
-		ARG 5 worldSeed
-		ARG 7 pos
-		ARG 8 config
-		ARG 9 world
-		ARG 10 biomePredicate
-	METHOD method_40551 (Lnet/minecraft/class_5312;)Lnet/minecraft/class_3037;
-		ARG 0 configuredStructureFeature
-	METHOD method_41133 configure (Lnet/minecraft/class_3037;Lnet/minecraft/class_6862;Ljava/util/Map;)Lnet/minecraft/class_5312;
-		ARG 1 config
-		ARG 2 biomeTag
-	METHOD method_41134 configure (Lnet/minecraft/class_3037;Lnet/minecraft/class_6862;Z)Lnet/minecraft/class_5312;
-		ARG 1 config
-		ARG 2 biomeTag
-	METHOD method_41135 configure (Lnet/minecraft/class_3037;Lnet/minecraft/class_6862;ZLjava/util/Map;)Lnet/minecraft/class_5312;
-		ARG 1 config
-		ARG 2 biomeTag

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

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_3812 net/minecraft/world/gen/feature/StructurePoolFeatureConfig
-	COMMENT A feature config that specifies a starting pool and a size for {@linkplain
-	COMMENT net.minecraft.structure.pool.StructurePoolBasedGenerator#generate}.
-	FIELD field_16860 size I
-	FIELD field_16861 startPool Lnet/minecraft/class_6880;
-	FIELD field_24886 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_6880;I)V
-		ARG 1 startPool
-		ARG 2 size
-	METHOD method_27222 getSize ()I
-	METHOD method_27223 getStartPool ()Lnet/minecraft/class_6880;
-	METHOD method_28724 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance

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

@@ -1,6 +1,3 @@
 CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
+	METHOD method_38693 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
-		ARG 1 configCodec
-	METHOD method_38693 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
 		ARG 0 collector
-		ARG 1 context

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

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_3211 net/minecraft/world/gen/feature/VillageFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec

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

@@ -1,16 +1 @@
 CLASS net/minecraft/class_3223 net/minecraft/world/gen/feature/WoodlandMansionFeature
-	METHOD <init> (Lcom/mojang/serialization/Codec;)V
-		ARG 1 configCodec
-	METHOD method_38694 postPlace (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_6624;)V
-		ARG 0 world
-		ARG 1 structureAccessor
-		ARG 2 chunkGenerator
-		ARG 3 random
-		ARG 4 chunkBox
-		ARG 5 chunkPos
-		ARG 6 children
-	METHOD method_38695 addPieces (Lnet/minecraft/class_6834$class_6835;)Ljava/util/Optional;
-		ARG 0 context
-	METHOD method_39823 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_2919;Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V
-		ARG 3 collector
-		ARG 4 context

mappings/net/minecraft/world/gen/noise/SimpleNoiseRouter.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_7056 net/minecraft/world/gen/noise/SimpleNoiseRouter
-	FIELD field_37137 CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_41124 apply (Lnet/minecraft/class_6910$class_6915;)Lnet/minecraft/class_7056;
-		ARG 1 visitor

mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping

@@ -98,13 +98,8 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu
 		FIELD field_35619 stoneDepthBelow I
 		FIELD field_35620 stoneDepthAbove I
 		FIELD field_35676 chunkNoiseSampler Lnet/minecraft/class_6568;
-		METHOD <init> (Lnet/minecraft/class_6724;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V
+		METHOD <init> (Lnet/minecraft/class_6724;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V
 			ARG 1 surfaceBuilder
-			ARG 2 chunk
-			ARG 3 chunkNoiseSampler
-			ARG 4 posToBiome
-			ARG 5 biomeRegistry
-			ARG 6 heightContext
 		METHOD method_39072 initHorizontalContext (II)V
 			ARG 1 x
 			ARG 2 z

mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping

@@ -12,24 +12,19 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui
 	FIELD field_35286 seaLevel I
 	FIELD field_35287 terracottaBands [Lnet/minecraft/class_2680;
 	FIELD field_35288 terracottaBandsOffsetNoise Lnet/minecraft/class_5216;
-	FIELD field_35291 noiseSamplers Ljava/util/Map;
 	FIELD field_35292 randomDeriver Lnet/minecraft/class_6574;
 	FIELD field_35293 surfaceNoise Lnet/minecraft/class_5216;
-	FIELD field_35415 noiseRegistry Lnet/minecraft/class_2378;
 	FIELD field_35495 badlandsPillarNoise Lnet/minecraft/class_5216;
 	FIELD field_35496 badlandsPillarRoofNoise Lnet/minecraft/class_5216;
 	FIELD field_35497 badlandsSurfaceNoise Lnet/minecraft/class_5216;
 	FIELD field_35498 icebergPillarNoise Lnet/minecraft/class_5216;
 	FIELD field_35499 icebergPillarRoofNoise Lnet/minecraft/class_5216;
 	FIELD field_35500 icebergSurfaceNoise Lnet/minecraft/class_5216;
-	FIELD field_35633 randomDerivers Ljava/util/Map;
 	FIELD field_35680 surfaceSecondaryNoise Lnet/minecraft/class_5216;
-	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V
+	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;ILnet/minecraft/class_6574;)V
 		ARG 1 noiseRegistry
 		ARG 2 defaultState
 		ARG 3 seaLevel
-		ARG 4 seed
-		ARG 6 randomProvider
 	METHOD method_39102 placeBadlandsPillar (Lnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V
 		ARG 1 column
 		ARG 2 x
@@ -48,14 +43,7 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui
 		ARG 5 x
 		ARG 6 z
 		ARG 7 surfaceY
-	METHOD method_39106 buildSurface (Lnet/minecraft/class_4543;Lnet/minecraft/class_2378;ZLnet/minecraft/class_5868;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_6686$class_6708;)V
+	METHOD method_39106 buildSurface (Lnet/minecraft/class_7138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2378;ZLnet/minecraft/class_5868;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_6686$class_6708;)V
-		ARG 1 biomeAccess
-		ARG 2 biomeRegistry
-		ARG 3 useLegacyRandom
-		ARG 4 context
-		ARG 5 chunk
-		ARG 6 chunkNoiseSampler
-		ARG 7 surfaceRule
 	METHOD method_39108 createTerracottaBands (Lnet/minecraft/class_5819;)[Lnet/minecraft/class_2680;
 		ARG 0 random
 	METHOD method_39109 addTerracottaBands (Lnet/minecraft/class_5819;[Lnet/minecraft/class_2680;ILnet/minecraft/class_2680;)V
@@ -71,11 +59,5 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui
 		ARG 5 chunkNoiseSampler
 		ARG 6 pos
 		ARG 7 hasFluid
-	METHOD method_39112 getNoiseSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216;
-		ARG 1 noise
 	METHOD method_39333 isDefaultBlock (Lnet/minecraft/class_2680;)Z
 		ARG 1 state
-	METHOD method_39482 getRandomDeriver (Lnet/minecraft/class_2960;)Lnet/minecraft/class_6574;
-		ARG 1 id
-	METHOD method_39483 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6574;
-		ARG 2 i

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

@@ -32,7 +32,6 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
 	FIELD field_26367 spawnAngle F
 	FIELD field_31843 WORLD_GEN_SETTINGS_KEY Ljava/lang/String;
 	METHOD <init> (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V
-		ARG 1 dataFixer
 		ARG 2 dataVersion
 		ARG 3 playerData
 		ARG 4 modded